@occultus/task-api 0.21.0 → 0.22.0-alpha.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@occultus/task-api",
-  "version": "0.21.0",
+  "version": "0.22.0-alpha.2",
   "repository": {
     "type": "git",
     "url": "https://codeberg.org/TeamOccultus/StarTenonAPI"
@@ -25,9 +25,9 @@
   "type": "module",
   "dependencies": {
     "@occultus/format-api": "0.21.0",
-    "@occultus/item-api": "0.20.0",
-    "@occultus/entity-api": "0.21.0",
-    "@occultus/text-api": "0.20.0"
+    "@occultus/condition-api": "0.22.0-alpha.2",
+    "@occultus/text-api": "0.20.0",
+    "@occultus/toolkit": "0.22.0"
   },
   "peerDependencies": {
     "@minecraft/server": ">=2.1.0",

package/src/api/TaskGroup.ts

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

package/src/api/TaskServer.ts

@@ -1,9 +1,12 @@
 import { EntityDamageCause, Player, world } from "@minecraft/server";
-import { KillEntityConditions } from "./conditions/KillEntityCondition";
-import { KillEntityFamilyConditions } from "./conditions/KillEntityFamilyCondition";
-import { TaskConditions } from "./conditions/TaskConditions";
+import {
+  KillEntityConditions,
+  KillEntityFamilyConditions,
+  Conditions,
+} from "@occultus/condition-api";
+
 import { Task } from "./Task";
-import { getFamilies } from "@occultus/entity-api";
+import { getFamilies } from "@occultus/toolkit";
 import { TaskStatus } from "../enum/TaskStatus";
 
 export class TaskServer {
@@ -15,7 +18,8 @@ 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;
+      if (task.getStatus(damageSource.damagingEntity) === TaskStatus.Done)
+        return;
       task.complete(damageSource.damagingEntity);
     });
     world.afterEvents.entityDie.subscribe((event) => {
@@ -27,18 +31,18 @@ export class TaskServer {
       getFamilies(deadEntity)?.forEach((family) => {
         const task = this.families.get(family);
         if (!task) return;
-        if(task.getStatus(damagingEntity) === TaskStatus.Done) return;
+        if (task.getStatus(damagingEntity) === TaskStatus.Done) return;
         task.complete(damagingEntity);
       });
     });
-    console.log("[Occultus SDK] Task Server Started")
+    console.log("[Occultus SDK] Task Server Started");
   }
   entities: Map<string, Task> = new Map();
   families: Map<string, Task> = new Map();
   constructor() {
     this.startUp();
   }
-  addCondition(condition: TaskConditions, bindTo: Task) {
+  addCondition(condition: Conditions, bindTo: Task) {
     if (condition instanceof KillEntityConditions) {
       this.entities.set(condition.entityType, bindTo);
     }

package/src/api/awards/ItemAwards.ts

@@ -1,7 +1,6 @@
 import { ItemStack, Player } from "@minecraft/server";
-import { TextProvider } from "@occultus/text-api";
 import { TaskAwards } from "./TaskAwards";
-import { giveItem } from "@occultus/entity-api";
+import { giveItem } from "@occultus/toolkit";
 
 export class ItemAwards extends TaskAwards {
   constructor(

package/src/index.ts

@@ -1,8 +1,10 @@
+/**
+ * @module @occultus/task-api
+ */
 export * from "./api/Task";
 export * from "./api/TaskGroup";
 export * from "./api/TaskCenter";
 export * from "./api/awards";
-export * from "./api/conditions";
 export * from "./enum/TaskStatus";
 export * from "./interface/TaskCenterOptions";
 export * from "./interface/TaskGroupOptions";

package/src/interface/TaskOptions.ts

@@ -1,6 +1,6 @@
 import { TextProvider } from "@occultus/text-api";
 import { TaskAwards } from "../api/awards/TaskAwards";
-import { TaskConditions } from "../api/conditions/TaskConditions";
+import { Conditions } from "@occultus/condition-api";
 import { Task } from "../api/Task";
 
 /**
@@ -15,7 +15,7 @@ export interface TaskOptions {
   /**
    * 任务完成所需满足的条件列表
    */
-  conditions: TaskConditions[];
+  conditions: Conditions[];
   
   /**
    * 前置任务

package/src/api/conditions/ItemConditions.ts

@@ -1,52 +0,0 @@
-import { ItemStack, Player } from "@minecraft/server";
-import { TaskConditions } from "./TaskConditions";
-import { getItemAmountInContainer } from "@occultus/item-api";
-
-/**
- * 物品条件
- */
-export class ItemConditions extends TaskConditions {
-  /**
-   * @param itemType 满足条件所需要的物品类型
-   * @param amount 满足条件所需要的物品数量，默认为 1
-   */
-  constructor(
-    protected itemType: string,
-    protected amount?: number
-  ) {
-    super(itemType);
-  }
-  getItem(){
-    return new ItemStack(this.itemType, this.amount)
-  }
-  check(player: Player) {
-    const container = player.getComponent("minecraft:inventory")?.container;
-    if (!container) return false;
-    const amount = getItemAmountInContainer(
-      container,
-      this.getItem().typeId
-    );
-    return amount >= this.getItem().amount;
-  }
-  getTextProvider(){
-    return {
-      rawtext: [
-        { translate: this.getItem().localizationKey },
-        { text: " × " },
-        { text: this.getItem().amount.toString() },
-      ],
-    };
-  };
-  getFailedReason(){
-    return {
-      rawtext: [
-        // 你缺少这些物品：
-        { translate: "task.condition.item.failed" },
-        { text: " " },
-        { translate: this.getItem().localizationKey },
-        { text: " × " },
-        { text: this.getItem().amount.toString() },
-      ],
-    }
-  };
-}

package/src/api/conditions/KillEntityCondition.ts

@@ -1,42 +0,0 @@
-import { Player } from "@minecraft/server";
-import { TaskConditions } from "./TaskConditions";
-import { Task } from "../Task";
-import { Localization } from "@occultus/format-api";
-
-/**
- * 击杀实体条件
- * 
- * **IMPORTANT: 此条件必须调用 {@link Task.pushToServer()} 方法才能生效**
- */
-export class KillEntityConditions extends TaskConditions {
-  /**
-   * @param entityType 满足条件所需要的实体类型
-   */
-  constructor(
-    public entityType: string
-  ) {
-    super(entityType);
-  }
-  check(player: Player) {
-    return false;
-  }
-  getTextProvider() {
-    return {
-      rawtext: [
-        // 击杀实体：
-        { translate: "task.condition.killentity" },
-        { translate: Localization.getEntityKey(this.entityType) },
-      ],
-    };
-  }
-  getFailedReason() {
-    return {
-      rawtext: [
-        // 你需要击杀实体：
-        { translate: "task.condition.killentity.failed" },
-        { text: " " },
-        { translate: Localization.getEntityKey(this.entityType) },
-      ],
-    };
-  }
-}

package/src/api/conditions/KillEntityFamilyCondition.ts

@@ -1,42 +0,0 @@
-import { Player } from "@minecraft/server";
-import { TaskConditions } from "./TaskConditions";
-import { Task } from "../Task";
-
-/**
- * 击杀实体条件
- * 
- * **IMPORTANT: 此条件必须调用 {@link Task.pushToServer()} 方法才能生效**
- */
-export class KillEntityFamilyConditions extends TaskConditions {
-  /**
-   * @param family 满足条件所需要的实体类型
-   */
-  constructor(
-    public family: string,
-    public localizationKey: string
-  ) {
-    super(family);
-  }
-  check(player: Player) {
-    return false;
-  }
-  getTextProvider() {
-    return {
-      rawtext: [
-        // 击杀此类实体：
-        { translate: "task.condition.killEntityFamily" },
-        { translate: this.localizationKey },
-      ],
-    };
-  }
-  getFailedReason() {
-    return {
-      rawtext: [
-        // 你需要击杀此类实体：
-        { translate: "task.condition.killEntityFamily.failed" },
-        { text: " " },
-        { translate: this.localizationKey },
-      ],
-    };
-  }
-}

package/src/api/conditions/LevelCondition.ts

@@ -1,36 +0,0 @@
-import { Player, RawMessage } from "@minecraft/server";
-import { TaskConditions } from "./TaskConditions";
-
-/**
- * 击杀实体条件
- */
-export class LevelConditions extends TaskConditions {
-  constructor(public level: number) {
-    super(level);
-  }
-  check(player: Player) {
-    return player.level >= this.level;
-  }
-  getTextProvider(): RawMessage {
-    return {
-      rawtext: [
-        // 达到 %s 级
-        {
-          translate: "task.condition.level",
-          with: { text: this.level.toString() },
-        },
-      ],
-    };
-  }
-  getFailedReason(): RawMessage {
-    return {
-      rawtext: [
-        // 你需要达到 %s 级
-        {
-          translate: "task.condition.level.failed",
-          with: { text: this.level.toString() },
-        },
-      ],
-    };
-  }
-}

package/src/api/conditions/TaskConditions.ts

@@ -1,35 +0,0 @@
-import { Player } from "@minecraft/server";
-import { TextProvider } from "@occultus/text-api";
-import { TaskServer } from "../TaskServer";
-
-/**
- * 任务条件的抽象类
- *
- * 定义了任务条件的基本结构和必须实现的方法，所有具体的任务条件类都应该继承此抽象类并实现其抽象方法
- */
-export abstract class TaskConditions {
-  /**
-   * @param data 任务条件所需的数据
-   */
-  constructor(protected data: unknown) {}
-  /**
-   * 检查玩家是否满足任务条件
-   *
-   * @param player 要检查的玩家对象
-   * @return 如果玩家满足条件返回`true`，否则返回`false`
-   */
-  abstract check(player: Player): boolean;
-
-  /**
-   * 获取任务条件的文本，该文本将会在任务面板中显示
-   *
-   * @return 用于显示任务条件描述的文本
-   */
-  abstract getTextProvider(): TextProvider;
-  /**
-   * 获取条件检查失败时的原因说明文本
-   *
-   * @return 用于显示失败原因的文本
-   */
-  abstract getFailedReason(): TextProvider;
-}

package/src/api/conditions/index.ts

@@ -1,5 +0,0 @@
-export * from "./ItemConditions";
-export * from "./KillEntityCondition";
-export * from "./KillEntityFamilyCondition";
-export * from "./LevelCondition";
-export * from "./TaskConditions";