@occultus/task-api 0.22.1 → 0.23.0-alpha

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@occultus/task-api",
-  "version": "0.22.1",
+  "version": "0.23.0-alpha",
   "repository": {
     "type": "git",
     "url": "https://codeberg.org/TeamOccultus/StarTenonAPI"
@@ -25,14 +25,14 @@
   "type": "module",
   "dependencies": {
     "@occultus/format-api": "0.21.0",
+    "@occultus/toolkit": "0.23.5",
     "@occultus/condition-api": "0.22.1",
-    "@occultus/toolkit": "0.23.3",
     "@occultus/text-api": "0.23.0"
   },
   "peerDependencies": {
     "@minecraft/server": "^2.4.0",
     "@minecraft/server-ui": "^2.0.0",
-    "@occultus/core": "~0.18.4"
+    "@occultus/core": "1.1.0-rc.1"
   },
   "devDependencies": {
     "typedoc": "^0.28.16"

package/src/api/Task.ts

@@ -8,8 +8,9 @@ import { ActionFormData } from "@minecraft/server-ui";
 import { TaskUtils } from "../utils/TaskUtils";
 import { LockedScreen } from "../ui/LockedScreen";
 import { TaskServer } from "./TaskServer";
+import { FormLike } from "@occultus/core";
 
-export class Task {
+export class Task extends FormLike {
   /**
    * @param id 任务的唯一标识符
    * @param name 任务名称
@@ -21,13 +22,15 @@ export class Task {
     public name: TextProvider,
     public description: TextProvider,
     public options: TaskOptions
-  ) {}
+  ) {
+    super();
+  }
   /**
    * 向玩家展示任务
    * @param player 要展示任务的玩家
    * @param backTo 关闭任务 UI 后返回的界面
    */
-  display(player: Player, backTo?: Task | TaskCenter | TaskGroup) {
+  display(player: Player, backTo: FormLike[]) {
     if (this.getStatus(player) === TaskStatus.Locked) {
       this.lockedDisplay(player, backTo);
       return;
@@ -45,17 +48,16 @@ export class Task {
     }
     form.show(player).then((result) => {
       if (result.selection === 1) {
-        if (this.getStatus(player) === TaskStatus.Done) return;
+        if (this.getStatus(player) === TaskStatus.Done)
+          return this.quit(player, backTo);
         if (this.checkConditions(player)) {
           this.complete(player);
-          return;
+          return this.quit(player, backTo);
         }
         player.sendMessage(TaskUtils.generateFailMessage(this, player));
-        return;
-      }
-      if (backTo) {
-        backTo.display(player);
+        return this.quit(player, backTo);
       }
+      this.quit(player, backTo);
     });
   }
   /**
@@ -75,17 +77,16 @@ export class Task {
       return true;
     return false;
   }
-  protected lockedDisplay(
-    player: Player,
-    backTo?: Task | TaskCenter | TaskGroup
-  ) {
+  protected lockedDisplay(player: Player, backTo: FormLike[]) {
     const screen = LockedScreen.create(this, player);
     screen.show(player).then((response) => {
-      if (this.options.previousTask === "none") return;
+      if (this.options.previousTask === "none")
+        return this.quit(player, backTo);
       if (response.selection === 1) {
-        this.options.previousTask.display(player, this);
+        const previous = this.options.previousTask;
+        this.jumpTo(player, previous, backTo);
       }
-      backTo?.display(player);
+      this.quit(player, backTo);
     });
   }
   /**

package/src/api/TaskCenter.ts

@@ -3,28 +3,35 @@ import { TextProvider } from "@occultus/text-api";
 import { TaskCenterOptions } from "../interface/TaskCenterOptions";
 import { TaskListScreen } from "../ui/TaskListScreen";
 import { TaskUtils } from "../utils/TaskUtils";
+import { FormLike } from "@occultus/core";
 
 /**
  * 表示任务中心的类，即所谓「任务书/任务面板」
  */
-export class TaskCenter {
+export class TaskCenter extends FormLike {
   constructor(
     readonly id: string,
     public name: TextProvider,
     public description: TextProvider,
     public options: TaskCenterOptions
-  ) {}
+  ) {
+    super();
+  }
   /**
    * 向玩家展示任务中心
    * @param player 要展示的玩家
    */
-  display(player: Player) {
+  display(player: Player, backTo: FormLike[]) {
     const { screen, tasks } = TaskListScreen.create(this, player);
     screen.show(player).then((response) => {
-      if (response.canceled) return;
-      if (response.selection === undefined) return;
-      tasks[response.selection].display(player, this);
-    });
+      if (response.canceled) return this.quit(player, backTo);
+      if (response.selection === undefined) return this.quit(player, backTo);
+      this.jumpTo(player, tasks[response.selection], backTo);
+      return this.quit(player, backTo);
+    }).catch(err=>{
+      console.error(err);
+      this.quit(player, backTo);
+    })
   }
   addTrigger(itemComponent?: string, command?: CustomCommand) {
     if (itemComponent) TaskUtils.registryComponent(itemComponent, this);

package/src/api/TaskGroup.ts

@@ -6,42 +6,52 @@ import { Task } from "./Task";
 import { TaskCenter } from "./TaskCenter";
 import { LockedScreen } from "../ui/LockedScreen";
 import { TaskListScreen } from "../ui/TaskListScreen";
+import { FormLike } from "@occultus/core";
 
-export class TaskGroup {
+export class TaskGroup extends FormLike {
   constructor(
     readonly id: string,
     public name: TextProvider,
     public description: TextProvider,
     public options: TaskGroupOptions
-  ) {}
-  display(player: Player, backTo?: Task | TaskCenter | TaskGroup) {
+  ) {
+    super();
+  }
+  display(player: Player, backTo: FormLike[]) {
     if (this.getStatus(player) === TaskStatus.Locked) {
-      this.lockedDisplay(player);
+      this.lockedDisplay(player, backTo);
       return;
     }
     const { screen, tasks } = TaskListScreen.create(this, player);
-    screen.show(player).then((response) => {
-      if (response.canceled) {
-        return backTo?.display(player);
-      }
-      if (response.selection === undefined) {
-        return backTo?.display(player);
-      }
-      if (response.selection === 0) {
-        if (this.hasOwnedAward(player)) {
-          // 你已经领取过该奖励！
-          player.onScreenDisplay.setActionBar({
-            translate: "ui.taskGroup.award.owned"
-          });
-          return;
+    screen
+      .show(player)
+      .then((response) => {
+        if (response.canceled) {
+          return this.quit(player, backTo);
         }
-        if (this.getStatus(player) === TaskStatus.Done) {
-          this.giveAward(player);
+        if (response.selection === undefined) {
+          return this.quit(player, backTo);
         }
-        return;
-      }
-      tasks[response.selection - 1].display(player, this);
-    });
+        if (response.selection === 0) {
+          if (this.hasOwnedAward(player)) {
+            // 你已经领取过该奖励！
+            player.onScreenDisplay.setActionBar({
+              translate: "ui.taskGroup.award.owned"
+            });
+            return this.quit(player, backTo);
+          }
+          if (this.getStatus(player) === TaskStatus.Done) {
+            this.giveAward(player);
+          }
+          return this.quit(player, backTo);
+        }
+        const selected = tasks[response.selection - 1];
+        this.jumpTo(player, selected, backTo);
+      })
+      .catch((err) => {
+        console.log(err);
+        this.quit(player, backTo);
+      });
   }
   isVisible(player: Player): boolean {
     if (this.isAvailable(player)) return true;
@@ -74,17 +84,16 @@ export class TaskGroup {
   ownAward(player: Player) {
     player.addTag(`taskGroup.${this.id}.award`);
   }
-  protected lockedDisplay(
-    player: Player,
-    backTo?: Task | TaskCenter | TaskGroup
-  ) {
+  protected lockedDisplay(player: Player, backTo: FormLike[]) {
     const screen = LockedScreen.create(this, player);
     screen.show(player).then((response) => {
-      if (this.options.previousTask === "none") return;
+      if (this.options.previousTask === "none")
+        return this.quit(player, backTo);
       if (response.selection === 1) {
-        this.options.previousTask.display(player, this);
+        const previous = this.options.previousTask;
+        this.jumpTo(player, previous, backTo);
       }
-      backTo?.display(player);
+      this.quit(player, backTo);
     });
   }
   protected giveAward(player: Player) {