Bump API and plugin version for release

Merge pull request #72 from Andre601/dependabot/maven/velocity/org.bstats-bstats-velocity-3.0.2
Bump bstats-velocity from 3.0.1 to 3.0.2 in /velocity
2026-11-05 17:02:34 -05:00 · 2023-03-29 18:41:31 +02:00 · 2023-03-29 18:31:46 +02:00 · 2023-03-29 16:10:44 +00:00 · 2023-03-29 18:02:40 +02:00 · 2023-03-29 16:01:29 +00:00
57 changed files with 1368 additions and 696 deletions
@@ -4,19 +4,19 @@ AdvancedServerList is a plugin that allowys you to customize your server's MOTD,
 ## Supported Platforms

 <a href="https://www.spigotmc.org" target="_blank">
-  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/supported/spigot_vector.svg" width="64" alt="platform-spigot" title="Tested on Spigot">
+  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact-minimal/supported/spigot_vector.svg" width="64" alt="platform-spigot" title="Tested on Spigot">
 </a>
 <a href="https://papermc.io" target="_blank">
-  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/supported/paper_vector.svg" width="64" alt="platform-paper" title="Tested on Paper">
+  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact-minimal/supported/paper_vector.svg" width="64" alt="platform-paper" title="Tested on Paper">
 </a>
 <a href="https://www.spigotmc.org" target="_blank">
-  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/supported/bungeecord_vector.svg" width="64" alt="platform-bungeecord" title="Tested on BungeeCord">
+  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact-minimal/supported/bungeecord_vector.svg" width="64" alt="platform-bungeecord" title="Tested on BungeeCord">
 </a>
 <a href="https://www.papermc.io" target="_blank">
-  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/supported/waterfall_vector.svg" width="64" alt="platform-waterfall" title="Tested on Waterfall">
+  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact-minimal/supported/waterfall_vector.svg" width="64" alt="platform-waterfall" title="Tested on Waterfall">
 </a>
 <a href="https://velocitypowered.com" target="_blank">
-  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/supported/velocity_vector.svg" width="64" alt="platform-velocity" title="Tested on Velocity">
+  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact-minimal/supported/velocity_vector.svg" width="64" alt="platform-velocity" title="Tested on Velocity">
 </a>

 ## What is a Server List Profile?
@@ -61,18 +61,18 @@ You can disable this in the global bStats config file located in `/plugins/bstat
 ## Screenshots

 <a href="https://modrinth.com/plugin/advancedserverlist/gallery" target="_blank">
-  <img src="https://raw.githubusercontent.com/intergrav/devins-badges/v2/assets/cozy/documentation/modrinth-gallery_vector.svg" width="208" alt="gallery" title="Check out the Gallery">
+  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy/documentation/modrinth-gallery_vector.svg" width="208" alt="gallery" title="Check out the Gallery">
 </a>

 ## Support
 <a href="https://discord.gg/6dazXp6" target="_blank">
-  <img src="https://raw.githubusercontent.com/intergrav/devins-badges/v2/assets/minimal/social/discord-singular_vector.svg" width="64" alt="discord" title="Join my Discord Server">
+  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact-minimal/social/discord-singular_vector.svg" width="64" alt="discord" title="Join my Discord Server">
 </a>
 <a href="https://app.revolt.chat/invite/74TpERXA" target="_blank">
-  <img src="https://raw.githubusercontent.com/intergrav/devins-badges/v2/assets/minimal/social/revolt-singular_vector.svg" width="64" alt="revolt" title="Join my Revolt Server">
+  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact-minimal/social/revolt-singular_vector.svg" width="64" alt="revolt" title="Join my Revolt Server">
 </a>
 <a href="https://blobfox.coffee/@andre_601" target="_blank">
-  <img src="https://raw.githubusercontent.com/intergrav/devins-badges/v2/assets/minimal/social/mastodon-singular_vector.svg" width="64" alt="revolt" title="Chat with me on Mastodon">
+  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact-minimal/social/mastodon-singular_vector.svg" width="64" alt="revolt" title="Chat with me on Mastodon">
 </a>

 <!-- Links -->
@@ -48,3 +48,11 @@ updates:
    labels:
      - 'Type: Update Dependency'
      - 'Target: GitHub Action'
+  - package-ecosystem: pip
+    directory: "/"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+    labels:
+      - 'Type: Update Dependency'
+      - 'Target: MkDocs'
@@ -1,14 +1,17 @@
-name: Deploy Site
+name: 'Deploy Site (Push)'

 on:
+  workflow_dispatch:
  push:
    paths:
      - 'docs/**'
      - 'mkdocs.yml'
+      - 'mkdocs-theme/**'
+      - 'requirements.txt'
    branches:
      - master
    tags-ignore:
-    - '**'
+      - '**'

 jobs:
  build:
@@ -18,13 +21,15 @@ jobs:
      - name: Set up Python 3.7
        uses: actions/setup-python@v4
        with:
-          python-version: 3.7
+          python-version: 3.x
+      - name: Create/Get Cache
+        uses: actions/cache@v3
+        with:
+          key: ${{ github.ref }}
+          path: .cache
      - name: Install dependencies
        run: |
          python -m pip install --upgrade pip setuptools
          python -m pip install -r requirements.txt
      - name: Deploy Files
-        run: |
-          git config user.name "github-actions[bot]"
-          git config user.email "actions@github.com"
-          mkdocs gh-deploy --force
+        run: mkdocs gh-deploy --force
@@ -30,18 +30,11 @@ jobs:
        path: bungeecord/target/AdvancedServerList-*.jar
        if-no-files-found: error
        retention-days: 1
-    - name: Save Paper Jar file
+    - name: Save Bukkit Jar file
      uses: actions/upload-artifact@v3
      with:
-        name: asl-paper
-        path: paper/target/AdvancedServerList-*.jar
-        if-no-files-found: error
-        retention-days: 1
-    - name: Save Spigot Jar file
-      uses: actions/upload-artifact@v3
-      with:
-        name: asl-spigot
-        path: spigot/target/AdvancedServerList-*.jar
+        name: asl-bukkit
+        path: bukkit/target/AdvancedServerList-*.jar
        if-no-files-found: error
        retention-days: 1
    - name: Save Velocity Jar file
@@ -61,12 +54,11 @@ jobs:
            loaders: |
              bungeecord
              waterfall
-          - platforms: Paper
-            directory: paper
-            loaders: paper
-          - platforms: Spigot
-            directory: spigot
-            loaders: spigot
+          - platforms: Spigot, Paper
+            directory: bukkit
+            loaders: |
+              spigot
+              paper
          - platforms: Velocity
            directory: velocity
            loaders: velocity
@@ -84,6 +76,7 @@ jobs:
        version=$(echo ${{ github.event.release.tag_name }} | cut -d'v' -f2)
        echo "PLUGIN_RELEASE=$version" >> $GITHUB_OUTPUT
    - name: Upload AdvancedServerList (${{ matrix.loaders }}) to GitHub and Modrinth
+      if: '!github.event.release.prerelease'
      uses: Kir-Antipov/mc-publish@v3.2
      with:
        name: ${{ github.event.release.tag_name }} (${{ matrix.platforms }})
@@ -98,8 +91,31 @@ jobs:
          1.19.1
          1.19.2
          1.19.3
+          1.19.4
        java: 16
        modrinth-id: xss83sOY
        modrinth-featured: false
        modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
        github-token: ${{ secrets.GITHUB_TOKEN }}
+    - name: Upload AdvancedServerList (${{ matrix.loaders }}) to GitHub and Modrinth [Pre-Release]
+      if: 'github.event.release.prerelease'
+      uses: Kir-Antipov/mc-publish@v3.2
+      with:
+        name: ${{ github.event.release.tag_name }} (${{ matrix.platforms }})
+        version: ${{ steps.github-release.outputs.PLUGIN_RELEASE }}
+        version-type: beta
+        files: ${{ matrix.directory }}/target/AdvancedServerList-*.jar
+        files-secondary: ""
+        loaders: ${{ matrix.loaders }}
+        version-resolver: releases
+        game-versions: |
+          1.19
+          1.19.1
+          1.19.2
+          1.19.3
+          1.19.4
+        java: 16
+        modrinth-id: xss83sOY
+        modrinth-featured: false
+        modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+        github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -1,26 +1,36 @@
 # AdvancedServerList
-<a href="https://modrinth.com/plugin/advancedserverlist" target="_blank">
-  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/cozy/available/modrinth_vector.svg" height="64" align="right" alt="modrinth" title="Available on Modrinth">
-</a>

 AdvancedServerList is a plugin that allowys you to customize your server's MOTD, favicon, Player count text and player count hover displayed in a player's multiplayer server list based on conditions and priorities.

+## Downloads
+<a href="https://modrinth.com/plugin/advancedserverlist" target="_blank">
+  <img src="https://cdn.jsdelivr.net/gh/Andre601/devins-badges@13e0142/assets/compact/available/modrinth_vector.svg" height="46" alt="modrinth" title="Available on Modrinth">
+</a>
+<br>
+<a href="https://hangar.papermc.io/Andre_601/AdvancedServerList" target="_blank">
+  <img src="https://cdn.jsdelivr.net/gh/Andre601/devins-badges@13e0142/assets/compact/available/hangar_vector.svg" height="46" alt="hangar" title="Available on Hangar">
+</a>
+<br>
+<a href="https://www.spigotmc.org/resources/102910" target="_blank">
+  <img src="https://cdn.jsdelivr.net/gh/Andre601/devins-badges@b9ff12b/assets/compact/available/spigot_vector.svg" height="46" alt="spigot" title="Available on SpigotMC">
+</a>
+
 ## Supported Platforms

 <a href="https://www.spigotmc.org" target="_blank">
-  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/supported/spigot_vector.svg" height="64" alt="platform-spigot" title="Tested on Spigot">
+  <img src="https://cdn.jsdelivr.net/gh/Andre601/devins-badges@13e0142/assets/compact-minimal/supported/spigot_vector.svg" height="64" alt="platform-spigot" title="Tested on Spigot">
 </a>
 <a href="https://papermc.io" target="_blank">
-  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/supported/paper_vector.svg" height="64" alt="platform-paper" title="Tested on Paper">
+  <img src="https://cdn.jsdelivr.net/gh/Andre601/devins-badges@13e0142/assets/compact-minimal/supported/paper_vector.svg" height="64" alt="platform-paper" title="Tested on Paper">
 </a>
 <a href="https://www.spigotmc.org" target="_blank">
-  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/supported/bungeecord_vector.svg" height="64" alt="platform-bungeecord" title="Tested on BungeeCord">
+  <img src="https://cdn.jsdelivr.net/gh/Andre601/devins-badges@13e0142/assets/compact-minimal/supported/bungeecord_vector.svg" height="64" alt="platform-bungeecord" title="Tested on BungeeCord">
 </a>
 <a href="https://www.papermc.io" target="_blank">
-  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/supported/waterfall_vector.svg" height="64" alt="platform-waterfall" title="Tested on Waterfall">
+  <img src="https://cdn.jsdelivr.net/gh/Andre601/devins-badges@13e0142/assets/compact-minimal/supported/waterfall_vector.svg" height="64" alt="platform-waterfall" title="Tested on Waterfall">
 </a>
 <a href="https://velocitypowered.com" target="_blank">
-  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/supported/velocity_vector.svg" height="64" alt="platform-velocity" title="Tested on Velocity">
+  <img src="https://cdn.jsdelivr.net/gh/Andre601/devins-badges@13e0142/assets/compact-minimal/supported/velocity_vector.svg" height="64" alt="platform-velocity" title="Tested on Velocity">
 </a>

 ## What is a Server List Profile?
@@ -55,9 +65,10 @@ Only certain options are usable for each option. As an example does motd support
 ## Dependencies

 | Dependency       | Platforms     | Required? |
-| ---------------- | ------------- | --------- |
+|------------------|---------------|-----------|
 | [ProtocolLib]    | Spigot        | Yes       |
 | [PlaceholderAPI] | Spigot, Paper | No        |
+| [ViaVersion]     | Spigot, Paper | No        |

 ## Statistics

@@ -71,18 +82,18 @@ You can disable this in the global bStats config file located in `/plugins/bstat
 ## Screenshots

 <a href="https://modrinth.com/plugin/advancedserverlist/gallery" target="_blank">
-  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/cozy/documentation/modrinth-gallery_vector.svg" height="64" alt="gallery" title="Check out the Gallery">
+  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy/documentation/modrinth-gallery_vector.svg" height="64" alt="gallery" title="Check out the Gallery">
 </a>

 ## Support
 <a href="https://discord.gg/6dazXp6" target="_blank">
-  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/social/discord-singular_vector.svg" height="64" alt="discord" title="Join my Discord Server">
+  <img src="https://cdn.jsdelivr.net/gh/Andre601/devins-badges@13e0142/assets/compact-minimal/social/discord-singular_vector.svg" height="64" alt="discord" title="Join my Discord Server">
 </a>
 <a href="https://app.revolt.chat/invite/74TpERXA" target="_blank">
-  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/social/revolt-singular_vector.svg" height="64" alt="revolt" title="Join my Revolt Server">
+  <img src="https://cdn.jsdelivr.net/gh/Andre601/devins-badges@13e0142/assets/compact-minimal/social/revolt-singular_vector.svg" height="64" alt="revolt" title="Join my Revolt Server">
 </a>
 <a href="https://blobfox.coffee/@andre_601" target="_blank">
-  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/social/mastodon-singular_vector.svg" height="64" alt="mastodon" title="Chat with me on Mastodon">
+  <img src="https://cdn.jsdelivr.net/gh/Andre601/devins-badges@13e0142/assets/compact-minimal/social/mastodon-singular_vector.svg" height="64" alt="mastodon" title="Chat with me on Mastodon">
 </a>

 <!-- Links -->
@@ -95,6 +106,7 @@ You can disable this in the global bStats config file located in `/plugins/bstat

 [protocollib]: https://www.spigotmc.org/resources/1997/
 [placeholderapi]: https://www.spigotmc.org/resources/6245/
+[viaversion]: https://www.spigotmc.org/resources/19254/

 [bstats]: https://bstats.org
 [bstats-bungee]: https://bstats.org/plugin/bungeecord/AdvancedServerList/15585
@@ -34,7 +34,7 @@
    </parent>
    <modelVersion>4.0.0</modelVersion>

-    <artifactId>spigot</artifactId>
+    <artifactId>bukkit</artifactId>
    <packaging>jar</packaging>
    <version>${plugin.version}</version>

@@ -44,6 +44,10 @@
    </properties>

    <repositories>
+        <repository>
+            <id>papermc</id>
+            <url>https://papermc.io/repo/repository/maven-public/</url>
+        </repository>
        <repository>
            <id>spigot</id>
            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
@@ -56,6 +60,10 @@
            <id>placeholderapi-repo</id>
            <url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
        </repository>
+        <repository>
+            <id>viaversion</id>
+            <url>https://repo.viaversion.com/</url>
+        </repository>
    </repositories>

    <dependencies>
@@ -71,6 +79,12 @@
            <version>${api.version}</version>
            <scope>compile</scope>
        </dependency>
+        <dependency>
+            <groupId>io.papermc.paper</groupId>
+            <artifactId>paper-api</artifactId>
+            <version>1.19.3-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
        <dependency>
            <groupId>org.spigotmc</groupId>
            <artifactId>spigot-api</artifactId>
@@ -80,30 +94,35 @@
        <dependency>
            <groupId>net.kyori</groupId>
            <artifactId>adventure-platform-bukkit</artifactId>
-            <version>4.2.0</version>
+            <version>4.3.0</version>
        </dependency>
        <dependency>
            <groupId>com.comphenix.protocol</groupId>
            <artifactId>ProtocolLib</artifactId>
-            <version>4.8.0</version>
+            <version>5.0.0-SNAPSHOT</version>
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>org.bstats</groupId>
            <artifactId>bstats-bukkit</artifactId>
-            <version>3.0.0</version>
+            <version>3.0.1</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>me.clip</groupId>
            <artifactId>placeholderapi</artifactId>
-            <version>2.11.2</version>
+            <version>2.11.3</version>
            <scope>provided</scope>
        </dependency>
+        <dependency>
+            <groupId>com.viaversion</groupId>
+            <artifactId>viaversion-api</artifactId>
+            <version>4.6.1</version>
+        </dependency>
    </dependencies>

    <build>
-        <finalName>AdvancedServerList-Spigot-${plugin.version}</finalName>
+        <finalName>AdvancedServerList-Bukkit-${plugin.version}</finalName>
        <resources>
            <resource>
                <filtering>true</filtering>
@@ -114,7 +133,7 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
+                <version>3.11.0</version>
                <configuration>
                    <release>16</release>
                </configuration>
@@ -122,7 +141,7 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.4.0</version>
+                <version>3.4.1</version>
                <configuration>
                    <createDependencyReducedPom>false</createDependencyReducedPom>
                    <relocations>
@@ -0,0 +1,75 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2023 Andre_601
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package ch.andre601.advancedserverlist.bukkit.commands;
+
+import ch.andre601.advancedserverlist.core.interfaces.commands.CmdSender;
+import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
+import ch.andre601.advancedserverlist.paper.commands.PaperCmdSender;
+import ch.andre601.advancedserverlist.spigot.commands.SpigotCmdSender;
+import net.kyori.adventure.platform.bukkit.BukkitAudiences;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collections;
+
+public class CmdAdvancedServerList extends Command implements CommandExecutor{
+    
+    private final PluginCore<?> plugin;
+    private final BukkitAudiences audiences;
+    
+    public CmdAdvancedServerList(PluginCore<?> plugin){
+        this(plugin, null);
+    }
+    
+    public CmdAdvancedServerList(PluginCore<?> plugin, BukkitAudiences audiences){
+        super(
+            "advancedserverlist",
+            "Main command of the plugin",
+            "/asl [reload|help]",
+            Collections.singletonList("asl")
+        );
+        
+        this.plugin = plugin;
+        this.audiences = audiences;
+    }
+    
+    public boolean execute(@NotNull CommandSender sender, @NotNull String s, @NotNull String[] args){
+        plugin.getCore().getCommandHandler().handle(getSender(sender), args);
+        return true;
+    }
+    
+    @Override
+    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @NotNull String label, @NotNull String[] args){
+        plugin.getCore().getCommandHandler().handle(getSender(sender), args);
+        return true;
+    }
+    
+    private CmdSender getSender(CommandSender sender){
+        return audiences == null ? new PaperCmdSender(sender) : new SpigotCmdSender(sender, audiences);
+    }
+}
@@ -23,9 +23,9 @@
 *
 */

-package ch.andre601.advancedserverlist.spigot.events;
+package ch.andre601.advancedserverlist.bukkit.events;

-import ch.andre601.advancedserverlist.spigot.SpigotCore;
+import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -35,9 +35,9 @@ import java.net.InetSocketAddress;

 public class JoinEvent implements Listener{
    
-    private final SpigotCore plugin;
+    private final PluginCore<?> plugin;
    
-    public JoinEvent(SpigotCore plugin){
+    public JoinEvent(PluginCore<?> plugin){
        this.plugin = plugin;
    }
    
@@ -46,7 +46,7 @@ public class JoinEvent implements Listener{
        InetSocketAddress address = event.getPlayer().getAddress();
        if(address == null)
            return;
-    
+        
        Player player = event.getPlayer();
        plugin.getCore().getPlayerHandler().addPlayer(address.getHostString(), player.getName(), player.getUniqueId());
    }
@@ -23,9 +23,10 @@
 *
 */

-package ch.andre601.advancedserverlist.spigot.events;
+package ch.andre601.advancedserverlist.bukkit.events;

 import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
+import ch.andre601.advancedserverlist.spigot.events.PreServerListSetEvent;

 public class PreServerListSetEventImpl extends PreServerListSetEvent{
    
@@ -23,18 +23,18 @@
 *
 */

-package ch.andre601.advancedserverlist.spigot.logging;
+package ch.andre601.advancedserverlist.bukkit.logging;

 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;

 import java.util.logging.Level;
 import java.util.logging.Logger;

-public class SpigotLogger implements PluginLogger{
+public class BukkitLogger implements PluginLogger{
    
    private final Logger logger;
    
-    public SpigotLogger(Logger logger){
+    public BukkitLogger(Logger logger){
        this.logger = logger;
    }
    
@@ -23,29 +23,30 @@
 *
 */

-package ch.andre601.advancedserverlist.spigot.objects;
+package ch.andre601.advancedserverlist.bukkit.objects;

 import ch.andre601.advancedserverlist.api.PlaceholderProvider;
 import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
 import ch.andre601.advancedserverlist.api.objects.GenericServer;
+import ch.andre601.advancedserverlist.spigot.objects.SpigotPlayer;

-public class SpigotPlayerPlaceholders extends PlaceholderProvider{
+public class BukkitPlayerPlaceholders extends PlaceholderProvider{
    
-    public SpigotPlayerPlaceholders(){
+    public BukkitPlayerPlaceholders(){
        super("player");
    }
    
    @Override
    public String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
-        SpigotPlayer spigotPlayer = (SpigotPlayer)player;
+        SpigotPlayer bukkitPlayer = (SpigotPlayer)player;
        
        return switch(placeholder){
-            case "name" -> spigotPlayer.getName();
-            case "protocol" -> String.valueOf(spigotPlayer.getProtocol());
-            case "uuid" -> String.valueOf(spigotPlayer.getUUID());
-            case "hasPlayedBefore" -> returnValue(spigotPlayer, spigotPlayer.hasPlayedBefore());
-            case "isBanned" -> returnValue(spigotPlayer, spigotPlayer.isBanned());
-            case "isWhitelisted" -> returnValue(spigotPlayer, spigotPlayer.isWhitelisted());
+            case "name" -> bukkitPlayer.getName();
+            case "protocol" -> String.valueOf(bukkitPlayer.getProtocol());
+            case "uuid" -> bukkitPlayer.getUUID().toString();
+            case "hasPlayedBefore" -> returnValue(bukkitPlayer, bukkitPlayer.hasPlayedBefore());
+            case "isBanned" -> returnValue(bukkitPlayer, bukkitPlayer.isBanned());
+            case "isWhitelisted" -> returnValue(bukkitPlayer, bukkitPlayer.isWhitelisted());
            default -> null;
        };
    }
@@ -0,0 +1,145 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2023 Andre_601
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package ch.andre601.advancedserverlist.bukkit.objects;
+
+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.interfaces.core.PluginCore;
+import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
+import ch.andre601.advancedserverlist.core.objects.GenericServerImpl;
+import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
+import ch.andre601.advancedserverlist.core.profiles.ServerListProfile;
+import ch.andre601.advancedserverlist.core.profiles.profile.ProfileManager;
+import ch.andre601.advancedserverlist.core.profiles.replacer.StringReplacer;
+import ch.andre601.advancedserverlist.spigot.SpigotCore;
+import ch.andre601.advancedserverlist.spigot.events.ProtocolLibEvents;
+import com.comphenix.protocol.ProtocolLibrary;
+import com.viaversion.viaversion.api.Via;
+import me.clip.placeholderapi.PlaceholderAPI;
+import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+import java.net.InetSocketAddress;
+import java.util.Locale;
+
+public class PAPIPlaceholders extends PlaceholderExpansion{
+    
+    private final PluginCore<?> plugin;
+    
+    public PAPIPlaceholders(PluginCore<?> plugin){
+        this.plugin = plugin;
+        this.register();
+    }
+    
+    @Override
+    public @NotNull String getIdentifier(){
+        return "asl";
+    }
+    
+    @Override
+    public @NotNull String getAuthor(){
+        return "Andre601";
+    }
+    
+    @Override
+    public @NotNull String getVersion(){
+        return plugin.getCore().getVersion();
+    }
+    
+    @Override
+    public String onPlaceholderRequest(Player pl, @NotNull String identifier){
+        InetSocketAddress address = pl.getAddress();
+        
+        String host = resolveVirtualHost(pl, address);
+        CachedPlayer cached = plugin.getCore().getPlayerHandler().getCachedPlayer(pl.getUniqueId());
+        
+        int protocol = resolveProtocol(pl);
+        int online = Bukkit.getOnlinePlayers().size();
+        int max = Bukkit.getMaxPlayers();
+        GenericServer server = new GenericServerImpl(online, max, host);
+        GenericPlayer player = new SpigotPlayerImpl(pl, cached, protocol);
+        
+        ServerListProfile profile = ProfileManager.resolveProfile(plugin.getCore(), player, server);
+        if(profile == null)
+            return null;
+        
+        ProfileEntry entry = ProfileManager.merge(profile);
+        
+        if(ProfileManager.checkOption(entry.extraPlayersEnabled()))
+            max = online + (entry.extraPlayersCount() == null ? 0 : entry.extraPlayersCount());
+        
+        GenericServer finalServer = new GenericServerImpl(online, max, host);
+        
+        return switch(identifier.toLowerCase(Locale.ROOT)){
+            case "motd" -> ComponentParser.list(entry.motd())
+                .modifyText(text -> PlaceholderAPI.setPlaceholders(pl, text))
+                .modifyText(text -> StringReplacer.replace(text, player, finalServer))
+                .toString();
+            case "favicon" -> ComponentParser.text(entry.favicon())
+                .modifyText(text -> PlaceholderAPI.setPlaceholders(pl, text))
+                .modifyText(text -> StringReplacer.replace(text, player, finalServer))
+                .toString();
+            case "playercount_hover" -> ComponentParser.list(entry.players())
+                .modifyText(text -> PlaceholderAPI.setPlaceholders(pl, text))
+                .modifyText(text -> StringReplacer.replace(text, player, finalServer))
+                .toString();
+            case "playercount_text" -> ComponentParser.text(entry.playerCountText())
+                .modifyText(text -> PlaceholderAPI.setPlaceholders(pl, text))
+                .modifyText(text -> StringReplacer.replace(text, player, finalServer))
+                .toString();
+            case "extra_players_max" -> String.valueOf(max);
+            default -> null;
+        };
+    }
+    
+    private int resolveProtocol(Player player){
+        if(Bukkit.getPluginManager().isPluginEnabled("ViaVersion"))
+            return Via.getAPI().getPlayerVersion(player.getUniqueId());
+        
+        // Since Spigot version requires ProtocolLib can we use it here safely if the plugin instance is SpigotCore.
+        if(plugin instanceof SpigotCore)
+            return ProtocolLibrary.getProtocolManager().getProtocolVersion(player);
+        
+        // getProtocolVersion is only in Paper, so this is only called when main class isn't SpigotCore
+        return Bukkit.getUnsafe().getProtocolVersion();
+    }
+    
+    private String resolveVirtualHost(Player player, InetSocketAddress address){
+        try {
+            // Server is a Paper Server with Player#getVirtualHost()
+            Class.forName("com.destroystokyo.paper.network.NetworkClient");
+            return player.getVirtualHost() == null ? null : player.getVirtualHost().getHostString();
+        }catch(ClassNotFoundException ignored){}
+        
+        if(address == null)
+            return null;
+        
+        return ProtocolLibEvents.getHostAddresses().get(address.getHostString());
+    }
+}
@@ -23,10 +23,11 @@
 *
 */

-package ch.andre601.advancedserverlist.spigot.objects;
+package ch.andre601.advancedserverlist.bukkit.objects;

 import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
 import ch.andre601.advancedserverlist.core.profiles.players.GenericPlayerImpl;
+import ch.andre601.advancedserverlist.spigot.objects.SpigotPlayer;
 import org.bukkit.OfflinePlayer;

 public class SpigotPlayerImpl extends GenericPlayerImpl implements SpigotPlayer{
@@ -0,0 +1,61 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2023 Andre_601
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package ch.andre601.advancedserverlist.paper;
+
+import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
+import io.papermc.paper.plugin.loader.PluginClasspathBuilder;
+import io.papermc.paper.plugin.loader.PluginLoader;
+import io.papermc.paper.plugin.loader.library.impl.MavenLibraryResolver;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.logger.slf4j.ComponentLogger;
+import org.eclipse.aether.artifact.DefaultArtifact;
+import org.eclipse.aether.graph.Dependency;
+import org.eclipse.aether.repository.RemoteRepository;
+import org.jetbrains.annotations.NotNull;
+
+public class ASLLoader implements PluginLoader{
+    @Override
+    public void classloader(@NotNull PluginClasspathBuilder pluginClasspathBuilder){
+        ComponentLogger logger = pluginClasspathBuilder.getContext().getLogger();
+        
+        logger.info(Component.text("Loading Libraries for plugin..."));
+        
+        MavenLibraryResolver resolver = new MavenLibraryResolver();
+        
+        resolver.addRepository(new RemoteRepository.Builder(
+            "paper-maven",
+            "default",
+            "https://repo.papermc.io/repository/maven-public/"
+        ).build());
+        
+        logger.info(Component.text("Loading com.squareup.okhttp3:okhttp:4.10.0 from repo.papermc.io..."));
+        
+        resolver.addDependency(new Dependency(new DefaultArtifact("com.squareup.okhttp3:okhttp:4.10.0"), null));
+        pluginClasspathBuilder.addLibrary(resolver);
+        
+        logger.info(Component.text("Loading libraries complete!"));
+    }
+}
@@ -0,0 +1,132 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2023 Andre_601
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package ch.andre601.advancedserverlist.paper;
+
+import ch.andre601.advancedserverlist.bukkit.commands.CmdAdvancedServerList;
+import ch.andre601.advancedserverlist.bukkit.events.JoinEvent;
+import ch.andre601.advancedserverlist.bukkit.logging.BukkitLogger;
+import ch.andre601.advancedserverlist.bukkit.objects.BukkitPlayerPlaceholders;
+import ch.andre601.advancedserverlist.bukkit.objects.PAPIPlaceholders;
+import ch.andre601.advancedserverlist.core.AdvancedServerList;
+import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
+import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
+import ch.andre601.advancedserverlist.core.profiles.favicon.FaviconHandler;
+import ch.andre601.advancedserverlist.paper.events.PaperPingEvent;
+import org.bstats.bukkit.Metrics;
+import org.bstats.charts.SimplePie;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.util.CachedServerIcon;
+
+import java.nio.file.Path;
+
+public class PaperCore extends JavaPlugin implements PluginCore<CachedServerIcon>{
+    
+    private final PluginLogger logger = new BukkitLogger(getLogger());
+    
+    private AdvancedServerList core;
+    private FaviconHandler<CachedServerIcon> faviconHandler;
+    
+    @Override
+    public void onEnable(){
+        this.core = new AdvancedServerList(this, new BukkitPlayerPlaceholders());
+        
+        if(getServer().getPluginManager().isPluginEnabled("PlaceholderAPI"))
+            new PAPIPlaceholders(this);
+    }
+    
+    @Override
+    public void onDisable(){
+        getCore().disable();
+    }
+    
+    @Override
+    public void loadCommands(){
+        if(getServer().getCommandMap().register("asl", new CmdAdvancedServerList(this))){
+            getPluginLogger().info("Registered /advancedserverlist:advancedserverlist");
+        }else{
+            getPluginLogger().info("Registered /asl:advancedserverlist");
+        }
+    }
+    
+    @Override
+    public void loadEvents(){
+        new JoinEvent(this);
+        new PaperPingEvent(this);
+    }
+    
+    @Override
+    public void loadMetrics(){
+        new Metrics(this, 15584).addCustomChart(new SimplePie("profiles",
+            () -> String.valueOf(core.getFileHandler().getProfiles().size())
+        ));
+    }
+    
+    @Override
+    public void clearFaviconCache(){
+        if(faviconHandler == null)
+            return;
+        
+        faviconHandler.clearCache();
+    }
+    
+    @Override
+    public AdvancedServerList getCore(){
+        return core;
+    }
+    
+    @Override
+    public Path getFolderPath(){
+        return getDataFolder().toPath();
+    }
+    
+    @Override
+    public PluginLogger getPluginLogger(){
+        return logger;
+    }
+    
+    @Override
+    public FaviconHandler<CachedServerIcon> getFaviconHandler(){
+        if(faviconHandler == null)
+            faviconHandler = new FaviconHandler<>(core);
+        
+        return faviconHandler;
+    }
+    
+    @Override
+    public String getPlatformName(){
+        return getServer().getName();
+    }
+    
+    @Override
+    public String getPlatformVersion(){
+        return getServer().getVersion();
+    }
+    
+    @Override
+    public String getLoader(){
+        return "paper";
+    }
+}
@@ -23,29 +23,27 @@
 *
 */

-package ch.andre601.advancedserverlist.spigot.commands;
+package ch.andre601.advancedserverlist.paper.commands;

-import ch.andre601.advancedserverlist.spigot.SpigotCore;
-import net.kyori.adventure.platform.bukkit.BukkitAudiences;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
+import ch.andre601.advancedserverlist.core.interfaces.commands.CmdSender;
+import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
 import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;

-public class CmdAdvancedServerList implements CommandExecutor{
+public class PaperCmdSender implements CmdSender{
    
-    SpigotCore plugin;
-    BukkitAudiences bukkitAudiences;
+    private final CommandSender sender;
    
-    public CmdAdvancedServerList(SpigotCore plugin){
-        this.plugin = plugin;
-        bukkitAudiences = BukkitAudiences.create(plugin);
+    public PaperCmdSender(CommandSender sender){
+        this.sender = sender;
    }
    
    @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @NotNull String label, @NotNull String[] args){
-        plugin.getCore().getCommandHandler().handle(new SpigotCmdSender(sender, bukkitAudiences), args);
-        
-        return true;
+    public boolean hasPermission(String permission){
+        return sender.hasPermission(permission) || sender.hasPermission("advancedserverlist.admin");
+    }
+    
+    @Override
+    public void sendMsg(String msg, Object... args){
+        sender.sendMessage(ComponentParser.text(String.format(msg, args)).toComponent());
    }
 }
@@ -0,0 +1,182 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2023 Andre_601
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package ch.andre601.advancedserverlist.paper.events;
+
+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.bukkit.events.PreServerListSetEventImpl;
+import ch.andre601.advancedserverlist.bukkit.objects.SpigotPlayerImpl;
+import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
+import ch.andre601.advancedserverlist.core.interfaces.events.GenericEventWrapper;
+import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
+import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
+import ch.andre601.advancedserverlist.core.profiles.replacer.StringReplacer;
+import ch.andre601.advancedserverlist.paper.PaperCore;
+import com.destroystokyo.paper.event.server.PaperServerListPingEvent;
+import com.destroystokyo.paper.profile.PlayerProfile;
+import me.clip.placeholderapi.PlaceholderAPI;
+import net.kyori.adventure.text.Component;
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.util.CachedServerIcon;
+
+import java.awt.image.BufferedImage;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+public class PaperEventWrapper implements GenericEventWrapper<CachedServerIcon, SpigotPlayerImpl>{
+    
+    private final PaperCore plugin;
+    private final PaperServerListPingEvent event;
+    
+    public PaperEventWrapper(PaperCore plugin, PaperServerListPingEvent event){
+        this.plugin = plugin;
+        this.event = event;
+    }
+    
+    @Override
+    public GenericServerListEvent callEvent(ProfileEntry entry){
+        PreServerListSetEventImpl event = new PreServerListSetEventImpl(entry);
+        plugin.getServer().getPluginManager().callEvent(event);
+        
+        return event;
+    }
+    
+    @Override
+    public void setMaxPlayers(int maxPlayers){
+        event.setMaxPlayers(maxPlayers);
+    }
+    
+    @Override
+    public void setMotd(Component component){
+        event.motd(component);
+    }
+    
+    @Override
+    public void hidePlayers(){
+        event.setHidePlayers(true);
+    }
+    
+    @Override
+    public void setPlayerCount(String name){
+        event.setVersion(name);
+        event.setProtocolVersion(-1);
+    }
+    
+    @Override
+    public void setPlayers(List<String> lines, SpigotPlayerImpl 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(Bukkit.createProfile(UUID.randomUUID(), parsed));
+        }
+        
+        event.getPlayerSample().addAll(players);
+    }
+    
+    @Override
+    public void setFavicon(CachedServerIcon favicon){
+        event.setServerIcon(favicon);
+    }
+    
+    @Override
+    public void setDefaultFavicon(){
+        event.setServerIcon(event.getServerIcon());
+    }
+    
+    // Not used in Paper
+    @Override
+    public void updateEvent(){}
+    
+    // Not used in Paper
+    @Override
+    public boolean isInvalidProtocol(){
+        return false;
+    }
+    
+    @Override
+    public int getProtocolVersion(){
+        return event.getClient().getProtocolVersion();
+    }
+    
+    @Override
+    public int getOnlinePlayers(){
+        return event.getNumPlayers();
+    }
+    
+    @Override
+    public int getMaxPlayers(){
+        return event.getMaxPlayers();
+    }
+    
+    @Override
+    public String getPlayerIP(){
+        return event.getClient().getAddress().getHostString();
+    }
+    
+    @Override
+    public String parsePAPIPlaceholders(String text, SpigotPlayerImpl player){
+        if(plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI"))
+            return PlaceholderAPI.setPlaceholders(player.getPlayer(), text);
+        
+        return text;
+    }
+    
+    @Override
+    public String getVirtualHost(){
+        return this.resolveHost(event.getClient().getVirtualHost());
+    }
+    
+    @Override
+    public PluginCore<CachedServerIcon> getPlugin(){
+        return plugin;
+    }
+    
+    @Override
+    public SpigotPlayerImpl createPlayer(CachedPlayer player, int protocol){
+        OfflinePlayer pl = Bukkit.getOfflinePlayer(player.getUuid());
+        
+        return new SpigotPlayerImpl(pl.hasPlayedBefore() ? pl : null, player, protocol);
+    }
+    
+    @Override
+    public CachedServerIcon createFavicon(BufferedImage image) throws Exception{
+        return Bukkit.loadServerIcon(image);
+    }
+}
@@ -0,0 +1,47 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2023 Andre_601
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package ch.andre601.advancedserverlist.paper.events;
+
+import ch.andre601.advancedserverlist.core.events.PingEventHandler;
+import ch.andre601.advancedserverlist.paper.PaperCore;
+import com.destroystokyo.paper.event.server.PaperServerListPingEvent;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+
+public class PaperPingEvent implements Listener{
+    
+    private final PaperCore plugin;
+    
+    public PaperPingEvent(PaperCore plugin){
+        this.plugin = plugin;
+        plugin.getServer().getPluginManager().registerEvents(this, plugin);
+    }
+    
+    @EventHandler
+    public void onPaperServerListPing(PaperServerListPingEvent event){
+        PingEventHandler.handleEvent(new PaperEventWrapper(plugin, event));
+    }
+}
@@ -25,15 +25,16 @@

 package ch.andre601.advancedserverlist.spigot;

+import ch.andre601.advancedserverlist.bukkit.commands.CmdAdvancedServerList;
+import ch.andre601.advancedserverlist.bukkit.logging.BukkitLogger;
+import ch.andre601.advancedserverlist.bukkit.objects.BukkitPlayerPlaceholders;
 import ch.andre601.advancedserverlist.core.AdvancedServerList;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
 import ch.andre601.advancedserverlist.core.profiles.favicon.FaviconHandler;
-import ch.andre601.advancedserverlist.spigot.commands.CmdAdvancedServerList;
 import ch.andre601.advancedserverlist.spigot.events.LoadEvent;
-import ch.andre601.advancedserverlist.spigot.logging.SpigotLogger;
-import ch.andre601.advancedserverlist.spigot.objects.SpigotPlayerPlaceholders;
 import com.comphenix.protocol.wrappers.WrappedServerPing;
+import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import org.bstats.bukkit.Metrics;
 import org.bstats.charts.SimplePie;
 import org.bukkit.command.PluginCommand;
@@ -43,7 +44,7 @@ import java.nio.file.Path;

 public class SpigotCore extends JavaPlugin implements PluginCore<WrappedServerPing.CompressedImage>{
    
-    private final PluginLogger logger = new SpigotLogger(getLogger());
+    private final PluginLogger logger = new BukkitLogger(getLogger());
    
    private AdvancedServerList core;
    FaviconHandler<WrappedServerPing.CompressedImage> faviconHandler = null;
@@ -63,7 +64,7 @@ public class SpigotCore extends JavaPlugin implements PluginCore<WrappedServerPi
            }catch(ClassNotFoundException ignored){}
        }
        
-        this.core = new AdvancedServerList(this, new SpigotPlayerPlaceholders());
+        this.core = new AdvancedServerList(this, new BukkitPlayerPlaceholders());
    }
    
    @Override
@@ -75,10 +76,10 @@ public class SpigotCore extends JavaPlugin implements PluginCore<WrappedServerPi
    public void loadCommands(){
        PluginCommand cmd = getServer().getPluginCommand("advancedserverlist");
        if(cmd == null){
-            getPluginLogger().warn("Could not register command /advancedserverlist");
+            getPluginLogger().warn("Unable to register command /advancedserverlist");
            return;
        }
-        cmd.setExecutor(new CmdAdvancedServerList(this));
+        cmd.setExecutor(new CmdAdvancedServerList(this, BukkitAudiences.create(this)));
    }
    
    @Override
@@ -25,7 +25,7 @@

 package ch.andre601.advancedserverlist.spigot.commands;

-import ch.andre601.advancedserverlist.core.interfaces.CmdSender;
+import ch.andre601.advancedserverlist.core.interfaces.commands.CmdSender;
 import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import org.bukkit.command.CommandSender;
@@ -25,7 +25,9 @@

 package ch.andre601.advancedserverlist.spigot.events;

+import ch.andre601.advancedserverlist.bukkit.events.JoinEvent;
 import ch.andre601.advancedserverlist.spigot.SpigotCore;
+import ch.andre601.advancedserverlist.bukkit.objects.PAPIPlaceholders;
 import com.comphenix.protocol.ProtocolLibrary;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -53,6 +55,9 @@ public class LoadEvent implements Listener{
        }
        
        manager.registerEvents(new JoinEvent(plugin), plugin);
-        manager.registerEvents(new PingEvent(plugin, ProtocolLibrary.getProtocolManager()), plugin);
+        manager.registerEvents(new ProtocolLibEvents(plugin, ProtocolLibrary.getProtocolManager()), plugin);
+        
+        if(manager.isPluginEnabled("PlaceholderAPI"))
+            new PAPIPlaceholders(plugin);
    }
 }
@@ -28,13 +28,14 @@ package ch.andre601.advancedserverlist.spigot.events;
 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.bukkit.events.PreServerListSetEventImpl;
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
 import ch.andre601.advancedserverlist.core.interfaces.events.GenericEventWrapper;
 import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
 import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
 import ch.andre601.advancedserverlist.core.profiles.replacer.StringReplacer;
 import ch.andre601.advancedserverlist.spigot.SpigotCore;
-import ch.andre601.advancedserverlist.spigot.objects.SpigotPlayerImpl;
+import ch.andre601.advancedserverlist.bukkit.objects.SpigotPlayerImpl;
 import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.wrappers.AdventureComponentConverter;
 import com.comphenix.protocol.wrappers.WrappedGameProfile;
@@ -47,7 +48,6 @@ import org.bukkit.OfflinePlayer;
 import java.awt.image.BufferedImage;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.UUID;

 public class ProtocolLibEventWrapper implements GenericEventWrapper<WrappedServerPing.CompressedImage, SpigotPlayerImpl>{
@@ -56,14 +56,10 @@ public class ProtocolLibEventWrapper implements GenericEventWrapper<WrappedServe
    private final PacketEvent event;
    private final WrappedServerPing ping;
    
-    private final Map<String, String> hostAddresses;
-    
-    public ProtocolLibEventWrapper(SpigotCore plugin, PacketEvent event, Map<String, String> hostAddresses){
+    public ProtocolLibEventWrapper(SpigotCore plugin, PacketEvent event){
        this.plugin = plugin;
        this.event = event;
        this.ping = event.getPacket().getServerPings().read(0);
-        
-        this.hostAddresses = hostAddresses;
    }
    
    @Override
@@ -128,7 +124,9 @@ public class ProtocolLibEventWrapper implements GenericEventWrapper<WrappedServe
    
    // Not used in ProtocolLib
    @Override
-    public void updateEvent(){}
+    public void updateEvent(){
+        event.getPacket().getServerPings().write(0, ping);
+    }
    
    @Override
    public boolean isInvalidProtocol(){
@@ -169,7 +167,7 @@ public class ProtocolLibEventWrapper implements GenericEventWrapper<WrappedServe
        if(host == null)
            return null;
        
-        return hostAddresses.get(host);
+        return ProtocolLibEvents.getHostAddresses().get(host);
    }
    
    @Override
@@ -38,18 +38,22 @@ import java.net.InetSocketAddress;
 import java.util.HashMap;
 import java.util.Map;

-public class PingEvent implements Listener{
+public class ProtocolLibEvents implements Listener{
    
    private final ProtocolManager protocolManager;
    
-    private final Map<String, String> hostAddresses = new HashMap<>();
+    private static final Map<String, String> hostAddresses = new HashMap<>();
    
-    public PingEvent(SpigotCore plugin, ProtocolManager protocolManager){
+    public ProtocolLibEvents(SpigotCore plugin, ProtocolManager protocolManager){
        this.protocolManager = protocolManager;
        
        loadPacketListener(plugin);
    }
    
+    public static Map<String, String> getHostAddresses(){
+        return hostAddresses;
+    }
+    
    private void loadPacketListener(SpigotCore spigotPlugin){
        protocolManager.addPacketListener(new PacketAdapter(spigotPlugin, ListenerPriority.LOW, PacketType.Handshake.Client.SET_PROTOCOL){
            @Override
@@ -67,7 +71,7 @@ public class PingEvent implements Listener{
        protocolManager.addPacketListener(new PacketAdapter(spigotPlugin, ListenerPriority.LOW, PacketType.Status.Server.SERVER_INFO){
            @Override
            public void onPacketSending(PacketEvent event){
-                PingEventHandler.handleEvent(new ProtocolLibEventWrapper(spigotPlugin, event, hostAddresses));
+                PingEventHandler.handleEvent(new ProtocolLibEventWrapper(spigotPlugin, event));
            }
        });
    }
@@ -0,0 +1,56 @@
+name: 'AdvancedServerList'
+author: 'Andre_601'
+version: '${plugin.version}'
+description: '${plugin.description}'
+
+main: 'ch.andre601.advancedserverlist.paper.PaperCore'
+loader: 'ch.andre601.advancedserverlist.paper.ASLLoader'
+
+api-version: 1.19
+
+dependencies:
+  - name: PlaceholderAPI
+    required: false
+    bootstrap: false
+  - name: ViaVersion
+    required: false
+    bootstrap: false
+
+load-after:
+  - name: PlaceholderAPI
+    bootstrap: false
+  - name: ViaVersion
+    bootstrap: false
+
+# The below stuff is NOT used by Paper plugin.
+commands:
+  advancedserverlist:
+    description: 'Main command of AdvancedServerList'
+    usage: '/<command> [help|reload]'
+    aliases:
+      - 'asl'
+    permission: 'advancedserverlist.admin'
+
+permissions:
+  advancedserverlist.*:
+    description: 'Grants access to all permissions'
+    default: op
+    children:
+      - 'advancedserverlist.admin'
+  advancedserverlist.admin:
+    description: 'Grants access to all permissions'
+    default: op
+    children:
+      - 'advancedserverlist.command.*'
+  advancedserverlist.command.*:
+    description: 'Grants access to all commands'
+    default: op
+    children:
+      - 'advancedserverlist.command.help'
+      - 'advancedserverlist.command.reload'
+  advancedserverlist.command.help:
+    description: 'Grants access to /asl help'
+    default: op
+  advancedserverlist.command.reload:
+    description: 'Grants access to /asl reload'
+    default: op
@@ -104,7 +104,7 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
+                <version>3.11.0</version>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
@@ -25,7 +25,7 @@

 package ch.andre601.advancedserverlist.bungeecord.commands;

-import ch.andre601.advancedserverlist.core.interfaces.CmdSender;
+import ch.andre601.advancedserverlist.core.interfaces.commands.CmdSender;
 import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
 import net.kyori.adventure.platform.bungeecord.BungeeAudiences;
 import net.md_5.bungee.api.CommandSender;
@@ -65,22 +65,22 @@
        <dependency>
            <groupId>net.kyori</groupId>
            <artifactId>adventure-api</artifactId>
-            <version>4.12.0</version>
+            <version>4.13.0</version>
        </dependency>
        <dependency>
            <groupId>net.kyori</groupId>
            <artifactId>adventure-text-minimessage</artifactId>
-            <version>4.12.0</version>
+            <version>4.13.0</version>
        </dependency>
        <dependency>
            <groupId>net.kyori</groupId>
            <artifactId>adventure-text-serializer-legacy</artifactId>
-            <version>4.12.0</version>
+            <version>4.13.0</version>
        </dependency>
        <dependency>
            <groupId>com.github.ben-manes.caffeine</groupId>
            <artifactId>caffeine</artifactId>
-            <version>3.1.2</version>
+            <version>3.1.5</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
@@ -120,7 +120,7 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
+                <version>3.11.0</version>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
@@ -103,6 +103,10 @@ public class AdvancedServerList{
        plugin.clearFaviconCache();
    }
    
+    public void clearPlayerCache(){
+        getPlayerHandler().clearCache();
+    }
+    
    private void load(){
        printBanner();
        resolveVersion();
@@ -150,7 +154,6 @@ public class AdvancedServerList{
    }
    
    private void printBanner(){
-        getPlugin().getPluginLogger().info("");
        getPlugin().getPluginLogger().info("           _____ _");
        getPlugin().getPluginLogger().info("    /\\    / ____| |");
        getPlugin().getPluginLogger().info("   /  \\  | (___ | |");
@@ -26,56 +26,121 @@
 package ch.andre601.advancedserverlist.core.commands;

 import ch.andre601.advancedserverlist.core.AdvancedServerList;
-import ch.andre601.advancedserverlist.core.interfaces.CmdSender;
+import ch.andre601.advancedserverlist.core.interfaces.commands.CmdSender;
+import ch.andre601.advancedserverlist.core.interfaces.commands.PluginCommand;
+
+import java.util.ArrayList;
+import java.util.List;

 public class CommandHandler{
    
-    private final AdvancedServerList core;
+    private final List<PluginCommand> subCommands = new ArrayList<>();
    
    public CommandHandler(AdvancedServerList core){
-        this.core = core;
+        subCommands.add(new Help());
+        subCommands.add(new Reload(core));
+        subCommands.add(new ClearCache(core));
    }
    
    public void handle(CmdSender sender, String[] args){
-        String errorPrefix = "<grey>[<gradient:dark_red:red>AdvancedServerList</gradient>]";
-        String prefix = "<grey>[<gradient:aqua:white>AdvancedServerList</gradient>]";
+        if(args.length == 0){
+            sender.sendErrorMsg("<red>Too few arguments! Use <grey>/asl help</grey> for a list of commands.");
+            return;
+        }
        
-        if(args.length == 0 || args[0].equalsIgnoreCase("help")){
-            if(sender.hasPermission("advancedserverlist.command.help")){
-                sender.sendMsg("%s - Commands", prefix);
-                sender.sendMsg();
-                sender.sendMsg("<gradient:aqua:white>/asl help</gradient> <grey>- Shows this Help");
-                sender.sendMsg();
-                sender.sendMsg("<gradient:aqua:white>/asl reload</gradient> <grey>- Reloads the plugin");
-            }else{
-                sender.sendMsg("%s <red>You do not have permissions to execute this command!", errorPrefix);
-            }
-        }else
-        if(args[0].equalsIgnoreCase("reload")){
-            if(sender.hasPermission("advancedserverlist.command.reload")){
-                sender.sendMsg("%s Reloading plugin...", prefix);
-                
-                if(core.getFileHandler().reloadConfig()){
-                    sender.sendMsg("%s <green>Reloaded <grey>config.yml</grey>!", prefix);
-                }else{
-                    sender.sendMsg("%s <red>Error while reloading the <grey>config.yml</grey>!", errorPrefix);
+        for(PluginCommand subCommand : subCommands){
+            if(subCommand.getArgument().equalsIgnoreCase(args[0])){
+                if(!sender.hasPermission(subCommand.getPermission())){
+                    sender.sendErrorMsg(
+                        "<red>You do not have the permission <grey>%s</grey> to execute this command.",
+                        subCommand.getPermission()
+                    );
+                    return;
                }
                
-                if(core.getFileHandler().reloadProfiles()){
-                    sender.sendMsg("%s <green>Loaded <grey>%d Profile(s)</grey>!", prefix, core.getFileHandler().getProfiles().size());
-                }else{
-                    sender.sendMsg("%s <red>Cannot load Profiles!", errorPrefix);
-                }
-                
-                core.clearFaviconCache();
-                sender.sendMsg("%s <green>Successfully cleared Favicon cache!", prefix);
-                
-                sender.sendMsg("%s <green>Reload complete!", prefix);
-            }else{
-                sender.sendMsg("%s <red>You do not have permissions to execute this command!", errorPrefix);
+                subCommand.handle(sender);
+                return;
            }
-        }else{
-            sender.sendMsg("%s <red>Unknown subcommand <grey>%s</grey>. Use <grey>/asl help</grey> for a list of commands.", prefix, args[0]);
+        }
+        
+        sender.sendErrorMsg("<red>Unknown subcommand <grey>%s</grey>. Use <grey>/asl help</grey> for a list of commands.", args[0]);
+    }
+    
+    private static class Help extends PluginCommand{
+        
+        public Help(){
+            super("help");
+        }
+    
+        @Override
+        public void handle(CmdSender sender){
+            sender.sendPrefixedMsg("- Commands");
+            sender.sendMsg();
+            sender.sendMsg("<aqua>/asl <white>help <grey>- Shows this help");
+            sender.sendMsg();
+            sender.sendMsg("<aqua>/asl <white>reload <grey>- Reloads the plugin and clears caches");
+            sender.sendMsg();
+            sender.sendMsg("<aqua>/asl <white>clearCache <grey>- Clears the Player and Favicon cache");
+        }
+    }
+    
+    private static class Reload extends PluginCommand{
+        
+        private final AdvancedServerList core;
+        
+        public Reload(AdvancedServerList core){
+            super("reload");
+            
+            this.core = core;
+        }
+        
+        @Override
+        public void handle(CmdSender sender){
+            sender.sendPrefixedMsg("Reloading plugin...");
+            
+            if(core.getFileHandler().reloadConfig()){
+                sender.sendPrefixedMsg("<green>Reloaded <grey>config.yml</grey>!");
+            }else{
+                sender.sendErrorMsg("<red>Error while reloading <grey>config.yml</grey>!");
+            }
+            
+            if(core.getFileHandler().reloadProfiles()){
+                sender.sendPrefixedMsg("<green>Loaded <grey>%d profile(s)</grey>!", core.getFileHandler().getProfiles().size());
+            }else{
+                sender.sendErrorMsg("<red>Error while loading profile(s)!");
+            }
+            
+            core.clearFaviconCache();
+            sender.sendPrefixedMsg("<green>Successfully cleared Favicon Cache!");
+            
+            core.clearPlayerCache();
+            sender.sendPrefixedMsg("<green>Successfully cleared Player Cache!");
+            
+            sender.sendPrefixedMsg("<green>Reload complete!");
+        }
+    }
+    
+    private static class ClearCache extends PluginCommand{
+        
+        private final AdvancedServerList core;
+        
+        public ClearCache(AdvancedServerList core){
+            super("clearCache");
+            
+            this.core = core;
+        }
+    
+        @Override
+        public void handle(CmdSender sender){
+            sender.sendPrefixedMsg("Clearing caches...");
+            
+            core.clearFaviconCache();
+            sender.sendPrefixedMsg("<green>Successfully cleared Favicon Cache!");
+            
+            core.clearPlayerCache();
+            sender.sendPrefixedMsg("<green>Successfully cleared Player Cache!");
+            
+            sender.sendPrefixedMsg("<green>Cache clearing complete!");
        }
    }
 }
@@ -68,43 +68,43 @@ public class PingEventHandler{
        if(entry.isInvalid())
            return;
        
-        if(ProfileManager.checkOption(entry.isExtraPlayersEnabled())){
-            max = online + (entry.getExtraPlayersCount() == null ? 0 : entry.getExtraPlayersCount());
+        if(ProfileManager.checkOption(entry.extraPlayersEnabled())){
+            max = online + (entry.extraPlayersCount() == null ? 0 : entry.extraPlayersCount());
            event.setMaxPlayers(max);
        }
        
        GenericServer finalServer = new GenericServerImpl(online, max, host);
        
-        if(ProfileManager.checkOption(entry.getMotd())){
+        if(ProfileManager.checkOption(entry.motd())){
            event.setMotd(
-                ComponentParser.list(entry.getMotd())
+                ComponentParser.list(entry.motd())
                    .modifyText(text -> StringReplacer.replace(text, player, finalServer))
                    .modifyText(text -> event.parsePAPIPlaceholders(text, player))
                    .toComponent()
            );
        }
        
-        boolean hidePlayers = ProfileManager.checkOption(entry.isHidePlayersEnabled());
+        boolean hidePlayers = ProfileManager.checkOption(entry.hidePlayersEnabled());
        
        if(hidePlayers){
            event.hidePlayers();
        }
        
-        if(ProfileManager.checkOption(entry.getPlayerCountText()) && !hidePlayers){
+        if(ProfileManager.checkOption(entry.playerCountText()) && !hidePlayers){
            event.setPlayerCount(
-                ComponentParser.text(entry.getPlayerCountText())
+                ComponentParser.text(entry.playerCountText())
                    .modifyText(text -> StringReplacer.replace(text, player, finalServer))
                    .modifyText(text -> event.parsePAPIPlaceholders(text, player))
                    .toString()
            );
        }
        
-        if(ProfileManager.checkOption(entry.getPlayers()) && !hidePlayers){
-            event.setPlayers(entry.getPlayers(), player, server);
+        if(ProfileManager.checkOption(entry.players()) && !hidePlayers){
+            event.setPlayers(entry.players(), player, server);
        }
        
-        if(ProfileManager.checkOption(entry.getFavicon())){
-            String favicon = StringReplacer.replace(entry.getFavicon(), player, server);
+        if(ProfileManager.checkOption(entry.favicon())){
+            String favicon = StringReplacer.replace(entry.favicon(), player, server);
            
            F fav = plugin.getFaviconHandler().getFavicon(favicon, image -> {
                try{
@@ -23,15 +23,26 @@
 *
 */

-package ch.andre601.advancedserverlist.core.interfaces;
+package ch.andre601.advancedserverlist.core.interfaces.commands;

 public interface CmdSender{
    
+    String prefix = "<grey>[<gradient:aqua:white>AdvancedServerList</gradient>] ";
+    String errorPrefix = "<grey>[<gradient:dark_red:red>AdvancedServerList</gradient>] ";
+    
    boolean hasPermission(String permission);
    
+    void sendMsg(String msg, Object... args);
+    
    default void sendMsg(){
        sendMsg("");
    }
    
-    void sendMsg(String msg, Object... args);
+    default void sendPrefixedMsg(String msg, Object... args){
+        sendMsg(prefix + msg, args);
+    }
+    
+    default void sendErrorMsg(String msg, Object... args){
+        sendMsg(errorPrefix + msg, args);
+    }
 }
@@ -0,0 +1,45 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2023 Andre_601
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package ch.andre601.advancedserverlist.core.interfaces.commands;
+
+public abstract class PluginCommand{
+    
+    private final String argument;
+    
+    public PluginCommand(String argument){
+        this.argument = argument;
+    }
+    
+    public String getArgument(){
+        return argument;
+    }
+    
+    public String getPermission(){
+        return "advancedserverlist.command." + getArgument();
+    }
+    
+    public abstract void handle(CmdSender sender);
+}
@@ -47,11 +47,12 @@ public class ServerListProfile{
    
    private final Random random = new Random();
    
-    public ServerListProfile(int priority, List<Expression> expressions, List<ProfileEntry> profiles, ProfileEntry defaultProfile){
+    public ServerListProfile(int priority, List<Expression> expressions, ProfileEntry defaultProfile, List<ProfileEntry> profiles){
        this.priority = priority;
        this.expressions = expressions;
-        this.profiles = profiles;
        this.defaultProfile = defaultProfile;
+        
+        this.profiles = profiles;
    }
    
    public int getPriority(){
@@ -183,7 +184,7 @@ public class ServerListProfile{
        }
        
        public ServerListProfile build(){
-            return new ServerListProfile(this.priority, this.expressions, this.profiles, this.defaultProfile);
+            return new ServerListProfile(this.priority, this.expressions, this.defaultProfile, this.profiles);
        }
    }
 }
@@ -128,6 +128,20 @@ public class PlayerHandler{
        return getDefaultPlayer();
    }
    
+    public CachedPlayer getCachedPlayer(UUID uuid){
+        for(CachedPlayer player : cachedPlayers){
+            if(player.getUuid().equals(uuid))
+                return player;
+        }
+        
+        return getDefaultPlayer();
+    }
+    
+    public void clearCache(){
+        cachedPlayers.clear();
+        defaultPlayer = null;
+    }
+    
    private boolean contains(String ip){
        for(CachedPlayer player : cachedPlayers){
            if(player.getIp().equals(ip))
@@ -99,7 +99,7 @@ public class ProfileManager{
            return !list.isEmpty(); // Check if list isn't empty
        }else
        if(obj instanceof String str){
-            return !str.isEmpty(); // Check if list is not empty
+            return !str.isEmpty(); // Check if String is not empty
        }else
        if(obj instanceof NullBool nb){
            return nb.getOrDefault(false); // Return NullBool's value
@@ -109,52 +109,52 @@ public class ProfileManager{
    }
    
    private static List<String> resolveMOTD(ProfileEntry profile, ProfileEntry defaultProfile){
-        if(profile == null || !checkOption(profile.getMotd()))
-            return defaultProfile.getMotd();
+        if(profile == null || !checkOption(profile.motd()))
+            return defaultProfile.motd();
        
-        return profile.getMotd();
+        return profile.motd();
    }
    
    private static List<String> resolvePlayers(ProfileEntry profile, ProfileEntry defaultProfile){
-        if(profile == null || !checkOption(profile.getPlayers()))
-            return defaultProfile.getPlayers();
+        if(profile == null || !checkOption(profile.players()))
+            return defaultProfile.players();
        
-        return profile.getPlayers();
+        return profile.players();
    }
    
    private static String resolvePlayerCountText(ProfileEntry profile, ProfileEntry defaultProfile){
-        if(profile == null || !checkOption(profile.getPlayerCountText()))
-            return defaultProfile.getPlayerCountText();
+        if(profile == null || !checkOption(profile.playerCountText()))
+            return defaultProfile.playerCountText();
        
-        return profile.getPlayerCountText();
+        return profile.playerCountText();
    }
    
    private static String resolveFavicon(ProfileEntry profile, ProfileEntry defaultProfile){
-        if(profile == null || !checkOption(profile.getFavicon()))
-            return defaultProfile.getFavicon();
+        if(profile == null || !checkOption(profile.favicon()))
+            return defaultProfile.favicon();
        
-        return profile.getFavicon();
+        return profile.favicon();
    }
    
    private static boolean resolveHidePlayersEnabled(ProfileEntry profile, ProfileEntry defaultProfile){
-        if(profile == null || !checkOption(profile.isHidePlayersEnabled()))
-            return defaultProfile.isHidePlayersEnabled().getOrDefault(false);
+        if(profile == null || !checkOption(profile.hidePlayersEnabled()))
+            return defaultProfile.hidePlayersEnabled().getOrDefault(false);
        
-        return profile.isHidePlayersEnabled().getOrDefault(false);
+        return profile.hidePlayersEnabled().getOrDefault(false);
    }
    
    private static boolean resolveExtraPlayersEnabled(ProfileEntry profile, ProfileEntry defaultProfile){
-        if(profile == null || !checkOption(profile.isExtraPlayersEnabled()))
-            return defaultProfile.isExtraPlayersEnabled().getOrDefault(false);
+        if(profile == null || !checkOption(profile.extraPlayersEnabled()))
+            return defaultProfile.extraPlayersEnabled().getOrDefault(false);
        
-        return profile.isExtraPlayersEnabled().getOrDefault(false);
+        return profile.extraPlayersEnabled().getOrDefault(false);
    }
    
    private static Integer resolveExtraPlayersCount(ProfileEntry profile, ProfileEntry defaultProfile){
-        if(profile == null || profile.getExtraPlayersCount() == null)
-            return defaultProfile.getExtraPlayersCount() == null ? 0 : defaultProfile.getExtraPlayersCount();
+        if(profile == null || profile.extraPlayersCount() == null)
+            return defaultProfile.extraPlayersCount() == null ? 0 : defaultProfile.extraPlayersCount();
        
-        return profile.getExtraPlayersCount();
+        return profile.extraPlayersCount();
    }
    
    private static List<String> resolveList(ConfigurationNode node, Object... path){
@@ -48,12 +48,12 @@ public class ProfileSerializer implements TypeSerializer<ProfileEntry>{
            return;
        }
        
-        node.node("motd").set(profile.getMotd());
-        node.node("playerCount", "hover").set(profile.getPlayers());
-        node.node("playerCount", "text").set(profile.getPlayerCountText());
-        node.node("favicon").set(profile.getFavicon());
-        node.node("playerCount", "hidePlayers").set(profile.isHidePlayersEnabled());
-        node.node("playerCount", "extraPlayers", "enabled").set(profile.isExtraPlayersEnabled());
-        node.node("playerCount", "extraPlayers", "amount").set(profile.getExtraPlayersCount());
+        node.node("motd").set(profile.motd());
+        node.node("playerCount", "hover").set(profile.players());
+        node.node("playerCount", "text").set(profile.playerCountText());
+        node.node("favicon").set(profile.favicon());
+        node.node("playerCount", "hidePlayers").set(profile.hidePlayersEnabled());
+        node.node("playerCount", "extraPlayers", "enabled").set(profile.extraPlayersEnabled());
+        node.node("playerCount", "extraPlayers", "amount").set(profile.extraPlayersCount());
    }
 }
@@ -3,6 +3,13 @@
 This page lists the recent changes made towards the AdvancedServerListAPI.  
 They are ordered newest to oldest.

+## v2.1.0
+
+### :octicons-pencil-24:{ .changelog-changed title="Changed" } Changed { #v-changed }
+
+- Turned `ProfileEntry` class into a record
+    - Former `getX()` methods are now deprecated in favour of the recor's own `x()` methods (i.e. `getMotd()` -> `motd()`)
+
 ## v2.0.0

 ### :octicons-alert-24:{ .changelog-breaking title="Breaking Changes" } Breaking Changes { #v2-breaking }
@@ -1,7 +1,7 @@
 # API

 AdvancedServerList v2 introduced a new API that plugins can hook into to use.  
-As of right now is it only providing a way to add your own placeholders for it to use.
+It provides a way for your plugin to provide its own placeholders that should be parsed by AdvancedServerList and also an event to modify the server list.

 ## Add dependency

@@ -13,7 +13,7 @@ Add the following to your `build.gradle` or `pom.xml` file to use the API:
    
    ```groovy
    repositorories {
-        maven { url = 'https://jitpack.io/" }
+        maven { url = 'https://jitpack.io/' }
    }
    
    dependencies {
@@ -21,7 +21,6 @@ Add the following to your `build.gradle` or `pom.xml` file to use the API:
        
        // Optional platform dependencies
        implementation 'ch.andre601.asl-api:platform-bungeecord:{version}'
-        implementation 'ch.andre601.asl-api:platform-paper:{version}'
        implementation 'ch.andre601.asl-api:platform-spigot:{version}'
        implementation 'ch.andre601.asl-api:platform-velocity:{version}'
    }
@@ -52,11 +51,6 @@ Add the following to your `build.gradle` or `pom.xml` file to use the API:
        <artifactId>platform-bungeecord</artifactId>
        <version>{version}</version>
      </dependency>
-      <dependency>
-        <groupId>ch.andre601.asl-api</groupId>
-        <artifactId>platform-paper</artifactId>
-        <version>{version}</version>
-      </dependency>
      <dependency>
        <groupId>ch.andre601.asl-api</groupId>
        <artifactId>platform-spigot</artifactId>
@@ -146,12 +140,12 @@ api.addPlaceholderProvider(new MyPlaceholders());
 !!! info "Note"
    The mentioned event is only accessible through one of the platform dependencies, as those are used in the platform's respective event handler system.

-v1.1.0 of the API adds the `PreServerListSetEvent` to the different platform dependencies to use.  
+v2 of the API adds the `PreServerListSetEvent` to the different platform dependencies to use.  
 It allows you to modify the ProfileEntry used for the player pinging the server/proxy or even cancelling the event altogether.

 ### ProfileEntry

-The ProfileEntry class has been moved to the API in v1.1.0 allowing you to create your own versions using the available Builder class.
+The ProfileEntry class has been moved to the API in v2 allowing you to create your own versions using the available Builder class.

-The ProfileEntry is what contains the necessary data from the server list profiles. This can be an entry from the "profiles" list, the settings themselves in the file or a mix of both depending on what options are present.  
-You can create a new entry or copy an existing one (i.e. from the [`PreServerListSetEvent`](#events)) to modify and use in the server list by setting it in the aforementioned `PreServerListSetEvent`.
+This class contains values from a Server List Profile file. The values can either be from a `profiles` list entry, one of the global options in the file, or a mix of both, depending on what options are present.  
+You can create a new entry or copy an existing one (i.e. from the [`PreServerListSetEvent`](#events)) to modify and use in the server list by setting it in the aforementioned `PreServerListSetEvent`.
@@ -21,4 +21,13 @@

 .changelog-breaking {
    color: #9e6a03
+}
+
+.md-banner--warning__icon {
+    color: #d29922;
+}
+
+/* Override mkdocs-material styling */
+.md-banner--warning {
+    background: rgba(187,128,9,0.15);
 }
@@ -0,0 +1,28 @@
+# Commands
+
+The plugin adds commands to use for various things related to the plugin itself.  
+The main command is `/advancedserverlist` but an alias called `/asl` is also registered to use.
+
+## Permissions
+
+The main permission is `advancedserverlist.admin` for all commands, but you can also grant access to specific commands using `advancedserverlist.command.<subcommand>` instead (i.e. `advancedserverlist.command.help` to grant access to [`/asl help`](#help)).
+
+## Subcommands
+
+The following subcommands are available (Subcommands are case-insensitive):
+
+- [`help`](#help)
+- [`reload`](#reload)
+- [`clearCache`](#clearcache)
+
+### help
+
+Shows a list of all available [subcommands](#subcommands) for AdvancedServerList.
+
+### reload
+
+Reloads the plugin's `config.yml`, all available YAML files in the `profiles` folder and also clears the currently cached favicons and Players.
+
+### clearCache
+
+Clears the currently cached favicons and Players.
@@ -9,21 +9,19 @@ If you're new to the plugin is it recommended to check out the [Profiles page](.

 AdvancedServerList supports the following platforms:

-<a href="https://www.spigotmc.org" target="_blank">
-  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/supported/spigot_vector.svg" width="64" alt="platform-spigot" title="Tested on Spigot">
-</a>
-<a href="https://papermc.io" target="_blank">
-  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/supported/paper_vector.svg" width="64" alt="platform-paper" title="Tested on Paper">
-</a>
-<a href="https://www.spigotmc.org" target="_blank">
-  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/supported/bungeecord_vector.svg" width="64" alt="platform-bungeecord" title="Tested on BungeeCord">
-</a>
-<a href="https://www.papermc.io" target="_blank">
-  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/supported/waterfall_vector.svg" width="64" alt="platform-waterfall" title="Tested on Waterfall">
-</a>
-<a href="https://velocitypowered.com" target="_blank">
-  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@2/assets/minimal/supported/velocity_vector.svg" width="64" alt="platform-velocity" title="Tested on Velocity">
-</a>
+[![spigot-img](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact-minimal/supported/spigot_vector.svg "Tested on Spigot"){ width=64 }][spigot]
+[![paper-img](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact-minimal/supported/paper_vector.svg "Tested on Paper"){ width=64 }][paper]
+[![bungeecord-img](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact-minimal/supported/bungeecord_vector.svg "Tested on BungeeCord"){ width=64 }][spigot]
+[![waterfall](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact-minimal/supported/waterfall_vector.svg "Tested on Waterfall"){ width=64 }][paper]
+[![velocity](https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact-minimal/supported/velocity_vector.svg "Tested on Velocity"){ width=64 }][velocity]
+
+## Dependencies
+
+| Dependency       | Platforms     | Required? |
+|------------------|---------------|-----------|
+| [ProtocolLib]    | Spigot        | Yes       |
+| [PlaceholderAPI] | Spigot, Paper | No        |
+| [ViaVersion]     | Spigot, Paper | No        |

 ## Pages

@@ -31,4 +29,13 @@ AdvancedServerList supports the following platforms:
    - [Formatting](./profiles/formatting)
    - [Placeholders](./profiles/placeholders)
 - [API](./api)
- [Examples](./examples)
+- [Examples](./examples)
+- [PlaceholderAPI placeholders](./placeholderapi.md)
+
+[spigot]: https://www.spigotmc.org
+[paper]: https://papermc.io
+[velocity]: https://velocitypowered.com
+
+[protocollib]: https://www.spigotmc.org/resources/1997/
+[placeholderapi]: https://www.spigotmc.org/resources/6245/
+[viaversion]: https://www.spigotmc.org/resources/19254/
@@ -0,0 +1,18 @@
+# PlaceholderAPI Placeholders
+
+The Spigot and Paper version of AdvancedServerList provide their own set of placeholders to use through [PlaceholderAPI].
+
+## Placeholders
+
+!!! note
+    AdvancedServerList will try to find a matching Profile for the player similar to when they ping the server when using any of the below placeholders.
+
+| Placeholder               | Description                                                                   |
+|---------------------------|-------------------------------------------------------------------------------|
+| `%asl_favicon%`           | Gives the value of `favicon` from a matching Profile.                         |
+| `%asl_extra_players_max%` | Gives the value of `playerCount.extraPlayers.amount` from a matching Profile. |
+| `%asl_motd%`              | Gives the value of `motd` in the matching Profile.                            |
+| `%asl_playercount_hover%` | Gives the value of `playerCount.hover` from a matching Profile.               |
+| `%asl_playercount_text%`  | Gives the value of `playerCount.text` from a matching Profile.                |
+
+[placeholderapi]: https://www.spigotmc.org/resources/6245/
@@ -50,49 +50,31 @@ The following operants are available and can be used in the conditions.

 ## Profiles

-!!! info "Available since v1.10.0"
-
 The profiles option allows you to add multiple combinations of all the other options (With the exception of [`Priority`](#priority) and [`Conditions`](#conditions)) to have randomized MOTDs, player counts, etc.

 If an option is not present in an entry will AdvancedServerList try to use one defined in the file or use whatever default value would be for that option.

 As an example:  
 ```yaml
-priority: 1
+priority: 0

 profiles:
  - motd:
-      - Line 1
-      - Line 2
+      - '<rainbow>Line 1</rainbow>'
+      - '<rainbow:!>Line 2</rainbow>'
    playerCount:
-      text: 'Awesome!'
+      text: '<green><bold>Awesome!'
  - playerCount:
-      text: 'Also Awesome'
+      text: '<yellow><bold>Also Awesome!'

 motd:
-  - Line A
-  - Line B
+  - '<rainbow:2>Line A</rainbow>'
+  - '<rainbow:!2>Line B</rainbow>'
 ```
-...the above file would randomly select between a MOTD saying `Line 1\nLine 2` and a player count saying `Awesome!` or a MOTD saying `Line A\nLine B` while the player count says `Also Awesome`
+...the above example would randomly select between the following combinations of MOTD and Player count text:

-## Motds
-
-!!! warning "Only available in v1.9.0"
-
-This option allows to create multiple MOTDs that AdvancedServerList should randomly select from.
-
-Due to the structure of this option will you need to use `|-` to have multi-line MOTDs.
-
-Example:  
-```yaml
-motds:
-  - |-
-    Line 1
-    Line 2
-  - |-
-    Line A
-    Line B
-```
+![motd-example-1](../assets/images/examples/motd-example-1.jpg)  
+![motd-example-2](../assets/images/examples/motd-example-2.jpg)

 ## Motd

@@ -12,7 +12,7 @@ The following placeholders are available in AdvancedServerList itself. Please no
 These placeholders use the player who pinged the server, to return values. They may require the player to be cached in order to work.

 | Placeholder                 | Description                                                     | Platforms    | Cached Player required?\* |
-| --------------------------- | --------------------------------------------------------------- | ------------ | ------------------------  |
+|-----------------------------|-----------------------------------------------------------------|--------------|---------------------------|
 | `${player name}`            | The name of the player.                                         | All          | Yes\*\*                   |
 | `${player protocol}`        | The protocol version of the player.                             | All          | No                        |
 | `${player uuid}`            | The UUID of the player.                                         | All          | Yes\*\*\*                 |
@@ -30,7 +30,7 @@ These placeholders use the player who pinged the server, to return values. They
 These placeholders use values given by the server/proxy AdvancedServerList runs on.

 | Placeholder               | Description                                              |
-| ------------------------- | -------------------------------------------------------- |
+|---------------------------|----------------------------------------------------------|
 | `${server playersOnline}` | The number of players online on this server.             |
 | `${server playersMax}`    | The total number of players that can join this server.\* |
 | `${server host}`          | The domain/IP the player pinged.                         |
@@ -1,97 +1,16 @@
-# +--------------------------------------------------------------------------------------------------------+
-# |                                                                                                        |
-# | This is the main file used by MkDocs to build the pages.                                               |
-# | It contains a lot of information and settings for you to read and use.                                 |
-# | Comments may contain "Read More" URLs to more in-depth documentation about the option for you to read. |
-# |                                                                                                        |
-# | You can check out https://www.mkdocs.org/user-guide/configuration/ for a more detailed explanation of  |
-# | all the options MkDocs offers by default.                                                              |
-# |                                                                                                        |
-# +------------------------------------------------- NOTE -------------------------------------------------+
-# |                                                                                                        |
-# | Some of the options listed here are only available through the usage of Material for MkDocs.           |
-# | Those options will usually have a link to the docs of this Theme and also mention "Material" as name.  |
-# | The actual name of the theme is "Material for MkDocs" and "Material" is used for simplicity reasons.   |
-# |                                                                                                        |
-# +--------------------------------------------------------------------------------------------------------+
-
-# +--------------------------------------------------------------------------------------------------------+
-# |                                                                                                        |
-# | Main Page Settings for MkDocs.                                                                         |
-# | Those settings are site name, site description, Site author and also Site URL (Canonical URL)          |
-# |                                                                                                        |
-# | Read More:                                                                                             |
-# | - https://www.mkdocs.org/user-guide/configuration/#site_name                                           |
-# | - https://www.mkdocs.org/user-guide/configuration/#site_description                                    |
-# | - https://www.mkdocs.org/user-guide/configuration/#site_author                                         |
-# | - https://www.mkdocs.org/user-guide/configuration/#site_url                                            |
-# |                                                                                                        |
-# +--------------------------------------------------------------------------------------------------------+
 site_name: AdvancedServerList Wiki
 site_description: 'Wiki for the AdvancedServerList plugin'
 site_author: 'Andre_601'
 site_url: 'https://www.andre601.ch/AdvancedServerList' # Uncomment to set a canonical URL

-# +--------------------------------------------------------------------------------------------------------+
-# |                                                                                                        |
-# | This setting allows you to define your own Copyright notice.                                           |
-# | The text is treated as HTML code so you can use things like <a> tags or &copy; to display the          |
-# | Copyright icon.                                                                                        |
-# |                                                                                                        |
-# | Where or IF the Copyright is displayed depends on the theme you use.                                   |
-# |                                                                                                        |
-# | Read More:                                                                                             |
-# | - https://www.mkdocs.org/user-guide/configuration/#copyright                                           |
-# |                                                                                                        |
-# +--------------------------------------------------------------------------------------------------------+
 copyright: |
  &copy; Andre_601

-# +--------------------------------------------------------------------------------------------------------+
-# |                                                                                                        |
-# | The base folder to use.                                                                                |
-# | Any Markdown files you put into this folder will be turned into a static HTML page once you build or   |
-# | publish your page.                                                                                     |
-# |                                                                                                        |
-# | It is also used as the base directory for other settings like the "extra_css" or "extra_javascript"    |
-# | option.                                                                                                |
-# |                                                                                                        |
-# +--------------------------------------------------------------------------------------------------------+
 docs_dir: docs/

-
-# +--------------------------------------------------------------------------------------------------------+
-# |                                                                                                        |
-# | These options allow to define a Repository to link to.                                                 |
-# | The result will, depending on the theme, be a link somewhere shown on the page that links to the       |
-# | Repository with the specified repo_name.                                                               |
-# |                                                                                                        |
-# | This will also enable a "edit" button on the page itself that allows the direct editing of the page.   |
-# | You can disable this by setting "edit_uri" to an empty String.                                         |
-# |                                                                                                        |
-# | Read More:                                                                                             |
-# | - https://www.mkdocs.org/user-guide/configuration/#repo_name                                           |
-# | - https://www.mkdocs.org/user-guide/configuration/#repo_url                                            |
-# | - https://www.mkdocs.org/user-guide/configuration/#edit_uri                                            |
-# |                                                                                                        |
-# +--------------------------------------------------------------------------------------------------------+
 repo_name: Andre601/AdvancedServerList
 repo_url: https://github.com/Andre601/AdvancedServerList
-#edit_uri: tree/master/docs # Uncomment to define a different URI/URL for the "edit" option

-# +--------------------------------------------------------------------------------------------------------+
-# |                                                                                                        |
-# | The "nav" option is where you define the navigation to show in MkDocs.                                 |
-# |                                                                                                        |
-# | Depending on the theme you use will the resulting Navigation look different.                           |
-# |                                                                                                        |
-# | You can set different types of navigations. Either just the path, the path with a separate title or    |
-# | an external URL.                                                                                       |
-# |                                                                                                        |
-# | Read More:                                                                                             |
-# | - https://www.mkdocs.org/user-guide/configuration/#documentation-layout                                |
-# |                                                                                                        |
-# +--------------------------------------------------------------------------------------------------------+
 nav:
  - Home: index.md
  - Profiles:
@@ -102,260 +21,23 @@ nav:
    - api/index.md
    - Changelog: api/changelog.md
  - Examples: examples.md
+  - PlaceholderAPI: placeholderapi.md

-# +--------------------------------------------------------------------------------------------------------+
-# |                                                                                                        |
-# | The "theme" section allows you to define what theme to use.                                            |
-# | It is also used for theme-specific options, but also for advanced stuff such as theme-extensions, if   |
-# | the theme actually supports it.                                                                        |
-# |                                                                                                        |
-# | Read More:                                                                                             |
-# | - https://www.mkdocs.org/user-guide/configuration/#theme                                               |
-# |                                                                                                        |
-# +--------------------------------------------------------------------------------------------------------+
 theme:
-
-  # +------------------------------------------------------------------------------------------------------+
-  # |                                                                                                      |
-  # | The "name" option is where you define the theme to use.                                              |
-  # |                                                                                                      |
-  # | Note that not all themes are included by default and will require you to install them first.         |
-  # | The Material theme is one of them. See the "Read More" link for instructions on how to install it.   |
-  # |                                                                                                      |
-  # | Read More:                                                                                           |
-  # | - https://squidfunk.github.io/mkdocs-material/getting-started/                                       |
-  # |                                                                                                      |
-  # +------------------------------------------------------------------------------------------------------+
  name: 'material'
-  
-  # +------------------------------------------------------------------------------------------------------+
-  # |                                                                                                      |
-  # | The Material theme allows "theme-extsnions", meaning that you can override parts of it by either     |
-  # | overriding a particular file, or only parts (blocks) of it.                                          |
-  # |                                                                                                      |
-  # | If you want to override parts of Material, uncomment the "custom_dir" option below and set the       |
-  # | folder (relative to the mkdocs.yml file) where your theme extensions will be located at.             |
-  # |                                                                                                      |
-  # | Read More:                                                                                           |
-  # | - https://www.mkdocs.org/user-guide/configuration/#custom_dir                                        |
-  # | - https://squidfunk.github.io/mkdocs-material/customization/#extending-the-theme                     |
-  # |                                                                                                      |
-  # +------------------------------------------------------------------------------------------------------+
-  #custom_dir: 'theme'
-  
-  # +------------------------------------------------------------------------------------------------------+
-  # |                                                                                                      |
-  # | The "favicon" option allows you to set your own image/icon to use in the browser-tab.                |
-  # |                                                                                                      |
-  # | Pretty much all image types are supported, but it's recommended to use a PNG, SVG or ICO image for   |
-  # | the favicon.                                                                                         |
-  # |                                                                                                      |
-  # | The directory is relative to the "docs_dir".                                                         |
-  # |                                                                                                      |
-  # | Example: Having a favicon.png in docs/assets/images will result in the "favicon" setting showing     |
-  # |          'assets/images/favicon.png'                                                                 |
-  # |                                                                                                      |
-  # | Read More:                                                                                           |
-  # | - https://squidfunk.github.io/mkdocs-material/setup/changing-the-logo-and-icons/#favicon             |
-  # |                                                                                                      |
-  # +------------------------------------------------------------------------------------------------------+
  favicon: 'assets/images/favicon.png'
  logo: 'assets/images/favicon.png'
-  
-  # +------------------------------------------------------------------------------------------------------+
-  # |                                                                                                      |
-  # | The "palette" section is a Material option and allows you to define specific style options such as   |
-  # | Color-Scheme, and primary and secondary Color.                                                       |
-  # |                                                                                                      |
-  # | You can also define multiple palettes that can have different Color Schemses and primary and/or      |
-  # | secondary Colors.                                                                                    |
-  # |                                                                                                      |
-  # | Read More:                                                                                           |
-  # | - https://squidfunk.github.io/mkdocs-material/setup/changing-the-colors/                             |
-  # | - https://squidfunk.github.io/mkdocs-material/setup/changing-the-colors/#color-palette-toggle        |
-  # |                                                                                                      |
-  # +------------------------------------------------------------------------------------------------------+
  palette:
-  
-    # +----------------------------------------------------------------------------------------------------+
-    # |                                                                                                    |
-    # | The "scheme" option is used to define the Color Scheme used by Material.                           |
-    # |                                                                                                    |
-    # | Material offers a "default" and a "slate" scheme. "default" is obviously the default (bright)      |
-    # | Color scheme while "slate" is the native dark theme from Material.                                 |
-    # |                                                                                                    |
-    # | Read More:                                                                                         |
-    # | - https://squidfunk.github.io/mkdocs-material/setup/changing-the-colors/#color-scheme              |
-    # |                                                                                                    |
-    # +----------------------------------------------------------------------------------------------------+
    scheme: 'slate'
-    
-    # +----------------------------------------------------------------------------------------------------+
-    # |                                                                                                    |
-    # | "primary" is used to set the main color of the Material Theme.                                     |
-    # |                                                                                                    |
-    # | The primary color is used on the top banner of the page but also for things like the link color.   |
-    # |                                                                                                    |
-    # | Read More:                                                                                         |
-    # | - https://squidfunk.github.io/mkdocs-material/setup/changing-the-colors/#primary-color             |
-    # |                                                                                                    |
-    # +----------------------------------------------------------------------------------------------------+
    primary: 'indigo'
-    
-    # +----------------------------------------------------------------------------------------------------+
-    # |                                                                                                    |
-    # | The "accent" is used for moments such as hovering over links.                                      |
-    # |                                                                                                    |
-    # | Read More:                                                                                         |
-    # | - https://squidfunk.github.io/mkdocs-material/setup/changing-the-colors/#accent-color              |
-    # |                                                                                                    |
-    # +----------------------------------------------------------------------------------------------------+
    accent: 'indigo'
-    
-  # +------------------------------------------------------------------------------------------------------+
-  # |                                                                                                      |
-  # | With the "font" option can you set a different font to use.                                          |
-  # |                                                                                                      |
-  # | Material supports all Google fonts, but you can also define your own ones if you choose so.          |
-  # |                                                                                                      |
-  # | The "text" option is used for the regular font while "code" is used for code blocks, inline code and |
-  # | similar.                                                                                             |
-  # |                                                                                                      |
-  # | Read More:                                                                                           |
-  # | - https://squidfunk.github.io/mkdocs-material/setup/changing-the-fonts/                              |
-  # |                                                                                                      |
-  # +------------------------------------------------------------------------------------------------------+
-  #font:
-  #  text: 'Roboto'
-  #  code: 'Roboto Mono'
-  
-  # +------------------------------------------------------------------------------------------------------+
-  # |                                                                                                      |
-  # | Material suppors more than 40 different languages which you can set using the "language" option      |
-  # | below.                                                                                               |
-  # |                                                                                                      |
-  # | The default language is "en" (English).                                                              |
-  # |                                                                                                      |
-  # | You can also enable/set a "selector" to allow switching between languages.                           |
-  # | See the "alternate" option in the "extra" section below for more information on this topic.          |
-  # |                                                                                                      |
-  # | Read More:                                                                                           |
-  # | - https://squidfunk.github.io/mkdocs-material/setup/changing-the-language/                           |
-  # |                                                                                                      |
-  # +------------------------------------------------------------------------------------------------------+
-  #language: 'en'
-  
-  # +------------------------------------------------------------------------------------------------------+
-  # |                                                                                                      |
-  # | The "direction" option is commonly used together with the "language" option.                         |
-  # |                                                                                                      |
-  # | It allows you to change the text direction from the default left-to-right (ltr) to right-to-left     |
-  # | (rtl) which is used in certain languages.                                                            |
-  # |                                                                                                      |
-  # | Read More:                                                                                           |
-  # | - https://squidfunk.github.io/mkdocs-material/setup/changing-the-language/#directionality            |
-  # |                                                                                                      |
-  # +------------------------------------------------------------------------------------------------------+
-  #direction: 'ltr'
-  
-  # +------------------------------------------------------------------------------------------------------+
-  # |                                                                                                      |
-  # | The "features" option allows you to enable specific features of Material, by adding them to the      |
-  # | list.                                                                                                |
-  # |                                                                                                      |
-  # | Features are in the format <category>.<name>. As an example, the feature to enable tabs is called    |
-  # | navigation.tabs.                                                                                     |
-  # |                                                                                                      |
-  # | The list below contains all known features of Material.                                              |
-  # |                                                                                                      |
-  # | Features marked with a * are currently Insiders-only. (Last update: 11th December 2021)              |
-  # | https://squidfunk.github.io/mkdocs-material/insiders/                                                |
-  # |                                                                                                      |
-  # | Read More:                                                                                           |
-  # | - https://squidfunk.github.io/mkdocs-material/setup/setting-up-navigation/                           |
-  # |                                                                                                      |
-  # +------------------------------------------------------------------------------------------------------+
  features:
-  # Announce
-  #
-  #- announce.dismiss # Adds a "X" button to dismiss a news banner/mark it as read.*
-  
-  # Header
-  #
-  #- header.autohide # Hide header when user scrolls past a specific point.
-  
-  # Navigation:
-  #
-  #- navigation.expand      # Expand all collapsable sections.
-  #- navigation.instant     # Instant loading pages.
-  - navigation.indexes     # Attach pages directly to Sections. Incompatible with "toc.integrate"
-  #- navigation.sections    # Render top sections as groups.
-  - navigation.tabs         # Render top sections as tabs at the top.
-  - navigation.tabs.sticky # Tabs won't disappear when scrolling down. Requires "navigation.tabs".
-  #- navigation.top         # Adds a "Back to top" that is shown when scrolling up.
-  #- navigation.tracking    # Updates the url with highlighted section anchor.
-  
-  # Search
-  #
-  #- search.highlight # Search will highlight the searched word(s) on the page.*
-  #- search.share     # Adds an option to share a search query link.*
-  #- search.suggest   # Search will suggest the likeliest completion for a word.*
-  
-  # Table of Contents
-  #
-  #- toc.integrate          # Include the TOC sections in the left navugation.
-  
-  # +------------------------------------------------------------------------------------------------------+
-  # |                                                                                                      |
-  # | The "icon" section allows you to define a icon to use for the logo and/or repository.                |
-  # |                                                                                                      |
-  # | To use already available icons will you need to set the right path for it, depending on which you    |
-  # | want to use.                                                                                         |
-  # |                                                                                                      |
-  # | Available icons:                                                                                     |
-  # | - FontAwesome                                                                                        |
-  # |   - Brands:  fontawesome/brands/...  (https://fontawesome.com/icons?d=gallery&p=2&s=brands&m=free)   |
-  # |   - Regular: fontawesome/regular/... (https://fontawesome.com/icons?d=gallery&p=2&s=regular&m=free)  |
-  # |   - Solid:   fontawesome/solid/...   (https://fontawesome.com/icons?d=gallery&p=2&s=solid&m=free)    |
-  # |                                                                                                      |
-  # | - Material Design Icons: material/... (https://materialdesignicons.com/)                             |
-  # |                                                                                                      |
-  # | - Octicons: octicons/... (https://primer.style/octicons/)                                            |
-  # |                                                                                                      |
-  # | You can also define your own Image for the logo. To do that, remove the "logo" option from "icon"    |
-  # | instead add a "logo" option on the same level as the "icon" one, where you then set the path         |
-  # | (relative to the "docs_dir") to the icon to use. Supported are all images types, including SVG.      |
-  # |                                                                                                      |
-  # | Read More:                                                                                           |
-  # | - https://squidfunk.github.io/mkdocs-material/setup/changing-the-logo-and-icons/#logo                |
-  # |                                                                                                      |
-  # +------------------------------------------------------------------------------------------------------+
+  - navigation.indexes
+  - navigation.tabs
+  - navigation.tabs.sticky
+
  icon:
    repo: 'octicons/mark-github-16'
-  
-  # +------------------------------------------------------------------------------------------------------+
-  # |                                                                                                      |
-  # | The "admonition" option allows you to set a different icon for each admonition type.                 |
-  # |                                                                                                      |
-  # | This is currently a Insiders-only feature. (Last update: 7th October 2021)                           |
-  # | https://squidfunk.github.io/mkdocs-material/insiders/                                                |
-  # |                                                                                                      |
-  # | Supported are all bundled icons:                                                                     |
-  # | - FontAwesome                                                                                        |
-  # |   - Brands:  fontawesome/brands/...  (https://fontawesome.com/icons?d=gallery&p=2&s=brands&m=free)   |
-  # |   - Regular: fontawesome/regular/... (https://fontawesome.com/icons?d=gallery&p=2&s=regular&m=free)  |
-  # |   - Solid:   fontawesome/solid/...   (https://fontawesome.com/icons?d=gallery&p=2&s=solid&m=free)    |
-  # |                                                                                                      |
-  # | - Material Design Icons: material/... (https://materialdesignicons.com/)                             |
-  # |                                                                                                      |
-  # | - Octicons: octicons/... (https://primer.style/octicons/)                                            |
-  # |                                                                                                      |
-  # | You can also create and use your own icons. See the documentation for more information.              |
-  # |                                                                                                      |
-  # | Read More:                                                                                           |
-  # | - https://squidfunk.github.io/mkdocs-material/reference/admonitions/#changing-the-icons              |
-  # |                                                                                                      |
-  # +------------------------------------------------------------------------------------------------------+
    admonition:
      note: 'octicons/tag-16'
      abstract: 'octicons/checklist-16'
@@ -370,116 +52,19 @@ theme:
      example: 'octicons/beaker-16'
      quote: 'octicons/quote-16'

-# +--------------------------------------------------------------------------------------------------------+
-# |                                                                                                        |
-# | With the "extra_css" option can you add your own (S)CSS files to enhance the documentation.            |
-# |                                                                                                        |
-# | The path to the file is relative to the "docs_dir".                                                    |
-# |                                                                                                        |
-# | Read More:                                                                                             |
-# | - https://www.mkdocs.org/user-guide/configuration/#extra_css                                           |
-# |                                                                                                        |
-# +--------------------------------------------------------------------------------------------------------+
 extra_css:
  - assets/stylesheets/custom.css

-# +--------------------------------------------------------------------------------------------------------+
-# |                                                                                                        |
-# | Similar to the "extra_css" option does the "extra_javascript" option allow you to set custom JS files  |
-# | to add extra featurues.                                                                                |
-# |                                                                                                        |
-# | The path to the file is relative to the "docs_dir".                                                    |
-# |                                                                                                        |
-# | Read More:                                                                                             |
-# | - https://www.mkdocs.org/user-guide/configuration/#extra_javascript                                    |
-# |                                                                                                        |
-# +--------------------------------------------------------------------------------------------------------+
-#extra_javascript:
-
-# +--------------------------------------------------------------------------------------------------------+
-# |                                                                                                        |
-# | The "extra" section contains pretty much anything you want, as long as it is a valid key-value pair.   |
-# |                                                                                                        |
-# | Material uses this section for different custom settings that wouldn't fit in the theme section.       |
-# |                                                                                                        |
-# | Read More:                                                                                             |
-# | - https://www.mkdocs.org/user-guide/configuration/#extra                                               |
-# |                                                                                                        |
-# +--------------------------------------------------------------------------------------------------------+
 extra:
-  # +------------------------------------------------------------------------------------------------------+
-  # |                                                                                                      |
-  # | The social section allows you to set a list of entries which would be displayed in the footer of the |
-  # | page.                                                                                                |
-  # |                                                                                                      |
-  # | Each entry has the exact same options:                                                               |
-  # | - icon: Path to the SVG icon to use. See "icon" section for available icon sets.                     |
-  # | - link: URL to which the icon should link.                                                           |
-  # | - name: Optional Name that would be displayed as title on hover.                                     |
-  # |                                                                                                      |
-  # | Read More:                                                                                           |
-  # | - https://squidfunk.github.io/mkdocs-material/setup/setting-up-the-footer/#social-links              |
-  # |                                                                                                      |
-  # +------------------------------------------------------------------------------------------------------+
  social:
    - icon: 'fontawesome/brands/github'
      link: 'https://github.com/Andre601/asl-wiki'
-  
-  # +------------------------------------------------------------------------------------------------------+
-  # |                                                                                                      |
-  # | Allows you to hide the "Made with Material for MkDocs" text in the footer of the pages by setting    |
-  # | this to "true".                                                                                      |
-  # |                                                                                                      |
-  # | Read More:                                                                                           |
-  # | - https://squidfunk.github.io/mkdocs-material/setup/setting-up-the-footer/#generator-notice          |
-  # |                                                                                                      |
-  # +------------------------------------------------------------------------------------------------------+
-  #generator: true
-  
-  # +------------------------------------------------------------------------------------------------------+
-  # |                                                                                                      |
-  # | The "manifest" option allows you to define a .manifest file to use.                                  |
-  # |                                                                                                      |
-  # | A .manifest file makes the doc act like a web-application and tells it how to behave when installed. |
-  # |                                                                                                      |
-  # | Read More:                                                                                           |
-  # | - https://squidfunk.github.io/mkdocs-material/reference/meta-tags/#adding-a-web-app-manifest         |
-  # |                                                                                                      |
-  # +------------------------------------------------------------------------------------------------------+
-  #manifest: manifest.webmanifest
-  
-  # +------------------------------------------------------------------------------------------------------+
-  # |                                                                                                      |
-  # | The "alternate" option can be used to create a selector to switch languages.                         |
-  # |                                                                                                      |
-  # | Using this requires you to create a specific, more complicated MkDocs setup.                         |
-  # |                                                                                                      |
-  # | A Setup Guide for multi-language docs can be found here:                                             |
-  # | https://github.com/squidfunk/mkdocs-material/discussions/2346                                        |
-  # |                                                                                                      |
-  # | Read More:                                                                                           |
-  # | - https://squidfunk.github.io/mkdocs-material/setup/changing-the-language/#site-language-selector    |
-  # |                                                                                                      |
-  # +------------------------------------------------------------------------------------------------------+
-  #alternate:
+  version:
+    provider: 'mike'
+    default:
+      - latest
+      - dev

-# +--------------------------------------------------------------------------------------------------------+
-# |                                                                                                        |
-# | MkDocs allows the usage of Markdown extensions which can do various things.                            |
-# |                                                                                                        |
-# | Material includes the pymdownx extension which provides a lot of useful features to use.               |
-# |                                                                                                        |
-# | Note that some extensions may use specific settings that you need to set.                              |
-# | Please check out the official documentation of PyMdownx for more information:                          |
-# | https://facelessuser.github.io/pymdown-extensions/                                                     |
-# |                                                                                                        |
-# | Material already provides required CSS and JS values for the PyMdownX Extensions, which means you do   |
-# | not need to set them up yourself.                                                                      |
-# |                                                                                                        |
-# | Read More:                                                                                             |
-# | - https://www.mkdocs.org/user-guide/configuration/#markdown_extensions                                 |
-# |                                                                                                        |
-# +--------------------------------------------------------------------------------------------------------+
 markdown_extensions:
  - markdown.extensions.admonition:
  - markdown.extensions.toc:
@@ -52,6 +52,10 @@
            <id>placeholderapi-repo</id>
            <url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
        </repository>
+        <repository>
+            <id>viaversion</id>
+            <url>https://repo.viaversion.com/</url>
+        </repository>
    </repositories>
    
    <dependencies>
@@ -75,15 +79,20 @@
        <dependency>
            <groupId>org.bstats</groupId>
            <artifactId>bstats-bukkit</artifactId>
-            <version>3.0.0</version>
+            <version>3.0.2</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>me.clip</groupId>
            <artifactId>placeholderapi</artifactId>
-            <version>2.11.2</version>
+            <version>2.11.3</version>
            <scope>provided</scope>
        </dependency>
+        <dependency>
+            <groupId>com.viaversion</groupId>
+            <artifactId>viaversion-api</artifactId>
+            <version>4.6.2</version>
+        </dependency>
    </dependencies>
    
    <build>
@@ -98,7 +107,7 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
+                <version>3.11.0</version>
                <configuration>
                    <release>16</release>
                </configuration>
@@ -33,6 +33,7 @@ import ch.andre601.advancedserverlist.paper.commands.CmdAdvancedServerList;
 import ch.andre601.advancedserverlist.paper.events.JoinEvent;
 import ch.andre601.advancedserverlist.paper.events.PingEvent;
 import ch.andre601.advancedserverlist.paper.logging.PaperLogger;
+import ch.andre601.advancedserverlist.paper.objects.PAPIPlaceholders;
 import ch.andre601.advancedserverlist.paper.objects.PaperPlayerPlaceholders;
 import org.bstats.bukkit.Metrics;
 import org.bstats.charts.SimplePie;
@@ -144,6 +145,9 @@ public class PaperCore extends JavaPlugin implements PluginCore<CachedServerIcon
    
    private void enable(){
        this.core = new AdvancedServerList(this, new PaperPlayerPlaceholders());
+        
+        if(getServer().getPluginManager().isPluginEnabled("PlaceholderAPI"))
+            new PAPIPlaceholders(this);
    }
    
    private void printSpigotWarning(){
@@ -25,7 +25,7 @@

 package ch.andre601.advancedserverlist.paper.commands;

-import ch.andre601.advancedserverlist.core.interfaces.CmdSender;
+import ch.andre601.advancedserverlist.core.interfaces.commands.CmdSender;
 import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
 import org.bukkit.command.CommandSender;

@@ -0,0 +1,122 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2023 Andre_601
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package ch.andre601.advancedserverlist.paper.objects;
+
+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.objects.CachedPlayer;
+import ch.andre601.advancedserverlist.core.objects.GenericServerImpl;
+import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
+import ch.andre601.advancedserverlist.core.profiles.ServerListProfile;
+import ch.andre601.advancedserverlist.core.profiles.profile.ProfileManager;
+import ch.andre601.advancedserverlist.core.profiles.replacer.StringReplacer;
+import ch.andre601.advancedserverlist.paper.PaperCore;
+import com.viaversion.viaversion.api.Via;
+import me.clip.placeholderapi.PlaceholderAPI;
+import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Locale;
+
+public class PAPIPlaceholders extends PlaceholderExpansion{
+    
+    private final PaperCore plugin;
+    
+    public PAPIPlaceholders(PaperCore plugin){
+        this.plugin = plugin;
+        this.register();
+    }
+    
+    @Override
+    public @NotNull String getIdentifier(){
+        return "asl";
+    }
+    
+    @Override
+    public @NotNull String getAuthor(){
+        return String.join(", ", plugin.getDescription().getAuthors());
+    }
+    
+    @Override
+    public @NotNull String getVersion(){
+        return plugin.getDescription().getVersion();
+    }
+    
+    @Override
+    public String onPlaceholderRequest(Player pl, @NotNull String identifier){
+        String host = pl.getVirtualHost() == null ? null : pl.getVirtualHost().getHostString();
+        CachedPlayer cached = plugin.getCore().getPlayerHandler().getCachedPlayer(pl.getUniqueId());
+        
+        // Check if ViaVersion is enabled to resolve the player's protocol version.
+        // If not can we assume the client's version to be the same as the server's.
+        int protocol;
+        if(Bukkit.getPluginManager().isPluginEnabled("ViaVersion")){
+            protocol = Via.getAPI().getPlayerVersion(pl.getUniqueId());
+        }else{
+            protocol = Bukkit.getUnsafe().getProtocolVersion();
+        }
+        
+        int online = Bukkit.getOnlinePlayers().size();
+        int max = Bukkit.getMaxPlayers();
+        GenericServer server = new GenericServerImpl(online, max, host);
+        GenericPlayer player = new PaperPlayerImpl(pl, cached, protocol);
+        
+        ServerListProfile profile = ProfileManager.resolveProfile(plugin.getCore(), player, server);
+        if(profile == null)
+            return null;
+    
+        ProfileEntry entry = ProfileManager.merge(profile);
+        
+        if(ProfileManager.checkOption(entry.isExtraPlayersEnabled()))
+            max = online + (entry.getExtraPlayersCount() == null ? 0 : entry.getExtraPlayersCount());
+        
+        GenericServer finalServer = new GenericServerImpl(online, max, host);
+        
+        return switch(identifier.toLowerCase(Locale.ROOT)){
+            case "motd" -> ComponentParser.list(entry.getMotd())
+                .modifyText(text -> PlaceholderAPI.setPlaceholders(pl, text))
+                .modifyText(text -> StringReplacer.replace(text, player, finalServer))
+                .toString();
+            case "favicon" -> ComponentParser.text(entry.getFavicon())
+                .modifyText(text -> PlaceholderAPI.setPlaceholders(pl, text))
+                .modifyText(text -> StringReplacer.replace(text, player, finalServer))
+                .toString();
+            case "playercount_hover" -> ComponentParser.list(entry.getPlayers())
+                .modifyText(text -> PlaceholderAPI.setPlaceholders(pl, text))
+                .modifyText(text -> StringReplacer.replace(text, player, finalServer))
+                .toString();
+            case "playercount_text" -> ComponentParser.text(entry.getPlayerCountText())
+                .modifyText(text -> PlaceholderAPI.setPlaceholders(pl, text))
+                .modifyText(text -> StringReplacer.replace(text, player, finalServer))
+                .toString();
+            case "extra_players_max" -> String.valueOf(max);
+            default -> null;
+        };
+    }
+}
@@ -12,6 +12,7 @@ libraries:

 softdepend:
  - 'PlaceholderAPI'
+  - 'ViaVersion'

 commands: 
  advancedserverlist:
@@ -37,10 +37,10 @@
    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        
-        <plugin.version>2.1.0</plugin.version>
+        <plugin.version>3.0.0-b2</plugin.version>
        <plugin.description>Create multiple Server lists based on conditions.</plugin.description>
        
-        <api.version>v2.0.0</api.version>
+        <api.version>v2.1.0</api.version>
        
        <maven.compiler.source>16</maven.compiler.source>
        <maven.compiler.target>16</maven.compiler.target>
@@ -57,7 +57,7 @@
        <module>core</module>
        <module>bungeecord</module>
        <module>paper</module>
-        <module>spigot</module>
+        <module>bukkit</module>
        <module>velocity</module>
    </modules>
 </project>
@@ -1 +1 @@
-mkdocs-material==9.0.6
+mkdocs-material==9.1.4
@@ -72,7 +72,7 @@
        <dependency>
            <groupId>org.bstats</groupId>
            <artifactId>bstats-velocity</artifactId>
-            <version>3.0.0</version>
+            <version>3.0.2</version>
            <scope>compile</scope>
        </dependency>
    </dependencies>
@@ -89,7 +89,7 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
+                <version>3.11.0</version>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
@@ -25,7 +25,7 @@

 package ch.andre601.advancedserverlist.velocity.commands;

-import ch.andre601.advancedserverlist.core.interfaces.CmdSender;
+import ch.andre601.advancedserverlist.core.interfaces.commands.CmdSender;
 import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
 import com.velocitypowered.api.command.CommandSource;