Add ECO-Reward notification & fix

Author: DWCarrot

.github/workflows/package-publish.yml

@@ -13,8 +13,6 @@ name: Publish to GitHub Packages
 run-name: 'Package Publish #${{github.run_number}}'
 
 on:
-  release:
-    types: [published]
   workflow_dispatch:
 
 jobs:
@@ -36,7 +34,7 @@ jobs:
           distribution: 'oracle'
 
       - name: Publish to GitHub Packages Apache Maven
-        run: ./gradlew publish -i
+        run: ./gradlew publishToGithubPackage
         env:
           MAVEN_PUBLISH_URL: https://maven.pkg.github.com/${{github.repository}}
           MAVEN_PUBLISH_USERNAME: ${{github.actor}}

.gitignore

@@ -1,5 +1,6 @@
 # User-specific stuff
 .idea/
+.vscode/
 
 *.iml
 *.ipr

Jenkinsfile

@@ -6,7 +6,7 @@ pipeline {
                 jdk "jdk17"
             }
             steps {
-                sh './gradlew publish'
+                sh './gradlew publishToNyaaCatCILocal'
             }
         }
     }

README.md

@@ -1,6 +1,8 @@
+
 # PlayTimeTracker
 Playtime tracking plugin for ~~Bukkit/Spigot~~ PaperMC
 
+
 ## Configuration
 
 ### missions.yml
@@ -58,6 +60,122 @@ missions:
 5. **If you modified `gradle.properties` under this repo, When committing changes, make sure to remove what you add in step 3. so that `GITHUB_TOKEN` is not exposed.**
 
 
+## Change Log
+
+### 0.9-SNAPSHOT
+
+- [Tech] port to 1.21.1 and CI migration;
+- [Tech] publish to github packages
+- **[BREAKING] Abandon support for other Bukkit/Spigot, Only support PaperMC ** 
+
+  we don't have enough effort for different distributions
+
+### 0.10-alpha.1
+
+- [Feature] **Rewards storage & any-time acquire**: Now rewards will be record when a mission is completed, and you can use `/ptt acquire` to acquire it at anytime, no need to worry about missing it!
+
+- [Feature/WIP] Reward Module instead of use command all the time. Currently only support ECO Rewards. Command Rewards and Item Rewards are WIP.
+
+- [Feature] Add `/ptt listrewards <missionName|all>` to show rewards awaiting for acquiring.
+
+- [Configuration] `missions.yml` :
+
+  ```yaml
+  missions:
+    eco:
+      __class__: cat.nyaa.playtimetracker.config.data.MissionData
+      group: []
+      expression: lastSeen>1&&dailyTime>1&&weeklyTime>1&&monthlyTime>1&&totalTime>1&&1==2
+      reset-daily: true
+      reset-weekly: false
+      reset-monthly: false
+      reward-list: # can be multiple rewards; the key is not important, but reward will be executed in key order
+        reward1:
+          __class__: cat.nyaa.playtimetracker.config.data.EcoRewardData
+          type: TRANSFER  # TRANSFER, ADD
+          ref-vault: $system # "$system" or player uuid
+          ratio: 0.01
+          min: 1.0
+          max: 1024.0
+          vault: $system # "$system" or player uuid  # same as /eco transfer 0.01:1:1024:$system $system %player_name%
+      notify: true
+    daily:
+      __class__: cat.nyaa.playtimetracker.config.data.MissionData
+      group: []
+      expression: dailyTime>3600000
+      reset-daily: true
+      reset-weekly: false
+      reset-monthly: false
+      reward-list:
+        reward2:
+          __class__: cat.nyaa.playtimetracker.config.data.EcoRewardData
+          type: ADD
+          amount: 100 # same as /eco add 100 %player%
+      notify: true
+  ```
+
+- [Configuration] lang
+
+  - `command.listrewards.*`
+  - `manual.listrewards.*`
+
+  ```yaml
+  command:
+    listrewards:
+      show_all: 有 %s 个任务奖励待领取
+      show: 有 %s 个 %s 任务奖励待领取
+      empty_all: 没有可以领取的任务奖励
+      empty: 没有可以领取的 %s 任务奖励
+  manual:
+    listrewards:
+      description: 查看所有奖励
+      usage: /ptt listrewards <奖励名称|all>
+  ```
+
+- [Tech] Add some Unit Tests.
+
+- [Tech] Recover to use NyaaCat CI
+
+### 0.10-alpha.2
+
+- [Feature] Add notification for ECO Rewards. Now when acquire ECO Rewards, it displays how much you get.
+
+- [Feature] `/ptt listrewards all` now display detailed information of how many rewards for each mission.
+
+- [Configuration] lang
+
+  - `command.listrewards.err`
+
+  - `command.listrewards.show_item`
+
+  - `message.reward.notify` for login notification
+
+  - `message.reward.eco` for ECO Rewards acquiring detailed information
+
+  ```yaml
+  command:
+    listrewards:
+      err: 查询失败
+      show_item: "- 任务 %s: %s"  # first %s is mission name; second %s is rewards count
+  message:
+    reward:
+      notify:
+        command: /ptt acquire
+        msg: 您有 %s 个任务奖励可以领取
+      eco:
+        success: 经济奖励%s%s已经添加到您的账户  # first %s is amount; second %s is eco-unit
+  ```
+
+- [Fix] Database wrapper log
+
+- [Fix] remove `NotifyAcquireTask` since it should not work.
+
+- [Fix] pipeline for github-package and NyaaCat CI
+
+- [Tech/WIP] PaperMC Adventure for messages instead of legacy Bukkit API
+
+
+
 ## TODO
 
 #### 0.10-alpha
@@ -69,13 +187,17 @@ missions:
 
 - [ ] add reward module: command
 - [ ] add reward module: item
-- [ ] logging system
+- [x] logging system
+- [ ] i18n: https://docs.papermc.io/paper/dev/component-api/i18n#examples
+- [ ] mission completion notification (sound or Advancement)
 
 #### 1.0
-
+- [ ] Use time-wheel instead of 1gt polling
+   - [ ] Optimize Expressions
+   - [ ] calculate next mission completion time
+   - [ ] time-wheel for mission completion
+   - [ ] command for querying next mission completion time
 - [ ] Make all db operations async
    - [ ] Remove `cat.nyan.playtimetracker.db.connection`
    - [ ] Make `CachedXXXTable` and async methods
-- [ ] Use time-wheel instead of 1gt polling
-- [ ] Optimize Expressions
-
+- [ ] disable plugin: self-disable

build.gradle.kts

@@ -10,7 +10,7 @@ val paperApiName = "1.21.1-R0.1-SNAPSHOT"
 
 // Version used for distribution. Different from maven repo
 group = "cat.nyaa"
-version = "0.10-alpha.1"
+version = "0.10-alpha.2"
 
 java {
     // Configure the java toolchain. This allows gradle to auto-provision JDK 21 on systems that only have JDK 8 installed for example.
@@ -69,7 +69,7 @@ publishing {
     }
     repositories {
         maven {
-            name = "maven-publish"
+            name = "GithubPackage"
             url = uri(System.getenv("MAVEN_PUBLISH_URL") ?: layout.buildDirectory.dir("repo"))
             val mavenUsername = System.getenv("MAVEN_PUBLISH_USERNAME")
             val mavenPassword = System.getenv("MAVEN_PUBLISH_PASSWORD")
@@ -80,9 +80,24 @@ publishing {
                 }
             }
         }
+        maven {
+            name = "NyaaCatCILocal"
+            //local maven repository
+            url = uri("file://${System.getenv("MAVEN_DIR")}")
+        }
     }
 }
 
+// Custom tasks for publishing to specific repositories
+tasks.register("publishToGithubPackage") {
+    dependsOn("publishMavenJavaPublicationToGithubPackageRepository")
+    // auto generated task: publish<PublicationName>PublicationTo<RepositoryName>Repository
+}
+
+tasks.register("publishToNyaaCatCILocal") {
+    dependsOn("publishMavenJavaPublicationToNyaaCatCILocalRepository")
+}
+
 
 tasks {
 

src/main/java/cat/nyaa/playtimetracker/PlayTimeTracker.java

@@ -36,6 +36,8 @@ public final class PlayTimeTracker extends JavaPlugin implements IEconomyCorePro
     @Nullable
     private TimeRecordManager timeRecordManager;
     @Nullable
+    private PlayerRewardManager rewardManager;
+    @Nullable
     private PlayerMissionManager missionManager;
     @Nullable
     private Plugin essentialsPlugin;
@@ -94,8 +96,10 @@ public void onEnable() {
         this.afkManager = new PlayerAFKManager(this);
         //record
         this.timeRecordManager = new TimeRecordManager(this, databaseManager.getTimeTrackerConnection());
+        //reward
+        this.rewardManager = new PlayerRewardManager(this, databaseManager.getRewardsConnection());
         //Mission
-        this.missionManager = new PlayerMissionManager(this, pttConfiguration, timeRecordManager, databaseManager.getCompletedMissionConnection(), databaseManager.getRewardsConnection());
+        this.missionManager = new PlayerMissionManager(this, pttConfiguration, timeRecordManager, rewardManager, databaseManager.getCompletedMissionConnection());
     }
 
     @Nullable
@@ -123,6 +127,11 @@ public TimeRecordManager getTimeRecordManager() {
         return timeRecordManager;
     }
 
+    @Nullable
+    public PlayerRewardManager getRewardManager() {
+        return rewardManager;
+    }
+
     @Nullable
     public PlayerMissionManager getMissionManager() {
         return missionManager;