@occultus/random-api 0.22.0 → 0.22.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@occultus/random-api",
-  "version": "0.22.0",
+  "version": "0.22.1",
   "repository": {
     "type": "git",
     "url": "https://codeberg.org/TeamOccultus/StarTenonAPI"

package/src/api/EventList.ts

@@ -39,18 +39,19 @@ export class EventList {
     for (const event of this.data) {
       weightSum += event.weight;
     }
-    let value = Random.integer(weightSum - 1);
+    const randValue = Random.integer(weightSum - 1);
+    let remaining = randValue;
     for (let i = 0; i < this.data.length; i++) {
       const item = this.data[i];
-      if (value < item.weight) {
+      if (remaining < item.weight) {
         item.event?.();
         return {
           weightSum: weightSum,
-          weightRand: value,
+          weightRand: randValue,
           dataIndex: i
         };
       }
-      value -= item.weight;
+      remaining -= item.weight;
     }
     throw new OccultusSDKError("Cannot find the event to call!", "Event List");
   }

package/src/api/Random.ts

@@ -1,5 +1,3 @@
-import { system } from "@minecraft/server";
-
 /**
  * 一个随机数或 UUID 生成器类
  */
@@ -30,21 +28,21 @@ export class Random {
   /**
    * 生成一个 UUID (version 4)
    * 按照 RFC 9562 实现。https://www.rfc-editor.org/rfc/rfc9562#name-uuid-version-4
-   * TODO 考虑写注释
-   * @return 一个字符串形式的 UUID
+   * @return 一个字符串形式的 UUID。
    */
   static UUID(): string {
-    const currentTimestamp: number = system.currentTick;
-    return "xxxxxxxx-xxxx-4xxx-yxxx-zxxxxxxx".replace(
-      /[xyz]/g,
-      (args: string) => {
-        const random: number = (Math.random() * 16) | 0;
-        const value: number = args === "x" ? random : (random & 0x3) | 0x8;
-        if (args === "z") {
-          return value.toString(16) + currentTimestamp.toString(16).slice(-4);
-        }
-        return value.toString(16);
+    let result = "";
+    for (let i = 0; i < 16; i++) {
+      let randomByte = Math.floor(Math.random() * 256);
+      // 第 7 个字节开头 4bit 为 0100 （ver）
+      if (i == 6) randomByte = (randomByte & 0x0f) | 0x40;
+      //第 9 个字节前 2bit 为 10 （var）
+      else if (i == 8) randomByte = (randomByte & 0x3f) | 0x80;
+      result += randomByte.toString(16).padStart(2, '0');
+      if (i == 3 || i == 5 || i == 7 || i == 9) {
+        result += '-';
       }
-    );
+    }
+    return result;
   }
 }