@occultus/task-api 0.23.0 → 0.23.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@occultus/task-api",
-  "version": "0.23.0",
+  "version": "0.23.2",
   "repository": {
     "type": "git",
     "url": "https://codeberg.org/TeamOccultus/StarTenonAPI"
@@ -27,7 +27,7 @@
     "@occultus/format-api": "0.21.0",
     "@occultus/toolkit": "0.24.0",
     "@occultus/text-api": "0.24.0",
-    "@occultus/condition-api": "0.23.0"
+    "@occultus/condition-api": "0.23.1"
   },
   "peerDependencies": {
     "@minecraft/server": "^2.4.0",

package/src/api/Task.ts

@@ -1,5 +1,5 @@
 import { parseText, parseToRaw, TextProvider } from "@occultus/text-api";
-import { Player } from "@minecraft/server";
+import { Player, world } from "@minecraft/server";
 import { TaskOptions } from "../interface/TaskOptions";
 import { TaskStatus } from "../enum/TaskStatus";
 import { TaskGroup } from "./TaskGroup";
@@ -129,6 +129,12 @@ export class Task extends FormLike {
         parseToRaw(this.name, player)
       ]
     });
+    world.sendMessage({
+      rawtext: [
+        { translate: "ui.task.complete.world", with: [player.name] },
+        parseToRaw(this.name, player)
+      ]
+    });
     player.playSound(this.options.completeSound ?? "random.levelup");
   }
   /**

package/src/api/TaskServer.ts

@@ -2,13 +2,18 @@ import { EntityDamageCause, Player, world } from "@minecraft/server";
 import {
   KillEntityConditions,
   KillEntityFamilyConditions,
-  Conditions
+  Conditions,
+  ItemConditions,
+  ItemTagConditions
 } from "@occultus/condition-api";
 
 import { Task } from "./Task";
 import { getFamilies } from "@occultus/toolkit";
 import { TaskStatus } from "../enum/TaskStatus";
 
+/**
+ * 用于实现任务智能提交的类
+ */
 export class TaskServer {
   private startUp() {
     world.afterEvents.entityDie.subscribe((event) => {
@@ -35,10 +40,32 @@ export class TaskServer {
         task.complete(damagingEntity);
       });
     });
+    world.afterEvents.playerInventoryItemChange.subscribe((arg) => {
+      const { player, itemStack } = arg;
+      if (!itemStack) return;
+      if (!this.items.has(itemStack.typeId)) return;
+      const task = this.items.get(itemStack.typeId);
+      if (task?.getStatus(player) === TaskStatus.Done) return;
+      task?.complete(player);
+    });
+    world.afterEvents.playerInventoryItemChange.subscribe((arg) => {
+      const { player, itemStack } = arg;
+      if (!itemStack) return;
+      const itemTags = itemStack.getTags();
+      if (!itemTags || itemTags.length === 0) return;
+      itemTags.forEach((tag) => {
+        if (!this.itemTags.has(tag)) return;
+        const tagTask = this.itemTags.get(tag);
+        if (tagTask?.getStatus(player) === TaskStatus.Done) return;
+        tagTask?.complete(player);
+      });
+    });
     console.log("[Occultus SDK] Task Server Started");
   }
   entities: Map<string, Task> = new Map();
   families: Map<string, Task> = new Map();
+  items: Map<string, Task> = new Map();
+  itemTags: Map<string, Task> = new Map();
   constructor() {
     this.startUp();
   }
@@ -49,10 +76,27 @@ export class TaskServer {
     if (condition instanceof KillEntityFamilyConditions) {
       this.families.set(condition.family, bindTo);
     }
+    if (condition instanceof ItemConditions) {
+      this.items.set(condition.itemType, bindTo);
+    }
+    if (condition instanceof ItemTagConditions) {
+      this.itemTags.set(condition.tag, bindTo);
+    }
   }
-  addTask(task: Task) {
-    task.options.conditions.forEach((condition) => {
-      this.addCondition(condition, task);
-    });
+  /**
+   * 向任务服务器添加任务，以启用智能提交功能
+   * 
+   * **IMPORTANT: 倘若启用智能提交功能，则当玩家完成`conditons`数组中任意条件时，任务都会自动设置为已完成状态**
+   * @param task
+   */
+  addTask(...task: Task[]) {
+    if (Array.isArray(task)) {
+      task.forEach((task) => {
+        task.options.conditions.forEach((condition) =>
+          this.addCondition(condition, task)
+        );
+      });
+      return;
+    }
   }
 }