Merge pull request #112 from Andre601/feature/new-placeholder-features

Allow multiple servers/worlds for playersOnline, add whitelistEnabled for spigot/paper and config backup on migration.
Use the right method for whitelistEnabled
2026-11-05 17:02:34 -05:00 · 2023-06-18 15:52:04 +02:00 · 2023-06-18 15:44:37 +02:00 · 2023-06-18 15:34:06 +02:00 · 2023-06-18 15:12:47 +02:00 · 2023-06-16 18:05:14 +02:00
102 changed files with 2794 additions and 1412 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://wsrv.nl/?url=https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact-minimal/supported/spigot_vector.svg&w=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://wsrv.nl/?url=https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact-minimal/supported/paper_vector.svg&w=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://wsrv.nl/?url=https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact-minimal/supported/bungeecord_vector.svg&w=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://wsrv.nl/?url=https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact-minimal/supported/waterfall_vector.svg&w=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://wsrv.nl/?url=https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact-minimal/supported/velocity_vector.svg&w=64 alt="platform-velocity" title="Tested on Velocity">
 </a>

 ## What is a Server List Profile?
@@ -24,12 +24,14 @@ A Server List Profile refers to a YAML file located in the plugin's `profiles` d
 It allows you to configure specific aspects of the server display in the MC-Client's multiplayer server list, such as the MOTD, player count text, player count hover or Favicon.

 > [*Read More*][profiles]
+
 ### Conditions
 Thanks to conditions can you determine when a profile should be displayed in the player’s server list, to allow displaying specific text (i.e. a warning when they are using an outdated version).

 When multiple profiles exist that have valid conditions will the one with the highest priority (Higher number = higher priority) be selected. Having no conditions makes the profile automatically return true.

 > [*Read More*][conditions]
+
 ### Placeholders
 Placeholders can be used within conditions to further customize them. They can also be used in any other text option (motd, playerCount and players) to display their respective values.
 The format is `${<target> <identifier>}` which was adopted from BungeeTabListPlus. Depending on what platform you use the plugin on are only specific placeholders available.
@@ -37,17 +39,20 @@ The format is `${<target> <identifier>}` which was adopted from BungeeTabListPlu
 When using the SpigotMC/PaperMC version can you also use placeholders from [PlaceholderAPI][placeholderapi] using its `%<identifier>_<values>%` placeholder format. PlaceholderAPI needs to be installed for that.

 > [*Read More*][placeholders]
+
 ### Formatting
 The plugin uses the MiniMessage format for a consistent, easy way of formatting your text.
 Only certain options are usable for each option. As an example does motd support HEX colours and gradients, while the other options only support default colour codes.

 > [*Read More*][minimessage]
+
 ## Dependencies

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

 ## Statistics

@@ -58,31 +63,42 @@ You can disable this in the global bStats config file located in `/plugins/bstat
 - [Paper/Spigot][bstats-spigot]
 - [Velocity][bstats-velocity]

+## Videos
+Do you have your own video to share? Contact me and I will add it to this section.
+
+<details><summary>Click to Show/Hide Videos</summary>
+
+Spanish Video by Ajneb97
+<iframe width="560" height="auto" src="https://www.youtube.com/embed/rIbljm_4HVI" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
+
+</details>
+
 ## 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://wsrv.nl/?url=https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/cozy/documentation/modrinth-gallery_vector.svg&w=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://wsrv.nl/?url=https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact-minimal/social/discord-singular_vector.svg&w=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://wsrv.nl/?url=https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact-minimal/social/revolt-singular_vector.svg&w=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://wsrv.nl/?url=https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact-minimal/social/mastodon-singular_vector.svg&w=64" alt="revolt" title="Chat with me on Mastodon">
 </a>

 <!-- Links -->
-[profiles]: https://andre601.ch/AdvancedServerList/profiles
-[conditions]: https://andre601.ch/AdvancedServerList/profiles/#conditions
-[placeholders]: https://andre601.ch/AdvancedServerList/profiles/placeholders
-[minimessage]: https://andre601.ch/AdvancedServerList/profiles/formatting
+[profiles]: https://andre601.ch/AdvancedServerList/latest/profiles
+[conditions]: https://andre601.ch/AdvancedServerList/latest/profiles/#conditions
+[placeholders]: https://andre601.ch/AdvancedServerList/latest/profiles/placeholders
+[minimessage]: https://andre601.ch/AdvancedServerList/latest/profiles/formatting

 [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
@@ -0,0 +1,7 @@
+<!-- pr-build comment -->
+
+![badge]
+
+Building jar file from Pull request. Please wait...
+
+[badge]: https://img.shields.io/badge/Building...-0d1117?style=for-the-badge&labelColor=7a8490&logo=data:image/svg%2bxml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCIgd2lkdGg9IjI0IiBoZWlnaHQ9IjI0IiBmaWxsPSIjZmZmZmZmIj48cGF0aCBkPSJNNC43NSAyaDE0LjVhLjc1Ljc1IDAgMCAxIDAgMS41aC0uNzV2Mi45ODJhNC43NSA0Ljc1IDAgMCAxLTIuMjE1IDQuMDE3bC0yLjA0NCAxLjI5YS4yNS4yNSAwIDAgMCAwIC40MjJsMi4wNDQgMS4yOWE0Ljc1IDQuNzUgMCAwIDEgMi4yMTUgNC4wMTdWMjAuNWguNzVhLjc1Ljc1IDAgMCAxIDAgMS41SDQuNzVhLjc1Ljc1IDAgMCAxIDAtMS41aC43NXYtMi45ODJhNC43NSA0Ljc1IDAgMCAxIDIuMjE1LTQuMDE3bDIuMDQ0LTEuMjlhLjI1LjI1IDAgMCAwIDAtLjQyMmwtMi4wNDQtMS4yOUE0Ljc1IDQuNzUgMCAwIDEgNS41IDYuNDgyVjMuNWgtLjc1YS43NS43NSAwIDAgMSAwLTEuNVpNMTcgMy41SDd2Mi45ODJBMy4yNSAzLjI1IDAgMCAwIDguNTE2IDkuMjNsMi4wNDQgMS4yOWExLjc1IDEuNzUgMCAwIDEgMCAyLjk2bC0yLjA0NCAxLjI5QTMuMjUgMy4yNSAwIDAgMCA3IDE3LjUxOFYyMC41aDEwdi0yLjk4MmEzLjI1IDMuMjUgMCAwIDAtMS41MTYtMi43NDhsLTIuMDQ0LTEuMjlhMS43NSAxLjc1IDAgMCAxIDAtMi45NmwyLjA0NC0xLjI5QTMuMjUgMy4yNSAwIDAgMCAxNyA2LjQ4MloiPjwvcGF0aD48L3N2Zz4=
@@ -0,0 +1,12 @@
+<!-- pr-build comment -->
+![badge]
+
+**Compiling of jar files failed!**  
+Please check the logs below for any errors.
+
+| Name   | Link                             |
+| ------ | -------------------------------- |
+| Commit | {{ .commit }}                    |
+| Logs   | {{ .logs | mdlink "View Logs" }} |
+
+[badge]: https://img.shields.io/badge/Build_Failure!-0d1117?style=for-the-badge&labelColor=f85149&logo=data:image/svg%2bxml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCIgd2lkdGg9IjI0IiBoZWlnaHQ9IjI0IiBmaWxsPSIjZmZmZmZmIj48cGF0aCBkPSJNNS43MiA1LjcyYS43NS43NSAwIDAgMSAxLjA2IDBMMTIgMTAuOTRsNS4yMi01LjIyYS43NDkuNzQ5IDAgMCAxIDEuMjc1LjMyNi43NDkuNzQ5IDAgMCAxLS4yMTUuNzM0TDEzLjA2IDEybDUuMjIgNS4yMmEuNzQ5Ljc0OSAwIDAgMS0uMzI2IDEuMjc1Ljc0OS43NDkgMCAwIDEtLjczNC0uMjE1TDEyIDEzLjA2bC01LjIyIDUuMjJhLjc1MS43NTEgMCAwIDEtMS4wNDItLjAxOC43NTEuNzUxIDAgMCAxLS4wMTgtMS4wNDJMMTAuOTQgMTIgNS43MiA2Ljc4YS43NS43NSAwIDAgMSAwLTEuMDZaIj48L3BhdGg+PC9zdmc+
@@ -0,0 +1,15 @@
+<!-- pr-build comment -->
+![badge]
+
+The compiling of the jar files was successful!  
+You can find a direct download for the artifact below.
+
+File expires: `{{ .expire | date "02 Jan 2006 15:04 MST" }}`
+
+| Name     | Link                                         |
+| -------- | -------------------------------------------- |
+| Commit   | {{ .commit }}                                |
+| Logs     | {{ .logs | mdlink "View Logs" }}             |
+| Download | {{ .download | mdlink "Download Artifact" }} |
+
+[badge]: https://img.shields.io/badge/Build_Success!-0d1117?style=for-the-badge&labelColor=3fb950&logo=data:image/svg%2bxml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCIgd2lkdGg9IjI0IiBoZWlnaHQ9IjI0IiBmaWxsPSIjZmZmZmZmIj48cGF0aCBkPSJNMjEuMDMgNS43MmEuNzUuNzUgMCAwIDEgMCAxLjA2bC0xMS41IDExLjVhLjc0Ny43NDcgMCAwIDEtMS4wNzItLjAxMmwtNS41LTUuNzVhLjc1Ljc1IDAgMSAxIDEuMDg0LTEuMDM2bDQuOTcgNS4xOTVMMTkuOTcgNS43MmEuNzUuNzUgMCAwIDEgMS4wNiAwWiI+PC9wYXRoPjwvc3ZnPg==
@@ -17,21 +17,13 @@ updates:
      - 'Type: Update Dependency'
      - 'Target: Core'
  - package-ecosystem: maven
-    directory: "/paper"
+    directory: "/bukkit"
    schedule:
      interval: daily
    open-pull-requests-limit: 10
    labels:
      - 'Type: Update Dependency'
-      - 'Target: PaperMC'
-  - package-ecosystem: maven
-    directory: "/spigot"
-    schedule:
-      interval: daily
-    open-pull-requests-limit: 10
-    labels:
-      - 'Type: Update Dependency'
-      - 'Target: Spigot'
+      - 'Target: Bukkit'
  - package-ecosystem: maven
    directory: "/velocity"
    schedule:
@@ -48,3 +40,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'
@@ -0,0 +1,100 @@
+name: Create PR Artifacts
+
+on:
+  pull_request_target:
+    types:
+      - opened
+      - reopened
+      - synchronize
+    branches:
+      - master
+    paths-ignore:
+      - '.github/**'
+      - 'docs/**'
+      - '.gitignore'
+      - 'LICENSE'
+      - 'README.md'
+      - 'mkdocs.yml'
+      - 'requirements.txt'
+
+concurrency:
+  group: '${{ github.workflow }}-${{ github.head_ref }}'
+  cancel-in-progress: false
+
+permissions:
+  issues: write
+  pull-requests: write
+
+jobs:
+  buildArtifacts:
+    runs-on: ubuntu-latest
+    outputs:
+      comment_id: ${{ steps.comment.outputs.comment-id }}
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+        with:
+          ref: refs/pull/${{ github.event.pull_request.number }}/merge
+      - name: Find Comment
+        uses: peter-evans/find-comment@v2
+        id: find-comment
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          comment-author: 'github-actions[bot]'
+          body-includes: '<!-- pr-build comment -->'
+      - name: Print Comment info
+        run: |
+          echo "Comment ID: ${{ steps.find-comment.outputs.comment-id }}"
+          echo "Comment Author: ${{ steps.find-comment.outputs.comment-author }}"
+          echo "Comment created at: ${{ steps.find-comment.outputs.comment-created-at }}"
+      - name: Post/Update Comment
+        uses: peter-evans/create-or-update-comment@v3
+        id: comment
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          comment-id: ${{ steps.find-comment.outputs.comment-id }}
+          edit-mode: replace
+          body-path: .github/assets/pr-comments/building.md
+      - name: Set up JDK 1.16
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '16'
+          cache: 'maven'
+      - name: Obtain short Commit SHA
+        id: get-commit
+        run: 'echo "sha_short=$(git rev-parse --short ${{ github.event.pull_request.head.sha }})" >> $GITHUB_OUTPUT'
+      - name: Build Jar files
+        run: mvn clean install
+        env:
+          COMMIT_SHA: ${{ steps.get-commit.outputs.sha_short }}
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: AdvancedServerList-Artifacts
+          path: '*/target/AdvancedServerList-*.jar'
+          if-no-files-found: error
+  commentOnFail:
+    needs: [buildArtifacts]
+    if: failure()
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+        with:
+          ref: refs/pull/${{ github.event.pull_request.number }}/merge
+      - name: Render Markdown Template
+        id: render
+        uses: chuhlomin/render-template@v1.7
+        with:
+          template: './.github/assets/pr-comments/failed.md'
+          vars: |
+            commit: ${{ github.event.pull_request.head.sha }}
+            logs: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+      - name: Update Comment (Failure)
+        uses: peter-evans/create-or-update-comment@v3
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          comment-id: ${{ needs.buildArtifacts.outputs.comment_id }}
+          edit-mode: replace
+          body: ${{ steps.render.outputs.result }}
@@ -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,19 @@ 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
+      - name: Set up Git
        run: |
          git config user.name "github-actions[bot]"
          git config user.email "actions@github.com"
-          mkdocs gh-deploy --force
+      - name: Deploy Files
+        run: mkdocs gh-deploy --force
@@ -0,0 +1,99 @@
+name: Comment on Pull request
+
+on:
+  workflow_run:
+    types:
+      - completed
+    workflows:
+      - 'Create PR Artifacts'
+
+permissions:
+  issues: write
+  pull-requests: write
+
+jobs:
+  comment:
+    if: github.event.workflow_run.conclusion == 'success'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+      - name: Get Artifact and Pull request info
+        env:
+          GITHUB_TOKEN: ${{ github.token }} # Needs to be set as env variable so that 'gh api' can be used.
+          WORKFLOW_RUN_EVENT_OBJ: ${{ toJSON(github.event.workflow_run) }}
+          OWNER: ${{ github.repository_owner }}
+          REPO: ${{ github.event.repository.name }}
+        run: |
+          PREVIOUS_JOB_ID=$(jq -r '.id' <<< "$WORKFLOW_RUN_EVENT_OBJ")
+          echo "Previous Job ID: $PREVIOUS_JOB_ID"
+          echo "PREVIOUS_JOB_ID=$PREVIOUS_JOB_ID" >> "$GITHUB_ENV"
+          
+          SUITE_ID=$(jq -r '.check_suite_id' <<< "$WORKFLOW_RUN_EVENT_OBJ")
+          echo "Previous Suite ID: $SUITE_ID"
+          echo "SUITE_ID=$SUITE_ID" >> "$GITHUB_ENV"
+          
+          ARTIFACT_ID=$(gh api "/repos/$OWNER/$REPO/actions/artifacts" \
+            --jq ".artifacts.[] |
+            select(.workflow_run.id==${PREVIOUS_JOB_ID}) |
+            select(.expired==false) |
+            .id")
+          
+          echo "Artifact ID: $ARTIFACT_ID"
+          echo "ARTIFACT_ID=$ARTIFACT_ID" >> "$GITHUB_ENV"
+          
+          ARTIFACT_EXPIRE_DATE=$(gh api "/repos/$OWNER/$REPO/actions/artifacts" \
+            --jq ".artifacts.[] |
+            select(.workflow_run.id==${PREVIOUS_JOB_ID}) |
+            select(.expired==false) |
+            .expires_at")
+          
+          echo "Artifact Expire Date: $ARTIFACT_EXPIRE_DATE"
+          echo "ARTIFACT_EXPIRE_DATE=$ARTIFACT_EXPIRE_DATE" >> "$GITHUB_ENV"
+          
+          PR_NUMBER=$(jq -r '.pull_requests[0].number' \
+            <<< "$WORKFLOW_RUN_EVENT_OBJ")
+          
+          echo "Pull request Number: $PR_NUMBER"
+          echo "PR_NUMBER=$PR_NUMBER" >> "$GITHUB_ENV"
+          
+          HEAD_SHA=$(jq -r '.pull_requests[0].head.sha' \
+            <<< "$WORKFLOW_RUN_EVENT_OBJ")
+          
+          echo "Head SHA: $HEAD_SHA"
+          echo "HEAD_SHA=$HEAD_SHA" >> "$GITHUB_ENV"
+      - name: Find Comment
+        uses: peter-evans/find-comment@v2
+        id: find-comment
+        with:
+          issue-number: ${{ env.PR_NUMBER }}
+          comment-author: 'github-actions[bot]'
+          body-includes: '<!-- pr-build comment -->'
+      - name: Print Comment info
+        run: |
+          echo "Comment ID: ${{ steps.find-comment.outputs.comment-id }}"
+          echo "Comment Author: ${{ steps.find-comment.outputs.comment-author }}"
+          echo "Comment created at: ${{ steps.find-comment.outputs.comment-created-at }}"
+      - name: Render Markdown Template
+        id: render
+        uses: chuhlomin/render-template@v1.7
+        env:
+          JOB_PATH: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ env.PREVIOUS_JOB_ID }}"
+          ARTIFACT_URL: "https://nightly.link/${{ github.repository }}/suites/${{ env.SUITE_ID }}/artifacts/${{ env.ARTIFACT_ID }}"
+          ARTIFACT_EXPIRE_DATE: "${{ env.ARTIFACT_EXPIRE_DATE }}"
+          HEAD_SHA: "${{ env.HEAD_SHA }}"
+        with:
+          template: './.github/assets/pr-comments/success.md'
+          timezone: Europe/Zurich
+          vars: |
+            commit: ${{ env.HEAD_SHA }}
+            logs: ${{ env.JOB_PATH }}
+            download: ${{ env.ARTIFACT_URL }}
+            expire: ${{ env.ARTIFACT_EXPIRE_DATE }}
+      - name: Update Comment
+        uses: peter-evans/create-or-update-comment@v3
+        with:
+          issue-number: ${{ env.PR_NUMBER }}
+          comment-id: ${{ steps.find-comment.outputs.comment-id }}
+          edit-mode: replace
+          body: ${{ steps.render.outputs.result }}
@@ -13,8 +13,16 @@ on:
 jobs:
  buildJars:
    runs-on: ubuntu-latest
+    outputs:
+      plugin_release: ${{ steps.github-release.outputs.PLUGIN_RELEASE }}
    steps:
-    - uses: actions/checkout@v3
+    - name: Checkout Repository
+      uses: actions/checkout@v3
+    - name: Get Version from Release
+      id: github-release
+      run: |
+        version=$(echo ${{ github.event.release.tag_name }} | cut -d'v' -f2)
+        echo "PLUGIN_RELEASE=$version" >> $GITHUB_OUTPUT
    - name: Set up JDK 1.16
      uses: actions/setup-java@v3
      with:
@@ -23,32 +31,13 @@ jobs:
        cache: 'maven'
    - name: Build Jar files
      run: mvn clean install
-    - name: Save BungeeCord Jar file
+    - name: Save All files
      uses: actions/upload-artifact@v3
      with:
-        name: asl-bungeecord
-        path: bungeecord/target/AdvancedServerList-*.jar
-        if-no-files-found: error
-        retention-days: 1
-    - name: Save Paper 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
-        if-no-files-found: error
-        retention-days: 1
-    - name: Save Velocity Jar file
-      uses: actions/upload-artifact@v3
-      with:
-        name: asl-velocity
-        path: velocity/target/AdvancedServerList-*.jar
+        name: asl-files
+        path: |
+          */target/AdvancedServerList-*.jar
+          hangar-uploader/target/HangarUploader.jar
        if-no-files-found: error
        retention-days: 1
  publish:
@@ -61,12 +50,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
@@ -76,30 +64,56 @@ jobs:
    - name: Get Jar files
      uses: actions/download-artifact@v3
      with:
-        name: asl-${{ matrix.directory }}
-        path: ${{ matrix.directory }}/target
-    - name: Get Version
-      id: github-release
-      run: |
-        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
-      uses: Kir-Antipov/mc-publish@v3.2
+        name: asl-files
+    - name: Upload AdvancedServerList v${{ needs.buildJars.outputs.plugin_release }} (${{ matrix.loaders }}) to GitHub and Modrinth
+      if: '!github.event.release.prerelease'
+      uses: Kir-Antipov/mc-publish@v3.3
      with:
        name: ${{ github.event.release.tag_name }} (${{ matrix.platforms }})
-        version: ${{ steps.github-release.outputs.PLUGIN_RELEASE }}
+        version: ${{ needs.buildJars.outputs.plugin_release }}
        version-type: release
        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
+        game-version-filter: releases
+        game-versions: '>=1.19'
        java: 16
        modrinth-id: xss83sOY
        modrinth-featured: false
        modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
        github-token: ${{ secrets.GITHUB_TOKEN }}
+    - name: Upload AdvancedServerList v${{ needs.buildJars.outputs.plugin_release }} (${{ matrix.loaders }}) to GitHub and Modrinth [Pre-Release]
+      if: 'github.event.release.prerelease'
+      uses: Kir-Antipov/mc-publish@v3.3
+      with:
+        name: ${{ github.event.release.tag_name }} (${{ matrix.platforms }})
+        version: ${{ needs.buildJars.outputs.plugin_release }}
+        version-type: beta
+        files: ${{ matrix.directory }}/target/AdvancedServerList-*.jar
+        loaders: ${{ matrix.loaders }}
+        game-version-filter: releases
+        game-versions: '>=1.19'
+        java: 16
+        modrinth-id: xss83sOY
+        modrinth-featured: false
+        modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+  publishHangar:
+    needs: [buildJars]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up JDK 1.16
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '16'
+      - name: Download Release Assets
+        uses: actions/download-artifact@v3
+        with:
+          name: asl-files
+      - name: Move HangarUploader.jar
+        working-directory: hangar-uploader/target/
+        run: mv HangarUploader.jar ../../
+      - name: Execute HangarUploader.jar
+        run: java -jar HangarUploader.jar ${{ secrets.HANGAR_TOKEN }} ${{ needs.buildJars.outputs.plugin_release }} ${{ github.event.release.prerelease }}
+        env:
+          GITHUB_RELEASE_BODY: ${{ github.event.release.body }}
@@ -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>
@@ -67,10 +75,16 @@
        </dependency>
        <dependency>
            <groupId>ch.andre601.asl-api</groupId>
-            <artifactId>platform-spigot</artifactId>
+            <artifactId>platform-bukkit</artifactId>
            <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,37 @@
        <dependency>
            <groupId>net.kyori</groupId>
            <artifactId>adventure-platform-bukkit</artifactId>
-            <version>4.2.0</version>
+            <version>4.3.0</version>
+            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>com.comphenix.protocol</groupId>
            <artifactId>ProtocolLib</artifactId>
-            <version>4.8.0</version>
+            <version>5.0.0</version>
            <scope>provided</scope>
        </dependency>
        <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.7.0</version>
            <scope>provided</scope>
        </dependency>
    </dependencies>

    <build>
-        <finalName>AdvancedServerList-Spigot-${plugin.version}</finalName>
+        <finalName>AdvancedServerList-Bukkit-${plugin.version}${project.build.commit}</finalName>
        <resources>
            <resource>
                <filtering>true</filtering>
@@ -114,7 +135,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 +143,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>
@@ -130,10 +151,6 @@
                            <pattern>org.bstats</pattern>
                            <shadedPattern>ch.andre601.advancedserverlist.spigot.depends.bstats</shadedPattern>
                        </relocation>
-                        <relocation>
-                            <pattern>com.github.benmanes.caffeine</pattern>
-                            <shadedPattern>ch.andre601.advancedserverlist.spigot.depends.caffeine</shadedPattern>
-                        </relocation>
                    </relocations>
                    <filters>
                        <filter>
@@ -157,4 +174,4 @@
        </plugins>
    </build>

-</project>
+</project>
@@ -23,12 +23,17 @@
 *
 */

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

-import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
+import ch.andre601.advancedserverlist.bukkit.objects.WorldCache;
+import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
+import org.bukkit.plugin.java.JavaPlugin;

-public class PreServerListSetEventImpl extends PreServerListSetEvent{
-    public PreServerListSetEventImpl(ProfileEntry entry){
-        super(entry);
-    }
-}
+/* 
+ * Small convenience class to "merge" the PluginCore and JavaPlugin classes.
+ * Allows me to have BukkitCore<?> for whenever I also need a JavaPlugin (i.e. registering events).
+ * See JoinEvent class for an example.
+*/
+public abstract class BukkitCore<F> extends JavaPlugin implements PluginCore<F>{
+    public abstract WorldCache getWorldCache();
+}
@@ -23,29 +23,53 @@
 *
 */

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

-import ch.andre601.advancedserverlist.spigot.SpigotCore;
+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;

-public class CmdAdvancedServerList implements CommandExecutor{
+import java.util.Collections;
+
+public class CmdAdvancedServerList extends Command implements CommandExecutor{
    
-    SpigotCore plugin;
-    BukkitAudiences bukkitAudiences;
+    private final PluginCore<?> plugin;
+    private final BukkitAudiences audiences;
    
-    public CmdAdvancedServerList(SpigotCore plugin){
+    public CmdAdvancedServerList(PluginCore<?> plugin){
+        this(plugin, null);
+    }
+    
+    public CmdAdvancedServerList(PluginCore<?> plugin, BukkitAudiences audiences){
+        super(
+            "advancedserverlist",
+            "Main command of the plugin",
+            "/asl [reload|help|clearCache]",
+            Collections.singletonList("asl")
+        );
+        
        this.plugin = plugin;
-        bukkitAudiences = BukkitAudiences.create(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(new SpigotCmdSender(sender, bukkitAudiences), 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,10 @@
 *
 */

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

-import ch.andre601.advancedserverlist.spigot.SpigotCore;
+import ch.andre601.advancedserverlist.bukkit.BukkitCore;
+import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -33,12 +34,17 @@ import org.bukkit.event.player.PlayerJoinEvent;

 import java.net.InetSocketAddress;

-public class JoinEvent implements Listener{
+public class JoinEvent<F> implements Listener{
    
-    private final SpigotCore plugin;
+    private final BukkitCore<F> plugin;
    
-    public JoinEvent(SpigotCore plugin){
+    private JoinEvent(BukkitCore<F> plugin){
        this.plugin = plugin;
+        Bukkit.getPluginManager().registerEvents(this, plugin);
+    }
+    
+    public static <F> void init(BukkitCore<F> plugin){
+        new JoinEvent<>(plugin);
    }
    
    @EventHandler
@@ -46,7 +52,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,36 +23,52 @@
 *
 */

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

+import ch.andre601.advancedserverlist.bukkit.BukkitCore;
+import ch.andre601.advancedserverlist.bukkit.objects.placeholders.PAPIPlaceholders;
 import ch.andre601.advancedserverlist.spigot.SpigotCore;
+import ch.andre601.advancedserverlist.spigot.listeners.ProtocolLibEvents;
 import com.comphenix.protocol.ProtocolLibrary;
+import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.server.ServerLoadEvent;
-import org.bukkit.plugin.PluginManager;

 public class LoadEvent implements Listener{
    
-    private final SpigotCore plugin;
+    private final BukkitCore<?> plugin;
    
-    public LoadEvent(SpigotCore plugin){
+    private LoadEvent(BukkitCore<?> plugin){
        this.plugin = plugin;
        plugin.getServer().getPluginManager().registerEvents(this, plugin);
    }
    
+    public static void init(BukkitCore<?> plugin){
+        new LoadEvent(plugin);
+    }
+    
    @EventHandler
    public void onServerLoad(ServerLoadEvent event){
-        PluginManager manager = plugin.getServer().getPluginManager();
+        JoinEvent.init(plugin);
+        WorldEvents.init(plugin);
        
-        if(!manager.isPluginEnabled("ProtocolLib")){
+        // Populate WorldCache with all loaded worlds
+        Bukkit.getWorlds().forEach(world -> plugin.getWorldCache().addWorld(world.getName(), world));
+        
+        if(!(plugin instanceof SpigotCore spigotCore))
+            return;
+        
+        if(!Bukkit.getPluginManager().isPluginEnabled("ProtocolLib")){
            plugin.getCore().getPlugin().getPluginLogger().warn("ProtocolLib not found! AdvancedServerList requires it to work on Spigot!");
-    
-            manager.disablePlugin(plugin);
+            
+            Bukkit.getPluginManager().disablePlugin(plugin);
            return;
        }
        
-        manager.registerEvents(new JoinEvent(plugin), plugin);
-        manager.registerEvents(new PingEvent(plugin, ProtocolLibrary.getProtocolManager()), plugin);
+        ProtocolLibEvents.init(spigotCore, ProtocolLibrary.getProtocolManager());
+        
+        if(Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI"))
+            spigotCore.setPapiPlaceholders(PAPIPlaceholders.init(spigotCore));
    }
 }
@@ -23,10 +23,10 @@
 *
 */

-package ch.andre601.advancedserverlist.paper.events;
+package ch.andre601.advancedserverlist.bukkit.listeners;

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

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

-package ch.andre601.advancedserverlist.paper.events;
+package ch.andre601.advancedserverlist.bukkit.listeners;

-import ch.andre601.advancedserverlist.paper.PaperCore;
-import org.bukkit.entity.Player;
+import ch.andre601.advancedserverlist.bukkit.BukkitCore;
+import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.world.WorldLoadEvent;
+import org.bukkit.event.world.WorldUnloadEvent;

-import java.net.InetSocketAddress;
-
-public class JoinEvent implements Listener{
+public class WorldEvents implements Listener{
    
-    private final PaperCore plugin;
+    private final BukkitCore<?> plugin;
    
-    public JoinEvent(PaperCore plugin){
+    private WorldEvents(BukkitCore<?> plugin){
        this.plugin = plugin;
-        plugin.getServer().getPluginManager().registerEvents(this, plugin);
+        Bukkit.getPluginManager().registerEvents(this, plugin);
+    }
+    
+    public static void init(BukkitCore<?> plugin){
+        new WorldEvents(plugin);
    }
    
    @EventHandler
-    public void onJoin(PlayerJoinEvent event){
-        InetSocketAddress address = event.getPlayer().getAddress();
-        if(address == null)
-            return;
+    public void onWorldLoad(WorldLoadEvent event){
+        plugin.getWorldCache().addWorld(event.getWorld().getName(), event.getWorld());
+    }
    
-        Player player = event.getPlayer();
-        plugin.getCore().getPlayerHandler().addPlayer(address.getHostString(), player.getName(), player.getUniqueId());
+    @EventHandler
+    public void onWorldUnload(WorldUnloadEvent event){
+        plugin.getWorldCache().removeWorld(event.getWorld().getName());
    }
 }
@@ -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;
    }
    
@@ -0,0 +1,50 @@
+/*
+ * 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 org.bukkit.World;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public record WorldCache(Map<String, World> worlds){
+    
+    public WorldCache(){
+        this(new HashMap<>());
+    }
+    
+    public boolean containsWorld(String key){
+        return worlds().containsKey(key);
+    }
+    
+    public void addWorld(String key, World world){
+        worlds().put(key, world);
+    }
+    
+    public void removeWorld(String key){
+        worlds().remove(key);
+    }
+}
@@ -23,20 +23,21 @@
 *
 */

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

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

-public class SpigotPlayerImpl extends GenericPlayerImpl implements SpigotPlayer{
+public class BukkitPlayerImpl extends GenericPlayerImpl implements BukkitPlayer{
    
    private final OfflinePlayer player;
    private boolean playedBefore = false;
    private boolean banned = false;
    private boolean whitelisted = false;
    
-    public SpigotPlayerImpl(OfflinePlayer player, CachedPlayer cachedPlayer, int protocol){
+    public BukkitPlayerImpl(OfflinePlayer player, CachedPlayer cachedPlayer, int protocol){
        this.player = player;
    
        this.name = player == null ? cachedPlayer.getName() : player.getName();
@@ -0,0 +1,54 @@
+/*
+ * 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.impl;
+
+import ch.andre601.advancedserverlist.api.bukkit.objects.BukkitServer;
+import org.bukkit.World;
+
+import java.util.Map;
+
+public record BukkitServerImpl(Map<String, World> worlds, int playersOnline, int playersMax, String host) implements BukkitServer{
+    
+    @Override
+    public Map<String, World> getWorlds(){
+        return worlds;
+    }
+    
+    @Override
+    public int getPlayersOnline(){
+        return playersOnline;
+    }
+    
+    @Override
+    public int getPlayersMax(){
+        return playersMax;
+    }
+    
+    @Override
+    public String getHost(){
+        return host;
+    }
+}
@@ -23,34 +23,40 @@
 *
 */

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

 import ch.andre601.advancedserverlist.api.PlaceholderProvider;
+import ch.andre601.advancedserverlist.api.bukkit.objects.BukkitPlayer;
 import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
 import ch.andre601.advancedserverlist.api.objects.GenericServer;

-public class SpigotPlayerPlaceholders extends PlaceholderProvider{
+public class BukkitPlayerPlaceholders extends PlaceholderProvider{
    
-    public SpigotPlayerPlaceholders(){
+    private BukkitPlayerPlaceholders(){
        super("player");
    }
    
+    public static BukkitPlayerPlaceholders init(){
+        return new BukkitPlayerPlaceholders();
+    }
+    
    @Override
    public String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
-        SpigotPlayer spigotPlayer = (SpigotPlayer)player;
+        if(!(player instanceof BukkitPlayer bukkitPlayer))
+            return null;
        
        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;
        };
    }
    
-    private String returnValue(SpigotPlayer player, Object value){
+    private String returnValue(BukkitPlayer player, Object value){
        return player.getPlayer() == null ? null : String.valueOf(value);
    }
 }
@@ -0,0 +1,90 @@
+/*
+ * 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.placeholders;
+
+import ch.andre601.advancedserverlist.api.bukkit.objects.BukkitServer;
+import ch.andre601.advancedserverlist.api.PlaceholderProvider;
+import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
+import ch.andre601.advancedserverlist.api.objects.GenericServer;
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+
+public class BukkitServerPlaceholders extends PlaceholderProvider{
+    
+    private BukkitServerPlaceholders(){
+        super("server");
+    }
+    
+    public static BukkitServerPlaceholders init(){
+        return new BukkitServerPlaceholders();
+    }
+    
+    @Override
+    public String parsePlaceholder(String placeholders, GenericPlayer player, GenericServer server){
+        if(!(server instanceof BukkitServer bukkitServer))
+            return null;
+        
+        String[] args = placeholders.split("\\s", 2);
+        
+        return switch(args[0]){
+            case "playersOnline" -> {
+                if(args.length >= 2){
+                    int players = 0;
+                    for(int i = 1; i < args.length; i++){
+                        World world = bukkitServer.getWorlds().get(args[i]);
+                        if(world == null)
+                            continue;
+                        
+                        players += world.getPlayers().size();
+                    }
+                    
+                    yield String.valueOf(players);
+                }
+                
+                yield String.valueOf(bukkitServer.getPlayersOnline());
+            }
+            case "playersMax" -> {
+                if(args.length >= 2)
+                    yield null;
+                
+                yield String.valueOf(bukkitServer.getPlayersMax());
+            }
+            case "host" -> {
+                if(args.length >= 2)
+                    yield null;
+                
+                yield bukkitServer.getHost();
+            }
+            case "whitelistEnabled" -> {
+                if(args.length >= 2)
+                    yield null;
+                
+                yield String.valueOf(Bukkit.hasWhitelist());
+            }
+            default -> null;
+        };
+    }
+}
@@ -0,0 +1,155 @@
+/*
+ * 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.placeholders;
+
+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.bukkit.BukkitCore;
+import ch.andre601.advancedserverlist.bukkit.objects.impl.BukkitPlayerImpl;
+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.listeners.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.*;
+
+public class PAPIPlaceholders<F> extends PlaceholderExpansion{
+    
+    private final BukkitCore<F> plugin;
+    
+    private PAPIPlaceholders(BukkitCore<F> plugin){
+        this.plugin = plugin;
+        this.register();
+    }
+    
+    public static <F> PAPIPlaceholders<F> init(BukkitCore<F> plugin){
+        return new PAPIPlaceholders<>(plugin);
+    }
+    
+    @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 boolean persist(){
+        return true;
+    }
+    
+    @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 BukkitPlayerImpl(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" -> getOption(entry.motd(), pl, player, finalServer);
+            case "favicon" -> getOption(entry.favicon(), pl, player, finalServer);
+            case "playercount_hover" -> getOption(entry.players(), pl, player, finalServer);
+            case "playercount_text" -> getOption(entry.playerCountText(), pl, player, finalServer);
+            case "extra_players_max" -> String.valueOf(max);
+            default -> null;
+        };
+    }
+    
+    private String getOption(String str, Player pl, GenericPlayer player, GenericServer server){
+        return getOption(Collections.singletonList(str), pl, player, server);
+    }
+    
+    private String getOption(List<String> list, Player pl, GenericPlayer player, GenericServer server){
+        return ComponentParser.list(list)
+            .modifyText(text -> PlaceholderAPI.setPlaceholders(pl, text))
+            .modifyText(text -> StringReplacer.replace(text, player, server))
+            .toString();
+    }
+    
+    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.
+        // Also, ViaVersion is not present, so the player protocol *should* be the same as the server.
+        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());
+    }
+}
@@ -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,153 @@
+/*
+ * 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.BukkitCore;
+import ch.andre601.advancedserverlist.bukkit.commands.CmdAdvancedServerList;
+import ch.andre601.advancedserverlist.bukkit.listeners.JoinEvent;
+import ch.andre601.advancedserverlist.bukkit.listeners.LoadEvent;
+import ch.andre601.advancedserverlist.bukkit.listeners.WorldEvents;
+import ch.andre601.advancedserverlist.bukkit.logging.BukkitLogger;
+import ch.andre601.advancedserverlist.bukkit.objects.placeholders.BukkitPlayerPlaceholders;
+import ch.andre601.advancedserverlist.bukkit.objects.placeholders.BukkitServerPlaceholders;
+import ch.andre601.advancedserverlist.bukkit.objects.placeholders.PAPIPlaceholders;
+import ch.andre601.advancedserverlist.bukkit.objects.WorldCache;
+import ch.andre601.advancedserverlist.core.AdvancedServerList;
+import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
+import ch.andre601.advancedserverlist.core.profiles.favicon.FaviconHandler;
+import ch.andre601.advancedserverlist.paper.listeners.PaperPingEvent;
+import org.bstats.bukkit.Metrics;
+import org.bstats.charts.SimplePie;
+import org.bukkit.util.CachedServerIcon;
+
+import java.nio.file.Path;
+
+public class PaperCore extends BukkitCore<CachedServerIcon>{
+    
+    private final PluginLogger logger = new BukkitLogger(getLogger());
+    
+    private AdvancedServerList<CachedServerIcon> core;
+    private FaviconHandler<CachedServerIcon> faviconHandler = null;
+    private PAPIPlaceholders<CachedServerIcon> papiPlaceholders = null;
+    private WorldCache worldCache = null;
+    
+    @Override
+    public void onEnable(){
+        this.core = AdvancedServerList.init(this, BukkitPlayerPlaceholders.init(), BukkitServerPlaceholders.init());
+        
+        if(getServer().getPluginManager().isPluginEnabled("PlaceholderAPI"))
+            papiPlaceholders = PAPIPlaceholders.init(this);
+    }
+    
+    @Override
+    public void onDisable(){
+        if(papiPlaceholders != null){
+            papiPlaceholders.unregister();
+            papiPlaceholders = null;
+        }
+        
+        if(worldCache != null)
+            worldCache = null;
+        
+        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(){
+        LoadEvent.init(this);
+        PaperPingEvent.init(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<CachedServerIcon> 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";
+    }
+    
+    @Override
+    public WorldCache getWorldCache(){
+        if(worldCache != null)
+            return worldCache;
+        
+        return (worldCache = new WorldCache());
+    }
+}
@@ -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;

@@ -23,18 +23,20 @@
 *
 */

-package ch.andre601.advancedserverlist.paper.events;
+package ch.andre601.advancedserverlist.paper.listeners;

 import ch.andre601.advancedserverlist.api.events.GenericServerListEvent;
 import ch.andre601.advancedserverlist.api.objects.GenericServer;
 import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
-import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
+import ch.andre601.advancedserverlist.bukkit.BukkitCore;
+import ch.andre601.advancedserverlist.bukkit.listeners.PreServerListSetEventImpl;
+import ch.andre601.advancedserverlist.bukkit.objects.impl.BukkitServerImpl;
+import ch.andre601.advancedserverlist.bukkit.objects.impl.BukkitPlayerImpl;
 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 ch.andre601.advancedserverlist.paper.objects.PaperPlayerImpl;
 import com.destroystokyo.paper.event.server.PaperServerListPingEvent;
 import com.destroystokyo.paper.profile.PlayerProfile;
 import me.clip.placeholderapi.PlaceholderAPI;
@@ -44,11 +46,9 @@ 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;
+import java.util.*;

-public class PaperEventWrapper implements GenericEventWrapper<CachedServerIcon, PaperPlayerImpl>{
+public class PaperEventWrapper implements GenericEventWrapper<CachedServerIcon, BukkitPlayerImpl>{
    
    private final PaperCore plugin;
    private final PaperServerListPingEvent event;
@@ -88,7 +88,7 @@ public class PaperEventWrapper implements GenericEventWrapper<CachedServerIcon,
    }
    
    @Override
-    public void setPlayers(List<String> lines, PaperPlayerImpl player, GenericServer server){
+    public void setPlayers(List<String> lines, BukkitPlayerImpl player, GenericServer server){
        event.getPlayerSample().clear();
        List<PlayerProfile> players = new ArrayList<>(lines.size());
        
@@ -150,7 +150,7 @@ public class PaperEventWrapper implements GenericEventWrapper<CachedServerIcon,
    }
    
    @Override
-    public String parsePAPIPlaceholders(String text, PaperPlayerImpl player){
+    public String parsePAPIPlaceholders(String text, BukkitPlayerImpl player){
        if(plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI"))
            return PlaceholderAPI.setPlaceholders(player.getPlayer(), text);
        
@@ -163,15 +163,20 @@ public class PaperEventWrapper implements GenericEventWrapper<CachedServerIcon,
    }
    
    @Override
-    public PluginCore<CachedServerIcon> getPlugin(){
+    public BukkitCore<CachedServerIcon> getPlugin(){
        return plugin;
    }
    
    @Override
-    public PaperPlayerImpl createPlayer(CachedPlayer player, int protocol){
+    public BukkitPlayerImpl createPlayer(CachedPlayer player, int protocol){
        OfflinePlayer pl = Bukkit.getOfflinePlayer(player.getUuid());
        
-        return new PaperPlayerImpl(pl.hasPlayedBefore() ? pl : null, player, protocol);
+        return new BukkitPlayerImpl(pl.hasPlayedBefore() ? pl : null, player, protocol);
+    }
+    
+    @Override
+    public GenericServer createGenericServer(int playersOnline, int playersMax, String host){
+        return new BukkitServerImpl(plugin.getWorldCache().worlds(), playersOnline, playersMax, host);
    }
    
    @Override
@@ -23,7 +23,7 @@
 *
 */

-package ch.andre601.advancedserverlist.paper.events;
+package ch.andre601.advancedserverlist.paper.listeners;

 import ch.andre601.advancedserverlist.core.events.PingEventHandler;
 import ch.andre601.advancedserverlist.paper.PaperCore;
@@ -31,17 +31,21 @@ import com.destroystokyo.paper.event.server.PaperServerListPingEvent;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;

-public class PingEvent implements Listener{
+public class PaperPingEvent implements Listener{
    
    private final PaperCore plugin;
    
-    public PingEvent(PaperCore plugin){
+    private PaperPingEvent(PaperCore plugin){
        this.plugin = plugin;
        plugin.getServer().getPluginManager().registerEvents(this, plugin);
    }
    
+    public static void init(PaperCore plugin){
+        new PaperPingEvent(plugin);
+    }
+    
    @EventHandler
-    public void onServerPing(PaperServerListPingEvent event){
+    public void onPaperServerListPing(PaperServerListPingEvent event){
        PingEventHandler.handleEvent(new PaperEventWrapper(plugin, event));
    }
 }
@@ -25,28 +25,33 @@

 package ch.andre601.advancedserverlist.spigot;

+import ch.andre601.advancedserverlist.bukkit.BukkitCore;
+import ch.andre601.advancedserverlist.bukkit.commands.CmdAdvancedServerList;
+import ch.andre601.advancedserverlist.bukkit.logging.BukkitLogger;
+import ch.andre601.advancedserverlist.bukkit.objects.placeholders.BukkitPlayerPlaceholders;
+import ch.andre601.advancedserverlist.bukkit.objects.placeholders.BukkitServerPlaceholders;
+import ch.andre601.advancedserverlist.bukkit.objects.placeholders.PAPIPlaceholders;
+import ch.andre601.advancedserverlist.bukkit.objects.WorldCache;
 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 ch.andre601.advancedserverlist.bukkit.listeners.LoadEvent;
 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;
-import org.bukkit.plugin.java.JavaPlugin;

 import java.nio.file.Path;

-public class SpigotCore extends JavaPlugin implements PluginCore<WrappedServerPing.CompressedImage>{
+public class SpigotCore extends BukkitCore<WrappedServerPing.CompressedImage>{
    
-    private final PluginLogger logger = new SpigotLogger(getLogger());
+    private final PluginLogger logger = new BukkitLogger(getLogger());
    
-    private AdvancedServerList core;
-    FaviconHandler<WrappedServerPing.CompressedImage> faviconHandler = null;
+    private AdvancedServerList<WrappedServerPing.CompressedImage> core;
+    private FaviconHandler<WrappedServerPing.CompressedImage> faviconHandler = null;
+    private PAPIPlaceholders<WrappedServerPing.CompressedImage> papiPlaceholders = null;
+    private WorldCache worldCache = null;
    
    @Override
    public void onEnable(){
@@ -63,11 +68,19 @@ public class SpigotCore extends JavaPlugin implements PluginCore<WrappedServerPi
            }catch(ClassNotFoundException ignored){}
        }
        
-        this.core = new AdvancedServerList(this, new SpigotPlayerPlaceholders());
+        this.core = AdvancedServerList.init(this, BukkitPlayerPlaceholders.init(), BukkitServerPlaceholders.init());
    }
    
    @Override
    public void onDisable(){
+        if(papiPlaceholders != null){
+            papiPlaceholders.unregister();
+            papiPlaceholders = null;
+        }
+        
+        if(worldCache != null)
+            worldCache = null;
+        
        getCore().disable();
    }
    
@@ -75,15 +88,15 @@ 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
    public void loadEvents(){
-        new LoadEvent(this);
+        LoadEvent.init(this);
    }
    
    @Override
@@ -102,7 +115,7 @@ public class SpigotCore extends JavaPlugin implements PluginCore<WrappedServerPi
    }
    
    @Override
-    public AdvancedServerList getCore(){
+    public AdvancedServerList<WrappedServerPing.CompressedImage> getCore(){
        return core;
    }
    
@@ -139,12 +152,24 @@ public class SpigotCore extends JavaPlugin implements PluginCore<WrappedServerPi
        return "spigot";
    }
    
+    @Override
+    public WorldCache getWorldCache(){
+        if(worldCache != null)
+            return worldCache;
+        
+        return (worldCache = new WorldCache());
+    }
+    
+    public void setPapiPlaceholders(PAPIPlaceholders<WrappedServerPing.CompressedImage> papiPlaceholders){
+        this.papiPlaceholders = papiPlaceholders;
+    }
+    
    private void printPaperInfo(){
        getPluginLogger().warn("======================================================================================");
        getPluginLogger().warn("You are using the Spigot version of AdvancedServerList on a Paper server.");
        getPluginLogger().warn("It is recommended to use the dedicated Paper version, to benefit from the");
        getPluginLogger().warn("following improvements:");
-        getPluginLogger().warn(" - No need to download external libraries already provided by PaperMC.");
+        getPluginLogger().warn(" - No downloading of external Libraries already provided by Paper (i.e. Adventure).");
        getPluginLogger().warn(" - No dependency on ProtocolLib thanks to provided Events.");
        getPluginLogger().warn("");
        getPluginLogger().warn("AdvancedServerList may work as normal, but consider using the PaperMC version instead!");
@@ -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;
@@ -23,47 +23,43 @@
 *
 */

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

 import ch.andre601.advancedserverlist.api.events.GenericServerListEvent;
 import ch.andre601.advancedserverlist.api.objects.GenericServer;
 import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
-import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
+import ch.andre601.advancedserverlist.bukkit.BukkitCore;
+import ch.andre601.advancedserverlist.bukkit.listeners.PreServerListSetEventImpl;
+import ch.andre601.advancedserverlist.bukkit.objects.impl.BukkitServerImpl;
 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.impl.BukkitPlayerImpl;
 import com.comphenix.protocol.events.PacketEvent;
-import com.comphenix.protocol.wrappers.AdventureComponentConverter;
+import com.comphenix.protocol.wrappers.WrappedChatComponent;
 import com.comphenix.protocol.wrappers.WrappedGameProfile;
 import com.comphenix.protocol.wrappers.WrappedServerPing;
 import me.clip.placeholderapi.PlaceholderAPI;
 import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
 import org.bukkit.Bukkit;
 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;
+import java.util.*;

-public class ProtocolLibEventWrapper implements GenericEventWrapper<WrappedServerPing.CompressedImage, SpigotPlayerImpl>{
+public class ProtocolLibEventWrapper implements GenericEventWrapper<WrappedServerPing.CompressedImage, BukkitPlayerImpl>{
    
    private final SpigotCore plugin;
    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
@@ -81,7 +77,7 @@ public class ProtocolLibEventWrapper implements GenericEventWrapper<WrappedServe
    
    @Override
    public void setMotd(Component component){
-        ping.setMotD(AdventureComponentConverter.fromComponent(component));
+        ping.setMotD(WrappedChatComponent.fromJson(GsonComponentSerializer.gson().serialize(component)));
    }
    
    @Override
@@ -96,7 +92,7 @@ public class ProtocolLibEventWrapper implements GenericEventWrapper<WrappedServe
    }
    
    @Override
-    public void setPlayers(List<String> lines, SpigotPlayerImpl player, GenericServer server){
+    public void setPlayers(List<String> lines, BukkitPlayerImpl player, GenericServer server){
        List<WrappedGameProfile> players = new ArrayList<>(lines.size());
        
        for(String line : lines){
@@ -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(){
@@ -156,7 +154,7 @@ public class ProtocolLibEventWrapper implements GenericEventWrapper<WrappedServe
    }
    
    @Override
-    public String parsePAPIPlaceholders(String text, SpigotPlayerImpl player){
+    public String parsePAPIPlaceholders(String text, BukkitPlayerImpl player){
        if(plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI"))
            return PlaceholderAPI.setPlaceholders(player.getPlayer(), text);
        
@@ -169,19 +167,24 @@ public class ProtocolLibEventWrapper implements GenericEventWrapper<WrappedServe
        if(host == null)
            return null;
        
-        return hostAddresses.get(host);
+        return ProtocolLibEvents.getHostAddresses().get(host);
    }
    
    @Override
-    public PluginCore<WrappedServerPing.CompressedImage> getPlugin(){
+    public BukkitCore<WrappedServerPing.CompressedImage> getPlugin(){
        return plugin;
    }
    
    @Override
-    public SpigotPlayerImpl createPlayer(CachedPlayer player, int protocol){
+    public BukkitPlayerImpl createPlayer(CachedPlayer player, int protocol){
        OfflinePlayer pl = Bukkit.getOfflinePlayer(player.getUuid());
        
-        return new SpigotPlayerImpl(pl.hasPlayedBefore() ? pl : null, player, protocol);
+        return new BukkitPlayerImpl(pl.hasPlayedBefore() ? pl : null, player, protocol);
+    }
+    
+    @Override
+    public GenericServer createGenericServer(int playersOnline, int playersMax, String host){
+        return new BukkitServerImpl(plugin.getWorldCache().worlds(), playersOnline, playersMax, host);
    }
    
    @Override
@@ -23,7 +23,7 @@
 *
 */

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

 import ch.andre601.advancedserverlist.core.events.PingEventHandler;
 import ch.andre601.advancedserverlist.spigot.SpigotCore;
@@ -32,22 +32,32 @@ import com.comphenix.protocol.ProtocolManager;
 import com.comphenix.protocol.events.ListenerPriority;
 import com.comphenix.protocol.events.PacketAdapter;
 import com.comphenix.protocol.events.PacketEvent;
+import org.bukkit.Bukkit;
 import org.bukkit.event.Listener;

 import java.net.InetSocketAddress;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.TreeMap;

-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 TreeMap<>(String.CASE_INSENSITIVE_ORDER);
    
-    public PingEvent(SpigotCore plugin, ProtocolManager protocolManager){
+    private ProtocolLibEvents(SpigotCore plugin, ProtocolManager protocolManager){
        this.protocolManager = protocolManager;
        
        loadPacketListener(plugin);
+        Bukkit.getPluginManager().registerEvents(this, plugin);
+    }
+    
+    public static void init(SpigotCore plugin, ProtocolManager protocolManager){
+        new ProtocolLibEvents(plugin, protocolManager);
+    }
+    
+    public static Map<String, String> getHostAddresses(){
+        return hostAddresses;
    }
    
    private void loadPacketListener(SpigotCore spigotPlugin){
@@ -67,7 +77,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));
            }
        });
    }
@@ -4,16 +4,21 @@ version: '${plugin.version}'
 description: '${plugin.description}'

 main: 'ch.andre601.advancedserverlist.paper.PaperCore'
+loader: 'ch.andre601.advancedserverlist.paper.ASLLoader'

 api-version: 1.19

-libraries:
-  - 'com.squareup.okhttp3:okhttp:4.10.0'
+dependencies:
+  server:
+    PlaceholderAPI:
+      load: BEFORE
+      required: false
+    ViaVersion:
+      load: BEFORE
+      required: false

-softdepend:
-  - 'PlaceholderAPI'
-
-commands: 
+# The below stuff is NOT used by Paper plugin.
+commands:
  advancedserverlist:
    description: 'Main command of AdvancedServerList'
    usage: '/<command> [help|reload]'
@@ -21,11 +26,12 @@ commands:
      - 'asl'
    permission: 'advancedserverlist.admin'

-permissions: 
+# This is actually supported(?)
+permissions:
  advancedserverlist.*:
    description: 'Grants access to all permissions'
    default: op
-    children: 
+    children:
      - 'advancedserverlist.admin'
  advancedserverlist.admin:
    description: 'Grants access to all permissions'
@@ -7,6 +7,8 @@ main: 'ch.andre601.advancedserverlist.spigot.SpigotCore'

 api-version: 1.19

+folia-supported: true
+
 libraries:
  - 'org.spongepowered:configurate-yaml:4.1.2'
  - 'net.kyori:adventure-api:4.12.0'
@@ -22,7 +24,7 @@ softdepend:
 commands:
  advancedserverlist:
    description: 'Main command of AdvancedServerList'
-    usage: '/<command> [help|reload]'
+    usage: '/<command> [help|reload|clearCache]'
    aliases:
      - 'asl'
    permission: 'advancedserverlist.admin'
@@ -49,4 +51,7 @@ permissions:
    default: op
  advancedserverlist.command.reload:
    description: 'Grants access to /asl reload'
+    default: op
+  advancedserverlist.command.clearcache:
+    description: 'Clears the Player and Favicon cache'
    default: op
@@ -78,6 +78,18 @@
            <type>javadoc</type>
            <scope>provided</scope>
        </dependency>
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>adventure-api</artifactId>
+            <version>4.13.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.kyori</groupId>
+            <artifactId>adventure-text-minimessage</artifactId>
+            <version>4.13.0</version>
+            <scope>compile</scope>
+        </dependency>
        <dependency>
            <groupId>net.kyori</groupId>
            <artifactId>adventure-platform-bungeecord</artifactId>
@@ -90,10 +102,22 @@
            <version>3.0.0</version>
            <scope>compile</scope>
        </dependency>
+        <dependency>
+            <groupId>org.spongepowered</groupId>
+            <artifactId>configurate-yaml</artifactId>
+            <version>4.1.2</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>4.10.0</version>
+            <scope>compile</scope>
+        </dependency>
    </dependencies>

    <build>
-        <finalName>AdvancedServerList-BungeeCord-${plugin.version}</finalName>
+        <finalName>AdvancedServerList-BungeeCord-${plugin.version}${project.build.commit}</finalName>
        <resources>
            <resource>
                <filtering>true</filtering>
@@ -104,12 +128,12 @@
            <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>
                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.5.0</version>
                <configuration>
                    <createDependencyReducedPom>false</createDependencyReducedPom>
                    <relocations>
@@ -125,10 +149,6 @@
                            <pattern>org.bstats</pattern>
                            <shadedPattern>ch.andre601.advancedserverlist.bungeecord.depends.bstats</shadedPattern>
                        </relocation>
-                        <relocation>
-                            <pattern>com.github.benmanes.caffeine</pattern>
-                            <shadedPattern>ch.andre601.advancedserverlist.bungeecord.depends.caffeine</shadedPattern>
-                        </relocation>
                        <relocation>
                            <pattern>okhttp3</pattern>
                            <shadedPattern>ch.andre601.advancedserverlist.bungeecord.depends.okhttp3</shadedPattern>
@@ -26,10 +26,11 @@
 package ch.andre601.advancedserverlist.bungeecord;

 import ch.andre601.advancedserverlist.bungeecord.commands.CmdAdvancedServerList;
-import ch.andre601.advancedserverlist.bungeecord.events.JoinEvent;
-import ch.andre601.advancedserverlist.bungeecord.events.PingEvent;
+import ch.andre601.advancedserverlist.bungeecord.listeners.JoinEvent;
+import ch.andre601.advancedserverlist.bungeecord.listeners.PingEvent;
 import ch.andre601.advancedserverlist.bungeecord.logging.BungeeLogger;
 import ch.andre601.advancedserverlist.bungeecord.objects.BungeePlayerPlaceholders;
+import ch.andre601.advancedserverlist.bungeecord.objects.BungeeServerPlaceholders;
 import ch.andre601.advancedserverlist.core.AdvancedServerList;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
@@ -43,13 +44,13 @@ import java.nio.file.Path;

 public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
    
-    private AdvancedServerList core;
+    private AdvancedServerList<Favicon> core;
    private FaviconHandler<Favicon> faviconHandler = null;
    private final PluginLogger logger = new BungeeLogger(getLogger());
    
    @Override
    public void onEnable(){
-        this.core = new AdvancedServerList(this, new BungeePlayerPlaceholders());
+        this.core = AdvancedServerList.init(this, BungeePlayerPlaceholders.init(), BungeeServerPlaceholders.init());
    }
    
    @Override
@@ -85,7 +86,7 @@ public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
    }
    
    @Override
-    public AdvancedServerList getCore(){
+    public AdvancedServerList<Favicon> getCore(){
        return core;
    }
    
@@ -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;
@@ -23,13 +23,14 @@
 *
 */

-package ch.andre601.advancedserverlist.bungeecord.events;
+package ch.andre601.advancedserverlist.bungeecord.listeners;

 import ch.andre601.advancedserverlist.api.objects.GenericServer;
 import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
 import ch.andre601.advancedserverlist.bungeecord.BungeeCordCore;
 import ch.andre601.advancedserverlist.bungeecord.objects.BungeePlayerImpl;
 import ch.andre601.advancedserverlist.api.events.GenericServerListEvent;
+import ch.andre601.advancedserverlist.bungeecord.objects.BungeeProxyImpl;
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
 import ch.andre601.advancedserverlist.core.interfaces.events.GenericEventWrapper;
 import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
@@ -40,11 +41,13 @@ import net.kyori.adventure.text.serializer.bungeecord.BungeeComponentSerializer;
 import net.md_5.bungee.api.Favicon;
 import net.md_5.bungee.api.ServerPing;
 import net.md_5.bungee.api.chat.TextComponent;
+import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.event.ProxyPingEvent;

 import java.awt.image.BufferedImage;
 import java.net.InetSocketAddress;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;

 public class BungeeEventWrapper implements GenericEventWrapper<Favicon, BungeePlayerImpl>{
@@ -168,6 +171,13 @@ public class BungeeEventWrapper implements GenericEventWrapper<Favicon, BungeePl
        return new BungeePlayerImpl(player, protocol);
    }
    
+    @Override
+    public GenericServer createGenericServer(int playersOnline, int playersMax, String host){
+        Map<String, ServerInfo> servers = plugin.getProxy().getServers();
+        
+        return new BungeeProxyImpl(servers, playersOnline, playersMax, host);
+    }
+    
    @Override
    public Favicon createFavicon(BufferedImage image) throws IllegalArgumentException{
        return Favicon.create(image);
@@ -23,7 +23,7 @@
 *
 */

-package ch.andre601.advancedserverlist.bungeecord.events;
+package ch.andre601.advancedserverlist.bungeecord.listeners;

 import ch.andre601.advancedserverlist.bungeecord.BungeeCordCore;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
@@ -23,7 +23,7 @@
 *
 */

-package ch.andre601.advancedserverlist.bungeecord.events;
+package ch.andre601.advancedserverlist.bungeecord.listeners;

 import ch.andre601.advancedserverlist.bungeecord.BungeeCordCore;
 import ch.andre601.advancedserverlist.core.events.PingEventHandler;
@@ -23,8 +23,9 @@
 *
 */

-package ch.andre601.advancedserverlist.bungeecord.events;
+package ch.andre601.advancedserverlist.bungeecord.listeners;

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

 public class PreServerListSetEventImpl extends PreServerListSetEvent{
@@ -33,10 +33,14 @@ import java.util.Locale;

 public class BungeePlayerPlaceholders extends PlaceholderProvider{
    
-    public BungeePlayerPlaceholders(){
+    private BungeePlayerPlaceholders(){
        super("player");
    }
    
+    public static BungeePlayerPlaceholders init(){
+        return new BungeePlayerPlaceholders();
+    }
+    
    @Override
    public String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
        return switch(placeholder.toLowerCase(Locale.ROOT)){
@@ -0,0 +1,53 @@
+/*
+ * 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.bungeecord.objects;
+
+import ch.andre601.advancedserverlist.api.bungeecord.objects.BungeeProxy;
+import net.md_5.bungee.api.config.ServerInfo;
+
+import java.util.Map;
+
+public record BungeeProxyImpl(Map<String, ServerInfo> servers, int playersOnline, int playersMax, String host) implements BungeeProxy{
+    @Override
+    public Map<String, ServerInfo> getServers(){
+        return servers;
+    }
+    
+    @Override
+    public int getPlayersOnline(){
+        return playersOnline;
+    }
+    
+    @Override
+    public int getPlayersMax(){
+        return playersMax;
+    }
+    
+    @Override
+    public String getHost(){
+        return host;
+    }
+}
@@ -0,0 +1,93 @@
+/*
+ * 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.bungeecord.objects;
+
+import ch.andre601.advancedserverlist.api.PlaceholderProvider;
+import ch.andre601.advancedserverlist.api.bungeecord.objects.BungeeProxy;
+import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
+import ch.andre601.advancedserverlist.api.objects.GenericServer;
+import net.md_5.bungee.api.config.ServerInfo;
+
+import java.net.InetSocketAddress;
+
+public class BungeeServerPlaceholders extends PlaceholderProvider{
+    
+    private BungeeServerPlaceholders(){
+        super("server");
+    }
+    
+    public static BungeeServerPlaceholders init(){
+        return new BungeeServerPlaceholders();
+    }
+    
+    @Override
+    public String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
+        if(!(server instanceof BungeeProxy proxy))
+            return null;
+        
+        String[] args = placeholder.split("\\s", 2);
+        
+        return switch(args[0]){
+            case "playersOnline" -> {
+                if(args.length >= 2){
+                    int players = 0;
+                    
+                    for(int i = 1; i < args.length; i++){
+                        ServerInfo info = proxy.getServers().get(args[i]);
+                        if(info == null)
+                            continue;
+                        
+                        players += info.getPlayers().size();
+                    }
+                    
+                    yield String.valueOf(players);
+                }
+                
+                yield String.valueOf(proxy.getPlayersOnline());
+            }
+            case "playersMax" -> {
+                // ServerInfo doesn't provide the max players that could join, so we won't allow an extra argument
+                if(args.length >= 2)
+                    yield null;
+                
+                yield String.valueOf(proxy.getPlayersMax());
+            }
+            case "host" -> {
+                if(args.length > 2)
+                    yield null;
+                
+                if(args.length == 2){
+                    ServerInfo info = proxy.getServers().get(args[1]);
+                    
+                    yield String.valueOf(((InetSocketAddress)info.getSocketAddress()).getHostString());
+                }
+                
+                yield proxy.getHost();
+            }
+            default -> null;
+        };
+    }
+}
@@ -61,42 +61,49 @@
            <groupId>org.spongepowered</groupId>
            <artifactId>configurate-yaml</artifactId>
            <version>4.1.2</version>
+            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>net.kyori</groupId>
            <artifactId>adventure-api</artifactId>
-            <version>4.12.0</version>
+            <version>4.14.0</version>
+            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>net.kyori</groupId>
            <artifactId>adventure-text-minimessage</artifactId>
-            <version>4.12.0</version>
+            <version>4.14.0</version>
+            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>net.kyori</groupId>
            <artifactId>adventure-text-serializer-legacy</artifactId>
-            <version>4.12.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.ben-manes.caffeine</groupId>
-            <artifactId>caffeine</artifactId>
-            <version>3.1.2</version>
-            <scope>compile</scope>
+            <version>4.14.0</version>
+            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>com.google.code.gson</groupId>
            <artifactId>gson</artifactId>
            <version>2.10.1</version>
+            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>com.squareup.okhttp3</groupId>
            <artifactId>okhttp</artifactId>
-            <version>4.10.0</version>
+            <version>4.11.0</version>
+            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>com.unascribed</groupId>
            <artifactId>flexver-java</artifactId>
            <version>1.1.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>32.0.1-jre</version>
+            <scope>provided</scope>
        </dependency>
        
        <!-- Test dependencies -->
@@ -109,7 +116,7 @@
    </dependencies>

    <build>
-        <finalName>AdvancedServerList-Core-${plugin.version}</finalName>
+        <finalName>AdvancedServerList-Core-${plugin.version}${project.build.commit}</finalName>
        <resources>
            <resource>
                <filtering>true</filtering>
@@ -120,12 +127,12 @@
            <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>
                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.5.0</version>
                <configuration>
                    <createDependencyReducedPom>false</createDependencyReducedPom>
                    <filters>
@@ -37,11 +37,13 @@ import ch.andre601.advancedserverlist.core.profiles.players.PlayerHandler;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.List;
 import java.util.Properties;

-public class AdvancedServerList{
+public class AdvancedServerList<F>{
    
-    private final PluginCore<?> plugin;
+    private final PluginCore<F> plugin;
    private final FileHandler fileHandler;
    private final CommandHandler commandHandler;
    private final PlayerHandler playerHandler;
@@ -51,19 +53,22 @@ public class AdvancedServerList{
    
    private String version;
    
-    public AdvancedServerList(PluginCore<?> plugin, PlaceholderProvider player){
+    private AdvancedServerList(PluginCore<F> plugin, List<PlaceholderProvider> placeholders){
        this.plugin = plugin;
        this.fileHandler = new FileHandler(this);
        this.commandHandler = new CommandHandler(this);
        this.playerHandler = new PlayerHandler(this);
        
-        this.api.addPlaceholderProvider(player);
-        this.api.addPlaceholderProvider(new ServerPlaceholders());
+        placeholders.forEach(this.api::addPlaceholderProvider);
        
        load();
    }
    
-    public PluginCore<?> getPlugin(){
+    public static <F> AdvancedServerList<F> init(PluginCore<F> plugin, PlaceholderProvider... placeholders){
+        return new AdvancedServerList<>(plugin, Arrays.asList(placeholders));
+    }
+    
+    public PluginCore<F> getPlugin(){
        return plugin;
    }
    
@@ -103,6 +108,10 @@ public class AdvancedServerList{
        plugin.clearFaviconCache();
    }
    
+    public void clearPlayerCache(){
+        getPlayerHandler().clearCache();
+    }
+    
    private void load(){
        printBanner();
        resolveVersion();
@@ -117,6 +126,16 @@ public class AdvancedServerList{
            return;
        }
        
+        if(getFileHandler().isOldConfig()){
+            getPlugin().getPluginLogger().info("Detected old config.yml. Attempting to migrate...");
+            if(getFileHandler().migrateConfig()){
+                getPlugin().getPluginLogger().info("Migration completed successfully!");
+            }else{
+                getPlugin().getPluginLogger().warn("Couldn't migrate config.yml! Check previous lines for errors.");
+                return;
+            }
+        }
+        
        if(getFileHandler().loadProfiles()){
            getPlugin().getPluginLogger().info("Successfully loaded " + getFileHandler().getProfiles().size() + " profiles!");
        }else{
@@ -145,12 +164,11 @@ public class AdvancedServerList{
    
        getPlugin().getPluginLogger().info("AdvancedServerList is ready!");
        
-        if(getFileHandler().getBoolean("check_updates"))
+        if(getFileHandler().getBoolean("checkUpdates"))
            this.updateChecker = new UpdateChecker(this);
    }
    
    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!");
        }
    }
 }
@@ -53,7 +53,7 @@ public class PingEventHandler{
            plugin.getCore().getPlayerHandler().getCachedPlayer(event.getPlayerIP()),
            event.getProtocolVersion()
        );
-        GenericServer server = new GenericServerImpl(online, max, host);
+        GenericServer server = event.createGenericServer(online, max, host);
        
        ServerListProfile profile = ProfileManager.resolveProfile(plugin.getCore(), player, server);
        
@@ -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);
+        GenericServer finalServer = event.createGenericServer(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{
@@ -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.core.file;
+
+import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
+import org.spongepowered.configurate.ConfigurateException;
+import org.spongepowered.configurate.ConfigurationNode;
+import org.spongepowered.configurate.NodePath;
+import org.spongepowered.configurate.transformation.ConfigurationTransformation;
+import org.spongepowered.configurate.transformation.TransformAction;
+
+public class ConfigMigrator{
+    
+    public static final int LATEST = 1;
+    
+    private ConfigMigrator(){}
+    
+    public static ConfigurationTransformation.Versioned create(){
+        return ConfigurationTransformation.versionedBuilder()
+            .versionKey("configVersion")
+            .addVersion(LATEST, oneToTwo())
+            .build();
+    }
+    
+    public static ConfigurationTransformation oneToTwo(){
+        return ConfigurationTransformation.builder()
+            .addAction(NodePath.path("unknown_player"), (path, value) -> new Object[]{"unknownPlayer", "name"})
+            .addAction(NodePath.path("unknown_player_uuid"), (path, value) -> new Object[]{"unknownPlayer", "uuid"})
+            .addAction(NodePath.path("disable_cache"), TransformAction.rename("disableCache"))
+            .addAction(NodePath.path("check_updates"), TransformAction.rename("checkUpdates"))
+            .addAction(NodePath.path("send_statistics"), TransformAction.rename("sendStatistics"))
+            .addAction(NodePath.path(), (path, value) -> {
+                value.node("configVersion").set(LATEST);
+                
+                return null;
+            })
+            .build();
+    }
+    
+    public static <N extends ConfigurationNode> N updateNode(final N node, PluginLogger logger) throws ConfigurateException{
+        if(!node.virtual()){
+            final ConfigurationTransformation.Versioned versioned = create();
+            final int startVersion = versioned.version(node);
+            versioned.apply(node);
+            final int endVersion = versioned.version(node);
+            if(startVersion < endVersion)
+                logger.info("Migrated config.yml from " + startVersion + " to " + endVersion);
+        }
+        
+        return node;
+    }
+}
@@ -30,7 +30,9 @@ import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
 import ch.andre601.advancedserverlist.core.profiles.ServerListProfile;
 import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
 import ch.andre601.advancedserverlist.core.profiles.profile.ProfileSerializer;
+import org.spongepowered.configurate.ConfigurateException;
 import org.spongepowered.configurate.ConfigurationNode;
+import org.spongepowered.configurate.yaml.NodeStyle;
 import org.spongepowered.configurate.yaml.YamlConfigurationLoader;

 import java.io.File;
@@ -38,13 +40,16 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;

 public class FileHandler{
    
-    private final AdvancedServerList plugin;
+    private final AdvancedServerList<?> plugin;
    private final PluginLogger logger;
    
    private final Path config;
@@ -54,7 +59,7 @@ public class FileHandler{
    
    private ConfigurationNode node = null;
    
-    public FileHandler(AdvancedServerList core){
+    public FileHandler(AdvancedServerList<?> core){
        this.plugin = core;
        this.logger = core.getPlugin().getPluginLogger();
        
@@ -68,7 +73,7 @@ public class FileHandler{
    
    public boolean loadConfig(){
        logger.info("Loading config.yml...");
-        File folder = config.toFile().getParentFile();
+        File folder = plugin.getPlugin().getFolderPath().toFile();
        if(!folder.exists() && !folder.mkdirs()){
            logger.warn("Couldn't create folder for plugin. Is it missing Write permissions?");
            return false;
@@ -82,6 +87,7 @@ public class FileHandler{
                }
                
                Files.copy(stream, config);
+                logger.info("Created new config.yml!");
            }catch(IOException ex){
                logger.warn("Cannot create config.yml for plugin.", ex);
                return false;
@@ -112,6 +118,26 @@ public class FileHandler{
        return reloadProfiles();
    }
    
+    public boolean migrateConfig(){
+        YamlConfigurationLoader loader = YamlConfigurationLoader.builder()
+            .path(config)
+            .nodeStyle(NodeStyle.BLOCK)
+            .build();
+        
+        if(!makeBackup())
+            return false;
+        
+        try{
+            node = ConfigMigrator.updateNode(loader.load(), logger);
+            loader.save(node);
+            
+            return true;
+        }catch(ConfigurateException ex){
+            logger.warn("Error while trying to migrate config.yml.", ex);
+            return false;
+        }
+    }
+    
    public boolean reloadConfig(){
        return (node = getConfigurationNode(config)) != null;
    }
@@ -164,4 +190,36 @@ public class FileHandler{
    public boolean getBoolean(Object... path){
        return node.node(path).getBoolean();
    }
+    
+    public boolean isOldConfig(){
+        return node.node("configVersion").virtual() || node.node("configVersion").getInt(0) < ConfigMigrator.LATEST;
+    }
+    
+    private boolean makeBackup(){
+        logger.info("Making backup of old config.yml...");
+        
+        File backups = plugin.getPlugin().getFolderPath().resolve("backups").toFile();
+        if(!backups.exists() && !backups.mkdirs()){
+            logger.warn("Cannot create backups folder for migration!");
+            return false;
+        }
+        
+        String date = DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(LocalDateTime.now());
+        
+        File configBackup = new File(backups, "config_" + date.replace(":", "_") + ".yml");
+        try{
+            if(!configBackup.exists() && !configBackup.createNewFile()){
+                logger.warn("Cannot create backup file for config.yml!");
+                return false;
+            }
+            
+            Files.copy(config, configBackup.toPath(), StandardCopyOption.REPLACE_EXISTING);
+            logger.info("Saved backup as '" + configBackup.getName() + "'!");
+            
+            return true;
+        }catch(IOException ex){
+            logger.warn("Encountered IOException while trying to create a backup.", ex);
+            return false;
+        }
+    }
 }
@@ -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,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.core.interfaces.commands;
+
+import java.util.Locale;
+
+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().toLowerCase(Locale.ROOT);
+    }
+    
+    public abstract void handle(CmdSender sender);
+}
@@ -41,7 +41,7 @@ public interface PluginCore<F>{
    
    void clearFaviconCache();
    
-    AdvancedServerList getCore();
+    AdvancedServerList<F> getCore();
    
    Path getFolderPath();
    
@@ -75,6 +75,8 @@ public interface GenericEventWrapper<F, P extends GenericPlayer>{
    
    P createPlayer(CachedPlayer player, int protocol);
    
+    GenericServer createGenericServer(int playersOnline, int playersMax, String host);
+    
    F createFavicon(BufferedImage image) throws Exception;
    
    default String resolveHost(InetSocketAddress address){
@@ -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);
        }
    }
 }
@@ -127,12 +127,24 @@ public class Expression{
                return left.equals(right);
            }
        },
+        EQUALS_IGNORE_CASE('~', '='){
+            @Override
+            public boolean evaluate(String left, String right){
+                return left.equalsIgnoreCase(right);
+            }
+        },
        NOT_EQUAL('!', '='){
            @Override
            public boolean evaluate(String left, String right){
                return !left.equals(right);
            }
        },
+        NOT_EQUAL_IGNORE_CASE('!', '~'){
+            @Override
+            public boolean evaluate(String left, String right){
+                return !left.equalsIgnoreCase(right);
+            }
+        },
        GREATER('>', '\0'){
            @Override
            public boolean evaluate(String left, String right){
@@ -172,7 +184,7 @@ public class Expression{
        public static Operator getOperand(char first, char second){
            for(Operator operator : VALUES){
                if(operator.first == first){
-                    if((!operator.hasSecond() && second != '=') || operator.second == second)
+                    if((!operator.hasSecond() && second != '=' && second != '~') || operator.second == second)
                        return operator;
                }
            }
@@ -26,8 +26,8 @@
 package ch.andre601.advancedserverlist.core.profiles.favicon;

 import ch.andre601.advancedserverlist.core.AdvancedServerList;
-import com.github.benmanes.caffeine.cache.Cache;
-import com.github.benmanes.caffeine.cache.Caffeine;
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;

 import javax.imageio.ImageIO;
 import java.awt.*;
@@ -39,12 +39,13 @@ import java.io.InputStream;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.Locale;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;

 public class FaviconHandler<F>{
    
-    private final Cache<String, F> favicons = Caffeine.newBuilder()
+    private final Cache<String, F> favicons = CacheBuilder.newBuilder()
        .expireAfterWrite(5, TimeUnit.MINUTES)
        .build();
    
@@ -55,13 +56,17 @@ public class FaviconHandler<F>{
    }
    
    public F getFavicon(String input, Function<BufferedImage, F> function){
-        return favicons.get(input, k -> {
-            BufferedImage image = resolveImage(core, input);
-            if(image == null)
-                return null;
-            
-            return function.apply(image);
-        });
+        try{
+            return favicons.get(input, () -> {
+                BufferedImage image = resolveImage(core, input);
+                if(image == null)
+                    return null;
+                
+                return function.apply(image);
+            });
+        }catch(ExecutionException ignored){
+            return null;
+        }
    }
    
    public void clearCache(){
@@ -44,7 +44,7 @@ import java.util.UUID;

 public class PlayerHandler{
    
-    private final AdvancedServerList core;
+    private final AdvancedServerList<?> core;
    private final PluginLogger logger;
    private final Path cache;
    private List<CachedPlayer> cachedPlayers = new ArrayList<>();
@@ -53,11 +53,11 @@ public class PlayerHandler{
    private final Gson gson = new Gson();
    
    // UUID of MHF_Question
-    private final String defaultUUID = "606e2ff0-ed77-4842-9d6c-e1d3321c7838";
+    private final UUID defaultUUID = UUID.fromString("606e2ff0-ed77-4842-9d6c-e1d3321c7838");
    
    private CachedPlayer defaultPlayer = null;
    
-    public PlayerHandler(AdvancedServerList core){
+    public PlayerHandler(AdvancedServerList<?> core){
        this.core = core;
        this.logger = core.getPlugin().getPluginLogger();
        this.cache = core.getPlugin().getFolderPath().resolve("playercache.json");
@@ -69,7 +69,7 @@ public class PlayerHandler{
            return;
        }
        
-        if(core.getFileHandler().getBoolean("disable_cache")){
+        if(core.getFileHandler().getBoolean("disableCache")){
            logger.info("'disable_cache' is set to true. Skipping playercache.json loading...");
            return;
        }
@@ -94,7 +94,7 @@ public class PlayerHandler{
            return;
        }
        
-        if(core.getFileHandler().getBoolean("disable_cache")){
+        if(core.getFileHandler().getBoolean("disableCache")){
            logger.info("'disable_cache' is set to true. Skipping saving of cached players...");
            return;
        }
@@ -110,14 +110,14 @@ public class PlayerHandler{
    }
    
    public void addPlayer(String ip, String name, UUID uuid){
-        if(contains(ip) || core.getFileHandler().getBoolean("disable_cache"))
+        if(contains(ip) || core.getFileHandler().getBoolean("disableCache"))
            return;
        
        cachedPlayers.add(new CachedPlayer(ip, name, uuid));
    }
    
    public CachedPlayer getCachedPlayer(String key){
-        if(!contains(key) || core.getFileHandler().getBoolean("disable_cache"))
+        if(!contains(key) || core.getFileHandler().getBoolean("disableCache"))
            return getDefaultPlayer();
        
        for(CachedPlayer player : cachedPlayers){
@@ -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))
@@ -143,8 +157,8 @@ public class PlayerHandler{
        
        return (defaultPlayer = new CachedPlayer(
            "0.0.0.0",
-            core.getFileHandler().getString("Anonymous", "unknown_player"),
-            convertToUUID(core.getFileHandler().getString(defaultUUID, "unknown_player_uuid"))
+            core.getFileHandler().getString("Anonymous", "unknownPlayer", "name"),
+            convertToUUID(core.getFileHandler().getString(defaultUUID.toString(), "unknownPlayer", "uuid"))
        ));
    }
    
@@ -153,7 +167,7 @@ public class PlayerHandler{
            return UUID.fromString(uuid);
        }catch(IllegalArgumentException ex){
            // This is always a valid UUID.
-            return UUID.fromString(defaultUUID);
+            return defaultUUID;
        }
    }
    
@@ -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());
    }
 }
@@ -1,27 +1,25 @@
 #
-# Used for when AdvancedServerList doesn't have a cached player to use for ${player name}
+# Used for when AdvancedServerList doesn't have a cached player to use for player placeholders.
 #
-# Defaults to 'Anonymous' when not present.
-#
-unknown_player: "Anonymous"
-
-#
-# UUID used for when AdvancedServerList doesn't have a cached player to use for the ${player uuid}
-# placeholder.
-#
-# Defaults to the UUID of MHF_Question (606e2ff0-ed77-4842-9d6c-e1d3321c7838) when not present.
-#
-unknown_player_uuid: "606e2ff0-ed77-4842-9d6c-e1d3321c7838"
+unknownPlayer:
+  #
+  # The name to use. Defaults to Anonymous.
+  #
+  name: "Anonymous"
+  #
+  # The UUID to use. Defaults to 606e2ff0-ed77-4842-9d6c-e1d3321c7838 (UUID of MHF_Question).
+  #
+  uuid: "606e2ff0-ed77-4842-9d6c-e1d3321c7838"

 #
 # Should the Caching of players be disabled?
 #
 # When set to true will AdvancedServerList not load any players from the cache.data file (if present) nor save any to it.
-# Placeholders that rely on the player being cached (such as ${player isWhitelisted}) will not work while this option is enabled.
+# Placeholders that rely on the player being cached (such as ${player name}) will not work while this option is enabled.
 #
 # Defaults to false when not present.
 #
-disable_cache: false
+disableCache: false

 #
 # Should AdvancedServerList check for new versions?
@@ -31,4 +29,12 @@ disable_cache: false
 #
 # Defaults to false when not present.
 #
-check_updates: true
+checkUpdates: true
+
+#
+# DO NOT EDIT!
+#
+# This is used internally to determine if the config needs to be migrated.
+# Changing or even removing this option could result in your config being broken.
+#
+config-version: 2
@@ -3,6 +3,31 @@
 This page lists the recent changes made towards the AdvancedServerListAPI.  
 They are ordered newest to oldest.

+## v3.0.0
+
+### :octicons-alert-24:{ .changelog-breaking title="Breaking Changes" } Breaking Changes { #v3-breaking }
+
+- Removed `platform-spigot` API in favour of a more generic sounding `platform-bukkit`
+- Renamed all platform-specific packages from `ch.andre601.advancedserverlist.<platform>` to `ch.andre601.advancedserverlist.api.<platform>`
+
+### :octicons-plus-circle-24:{ .changelog-added title="Added" } Added { #v3-added }
+
+- New platform-specific `GenericServer` instances with their own methods to use.
+  - `BukkitServer` - Contains a `getWorlds()` method that returns a `Map<String, World>` of all loaded worlds in the server.
+  - `BungeeProxy` - Contains a `getServers()` method that returns a `Map<String, ServerInfo>` of all known Servers for BungeeCord.
+  - `VelocityProxy` - Contains a `getServers()` method that returns a `Map<String, RegisteredServer>` of all known Servers for Velocity.
+
+### :octicons-trash-24:{ .changelog-removed title="Removed" } Removed { #v-removed }
+
+- All previously deprecated `getX()` methods from the `ProfileEntry` record
+
+## v2.1.0
+
+### :octicons-pencil-24:{ .changelog-changed title="Changed" } Changed { #v2.1.0-changed }
+
+- Turned `ProfileEntry` class into a record
+    - Former `getX()` methods are now deprecated in favour of the record'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

@@ -11,9 +11,9 @@ Add the following to your `build.gradle` or `pom.xml` file to use the API:
    
    Make sure to replace `{version}` with the latest version available in the [GitHub Repository][api-repo].
    
-    ```groovy
+    ```groovy title="build.gradle"
    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}'
    }
@@ -31,7 +30,7 @@ Add the following to your `build.gradle` or `pom.xml` file to use the API:
    
    Make sure to replace `{version}` with the latest version available in the [GitHub Repository][api-repo].
    
-    ```xml
+    ```xml title="pom.xml"
    <repositories>
      <repository>
        <id>jitpack</id>
@@ -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>
@@ -84,8 +78,9 @@ It will be needed at a later point.
 ### 2) Create a Placeholder class

 Make a new class that you want to use for the placeholders and let it extend the `PlaceholderProvider` class of AdvancedServerList.  
-Your IDE should now tell you to implement/override some methods. Confirm this action and your class should look something alongside this:  
-```java
+Your IDE should now tell you to implement/override some methods. Confirm this action and your class should look something alongside this:
+
+```java title="PlaceholderProvider example"
 public class MyPlaceholders extends PlaceholderProvider {
    
    public MyPlaceholders(String identifier) {
@@ -100,7 +95,8 @@ public class MyPlaceholders extends PlaceholderProvider {
 ```

 It's recommended to replace your generated constructor with a no-args one and set the identifier directly in the `super()`.  
-For example:  
+For example:
+
 ```java
 public MyPlaceholders() {
    super("myplaceholders");
@@ -112,8 +108,9 @@ The `placeholder` String is whatever value was provided after the identifier in

 Something to note is, that when returning `null` will AdvancedServerList understand it as an invalid placeholder and return it unchanged.

-Here is a small example of the final class:  
-```java
+Here is a small example of the final class:
+
+```java title="PlaceholderProvider example"
 public class MyPlaceholders extends PlaceholderProvider {
    
    public MyPlaceholders() {
@@ -134,8 +131,7 @@ public class MyPlaceholders extends PlaceholderProvider {

 All that is left to do now is to register your class as a new PlaceholderProvider instance. To do this, get the API instance you retrieved earlier and use `addPlaceholderProvider` with a new instance of your class.

-Example:  
-```java
+```java title="Registering PlaceholderProvider class"
 AdvancedServerListAPI api = AdvancedServerListAPI.get();

 api.addPlaceholderProvider(new MyPlaceholders());
@@ -146,12 +142,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,23 @@

 .changelog-breaking {
    color: #9e6a03
+}
+
+.md-banner--warning__icon {
+    color: #d29922;
+}
+
+.result {
+    border: .05rem solid var(--md-code-bg-color);
+    border-bottom-left-radius: .1rem;
+    border-bottom-right-radius: .1rem;
+    border-top-width: .1rem;
+    margin-top: -1.125em;
+    overflow: visible;
+    padding: 0 1em;
+}
+
+/* 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.
@@ -28,7 +28,7 @@ Some examples about version-related things.
 You may want to display a separate MOTD or text for incompatible client versions.  
 This example here shows a separate MOTD and player count message for when the player's client version is older than what the server supports.

-```yaml
+```yaml title="outdated-client.yml"
 priority: 1

 # Display this profile, if the version of the player is below 760 (1.19.1)
@@ -47,7 +47,7 @@ playerCount:

 This profile would display a MOTD without HEX colours if the player's version is below 735 (1.16).

-```yaml
+```yaml title="pre-1_16.yml"
 priority: 1

 # Display this profile, if the version of the player is below 735 (1.16)
@@ -70,7 +70,7 @@ Examples that can be used with the Spigot or PaperMC version.

 Displays a separate profile for when the player has been banned from the server.

-```yaml
+```yaml title="banned.yml"
 priority: 1

 conditions:
@@ -94,7 +94,7 @@ Some misc examples.

 Display a different profile when the playing pings a specific domain/IP.

-```yaml
+```yaml title="specific-host.yml"
 priority: 1

 conditions:
@@ -109,7 +109,7 @@ motd:

 Display a different profile, if the player pinging the server is "known" by AdvancedServerList (Has joined before with the same IP).

-```yaml
+```yaml title="personalized.yml"
 priority: 1

 conditions:
@@ -132,7 +132,8 @@ playerCount:
 v1.10.0 of AdvancedServerList introduced an option called `profiles`. It allows you to create multiple variants of an MOTD, playercount, etc. while also supporting the normal (global) options as a fallback.

 The following example will create a profile that has a randomized MOTD, but the same hover for both:
-```yaml
+
+```yaml title="random-motd.yml"
 priority: 1

 profiles:
@@ -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/
@@ -2,6 +2,26 @@

 All text options with exception of [`Conditions`](../#conditions) allow the usage of formatting options using [MiniMessage].

+!!! warning "IMPORTANT"
+    Whenever your text starts with a colour or formatting code (`<aqua>`, `<blue>`, `<bold>`, `<italic>`, etc.) should it be surrounded with single or double quotes.  
+    Not doing so will cause the YAML parses used - Configurate - to not see the value as a String, but something else, causing exceptions to appear.
+    
+    ```yaml title="Wrong formatting"
+    motd:
+      - <red>This will cause
+      - <red>Errors
+    ```
+
+    ```yaml title="Right formatting"
+    motd:
+      - '<green>This will be formatted'
+      - '<green>properly.'
+    ```
+
+!!! info "Online Tool"
+    The devs of the Adventure library provide a handy online tool to create the right formatting codes to display the text properly.  
+    You can find the tool at https://webui.advntr.dev/
+
 ## Unsupported options

 The following options are **not** supported, no matter what option they are used in:
@@ -18,4 +38,4 @@ Normal text colours such as `<aqua>` or `<red>` can be used in all text options.

 24-Bit HEX colours such as `<#ffffff>` can be used in the [`Motd`](../#motd) option on 1.16+ servers/proxies.

-[MiniMessage]: https://docs.adventure.kyori.net/minimessage/index.html
+[MiniMessage]: https://docs.adventure.kyori.net/minimessage/index.html
@@ -31,68 +31,54 @@ Only when **all** conditions defined return true will the profile be displayed.

 You can remove this option, or set it to an empty list (`conditions: []`) to always return true.

-### Operants
+### Operands

 The following operants are available and can be used in the conditions.

 !!! warning "Only one operant can be used per condition!"

-| Operant | Description                                                        |
-| ------- | ------------------------------------------------------------------ |
-| `<`     | Checks if the left value is less than the right one.\*             |
-| `<=`    | Checks if the left value is less than or equal to the right one.\* |
-| `>`     | Checks if the left value is more than the right one.\*             |
-| `>=`    | Checks if the left value is more than or equal to the right one.\* |
-| `=`     | Checks if the left value is equal to the right one.                |
-| `!=`    | Checks if the left value is not equal to the right one.            |
+| Operand | Description                                                            |
+|---------|------------------------------------------------------------------------|
+| `<`     | Checks if the left value is less than the right one.[^1]               |
+| `<=`    | Checks if the left value is less than or equal to the right one.[^1]   |
+| `>`     | Checks if the left value is more than the right one.[^1]               |
+| `>=`    | Checks if the left value is more than or equal to the right one.[^1]   |
+| `=`     | Checks if the left value is equal to the right one.                    |
+| `!=`    | Checks if the left value is not equal to the right one.                |
+| `~=`    | Checks if the left value is equal to the right one, ignoring case.     |
+| `!~`    | Checks if the left value is not equal to the right one, ignoring case. |

-\* In the case of the provided value not being a number will the plugin instead use the text length to compare with.
+[^1]: In the case of the provided value not being a number will the plugin instead use the text length to compare with.

 ## 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.
+The profiles option allows you to add multiple combinations of all the other options (Except for [`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
+??? example "Example"
+    ```yaml title="YAML file"
+    priority: 0
+    
+    profiles:
+      - motd:
+          - '<rainbow>Line 1</rainbow>'
+          - '<rainbow:!>Line 2</rainbow>'
+        playerCount:
+          text: '<green><bold>Awesome!'
+      - playerCount:
+          text: '<yellow><bold>Also Awesome!'
+    
+    motd:
+      - '<rainbow:2>Line A</rainbow>'
+      - '<rainbow:!2>Line B</rainbow>'
+    ```
+    <div class="result">
+    
+    ![profiles-example-1](../assets/images/examples/profiles-example-1.jpg)  
+    ![profiles-example-2](../assets/images/examples/profiles-example-2.jpg)

-profiles:
-  - motd:
-      - Line 1
-      - Line 2
-    playerCount:
-      text: 'Awesome!'
-  - playerCount:
-      text: 'Also Awesome'
-
-motd:
-  - Line A
-  - Line B
-```
-...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`
-
-## 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
-```
+    </div>

 ## Motd

@@ -101,6 +87,21 @@ Normal colour and formatting codes such as `<aqua>` or `<bold>` are supported. O

 If you want to display multiple MOTDs will you need to use the [`Profiles` option](#profiles)

+??? example "Example"
+    ```yaml title="YAML file"
+    priority: 0
+    
+    motd:
+      - '<rainbow:2>Rainbow Gradients</rainbow>'
+      - '<rainbow:!2>|||||||||||||||||||||||||||||||||||||</rainbow>'
+    ```
+    <div class="result">
+
+    ![motd-example](../assets/images/examples/motd-example.jpg)
+
+    </div>
+
+
 ## Favicon

 The favicon option allows you to customize the favicon and display one or multiple different images.
@@ -113,6 +114,24 @@ This option currently supports the following values:

 Please note that AdvancedServerList will rescale the image to be 64x64 pixels, so be sure to provide images at that particular scale.

+??? example "Example"
+    ```yaml title="YAML file"
+    priority: 0
+    
+    # We use just colour to hide the MOTD
+    motd:
+      - '<grey>'
+      - '<grey>'
+    
+    # Player is Andre_601
+    favicon: ${player uuid}
+    ```
+    <div class="result">
+
+    ![hideplayers-example](../assets/images/examples/favicon-example.jpg)
+
+    </div>
+
 ## PlayerCount

 The `playerCount` option contains multiple different options all about the Player count itself.
@@ -122,12 +141,51 @@ The `playerCount` option contains multiple different options all about the Playe
 Boolean option to set whether AdvancedServerList should hide the player count or not. When set to `true` will the player count be replaced with `???`.  
 Additionally will the [`Text`](#text) and [`Hover`](#hover) option be ignored.

+??? example "Example"
+    ```yaml title="YAML file"
+    priority: 0
+    
+    # We use just colour to hide the MOTD
+    motd:
+      - '<grey>'
+      - '<grey>'
+    
+    playerCount:
+      hidePlayers: true
+    ```
+    <div class="result">
+
+    ![hideplayers-example](../assets/images/examples/hideplayers-example.jpg)
+
+    </div>
+
 ### Hover

 This option allows to override the hover text usually displaying the players on the server when hovering over the player count.

 You can either remove this option or set to an empty list (`hover: []`) to not override the hover.

+??? example "Example"
+    ```yaml title="YAML file"
+    priority: 0
+    
+    # We use just colour to hide the MOTD
+    motd:
+      - '<grey>'
+      - '<grey>'
+    
+    playerCount:
+      hover:
+        - '<grey>Line 1'
+        - '<aqua>Line 2'
+        - '<gold>Line 3'
+    ```
+    <div class="result">
+
+    ![hover-example](../assets/images/examples/hover-example.jpg)
+
+    </div>
+
 ### Text

 This option allows to override the text usually displaying the online players and total players that can join.  
@@ -139,6 +197,24 @@ Note that AdvancedServerList will not add the `<online>/<max>` text to the playe

 To not override the player count, remove this option or set it to an empty String (`text: ''`).

+??? example "Example"
+    ```yaml title="YAML file"
+    priority: 0
+    
+    # We use just colour to hide the MOTD
+    motd:
+      - '<grey>'
+      - '<grey>'
+    
+    playerCount:
+      text: '<yellow><bold>Cool text!'
+    ```
+    <div class="result">
+
+    ![hover-example](../assets/images/examples/text-example.jpg)
+
+    </div>
+
 ### ExtraPlayers

 Contains options to modify how the `<max>` number in the player count should look like.
@@ -154,4 +230,24 @@ When set to `true` will the max amount of players be modified by taking the curr

 Sets the number to add to the current online players to then use as the new max players count.

-As an example, setting this to `1` while `10` players are online will display `11`, while `-1` would display `9`.
+As an example, setting this to `1` while `10` players are online will display `11`, while `-1` would display `9`.
+
+??? example "Example"
+    ```yaml title="YAML file"
+    priority: 0
+    
+    # We use just colour to hide the MOTD
+    motd:
+      - '<grey>'
+      - '<grey>'
+    
+    playerCount:
+      extraPlayers:
+        enabled: true
+        amount: 1
+    ```
+    <div class="result">
+
+    ![hover-example](../assets/images/examples/extraplayers-example.jpg)
+
+    </div>
@@ -11,31 +11,41 @@ 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\*\*\*                 |
-| `${player version}`         | The protocol version of the player as readable MC version.      | Velocity     | No                        |
-| `${player hasPlayedBefore}` | Boolean for whether the player has played on the server before. | Spigot/Paper | Yes                       |
-| `${player isBanned}`        | Boolean for whether the player has been banned from the server. | Spigot/Paper | Yes                       |
-| `${player isWhitelisted}`   | Boolean for whether the player is whitelisted on the server.    | Spigot/Paper | Yes                       |
+| Placeholder                 | Description                                                     | Platforms    | Cached Player required?[^1] |
+|-----------------------------|-----------------------------------------------------------------|--------------|-----------------------------|
+| `${player name}`            | The name of the player.                                         | All          | Yes[^2]                     |
+| `${player protocol}`        | The protocol version of the player.                             | All          | No                          |
+| `${player uuid}`            | The UUID of the player.                                         | All          | Yes[^3]                     |
+| `${player version}`         | The protocol version of the player as readable MC version.      | Velocity     | No                          |
+| `${player hasPlayedBefore}` | Boolean for whether the player has played on the server before. | Spigot/Paper | Yes                         |
+| `${player isBanned}`        | Boolean for whether the player has been banned from the server. | Spigot/Paper | Yes                         |
+| `${player isWhitelisted}`   | Boolean for whether the player is whitelisted on the server.    | Spigot/Paper | Yes                         |

-\*Whether this placeholder requires the player to have joined before while AdvancedServerList was running. When `disable_cache` is enabled will these placeholders not work.  
-\*\*Will default to whatever name has been provided in the config.yml's `unknown_player` option, when the player isn't cached yet.  
-\*\*\*Will default to whatever name has been provided in the config.yml's `unknown_player_uuid` option, when the player isn't cached yet.
+[^1]:
+    Whether this placeholder requires the player to have joined before while AdvancedServerList was running.  
+    When `disableCache` is enabled will these placeholders not work.
+[^2]: Will default to whatever name has been provided in the `unknownPlayer -> name` option of the config.yml, when the player isn't cached yet.
+[^3]: Will default to whatever name has been provided in the `unknownPlayer -> uuid` option of the config.yml, when the player isn't cached yet.

 ### Server

 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.                         |
+| Placeholder               | Description                                                |
+|---------------------------|------------------------------------------------------------|
+| `${server playersOnline}` | The number of players online on this proxy/server.[^4]     |
+| `${server playersMax}`    | The total number of players that can join this server.[^5] |
+| `${server host}`          | The domain/IP the player pinged.[^6]                       |

-\*This placeholder is affected by the [`Amount` option](../#amount) in a server list profile, with the exception being when used in [`Conditions`](../#conditions).
+[^4]:
+    An space-separated list of worlds (Spigot/Paper) or Servers (BungeeCord/Velocity) can be provided to display the number of players in these worlds/servers.  
+    Example: `${server playersOnline lobby1 lobby2}` will display the numbers of players online on the servers `lobby1` and `lobby2`.
+[^5]:
+    When the [`amount` option](../#amount) is used will this placeholder display the modified max players count.  
+    The only exception is [`conditions`](../#conditions) where it uses the actual max players of the server/proxy.
+[^6]:
+    An optional server name can be provided to display the IP/Domain associated with that server. Only works on BungeeCord/Velocity.
+    Example: `${server host survival}` would display the IP/Domain associated with the `survival` server.

 ## PlaceholderAPI

@@ -27,111 +27,73 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
    <parent>
-        <artifactId>parent</artifactId>
        <groupId>ch.andre601.advancedserverlist</groupId>
+        <artifactId>parent</artifactId>
        <version>parent</version>
    </parent>
-    <modelVersion>4.0.0</modelVersion>

-    <artifactId>paper</artifactId>
-    <packaging>jar</packaging>
-    <version>${plugin.version}</version>
+    <artifactId>hangar-uploader</artifactId>

    <properties>
        <maven.compiler.source>16</maven.compiler.source>
        <maven.compiler.target>16</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    </properties>
    
-    <repositories>
-        <repository>
-            <id>papermc</id>
-            <url>https://papermc.io/repo/repository/maven-public/</url>
-        </repository>
-        <repository>
-            <id>placeholderapi-repo</id>
-            <url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
-        </repository>
-    </repositories>
-    
    <dependencies>
        <dependency>
-            <groupId>ch.andre601.advancedserverlist</groupId>
-            <artifactId>core</artifactId>
-            <version>${plugin.version}</version>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.10.1</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
-            <groupId>ch.andre601.asl-api</groupId>
-            <artifactId>platform-spigot</artifactId>
-            <version>${api.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.papermc.paper</groupId>
-            <artifactId>paper-api</artifactId>
-            <version>1.19-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.bstats</groupId>
-            <artifactId>bstats-bukkit</artifactId>
-            <version>3.0.0</version>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.4.6</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
-            <groupId>me.clip</groupId>
-            <artifactId>placeholderapi</artifactId>
-            <version>2.11.2</version>
-            <scope>provided</scope>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+            <version>5.2.1</version>
+            <scope>compile</scope>
        </dependency>
    </dependencies>
-    
+
    <build>
-        <finalName>AdvancedServerList-Paper-${plugin.version}</finalName>
-        <resources>
-            <resource>
-                <filtering>true</filtering>
-                <directory>${project.basedir}/src/main/resources</directory>
-            </resource>
-        </resources>
+        <finalName>HangarUploader</finalName>
        <plugins>
            <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>
            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.2.2</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>lib/</classpathPrefix>
+                            <mainClass>ch.andre601.advancedserverlist.hangaruploader.HangarUploader</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-shade-plugin</artifactId>
                <version>3.4.1</version>
                <configuration>
                    <createDependencyReducedPom>false</createDependencyReducedPom>
-                    <relocations>
-                        <relocation>
-                            <pattern>org.spongepowered.configurate</pattern>
-                            <shadedPattern>ch.andre601.advancedserverlist.paper.depends.configurate</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>org.bstats</pattern>
-                            <shadedPattern>ch.andre601.advancedserverlist.paper.depends.bstats</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>com.github.benmanes.caffeine</pattern>
-                            <shadedPattern>ch.andre601.advancedserverlist.paper.depends.caffeine</shadedPattern>
-                        </relocation>
-                    </relocations>
-                    <filters>
-                        <filter>
-                            <artifact>*:*</artifact>
-                            <excludes>
-                                <exclude>META-INF/*.SF</exclude>
-                                <exclude>META-INF/*.RSA</exclude>
-                            </excludes>
-                        </filter>
-                    </filters>
                </configuration>
                <executions>
                    <execution>
@@ -0,0 +1,209 @@
+/*
+ * 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.hangaruploader;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonObject;
+import org.apache.hc.client5.http.classic.HttpClient;
+import org.apache.hc.client5.http.classic.methods.HttpPost;
+import org.apache.hc.client5.http.entity.mime.FileBody;
+import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder;
+import org.apache.hc.client5.http.entity.mime.StringBody;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.core5.http.ContentType;
+import org.apache.hc.core5.http.HttpMessage;
+import org.apache.hc.core5.http.ParseException;
+import org.apache.hc.core5.http.io.entity.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+public class HangarUploader{
+    
+    private static final Logger LOGGER = LoggerFactory.getLogger(HangarUploader.class);
+    private static final String API_URL = "https://hangar.papermc.io/api/v1/";
+    
+    private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
+    private final String apiKey;
+    private ActiveJWT activeJWT;
+    
+    public HangarUploader(String apiKey){
+        this.apiKey = apiKey;
+    }
+    
+    public static void main(String[] args) throws IOException{
+        LOGGER.info("Starting Jar file...");
+        final VersionUpload.Namespace project = new VersionUpload.Namespace("Andre_601", "AdvancedServerList");
+        
+        if(args.length < 3){
+            throw new IllegalStateException("Application requires HANGAR_TOKEN, RELEASE_TAG, PRERELEASE and RELEASE_BODY to work");
+        }
+        
+        String apiToken = args[0];
+        String version = args[1].startsWith("v") ? args[1].substring(1) : args[1];
+        boolean isPreRelease = args[2].equalsIgnoreCase("true");
+        String body = System.getenv("GITHUB_RELEASE_BODY");
+        
+        LOGGER.info("Version: {}", version);
+        LOGGER.info("Is Prerelease: {}", isPreRelease);
+        LOGGER.info("Release Message: {}", body);
+        
+        final List<Path> filePaths = List.of(
+            new File("bukkit/target/AdvancedServerList-Bukkit-" + version + ".jar").toPath(),
+            new File("bungeecord/target/AdvancedServerList-BungeeCord-" + version + ".jar").toPath(),
+            new File("velocity/target/AdvancedServerList-Velocity-" + version + ".jar").toPath()
+        );
+        final List<VersionUpload.PluginDependency> paperDependencies = List.of(
+            VersionUpload.PluginDependency.createWithHangarNamespace(
+                "ViaVersion",
+                false,
+                new VersionUpload.Namespace("ViaVersion", "ViaVersion")
+            ),
+            VersionUpload.PluginDependency.createWithExternalUrl(
+                "PlaceholderAPI",
+                false,
+                "https://www.spigotmc.org/resources/6245/"
+            )
+        );
+        final List<VersionUpload.MultipartFileOrUrl> fileInfo = List.of(
+            new VersionUpload.MultipartFileOrUrl(List.of(VersionUpload.Platform.PAPER), null),
+            new VersionUpload.MultipartFileOrUrl(List.of(VersionUpload.Platform.WATERFALL), null),
+            new VersionUpload.MultipartFileOrUrl(List.of(VersionUpload.Platform.VELOCITY), null)
+        );
+        
+        final VersionUpload versionUpload = new VersionUpload(
+            version,
+            Map.of(
+                VersionUpload.Platform.PAPER, paperDependencies,
+                VersionUpload.Platform.WATERFALL, List.of(),
+                VersionUpload.Platform.VELOCITY, List.of()
+            ),
+            Map.of(
+                VersionUpload.Platform.PAPER, List.of("1.19.x", "1.20.x"),
+                VersionUpload.Platform.WATERFALL, List.of("1.19.x", "1.20.x"),
+                VersionUpload.Platform.VELOCITY, List.of("3.1")
+            ),
+            body,
+            fileInfo,
+            isPreRelease ? "Beta" : "Release"
+        );
+        
+        HangarUploader uploader = new HangarUploader(apiToken);
+        try(CloseableHttpClient client = HttpClients.createDefault()){
+            uploader.uploadVersion(client, project, versionUpload, filePaths);
+        }catch(ParseException ex){
+            LOGGER.error("Encountered ParseException while performing a request.", ex);
+        }
+    }
+    
+    public void uploadVersion(HttpClient client, VersionUpload.Namespace namespace, VersionUpload versionUpload,
+                              List<Path> filePaths) throws IOException, ParseException{
+        MultipartEntityBuilder builder = MultipartEntityBuilder.create();
+        builder.addPart("versionUpload", new StringBody(GSON.toJson(versionUpload), ContentType.APPLICATION_JSON));
+        
+        for(Path path : filePaths){
+            builder.addPart("files", new FileBody(path.toFile(), ContentType.DEFAULT_BINARY));
+        }
+    
+        HttpPost post = new HttpPost(API_URL + "projects/" + namespace + "/upload");
+        post.setEntity(builder.build());
+        this.addAuthHeader(client, post);
+        
+        LOGGER.info("Uploading release...");
+        final boolean success = client.execute(post, response -> {
+            if(response.getCode() != 200){
+                LOGGER.error("Error while uploading version. Received response code {}: {}", response.getCode(), response.getReasonPhrase());
+                LOGGER.error("Body: {}", EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8));
+                return false;
+            }
+            return true;
+        });
+        if(!success){
+            throw new RuntimeException("Error uploading version!");
+        }
+        LOGGER.info("Upload complete!");
+        System.exit(0);
+    }
+    
+    private synchronized void addAuthHeader(HttpClient client, HttpMessage message) throws IOException{
+        LOGGER.info("Applying Authorization Header...");
+        if(this.activeJWT != null && !this.activeJWT.hasExpired()){
+            message.addHeader("Authorization", this.activeJWT.jwt());
+            LOGGER.info("Authorization Header applied. Expires at {}", getDate(this.activeJWT.expiresAt()));
+            return;
+        }
+        
+        LOGGER.info("Current JWT expired. Requesting new one...");
+        ActiveJWT jwt = client.execute(new HttpPost(API_URL + "authenticate?apiKey=" + this.apiKey), response -> {
+            if(response.getCode() == 400){
+                LOGGER.error("Bad JWT request; is the API-token valid?");
+                return null;
+            }else
+            if(response.getCode() != 200){
+                LOGGER.error("Received non-successful response code {}: {}", response.getCode(), response.getReasonPhrase());
+                return null;
+            }
+            
+            final String json = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
+            final JsonObject jsonObject = GSON.fromJson(json, JsonObject.class);
+            final String token = jsonObject.getAsJsonPrimitive("token").getAsString();
+            final long expiresIn = jsonObject.getAsJsonPrimitive("expiresIn").getAsLong();
+    
+            LOGGER.info("Received new JWT!");
+            return new ActiveJWT(token, System.currentTimeMillis() + expiresIn);
+        });
+        
+        if(jwt == null){
+            throw new RuntimeException("Error getting JWT.");
+        }
+        
+        this.activeJWT = jwt;
+        
+        LOGGER.info("Authorization Header applied. Expires at {}", getDate(this.activeJWT.expiresAt()));
+        message.addHeader("Authorization", jwt.jwt());
+    }
+    
+    private synchronized String getDate(long timestamp){
+        return timestamp + " (" + new Date(timestamp) + ")";
+    }
+    
+    private record ActiveJWT(String jwt, long expiresAt){
+        
+        public boolean hasExpired(){
+            return System.currentTimeMillis() < this.expiresAt + TimeUnit.SECONDS.toMillis(3);
+        }
+    }
+}
@@ -0,0 +1,66 @@
+/*
+ * 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.hangaruploader;
+
+import java.util.List;
+import java.util.Map;
+
+public record VersionUpload(String version, Map<Platform, List<PluginDependency>> pluginDependencies,
+                            Map<Platform, List<String>> platformDependencies, String description,
+                            List<MultipartFileOrUrl> files, String channel){
+    
+    public record Namespace(String owner, String slug){
+        
+        @Override
+        public String toString(){
+            return this.owner + "/" + this.slug;
+        }
+    }
+    
+    public record PluginDependency(String name, boolean required, Namespace namespace, String externalUrl){
+        
+        public PluginDependency{
+            if(namespace == null && externalUrl == null)
+                throw new IllegalStateException("Either a Hangar Namespace or an external URL needs to be defined.");
+        }
+        
+        public static PluginDependency createWithHangarNamespace(String name, boolean required, Namespace namespace){
+            return new PluginDependency(name, required, namespace, null);
+        }
+        
+        public static PluginDependency createWithExternalUrl(String name, boolean required, String externalUrl){
+            return new PluginDependency(name, required, null, externalUrl);
+        }
+    }
+    
+    public record MultipartFileOrUrl(List<Platform> platforms, String externalUrl){}
+    
+    public enum Platform{
+        PAPER,
+        WATERFALL,
+        VELOCITY
+    }
+}
@@ -0,0 +1,60 @@
+<!--
+  ~ 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.
+  ~
+  -->
+
+<configuration debug="false">
+
+    <property name="DEV_HOME" value="./logs"/>
+
+    <!--CONSOLE -->
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%highlight([) %boldWhite(%d{dd.MM.yyyy HH:mm:ss}) %highlight(%-5level) %highlight(]) %cyan([%t]) %boldWhite([%logger{0}]) %boldRed(-) %white(%msg) %n</pattern>
+        </encoder>
+    </appender>
+
+    <!--FILE OUT-->
+    <appender name="FILE-AUDIT" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
+        <file>${DEV_HOME}/Purr.log</file>
+        <encoder>
+            <pattern>%d{dd.MM.yyyy HH:mm:ss} [%thread] [ %-5level] [%logger{0}] %msg%n</pattern>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!-- rollover daily -->
+            <fileNamePattern>${DEV_HOME}/archived/purr-%d{dd.MM.yyyy}.%i.log</fileNamePattern>
+            <maxFileSize>100MB</maxFileSize>
+            <maxHistory>60</maxHistory>
+            <totalSizeCap>20GB</totalSizeCap>
+        </rollingPolicy>
+    </appender>
+
+    <!--Root logger-->
+    <root level="INFO">
+        <appender-ref ref="CONSOLE"/>
+        <appender-ref ref="FILE-AUDIT"/>
+    </root>
+</configuration>
@@ -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,24 @@ 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
+  - content.code.copy
+
  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,121 +53,29 @@ 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
+
+plugins:
+  - search
+  - glightbox

-# +--------------------------------------------------------------------------------------------------------+
-# |                                                                                                        |
-# | 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:
      permalink: true
  - markdown.extensions.attr_list:
+  - markdown.extensions.footnotes:
  - pymdownx.emoji:
      emoji_index: !!python/name:materialx.emoji.twemoji
      emoji_generator: !!python/name:materialx.emoji.to_svg
@@ -493,3 +84,4 @@ markdown_extensions:
  - pymdownx.superfences:
  - pymdownx.tabbed:
      alternate_style: true
+  - pymdownx.details:
@@ -1,165 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2023 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.paper;
-
-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.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.PaperPlayerPlaceholders;
-import org.bstats.bukkit.Metrics;
-import org.bstats.charts.SimplePie;
-import org.bukkit.command.PluginCommand;
-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 PaperLogger(getLogger());
-    
-    private AdvancedServerList core;
-    private FaviconHandler<CachedServerIcon> faviconHandler;
-    
-    @Override
-    public void onEnable(){
-        try{
-            Class.forName("io.papermc.paper.configuration.ConfigurationLoaders");
-            enable();
-        }catch(ClassNotFoundException ex){
-            try{
-                Class.forName("com.destroystokyo.paper.PaperConfig");
-                enable();
-            }catch(ClassNotFoundException ex1){
-                printSpigotWarning();
-                getServer().getPluginManager().disablePlugin(this);
-            }
-        }
-    }
-    
-    @Override
-    public void onDisable(){
-        if(getCore() == null)
-            return; // This is always the case when the plugin is used on a Spigot server (See above try-catch blocks).
-        
-        getCore().disable();
-    }
-    
-    @Override
-    public void loadCommands(){
-        PluginCommand cmd = getServer().getPluginCommand("advancedserverlist");
-        if(cmd == null){
-            getPluginLogger().warn("Could not register command /advancedserverlist");
-            return;
-        }
-        cmd.setExecutor(new CmdAdvancedServerList(this));
-    }
-    
-    @Override
-    public void loadEvents(){
-        new JoinEvent(this);
-        new PingEvent(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";
-    }
-    
-    private void enable(){
-        this.core = new AdvancedServerList(this, new PaperPlayerPlaceholders());
-    }
-    
-    private void printSpigotWarning(){
-        getPluginLogger().warn("======================================== WARNING ========================================");
-        getPluginLogger().warn("");
-        getPluginLogger().warn("You are using the Paper version of AdvancedServerList on a SpigotMC server.");
-        getPluginLogger().warn("The Paper version is ONLY compatible with Paper itself due to it using exclusive");
-        getPluginLogger().warn("methods and events not available within SpigotMC.");
-        getPluginLogger().warn("");
-        getPluginLogger().warn("To avoid any exceptions and errors will AdvancedServerList disable itself now.");
-        getPluginLogger().warn("Please stop your server and either switch to Paper or use the Spigot version");
-        getPluginLogger().warn("of AdvancedServerList.");
-        getPluginLogger().warn("");
-        getPluginLogger().warn("Paper can be downloaded here:");
-        getPluginLogger().warn("https://papermc.io/downloads");
-        getPluginLogger().warn("");
-        getPluginLogger().warn("======================================== WARNING ========================================");
-    }
-}
@@ -1,60 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2023 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.paper.logging;
-
-import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-public class PaperLogger implements PluginLogger{
-    
-    private final Logger logger;
-    
-    public PaperLogger(Logger logger){
-        this.logger = logger;
-    }
-    
-    @Override
-    public void info(String msg, Object... args){
-        logger.info(String.format(msg, args));
-    }
-    
-    @Override
-    public void warn(String msg, Object... args){
-        logger.warning(String.format(msg, args));
-    }
-    
-    @Override
-    public void warn(String msg, Throwable throwable){
-        logger.log(Level.WARNING, msg, throwable);
-    }
-    
-    @Override
-    public void warn(String msg, Throwable throwable, Object... args){
-        logger.log(Level.WARNING, String.format(msg, args), throwable);
-    }
-}
@@ -1,74 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2023 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.paper.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 PaperPlayerImpl extends GenericPlayerImpl implements SpigotPlayer{
-    
-    private final OfflinePlayer player;
-    private boolean playedBefore = false;
-    private boolean banned = false;
-    private boolean whitelisted = false;
-    
-    public PaperPlayerImpl(OfflinePlayer player, CachedPlayer cachedPlayer, int protocol){
-        this.player = player;
-        
-        this.name = player == null ? cachedPlayer.getName() : player.getName();
-        this.protocol = protocol;
-        this.uuid = player == null ? cachedPlayer.getUuid() : player.getUniqueId();
-        
-        if(player == null)
-            return;
-        
-        this.playedBefore = player.hasPlayedBefore();
-        this.banned = player.isBanned();
-        this.whitelisted = player.isWhitelisted();
-    }
-    
-    @Override
-    public OfflinePlayer getPlayer(){
-        return player;
-    }
-    
-    @Override
-    public boolean hasPlayedBefore(){
-        return playedBefore;
-    }
-    
-    @Override
-    public boolean isBanned(){
-        return banned;
-    }
-    
-    @Override
-    public boolean isWhitelisted(){
-        return whitelisted;
-    }
-}
@@ -1,57 +0,0 @@
-/*
- * MIT License
- *
- * Copyright (c) 2022-2023 Andre_601
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-package ch.andre601.advancedserverlist.paper.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 PaperPlayerPlaceholders extends PlaceholderProvider{
-    
-    public PaperPlayerPlaceholders(){
-        super("player");
-    }
-    
-    @Override
-    public String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
-        SpigotPlayer paperPlayer = (SpigotPlayer)player;
-        
-        return switch(placeholder){
-            case "name" -> paperPlayer.getName();
-            case "protocol" -> String.valueOf(paperPlayer.getProtocol());
-            case "uuid" -> String.valueOf(paperPlayer.getUUID());
-            case "hasPlayedBefore" -> returnValue(paperPlayer, paperPlayer.hasPlayedBefore());
-            case "isBanned" -> returnValue(paperPlayer, paperPlayer.isBanned());
-            case "isWhitelisted" -> returnValue(paperPlayer, paperPlayer.isWhitelisted());
-            default -> null;
-        };
-    }
-    
-    private String returnValue(SpigotPlayer player, Object value){
-        return player.getPlayer() == null ? null : String.valueOf(value);
-    }
-}
@@ -36,16 +36,31 @@

    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.build.commit/>
        
-        <plugin.version>2.1.0</plugin.version>
+        <plugin.version>3.2.0</plugin.version>
        <plugin.description>Create multiple Server lists based on conditions.</plugin.description>
        
-        <api.version>v2.0.0</api.version>
+        <api.version>v3.0.0</api.version>
        
        <maven.compiler.source>16</maven.compiler.source>
        <maven.compiler.target>16</maven.compiler.target>
    </properties>
    
+    <profiles>
+        <profile>
+            <id>gh-actions</id>
+            <activation>
+                <property>
+                    <name>env.COMMIT_SHA</name>
+                </property>
+            </activation>
+            <properties>
+                <project.build.commit>_${env.COMMIT_SHA}</project.build.commit>
+            </properties>
+        </profile>
+    </profiles>
+    
    <repositories>
        <repository>
            <id>jitpack</id>
@@ -56,8 +71,8 @@
    <modules>
        <module>core</module>
        <module>bungeecord</module>
-        <module>paper</module>
-        <module>spigot</module>
+        <module>bukkit</module>
        <module>velocity</module>
+        <module>hangar-uploader</module>
    </modules>
 </project>
@@ -1 +1,2 @@
-mkdocs-material==9.0.6
+mkdocs-material==9.1.16
+mkdocs-glightbox==0.3.4
@@ -72,13 +72,25 @@
        <dependency>
            <groupId>org.bstats</groupId>
            <artifactId>bstats-velocity</artifactId>
-            <version>3.0.0</version>
+            <version>3.0.2</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.spongepowered</groupId>
+            <artifactId>configurate-yaml</artifactId>
+            <version>4.1.2</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>4.11.0</version>
            <scope>compile</scope>
        </dependency>
    </dependencies>
    
    <build>
-        <finalName>AdvancedServerList-Velocity-${plugin.version}</finalName>
+        <finalName>AdvancedServerList-Velocity-${plugin.version}${project.build.commit}</finalName>
        <resources>
            <resource>
                <filtering>true</filtering>
@@ -89,7 +101,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>
@@ -106,10 +118,6 @@
                            <pattern>org.bstats</pattern>
                            <shadedPattern>ch.andre601.advancedserverlist.velocity.depends.bstats</shadedPattern>
                        </relocation>
-                        <relocation>
-                            <pattern>com.github.benmanes.caffeine</pattern>
-                            <shadedPattern>ch.andre601.advancedserverlist.velocity.depends.caffeine</shadedPattern>
-                        </relocation>
                        <relocation>
                            <pattern>okhttp3</pattern>
                            <shadedPattern>ch.andre601.advancedserverlist.velocity.depends.okhttp3</shadedPattern>
@@ -30,10 +30,11 @@ 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.velocity.commands.CmdAdvancedServerList;
-import ch.andre601.advancedserverlist.velocity.events.JoinEvent;
-import ch.andre601.advancedserverlist.velocity.events.PingEvent;
+import ch.andre601.advancedserverlist.velocity.listeners.JoinEvent;
+import ch.andre601.advancedserverlist.velocity.listeners.PingEvent;
 import ch.andre601.advancedserverlist.velocity.logging.VelocityLogger;
 import ch.andre601.advancedserverlist.velocity.objects.VelocityPlayerPlaceholders;
+import ch.andre601.advancedserverlist.velocity.objects.VelocityServerPlaceholders;
 import com.google.inject.Inject;
 import com.velocitypowered.api.command.CommandMeta;
 import com.velocitypowered.api.event.Subscribe;
@@ -55,7 +56,7 @@ public class VelocityCore implements PluginCore<Favicon>{
    private final Path path;
    private final Metrics.Factory metrics;
    
-    private AdvancedServerList core;
+    private AdvancedServerList<Favicon> core;
    private FaviconHandler<Favicon> faviconHandler = null;
    
    @Inject
@@ -69,7 +70,7 @@ public class VelocityCore implements PluginCore<Favicon>{
    
    @Subscribe
    public void init(ProxyInitializeEvent event){
-        this.core = new AdvancedServerList(this, new VelocityPlayerPlaceholders());
+        this.core = AdvancedServerList.init(this, VelocityPlayerPlaceholders.init(), VelocityServerPlaceholders.init());
    }
    
    @Subscribe
@@ -109,7 +110,7 @@ public class VelocityCore implements PluginCore<Favicon>{
    }
    
    @Override
-    public AdvancedServerList getCore(){
+    public AdvancedServerList<Favicon> getCore(){
        return core;
    }
    
@@ -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;

@@ -23,7 +23,7 @@
 *
 */

-package ch.andre601.advancedserverlist.velocity.events;
+package ch.andre601.advancedserverlist.velocity.listeners;

 import ch.andre601.advancedserverlist.velocity.VelocityCore;
 import com.velocitypowered.api.event.Subscribe;
@@ -23,7 +23,7 @@
 *
 */

-package ch.andre601.advancedserverlist.velocity.events;
+package ch.andre601.advancedserverlist.velocity.listeners;

 import ch.andre601.advancedserverlist.core.events.PingEventHandler;
 import ch.andre601.advancedserverlist.velocity.VelocityCore;
@@ -23,12 +23,12 @@
 *
 */

-package ch.andre601.advancedserverlist.spigot.events;
+package ch.andre601.advancedserverlist.velocity.listeners;

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

 public class PreServerListSetEventImpl extends PreServerListSetEvent{
-    
    public PreServerListSetEventImpl(ProfileEntry entry){
        super(entry);
    }
@@ -23,7 +23,7 @@
 *
 */

-package ch.andre601.advancedserverlist.velocity.events;
+package ch.andre601.advancedserverlist.velocity.listeners;

 import ch.andre601.advancedserverlist.api.events.GenericServerListEvent;
 import ch.andre601.advancedserverlist.api.objects.GenericServer;
@@ -35,13 +35,17 @@ import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
 import ch.andre601.advancedserverlist.core.profiles.replacer.StringReplacer;
 import ch.andre601.advancedserverlist.velocity.VelocityCore;
 import ch.andre601.advancedserverlist.velocity.objects.VelocityPlayerImpl;
+import ch.andre601.advancedserverlist.velocity.objects.VelocityProxyImpl;
 import com.velocitypowered.api.event.proxy.ProxyPingEvent;
+import com.velocitypowered.api.proxy.server.RegisteredServer;
 import com.velocitypowered.api.proxy.server.ServerPing;
 import com.velocitypowered.api.util.Favicon;
 import net.kyori.adventure.text.Component;

 import java.awt.image.BufferedImage;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;

@@ -166,6 +170,14 @@ public class VelocityEventWrapper implements GenericEventWrapper<Favicon, Veloci
        return new VelocityPlayerImpl(player, protocol);
    }
    
+    @Override
+    public GenericServer createGenericServer(int playersOnline, int playersMax, String host){
+        Map<String, RegisteredServer> servers = new HashMap<>();
+        plugin.getProxy().getAllServers().forEach(server -> servers.put(server.getServerInfo().getName(), server));
+        
+        return new VelocityProxyImpl(servers, playersOnline, playersMax, host);
+    }
+    
    @Override
    public Favicon createFavicon(BufferedImage image){
        return Favicon.create(image);
@@ -25,6 +25,7 @@

 package ch.andre601.advancedserverlist.velocity.objects;

+import ch.andre601.advancedserverlist.api.velocity.objects.VelocityPlayer;
 import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
 import ch.andre601.advancedserverlist.core.profiles.players.GenericPlayerImpl;
 import com.velocitypowered.api.network.ProtocolVersion;
@@ -28,20 +28,28 @@ package ch.andre601.advancedserverlist.velocity.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.api.velocity.objects.VelocityPlayer;

 public class VelocityPlayerPlaceholders extends PlaceholderProvider{
    
-    public VelocityPlayerPlaceholders(){
+    private VelocityPlayerPlaceholders(){
        super("player");
    }
    
+    public static VelocityPlayerPlaceholders init(){
+        return new VelocityPlayerPlaceholders();
+    }
+    
    @Override
    public String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
+        if(!(player instanceof VelocityPlayer velocityPlayer))
+            return null;
+        
        return switch(placeholder){
-            case "name" -> player.getName();
-            case "protocol" -> String.valueOf(player.getProtocol());
-            case "uuid" -> String.valueOf(player.getUUID());
-            case "version" -> ((VelocityPlayerImpl)player).getVersion();
+            case "name" -> velocityPlayer.getName();
+            case "protocol" -> String.valueOf(velocityPlayer.getProtocol());
+            case "uuid" -> String.valueOf(velocityPlayer.getUUID());
+            case "version" -> velocityPlayer.getVersion();
            default -> null;
        };
    }