@occultus/toolkit 0.22.2 → 0.22.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@occultus/toolkit",
-  "version": "0.22.2",
+  "version": "0.22.4",
   "repository": {
     "type": "git",
     "url": "https://codeberg.org/TeamOccultus/StarTenonAPI"

package/src/entity/EntitiesUtils.ts

@@ -9,7 +9,13 @@ import {
   ItemStack
 } from "@minecraft/server";
 import { EffectGroups, EffectData } from "@occultus/common";
-import { addEffect, applyEffectData, clearSlot, giveItem } from "./entityUtils";
+import {
+  addEffect,
+  applyEffectData,
+  clearSlot,
+  giveItem,
+  heal
+} from "./entityUtils";
 
 /**
  * 适用于批量实体的相关工具
@@ -103,4 +109,13 @@ export class EntitiesUtils {
   applyEffectData(data: EffectData | EffectData[]): void {
     return this.query().forEach((entity) => applyEffectData(entity, data));
   }
+  /**
+   * 恢复实体的生命值
+   * @param amount 恢复的生命值，若治愈后生命值超过最大生命值，则重置为最大生命值
+   * @return 治愈后的生命值
+   * @throws 如果实体没有`minecraft:health`组件，则抛出`OccultusSDKError`
+   */
+  heal(amount: number) {
+    this.query().forEach((entity) => heal(entity, amount));
+  }
 }

package/src/entity/entityUtils.ts

@@ -11,6 +11,7 @@ import {
 } from "@minecraft/server";
 import { EffectData, effectGroupMap, EffectGroups } from "@occultus/common";
 import { OccultusSDKError } from "@occultus/core";
+import { ensureNoNamespace } from "../identifier/namespace";
 
 /**
  * 尝试对实体进行操作
@@ -172,19 +173,27 @@ export function clearEffect(
  * 状态效果持续时间，以刻为单位 *（20刻 = 1秒）*
  *
  * 其值必须在范围`[0, 20000000]`内
+ * 
+ * 如果值为`"infinite"`，则状态效果将无限期持续
  * @param options 状态效果选项
  * @since Starock 0.6.0 (0.1.0)
  */
 export function addEffect(
   entity: Entity,
   effectType: EffectType | EffectType[] | string | string[] | EffectGroups,
-  duration: number,
+  duration: number | "infinite",
   options?: EntityEffectOptions
 ): void {
   const effects =
     effectGroupMap[effectType as EffectGroups] ||
     (Array.isArray(effectType) ? effectType : [effectType]);
   for (const effect of effects) {
+    if (duration === "infinite") {
+      entity.runCommand(
+        `effect @s ${ensureNoNamespace(effect)} infinite ${options?.amplifier ?? 0} ${options?.showParticles ?? false}`
+      );
+      return;
+    }
     entity.addEffect(effect, duration, options);
   }
 }
@@ -276,3 +285,22 @@ export function consumeEquipmentAmount(
   if (!item) return false;
   return setEquipmentItem(player, consumeAmount(item, amount));
 }
+
+/**
+ * 恢复实体的生命值
+ * @param entity 将要被治疗的实体
+ * @param amount 恢复的生命值，若治愈后生命值超过最大生命值，则重置为最大生命值
+ * @return 治愈后的生命值
+ * @throws 如果实体没有`minecraft:health`组件，则抛出`OccultusSDKError`
+ */
+export function heal(entity: Entity, amount: number): number {
+  const health = entity.getComponent("minecraft:health");
+  if (!health)
+    throw new OccultusSDKError("The entity does not have health component!");
+  const newHealth = health.currentValue + amount;
+  if (newHealth > health.effectiveMax) {
+    health.resetToMaxValue();
+    return health.effectiveMax;
+  } else health.setCurrentValue(newHealth);
+  return newHealth;
+}

package/src/identifier/namespace.ts

@@ -0,0 +1,24 @@
+
+/**
+ * 确保命名空间存在，若不存在则自动加上`minecraft:`命名空间
+ * @param identifier 要检查的标识符
+ * @return 存在命名空间的标识符
+ */
+export function ensureNamespace(identifier: string): string {
+  if (identifier.includes(":")) {
+    return identifier;
+  }
+  return `minecraft:${identifier}`;
+}
+
+/**
+ * 确保命名空间**不**存在，若存在则自动去掉命名空间
+ * @param identifier 要检查的标识符
+ * @return 不存在命名空间的标识符
+ */
+export function ensureNoNamespace(identifier: string): string {
+  if (identifier.includes(":")) {
+    return identifier.split(":")[1];
+  }
+  return identifier;
+}

package/src/index.ts

@@ -5,3 +5,4 @@ export * from "./entity/EntitiesUtils";
 export * from "./entity/entityUtils";
 export * from "./item/item";
 export * from "./item/container";
+export * from "./identifier/namespace";