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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@occultus/task-api",
-  "version": "0.21.0-beta.2",
+  "version": "0.21.0",
   "repository": {
     "type": "git",
     "url": "https://codeberg.org/TeamOccultus/StarTenonAPI"
@@ -24,10 +24,10 @@
   "author": "CTN Studios",
   "type": "module",
   "dependencies": {
-    "@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"
+    "@occultus/format-api": "0.21.0",
+    "@occultus/item-api": "0.20.0",
+    "@occultus/entity-api": "0.21.0",
+    "@occultus/text-api": "0.20.0"
   },
   "peerDependencies": {
     "@minecraft/server": ">=2.1.0",

package/src/api/Task.ts

@@ -1,7 +1,7 @@
 import { parseText, parseToRaw, TextProvider } from "@occultus/text-api";
 import { Player } from "@minecraft/server";
 import { TaskOptions } from "../interface/TaskOptions";
-import { TaskStatus } from "../enum/TaskStaus";
+import { TaskStatus } from "../enum/TaskStatus";
 import { TaskGroup } from "./TaskGroup";
 import { TaskCenter } from "./TaskCenter";
 import { ActionFormData } from "@minecraft/server-ui";

package/src/api/TaskCenter.ts

@@ -4,6 +4,9 @@ import { TaskCenterOptions } from "../interface/TaskCenterOptions";
 import { TaskListScreen } from "../ui/TaskListScreen";
 import { TaskUtils } from "../utils/TaskUtils";
 
+/**
+ * 表示任务中心的类，即所谓「任务书/任务面板」
+ */
 export class TaskCenter {
   constructor(
     readonly id: string,
@@ -11,6 +14,10 @@ export class TaskCenter {
     public description: TextProvider,
     public options: TaskCenterOptions
   ) {}
+  /**
+   * 向玩家展示任务中心
+   * @param player 要展示的玩家
+   */
   display(player: Player) {
     const { screen, tasks } = TaskListScreen.create(this, player);
     screen.show(player).then((response) => {

package/src/api/TaskGroup.ts

@@ -1,7 +1,7 @@
 import { Player } from "@minecraft/server";
 import { parseToRaw, TextProvider } from "@occultus/text-api";
 import { TaskGroupOptions } from "../interface/TaskGroupOptions";
-import { TaskStatus } from "../enum/TaskStaus";
+import { TaskStatus } from "../enum/TaskStatus";
 import { ActionFormData, MessageFormData } from "@minecraft/server-ui";
 import { Task } from "./Task";
 import { TaskCenter } from "./TaskCenter";

package/src/api/TaskServer.ts

@@ -4,6 +4,7 @@ import { KillEntityFamilyConditions } from "./conditions/KillEntityFamilyConditi
 import { TaskConditions } from "./conditions/TaskConditions";
 import { Task } from "./Task";
 import { getFamilies } from "@occultus/entity-api";
+import { TaskStatus } from "../enum/TaskStatus";
 
 export class TaskServer {
   private startUp() {
@@ -14,6 +15,7 @@ export class TaskServer {
       if (damageSource.cause !== EntityDamageCause.entityAttack) return;
       if (!damageSource.damagingEntity) return;
       if (!(damageSource.damagingEntity instanceof Player)) return;
+      if(task.getStatus(damageSource.damagingEntity) === TaskStatus.Done) return;
       task.complete(damageSource.damagingEntity);
     });
     world.afterEvents.entityDie.subscribe((event) => {
@@ -23,8 +25,9 @@ export class TaskServer {
       if (!damagingEntity) return;
       if (!(damagingEntity instanceof Player)) return;
       getFamilies(deadEntity)?.forEach((family) => {
-        const task = this.families.get(deadEntity.typeId);
+        const task = this.families.get(family);
         if (!task) return;
+        if(task.getStatus(damagingEntity) === TaskStatus.Done) return;
         task.complete(damagingEntity);
       });
     });
@@ -35,17 +38,17 @@ export class TaskServer {
   constructor() {
     this.startUp();
   }
-  addCondition(condition: TaskConditions) {
+  addCondition(condition: TaskConditions, bindTo: Task) {
     if (condition instanceof KillEntityConditions) {
-      this.entities.set(condition.entityType, condition.bindTo);
+      this.entities.set(condition.entityType, bindTo);
     }
     if (condition instanceof KillEntityFamilyConditions) {
-      this.families.set(condition.family, condition.bindTo);
+      this.families.set(condition.family, bindTo);
     }
   }
   addTask(task: Task) {
     task.options.conditions.forEach((condition) => {
-      this.addCondition(condition);
+      this.addCondition(condition, task);
     });
   }
 }

package/src/api/conditions/KillEntityCondition.ts

@@ -6,15 +6,14 @@ import { Localization } from "@occultus/format-api";
 /**
  * 击杀实体条件
  * 
- * **IMPORTANT: 此条件必须调用 {@link TaskConditions.pushToServer()} 方法才能生效**
+ * **IMPORTANT: 此条件必须调用 {@link Task.pushToServer()} 方法才能生效**
  */
 export class KillEntityConditions extends TaskConditions {
   /**
    * @param entityType 满足条件所需要的实体类型
    */
   constructor(
-    public entityType: string,
-    public bindTo: Task
+    public entityType: string
   ) {
     super(entityType);
   }

package/src/api/conditions/KillEntityFamilyCondition.ts

@@ -5,7 +5,7 @@ import { Task } from "../Task";
 /**
  * 击杀实体条件
  * 
- * **IMPORTANT: 此条件必须调用 {@link TaskConditions.pushToServer()} 方法才能生效**
+ * **IMPORTANT: 此条件必须调用 {@link Task.pushToServer()} 方法才能生效**
  */
 export class KillEntityFamilyConditions extends TaskConditions {
   /**
@@ -13,8 +13,7 @@ export class KillEntityFamilyConditions extends TaskConditions {
    */
   constructor(
     public family: string,
-    public localizationKey: string,
-    public bindTo: Task
+    public localizationKey: string
   ) {
     super(family);
   }

package/src/api/conditions/TaskConditions.ts

@@ -12,17 +12,6 @@ export abstract class TaskConditions {
    * @param data 任务条件所需的数据
    */
   constructor(protected data: unknown) {}
-  /**
-   * 直接将条件上传到服务端监听器中
-   * 
-   * **IMPORTANT: 除非有特殊说明，否则此方法一般无用**
-   * @param server 要上传的服务端监听器
-   * @return 条件自身
-   */
-  pushToServer(server: TaskServer): TaskConditions {
-    server.addCondition(this);
-    return this;
-  }
   /**
    * 检查玩家是否满足任务条件
    *

package/src/index.ts

@@ -3,7 +3,7 @@ export * from "./api/TaskGroup";
 export * from "./api/TaskCenter";
 export * from "./api/awards";
 export * from "./api/conditions";
-export * from "./enum/TaskStaus";
+export * from "./enum/TaskStatus";
 export * from "./interface/TaskCenterOptions";
 export * from "./interface/TaskGroupOptions";
 export * from "./interface/TaskOptions";

package/src/utils/TaskUtils.ts

@@ -9,7 +9,7 @@ import {
 import { Task } from "../api/Task";
 import { parseToRaw } from "@occultus/text-api";
 import { Format, Color } from "@occultus/format-api";
-import { TaskStatus } from "../enum/TaskStaus";
+import { TaskStatus } from "../enum/TaskStatus";
 import { TaskGroup } from "../api/TaskGroup";
 import { TaskCenter } from "../api/TaskCenter";