Update npm packages (JaylyDev#192)

* Update package.json and package-lock.json

* test-event replacement

* scoreboardIdentity

* Revert "scoreboardIdentity"

This reverts commit 4039ba4.

* types rename

* teleport fix

* fix

* next file

* Vector2 change

* small change

---------

Co-authored-by: ConMaster2112 <[email protected]>
Co-authored-by: JaylyDev <[email protected]>

Author: 3 people

package-lock.json

@@ -19,18 +19,18 @@
   },
   "homepage": "https://github.com/JaylyDev/ScriptAPI#readme",
   "dependencies": {
-    "@minecraft/server": "1.2.0-beta.1.19.80-preview.24",
-    "@minecraft/server-admin": "1.0.0-beta.1.19.80-preview.24",
-    "@minecraft/server-gametest": "1.0.0-beta.1.19.80-preview.24",
-    "@minecraft/server-net": "1.0.0-beta.1.19.80-preview.24",
-    "@minecraft/server-ui": "1.0.0-beta.1.19.80-preview.24"
+    "@minecraft/server": "1.2.0-beta.1.20.0-preview.20",
+    "@minecraft/server-admin": "1.0.0-beta.1.20.0-preview.20",
+    "@minecraft/server-gametest": "1.0.0-beta.1.20.0-preview.20",
+    "@minecraft/server-net": "1.0.0-beta.1.20.0-preview.20",
+    "@minecraft/server-ui": "1.0.0-beta.1.20.0-preview.20"
   },
   "devDependencies": {
     "@npm/types": "^1.0.2",
     "@types/node": "^18.15.11",
     "@types/parsimmon": "^1.10.6",
     "axios": "^1.3.5",
     "parsimmon": "^1.18.1",
-    "typescript": "^5.0.3"
+    "typescript": "^5.0.4"
   }
 }

package.json

@@ -9,7 +9,7 @@ world.events.projectileHit.subscribe((arg) => {
       && arg.projectile.typeId === MinecraftEntityTypes.arrow.id
   ) {
     /**
-      * @type {import("@minecraft/server").SoundOptions}
+      * @type {import("@minecraft/server").PlayerSoundOptions}
       */
     const soundOption = {
         volume: 0.4,

scripts/bow-ding/index.js

@@ -6,7 +6,7 @@ import * as Minecraft from "@minecraft/server";
 
 let prefix = "!";
 
-Minecraft.world.events.beforeChat.subscribe((data) => {
+Minecraft.world.beforeEvents.chatSend.subscribe((data) => {
   if (data.message.toLowerCase().startsWith(`${prefix}help`)) {
     data.cancel = true;
     data.sender.runCommandAsync(`tellraw @s {"rawtext":[{"text":"hello"}]}`);

scripts/chat-command/index.js

@@ -11,7 +11,7 @@ const replacements = {
 };
 
 /**
- * @param {import("@minecraft/server").BeforeChatEvent} msg
+ * @param {import("@minecraft/server").ChatSendBeforeEvent} msg
  */
 function beforeChat(msg) {
     const player = msg.sender;
@@ -26,4 +26,4 @@ function beforeChat(msg) {
     msg.cancel = true;
 }
 
-world.events.beforeChat.subscribe(msg => beforeChat(msg));
+world.beforeEvents.chatSend.subscribe(msg => beforeChat(msg));

scripts/chat-emoji-replacements/index.js

@@ -1,11 +1,11 @@
 import { world } from "@minecraft/server";
 
-world.events.beforeChat.subscribe((data) => {
+world.beforeEvents.chatSend.subscribe((data) => {
     data.sendToTargets = true
     data.setTargets([])
 })
 
-world.events.chat.subscribe((data) => {
+world.events.chatSend.subscribe((data) => {
   try {
       data.sender.runCommandAsync(`tellraw @a ${JSON.stringify({rawtext:[{text: "§l§8[§r" + ((data.sender.getTags().find(tag => tag.startsWith("rank:"))?.substring(5)?.replaceAll("--", "§r§l§8][§r")) ?? "§bMember") + `§l§8]§r §7${data.sender.nameTag}:§r ${data.message}`}]})}`)
   } catch (error) {

scripts/chat-rank/chat-rank.js

@@ -4,7 +4,7 @@
 // command: /tag @s add rank:Owner
 import { world } from "@minecraft/server";
 
-world.events.beforeChat.subscribe((eventData) => {
+world.beforeEvents.chatSend.subscribe((eventData) => {
   const { message, sender } = eventData;
 
   let rank = sender

scripts/chat-rank/index.js

@@ -27,11 +27,11 @@ function getRanks(player) {
         .filter((x) => x);
     return ranks.length == 0 ? [DEFAULT_RANK] : ranks;
 }
-world.events.beforeChat.subscribe((data) => {
+world.beforeEvents.chatSend.subscribe((data) => {
     data.sendToTargets = true;
     data.setTargets([]);
 });
-world.events.chat.subscribe((data) => {
+world.events.chatSend.subscribe((data) => {
     const ranks = getRanks(data.sender).join("§r§l§8][§r");
     const message = data.message;
     world.sendMessage(`§r§l§8[§r${ranks}§r§l§8]§r§7 ${data.sender.name}:§r ${message}`);

scripts/chat-ranks/index.js

@@ -30,12 +30,12 @@ function getRanks(player: Player): string[] {
   return ranks.length == 0 ? [DEFAULT_RANK] : ranks;
 }
 
-world.events.beforeChat.subscribe((data) => {
+world.beforeEvents.chatSend.subscribe((data) => {
   data.sendToTargets = true;
   data.setTargets([]);
 });
 
-world.events.chat.subscribe((data) => {
+world.events.chatSend.subscribe((data) => {
   const ranks = getRanks(data.sender).join("§r§l§8][§r");
   const message = data.message;
   world.sendMessage(`§r§l§8[§r${ranks}§r§l§8]§r§7 ${data.sender.name}:§r ${message}`);

scripts/chat-ranks/index.ts

@@ -7,10 +7,10 @@ const chestsType = [
 
 const key = MinecraftItemTypes.recoveryCompass;
 
-world.events.beforeItemUseOn.subscribe((event) => {
+world.beforeEvents.itemUseOn.subscribe((event) => {
   const player = event.source;
   if (!(player instanceof Player)) return;
-  const block = player.dimension.getBlock(event.getBlockLocation());
+  const block = player.dimension.getBlock(event.faceLocation);
   /** @type {EntityInventoryComponent} */
   // @ts-ignore
   const inventory = player.getComponent('inventory');

scripts/chest-lock/index.js

@@ -33,7 +33,7 @@ function customCommand(command, args, msg, player) {
 }
 
 //Checks if a command was run (checks for the prefix)
-world.events.beforeChat.subscribe((msg) => {
+world.beforeEvents.chatSend.subscribe((msg) => {
   if (!msg.message.startsWith(COMMAND_PREFIX)) return;
   const args = msg.message.slice(COMMAND_PREFIX.length).trim().split(/\s+/);
   msg.cancel = true;

scripts/command-handle/index.js

@@ -92,7 +92,7 @@ export class Commands {
     static register(prefix, command, commandFunction) {
         if (prefix.startsWith("/"))
             throw Error("Unable to register slash commands.");
-        world.events.beforeChat.subscribe((arg) => {
+        world.beforeEvents.chatSend.subscribe((arg) => {
             var argv = arg.message.split(/(".*?"|[^"\s]+)+(?=\s*|\s*$)/g).filter(e => e.trim().length > 0);
             if (argv[0] === `${prefix}${command}`) {
                 arg.cancel = true;

scripts/commands/index.js

@@ -87,7 +87,7 @@ export class Commands {
    */
   public static register (prefix: string, command: string, commandFunction: (arg: Command) => void): void {
     if (prefix.startsWith("/")) throw Error ("Unable to register slash commands.");
-    world.events.beforeChat.subscribe((arg) => {
+    world.beforeEvents.chatSend.subscribe((arg) => {
       var argv = arg.message.split(/(".*?"|[^"\s]+)+(?=\s*|\s*$)/g).filter( e => e.trim().length > 0);
       if (argv[0] === `${prefix}${command}`) {
         arg.cancel = true;

scripts/commands/index.ts

@@ -13,10 +13,10 @@ gui.button('§l§8Teleport request')
 gui.button('§l§bBank')
 gui.button('§l§eMoney Transactions')
 
-world.events.beforeItemUse.subscribe(data => {
+world.beforeEvents.itemUse.subscribe(data => {
     const source = data.source
     if (!(source instanceof Player)) return;
-    if (data.item.typeId === 'minecraft:compass') gui.show(source).then(result => {
+    if (data.itemStack.typeId === 'minecraft:compass') gui.show(source).then(result => {
         if (result.canceled) console.warn('GUI was canceled')
         if (result.selection === 0) source.runCommandAsync('give @s diamond 1')
         if (result.selection === 1) source.runCommandAsync('give @s diamond 1')

scripts/compass-prompt/index.js

@@ -1,6 +1,6 @@
 import { world } from "@minecraft/server";
 import { getPlayerCPS } from "./index";
 
-world.events.beforeChat.subscribe((evd) => {
+world.beforeEvents.chatSend.subscribe((evd) => {
   evd.sender.runCommandAsync(`say CPS: ${getPlayerCPS(evd.sender)}`);
 });

scripts/cps-counter/cps-counter-tests.js

@@ -138,7 +138,7 @@ world.events.entityHurt.subscribe(({ hurtEntity, damageSource, damage }) => {
       });
   }
 });
-world.events.beforeItemUse.subscribe(({ source, item }) => {
+world.beforeEvents.itemUse.subscribe(({ source, item }) => {
   if (source instanceof Player) {
       const itemEnchants = item.getLore().map(lore => { return { data: enchants[names[lore.split(" ")[0]]], lore }; });
       itemEnchants.forEach((e) => {
@@ -148,12 +148,12 @@ world.events.beforeItemUse.subscribe(({ source, item }) => {
       });
   }
 });
-world.events.beforeItemUseOn.subscribe((event) => {
+world.beforeEvents.itemUseOn.subscribe((event) => {
   if (event.source instanceof Player) {
       const itemEnchants = event.item.getLore().map(lore => { return { data: enchants[names[lore.split(" ")[0]]], lore }; });
       itemEnchants.forEach((e) => {
           if (e.data?.rightClickBlock)
-              e.data.rightClickBlock({ player: event.source, level: romanToInt(e.lore.slice(e.data.display.length + 1)), item: event.item, block: event.source.dimension.getBlock(event.getBlockLocation()) });
+              e.data.rightClickBlock({ player: event.source, level: romanToInt(e.lore.slice(e.data.display.length + 1)), item: event.item, block: event.source.dimension.getBlock(event.faceLocation) });
       });
   }
 });

scripts/custom-enchantments/index.js

@@ -16,7 +16,7 @@ bleedEnchant.onHurt(data => {
     world.sendMessage("hello world")
 })
 
-world.events.beforeChat.subscribe(data => {
+world.beforeEvents.chatSend.subscribe(data => {
     /**
      * @type {Container}
      */

scripts/custom-enchantments/test2.js

@@ -10,7 +10,7 @@ bleedEnchant.onHurt(data => {
     data.hurtEntity.runCommandAsync(`damage @s 2`)
 })
 
-world.events.beforeChat.subscribe(data => {
+world.beforeEvents.chatSend.subscribe(data => {
     /**
      * @type {Container}
      */