Update API reference

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

.github/dependabot.yml

@@ -1,50 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: maven
-    directory: "/bungeecord"
-    schedule:
-      interval: daily
-    open-pull-requests-limit: 10
-    labels:
-      - 'Type: Update Dependency'
-      - 'Target: BungeeCord'
-  - package-ecosystem: maven
-    directory: "/core"
-    schedule:
-      interval: daily
-    open-pull-requests-limit: 10
-    labels:
-      - 'Type: Update Dependency'
-      - 'Target: Core'
-  - package-ecosystem: maven
-    directory: "/bukkit"
-    schedule:
-      interval: daily
-    open-pull-requests-limit: 10
-    labels:
-      - 'Type: Update Dependency'
-      - 'Target: Bukkit'
-  - package-ecosystem: maven
-    directory: "/velocity"
-    schedule:
-      interval: daily
-    open-pull-requests-limit: 10
-    labels:
-      - 'Type: Update Dependency'
-      - 'Target: Velocity'
-  - package-ecosystem: github-actions
-    directory: "/"
-    schedule:
-      interval: daily
-    open-pull-requests-limit: 10
-    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'

.github/workflows/create-pr-artifact.yml

@@ -1,100 +0,0 @@
-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@v4
-        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@v4
-        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 }}

.github/workflows/docs-deploy.yml

@@ -2,28 +2,33 @@ name: 'Deploy Site (Push)'
 
 on:
   workflow_dispatch:
-  push:
-    paths:
-      - 'docs/**'
-      - 'mkdocs.yml'
-      - 'mkdocs-theme/**'
-      - 'requirements.txt'
-    branches:
-      - master
-    tags-ignore:
-      - '**'
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+env:
+  GITHUB_REPO_INSTANCE: true
 
 jobs:
   build:
     runs-on: ubuntu-latest
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python 3.7
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.x
       - name: Create/Get Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           key: ${{ github.ref }}
           path: .cache
@@ -31,9 +36,14 @@ jobs:
         run: |
           python -m pip install --upgrade pip setuptools
           python -m pip install -r requirements.txt
-      - name: Set up Git
-        run: |
-          git config user.name "github-actions[bot]"
-          git config user.email "actions@github.com"
-      - name: Deploy Files
-        run: mkdocs gh-deploy --force
+      - name: Build docs
+        run: mkdocs build
+      - name: Configure GitHub Pages
+        uses: actions/configure-pages@v4
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: 'site/'
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.github/workflows/pr-comment.yml

@@ -1,99 +0,0 @@
-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@v4
-      - 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 }}

.github/workflows/release.yml

@@ -1,125 +0,0 @@
-#
-# Big thank you to @Kir-Antipov for providing this workflow file.
-# Check out his mc-publish action here: https://github.com/Kir-Antipov/mc-publish
-#
-
-name: Publish Assets
-
-on:
-  release:
-    types:
-    - published
-
-jobs:
-  buildJars:
-    runs-on: ubuntu-latest
-    outputs:
-      plugin_release: ${{ steps.github-release.outputs.PLUGIN_RELEASE }}
-    steps:
-    - name: Checkout Repository
-      uses: actions/checkout@v4
-    - 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:
-        distribution: 'temurin'
-        java-version: '16'
-        cache: 'maven'
-    - name: Build Jar files
-      run: mvn clean install
-    - name: Save All files
-      uses: actions/upload-artifact@v3
-      with:
-        name: asl-files
-        path: |
-          */target/AdvancedServerList-*.jar
-          hangar-uploader/target/HangarUploader.jar
-        if-no-files-found: error
-        retention-days: 1
-  publish:
-    needs: [buildJars]
-    strategy:
-      matrix:
-        include:
-          - platforms: BungeeCord, Waterfall
-            directory: bungeecord
-            loaders: |
-              bungeecord
-              waterfall
-            dependencies: 'papiproxybridge@1.3(optional)'
-          - platforms: Spigot, Paper, Folia
-            directory: bukkit
-            loaders: |
-              spigot
-              paper
-              folia
-            dependencies: ''
-          - platforms: Velocity
-            directory: velocity
-            loaders: velocity
-            dependencies: 'papiproxybridge@1.3(optional)'
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - name: Get Jar files
-      uses: actions/download-artifact@v3
-      with:
-        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: ${{ needs.buildJars.outputs.plugin_release }}
-        version-type: release
-        files: ${{ matrix.directory}}/target/AdvancedServerList-*.jar
-        loaders: ${{ matrix.loaders }}
-        game-version-filter: releases
-        game-versions: '>=1.19'
-        java: 16
-        dependencies: ${{ matrix.dependencies }}
-        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
-        dependencies: ${{ matrix.dependencies }}
-        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 }}

.gitignore

@@ -2,3 +2,4 @@
 /.idea/
 /**/dependency-reduced-pom.xml
 /**/target/
+/**/__pycache__/

.woodpecker/publish_assets.yml

@@ -4,55 +4,33 @@ when:
 
 steps:
   createFiles:
-    image: maven:3.9.4-eclipse-temurin-17
+    image: maven:3.9.6-eclipse-temurin-17
+    secrets:
+      - source: cb_token
+        target: codeberg_api_token
+      - source: modrinth_api_token
+        target: modrinth_api_token
+      - source: hangar_api_token
+        target: hangar_api_token
+      - source: discord_webhook_url
+        target: discord_webhook_url
     commands:
       # Create the jar files.
       - mvn clean install
-  #uploadFiles:
-  #  image: badouralix/curl-jq
-  #  secrets:
-  #    - cb_token
-  #  commands:
-  #    # Get release info and setup env vars.
-  #    - |-
-  #      export JSON=`curl --location "https://codeberg.org/api/v1/repos/Andre601/AdvancedServerList/releases?limit=10" \
-  #      --header 'Authorization: token $CB_TOKEN' \
-  #      --header 'Accept: application/json' -s -S \
-  #      --fail-with-body | jq ".[] | select (.tag_name==\"$CI_COMMIT_TAG\").")`
-  #    - export PLUGIN_CHANGELOG=$( echo $JSON | jq -r '.body' )
-  #    - export PLUGIN_PRE_RELEASE=$( echo $JSON | jq -r '.prerelease' )
-  #    - export RELEASE_ID=$( echo $JSON | jq -r '.id' )
-  #    # Upload release assets to Codeberg release
-  #    - |-
-  #      curl -X POST --location "https://codeberg.org/api/v1/repos/Andre601/AdvancedServerList/releases/$RELEASE_ID/assets" \
-  #      --header "Authorization: token $CB_TOKEN" \
-  #      --header "Content-Type: multipart/form-data" -s -S \
-  #      --form "attachment=@bukkit/target/AdvancedServerList-Bukkit-${CI_COMMIT_TAG##v}.jar;type=application/octet-stream" \
-  #      --fail-with-body
-  #    - |-
-  #      curl -X POST --location "https://codeberg.org/api/v1/repos/Andre601/AdvancedServerList/releases/$RELEASE_ID/assets" \
-  #      --header "Authorization: token $CB_TOKEN" \
-  #      --header "Content-Type: multipart/form-data" -s -S \
-  #      --form "attachment=@bungeecord/target/AdvancedServerList-BungeeCord-${CI_COMMIT_TAG##v}.jar;type=application/octet-stream" \
-  #      --fail-with-body
-  #    - |-
-  #      curl -X POST --location "https://codeberg.org/api/v1/repos/Andre601/AdvancedServerList/releases/$RELEASE_ID/assets" \
-  #      --header "Authorization: token $CB_TOKEN" \
-  #      --header "Content-Type: multipart/form-data" -s -S \
-  #      --form "attachment=@velocity/target/AdvancedServerList-Velocity-${CI_COMMIT_TAG##v}.jar;type=application/octet-stream" \
-  #      --fail-with-body
-  uploadToModrinthAndMaven:
-    image: eclipse-temurin
-    secrets:
-      - cb_token
-      - modrinth_api_token
-      - hangar_api_token
-    commands:
-      # Move VersionUploader.jar
+      # Move VersionUploader jar file
       - cd version-uploader/target/
       - mv VersionUploader.jar ../../
       - cd ../../
-      # Create Modrinth releases
-      - java -jar VersionUploader.jar --modrinth
-      # Create Hangar release
-      - java -jar VersionUploader.jar --hangar
+      # Execute Jar file
+      - java -jar VersionUploader.jar --all
+  uploadToCodeberg:
+    image: woodpeckerci/plugin-gitea-release
+    settings:
+      base_url: https://codeberg.org
+      files:
+        - "bungeecord/target/AdvancedServerList-*.jar"
+        - "paper/target/AdvancedServerList-*.jar"
+        - "velocity/target/AdvancedServerList-*.jar"
+        - "addons/banplugins/target/AdvancedServerList-*.jar"
+      api_key:
+        from_secret: CB_TOKEN

.woodpecker/publish_docs.yml

@@ -4,25 +4,33 @@ when:
     path:
       include: ['requirements.txt', 'mkdocs.yml', 'docs/**']
 
+variables:
+  setup_git: &setup_git
+    - apk add git
+    - git config --global user.email "github@andre601.ch"
+    - git config --global user.name "ASL Docs Builder"
+
 steps:
+  cloneTargetRepo:
+    image: alpine:3.18.4
+    commands:
+      - chmod -R a+w .
+      - <<: *setup_git
+      - git clone -b pages https://codeberg.org/Andre601/AdvancedServerList.git site
+      - chmod -R a+w site
   buildDocs:
-    image: python
+    image: woodpeckerci/plugin-mkdocs:latest
+    settings:
+      pip_install_file: requirements.txt
+  commitAndPush:
+    image: alpine:3.18.4
     secrets:
       - cb_token
     commands:
-      - chmod -R a+w .
-      - git config --global --add safe.directory /woodpecker/src/codeberg.org/Andre601/blog-source/website
-      - git config --global user.email "github@andre601.ch"
-      - git config --global user.name "CI Website Builder"
-      - git fetch --unshallow
-      - git clone -b pages https://codeberg.org/Andre601/AdvancedServerList.git site
-      - chmod -R a+w site
-      - python -m pip install --upgrade pip
-      - python -m pip install -r requirements.txt
-      - mkdocs build
+      - <<: *setup_git
       - mv domains site/.domains
       - cd site
       - git remote set-url origin https://$CB_TOKEN@codeberg.org/Andre601/AdvancedServerList.git
       - git add --all
-      - git commit -m "Update AdvancedServerList Docs ($( env TZ=Europe/Zurich date +"%d.%m.%Y" )) [CI SKIP]"
+      - git commit -m "Update AdvancedServerList Docs ($( env TZ=Europe/Zurich date +"%d.%m.%Y %Z" )) [SKIP CI]"
       - git push

README.md

@@ -1,21 +1,21 @@
 # AdvancedServerList
 
-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.
+AdvancedServerList is a plugin that allows 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>
+-->
 
 ## Supported Platforms
 
-<a href="https://www.spigotmc.org" target="_blank">
-  <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/gh/Andre601/devins-badges@13e0142/assets/compact-minimal/supported/paper_vector.svg" height="64" alt="platform-paper" title="Tested on Paper">
 </a>
@@ -30,29 +30,33 @@ AdvancedServerList is a plugin that allowys you to customize your server's MOTD,
 </a>
 
 ## What is a Server List Profile?
+
 A Server List Profile refers to a YAML file located in the plugin's `profiles` directory.  
 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.
+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 it automatically 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.
+
+Placeholders can be used within conditions to further customize them. They can also be used in any other text option 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.
 
-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.
+When using the SpigotMC/PaperMC version, or while [PAPIProxyBridge][papiproxybridge] is installed on your proxy, can you also use placeholders from [PlaceholderAPI][placeholderapi] using its `%<identifier>_<values>%` placeholder format. PlaceholderAPI needs to be installed on the server (not proxy) for that.
 
 If you're a plugin dev can you even add your own custom placeholders through AdvancedServerList's own API.
 
 > [*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.
 
@@ -60,13 +64,14 @@ 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        |
-| [PAPIProxyBridge] | Spigot, Paper, BungeeCord, Velocity | No        |
-| [Maintenance]     | Spigot, Paper, BungeeCord, Velocity | No        |
+All listed dependencies are optional.
+
+| Dependency        | Platforms            |
+|-------------------|----------------------|
+| [PlaceholderAPI]  | Paper                |
+| [ViaVersion]      | Paper                |
+| [PAPIProxyBridge] | BungeeCord, Velocity |
+| [Maintenance]     | All                  |
 
 ## Statistics
 
@@ -84,6 +89,7 @@ You can disable this in the global bStats config file located in `/plugins/bstat
 </a>
 
 ## Support
+
 <a href="https://discord.gg/6dazXp6" target="_blank">
   <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>
@@ -96,14 +102,13 @@ You can disable this in the global bStats config file located in `/plugins/bstat
 
 <!-- Links -->
 [profiles]: https://asl.andre601.ch/profiles/
-[conditions]: https://asl.andre601.ch/profiles/#conditions
+[conditions]: https://asl.andre601.ch/profiles/#condition
 [placeholders]: https://asl.andre601.ch/profiles/placeholders/
 [minimessage]: https://asl.andre601.ch/profiles/formatting/
 
 [modrinth]: https://modrinth.com/plugin/advancedserverlist
 
-[protocollib]: https://hangar.papermc.io/dmulloy2/ProtocolLib
-[placeholderapi]: https://www.spigotmc.org/resources/6245/
+[placeholderapi]: https://hangar.papermc.io/HelpChat/PlaceholderAPI
 [viaversion]: https://hangar.papermc.io/ViaVersion/ViaVersion
 [papiproxybridge]: https://hangar.papermc.io/William278/PAPIProxyBridge
 [maintenance]: https://hangar.papermc.io/kennytv/Maintenance

addons/banplugins/pom.xml

@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ MIT License
+  ~
+  ~ Copyright (c) 2022-2024 Andre_601
+  ~
+  ~ Permission is hereby granted, free of charge, to any person obtaining a copy
+  ~ of this software and associated documentation files (the "Software"), to deal
+  ~ in the Software without restriction, including without limitation the rights
+  ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  ~ copies of the Software, and to permit persons to whom the Software is
+  ~ furnished to do so, subject to the following conditions:
+  ~
+  ~ The above copyright notice and this permission notice shall be included in all
+  ~ copies or substantial portions of the Software.
+  ~
+  ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  ~ SOFTWARE.
+  ~
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>parent</artifactId>
+        <groupId>ch.andre601.advancedserverlist</groupId>
+        <version>parent</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    
+    <artifactId>banplugins</artifactId>
+    <packaging>jar</packaging>
+    <version>${plugin.version}</version>
+
+    <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>sonatype</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+        </repository>
+        <repository>
+            <id>papermc</id>
+            <url>https://papermc.io/repo/repository/maven-public/</url>
+        </repository>
+        <repository>
+            <id>libertybans</id>
+            <url>https://mvn-repo.arim.space/affero-gpl3/</url>
+        </repository>
+    </repositories>
+    
+    <dependencies>
+        <!-- Proxy/Server -->
+        <dependency>
+            <groupId>net.md-5</groupId>
+            <artifactId>bungeecord-api</artifactId>
+            <version>1.20-R0.2</version>
+            <type>jar</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.md-5</groupId>
+            <artifactId>bungeecord-api</artifactId>
+            <version>1.20-R0.2</version>
+            <type>javadoc</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.papermc.paper</groupId>
+            <artifactId>paper-api</artifactId>
+            <version>1.20-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.velocitypowered</groupId>
+            <artifactId>velocity-api</artifactId>
+            <version>3.3.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <!-- Plugin APIs -->
+        <dependency>
+            <groupId>com.github.DevLeoko</groupId>
+            <artifactId>AdvancedBan</artifactId>
+            <version>v2.3.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>space.arim.libertybans</groupId>
+            <artifactId>bans-api</artifactId>
+            <version>1.1.0-RC1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>ch.andre601.asl-api</groupId>
+            <artifactId>api</artifactId>
+            <version>${api.version}</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+    
+    <build>
+        <finalName>AdvancedServerList-BanPlugins-Addon-${plugin.version}</finalName>
+        <resources>
+            <resource>
+                <filtering>true</filtering>
+                <directory>src/main/resources</directory>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.12.1</version>
+            </plugin>
+        </plugins>
+    </build>
+</project>

addons/banplugins/src/main/java/ch/andre601/advancedserverlist/banplugins/bungeecord/BungeeCordBanPlugins.java

@@ -0,0 +1,57 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2024 Andre_601
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package ch.andre601.advancedserverlist.banplugins.bungeecord;
+
+import ch.andre601.advancedserverlist.api.PlaceholderProvider;
+import ch.andre601.advancedserverlist.banplugins.placeholders.AdvancedBanPlaceholders;
+import ch.andre601.advancedserverlist.banplugins.placeholders.LibertyBansPlaceholders;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum BungeeCordBanPlugins{
+    
+    ADVANCED_BAN("AdvancedBan", new AdvancedBanPlaceholders()),
+    LIBERTY_BANS("LibertyBans", new LibertyBansPlaceholders());
+    
+    private final String plugin;
+    private final PlaceholderProvider placeholderProvider;
+    
+    BungeeCordBanPlugins(String plugin, PlaceholderProvider placeholderProvider){
+        this.plugin = plugin;
+        this.placeholderProvider = placeholderProvider;
+    }
+    
+    public static Map<String, PlaceholderProvider> getBanPlugins(){
+        Map<String, PlaceholderProvider> content = new HashMap<>();
+        
+        for(BungeeCordBanPlugins bungeeCordBanPlugins : BungeeCordBanPlugins.values()){
+            content.put(bungeeCordBanPlugins.plugin, bungeeCordBanPlugins.placeholderProvider);
+        }
+        
+        return content;
+    }
+}

addons/banplugins/src/main/java/ch/andre601/advancedserverlist/banplugins/bungeecord/BungeeCordBanPluginsAddon.java

@@ -0,0 +1,68 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2024 Andre_601
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package ch.andre601.advancedserverlist.banplugins.bungeecord;
+
+import ch.andre601.advancedserverlist.api.AdvancedServerListAPI;
+import ch.andre601.advancedserverlist.api.PlaceholderProvider;
+import net.md_5.bungee.api.plugin.Plugin;
+
+import java.util.Map;
+
+public class BungeeCordBanPluginsAddon extends Plugin{
+    
+    @Override
+    public void onEnable(){
+        if(getProxy().getPluginManager().getPlugin("AdvancedServerList") == null){
+            getLogger().warning("AdvancedServerList is not enabled. This plugin requires it to function!");
+            return;
+        }
+        
+        int loadedPlaceholders = loadPlaceholderProviders();
+        if(loadedPlaceholders == 0){
+            getLogger().warning("No compatible Ban plugin was found to register placeholders for.");
+        }else{
+            getLogger().info("Loaded " + loadedPlaceholders + " Placeholder Set(s) for AdvancedServerList!");
+        }
+    }
+    
+    private int loadPlaceholderProviders(){
+        int loaded = 0;
+        Map<String, PlaceholderProvider> banPlugins = BungeeCordBanPlugins.getBanPlugins();
+        AdvancedServerListAPI api = AdvancedServerListAPI.get();
+        
+        for(Map.Entry<String, PlaceholderProvider> entry : banPlugins.entrySet()){
+            if(getProxy().getPluginManager().getPlugin(entry.getKey()) != null){
+                getLogger().info("Registering Placeholders for " + entry.getKey() + "...");
+                api.addPlaceholderProvider(entry.getValue());
+                getLogger().info("Placeholder successfully registered!");
+                
+                loaded++;
+            }
+        }
+        
+        return loaded;
+    }
+}

addons/banplugins/src/main/java/ch/andre601/advancedserverlist/banplugins/paper/PaperBanPlugins.java

@@ -0,0 +1,57 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2024 Andre_601
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package ch.andre601.advancedserverlist.banplugins.paper;
+
+import ch.andre601.advancedserverlist.api.PlaceholderProvider;
+import ch.andre601.advancedserverlist.banplugins.placeholders.AdvancedBanPlaceholders;
+import ch.andre601.advancedserverlist.banplugins.placeholders.LibertyBansPlaceholders;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum PaperBanPlugins{
+    
+    ADVANCED_BAN("AdvancedBan", new AdvancedBanPlaceholders()),
+    LIBERTY_BANS("LibertyBans", new LibertyBansPlaceholders());
+    
+    private final String plugin;
+    private final PlaceholderProvider placeholderProvider;
+    
+    PaperBanPlugins(String plugin, PlaceholderProvider placeholderProvider){
+        this.plugin = plugin;
+        this.placeholderProvider = placeholderProvider;
+    }
+    
+    public static Map<String, PlaceholderProvider> getBanPlugins(){
+        Map<String, PlaceholderProvider> content = new HashMap<>();
+        
+        for(PaperBanPlugins paperBanPlugins : PaperBanPlugins.values()){
+            content.put(paperBanPlugins.plugin, paperBanPlugins.placeholderProvider);
+        }
+        
+        return content;
+    }
+}

addons/banplugins/src/main/java/ch/andre601/advancedserverlist/banplugins/paper/PaperBanPluginsAddon.java

@@ -0,0 +1,71 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2024 Andre_601
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package ch.andre601.advancedserverlist.banplugins.paper;
+
+import ch.andre601.advancedserverlist.api.AdvancedServerListAPI;
+import ch.andre601.advancedserverlist.api.PlaceholderProvider;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import java.util.Map;
+
+public class PaperBanPluginsAddon extends JavaPlugin{
+    
+    @Override
+    public void onEnable(){
+        if(!getServer().getPluginManager().isPluginEnabled("AdvancedServerList")){
+            getLogger().warning("AdvancedServerList is not enabled. This plugin requires it to function!");
+            getServer().getPluginManager().disablePlugin(this);
+            return;
+        }
+        
+        int loadedPlaceholders = loadPlaceholderProviders();
+        if(loadedPlaceholders == 0){
+            getLogger().warning("No compatible Ban plugin was found to register placeholders for. Disabling plugin...");
+            
+            getServer().getPluginManager().disablePlugin(this);
+        }else{
+            getLogger().info("Loaded " + loadedPlaceholders + " Placeholder Set(s) for AdvancedServerList!");
+        }
+    }
+    
+    private int loadPlaceholderProviders(){
+        int loaded = 0;
+        Map<String, PlaceholderProvider> banPlugins = PaperBanPlugins.getBanPlugins();
+        AdvancedServerListAPI api = AdvancedServerListAPI.get();
+        
+        for(Map.Entry<String, PlaceholderProvider> entry : banPlugins.entrySet()){
+            if(getServer().getPluginManager().isPluginEnabled(entry.getKey())){
+                getLogger().info("Registering Placeholders for " + entry.getKey() + "...");
+                api.addPlaceholderProvider(entry.getValue());
+                getLogger().info("Placeholder successfully registered!");
+                
+                loaded++;
+            }
+        }
+        
+        return loaded;
+    }
+}

addons/banplugins/src/main/java/ch/andre601/advancedserverlist/banplugins/placeholders/AdvancedBanPlaceholders.java

@@ -0,0 +1,96 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2024 Andre_601
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package ch.andre601.advancedserverlist.banplugins.placeholders;
+
+import ch.andre601.advancedserverlist.api.PlaceholderProvider;
+import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
+import ch.andre601.advancedserverlist.api.objects.GenericServer;
+import ch.andre601.advancedserverlist.banplugins.providers.AdvancedBanProvider;
+
+import java.util.Arrays;
+
+public class AdvancedBanPlaceholders extends PlaceholderProvider{
+    
+    private final AdvancedBanProvider provider = new AdvancedBanProvider();
+    
+    public AdvancedBanPlaceholders(){
+        super("advancedban");
+    }
+    
+    @Override
+    public String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
+        String[] args = placeholder.split("\\s");
+        
+        return switch(args[0]) {
+            // Mute-related placeholders
+            case "isMuted" -> String.valueOf(provider.muted(player));
+            case "muteReason" -> provider.muteReason(player);
+            case "muteDuration" -> {
+                if(args.length == 1)
+                    yield provider.muteDuration(player);
+                
+                if(args.length > 2)
+                    yield null;
+                
+                boolean fromStart = Boolean.getBoolean(args[1]);
+                yield provider.muteDuration(player, fromStart);
+            }
+            case "muteExpiration" -> {
+                if(args.length == 1)
+                    yield provider.muteExpirationDate(player);
+                
+                String pattern = String.join(" ", Arrays.copyOfRange(args, 1, args.length));
+                
+                yield provider.banExpirationDate(player, pattern);
+            }
+            
+            // Ban-related placeholders
+            case "isBanned" -> String.valueOf(provider.banned(player));
+            case "banReason" -> provider.banReason(player);
+            case "banDuration" -> {
+                if(args.length == 1)
+                    yield provider.banDuration(player);
+                
+                if(args.length > 2)
+                    yield null;
+                
+                boolean fromStart = Boolean.getBoolean(args[1]);
+                yield provider.banDuration(player, fromStart);
+            }
+            case "banExpiration" -> {
+                if(args.length == 1)
+                    yield provider.banExpirationDate(player);
+                
+                String pattern = String.join(" ", Arrays.copyOfRange(args, 1, args.length));
+                
+                yield provider.banExpirationDate(player, pattern);
+            }
+            
+            // Unknown/Invalid placeholder.
+            default -> null;
+        };
+    }
+}

addons/banplugins/src/main/java/ch/andre601/advancedserverlist/banplugins/placeholders/LibertyBansPlaceholders.java

@@ -0,0 +1,76 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2024 Andre_601
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package ch.andre601.advancedserverlist.banplugins.placeholders;
+
+import ch.andre601.advancedserverlist.api.PlaceholderProvider;
+import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
+import ch.andre601.advancedserverlist.api.objects.GenericServer;
+import ch.andre601.advancedserverlist.banplugins.providers.LibertyBansProvider;
+
+import java.util.Arrays;
+
+public class LibertyBansPlaceholders extends PlaceholderProvider{
+    
+    private final LibertyBansProvider provider = LibertyBansProvider.create();
+    
+    public LibertyBansPlaceholders(){
+        super("libertybans");
+    }
+    
+    @Override
+    public String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
+        String[] args = placeholder.split("\\.");
+        
+        return switch(args[0]){
+            // Mute-related placeholders
+            case "isMuted" -> String.valueOf(provider.muted(player));
+            case "muteReason" -> provider.muteReason(player);
+            case "muteExpiration" -> {
+                if(args.length == 1)
+                    yield provider.muteExpirationDate(player);
+                
+                String pattern = String.join(" ", Arrays.copyOfRange(args, 1, args.length));
+                
+                yield provider.muteExpirationDate(player, pattern);
+            }
+            
+            // Ban-related placeholders
+            case "isBanned" -> String.valueOf(provider.banned(player));
+            case "banReason" -> provider.banReason(player);
+            case "banExpiration" -> {
+                if(args.length == 1)
+                    yield provider.banExpirationDate(player);
+                
+                String pattern = String.join(" ", Arrays.copyOfRange(args, 1, args.length));
+                
+                yield provider.banExpirationDate(player, pattern);
+            }
+            
+            // Unknown/Invalid placeholder
+            default -> null;
+        };
+    }
+}

addons/banplugins/src/main/java/ch/andre601/advancedserverlist/banplugins/providers/AdvancedBanProvider.java

@@ -0,0 +1,139 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2024 Andre_601
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package ch.andre601.advancedserverlist.banplugins.providers;
+
+import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
+import com.google.common.base.Strings;
+import com.google.common.primitives.UnsignedLongs;
+import me.leoko.advancedban.manager.PunishmentManager;
+import me.leoko.advancedban.utils.Punishment;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.UUID;
+
+public class AdvancedBanProvider implements PunishmentProvider{
+    
+    private static PunishmentManager getAPI(){
+        return PunishmentManager.get();
+    }
+    
+    private static String noDashesUUID(UUID uuid){
+        return hexString(uuid.getMostSignificantBits()) + hexString(uuid.getLeastSignificantBits());
+    }
+    
+    private static Punishment mute(GenericPlayer player){
+        return getAPI().getMute(noDashesUUID(player.getUUID()));
+    }
+    
+    private static Punishment ban(GenericPlayer player){
+        return getAPI().getBan(noDashesUUID(player.getUUID()));
+    }
+    
+    private static String hexString(long unsigned){
+        return Strings.padStart(UnsignedLongs.toString(unsigned, 16), 16, '0');
+    }
+    
+    @Override
+    public boolean muted(GenericPlayer player){
+        return getAPI().isMuted(noDashesUUID(player.getUUID()));
+    }
+    
+    @Override
+    public boolean banned(GenericPlayer player){
+        return getAPI().isBanned(noDashesUUID(player.getUUID()));
+    }
+    
+    @Override
+    public String muteReason(GenericPlayer player){
+        Punishment mute = mute(player);
+        if(mute == null)
+            return null;
+        
+        return mute.getReason();
+    }
+    
+    @Override
+    public String banReason(GenericPlayer player){
+        Punishment ban = ban(player);
+        if(ban == null)
+            return null;
+        
+        return ban.getReason();
+    }
+    
+    @Override
+    public String muteDuration(GenericPlayer player){
+        return muteDuration(player, false);
+    }
+    
+    @Override
+    public String banDuration(GenericPlayer player){
+        return banDuration(player, false);
+    }
+    
+    @Override
+    public String muteExpirationDate(GenericPlayer player, String pattern){
+        Punishment mute = mute(player);
+        if(mute == null)
+            return null;
+        
+        long end = mute.getEnd();
+        if(end < 0L)
+            return "never";
+        
+        return this.returnDate(pattern, end);
+    }
+    
+    @Override
+    public String banExpirationDate(GenericPlayer player, String pattern){
+        Punishment ban = ban(player);
+        if(ban == null)
+            return null;
+        
+        long end = ban.getEnd();
+        if(end < 0L)
+            return "never";
+        
+        return this.returnDate(pattern, end);
+    }
+    
+    public String muteDuration(GenericPlayer player, boolean fromStart){
+        Punishment mute = mute(player);
+        if(mute == null)
+            return null;
+        
+        return mute.getDuration(fromStart);
+    }
+    
+    public String banDuration(GenericPlayer player, boolean fromStart){
+        Punishment ban = ban(player);
+        if(ban == null)
+            return null;
+        
+        return ban.getDuration(fromStart);
+    }
+}

addons/banplugins/src/main/java/ch/andre601/advancedserverlist/banplugins/providers/LibertyBansProvider.java

@@ -0,0 +1,136 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2024 Andre_601
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package ch.andre601.advancedserverlist.banplugins.providers;
+
+import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
+import space.arim.libertybans.api.LibertyBans;
+import space.arim.libertybans.api.PunishmentType;
+import space.arim.libertybans.api.punish.Punishment;
+import space.arim.libertybans.api.user.KnownAccount;
+import space.arim.omnibus.Omnibus;
+import space.arim.omnibus.OmnibusProvider;
+
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.UUID;
+
+public class LibertyBansProvider implements PunishmentProvider{
+    private final LibertyBans libertyBans;
+    
+    private LibertyBansProvider(LibertyBans libertyBans){
+        this.libertyBans = libertyBans;
+    }
+    
+    public static LibertyBansProvider create(){
+        Omnibus omnibus = OmnibusProvider.getOmnibus();
+        LibertyBans libertyBans = omnibus.getRegistry().getProvider(LibertyBans.class).orElseThrow();
+        
+        return new LibertyBansProvider(libertyBans);
+    }
+    
+    @Override
+    public boolean muted(GenericPlayer player){
+        return punishment(player.getUUID(), PunishmentType.MUTE) != null;
+    }
+    
+    @Override
+    public boolean banned(GenericPlayer player){
+        return punishment(player.getUUID(), PunishmentType.BAN) != null;
+    }
+    
+    @Override
+    public String muteReason(GenericPlayer player){
+        Punishment mute = punishment(player.getUUID(), PunishmentType.MUTE);
+        if(mute == null)
+            return null;
+        
+        return mute.getReason();
+    }
+    
+    @Override
+    public String banReason(GenericPlayer player){
+        Punishment ban = punishment(player.getUUID(), PunishmentType.BAN);
+        if(ban == null)
+            return null;
+        
+        return ban.getReason();
+    }
+    
+    @Override
+    public String muteDuration(GenericPlayer player){
+        return null;
+    }
+    
+    @Override
+    public String banDuration(GenericPlayer player){
+        return null;
+    }
+    
+    @Override
+    public String muteExpirationDate(GenericPlayer player, String pattern){
+        Punishment mute = punishment(player.getUUID(), PunishmentType.MUTE);
+        if(mute == null)
+            return null;
+        
+        if(mute.isPermanent())
+            return "never";
+        
+        return this.returnDate(pattern, mute.getEndDate().toEpochMilli());
+    }
+    
+    @Override
+    public String banExpirationDate(GenericPlayer player, String pattern){
+        Punishment ban = punishment(player.getUUID(), PunishmentType.BAN);
+        if(ban == null)
+            return null;
+        
+        if(ban.isPermanent())
+            return "never";
+        
+        return this.returnDate(pattern, ban.getEndDate().toEpochMilli());
+    }
+    
+    private Punishment punishment(UUID uuid, PunishmentType type){
+        List<? extends KnownAccount> accounts = libertyBans.getAccountSupervisor()
+            .findAccountsMatching(uuid)
+            .join();
+        
+        if(accounts.isEmpty())
+            return null;
+        
+        KnownAccount sorted = Collections.max(accounts, Comparator.comparing(KnownAccount::recorded));
+        
+        return libertyBans.getSelector()
+            .selectionByApplicabilityBuilder(sorted.uuid(), sorted.address())
+            .type(type)
+            .build()
+            .getFirstSpecificPunishment()
+            .toCompletableFuture()
+            .join()
+            .orElse(null);
+    }
+}

addons/banplugins/src/main/java/ch/andre601/advancedserverlist/banplugins/providers/PunishmentProvider.java

@@ -0,0 +1,68 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2024 Andre_601
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package ch.andre601.advancedserverlist.banplugins.providers;
+
+import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public interface PunishmentProvider{
+    
+    boolean muted(GenericPlayer player);
+    
+    boolean banned(GenericPlayer player);
+    
+    String muteReason(GenericPlayer player);
+    
+    String banReason(GenericPlayer player);
+    
+    String muteDuration(GenericPlayer player);
+    
+    String banDuration(GenericPlayer player);
+    
+    default String muteExpirationDate(GenericPlayer player){
+        return muteExpirationDate(player, "dd, MMM yyyy HH:mm:ss");
+    }
+    
+    String muteExpirationDate(GenericPlayer player, String pattern);
+    
+    default String banExpirationDate(GenericPlayer player){
+        return banExpirationDate(player, "dd, MMM yyyy HH:mm:ss");
+    }
+    
+    String banExpirationDate(GenericPlayer player, String pattern);
+    
+    default String returnDate(String pattern, long end){
+        Date date = new Date(end);
+        try{
+            return new SimpleDateFormat(pattern).format(date);
+        }catch(IllegalArgumentException ex){
+            return new SimpleDateFormat("dd, MMM yyyy HH:mm:ss").format(date);
+        }
+    }
+    
+}

addons/banplugins/src/main/java/ch/andre601/advancedserverlist/banplugins/velocity/VelocityBanPlugins.java

@@ -0,0 +1,56 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2024 Andre_601
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package ch.andre601.advancedserverlist.banplugins.velocity;
+
+import ch.andre601.advancedserverlist.api.PlaceholderProvider;
+import ch.andre601.advancedserverlist.banplugins.paper.PaperBanPlugins;
+import ch.andre601.advancedserverlist.banplugins.placeholders.LibertyBansPlaceholders;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum VelocityBanPlugins{
+    
+    LIBERTY_BANS("libertybans", new LibertyBansPlaceholders());
+    
+    private final String plugin;
+    private final PlaceholderProvider placeholderProvider;
+    
+    VelocityBanPlugins(String plugin, PlaceholderProvider placeholderProvider){
+        this.plugin = plugin;
+        this.placeholderProvider = placeholderProvider;
+    }
+    
+    public static Map<String, PlaceholderProvider> getBanPlugins(){
+        Map<String, PlaceholderProvider> content = new HashMap<>();
+        
+        for(VelocityBanPlugins velocityBanPlugins : VelocityBanPlugins.values()){
+            content.put(velocityBanPlugins.plugin, velocityBanPlugins.placeholderProvider);
+        }
+        
+        return content;
+    }
+}

addons/banplugins/src/main/java/ch/andre601/advancedserverlist/banplugins/velocity/VelocityBanPluginsAddon.java

@@ -0,0 +1,82 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2024 Andre_601
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package ch.andre601.advancedserverlist.banplugins.velocity;
+
+import ch.andre601.advancedserverlist.api.AdvancedServerListAPI;
+import ch.andre601.advancedserverlist.api.PlaceholderProvider;
+import com.google.inject.Inject;
+import com.velocitypowered.api.event.Subscribe;
+import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
+import net.md_5.bungee.api.ProxyServer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Map;
+
+public class VelocityBanPluginsAddon{
+    
+    private final Logger logger = LoggerFactory.getLogger("ASLBanPluginsAddon");
+    
+    private final ProxyServer proxy;
+    
+    @Inject
+    public VelocityBanPluginsAddon(ProxyServer proxy){
+        this.proxy = proxy;
+    }
+    
+    @Subscribe
+    public void init(ProxyInitializeEvent event){
+        if(proxy.getPluginManager().getPlugin("advancedserverlist") == null){
+            logger.warn("AdvancedServerList is not enabled. This plugin requires it to function!");
+            return;
+        }
+        
+        int loadedPlaceholders = loadPlaceholderProviders();
+        if(loadedPlaceholders == 0){
+            logger.warn("No compatible Ban plugin was found to register placeholders for.");
+        }else{
+            logger.info("Loaded {} Placeholder Set(s) for AdvancedServerList!", loadedPlaceholders);
+        }
+    }
+    
+    private int loadPlaceholderProviders(){
+        int loaded = 0;
+        Map<String, PlaceholderProvider> banPlugins = VelocityBanPlugins.getBanPlugins();
+        AdvancedServerListAPI api = AdvancedServerListAPI.get();
+        
+        for(Map.Entry<String, PlaceholderProvider> entry : banPlugins.entrySet()){
+            if(proxy.getPluginManager().getPlugin(entry.getKey()) != null){
+                logger.info("Registering placeholders for {}...", entry.getKey());
+                api.addPlaceholderProvider(entry.getValue());
+                logger.info("Placeholder successfully registered!");
+                
+                loaded++;
+            }
+        }
+        
+        return loaded;
+    }
+}

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

@@ -0,0 +1,11 @@
+name: 'ASLBanPluginsAddon'
+author: 'Andre_601'
+version: '${plugin.version}'
+description: 'AdvancedBan Add-on for AdvancedServerList to add placeholders to use.'
+
+softDepends:
+  - AdvancedServerList
+  - AdvancedBan
+  - LibertyBans
+
+main: 'ch.andre601.advancedserverlist.banplugins.bungeecord.BungeeCordBanPluginsAddon'

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

@@ -0,0 +1,19 @@
+name: 'ASLBanPluginsAddon'
+author: 'Andre_601'
+version: '${plugin.version}'
+
+main: 'ch.andre601.advancedserverlist.banplugins.paper.AdvancedBanPlaceholders'
+
+api-version: '1.19'
+
+dependencies: 
+  server: 
+    AdvancedServerList:
+      required: false
+      load: BEFORE
+    AdvancedBans:
+      required: false
+      load: BEFORE
+    LibertyBans:
+      required: false
+      load: BEFORE

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

@@ -0,0 +1,20 @@
+{
+  "id": "aslbanpluginsaddon",
+  "name": "ASLBanPluginsAddon",
+  "version": "${plugin.version}",
+  "description": "${plugin.description}",
+  "authors": [
+    "Andre_601"
+  ],
+  "dependencies": [
+    {
+      "id": "advancedserverlist",
+      "optional": true
+    },
+    {
+      "id": "libertybans",
+      "optional": true
+    }
+  ],
+  "main": "ch.andre601.advancedserverlist.banplugins.velocity.VelocityBanPluginsAddon"
+}

bukkit/src/main/java/ch/andre601/advancedserverlist/bukkit/BukkitCore.java

@@ -1,39 +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.bukkit;
-
-import ch.andre601.advancedserverlist.bukkit.objects.WorldCache;
-import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
-import org.bukkit.plugin.java.JavaPlugin;
-
-/* 
- * 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();
-}

bukkit/src/main/java/ch/andre601/advancedserverlist/bukkit/commands/CmdAdvancedServerList.java

@@ -1,75 +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.bukkit.commands;
-
-import ch.andre601.advancedserverlist.core.interfaces.commands.CmdSender;
-import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
-import ch.andre601.advancedserverlist.paper.commands.PaperCmdSender;
-import ch.andre601.advancedserverlist.spigot.commands.SpigotCmdSender;
-import net.kyori.adventure.platform.bukkit.BukkitAudiences;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Collections;
-
-public class CmdAdvancedServerList extends Command implements CommandExecutor{
-    
-    private final PluginCore<?> plugin;
-    private final BukkitAudiences audiences;
-    
-    public CmdAdvancedServerList(PluginCore<?> plugin){
-        this(plugin, null);
-    }
-    
-    public CmdAdvancedServerList(PluginCore<?> plugin, BukkitAudiences audiences){
-        super(
-            "advancedserverlist",
-            "Main command of the plugin",
-            "/asl [reload|help|clearCache]",
-            Collections.singletonList("asl")
-        );
-        
-        this.plugin = plugin;
-        this.audiences = audiences;
-    }
-    
-    public boolean execute(@NotNull CommandSender sender, @NotNull String s, @NotNull String[] args){
-        plugin.getCore().getCommandHandler().handle(getSender(sender), args);
-        return true;
-    }
-    
-    @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @NotNull String label, @NotNull String[] args){
-        plugin.getCore().getCommandHandler().handle(getSender(sender), args);
-        return true;
-    }
-    
-    private CmdSender getSender(CommandSender sender){
-        return audiences == null ? new PaperCmdSender(sender) : new SpigotCmdSender(sender, audiences);
-    }
-}

bukkit/src/main/java/ch/andre601/advancedserverlist/bukkit/listeners/LoadEvent.java

@@ -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.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;
-
-public class LoadEvent implements Listener{
-    
-    private final BukkitCore<?> 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){
-        JoinEvent.init(plugin);
-        WorldEvents.init(plugin);
-        
-        // 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!");
-            
-            Bukkit.getPluginManager().disablePlugin(plugin);
-            return;
-        }
-        
-        ProtocolLibEvents.init(spigotCore, ProtocolLibrary.getProtocolManager());
-        
-        if(Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI"))
-            spigotCore.setPapiPlaceholders(PAPIPlaceholders.init(spigotCore));
-    }
-}

bukkit/src/main/java/ch/andre601/advancedserverlist/bukkit/objects/placeholders/BukkitPlayerPlaceholders.java

@@ -1,62 +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.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 BukkitPlayerPlaceholders extends PlaceholderProvider{
-    
-    private BukkitPlayerPlaceholders(){
-        super("player");
-    }
-    
-    public static BukkitPlayerPlaceholders init(){
-        return new BukkitPlayerPlaceholders();
-    }
-    
-    @Override
-    public String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server){
-        if(!(player instanceof BukkitPlayer bukkitPlayer))
-            return null;
-        
-        return switch(placeholder){
-            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(BukkitPlayer player, Object value){
-        return player.getPlayer() == null ? null : String.valueOf(value);
-    }
-}

bukkit/src/main/java/ch/andre601/advancedserverlist/paper/ASLLoader.java

@@ -1,61 +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.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!"));
-    }
-}

bukkit/src/main/java/ch/andre601/advancedserverlist/paper/PaperCore.java

@@ -1,153 +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.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());
-    }
-}

bukkit/src/main/java/ch/andre601/advancedserverlist/spigot/SpigotCore.java

@@ -1,178 +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.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.profiles.favicon.FaviconHandler;
-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 java.nio.file.Path;
-
-public class SpigotCore extends BukkitCore<WrappedServerPing.CompressedImage>{
-    
-    private final PluginLogger logger = new BukkitLogger(getLogger());
-    
-    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(){
-        try{
-            Class.forName("io.papermc.paper.configuration.ConfigurationLoaders");
-            
-            printPaperInfo();
-        }catch(ClassNotFoundException ex){
-            try{
-                // Above class only exists since 1.19+, so this is a fallback for older versions.
-                Class.forName("com.destroystokyo.paper.PaperConfig");
-                
-                printPaperInfo();
-            }catch(ClassNotFoundException ignored){}
-        }
-        
-        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();
-    }
-    
-    @Override
-    public void loadCommands(){
-        PluginCommand cmd = getServer().getPluginCommand("advancedserverlist");
-        if(cmd == null){
-            getPluginLogger().warn("Unable to register command /advancedserverlist");
-            return;
-        }
-        cmd.setExecutor(new CmdAdvancedServerList(this, BukkitAudiences.create(this)));
-    }
-    
-    @Override
-    public void loadEvents(){
-        LoadEvent.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<WrappedServerPing.CompressedImage> getCore(){
-        return core;
-    }
-    
-    @Override
-    public Path getFolderPath(){
-        return getDataFolder().toPath();
-    }
-    
-    @Override
-    public PluginLogger getPluginLogger(){
-        return logger;
-    }
-    
-    @Override
-    public FaviconHandler<WrappedServerPing.CompressedImage> 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 "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 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!");
-        getPluginLogger().warn("======================================================================================");
-    }
-}

bukkit/src/main/java/ch/andre601/advancedserverlist/spigot/listeners/ProtocolLibEventWrapper.java

@@ -1,203 +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.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.bukkit.BukkitCore;
-import ch.andre601.advancedserverlist.bukkit.listeners.PreServerListSetEventImpl;
-import ch.andre601.advancedserverlist.bukkit.objects.impl.BukkitServerImpl;
-import ch.andre601.advancedserverlist.core.events.PingEventHandler;
-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.bukkit.objects.impl.BukkitPlayerImpl;
-import com.comphenix.protocol.events.PacketEvent;
-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.*;
-
-public class ProtocolLibEventWrapper implements GenericEventWrapper<WrappedServerPing.CompressedImage, BukkitPlayerImpl>{
-    
-    private final SpigotCore plugin;
-    private final PacketEvent event;
-    private final WrappedServerPing ping;
-    
-    public ProtocolLibEventWrapper(SpigotCore plugin, PacketEvent event){
-        this.plugin = plugin;
-        this.event = event;
-        this.ping = event.getPacket().getServerPings().read(0);
-    }
-    
-    @Override
-    public GenericServerListEvent callEvent(ProfileEntry entry){
-        PreServerListSetEventImpl event = new PreServerListSetEventImpl(entry);
-        plugin.getServer().getPluginManager().callEvent(event);
-        
-        return event;
-    }
-    
-    @Override
-    public void setMaxPlayers(int maxPlayers){
-        ping.setPlayersMaximum(maxPlayers);
-    }
-    
-    @Override
-    public void setMotd(Component component){
-        ping.setMotD(WrappedChatComponent.fromJson(GsonComponentSerializer.gson().serialize(component)));
-    }
-    
-    @Override
-    public void hidePlayers(){
-        ping.setPlayersVisible(false);
-    }
-    
-    @Override
-    public void setPlayerCount(String name){
-        ping.setVersionName(name);
-        ping.setVersionProtocol(-1);
-    }
-    
-    @Override
-    public void setPlayers(List<String> lines, BukkitPlayerImpl player, GenericServer server){
-        List<WrappedGameProfile> players = new ArrayList<>(lines.size());
-        
-        for(String line : lines){
-            String parsed = ComponentParser.text(line)
-                .modifyText(text -> StringReplacer.replace(text, player, server))
-                .modifyText(text -> {
-                    if(plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI"))
-                        return PlaceholderAPI.setPlaceholders(player.getPlayer(), text);
-                    
-                    return text;
-                })
-                .toString();
-            
-            players.add(new WrappedGameProfile(UUID.randomUUID(), parsed));
-        }
-        
-        ping.setPlayers(players);
-    }
-    
-    @Override
-    public void setFavicon(WrappedServerPing.CompressedImage favicon){
-        ping.setFavicon(favicon);
-    }
-    
-    @Override
-    public void setDefaultFavicon(){
-        ping.setFavicon(ping.getFavicon());
-    }
-    
-    // Not used in ProtocolLib
-    @Override
-    public void updateEvent(){
-        event.getPacket().getServerPings().write(0, ping);
-    }
-    
-    @Override
-    public boolean isInvalidProtocol(){
-        return event.getPlayer().getAddress() == null;
-    }
-    
-    @Override
-    public boolean isMaintenanceModeActive(){
-        if(!Bukkit.getPluginManager().isPluginEnabled("Maintenance"))
-            return false;
-        
-        return PingEventHandler.getMaintenanceUtil().isMaintenanceEnabled();
-    }
-    
-    @Override
-    public int getProtocolVersion(){
-        return ping.getVersionProtocol();
-    }
-    
-    @Override
-    public int getOnlinePlayers(){
-        return ping.getPlayersOnline();
-    }
-    
-    @Override
-    public int getMaxPlayers(){
-        return ping.getPlayersMaximum();
-    }
-    
-    @Override
-    public String getPlayerIP(){
-        return event.getPlayer().getAddress() == null ? "UNKNOWN" : event.getPlayer().getAddress().getHostString();
-    }
-    
-    @Override
-    public String parsePAPIPlaceholders(String text, BukkitPlayerImpl player){
-        if(plugin.getServer().getPluginManager().isPluginEnabled("PlaceholderAPI"))
-            return PlaceholderAPI.setPlaceholders(player.getPlayer(), text);
-        
-        return text;
-    }
-    
-    @Override
-    public String getVirtualHost(){
-        String host = this.resolveHost(event.getPlayer().getAddress());
-        if(host == null)
-            return null;
-        
-        return ProtocolLibEvents.getHostAddresses().get(host);
-    }
-    
-    @Override
-    public BukkitCore<WrappedServerPing.CompressedImage> getPlugin(){
-        return plugin;
-    }
-    
-    @Override
-    public BukkitPlayerImpl createPlayer(CachedPlayer player, int protocol){
-        OfflinePlayer pl = Bukkit.getOfflinePlayer(player.getUuid());
-        
-        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
-    public WrappedServerPing.CompressedImage createFavicon(BufferedImage image) throws Exception{
-        return WrappedServerPing.CompressedImage.fromPng(image);
-    }
-}

bukkit/src/main/java/ch/andre601/advancedserverlist/spigot/listeners/ProtocolLibEvents.java

@@ -1,84 +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.spigot.listeners;
-
-import ch.andre601.advancedserverlist.core.events.PingEventHandler;
-import ch.andre601.advancedserverlist.spigot.SpigotCore;
-import com.comphenix.protocol.PacketType;
-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.Map;
-import java.util.TreeMap;
-
-public class ProtocolLibEvents implements Listener{
-    
-    private final ProtocolManager protocolManager;
-    
-    private static final Map<String, String> hostAddresses = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
-    
-    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){
-        protocolManager.addPacketListener(new PacketAdapter(spigotPlugin, ListenerPriority.LOW, PacketType.Handshake.Client.SET_PROTOCOL){
-            @Override
-            public void onPacketReceiving(PacketEvent event){
-                InetSocketAddress address = event.getPlayer().getAddress();
-                if(address == null)
-                    return;
-                
-                String host = event.getPacket().getStrings().read(0);
-                
-                hostAddresses.put(address.getHostString(), host);
-            }
-        });
-        
-        protocolManager.addPacketListener(new PacketAdapter(spigotPlugin, ListenerPriority.LOW, PacketType.Status.Server.SERVER_INFO){
-            @Override
-            public void onPacketSending(PacketEvent event){
-                PingEventHandler.handleEvent(new ProtocolLibEventWrapper(spigotPlugin, event));
-            }
-        });
-    }
-}

bungeecord/pom.xml

@@ -64,55 +64,65 @@
             <version>${api.version}</version>
             <scope>compile</scope>
         </dependency>
+        
+        <!-- BungeeCord API -->
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-api</artifactId>
-            <version>1.19-R0.1-SNAPSHOT</version>
+            <version>1.20-R0.2</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-api</artifactId>
-            <version>1.19-R0.1-SNAPSHOT</version>
+            <version>1.20-R0.2</version>
             <type>javadoc</type>
             <scope>provided</scope>
         </dependency>
+        
+        <!-- Adventure Library. Needs to be shaded in -->
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-api</artifactId>
-            <version>4.13.0</version>
+            <version>4.16.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-text-minimessage</artifactId>
-            <version>4.13.0</version>
+            <version>4.16.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-platform-bungeecord</artifactId>
-            <version>4.1.2</version>
+            <version>4.3.2</version>
             <scope>compile</scope>
         </dependency>
+        
+        <!-- Metrics -->
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bungeecord</artifactId>
-            <version>3.0.0</version>
+            <version>3.0.2</version>
             <scope>compile</scope>
         </dependency>
+        
+        <!-- Configurate -->
         <dependency>
             <groupId>org.spongepowered</groupId>
             <artifactId>configurate-yaml</artifactId>
             <version>4.1.2</version>
             <scope>compile</scope>
         </dependency>
+        
+        <!-- Plugins -->
         <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
-            <version>4.10.0</version>
-            <scope>compile</scope>
+            <groupId>com.github.LeonMangler</groupId>
+            <artifactId>PremiumVanishAPI</artifactId>
+            <version>2.9.0-4</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
@@ -128,12 +138,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.11.0</version>
+                <version>3.12.1</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>3.5.2</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <relocations>
@@ -149,10 +159,6 @@
                             <pattern>org.bstats</pattern>
                             <shadedPattern>ch.andre601.advancedserverlist.bungeecord.depends.bstats</shadedPattern>
                         </relocation>
-                        <relocation>
-                            <pattern>okhttp3</pattern>
-                            <shadedPattern>ch.andre601.advancedserverlist.bungeecord.depends.okhttp3</shadedPattern>
-                        </relocation>
                     </relocations>
                     <filters>
                         <filter>

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

@@ -29,28 +29,34 @@ import ch.andre601.advancedserverlist.bungeecord.commands.CmdAdvancedServerList;
 import ch.andre601.advancedserverlist.bungeecord.listeners.JoinEvent;
 import ch.andre601.advancedserverlist.bungeecord.listeners.PingEvent;
 import ch.andre601.advancedserverlist.bungeecord.logging.BungeeLogger;
-import ch.andre601.advancedserverlist.bungeecord.objects.BungeePlayerPlaceholders;
-import ch.andre601.advancedserverlist.bungeecord.objects.BungeeServerPlaceholders;
+import ch.andre601.advancedserverlist.bungeecord.objects.placeholders.BungeePlayerPlaceholders;
+import ch.andre601.advancedserverlist.bungeecord.objects.placeholders.BungeeServerPlaceholders;
 import ch.andre601.advancedserverlist.core.AdvancedServerList;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
 import ch.andre601.advancedserverlist.core.profiles.favicon.FaviconHandler;
+import de.myzelyam.api.vanish.BungeeVanishAPI;
 import net.md_5.bungee.api.Favicon;
+import net.md_5.bungee.api.config.ServerInfo;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.plugin.Plugin;
 import org.bstats.bungeecord.Metrics;
 import org.bstats.charts.SimplePie;
 
+import java.awt.image.BufferedImage;
 import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
 
 public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
     
     private AdvancedServerList<Favicon> core;
     private FaviconHandler<Favicon> faviconHandler = null;
-    private final PluginLogger logger = new BungeeLogger(getLogger());
+    private final PluginLogger logger = new BungeeLogger(this);
     
     @Override
     public void onEnable(){
-        this.core = AdvancedServerList.init(this, BungeePlayerPlaceholders.init(), BungeeServerPlaceholders.init());
+        this.core = AdvancedServerList.init(this, BungeePlayerPlaceholders.init(), BungeeServerPlaceholders.init(this));
     }
     
     @Override
@@ -77,12 +83,17 @@ public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
         
     }
     
+    @Override
+    public void loadFaviconHandler(AdvancedServerList<Favicon> core){
+        faviconHandler = new FaviconHandler<>(core);
+    }
+    
     @Override
     public void clearFaviconCache(){
         if(faviconHandler == null)
             return;
     
-        faviconHandler.clearCache();
+        faviconHandler.cleanCache();
     }
     
     @Override
@@ -122,4 +133,20 @@ public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
     public String getLoader(){
         return "bungeecord";
     }
+    
+    @Override
+    public Favicon createFavicon(BufferedImage image) throws IllegalArgumentException{
+        return Favicon.create(image);
+    }
+    
+    public int getOnlinePlayers(ServerInfo server){
+        List<ProxiedPlayer> players = new ArrayList<>(server == null ? getProxy().getPlayers() : server.getPlayers());
+        
+        // Exclude players when PremiumVanish is enabled and player is hidden.
+        if(getProxy().getPluginManager().getPlugin("PremiumVanish") != null){
+            players.removeIf(BungeeVanishAPI::isInvisible);
+        }
+        
+        return players.size();
+    }
 }

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

@@ -25,12 +25,12 @@
 
 package ch.andre601.advancedserverlist.bungeecord.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.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.bungeecord.objects.impl.BungeePlayerImpl;
+import ch.andre601.advancedserverlist.bungeecord.objects.impl.BungeeProxyImpl;
 import ch.andre601.advancedserverlist.core.events.PingEventHandler;
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
 import ch.andre601.advancedserverlist.core.interfaces.events.GenericEventWrapper;
@@ -46,7 +46,6 @@ import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.event.ProxyPingEvent;
 
-import java.awt.image.BufferedImage;
 import java.net.InetSocketAddress;
 import java.util.List;
 import java.util.Map;
@@ -148,7 +147,7 @@ public class BungeeEventWrapper implements GenericEventWrapper<Favicon, BungeePl
     
     @Override
     public int getOnlinePlayers(){
-        return ping.getPlayers().getOnline();
+        return plugin.getOnlinePlayers(null);
     }
     
     @Override
@@ -205,9 +204,4 @@ public class BungeeEventWrapper implements GenericEventWrapper<Favicon, BungeePl
         
         return new BungeeProxyImpl(servers, playersOnline, playersMax, host);
     }
-    
-    @Override
-    public Favicon createFavicon(BufferedImage image) throws IllegalArgumentException{
-        return Favicon.create(image);
-    }
 }

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

@@ -25,12 +25,13 @@
 
 package ch.andre601.advancedserverlist.bungeecord.listeners;
 
+import ch.andre601.advancedserverlist.api.bungeecord.events.PostServerListSetEvent;
+import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
 import ch.andre601.advancedserverlist.bungeecord.BungeeCordCore;
 import ch.andre601.advancedserverlist.core.events.PingEventHandler;
 import net.md_5.bungee.api.event.ProxyPingEvent;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.event.EventHandler;
-import net.md_5.bungee.event.EventPriority;
 
 public class PingEvent implements Listener{
     
@@ -41,8 +42,10 @@ public class PingEvent implements Listener{
         plugin.getProxy().getPluginManager().registerListener(plugin, this);
     }
     
-    @EventHandler(priority = EventPriority.LOW)
+    @EventHandler(priority = 90) // Maintenance has Event Priority 80, so we need to be AFTER it.
     public void onProxyPing(ProxyPingEvent event){
-        PingEventHandler.handleEvent(new BungeeEventWrapper(plugin, event));
+        ProfileEntry entry = PingEventHandler.handleEvent(new BungeeEventWrapper(plugin, event));
+        
+        plugin.getProxy().getPluginManager().callEvent(new PostServerListSetEvent(entry));
     }
 }

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

@@ -25,6 +25,7 @@
 
 package ch.andre601.advancedserverlist.bungeecord.logging;
 
+import ch.andre601.advancedserverlist.bungeecord.BungeeCordCore;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
 
 import java.util.logging.Level;
@@ -32,10 +33,24 @@ import java.util.logging.Logger;
 
 public class BungeeLogger implements PluginLogger{
     
+    private final BungeeCordCore plugin;
     private final Logger logger;
     
-    public BungeeLogger(Logger logger){
-        this.logger = logger;
+    public BungeeLogger(BungeeCordCore plugin){
+        this.plugin = plugin;
+        this.logger = plugin.getLogger();
+    }
+    
+    @Override
+    public void debug(Class<?> clazz, String msg, Object... args){
+        if(plugin.isDebugEnabled())
+            info("[DEBUG] [" + clazz.getSimpleName() + "] " + msg, args);
+    }
+    
+    @Override
+    public void debugWarn(Class<?> clazz, String msg, Object... args){
+        if(plugin.isDebugEnabled())
+            warn("[DEBUG] [" + clazz.getSimpleName() + "] " + msg, args);
     }
     
     @Override

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

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022-2023 Andre_601
+ * Copyright (c) 2022-2024 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,7 +23,7 @@
  *
  */
 
-package ch.andre601.advancedserverlist.bungeecord.objects;
+package ch.andre601.advancedserverlist.bungeecord.objects.impl;
 
 import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
 import ch.andre601.advancedserverlist.core.profiles.players.GenericPlayerImpl;
@@ -31,8 +31,8 @@ import ch.andre601.advancedserverlist.core.profiles.players.GenericPlayerImpl;
 public class BungeePlayerImpl extends GenericPlayerImpl{
     
     public BungeePlayerImpl(CachedPlayer player, int protocol){
-        this.name = player.getName();
+        this.name = player.name();
         this.protocol = protocol;
-        this.uuid = player.getUuid();
+        this.uuid = player.uuid();
     }
 }

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

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022-2023 Andre_601
+ * Copyright (c) 2022-2024 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,7 +23,7 @@
  *
  */
 
-package ch.andre601.advancedserverlist.bungeecord.objects;
+package ch.andre601.advancedserverlist.bungeecord.objects.impl;
 
 import ch.andre601.advancedserverlist.api.bungeecord.objects.BungeeProxy;
 import net.md_5.bungee.api.config.ServerInfo;

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

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022-2023 Andre_601
+ * Copyright (c) 2022-2024 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,7 +23,7 @@
  *
  */
 
-package ch.andre601.advancedserverlist.bungeecord.objects;
+package ch.andre601.advancedserverlist.bungeecord.objects.placeholders;
 
 import ch.andre601.advancedserverlist.api.PlaceholderProvider;
 import ch.andre601.advancedserverlist.api.objects.GenericPlayer;

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

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022-2023 Andre_601
+ * Copyright (c) 2022-2024 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,24 +23,28 @@
  *
  */
 
-package ch.andre601.advancedserverlist.bungeecord.objects;
+package ch.andre601.advancedserverlist.bungeecord.objects.placeholders;
 
 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 ch.andre601.advancedserverlist.bungeecord.BungeeCordCore;
 import net.md_5.bungee.api.config.ServerInfo;
 
 import java.net.InetSocketAddress;
 
 public class BungeeServerPlaceholders extends PlaceholderProvider{
     
-    private BungeeServerPlaceholders(){
+    private final BungeeCordCore plugin;
+    
+    private BungeeServerPlaceholders(BungeeCordCore plugin){
         super("server");
+        this.plugin = plugin;
     }
     
-    public static BungeeServerPlaceholders init(){
-        return new BungeeServerPlaceholders();
+    public static BungeeServerPlaceholders init(BungeeCordCore plugin){
+        return new BungeeServerPlaceholders(plugin);
     }
     
     @Override
@@ -53,14 +57,18 @@ public class BungeeServerPlaceholders extends PlaceholderProvider{
         return switch(args[0]){
             case "playersOnline" -> {
                 if(args.length >= 2){
-                    int players = 0;
+                    String[] servers = args[1].split(",");
                     
-                    for(int i = 1; i < args.length; i++){
-                        ServerInfo info = proxy.getServers().get(args[i]);
+                    int players = 0;
+                    for(String serverName : servers){
+                        if(serverName.isEmpty())
+                            continue;
+                        
+                        ServerInfo info = proxy.getServers().get(serverName.strip());
                         if(info == null)
                             continue;
                         
-                        players += info.getPlayers().size();
+                        players += plugin.getOnlinePlayers(info);
                     }
                     
                     yield String.valueOf(players);
@@ -81,6 +89,8 @@ public class BungeeServerPlaceholders extends PlaceholderProvider{
                 
                 if(args.length == 2){
                     ServerInfo info = proxy.getServers().get(args[1]);
+                    if(info == null)
+                        yield null;
                     
                     yield String.valueOf(((InetSocketAddress)info.getSocketAddress()).getHostString());
                 }

core/pom.xml

@@ -41,6 +41,7 @@
     <properties>
         <maven.compiler.source>16</maven.compiler.source>
         <maven.compiler.target>16</maven.compiler.target>
+        <plugin.config.version>5</plugin.config.version>
     </properties>
     
     <repositories>
@@ -56,6 +57,10 @@
             <id>sonatype</id>
             <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
         </repository>
+        <repository>
+            <id>codeberg</id>
+            <url>https://codeberg.org/api/packages/Andre601/maven/</url>
+        </repository>
     </repositories>
     
     <dependencies>
@@ -65,42 +70,46 @@
             <version>${api.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>ch.andre601</groupId>
+            <artifactId>expressionparser</artifactId>
+            <version>1.3.0</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>org.spongepowered</groupId>
             <artifactId>configurate-yaml</artifactId>
             <version>4.1.2</version>
             <scope>provided</scope>
         </dependency>
+        
+        <!-- MiniMessage -->
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-api</artifactId>
-            <version>4.14.0</version>
+            <version>4.16.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-text-minimessage</artifactId>
-            <version>4.14.0</version>
+            <version>4.16.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.kyori</groupId>
             <artifactId>adventure-text-serializer-legacy</artifactId>
-            <version>4.14.0</version>
+            <version>4.16.0</version>
             <scope>provided</scope>
         </dependency>
+        
+        <!-- Misc -->
         <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.11.0</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>com.unascribed</groupId>
             <artifactId>flexver-java</artifactId>
@@ -110,13 +119,15 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>32.1.2-jre</version>
+            <version>33.1.0-jre</version>
             <scope>provided</scope>
         </dependency>
+        
+        <!-- Plugins -->
         <dependency>
             <groupId>net.william278</groupId>
             <artifactId>papiproxybridge</artifactId>
-            <version>1.3</version>
+            <version>1.5</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -128,9 +139,9 @@
         
         <!-- Test dependencies -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13.2</version>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>5.10.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -147,12 +158,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.11.0</version>
+                <version>3.12.1</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>3.5.2</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <filters>
@@ -169,6 +180,10 @@
                             <pattern>com.unascribed</pattern>
                             <shadedPattern>ch.andre601.advancedserverlist.core.depends.flexver</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>ch.andre601.expressionparser</pattern>
+                            <shadedPattern>ch.andre601.advancedserverlist.core.depends.expressionparser</shadedPattern>
+                        </relocation>
                     </relocations>
                 </configuration>
                 <executions>

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

@@ -31,12 +31,11 @@ import ch.andre601.advancedserverlist.core.check.UpdateChecker;
 import ch.andre601.advancedserverlist.core.commands.CommandHandler;
 import ch.andre601.advancedserverlist.core.file.FileHandler;
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
-import ch.andre601.advancedserverlist.core.objects.ServerPlaceholders;
+import ch.andre601.advancedserverlist.core.profiles.conditions.ProfileConditionParser;
 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;
@@ -47,7 +46,8 @@ public class AdvancedServerList<F>{
     private final FileHandler fileHandler;
     private final CommandHandler commandHandler;
     private final PlayerHandler playerHandler;
-    private final AdvancedServerListAPI api = AdvancedServerListAPI.get();
+    private static final AdvancedServerListAPI api = AdvancedServerListAPI.get();
+    private final ProfileConditionParser parser = ProfileConditionParser.create();
     
     private UpdateChecker updateChecker;
     
@@ -59,7 +59,7 @@ public class AdvancedServerList<F>{
         this.commandHandler = new CommandHandler(this);
         this.playerHandler = new PlayerHandler(this);
         
-        placeholders.forEach(this.api::addPlaceholderProvider);
+        placeholders.forEach(AdvancedServerList.getApi()::addPlaceholderProvider);
         
         load();
     }
@@ -88,10 +88,14 @@ public class AdvancedServerList<F>{
         return version;
     }
     
-    public AdvancedServerListAPI getApi(){
+    public static AdvancedServerListAPI getApi(){
         return api;
     }
     
+    public ProfileConditionParser getParser(){
+        return parser;
+    }
+    
     public void disable(){
         getPlugin().getPluginLogger().info("Saving playercache.json file...");
         getPlayerHandler().save();
@@ -137,15 +141,13 @@ public class AdvancedServerList<F>{
         }
         
         if(getFileHandler().loadProfiles()){
-            getPlugin().getPluginLogger().info("Successfully loaded " + getFileHandler().getProfiles().size() + " profiles!");
+            getPlugin().getPluginLogger().info("Successfully loaded %d profile(s)!", getFileHandler().getProfiles().size());
         }else{
             getPlugin().getPluginLogger().warn("Unable to load profiles! Check previous lines for errors.");
             return;
         }
         
-        Path folder = getPlugin().getFolderPath().resolve("favicons");
-        if(!folder.toFile().exists() && folder.toFile().mkdirs())
-            getPlugin().getPluginLogger().info("Successfully created favicons folder.");
+        getPlugin().loadFaviconHandler(this);
     
         getPlugin().getPluginLogger().info("Loading Commands...");
         plugin.loadCommands();

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

@@ -30,18 +30,17 @@ import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
 import com.google.gson.FieldNamingPolicy;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.google.gson.JsonSyntaxException;
 import com.unascribed.flexver.FlexVerComparator;
 import io.leangen.geantyref.TypeToken;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-import okhttp3.ResponseBody;
 
-import java.io.IOException;
 import java.lang.reflect.Type;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -49,12 +48,10 @@ import java.util.concurrent.TimeUnit;
 
 public class UpdateChecker{
     
-    private final String url = "https://api.modrinth.com/v2/project/advancedserverlist/version?loaders=[\"%s\"]";
-    private final OkHttpClient client = new OkHttpClient();
-    
-    private final AdvancedServerList<?> core;
-    private final PluginLogger logger;
-    private final String loader;
+    @SuppressWarnings("FieldCanBeLocal")
+    // 'https://api.modrinth.com/v2/project/advancedserverlist/version?loaders=["%s"]' URL encoded.
+    private final String url = "https://api.modrinth.com/v2/project/advancedserverlist/version?loaders=%%5B%%22%s%%22%%5D";
+    private final HttpClient client = HttpClient.newHttpClient();
     
     private final Type listType = new TypeToken<ArrayList<ModrinthVersion>>(){}.getType();
     private final Gson gson = new GsonBuilder()
@@ -65,6 +62,10 @@ public class UpdateChecker{
     
     private final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor(new UpdateCheckThread());
     
+    private final AdvancedServerList<?> core;
+    private final PluginLogger logger;
+    private final String loader;
+    
     public UpdateChecker(AdvancedServerList<?> core){
         this.core = core;
         this.logger = core.getPlugin().getPluginLogger();
@@ -73,42 +74,13 @@ public class UpdateChecker{
         startUpdateChecker();
     }
     
-    public void startUpdateChecker(){
-        executor.scheduleAtFixedRate(() -> {
-            logger.info("Checking for a new update...");
-            checkUpdate().whenComplete((version, throwable) -> {
-                if(version == null || throwable != null){
-                    logger.warn("Failed to look for any updates. See previous messages for reasons.");
-                    return;
-                }
-        
-                int result = version.compare(core.getVersion());
-                switch(result){
-                    case -1 -> printUpdateBanner(version.getVersionNumber(), version.getId(), version.isRelease());
-                    case 0 -> logger.info("No new update found. You're running the latest version!");
-                    case 1 -> logger.info(
-                        "Your version (%s) is higher than the latest release (%s). Are you running a dev build?",
-                        core.getVersion(), version.getVersionNumber()
-                    );
-                }
-            });
-        }, 0L, 12L, TimeUnit.HOURS);
-    }
-    
     public void disable(){
         executor.shutdown();
-        client.dispatcher().executorService().shutdown();
         try{
             if(!executor.awaitTermination(1, TimeUnit.SECONDS)){
                 executor.shutdownNow();
                 if(!executor.awaitTermination(1, TimeUnit.SECONDS))
-                    logger.warn("Scheduler didn't terminate in time!");
-            }
-            
-            if(!client.dispatcher().executorService().awaitTermination(1, TimeUnit.SECONDS)){
-                client.dispatcher().executorService().shutdownNow();
-                if(!client.dispatcher().executorService().awaitTermination(1, TimeUnit.SECONDS))
-                    logger.warn("OkHttp's Scheduler didn't terminate in time!");
+                    logger.warn("Scheduler did not terminate in time!");
             }
         }catch(InterruptedException ex){
             executor.shutdownNow();
@@ -116,108 +88,93 @@ public class UpdateChecker{
         }
     }
     
-    private CompletableFuture<ModrinthVersion> checkUpdate(){
-        return CompletableFuture.supplyAsync(() -> {
-            PluginLogger logger = core.getPlugin().getPluginLogger();
-            if(core.getVersion().equals("UNKNOWN")){
-                logger.warn("Cannot perform Update check! Plugin version couldn't be parsed.");
-                return null;
-            }
+    private void startUpdateChecker(){
+        executor.scheduleAtFixedRate(() -> {
+            logger.info("Looking for an update...");
             
-            Request request = new Request.Builder()
-                .url(String.format(url, loader))
-                .header("User-Agent", "AdvancedServerList-" + loader + "/" + core.getVersion())
-                .build();
-            
-            try(Response response = client.newCall(request).execute()){
-                if(!response.isSuccessful()){
-                    logger.warn("Encountered a non-successful response from Modrinth! Code: %d", response.code());
-                    return null;
-                }
-    
-                ResponseBody body = response.body();
-                if(body == null){
-                    logger.warn("Received an empty Response body from Modrinth!");
-                    return null;
+            performUpdateCheck().whenComplete((version, throwable) -> {
+                if(version == null || throwable != null){
+                    logger.warn("Failed to look for any updates. Check previous messages for causes.");
+                    return;
                 }
                 
-                String responseString = body.string();
-                if(responseString.isEmpty()){
-                    logger.warn("Received an empty Response body from Modrinth!");
-                    return null;
+                logger.debug(UpdateChecker.class, "Comparing versions...");
+                
+                int result = version.compare(core.getVersion());
+                switch(result){
+                    case -1 -> printUpdateBanner(version);
+                    case 0 -> logger.info("You are running the latest version!");
+                    case 1 -> logger.info(
+                        "Your version (%s) seems to be newer than the latest release (%s). Are you running a dev build?",
+                        core.getVersion(), version.versionNumber()
+                    );
                 }
-                
-                List<ModrinthVersion> list = gson.fromJson(responseString, listType);
-                if(list == null || list.isEmpty()){
-                    logger.warn("Couldn't convert JSON Array into a valid list.");
-                    return null;
-                }
-                
-                ModrinthVersion version = list.get(0);
-                
-                if(version.getVersionNumber() == null || version.getVersionNumber().isEmpty()){
-                    logger.warn("Cannot check latest version. Received version number was null/empty.");
-                    return null;
-                }
-                
-                return version;
-            }catch(JsonSyntaxException ex){
-                logger.warn("Encountered invalid JSON from Response body!", ex);
-                return null;
-            }catch(IOException ex){
-                logger.warn("Encountered Exception while checking for an update!", ex);
-                return null;
-            }
-        });
+            });
+        }, 0L, 12L, TimeUnit.HOURS);
     }
     
-    private void printUpdateBanner(String version, String versionId, boolean isRelease){
+    private CompletableFuture<ModrinthVersion> performUpdateCheck(){
+        String finalUrl = String.format(url, loader);
+        
+        logger.debug(UpdateChecker.class, "Checking '%s' for updates...", finalUrl);
+        
+        if(core.getVersion().equals("UNKNOWN")){
+            logger.warn("Cannot perform update check. Plugin version is 'UNKNOWN'!");
+            return CompletableFuture.completedFuture(null);
+        }
+        
+        HttpRequest request;
+        try{
+            request = HttpRequest.newBuilder()
+                .uri(new URI(finalUrl))
+                .header("User-Agent", "AdvancedServerList-" + loader + "/" + core.getVersion())
+                .build();
+        }catch(URISyntaxException ex){
+            logger.warn("Cannot perform update check. URL '%s' is not a valid URI.", ex, finalUrl);
+            return CompletableFuture.completedFuture(null);
+        }
+        
+        return client.sendAsync(request, HttpResponse.BodyHandlers.ofString(StandardCharsets.UTF_8))
+            .thenApply(response -> new ArrayList<ModrinthVersion>(gson.fromJson(response.body(), listType)))
+            .thenApply(list -> list.get(0))
+            .exceptionally((throwable) -> {
+                logger.warn("Encountered exception while performing update check!", throwable);
+                return null;
+            });
+    }
+    
+    private void printUpdateBanner(ModrinthVersion version){
         logger.info("==================================================================");
         logger.info("You are running an outdated version of AdvancedServerList!");
         logger.info("");
         logger.info("Your version: %s", core.getVersion());
-        logger.info("Modrinth version: %s", version);
+        logger.info("Modrinth:     %s", version.versionNumber());
         logger.info("");
         
-        if(!isRelease){
-            logger.info("WARNING: This release is an Alpha/Beta! It may contain");
-            logger.info("         breaking changes!");
+        if(!version.isRelease()){
+            logger.info("WARNING!");
+            logger.info("This is a %s version and may contain breaking changes and/or bugs!", version.versionType());
             logger.info("");
         }
         
-        logger.info("You can download the latest release from here:");
-        logger.info("https://modrinth.com/plugin/advancedserverlist/version/%s", versionId);
+        logger.info("Download the latest version from here:");
+        logger.info("https://modrinth.com/plugin/advancedserverlist/version/%s", version.id());
         logger.info("==================================================================");
     }
     
-    public static class ModrinthVersion{
-        @SuppressWarnings("FieldMayBeFinal")
-        private String id;
-        @SuppressWarnings("FieldMayBeFinal")
-        private String versionNumber;
-        @SuppressWarnings("FieldMayBeFinal")
-        private String versionType;
-        
-        public ModrinthVersion(String id, String versionNumber, String versionType){
-            this.id = id;
-            this.versionNumber = versionNumber;
-            this.versionType = versionType;
-        }
-    
-        public String getId(){
-            return id;
-        }
-    
-        public String getVersionNumber(){
-            return versionNumber;
-        }
+    public record ModrinthVersion(String id, String versionNumber, String versionType){
         
         public boolean isRelease(){
-            return versionType.equals("release");
+            return versionType().equals("release");
         }
         
         public int compare(String version){
-            return FlexVerComparator.compare(version, versionNumber);
+            return FlexVerComparator.compare(version, versionNumber());
+        }
+        
+        @Override
+        public String toString(){
+            return String.format("ModrinthVersion{id=%s,versionNumber=%s,versionType=%s}", id, versionNumber, versionType);
         }
     }
 }

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

@@ -27,7 +27,10 @@ package ch.andre601.advancedserverlist.core.compat.papi;
 
 import net.william278.papiproxybridge.api.PlaceholderAPI;
 
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;

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

@@ -30,9 +30,10 @@ import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
 import ch.andre601.advancedserverlist.api.objects.GenericServer;
 import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
 import ch.andre601.advancedserverlist.core.compat.maintenance.MaintenanceUtil;
+import ch.andre601.advancedserverlist.core.compat.papi.PAPIUtil;
+import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
 import ch.andre601.advancedserverlist.core.interfaces.events.GenericEventWrapper;
-import ch.andre601.advancedserverlist.core.compat.papi.PAPIUtil;
 import ch.andre601.advancedserverlist.core.parsing.ComponentParser;
 import ch.andre601.advancedserverlist.core.profiles.ServerListProfile;
 import ch.andre601.advancedserverlist.core.profiles.profile.ProfileManager;
@@ -43,12 +44,18 @@ public class PingEventHandler{
     private static PAPIUtil papiUtil = null;
     private static MaintenanceUtil maintenanceUtil = null;
     
-    public static <F, P extends GenericPlayer> void handleEvent(GenericEventWrapper<F, P> event){
-        if(event.isInvalidProtocol() || event.isMaintenanceModeActive())
-            return;
+    public static <F, P extends GenericPlayer> ProfileEntry handleEvent(GenericEventWrapper<F, P> event){
+        event.getPlugin().getPluginLogger().debug(PingEventHandler.class, "Received ping event. Handling it...");
+        if(event.isInvalidProtocol()){
+            event.getPlugin().getPluginLogger().debug(PingEventHandler.class, "Not handling event. Protocol was invalid.");
+            return null;
+        }
         
         PluginCore<F> plugin = event.getPlugin();
         String host = event.getVirtualHost();
+        PluginLogger logger = plugin.getPluginLogger();
+        
+        logger.debug(PingEventHandler.class, "Protocol valid. Continue handling...");
         
         int online = event.getOnlinePlayers();
         int max = event.getMaxPlayers();
@@ -61,25 +68,50 @@ public class PingEventHandler{
         
         ServerListProfile profile = ProfileManager.resolveProfile(plugin.getCore(), player, server);
         
-        if(profile == null)
-            return;
+        if(profile == null){
+            logger.debugWarn(PingEventHandler.class, "Server List Profile couldn't be resolved properly. Cancelling event handling...");
+            return null;
+        }
+        
+        logger.debug(PingEventHandler.class, "Received valid Server List Profile. Calling PreServerListSetEvent...");
         
         GenericServerListEvent e = event.callEvent(ProfileManager.merge(profile));
-        if(e == null || e.isCancelled())
-            return;
+        if(e == null || e.isCancelled()){
+            logger.debug(PingEventHandler.class, "PreServerListSetEvent was cancelled. Stopping ping handling...");
+            return null;
+        }
+        
+        logger.debug(PingEventHandler.class, "PreServerListSetEvent completed. Proceeding with ping handling...");
         
         ProfileEntry entry = e.getEntry();
-        if(entry.isInvalid())
-            return;
+        if(entry.isInvalid()){
+            logger.debugWarn(PingEventHandler.class, "No valid ProfileEntry retrieved. Cancelling ping handling...");
+            return null;
+        }
         
-        if(ProfileManager.checkOption(entry.extraPlayersEnabled())){
+        boolean extraPlayers = ProfileManager.checkOption(entry.extraPlayersEnabled());
+        
+        if(extraPlayers && ignoreMaintenance(event, "extraPlayers")){
             max = online + (entry.extraPlayersCount() == null ? 0 : entry.extraPlayersCount());
+            
+            logger.debug(PingEventHandler.class, "Extra Players enabled. Applying '%d' as max player count...", max);
+            
+            event.setMaxPlayers(max);
+        }
+        
+        if(ProfileManager.checkOption(entry.maxPlayersEnabled()) && !extraPlayers && ignoreMaintenance(event, "maxPlayers")){
+            max = (entry.maxPlayersCount() == null) ? 0 : entry.maxPlayersCount();
+            
+            logger.debug(PingEventHandler.class, "Max Players enabled. Applying '%d' as max player count...", max);
+            
             event.setMaxPlayers(max);
         }
         
         GenericServer finalServer = event.createGenericServer(online, max, host);
         
-        if(ProfileManager.checkOption(entry.motd())){
+        if(ProfileManager.checkOption(entry.motd()) && ignoreMaintenance(event, "motd")){
+            logger.debug(PingEventHandler.class, "MOTD set. Applying '%s'...", String.join("\\n", entry.motd()));
+            
             event.setMotd(
                 ComponentParser.list(entry.motd())
                     .modifyText(text -> StringReplacer.replace(text, player, finalServer))
@@ -90,11 +122,15 @@ public class PingEventHandler{
         
         boolean hidePlayers = ProfileManager.checkOption(entry.hidePlayersEnabled());
         
-        if(hidePlayers){
+        if(hidePlayers && ignoreMaintenance(event, "hidePlayers")){
+            logger.debug(PingEventHandler.class, "Hide Players enabled. Hiding player count...");
+            
             event.hidePlayers();
         }
         
-        if(ProfileManager.checkOption(entry.playerCountText()) && !hidePlayers){
+        if(ProfileManager.checkOption(entry.playerCountText()) && !hidePlayers && ignoreMaintenance(event, "playerCountText")){
+            logger.debug(PingEventHandler.class, "Player Count Text set. Applying '%s'...", entry.playerCountText());
+            
             event.setPlayerCount(
                 ComponentParser.text(entry.playerCountText())
                     .modifyText(text -> StringReplacer.replace(text, player, finalServer))
@@ -103,30 +139,34 @@ public class PingEventHandler{
             );
         }
         
-        if(ProfileManager.checkOption(entry.players()) && !hidePlayers){
+        if(ProfileManager.checkOption(entry.players()) && !hidePlayers && ignoreMaintenance(event, "playerCountHover")){
+            logger.debug(PingEventHandler.class, "Player Count Hover set. Applying '%s'...", String.join("\\n", entry.players()));
+            
             event.setPlayers(entry.players(), player, server);
         }
         
-        if(ProfileManager.checkOption(entry.favicon())){
-            String favicon = StringReplacer.replace(entry.favicon(), player, server);
+        if(ProfileManager.checkOption(entry.favicon()) && ignoreMaintenance(event, "favicon")){
+            logger.debug(PingEventHandler.class, "Favicon set. Resolving '%s'...", entry.favicon());
             
-            F fav = plugin.getFaviconHandler().getFavicon(favicon, image -> {
-                try{
-                    return event.createFavicon(image);
-                }catch(Exception ex){
-                    plugin.getPluginLogger().warn("Encountered an Exception while creating Favicon!", ex);
-                    return null;
-                }
-            });
+            String faviconString = StringReplacer.replace(entry.favicon(), player, server);
             
-            if(fav == null){
+            F favicon = plugin.getFaviconHandler().getFavicon(faviconString);
+            
+            if(favicon == null){
+                logger.debugWarn(PingEventHandler.class, "Favicon was invalid or not yet resolved! Using default favicon of Server/Proxy...");
+                
                 event.setDefaultFavicon();
             }else{
-                event.setFavicon(fav);
+                logger.debug(PingEventHandler.class, "Applying favicon...");
+                
+                event.setFavicon(favicon);
             }
         }
         
+        logger.debug(PingEventHandler.class, "Event handling completed. Updating Ping data...");
         event.updateEvent();
+        
+        return entry;
     }
     
     public static PAPIUtil getPAPIUtil(){
@@ -142,4 +182,11 @@ public class PingEventHandler{
         
         return (maintenanceUtil = new MaintenanceUtil());
     }
+    
+    private static <F, P extends GenericPlayer> boolean ignoreMaintenance(GenericEventWrapper<F, P> event, String option){
+        if(!event.isMaintenanceModeActive())
+            return true;
+        
+        return !event.getPlugin().getCore().getFileHandler().getBool(true, "disableDuringMaintenance", option);
+    }
 }

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

@@ -25,6 +25,7 @@
 
 package ch.andre601.advancedserverlist.core.file;
 
+import ch.andre601.advancedserverlist.core.AdvancedServerList;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
 import org.spongepowered.configurate.ConfigurateException;
 import org.spongepowered.configurate.ConfigurationNode;
@@ -32,16 +33,59 @@ import org.spongepowered.configurate.NodePath;
 import org.spongepowered.configurate.transformation.ConfigurationTransformation;
 import org.spongepowered.configurate.transformation.TransformAction;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
 public class ConfigMigrator{
     
-    public static final int LATEST = 1;
+    public static final int LATEST = resolveConfigVersion();
     
     private ConfigMigrator(){}
     
     public static ConfigurationTransformation.Versioned create(){
         return ConfigurationTransformation.versionedBuilder()
             .versionKey("configVersion")
-            .addVersion(LATEST, oneToTwo())
+            .addVersion(LATEST, fourToFive())
+            .addVersion(4, threeToFour())
+            .addVersion(3, twoToThree())
+            .addVersion(2, oneToTwo())
+            .build();
+    }
+    
+    public static ConfigurationTransformation fourToFive(){
+        return ConfigurationTransformation.builder()
+            .addAction(NodePath.path(), (path, value) -> {
+                value.node("disableDuringMaintenance", "motd").set(true);
+                value.node("disableDuringMaintenance", "favicon").set(true);
+                value.node("disableDuringMaintenance", "hidePlayers").set(true);
+                value.node("disableDuringMaintenance", "playerCountText").set(true);
+                value.node("disableDuringMaintenance", "playerCountHover").set(true);
+                value.node("disableDuringMaintenance", "extraPlayers").set(true);
+                value.node("disableDuringMaintenance", "maxPlayers").set(true);
+                
+                return null;
+            })
+            .build();
+    }
+    
+    public static ConfigurationTransformation threeToFour(){
+        return ConfigurationTransformation.builder()
+            .addAction(NodePath.path(), (path, value) -> {
+                value.node("faviconCacheTime").set(1);
+                
+                return null;
+            })
+            .build();
+    }
+    
+    public static ConfigurationTransformation twoToThree(){
+        return ConfigurationTransformation.builder()
+            .addAction(NodePath.path(), (path, value) -> {
+                value.node("debug").set(false);
+                
+                return null;
+            })
             .build();
     }
     
@@ -67,9 +111,21 @@ public class ConfigMigrator{
             versioned.apply(node);
             final int endVersion = versioned.version(node);
             if(startVersion < endVersion)
-                logger.info("Migrated config.yml from " + startVersion + " to " + endVersion);
+                logger.info("Migrated config.yml from v" + startVersion + " to v" + endVersion);
         }
         
         return node;
     }
+    
+    private static int resolveConfigVersion(){
+        try(InputStream is = AdvancedServerList.class.getResourceAsStream("/version.properties")){
+            Properties properties = new Properties();
+            
+            properties.load(is);
+            
+            return Integer.parseInt(properties.getProperty("config-version"));
+        }catch(IOException | NumberFormatException ex){
+            return -1;
+        }
+    }
 }

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

@@ -25,10 +25,10 @@
 
 package ch.andre601.advancedserverlist.core.file;
 
+import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
 import ch.andre601.advancedserverlist.core.AdvancedServerList;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
 import ch.andre601.advancedserverlist.core.profiles.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;
@@ -157,7 +157,7 @@ public class FileHandler{
                 continue;
             
             profiles.add(ServerListProfile.Builder.resolve(file.getName(), tmp, logger).build());
-            logger.info("Loaded " + file.getName());
+            logger.info("Loaded '%s'!", file.getName());
         }
         
         if(profiles.isEmpty()){
@@ -165,7 +165,7 @@ public class FileHandler{
             return false;
         }
         
-        profiles.sort(Comparator.comparing(ServerListProfile::getPriority).reversed());
+        profiles.sort(Comparator.comparing(ServerListProfile::priority).reversed());
         return !profiles.isEmpty();
     }
     
@@ -178,7 +178,7 @@ public class FileHandler{
         try{
             return loader.load();
         }catch(IOException ex){
-            logger.warn("Cannot load " + path.toFile().getName() + " due to an IOException!", ex);
+            logger.warn("Cannot load '%s' due to an IOException!", ex, path.toFile().getName());
             return null;
         }
     }
@@ -187,8 +187,17 @@ public class FileHandler{
         return node.node(path).getString(def);
     }
     
+    public boolean getBool(boolean def, Object... path){
+        return node.node(path).getBoolean(def);
+    }
+    
     public boolean getBoolean(Object... path){
-        return node.node(path).getBoolean();
+        return getBool(false, path);
+    }
+    
+    public long getLong(long def, long limit, Object... path){
+        long value = node.node(path).getLong(def);
+        return Math.max(value, limit);
     }
     
     public boolean isOldConfig(){
@@ -214,7 +223,7 @@ public class FileHandler{
             }
             
             Files.copy(config, configBackup.toPath(), StandardCopyOption.REPLACE_EXISTING);
-            logger.info("Saved backup as '" + configBackup.getName() + "'!");
+            logger.info("Saved backup as '%s'!", configBackup.getName());
             
             return true;
         }catch(IOException ex){

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

@@ -27,6 +27,10 @@ package ch.andre601.advancedserverlist.core.interfaces;
 
 public interface PluginLogger{
     
+    void debug(Class<?> clazz, String msg, Object... args);
+    
+    void debugWarn(Class<?> clazz, String msg, Object... args);
+    
     void info(String msg, Object... args);
     
     void warn(String msg, Object... args);

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

@@ -29,6 +29,7 @@ import ch.andre601.advancedserverlist.core.AdvancedServerList;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
 import ch.andre601.advancedserverlist.core.profiles.favicon.FaviconHandler;
 
+import java.awt.image.BufferedImage;
 import java.nio.file.Path;
 
 public interface PluginCore<F>{
@@ -39,6 +40,8 @@ public interface PluginCore<F>{
     
     void loadMetrics();
     
+    void loadFaviconHandler(AdvancedServerList<F> core);
+    
     void clearFaviconCache();
     
     AdvancedServerList<F> getCore();
@@ -54,4 +57,13 @@ public interface PluginCore<F>{
     String getPlatformVersion();
     
     String getLoader();
+    
+    F createFavicon(BufferedImage image) throws Exception;
+    
+    default boolean isDebugEnabled(){
+        if(getCore() == null)
+            return false;
+        
+        return getCore().getFileHandler().getBoolean("debug");
+    }
 }

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

@@ -25,15 +25,14 @@
 
 package ch.andre601.advancedserverlist.core.interfaces.events;
 
+import ch.andre601.advancedserverlist.api.events.GenericServerListEvent;
 import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
 import ch.andre601.advancedserverlist.api.objects.GenericServer;
 import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
-import ch.andre601.advancedserverlist.api.events.GenericServerListEvent;
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
 import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
 import net.kyori.adventure.text.Component;
 
-import java.awt.image.BufferedImage;
 import java.net.InetSocketAddress;
 import java.util.List;
 
@@ -79,8 +78,6 @@ public interface GenericEventWrapper<F, P extends GenericPlayer>{
     
     GenericServer createGenericServer(int playersOnline, int playersMax, String host);
     
-    F createFavicon(BufferedImage image) throws Exception;
-    
     default String resolveHost(InetSocketAddress address){
         return address == null ? null : address.getHostString();
     }

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

@@ -27,28 +27,4 @@ package ch.andre601.advancedserverlist.core.objects;
 
 import java.util.UUID;
 
-@SuppressWarnings("FieldMayBeFinal")
-public class CachedPlayer{
-    
-    private String ip;
-    private String name;
-    private UUID uuid;
-    
-    public CachedPlayer(String ip, String name, UUID uuid){
-        this.ip = ip;
-        this.name = name;
-        this.uuid = uuid;
-    }
-    
-    public String getIp(){
-        return ip;
-    }
-    
-    public String getName(){
-        return name;
-    }
-    
-    public UUID getUuid(){
-        return uuid;
-    }
-}
+public record CachedPlayer(String ip, String name, UUID uuid){}

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

@@ -29,7 +29,9 @@ import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
 import ch.andre601.advancedserverlist.api.objects.GenericServer;
 import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
-import ch.andre601.advancedserverlist.core.profiles.conditions.Expression;
+import ch.andre601.advancedserverlist.core.profiles.conditions.ProfileConditionParser;
+import ch.andre601.expressionparser.ParseWarnCollector;
+import ch.andre601.expressionparser.templates.ExpressionTemplate;
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.serialize.SerializationException;
 
@@ -37,38 +39,36 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
-public class ServerListProfile{
+public record ServerListProfile(int priority, String condition, ProfileEntry defaultProfile, List<ProfileEntry> profiles, String file){
+    private static final Random random = new Random();
     
-    private final int priority;
-    private final List<Expression> expressions;
-    private final ProfileEntry defaultProfile;
-    
-    private final List<ProfileEntry> profiles;
-    
-    private final Random random = new Random();
-    
-    public ServerListProfile(int priority, List<Expression> expressions, ProfileEntry defaultProfile, List<ProfileEntry> profiles){
-        this.priority = priority;
-        this.expressions = expressions;
-        this.defaultProfile = defaultProfile;
-        
-        this.profiles = profiles;
-    }
-    
-    public int getPriority(){
-        return priority;
-    }
-    
-    public boolean evalConditions(GenericPlayer player, GenericServer server){
-        if(expressions.isEmpty())
+    public boolean evalConditions(ProfileConditionParser parser, PluginLogger logger, GenericPlayer player, GenericServer server){
+        if(condition == null || condition.isEmpty())
             return true;
         
-        for(Expression expression : expressions){
-            if(!expression.evaluate(player, server))
-                return false;
+        ParseWarnCollector collector = new ParseWarnCollector(condition);
+        ExpressionTemplate template = parser.compile(condition, player, server, collector);
+        
+        if(collector.hasWarnings()){
+            logger.warn("Encountered %d Error(s) while parsing condition for file '%s':", collector.getWarnings().size(), file);
+            
+            for(ParseWarnCollector.Context context : collector.getWarnings()){
+                if(context.position() <= -1){
+                    logger.warn("  - %s", condition);
+                    logger.warn("    -> %s", context.message());
+                }else{
+                    logger.warn("  - At position %d:", context.position());
+                    logger.warn("    %s", condition);
+                    logger.warn(" ".repeat(context.position() + 5) + "^");
+                    logger.warn("    -> %s", context.message());
+                }
+            }
         }
         
-        return true;
+        if(template == null)
+            return false;
+        
+        return template.returnBooleanExpression().evaluate();
     }
     
     public ProfileEntry getRandomProfile(){
@@ -84,10 +84,6 @@ public class ServerListProfile{
         }
     }
     
-    public ProfileEntry getDefaultProfile(){
-        return defaultProfile;
-    }
-    
     /*
      * Returns true if the Profile...
      * ...doesn't have any valid MOTD set AND
@@ -96,12 +92,12 @@ public class ServerListProfile{
      * ...doesn't have a favicon set.
      */
     public boolean isInvalidProfile(){
-        if(profiles.isEmpty())
-            return defaultProfile.isInvalid();
+        if(profiles().isEmpty())
+            return defaultProfile().isInvalid();
         
         boolean profilesValid = false;
         
-        for(ProfileEntry profile : profiles){
+        for(ProfileEntry profile : profiles()){
             if(profile.isInvalid())
                 continue;
             
@@ -117,10 +113,10 @@ public class ServerListProfile{
         private final String fileName;
         private final ConfigurationNode node;
         private final int priority;
-        private final List<Expression> expressions = new ArrayList<>();
         
         private final PluginLogger logger;
         
+        private String condition = null;
         private List<ProfileEntry> profiles = new ArrayList<>();
         private ProfileEntry defaultProfile = ProfileEntry.empty();
         
@@ -133,34 +129,17 @@ public class ServerListProfile{
         
         public static Builder resolve(String fileName, ConfigurationNode node, PluginLogger logger){
             return new Builder(fileName, node, logger)
-                .resolveExpressions()
+                .resolveCondition()
                 .resolveProfiles()
                 .resolveDefaultProfile();
         }
         
-        private Builder resolveExpressions(){
-            List<String> temp;
-            try{
-                temp = node.node("conditions").getList(String.class);
-            }catch(SerializationException ex){
-                logger.warn("Encountered a SerializationException while resolving conditions for %s", ex, fileName);
-                return this;
-            }
-            
-            if(temp == null || temp.isEmpty())
+        private Builder resolveCondition(){
+            String condition = node.node("condition").getString();
+            if(condition == null || condition.isEmpty())
                 return this;
             
-            for(String str : temp){
-                Expression expr = Expression.resolve(str);
-                
-                if(expr.getResult() != Expression.ExpressionResult.VALID){
-                    logger.warn("Found invalid expression in condition '%s'! Reason: %s", str, expr.getResult().getMessage());
-                    continue;
-                }
-                
-                this.expressions.add(expr);
-            }
-            
+            this.condition = condition;
             return this;
         }
         
@@ -184,7 +163,7 @@ public class ServerListProfile{
         }
         
         public ServerListProfile build(){
-            return new ServerListProfile(this.priority, this.expressions, this.defaultProfile, this.profiles);
+            return new ServerListProfile(this.priority, this.condition, this.defaultProfile, this.profiles, this.fileName);
         }
     }
 }

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/Expression.java

@@ -1,226 +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.core.profiles.conditions;
-
-import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
-import ch.andre601.advancedserverlist.api.objects.GenericServer;
-import ch.andre601.advancedserverlist.core.profiles.replacer.StringReplacer;
-
-public class Expression{
-    
-    private final ExpressionResult result;
-    
-    private final String left;
-    private final Operator operator;
-    private final String right;
-    
-    private Expression(ExpressionResult result, String left, Operator operator, String right){
-        this.result = result;
-        this.left = left;
-        this.operator = operator;
-        this.right = right;
-    }
-    
-    public static Expression createInvalid(ExpressionResult result){
-        return new Expression(result, null, Operator.UNKNOWN, null);
-    }
-    
-    public static Expression resolve(String expression){
-        Operator operator = Operator.UNKNOWN;
-        
-        if(expression == null || expression.isEmpty()){
-            return Expression.createInvalid(ExpressionResult.INVALID_NO_EXPRESSION);
-        }
-        
-        char[] chars = expression.toCharArray();
-        
-        StringBuilder leftBuilder = new StringBuilder();
-        StringBuilder rightBuilder = new StringBuilder();
-        
-        boolean foundOperator = false;
-        
-        for(int i = 0; i < chars.length; i++){
-            char c = chars[i];
-            char next = (i == (chars.length - 1)) ? '\0' : chars[i + 1];
-            
-            Operator tmp = Operator.getOperand(c, next);
-            if(tmp != Operator.UNKNOWN && !foundOperator){
-                operator = tmp;
-                foundOperator = true;
-                
-                if(tmp.hasSecond())
-                    i++; // Skip next character if operator has 2
-                
-                continue;
-            }
-            
-            if(foundOperator){
-                rightBuilder.append(c);
-            }else{
-                leftBuilder.append(c);
-            }
-        }
-        
-        if(leftBuilder.isEmpty() || rightBuilder.isEmpty()){
-            return Expression.createInvalid(ExpressionResult.INVALID_EMPTY_PARTS);
-        }
-        
-        return new Expression(ExpressionResult.VALID, leftBuilder.toString().trim(), operator, rightBuilder.toString().trim());
-    }
-    
-    public boolean evaluate(GenericPlayer player, GenericServer server){
-        String newLeft = StringReplacer.replace(left, player, server);
-        String newRight = StringReplacer.replace(right, player, server);
-        
-        return operator.evaluate(newLeft, newRight);
-    }
-    
-    public ExpressionResult getResult(){
-        return result;
-    }
-    
-    public enum Operator{
-        LESS('<', '\0'){
-            @Override
-            public boolean evaluate(String left, String right){
-                int leftInt = Operator.getInt(left);
-                int rightInt = Operator.getInt(right);
-                
-                return leftInt < rightInt;
-            }
-        },
-        LESS_OR_EQUAL('<', '='){
-            @Override
-            public boolean evaluate(String left, String right){
-                int leftInt = Operator.getInt(left);
-                int rightInt = Operator.getInt(right);
-                
-                return leftInt <= rightInt;
-            }
-        },
-        EQUAL('=', '\0'){
-            @Override
-            public boolean evaluate(String left, String right){
-                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){
-                int leftInt = Operator.getInt(left);
-                int rightInt = Operator.getInt(right);
-                
-                return leftInt > rightInt;
-            }
-        },
-        GREATER_OR_EQUAL('>', '='){
-            @Override
-            public boolean evaluate(String left, String right){
-                int leftInt = Operator.getInt(left);
-                int rightInt = Operator.getInt(right);
-                
-                return leftInt >= rightInt;
-            }
-        },
-        
-        UNKNOWN('\0', '\0'){
-            @Override
-            public boolean evaluate(String left, String right){
-                return false;
-            }
-        };
-        
-        private static final Operator[] VALUES = values();
-        
-        private final char first;
-        private final char second;
-        
-        Operator(char first, char second){
-            this.first = first;
-            this.second = second;
-        }
-        
-        public static Operator getOperand(char first, char second){
-            for(Operator operator : VALUES){
-                if(operator.first == first){
-                    if((!operator.hasSecond() && second != '=' && second != '~') || operator.second == second)
-                        return operator;
-                }
-            }
-            
-            return Operator.UNKNOWN;
-        }
-        
-        public boolean hasSecond(){
-            return second != '\0';
-        }
-        
-        public abstract boolean evaluate(String left, String right);
-    
-        private static int getInt(String text){
-            try{
-                return Integer.parseInt(text);
-            }catch(NumberFormatException ex){
-                return text.length();
-            }
-        }
-    }
-    
-    public enum ExpressionResult{
-        VALID(null),
-        
-        INVALID_NO_EXPRESSION("Received empty condition which isn't allowed!"),
-        INVALID_EMPTY_PARTS  ("Received condition with either left or right part being empty.");
-        
-        private final String message;
-        
-        ExpressionResult(String message){
-            this.message = message;
-        }
-        
-        public String getMessage(){
-            return message;
-        }
-    }
-}

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/ProfileConditionParser.java

@@ -0,0 +1,78 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2024 Andre_601
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package ch.andre601.advancedserverlist.core.profiles.conditions;
+
+import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
+import ch.andre601.advancedserverlist.api.objects.GenericServer;
+import ch.andre601.advancedserverlist.core.profiles.conditions.placeholders.reader.PlaceholderTokenReader;
+import ch.andre601.advancedserverlist.core.profiles.conditions.placeholders.reader.PlaceholderValueReader;
+import ch.andre601.advancedserverlist.core.profiles.conditions.placeholders.tokens.CustomExpressionTokenizer;
+import ch.andre601.expressionparser.ExpressionParserEngine;
+import ch.andre601.expressionparser.ParseWarnCollector;
+import ch.andre601.expressionparser.operator.Operator;
+import ch.andre601.expressionparser.parsers.ExpressionTemplateParser;
+import ch.andre601.expressionparser.parsers.ValueReader;
+import ch.andre601.expressionparser.templates.ExpressionTemplate;
+import ch.andre601.expressionparser.tokens.Token;
+import ch.andre601.expressionparser.tokens.readers.TokenReader;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+
+import java.util.List;
+
+public class ProfileConditionParser implements ExpressionParserEngine{
+    
+    private final CustomExpressionTokenizer tokenizer;
+    private final ExpressionTemplateParser parser;
+    
+    private ProfileConditionParser(List<TokenReader> tokenReaders, ImmutableMap<Token, Operator> operators, ImmutableList<ValueReader> valueReaders){
+        this.tokenizer = new CustomExpressionTokenizer(tokenReaders);
+        this.parser = new ExpressionTemplateParser(operators, valueReaders);
+    }
+    
+    public static ProfileConditionParser create(){
+        return new ProfileConditionParserBuilder().addDefaults()
+            .addTokenReader(new PlaceholderTokenReader(-20))
+            .addValueReader(new PlaceholderValueReader())
+            .build();
+    }
+    
+    public ExpressionTemplate compile(String text, GenericPlayer player, GenericServer server, ParseWarnCollector collector){
+        return parser.parse(tokenizer.parse(text, player, server, collector), collector);
+    }
+    
+    @Override
+    public ExpressionTemplate compile(String s, ParseWarnCollector parseWarnCollector){
+        return null;
+    }
+    
+    private static class ProfileConditionParserBuilder extends ExpressionParserEngine.Builder<ProfileConditionParser>{
+        @Override
+        public ProfileConditionParser build(){
+            return new ProfileConditionParser(this.getTokenReaders(), ImmutableMap.copyOf(this.getOperators()), ImmutableList.copyOf(this.getValueReaders()));
+        }
+    }
+}

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/placeholders/reader/CustomTokenReader.java

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022-2023 Andre_601
+ * Copyright (c) 2022-2024 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,34 +23,26 @@
  *
  */
 
-package ch.andre601.advancedserverlist.core.objects;
+package ch.andre601.advancedserverlist.core.profiles.conditions.placeholders.reader;
 
+import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
 import ch.andre601.advancedserverlist.api.objects.GenericServer;
+import ch.andre601.expressionparser.ParseWarnCollector;
+import ch.andre601.expressionparser.tokens.Token;
+import ch.andre601.expressionparser.tokens.readers.TokenReader;
 
-public class GenericServerImpl implements GenericServer{
+import java.text.ParsePosition;
+
+public abstract class CustomTokenReader extends TokenReader{
     
-    private final int online;
-    private final int max;
-    private final String host;
-    
-    public GenericServerImpl(int online, int max, String host){
-        this.online = online;
-        this.max = max;
-        this.host = host;
+    public CustomTokenReader(int priority){
+        super(priority);
     }
     
     @Override
-    public int getPlayersOnline(){
-        return online;
+    public Token read(String text, ParsePosition position, ParseWarnCollector collector){
+        return null;
     }
     
-    @Override
-    public int getPlayersMax(){
-        return max;
-    }
-    
-    @Override
-    public String getHost(){
-        return host;
-    }
+    public abstract Token read(String text, ParsePosition position, GenericPlayer player, GenericServer server, ParseWarnCollector collector);
 }

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/placeholders/reader/PlaceholderTokenReader.java

@@ -0,0 +1,51 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2024 Andre_601
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package ch.andre601.advancedserverlist.core.profiles.conditions.placeholders.reader;
+
+import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
+import ch.andre601.advancedserverlist.api.objects.GenericServer;
+import ch.andre601.advancedserverlist.core.profiles.conditions.placeholders.tokens.PlaceholderToken;
+import ch.andre601.advancedserverlist.core.profiles.replacer.StringReplacer;
+import ch.andre601.expressionparser.ParseWarnCollector;
+import ch.andre601.expressionparser.tokens.Token;
+
+import java.text.ParsePosition;
+
+public class PlaceholderTokenReader extends CustomTokenReader{
+    
+    public PlaceholderTokenReader(int priority){
+        super(priority);
+    }
+    
+    @Override
+    public Token read(String text, ParsePosition position, GenericPlayer player, GenericServer server, ParseWarnCollector collector){
+        if(position.getIndex() + 1 < text.length() && text.charAt(position.getIndex()) == '$' && text.charAt(position.getIndex() + 1) == '{'){
+            position.setIndex(position.getIndex() + 2);
+            return new PlaceholderToken(StringReplacer.parsePlaceholder(text, position, player, server, collector));
+        }
+        return null;
+    }
+}

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/placeholders/reader/PlaceholderValueReader.java

@@ -0,0 +1,46 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2024 Andre_601
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package ch.andre601.advancedserverlist.core.profiles.conditions.placeholders.reader;
+
+import ch.andre601.advancedserverlist.core.profiles.conditions.placeholders.tokens.PlaceholderToken;
+import ch.andre601.expressionparser.ParseWarnCollector;
+import ch.andre601.expressionparser.parsers.ExpressionTemplateParser;
+import ch.andre601.expressionparser.parsers.ValueReader;
+import ch.andre601.expressionparser.templates.ExpressionTemplate;
+import ch.andre601.expressionparser.tokens.Token;
+
+import java.util.List;
+
+public class PlaceholderValueReader extends ValueReader{
+    @Override
+    public ExpressionTemplate read(ExpressionTemplateParser parser, List<Token> tokens, ParseWarnCollector collector){
+        if(tokens.get(0) instanceof PlaceholderToken){
+            PlaceholderToken token = (PlaceholderToken)tokens.remove(0);
+            return token.getValue();
+        }
+        return null;
+    }
+}

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

@@ -0,0 +1,85 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2024 Andre_601
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package ch.andre601.advancedserverlist.core.profiles.conditions.placeholders.tokens;
+
+import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
+import ch.andre601.advancedserverlist.api.objects.GenericServer;
+import ch.andre601.advancedserverlist.core.profiles.conditions.placeholders.reader.CustomTokenReader;
+import ch.andre601.expressionparser.ParseWarnCollector;
+import ch.andre601.expressionparser.tokens.Token;
+import ch.andre601.expressionparser.tokens.readers.TokenReader;
+import com.google.common.collect.Ordering;
+
+import java.text.ParsePosition;
+import java.util.Comparator;
+import java.util.LinkedList;
+import java.util.List;
+
+public class CustomExpressionTokenizer{
+    
+    private static final Ordering<TokenReader> TOKEN_READER_ORDERING = Ordering.from(Comparator.comparingInt(TokenReader::getPriority)).reverse();
+    
+    private final List<TokenReader> tokenReaders;
+    
+    public CustomExpressionTokenizer(Iterable<TokenReader> tokenReaders){
+        this.tokenReaders = TOKEN_READER_ORDERING.immutableSortedCopy(tokenReaders);
+    }
+    
+    public List<Token> parse(String text, GenericPlayer player, GenericServer server, ParseWarnCollector collector){
+        ParsePosition position = new ParsePosition(0);
+        
+        List<Token> tokens = new LinkedList<>();
+        
+        next_token:
+        while(true){
+            while(position.getIndex() < text.length() && Character.isWhitespace(text.charAt(position.getIndex())))
+                position.setIndex(position.getIndex() + 1);
+            
+            if(position.getIndex() >= text.length())
+                break;
+            
+            for(TokenReader tokenReader : tokenReaders){
+                Token token;
+                if(tokenReader instanceof CustomTokenReader customTokenReader){
+                    if(null != (token = customTokenReader.read(text, position, player, server, collector))){
+                        tokens.add(token);
+                        continue next_token;
+                    }
+                }else{
+                    if(null != (token = tokenReader.read(text, position, collector))){
+                        tokens.add(token);
+                        continue next_token;
+                    }
+                }
+            }
+            
+            collector.appendWarningFormatted(position.getIndex(), "Illegal Token '%c'.", text.charAt(position.getIndex()));
+            break;
+        }
+        
+        return tokens;
+    }
+}

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

@@ -0,0 +1,81 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2024 Andre_601
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package ch.andre601.advancedserverlist.core.profiles.conditions.placeholders.tokens;
+
+import ch.andre601.expressionparser.expressions.ToBooleanExpression;
+import ch.andre601.expressionparser.expressions.ToDoubleExpression;
+import ch.andre601.expressionparser.expressions.ToStringExpression;
+import ch.andre601.expressionparser.templates.ExpressionTemplate;
+import ch.andre601.expressionparser.tokens.Token;
+
+public class PlaceholderToken extends Token{
+    
+    private final Placeholder value;
+    
+    public PlaceholderToken(Placeholder value){
+        super("PLACEHOLDER");
+        this.value = value;
+    }
+    
+    public Placeholder getValue(){
+        return value;
+    }
+    
+    public static class Placeholder implements ExpressionTemplate{
+        
+        private final ToBooleanExpression toBooleanExpression;
+        private final ToDoubleExpression toDoubleExpression;
+        private final ToStringExpression toStringExpression;
+        
+        public Placeholder(String value){
+            double doubleValue;
+            try{
+                doubleValue = Double.parseDouble(value);
+            }catch(NumberFormatException ex){
+                doubleValue = value.length();
+            }
+            
+            this.toBooleanExpression = ToBooleanExpression.literal(Boolean.parseBoolean(value));
+            this.toDoubleExpression = ToDoubleExpression.literal(doubleValue);
+            this.toStringExpression = ToStringExpression.literal(value);
+        }
+        
+        @Override
+        public ToBooleanExpression returnBooleanExpression(){
+            return toBooleanExpression;
+        }
+        
+        @Override
+        public ToDoubleExpression returnDoubleExpression(){
+            return toDoubleExpression;
+        }
+        
+        @Override
+        public ToStringExpression returnStringExpression(){
+            return toStringExpression;
+        }
+    }
+}

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

@@ -26,122 +26,167 @@
 package ch.andre601.advancedserverlist.core.profiles.favicon;
 
 import ch.andre601.advancedserverlist.core.AdvancedServerList;
+import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 
 import javax.imageio.ImageIO;
 import java.awt.*;
 import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URL;
-import java.net.URLConnection;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.HashMap;
 import java.util.Locale;
+import java.util.Map;
 import java.util.concurrent.*;
-import java.util.function.Function;
+import java.util.stream.Stream;
 
 public class FaviconHandler<F>{
     
-    private final Cache<String, CompletableFuture<F>> favicons = CacheBuilder.newBuilder()
-        .expireAfterWrite(5, TimeUnit.MINUTES)
-        .build();
-    
     private final AdvancedServerList<F> core;
+    private final PluginLogger logger;
     private final ThreadPoolExecutor faviconThreadPool;
+    private final Cache<String, CompletableFuture<F>> faviconCache;
+    
+    private final Map<String, F> localFavicons = new HashMap<>();
+    private final HttpClient client = HttpClient.newHttpClient();
     
     public FaviconHandler(AdvancedServerList<F> core){
         this.core = core;
+        this.logger = core.getPlugin().getPluginLogger();
         this.faviconThreadPool = createFaviconThreadPool();
+        this.faviconCache = CacheBuilder.newBuilder()
+            .expireAfterWrite(core.getFileHandler().getLong(1, 1, "faviconCacheTime"), TimeUnit.MINUTES)
+            .build();
+        
+        loadLocalFavicons();
     }
     
-    public F getFavicon(String input, Function<BufferedImage, F> function){
+    public F getFavicon(String input){
+        if(localFavicons.containsKey(input.toLowerCase(Locale.ROOT).split("\\.")[0])){
+            return localFavicons.get(input.toLowerCase(Locale.ROOT).split("\\.")[0]);
+        }
+        
         try{
-            return favicons.get(input, () -> convert(input, function)).getNow(null);
-        }catch(ExecutionException e){
+            return faviconCache.get(input, () -> getFuture(input)).getNow(null);
+        }catch(ExecutionException ex){
+            logger.warn("Received ExecutionException while retrieving Favicon for '%s'.", ex, input);
             return null;
         }
     }
     
-    public void clearCache(){
-        favicons.invalidateAll();
+    public void cleanCache(){
+        faviconCache.invalidateAll();
+        loadLocalFavicons();
     }
     
-    private CompletableFuture<F> convert(String input, Function<BufferedImage, F> function){
-        return CompletableFuture.supplyAsync(() -> {
-            BufferedImage img = resolveImage(core, input);
-            if(img == null)
-                return null;
-            
-            return function.apply(img);
-        }, faviconThreadPool);
-    }
-    
-    private BufferedImage resolveImage(AdvancedServerList<F> core, String input){
-        InputStream stream;
-        
+    private CompletableFuture<F> getFuture(String input){
         if(input.toLowerCase(Locale.ROOT).startsWith("https://")){
-            stream = getFromUrl(core, input);
+            logger.debug(FaviconHandler.class, "Resolving URL '%s'...", input);
+            return CompletableFuture.supplyAsync(() -> fromURL(core, input), this.faviconThreadPool);
         }else
         if(input.toLowerCase(Locale.ROOT).endsWith(".png")){
-            File folder = core.getPlugin().getFolderPath().resolve("favicons").toFile();
-            if(!folder.exists()){
-                core.getPlugin().getPluginLogger().warn("Cannot get Favicon %s from favicons folder. Folder doesn't exist!", input);
-                return null;
-            }
-            
-            File file = new File(folder, input);
-            
-            try{
-                stream = new FileInputStream(file);
-            }catch(IOException ex){
-                core.getPlugin().getPluginLogger().warn("Cannot create Favicon from File %s.", input);
-                core.getPlugin().getPluginLogger().warn("Cause: %s", ex.getMessage());
-                return null;
-            }
+            logger.debug(FaviconHandler.class, "Resolving image file '%s'...", input);
+            return CompletableFuture.completedFuture(localFavicons.get(input.toLowerCase(Locale.ROOT).split("\\.")[0]));
         }else{
-            stream = getFromUrl(core, "https://mc-heads.net/avatar/" + input + "/64");
+            logger.debug(FaviconHandler.class, "Resolving Name/UUID as https://mc-heads.net/avatar/%s/64...", input);
+            return CompletableFuture.supplyAsync(() -> fromURL(core, "https://mc-heads.net/avatar/" + input + "/64"), this.faviconThreadPool);
+        }
+    }
+    
+    private void loadLocalFavicons(){
+        this.localFavicons.clear();
+        
+        logger.info("Loading local image files as Favicons...");
+        
+        Path folder = core.getPlugin().getFolderPath().resolve("favicons");
+        if(!Files.exists(folder)){
+            try{
+                Files.createDirectories(folder);
+                logger.info("Created favicons folder.");
+            }catch(IOException ex){
+                logger.warn("Cannot create favicons folder. Encountered an IOException.", ex);
+                return;
+            }
         }
         
-        if(stream == null){
-            core.getPlugin().getPluginLogger().warn("Cannot create Favicon. InputStream was null.");
-            return null;
+        try(Stream<Path> pathStream = Files.list(folder)){
+            pathStream.filter(Files::isRegularFile)
+                .filter(file -> file.getFileName().toString().endsWith(".png"))
+                .forEach(this::loadFile);
+        }catch(IOException ex){
+            logger.warn("Cannot load files from Favicons folder.", ex);
         }
-        
-        try{
-            BufferedImage original = ImageIO.read(stream);
-            if(original == null){
-                core.getPlugin().getPluginLogger().warn("Cannot create Favicon. Unable to create BufferedImage.");
-                return null;
+    }
+    
+    private void loadFile(Path path){
+        try(InputStream stream = Files.newInputStream(path)){
+            F favicon = createFavicon(stream);
+            if(favicon == null){
+                logger.warn("Cannot create Favicon from file '%s'. Received Favicon was null.", path.getFileName().toString());
+                return;
             }
             
-            BufferedImage favicon = new BufferedImage(64, 64, BufferedImage.TYPE_INT_ARGB);
-            Graphics2D img = favicon.createGraphics();
-            
-            // Resize original image to 64x64 and apply to favicon.
-            img.drawImage(original, 0, 0, 64, 64, null);
-            img.dispose();
-            
-            return favicon;
+            localFavicons.put(path.getFileName().toString().split("\\.")[0], favicon);
+            logger.info("Loaded file '%s' as Favicon.", path.getFileName().toString());
         }catch(IOException ex){
-            core.getPlugin().getPluginLogger().warn("Unable to create Favicon. Encountered IOException during creation.");
-            core.getPlugin().getPluginLogger().warn("Cause: %s", ex.getMessage());
+            logger.warn("Cannot create Favicon from file '%s'. Encountered IOException.", ex);
+        }
+    }
+    
+    private F fromURL(AdvancedServerList<F> core, String url){
+        try{
+            logger.debug(FaviconHandler.class, "Creating Request for URL '%s'...", url);
+            HttpRequest request = HttpRequest.newBuilder()
+                .uri(new URI(url))
+                .header("User-Agent", "AdvancedServerList-" + core.getPlugin().getLoader() + "/" + core.getVersion())
+                .build();
+            
+            try(InputStream stream = client.send(request, HttpResponse.BodyHandlers.ofInputStream()).body()){
+                return createFavicon(stream);
+            }catch(InterruptedException | IOException ex){
+                logger.warn("Cannot create Favicon from URL '%s'. Encountered an Exception.", ex, url);
+                return null;
+            }
+        }catch(URISyntaxException ex){
+            logger.warn("Cannot create Favicon from URL '%s'. Encountered an IOException.", ex, url);
             return null;
         }
     }
     
-    private InputStream getFromUrl(AdvancedServerList<F> core, String url){
+    private F createFavicon(InputStream stream){
         try{
-            URL faviconUrl = new URL(url);
-            URLConnection connection = faviconUrl.openConnection();
-            connection.setRequestProperty("User-Agent", "AdvancedServerList/" + core.getVersion());
-            connection.connect();
+            logger.debug(FaviconHandler.class, "Creating BufferedImage from InputStream...");
+            BufferedImage original = ImageIO.read(stream);
+            if(original == null){
+                logger.warn("Cannot create Favicon. Received null BufferedImage.");
+                return null;
+            }
             
-            return connection.getInputStream();
-        }catch(IOException ex){
-            core.getPlugin().getPluginLogger().warn("Error while connecting to %s for Favicon creation.", url);
-            core.getPlugin().getPluginLogger().warn("Cause: %s", ex.getMessage());
+            // Don't waste resources resizing images already having right size.
+            if(original.getWidth() == 64 && original.getHeight() == 64){
+                logger.debug(FaviconHandler.class, "BufferedImage is 64x64 pixels. No resizing needed.");
+                return core.getPlugin().createFavicon(original);
+            }
+            
+            logger.debug(FaviconHandler.class, "Resizing image to 64x64 pixels...");
+            BufferedImage image = new BufferedImage(64, 64, BufferedImage.TYPE_INT_ARGB);
+            Graphics2D graphics2D = image.createGraphics();
+            
+            graphics2D.drawImage(original, 0, 0, 64, 64, null);
+            graphics2D.dispose();
+            
+            logger.debug(FaviconHandler.class, "Image resized! Returning Favicon...");
+            return core.getPlugin().createFavicon(image);
+        }catch(Exception ex){
+            logger.warn("Unable to create Favicon. Received Exception.", ex);
             return null;
         }
     }

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

@@ -29,6 +29,8 @@ import ch.andre601.advancedserverlist.core.AdvancedServerList;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
 import ch.andre601.advancedserverlist.core.objects.CachedPlayer;
 import com.google.gson.Gson;
+import com.google.gson.JsonIOException;
+import com.google.gson.JsonSyntaxException;
 import io.leangen.geantyref.TypeToken;
 
 import java.io.BufferedReader;
@@ -38,7 +40,9 @@ import java.lang.reflect.Type;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
 
 public class PlayerHandler{
     
@@ -68,19 +72,18 @@ public class PlayerHandler{
         }
         
         if(core.getFileHandler().getBoolean("disableCache")){
-            logger.info("'disable_cache' is set to true. Skipping playercache.json loading...");
+            logger.info("'disableCache' is set to true. Skipping playercache.json loading...");
             return;
         }
-    
-        try{
-            BufferedReader reader = Files.newBufferedReader(cache);
-            
+        
+        try(BufferedReader reader = Files.newBufferedReader(cache)){
             cachedPlayers = gson.fromJson(reader, listType);
-            
-            reader.close();
         }catch(IOException ex){
             logger.warn("Encountered IOException while reading the playercache.json file!", ex);
             return;
+        }catch(JsonIOException | JsonSyntaxException ex){
+            logger.warn("Encountered Json exception while parsing playercache.json file!", ex);
+            return;
         }
         
         // In case Gson messes up... I guess.
@@ -127,7 +130,7 @@ public class PlayerHandler{
             return getDefaultPlayer();
         
         for(CachedPlayer player : cachedPlayers){
-            if(player.getIp().equals(key))
+            if(player.ip().equals(key))
                 return player;
         }
         
@@ -136,7 +139,7 @@ public class PlayerHandler{
     
     public CachedPlayer getCachedPlayer(UUID uuid){
         for(CachedPlayer player : cachedPlayers){
-            if(player.getUuid().equals(uuid))
+            if(player.uuid().equals(uuid))
                 return player;
         }
         
@@ -150,7 +153,7 @@ public class PlayerHandler{
     
     private boolean contains(String ip){
         for(CachedPlayer player : cachedPlayers){
-            if(player.getIp().equals(ip))
+            if(player.ip().equals(ip))
                 return true;
         }
         

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

@@ -28,9 +28,9 @@ package ch.andre601.advancedserverlist.core.profiles.profile;
 import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
 import ch.andre601.advancedserverlist.api.objects.GenericServer;
 import ch.andre601.advancedserverlist.api.objects.NullBool;
+import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
 import ch.andre601.advancedserverlist.core.AdvancedServerList;
 import ch.andre601.advancedserverlist.core.profiles.ServerListProfile;
-import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.serialize.SerializationException;
 
@@ -45,7 +45,7 @@ public class ProfileManager{
      */
     public static ProfileEntry merge(ServerListProfile profile){
         ProfileEntry entry = profile.getRandomProfile();
-        ProfileEntry defEntry = profile.getDefaultProfile();
+        ProfileEntry defEntry = profile.defaultProfile();
         
         List<String> motd = resolveMOTD(entry, defEntry);
         List<String> players = resolvePlayers(entry, defEntry);
@@ -53,18 +53,21 @@ public class ProfileManager{
         String favicon = resolveFavicon(entry, defEntry);
         boolean isHidePlayersEnabled = resolveHidePlayersEnabled(entry, defEntry);
         boolean isExtraPlayersEnabled = resolveExtraPlayersEnabled(entry, defEntry);
+        boolean isMaxPlayersEnabled = resolveMaxPlayersEnabled(entry, defEntry);
         Integer extraPlayersCount = resolveExtraPlayersCount(entry, defEntry);
+        Integer maxPlayersCount = resolveMaxPlayersCount(entry, defEntry);
         
         return new ProfileEntry(motd, players, playerCountText, favicon, 
-            NullBool.resolve(isHidePlayersEnabled), NullBool.resolve(isExtraPlayersEnabled), extraPlayersCount);
+            NullBool.resolve(isHidePlayersEnabled), NullBool.resolve(isExtraPlayersEnabled), NullBool.resolve(isMaxPlayersEnabled),
+            extraPlayersCount, maxPlayersCount);
     }
     
-    public static ServerListProfile resolveProfile(AdvancedServerList core, GenericPlayer player, GenericServer server){
+    public static ServerListProfile resolveProfile(AdvancedServerList<?> core, GenericPlayer player, GenericServer server){
         for(ServerListProfile profile : core.getFileHandler().getProfiles()){
             if(profile.isInvalidProfile())
                 continue;
             
-            if(profile.evalConditions(player, server))
+            if(profile.evalConditions(core.getParser(), core.getPlugin().getPluginLogger(), player, server))
                 return profile;
         }
         
@@ -78,16 +81,20 @@ public class ProfileManager{
         String favicon = node.node("favicon").getString("");
         NullBool hidePlayers = resolveNullBool(node, "playerCount", "hidePlayers");
         NullBool extraPlayersEnabled = resolveNullBool(node, "playerCount", "extraPlayers", "enabled");
-        Integer extraPlayers = resolveNullableInt(node);
+        NullBool maxPlayersEnabled = resolveNullBool(node, "playerCount", "maxPlayers", "enabled");
+        Integer extraPlayers = resolveNullableInt(node, "playerCount", "extraPlayers", "amount");
+        Integer maxPlayers = resolveNullableInt(node, "playerCount", "maxPlayers", "amount");
         
         return new ProfileEntry.Builder()
-            .setMotd(motd)
-            .setPlayers(players)
-            .setPlayerCountText(playerCountText)
-            .setFavicon(favicon)
-            .setHidePlayersEnabled(hidePlayers)
-            .setExtraPlayersEnabled(extraPlayersEnabled)
-            .setExtraPlayerCount(extraPlayers)
+            .motd(motd)
+            .players(players)
+            .playerCountText(playerCountText)
+            .favicon(favicon)
+            .hidePlayersEnabled(hidePlayers)
+            .extraPlayersEnabled(extraPlayersEnabled)
+            .maxPlayersEnabled(maxPlayersEnabled)
+            .extraPlayersCount(extraPlayers)
+            .maxPlayersCount(maxPlayers)
             .build();
     }
     
@@ -150,6 +157,13 @@ public class ProfileManager{
         return profile.extraPlayersEnabled().getOrDefault(false);
     }
     
+    private static boolean resolveMaxPlayersEnabled(ProfileEntry profile, ProfileEntry defaultProfile){
+        if(profile == null || !checkOption(profile.maxPlayersEnabled()))
+            return defaultProfile.maxPlayersEnabled().getOrDefault(false);
+        
+        return profile.maxPlayersEnabled().getOrDefault(false);
+    }
+    
     private static Integer resolveExtraPlayersCount(ProfileEntry profile, ProfileEntry defaultProfile){
         if(profile == null || profile.extraPlayersCount() == null)
             return defaultProfile.extraPlayersCount() == null ? 0 : defaultProfile.extraPlayersCount();
@@ -157,6 +171,13 @@ public class ProfileManager{
         return profile.extraPlayersCount();
     }
     
+    private static Integer resolveMaxPlayersCount(ProfileEntry profile, ProfileEntry defaultProfile){
+        if(profile == null || profile.maxPlayersCount() == null)
+            return defaultProfile.maxPlayersCount() == null ? 0 : defaultProfile.maxPlayersCount();
+        
+        return profile.maxPlayersCount();
+    }
+    
     private static List<String> resolveList(ConfigurationNode node, Object... path){
         try{
             return node.node(path).getList(String.class);
@@ -172,10 +193,10 @@ public class ProfileManager{
         return NullBool.resolve(node.node(path).getBoolean());
     }
     
-    private static Integer resolveNullableInt(ConfigurationNode node){
-        if(node.node("playerCount", "extraPlayers", "amount").virtual())
+    private static Integer resolveNullableInt(ConfigurationNode node, Object... path){
+        if(node.node(path).virtual())
             return null;
         
-        return node.node("playerCount", "extraPlayers", "amount").getInt();
+        return node.node(path).getInt();
     }
 }

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

@@ -25,11 +25,11 @@
 
 package ch.andre601.advancedserverlist.core.profiles.profile;
 
+import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.configurate.ConfigurationNode;
 import org.spongepowered.configurate.serialize.SerializationException;
 import org.spongepowered.configurate.serialize.TypeSerializer;
-import ch.andre601.advancedserverlist.api.profiles.ProfileEntry;
 
 import java.lang.reflect.Type;
 
@@ -52,8 +52,10 @@ public class ProfileSerializer implements TypeSerializer<ProfileEntry>{
         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());
+        node.node("playerCount", "hidePlayers").set(profile.hidePlayersEnabled().getOrDefault(false));
+        node.node("playerCount", "extraPlayers", "enabled").set(profile.extraPlayersEnabled().getOrDefault(false));
+        node.node("playerCount", "extraPlayers", "amount").set((profile.extraPlayersCount() == null) ? 0 : profile.extraPlayersCount());
+        node.node("playerCount", "maxPlayers", "enabled").set(profile.maxPlayersEnabled().getOrDefault(false));
+        node.node("playerCount", "maxPlayers", "amount").set((profile.maxPlayersCount() == null) ? 0 : profile.maxPlayersCount());
     }
 }

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

@@ -29,6 +29,11 @@ import ch.andre601.advancedserverlist.api.AdvancedServerListAPI;
 import ch.andre601.advancedserverlist.api.PlaceholderProvider;
 import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
 import ch.andre601.advancedserverlist.api.objects.GenericServer;
+import ch.andre601.advancedserverlist.core.AdvancedServerList;
+import ch.andre601.advancedserverlist.core.profiles.conditions.placeholders.tokens.PlaceholderToken;
+import ch.andre601.expressionparser.ParseWarnCollector;
+
+import java.text.ParsePosition;
 
 public class StringReplacer{
     
@@ -36,99 +41,113 @@ public class StringReplacer{
         if(input == null)
             return null;
         
-        char[] chars = input.toCharArray();
+        ParsePosition position = new ParsePosition(0);
         StringBuilder builder = new StringBuilder(input.length());
         
-        StringBuilder identifier = new StringBuilder();
-        StringBuilder placeholder = new StringBuilder();
-        
-        AdvancedServerListAPI api = AdvancedServerListAPI.get();
-        
-        for(int i = 0; i < chars.length; i++){
-            char c = chars[i];
-            char next = (i == (chars.length - 1)) ? '\0' : chars[i + 1];
-            
-            if(c != '$' || i + 2 >= chars.length){
-                builder.append(c);
+        while(position.getIndex() < input.length()){
+            if(position.getIndex() + 1 < input.length() && input.charAt(position.getIndex()) == '$' && input.charAt(position.getIndex() + 1) == '{'){
+                position.setIndex(position.getIndex() + 2);
+                builder.append(parsePlaceholder0(input, position, player, server, null));
                 continue;
             }
             
-            if(next != '{'){
-                if(next == '\0')
-                    continue;
-                
-                builder.append(next);
-                i++;
-                continue;
-            }
-            
-            i++;
-            
-            boolean identified = false;
-            boolean invalid = true;
-            
-            while(++i < chars.length){
-                final char id = chars[i];
-                
-                if(id == '}'){
-                    invalid = false;
-                    break;
-                }
-                
-                if(id == ' ' && !identified){
-                    identified = true;
-                    continue;
-                }
-                
-                if(identified){
-                    placeholder.append(id);
-                }else{
-                    identifier.append(id);
-                }
-            }
-            
-            String identifierString = identifier.toString();
-            String placeholderString = placeholder.toString();
-            
-            identifier.setLength(0);
-            placeholder.setLength(0);
-            
-            if(invalid){
-                builder.append("${").append(identifierString);
-                
-                if(identified){
-                    builder.append(' ').append(placeholderString);
-                }
-                continue;
-            }
-            
-            PlaceholderProvider provider = api.retrievePlaceholderProvider(identifierString);
-            if(provider == null){
-                builder.append("${").append(identifierString);
-    
-                if(identified){
-                    builder.append(' ').append(placeholderString);
-                }
-                
-                builder.append('}');
-                continue;
-            }
-            
-            String replacement = provider.parsePlaceholder(placeholderString, player, server);
-            if(replacement == null){
-                builder.append("${").append(identifierString);
-    
-                if(identified){
-                    builder.append(' ').append(placeholderString);
-                }
-    
-                builder.append('}');
-                continue;
-            }
-            
-            builder.append(replacement);
+            builder.append(input.charAt(position.getIndex()));
+            position.setIndex(position.getIndex() + 1);
         }
         
         return builder.toString();
     }
+    
+    public static PlaceholderToken.Placeholder parsePlaceholder(String input, ParsePosition position, GenericPlayer player, GenericServer server, ParseWarnCollector collector){
+        return new PlaceholderToken.Placeholder(parsePlaceholder0(input, position, player, server, collector));
+    }
+    
+    private static String parsePlaceholder0(String input, ParsePosition position, GenericPlayer player, GenericServer server, ParseWarnCollector collector){
+        AdvancedServerListAPI api = AdvancedServerList.getApi();
+        
+        int placeholderStart = position.getIndex() - 2;
+        int index = position.getIndex();
+        
+        StringBuilder identifier = new StringBuilder();
+        StringBuilder values = new StringBuilder();
+        
+        boolean identified = false;
+        boolean invalid = true;
+        
+        char[] chars = input.substring(index).toCharArray();
+        for(final char c : chars){
+            index++;
+            
+            if(c == '}'){
+                invalid = false;
+                break;
+            }
+            
+            if(c == ' ' && !identified){
+                identified = true;
+                continue;
+            }
+            
+            if(identified){
+                values.append(c);
+            }else{
+                identifier.append(c);
+            }
+        }
+        
+        String identifierStr = identifier.toString();
+        String valuesStr = values.toString();
+        
+        StringBuilder raw = new StringBuilder();
+        
+        // Condition parsing needs one extra increase of index... for some reason
+        if(collector != null)
+            index++;
+        
+        position.setIndex(index);
+        
+        if(invalid){
+            raw.append("${").append(identifierStr);
+            
+            if(identified)
+                raw.append(' ').append(valuesStr);
+            
+            if(collector != null)
+                collector.appendWarningFormatted(placeholderStart, "Placeholder '%s' does not have a closing bracket (})", raw.toString());
+            
+            return raw.toString();
+        }
+        
+        PlaceholderProvider provider = api.retrievePlaceholderProvider(identifierStr);
+        if(provider == null){
+            raw.append("${").append(identifierStr);
+            
+            if(identified)
+                raw.append(' ').append(valuesStr);
+            
+            raw.append('}');
+            
+            if(collector != null)
+                collector.appendWarningFormatted(placeholderStart, "Placeholder '%s' does not have any available PlaceholderProvider", raw.toString());
+            
+            return raw.toString();
+        }
+        
+        String replacement = provider.parsePlaceholder(valuesStr, player, server);
+        if(replacement == null){
+            raw.append("${").append(identifierStr);
+            
+            if(identified)
+                raw.append(' ').append(valuesStr);
+            
+            raw.append('}');
+            
+            if(collector != null)
+                collector.appendWarningFormatted(placeholderStart, "Placeholder '%s' has an invalid value String '%s'", raw.toString(), valuesStr);
+            
+            return raw.toString();
+        }
+        
+        return replacement;
+    }
 }

core/src/main/resources/config.yml

@@ -31,10 +31,65 @@ disableCache: false
 #
 checkUpdates: true
 
+#
+# Should debug mode be enabled?
+#
+# When set to true will AdvancedServerList print additional messages to the console prefixed with "[DEBUG]".
+# It is recommended to only enable this when having problems or when being told to by the plugin dev, as it could
+# otherwise cause significant spam in your console.
+#
+# Defaults to false when not present.
+#
+debug: false
+
+#
+# Sets the time in minutes for favicons to be cached.
+# The number cannot be less than 1.
+#
+# Defaults to 1 if not set.
+#
+faviconCacheTime: 1
+
+#
+# List of options that should be disabled while the Maintenance Mode of the plugin Maintenance is active.
+# Any option not listed here will NOT be disabled, meaning AdvancedServerList will continue to handle it.
+#
+# Each option defaults to true when not present, disabling said option while Maintenance is active.
+#
+disableDuringMaintenance:
+  #
+  # When true (Default), disables handling of MOTD while Maintenance is enabled.
+  #
+  motd: true
+  #
+  # When true (Default), disables handling of Favicon while Maintenance is enabled.
+  #
+  favicon: true
+  #
+  # When true (Default), disables hiding of player count while Maintenance is enabled.
+  #
+  hidePlayers: true
+  #
+  # When true (Default), disables handling of player count text while Maintenance is enabled.
+  #
+  playerCountText: true
+  #
+  # When true (Default), disables handling of player count hover while Maintenance is enabled.
+  #
+  playerCountHover: true
+  #
+  # When true (Default), disables use of extra players feature while Maintenance is enabled.
+  #
+  extraPlayers: true
+  #
+  # When true (Default), disables use of max players feature while Maintenance is enabled.
+  #
+  maxPlayers: 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
+config-version: ${plugin.config.version}

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

@@ -2,15 +2,24 @@
 # Set the priority of this profile.
 # Higher number = Higher priority.
 #
-# Read more: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#priority
+# Read more: https://asl.andre601.ch/profiles/#priority
 #
 priority: 0
 
+#
+# Set conditions that need to me met to show this profile.
+# You can use keywords 'and' or 'or' (Or alternatively '&&' or `||`) to make more complex condition sets.
+#
+# Read more: https://asl.andre601.ch/profiles/#condition
+#
+# condition: '${player protocol} < 759'
+#
+
 #
 # Set conditions that needs to be met.
 # Only when all conditions return true will the profile be shown (Given no profile with higher priority is used).
 #
-# Read more: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#conditions
+# Read more: https://asl.andre601.ch/profiles/#conditions
 #
 #conditions:
 #  - '{playerVersion} < 759'
@@ -25,7 +34,7 @@ priority: 0
 #
 # Remove this option or set it to profiles: [] to use the global options of this file.
 #
-# Read more: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#profiles
+# Read more: https://asl.andre601.ch/profiles/#profiles
 #
 #profiles:
 #  - motd:
@@ -49,7 +58,7 @@ priority: 0
 # 
 # Remove this option or set it to motd: [] to not alter the MOTD.
 #
-# Read more: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#motds
+# Read more: https://asl.andre601.ch/profiles/#motd
 #
 motd:
   - '<grey>Line 1'
@@ -64,14 +73,14 @@ motd:
 #
 # Remove this option or set to favicon: '' to not replace the Favicon.
 #
-# Read more: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#favicon
+# Read more: https://asl.andre601.ch/profiles/#favicon
 #
 favicon: ''
 
 #
 # Contains various options to manipulate the player count (Text displaying online and max players allowed).
 #
-# Read more: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#playercount
+# Read more: https://asl.andre601.ch/profiles/#playercount
 #
 playerCount:
   #
@@ -82,7 +91,7 @@ playerCount:
   #
   # Defaults to false when not present.
   #
-  # Read more: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#hideplayers
+  # Read more: https://asl.andre601.ch/profiles/#hideplayers
   #
   hidePlayers: false
   #
@@ -90,7 +99,7 @@ playerCount:
   #
   # Remove this option or set it to hover: [] to not modify the player samples on the player count.
   #
-  # Read more: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#hover
+  # Read more: https://asl.andre601.ch/profiles/#hover
   #
   hover:
     - '<grey>Line 1'
@@ -104,24 +113,24 @@ playerCount:
   #
   # Remove this option or set it to text: '' to not modify the player count text.
   #
-  # Read more: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#text
+  # Read more: https://asl.andre601.ch/profiles/#text
   #
   text: ''
   #
   # Allows you to modify the max player count displayed.
   # Note that this will affect ${server playersMax} (Except for when used in conditions).
   #
-  # Read more: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#extraPlayers
+  # Read more: https://asl.andre601.ch/profiles/#extraplayers
   #
   extraPlayers:
     #
     # Enables/Disables the extraPlayers option.
-    # When enabled will the total amount of players allowed be modified to the current
+    # When enabled will the total amount of players allowed to join be modified to the current
     # number of online players + 'amount'
     #
     # Defaults to false when not present.
     #
-    # Read more: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#enabled
+    # Read more: https://asl.andre601.ch/profiles/#extraplayers-enabled
     #
     enabled: false
     #
@@ -134,6 +143,35 @@ playerCount:
     #
     # Defaults to 0 when not present.
     #
-    # Read more: https://github.com/Andre601/AdvancedServerList/wiki/Profiles#amount
+    # Read more: https://asl.andre601.ch/profiles/#extraplayers-amount
+    #
+    amount: 0
+  #
+  # Allows you to set the max players that could join your server.
+  # Note that this option influences the '${server playersMax}' placeholder.
+  #
+  # The settings of this option have no effect should 'extraPlayers' be enabled
+  #
+  # Read more: https://asl.andre601.ch/profiles/#maxplayers
+  #
+  maxPlayers:
+    #
+    # Enables/Disables the maxPlayers option.
+    # When enabled will the total amount of players allowed to join be changed to what 'amount' is set to.
+    #
+    # Defaults to false when not present.
+    # 
+    # Read more: https://asl.andre601.ch/profiles/#maxplayers-enabled
+    #
+    enabled: false
+    #
+    # Sets the number to display for the max number of players allowed to join your server.
+    #
+    # Example:
+    # Setting this option to 0 (Default) while 1 player is online would display '1/0'
+    #
+    # Defaults to 0 if not set.
+    #
+    # Read more: https://asl.andre601.ch/profiles/#maxplayers-amount
     #
     amount: 0

core/src/main/resources/version.properties

@@ -23,4 +23,5 @@
 #
 #
 
-version=${plugin.version}
+version=${plugin.version}
+config-version=${plugin.config.version}

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

@@ -1,7 +1,7 @@
 /*
  * MIT License
  *
- * Copyright (c) 2022-2023 Andre_601
+ * Copyright (c) 2022-2024 Andre_601
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,30 +23,38 @@
  *
  */
 
-package ch.andre601.advancedserverlist.spigot.commands;
+package ch.andre601.advancedserverlist.test;
 
-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;
+import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
 
-public class SpigotCmdSender implements CmdSender{
-    
-    private final CommandSender sender;
-    private final BukkitAudiences bukkitAudiences;
-    
-    public SpigotCmdSender(CommandSender sender, BukkitAudiences bukkitAudiences){
-        this.sender = sender;
-        this.bukkitAudiences = bukkitAudiences;
+public class DummyPluginLogger implements PluginLogger{
+    @Override
+    public void debug(Class<?> clazz, String msg, Object... args){
+        info("[DEBUG] [" + clazz.getSimpleName() + "] " + msg, args);
     }
     
     @Override
-    public boolean hasPermission(String permission){
-        return sender.hasPermission(permission) || sender.hasPermission("advancedserverlist.admin");
+    public void debugWarn(Class<?> clazz, String msg, Object... args){
+        warn("[DEBUG] [" + clazz.getSimpleName() + "] " + msg, args);
     }
     
     @Override
-    public void sendMsg(String msg, Object... args){
-        bukkitAudiences.sender(sender).sendMessage(ComponentParser.text(String.format(msg, args)).toComponent());
+    public void info(String msg, Object... args){
+        System.out.printf((msg) + "%n", args);
+    }
+    
+    @Override
+    public void warn(String msg, Object... args){
+        System.out.printf((msg) + "%n", args);
+    }
+    
+    @Override
+    public void warn(String msg, Throwable throwable){
+        System.out.printf((msg) + "%n", throwable);
+    }
+    
+    @Override
+    public void warn(String msg, Throwable throwable, Object... args){
+        System.out.printf((msg) + "%n", args);
     }
 }

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

@@ -0,0 +1,76 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2024 Andre_601
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package ch.andre601.advancedserverlist.test;
+
+import ch.andre601.advancedserverlist.core.profiles.conditions.ProfileConditionParser;
+import ch.andre601.expressionparser.ParseWarnCollector;
+import ch.andre601.expressionparser.templates.ExpressionTemplate;
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class ExpressionParserTests{
+    
+    private final ProfileConditionParser parser = ProfileConditionParser.create();
+    private final DummyPluginLogger logger = new DummyPluginLogger();
+    private final Map<String, Boolean> testValuesMap = getTestMap();
+    
+    @Test
+    public void testBasicExpressionResults(){
+        for(Map.Entry<String, Boolean> values : testValuesMap.entrySet()){
+            logger.info("TEST[expression=\"%s\", expected=%b]", values.getKey(), values.getValue());
+            
+            ParseWarnCollector collector = new ParseWarnCollector(values.getKey());
+            ExpressionTemplate template = parser.compile(values.getKey(), null, null, collector);
+            boolean result;
+            if(template == null){
+                result = false;
+            }else{
+                result = template.returnBooleanExpression().evaluate();
+            }
+            
+            logger.info("Result (output, isExpected): " + result + ", " + (result == values.getValue()));
+            assertEquals(result, values.getValue());
+        }
+    }
+    
+    private Map<String, Boolean> getTestMap(){
+        return Map.of(
+            "20 > 10", true,
+            "10 > 20", false,
+            "10 = 10", true,
+            "10 = 20", false,
+            "(10 - 5) > (1 + 1)", true,
+            "(10 - 10) > (1 + 1)", false,
+            "100 > 50 and 50 < 100", true,
+            "100 < 50 and 50 > 100", false,
+            "true or 100 > 10", true,
+            "false or 100 < 10", false
+        );
+    }
+}

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

@@ -26,7 +26,9 @@
 package ch.andre601.advancedserverlist.test;
 
 import com.unascribed.flexver.FlexVerComparator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class FlexVerTests{
     
@@ -286,7 +288,9 @@ public class FlexVerTests{
     
     private void compare(String version1, String comparator, String version2, int expected){
         String expression = version1 + " " + comparator + " " + version2 + "?";
+        int result = FlexVerComparator.compare(version1, version2);
         
         System.out.printf("│ %-24s %5b │\n", expression, FlexVerComparator.compare(version1, version2) == expected);
+        assertEquals(result, expected);
     }
 }

docs/.hooks/badges.py

@@ -0,0 +1,54 @@
+#
+# Modified version of Squidfunk's shortcodes.py file for Material for MkDocs.
+#
+# It was altered to create compact admonition-like boxes to display in the documentation.
+#
+# Original shortcodes.py file:
+# https://github.com/squidfunk/mkdocs-material/blob/56b96b4d799174d48d36613d70ffac9b964171cc/material/overrides/hooks/shortcodes.py
+#
+
+from __future__ import annotations
+
+import re
+
+from mkdocs.config.defaults import MkDocsConfig
+from mkdocs.structure.files import File, Files
+from mkdocs.structure.pages import Page
+from re import Match
+
+def on_page_markdown(
+    markdown: str, *, page: Page, config: MkDocsConfig, files: Files
+):
+
+    # Replace callback
+    def replace(match: Match):
+        type, args = match.groups()
+        args = args.strip()
+        if type == "abstract":     return _admo(text = args, type = "abstract")
+        elif type == "info":       return _admo(text = args, type = "info")
+        elif type == "tip":        return _admo(text = args, type = "tip")
+        elif type == "success":    return _admo(text = args, type = "success")
+        elif type == "question":   return _admo(text = args, type = "question")
+        elif type == "warning":    return _admo(text = args, type = "warning")
+        elif type == "failure":    return _admo(text = args, type = "failure")
+        elif type == "danger":     return _admo(text = args, type = "danger")
+        elif type == "bug":        return _admo(text = args, type = "bug")
+        elif type == "example":    return _admo(text = args, type = "example")
+        elif type == "quote":      return _admo(text = args, type = "quote")
+        elif type == "deprecated": return _admo(text = args, type = "deprecated")
+        else:                      return _admo(text = args)
+
+    # Find and replace all external asset URLs in current page
+    return re.sub(
+        r"<!-- admo:(\w+)(.*?) -->",
+        replace, markdown, flags = re.I | re.M
+    )
+
+def _admo(text: str = "", type: str = ""):
+    classes = f"mdx-grid-wrapper mdx-admo--{type}" if type else "mdx-grid-wrapper"
+    return "".join([
+        f"<div class=\"{classes}\">",
+        f"<div class=\"mdx-grid-child mdx-grid-child--icon\"></div>",
+        f"<div class=\"mdx-grid-child\">{text}</div>"
+        "</div>",
+    ])

docs/.hooks/replacer.py

@@ -0,0 +1,26 @@
+#
+# A simple hook that replaces any appearances of \| with just |.
+#
+# There is an inconsistency between GitHub flavourited Markdown and Python Markdown
+# where the former treats | as part of a table, even if it is inside inline code
+# causing unwanted table rendering.
+#
+# The only way to prevent this is to escape it by prefixing it with a back slash (\).
+# Unfortunately does this cause issues on Python-Markdown, as it renders inline code
+# content as-is without special treatments whatsoever, meaning that `\|` will be
+# rendered as <code>\|</code> in the end.
+#
+# Using this hook, `\|` is being turned into `|` before further processing, resulting
+# in <code>|</code> being rendered in the end, while preserving proper table rendering
+# on GitHub and co.
+#
+import re
+
+from mkdocs.config.defaults import MkDocsConfig
+from mkdocs.structure.files import File, Files
+from mkdocs.structure.pages import Page
+
+def on_page_markdown(
+        markdown: str, *, page: Page, config: MkDocsConfig, files: Files
+):
+    return re.sub(r"\\\|","|",markdown)

docs/.overrides/api-doc.html

@@ -8,28 +8,28 @@
       Object summaries
     -->
     {% if page.meta.constructors %}
-      {{ info.summary('Constructor Summary', page.meta.constructors, details_type='constructor') }}
+      {{ info.summary('Constructor Summary', page.meta.constructors, details_type='constructor', defaults=page.meta.defaults) }}
     {% endif %}
     {% if page.meta.classes %}
-      {{ info.summary('Class Summary', page.meta.classes, details_type='class') }}
+      {{ info.summary('Class Summary', page.meta.classes, details_type='class', defaults=page.meta.defaults) }}
     {% endif %}
     {% if page.meta.enums %}
-      {{ info.summary('Enum Constant Summary', page.meta.enums, details_type='enum') }}
+      {{ info.summary('Enum Constant Summary', page.meta.enums, details_type='enum', defaults=page.meta.defaults) }}
     {% endif %}
     {% if page.meta.methods or page.meta.inherits %}
-      {{ info.summary('Method Summary', page.meta.methods, page.meta.inherits, details_type='method') }}
+      {{ info.summary('Method Summary', page.meta.methods, page.meta.inherits, details_type='method', defaults=page.meta.defaults) }}
     {% endif %}
     <!--
       Detailed object info
     -->
     {% if page.meta.constructors %}
-      {{ info.info('Constructor Detail', page.meta.constructors) }}
+      {{ info.info('Constructor Detail', page.meta.constructors, 'constructor', defaults=page.meta.defaults) }}
     {% endif %}
     {% if page.meta.enums %}
-      {{ info.info('Enum Constant Detail', page.meta.enums, true) }}
+      {{ info.info('Enum Constant Detail', page.meta.enums, 'enum', defaults=page.meta.defaults) }}
     {% endif %}
     {% if page.meta.methods %}
-      {{ info.info('Method Detail', page.meta.methods)}}
+      {{ info.info('Method Detail', page.meta.methods, 'method', defaults=page.meta.defaults)}}
     {% endif %}
   {% endif %}
 {% endblock %}

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

@@ -1,4 +1,4 @@
-{% macro summary(title, summaries, inherits, details_type = 'unknown') -%}
+{% macro summary(title, summaries, inherits, details_type = 'unknown', defaults = []) -%}
   <h2 id="{{ title | lower() | replace(' ', '-') |  e}}">
     {{ title }}
   </h2>
@@ -28,12 +28,16 @@
                 
                 {% if summary.type and summary.type.name %}
                   {% set modifiers.name = modifiers.name ~ summary.type.name %}
+                {% elif defaults and defaults.type and defaults.type.name %}
+                  {% set modifiers.name = modifiers.name ~ defaults.type.name %}
                 {% else %}
                   {% set modifiers.name = modifiers.name ~ "void" %}
                 {% endif %}
                 
                 {% set desc = "" %}
-                {% if summary.description %}
+                {% if summary.deprecated %}
+                  {% set desc = "<api__deprecated></api__deprecated><br>" ~ summary.deprecated.split("<br>")[0] %}
+                {% elif summary.description %}
                   {% set desc = summary.description.split("<br>")[0] %}
                 {% endif %}
                 
@@ -53,7 +57,7 @@
                   {% set final_name.name = final_name.name ~ ")" %}
                 {% endif %}
                 
-              {% if details_type and details_type == "method" %}
+                {% if details_type and details_type == "method" %}
                   {% if modifiers.name  %}
                     <td><code>{{ modifiers.name }}</code></td>
                   {% else %}
@@ -101,14 +105,14 @@
   </div>
 {%- endmacro %}
 
-{% macro info(title, details, enum = false) -%}
+{% macro info(title, details, details_type = 'unknown', defaults = []) -%}
   <h2 id="{{ title | lower() | replace(' ', '-') | e}}">
     {{ title }}
   </h2>
   {% for detail in details %}
     <div class="api-detail">
       {% set final_name = namespace(name = "") %}
-      {% if enum %}
+      {% if details_type == "enum" %}
         {% set final_name.name = detail.name | upper() %}
       {% else %}
         {% set final_name.name = detail.name ~ "(" %}
@@ -119,11 +123,15 @@
         {% if loop.revindex > 1 %}{% set final_name.name = final_name.name ~ ", " %}{% endif %}
       {% endfor %}
       
-      {% if not enum %}
+      {% if details_type != "enum" %}
         {% set final_name.name = final_name.name ~ ")" %}
       {% endif %}
       
       <h3 id="{{ final_name.name | lower() | replace(' ', '-') | e }}">
+        {% if detail.deprecated %}
+          <api__deprecated></api__deprecated>
+        {% endif %}
+        
         {% for attribute in detail.attributes %}
           <api__{{- attribute -}}></api__{{- attribute -}}>
         {% endfor %}
@@ -132,16 +140,33 @@
           <api__static></api__static> <api__final></api__final>
         {% endif %}
         
-        {% if detail.type %}
+        {% if detail.type and details_type == "method" %}
           {% if detail.type.link %}
             <a href="{{ detail.type.link }}" class="api-type__{{- detail.type.type | default('primitive') -}}">{{ detail.type.name | default('void') | e }}</a>
           {% else %}
             <span class="api-type__{{- detail.type.type | default('primitive') -}}">{{ detail.type.name | default('void') | e }}</span>
           {% endif %}
+        {% elif defaults and defaults.type and details_type == "method" %}
+          {% if defaults.type.link %}
+            <a href="{{ defaults.type.link }}" class="api-type__{{- defaults.type.type | default('primitive') -}}">{{ defaults.type.name | default('void') | e }}</a>
+          {% else %}
+            <span class="api-type__{{- defaults.type.type | default('primitive') -}}">{{ defaults.type.name | default('void') }}</span>
+          {% endif %}
+        {% elif details_type == "method" %}
+          <span class="api-type__primitive">void</span>
         {% endif %}
         <code>{{ final_name.name | e }}</code><a href="#{{ final_name.name | lower() | replace(' ', '-') | e }}" class="headerlink" title="Permanent link">¶</a>
       </h3>
       
+      {% if detail.deprecated %}
+        <div class="admonition deprecated">
+          <div class="admonition-title">Deprecation Warning</div>
+          <p>
+            {{ detail.deprecated }}
+          </p>
+        </div>
+      {% endif %}
+      
       {% if detail.description %}
         <p class="api-detail__description">
           {{ detail.description }}

docs/.overrides/partials/content.html

@@ -0,0 +1,42 @@
+<!-- Tags -->
+{% if "material/tags" in config.plugins and tags %}
+  {% include "partials/tags.html" %}
+{% endif %}
+
+<!-- Actions -->
+{% include "partials/actions.html" %}
+
+{% if config.extra.github_repository %}
+  <div class="admonition info">
+    <p class="admonition-title">Moved</p>
+    <p>
+      The documenation has been moved and can now be found at <a href="https://asl.andre601.ch" target="_blank" rel="noreferral nofollow noopener"><strong>asl.andre601.ch</strong></a>.<br>
+      This page in particular can be found at <a href="https://asl.andre601.ch/{{ page.url }}" target="_blank" rel="noreferral nofollow noopener"><strong>asl.andre601.ch/{{ page.url }}</strong></a>.
+    </p>
+  </div>
+{% endif %}
+
+<!--
+  Hack: check whether the content contains a h1 headline. If it doesn't, the
+  page title (or respectively site name) is used as the main headline.
+-->
+{% if "\x3ch1" not in page.content %}
+  <h1>{{ page.title | d(config.site_name, true)}}</h1>
+{% endif %}
+
+<!-- Page content -->
+{{ page.content }}
+
+<!-- Source file information -->
+{% if page.meta and (
+  page.meta.git_revision_date_localized or
+  page.meta.revision_date
+) %}
+  {% include "partials/source-file.html" %}
+{% endif %}
+
+<!-- Was this page helpful? -->
+{% include "partials/feedback.html" %}
+
+<!-- Comment system -->
+{% include "partials/comments.html" %}

docs/.overrides/partials/source.html

@@ -1,17 +0,0 @@
-<a
-  href="{{ config.repo_url}}"
-  title="{{ lang.t('source') }}"
-  class="md-source"
-  target="_blank"
-  rel="nofollow noreferral noopener"
->
-  <div class="md-source__icon md-icon">
-    {% set icon = config.theme.icon.repo or "fontawesome/brands/git-alt" %}
-    {% include ".icons/" ~ icon ~ ".svg" %}
-  </div>
-  <div class="md-source__repository">
-    {{ config.repo_name }}
-    <ul class="md-source__facts" data-md-component="codeberg-stats">
-    </ul>
-  </div>
-</a>

docs/.pages.yml

@@ -1,9 +0,0 @@
-nav:
-  - Home:
-    - index.md
-    - commands.md
-  - profiles
-  - examples
-  - migration
-  - api
-  - placeholderapi 

docs/.snippets/api_version.md

@@ -0,0 +1 @@
+<div class="mdx-badge"><span class="mdx-badge__icon">[:octicons-tag-24:](changelog.md#v3.1.0 'View latest Release Changelog')</span><span class="mdx-badge__text">[v3.1.0](changelog.md#v3.1.0 'View latest Release Changelog')</span></div>

docs/.snippets/warn-header.md

@@ -0,0 +1 @@
+<div class="mdx-badge"><span class="mdx-badge__icon" >[:octicons-alert-24:](changelog.md)</span><span class="mdx-badge__text">[v3.1.0](changelog.md#v3.1.0 'View latest Release Changelog')</span></div>

docs/addons/banplugins.md

@@ -0,0 +1,64 @@
+# BanPlugins Addon
+
+The BanPlugins Addon was made to provide placeholders for different punishment plugins to use in AdvancedServerList.
+
+## Placeholders
+
+### AdvancedBan
+
+Placeholders for the plugin [AdvancedBan](https://www.spigotmc.org/resources/8695/){ target="_blank" rel="nofollow" } are available to use.
+
+| Placeholder                     | Description                                                                               |
+|---------------------------------|-------------------------------------------------------------------------------------------|
+| `${advancedban isMuted}`        | Whether the player is muted or not.                                                       |
+| `${advancedban muteReason}`     | The reason for why the player was muted. Returns invalid placeholder if no mute was set.  |
+| `${advancedban muteDuration}`   | Relative time until the mute expires.[^1] Returns invalid placeholder if no mute was set. |
+| `${advancedban muteExpiration}` | Date on when the mute will expire.[^2]                                                    |
+| `${advancedban isBanned}`       | Whether the player is banned or not.                                                      |
+| `${advancedban banReason}`      | The reason for why the player was banned. Returns invalid placeholder if no ban was set.  |
+| `${advancedban banDuration}`    | Relative time until the ban expires.[^3] Returns invalid placeholder if no ban was set.   |
+| `${advancedban banExpiration}`  | Date on when the ban will expire.[^4]                                                     |
+
+[^1]:
+    An optional boolean can be added to set whether the duration should be from the start or not. `false` is the default.  
+    Example: `${advancedban muteDuration true}`
+[^2]:
+    An optional Date and time Pattern can be set to change the displayed output. The default is `dd, MMM yyyy HH:mm:ss`.  
+    Example: `${advancedban muteExpiration yyyy-MM-dd HH:mm:ss}`
+[^3]:
+    An optional boolean can be added to set whether the duration should be from the start or not. `false` is the default.  
+    Example: `${advancedban banDuration true}`
+[^4]:
+    An optional Date and time Pattern can be set to change the displayed output. The default is `dd, MMM yyyy HH:mm:ss`.  
+    Example: `${advancedban banExpiration yyyy-MM-dd HH:mm:ss}`
+
+### LibertyBans
+
+Placeholders for the plugin [LibertyBans](https://modrinth.com/plugin/libertybans/){ target="_blank" rel="nofollow" } are available to use.
+
+| Placeholder                     | Description                                                                              |
+|---------------------------------|------------------------------------------------------------------------------------------|
+| `${libertybans isMuted}`        | Whether the player is muted or not.                                                      |
+| `${libertybans muteReason}`     | The reason for why the player was muted. Returns invalid placeholder if no mute was set. |
+| `${libertybans muteExpiration}` | Date on when the mute will expire.[^5]                                                   |
+| `${libertybans isBanned}`       | Whether the player is banned or not.                                                     |
+| `${libertybans banReason}`      | The reason for why the player was banned. Returns invalid placeholder if no ban was set. |
+| `${libertybans banExpiration}`  | Date on when the ban will expire.[^6]                                                    |
+
+[^5]:
+    An optional Date and time Pattern can be set to change the displayed output. The default is `dd, MMM yyyy HH:mm:ss`.  
+    Example: `${libertybans muteExpiration yyyy-MM-dd HH:mm:ss}`
+[^6]:
+    An optional Date and time Pattern can be set to change the displayed output. The default is `dd, MMM yyyy HH:mm:ss`.  
+    Example: `${libertybans banExpiration yyyy-MM-dd HH:mm:ss}`
+
+## Example
+
+```yaml title="banned.yml"
+priority: 1
+condition: '${advancedban isBanned}'
+
+motd:
+  - '<red>You were <bold>BANNED</bold>!'
+  - '<red>Expires: <grey>${advancedban banExpiration}'
+```

docs/addons/index.md

@@ -0,0 +1,28 @@
+---
+icon: octicons/plus-circle-24
+---
+
+# Addons
+
+This section contains a curated list of add-ons for AdvancedServerList which can be used to enhance the plugin in different ways.  
+Do you have a plugin that hooks into AdvancedServerList that is not listed here? Contact Andre601 on Discord and it will be added!
+
+## First-party Addons
+
+These Addons are made by Andre601 and available together with the plugin downloads.
+
+<div class="grid cards" markdown>
+
+-   [**BanPlugins**](banplugins.md)
+
+    ----
+    
+    Addon for different Punishment plugins such as AdvancedBan, that add new placeholders to use in AdvancedServerList.
+
+</div>
+
+## Third-party
+
+Third-party addons made by other people not working on AdvancedServerList.
+
+*Currently no entries*

docs/api/.pages.yml

@@ -1,2 +0,0 @@
-nav:
-  - ...

docs/api/changelog.md

@@ -7,7 +7,113 @@ icon: octicons/log-24
 This page lists the recent changes made towards the AdvancedServerListAPI.  
 They are ordered newest to oldest.
 
-## v3.0.0
+## v3.2.1 { #v3.2.1 }
+
+### :octicons-pencil-24:{ .changelog-changed title="Changed" } Changed { #v3.2.1-changed }
+
+- Removed usage of `${api.version}` in the different pom.xml for version resolving.
+
+## v3.2.0 { #v3.2.0 }
+
+### :octicons-plus-circle-24:{ .changelog-added title="Added" } Added { #v3.2.0-added }
+
+- New setter methods added to [`ProfileEntry.Builder`][profileentry.builder] class, replacing old ones (See deprecations below):
+    - [`extraPlayersCount(Integer)`][extraplayerscount]
+    - [`extraPlayersEnabled(NullBool)`][extraplayersenabled]
+    - [`favicon(String)`][favicon]
+    - [`hidePlayersEnabled(NullBool)`][hideplayersenabled]
+    - [`maxPlayersCount(Integer)`][maxplayerscount]
+    - [`maxPlayersEnabled(NullBool)`][maxplayersenabled]
+    - [`motd(List<String>)`][motd]
+    - [`playerCountText(String)`][playercounttext]
+    - [`players(List<String>)`][players]
+
+[extraplayerscount]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#extraplayerscount(integer)
+[extraplayersenabled]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#extraplayersenabled(nullbool)
+[favicon]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#favicon(string)
+[hideplayersenabled]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#hideplayersenabled(nullbool)
+[maxplayerscount]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#maxplayerscount(integer)
+[maxplayersenabled]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#maxplayersenabled(nullbool)
+[motd]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#motd(list<string>)
+[playercounttext]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#playercounttext(string)
+[players]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#players(list<string>)
+
+### :octicons-pencil-24:{ .changelog-changed title="Changed" } Changed { #v3.2.0-changed }
+
+- The API has been moved to Codeberg and is now available under a new repository URL to download. The group and artifact ID remained the same, but version no longer has a `v` prefix:
+    
+    /// tab | ":simple-apachemaven: Maven (pom.xml)"
+    ```xml
+    <repositories>
+      <repository>
+        <id>codeberg</id>
+        <url>https://codeberg.org/api/packages/Andre601/maven/</url>
+      </repository>
+    </repositories>
+    
+    <dependencies>
+      <dependency>
+        <groupId>ch.andre601.asl-api</groupId>
+        <artifactId>api</artifactId>
+        <version>{apiVersion}</version>
+        <scope>provided</scope>
+      </dependency>
+    </dependencies>
+    ```
+    ///
+    /// tab | ":simple-gradle: Gradle (build.gradle)"
+    ```groovy
+    repositories {
+        maven = { url ="https://codeberg.org/api/packages/Andre601/maven/" }
+    }
+    
+    dependencies {
+        compileOnly "ch.andre601.asl-api:api:{apiVersion}"
+    }
+    ```
+    ///
+
+### :octicons-zap-24:{ .changelog-breaking title="Deprecated" } Deprecated { #v3.2.0-deprecated }
+
+- Setters in [`ProfileEntry.Builder`][profileentry.builder] deprecated in favour of more consistent method naming.
+    - `setExtraPlayersCount(Integer)`
+    - `setExtraPlayersEnabled(NullBool)`
+    - `setFavicon(String)`
+    - `setHidePlayersEnabled(NullBool)`
+    - `setMaxPlayersCount(Integer)`
+    - `setMaxPlayersEnabled(NullBool)`
+    - `setMotd(List<String>)`
+    - `setPlayerCountText(String)`
+    - `setPlayers(List<String>)`
+
+## v3.1.0 { #v3.1.0 }
+
+### :octicons-plus-circle-24:{ .changelog-added title="Added" } Added { #v3.1.0-added }
+
+- New getters in [`ProfileEntry`][profileentry]:
+    - [`maxPlayersEnabled()`][maxplayersenabled] - Returns the value for `playerCount -> maxPlayers -> enabled` as `NullBool`
+    - [`maxPlayersCount()`][maxplayerscount] - Returns the value of `playerCount -> maxPlayers -> amount` as nullable `Integer`
+- New setters in [`ProfileEntry.Builder`][profileentry.builder]:
+    - [`setMaxPlayersEnabled(NullBool)`][setmaxplayersenabled] - Sets whether the max players feature is enabled or not.
+    - [`setMaxPlayersCount(Integer)`][setmaxplayerscount] - Sets the number to use for the max players count.
+    - [`setExtraPlayersCount(Integer)`][setextraplayersecount] - Replacement for [deprecated `setExtraPlayerCount(Integer)` method](#v3.1.0-deprecated).
+
+### :octicons-zap-24:{ .changelog-breaking title="Deprecated" } Deprecated { #v3.1.0-deprecated }
+
+- `setExtraPlayerEnabled(Integer)` in `ProfileEntry.Builder` - Typo in method name.
+
+[profileentry]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/index.md
+[maxplayersenabled]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/index.md#maxplayersenabled()
+[maxplayerscount]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/index.md#maxplayerscount()
+
+[profileentry.builder]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md
+[setmaxplayersenabled]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#setmaxplayersenabled(nullbool)
+[setmaxplayerscount]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#setmaxplayerscount(integer)
+[setextraplayersecount]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md#setextraplayerscount(integer)
+
+----
+
+## v3.0.0 { #v3.0.0 }
 
 ### :octicons-alert-24:{ .changelog-breaking title="Breaking Changes" } Breaking Changes { #v3-breaking }
 
@@ -25,14 +131,18 @@ They are ordered newest to oldest.
 
 - All previously deprecated `getX()` methods from the `ProfileEntry` record
 
-## v2.1.0
+----
+
+## v2.1.0 { #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
+----
+
+## v2.0.0 { #v2.0.0 }
 
 ### :octicons-alert-24:{ .changelog-breaking title="Breaking Changes" } Breaking Changes { #v2-breaking }
 
@@ -61,7 +171,9 @@ They are ordered newest to oldest.
 
 - `UnsupportedAPIAccessException` as it is no longer used in the API itself.
 
-## v1.0.0
+----
+
+## v1.0.0 { #v1.0.0 }
 
 ### :octicons-plus-circle-24:{ .changelog-added title="Added" } Added { #v1-added }
 
@@ -78,5 +190,6 @@ Templates for changelog
 ### :octicons-plus-circle-24:{ .changelog-added title="Added" } Added { #v-added }
 ### :octicons-pencil-24:{ .changelog-changed title="Changed" } Changed { #v-changed }
 ### :octicons-trash-24:{ .changelog-removed title="Removed" } Removed { #v-removed }
+### :octicons-zap-24:{ .changelog-breaking title="Deprecated" } Deprecated { #v-deprecated }
 
 -->

docs/api/index.md

@@ -4,92 +4,99 @@ icon: octicons/command-palette-24
 
 # API
 
-AdvancedServerList v2 introduced a new API that plugins can hook into 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.
+AdvancedServerList offers an API that other plugins can use to add their own placeholder to the plugin, listen for specific events or even modify Server List Profiles on the fly.
 
 ## Add dependency
 
-Add the following to your `build.gradle` or `pom.xml` file to use the API:
+Add the following to your `pom.xml`, `build.gradle` or `build.gradle.kts` depending on what you use:
 
-=== ":simple-gradle: Gradle"
+/// tab | :simple-apachemaven: Maven 
+```xml title="pom.xml"
+<repositories>
+  <repository>
+    <id>codeberg</id>
+    <url>https://codeberg.org/api/packages/Andre601/maven/</url>
+  </repository>
+</repositories>
+
+<dependencies>
+  <dependency>
+    <groupId>ch.andre601.asl-api</groupId>
+    <artifactId>api</artifactId>
+    <version>{apiVersion}</version>
+    <scope>provided</scope>
+  </dependency>
+  
+  <!-- Optional platform dependencies -->
+  <dependency>
+    <groupId>ch.andre601.asl-api</groupId>
+    <artifactId>platform-bukkit</artifactId>
+    <version>{apiVersion}</version>
+    <scope>provided</scope>
+  </dependency>
+  <dependency>
+    <groupId>ch.andre601.asl-api</groupId>
+    <artifactId>platform-bungeecord</artifactId>
+    <version>{apiVersion}</version>
+    <scope>provided</scope>
+  </dependency>
+  <dependency>
+    <groupId>ch.andre601.asl-api</groupId>
+    <artifactId>platform-velocity</artifactId>
+    <version>{apiVersion}</version>
+    <scope>provided</scope>
+  </dependency>
+</dependencies>
+```
+///
+
+/// tab | :simple-gradle: Gradle
+```groovy title="build.gradle"
+repositorories {
+    maven { url = 'https://codeberg.org/api/packages/Andre601/maven/' }
+}
+
+dependencies {
+    compileOnly 'ch.andre601.asl-api:api:{apiVersion}'
     
-    [![latest_release][release]][api-repo]
+    // Optional platform dependencies
+    compileOnly 'ch.andre601.asl-api:platform-bukkit:{apiVersion}'
+    compileOnly 'ch.andre601.asl-api:platform-bungeecord:{apiVersion}'
+    compileOnly 'ch.andre601.asl-api:platform-velocity:{apiVersion}'
+}
+```
+///
+
+/// tab | :simple-gradle: Gradle (KTS)
+```kotlin title="build.gradle.kts"
+repositories {
+    maven("https://codeberg.org/api/packages/Andre601/maven/")
+}
+
+dependencies {
+    compileOnly("ch.andre601.asl-api:api:{apiVersion}")
     
-    Make sure to replace `{version}` with the version displayed above.
-    
-    ```groovy title="build.gradle"
-    repositorories {
-        maven { url = 'https://jitpack.io/' }
-    }
-    
-    dependencies {
-        implementation 'ch.andre601.asl-api:api:{version}'
-        
-        // Optional platform dependencies
-        implementation 'ch.andre601.asl-api:platform-bukkit:{version}'
-        implementation 'ch.andre601.asl-api:platform-bungeecord:{version}'
-        implementation 'ch.andre601.asl-api:platform-velocity:{version}'
-    }
-    ```
+    // Optional platform dependencies
+    compileOnly("ch.andre601.asl-api:platform-bukkit:{apiVersion}")
+    compileOnly("ch.andre601.asl-api:platform-bungeecord:{apiVersion}")
+    compileOnly("ch.andre601.asl-api:platform-velocity:{apiVersion}")
+}
+```
+///
 
-=== ":simple-apachemaven: Maven"
-    
-    [![latest_release][release]][api-repo]
-    
-    Make sure to replace `{version}` with the version displayed above.
-    
-    ```xml title="pom.xml"
-    <repositories>
-      <repository>
-        <id>jitpack</id>
-        <url>https://jitpack.io/</url>
-      </repository>
-    </repositories>
-    
-    <dependencies>
-      <dependency>
-        <groupId>ch.andre601.asl-api</groupId>
-        <artifactId>api</artifactId>
-        <version>{version}</version>
-      </dependency>
-      
-      <!-- Optional platform dependencies -->
-      <dependency>
-        <groupId>ch.andre601.asl-api</groupId>
-        <artifactId>platform-bukkit</artifactId>
-        <version>{version}</version>
-      </dependency>
-      <dependency>
-        <groupId>ch.andre601.asl-api</groupId>
-        <artifactId>platform-bungeecord</artifactId>
-        <version>{version}</version>
-      </dependency>
-      <dependency>
-        <groupId>ch.andre601.asl-api</groupId>
-        <artifactId>platform-velocity</artifactId>
-        <version>{version}</version>
-      </dependency>
-    </dependencies>
-    ```
+## Adding your own Placeholders
 
-[release]: https://img.shields.io/github/v/tag/Andre601/asl-api?labelColor=252631&color=292a36&style=for-the-badge&label=Latest%20Release:
-[api-repo]: https://github.com/Andre601/asl-api
+<!-- admo:info This requires the main api module -->
 
-## Add own placeholders
+The API allows you to add your own placeholders which would be available through the `${<identifier> <values>}` placeholder Pattern in a Server List profile.
 
-To add your own placeholders will you need to do a few steps.
+To add your own placeholders, follow these steps:
 
-### 1) Get API instance
+### 1. Create a Placeholder class
 
-Use `AdvancedServerListAPI.get()` to retrieve an instance of the currently used AdvancedServerList API.  
-It will be needed at a later point.
+You should first create a new class and make it extend the abstract [`PlaceholderProvider`][placeholderprovider]. This class includes a constructor and a method you need to add, so do that:
 
-### 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 title="PlaceholderProvider example"
+```java
 public class MyPlaceholders extends PlaceholderProvider {
     
     public MyPlaceholders(String identifier) {
@@ -103,23 +110,25 @@ 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:
-
+/// tip
+You can replace the Constructor with a String argument with a no-args constructor and set the identifier directly in the `super`:
 ```java
 public MyPlaceholders() {
     super("myplaceholders");
 }
 ```
+///
 
-The next step now would be to handle the different placeholders. These are handled in the `parsePlaceholder` method you had to override.  
-The `placeholder` String is whatever value was provided after the identifier in `${<identifier> <placeholder>}`. It can contain spaces.
+The [`parsePlaceholder(String, GenericPlayer, GenericServer)`][parseplaceholder] method is used by AdvancedServerList to replace a matching placeholder with a value.  
+What you return is completely up to you. Just keep in mind that returning `null` will be treated as an invalid placeholder by AdvancedServerList, resulting in the placeholder being returned as-is without any changes.
 
-Something to note is, that when returning `null` will AdvancedServerList understand it as an invalid placeholder and return it unchanged.
+[placeholderprovider]: reference/api/ch.andre601.advancedserverlist.api/placeholderprovider.md
+[parseplaceholder]: reference/api/ch.andre601.advancedserverlist.api/placeholderprovider.md#parseplaceholder(string,-genericplayer,-genericserver)
 
-Here is a small example of the final class:
+/// details | Example of final class
+    type: example
 
-```java title="PlaceholderProvider example"
+```java
 public class MyPlaceholders extends PlaceholderProvider {
     
     public MyPlaceholders() {
@@ -128,35 +137,258 @@ public class MyPlaceholders extends PlaceholderProvider {
     
     @Override
     public String parsePlaceholder(String placeholder, GenericPlayer player, GenericServer server) {
-        if(placeholder.equals("hello"))
-            return "Hi!";
+        if(placeholder.equalsIgnoreCase("hello"))
+            return "Hello " + player.getName();
         
         return null;
     }
 }
 ```
+///
 
-### 3) Register the placeholder class
+### 2. Register the Placeholders
 
-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.
+Next step should be to register the placeholder. To achieve this, first obtain an instance of the [`AdvancedServerListAPI`][advancedserverlistapi] by using the static [`get()`][get] method. After that call [`addPlaceholderProvider(PlaceholderProvider placeholderProvider)`][addplaceholderprovider].  
+Your code may look similar to this:
 
 ```java title="Registering PlaceholderProvider class"
-AdvancedServerListAPI api = AdvancedServerListAPI.get();
-
-api.addPlaceholderProvider(new MyPlaceholders());
+public class MyPlugin extends JavaPlugin {
+    
+    @Override
+    public void onEnable() {
+        AdvancedServerListAPI api = AdvancedServerListAPI.get();
+        
+        api.addPlaceholderProvider(new MyPlaceholders());
+    }
+}
 ```
 
-## Events
+[advancedserverlistapi]: reference/api/ch.andre601.advancedserverlist.api/advancedserverlistapi.md
+[get]: reference/api/ch.andre601.advancedserverlist.api/advancedserverlistapi.md#get()
+[addplaceholderprovider]: reference/api/ch.andre601.advancedserverlist.api/advancedserverlistapi.md#addplaceholderprovider(placeholderprovider)
 
-!!! 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.
+This should register your PlaceholderExpansion as long as it is valid, meaning that the identifier...
 
-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.
+- ...is not `null`
+- ...is not containing spaces
+- ...is not using a name already registered in the API
+
+### 3. Declare AdvancedServerList as (soft)depend
+
+The final thing you should make sure is to define AdvancedServerList as a depend or soft-depend for your plugin, to make sure it loads after AdvancedServerList.
+
+Below are example setups for Spigot, Paper, BungeeCord and Velocity:
+
+/// tab | :simple-spigotmc: Spigot
+//// tab | Softdepend
+```yaml title="plugin.yml"
+name: "MyPlugin"
+author: "author"
+version: "1.0.0"
+
+main: "com.example.plugin.ExamplePlugin"
+
+softdepend:
+  - AdvancedServerList
+```
+////
+
+//// tab | Depend
+```yaml title="plugin.yml"
+name: "MyPlugin"
+author: "author"
+version: "1.0.0"
+
+main: "com.example.plugin.ExamplePlugin"
+
+depend:
+  - AdvancedServerList
+```
+////
+///
+
+/// tab | :fontawesome-solid-paper-plane: Paper
+//// tab | Softdepend
+```yaml title="paper-plugin.yml"
+name: "MyPlugin"
+author: "author"
+version: "1.0.0"
+
+main: "com.example.plugin.ExamplePlugin"
+
+dependencies:
+  server:
+    AdvancedServerList:
+      load: BEFORE
+      required: false # Default, not required
+```
+////
+
+//// tab | Depend
+```yaml title="paper-plugin.yml"
+name: "MyPlugin"
+author: "author"
+version: "1.0.0"
+
+main: "com.example.plugin.ExamplePlugin"
+
+dependencies:
+  server:
+    AdvancedServerList:
+      load: BEFORE
+      required: true
+```
+////
+///
+
+/// tab | :octicons-git-merge-24: BungeeCord
+//// tab | Softdepend
+```yaml title="bungee.yml"
+name: "MyPlugin"
+author: "author"
+version: "1.0.0"
+
+main: "com.example.plugin.ExamplePlugin"
+
+softDepends:
+  - AdvancedServerList
+```
+////
+
+//// tab | Depend
+```yaml title="bungee.yml"
+name: "MyPlugin"
+author: "author"
+version: "1.0.0"
+
+main: "com.example.plugin.ExamplePlugin"
+
+depends:
+  - AdvancedServerList
+```
+////
+///
+
+/// tab | :octicons-git-merge-24: Velocity
+//// tab | Softdepend (File)
+```json title="velocity-plugin.json"
+{
+  "id": "myplugin",
+  "name": "MyPlugin",
+  "version": "1.0.0",
+  "authors": [
+    "author"
+  ],
+  "main": "com.example.plugin.ExamplePlugin",
+  "dependencies": [
+    {
+      "id": "advancedserverlist",
+      "optional": true
+    }
+  ]
+}
+```
+////
+
+//// tab | Depend (File)
+```json title="velocity-plugin.json"
+{
+  "id": "myplugin",
+  "name": "MyPlugin",
+  "version": "1.0.0",
+  "authors": [
+    "author"
+  ],
+  "main": "com.example.plugin.ExamplePlugin",
+  "dependencies": [
+    {
+      "id": "advancedserverlist",
+      "optional": false // Default, not required
+    }
+  ]
+}
+```
+////
+
+//// tab | Softdepend (Annotation)
+```java title="MyPlugin.java"
+@Plugin(
+  id = "myplugin",
+  name = "MyPlugin",
+  version = "1.0.0",
+  authors = {"author"},
+  dependencies = {
+    @Dependency(
+      id = "advancedserverlist",
+      optional = true
+    )
+  }
+)
+public class MyPlugin {
+  
+  // ...
+  
+}
+```
+////
+
+//// tab | Depend (Annotation)
+```java title="MyPlugin.java"
+@Plugin(
+  id = "myplugin",
+  name = "MyPlugin",
+  version = "1.0.0",
+  authors = {"author"},
+  dependencies = {
+    @Dependency(
+      id = "advancedserverlist",
+      optional = false // Default, not required
+    )
+  }
+)
+public class MyPlugin {
+  
+  // ...
+  
+}
+```
+////
+///
+
+### 4. You're done!
+
+Your plugin should now hook into AdvancedServerList and register its own custom placeholders to use.
+
+## Listening for events
+
+<!-- admo:info This requires the platform specific dependencies -->
+
+AdvancedServerList provides an Event that your plugin can listen for.  
+The event is called `PreServerListSetEvent` and provides the following methods to use:
+
+- [`getEntry()`][getentry] - Gets the currently set [`ProfileEntry`][profileentry].
+- [`setEntry(ProfileEntry)`][setentry] - Sets a new [`ProfileEntry`][profileentry] to use.
+- [`isCancelled()`][iscancelled] - Gets the current cancelled state of the event.
+- [`setCancelled(boolean)`][setcancelled] - Sets the current cancelled state.
+
+Setting the event's cancelled state to true will result in AdvancedServerList not altering the Server list.
+
+Please check the server/proxy's documentation on how to listen for events with your plugin.
+
+[getentry]: reference/api/ch.andre601.advancedserverlist.api/events/genericserverlistevent.md#getentry()
+[setentry]: reference/api/ch.andre601.advancedserverlist.api/events/genericserverlistevent.md#setentry(profileentry)
+[iscancelled]: reference/api/ch.andre601.advancedserverlist.api/events/genericserverlistevent.md#iscancelled()
+[setcancelled]: reference/api/ch.andre601.advancedserverlist.api/events/genericserverlistevent.md#setcancelled(boolean)
+
+[profileentry]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/index.md
 
 ### ProfileEntry
 
-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 record is the core class used within the `PreServerListSetEvent`. It sets what values (MOTD, Favicon, Players, etc.) should be displayed.  
+Note that the record is - by nature - immutable and that the [`Builder`][builder] class should be used to create a new ProfileEntry instance to use.
 
-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`.
+A convenience method exists to create a `Builder` instance from an existing `ProfileEntry` in case you only want to alter certain options while everything else unchanged.
+
+This allows you to customize the Server list using your plugin. Just keep in mind that other plugins may also do the same, overriding your changes.
+
+[builder]: reference/api/ch.andre601.advancedserverlist.api/profiles/profileentry/builder.md

docs/api/javadocs.md

@@ -0,0 +1,10 @@
+---
+template: redirect.html
+
+location: https://jd.andre601.ch
+
+title: Javadocs
+icon: octicons/link-external-24
+---
+
+<!-- Comment to trigger proper build -->

docs/api/reference/.pages.yml

@@ -1,6 +0,0 @@
-nav:
-  - index.md
-  - api: api
-  - platform-bukkit: platform-bukkit
-  - platform-bungeecord: platform-bungeecord
-  - platform-velocity: platform-velocity

docs/api/reference/api/.pages.yml

@@ -1,3 +0,0 @@
-nav:
-  - index.md
-  - ch.andre601.advancedserverlist.api: ch.andre601.advancedserverlist.api

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

@@ -8,7 +8,7 @@ constructors:
       - name: 'identifier'
         description: 'The identifier to use for the placeholder. Cannot be empty.'
         type: String
-        attributes:
+        attribute:
           - notnull
 
 methods:
@@ -28,7 +28,7 @@ methods:
         type: GenericServer
         description: 'The <a href="./../objects/genericserver/"><code>GenericServer</code> instance</a> used.'
     returns: 'Possibly-parsed or possibly-null String to replace the placeholder with.'
-    attributes:
+    attribute:
       - nullable
       - abstract
     type:

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

@@ -1,59 +1,213 @@
 ---
 template: api-doc.html
 
+defaults:
+  type:
+    name: 'Builder'
+    type: 'object'
+
 constructors:
   - name: 'Builder'
+    description: 'Empty Builder Constructor used to create a new instance of this class.'
   
 methods:
-  - name: 'setMotd'
+  - name: 'extraPlayersCount'
+    description: |
+      Sets the number of players to add to the online players to use as the new max players value.<br>
+      This option has no effect when <a href="../#extraplayersenabled()"><code>extraPlayersEnabled</code></a> is set to <a href="../../../objects/nullbool/#false"><code>NullBool.FALSE</code></a> or <a href="../../objects/nullbool/#not_set"><code>NullBool.NOT_SET</code></a>.<br>
+      <br>
+      Set this to <code>null</code> to not alter the max player count. Alternatively, set <a href="#setextraplayersenabled(nullbool)"><code>setExtraPlayersEnabled(NullBool)</code></a> to <a href="../../../objects/nullbool/#false"><code>NullBool.FALSE</code></a>.
+    parameters:
+      - name: 'extraPlayersCount'
+        description: 'The number of extra players to add.'
+        type: 'Integer'
+        attribute:
+          - 'nullable'
+    returns: 'This Builder after the extra player count has been set. Useful for chaining.'
+  - name: 'extraPlayersEnabled'
+    description: |
+      Sets whether the extra players feature should be enabled or not.<br>
+      <br>
+      Set to <a href="../../../objects/nullbool#not_set"><code>NullBool.NOT_SET</code></a> to not set this.
+    parameters:
+      - name: 'extraPlayersEnabled'
+        description: 'Whether the extra players feature should be enabled or not.'
+        type: 'NullBool'
+        attribute:
+          - 'notnull'
+    returns: 'This Builder after the NullBool has been set. Useful for chaining.'
+    throws:
+      - name: 'IllegalArgumentException'
+        description: Thrown by the <code>CheckUtil</code> in case <code>null</code> has been provided as parameter.
+  - name: 'favicon'
+    description: |
+      Sets the value to use for the favicon.<br>
+      The following values are supported:
+      <ul>
+      <li>URL to a valid PNG file.</li>
+      <li>File name (with <code>.png</code> extension) matching a file saved in the favicons folder of AdvancedServerList.</li>
+      <li><code>${player uuid}</code> to display the avatar of the player.
+      </ul>
+      Set to an empty String or <code>null</code> to not alter the Favicon.
+    parameters:
+      - name: 'favicon'
+        description: 'The favicon to set.'
+        type: 'String'
+        attribute:
+          - 'nullable'
+    returns: 'This Builder after the Favicon has been set. Useful for chaining.'
+  - name: 'hidePlayersEnabled'
+    description: |
+      Sets whether the player count should be hidden or not.<br>
+      <br>
+      Set to <a href="../../../objects/nullbool#not_set"><code>NullBool.NOT_SET</code></a> to not set this.
+    parameters:
+      - name: 'hidePlayersEnabled'
+        description: 'Whether the player count should be hidden or not.'
+        type: 'NullBool'
+        attribute:
+          - 'notnull'
+    returns: 'This Builder after the NullBool has been set. Useful for chaining.'
+    throws:
+      - name: 'IllegalArgumentException'
+        description: 'Thrown by the <code>CheckUtil</code> in case <code>null</code> has been provided as parameter.'
+  - name: 'maxPlayersCount'
+    description: |
+      Sets the number of max players allowed to join this server.<br>
+      This option has no effect when <a href="#maxplayersenabled(nullbool)">maxPlayersEnabled</a> is set to <a href="../../../objects/nullbool/#false"><code>NullBool.FALSE</code></a> or <a href="../../../objects/nullbool/#not_set"><code>NullBool.NOT_SET</code></a>.<br>
+      <br>
+      Set this to <code>null</code> to not alter the max player count. Alternatively <a href="#maxplayersenabled(nullbool)">disable max Players</a>.
+    parameters:
+      - name: 'maxPlayersCount'
+        description: 'The number of max players to set.'
+        type: 'Integer'
+        attribute:
+          - 'nullable'
+    returns: 'This Builder after the max player count has been set. Useful for chaining.'
+  - name: 'maxPlayersEnabled'
+    description: |
+      Sets whether the max players feature should be enabled.<br>
+      <br>
+      Set to <a href="../../../objects/nullbool/#not_set"><code>NullBool.NOT_SET</code></a> to not set this.<br>
+      <br>
+      An <code>IllegalArgumentException</code> may be thrown by the <code>CheckUtil</code> should maxPlayersEnabled be null.
+    parameters:
+      - name: 'maxPlayersEnabled'
+        description: 'Whether the extra players feature should be enabled or not.'
+        type: 'NullBool'
+        attribute:
+          - 'notnull'
+    returns: 'This Builder after the NullBool has been set. Useful for chaining.'
+    throws:
+      - name: 'IllegalArgumentException'
+        description: 'Thrown by the <code>CheckUtil</code> in case <code>null</code> has been provided as parameter.'
+  - name: 'motd'
     description: |
       Sets a new MOTD to use.<br>
       <br>
       Set to an empty list to not change the MOTD.<br>
-      Only the first two entries of the list will be considered and any additional ones discarded.
-    returns: 'This Builder after the motd has been set. Useful for chaining.'
+      Only the first two entries of the list will be considered and any additional ones discarded.<br>
+      <br>
+      An <code>IllegalArgumentException</code> may be thrown by the <code>CheckUtil</code> should the provided motd list be null.
     parameters:
       - name: 'motd'
         description: 'The MOTD to use.'
         type: 'List<String>'
-        attributes:
-          - notnull
+        attribute:
+          - 'notnull'
+    returns: 'This Builder after the motd has been set. Useful for chaining.'
     throws:
       - name: 'IllegalArgumentException'
         description: 'Thrown by the <code>CheckUtil</code> in case <code>null</code> has been provided as parameter.'
-    type:
-      name: 'Builder'
-      type: 'object'
-  - name: 'setPlayers'
-    description: |
-      Sets the players (lines) to use for the hover.<br>
-      <br>
-      Set to an empty list to not change the hover text.
-    returns: 'This Builder after the players have been set. Useful for chaining.'
-    parameters:
-      - name: 'players'
-        description: 'The lines to set for the hover.'
-        type: 'List<String>'
-        attributes:
-          - notnull
-    throws:
-      - name: 'IllegalArgumentException'
-        description: 'Thrown by the <code>CheckUtil</code> in case <code>null</code> has been provided as parameter.'
-    type:
-      name: 'Builder'
-      type: 'object'
-  - name: 'setPlayerCountText'
+  - name: 'playerCountText'
     description: |
       Sets the text to override the player count with.<br>
       <br>
       Set to an empty String or <code>null</code> to not alter the player count text.
-    returns: 'This Builder after the player count text has been set. Useful for chaining.'
     parameters:
       - name: 'playerCountText'
         description: 'The text to show in the player count.'
-        type: String
-        attributes:
+        type: 'String'
+        attribute:
+          - 'nullable'
+    returns: 'This Builder after the player count text has been set. Useful for chaining.'
+  - name: 'players'
+    description: |
+      Sets the players (lines) to use for the hover.<br>
+      <br>
+      Set to an empty list to not change the hover text.
+      <br>
+      An <code>IllegalArgumentException</code> may be thrown by the <code>CheckUtil</code> should the provided okayersmotd list be null.
+    parameters:
+      - name: 'players'
+        description: 'The lines to set for the hover.'
+        type: 'List<String>'
+        attribute:
+          - 'notnull'
+    returns: 'This Builder after the players have been set. Useful for chaining.'
+    throws:
+      - name: 'IllegalArgumentException'
+        description: 'Thrown by the <code>CheckUtil</code> in case <code>null</code> has been provided as parameter.'
+  - name: 'build'
+    description: 'Creates a new <a href="./.."><code>ProfileEntry</code> instance</a> with the values set in this Builder.'
+    returns: 'New <a href="./.."><code>ProfileEntry</code> instance</a>.'
+    type:
+      name: 'ProfileEntry'
+      type: 'object'
+      link: './..'
+  #
+  # Deprecated stuff
+  #
+  - name: 'setExtraPlayerCount'
+    description: |
+      Sets the number of players to add to the online players to use as the new max players value.<br>
+      This option has no effect when <a href="../#extraplayersenabled()"><code>extraPlayersEnabled</code></a> is set to <a href="../../objects/nullbool/#false"><code>NullBool.FALSE</code></a> or <a href="../../objects/nullbool/#not_set"><code>NullBool.NOT_SET</code></a>.<br>
+      <br>
+      Set this to <code>null</code> to not alter the max player count. Alternatively, set <a href="#setextraplayersenabled(nullbool)"><code>setExtraPlayersEnabled(NullBool)</code></a> to <a href="../../objects/nullbool/#false"><code>NullBool.FALSE</code></a>.
+    returns: 'This Builder after the extra player count has been set. Useful for chaining.'
+    parameters:
+      - name: 'extraPlayersCount'
+        description: 'The number of extra players to add.'
+        type: Integer
+        attribute:
           - nullable
+    deprecated: 'Typo in the name. Use <a href="#setextraplayerscount(integer)">setExtraPlayersCount(Integer)</a> instead.'
+    type:
+      name: 'Builder'
+      type: 'object'
+  - name: 'setExtraPlayersCount'
+    description: |
+      Sets the number of players to add to the online players to use as the new max players value.<br>
+      This option has no effect when <a href="../#extraplayersenabled()"><code>extraPlayersEnabled</code></a> is set to <a href="../../objects/nullbool/#false"><code>NullBool.FALSE</code></a> or <a href="../../objects/nullbool/#not_set"><code>NullBool.NOT_SET</code></a>.<br>
+      <br>
+      Set this to <code>null</code> to not alter the max player count. Alternatively, set <a href="#setextraplayersenabled(nullbool)"><code>setExtraPlayersEnabled(NullBool)</code></a> to <a href="../../objects/nullbool/#false"><code>NullBool.FALSE</code></a>.
+    returns: 'This Builder after the extra player count has been set. Useful for chaining.'
+    parameters:
+      - name: 'extraPlayersCount'
+        description: 'The number of extra players to add.'
+        type: Integer
+        attribute:
+          - nullable
+    deprecated: 'Method renamed to fit <a href="..">ProfileEntry</a> record more closely. Use <a href="#extraplayerscount(integer)">extraPlayersCount(Integer)</a> instead.'
+    type:
+      name: 'Builder'
+      type: 'object'
+  - name: 'setExtraPlayersEnabled'
+    description: |
+      Sets whether the extra players feature should be enabled or not.<br>
+      <br>
+      Set to <a href="../../objects/nullbool/#not_set"><code>NullBool.NOT_SET</code></a> to not set this.
+    returns: 'This Builder after the NullBool has been set. Useful for chaining.'
+    parameters:
+      - name: 'extraPlayersEnabled'
+        description: 'Whether the extra players feature should be enabled or not.'
+        type: NullBool
+        attribute:
+          - notnull
+    deprecated: 'Method renamed to fit <a href="..">ProfileEntry</a> record more closely. Use <a href="#extraplayersenabled(nullbool)">extraPlayersEnabled(NullBool)</a> instead.'
+    throws:
+      - name: 'IllegalArgumentException'
+        description: 'Thrown by the <code>CheckUtil</code> in case <code>null</code> has been provided as parameter.'
     type:
       name: 'Builder'
       type: 'object'
@@ -71,8 +225,9 @@ methods:
       - name: 'favicon'
         description: 'The favicon to set'
         type: String
-        attributes:
+        attribute:
           - nullable
+    deprecated: 'Method renamed to fit <a href="..">ProfileEntry</a> record more closely. Use <a href="#favicon(string)">favicon(String)</a> instead.'
     type:
       name: 'Builder'
       type: 'object'
@@ -86,55 +241,106 @@ methods:
       - name: 'hidePlayersEnabled'
         description: 'Whether the player count should be hidden or not.'
         type: NullBool
-        attributes:
+        attribute:
           - notnull
+    deprecated: 'Method renamed to fit <a href="..">ProfileEntry</a> record more closely. Use <a href="#hideplayersenabled(nullbool)">hidePlayersEnabled(NullBool)</a> instead.'
     throws:
       - name: 'IllegalArgumentException'
         description: 'Thrown by the <code>CheckUtil</code> in case <code>null</code> has been provided as parameter.'
     type:
       name: 'Builder'
       type: 'object'
-  - name: 'setExtraPlayersEnabled'
+  - name: 'setMaxPlayersCount'
     description: |
-      Sets whether the extra players feature should be enabled or not.<br>
+      Sets the number of max players allowed to join this server.<br>
+      This option has no effect when <a href="../#maxplayersenabled()"><code>maxPlayersEnabled</code></a> is set to <a href="../../objects/nullbool/#false"><code>NullBool.FALSE</code></a> or <a href="../../objects/nullbool/#not_set"><code>NullBool.NOT_SET</code></a>.<br>
+      <br>
+      Set this to <code>null</code> to not alter the max player count. Alternatively, set <a href="#setmaxplayersenabled(nullbool)"><code>setMaxPlayersEnabled(NullBool)</code></a> to <a href="../../objects/nullbool/#false"><code>NullBool.FALSE</code></a>.
+    returns: 'This Builder after the extra player count has been set. Useful for chaining.'
+    parameters:
+      - name: 'maxPlayersCount'
+        description: 'The number of max players to set.'
+        type: Integer
+        attribute:
+          - nullable
+    deprecated: 'Method renamed to fit <a href="..">ProfileEntry</a> record more closely. Use <a href="#maxplayerscount(integer)">maxPlayersCount(Integer)</a> instead.'
+    type:
+      name: 'Builder'
+      type: 'object'
+  - name: 'setMaxPlayersEnabled'
+    description: |
+      Sets whether the max players feature should be enabled.<br>
       <br>
       Set to <a href="../../objects/nullbool/#not_set"><code>NullBool.NOT_SET</code></a> to not set this.
     returns: 'This Builder after the NullBool has been set. Useful for chaining.'
     parameters:
-      - name: 'extraPlayersEnabled'
+      - name: 'maxPlayersEnabled'
         description: 'Whether the extra players feature should be enabled or not.'
         type: NullBool
-        attributes:
+        attribute:
           - notnull
+    deprecated: 'Method renamed to fit <a href="..">ProfileEntry</a> record more closely. Use <a href="#maxplayersenabled(nullbool)">maxPlayersEnabled(NullBool)</a> instead.'
     throws:
       - name: 'IllegalArgumentException'
         description: 'Thrown by the <code>CheckUtil</code> in case <code>null</code> has been provided as parameter.'
     type:
       name: 'Builder'
       type: 'object'
-  - name: 'setExtraPlayers'
+  - name: 'setMotd'
     description: |
-      Sets the number of players to add to the online players to use as the new max players value.<br>
-      This option has no effect when <a href="../#extraplayersenabled()"><code>extraPlayersEnabled()</code></a> is set to <a href="../../objects/nullbool/#false"><code>NullBool.FALSE</code></a>.<br>
+      Sets a new MOTD to use.<br>
       <br>
-      Set this to <code>null</code> to not alter the max player count. Alternatively, set <a href="#setextraplayersenabled(nullbool)"><code>setExtraPlayersEnabled(NullBool)</code></a> to <a href="../../objects/nullbool/#false"><code>NullBool.FALSE</code></a>.
-    returns: 'This Builder after the extra player count has been set. Useful for chaining.'
+      Set to an empty list to not change the MOTD.<br>
+      Only the first two entries of the list will be considered and any additional ones discarded.
+    returns: 'This Builder after the motd has been set. Useful for chaining.'
     parameters:
-      - name: 'extraPlayersCount'
-        description: 'The number of extra players to use.'
-        type: Integer
-        attributes:
-          - nullable
+      - name: 'motd'
+        description: 'The MOTD to use.'
+        type: 'List<String>'
+        attribute:
+          - notnull
+    deprecated: 'Method renamed to fit <a href="..">ProfileEntry</a> record more closely. Use <a href="#motd(string)">motd(String)</a> instead.'
+    throws:
+      - name: 'IllegalArgumentException'
+        description: 'Thrown by the <code>CheckUtil</code> in case <code>null</code> has been provided as parameter.'
     type:
       name: 'Builder'
       type: 'object'
-  - name: 'build'
-    description: 'Creates a new <a href="./.."><code>ProfileEntry</code> instance</a> with the values set in this Builder.'
-    returns: 'New <a href="./.."><code>ProfileEntry</code> instance</a>.'
+  - name: 'setPlayerCountText'
+    description: |
+      Sets the text to override the player count with.<br>
+      <br>
+      Set to an empty String or <code>null</code> to not alter the player count text.
+    returns: 'This Builder after the player count text has been set. Useful for chaining.'
+    parameters:
+      - name: 'playerCountText'
+        description: 'The text to show in the player count.'
+        type: String
+        attribute:
+          - nullable
+    deprecated: 'Method renamed to fit <a href="..">ProfileEntry</a> record more closely. Use <a href="#playercounttext(string)">playerCountText(String)</a> instead.'
     type:
-      name: 'ProfileEntry'
+      name: 'Builder'
+      type: 'object'
+  - name: 'setPlayers'
+    description: |
+      Sets the players (lines) to use for the hover.<br>
+      <br>
+      Set to an empty list to not change the hover text.
+    returns: 'This Builder after the players have been set. Useful for chaining.'
+    parameters:
+      - name: 'players'
+        description: 'The lines to set for the hover.'
+        type: 'List<String>'
+        attribute:
+          - notnull
+    deprecated: 'Method renamed to fit <a href="..">ProfileEntry</a> record more closely. Use <a href="#players(list<string>)">players(List&lt;String&gt;)</a> instead.'
+    throws:
+      - name: 'IllegalArgumentException'
+        description: 'Thrown by the <code>CheckUtil</code> in case <code>null</code> has been provided as parameter.'
+    type:
+      name: 'Builder'
       type: 'object'
-      link: './..'
 ---
 
 # <api__class></api__class> Builder

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

@@ -37,11 +37,21 @@ constructors:
         type: NullBool
         attributes:
           - notnull
+      - name: 'maxPlayersEnabled'
+        description: 'Whether the max players option should be enabled.'
+        type: NullBool
+        attributes:
+          - notnull
       - name: 'extraPlayersCount'
         description: 'The number to add to the online players for the max players number.'
         type: Integer
         attributes:
           - nullable
+      - name: 'maxPlayersCount'
+        description: 'The number to use for the max players count.'
+        type: Integer
+        attributes:
+          - nullable
     seealso:
       - name: 'ProfileEntry.Builder'
         link: './builder/'
@@ -61,9 +71,11 @@ methods:
         <li><a href="#players()"><code>players</code></a>: Empty List</li>
         <li><a href="#playercounttext()"><code>playerCountText</code></a>: Empty String</li>
         <li><a href="#favicon()"><code>favicon</code></a>: Empty String</li>
-        <li><a href="#hideplayersenabled()"><code>hidePlayersEnabled</code></a>: <a href="../../objects/nullbool/"><code>NullBool.NOT_SET</code></a></li>
-        <li><a href="#extraplayersenabled()"><code>extraPlayersEnabled</code></a>: <a href="../../objects/nullbool/"><code>NullBool.NOT_SET</code></a></li>
+        <li><a href="#hideplayersenabled()"><code>hidePlayersEnabled</code></a>: <a href="../../objects/nullbool/#not_set"><code>NullBool.NOT_SET</code></a></li>
+        <li><a href="#extraplayersenabled()"><code>extraPlayersEnabled</code></a>: <a href="../../objects/nullbool/#not_set"><code>NullBool.NOT_SET</code></a></li>
+        <li><a href="#maxplayersenabled()"><code>maxPlayersEnabled</code></a>: <a href="../../objects/nullbool/#not_set"><code>NullBoo.NOT_SET</code></a></li>
         <li><a href="#extraplayerscount()"><code>extraPlayersCount</code></a>: <code>null</code></li>
+        <li><a href="#maxplayerscount()"><code>maxPlayersCount</code></a>: <code>null</code></li>
       </ul>
     returns: 'New ProfileEntry instance with empty/null values defined'
     attributes:
@@ -142,6 +154,15 @@ methods:
       name: 'NullBool'
       type: 'object'
       link: '../../objects/nullbool/'
+  - name: 'maxPlayersEnabled'
+    description: |
+      Whether the max players feature should be used or not.<br>
+      To get the actual boolean value, append <a href="../../objects/nullbool/#getordefault()"><code>getOrDefault(boolean)</code></a>.
+    returns: 'Whether the max players feature should be used or not.'
+    type:
+      name: 'NullBool'
+      type: 'object'
+      link: '../../objects/nullbool/'
   - name: 'extraPlayersCount'
     description: 'Gets the currently set number of extra players to use by this ProfileEntry. May be <code>null</code>.'
     returns: 'Possibly-null integer number of extra players used by this ProfileEntry.'
@@ -150,6 +171,14 @@ methods:
     type:
       name: 'Integer'
       type: 'object'
+  - name: 'maxPlayersCount'
+    description: 'Gets the currently set number of max players of this ProfileEntry.'
+    returns: 'The current number of max players used by this ProfileEntry.'
+    attributes:
+      - nullable
+    type:
+      name: 'Integer'
+      type: 'object'
   - name: 'isInvalid'
     description: |
       Whether this ProfileEntry is considered invalid or not.<br>

docs/api/reference/platform-bukkit/.pages.yml

@@ -1,3 +0,0 @@
-nav:
-  - index.md
-  - ch.andre601.advancedserverlist.api.bukkit: ch.andre601.advancedserverlist.api.bukkit

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

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

docs/api/reference/platform-bungeecord/.pages.yml

@@ -1,3 +0,0 @@
-nav:
-  - index.md
-  - ch.andre601.advancedserverlist.api.bungeecord: ch.andre601.advancedserverlist.api.bungeecord

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

@@ -0,0 +1,35 @@
+---
+template: api-doc.html
+
+constructors:
+  - name: 'PostServerListSetEvent'
+    description: 'Constructor for creating a new PostServerListSetEvent instance.'
+    parameters:
+      - name: 'entry'
+        description: 'The <a href="../../../../api/ch.andre601.advancedserverlist.api/profiles/profileentry/"><code>ProfileEntry</code></a> used during the PingEvent.'
+        type: ProfileEntry
+        attribute:
+          - nullable
+
+methods:
+  - name: 'getEntry'
+    description: |
+      The <a href="../../../../api/ch.andre601.advancedserverlist.api/profiles/profileentry/"><code>ProfileEntry</code></a> that was used during the PingEvent handling.<br>
+      <br>
+      The returned value may be <code>null</code> should the PingEvent handling be cancelled at any point (i.e. due to an invalid protocol or because the <a href="../preserverlistsetevent/"><code>PreServerListSetEvent</code></a> has been cancelled).<br>
+      The values within the ProfileEntry also do not represent what is actually used within the Server list itself, but only the values provided for the PingEvent handling.
+    returns: 'Possibly-null ProfileEntry used for the PingEvent.'
+    attributes:
+      - nullable
+    type:
+      name: 'ProfileEntry'
+      type: 'object'
+      link: '../../../../api/ch.andre601.advancedserverlist.api/profiles/profileentry/'
+---
+
+# <api__class></api__class> PostServerListSetEvent
+
+Called **after** the plugin has updated the Server List.
+
+The provided [`ProfileEntry`](#getentry()) may be null due to the PingEvent handling being cancelled (i.e. due to a invalid protocol or due to the [`PreServerListSetEvent`](preserverlistsetevent.md) being cancelled).  
+The entry also only represents the values used during the PingEvent, not the actual content that is being displayed.

docs/api/reference/platform-velocity/.pages.yml

@@ -1,3 +0,0 @@
-nav:
-  - index.md
-  - ch.andre601.advancedserverlist.api.velocity: ch.andre601.advancedserverlist.api.velocity

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

@@ -0,0 +1,35 @@
+---
+template: api-doc.html
+
+constructors:
+  - name: 'PostServerListSetEvent'
+    description: 'Constructor for creating a new PostServerListSetEvent instance.'
+    parameters:
+      - name: 'entry'
+        description: 'The <a href="../../../../api/ch.andre601.advancedserverlist.api/profiles/profileentry/"><code>ProfileEntry</code></a> used during the PingEvent.'
+        type: ProfileEntry
+        attribute:
+          - nullable
+
+methods:
+  - name: 'getEntry'
+    description: |
+      The <a href="../../../../api/ch.andre601.advancedserverlist.api/profiles/profileentry/"><code>ProfileEntry</code></a> that was used during the PingEvent handling.<br>
+      <br>
+      The returned value may be <code>null</code> should the PingEvent handling be cancelled at any point (i.e. due to an invalid protocol or because the <a href="../preserverlistsetevent/"><code>PreServerListSetEvent</code></a> has been cancelled).<br>
+      The values within the ProfileEntry also do not represent what is actually used within the Server list itself, but only the values provided for the PingEvent handling.
+    returns: 'Possibly-null ProfileEntry used for the PingEvent.'
+    attributes:
+      - nullable
+    type:
+      name: 'ProfileEntry'
+      type: 'object'
+      link: '../../../../api/ch.andre601.advancedserverlist.api/profiles/profileentry/'
+---
+
+# <api__class></api__class> PostServerListSetEvent
+
+Called **after** the plugin has updated the Server List.
+
+The provided [`ProfileEntry`](#getentry()) may be null due to the PingEvent handling being cancelled (i.e. due to a invalid protocol or due to the [`PreServerListSetEvent`](preserverlistsetevent.md) being cancelled).  
+The entry also only represents the values used during the PingEvent, not the actual content that is being displayed.

docs/api/reference/structure.md

@@ -5,6 +5,8 @@ The Reference docs follow a specific mixture of manually created and auto-genera
 A page may look something like this:
 ```markdown
 ---
+template: api-doc.html
+
 constructors:
   - name: 'Constructor'
     description: 'Creates a new instance of this class.'
@@ -25,7 +27,7 @@ An example class to show how the page structure may look like.
 ## custom HTML tags
 
 There is a collection of custom HTML tags that are used to render specific text in certain styles.  
-Below is a list of all custom tags. Note that these tags only render on the actual site and not within the repository.
+Below is a list of all custom tags. Note that these tags only render on the actual site and not within the repository when viewing the source.
 
 - `<api__class></api__class>`: <api__class></api__class>
 - `<api__interface></api__interface>`: <api__interface></api__interface>
@@ -36,16 +38,17 @@ Below is a list of all custom tags. Note that these tags only render on the actu
 - `<api__final></api__final>`: <api__final></api__final>
 - `<api__notnull></api__notnull>`: <api__notnull></api__notnull>
 - `<api__nullable></api__nullable>`: <api__nullable></api__nullable>
+- `<api__deprecated></api__deprecated>`: <api__deprecated></api__deprecated>
 
 In addition are there two classes used within `span` tags to colour the text, to indicate their type:
 
 - `<span class="api-type__object">Object</span>`: <span class="api-type__object">Object</span>
-- `<span class="api-type__primitive">Object</span>`: <span class="api-type__primitive">Primitive</span>
+- `<span class="api-type__primitive">primitive</span>`: <span class="api-type__primitive">primitive</span>
 
 ## Auto-generated content
 
-The page template used checks for specific YAML frontmatter in the page to include other templates.  
-These templates pull the data from the YAML frontmatter to generate the page content which is then appendet to the already existing page content.
+A page template is used to auto-generate the page content based on available YAML frontmatter.  
+Depending on the frontmatter available will the template call a jinja2 Macro to generate a Summary and Detailed info on the page for the respective frontmatter data.
 
 There are 5 frontmatter options, each following a specific structure:
 
@@ -67,10 +70,11 @@ constructors:
         type: '<string>'
         attributes:
           - '<string>'
+    deprecated: '<string>'
     throws:
       - name: '<string>'
         description: '<string>'
-    seealos:
+    seealso:
       - name: '<string>'
         link: '<string>'
 ```
@@ -84,6 +88,7 @@ constructors:
     - `description` - Description of the parameter.
     - `type` - The type this parameter is.
     - `attributes` - List of attributes (i.e. nullability) to display. The provided values will be turned into `<api__{name}></api__{name}>` tags that will be prependet to the parameter name.
+- `deprecated` - Adds a notice about the deprecation of this Constructor in the form of a deprecation label and a `deprecated` section with the provided `<string>` as explanation.
 - `throws` - List of possible throws to display.
     - `name` - Name of the throw to display.
     - `description` - Description of the throw.
@@ -115,6 +120,7 @@ enums:
   - name: '<string>'
     description: '<string>'
     type: '<string>'
+    deprecated: '<string>'
     seealso:
       - name: '<string>'
         link: '<string>'
@@ -122,9 +128,10 @@ enums:
 
 **Options:**
 
-- `name` - The name to display for the Constructor summary and detail. This should include any parameters the Constructor has, but without any parameter name.
-- `description` - The description to display for the Constructor.
+- `name` - The name to display for the Enum summary and detail. This should include any parameters the Enum has, but without any parameter name.
+- `description` - The description to display for the Enum.
 - `type` - The return type to display. Will default to `{{ page.title }}` if not set.
+- `deprecated` - Adds a notice about the deprecation of this Enum in the form of a deprecation label and a `deprecated` section with the provided `<string>` as explanation.
 - `seealso` - List of "See also" text to display.
     - `name` - Name of the See also link.
     - `link` - Link (Relative, absolute or URL) to use for the See also text.
@@ -148,6 +155,7 @@ methods:
         attributes:
           - '<string>'
     returns: '<string>'
+    deprecated: '<string>'
     throws:
       - name: '<string>'
         description: '<string>'
@@ -158,8 +166,8 @@ methods:
 
 **Options:**
 
-- `name` - The name to display for the Constructor summary and detail. This should include any parameters the Constructor has, but without any parameter name.
-- `description` - The description to display for the Constructor.
+- `name` - The name to display for the Method summary and detail. This should include any parameters the Method has, but without any parameter name.
+- `description` - The description to display for the Method.
 - `type` - Options for object type to display.
     - `name` - Displayed name of the object.
     - `type` - Object type. Can be either `object` or `primitive` which would be used in a class name for styling.
@@ -171,6 +179,7 @@ methods:
     - `type` - The type this parameter is.
     - `attributes` - List of attributes (i.e. nullability) to display. The provided values will be turned into `<api__{name}></api__{name}>` tags that will be prependet to the parameter name.
 - `returns` - Possible return values.
+- `deprecated` - Adds a notice about the deprecation of this Method in the form of a deprecation label and a `deprecated` section with the provided `<string>` as explanation.
 - `throws` - List of possible throws to display.
     - `name` - Name of the throw to display.
     - `description` - Description of the throw.

docs/api/source.md

@@ -0,0 +1,10 @@
+---
+template: redirect.html
+
+location: https://codeberg.org/Andre601/asl-api
+
+title: Source Code
+icon: simple/codeberg
+---
+
+<!-- Comment to trigger proper build -->