Update versions.txt 5.6 build 2883

Affects issues:
- Close #3631

.github/ISSUE_TEMPLATE/bug_report.md

@@ -12,9 +12,13 @@ labels: 'Bug'
 ### Exceptions & Other Logs
 <!-- If reporting an Exception, please provide the error log from /plugins/Plan/logs, it has context in it -->
 
-```
-Place log contents here
+<!-- Paste log contents inside the backticks below -->
 ```
 
+```
+
+### Plugin versions
+<!-- Versions of Plan and any other related plugins -->
+
 ### Additional information
-<!-- Any additional information, plugin versions, context, what was attempted, etc -->
+<!-- Any additional information, context, what was attempted, etc -->

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,28 +0,0 @@
-name: Bug report
-description: Create a report to help improve the plugin
-labels: [Bug]
-body:
-- type: markdown
-  attributes:
-    value: |
-      > Before opening a bug report:
-      > - Make sure that you're running [the latest version](https://github.com/plan-player-analytics/Plan/releases/latest).
-- type: textarea
-  attributes:
-    label: Describe the issue
-    description: A clear and concise description of what the issue is, and when it occurred. Post possible exceptions further down below.
-  validations:
-      required: true
-- type: textarea
-  attributes:
-    label: Exceptions & other logs
-    description: Paste all relevant log files here. Attach files if necessary.
-    render: text
-- type: textarea
-  attributes:
-    label: Plugin versions
-    description: Write versions of any relevant plugins or software in this section
-- type: textarea
-  attributes:
-    label: Additional information
-    description: Any additional information goes here (relevant parts of Plan config, what you attempted, etc).

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,7 @@
+contact_links:  
+  - name: Question
+    url: https://github.com/plan-player-analytics/Plan/discussions/new
+    about: Ask a question about the plugin on the Discussions forum
+  - name: Installation help
+    url: https://discordapp.com/invite/yXKmjzT
+    about: Get help for installations on Discord

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,10 +0,0 @@
----
-name: Suggestion
-about: Feature request or an addition
----
-
-### Is your feature request related to a problem? Please describe.
-<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
-
-### I would like to be able to..
-<!-- A clear and concise description of what you want to happen. -->

.github/ISSUE_TEMPLATE/plugin_request.md

@@ -1,16 +0,0 @@
----
-name: Plugin Suggestion
-about: Suggest data from another plugin for Plan
-labels: 'New Data, DataExtensions, Help Wanted'
-
----
-
-### Data to display
-<!-- List any data you would like to see from the plugin -->
-
-### Plugin information
-
-<!-- Required -->
-**API or Source Code:** [Link](URL HERE)  
-<!-- Required -->
-**Project page or Downloads:** [Link](URL HERE)

.github/ISSUE_TEMPLATE/question.md

@@ -1,12 +0,0 @@
----
-name: Question
-about: Ask a Question about the plugin, see 'Possible Pitfalls' under Projects before asking your question.
-labels: 'Question'
-
----
-
-<!-- Remove this comment and write your question here -->
-
-
-### Additional context
-<!-- Any additional information to understand the question better -->

.github/ISSUE_TEMPLATE/question.yml

@@ -1,20 +0,0 @@
-name: Question
-description: Ask a Question about the plugin
-labels: [Question]
-body:
-- type: markdown
-  attributes:
-    value: |
-      > Before opening a question:
-      > - See if [the wiki](https://github.com/plan-player-analytics/Plan/wiki#tutorials) has an answer to your question
-      > - See if [the question has been answered](https://github.com/plan-player-analytics/Plan/projects/4)
-- type: textarea
-  attributes:
-    label: Question
-    description: Write your question here
-  validations:
-      required: true
-- type: textarea
-  attributes:
-    label: Additional context
-    description: Any additional information to understand the question better

.github/ISSUE_TEMPLATE/security_vuln.md

@@ -1,22 +0,0 @@
----
-name: Security Vulnerability
-about: Create a report to help improving the plugin
-labels: 'Security Vulnerability'
-
----
-
-### Vulnerability description
-<!-- A clear and concise description of what the issue is. Post possible exceptions further down below -->
-
-
-### Steps to reproduce
-
-1. Set these config settings..
-2. Open `<plan address>/`
-3. ...
-
-### Server information
-
-
-### Additional information
-<!-- Any additional information -->

.github/dependabot.yml

@@ -3,9 +3,13 @@ updates:
 - package-ecosystem: gradle
   directory: "/Plan"
   schedule:
-    interval: daily
+    interval: weekly
+    day: friday
   open-pull-requests-limit: 99
   ignore:
+  - dependency-name: net.fabricmc:fabric-loader
+    versions:
+    - ">=0, < 2"
   - dependency-name: com.djrapitops:Extension-ProtocolSupport
     versions:
     - ">= 4.a, < 5"
@@ -15,3 +19,9 @@ updates:
   - dependency-name: com.h2database:h2
     versions:
     - "> 1.4.199"
+- package-ecosystem: npm
+  directory: "/Plan/react/dashboard"
+  schedule:
+    interval: weekly
+    day: friday
+  open-pull-requests-limit: 99

.github/workflows/ci.yml

@@ -0,0 +1,124 @@
+
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    name: Test, Build & Upload
+
+    runs-on: ubuntu-latest
+
+    services:
+      mariadb:
+        image: mariadb:11.1-rc
+        ports:
+          - 3306
+        env:
+          MYSQL_USER: user
+          MYSQL_PASSWORD: password
+          MYSQL_DATABASE: test
+          MYSQL_ROOT_PASSWORD: password
+        options: --health-cmd="mariadb-admin ping" --health-interval=5s --health-timeout=2s --health-retries=3
+
+    steps:
+      - name: 📥 Checkout git repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: ☕ Setup JDK
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'adopt'
+          java-version: '21'
+      - name: 💼 Load Gradle Cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: 🛠 Build jars 
+        run: |
+          cd Plan
+          ./gradlew shadowJar
+      - name: ⚙ Get versions
+        run: |
+          cd Plan
+          ./gradlew snapshotVersion jarNameVersion
+          git_hash=$(git rev-parse --short "$GITHUB_SHA")
+          echo "git_hash=$git_hash" >> $GITHUB_ENV
+          echo "snapshotVersion=$(cat build/versions/snapshot.txt)" >> $GITHUB_ENV
+          echo "versionString=$(cat build/versions/jar.txt)" >> $GITHUB_ENV
+          echo "artifactPath=$(pwd)/builds" >> $GITHUB_ENV
+      - name: 📤 Upload Plan.jar 
+        uses: actions/upload-artifact@v4
+        with:
+          name: Plan-${{ env.versionString }}-${{ env.git_hash }}.jar
+          path: ${{ env.artifactPath }}/Plan-${{ env.snapshotVersion }}.jar
+      - name: 📤 Upload PlanFabric.jar 
+        uses: actions/upload-artifact@v4
+        with:
+          name: PlanFabric-${{ env.versionString }}-${{ env.git_hash }}.jar
+          path: ${{ env.artifactPath }}/PlanFabric-${{ env.snapshotVersion }}.jar
+      - name: 🚦 Setup Selenium Webdriver
+        uses: nanasess/setup-chromedriver@v2
+      - name: 🚦 Setup Selenium Webdriver settings
+        run: |
+          export DISPLAY=:99
+          chromedriver --url-base=/wd/hub &
+          sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
+      - name: 📶 Verify MariaDB connection 
+        env:
+          PORT: ${{ job.services.mariadb.ports[3306] }}
+        run: |
+          while ! mysqladmin ping -h"127.0.0.1" -P"$PORT" --silent; do
+            sleep 1
+          done
+      - name: 🩺 Test 
+        env:
+          MYSQL_DB: test
+          MYSQL_USER: user
+          MYSQL_PASS: password
+          MYSQL_PORT: ${{ job.services.mariadb.ports[3306] }}
+          CHROMEDRIVER: /usr/local/bin/chromedriver
+        run: |
+          cd Plan
+          ./gradlew build
+      - name: 🖨 Build Javadocs
+        run: |
+          cd Plan
+          echo "Building javadocs with gradle"
+          ./gradlew aggregateJavadocs
+          echo "Moving to working directory:"
+          cd ../
+          mkdir javadocs
+          mkdir javadocs/all
+          mkdir javadocs/api
+          cp -r Plan/build/docs/javadoc/* javadocs/all/
+          cp -r Plan/api/build/docs/javadoc/* javadocs/api/
+          cp scripts/index.html javadocs/index.html
+          cd javadocs
+          touch .nojekyll
+      - name: 📤 Deploy Javadocs 
+        if: github.ref == 'refs/heads/master'
+        uses: JamesIves/github-pages-deploy-action@v4
+        with:
+          branch: gh-pages # The branch the action should deploy to.
+          folder: javadocs # The folder the action should deploy.
+      - name: 🩺 SonarCloud - Java
+        if: "${{ env.SONAR_TOKEN != '' }}"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        run: |
+          cd Plan
+          ./gradlew sonar -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=player-analytics-plan
+      - name: 🩺 SonarCloud - React
+        if: "${{ env.SONAR_TOKEN != '' }}"
+        uses: SonarSource/sonarcloud-github-action@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/curseforge-upload.yml

@@ -1,56 +0,0 @@
-name: Upload artifact to CurseForge
-
-on:
-  release:
-    types: [ published ]
-
-jobs:
-  upload_release:
-    if: ${{ github.event.release.prerelease == false }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download release artifact for upload
-        run: |
-          curl 'https://api.github.com/repos/plan-player-analytics/plan/releases/${{ github.event.release.id }}/assets' | jq -r '.[] | {name: .name, url: .browser_download_url} | select(.url | strings | test("Fabric"))' > asset.txt
-          jq -r '.url' asset.txt > url.txt
-          jq -r '.name' asset.txt > name.txt
-          wget -i url.txt
-          echo "JAR_FILENAME=$(cat name.txt)" >> $GITHUB_ENV
-      - name: Upload release to CurseForge 🚀
-        uses: itsmeow/curseforge-upload@master
-        with:
-          token: ${{ secrets.CF_API_TOKEN }}
-          project_id: 508727
-          game_endpoint: minecraft
-          file_path: ${{ env.JAR_FILENAME }}
-          changelog: ${{ github.event.release.body }}
-          changelog_type: markdown
-          display_name: ${{ github.event.release.name }}
-          game_versions: "2:Java 16,2:Java 17,73242:1.17,73242:1.17.1,Fabric,73250:1.18,73250:1.18.1"
-          release_type: release
-          relations: fabric-api:requiredDependency,luckperms:optionalDependency
-
-  upload_prerelease:
-    if: ${{ github.event.release.prerelease == true }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download release artifact for upload
-        run: |
-          curl 'https://api.github.com/repos/plan-player-analytics/plan/releases/${{ github.event.release.id }}/assets' | jq -r '.[] | {name: .name, url: .browser_download_url} | select(.url | strings | test("Fabric"))' > asset.txt
-          jq -r '.url' asset.txt > url.txt
-          jq -r '.name' asset.txt > name.txt
-          wget -i url.txt
-          echo "JAR_FILENAME=$(cat name.txt)" >> $GITHUB_ENV
-      - name: Upload prerelease to CurseForge 🚀
-        uses: itsmeow/curseforge-upload@master
-        with:
-          token: ${{ secrets.CF_API_TOKEN }}
-          project_id: 508727
-          game_endpoint: minecraft
-          file_path: ${{ env.JAR_FILENAME }}
-          changelog: ${{ github.event.release.body }}
-          changelog_type: markdown
-          display_name: ${{ github.event.release.name }}
-          game_versions: "2:Java 16,2:Java 17,73242:1.17,73242:1.17.1,Fabric,73250:1.18,73250:1.18.1"
-          release_type: beta
-          relations: fabric-api:requiredDependency,luckperms:optionalDependency

.github/workflows/gradle-pr.yml

@@ -1,68 +0,0 @@
-
-name: Java PR CI
-
-on: [pull_request]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    services:
-      mariadb:
-        image: mariadb:latest
-        ports:
-          - 3306
-        env:
-          MYSQL_USER: user
-          MYSQL_PASSWORD: password
-          MYSQL_DATABASE: test
-          MYSQL_ROOT_PASSWORD: password
-        options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 1.16
-        uses: actions/setup-java@v2
-        with:
-          distribution: 'adopt'
-          java-version: '16'
-      - name: Setup Selenium Webdriver
-        uses: nanasess/setup-chromedriver@v1
-      - name: Setup Selenium Webdriver settings
-        run: |
-          export DISPLAY=:99
-          chromedriver --url-base=/wd/hub &
-          sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
-      - name: Verify MariaDB connection
-        env:
-          PORT: ${{ job.services.mariadb.ports[3306] }}
-        run: |
-          while ! mysqladmin ping -h"127.0.0.1" -P"$PORT" --silent; do
-            sleep 1
-          done
-      - name: Cache Gradle packages
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-      - name: Build with Gradle
-        env:
-          MYSQL_DB: test
-          MYSQL_USER: user
-          MYSQL_PASS: password
-          MYSQL_PORT: ${{ job.services.mariadb.ports[3306] }}
-          CHROMEDRIVER: /usr/local/bin/chromedriver
-        run: |
-          cd Plan
-          ./gradlew build
-      - name: Cleanup Gradle cache
-        # Remove some files from the Gradle cache, so they aren't cached by GitHub Actions.
-        # Restoring these files from a GitHub Actions cache might cause problems for future builds.
-        run: |
-          rm -f ~/.gradle/caches/modules-2/modules-2.lock
-          rm -f ~/.gradle/caches/modules-2/gc.properties

.github/workflows/gradle.yml

@@ -1,71 +0,0 @@
-
-name: Java CI
-
-on: [push]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    services:
-      mariadb:
-        image: mariadb:latest
-        ports:
-          - 3306
-        env:
-          MYSQL_USER: user
-          MYSQL_PASSWORD: password
-          MYSQL_DATABASE: test
-          MYSQL_ROOT_PASSWORD: password
-        options: --health-cmd="mysqladmin ping" --health-interval=5s --health-timeout=2s --health-retries=3
-
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Set up JDK 1.16
-        uses: actions/setup-java@v2
-        with:
-          distribution: 'adopt'
-          java-version: '16'
-      - name: Setup Selenium Webdriver
-        uses: nanasess/setup-chromedriver@v1
-      - name: Setup Selenium Webdriver settings
-        run: |
-          export DISPLAY=:99
-          chromedriver --url-base=/wd/hub &
-          sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
-      - name: Verify MariaDB connection
-        env:
-          PORT: ${{ job.services.mariadb.ports[3306] }}
-        run: |
-          while ! mysqladmin ping -h"127.0.0.1" -P"$PORT" --silent; do
-            sleep 1
-          done
-      - name: Cache Gradle packages
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-      - name: Build with Gradle
-        env:
-          MYSQL_DB: test
-          MYSQL_USER: user
-          MYSQL_PASS: password
-          MYSQL_PORT: ${{ job.services.mariadb.ports[3306] }}
-          CHROMEDRIVER: /usr/local/bin/chromedriver
-        run: |
-          cd Plan
-          ./gradlew build
-      - name: SonarCloud
-        run: |
-          cd Plan
-          ./gradlew sonar -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=player-analytics-plan
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/html.yml

@@ -1,30 +0,0 @@
-# This workflow will build a Java project with Gradle
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
-
-name: Update html-branch
-
-on:
-  release:
-    types: [ published  ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout 🛎️
-        uses: actions/checkout@v2.3.1
-      - name: Get git TAG
-        id: tagName
-        uses: olegtarasov/get-tag@v2.1
-      - name: Copy assets 🔧 
-        run: |
-          mkdir -p workingdir/Plan/src/main/resources/assets/plan
-          cp -r Plan/common/src/main/resources/assets/plan workingdir/Plan/src/main/resources/assets/plan
-      - name: Deploy 🚀
-        uses: JamesIves/github-pages-deploy-action@4.0.0
-        with:
-          branch: html # The branch the action should deploy to.
-          folder: workingdir # The folder the action should deploy.
-          commit-message: ${{ steps.tagName.outputs.tag }}

.github/workflows/issues.yml

@@ -0,0 +1,28 @@
+name: Issue Automation
+on:
+  issues:
+    types:
+      - opened
+
+# map fields with customized labels
+env:
+  inbox: INBOX
+  refinement: Needs Refinement
+  refined: Refined & Actionable
+  assigned: Assigned to Milestone
+  done: Done
+
+jobs:
+  issue_opened:
+    name: New Issue Opened
+    runs-on: ubuntu-latest
+    if: github.event_name == 'issues' && github.event.action == 'opened'
+    steps:
+      - name: Add issue to ${{ env.inbox }}
+        uses: leonsteinhaeuser/project-beta-automations@v1.2.1
+        with:
+          gh_token: ${{ secrets.GITHUB_TOKEN }}
+          organization: plan-player-analytics
+          project_id: 3
+          resource_node_id: ${{ github.event.issue.node_id }}
+          status_value: ${{ env.inbox }} # Target status

.github/workflows/javadocs.yml

@@ -1,47 +0,0 @@
-# This workflow will build a Java project with Gradle
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
-
-name: Automatically Deploy Javadocs
-
-on:
-  push:
-    branches: [ master ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-    
-    steps:
-      - name: Checkout 🛎️
-        uses: actions/checkout@v2.3.1
-
-      - name: Set up JDK 1.16 🍵
-        uses: actions/setup-java@v2
-        with:
-          distribution: 'adopt'
-          java-version: '16'
-      - name: Build Javadocs 🔧 
-        run: |
-          cd Plan
-          echo "Building javadocs with gradle"
-          ./gradlew aggregateJavadocs
-          echo "Moving to working directory:"
-          cd ../
-          mkdir javadocs
-          mkdir javadocs/all
-          mkdir javadocs/api
-          cp -r Plan/build/docs/javadoc/* javadocs/all/
-          cp -r Plan/api/build/docs/javadoc/* javadocs/api/
-          cp scripts/index.html javadocs/index.html
-          cd javadocs
-          touch .nojekyll
-
-      - name: Deploy 🚀
-        uses: JamesIves/github-pages-deploy-action@4.1.4
-        with:
-          branch: gh-pages # The branch the action should deploy to.
-          folder: javadocs # The folder the action should deploy.
-    
-          
-  

.github/workflows/on-release.yml

@@ -0,0 +1,138 @@
+name: Release
+
+on:
+  release:
+    types: [ published ]
+
+jobs:
+  update_versions_txt:
+    name: Update versions.txt
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout 🛎️
+        uses: actions/checkout@v3
+      - name: Get Download URL
+        run: |
+          curl 'https://api.github.com/repos/plan-player-analytics/plan/releases/${{ github.event.release.id }}/assets' | jq -r '.[] | {name: .name, url: .browser_download_url} | select(.url | strings | test("Fabric") | not)' > asset.txt
+          jq -r '.url' asset.txt > url.txt
+          echo "RELEASE_DOWNLOAD_URL=$(cat url.txt)" >> $GITHUB_ENV
+      - name: Write REL release line
+        if: ${{ github.event.release.prerelease == false }}
+        run: |
+          echo "REL|${{ github.event.release.tag_name }}|${{ env.RELEASE_DOWNLOAD_URL }}|https://github.com/plan-player-analytics/Plan/releases" > release_line.txt
+      - name: Write DEV release line
+        if: ${{ github.event.release.prerelease == true }}
+        run: |
+          echo "DEV|${{ github.event.release.tag_name }}|${{ env.RELEASE_DOWNLOAD_URL }}|${{ github.event.release.html_url }}" > release_line.txt
+      - name: Append to versions.txt
+        run: |
+          cat versions.txt > temp.txt
+          cat release_line.txt temp.txt > versions.txt
+      - name: Commit and push changes
+        uses: EndBug/add-and-commit@v9
+        with:
+          committer_name: GitHub Actions
+          committer_email: 41898282+github-actions[bot]@users.noreply.github.com
+          message: Update versions.txt ${{ github.event.release.name }}
+          add: versions.txt
+          push: origin HEAD:master
+
+  update_html:
+    name: Update html-branch
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout 🛎️
+        uses: actions/checkout@v3
+      - name: Get git TAG
+        id: tagName
+        uses: olegtarasov/get-tag@v2.1
+      - name: Copy assets 🔧 
+        run: |
+          mkdir -p workingdir/Plan/src/main/resources/assets/plan
+          mkdir -p workingdir/react/dashboard
+          cp -r Plan/common/src/main/resources/assets/plan workingdir/Plan/src/main/resources/assets/plan
+          cp -r Plan/react/dashboard workingdir/react/dashboard
+      - name: Deploy 🚀
+        uses: JamesIves/github-pages-deploy-action@4.0.0
+        with:
+          branch: html # The branch the action should deploy to.
+          folder: workingdir # The folder the action should deploy.
+          commit-message: ${{ steps.tagName.outputs.tag }}
+
+  upload_release_ore:
+    name: Ore Upload
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download release artifact for upload
+        run: |
+          curl 'https://api.github.com/repos/plan-player-analytics/plan/releases/${{ github.event.release.id }}/assets' | jq -r '.[] | {name: .name, url: .browser_download_url} | select(.url | strings | test("Fabric") | not)' > asset.txt
+          jq -r '.url' asset.txt > url.txt
+          jq -r '.name' asset.txt > name.txt
+          wget -i url.txt
+          echo "JAR_FILENAME=$(cat name.txt)" >> $GITHUB_ENV
+      - name: Upload artifact for ore upload
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ github.event.release.name }}
+          path: ${{ env.JAR_FILENAME }}
+      - name: Upload release to Ore 🚀
+        if: ${{ github.event.release.prerelease == false }}
+        uses: dualspiral/ore-upload-action@v2
+        with:
+          plugin: ${{ github.event.release.name }}
+          description: ${{ github.event.release.body }}
+          apiKey: ${{ secrets.ORE_API_TOKEN }}
+          channel: Release
+          pluginId: plan
+          createForumPost: true
+      - name: Upload DEV release to Ore 🚀
+        if: ${{ github.event.release.prerelease == true }}
+        uses: dualspiral/ore-upload-action@v1
+        with:
+          plugin: ${{ github.event.release.name }}
+          description: ${{ github.event.release.body }}
+          apiKey: ${{ secrets.ORE_API_TOKEN }}
+          channel: DEV
+          pluginId: plan
+          createForumPost: false
+
+  upload_release_curseforge:
+    name: CurseForge Upload
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download release artifact for upload
+        run: |
+          curl 'https://api.github.com/repos/plan-player-analytics/plan/releases/${{ github.event.release.id }}/assets' | jq -r '.[] | {name: .name, url: .browser_download_url} | select(.url | strings | test("Fabric"))' > asset.txt
+          jq -r '.url' asset.txt > url.txt
+          jq -r '.name' asset.txt > name.txt
+          wget -i url.txt
+          echo "JAR_FILENAME=$(cat name.txt)" >> $GITHUB_ENV
+      - name: Upload release to CurseForge 🚀
+        if: ${{ github.event.release.prerelease == false }}
+        uses: itsmeow/curseforge-upload@master
+        with:
+          token: ${{ secrets.CF_API_TOKEN }}
+          project_id: 508727
+          game_endpoint: minecraft
+          file_path: ${{ env.JAR_FILENAME }}
+          changelog: ${{ github.event.release.body }}
+          changelog_type: markdown
+          display_name: ${{ github.event.release.name }}
+          game_versions: "2:Java 17,75125:1.20,Fabric"
+          release_type: release
+          relations: fabric-api:requiredDependency,luckperms:optionalDependency
+      - name: Upload prerelease to CurseForge 🚀
+        if: ${{ github.event.release.prerelease == true }}
+        uses: itsmeow/curseforge-upload@master
+        with:
+          token: ${{ secrets.CF_API_TOKEN }}
+          project_id: 508727
+          game_endpoint: minecraft
+          file_path: ${{ env.JAR_FILENAME }}
+          changelog: ${{ github.event.release.body }}
+          changelog_type: markdown
+          display_name: ${{ github.event.release.name }}
+          game_versions: "2:Java 17,75125:1.20,Fabric"
+          release_type: beta
+          relations: fabric-api:requiredDependency,luckperms:optionalDependency

.gitignore

@@ -12,6 +12,9 @@ server.log
 **/.gradle
 out/
 
+# Fabric
+remappedSrc/
+
 # Created by https://www.gitignore.io/api/maven,eclipse,intellij,netbeans,osx,windows,notepadpp,windows,java
 
 ### Maven ###
@@ -165,33 +168,6 @@ $RECYCLE.BIN/
 # Windows shortcuts
 *.lnk
 
-
-### NotepadPP ###
-# Notepad++ backups #
-*.bak
-
-
-### Windows ###
-# Windows image file caches
-Thumbs.db
-ehthumbs.db
-
-# Folder config file
-Desktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Windows Installer files
-*.cab
-*.msi
-*.msm
-*.msp
-
-# Windows shortcuts
-*.lnk
-
-
 ### Java ###
 *.class
 

Plan/api/build.gradle

@@ -4,7 +4,11 @@ dependencies {
     compileOnly "com.google.code.gson:gson:$gsonVersion"
 }
 
-ext.apiVersion = '5.4-R0.1'
+compileJava {
+    options.release = 8
+}
+
+ext.apiVersion = '5.6-R0.1'
 
 publishing {
     repositories {

Plan/api/src/main/java/com/djrapitops/plan/capability/Capability.java

@@ -16,6 +16,8 @@
  */
 package com.djrapitops.plan.capability;
 
+import com.djrapitops.plan.delivery.web.ResourceService;
+
 import java.util.Optional;
 import java.util.UUID;
 
@@ -83,7 +85,16 @@ enum Capability {
     /**
      * {@link com.djrapitops.plan.delivery.web.ResourceService}
      */
-    PAGE_EXTENSION_RESOURCES;
+    PAGE_EXTENSION_RESOURCES,
+    /**
+     * {@link com.djrapitops.plan.delivery.web.ResourceService#addJavascriptToResource(String, String, ResourceService.Position, String, String)}
+     * {@link com.djrapitops.plan.delivery.web.ResourceService#addStyleToResource(String, String, ResourceService.Position, String, String)}
+     */
+    PAGE_EXTENSION_RESOURCES_REGISTER_DIRECT_CUSTOMIZATION,
+    /**
+     * {@link  com.djrapitops.plan.delivery.web.ResolverService#registerPermissions(String...)}
+     */
+    PAGE_EXTENSION_USER_PERMISSIONS;
 
     static Optional<Capability> getByName(String name) {
         if (name == null) {

Plan/api/src/main/java/com/djrapitops/plan/capability/CapabilityService.java

@@ -64,6 +64,9 @@ public interface CapabilityService {
         return Capability.getByName(capabilityName).isPresent();
     }
 
+    /**
+     * Singleton holder for listeners.
+     */
     class ListHolder {
         static final AtomicReference<List<Consumer<Boolean>>> enableListeners = new AtomicReference<>(
                 new CopyOnWriteArrayList<>()

Plan/api/src/main/java/com/djrapitops/plan/component/Component.java

@@ -0,0 +1,30 @@
+/*
+ *  This file is part of Player Analytics (Plan).
+ *
+ *  Plan is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License v3 as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Plan is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with Plan. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.djrapitops.plan.component;
+
+/**
+ * A Minecraft message component. You should <b>not</b> implement this,
+ * you can use {@link ComponentService} to a get an instance.
+ *
+ * @author Vankka
+ */
+public interface Component {
+
+    char AMPERSAND = '&';
+    char SECTION = '\u00A7';
+
+}

Plan/api/src/main/java/com/djrapitops/plan/component/ComponentService.java

@@ -0,0 +1,181 @@
+/*
+ *  This file is part of Player Analytics (Plan).
+ *
+ *  Plan is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License v3 as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Plan is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with Plan. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.djrapitops.plan.component;
+
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * A utility api class for dealing with rich and less-rich Minecraft message formats.
+ *
+ * @author Vankka
+ * @see #getInstance()
+ */
+public interface ComponentService {
+
+    /**
+     * Obtain the instance of ComponentService.
+     *
+     * @return ComponentService implementation.
+     * @throws NoClassDefFoundError  If Plan is not installed and this class can not be found or if older Plan version is installed.
+     * @throws IllegalStateException If Plan is installed, but not enabled.
+     */
+    static ComponentService getInstance() {
+        return Optional.ofNullable(ComponentService.Holder.service.get())
+                .orElseThrow(() -> new IllegalStateException("ComponentService has not been initialised yet."));
+    }
+
+    /**
+     * Translates ampersands into section signs for color codes. Defaults to {@link Component#AMPERSAND} to {@link Component#SECTION}.
+     * Example: {@code &ctext} to {@code §ctext}.
+     *
+     * @param input the input color string with color codes using ampersands ({@code &})
+     * @return the same input string with ampersands ({@code &}) for color codes replaced with section signs ({@code §})
+     * @see #translateLegacy(String, char, char)
+     */
+    default String translateLegacy(String input) {
+        return translateLegacy(input, Component.AMPERSAND, Component.SECTION);
+    }
+
+    /**
+     * Translates ampersands into section signs for color codes. Example: {@code &ctext} to {@code §ctext}.
+     *
+     * @param input           the input color string with color codes using ampersands ({@code &})
+     * @param inputCharacter  the input character for translation, usually {@code &}.
+     * @param outputCharacter the output character for translation, usually {@code §}.
+     * @return the same input string with input characters for color codes replaced with output characters
+     * @see #translateLegacy(String)
+     * @see Component#SECTION
+     * @see Component#AMPERSAND
+     */
+    String translateLegacy(String input, char inputCharacter, char outputCharacter);
+
+    /**
+     * Converts the given input into a {@link Component}.
+     * Converts an unknown format legacy/minimessage string into a component by attempting to guess the input format.
+     *
+     * @param unknown the unknown format input string
+     * @return a {@link Component}
+     */
+    Component fromAutoDetermine(String unknown);
+
+    /**
+     * Converts the given input into a {@link Component}.
+     * Input example {@code §ctext}.
+     *
+     * @param legacy the input legacy
+     * @return a {@link Component}
+     * @see #fromLegacy(String, char)
+     */
+    default Component fromLegacy(String legacy) {
+        return fromLegacy(legacy, Component.SECTION);
+    }
+
+    /**
+     * Converts the given input into a {@link Component}.
+     * Input example {@code §ctext}.
+     *
+     * @param legacy    the input legacy
+     * @param character the character to use as the color prefix, usually {@code §}.
+     * @return a {@link Component}
+     * @see #fromLegacy(String)
+     * @see Component#SECTION
+     * @see Component#AMPERSAND
+     */
+    Component fromLegacy(String legacy, char character);
+
+    /**
+     * Converts the given input into a {@link Component}.
+     * Input example: {@code &#rrggbbtext}.
+     *
+     * @param adventureLegacy the input adventure legacy
+     * @return a {@link Component}
+     * @see #fromAdventureLegacy(String, char)
+     */
+    default Component fromAdventureLegacy(String adventureLegacy) {
+        return fromAdventureLegacy(adventureLegacy, Component.AMPERSAND);
+    }
+
+    /**
+     * Converts the given input into a {@link Component}.
+     * Input example: {@code &#rrggbbtext}.
+     *
+     * @param adventureLegacy the input adventure legacy
+     * @param character       the character to use as the color prefix, usually {@code &}.
+     * @return a {@link Component}
+     * @see #fromAdventureLegacy(String)
+     * @see Component#SECTION
+     * @see Component#AMPERSAND
+     */
+    Component fromAdventureLegacy(String adventureLegacy, char character);
+
+    /**
+     * Converts the given input into a {@link Component}.
+     * Input example: {@code §x§r§r§g§g§b§btext}.
+     *
+     * @param bungeeLegacy the input bungee legacy
+     * @return a {@link Component}
+     */
+    default Component fromBungeeLegacy(String bungeeLegacy) {
+        return fromBungeeLegacy(bungeeLegacy, Component.SECTION);
+    }
+
+    /**
+     * Converts the given input into a {@link Component}.
+     * Input example: {@code §x§r§r§g§g§b§btext}.
+     *
+     * @param bungeeLegacy the input bungee legacy
+     * @param character    the character to use as the color prefix, usually {@code §}.
+     * @return a {@link Component}
+     * @see Component#SECTION
+     * @see Component#AMPERSAND
+     */
+    Component fromBungeeLegacy(String bungeeLegacy, char character);
+
+    /**
+     * Converts the given input into a {@link Component}.
+     * Input example: {@code <red>text</red>}.
+     *
+     * @param miniMessage the input minimessage
+     * @return a {@link Component}
+     */
+    Component fromMiniMessage(String miniMessage);
+
+    /**
+     * Converts the given input into a {@link Component}.
+     * Input example: {@code {text:"text",color:"red"}} (standard Minecraft json).
+     *
+     * @param json the input json
+     * @return a {@link Component}
+     */
+    Component fromJson(String json);
+
+    /**
+     * Singleton holder for ComponentService.
+     */
+    class Holder {
+        static final AtomicReference<ComponentService> service = new AtomicReference<>();
+
+        private Holder() {
+            /* Static variable holder */
+        }
+
+        static void set(ComponentService service) {
+            ComponentService.Holder.service.set(service);
+        }
+    }
+}

Plan/api/src/main/java/com/djrapitops/plan/component/package-info.java

@@ -0,0 +1,4 @@
+/**
+ * {@link com.djrapitops.plan.component.ComponentService} providing an api for Minecraft message components.
+ */
+package com.djrapitops.plan.component;

Plan/api/src/main/java/com/djrapitops/plan/delivery/web/ResolverService.java

@@ -17,9 +17,11 @@
 package com.djrapitops.plan.delivery.web;
 
 import com.djrapitops.plan.delivery.web.resolver.Resolver;
+import com.djrapitops.plan.delivery.web.resolver.request.Request;
 
 import java.util.List;
 import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.regex.Pattern;
 
@@ -63,6 +65,26 @@ public interface ResolverService {
      */
     void registerResolverForMatches(String pluginName, Pattern pattern, Resolver resolver);
 
+    /**
+     * Register a new permission that you are using in your {@link Resolver#canAccess(Request)} method.
+     * <p>
+     * The permissions are not given to any users by default, and need to be given by admin manually.
+     *
+     * @param webPermissions Permission strings, higher level permissions grant lower level automatically - eg. page.foo also grants page.foo.bar
+     * @return CompletableFuture that tells when the permissions have been stored.
+     */
+    CompletableFuture<Void> registerPermissions(String... webPermissions);
+
+    /**
+     * Register a new permission that you are using in your {@link Resolver#canAccess(Request)} method.
+     * <p>
+     * The permission is granted to any groups with {@code whenHasPermission} parameter.
+     *
+     * @param webPermission     Permission string, higher level permissions grant lower level automatically - eg. page.foo also grants page.foo.bar
+     * @param whenHasPermission Permission that a group already has that this permission should be granted to - eg. page.network.overview.numbers
+     */
+    void registerPermission(String webPermission, String whenHasPermission);
+
     /**
      * Obtain a {@link Resolver} for a target.
      * <p>

Plan/api/src/main/java/com/djrapitops/plan/delivery/web/ResourceService.java

@@ -16,6 +16,9 @@
  */
 package com.djrapitops.plan.delivery.web;
 
+import com.djrapitops.plan.delivery.web.resolver.MimeType;
+import com.djrapitops.plan.delivery.web.resolver.NoAuthResolver;
+import com.djrapitops.plan.delivery.web.resolver.Response;
 import com.djrapitops.plan.delivery.web.resource.WebResource;
 
 import java.util.Optional;
@@ -48,7 +51,7 @@ public interface ResourceService {
     WebResource getResource(String pluginName, String fileName, Supplier<WebResource> source);
 
     /**
-     * Add javascript to load in an existing html resource.
+     * Add javascript to load in a html resource.
      * <p>
      * Adds {@code <script src="jsSrc"></script>} or multiple to the resource.
      *
@@ -63,6 +66,40 @@ public interface ResourceService {
      */
     void addScriptsToResource(String pluginName, String fileName, Position position, String... jsSources);
 
+    /**
+     * Add javascript to load in a html resource.
+     * <p>
+     * Requires PAGE_EXTENSION_RESOURCES_REGISTER_DIRECT_CUSTOMIZATION Capability.
+     *
+     * @param pluginName         Name of your plugin (for config purposes)
+     * @param fileName           Name of the .html file being modified
+     * @param position           Where to place the script tag on the page.
+     * @param scriptName         Name of your javascript file (used on the page)
+     * @param javascriptAsString Javascript file contents in UTF-8
+     * @throws IllegalArgumentException If fileName is null, empty or does not end with .html
+     * @throws IllegalArgumentException If anything is empty or null
+     */
+    default void addJavascriptToResource(String pluginName, String fileName, Position position, String scriptName, String javascriptAsString) {
+        if (javascriptAsString == null || javascriptAsString.isEmpty()) {
+            throw new IllegalArgumentException("null or empty 'javascriptAsString' given.");
+        }
+        if (scriptName == null || scriptName.isEmpty()) {
+            throw new IllegalArgumentException("null or empty 'scriptName' given.");
+        }
+        String actualScriptName = scriptName.endsWith(".js") ? scriptName : scriptName + ".js";
+
+        addScriptsToResource(pluginName, fileName, position, "/" + pluginName + "/" + actualScriptName);
+        ResolverService.getInstance().registerResolver(pluginName, "/" + pluginName + "/" + actualScriptName, (NoAuthResolver) request -> {
+            if (request.getPath().asString().endsWith(actualScriptName)) {
+                return Optional.of(Response.builder()
+                        .setContent(javascriptAsString)
+                        .setMimeType(MimeType.JS)
+                        .build());
+            }
+            return Optional.empty();
+        });
+    }
+
     /**
      * Add css to load in an existing html resource.
      * <p>
@@ -79,9 +116,46 @@ public interface ResourceService {
      */
     void addStylesToResource(String pluginName, String fileName, Position position, String... cssSources);
 
+
+    /**
+     * Add javascript to load in a html resource.
+     * <p>
+     * Requires PAGE_EXTENSION_RESOURCES_REGISTER_DIRECT_CUSTOMIZATION Capability.
+     *
+     * @param pluginName  Name of your plugin (for config purposes)
+     * @param fileName    Name of the .html file being modified
+     * @param position    Where to place the script tag on the page.
+     * @param cssFileName Name of your css file (used on the page)
+     * @param cssAsString CSS file contents in UTF-8
+     * @throws IllegalArgumentException If fileName is null, empty or does not end with .html
+     * @throws IllegalArgumentException If anything is empty or null
+     */
+    default void addStyleToResource(String pluginName, String fileName, Position position, String cssFileName, String cssAsString) {
+        if (cssAsString == null || cssAsString.isEmpty()) {
+            throw new IllegalArgumentException("null or empty 'cssAsString' given.");
+        }
+        if (cssFileName == null || cssFileName.isEmpty()) {
+            throw new IllegalArgumentException("null or empty 'cssFileName' given.");
+        }
+        String actualCssFileName = cssFileName.endsWith(".js") ? cssFileName : cssFileName + ".js";
+
+        addStylesToResource(pluginName, fileName, position, pluginName + "/" + actualCssFileName);
+        ResolverService.getInstance().registerResolver(pluginName, pluginName + "/" + actualCssFileName, (NoAuthResolver) request -> {
+            if (request.getPath().asString().equals(actualCssFileName)) {
+                return Optional.of(Response.builder()
+                        .setContent(cssAsString)
+                        .setMimeType(MimeType.CSS)
+                        .build());
+            }
+            return Optional.empty();
+        });
+    }
+
     enum Position {
         /**
          * Loaded before page contents.
+         * <p>
+         * Recommended for loading style sheets.
          */
         PRE_CONTENT,
         /**
@@ -94,7 +168,11 @@ public interface ResourceService {
          * Loaded after script execution.
          * <p>
          * Recommended for loading data to custom structure on the page.
+         *
+         * @see <a href="https://github.com/plan-player-analytics/Plan/blob/master/Plan/react/dashboard/public/pageExtensionApi.js">Javascript API</a>
+         * @deprecated No longer supported on React pages, use the javascript API in PRE_MAIN_SCRIPT.
          */
+        @Deprecated
         AFTER_MAIN_SCRIPT;
 
         public String cleanName() {

Plan/api/src/main/java/com/djrapitops/plan/delivery/web/package-info.java

@@ -1,6 +1,5 @@
 /**
  * PageExtension API for extending the webserver and the website.
- *
  * <a href="https://github.com/plan-player-analytics/Plan/wiki/APIv5-PageExtension-API">Documentation</a>
  */
 package com.djrapitops.plan.delivery.web;

Plan/api/src/main/java/com/djrapitops/plan/delivery/web/resolver/CompositeResolver.java

@@ -46,6 +46,11 @@ public final class CompositeResolver implements Resolver {
         this.resolvers = new ArrayList<>();
     }
 
+    /**
+     * Create a new builder for a .
+     *
+     * @return a builder.
+     */
     public static CompositeResolver.Builder builder() {
         return new Builder();
     }
@@ -100,6 +105,9 @@ public final class CompositeResolver implements Resolver {
         return getResolver(forThis.getPath()).map(resolver -> resolver.requiresAuth(forThis)).orElse(true);
     }
 
+    /**
+     * Builder class for {@link CompositeResolver}.
+     */
     public static class Builder {
         private final CompositeResolver composite;
 
@@ -132,6 +140,11 @@ public final class CompositeResolver implements Resolver {
             return this;
         }
 
+        /**
+         * Build the final result after adding all resolvers.
+         *
+         * @return The {@link CompositeResolver}
+         */
         public CompositeResolver build() {
             return composite;
         }

Plan/api/src/main/java/com/djrapitops/plan/delivery/web/resolver/FunctionalResolverWrapper.java

@@ -22,11 +22,20 @@ import java.util.Optional;
 import java.util.function.Function;
 import java.util.function.Predicate;
 
+/**
+ * Utility class for constructing a {@link Resolver} with Functional Interfaces.
+ */
 public class FunctionalResolverWrapper implements Resolver {
 
     private final Function<Request, Optional<Response>> resolver;
     private final Predicate<Request> accessCheck;
 
+    /**
+     * Default constructor.
+     *
+     * @param resolver    Function that solves the {@link Request} into an Optional {@link Response}.
+     * @param accessCheck Predicate that checks if {@link Request} is allowed or if 403 Forbidden should be given.
+     */
     public FunctionalResolverWrapper(Function<Request, Optional<Response>> resolver, Predicate<Request> accessCheck) {
         this.resolver = resolver;
         this.accessCheck = accessCheck;

Plan/api/src/main/java/com/djrapitops/plan/delivery/web/resolver/MimeType.java

@@ -20,7 +20,7 @@ public final class MimeType {
     public static final String HTML = "text/html";
     public static final String CSS = "text/css";
     public static final String JSON = "application/json";
-    public static final String JS = "application/javascript";
+    public static final String JS = "text/javascript";
     public static final String IMAGE = "image/gif";
     public static final String FAVICON = "image/x-icon";
     public static final String FONT_TTF = "application/x-font-ttf";

Plan/api/src/main/java/com/djrapitops/plan/delivery/web/resolver/Resolver.java

@@ -19,7 +19,9 @@ package com.djrapitops.plan.delivery.web.resolver;
 import com.djrapitops.plan.delivery.web.resolver.request.Request;
 import com.djrapitops.plan.delivery.web.resolver.request.WebUser;
 
+import java.util.HashSet;
 import java.util.Optional;
+import java.util.Set;
 
 /**
  * Interface for resolving requests of Plan webserver.
@@ -40,6 +42,25 @@ public interface Resolver {
      */
     boolean canAccess(Request request);
 
+    /**
+     * Override this to tell Plan what web permissions this endpoint uses.
+     * <p>
+     * This allows:
+     * <ul>
+     *     <li>Plan to store these permissions in the permission list</li>
+     *     <li>Users can grant/deny the permission for a group</li>
+     *     <li>Plan can show what endpoints specific permission gives access to</li>
+     * </ul>
+     * <p>
+     * Requires PAGE_EXTENSION_USER_PERMISSIONS capability
+     *
+     * @return Set of permissions eg. [plugin.custom.permission, plugin.custom.permission.child.node]
+     * @see com.djrapitops.plan.capability.CapabilityService for Capability checks
+     */
+    default Set<String> usedWebPermissions() {
+        return new HashSet<>();
+    }
+
     /**
      * Implement request resolution.
      *
@@ -51,10 +72,21 @@ public interface Resolver {
      */
     Optional<Response> resolve(Request request);
 
+    /**
+     * Creates a new {@link ResponseBuilder} for a {@link Response}.
+     *
+     * @return a new builder.
+     */
     default ResponseBuilder newResponseBuilder() {
         return Response.builder();
     }
 
+    /**
+     * Used to check if the resolver requires authentication to be used.
+     *
+     * @param request Incoming request that you can use to figure out if authentication is required.
+     * @return true if you want 401 to be given when user has not logged in.
+     */
     default boolean requiresAuth(Request request) {
         return true;
     }

Plan/api/src/main/java/com/djrapitops/plan/delivery/web/resolver/ResponseBuilder.java

@@ -33,7 +33,7 @@ public class ResponseBuilder {
     /**
      * Set MIME Type of the Response.
      *
-     * @param mimeType MIME type of the Response https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types
+     * @param mimeType MIME type of the Response <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types">Documentation</a>
      * @return this builder.
      * @see MimeType for common MIME types.
      */
@@ -46,7 +46,7 @@ public class ResponseBuilder {
      * <p>
      * Default status code is 200 (OK) if not set.
      *
-     * @param code 1xx, 2xx, 3xx, 4xx, 5xx, https://developer.mozilla.org/en-US/docs/Web/HTTP/Status
+     * @param code 1xx, 2xx, 3xx, 4xx, 5xx, <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Status">Documentation</a>
      * @return this builder.
      */
     public ResponseBuilder setStatus(int code) {
@@ -57,7 +57,7 @@ public class ResponseBuilder {
     /**
      * Set HTTP Response header.
      *
-     * @param header Key of the header. https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers
+     * @param header Key of the header. <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers">Documentation</a>
      * @param value  Value for the header.
      * @return this builder.
      */
@@ -66,11 +66,16 @@ public class ResponseBuilder {
         return this;
     }
 
+    protected ResponseBuilder removeHeader(String header) {
+        response.headers.remove(header);
+        return this;
+    }
+
     /**
      * Utility method for building redirects.
      *
      * @param url URL to redirect the client to with 302 Found.
-     * @return https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Location
+     * @return <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Location">Documentation</a>
      */
     public ResponseBuilder redirectTo(String url) {
         return setStatus(302).setHeader("Location", url).setContent(new byte[0]);
@@ -103,7 +108,8 @@ public class ResponseBuilder {
             }
         }
 
-        return setContent(content.getBytes(charset));
+        return setContent(content.getBytes(charset))
+                .removeHeader("Accept-Ranges"); // Can compress
     }
 
     /**

Plan/api/src/main/java/com/djrapitops/plan/delivery/web/resolver/exception/BadRequestException.java

@@ -26,6 +26,11 @@ package com.djrapitops.plan.delivery.web.resolver.exception;
  */
 public class BadRequestException extends IllegalArgumentException {
 
+    /**
+     * Default constructor.
+     *
+     * @param message Error message - avoid including any input incoming in the request to prevent XSS.
+     */
     public BadRequestException(String message) {
         super(message);
     }

Plan/api/src/main/java/com/djrapitops/plan/delivery/web/resolver/package-info.java

@@ -1,6 +1,5 @@
 /**
  * Classes for implementing functionality with {@link com.djrapitops.plan.delivery.web.ResolverService}.
- *
  * <a href="https://github.com/plan-player-analytics/Plan/wiki/APIv5-PageExtension-API#resolverservice">Documentation</a>
  */
 package com.djrapitops.plan.delivery.web.resolver;

Plan/api/src/main/java/com/djrapitops/plan/delivery/web/resolver/request/Request.java

@@ -43,7 +43,7 @@ public final class Request {
      * @param path        Requested path /example/target
      * @param query       Request parameters ?param=value etc
      * @param user        Web user doing the request (if authenticated)
-     * @param headers     Request headers https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers
+     * @param headers     Request headers <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers">Documentation</a>
      * @param requestBody Raw body as bytes, if present
      */
     public Request(String method, URIPath path, URIQuery query, WebUser user, Map<String, String> headers, byte[] requestBody) {
@@ -57,6 +57,11 @@ public final class Request {
 
     /**
      * Special constructor that figures out URIPath and URIQuery from "/path/and?query=params" and has no request body.
+     *
+     * @param method  HTTP requst method
+     * @param target  The requested path and query, e.g. "/path/and?query=params"
+     * @param user    User that made the request
+     * @param headers HTTP request headers
      */
     public Request(String method, String target, WebUser user, Map<String, String> headers) {
         this.method = method;
@@ -121,7 +126,7 @@ public final class Request {
     /**
      * Get a header in the request.
      *
-     * @param key https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers
+     * @param key <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers">Documentation</a>
      * @return Value if it is present in the request.
      */
     public Optional<String> getHeader(String key) {

Plan/api/src/main/java/com/djrapitops/plan/delivery/web/resolver/request/URIQuery.java

@@ -16,6 +16,7 @@
  */
 package com.djrapitops.plan.delivery.web.resolver.request;
 
+import com.djrapitops.plan.delivery.web.resolver.exception.BadRequestException;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.UnsupportedEncodingException;
@@ -82,6 +83,8 @@ public final class URIQuery {
             );
         } catch (UnsupportedEncodingException e) {
             // If UTF-8 is unsupported, we have bigger problems
+        } catch (IllegalArgumentException badCharacter) {
+            throw new BadRequestException("URI Query contained bad character");
         }
     }
 
@@ -96,6 +99,8 @@ public final class URIQuery {
     }
 
     public String asString() {
+        if (byKey.isEmpty()) return "";
+
         StringBuilder builder = new StringBuilder("?");
         int i = 0;
         int max = byKey.size();

Plan/api/src/main/java/com/djrapitops/plan/delivery/web/resolver/request/WebUser.java

@@ -17,6 +17,7 @@
 package com.djrapitops.plan.delivery.web.resolver.request;
 
 import java.util.*;
+import java.util.function.Supplier;
 
 public final class WebUser {
 
@@ -57,7 +58,16 @@ public final class WebUser {
     }
 
     public boolean hasPermission(String permission) {
-        return permissions.contains(permission);
+        for (String grant : permissions) {
+            String substitute = permission.replace(grant, "");
+            // Last character is . so it is a sub-permission of the parent, eg. page.player, page.player.thing -> .thing
+            if (substitute.isEmpty() || substitute.startsWith(".")) return true;
+        }
+        return false;
+    }
+
+    public boolean hasPermission(Supplier<String> permissionSupplier) {
+        return hasPermission(permissionSupplier.get());
     }
 
     public String getName() {

Plan/api/src/main/java/com/djrapitops/plan/delivery/web/resource/WebResource.java

@@ -16,11 +16,10 @@
  */
 package com.djrapitops.plan.delivery.web.resource;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import java.nio.charset.StandardCharsets;
+import java.util.Optional;
+import java.util.function.Supplier;
 
 /**
  * Represents a customizable resource.
@@ -61,6 +60,18 @@ public interface WebResource {
      * @throws IOException If the stream can not be read.
      */
     static WebResource create(InputStream in) throws IOException {
+        return create(in, null);
+    }
+
+    /**
+     * Creates a new WebResource from an InputStream.
+     *
+     * @param in           InputStream for the resource, closed after inside the method.
+     * @param lastModified Epoch millisecond the resource was last modified
+     * @return WebResource.
+     * @throws IOException If the stream can not be read.
+     */
+    static WebResource create(InputStream in, Long lastModified) throws IOException {
         try (ByteArrayOutputStream out = new ByteArrayOutputStream()) {
             int read;
             byte[] bytes = new byte[1024];
@@ -68,12 +79,36 @@ public interface WebResource {
                 out.write(bytes, 0, read);
             }
 
-            return new ByteResource(out.toByteArray());
+            return new ByteResource(out.toByteArray(), lastModified);
         } finally {
             in.close();
         }
     }
 
+    /**
+     * Create a lazy WebResource that only reads contents if necessary.
+     *
+     * @param in           Supplier for InputStream, a lazy method that reads input when necessary.
+     * @param lastModified Last modified date for the resource.
+     * @return WebResource.
+     */
+    static WebResource create(Supplier<InputStream> in, Long lastModified) {
+        return new LazyWebResource(in, () -> {
+            try (ByteArrayOutputStream out = new ByteArrayOutputStream();
+                 InputStream input = in.get()) {
+                int read;
+                byte[] bytes = new byte[1024];
+                while ((read = input.read(bytes)) != -1) {
+                    out.write(bytes, 0, read);
+                }
+
+                return out.toByteArray();
+            } catch (IOException e) {
+                throw new UncheckedIOException(e);
+            }
+        }, lastModified);
+    }
+
     byte[] asBytes();
 
     /**
@@ -85,11 +120,21 @@ public interface WebResource {
 
     InputStream asStream();
 
+    default Optional<Long> getLastModified() {
+        return Optional.empty();
+    }
+
     final class ByteResource implements WebResource {
         private final byte[] content;
+        private final Long lastModified;
 
         public ByteResource(byte[] content) {
+            this(content, null);
+        }
+
+        public ByteResource(byte[] content, Long lastModified) {
             this.content = content;
+            this.lastModified = lastModified;
         }
 
         @Override
@@ -106,5 +151,42 @@ public interface WebResource {
         public InputStream asStream() {
             return new ByteArrayInputStream(content);
         }
+
+        @Override
+        public Optional<Long> getLastModified() {
+            return Optional.ofNullable(lastModified);
+        }
+    }
+
+    final class LazyWebResource implements WebResource {
+        private final Supplier<InputStream> inputStreamSupplier;
+        private final Supplier<byte[]> contentSupplier;
+        private final Long lastModified;
+
+        public LazyWebResource(Supplier<InputStream> inputStreamSupplier, Supplier<byte[]> contentSupplier, Long lastModified) {
+            this.inputStreamSupplier = inputStreamSupplier;
+            this.contentSupplier = contentSupplier;
+            this.lastModified = lastModified;
+        }
+
+        @Override
+        public byte[] asBytes() {
+            return contentSupplier.get();
+        }
+
+        @Override
+        public String asString() {
+            return new String(asBytes(), StandardCharsets.UTF_8);
+        }
+
+        @Override
+        public InputStream asStream() {
+            return inputStreamSupplier.get();
+        }
+
+        @Override
+        public Optional<Long> getLastModified() {
+            return Optional.ofNullable(lastModified);
+        }
     }
 }

Plan/api/src/main/java/com/djrapitops/plan/delivery/web/resource/package-info.java

@@ -1,6 +1,5 @@
 /**
  * Classes for implementing functionality with {@link com.djrapitops.plan.delivery.web.ResourceService}.
- *
  * <a href="https://github.com/plan-player-analytics/Plan/wiki/APIv5-PageExtension-API#resourceservice">Documentation</a>
  */
 package com.djrapitops.plan.delivery.web.resource;

Plan/api/src/main/java/com/djrapitops/plan/extension/DataExtension.java

@@ -113,6 +113,7 @@ public interface DataExtension {
      * <p>
      * Requires Capability DATA_EXTENSION_BUILDER_API
      *
+     * @param text Text that is displayed next to the value.
      * @return new builder.
      */
     default ValueBuilder valueBuilder(String text) {

Plan/api/src/main/java/com/djrapitops/plan/extension/ExtensionService.java

@@ -81,6 +81,9 @@ public interface ExtensionService {
      */
     void unregister(DataExtension extension);
 
+    /**
+     * Singleton holder for {@link ExtensionService}.
+     */
     class Holder {
         static final AtomicReference<ExtensionService> service = new AtomicReference<>();
 

Plan/api/src/main/java/com/djrapitops/plan/extension/FormatType.java

@@ -42,6 +42,12 @@ public enum FormatType {
      */
     NONE;
 
+    /**
+     * Get a format type by the enum name without exception.
+     *
+     * @param name FormatType#name()
+     * @return Optional if the format type is found by that name, empty if not found.
+     */
     public static Optional<FormatType> getByName(String name) {
         if (name == null) {
             return Optional.empty();
@@ -51,4 +57,5 @@ public enum FormatType {
         } catch (IllegalArgumentException e) {
             return Optional.empty();
         }
-    }}
+    }
+}

Plan/api/src/main/java/com/djrapitops/plan/extension/Group.java

@@ -30,6 +30,11 @@ package com.djrapitops.plan.extension;
  */
 public interface Group {
 
+    /**
+     * Get the name of the group.
+     *
+     * @return Name of the group given by a {@link com.djrapitops.plan.extension.annotation.GroupProvider}, e.g. "Miner"
+     */
     String getGroupName();
 
 }

Plan/api/src/main/java/com/djrapitops/plan/extension/annotation/BooleanProvider.java

@@ -89,7 +89,7 @@ public @interface BooleanProvider {
     /**
      * Name of Font Awesome icon.
      * <p>
-     * See https://fontawesome.com/icons (select 'free')) for icons and their {@link Family}.
+     * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons and their {@link Family}.
      *
      * @return Name of the icon, if name is not valid no icon is shown.
      */
@@ -98,7 +98,7 @@ public @interface BooleanProvider {
     /**
      * Family of Font Awesome icon.
      * <p>
-     * See https://fontawesome.com/icons (select 'free')) for icons and their {@link Family}.
+     * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons and their {@link Family}.
      *
      * @return Family that matches an icon, if there is no icon for this family no icon is shown.
      */

Plan/api/src/main/java/com/djrapitops/plan/extension/annotation/ComponentProvider.java

@@ -0,0 +1,109 @@
+/*
+ *  This file is part of Player Analytics (Plan).
+ *
+ *  Plan is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License v3 as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Plan is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with Plan. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.djrapitops.plan.extension.annotation;
+
+import com.djrapitops.plan.extension.FormatType;
+import com.djrapitops.plan.extension.icon.Color;
+import com.djrapitops.plan.extension.icon.Family;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Method annotation to provide a Minecraft text {@link com.djrapitops.plan.component.Component} value.
+ * <p>
+ * Usage: {@code @ComponentProvider Component method(UUID playerUUID)}
+ *
+ * @author Vankka
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface ComponentProvider {
+
+    /**
+     * Text displayed before the value, limited to 50 characters.
+     * <p>
+     * Should inform the user what the value represents, for example
+     * "Owned Chickens", "Claimed Blocks"
+     *
+     * @return String of max 50 characters, remainder will be clipped.
+     */
+    String text();
+
+    /**
+     * Display-priority of the value, highest value is placed top most.
+     * <p>
+     * Two values with same priority may appear in a random order.
+     *
+     * @return Priority between 0 and {@code Integer.MAX_VALUE}.
+     */
+    int priority() default 0;
+
+    /**
+     * Text displayed when hovering over the value, limited to 150 characters.
+     * <p>
+     * Should be used to clarify what the value is if not self evident, for example
+     * text: "Fished", description: "How long the player has fished for"
+     *
+     * @return String of max 150 characters, remainder will be clipped.
+     */
+    String description() default "";
+
+    /**
+     * Apply special formatting to the value before presentation.
+     *
+     * @return {@link FormatType} that best represents the long value.
+     * @see FormatType for available formatters.
+     */
+    FormatType format() default FormatType.NONE;
+
+    /**
+     * Name of Font Awesome icon.
+     * <p>
+     * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons and their {@link Family}.
+     *
+     * @return Name of the icon, if name is not valid no icon is shown.
+     */
+    String iconName() default "question";
+
+    /**
+     * Family of Font Awesome icon.
+     * <p>
+     * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons and their {@link Family}.
+     *
+     * @return Family that matches an icon, if there is no icon for this family no icon is shown.
+     */
+    Family iconFamily() default Family.SOLID;
+
+    /**
+     * Color preference of the plugin.
+     * <p>
+     * This color will be set as the default color to use for plugin's elements.
+     *
+     * @return Preferred color. If none are specified defaults are used.
+     */
+    Color iconColor() default Color.NONE;
+
+    /**
+     * When the parameter is set to {@code true} the value from this Provider is shown on a table alongside players.
+     *
+     * @return false by default.
+     */
+    boolean showInPlayerTable() default false;
+}

Plan/api/src/main/java/com/djrapitops/plan/extension/annotation/DoubleProvider.java

@@ -67,7 +67,7 @@ public @interface DoubleProvider {
     /**
      * Name of Font Awesome icon.
      * <p>
-     * See https://fontawesome.com/icons (select 'free')) for icons and their {@link Family}.
+     * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons and their {@link Family}.
      *
      * @return Name of the icon, if name is not valid no icon is shown.
      */
@@ -76,7 +76,7 @@ public @interface DoubleProvider {
     /**
      * Family of Font Awesome icon.
      * <p>
-     * See https://fontawesome.com/icons (select 'free')) for icons and their {@link Family}.
+     * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons and their {@link Family}.
      *
      * @return Family that matches an icon, if there is no icon for this family no icon is shown.
      */

Plan/api/src/main/java/com/djrapitops/plan/extension/annotation/GroupProvider.java

@@ -62,7 +62,7 @@ public @interface GroupProvider {
     /**
      * Name of Font Awesome icon.
      * <p>
-     * See https://fontawesome.com/icons (select 'free')) for icons and their {@link Family}.
+     * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons and their {@link Family}.
      *
      * @return Name of the icon, if name is not valid no icon is shown.
      */
@@ -71,7 +71,7 @@ public @interface GroupProvider {
     /**
      * Family of Font Awesome icon.
      * <p>
-     * See https://fontawesome.com/icons (select 'free')) for icons and their {@link Family}.
+     * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons and their {@link Family}.
      *
      * @return Family that matches an icon, if there is no icon for this family no icon is shown.
      */

Plan/api/src/main/java/com/djrapitops/plan/extension/annotation/InvalidateMethod.java

@@ -39,10 +39,18 @@ public @interface InvalidateMethod {
      */
     String value();
 
+    /**
+     * Multiple {@link InvalidateMethod} annotations are supported per class.
+     */
     @Retention(RetentionPolicy.RUNTIME)
     @Target(ElementType.TYPE)
     @interface Multiple {
 
+        /**
+         * All the annotations.
+         *
+         * @return All InvalidateMethod annotations in the class.
+         */
         InvalidateMethod[] value();
 
     }

Plan/api/src/main/java/com/djrapitops/plan/extension/annotation/NumberProvider.java

@@ -79,7 +79,7 @@ public @interface NumberProvider {
     /**
      * Name of Font Awesome icon.
      * <p>
-     * See https://fontawesome.com/icons (select 'free')) for icons and their {@link Family}.
+     * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons and their {@link Family}.
      *
      * @return Name of the icon, if name is not valid no icon is shown.
      */
@@ -88,7 +88,7 @@ public @interface NumberProvider {
     /**
      * Family of Font Awesome icon.
      * <p>
-     * See https://fontawesome.com/icons (select 'free')) for icons and their {@link Family}.
+     * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons and their {@link Family}.
      *
      * @return Family that matches an icon, if there is no icon for this family no icon is shown.
      */

Plan/api/src/main/java/com/djrapitops/plan/extension/annotation/PercentageProvider.java

@@ -70,7 +70,7 @@ public @interface PercentageProvider {
     /**
      * Name of Font Awesome icon.
      * <p>
-     * See https://fontawesome.com/icons (select 'free')) for icons and their {@link Family}.
+     * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons and their {@link Family}.
      *
      * @return Name of the icon, if name is not valid no icon is shown.
      */
@@ -79,7 +79,7 @@ public @interface PercentageProvider {
     /**
      * Family of Font Awesome icon.
      * <p>
-     * See https://fontawesome.com/icons (select 'free')) for icons and their {@link Family}.
+     * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons and their {@link Family}.
      *
      * @return Family that matches an icon, if there is no icon for this family no icon is shown.
      */

Plan/api/src/main/java/com/djrapitops/plan/extension/annotation/PluginInfo.java

@@ -44,7 +44,7 @@ public @interface PluginInfo {
     /**
      * Name of Font Awesome icon.
      * <p>
-     * See https://fontawesome.com/icons (select 'free')) for icons and their {@link Family}.
+     * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons and their {@link Family}.
      *
      * @return Name of the icon, if name is not valid no icon is shown.
      */
@@ -53,7 +53,7 @@ public @interface PluginInfo {
     /**
      * Family of Font Awesome icon.
      * <p>
-     * See https://fontawesome.com/icons (select 'free')) for icons and their {@link Family}.
+     * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons and their {@link Family}.
      *
      * @return Family that matches an icon, if there is no icon for this family no icon is shown.
      */

Plan/api/src/main/java/com/djrapitops/plan/extension/annotation/StringProvider.java

@@ -79,7 +79,7 @@ public @interface StringProvider {
     /**
      * Name of Font Awesome icon.
      * <p>
-     * See https://fontawesome.com/icons (select 'free')) for icons and their {@link Family}.
+     * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons and their {@link Family}.
      *
      * @return Name of the icon, if name is not valid no icon is shown.
      */
@@ -88,7 +88,7 @@ public @interface StringProvider {
     /**
      * Family of Font Awesome icon.
      * <p>
-     * See https://fontawesome.com/icons (select 'free')) for icons and their {@link Family}.
+     * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons and their {@link Family}.
      *
      * @return Family that matches an icon, if there is no icon for this family no icon is shown.
      */

Plan/api/src/main/java/com/djrapitops/plan/extension/annotation/TabInfo.java

@@ -41,7 +41,7 @@ public @interface TabInfo {
     /**
      * Name of Font Awesome icon.
      * <p>
-     * See https://fontawesome.com/icons (select 'free')) for icons and their {@link Family}.
+     * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons and their {@link Family}.
      *
      * @return Name of the icon, if name is not valid no icon is shown.
      */
@@ -50,7 +50,7 @@ public @interface TabInfo {
     /**
      * Family of Font Awesome icon.
      * <p>
-     * See https://fontawesome.com/icons (select 'free')) for icons and their {@link Family}.
+     * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons and their {@link Family}.
      *
      * @return Family that matches an icon, if there is no icon for this family no icon is shown.
      */

Plan/api/src/main/java/com/djrapitops/plan/extension/builder/ValueBuilder.java

@@ -16,6 +16,7 @@
  */
 package com.djrapitops.plan.extension.builder;
 
+import com.djrapitops.plan.component.Component;
 import com.djrapitops.plan.extension.FormatType;
 import com.djrapitops.plan.extension.annotation.BooleanProvider;
 import com.djrapitops.plan.extension.annotation.Conditional;
@@ -66,7 +67,7 @@ public interface ValueBuilder {
     /**
      * Icon displayed next to the value.
      * <p>
-     * See https://fontawesome.com/icons (select 'free')) for icons
+     * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons
      *
      * @param iconName   Name of the icon
      * @param iconFamily Family of the icon
@@ -80,7 +81,7 @@ public interface ValueBuilder {
     /**
      * Icon displayed next to the value.
      * <p>
-     * See https://fontawesome.com/icons (select 'free')) for icons
+     * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons
      *
      * @param icon Icon built using the methods in {@link Icon}.
      * @return This builder.
@@ -162,6 +163,14 @@ public interface ValueBuilder {
      */
     DataValue<String> buildString(String value);
 
+    /**
+     * Build a {@link Component}.
+     *
+     * @param value a {@link Component} made by {@link com.djrapitops.plan.component.ComponentService}
+     * @return a data value to give to {@link ExtensionDataBuilder}.
+     */
+    DataValue<Component> buildComponent(Component value);
+
     /**
      * Build a Number.
      *
@@ -244,6 +253,13 @@ public interface ValueBuilder {
      */
     DataValue<String> buildString(Supplier<String> value);
 
+    /**
+     * Lambda version for conditional return or throwing {@link com.djrapitops.plan.extension.NotReadyException}.
+     * <p>
+     * {@link ValueBuilder#buildComponent(Component)}
+     */
+    DataValue<Component> buildComponent(Supplier<Component> value);
+
     /**
      * Lambda version for conditional return or throwing {@link com.djrapitops.plan.extension.NotReadyException}.
      * <p>

Plan/api/src/main/java/com/djrapitops/plan/extension/extractor/ExtensionExtractor.java

@@ -16,6 +16,7 @@
  */
 package com.djrapitops.plan.extension.extractor;
 
+import com.djrapitops.plan.component.Component;
 import com.djrapitops.plan.extension.DataExtension;
 import com.djrapitops.plan.extension.Group;
 import com.djrapitops.plan.extension.annotation.*;
@@ -45,7 +46,6 @@ public final class ExtensionExtractor {
     private PluginInfo pluginInfo;
     private List<TabInfo> tabInformation;
     private List<InvalidateMethod> invalidMethods;
-    private MethodAnnotations methodAnnotations;
     private Map<ExtensionMethod.ParameterType, ExtensionMethods> methods;
     private Collection<Method> conditionalMethods;
     private Collection<Tab> tabAnnotations;
@@ -102,12 +102,9 @@ public final class ExtensionExtractor {
      * @deprecated No longer used anywhere, no-op.
      */
     @Deprecated
-    public void extractAnnotationInformation() {
-        // no-op
-    }
+    public void extractAnnotationInformation() {/* no-op */}
 
     private void extractMethods() {
-        methodAnnotations = new MethodAnnotations();
         methods = new EnumMap<>(ExtensionMethod.ParameterType.class);
         methods.put(ExtensionMethod.ParameterType.SERVER_NONE, new ExtensionMethods());
         methods.put(ExtensionMethod.ParameterType.PLAYER_STRING, new ExtensionMethods());
@@ -132,55 +129,45 @@ public final class ExtensionExtractor {
             method.getAnnotation(BooleanProvider.class).ifPresent(annotation -> {
                 validateMethod(method, annotation);
                 methods.get(method.getParameterType()).addBooleanMethod(method);
-                methodAnnotations.put(method.getMethod(), BooleanProvider.class, annotation);
             });
             method.getAnnotation(NumberProvider.class).ifPresent(annotation -> {
                 validateMethod(method, annotation);
                 methods.get(method.getParameterType()).addNumberMethod(method);
-                methodAnnotations.put(method.getMethod(), NumberProvider.class, annotation);
             });
             method.getAnnotation(DoubleProvider.class).ifPresent(annotation -> {
                 validateMethod(method, annotation);
                 methods.get(method.getParameterType()).addDoubleMethod(method);
-                methodAnnotations.put(method.getMethod(), DoubleProvider.class, annotation);
             });
             method.getAnnotation(PercentageProvider.class).ifPresent(annotation -> {
                 validateMethod(method, annotation);
                 methods.get(method.getParameterType()).addPercentageMethod(method);
-                methodAnnotations.put(method.getMethod(), PercentageProvider.class, annotation);
             });
             method.getAnnotation(StringProvider.class).ifPresent(annotation -> {
                 validateMethod(method, annotation);
                 methods.get(method.getParameterType()).addStringMethod(method);
-                methodAnnotations.put(method.getMethod(), StringProvider.class, annotation);
+            });
+            method.getAnnotation(ComponentProvider.class).ifPresent(annotation -> {
+                validateMethod(method, annotation);
+                methods.get(method.getParameterType()).addComponentMethod(method);
             });
             method.getAnnotation(TableProvider.class).ifPresent(annotation -> {
                 validateMethod(method, annotation);
                 methods.get(method.getParameterType()).addTableMethod(method);
-                methodAnnotations.put(method.getMethod(), TableProvider.class, annotation);
             });
             method.getAnnotation(GroupProvider.class).ifPresent(annotation -> {
                 validateMethod(method, annotation);
                 methods.get(method.getParameterType()).addGroupMethod(method);
-                methodAnnotations.put(method.getMethod(), GroupProvider.class, annotation);
             });
             method.getAnnotation(DataBuilderProvider.class).ifPresent(annotation -> {
                 validateMethod(method, annotation);
                 methods.get(method.getParameterType()).addDataBuilderMethod(method);
-                methodAnnotations.put(method.getMethod(), DataBuilderProvider.class, annotation);
             });
 
-            method.getAnnotation(Conditional.class).ifPresent(annotation -> {
-                conditionalMethods.add(method.getMethod());
-                methodAnnotations.put(method.getMethod(), Conditional.class, annotation);
-            });
-            method.getAnnotation(Tab.class).ifPresent(annotation -> {
-                tabAnnotations.add(annotation);
-                methodAnnotations.put(method.getMethod(), Tab.class, annotation);
-            });
+            method.getAnnotation(Conditional.class).ifPresent(annotation -> conditionalMethods.add(method.getMethod()));
+            method.getAnnotation(Tab.class).ifPresent(tabAnnotations::add);
         }
 
-        if (methodAnnotations.isEmpty()) {
+        if (methods.values().stream().allMatch(ExtensionMethods::isEmpty)) {
             throw new IllegalArgumentException(extensionName + " class had no methods annotated with a Provider annotation");
         }
 
@@ -297,6 +284,15 @@ public final class ExtensionExtractor {
         validateMethodArguments(method, false, UUID.class, String.class, Group.class);
     }
 
+    private void validateMethod(ExtensionMethod extensionMethod, ComponentProvider annotation) {
+        Method method = extensionMethod.getMethod();
+
+        validateReturnType(method, Component.class);
+        validateMethodAnnotationPropertyLength(annotation.text(), "text", 50, method);
+        validateMethodAnnotationPropertyLength(annotation.description(), "description", 150, method);
+        validateMethodArguments(method, false, UUID.class, String.class, Group.class);
+    }
+
     private void validateMethod(ExtensionMethod extensionMethod, TableProvider annotation) {
         Method method = extensionMethod.getMethod();
 
@@ -324,8 +320,8 @@ public final class ExtensionExtractor {
         for (Method conditionalMethod : conditionalMethods) {
             if (!hasAnyOf(conditionalMethod,
                     BooleanProvider.class, DoubleProvider.class, NumberProvider.class,
-                    PercentageProvider.class, StringProvider.class, TableProvider.class,
-                    GroupProvider.class, DataBuilderProvider.class
+                    PercentageProvider.class, StringProvider.class, ComponentProvider.class,
+                    TableProvider.class, GroupProvider.class, DataBuilderProvider.class
             )) {
                 throw new IllegalArgumentException(extensionName + "." + conditionalMethod.getName() + " did not have any associated Provider for Conditional.");
             }
@@ -440,10 +436,12 @@ public final class ExtensionExtractor {
         return tabInformation;
     }
 
+    /**
+     * @deprecated During refactoring MethodAnnotations was removed. Using {@link ExtensionExtractor#getMethods()} instead.
+     */
     @Deprecated
     public MethodAnnotations getMethodAnnotations() {
-        if (methodAnnotations == null) extractMethods();
-        return methodAnnotations;
+        return new MethodAnnotations();
     }
 
     public Map<ExtensionMethod.ParameterType, ExtensionMethods> getMethods() {
@@ -455,4 +453,10 @@ public final class ExtensionExtractor {
         if (invalidMethods == null) extractInvalidMethods();
         return invalidMethods;
     }
+
+    // Visible for testing
+    Collection<Method> getConditionalMethods() {
+        if (conditionalMethods == null) extractMethods();
+        return conditionalMethods;
+    }
 }

Plan/api/src/main/java/com/djrapitops/plan/extension/extractor/ExtensionMethods.java

@@ -30,6 +30,7 @@ public class ExtensionMethods {
     private final List<ExtensionMethod> doubleProviders;
     private final List<ExtensionMethod> percentageProviders;
     private final List<ExtensionMethod> stringProviders;
+    private final List<ExtensionMethod> componentProviders;
     private final List<ExtensionMethod> tableProviders;
     private final List<ExtensionMethod> groupProviders;
     private final List<ExtensionMethod> dataBuilderProviders;
@@ -40,6 +41,7 @@ public class ExtensionMethods {
         doubleProviders = new ArrayList<>();
         percentageProviders = new ArrayList<>();
         stringProviders = new ArrayList<>();
+        componentProviders = new ArrayList<>();
         tableProviders = new ArrayList<>();
         groupProviders = new ArrayList<>();
         dataBuilderProviders = new ArrayList<>();
@@ -65,6 +67,10 @@ public class ExtensionMethods {
         return stringProviders;
     }
 
+    public List<ExtensionMethod> getComponentProviders() {
+        return componentProviders;
+    }
+
     public List<ExtensionMethod> getTableProviders() {
         return tableProviders;
     }
@@ -97,6 +103,10 @@ public class ExtensionMethods {
         stringProviders.add(method);
     }
 
+    public void addComponentMethod(ExtensionMethod method) {
+        componentProviders.add(method);
+    }
+
     public void addTableMethod(ExtensionMethod method) {
         tableProviders.add(method);
     }
@@ -119,6 +129,7 @@ public class ExtensionMethods {
                 && Objects.equals(doubleProviders, that.doubleProviders)
                 && Objects.equals(percentageProviders, that.percentageProviders)
                 && Objects.equals(stringProviders, that.stringProviders)
+                && Objects.equals(componentProviders, that.componentProviders)
                 && Objects.equals(tableProviders, that.tableProviders)
                 && Objects.equals(groupProviders, that.groupProviders)
                 && Objects.equals(dataBuilderProviders, that.dataBuilderProviders);
@@ -126,7 +137,7 @@ public class ExtensionMethods {
 
     @Override
     public int hashCode() {
-        return Objects.hash(booleanProviders, numberProviders, doubleProviders, percentageProviders, stringProviders, tableProviders, groupProviders, dataBuilderProviders);
+        return Objects.hash(booleanProviders, numberProviders, doubleProviders, percentageProviders, stringProviders, componentProviders, tableProviders, groupProviders, dataBuilderProviders);
     }
 
     @Override
@@ -137,9 +148,22 @@ public class ExtensionMethods {
                 ", doubleProviders=" + doubleProviders +
                 ", percentageProviders=" + percentageProviders +
                 ", stringProviders=" + stringProviders +
+                ", componentProviders=" + componentProviders +
                 ", tableProviders=" + tableProviders +
                 ", groupProviders=" + groupProviders +
                 ", dataBuilderProviders=" + dataBuilderProviders +
                 '}';
     }
+
+    public boolean isEmpty() {
+        return booleanProviders.isEmpty()
+                && numberProviders.isEmpty()
+                && doubleProviders.isEmpty()
+                && percentageProviders.isEmpty()
+                && stringProviders.isEmpty()
+                && componentProviders.isEmpty()
+                && tableProviders.isEmpty()
+                && groupProviders.isEmpty()
+                && dataBuilderProviders.isEmpty();
+    }
 }

Plan/api/src/main/java/com/djrapitops/plan/extension/icon/Color.java

@@ -47,6 +47,12 @@ public enum Color {
     BLACK,
     NONE;
 
+    /**
+     * Get a color by the enum name without exception.
+     *
+     * @param name Color#name()
+     * @return Optional if the color is found by that name, empty if not found.
+     */
     public static Optional<Color> getByName(String name) {
         if (name == null) {
             return Optional.empty();
@@ -56,4 +62,5 @@ public enum Color {
         } catch (IllegalArgumentException e) {
             return Optional.empty();
         }
-    }}
+    }
+}

Plan/api/src/main/java/com/djrapitops/plan/extension/icon/Family.java

@@ -24,10 +24,25 @@ import java.util.Optional;
  * @author AuroraLS3
  */
 public enum Family {
+    /**
+     * 'fas' (solid) Font awesome family.
+     */
     SOLID,
+    /**
+     * 'far' (regular) Font awesome family.
+     */
     REGULAR,
+    /**
+     * 'fab' (brand) Font awesome family.
+     */
     BRAND;
 
+    /**
+     * Get a family by the enum name without exception.
+     *
+     * @param name Family#name()
+     * @return Optional if the family is found by that name, empty if not found.
+     */
     public static Optional<Family> getByName(String name) {
         if (name == null) {
             return Optional.empty();

Plan/api/src/main/java/com/djrapitops/plan/extension/icon/Icon.java

@@ -16,10 +16,12 @@
  */
 package com.djrapitops.plan.extension.icon;
 
+import java.util.Objects;
+
 /**
  * Object that represents an icon on the website.
  * <p>
- * See https://fontawesome.com/icons (select 'free')) for icons and their {@link Family}.
+ * See <a href="https://fontawesome.com/icons">FontAwesome</a> (select 'free')) for icons and their {@link Family}.
  *
  * @author AuroraLS3
  */
@@ -72,11 +74,27 @@ public class Icon {
         return this;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Icon icon = (Icon) o;
+        return type == icon.type && Objects.equals(getName(), icon.getName()) && getColor() == icon.getColor();
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, type, getName(), getColor());
+    }
+
     @Override
     public String toString() {
         return "Icon{" + type.name() + ", '" + name + '\'' + ", " + color.name() + '}';
     }
 
+    /**
+     * Builder for an {@link Icon}.
+     */
     public static class Builder {
 
         private final Icon icon;

Plan/api/src/main/java/com/djrapitops/plan/extension/package-info.java

@@ -1,6 +1,5 @@
 /**
  * DataExtension API and related classes.
- *
  * <a href="https://github.com/plan-player-analytics/Plan/wiki/APIv5---DataExtension-API">Documentation</a>
  */
 package com.djrapitops.plan.extension;

Plan/api/src/main/java/com/djrapitops/plan/extension/table/Table.java

@@ -21,10 +21,8 @@ import com.djrapitops.plan.extension.icon.Color;
 import com.djrapitops.plan.extension.icon.Icon;
 import org.apache.commons.lang3.StringUtils;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * Object for giving Plan table data.
@@ -100,6 +98,52 @@ public final class Table {
         return tableColumnFormats;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Table table = (Table) o;
+        return Arrays.equals(getColumns(), table.getColumns())
+                && Arrays.equals(getIcons(), table.getIcons())
+                && Arrays.equals(getTableColumnFormats(), table.getTableColumnFormats())
+                && valuesEqual(table);
+    }
+
+    private boolean valuesEqual(Table other) {
+        List<Object[]> rows1 = getRows();
+        List<Object[]> rows2 = other.getRows();
+        if (rows1.size() != rows2.size()) return false;
+        for (int i = 0; i < rows1.size(); i++) {
+            Object[] values1 = rows1.get(i);
+            Object[] values2 = rows2.get(i);
+            for (int j = 0; j < getMaxColumnSize(); j++) {
+                if (!Objects.equals(Objects.toString(values1[0]), Objects.toString(values2[0]))) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = Objects.hash(getRows());
+        result = 31 * result + Arrays.hashCode(getColumns());
+        result = 31 * result + Arrays.hashCode(getIcons());
+        result = 31 * result + Arrays.hashCode(getTableColumnFormats());
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "Table{" +
+                "columns=" + Arrays.toString(columns) +
+                ", icons=" + Arrays.toString(icons) +
+                ", tableColumnFormats=" + Arrays.toString(tableColumnFormats) +
+                ", rows=" + rows.stream().map(Arrays::toString).collect(Collectors.toList()) +
+                '}';
+    }
+
     /**
      * Factory for creating new {@link Table} objects.
      */
@@ -185,22 +229,52 @@ public final class Table {
             return this;
         }
 
+        /**
+         * Apply formatting to column one.
+         *
+         * @param tableColumnFormat Format to apply
+         * @return Factory.
+         */
         public Factory columnOneFormat(TableColumnFormat tableColumnFormat) {
             return columnFormat(0, tableColumnFormat);
         }
 
+        /**
+         * Apply formatting to column two.
+         *
+         * @param tableColumnFormat Format to apply
+         * @return Factory.
+         */
         public Factory columnTwoFormat(TableColumnFormat tableColumnFormat) {
             return columnFormat(1, tableColumnFormat);
         }
 
+        /**
+         * Apply formatting to column three.
+         *
+         * @param tableColumnFormat Format to apply
+         * @return Factory.
+         */
         public Factory columnThreeFormat(TableColumnFormat tableColumnFormat) {
             return columnFormat(2, tableColumnFormat);
         }
 
+        /**
+         * Apply formatting to column four.
+         *
+         * @param tableColumnFormat Format to apply
+         * @return Factory.
+         */
         public Factory columnFourFormat(TableColumnFormat tableColumnFormat) {
             return columnFormat(3, tableColumnFormat);
         }
 
+        /**
+         * Apply formatting to column five.
+         *
+         * @param tableColumnFormat Format to apply
+         * @return Factory.
+         */
         public Factory columnFiveFormat(TableColumnFormat tableColumnFormat) {
             return columnFormat(4, tableColumnFormat);
         }

Plan/api/src/main/java/com/djrapitops/plan/extension/table/TableColumnFormat.java

@@ -17,10 +17,28 @@
 package com.djrapitops.plan.extension.table;
 
 public enum TableColumnFormat {
+    /**
+     * String variables to be formatted as links to player page.
+     */
     PLAYER_NAME,
+    /**
+     * String variables to be formatted as colored (using § character).
+     */
     CHAT_COLORED,
+    /**
+     * Number variables to be formatted as time amount (eg. 1h 30m 25s).
+     */
     TIME_MILLISECONDS,
+    /**
+     * Number epoch millisecond to be formatted as date without second indicator.
+     */
     DATE_YEAR,
+    /**
+     * Number epoch millisecond to be formatted as date with second indicator.
+     */
     DATE_SECOND,
+    /**
+     * Default formatting, no extra formatting applied.
+     */
     NONE
 }

Plan/api/src/main/java/com/djrapitops/plan/query/CommonQueries.java

@@ -62,14 +62,44 @@ public interface CommonQueries {
      */
     long fetchLastSeen(UUID playerUUID, UUID serverUUID);
 
+    /**
+     * Get the UUIDs of all servers Plan has registered.
+     *
+     * @return Set of Server UUIDs
+     */
     Set<UUID> fetchServerUUIDs();
 
+    /**
+     * Fetch UUID of a player by name.
+     *
+     * @param playerName Name of the player
+     * @return UUID if it is found by Plan or empty if not found.
+     */
     Optional<UUID> fetchUUIDOf(String playerName);
 
+    /**
+     * Fetch name of a player by UUID.
+     *
+     * @param playerUUID UUID of the player
+     * @return Name if it is known by Plan or empty if not.
+     */
     Optional<String> fetchNameOf(UUID playerUUID);
 
+    /**
+     * Check that schema has table you are using in your queries.
+     *
+     * @param table Name of the table, e.g. plan_users.
+     * @return true if table exists.
+     */
     boolean doesDBHaveTable(String table);
 
+    /**
+     * Check that schema table has a column you are using in your queries.
+     *
+     * @param table  Name of the table, e.g. plan_users.
+     * @param column Name of the column, e.g. id
+     * @return true if table and column exist.
+     */
     boolean doesDBHaveTableColumn(String table, String column);
 
     /**

Plan/api/src/main/java/com/djrapitops/plan/query/QueryService.java

@@ -126,7 +126,7 @@ public interface QueryService {
     CommonQueries getCommonQueries();
 
     /**
-     * See https://docs.oracle.com/javase/8/docs/api/java/util/function/package-summary.html
+     * See <a href="https://docs.oracle.com/javase/8/docs/api/java/util/function/package-summary.html">Functional Interfaces</a>
      */
     @FunctionalInterface
     interface ThrowingConsumer<T> {
@@ -134,7 +134,7 @@ public interface QueryService {
     }
 
     /**
-     * See https://docs.oracle.com/javase/8/docs/api/java/util/function/package-summary.html
+     * See <a href="https://docs.oracle.com/javase/8/docs/api/java/util/function/package-summary.html">Functional Interfaces</a>
      */
     @FunctionalInterface
     interface ThrowingFunction<T, R> {
@@ -142,7 +142,7 @@ public interface QueryService {
     }
 
     /**
-     * See https://docs.oracle.com/javase/8/docs/api/java/util/function/package-summary.html
+     * See <a href="https://docs.oracle.com/javase/8/docs/api/java/util/function/package-summary.html">Functional Interfaces</a>
      */
     @FunctionalInterface
     interface VoidFunction {

Plan/api/src/main/java/com/djrapitops/plan/query/package-info.java

@@ -1,6 +1,5 @@
 /**
  * Query API related classes.
- *
  * <a href="https://github.com/plan-player-analytics/Plan/wiki/APIv5-Query-API">Documentation</a>
  */
 package com.djrapitops.plan.query;

Plan/api/src/main/java/com/djrapitops/plan/settings/ListenerService.java

@@ -51,6 +51,9 @@ public interface ListenerService {
      */
     void registerListenerForPlan(Object listener);
 
+    /**
+     * Singleton holder for listeners.
+     */
     class Holder {
         static final AtomicReference<ListenerService> service = new AtomicReference<>();
 

Plan/api/src/test/java/com/djrapitops/plan/extension/extractor/ExtensionExtractorTest.java

@@ -16,6 +16,7 @@
  */
 package com.djrapitops.plan.extension.extractor;
 
+import com.djrapitops.plan.component.Component;
 import com.djrapitops.plan.extension.DataExtension;
 import com.djrapitops.plan.extension.Group;
 import com.djrapitops.plan.extension.annotation.*;
@@ -265,7 +266,7 @@ class ExtensionExtractorTest {
         }
 
         ExtensionExtractor underTest = new ExtensionExtractor(new Extension());
-        assertEquals("Extension.method did not have any associated Provider for Conditional.", assertThrows(IllegalArgumentException.class, underTest::validateAnnotations).getMessage());
+        assertEquals("Extension class had no methods annotated with a Provider annotation", assertThrows(IllegalArgumentException.class, underTest::validateAnnotations).getMessage());
     }
 
     @Test
@@ -456,6 +457,24 @@ class ExtensionExtractorTest {
         assertEquals(expected, result);
     }
 
+    @Test
+    void methodsAreExtracted9() throws NoSuchMethodException {
+        @PluginInfo(name = "Extension")
+        class Extension implements DataExtension {
+            @Conditional("hasJoined")
+            @ComponentProvider(text = "Test")
+            public Component method() {
+                return null;
+            }
+        }
+        Extension extension = new Extension();
+        ExtensionExtractor underTest = new ExtensionExtractor(extension);
+        Map<ExtensionMethod.ParameterType, ExtensionMethods> result = underTest.getMethods();
+        Map<ExtensionMethod.ParameterType, ExtensionMethods> expected = buildExpectedExtensionMethodMap(extension, ExtensionMethods::addComponentMethod);
+
+        assertEquals(expected, result);
+    }
+
     @Test
     void tabsAreExtracted() throws NoSuchMethodException {
         @PluginInfo(name = "Extension")
@@ -489,8 +508,13 @@ class ExtensionExtractorTest {
 
         String expected = Stream.of(extension.getClass().getMethod("method").getAnnotation(Conditional.class))
                 .map(Conditional::value).findFirst().orElseThrow(AssertionError::new);
-        String result = underTest.getMethodAnnotations().getAnnotations(Conditional.class).stream()
-                .map(Conditional::value).findFirst().orElseThrow(AssertionError::new);
+        String result = underTest.getConditionalMethods().stream()
+                .map(method -> new ExtensionMethod(extension, method))
+                .map(extensionMethod -> extensionMethod.getAnnotation(Conditional.class))
+                .filter(Optional::isPresent)
+                .map(Optional::get)
+                .map(Conditional::value)
+                .findFirst().orElseThrow(AssertionError::new);
         assertEquals(expected, result);
     }
 

Plan/build.gradle

@@ -1,17 +1,23 @@
+import java.nio.file.Files
+
 // Aggregate Javadocs
 buildscript {
-    repositories { mavenCentral() }
+    repositories {
+        mavenCentral()
+    }
     dependencies {
         classpath 'com.netflix.nebula:gradle-aggregate-javadocs-plugin:3.0.+'
     }
 }
 
 plugins {
-    id "com.github.johnrengelman.shadow" version "7.1.2" apply false
+    id "com.github.johnrengelman.shadow" version "8.1.1" apply false
     id "java"
+    id 'java-library'
     id "jacoco"
     id "checkstyle"
-    id "org.sonarqube" version "3.3"
+    id "org.sonarqube" version "5.0.0.4638"
+    id 'fabric-loom' version '1.6-SNAPSHOT' apply false
 }
 
 apply plugin: 'nebula-aggregate-javadocs'
@@ -30,25 +36,28 @@ def buildVersion = determineBuildVersion()
 allprojects {
 
     group "com.djrapitops"
-    version "5.4-SNAPSHOT"
+    version "5.6-SNAPSHOT"
 
     ext.majorVersion = '5'
-    ext.minorVersion = '4'
+    ext.minorVersion = '6'
     ext.buildVersion = buildVersion
     ext.fullVersion = project.ext.majorVersion + '.' + project.ext.minorVersion + ' build ' + project.ext.buildVersion
+    ext.fullVersionFilename = project.ext.majorVersion + '.' + project.ext.minorVersion + '-build-' + project.ext.buildVersion
+    ext.fullVersionSemantic = project.ext.majorVersion + '.' + project.ext.minorVersion + '+build.' + project.ext.buildVersion
 
     // Fix for UTF-8 files showing with wrong encoding when compiled on Windows machines.
     compileJava { options.encoding = "UTF-8" }
-    tasks.withType(JavaCompile) { options.encoding = 'UTF-8' }
+    tasks.withType(JavaCompile).configureEach { options.encoding = 'UTF-8' }
     javadoc { options.encoding = 'UTF-8' }
 }
 
-logger.lifecycle("Building artifact for version $fullVersion")
+logger.lifecycle("Building artifact for version $fullVersion / $fullVersionFilename / $fullVersionSemantic")
 
 subprojects {
     // Build plugins
     apply plugin: "com.github.johnrengelman.shadow"
     apply plugin: "java"
+    apply plugin: "java-library"
     apply plugin: "maven-publish"
 
     // Report plugins
@@ -56,41 +65,51 @@ subprojects {
     apply plugin: "jacoco"
 
     compileJava {
-        options.release = 8
+        options.release = 11
     }
 
     ext {
-        daggerVersion = "2.41"
+        daggerVersion = "2.51.1"
 
-        palVersion = "5.0.0"
+        palVersion = "5.2.0"
 
         bukkitVersion = "1.13.2-R0.1-SNAPSHOT"
         spigotVersion = "1.13.2-R0.1-SNAPSHOT"
         paperVersion = "1.13.2-R0.1-SNAPSHOT"
-        spongeVersion = "7.4.0"
+        spongeVersion = "8.1.0"
         nukkitVersion = "1.0-SNAPSHOT"
         bungeeVersion = "1.16-R0.4"
         velocityVersion = "3.0.0-SNAPSHOT"
         redisBungeeVersion = "0.3.8-SNAPSHOT"
+        redisBungeeProxioDevVersion = "0.7.3"
 
-        commonsTextVersion = "1.9"
-        commonsCompressVersion = "1.21"
+        commonsTextVersion = "1.12.0"
+        commonsCompressVersion = "1.26.2"
+        commonsCodecVersion = "1.17.0"
+        caffeineVersion = "3.1.8"
+        jettyVersion = "11.0.21"
         caffeineVersion = "2.9.2"
-        mysqlVersion = "8.0.28"
-        sqliteVersion = "3.36.0.3"
-        hikariVersion = "4.0.3"
-        slf4jVersion = "1.7.36"
-        geoIpVersion = "2.16.1"
-        gsonVersion = "2.9.0"
-        dependencyDownloadVersion = "1.2.1"
+        mysqlVersion = "8.4.0"
+        mariadbVersion = "3.4.0"
+        sqliteVersion = "3.42.0.1"
+        adventureVersion = "4.17.0"
+        hikariVersion = "5.1.0"
+        slf4jVersion = "2.0.13"
+        geoIpVersion = "4.2.0"
+        gsonVersion = "2.11.0"
+        dependencyDownloadVersion = "1.3.1"
+        ipAddressMatcherVersion = "5.5.0"
+        jasyptVersion = "1.9.3"
 
-        bstatsVersion = "2.2.1"
-        placeholderapiVersion = "2.11.1"
+        bstatsVersion = "3.0.2"
+        placeholderapiVersion = "2.11.5"
         nkPlaceholderapiVersion = "1.4-SNAPSHOT"
 
-        junitVersion = "5.8.2"
-        mockitoVersion = "4.4.0"
-        testContainersVersion = "1.17.1"
+        junitVersion = "5.10.2"
+        mockitoVersion = "5.12.0"
+        seleniumVersion = "4.21.0"
+        testContainersVersion = "1.19.8"
+        swaggerVersion = "2.2.22"
     }
 
     repositories {
@@ -100,34 +119,42 @@ subprojects {
         maven { url = "https://papermc.io/repo/repository/maven-public/" } // Paper
         maven { url = "https://repo.spongepowered.org/repository/maven-public/" } // Sponge
         maven { url = "https://oss.sonatype.org/content/repositories/snapshots" } // BungeeCord
-        maven { url = "https://repo.md-5.net/content/repositories/snapshots/" } // RedisBungee
-        maven { url = "https://repo.velocitypowered.com/snapshots/" } // Velocity
         maven { url = "https://repo.playeranalytics.net/releases" } // Plan
+        maven { url = "https://repo.md-5.net/content/repositories/snapshots/" } // RedisBungee
+        maven { url = "https://jitpack.io" } // RedisBungee fork
     }
 
     dependencies {
         // Dependency Injection used across the project
-        implementation "com.google.dagger:dagger:$daggerVersion"
+        shadow "com.google.dagger:dagger:$daggerVersion"
         annotationProcessor "com.google.dagger:dagger-compiler:$daggerVersion"
+        testImplementation "com.google.dagger:dagger:$daggerVersion"
         testAnnotationProcessor "com.google.dagger:dagger-compiler:$daggerVersion"
 
+        compileOnly "io.swagger.core.v3:swagger-core-jakarta:$swaggerVersion"
+
         // Test Tooling Dependencies
         testImplementation "org.junit.jupiter:junit-jupiter:$junitVersion"      // JUnit 5
         testImplementation "org.mockito:mockito-core:$mockitoVersion"           // Mockito Core
         testImplementation "org.mockito:mockito-junit-jupiter:$mockitoVersion"  // Mockito JUnit 5 Extension
-        testImplementation "org.seleniumhq.selenium:selenium-java:4.1.3"        // Selenium (Browser tests)
-        testImplementation "com.jayway.awaitility:awaitility:1.7.0"             // Awaitility (Concurrent wait conditions)
+        testImplementation "com.jayway.awaitility:awaitility:1.7.0"
+        // Awaitility (Concurrent wait conditions)
 
         // Testing dependencies required by Plan
-        testImplementation "org.xerial:sqlite-jdbc:$sqliteVersion"    // SQLite
-        testImplementation "mysql:mysql-connector-java:$mysqlVersion" // MySQL
+        testImplementation "org.xerial:sqlite-jdbc:$sqliteVersion" // SQLite
+        testImplementation "com.mysql:mysql-connector-j:$mysqlVersion" // MySQL
+        testImplementation "org.mariadb.jdbc:mariadb-java-client:$mariadbVersion" // MariaDB
     }
 
     configurations {
-        testArtifacts.extendsFrom testRuntimeOnly
+        // Include shadowed dependencies in compile classpath of dependent modules
+        api.extendsFrom shadow
+
+        testArtifacts.extendsFrom testRuntimeOnly // Test classes available to other modules
+        testImplementation.extendsFrom shadow // Include shadowed dependencies in test classpath
     }
     // Test classes available to other modules
-    task testJar(type: Jar) {
+    tasks.register('testJar', Jar) {
         archiveClassifier.set("test")
         from sourceSets.test.output
     }
@@ -155,8 +182,8 @@ subprojects {
         }
     }
 
-    plugins.withType(JacocoPlugin) {
-        tasks["test"].finalizedBy 'jacocoTestReport'
+    plugins.withType(JacocoPlugin).configureEach {
+        tasks.named("test").get().finalizedBy 'jacocoTestReport'
     }
 }
 
@@ -164,6 +191,47 @@ sonarqube {
     properties {
         property "sonar.projectName", "Player Analytics"
         property "sonar.projectKey", "com.djrapitops:Plan"
-        property "sonar.coverage.jacoco.xmlReportPaths", "**/build/report/jacoco/test/jacocoTestReport.xml"
+        property "sonar.coverage.jacoco.xmlReportPaths", "build/reports/jacoco/test/jacocoTestReport.xml"
     }
 }
+
+abstract class PrintSnapshotVersionTask extends DefaultTask {
+    @TaskAction
+    def print() {
+        def versionsDir = project.file("$project.buildDir/versions")
+        def textFile = project.file("$project.buildDir/versions/snapshot.txt")
+        versionsDir.mkdirs()
+        Files.deleteIfExists(textFile.toPath())
+        textFile.createNewFile()
+        textFile << "$project.version"
+    }
+}
+
+abstract class PrintJarNameVersionTask extends DefaultTask {
+    @TaskAction
+    def print() {
+        def versionsDir = project.file("$project.buildDir/versions")
+        def textFile = project.file("$project.buildDir/versions/jar.txt")
+        versionsDir.mkdirs()
+        Files.deleteIfExists(textFile.toPath())
+        textFile.createNewFile()
+        textFile << "$project.majorVersion.$project.minorVersion-build-$project.buildVersion"
+    }
+}
+
+abstract class PrintHumanReadableVersionTask extends DefaultTask {
+    @TaskAction
+    def print() {
+        def versionsDir = project.file("$project.buildDir/versions")
+        def textFile = project.file("$project.buildDir/versions/human.txt")
+        versionsDir.mkdirs()
+        Files.deleteIfExists(textFile.toPath())
+        textFile.createNewFile()
+        textFile << "$project.fullVersion"
+    }
+}
+
+// Create a task using the task type
+tasks.register('snapshotVersion', PrintSnapshotVersionTask)
+tasks.register('jarNameVersion', PrintJarNameVersionTask)
+tasks.register('humanReadableVersion', PrintHumanReadableVersionTask)

Plan/bukkit/build.gradle

@@ -5,21 +5,22 @@ repositories {
 }
 
 dependencies {
-    compileOnly project(":common")
-    implementation project(path: ":common", configuration: 'shadow')
-    compileOnly project(":api")
+    implementation project(":api")
+    implementation project(":common")
 
-    implementation "net.playeranalytics:platform-abstraction-layer-bukkit:$palVersion"
-    implementation "org.bstats:bstats-bukkit:$bstatsVersion"
+    shadow "net.playeranalytics:platform-abstraction-layer-api:$palVersion"
+    shadow "net.playeranalytics:platform-abstraction-layer-bukkit:$palVersion"
+    shadow "org.bstats:bstats-bukkit:$bstatsVersion"
     compileOnly "me.clip:placeholderapi:$placeholderapiVersion"
 
     compileOnly "com.destroystokyo.paper:paper-api:$paperVersion"
-    testImplementation "com.destroystokyo.paper:paper-api:$paperVersion"
 
+    testImplementation "com.destroystokyo.paper:paper-api:$paperVersion"
     testImplementation project(path: ":common", configuration: 'testArtifacts')
 }
 
 shadowJar {
-    relocate 'org.bstats', 'com.djrapitops.plan.utilities.metrics'
-    relocate 'org.slf4j', 'plan.org.slf4j'
+    configurations = [project.configurations.shadow]
+
+    relocate 'org.bstats', 'net.playeranalytics.bstats.utilities.metrics'
 }

Plan/bukkit/src/main/java/com/djrapitops/plan/BukkitServerShutdownSave.java

@@ -17,6 +17,8 @@
 package com.djrapitops.plan;
 
 import com.djrapitops.plan.gathering.ServerShutdownSave;
+import com.djrapitops.plan.gathering.afk.AFKTracker;
+import com.djrapitops.plan.gathering.listeners.bukkit.BukkitAFKListener;
 import com.djrapitops.plan.settings.locale.Locale;
 import com.djrapitops.plan.storage.database.DBSystem;
 import com.djrapitops.plan.utilities.java.Reflection;
@@ -26,6 +28,7 @@ import org.bukkit.Bukkit;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
+import java.util.Optional;
 
 /**
  * ServerShutdownSave implementation for Bukkit based servers.
@@ -52,6 +55,11 @@ public class BukkitServerShutdownSave extends ServerShutdownSave {
         return isStoppedBefore1p17() || isStoppedV1p17() || isStoppedAfterV1p17();
     }
 
+    @Override
+    public Optional<AFKTracker> getAfkTracker() {
+        return Optional.ofNullable(BukkitAFKListener.getAfkTracker());
+    }
+
     private boolean isStoppedBefore1p17() {
         try {
             // Special thanks to Fuzzlemann for figuring out the methods required for this check.

Plan/bukkit/src/main/java/com/djrapitops/plan/Plan.java

@@ -25,6 +25,8 @@ import com.djrapitops.plan.gathering.ServerShutdownSave;
 import com.djrapitops.plan.settings.locale.Locale;
 import com.djrapitops.plan.settings.locale.lang.PluginLang;
 import com.djrapitops.plan.settings.theme.PlanColorScheme;
+import com.djrapitops.plan.utilities.java.ThreadContextClassLoaderSwap;
+import com.djrapitops.plan.utilities.logging.ErrorLogger;
 import net.playeranalytics.plugin.BukkitPlatformLayer;
 import net.playeranalytics.plugin.PlatformAbstractionLayer;
 import net.playeranalytics.plugin.scheduling.RunnableFactory;
@@ -34,6 +36,7 @@ import org.bukkit.command.PluginCommand;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import java.lang.reflect.Constructor;
 import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
@@ -55,23 +58,37 @@ public class Plan extends JavaPlugin implements PlanPlugin {
     private PluginLogger pluginLogger;
     private RunnableFactory runnableFactory;
     private PlatformAbstractionLayer abstractionLayer;
+    private ErrorLogger errorLogger;
+    private PlanBukkitComponent component;
 
     @Override
     public void onLoad() {
-        abstractionLayer = new BukkitPlatformLayer(this);
+        if (isFolia()) {
+            try {
+                // Attempt to load and use the Folia library for Java 17+
+                Class<?> foliaPlatformLayer = Class.forName("net.playeranalytics.plugin.FoliaPlatformLayer");
+                abstractionLayer = (PlatformAbstractionLayer) foliaPlatformLayer.getConstructor(JavaPlugin.class).newInstance(this);
+            } catch (Exception e) {
+                this.getLogger().log(Level.SEVERE, "Failed to load FoliaPlatformLayer", e);
+                abstractionLayer = new BukkitPlatformLayer(this);
+            }
+        } else {
+            abstractionLayer = new BukkitPlatformLayer(this);
+        }
         pluginLogger = abstractionLayer.getPluginLogger();
         runnableFactory = abstractionLayer.getRunnableFactory();
     }
 
     @Override
     public void onEnable() {
-        PlanBukkitComponent component = DaggerPlanBukkitComponent.builder()
+        component = DaggerPlanBukkitComponent.builder()
                 .plan(this)
                 .abstractionLayer(abstractionLayer)
                 .server(getServer())
                 .build();
         try {
-            system = component.system();
+            system = ThreadContextClassLoaderSwap.performOperation(getClass().getClassLoader(), component::system);
+            errorLogger = component.errorLogger();
             serverShutdownSave = component.serverShutdownSave();
             locale = system.getLocaleSystem().getLocale();
             system.enable();
@@ -131,11 +148,18 @@ public class Plan extends JavaPlugin implements PlanPlugin {
     public void onDisable() {
         storeSessionsOnShutdown();
         cancelAllTasks();
+        if (component != null) unregisterPlaceholders(component.placeholders());
         if (system != null) system.disable();
 
         pluginLogger.info(Locale.getStringNullSafe(locale, PluginLang.DISABLED));
     }
 
+    private void unregisterPlaceholders(BukkitPlaceholderRegistrar placeholders) {
+        if (placeholders != null) {
+            runnableFactory.create(placeholders::unregister);
+        }
+    }
+
     private void storeSessionsOnShutdown() {
         if (serverShutdownSave != null) {
             Optional<Future<?>> complete = serverShutdownSave.performSave();
@@ -155,7 +179,18 @@ public class Plan extends JavaPlugin implements PlanPlugin {
 
     public void cancelAllTasks() {
         runnableFactory.cancelAllKnownTasks();
-        Bukkit.getScheduler().cancelTasks(this);
+        if (!isFolia()) {
+            Bukkit.getScheduler().cancelTasks(this);
+        }
+    }
+
+    private static boolean isFolia() {
+        try {
+            Class.forName("io.papermc.paper.threadedregions.RegionizedServer");
+            return true;
+        } catch (ClassNotFoundException e) {
+            return false;
+        }
     }
 
     @Override
@@ -170,42 +205,42 @@ public class Plan extends JavaPlugin implements PlanPlugin {
                 pluginLogger.warn("Attempted to register '" + name + "'-command, but it is not in plugin.yml!");
                 continue;
             }
-            registering.setExecutor(new BukkitCommand(runnableFactory, system.getErrorLogger(), command));
+            registering.setExecutor(new BukkitCommand(runnableFactory, errorLogger, command));
         }
     }
 
     /**
-     * @deprecated Deprecated due to use of APF Config
+     * @deprecated Deprecated due to use of custom Config
      */
     @Override
-    @Deprecated
+    @Deprecated(since = "Config.java (2018)")
     public void reloadConfig() {
         throw new IllegalStateException("This method should be used on this plugin. Use onReload() instead");
     }
 
     /**
-     * @deprecated Deprecated due to use of APF Config
+     * @deprecated Deprecated due to use of custom Config
      */
     @Override
-    @Deprecated
+    @Deprecated(since = "Config.java (2018)")
     public FileConfiguration getConfig() {
         throw new IllegalStateException("This method should be used on this plugin. Use getMainConfig() instead");
     }
 
     /**
-     * @deprecated Deprecated due to use of APF Config
+     * @deprecated Deprecated due to use of custom Config
      */
     @Override
-    @Deprecated
+    @Deprecated(since = "Config.java (2018)")
     public void saveConfig() {
         throw new IllegalStateException("This method should be used on this plugin. Use getMainConfig().save() instead");
     }
 
     /**
-     * @deprecated Deprecated due to use of APF Config
+     * @deprecated Deprecated due to use of custom Config
      */
     @Override
-    @Deprecated
+    @Deprecated(since = "Config.java (2018)")
     public void saveDefaultConfig() {
         throw new IllegalStateException("This method should be used on this plugin.");
     }

Plan/bukkit/src/main/java/com/djrapitops/plan/PlanBukkitComponent.java

@@ -24,6 +24,7 @@ import com.djrapitops.plan.modules.bukkit.BukkitPlanModule;
 import com.djrapitops.plan.modules.bukkit.BukkitServerPropertiesModule;
 import com.djrapitops.plan.modules.bukkit.BukkitSuperClassBindingModule;
 import com.djrapitops.plan.modules.bukkit.BukkitTaskModule;
+import com.djrapitops.plan.utilities.logging.ErrorLogger;
 import dagger.BindsInstance;
 import dagger.Component;
 import net.playeranalytics.plugin.PlatformAbstractionLayer;
@@ -59,6 +60,8 @@ public interface PlanBukkitComponent {
 
     ServerShutdownSave serverShutdownSave();
 
+    ErrorLogger errorLogger();
+
     @Component.Builder
     interface Builder {
 

Plan/bukkit/src/main/java/com/djrapitops/plan/addons/placeholderapi/BukkitPlaceholderRegistrar.java

@@ -22,6 +22,7 @@ import com.djrapitops.plan.utilities.logging.ErrorLogger;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
+import java.util.concurrent.TimeUnit;
 
 @Singleton
 public class BukkitPlaceholderRegistrar {
@@ -30,6 +31,8 @@ public class BukkitPlaceholderRegistrar {
     private final PlanSystem system;
     private final ErrorLogger errorLogger;
 
+    private PlanPlaceholderExtension placeholderExtension;
+
     @Inject
     public BukkitPlaceholderRegistrar(
             PlanPlaceholders placeholders,
@@ -42,6 +45,23 @@ public class BukkitPlaceholderRegistrar {
     }
 
     public void register() {
-        new PlanPlaceholderExtension(placeholders, system, errorLogger).register();
+        placeholderExtension = new PlanPlaceholderExtension(placeholders, system, errorLogger);
+        placeholderExtension.register();
+    }
+
+    public void unregister() {
+        if (placeholderExtension != null) {
+            boolean success = false;
+            while (!success) {
+                success = placeholderExtension.unregister();
+                if (!success) {
+                    try {
+                        Thread.sleep(TimeUnit.SECONDS.toMillis(1));
+                    } catch (InterruptedException interrupted) {
+                        Thread.currentThread().interrupt();
+                    }
+                }
+            }
+        }
     }
 }

Plan/bukkit/src/main/java/com/djrapitops/plan/addons/placeholderapi/PlaceholderCacheRefreshTask.java

@@ -49,7 +49,7 @@ public class PlaceholderCacheRefreshTask extends TaskSystem.Task {
 
     @Override
     public void run() {
-        if (!config.getNode("Plugins.PlaceholderAPI").isPresent()) {
+        if (config.getNode("Plugins.PlaceholderAPI").isEmpty()) {
             cancel(); // Cancel the task and don't do anything if PlaceholderAPI is not installed.
             return;
         }

Plan/bukkit/src/main/java/com/djrapitops/plan/addons/placeholderapi/PlanPlaceholderExtension.java

@@ -19,6 +19,7 @@ package com.djrapitops.plan.addons.placeholderapi;
 import com.djrapitops.plan.PlanSystem;
 import com.djrapitops.plan.placeholder.PlanPlaceholders;
 import com.djrapitops.plan.processing.Processing;
+import com.djrapitops.plan.utilities.dev.Untrusted;
 import com.djrapitops.plan.utilities.logging.ErrorContext;
 import com.djrapitops.plan.utilities.logging.ErrorLogger;
 import com.djrapitops.plan.version.VersionChecker;
@@ -89,15 +90,25 @@ public class PlanPlaceholderExtension extends PlaceholderExpansion {
     }
 
     @Override
-    public String onRequest(OfflinePlayer player, String params) {
-        UUID uuid = player != null ? player.getUniqueId() : null;
-        if ("Server thread".equalsIgnoreCase(Thread.currentThread().getName())) {
-            return getCached(params, uuid);
+    public String onRequest(OfflinePlayer player, @Untrusted String params) {
+        try {
+            UUID uuid = player != null ? player.getUniqueId() : null;
+            if ("Server thread".equalsIgnoreCase(Thread.currentThread().getName())) {
+                return getCached(params, uuid);
+            }
+
+            return Optional.ofNullable(getCached(params, uuid))
+                    .orElseGet(() -> getPlaceholderValue(params, uuid));
+        } catch (IllegalStateException e) {
+            if ("zip file closed".equals(e.getMessage())) {
+                return null; // Plan is disabled.
+            } else {
+                throw e;
+            }
         }
-        return getPlaceholderValue(params, uuid);
     }
 
-    private String getPlaceholderValue(String params, UUID uuid) {
+    private String getPlaceholderValue(@Untrusted String params, UUID uuid) {
         try {
             String value = placeholders.onPlaceholderRequest(uuid, parseRequest(params), parseParameters(params));
 
@@ -114,14 +125,16 @@ public class PlanPlaceholderExtension extends PlaceholderExpansion {
         }
     }
 
-    private String parseRequest(String params) {
+    @Untrusted
+    private String parseRequest(@Untrusted String params) {
         return params.split(":")[0];
     }
 
-    private List<String> parseParameters(String params) {
+    @Untrusted
+    private List<String> parseParameters(@Untrusted String params) {
         List<String> parameters = new ArrayList<>();
         boolean first = true;
-        for (String parameter : params.split(":")) {
+        for (@Untrusted String parameter : params.split(":")) {
             if (first) {
                 first = false;
             } else {
@@ -131,8 +144,8 @@ public class PlanPlaceholderExtension extends PlaceholderExpansion {
         return parameters;
     }
 
-    private String getCached(String params, UUID uuid) {
-        String key = params + "-" + uuid;
+    private String getCached(@Untrusted String params, UUID uuid) {
+        @Untrusted String key = params + "-" + uuid;
 
         if (!currentlyProcessing.contains(key)) {
             currentlyProcessing.add(key);

Plan/bukkit/src/main/java/com/djrapitops/plan/gathering/BukkitSensor.java

@@ -16,11 +16,18 @@
  */
 package com.djrapitops.plan.gathering;
 
+import com.djrapitops.plan.gathering.domain.PluginMetadata;
+import org.bukkit.Bukkit;
 import org.bukkit.Server;
 import org.bukkit.World;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
 
 @Singleton
 public class BukkitSensor implements ServerSensor<World> {
@@ -118,4 +125,19 @@ public class BukkitSensor implements ServerSensor<World> {
             return false;
         }
     }
+
+    @Override
+    public List<String> getOnlinePlayerNames() {
+        return Bukkit.getOnlinePlayers().stream()
+                .map(Player::getName)
+                .collect(Collectors.toList());
+    }
+
+    @Override
+    public List<PluginMetadata> getInstalledPlugins() {
+        return Arrays.stream(Bukkit.getPluginManager().getPlugins())
+                .map(Plugin::getDescription)
+                .map(description -> new PluginMetadata(description.getName(), description.getVersion()))
+                .collect(Collectors.toList());
+    }
 }

Plan/bukkit/src/main/java/com/djrapitops/plan/gathering/domain/BukkitPlayerData.java

@@ -0,0 +1,85 @@
+/*
+ *  This file is part of Player Analytics (Plan).
+ *
+ *  Plan is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License v3 as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Plan is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with Plan. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.djrapitops.plan.gathering.domain;
+
+import org.bukkit.entity.Player;
+
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.util.Optional;
+import java.util.UUID;
+
+public class BukkitPlayerData implements PlatformPlayerData {
+
+    private final Player player;
+    private final String joinAddress;
+
+    public BukkitPlayerData(Player player, String joinAddress) {
+        this.player = player;
+        this.joinAddress = joinAddress;
+    }
+
+    @Override
+    public UUID getUUID() {
+        return player.getUniqueId();
+    }
+
+    @Override
+    public String getName() {
+        return player.getName();
+    }
+
+    @Override
+    public Optional<String> getDisplayName() {
+        return Optional.of(player.getDisplayName());
+    }
+
+    @Override
+    public Optional<Boolean> isBanned() {
+        return Optional.of(player.isBanned());
+    }
+
+    @Override
+    public Optional<Boolean> isOperator() {
+        return Optional.of(player.isOp());
+    }
+
+    @Override
+    public Optional<String> getJoinAddress() {
+        return Optional.ofNullable(joinAddress);
+    }
+
+    @Override
+    public Optional<String> getCurrentWorld() {
+        return Optional.of(player.getWorld().getName());
+    }
+
+    @Override
+    public Optional<String> getCurrentGameMode() {
+        return Optional.ofNullable(player.getGameMode()).map(Enum::name);
+    }
+
+    @Override
+    public Optional<Long> getRegisterDate() {
+        return Optional.of(player.getFirstPlayed());
+    }
+
+    @Override
+    public Optional<InetAddress> getIPAddress() {
+        return Optional.ofNullable(player.getAddress()).map(InetSocketAddress::getAddress);
+    }
+}

Plan/bukkit/src/main/java/com/djrapitops/plan/gathering/importing/data/BukkitUserImportRefiner.java

@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
 
 /**
  * UserImportRefiner attempts to find any crucial information that is missing.
- *
+ * <p>
  * - Finds UUIDs if only name is present.
  * - Finds Names if only UUID is present.
  * - Removes any importers that do not have any identifiers.

Plan/bukkit/src/main/java/com/djrapitops/plan/gathering/listeners/bukkit/BukkitAFKListener.java

@@ -62,6 +62,10 @@ public class BukkitAFKListener implements Listener {
         }
     }
 
+    public static AFKTracker getAfkTracker() {
+        return afkTracker;
+    }
+
     private void event(PlayerEvent event) {
         try {
             Player player = event.getPlayer();

Plan/bukkit/src/main/java/com/djrapitops/plan/gathering/listeners/bukkit/ChatListener.java

@@ -20,7 +20,7 @@ import com.djrapitops.plan.delivery.domain.Nickname;
 import com.djrapitops.plan.gathering.cache.NicknameCache;
 import com.djrapitops.plan.identification.ServerInfo;
 import com.djrapitops.plan.storage.database.DBSystem;
-import com.djrapitops.plan.storage.database.transactions.events.NicknameStoreTransaction;
+import com.djrapitops.plan.storage.database.transactions.events.StoreNicknameTransaction;
 import com.djrapitops.plan.utilities.logging.ErrorContext;
 import com.djrapitops.plan.utilities.logging.ErrorLogger;
 import org.bukkit.entity.Player;
@@ -76,7 +76,7 @@ public class ChatListener implements Listener {
         UUID uuid = player.getUniqueId();
         String displayName = player.getDisplayName();
 
-        dbSystem.getDatabase().executeTransaction(new NicknameStoreTransaction(
+        dbSystem.getDatabase().executeTransaction(new StoreNicknameTransaction(
                 uuid, new Nickname(displayName, time, serverInfo.getServerUUID()),
                 (playerUUID, name) -> nicknameCache.getDisplayName(playerUUID).map(name::equals).orElse(false)
         ));

Plan/bukkit/src/main/java/com/djrapitops/plan/gathering/listeners/bukkit/DeathEventListener.java

@@ -74,7 +74,7 @@ public class DeathEventListener implements Listener {
 
         try {
             Optional<Player> foundKiller = findKiller(dead);
-            if (!foundKiller.isPresent()) {
+            if (foundKiller.isEmpty()) {
                 return;
             }
             Player killer = foundKiller.get();
@@ -93,7 +93,7 @@ public class DeathEventListener implements Listener {
     }
 
     private PlayerKill.Victim getVictim(Player victim) {
-        return new PlayerKill.Victim(victim.getUniqueId(), victim.getName());
+        return new PlayerKill.Victim(victim.getUniqueId(), victim.getName(), victim.getFirstPlayed());
     }
 
     public Optional<Player> findKiller(Entity dead) {

Plan/bukkit/src/main/java/com/djrapitops/plan/gathering/listeners/bukkit/GameModeChangeListener.java

@@ -21,7 +21,7 @@ import com.djrapitops.plan.gathering.domain.ActiveSession;
 import com.djrapitops.plan.identification.ServerInfo;
 import com.djrapitops.plan.settings.config.WorldAliasSettings;
 import com.djrapitops.plan.storage.database.DBSystem;
-import com.djrapitops.plan.storage.database.transactions.events.WorldNameStoreTransaction;
+import com.djrapitops.plan.storage.database.transactions.events.StoreWorldNameTransaction;
 import com.djrapitops.plan.utilities.logging.ErrorContext;
 import com.djrapitops.plan.utilities.logging.ErrorLogger;
 import org.bukkit.entity.Player;
@@ -78,7 +78,7 @@ public class GameModeChangeListener implements Listener {
         String gameMode = event.getNewGameMode().name();
         String worldName = player.getWorld().getName();
 
-        dbSystem.getDatabase().executeTransaction(new WorldNameStoreTransaction(serverInfo.getServerUUID(), worldName));
+        dbSystem.getDatabase().executeTransaction(new StoreWorldNameTransaction(serverInfo.getServerUUID(), worldName));
         worldAliasSettings.addWorld(worldName);
 
         Optional<ActiveSession> cachedSession = SessionCache.getCachedSession(uuid);

Plan/bukkit/src/main/java/com/djrapitops/plan/gathering/listeners/bukkit/PlayerOnlineListener.java

@@ -16,29 +16,23 @@
  */
 package com.djrapitops.plan.gathering.listeners.bukkit;
 
-import com.djrapitops.plan.delivery.domain.Nickname;
-import com.djrapitops.plan.delivery.domain.PlayerName;
-import com.djrapitops.plan.delivery.domain.ServerName;
-import com.djrapitops.plan.delivery.export.Exporter;
-import com.djrapitops.plan.extension.CallEvents;
-import com.djrapitops.plan.extension.ExtensionSvc;
-import com.djrapitops.plan.gathering.cache.NicknameCache;
-import com.djrapitops.plan.gathering.cache.SessionCache;
-import com.djrapitops.plan.gathering.domain.ActiveSession;
-import com.djrapitops.plan.gathering.geolocation.GeolocationCache;
+import com.djrapitops.plan.gathering.JoinAddressValidator;
+import com.djrapitops.plan.gathering.cache.JoinAddressCache;
+import com.djrapitops.plan.gathering.domain.BukkitPlayerData;
+import com.djrapitops.plan.gathering.domain.event.PlayerJoin;
+import com.djrapitops.plan.gathering.domain.event.PlayerLeave;
+import com.djrapitops.plan.gathering.events.PlayerJoinEventConsumer;
+import com.djrapitops.plan.gathering.events.PlayerLeaveEventConsumer;
 import com.djrapitops.plan.gathering.listeners.Status;
 import com.djrapitops.plan.identification.ServerInfo;
 import com.djrapitops.plan.identification.ServerUUID;
-import com.djrapitops.plan.processing.Processing;
-import com.djrapitops.plan.settings.config.PlanConfig;
-import com.djrapitops.plan.settings.config.paths.DataGatheringSettings;
-import com.djrapitops.plan.settings.config.paths.ExportSettings;
 import com.djrapitops.plan.storage.database.DBSystem;
-import com.djrapitops.plan.storage.database.Database;
-import com.djrapitops.plan.storage.database.transactions.events.*;
+import com.djrapitops.plan.storage.database.transactions.events.BanStatusTransaction;
+import com.djrapitops.plan.storage.database.transactions.events.KickStoreTransaction;
+import com.djrapitops.plan.storage.database.transactions.events.StoreAllowlistBounceTransaction;
+import com.djrapitops.plan.utilities.dev.Untrusted;
 import com.djrapitops.plan.utilities.logging.ErrorContext;
 import com.djrapitops.plan.utilities.logging.ErrorLogger;
-import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -48,12 +42,7 @@ import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 
 import javax.inject.Inject;
-import java.net.InetAddress;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
 import java.util.UUID;
-import java.util.function.Supplier;
 
 /**
  * Event Listener for PlayerJoin, PlayerQuit and PlayerKickEvents.
@@ -62,61 +51,54 @@ import java.util.function.Supplier;
  */
 public class PlayerOnlineListener implements Listener {
 
-    private final PlanConfig config;
-    private final Processing processing;
+    private final PlayerJoinEventConsumer playerJoinEventConsumer;
+    private final PlayerLeaveEventConsumer playerLeaveEventConsumer;
+    private final JoinAddressValidator joinAddressValidator;
+    private final JoinAddressCache joinAddressCache;
+
     private final ServerInfo serverInfo;
     private final DBSystem dbSystem;
-    private final ExtensionSvc extensionService;
-    private final Exporter exporter;
-    private final GeolocationCache geolocationCache;
-    private final NicknameCache nicknameCache;
-    private final SessionCache sessionCache;
     private final ErrorLogger errorLogger;
     private final Status status;
 
-    private final Map<UUID, String> joinAddresses;
-
     @Inject
     public PlayerOnlineListener(
-            PlanConfig config,
-            Processing processing,
+            PlayerJoinEventConsumer playerJoinEventConsumer,
+            PlayerLeaveEventConsumer playerLeaveEventConsumer,
+            JoinAddressValidator joinAddressValidator,
+            JoinAddressCache joinAddressCache,
             ServerInfo serverInfo,
             DBSystem dbSystem,
-            ExtensionSvc extensionService,
-            Exporter exporter,
-            GeolocationCache geolocationCache,
-            NicknameCache nicknameCache,
-            SessionCache sessionCache,
             Status status,
             ErrorLogger errorLogger
     ) {
-        this.config = config;
-        this.processing = processing;
+        this.playerJoinEventConsumer = playerJoinEventConsumer;
+        this.playerLeaveEventConsumer = playerLeaveEventConsumer;
+        this.joinAddressValidator = joinAddressValidator;
+        this.joinAddressCache = joinAddressCache;
         this.serverInfo = serverInfo;
         this.dbSystem = dbSystem;
-        this.extensionService = extensionService;
-        this.exporter = exporter;
-        this.geolocationCache = geolocationCache;
-        this.nicknameCache = nicknameCache;
-        this.sessionCache = sessionCache;
         this.status = status;
         this.errorLogger = errorLogger;
-
-        joinAddresses = new HashMap<>();
     }
 
     @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerLogin(PlayerLoginEvent event) {
         try {
-            PlayerLoginEvent.Result result = event.getResult();
             UUID playerUUID = event.getPlayer().getUniqueId();
             ServerUUID serverUUID = serverInfo.getServerUUID();
-            boolean banned = result == PlayerLoginEvent.Result.KICK_BANNED;
-            String joinAddress = event.getHostname();
-            if (!joinAddress.isEmpty()) {
-                joinAddresses.put(playerUUID, joinAddress.substring(0, joinAddress.lastIndexOf(':')));
+            boolean banned = PlayerLoginEvent.Result.KICK_BANNED == event.getResult();
+            boolean notWhitelisted = PlayerLoginEvent.Result.KICK_WHITELIST == event.getResult();
+
+            if (notWhitelisted) {
+                dbSystem.getDatabase().executeTransaction(new StoreAllowlistBounceTransaction(playerUUID, event.getPlayer().getName(), serverUUID, System.currentTimeMillis()));
             }
-            dbSystem.getDatabase().executeTransaction(new BanStatusTransaction(playerUUID, serverUUID, () -> banned));
+
+            @Untrusted String address = joinAddressValidator.sanitize(event.getHostname());
+            if (joinAddressValidator.isValid(address)) {
+                joinAddressCache.put(playerUUID, address);
+            }
+            dbSystem.getDatabase().executeTransaction(new BanStatusTransaction(playerUUID, serverUUID, banned));
         } catch (Exception e) {
             errorLogger.error(e, ErrorContext.builder().related(event, event.getResult()).build());
         }
@@ -157,66 +139,28 @@ public class PlayerOnlineListener implements Listener {
     }
 
     private void actOnJoinEvent(PlayerJoinEvent event) {
-        Player player = event.getPlayer();
-
-        UUID playerUUID = player.getUniqueId();
-        ServerUUID serverUUID = serverInfo.getServerUUID();
         long time = System.currentTimeMillis();
-
+        UUID playerUUID = event.getPlayer().getUniqueId();
         BukkitAFKListener.afkTracker.performedAction(playerUUID, time);
 
-        String world = player.getWorld().getName();
-        String gm = Optional.ofNullable(player.getGameMode()).map(gameMode -> gameMode.name()).orElse("Unknown");
-
-        Database database = dbSystem.getDatabase();
-        database.executeTransaction(new WorldNameStoreTransaction(serverUUID, world));
-
-        InetAddress address = player.getAddress().getAddress();
-        Supplier<String> getHostName = () -> getHostname(player);
-
-        String playerName = player.getName();
-        String displayName = player.getDisplayName();
-
-        database.executeTransaction(new PlayerServerRegisterTransaction(playerUUID,
-                        player::getFirstPlayed, playerName, serverUUID, getHostName))
-                .thenRunAsync(() -> {
-                    boolean gatheringGeolocations = config.isTrue(DataGatheringSettings.GEOLOCATIONS);
-                    if (gatheringGeolocations) {
-                        database.executeTransaction(
-                                new GeoInfoStoreTransaction(playerUUID, address, time, geolocationCache::getCountry)
-                        );
-                    }
-
-                    database.executeTransaction(new OperatorStatusTransaction(playerUUID, serverUUID, player.isOp()));
-
-                    ActiveSession session = new ActiveSession(playerUUID, serverUUID, time, world, gm);
-                    session.getExtraData().put(PlayerName.class, new PlayerName(playerName));
-                    session.getExtraData().put(ServerName.class, new ServerName(serverInfo.getServer().getIdentifiableName()));
-                    sessionCache.cacheSession(playerUUID, session)
-                            .ifPresent(previousSession -> database.executeTransaction(new SessionEndTransaction(previousSession)));
-
-                    database.executeTransaction(new NicknameStoreTransaction(
-                            playerUUID, new Nickname(displayName, time, serverUUID),
-                            (uuid, name) -> nicknameCache.getDisplayName(playerUUID).map(name::equals).orElse(false)
-                    ));
-
-                    processing.submitNonCritical(() -> extensionService.updatePlayerValues(playerUUID, playerName, CallEvents.PLAYER_JOIN));
-                    if (config.isTrue(ExportSettings.EXPORT_ON_ONLINE_STATUS_CHANGE)) {
-                        processing.submitNonCritical(() -> exporter.exportPlayerPage(playerUUID, playerName));
-                    }
-                });
-    }
-
-    private String getHostname(Player player) {
-        return joinAddresses.get(player.getUniqueId());
+        playerJoinEventConsumer.onJoinGameServer(PlayerJoin.builder()
+                .server(serverInfo.getServer())
+                .player(new BukkitPlayerData(event.getPlayer(), joinAddressCache.getNullableString(playerUUID)))
+                .time(time)
+                .build());
     }
 
     @EventHandler(priority = EventPriority.NORMAL)
     public void beforePlayerQuit(PlayerQuitEvent event) {
-        Player player = event.getPlayer();
-        UUID playerUUID = player.getUniqueId();
-        String playerName = player.getName();
-        processing.submitNonCritical(() -> extensionService.updatePlayerValues(playerUUID, playerName, CallEvents.PLAYER_LEAVE));
+        try {
+            playerLeaveEventConsumer.beforeLeave(PlayerLeave.builder()
+                    .server(serverInfo.getServer())
+                    .player(new BukkitPlayerData(event.getPlayer(), null))
+                    .time(System.currentTimeMillis())
+                    .build());
+        } catch (Exception e) {
+            errorLogger.error(e, ErrorContext.builder().related(event).build());
+        }
     }
 
     @EventHandler(priority = EventPriority.MONITOR)
@@ -230,23 +174,13 @@ public class PlayerOnlineListener implements Listener {
 
     private void actOnQuitEvent(PlayerQuitEvent event) {
         long time = System.currentTimeMillis();
-        Player player = event.getPlayer();
-        String playerName = player.getName();
-        UUID playerUUID = player.getUniqueId();
-        ServerUUID serverUUID = serverInfo.getServerUUID();
-
+        UUID playerUUID = event.getPlayer().getUniqueId();
         BukkitAFKListener.afkTracker.loggedOut(playerUUID, time);
 
-        joinAddresses.remove(playerUUID);
-        nicknameCache.removeDisplayName(playerUUID);
-
-        dbSystem.getDatabase().executeTransaction(new BanStatusTransaction(playerUUID, serverUUID, player::isBanned));
-
-        sessionCache.endSession(playerUUID, time)
-                .ifPresent(endedSession -> dbSystem.getDatabase().executeTransaction(new SessionEndTransaction(endedSession)));
-
-        if (config.isTrue(ExportSettings.EXPORT_ON_ONLINE_STATUS_CHANGE)) {
-            processing.submitNonCritical(() -> exporter.exportPlayerPage(playerUUID, playerName));
-        }
+        playerLeaveEventConsumer.onLeaveGameServer(PlayerLeave.builder()
+                .server(serverInfo.getServer())
+                .player(new BukkitPlayerData(event.getPlayer(), null))
+                .time(System.currentTimeMillis())
+                .build());
     }
 }

Plan/bukkit/src/main/java/com/djrapitops/plan/gathering/listeners/bukkit/WorldChangeListener.java

@@ -21,7 +21,7 @@ import com.djrapitops.plan.gathering.domain.ActiveSession;
 import com.djrapitops.plan.identification.ServerInfo;
 import com.djrapitops.plan.settings.config.WorldAliasSettings;
 import com.djrapitops.plan.storage.database.DBSystem;
-import com.djrapitops.plan.storage.database.transactions.events.WorldNameStoreTransaction;
+import com.djrapitops.plan.storage.database.transactions.events.StoreWorldNameTransaction;
 import com.djrapitops.plan.utilities.logging.ErrorContext;
 import com.djrapitops.plan.utilities.logging.ErrorLogger;
 import org.bukkit.entity.Player;
@@ -72,7 +72,7 @@ public class WorldChangeListener implements Listener {
         String worldName = player.getWorld().getName();
         String gameMode = player.getGameMode().name();
 
-        dbSystem.getDatabase().executeTransaction(new WorldNameStoreTransaction(serverInfo.getServerUUID(), worldName));
+        dbSystem.getDatabase().executeTransaction(new StoreWorldNameTransaction(serverInfo.getServerUUID(), worldName));
         worldAliasSettings.addWorld(worldName);
 
         Optional<ActiveSession> cachedSession = SessionCache.getCachedSession(uuid);

Plan/bukkit/src/main/java/com/djrapitops/plan/gathering/timed/BukkitPingCounter.java

@@ -53,7 +53,7 @@ import java.util.logging.Logger;
  * Task that handles player ping calculation on Bukkit based servers.
  * <p>
  * Modified PingManager from LagMonitor plugin.
- * https://github.com/games647/LagMonitor/blob/master/src/main/java/com/github/games647/lagmonitor/task/PingManager.java
+ * <a href="https://github.com/games647/LagMonitor/blob/master/src/main/java/com/github/games647/lagmonitor/task/PingManager.java">original</a>
  *
  * @author games647
  */
@@ -89,9 +89,9 @@ public class BukkitPingCounter extends TaskSystem.Task implements Listener {
         startRecording = new ConcurrentHashMap<>();
         playerHistory = new HashMap<>();
 
-        Optional<PingMethod> pingMethod = loadPingMethod();
-        if (pingMethod.isPresent()) {
-            this.pingMethod = pingMethod.get();
+        Optional<PingMethod> loaded = loadPingMethod();
+        if (loaded.isPresent()) {
+            this.pingMethod = loaded.get();
             pingMethodAvailable = true;
         } else {
             pingMethodAvailable = false;
@@ -100,6 +100,7 @@ public class BukkitPingCounter extends TaskSystem.Task implements Listener {
 
     private Optional<PingMethod> loadPingMethod() {
         PingMethod[] methods = new PingMethod[]{
+                new SpigotPingMethod(),
                 new PaperPingMethod(),
                 new ReflectiveLatencyFieldMethod(),
                 new ReflectivePingFieldMethod(),

Plan/bukkit/src/main/java/com/djrapitops/plan/gathering/timed/SpigotPingMethod.java

@@ -0,0 +1,64 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016-2018
+ *
+ * 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 com.djrapitops.plan.gathering.timed;
+
+import org.bukkit.entity.Player;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+public class SpigotPingMethod implements PingMethod {
+
+    private String reasonForUnavailability;
+
+    @Override
+    public boolean isAvailable() {
+        try {
+            //Only available in Paper
+            Class.forName("org.bukkit.entity.Player").getDeclaredMethod("getPing");
+            return true;
+        } catch (ClassNotFoundException | NoSuchMethodException noSuchMethodEx) {
+            reasonForUnavailability = noSuchMethodEx.toString();
+            return false;
+        }
+    }
+
+    @Override
+    public int getPing(Player player) {
+        if (reasonForUnavailability != null) return -1;
+
+        try {
+            Method getPing = player.getClass().getDeclaredMethod("getPing");
+            return (int) getPing.invoke(player);
+        } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
+            reasonForUnavailability = e.toString();
+            return -1;
+        }
+    }
+
+    @Override
+    public String getReasonForUnavailability() {
+        return reasonForUnavailability;
+    }
+}

Plan/bukkit/src/main/java/com/djrapitops/plan/modules/bukkit/BukkitEventPipelineModule.java

@@ -1,93 +0,0 @@
-/*
- *  This file is part of Player Analytics (Plan).
- *
- *  Plan is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License v3 as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Plan is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public License
- *  along with Plan. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.djrapitops.plan.modules.bukkit;
-
-import com.djrapitops.plan.DataService;
-import com.djrapitops.plan.exceptions.MissingPipelineException;
-import com.djrapitops.plan.gathering.cache.JoinAddressCache;
-import com.djrapitops.plan.gathering.domain.PlayerMetadata;
-import com.djrapitops.plan.gathering.domain.event.JoinAddress;
-import com.djrapitops.plan.gathering.domain.event.PlayerJoin;
-import com.djrapitops.plan.gathering.domain.event.PlayerLeave;
-import com.djrapitops.plan.identification.ServerUUID;
-import dagger.Module;
-import dagger.Provides;
-import dagger.multibindings.IntoSet;
-import org.bukkit.GameMode;
-import org.bukkit.entity.Player;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
-
-import javax.inject.Singleton;
-import java.net.InetSocketAddress;
-import java.util.Optional;
-import java.util.UUID;
-
-@Module
-public class BukkitEventPipelineModule {
-
-    @Provides
-    @Singleton
-    @IntoSet
-    DataService.Pipeline metadata(JoinAddressCache joinAddressCache) {
-        return service -> service
-                .registerMapper(UUID.class, Player.class, PlayerMetadata.class,
-                        player -> getPlayerMetadata(player, service, joinAddressCache));
-    }
-
-    private PlayerMetadata getPlayerMetadata(Player player, DataService service, JoinAddressCache joinAddressCache) {
-        return PlayerMetadata.builder()
-                .playerName(player.getName())
-                .displayName(player.getDisplayName())
-                .world(player.getWorld().getName())
-                .gameMode(Optional.ofNullable(player.getGameMode()).map(GameMode::name).orElse(null))
-                .ipAddress(Optional.ofNullable(player.getAddress()).map(InetSocketAddress::getAddress).orElse(null))
-                .joinAddress(service.pullWithoutId(JoinAddress.class).map(JoinAddress::getAddress).orElse(null))
-                .build();
-    }
-
-    @Provides
-    @Singleton
-    @IntoSet
-    DataService.Pipeline events() {
-        return service -> service
-                .registerDataServiceMapper(UUID.class, PlayerJoinEvent.class, PlayerJoin.class, this::mapToPlayerJoin)
-                .registerDataServiceMapper(UUID.class, PlayerQuitEvent.class, PlayerLeave.class, this::mapToPlayerLeave);
-    }
-
-    private PlayerJoin mapToPlayerJoin(DataService service, PlayerJoinEvent event) {
-        UUID playerUUID = event.getPlayer().getUniqueId();
-        Optional<PlayerMetadata> metadata = service.map(playerUUID, event.getPlayer(), PlayerMetadata.class);
-        return PlayerJoin.builder()
-                .playerUUID(playerUUID)
-                .serverUUID(service.pullWithoutId(ServerUUID.class).orElseThrow(MissingPipelineException::new))
-                .playerMetadata(metadata.orElseThrow(MissingPipelineException::new))
-                .time(System.currentTimeMillis())
-                .build();
-    }
-
-    private PlayerLeave mapToPlayerLeave(DataService service, PlayerQuitEvent event) {
-        UUID playerUUID = event.getPlayer().getUniqueId();
-        Optional<PlayerMetadata> metadata = service.map(playerUUID, event.getPlayer(), PlayerMetadata.class);
-        return PlayerLeave.builder()
-                .playerUUID(playerUUID)
-                .serverUUID(service.pullWithoutId(ServerUUID.class).orElseThrow(MissingPipelineException::new))
-                .playerMetadata(metadata.orElseThrow(MissingPipelineException::new))
-                .time(System.currentTimeMillis())
-                .build();
-    }
-}

Plan/bukkit/src/main/java/com/djrapitops/plan/modules/bukkit/BukkitTaskModule.java

@@ -19,13 +19,14 @@ package com.djrapitops.plan.modules.bukkit;
 import com.djrapitops.plan.TaskSystem;
 import com.djrapitops.plan.addons.placeholderapi.PlaceholderCacheRefreshTask;
 import com.djrapitops.plan.delivery.web.ResourceWriteTask;
-import com.djrapitops.plan.delivery.web.WebAssetVersionCheckTask;
 import com.djrapitops.plan.delivery.webserver.auth.ActiveCookieExpiryCleanupTask;
 import com.djrapitops.plan.delivery.webserver.cache.JSONFileStorage;
+import com.djrapitops.plan.delivery.webserver.configuration.AddressAllowList;
 import com.djrapitops.plan.extension.ExtensionServerDataUpdater;
 import com.djrapitops.plan.gathering.ShutdownDataPreservation;
 import com.djrapitops.plan.gathering.ShutdownHook;
 import com.djrapitops.plan.gathering.timed.BukkitPingCounter;
+import com.djrapitops.plan.gathering.timed.InstalledPluginGatheringTask;
 import com.djrapitops.plan.gathering.timed.ServerTPSCounter;
 import com.djrapitops.plan.gathering.timed.SystemUsageBuffer;
 import com.djrapitops.plan.settings.upkeep.ConfigStoreTask;
@@ -93,10 +94,6 @@ public interface BukkitTaskModule {
     @IntoSet
     TaskSystem.Task bindResourceWriteTask(ResourceWriteTask resourceWriteTask);
 
-    @Binds
-    @IntoSet
-    TaskSystem.Task bindWebAssetVersionCheckTask(WebAssetVersionCheckTask webAssetVersionCheckTask);
-
     @Binds
     @IntoSet
     TaskSystem.Task bindActiveCookieStoreExpiryTask(ActiveCookieExpiryCleanupTask activeCookieExpiryCleanupTask);
@@ -108,4 +105,12 @@ public interface BukkitTaskModule {
     @Binds
     @IntoSet
     TaskSystem.Task bindPlaceholderWarmupTask(PlaceholderCacheRefreshTask placeholderCacheRefreshTask);
+
+    @Binds
+    @IntoSet
+    TaskSystem.Task bindAddressAllowListUpdateTask(AddressAllowList addressAllowList);
+
+    @Binds
+    @IntoSet
+    TaskSystem.Task bindInstalledPluginGatheringTask(InstalledPluginGatheringTask installedPluginGatheringTask);
 }

Plan/bukkit/src/main/java/com/djrapitops/plan/storage/database/BukkitDBSystem.java

@@ -32,7 +32,6 @@ import javax.inject.Singleton;
 @Singleton
 public class BukkitDBSystem extends DBSystem {
 
-    private final PlanConfig config;
 
     @Inject
     public BukkitDBSystem(
@@ -42,8 +41,7 @@ public class BukkitDBSystem extends DBSystem {
             PlanConfig config,
             PluginLogger logger
     ) {
-        super(locale, sqLiteDB, logger);
-        this.config = config;
+        super(config, locale, sqLiteDB, logger);
 
         databases.add(mySQLDB);
         databases.add(sqLiteDB.usingDefaultFile());

Plan/bukkit/src/main/java/com/djrapitops/plan/utilities/java/Reflection.java

@@ -32,7 +32,7 @@ import java.lang.reflect.Field;
  * An utility class that simplifies reflection in Bukkit plugins.
  * <p>
  * Modified Reflection utility from LagMonitor plugin.
- * https://github.com/games647/LagMonitor/blob/master/src/main/java/com/github/games647/lagmonitor/traffic/Reflection.java
+ * <a href="https://github.com/games647/LagMonitor/blob/master/src/main/java/com/github/games647/lagmonitor/traffic/Reflection.java">original code</a>
  *
  * @author Kristian
  */
@@ -71,7 +71,7 @@ public final class Reflection {
                 field.setAccessible(true);
 
                 // A function for retrieving a specific field value
-                return new FieldAccessor<T>() {
+                return new FieldAccessor<>() {
 
                     @Override
                     @SuppressWarnings("unchecked")

Plan/bungeecord/build.gradle

@@ -1,20 +1,20 @@
 dependencies {
-    compileOnly project(":common")
-    implementation project(path: ":common", configuration: 'shadow')
-    compileOnly project(":api")
+    implementation project(":api")
+    implementation project(":common")
 
-    implementation "net.playeranalytics:platform-abstraction-layer-bungeecord:$palVersion"
-    implementation "org.bstats:bstats-bungeecord:$bstatsVersion"
+    shadow "net.playeranalytics:platform-abstraction-layer-api:$palVersion"
+    shadow "net.playeranalytics:platform-abstraction-layer-bungeecord:$palVersion"
+    shadow "org.bstats:bstats-bungeecord:$bstatsVersion"
 
     compileOnly "net.md-5:bungeecord-api:$bungeeVersion"
     compileOnly "com.imaginarycode.minecraft:RedisBungee:$redisBungeeVersion"
+
     testImplementation "net.md-5:bungeecord-api:$bungeeVersion"
     testImplementation "com.imaginarycode.minecraft:RedisBungee:$redisBungeeVersion"
-
     testImplementation project(path: ":common", configuration: 'testArtifacts')
 }
 
 shadowJar {
-    relocate 'org.bstats', 'com.djrapitops.plan.utilities.metrics'
-    relocate 'org.slf4j', 'plan.org.slf4j'
+    configurations = [project.configurations.shadow]
+    relocate 'org.bstats', 'net.playeranalytics.bstats.utilities.metrics'
 }

Plan/bungeecord/src/main/java/com/djrapitops/plan/PlanBungee.java

@@ -23,6 +23,8 @@ import com.djrapitops.plan.exceptions.EnableException;
 import com.djrapitops.plan.settings.locale.Locale;
 import com.djrapitops.plan.settings.locale.lang.PluginLang;
 import com.djrapitops.plan.settings.theme.PlanColorScheme;
+import com.djrapitops.plan.utilities.java.ThreadContextClassLoaderSwap;
+import com.djrapitops.plan.utilities.logging.ErrorLogger;
 import net.md_5.bungee.api.plugin.Plugin;
 import net.playeranalytics.plugin.BungeePlatformLayer;
 import net.playeranalytics.plugin.PlatformAbstractionLayer;
@@ -46,6 +48,7 @@ public class PlanBungee extends Plugin implements PlanPlugin {
     private PluginLogger logger;
     private RunnableFactory runnableFactory;
     private PlatformAbstractionLayer abstractionLayer;
+    private ErrorLogger errorLogger;
 
     @Override
     public void onLoad() {
@@ -61,7 +64,8 @@ public class PlanBungee extends Plugin implements PlanPlugin {
                 .abstractionLayer(abstractionLayer)
                 .build();
         try {
-            system = component.system();
+            system = ThreadContextClassLoaderSwap.performOperation(getClass().getClassLoader(), component::system);
+            errorLogger = component.errorLogger();
             locale = system.getLocaleSystem().getLocale();
             system.enable();
 
@@ -107,7 +111,7 @@ public class PlanBungee extends Plugin implements PlanPlugin {
             return;
         }
         for (String name : command.getAliases()) {
-            getProxy().getPluginManager().registerCommand(this, new BungeeCommand(runnableFactory, system.getErrorLogger(), command, name));
+            getProxy().getPluginManager().registerCommand(this, new BungeeCommand(runnableFactory, errorLogger, command, name));
         }
     }
 

Plan/bungeecord/src/main/java/com/djrapitops/plan/PlanBungeeComponent.java

@@ -19,6 +19,7 @@ package com.djrapitops.plan;
 import com.djrapitops.plan.commands.PlanCommand;
 import com.djrapitops.plan.modules.*;
 import com.djrapitops.plan.modules.bungee.*;
+import com.djrapitops.plan.utilities.logging.ErrorLogger;
 import dagger.BindsInstance;
 import dagger.Component;
 import net.playeranalytics.plugin.PlatformAbstractionLayer;
@@ -50,6 +51,8 @@ public interface PlanBungeeComponent {
 
     PlanSystem system();
 
+    ErrorLogger errorLogger();
+
     @Component.Builder
     interface Builder {
 

Plan/bungeecord/src/main/java/com/djrapitops/plan/command/use/BungeePartBuilder.java

@@ -20,6 +20,7 @@ import com.djrapitops.plan.commands.use.MessageBuilder;
 import net.md_5.bungee.api.chat.ClickEvent;
 import net.md_5.bungee.api.chat.ComponentBuilder;
 import net.md_5.bungee.api.chat.HoverEvent;
+import net.md_5.bungee.api.chat.hover.content.Text;
 import org.apache.commons.text.TextStringBuilder;
 
 import java.util.Arrays;
@@ -68,7 +69,7 @@ class BungeePartBuilder implements MessageBuilder {
 
     @Override
     public MessageBuilder hover(String text) {
-        part.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder(text).create()));
+        part.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new Text(text)));
         return this;
     }
 
@@ -81,7 +82,7 @@ class BungeePartBuilder implements MessageBuilder {
     public MessageBuilder hover(Collection<String> lines) {
         ComponentBuilder hoverMsg = new ComponentBuilder("");
         hoverMsg.append(new TextStringBuilder().appendWithSeparators(lines, "\n").build());
-        part.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, hoverMsg.create()));
+        part.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new Text(hoverMsg.create())));
         return this;
     }
 

Plan/bungeecord/src/main/java/com/djrapitops/plan/gathering/BungeeSensor.java

@@ -17,22 +17,33 @@
 package com.djrapitops.plan.gathering;
 
 import com.djrapitops.plan.PlanBungee;
+import com.djrapitops.plan.gathering.domain.PluginMetadata;
 import com.djrapitops.plan.identification.properties.RedisCheck;
 import com.djrapitops.plan.identification.properties.RedisPlayersOnlineSupplier;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+import net.md_5.bungee.api.plugin.Plugin;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
+import java.util.Collection;
+import java.util.List;
 import java.util.function.IntSupplier;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
 
 @Singleton
 public class BungeeSensor implements ServerSensor<Object> {
 
     private final IntSupplier onlinePlayerCountSupplier;
     private final IntSupplier onlinePlayerCountBungee;
+    private final Supplier<Collection<ProxiedPlayer>> getPlayers;
+    private final Supplier<Collection<Plugin>> getPlugins;
 
     @Inject
     public BungeeSensor(PlanBungee plugin) {
+        getPlayers = plugin.getProxy()::getPlayers;
         onlinePlayerCountBungee = plugin.getProxy()::getOnlineCount;
+        getPlugins = plugin.getProxy().getPluginManager()::getPlugins;
         onlinePlayerCountSupplier = RedisCheck.isClassAvailable() ? new RedisPlayersOnlineSupplier() : onlinePlayerCountBungee;
     }
 
@@ -46,4 +57,22 @@ public class BungeeSensor implements ServerSensor<Object> {
         int count = onlinePlayerCountSupplier.getAsInt();
         return count != -1 ? count : onlinePlayerCountBungee.getAsInt();
     }
+
+    @Override
+    public List<String> getOnlinePlayerNames() {
+        return getPlayers.get().stream().map(ProxiedPlayer::getName).collect(Collectors.toList());
+    }
+
+    @Override
+    public boolean usingRedisBungee() {
+        return RedisCheck.isClassAvailable();
+    }
+
+    @Override
+    public List<PluginMetadata> getInstalledPlugins() {
+        return getPlugins.get().stream()
+                .map(Plugin::getDescription)
+                .map(description -> new PluginMetadata(description.getName(), description.getVersion()))
+                .collect(Collectors.toList());
+    }
 }

Plan/bungeecord/src/main/java/com/djrapitops/plan/gathering/domain/BungeePlayerData.java

@@ -0,0 +1,78 @@
+/*
+ *  This file is part of Player Analytics (Plan).
+ *
+ *  Plan is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License v3 as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Plan is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with Plan. If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.djrapitops.plan.gathering.domain;
+
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.net.UnknownHostException;
+import java.util.Optional;
+import java.util.UUID;
+
+public class BungeePlayerData implements PlatformPlayerData {
+
+    private final ProxiedPlayer player;
+
+    public BungeePlayerData(ProxiedPlayer player) {this.player = player;}
+
+    @Override
+    public UUID getUUID() {
+        return player.getUniqueId();
+    }
+
+    @Override
+    public String getName() {
+        return player.getName();
+    }
+
+    @Override
+    public Optional<InetAddress> getIPAddress() {
+        Optional<InetAddress> ip = getIPFromSocketAddress();
+        if (ip.isPresent()) return ip;
+        return getIpFromOldMethod();
+    }
+
+    @SuppressWarnings("deprecation") // ProxiedPlayer#getAddress is deprecated
+    private Optional<InetAddress> getIpFromOldMethod() {
+        try {
+            return Optional.ofNullable(player.getAddress()).map(InetSocketAddress::getAddress);
+        } catch (NoSuchMethodError e) {
+            return Optional.empty();
+        }
+    }
+
+    private Optional<InetAddress> getIPFromSocketAddress() {
+        try {
+            SocketAddress socketAddress = player.getSocketAddress();
+            if (socketAddress instanceof InetSocketAddress) {
+                return Optional.of(((InetSocketAddress) socketAddress).getAddress());
+            }
+
+            // Unix domain socket address requires Java 16 compatibility.
+            // These connections come from the same physical machine
+            Class<?> jdk16SocketAddressType = Class.forName("java.net.UnixDomainSocketAddress");
+            if (jdk16SocketAddressType.isAssignableFrom(socketAddress.getClass())) {
+                return Optional.of(InetAddress.getLocalHost());
+            }
+        } catch (NoSuchMethodError | ClassNotFoundException | UnknownHostException e) {
+            // Ignored
+        }
+        return Optional.empty();
+    }
+}

Plan/bungeecord/src/main/java/com/djrapitops/plan/gathering/listeners/bungee/PlayerOnlineListener.java

@@ -16,23 +16,13 @@
  */
 package com.djrapitops.plan.gathering.listeners.bungee;
 
-import com.djrapitops.plan.delivery.domain.PlayerName;
-import com.djrapitops.plan.delivery.domain.ServerName;
-import com.djrapitops.plan.delivery.export.Exporter;
-import com.djrapitops.plan.extension.CallEvents;
-import com.djrapitops.plan.extension.ExtensionSvc;
-import com.djrapitops.plan.gathering.cache.SessionCache;
-import com.djrapitops.plan.gathering.domain.ActiveSession;
-import com.djrapitops.plan.gathering.geolocation.GeolocationCache;
+import com.djrapitops.plan.gathering.domain.BungeePlayerData;
+import com.djrapitops.plan.gathering.domain.event.PlayerJoin;
+import com.djrapitops.plan.gathering.domain.event.PlayerLeave;
+import com.djrapitops.plan.gathering.events.PlayerJoinEventConsumer;
+import com.djrapitops.plan.gathering.events.PlayerLeaveEventConsumer;
+import com.djrapitops.plan.gathering.events.PlayerSwitchServerEventConsumer;
 import com.djrapitops.plan.identification.ServerInfo;
-import com.djrapitops.plan.processing.Processing;
-import com.djrapitops.plan.settings.config.PlanConfig;
-import com.djrapitops.plan.settings.config.paths.DataGatheringSettings;
-import com.djrapitops.plan.settings.config.paths.ExportSettings;
-import com.djrapitops.plan.storage.database.DBSystem;
-import com.djrapitops.plan.storage.database.Database;
-import com.djrapitops.plan.storage.database.transactions.events.GeoInfoStoreTransaction;
-import com.djrapitops.plan.storage.database.transactions.events.PlayerRegisterTransaction;
 import com.djrapitops.plan.utilities.logging.ErrorContext;
 import com.djrapitops.plan.utilities.logging.ErrorLogger;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
@@ -44,8 +34,6 @@ import net.md_5.bungee.event.EventHandler;
 import net.md_5.bungee.event.EventPriority;
 
 import javax.inject.Inject;
-import java.net.InetAddress;
-import java.util.UUID;
 
 /**
  * Player Join listener for Bungee.
@@ -54,34 +42,24 @@ import java.util.UUID;
  */
 public class PlayerOnlineListener implements Listener {
 
-    private final PlanConfig config;
-    private final Processing processing;
-    private final DBSystem dbSystem;
-    private final ExtensionSvc extensionService;
-    private final Exporter exporter;
-    private final GeolocationCache geolocationCache;
-    private final SessionCache sessionCache;
+    private final PlayerJoinEventConsumer joinEventConsumer;
+    private final PlayerLeaveEventConsumer leaveEventConsumer;
+    private final PlayerSwitchServerEventConsumer switchServerEventConsumer;
+
     private final ServerInfo serverInfo;
     private final ErrorLogger errorLogger;
 
     @Inject
     public PlayerOnlineListener(
-            PlanConfig config,
-            Processing processing,
-            DBSystem dbSystem,
-            ExtensionSvc extensionService,
-            Exporter exporter, GeolocationCache geolocationCache,
-            SessionCache sessionCache,
+            PlayerJoinEventConsumer joinEventConsumer,
+            PlayerLeaveEventConsumer leaveEventConsumer,
+            PlayerSwitchServerEventConsumer switchServerEventConsumer,
             ServerInfo serverInfo,
             ErrorLogger errorLogger
     ) {
-        this.config = config;
-        this.processing = processing;
-        this.dbSystem = dbSystem;
-        this.extensionService = extensionService;
-        this.exporter = exporter;
-        this.geolocationCache = geolocationCache;
-        this.sessionCache = sessionCache;
+        this.joinEventConsumer = joinEventConsumer;
+        this.leaveEventConsumer = leaveEventConsumer;
+        this.switchServerEventConsumer = switchServerEventConsumer;
         this.serverInfo = serverInfo;
         this.errorLogger = errorLogger;
     }
@@ -96,84 +74,48 @@ public class PlayerOnlineListener implements Listener {
     }
 
     private void actOnLogin(PostLoginEvent event) {
-        ProxiedPlayer player = event.getPlayer();
-        UUID playerUUID = player.getUniqueId();
-        String playerName = player.getName();
-        InetAddress address = player.getAddress().getAddress();
         long time = System.currentTimeMillis();
+        ProxiedPlayer player = event.getPlayer();
 
-        ActiveSession session = new ActiveSession(playerUUID, serverInfo.getServerUUID(), time, null, null);
-        session.getExtraData().put(PlayerName.class, new PlayerName(playerName));
-        session.getExtraData().put(ServerName.class, new ServerName("Proxy Server"));
-        sessionCache.cacheSession(playerUUID, session);
-        Database database = dbSystem.getDatabase();
-
-        database.executeTransaction(new PlayerRegisterTransaction(playerUUID, () -> time, playerName))
-                .thenRunAsync(() -> {
-                    boolean gatheringGeolocations = config.isTrue(DataGatheringSettings.GEOLOCATIONS);
-                    if (gatheringGeolocations) {
-                        database.executeTransaction(
-                                new GeoInfoStoreTransaction(playerUUID, address, time, geolocationCache::getCountry)
-                        );
-                    }
-
-                    processing.submitNonCritical(() -> extensionService.updatePlayerValues(playerUUID, playerName, CallEvents.PLAYER_JOIN));
-                    if (config.isTrue(ExportSettings.EXPORT_ON_ONLINE_STATUS_CHANGE)) {
-                        processing.submitNonCritical(() -> exporter.exportPlayerPage(playerUUID, playerName));
-                    }
-                });
+        joinEventConsumer.onJoinProxyServer(PlayerJoin.builder()
+                .server(serverInfo.getServer())
+                .player(new BungeePlayerData(player))
+                .time(time)
+                .build());
     }
 
     @EventHandler(priority = EventPriority.NORMAL)
     public void beforeLogout(PlayerDisconnectEvent event) {
-        ProxiedPlayer player = event.getPlayer();
-        UUID playerUUID = player.getUniqueId();
-        String playerName = player.getName();
-        processing.submitNonCritical(() -> extensionService.updatePlayerValues(playerUUID, playerName, CallEvents.PLAYER_LEAVE));
-    }
-
-    @EventHandler(priority = EventPriority.HIGHEST)
-    public void onLogout(PlayerDisconnectEvent event) {
         try {
-            actOnLogout(event);
+            leaveEventConsumer.beforeLeave(PlayerLeave.builder()
+                    .server(serverInfo.getServer())
+                    .player(new BungeePlayerData(event.getPlayer()))
+                    .time(System.currentTimeMillis())
+                    .build());
         } catch (Exception e) {
             errorLogger.error(e, ErrorContext.builder().related(event).build());
         }
     }
 
-    private void actOnLogout(PlayerDisconnectEvent event) {
-        ProxiedPlayer player = event.getPlayer();
-        String playerName = player.getName();
-        UUID playerUUID = player.getUniqueId();
-
-        sessionCache.endSession(playerUUID, System.currentTimeMillis());
-        if (config.isTrue(ExportSettings.EXPORT_ON_ONLINE_STATUS_CHANGE)) {
-            processing.submitNonCritical(() -> exporter.exportPlayerPage(playerUUID, playerName));
+    @EventHandler(priority = EventPriority.HIGHEST)
+    public void onLogout(PlayerDisconnectEvent event) {
+        try {
+            leaveEventConsumer.onLeaveProxyServer(PlayerLeave.builder()
+                    .server(serverInfo.getServer())
+                    .player(new BungeePlayerData(event.getPlayer()))
+                    .time(System.currentTimeMillis())
+                    .build());
+        } catch (Exception e) {
+            errorLogger.error(e, ErrorContext.builder().related(event).build());
         }
     }
 
     @EventHandler(priority = EventPriority.HIGHEST)
     public void onServerSwitch(ServerSwitchEvent event) {
         try {
-            actOnServerSwitch(event);
+            switchServerEventConsumer.onServerSwitch(new BungeePlayerData(event.getPlayer()), System.currentTimeMillis());
         } catch (Exception e) {
             errorLogger.error(e, ErrorContext.builder().related(event).build());
         }
     }
-
-    private void actOnServerSwitch(ServerSwitchEvent event) {
-        ProxiedPlayer player = event.getPlayer();
-        String playerName = player.getName();
-        UUID playerUUID = player.getUniqueId();
-
-        long time = System.currentTimeMillis();
-        // Replaces the current session in the cache.
-        ActiveSession session = new ActiveSession(playerUUID, serverInfo.getServerUUID(), time, null, null);
-        session.getExtraData().put(PlayerName.class, new PlayerName(playerName));
-        session.getExtraData().put(ServerName.class, new ServerName("Proxy Server"));
-        sessionCache.cacheSession(playerUUID, session);
-        if (config.isTrue(ExportSettings.EXPORT_ON_ONLINE_STATUS_CHANGE)) {
-            processing.submitNonCritical(() -> exporter.exportPlayerPage(playerUUID, playerName));
-        }
-    }
 }

Plan/bungeecord/src/main/java/com/djrapitops/plan/identification/BungeeServerInfo.java

@@ -26,6 +26,7 @@ import com.djrapitops.plan.processing.Processing;
 import com.djrapitops.plan.settings.locale.Locale;
 import com.djrapitops.plan.settings.locale.lang.PluginLang;
 import net.playeranalytics.plugin.server.PluginLogger;
+import org.jetbrains.annotations.Nullable;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -73,17 +74,16 @@ public class BungeeServerInfo extends ServerInfo {
     @Override
     public void loadServerInfo() {
         logger.info(locale.getString(PluginLang.LOADING_SERVER_INFO));
-        checkIfDefaultIP();
 
-        this.server = fromFile.load(null).orElseGet(() -> fromDatabase.load(null)
-                .orElseGet(this::registerServer));
+        this.server = fromFile.load(null)
+                .orElseGet(this::registerServer);
         this.server.setProxy(true); // Ensure isProxy if loaded from file
 
         processing.submitNonCritical(this::updateStorage);
     }
 
     private void updateStorage() {
-        String address = addresses.getAccessAddress().orElseGet(addresses::getFallbackLocalhostAddress);
+        String address = getAddress();
 
         server.setWebAddress(address);
 
@@ -92,18 +92,6 @@ public class BungeeServerInfo extends ServerInfo {
         fromFile.save(server);
     }
 
-    /**
-     * @throws EnableException If IP setting is unset
-     */
-    private void checkIfDefaultIP() {
-        String ip = serverProperties.getIp();
-        if ("0.0.0.0".equals(ip)) {
-            logger.error("IP setting still 0.0.0.0 - Configure Alternative_IP/IP that connects to the Proxy server.");
-            logger.info("Player Analytics partially enabled (Use /planproxy reload to reload config)");
-            throw new EnableException("IP setting still 0.0.0.0 - Configure Alternative_IP/IP that connects to the Proxy server.");
-        }
-    }
-
     /**
      * @throws EnableException If IP setting is unset
      */
@@ -111,19 +99,22 @@ public class BungeeServerInfo extends ServerInfo {
         Server proxy = createServerObject();
 
         fromDatabase.save(proxy);
-        Server stored = fromDatabase.load(null)
-                .orElseThrow(() -> new EnableException("BungeeCord registration failed (DB)"));
+        Server stored = fromDatabase.load(proxy.getUuid())
+                .orElseThrow(() -> new EnableException("Server registration to database failed"));
 
         fromFile.save(stored);
         return stored;
     }
 
-    /**
-     * @throws EnableException If IP setting is unset
-     */
     private Server createServerObject() {
         ServerUUID serverUUID = generateNewUUID();
-        String accessAddress = addresses.getAccessAddress().orElseThrow(() -> new EnableException("Velocity can not have '0.0.0.0' or '' as an address. Set up 'Server.IP' setting."));
+        String accessAddress = getAddress();
         return new Server(-1, serverUUID, "BungeeCord", accessAddress, true, currentVersion);
     }
+
+    @Nullable
+    private String getAddress() {
+        return addresses.getAccessAddress()
+                .orElse(addresses.isWebserverEnabled() ? addresses.getFallbackLocalhostAddress() : null);
+    }
 }

Plan/bungeecord/src/main/java/com/djrapitops/plan/modules/bungee/BungeeSuperClassBindingModule.java

@@ -40,5 +40,5 @@ public interface BungeeSuperClassBindingModule {
     ListenerSystem bindListenerSystem(BungeeListenerSystem listenerSystem);
 
     @Binds
-    ServerSensor<Object> bindServerSensor(BungeeSensor sensor);
+    ServerSensor<?> bindServerSensor(BungeeSensor sensor);
 }

Plan/bungeecord/src/main/java/com/djrapitops/plan/modules/bungee/BungeeTaskModule.java

@@ -18,11 +18,12 @@ package com.djrapitops.plan.modules.bungee;
 
 import com.djrapitops.plan.TaskSystem;
 import com.djrapitops.plan.delivery.web.ResourceWriteTask;
-import com.djrapitops.plan.delivery.web.WebAssetVersionCheckTask;
 import com.djrapitops.plan.delivery.webserver.auth.ActiveCookieExpiryCleanupTask;
 import com.djrapitops.plan.delivery.webserver.cache.JSONFileStorage;
+import com.djrapitops.plan.delivery.webserver.configuration.AddressAllowList;
 import com.djrapitops.plan.extension.ExtensionServerDataUpdater;
 import com.djrapitops.plan.gathering.timed.BungeePingCounter;
+import com.djrapitops.plan.gathering.timed.InstalledPluginGatheringTask;
 import com.djrapitops.plan.gathering.timed.ProxyTPSCounter;
 import com.djrapitops.plan.gathering.timed.SystemUsageBuffer;
 import com.djrapitops.plan.settings.upkeep.NetworkConfigStoreTask;
@@ -82,9 +83,13 @@ public interface BungeeTaskModule {
 
     @Binds
     @IntoSet
-    TaskSystem.Task bindWebAssetVersionCheckTask(WebAssetVersionCheckTask webAssetVersionCheckTask);
+    TaskSystem.Task bindActiveCookieStoreExpiryTask(ActiveCookieExpiryCleanupTask activeCookieExpiryCleanupTask);
 
     @Binds
     @IntoSet
-    TaskSystem.Task bindActiveCookieStoreExpiryTask(ActiveCookieExpiryCleanupTask activeCookieExpiryCleanupTask);
+    TaskSystem.Task bindAddressAllowListUpdateTask(AddressAllowList addressAllowList);
+
+    @Binds
+    @IntoSet
+    TaskSystem.Task bindInstalledPluginGatheringTask(InstalledPluginGatheringTask installedPluginGatheringTask);
 }