@occultus/task-api 0.21.0-beta.0 → 0.21.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@occultus/task-api",
-  "version": "0.21.0-beta.0",
+  "version": "0.21.0-beta.2",
   "repository": {
     "type": "git",
     "url": "https://codeberg.org/TeamOccultus/StarTenonAPI"
@@ -24,8 +24,8 @@
   "author": "CTN Studios",
   "type": "module",
   "dependencies": {
-    "@occultus/format-api": "0.21.0-beta.0",
-    "@occultus/entity-api": "0.20.0",
+    "@occultus/format-api": "0.21.0-beta.2",
+    "@occultus/entity-api": "0.21.0-beta.2",
     "@occultus/text-api": "0.20.0",
     "@occultus/item-api": "0.20.0"
   },

package/src/api/Task.ts

@@ -4,9 +4,10 @@ import { TaskOptions } from "../interface/TaskOptions";
 import { TaskStatus } from "../enum/TaskStaus";
 import { TaskGroup } from "./TaskGroup";
 import { TaskCenter } from "./TaskCenter";
-import { MessageFormData } from "@minecraft/server-ui";
+import { ActionFormData } from "@minecraft/server-ui";
 import { TaskUtils } from "../utils/TaskUtils";
 import { LockedScreen } from "../ui/LockedScreen";
+import { TaskServer } from "./TaskServer";
 
 export class Task {
   /**
@@ -31,16 +32,16 @@ export class Task {
       this.lockedDisplay(player, backTo);
       return;
     }
-    const form = new MessageFormData();
+    const form = new ActionFormData();
     form.title(parseText(this.name, player));
     form.body(TaskUtils.generateTaskBody(this, player));
-    form.button1({ translate: "gui.back" });
+    form.button({ translate: "gui.back" });
     if (this.getStatus(player) === TaskStatus.Done) {
       // 任务已完成
-      form.button2({ translate: "ui.task.done" });
+      form.button({ translate: "ui.task.done" });
     } else {
       // 提交任务
-      form.button2({ translate: "ui.task.submit" });
+      form.button({ translate: "ui.task.submit" });
     }
     form.show(player).then((result) => {
       if (result.selection === 1) {
@@ -128,4 +129,13 @@ export class Task {
     });
     player.playSound(this.options.completeSound ?? "random.levelup");
   }
+  /**
+   * 直接将任务上传到服务端监听器中
+   * 
+   * **IMPORTANT: 除非任务使用的条件有特殊说明，否则此方法一般无用**
+   * @param server 
+   */
+  pushToServer(server: TaskServer){
+    server.addTask(this);
+  }
 }

package/src/api/TaskServer.ts

@@ -1,12 +1,9 @@
-import {
-  EntityDamageCause,
-  Player,
-  world,
-} from "@minecraft/server";
+import { EntityDamageCause, Player, world } from "@minecraft/server";
 import { KillEntityConditions } from "./conditions/KillEntityCondition";
 import { KillEntityFamilyConditions } from "./conditions/KillEntityFamilyCondition";
 import { TaskConditions } from "./conditions/TaskConditions";
 import { Task } from "./Task";
+import { getFamilies } from "@occultus/entity-api";
 
 export class TaskServer {
   private startUp() {
@@ -21,13 +18,17 @@ export class TaskServer {
     });
     world.afterEvents.entityDie.subscribe((event) => {
       const { deadEntity, damageSource } = event;
-      const task = this.entities.get(deadEntity.typeId);
-      if (!task) return;
+      const damagingEntity = damageSource.damagingEntity;
       if (damageSource.cause !== EntityDamageCause.entityAttack) return;
-      if (!damageSource.damagingEntity) return;
-      if (!(damageSource.damagingEntity instanceof Player)) return;
-      task.complete(damageSource.damagingEntity);
+      if (!damagingEntity) return;
+      if (!(damagingEntity instanceof Player)) return;
+      getFamilies(deadEntity)?.forEach((family) => {
+        const task = this.families.get(deadEntity.typeId);
+        if (!task) return;
+        task.complete(damagingEntity);
+      });
     });
+    console.log("[Occultus SDK] Task Server Started")
   }
   entities: Map<string, Task> = new Map();
   families: Map<string, Task> = new Map();
@@ -42,4 +43,9 @@ export class TaskServer {
       this.families.set(condition.family, condition.bindTo);
     }
   }
+  addTask(task: Task) {
+    task.options.conditions.forEach((condition) => {
+      this.addCondition(condition);
+    });
+  }
 }