Fix scripts for Minecraft 1.20.10.23 (#270)

* development

* Update jaylydb to 1.1.0

* fix

* f

* Update testScriptChecks.ts

* tes

Author: JaylyDev

legacyPackages.json

@@ -1,7 +1,6 @@
 {
   "packages": [
     "chat-rank",
-    "dimension-entities",
     "dimensions",
     "get-scores",
     "is-host",

packages/minecraft-editor/@minecraft/server-editor-bindings.d.ts

@@ -12,7 +12,7 @@
 declare module '@minecraft/server-editor-bindings' {
     import { BlockLocationIterator, BlockVolume, BoundingBox, Color, CompoundBlockVolumeAction, Player, Vector3, } from '@minecraft/server';
     export class ClipboardItem {
-        protected constructor();
+        private constructor();
         readFromSelection(selection: Selection): void;
         readFromWorld(a: Vector3, b: Vector3): any;
         writeToWorld(location: Vector3, options: ClipboardWriteOptions): void;
@@ -22,7 +22,7 @@ declare module '@minecraft/server-editor-bindings' {
         isEmpty: boolean;
     }
     export class ClipboardManager {
-        protected constructor();
+        private constructor();
         create(): ClipboardItem;
         clipboard: ClipboardItem;
     }
@@ -73,10 +73,10 @@ declare module '@minecraft/server-editor-bindings' {
         Face = 1
     }
     export class Extension {
-        protected constructor();
+        private constructor();
     }
     export class ExtensionContext {
-        protected constructor();
+        private constructor();
         extensionName: string;
         player: Player;
         selectionManager: SelectionManager;
@@ -95,7 +95,7 @@ declare module '@minecraft/server-editor-bindings' {
         debug(message: string, properties?: LogProperties): void;
     }
     export class MinecraftEditor {
-        protected constructor();
+        private constructor();
         registerExtension_Internal(extensionName: string, activationFunction: (context: ExtensionContext) => void, shutdownFunction: (context: ExtensionContext) => void, optionalParameters?: ExtensionOptionalParameters): Extension;
         readonly log: Logger;
     }
@@ -104,7 +104,7 @@ declare module '@minecraft/server-editor-bindings' {
         volume: BlockVolume;
     }
     export class Selection {
-        protected constructor();
+        private constructor();
         clear(): void;
         pushVolume(options: PushVolumeOptions): void;
         popVolume(): void;
@@ -122,12 +122,12 @@ declare module '@minecraft/server-editor-bindings' {
         visible: boolean;
     }
     export class SelectionManager {
-        protected constructor();
+        private constructor();
         create(): Selection;
         selection: Selection;
     }
     export class TransactionManager {
-        protected constructor();
+        private constructor();
         undo(): void;
         redo(): void;
         undoSize(): number;

packages/minecraft-editor/README.md

@@ -17,8 +17,8 @@ Then you must include the following in TSConfig. This allows the editor API modu
 ```json
 {
   "compilerOptions": {
-    "types": ["@jayly/minecraft-editor"],
-    "typeRoots": ["./node_modules/@jayly/minecraft-editor"],
+    "types": ["minecraft-editor"],
+    "typeRoots": ["./node_modules/@jayly"],
   },
 }
 ```

packages/minecraft-editor/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayly/minecraft-editor",
-  "version": "0.3.6-4",
+  "version": "0.3.7-0",
   "description": "Unofficial Minecraft Bedrock Editor API modules type definitions.",
   "types": "index.d.ts",
   "main": "",
@@ -15,6 +15,6 @@
   },
   "homepage": "https://github.com/JaylyDev/ScriptAPI#readme",
   "dependencies": {
-    "@minecraft/server": "1.4.0-beta.1.20.10-preview.21"
+    "@minecraft/server": "1.4.0-beta.1.20.10-preview.23"
   }
 }

packages/minecraft-editor/package.json

@@ -0,0 +1,41 @@
+// Script example for ScriptAPI
+// Author: Jayly <https://github.com/JaylyDev>
+// Project: https://github.com/JaylyDev/ScriptAPI
+import { Player, world } from "@minecraft/server";
+
+interface ClickInfo {
+  readonly timestamp: number
+};
+
+// Using map because typescript doesn't support prototype property declaration properly
+const clicks = new Map<Player, ClickInfo[]>();
+
+world.afterEvents.entityHitBlock.subscribe(function ({ damagingEntity }) {
+  if (!(damagingEntity instanceof Player)) return;
+  const clickInfo = { timestamp: Date.now() };
+  const playerClicks = clicks.get(damagingEntity) || [];
+  playerClicks.push(clickInfo);
+  clicks.set(damagingEntity, playerClicks);
+});
+
+world.afterEvents.entityHitEntity.subscribe(function ({ damagingEntity }) {
+  if (!(damagingEntity instanceof Player)) return;
+  const clickInfo = { timestamp: Date.now() };
+  const playerClicks = clicks.get(damagingEntity) || [];
+  playerClicks.push(clickInfo);
+  clicks.set(damagingEntity, playerClicks);
+});
+
+/**
+ * Get a player's clicks per second
+ * @param player 
+ * @returns
+ */
+export function getPlayerCPS(player: Player) {
+  const currentTime = Date.now();
+  const playerClicks = clicks.get(player) || [];
+  const recentClicks = playerClicks.filter(({ timestamp }) => currentTime - 1000 < timestamp);
+  clicks.set(player, recentClicks);
+
+  return recentClicks.length;
+};

scripts/cps-counter/index.js

@@ -1,25 +1,23 @@
 // Script example for ScriptAPI
 // Author: Jayly <https://github.com/JaylyDev>
 // Project: https://github.com/JaylyDev/ScriptAPI
-import { Block, Entity, EntityHitAfterEvent, Player, world } from "@minecraft/server";
+import { Block, Entity, EntityHitEntityAfterEvent, Player, world } from "@minecraft/server";
 
 /**
- * @implements {Omit<EntityHitAfterEvent, "entity">}
+ * @implements {Omit<EntityHitEntityAfterEvent, "damagingEntity">}
  */
 export class EntityCriticalHitAfterEvent {
   /**
-   * @param {Entity} entity
-   * @param {Block} hitBlock
+   * @param {Entity} damagingEntity
    * @param {Entity} hitEntity
    */
-  constructor(entity, hitBlock, hitEntity) {
-    if (!(entity instanceof Player)) {
-      console.log("Failed to call function EntityCriticalHitAfterEvent, entity is not a player");
+  constructor(damagingEntity, hitEntity) {
+    if (!(damagingEntity instanceof Player)) {
+      console.log("Failed to call function EntityCriticalHitAfterEvent, damagingEntity is not a player");
       return;
     };
 
-    this.player = entity;
-    this.hitBlock = hitBlock;
+    this.player = damagingEntity;
     this.hitEntity = hitEntity;
   };
   /**
@@ -29,21 +27,11 @@ export class EntityCriticalHitAfterEvent {
    * @type {Player}
    */
   player;
-  /**
-   * @remarks
-   * Block that was hit by the attack, or undefined if the hit
-   * attack did not hit a block. If both hitEntity and hitBlock
-   * are undefined, then the entity basically swiped into the
-   * air.
-   * @readonly
-   * @type {Block | undefined}
-   */
-  hitBlock;
   /**
    * @remarks
    * Entity that was hit by the attack, or undefined if the hit
-   * attack did not hit an entity. If both hitEntity and hitBlock
-   * are undefined, then the entity basically swiped into the
+   * attack did not hit an damagingEntity. If both hitEntity and hitBlock
+   * are undefined, then the damagingEntity basically swiped into the
    * air.
    * @readonly
    * @type {Entity | undefined}
@@ -73,17 +61,17 @@ export class EntityCriticalHitAfterEventSignal {
   }
   /**
    * @private
-   * @param {EntityHitAfterEvent} event 
+   * @param {EntityHitEntityAfterEvent} event 
    */
   trigger(event) {
-    this.handlers.forEach((callback) => callback(new EntityCriticalHitAfterEvent(event.entity, event.hitBlock, event.hitEntity)));
+    this.handlers.forEach((callback) => callback(new EntityCriticalHitAfterEvent(event.damagingEntity, event.hitEntity)));
   }
   constructor() {
-    world.afterEvents.entityHit.subscribe((event) => {
-      // checks if entity has a critical hit and is a player
-      if (event.entity instanceof Player && !!event.hitEntity && event.entity.getVelocity().y !== 0) this.trigger(event);
+    world.afterEvents.entityHitEntity.subscribe((event) => {
+      // checks if damagingEntity has a critical hit and is a player
+      if (event.damagingEntity instanceof Player && !!event.hitEntity && event.damagingEntity.getVelocity().y !== 0) this.trigger(event);
     }); 
   }
 }
 
-export const entityCriticalHit = new EntityCriticalHitAfterEventSignal();
+export const damagingEntityCriticalHit = new EntityCriticalHitAfterEventSignal();

scripts/cps-counter/index.ts

@@ -1,12 +1,19 @@
+// Script example for ScriptAPI
+// Author: Jayly#1397 <Jayly Discord>
+// Project: https://github.com/JaylyDev/ScriptAPI
 import { Dimension, world } from "@minecraft/server";
 
 /**
  * Get entities that are in specific dimension
  * @param {Dimension} dimension 
- * @param {import("@minecraft/server").EntityQueryOptions} [getEntities] 
+ * @param {import("@minecraft/server").EntityQueryOptions} [options] 
  */
-export function getEntities(dimension, getEntities) {
-  return [...dimension.getEntities(getEntities)].filter((entity) => entity.dimension === dimension);
+export function getEntities(dimension, options) {
+  const mergedOptions = {
+    minDistance: 0,
+    ...(typeof options.minDistance !== 'undefined' ? { minDistance: options.minDistance } : {})
+  };
+  return dimension.getEntities(mergedOptions);
 };
 
 /**
@@ -15,5 +22,9 @@ export function getEntities(dimension, getEntities) {
  * @param {import("@minecraft/server").EntityQueryOptions} [options] 
  */
 export function getPlayers(dimension, options) {
-  return [...world.getPlayers(options)].filter((player) => player.dimension === dimension);
+  const mergedOptions = {
+    minDistance: 0,
+    ...(typeof options.minDistance !== 'undefined' ? { minDistance: options.minDistance } : {})
+  };
+  return dimension.getPlayers(mergedOptions);
 };

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

@@ -1,10 +1,11 @@
-import { GameMode, MinecraftEffectTypes, world } from "@minecraft/server";
+import { GameMode, world } from "@minecraft/server";
 import { getEntities, getPlayers } from "dimension-entities/index";
+import { MinecraftEffectTypes } from "@minecraft/vanilla-data";
 
 const overworldEntities = getEntities(world.getDimension('overworld'));
 
 for (const entity of overworldEntities) {
-  entity.addEffect(MinecraftEffectTypes.absorption, 10);
+  entity.addEffect(MinecraftEffectTypes.Absorption, 10);
 };
 
 const netherCreativePlayers = getPlayers(world.getDimension('nether'), {

scripts/critical-hit/index.js

@@ -1,5 +1,6 @@
 import * as Server from "@minecraft/server";
 import * as Editor from "@minecraft/server-editor";
+import { MinecraftEffectTypes } from "@minecraft/vanilla-data";
 /**
  * @param {import("@minecraft/server-editor").IPlayerUISession} uiSession 
  */
@@ -13,7 +14,7 @@ export const Start = (uiSession) => {
         uiSession.actionManager.createAction(
             {
                 actionType: Editor.ActionTypes.NoArgsAction,
-                onExecute: () => uiSession.extensionContext.player.addEffect( Server.MinecraftEffectTypes.nightVision, 20000000, { amplifier: 1, showParticles: false } ),
+                onExecute: () => uiSession.extensionContext.player.addEffect( MinecraftEffectTypes.NightVision, 20000000, { amplifier: 1, showParticles: false } ),
             },
         ),
     );
@@ -23,7 +24,7 @@ export const Start = (uiSession) => {
         uiSession.actionManager.createAction(
             {
                 actionType: Editor.ActionTypes.NoArgsAction,
-                onExecute: () => uiSession.extensionContext.player.removeEffect( Server.MinecraftEffectTypes.nightVision ),
+                onExecute: () => uiSession.extensionContext.player.removeEffect( MinecraftEffectTypes.NightVision ),
             },
         ),
     );

scripts/dimension-entities/index.js

@@ -2,7 +2,7 @@
 // Author: Jayly <https://github.com/JaylyDev>
 // Project: https://github.com/JaylyDev/ScriptAPI
 import { ActionTypes, EditorInputContext, IMenu, InputModifier, IPlayerUISession, KeyboardKey } from "@minecraft/server-editor";
-import { MinecraftEffectTypes } from "@minecraft/server";
+import { MinecraftEffectTypes } from "@minecraft/vanilla-data";
 
 /**
  * Class to enable toggles for full bright in menu in editor mode
@@ -14,13 +14,13 @@ export class FullbrightToggle {
     const enableAction = uiSession.actionManager.createAction({
         actionType: ActionTypes.NoArgsAction,
         onExecute: () => {
-            player.addEffect(MinecraftEffectTypes.nightVision, 20000000, { amplifier: 1, showParticles: false });
+            player.addEffect(MinecraftEffectTypes.NightVision, 20000000, { amplifier: 1, showParticles: false });
         },
     });
     const disableAction = uiSession.actionManager.createAction({
         actionType: ActionTypes.NoArgsAction,
         onExecute: () => {
-            player.runCommand("effect @s " + MinecraftEffectTypes.nightVision.getName() + " 0");
+          player.removeEffect(MinecraftEffectTypes.NightVision);
         },
     });
     // Add actions to menu

scripts/dimension-entities/tests.js

@@ -3,8 +3,8 @@
 // Project: https://github.com/JaylyDev/ScriptAPI
 import { EntityHealthComponent, world } from "@minecraft/server";
 
-world.afterEvents.entityHit.subscribe((evd) => {
-    if (evd.entity.typeId !== 'minecraft:player') return;
+world.afterEvents.entityHitEntity.subscribe((evd) => {
+    if (evd.damagingEntity.typeId !== 'minecraft:player') return;
 
     const ent = evd.hitEntity;
     if (!ent) return;