mbler 0.1.3-alpha → 0.1.3-alpha-r2

package/test/mbler-int/behavior/scripts/lib/event/index.js

@@ -1,20 +1,20 @@
-import ui from "./../ui/index"
-import {
-  world
-} from "@minecraft/server"
-let scriptUi;
-const useItem = ({
-  source: player,
-  itemStack: item
-}) => {
-  if (!player.typeId.includes('player')) return;
-  if (item.typeId === "mbler_int:mang_one_int")
-    scriptUi.openHomeForm(player, item)
-}
-const regEvent = (game) => {
-  world.afterEvents.itemUse.subscribe(useItem);
-  scriptUi = new ui(game)
-}
-export {
-  regEvent
+import ui from "./../ui/index"
+import {
+  world
+} from "@minecraft/server"
+let scriptUi;
+const useItem = ({
+  source: player,
+  itemStack: item
+}) => {
+  if (!player.typeId.includes('player')) return;
+  if (item.typeId === "mbler_int:mang_one_int")
+    scriptUi.openHomeForm(player, item)
+}
+const regEvent = (game) => {
+  world.afterEvents.itemUse.subscribe(useItem);
+  scriptUi = new ui(game)
+}
+export {
+  regEvent
 }

package/test/mbler-int/behavior/scripts/lib/ui/Lore.js

@@ -1,19 +1,19 @@
-export class Lore {
-  name;
-  count;
-  constructor(item) {
-    const LoreArr = item.getLore();
-    let count = parseInt(`0x${LoreArr[1]}`) // 加上16进制表明式
-    if (!/^[a-z0-9_]+(\:)?[a-z0-9_]+$/.test(LoreArr[0] + ''))
-      LoreArr[0] = undefined;
-    if (isNaN(count)) count = 0;
-    this.count = count;
-    this.name = LoreArr[0];
-  }
-  parseArr() {
-    return [
-      this.name,
-      this.count.toString(16)
-    ]
-  }
+export class Lore {
+  name;
+  count;
+  constructor(item) {
+    const LoreArr = item.getLore();
+    let count = parseInt(`0x${LoreArr[1]}`) // 加上16进制表明式
+    if (!/^[a-z0-9_]+(\:)?[a-z0-9_]+$/.test(LoreArr[0] + ''))
+      LoreArr[0] = undefined;
+    if (isNaN(count)) count = 0;
+    this.count = count;
+    this.name = LoreArr[0];
+  }
+  parseArr() {
+    return [
+      this.name,
+      this.count.toString(16)
+    ]
+  }
 }

package/test/mbler-int/behavior/scripts/lib/ui/baseUi.js

@@ -1,6 +1,6 @@
-export class baseUi {
-  game;
-  constructor(game) {
-    this.game = game;
-  };
-}
+export class baseUi {
+  game;
+  constructor(game) {
+    this.game = game;
+  };
+}

package/test/mbler-int/behavior/scripts/lib/ui/index.js

@@ -1,207 +1,207 @@
-import {
-  baseUi
-} from "./baseUi";
-import {
-  utils
-} from "./../utils/index";
-import {
-  Lore
-} from "./Lore";
-class ItemBagUI extends baseUi {
-  initLayout() {
-    this.layouts = this.game.regLayout({
-      regIds: ["Home", "NumSelect", "showInNoFound"],
-      Home: {
-        title: "菜单",
-        layout: [{
-            type: "button",
-            param: ["存入物品"]
-          },
-          {
-            type: "button",
-            param: ["取出物品"]
-          },
-        ],
-      },
-      NumSelect: {
-        title: "选择数量",
-        layout: []
-      },
-      showInNoFound: {
-        title: "请选择要存入的物品",
-        layout: [{
-          type: "label",
-          param: ["点击你想要存放的物品"]
-        }]
-      }
-    })
-  }
-  /**
-   * 打开主菜单：存入物品 / 取出物品
-   */
-  openHomeForm(player, itemOnHand) {
-    if (!this.layouts) this.initLayout();
-    const lore = new Lore(itemOnHand);
-    const form = this.game.createForm("Action", this.layouts[0]);
-    form.addLayout({
-      type: "label",
-      param: [`无尽袋子 - 菜单\n物品 : ${lore.name} , 数量 : ${lore.count}`]
-    })
-    form.show(player, true).onCommit(({
-      selection
-    }) => {
-      switch (selection) {
-        case 0:
-          this.openAddItemForm(player, itemOnHand);
-          break;
-        case 1:
-          this.hanlerTakeOutItems(player, itemOnHand);
-          break;
-        default:
-          player.sendMessage("请选择存入或取出");
-      }
-    });
-  }
-  hanlerTakeOutItems(player, itemOnHand) {
-    const lore = new Lore(itemOnHand)
-    if (!lore.name) return player.sendMessage('没有存入任何东西');
-    this.selectionNum({
-      min: 1,
-      max: lore.count,
-      tit: lore.name,
-      callback: ({
-        formValues
-      }) => {
-        const TakeOutCount = formValues[0];
-        player.runCommand(`give @s ${lore.name} ${TakeOutCount}`)
-        lore.count = lore.count - TakeOutCount;
-        itemOnHand.setLore(lore.parseArr())
-        utils.setMainHand(player, itemOnHand);
-      },
-      lastUi: () => this.openHomeForm(player, itemOnHand)
-    }, player)
-  }
-  /**
-   * 打开“存入物品”表单（自动识别物品类型）
-   */
-  openAddItemForm(player, itemOnHand) {
-    const currencyLore = new Lore(itemOnHand);
-    // 如果 Lore 无法识别此物品（比如没有 name 字段），则进入手动选择模式
-    if (currencyLore.name === undefined) {
-      return this.showInNoData(player, currencyLore, itemOnHand);
-    }
-    const inventoryData = utils.getAllPlayerInt(player);
-    let totalItemAmount = 0;
-    // 统计当前玩家拥有该物品的总数量
-    for (const [itemId, itemData] of inventoryData) {
-      const [itemName, itemCount] = itemData;
-      if (itemName === currencyLore.name) {
-        totalItemAmount += itemCount;
-      }
-    }
-    // 如果该物品数量为 0，则提示无法存入
-    if (totalItemAmount <= 0) {
-      return player.sendMessage("你没有该物品，无法存入！");
-    }
-    // 弹出滑条，让用户选择存入多少个
-    this.selectionNum({
-        min: 0,
-        max: totalItemAmount,
-        tit: currencyLore.name,
-        callback: ({
-          formValues
-        }) => {
-          const countToStore = formValues[0];
-          currencyLore.count = countToStore + totalItemAmount;
-          this.handlerAdd(currencyLore, player, itemOnHand, countToStore);
-        },
-        lastUi: () => this.openHomeForm(player, itemOnHand),
-      },
-      player
-    );
-  }
-  /**
-   * 当物品无法自动识别时，让用户从列表中手动选择要存入的物品
-   */
-  showInNoData(player, placeholderLore, itemOnHand) {
-    const form = this.game.createForm("Action", this.layouts[2]);
-    const inventoryData = utils.getAllPlayerInt(player);
-    const itemButtons = [];
-    const itemKeys = [];
-    let buttonIndex = 0;
-    for (const [itemId, itemData] of inventoryData) {
-      if (!Array.isArray(itemData)) continue;
-      const [itemName, itemCount] = itemData;
-      form.addLayout({
-        type: "button",
-        param: [`${itemName} x${itemCount}`],
-      });
-      itemKeys[buttonIndex] = itemId;
-      buttonIndex++;
-    }
-    form.show(player).then(({
-      selection,
-      canceled
-    }) => {
-      if (canceled) {
-        return this.openHomeForm(player, itemOnHand);
-      }
-      if (selection === undefined || selection >= itemKeys.length) {
-        return player.sendMessage("你选择的物品无效");
-      }
-      const selectedItemId = itemKeys[selection];
-      const selectedItemData = inventoryData.get(selectedItemId);
-      if (!selectedItemData || !Array.isArray(selectedItemData)) {
-        return player.sendMessage("该物品数据异常");
-      }
-      const [selectedItemName, selectedItemCount] = selectedItemData;
-      this.selectionNum({
-          tit: `存入 ${selectedItemName}`,
-          min: 0,
-          max: selectedItemCount,
-          callback: ({
-            formValues
-          }) => {
-            const countToStore = formValues[0];
-            const manualLore = new Lore(itemOnHand);
-            manualLore.name = selectedItemName;
-            manualLore.count = countToStore + selectedItemCount;
-            this.handlerAdd(manualLore, player, itemOnHand, countToStore);
-          },
-          lastUi: () => this.openHomeForm(player, itemOnHand),
-        },
-        player
-      );
-    });
-  }
-  handlerAdd(lore, player, originalItem, countToStore) {
-    utils.removeItems(player, {
-      name: lore.name,
-      count: countToStore,
-    });
-    originalItem.setLore(lore.parseArr())
-    utils.setMainHand(player, originalItem);
-    player.sendMessage(`成功存入 ${countToStore} 个「${lore.name}」`);
-  }
-  selectionNum({
-      min = 0,
-      max = 1,
-      tit = "",
-      callback = () => {},
-      lastUi = () => {},
-    } = {},
-    player
-  ) {
-    const form = this.game
-      .createForm("Modal", this.layouts[1])
-    form.addLayout({
-      type: "slider",
-      param: [tit, min, max]
-    })
-    const show = form.show(player, true)
-    show.onCancel(lastUi)
-    show.onCommit(callback);
-  }
-}
-
+import {
+  baseUi
+} from "./baseUi";
+import {
+  utils
+} from "./../utils/index";
+import {
+  Lore
+} from "./Lore";
+class ItemBagUI extends baseUi {
+  initLayout() {
+    this.layouts = this.game.regLayout({
+      regIds: ["Home", "NumSelect", "showInNoFound"],
+      Home: {
+        title: "菜单",
+        layout: [{
+            type: "button",
+            param: ["存入物品"]
+          },
+          {
+            type: "button",
+            param: ["取出物品"]
+          },
+        ],
+      },
+      NumSelect: {
+        title: "选择数量",
+        layout: []
+      },
+      showInNoFound: {
+        title: "请选择要存入的物品",
+        layout: [{
+          type: "label",
+          param: ["点击你想要存放的物品"]
+        }]
+      }
+    })
+  }
+  /**
+   * 打开主菜单：存入物品 / 取出物品
+   */
+  openHomeForm(player, itemOnHand) {
+    if (!this.layouts) this.initLayout();
+    const lore = new Lore(itemOnHand);
+    const form = this.game.createForm("Action", this.layouts[0]);
+    form.addLayout({
+      type: "label",
+      param: [`无尽袋子 - 菜单\n物品 : ${lore.name} , 数量 : ${lore.count}`]
+    })
+    form.show(player, true).onCommit(({
+      selection
+    }) => {
+      switch (selection) {
+        case 0:
+          this.openAddItemForm(player, itemOnHand);
+          break;
+        case 1:
+          this.hanlerTakeOutItems(player, itemOnHand);
+          break;
+        default:
+          player.sendMessage("请选择存入或取出");
+      }
+    });
+  }
+  hanlerTakeOutItems(player, itemOnHand) {
+    const lore = new Lore(itemOnHand)
+    if (!lore.name) return player.sendMessage('没有存入任何东西');
+    this.selectionNum({
+      min: 1,
+      max: lore.count,
+      tit: lore.name,
+      callback: ({
+        formValues
+      }) => {
+        const TakeOutCount = formValues[0];
+        player.runCommand(`give @s ${lore.name} ${TakeOutCount}`)
+        lore.count = lore.count - TakeOutCount;
+        itemOnHand.setLore(lore.parseArr())
+        utils.setMainHand(player, itemOnHand);
+      },
+      lastUi: () => this.openHomeForm(player, itemOnHand)
+    }, player)
+  }
+  /**
+   * 打开“存入物品”表单（自动识别物品类型）
+   */
+  openAddItemForm(player, itemOnHand) {
+    const currencyLore = new Lore(itemOnHand);
+    // 如果 Lore 无法识别此物品（比如没有 name 字段），则进入手动选择模式
+    if (currencyLore.name === undefined) {
+      return this.showInNoData(player, currencyLore, itemOnHand);
+    }
+    const inventoryData = utils.getAllPlayerInt(player);
+    let totalItemAmount = 0;
+    // 统计当前玩家拥有该物品的总数量
+    for (const [itemId, itemData] of inventoryData) {
+      const [itemName, itemCount] = itemData;
+      if (itemName === currencyLore.name) {
+        totalItemAmount += itemCount;
+      }
+    }
+    // 如果该物品数量为 0，则提示无法存入
+    if (totalItemAmount <= 0) {
+      return player.sendMessage("你没有该物品，无法存入！");
+    }
+    // 弹出滑条，让用户选择存入多少个
+    this.selectionNum({
+        min: 0,
+        max: totalItemAmount,
+        tit: currencyLore.name,
+        callback: ({
+          formValues
+        }) => {
+          const countToStore = formValues[0];
+          currencyLore.count = countToStore + totalItemAmount;
+          this.handlerAdd(currencyLore, player, itemOnHand, countToStore);
+        },
+        lastUi: () => this.openHomeForm(player, itemOnHand),
+      },
+      player
+    );
+  }
+  /**
+   * 当物品无法自动识别时，让用户从列表中手动选择要存入的物品
+   */
+  showInNoData(player, placeholderLore, itemOnHand) {
+    const form = this.game.createForm("Action", this.layouts[2]);
+    const inventoryData = utils.getAllPlayerInt(player);
+    const itemButtons = [];
+    const itemKeys = [];
+    let buttonIndex = 0;
+    for (const [itemId, itemData] of inventoryData) {
+      if (!Array.isArray(itemData)) continue;
+      const [itemName, itemCount] = itemData;
+      form.addLayout({
+        type: "button",
+        param: [`${itemName} x${itemCount}`],
+      });
+      itemKeys[buttonIndex] = itemId;
+      buttonIndex++;
+    }
+    form.show(player).then(({
+      selection,
+      canceled
+    }) => {
+      if (canceled) {
+        return this.openHomeForm(player, itemOnHand);
+      }
+      if (selection === undefined || selection >= itemKeys.length) {
+        return player.sendMessage("你选择的物品无效");
+      }
+      const selectedItemId = itemKeys[selection];
+      const selectedItemData = inventoryData.get(selectedItemId);
+      if (!selectedItemData || !Array.isArray(selectedItemData)) {
+        return player.sendMessage("该物品数据异常");
+      }
+      const [selectedItemName, selectedItemCount] = selectedItemData;
+      this.selectionNum({
+          tit: `存入 ${selectedItemName}`,
+          min: 0,
+          max: selectedItemCount,
+          callback: ({
+            formValues
+          }) => {
+            const countToStore = formValues[0];
+            const manualLore = new Lore(itemOnHand);
+            manualLore.name = selectedItemName;
+            manualLore.count = countToStore + selectedItemCount;
+            this.handlerAdd(manualLore, player, itemOnHand, countToStore);
+          },
+          lastUi: () => this.openHomeForm(player, itemOnHand),
+        },
+        player
+      );
+    });
+  }
+  handlerAdd(lore, player, originalItem, countToStore) {
+    utils.removeItems(player, {
+      name: lore.name,
+      count: countToStore,
+    });
+    originalItem.setLore(lore.parseArr())
+    utils.setMainHand(player, originalItem);
+    player.sendMessage(`成功存入 ${countToStore} 个「${lore.name}」`);
+  }
+  selectionNum({
+      min = 0,
+      max = 1,
+      tit = "",
+      callback = () => {},
+      lastUi = () => {},
+    } = {},
+    player
+  ) {
+    const form = this.game
+      .createForm("Modal", this.layouts[1])
+    form.addLayout({
+      type: "slider",
+      param: [tit, min, max]
+    })
+    const show = form.show(player, true)
+    show.onCancel(lastUi)
+    show.onCommit(callback);
+  }
+}
+
 export default ItemBagUI;

package/test/mbler-int/behavior/scripts/lib/utils/index.js

@@ -1,52 +1,52 @@
-import {
-  EntityComponentTypes,
-  EquipmentSlot
-} from "@minecraft/server"
-
-export class utils {
-  static getAllPlayerInt(player) {
-    const data = new Map();
-    const inventory = player
-      .getComponent("inventory")
-      .container;
-    for (let i = 0; i < inventory.size; i++) {
-      const item = inventory.getItem(i);
-      if (!item) continue;
-      let num = item.amount;
-      // 自动合并
-      const it = data.get(item.typeId);
-      if (Array.isArray(it)) num += it[1]
-      data.set(item.typeId, [item.typeId, num]);
-    }
-    return data;
-  }
-  static setMainHand(player, item) {
-    const Equippable = player
-      .getComponent(EntityComponentTypes.Equippable);
-    Equippable
-      .setEquipment(EquipmentSlot.Mainhand, item);
-  }
-  static removeItems(player, {
-    name,
-    count
-  } = {}) {
-    const inventory = player
-      .getComponent("inventory")
-      .container;
-    let RemoveNum = count;
-    for (let i = 0; i < inventory.size; i++) {
-      const item = inventory.getItem(i);
-      if (!item || !item.typeId || item.typeId !== name) continue;
-      const num = item.amount;
-      if (RemoveNum >= num) {
-        inventory.setItem(i, null);
-        RemoveNum -= num;
-      } else {
-        const remNum = RemoveNum >= 64 ? 64 : Math.max(RemoveNum, item.amount) - Math.min(RemoveNum, item.amount)
-        item.amount = remNum;
-        RemoveNum -= remNum
-        inventory.setItem(i, item);
-      }
-    }
-  }
+import {
+  EntityComponentTypes,
+  EquipmentSlot
+} from "@minecraft/server"
+
+export class utils {
+  static getAllPlayerInt(player) {
+    const data = new Map();
+    const inventory = player
+      .getComponent("inventory")
+      .container;
+    for (let i = 0; i < inventory.size; i++) {
+      const item = inventory.getItem(i);
+      if (!item) continue;
+      let num = item.amount;
+      // 自动合并
+      const it = data.get(item.typeId);
+      if (Array.isArray(it)) num += it[1]
+      data.set(item.typeId, [item.typeId, num]);
+    }
+    return data;
+  }
+  static setMainHand(player, item) {
+    const Equippable = player
+      .getComponent(EntityComponentTypes.Equippable);
+    Equippable
+      .setEquipment(EquipmentSlot.Mainhand, item);
+  }
+  static removeItems(player, {
+    name,
+    count
+  } = {}) {
+    const inventory = player
+      .getComponent("inventory")
+      .container;
+    let RemoveNum = count;
+    for (let i = 0; i < inventory.size; i++) {
+      const item = inventory.getItem(i);
+      if (!item || !item.typeId || item.typeId !== name) continue;
+      const num = item.amount;
+      if (RemoveNum >= num) {
+        inventory.setItem(i, null);
+        RemoveNum -= num;
+      } else {
+        const remNum = RemoveNum >= 64 ? 64 : Math.max(RemoveNum, item.amount) - Math.min(RemoveNum, item.amount)
+        item.amount = remNum;
+        RemoveNum -= remNum
+        inventory.setItem(i, item);
+      }
+    }
+  }
 }

package/test/mbler-int/mbler.config.json

@@ -1,19 +1,19 @@
-{
-  "name": "无尽袋子",
-  "description": "一个袋子装无限的单种物品",
-  "mcVersion": "1.21.120",
-  "version": "0.0.1",
-  "script": {
-    "main": "index.js",
-    "ui": true,
-    "dependencies": {
-      "gameLib": "inner"
-    }
-  },
-  "minify": true,
-  "outdir": {
-    "resources": "./dist/res",
-    "behavior": "./dist/dep",
-    "dist": "./dist.mcaddon"
-  }
+{
+  "name": "无尽袋子",
+  "description": "一个袋子装无限的单种物品",
+  "mcVersion": "1.21.120",
+  "version": "0.0.1",
+  "script": {
+    "main": "index.js",
+    "ui": true,
+    "dependencies": {
+      "gameLib": "inner"
+    }
+  },
+  "minify": true,
+  "outdir": {
+    "resources": "./dist/res",
+    "behavior": "./dist/dep",
+    "dist": "./dist.mcaddon"
+  }
 }

package/test/mbler-int/package.json

@@ -1,13 +1,13 @@
-{
-  "name": "mbler/test mbler-int",
-  "description": "能存无数物品的袋子 ！",
-  "version": "0.0.1",
-  "engines": {
-    "node": ">=16.0.0"
-  },
-  "scripts": {
-    "dev": "mbler dev",
-    "build": "MBLER_BUILD_MODULE=dist mbler build",
-    "dev-build": "MBLER_BUILD_MODULE=dev mbler build"
-  }
+{
+  "name": "mbler/test mbler-int",
+  "description": "能存无数物品的袋子 ！",
+  "version": "0.0.1",
+  "engines": {
+    "node": ">=16.0.0"
+  },
+  "scripts": {
+    "dev": "mbler dev",
+    "build": "MBLER_BUILD_MODULE=dist mbler build",
+    "dev-build": "MBLER_BUILD_MODULE=dev mbler build"
+  }
 }