Merge branch 'master' into standalone-mode

# Conflicts:
#	Plan/common/src/main/java/com/djrapitops/plan/delivery/export/NetworkPageExporter.java
#	Plan/common/src/main/java/com/djrapitops/plan/delivery/export/PlayersPageExporter.java
#	Plan/common/src/main/java/com/djrapitops/plan/delivery/export/ServerPageExporter.java
#	Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/JSONFactory.java
#	Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/GraphJSONCreator.java
#	Plan/common/src/main/java/com/djrapitops/plan/delivery/web/ResourceSvc.java
#	Plan/common/src/main/java/com/djrapitops/plan/delivery/webserver/resolver/json/theme/SaveThemeJSONResolver.java
#	Plan/common/src/main/java/com/djrapitops/plan/gathering/events/PlayerJoinEventConsumer.java
#	Plan/common/src/main/java/com/djrapitops/plan/storage/database/SQLDB.java
#	Plan/common/src/main/java/com/djrapitops/plan/storage/file/PlanFiles.java
#	Plan/common/src/test/java/com/djrapitops/plan/delivery/webserver/AccessControlVisibilityTest.java
#	Plan/common/src/test/java/com/djrapitops/plan/gathering/geolocation/GeolocationTest.java
#	Plan/fabric/src/main/java/net/playeranalytics/plan/commands/FabricCommandManager.java
#	Plan/plugin/build.gradle
#	Plan/react/dashboard/src/components/cards/server/values/ServerAsNumbersCard.jsx
#	Plan/react/dashboard/src/components/table/OnlineActivityAsNumbersTable.jsx

Author: AuroraLS3

.github/dependabot.yml

@@ -33,4 +33,9 @@ updates:
     fontawesome:
       patterns:
         - "@fortawesome/*"
-    
+    fullcalendar:
+      patterns:
+        - "@fullcalendar/*"
+    reactcolorwheel:
+      patterns:
+        - "@uiw/*"

.github/workflows/ci.yml

@@ -23,7 +23,7 @@ jobs:
 
     services:
       mariadb:
-        image: mariadb:11.1-rc
+        image: mariadb:11
         ports:
           - 3306
         env:
@@ -36,25 +36,28 @@ jobs:
     steps:
       - if: ${{ github.event_name == 'push' }}
         name: 📥 Checkout git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
       - if: ${{ github.event_name == 'pull_request' }}
         name: 📥 Checkout git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.sha }}
 
       - name: ☕ Setup JDK
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: '21'
+          java-version: '25'
       - name: 💼 Setup Gradle
         uses: gradle/actions/setup-gradle@v4
-      - name: 🛠 Build jars 
+      - name: 🛠 Build jars
+        env:
+          npm_config_ignore_scripts: true
+          YARN_ENABLE_SCRIPTS: false
         run: |
           cd Plan
           ./gradlew build -x test
@@ -68,15 +71,17 @@ jobs:
           echo "versionString=$(cat build/versions/jar.txt)" >> $GITHUB_ENV
           echo "artifactPath=$(pwd)/builds" >> $GITHUB_ENV
       - name: 📤 Upload Plan.jar 
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: Plan-${{ env.versionString }}-${{ env.git_hash }}.jar
           path: ${{ env.artifactPath }}/Plan-${{ env.snapshotVersion }}.jar
+          archive: false
       - name: 📤 Upload PlanFabric.jar 
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: PlanFabric-${{ env.versionString }}-${{ env.git_hash }}.jar
           path: ${{ env.artifactPath }}/PlanFabric-${{ env.snapshotVersion }}.jar
+          archive: false
       - name: 🚦 Setup Selenium Webdriver
         uses: nanasess/setup-chromedriver@v2
       - name: 🚦 Setup Selenium Webdriver settings
@@ -100,14 +105,19 @@ jobs:
       - name: 🩺 Test 
         env:
           MYSQL_DB: test
-          MYSQL_USER: user
+          MYSQL_USER: root
           MYSQL_PASS: password
           MYSQL_PORT: ${{ job.services.mariadb.ports[3306] }}
           CHROMEDRIVER: /usr/local/bin/chromedriver
+          npm_config_ignore_scripts: true
+          YARN_ENABLE_SCRIPTS: false
         run: |
           cd Plan
           ./gradlew build
       - name: 🖨 Build Javadocs
+        env:
+          npm_config_ignore_scripts: true
+          YARN_ENABLE_SCRIPTS: false
         run: |
           cd Plan
           echo "Building javadocs with gradle"
@@ -133,6 +143,8 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          npm_config_ignore_scripts: true
+          YARN_ENABLE_SCRIPTS: false
         run: |
           cd Plan
           ./gradlew sonar -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=player-analytics-plan

.github/workflows/issues.yml

@@ -19,7 +19,7 @@ jobs:
     if: github.event_name == 'issues' && github.event.action == 'opened'
     steps:
       - name: Add issue to ${{ env.inbox }}
-        uses: leonsteinhaeuser/project-beta-automations@v1.2.1
+        uses: leonsteinhaeuser/project-beta-automations@v2.2.1
         with:
           gh_token: ${{ secrets.GITHUB_TOKEN }}
           organization: plan-player-analytics

.github/workflows/on-release.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout 🛎️
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
       - 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
@@ -29,7 +29,7 @@ jobs:
           cat versions.txt > temp.txt
           cat release_line.txt temp.txt > versions.txt
       - name: Commit and push changes
-        uses: EndBug/add-and-commit@v9
+        uses: EndBug/add-and-commit@v10
         with:
           committer_name: GitHub Actions
           committer_email: 41898282+github-actions[bot]@users.noreply.github.com
@@ -43,7 +43,7 @@ jobs:
 
     steps:
       - name: Checkout 🛎️
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
       - name: Get git TAG
         id: tagName
         uses: olegtarasov/get-tag@v2.1
@@ -54,7 +54,7 @@ jobs:
           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
+        uses: JamesIves/github-pages-deploy-action@v4
         with:
           branch: html # The branch the action should deploy to.
           folder: workingdir # The folder the action should deploy.
@@ -64,38 +64,33 @@ jobs:
     name: Ore Upload
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout 🛎️
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
       - 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
+          echo "RELEASE_JAR_PATH=$(pwd)/$(cat name.txt)" >> $GITHUB_ENV
+      - name: Setup JDK
+        uses: actions/setup-java@v5
         with:
-          plugin: ${{ github.event.release.name }}
-          description: ${{ github.event.release.body }}
-          apiKey: ${{ secrets.ORE_API_TOKEN }}
-          channel: DEV
-          pluginId: plan
-          createForumPost: false
+          distribution: 'temurin'
+          java-version: '25'
+      - name: Publish release to Ore 🚀
+        env:
+          ORE_TOKEN: ${{ secrets.ORE_API_TOKEN }}
+          RELEASE_CHANGELOG: ${{ github.event.release.body }}
+          RELEASE_PRERELEASE: ${{ github.event.release.prerelease }}
+          RELEASE_JAR_PATH: ${{ env.RELEASE_JAR_PATH }}
+          npm_config_ignore_scripts: true
+          YARN_ENABLE_SCRIPTS: false
+        run: |
+          cd Plan
+          ./gradlew :plugin:publishToOre
 
   upload_release_curseforge:
     name: CurseForge Upload
@@ -119,7 +114,7 @@ jobs:
           changelog: ${{ github.event.release.body }}
           changelog_type: markdown
           display_name: ${{ github.event.release.name }}
-          game_versions: "Java 21,1.21.3,Fabric"
+          game_versions: "2:Java 25,86297:26.2,68441:Fabric"
           release_type: release
           relations: fabric-api:requiredDependency,luckperms:optionalDependency
       - name: Upload prerelease to CurseForge 🚀
@@ -133,6 +128,107 @@ jobs:
           changelog: ${{ github.event.release.body }}
           changelog_type: markdown
           display_name: ${{ github.event.release.name }}
-          game_versions: "Java 21,1.21.3,Fabric"
+          game_versions: "2:Java 25,83806:26.1,68441:Fabric"
           release_type: beta
           relations: fabric-api:requiredDependency,luckperms:optionalDependency
+
+  upload_release_hangar:
+    name: Hangar Upload
+    runs-on: ubuntu-latest
+    steps:
+      - name: 📥 Checkout git repository
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+      - 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: ☕ Setup JDK
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: '25'
+      - name: Publish release to Hangar 🚀
+        env:
+          HANGAR_API_TOKEN: ${{ secrets.HANGAR_API_TOKEN }}
+          RELEASE_CHANGELOG: ${{ github.event.release.body }}
+          RELEASE_PRERELEASE: ${{ github.event.release.prerelease }}
+          RELEASE_DOWNLOAD_URL: ${{ env.RELEASE_DOWNLOAD_URL }}
+          npm_config_ignore_scripts: true
+          YARN_ENABLE_SCRIPTS: false
+        run: |
+          cd Plan
+          ./gradlew :plugin:publishPluginPublicationToHangar
+
+  upload_release_modrinth:
+    name: Modrinth Upload
+    runs-on: ubuntu-latest
+    steps:
+      - name: Calculate formatted version
+        run: |
+          TAG_NAME="${{ github.event.release.tag_name }}"
+          # 5.7.xxxx -> 5.7+build.xxxx
+          FORMATTED_VERSION=$(echo "$TAG_NAME" | sed -r 's/([0-9]+\.[0-9]+)\.(.*)/\1+build.\2/')
+          echo "FORMATTED_VERSION=$FORMATTED_VERSION" >> $GITHUB_ENV
+      - name: Download release artifacts for upload
+        run: |
+          # Fetch all assets
+          curl 'https://api.github.com/repos/plan-player-analytics/plan/releases/${{ github.event.release.id }}/assets' > all_assets.json
+          
+          # Download regular JAR (non-Fabric)
+          jq -r '.[] | {name: .name, url: .browser_download_url} | select(.url | strings | test("Fabric") | not)' all_assets.json > asset_regular.txt
+          jq -r '.url' asset_regular.txt > url_regular.txt
+          jq -r '.name' asset_regular.txt > name_regular.txt
+          wget -i url_regular.txt
+          echo "REGULAR_JAR=$(cat name_regular.txt)" >> $GITHUB_ENV
+          
+          # Download Fabric JAR
+          jq -r '.[] | {name: .name, url: .browser_download_url} | select(.url | strings | test("Fabric"))' all_assets.json > asset_fabric.txt
+          jq -r '.url' asset_fabric.txt > url_fabric.txt
+          jq -r '.name' asset_fabric.txt > name_fabric.txt
+          wget -i url_fabric.txt
+          echo "FABRIC_JAR=$(cat name_fabric.txt)" >> $GITHUB_ENV
+
+      - name: Modrinth Upload - Plugin 🚀
+        uses: Kira-NT/mc-publish@v3.3
+        with:
+          modrinth-id: wJQfHhxh
+          modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+          files: ${{ env.REGULAR_JAR }}
+          name: ${{ github.event.release.name }}
+          version: ${{ env.FORMATTED_VERSION }}
+          changelog: ${{ github.event.release.body }}
+          loaders: |
+            bukkit
+            spigot
+            paper
+            folia
+            purpur
+            bungeecord
+            waterfall
+            velocity
+            sponge
+            nukkit
+          game-versions: |
+            >=1.13
+          version-type: ${{ github.event.release.prerelease && 'beta' || 'release' }}
+
+      - name: Modrinth Upload - Fabric 🚀
+        uses: Kira-NT/mc-publish@v3.3
+        with:
+          modrinth-id: plan
+          modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+          files: ${{ env.FABRIC_JAR }}
+          name: ${{ github.event.release.name }}
+          version: ${{ env.FORMATTED_VERSION }}+fabric
+          changelog: ${{ github.event.release.body }}
+          loaders: |
+            fabric
+          game-versions: |
+            >=26.2
+          version-type: ${{ github.event.release.prerelease && 'beta' || 'release' }}
+          dependencies: |
+            P7dR8mSH(required)
+            Vebnzrzj(optional)

Plan/api/build.gradle

@@ -11,7 +11,7 @@ compileJava {
     options.release = 8
 }
 
-def apiVersion = "5.7-R0.1"
+def apiVersion = "5.7-R0.2"
 
 publishing {
     repositories {

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

@@ -26,6 +26,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
+import java.util.function.Function;
 
 /**
  * Represents URI parameters described with {@code ?param=value&param2=value2} in the URL.
@@ -98,6 +99,10 @@ public Optional<String> get(String key) {
         return Optional.ofNullable(byKey.get(key));
     }
 
+    public <T> Optional<T> get(String key, Function<String, T> function) {
+        return get(key).map(function);
+    }
+
     public String asString() {
         if (byKey.isEmpty()) return "";
 

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

@@ -37,6 +37,12 @@ public enum CallEvents {
      * Method calls are asynchronous.
      */
     PLAYER_JOIN,
+    /**
+     * This event represents call to player methods while player is online.
+     * <p>
+     * The call is made periodically from an async task.
+     */
+    PLAYER_PERIODICAL,
     /**
      * This event represents a call to player methods on a Player Leave event.
      * <p>