@occultus/condition-api 0.22.0-alpha.6 → 0.22.0-beta.2

package/README.md

@@ -27,4 +27,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-```
+```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@occultus/condition-api",
-  "version": "0.22.0-alpha.6",
+  "version": "0.22.0-beta.2",
   "repository": {
     "type": "git",
     "url": "https://codeberg.org/TeamOccultus/StarTenonAPI"
@@ -28,8 +28,8 @@
   },
   "dependencies": {
     "@occultus/format-api": "0.21.0",
-    "@occultus/text-api": "0.20.0",
-    "@occultus/toolkit": "0.22.1"
+    "@occultus/toolkit": "0.22.2",
+    "@occultus/text-api": "0.21.0"
   },
   "devDependencies": {
     "typedoc": "^0.28.15"

package/src/api/ExpCondition.ts

@@ -10,7 +10,10 @@ export class ExpConditions extends Conditions {
    * @param experience 满足条件所需的最低等级
    * @param consumeAmount 倘若为`true`，则条件检查通过后会自动消耗对应等级
    */
-  constructor(protected experience: number, protected consumeAmount = false) {
+  constructor(
+    protected experience: number,
+    protected consumeAmount = false
+  ) {
     super();
   }
   check(player: Player, visual = false) {
@@ -28,9 +31,9 @@ export class ExpConditions extends Conditions {
         // 达到 %s 级
         {
           translate: "task.condition.level",
-          with: { text: this.experience.toString() },
-        },
-      ],
+          with: { text: this.experience.toString() }
+        }
+      ]
     };
   }
   getFailedReason(): RawMessage {
@@ -39,9 +42,9 @@ export class ExpConditions extends Conditions {
         // 你需要达到 %s 级
         {
           translate: "task.condition.level.failed",
-          with: { text: this.experience.toString() },
-        },
-      ],
+          with: { text: this.experience.toString() }
+        }
+      ]
     };
   }
 }

package/src/api/ItemConditions.ts

@@ -1,9 +1,6 @@
 import { ItemStack, Player, RawMessage } from "@minecraft/server";
 import { Conditions } from "./Conditions";
-import {
-  getItemAmountInContainer,
-  removeItemInContainer,
-} from "@occultus/toolkit";
+import { getItemAmountOfPlayer, removeItemOfPlayer } from "@occultus/toolkit";
 import { TextProvider } from "@occultus/text-api";
 
 /**
@@ -39,11 +36,11 @@ export class ItemConditions extends Conditions {
   check(player: Player, visual = false) {
     const container = player.getComponent("minecraft:inventory")?.container;
     if (!container) return false;
-    const amount = getItemAmountInContainer(container, this.getItem().typeId);
+    const amount = getItemAmountOfPlayer(player, this.getItem().typeId);
     if (amount >= this.getItem().amount) {
       if (visual) return true;
       if (!this.consumeAmount) return true;
-      removeItemInContainer(container, this.itemType, this.amount);
+      removeItemOfPlayer(player, this.itemType, this.amount);
       return true;
     }
     return false;
@@ -57,8 +54,8 @@ export class ItemConditions extends Conditions {
       rawtext: [
         { translate: this.getItem().localizationKey },
         { text: " × " },
-        { text: this.getItem().amount.toString() },
-      ],
+        { text: this.getItem().amount.toString() }
+      ]
     };
   }
   /**
@@ -73,8 +70,8 @@ export class ItemConditions extends Conditions {
         { text: " " },
         { translate: this.getItem().localizationKey },
         { text: " × " },
-        { text: this.getItem().amount.toString() },
-      ],
+        { text: this.getItem().amount.toString() }
+      ]
     };
   }
 }

package/src/api/ItemTagConditions.ts

@@ -2,7 +2,7 @@ import { Player, RawMessage } from "@minecraft/server";
 import { Conditions } from "./Conditions";
 import {
   getTagItemAmountInContainer,
-  removeTagItemInContainer,
+  removeTagItemInContainer
 } from "@occultus/toolkit";
 import { TextProvider } from "@occultus/text-api";
 
@@ -52,8 +52,8 @@ export class ItemTagConditions extends Conditions {
       rawtext: [
         { translate: "task.condition.itemTag" },
         { text: " × " },
-        { text: this.translateKey },
-      ],
+        { text: this.translateKey }
+      ]
     };
   }
   /**
@@ -68,8 +68,8 @@ export class ItemTagConditions extends Conditions {
         { text: " " },
         { translate: this.translateKey },
         { text: " × " },
-        { text: this.amount.toString() },
-      ],
+        { text: this.amount.toString() }
+      ]
     };
   }
 }

package/src/api/KillEntityConditions.ts

@@ -14,7 +14,7 @@ export class KillEntityConditions extends Conditions {
   constructor(public entityType: string) {
     super();
   }
-  check(player: Player, visual = false) {
+  check(_player: Player, _visual = false) {
     return false;
   }
   getTextProvider(): RawMessage {

package/src/api/KillEntityFamilyCondition.ts

@@ -16,7 +16,7 @@ export class KillEntityFamilyConditions extends Conditions {
   ) {
     super();
   }
-  check(player: Player, visual = false) {
+  check(_player: Player, _visual = false) {
     return false;
   }
   getTextProvider(): RawMessage {

package/src/api/LevelConditions.ts

@@ -9,7 +9,10 @@ export class LevelConditions extends Conditions {
    * @param level 满足条件所需的最低等级
    * @param consumeAmount 倘若为`true`，则条件检查通过后会自动消耗对应等级
    */
-  constructor(protected level: number, protected consumeAmount = false) {
+  constructor(
+    protected level: number,
+    protected consumeAmount = false
+  ) {
     super();
   }
   check(player: Player, visual = false) {
@@ -27,9 +30,9 @@ export class LevelConditions extends Conditions {
         // 达到 %s 级
         {
           translate: "task.condition.level",
-          with: { text: this.level.toString() },
-        },
-      ],
+          with: { text: this.level.toString() }
+        }
+      ]
     };
   }
   getFailedReason(): RawMessage {
@@ -38,9 +41,9 @@ export class LevelConditions extends Conditions {
         // 你需要达到 %s 级
         {
           translate: "task.condition.level.failed",
-          with: { text: this.level.toString() },
-        },
-      ],
+          with: { text: this.level.toString() }
+        }
+      ]
     };
   }
 }

package/src/index.ts

@@ -1,10 +1,10 @@
-/**
- * @module @occultus/condition-api
- */
-export * from "./api/ItemConditions";
-export * from "./api/KillEntityConditions";
-export * from "./api/KillEntityFamilyCondition";
-export * from "./api/LevelConditions";
-export * from "./api/ExpCondition";
-export * from "./api/ItemTagConditions"
-export * from "./api/Conditions";
+/**
+ * @module @occultus/condition-api
+ */
+export * from "./api/ItemConditions";
+export * from "./api/KillEntityConditions";
+export * from "./api/KillEntityFamilyCondition";
+export * from "./api/LevelConditions";
+export * from "./api/ExpCondition";
+export * from "./api/ItemTagConditions";
+export * from "./api/Conditions";