diff --git a/.gitignore b/.gitignore index 11016cc..22322fa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ /build /.regolith .DS_Store -.vscode/ -node_modules/ \ No newline at end of file +node_modules/ +coverage/ \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..a4a4eb2 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,104 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "regolith: run default", + "type": "shell", + "command": "regolith run default", + "problemMatcher": [], + "group": { + "kind": "build", + "isDefault": true + }, + "presentation": { + "echo": true, + "close": true + } + }, + { + "label": "regolith: run preview", + "type": "shell", + "command": "regolith run preview", + "problemMatcher": [], + "group": "build", + "presentation": { + "echo": true, + "close": true + } + }, + { + "label": "regolith: run release", + "type": "shell", + "command": "regolith run release", + "problemMatcher": [], + "group": "build", + "presentation": { + "echo": true, + "reveal": "always", + "close": false + } + }, + { + "label": "regolith: bump version", + "type": "shell", + "command": "regolith run bump-version", + "problemMatcher": [], + "presentation": { + "echo": true, + "reveal": "always", + "panel": "new", + "close": false + } + }, + { + "label": "regolith: watch default", + "type": "shell", + "command": "regolith watch default", + "isBackground": true, + "problemMatcher": { + "pattern": [ + { + "regexp": ".", + "file": 1, + "location": 2, + "message": 3 + } + ], + "background": { + "activeOnStart": true, + "beginsPattern": ".", + "endsPattern": "." + } + }, + "presentation": { + "echo": true, + "close": true + } + }, + { + "label": "regolith: watch preview", + "type": "shell", + "command": "regolith watch preview", + "isBackground": true, + "problemMatcher": { + "pattern": [ + { + "regexp": ".", + "file": 1, + "location": 2, + "message": 3 + } + ], + "background": { + "activeOnStart": true, + "beginsPattern": ".", + "endsPattern": "." + } + }, + "presentation": { + "echo": true, + "close": true + } + } + ] +} diff --git a/README.md b/README.md index e01154b..25f18b4 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,7 @@ [![GitHub Downloads](https://img.shields.io/github/downloads/ForestOfLight/Understudy/total?label=Github%20downloads&logo=github)](https://github.com/ForestOfLight/Understudy/releases/latest) [![Curseforge Downloads](https://cf.way2muchnoise.eu/full_1093805_downloads.svg)](https://www.curseforge.com/minecraft-bedrock/addons/understudy) -[![Minecraft - Version](https://img.shields.io/badge/Minecraft-v26.0_(Bedrock)-brightgreen)](https://feedback.minecraft.net/hc/en-us/sections/360001186971-Release-Changelogs) -[![Codacy Badge](https://app.codacy.com/project/badge/Grade/bee7bd9061ab4085b1a26624c1f97e2c)](https://app.codacy.com/gh/ForestOfLight/Understudy/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade) +[![Minecraft - Version](https://img.shields.io/badge/Minecraft-v26.20_(Bedrock)-brightgreen)](https://feedback.minecraft.net/hc/en-us/sections/360001186971-Release-Changelogs) [![Discord](https://badgen.net/discord/members/9KGche8fxm?icon=discord&label=Discord&list=what)](https://discord.gg/9KGche8fxm) diff --git a/__mocks__/@minecraft/server-gametest.js b/__mocks__/@minecraft/server-gametest.js deleted file mode 100644 index 50a0ab6..0000000 --- a/__mocks__/@minecraft/server-gametest.js +++ /dev/null @@ -1,46 +0,0 @@ -import { vi } from 'vitest' -import { EntityComponentTypes } from '@minecraft/server' -import { Container, Player } from './server' - -export function makeEquippable(items = {}) { - return { - getEquipment: vi.fn(slot => items[slot]), - setEquipment: vi.fn(), - } -} - -export class SimulatedPlayer extends Player { - #container = new Container() - #equippable = makeEquippable() - - headRotation = { x: 0, y: 0 } - - navigateToLocation = vi.fn() - navigateToEntity = vi.fn() - navigateToBlock = vi.fn() - moveRelative = vi.fn() - stopMoving = vi.fn() - lookAtBlock = vi.fn() - lookAtEntity = vi.fn() - lookAtLocation = vi.fn() - stopBuild = vi.fn() - stopInteracting = vi.fn() - stopBreakingBlock = vi.fn() - stopUsingItem = vi.fn() - stopSwimming = vi.fn() - stopGliding = vi.fn() - attack = vi.fn() - interact = vi.fn() - useItemInSlot = vi.fn() - dropSelectedItem = vi.fn() - jump = vi.fn() - startBuild = vi.fn() - breakBlock = vi.fn() - getComponent = vi.fn((type) => { - if (type === EntityComponentTypes.Inventory) return { container: this.#container } - if (type === EntityComponentTypes.Equippable) return this.#equippable - return void 0 - }) -} - -export const spawnSimulatedPlayer = vi.fn(() => new SimulatedPlayer()) diff --git a/__mocks__/@minecraft/server.js b/__mocks__/@minecraft/server.js deleted file mode 100644 index 375c357..0000000 --- a/__mocks__/@minecraft/server.js +++ /dev/null @@ -1,313 +0,0 @@ -import { vi } from 'vitest' - -export const dynamicPropertyStore = new Map() - -let nextRunId = 1 -const scheduled = new Map() // id → { callback, nextTick, interval: number | null } -let currentTick = 0 - -export function advanceTicks(n = 1) { - for (let i = 0; i < n; i++) { - currentTick++ - system.currentTick = currentTick - for (const [id, entry] of [...scheduled.entries()]) { - if (!scheduled.has(id)) continue - if (entry.nextTick <= currentTick) { - entry.callback() - if (entry.interval === null) - scheduled.delete(id) - else if (scheduled.has(id)) - entry.nextTick = currentTick + entry.interval - } - } - } -} - -export function resetScheduler() { - nextRunId = 1 - scheduled.clear() - currentTick = 0 - system.currentTick = 0 -} - -export const ScriptEventSource = { Entity: 'Entity', Block: 'Block', Server: 'Server', NPCDialogue: 'NPCDialogue' } -export const CustomCommandSource = { Entity: 'Entity', Block: 'Block', Server: 'Server', NPCDialogue: 'NPCDialogue' } -export const CustomCommandStatus = { Failure: 'Failure', Success: 'Success' } -export const CommandPermissionLevel = {} -export const CustomCommandParamType = {} -export const GameMode = { Adventure: 'Adventure', Creative: 'Creative', Spectator: 'Spectator', Survival: 'Survival' } -export class Entity { - dimension = world.getDimension('overworld') - id = 'entity' - isClimbing = false - isFalling = false - isInWater = false - isOnGround = true - isSleeping = false - isSneaking = false - isSprinting = false - isSwimming = false - isValid = true - localizationKey = '' - location = { x: 0, y: 64, z: 0 } - x = 0 - y = 64 - z = 0 - nameTag = '' - scoreboardIdentity = void 0 - target = void 0 - typeId = 'minecraft:entity' - - addEffect = vi.fn() - addItem = vi.fn() - addTag = vi.fn(() => true) - applyDamage = vi.fn(() => false) - applyImpulse = vi.fn() - applyKnockback = vi.fn() - clearDynamicProperties = vi.fn() - clearVelocity = vi.fn() - extinguishFire = vi.fn(() => false) - getAABB = vi.fn() - getAllBlocksStandingOn = vi.fn(() => []) - getBlockFromViewDirection = vi.fn(() => void 0) - getBlockStandingOn = vi.fn(() => void 0) - getComponent = vi.fn(() => void 0) - getComponents = vi.fn(() => []) - getDynamicProperty = vi.fn() - getDynamicPropertyIds = vi.fn(() => []) - getDynamicPropertyTotalByteCount = vi.fn(() => 0) - getEffect = vi.fn() - getEffects = vi.fn(() => []) - getEntitiesFromViewDirection = vi.fn(() => []) - getHeadLocation = vi.fn(() => ({ x: 0, y: 66, z: 0 })) - getProperty = vi.fn() - getRotation = vi.fn(() => ({ x: 0, y: 0 })) - getTags = vi.fn(() => []) - getVelocity = vi.fn(() => ({ x: 0, y: 0, z: 0 })) - getViewDirection = vi.fn(() => ({ x: 0, y: 0, z: 1 })) - hasComponent = vi.fn(() => false) - hasTag = vi.fn(() => false) - kill = vi.fn(() => true) - lookAt = vi.fn() - matches = vi.fn(() => false) - playAnimation = vi.fn() - remove = vi.fn() - removeEffect = vi.fn(() => false) - removeTag = vi.fn(() => false) - resetProperty = vi.fn() - runCommand = vi.fn() - setDynamicProperties = vi.fn() - setDynamicProperty = vi.fn() - setOnFire = vi.fn(() => false) - setProperty = vi.fn() - setRotation = vi.fn() - teleport = vi.fn() - triggerEvent = vi.fn() - tryTeleport = vi.fn(() => true) -} - -export class Player extends Entity { - camera = {} - clientSystemInfo = {} - commandPermissionLevel = void 0 - graphicsMode = {} - inputInfo = {} - inputPermissions = {} - isEmoting = false - isFlying = false - isGliding = false - isJumping = false - level = 0 - locatorBar = {} - name = '' - onScreenDisplay = {} - partyId = void 0 - playerPermissionLevel = void 0 - selectedSlotIndex = 0 - totalXpNeededForNextLevel = 0 - xpEarnedAtCurrentLevel = 0 - typeId = 'minecraft:player' - - addExperience = vi.fn(() => 0) - addLevels = vi.fn(() => 0) - clearPropertyOverridesForEntity = vi.fn() - eatItem = vi.fn() - getAimAssist = vi.fn() - getControlScheme = vi.fn() - getGameMode = vi.fn(() => GameMode.Survival) - getItemCooldown = vi.fn(() => 0) - getSpawnPoint = vi.fn() - getTotalXp = vi.fn(() => 0) - playMusic = vi.fn() - playSound = vi.fn() - postClientMessage = vi.fn() - queueMusic = vi.fn() - removePropertyOverrideForEntity = vi.fn() - resetLevel = vi.fn() - sendMessage = vi.fn() - setControlScheme = vi.fn() - setGameMode = vi.fn() - setPropertyOverrideForEntity = vi.fn() - setSpawnPoint = vi.fn() - spawnParticle = vi.fn() - startItemCooldown = vi.fn() - stopAllSounds = vi.fn() - stopMusic = vi.fn() - stopSound = vi.fn() -} - -export const Block = class Block {} -export const EntityComponentTypes = { - Inventory: 'minecraft:inventory', - Equippable: 'minecraft:equippable', - Projectile: 'minecraft:projectile', -} -export const Container = class Container { - #slots - - constructor({ size = 27, items = {} } = {}) { - this.size = size - this.isValid = true - this.containerRules = void 0 - this.#slots = Array.from({ length: size }, (_, i) => items[i] ?? void 0) - } - - get emptySlotsCount() { return this.#slots.filter(s => s === void 0).length } - get weight() { return 0 } - - getItem = vi.fn(i => this.#slots[i] ?? void 0) - setItem = vi.fn((i, item) => { this.#slots[i] = item ?? void 0 }) - getSlot = vi.fn(i => ({ - getItem: () => this.#slots[i] ?? void 0, - setItem: (item) => { this.#slots[i] = item ?? void 0 }, - })) - addItem = vi.fn(itemStack => { - for (let i = 0; i < this.size; i++) { - if (!this.#slots[i]) { - this.#slots[i] = itemStack - return void 0 - } - } - return itemStack - }) - clearAll = vi.fn(() => { this.#slots = Array(this.size).fill(void 0) }) - contains = vi.fn(itemStack => this.#slots.some(s => s?.typeId === itemStack?.typeId)) - find = vi.fn(itemStack => { - const i = this.#slots.findIndex(s => s?.typeId === itemStack?.typeId) - return i === -1 ? void 0 : i - }) - findLast = vi.fn(itemStack => { - for (let i = this.size - 1; i >= 0; i--) - if (this.#slots[i]?.typeId === itemStack?.typeId) return i - - return void 0 - }) - firstEmptySlot = vi.fn(() => { - const i = this.#slots.indexOf(s => s === void 0) - return i === -1 ? void 0 : i - }) - firstItem = vi.fn(() => { - const i = this.#slots.findIndex(slot => slot !== void 0) - return i === -1 ? void 0 : i - }) - swapItems = vi.fn((slotA, slotB, otherContainer) => { - const target = otherContainer ?? this - const a = this.#slots[slotA] - const b = target.getItem(slotB) - this.#slots[slotA] = b ?? void 0 - target.setItem(slotB, a) - }) - moveItem = vi.fn((fromSlot, toSlot, toContainer) => { - const item = this.#slots[fromSlot] - this.#slots[fromSlot] = void 0 - toContainer.setItem(toSlot, item) - }) - transferItem = vi.fn((fromSlot, toContainer) => { - const item = this.#slots[fromSlot] - if (!item) return void 0 - for (let i = 0; i < toContainer.size; i++) { - if (!toContainer.getItem(i)) { - this.#slots[fromSlot] = void 0 - toContainer.setItem(i, item) - return item - } - } - return void 0 - }) -} -export const EquipmentSlot = { Body: 'Body', Chest: 'Chest', Feet: 'Feet', Head: 'Head', Legs: 'Legs', Mainhand: 'Mainhand', Offhand: 'Offhand' } -export const DimensionType = class DimensionType { - typeId = 'minecraft:overworld' - - constructor(typeId = void 0) { - if (typeId) this.typeId = typeId - } -} -export const DimensionTypes = { getAll: vi.fn(() => [new DimensionType("minecraft:overworld"), new DimensionType('minecraft:nether'), new DimensionType('minecraft:the_end')]) } -export const TicksPerSecond = 20.0 -export const BlockVolume = class BlockVolume {} -export const EntityItemComponent = class EntityItemComponent { get componentId() { return 'minecraft:item' } } -export const StructureSaveMode = { Memory: 'Memory', World: 'World' } - -export const system = { - afterEvents: { - scriptEventReceive: { subscribe: vi.fn() }, - }, - beforeEvents: { - shutdown: { subscribe: vi.fn(), unsubscribe: vi.fn() }, - startup: { subscribe: vi.fn() }, - }, - runJob: vi.fn(), - run: vi.fn(callback => { - const id = nextRunId++ - scheduled.set(id, { callback, nextTick: currentTick + 1, interval: null }) - return id - }), - runTimeout: vi.fn((callback, tickDelay = 0) => { - const id = nextRunId++ - scheduled.set(id, { callback, nextTick: currentTick + Math.max(tickDelay, 1), interval: null }) - return id - }), - runInterval: vi.fn((callback, tickInterval = 0) => { - const id = nextRunId++ - const interval = Math.max(tickInterval, 1) - scheduled.set(id, { callback, nextTick: currentTick + interval, interval }) - return id - }), - clearRun: vi.fn(runId => { - scheduled.delete(runId) - }), - currentTick: 0, -} - -export const world = { - afterEvents: { - playerJoin: { subscribe: vi.fn() }, - entityDie: { subscribe: vi.fn() }, - playerGameModeChange: { subscribe: vi.fn() }, - gameRuleChange: { subscribe: vi.fn() }, - worldLoad: { subscribe: vi.fn(cb => cb()) }, - }, - getDynamicProperty: vi.fn((key) => dynamicPropertyStore.get(key)), - setDynamicProperty: vi.fn((key, value) => { - if (value === void 0) - dynamicPropertyStore.delete(key) - else - dynamicPropertyStore.set(key, JSON.stringify(value)) - }), - getDynamicPropertyIds: vi.fn(() => [...dynamicPropertyStore.keys()]), - getDimension: vi.fn((() => { - const dim = { id: 'minecraft:overworld', runCommand: vi.fn(), fillBlocks: vi.fn(), getEntities: vi.fn(() => []), spawnItem: vi.fn() } - return () => dim - })()), - getPlayers: vi.fn(() => []), - getEntity: vi.fn(), - sendMessage: vi.fn(), - gameRules: {}, - structureManager: { - get: vi.fn(), - delete: vi.fn(() => true), - place: vi.fn(), - createFromWorld: vi.fn(), - }, -} diff --git a/__tests__/classes/Actions.test.js b/__tests__/classes/Actions.test.js index 14bea2b..8dceb73 100644 --- a/__tests__/classes/Actions.test.js +++ b/__tests__/classes/Actions.test.js @@ -1,8 +1,8 @@ import { vi, describe, it, expect, beforeEach } from 'vitest' -import { advanceTicks } from '../../__mocks__/@minecraft/server.js' import { Actions } from '../../packs/BP/scripts/classes/Actions.js' import { RepeatableAction } from '../../packs/BP/scripts/classes/RepeatableAction.js' import { REPEATABLE_ACTIONS } from '../../packs/BP/scripts/commands/action.js' +import { scheduler } from '@forestoflight/minecraft-vitest-mocks' describe('Actions', () => { let mockUnderstudy; let actions; let performSpy; let repeatableActionOnTickSpy @@ -51,7 +51,7 @@ describe('Actions', () => { it('performs the action after the tick delay elapses', () => { actions.once(REPEATABLE_ACTIONS.ATTACK, 5) - advanceTicks(5) + scheduler.advanceTicks(5) actions.onTick() expect(performSpy).toHaveBeenCalledOnce() }) diff --git a/__tests__/classes/PlayerInfoSaver.test.js b/__tests__/classes/PlayerInfoSaver.test.js index 17c7357..9eaa5b0 100644 --- a/__tests__/classes/PlayerInfoSaver.test.js +++ b/__tests__/classes/PlayerInfoSaver.test.js @@ -3,7 +3,7 @@ import { world, system, EntityComponentTypes, TicksPerSecond } from '@minecraft/ import { PlayerInfoSaver } from '../../packs/BP/scripts/classes/PlayerInfoSaver.js' import Understudy from '../../packs/BP/scripts/classes/Understudy.js' import { UnderstudySaveInfoError } from '../../packs/BP/scripts/errors/UnderstudySaveInfoError.js' -import { dynamicPropertyStore } from '../../__mocks__/@minecraft/server.js' +import { worldDynamicPropertyStore } from '@forestoflight/minecraft-vitest-mocks' import { UnderstudyNotConnectedError } from '../../packs/BP/scripts/errors/UnderstudyNotConnectedError.js' describe('PlayerInfoSaver', () => { @@ -15,7 +15,7 @@ describe('PlayerInfoSaver', () => { understudy = new Understudy('TestBot') understudy.join({ location: { x: 0, y: 64, z: 0 }, dimension: world.getDimension("minecraft:overworld") }) infoSaver = new PlayerInfoSaver(understudy) - dynamicPropertyStore.set('noSimplayerSaving', false) + worldDynamicPropertyStore.set('noSimplayerSaving', false) }) describe('get', () => { @@ -24,17 +24,17 @@ describe('PlayerInfoSaver', () => { }) it('throws when noSimplayerSaving is enabled', () => { - dynamicPropertyStore.set('noSimplayerSaving', true) + worldDynamicPropertyStore.set('noSimplayerSaving', true) expect(() => infoSaver.get()).toThrow(UnderstudySaveInfoError) }) it('throws when no player info has been saved', () => { - dynamicPropertyStore.set('TestBot:playerinfo', undefined) + worldDynamicPropertyStore.set('TestBot:playerinfo', undefined) expect(() => infoSaver.get()).toThrow(UnderstudySaveInfoError) }) it('throws when player info is corrupted', () => { - dynamicPropertyStore.set('TestBot:playerinfo', 'this is not valid json') + worldDynamicPropertyStore.set('TestBot:playerinfo', 'this is not valid json') expect(() => infoSaver.get()).toThrow(UnderstudySaveInfoError) }) @@ -43,7 +43,7 @@ describe('PlayerInfoSaver', () => { location: { x: 0, y: 64, z: 0 }, rotation: { x: 0, y: 0 }, dimensionId: 'minecraft:overworld', gameMode: 'Survival', projectileIds: [], } - dynamicPropertyStore.set('TestBot:playerinfo', JSON.stringify(playerInfo)) + worldDynamicPropertyStore.set('TestBot:playerinfo', JSON.stringify(playerInfo)) expect(infoSaver.get()).toEqual(playerInfo) }) @@ -70,7 +70,7 @@ describe('PlayerInfoSaver', () => { }) it('does not save when noSimplayerSaving is enabled', () => { - dynamicPropertyStore.set('noSimplayerSaving', true) + worldDynamicPropertyStore.set('noSimplayerSaving', true) infoSaver.save() expect(world.setDynamicProperty).not.toHaveBeenCalledWith('TestBot:playerinfo', expect.any(String)) }) @@ -101,7 +101,7 @@ describe('PlayerInfoSaver', () => { describe('loadInventoryAndProjectileOwnership', () => { it('throws when noSimplayerSaving is enabled', () => { - dynamicPropertyStore.set('noSimplayerSaving', true) + worldDynamicPropertyStore.set('noSimplayerSaving', true) expect(() => infoSaver.loadInventoryAndProjectileOwnership()).toThrow(UnderstudySaveInfoError) }) @@ -110,8 +110,8 @@ describe('PlayerInfoSaver', () => { location: { x: 1, y: 64, z: 2 }, rotation: { x: 0, y: 90 }, dimensionId: 'minecraft:overworld', gameMode: 'Creative', projectileIds: [], } - dynamicPropertyStore.set('TestBot:playerinfo', JSON.stringify(playerInfo)) - dynamicPropertyStore.set('bot_TestBot_inventory', JSON.stringify({ 0: { typeId: 'minecraft:stone', amount: 1 } })) + worldDynamicPropertyStore.set('TestBot:playerinfo', JSON.stringify(playerInfo)) + worldDynamicPropertyStore.set('bot_TestBot_inventory', JSON.stringify({ 0: { typeId: 'minecraft:stone', amount: 1 } })) infoSaver.loadInventoryAndProjectileOwnership() expect(understudy.getInventory().setItem).toHaveBeenCalled() }) @@ -123,7 +123,7 @@ describe('PlayerInfoSaver', () => { location: { x: 1, y: 64, z: 2 }, rotation: { x: 0, y: 90 }, dimensionId: 'minecraft:overworld', gameMode: 'Creative', projectileIds: ['proj1'], } - dynamicPropertyStore.set('TestBot:playerinfo', JSON.stringify(playerInfo)) + worldDynamicPropertyStore.set('TestBot:playerinfo', JSON.stringify(playerInfo)) infoSaver.loadInventoryAndProjectileOwnership() expect(projectile.getComponent(EntityComponentTypes.Projectile).owner).toBe(understudy.simulatedPlayer) }) @@ -136,7 +136,7 @@ describe('PlayerInfoSaver', () => { }) it('does nothing when noSimplayerSaving is enabled', () => { - dynamicPropertyStore.set('noSimplayerSaving', true) + worldDynamicPropertyStore.set('noSimplayerSaving', true) infoSaver.onConnectedTick() expect(world.setDynamicProperty).not.toHaveBeenCalledWith('TestBot:playerinfo', expect.any(String)) }) diff --git a/__tests__/classes/Understudies.test.js b/__tests__/classes/Understudies.test.js index 8362c81..0c45ef3 100644 --- a/__tests__/classes/Understudies.test.js +++ b/__tests__/classes/Understudies.test.js @@ -1,12 +1,12 @@ import { vi, describe, it, expect, beforeEach } from 'vitest' import { world, system } from '@minecraft/server' import Understudies from '../../packs/BP/scripts/classes/Understudies.js' -import { advanceTicks, resetScheduler } from '../../__mocks__/@minecraft/server.js' +import { scheduler } from '@forestoflight/minecraft-vitest-mocks' describe('Understudies', () => { beforeEach(() => { Understudies.understudies = [] - resetScheduler() + scheduler.reset() }) describe('onStartup', () => { @@ -23,7 +23,7 @@ describe('Understudies', () => { const understudy = Understudies.create('TestBot') understudy.join({ location: { x: 0, y: 0, z: 0 }, dimension: world.getDimension('overworld') }) const onConnectedTickSpy = vi.spyOn(understudy, 'onConnectedTick').mockImplementation(() => {}) - advanceTicks(1) + scheduler.advanceTicks(1) expect(onConnectedTickSpy).toHaveBeenCalled() }) }) @@ -38,10 +38,10 @@ describe('Understudies', () => { it('removes the understudy when it dies', () => { const understudy = Understudies.create('TestBot') understudy.join({ location: { x: 0, y: 0, z: 0 }, dimension: world.getDimension('overworld') }) - advanceTicks(1) + scheduler.advanceTicks(1) const event = { deadEntity: { typeId: 'minecraft:player', name: 'TestBot' } } Understudies.onEntityDie(event) - advanceTicks(1) + scheduler.advanceTicks(1) expect(Understudies.understudies.length).toBe(0) }) }) @@ -112,21 +112,21 @@ describe('Understudies', () => { it('removes the understudy once it is no longer connected', () => { const understudy = Understudies.create('TestBot') understudy.join({ location: { x: 0, y: 0, z: 0 }, dimension: world.getDimension('overworld') }) - advanceTicks(1) + scheduler.advanceTicks(1) understudy.leave() Understudies.remove(understudy) - advanceTicks(1) + scheduler.advanceTicks(1) expect(Understudies.understudies.length).toBe(0) }) it('clears the run interval after removing', () => { const understudy = Understudies.create('TestBot') understudy.join({ location: { x: 0, y: 0, z: 0 }, dimension: world.getDimension('overworld') }) - advanceTicks(1) + scheduler.advanceTicks(1) understudy.leave() const clearRunSpy = vi.spyOn(system, 'clearRun') Understudies.remove(understudy) - advanceTicks(1) + scheduler.advanceTicks(1) expect(clearRunSpy).toHaveBeenCalled() }) @@ -142,7 +142,7 @@ describe('Understudies', () => { Understudies.create('TestBot') Understudies.create('Bob') Understudies.removeAll() - advanceTicks(1) + scheduler.advanceTicks(1) expect(Understudies.length()).toBe(0) }) }) diff --git a/__tests__/classes/Understudy.test.js b/__tests__/classes/Understudy.test.js index 2da9bcc..73d1783 100644 --- a/__tests__/classes/Understudy.test.js +++ b/__tests__/classes/Understudy.test.js @@ -1,8 +1,8 @@ import { vi, describe, it, expect, beforeEach } from 'vitest' -import { system, world, Block, Entity, Player, dynamicPropertyStore } from '@minecraft/server' +import { system, world, Block, Entity, Player } from '@minecraft/server' import Understudy from '../../packs/BP/scripts/classes/Understudy.js' import { MOVE_OPTIONS } from '../../packs/BP/scripts/commands/move.js' -import { advanceTicks } from '../../__mocks__/@minecraft/server.js' +import { scheduler, worldDynamicPropertyStore } from '@forestoflight/minecraft-vitest-mocks' describe('Understudy', () => { let understudy @@ -84,7 +84,7 @@ describe('Understudy', () => { }) const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {}) understudy.join({ location: { x: 0, y: 64, z: 0 }, dimension: world.getDimension() }) - advanceTicks(1) + scheduler.advanceTicks(1) expect(warnSpy).toHaveBeenCalled() }) @@ -98,7 +98,7 @@ describe('Understudy', () => { }) expect(() => { understudy.join({ location: { x: 0, y: 64, z: 0 }, dimension: world.getDimension() }) - advanceTicks(1) + scheduler.advanceTicks(1) }).toThrow() }) }) @@ -106,7 +106,7 @@ describe('Understudy', () => { describe('rejoin', () => { it('calls join with saved player info', () => { const savedInfo = { location: { x: 0, y: 64, z: 0 }, dimensionId: 'minecraft:overworld', rotation: { x: 0, y: 0 }, gameMode: 'Survival' } - dynamicPropertyStore.set('TestBot:playerinfo', JSON.stringify(savedInfo)) + worldDynamicPropertyStore.set('TestBot:playerinfo', JSON.stringify(savedInfo)) vi.spyOn(understudy, 'join') understudy.rejoin() expect(understudy.join).toHaveBeenCalledWith({ location: savedInfo.location, dimension: world.getDimension(), rotation: savedInfo.rotation, gameMode: savedInfo.gameMode }) diff --git a/__tests__/commands/action.test.js b/__tests__/commands/action.test.js index 452a85e..240d87c 100644 --- a/__tests__/commands/action.test.js +++ b/__tests__/commands/action.test.js @@ -1,6 +1,6 @@ import { vi, describe, it, expect, beforeEach } from 'vitest' import Understudies from '../../packs/BP/scripts/classes/Understudies.js' -import { advanceTicks } from '../../__mocks__/@minecraft/server.js' +import { scheduler } from '@forestoflight/minecraft-vitest-mocks' import { world } from '@minecraft/server' import { actionCommand, REPEATABLE_ACTIONS, TIMING_OPTIONS } from '../../packs/BP/scripts/commands/action.js' @@ -10,7 +10,7 @@ describe('ActionCommand', () => { beforeEach(() => { Understudies.removeAll() - advanceTicks(1) + scheduler.advanceTicks(1) understudy = Understudies.create('TestBot') understudy.join({ location: { x: 0, y: 0, z: 0 }, dimension: world.getDimension('overworld') }) actions = understudy.actions diff --git a/__tests__/commands/claimprojectiles.test.js b/__tests__/commands/claimprojectiles.test.js index cd49a55..8d5e8b3 100644 --- a/__tests__/commands/claimprojectiles.test.js +++ b/__tests__/commands/claimprojectiles.test.js @@ -1,5 +1,5 @@ import { vi, describe, it, expect, beforeEach, beforeAll } from 'vitest' -import { advanceTicks } from '../../__mocks__/@minecraft/server.js' +import { scheduler } from '@forestoflight/minecraft-vitest-mocks' import Understudies from '../../packs/BP/scripts/classes/Understudies.js' import { world, CustomCommandStatus } from '@minecraft/server' import { claimProjectilesCommand } from '../../packs/BP/scripts/commands/claimprojectiles.js' @@ -33,13 +33,13 @@ describe('ClaimProjectilesCommand', () => { it('schedules claimProjectiles with the default radius of 25', () => { claimProjectilesCommand.claimprojectilesCommand({}, 'TestBot') - advanceTicks(1) + scheduler.advanceTicks(1) expect(understudy.claimProjectiles).toHaveBeenCalledWith(25) }) it('schedules claimProjectiles with a custom radius', () => { claimProjectilesCommand.claimprojectilesCommand({}, 'TestBot', 50) - advanceTicks(1) + scheduler.advanceTicks(1) expect(understudy.claimProjectiles).toHaveBeenCalledWith(50) }) }) diff --git a/__tests__/commands/inventory.test.js b/__tests__/commands/inventory.test.js index 7875f1e..4a0865b 100644 --- a/__tests__/commands/inventory.test.js +++ b/__tests__/commands/inventory.test.js @@ -1,7 +1,7 @@ import { vi, describe, it, expect, beforeAll } from 'vitest' import Understudies from '../../packs/BP/scripts/classes/Understudies.js' import { CustomCommandStatus, world } from '@minecraft/server' -import { Container } from '../../__mocks__/@minecraft/server.js' +import { Container } from '@forestoflight/minecraft-vitest-mocks/server' import { inventoryCommand } from '../../packs/BP/scripts/commands/inventory.js' describe('InventoryCommand', () => { diff --git a/__tests__/commands/join.test.js b/__tests__/commands/join.test.js index a562c10..87c9705 100644 --- a/__tests__/commands/join.test.js +++ b/__tests__/commands/join.test.js @@ -1,6 +1,6 @@ import { vi, describe, it, expect, beforeEach } from 'vitest' import { CustomCommandStatus, Player, world } from '@minecraft/server' -import { advanceTicks, resetScheduler } from '../../__mocks__/@minecraft/server.js' +import { scheduler } from '@forestoflight/minecraft-vitest-mocks' import Understudies from '../../packs/BP/scripts/classes/Understudies.js' import Understudy from '../../packs/BP/scripts/classes/Understudy.js' import { joinCommand } from '../../packs/BP/scripts/commands/join.js' @@ -28,8 +28,8 @@ describe('JoinCommand', () => { beforeEach(() => { vi.clearAllMocks() Understudies.removeAll() - advanceTicks(1) - resetScheduler() + scheduler.advanceTicks(1) + scheduler.reset() }) it('returns failure when the understudy is already online', () => { @@ -42,14 +42,14 @@ describe('JoinCommand', () => { it('creates a new understudy when not already online', () => { const spy = vi.spyOn(Understudies, 'create') joinCommand.joinCommand(makePlayerOrigin(), 'TestBot') - advanceTicks(1) + scheduler.advanceTicks(1) expect(spy).toHaveBeenCalledWith('TestBot') }) it('calls join with location info from the origin source', () => { const joinSpy = vi.spyOn(Understudy.prototype, 'join') joinCommand.joinCommand(makePlayerOrigin(), 'TestBot') - advanceTicks(1) + scheduler.advanceTicks(1) expect(joinSpy).toHaveBeenCalledWith( expect.objectContaining({ location: { x: 0, y: 64, z: 0 } }) ) @@ -58,7 +58,7 @@ describe('JoinCommand', () => { it('adds the nametag prefix after joining', () => { vi.spyOn(Understudies, 'addNametagPrefix') joinCommand.joinCommand(makePlayerOrigin(), 'TestBot') - advanceTicks(1) + scheduler.advanceTicks(1) const understudy = Understudies.get('TestBot') expect(Understudies.addNametagPrefix).toHaveBeenCalledWith(understudy) }) diff --git a/__tests__/commands/leave.test.js b/__tests__/commands/leave.test.js index 995fc33..df7f631 100644 --- a/__tests__/commands/leave.test.js +++ b/__tests__/commands/leave.test.js @@ -1,5 +1,5 @@ import { vi, describe, it, expect, beforeEach, beforeAll } from 'vitest' -import { advanceTicks } from '../../__mocks__/@minecraft/server.js' +import { scheduler } from '@forestoflight/minecraft-vitest-mocks' import Understudies from '../../packs/BP/scripts/classes/Understudies.js' import { leaveCommand } from '../../packs/BP/scripts/commands/leave.js' import { CustomCommandStatus, world } from '@minecraft/server' @@ -23,7 +23,7 @@ describe('LeaveCommand', () => { describe('leaveCommand', () => { beforeEach(() => { Understudies.removeAll() - advanceTicks(1) + scheduler.advanceTicks(1) understudy = Understudies.create('TestBot') understudy.join({ location: { x: 0, y: 0, z: 0 }, dimension: world.getDimension('overworld') }) }) @@ -36,14 +36,14 @@ describe('LeaveCommand', () => { it('schedules leave when the understudy is found', () => { vi.spyOn(understudy, 'leave') leaveCommand.leaveCommand({}, 'TestBot') - advanceTicks(1) + scheduler.advanceTicks(1) expect(understudy.leave).toHaveBeenCalled() }) it('schedules remove after leave', () => { const spy = vi.spyOn(Understudies, 'remove') leaveCommand.leaveCommand({}, 'TestBot') - advanceTicks(1) + scheduler.advanceTicks(1) expect(spy).toHaveBeenCalledWith(understudy) }) diff --git a/__tests__/commands/look.test.js b/__tests__/commands/look.test.js index 5d6c3bb..854c284 100644 --- a/__tests__/commands/look.test.js +++ b/__tests__/commands/look.test.js @@ -1,6 +1,6 @@ import { vi, describe, it, expect, beforeEach } from 'vitest' import { Entity, Block, world, CustomCommandStatus } from '@minecraft/server' -import { advanceTicks } from '../../__mocks__/@minecraft/server.js' +import { scheduler } from '@forestoflight/minecraft-vitest-mocks' import { ServerCommandOrigin } from '../../packs/BP/scripts/lib/canopy/ServerCommandOrigin.js' import Understudies from '../../packs/BP/scripts/classes/Understudies.js' import { lookCommand } from '../../packs/BP/scripts/commands/look.js' @@ -19,7 +19,7 @@ describe('LookCommand', () => { beforeEach(() => { Understudies.removeAll() - advanceTicks(1) + scheduler.advanceTicks(1) understudy = Understudies.create('TestBot') understudy.join({ location: { x: 0, y: 0, z: 0 }, dimension: world.getDimension('overworld') }) }) @@ -49,7 +49,7 @@ describe('LookCommand', () => { ])('routes %s to lookAtCardinal and schedules looking %s', (direction, expected) => { const spy = vi.spyOn(understudy, 'look') lookCommand.lookCommand({}, 'TestBot', direction) - advanceTicks(1) + scheduler.advanceTicks(1) expect(spy).toHaveBeenCalledWith(expected) }) }) @@ -73,7 +73,7 @@ describe('LookCommand', () => { origin.getSource().getBlockFromViewDirection.mockReturnValue({ block }) const spy = vi.spyOn(understudy, 'look') lookCommand.lookCommand(origin, 'TestBot', 'block') - advanceTicks(1) + scheduler.advanceTicks(1) expect(spy).toHaveBeenCalledWith(block) }) }) @@ -97,7 +97,7 @@ describe('LookCommand', () => { origin.getSource().getEntitiesFromViewDirection.mockReturnValue([{ entity: targetEntity }]) const spy = vi.spyOn(understudy, 'look') lookCommand.lookCommand(origin, 'TestBot', 'entity') - advanceTicks(1) + scheduler.advanceTicks(1) expect(spy).toHaveBeenCalledWith(targetEntity) }) }) @@ -114,7 +114,7 @@ describe('LookCommand', () => { const origin = { getSource: vi.fn(() => mockSource) } const spy = vi.spyOn(understudy, 'look') lookCommand.lookCommand(origin, 'TestBot', 'me') - advanceTicks(1) + scheduler.advanceTicks(1) expect(spy).toHaveBeenCalledWith(mockSource) }) }) @@ -124,7 +124,7 @@ describe('LookCommand', () => { const location = { x: 10, y: 64, z: 20 } const spy = vi.spyOn(understudy, 'look') lookCommand.lookCommand({}, 'TestBot', 'at', location) - advanceTicks(1) + scheduler.advanceTicks(1) expect(spy).toHaveBeenCalledWith( expect.objectContaining({ x: 10, y: 64, z: 20 }) ) @@ -135,7 +135,7 @@ describe('LookCommand', () => { it('schedules stopLooking on the understudy', () => { const spy = vi.spyOn(understudy, 'stopLooking') lookCommand.lookCommand({}, 'TestBot', 'stop') - advanceTicks(1) + scheduler.advanceTicks(1) expect(spy).toHaveBeenCalled() }) }) diff --git a/__tests__/commands/move.test.js b/__tests__/commands/move.test.js index 3751cd0..d89b3e1 100644 --- a/__tests__/commands/move.test.js +++ b/__tests__/commands/move.test.js @@ -1,6 +1,6 @@ import { vi, describe, it, expect, beforeAll } from 'vitest' import { Entity, Block, CustomCommandStatus, world } from '@minecraft/server' -import { advanceTicks } from '../../__mocks__/@minecraft/server.js' +import { scheduler } from '@forestoflight/minecraft-vitest-mocks' import { ServerCommandOrigin } from '../../packs/BP/scripts/lib/canopy/ServerCommandOrigin.js' import Understudies from '../../packs/BP/scripts/classes/Understudies.js' import { moveCommand, MOVE_OPTIONS } from '../../packs/BP/scripts/commands/move.js' @@ -45,7 +45,7 @@ describe('MoveCommand', () => { ])('routes %s to moveRelatively', (direction) => { const spy = vi.spyOn(understudy, 'moveRelative') moveCommand.moveCommand({}, 'TestBot', direction) - advanceTicks(1) + scheduler.advanceTicks(1) expect(spy).toHaveBeenCalledWith(direction) }) @@ -80,7 +80,7 @@ describe('MoveCommand', () => { origin.getSource().getBlockFromViewDirection.mockReturnValue({ block }) const spy = vi.spyOn(understudy, 'moveLocation') moveCommand.moveCommand(origin, 'TestBot', MOVE_OPTIONS.BLOCK) - advanceTicks(1) + scheduler.advanceTicks(1) expect(spy).toHaveBeenCalledWith(block) }) @@ -112,7 +112,7 @@ describe('MoveCommand', () => { origin.getSource().getEntitiesFromViewDirection.mockReturnValue([{ entity: targetEntity }]) const spy = vi.spyOn(understudy, 'moveLocation') moveCommand.moveCommand(origin, 'TestBot', MOVE_OPTIONS.ENTITY) - advanceTicks(1) + scheduler.advanceTicks(1) expect(spy).toHaveBeenCalledWith(targetEntity) }) @@ -137,7 +137,7 @@ describe('MoveCommand', () => { const origin = makeEntityOrigin() const spy = vi.spyOn(understudy, 'moveLocation') moveCommand.moveCommand(origin, 'TestBot', MOVE_OPTIONS.ME) - advanceTicks(1) + scheduler.advanceTicks(1) expect(spy).toHaveBeenCalledWith(origin.getSource()) }) @@ -154,7 +154,7 @@ describe('MoveCommand', () => { const location = { x: 10, y: 64, z: 20 } const spy = vi.spyOn(understudy, 'moveLocation') moveCommand.moveCommand(origin, 'TestBot', MOVE_OPTIONS.TO, location) - advanceTicks(1) + scheduler.advanceTicks(1) expect(spy).toHaveBeenCalledWith( expect.objectContaining({ x: 10, y: 64, z: 20 }) ) @@ -172,7 +172,7 @@ describe('MoveCommand', () => { const origin = makeEntityOrigin() const spy = vi.spyOn(understudy, 'stopMoving') moveCommand.moveCommand(origin, 'TestBot', MOVE_OPTIONS.STOP) - advanceTicks(1) + scheduler.advanceTicks(1) expect(spy).toHaveBeenCalled() }) diff --git a/__tests__/commands/prefix.test.js b/__tests__/commands/prefix.test.js index f867b1c..df199bb 100644 --- a/__tests__/commands/prefix.test.js +++ b/__tests__/commands/prefix.test.js @@ -1,7 +1,8 @@ import { vi, describe, it, expect, beforeEach } from 'vitest' -import { advanceTicks, CustomCommandStatus } from '../../__mocks__/@minecraft/server.js' +import { scheduler } from '@forestoflight/minecraft-vitest-mocks' import Understudies from '../../packs/BP/scripts/classes/Understudies.js' import { prefixCommand } from '../../packs/BP/scripts/commands/prefix.js' +import { CustomCommandStatus } from '@minecraft/server' describe('PrefixCommand', () => { beforeEach(() => { @@ -19,13 +20,13 @@ describe('PrefixCommand', () => { describe('prefixCommand', () => { it('schedules removing the prefix when prefix is -none', () => { prefixCommand.prefixCommand({}, '-none') - advanceTicks(1) + scheduler.advanceTicks(1) expect(Understudies.setNametagPrefix).toHaveBeenCalledWith('') }) it('schedules setting the prefix when prefix is provided', () => { prefixCommand.prefixCommand({}, 'BOT') - advanceTicks(1) + scheduler.advanceTicks(1) expect(Understudies.setNametagPrefix).toHaveBeenCalledWith('BOT') }) diff --git a/__tests__/commands/rejoin.test.js b/__tests__/commands/rejoin.test.js index 5aa2903..23d2512 100644 --- a/__tests__/commands/rejoin.test.js +++ b/__tests__/commands/rejoin.test.js @@ -1,6 +1,6 @@ import { vi, describe, it, expect, beforeEach, beforeAll } from 'vitest' import { CustomCommandStatus, Player, world } from '@minecraft/server' -import { advanceTicks } from '../../__mocks__/@minecraft/server.js' +import { scheduler } from '@forestoflight/minecraft-vitest-mocks' import Understudies from '../../packs/BP/scripts/classes/Understudies.js' import { rejoinCommand } from '../../packs/BP/scripts/commands/rejoin.js' import Understudy from '../../packs/BP/scripts/classes/Understudy.js' @@ -33,7 +33,7 @@ describe('RejoinCommand', () => { beforeEach(() => { vi.clearAllMocks() Understudies.removeAll() - advanceTicks(1) + scheduler.advanceTicks(1) }) it('returns failure when the understudy is already online', () => { @@ -47,7 +47,7 @@ describe('RejoinCommand', () => { const createSpy = vi.spyOn(Understudies, 'create') const rejoinSpy = vi.spyOn(Understudy.prototype, 'rejoin') rejoinCommand.rejoinCommand(makePlayerOrigin(), 'TestBot') - advanceTicks(1) + scheduler.advanceTicks(1) expect(createSpy).toHaveBeenCalledWith('TestBot') expect(rejoinSpy).toHaveBeenCalled() }) @@ -57,14 +57,14 @@ describe('RejoinCommand', () => { vi.spyOn(console, 'warn').mockImplementation(() => {}) const joinSpy = vi.spyOn(Understudy.prototype, 'join') rejoinCommand.rejoinCommand(makePlayerOrigin(), 'TestBot') - advanceTicks(1) + scheduler.advanceTicks(1) expect(joinSpy).toHaveBeenCalled() }) it('adds the nametag prefix after rejoining/joining', () => { const spy = vi.spyOn(Understudies, 'addNametagPrefix') rejoinCommand.rejoinCommand(makePlayerOrigin(), 'TestBot') - advanceTicks(1) + scheduler.advanceTicks(1) expect(spy).toHaveBeenCalledWith(expect.any(Understudy)) }) diff --git a/__tests__/commands/select.test.js b/__tests__/commands/select.test.js index a773a41..9909fc1 100644 --- a/__tests__/commands/select.test.js +++ b/__tests__/commands/select.test.js @@ -1,5 +1,5 @@ import { vi, describe, it, expect, beforeAll } from 'vitest' -import { advanceTicks } from '../../__mocks__/@minecraft/server.js' +import { scheduler } from '@forestoflight/minecraft-vitest-mocks' import Understudies from '../../packs/BP/scripts/classes/Understudies.js' import { selectCommand } from '../../packs/BP/scripts/commands/select.js' import { CustomCommandStatus, world } from '@minecraft/server' @@ -41,7 +41,7 @@ describe('SelectCommand', () => { it.each([0, 1, 2, 3, 4, 5, 6, 7, 8])('schedules selectSlot for valid slot (%i)', (slot) => { const spy = vi.spyOn(understudy, 'selectSlot') selectCommand.selectCommand({}, 'TestBot', slot) - advanceTicks(1) + scheduler.advanceTicks(1) expect(spy).toHaveBeenCalledWith(slot) }) diff --git a/__tests__/commands/sneak.test.js b/__tests__/commands/sneak.test.js index ba8b7d1..b57bd58 100644 --- a/__tests__/commands/sneak.test.js +++ b/__tests__/commands/sneak.test.js @@ -1,5 +1,5 @@ import { vi, describe, it, expect, beforeAll } from 'vitest' -import { advanceTicks } from '../../__mocks__/@minecraft/server.js' +import { scheduler } from '@forestoflight/minecraft-vitest-mocks' import Understudies from '../../packs/BP/scripts/classes/Understudies.js' import { sneakCommand } from '../../packs/BP/scripts/commands/sneak.js' import { CustomCommandStatus, world } from '@minecraft/server' @@ -29,7 +29,7 @@ describe('SneakCommand', () => { it.each([true, false])('schedules sneak(%s) when shouldSneak is %s', (shouldSneak) => { const spy = vi.spyOn(understudy, 'sneak') sneakCommand.sprintCommand({}, 'TestBot', shouldSneak) - advanceTicks(1) + scheduler.advanceTicks(1) expect(spy).toHaveBeenCalledWith(shouldSneak) }) diff --git a/__tests__/commands/sprint.test.js b/__tests__/commands/sprint.test.js index cf808d3..b5b3eec 100644 --- a/__tests__/commands/sprint.test.js +++ b/__tests__/commands/sprint.test.js @@ -1,5 +1,5 @@ import { vi, describe, it, expect, beforeAll } from 'vitest' -import { advanceTicks } from '../../__mocks__/@minecraft/server.js' +import { scheduler } from '@forestoflight/minecraft-vitest-mocks' import Understudies from '../../packs/BP/scripts/classes/Understudies.js' import { sprintCommand } from '../../packs/BP/scripts/commands/sprint.js' import { CustomCommandStatus, world } from '@minecraft/server' @@ -29,7 +29,7 @@ describe('SprintCommand', () => { it.each([true, false])('schedules sprint(%s) when shouldSprint is %s', (shouldSprint) => { const spy = vi.spyOn(understudy, 'sprint') sprintCommand.sprintCommand({}, 'TestBot', shouldSprint) - advanceTicks(1) + scheduler.advanceTicks(1) expect(spy).toHaveBeenCalledWith(shouldSprint) }) diff --git a/__tests__/commands/stop.test.js b/__tests__/commands/stop.test.js index 77c7c02..5142491 100644 --- a/__tests__/commands/stop.test.js +++ b/__tests__/commands/stop.test.js @@ -1,5 +1,5 @@ import { vi, describe, it, expect, beforeAll } from 'vitest' -import { advanceTicks } from '../../__mocks__/@minecraft/server.js' +import { scheduler } from '@forestoflight/minecraft-vitest-mocks' import Understudies from '../../packs/BP/scripts/classes/Understudies.js' import { CustomCommandStatus, world } from '@minecraft/server' import { stopCommand } from '../../packs/BP/scripts/commands/stop.js' @@ -29,7 +29,7 @@ describe('StopCommand', () => { it('schedules stopAll when the understudy is found', () => { const spy = vi.spyOn(understudy, 'stopAll') stopCommand.stopCommand({}, 'TestBot') - advanceTicks(1) + scheduler.advanceTicks(1) expect(spy).toHaveBeenCalled() }) diff --git a/__tests__/commands/swapheld.test.js b/__tests__/commands/swapheld.test.js index 19cbf58..dbeeda9 100644 --- a/__tests__/commands/swapheld.test.js +++ b/__tests__/commands/swapheld.test.js @@ -1,5 +1,5 @@ import { vi, describe, it, expect, beforeAll } from 'vitest' -import { advanceTicks } from '../../__mocks__/@minecraft/server.js' +import { scheduler } from '@forestoflight/minecraft-vitest-mocks' import Understudies from '../../packs/BP/scripts/classes/Understudies.js' import { swapHeldCommand } from '../../packs/BP/scripts/commands/swapheld.js' import { CustomCommandStatus, world, Player } from '@minecraft/server' @@ -32,7 +32,7 @@ describe('SwapHeldCommand', () => { const origin = new PlayerCommandOrigin({ sourceEntity: new Player() }) const spy = vi.spyOn(understudy, 'swapHeldItemWithPlayer') swapHeldCommand.swapHeldCommand(origin, 'TestBot') - advanceTicks(1) + scheduler.advanceTicks(1) expect(spy).toHaveBeenCalledWith(origin.getSource()) }) diff --git a/__tests__/commands/tp.test.js b/__tests__/commands/tp.test.js index 8db38d3..6a1100b 100644 --- a/__tests__/commands/tp.test.js +++ b/__tests__/commands/tp.test.js @@ -1,6 +1,6 @@ import { vi, describe, it, expect, beforeAll } from 'vitest' -import { Player, world } from '@minecraft/server' -import { advanceTicks, CustomCommandStatus } from '../../__mocks__/@minecraft/server.js' +import { CustomCommandStatus, Player, world } from '@minecraft/server' +import { scheduler } from '@forestoflight/minecraft-vitest-mocks' import Understudies from '../../packs/BP/scripts/classes/Understudies.js' import { teleportCommand } from '../../packs/BP/scripts/commands/tp.js' import { PlayerCommandOrigin } from '../../packs/BP/scripts/lib/canopy/PlayerCommandOrigin.js' @@ -41,7 +41,7 @@ describe('TeleportCommand', () => { const origin = new PlayerCommandOrigin({ sourceEntity: player }) const spy = vi.spyOn(understudy, 'teleport') teleportCommand.teleportCommand(origin, 'TestBot') - advanceTicks(1) + scheduler.advanceTicks(1) expect(spy).toHaveBeenCalledWith( expect.objectContaining({ location: player.location }) ) diff --git a/__tests__/rules/simplayerRejoining.test.js b/__tests__/rules/simplayerRejoining.test.js index 03d8ee4..da4a9ac 100644 --- a/__tests__/rules/simplayerRejoining.test.js +++ b/__tests__/rules/simplayerRejoining.test.js @@ -2,7 +2,7 @@ import { vi, describe, it, expect, beforeEach } from 'vitest' import { system, world } from '@minecraft/server' import { simplayerRejoining } from '../../packs/BP/scripts/rules/simplayerRejoining.js' import Understudies from '../../packs/BP/scripts/classes/Understudies.js' -import { advanceTicks, dynamicPropertyStore, resetScheduler } from '../../__mocks__/@minecraft/server.js' +import { scheduler, worldDynamicPropertyStore } from '@forestoflight/minecraft-vitest-mocks' describe('SimplayerRejoining', () => { beforeEach(() => { @@ -47,7 +47,7 @@ describe('SimplayerRejoining', () => { describe('onShutdown', () => { it('saves understudy names when enabled', () => { - dynamicPropertyStore.set('simplayerRejoining', true) + worldDynamicPropertyStore.set('simplayerRejoining', true) Understudies.create('Alice') Understudies.create('Bob') simplayerRejoining.onShutdown() @@ -65,10 +65,10 @@ describe('SimplayerRejoining', () => { describe('onStartup', () => { beforeEach(() => { - resetScheduler() + scheduler.reset() Understudies.removeAll() vi.clearAllMocks() - advanceTicks(1) + scheduler.advanceTicks(1) }) it('returns early without reading world state when disabled', () => { @@ -79,8 +79,8 @@ describe('SimplayerRejoining', () => { it('creates and rejoins each saved player when enabled', () => { const spy = vi.spyOn(Understudies, 'create') - dynamicPropertyStore.set('simplayerRejoining', true) - dynamicPropertyStore.set('simplayersToRejoin', JSON.stringify(['Alice', 'Bob'])) + worldDynamicPropertyStore.set('simplayerRejoining', true) + worldDynamicPropertyStore.set('simplayersToRejoin', JSON.stringify(['Alice', 'Bob'])) simplayerRejoining.onStartup() expect(spy).toHaveBeenCalledWith('Alice') expect(spy).toHaveBeenCalledWith('Bob') @@ -88,18 +88,18 @@ describe('SimplayerRejoining', () => { it('calls addNametagPrefix via runTimeout for each player', () => { const spy = vi.spyOn(Understudies, 'addNametagPrefix') - dynamicPropertyStore.set('simplayerRejoining', true) - dynamicPropertyStore.set('simplayersToRejoin', JSON.stringify(['Alice'])) + worldDynamicPropertyStore.set('simplayerRejoining', true) + worldDynamicPropertyStore.set('simplayersToRejoin', JSON.stringify(['Alice'])) simplayerRejoining.onStartup() - advanceTicks(5) + scheduler.advanceTicks(5) expect(spy).toHaveBeenCalledWith(Understudies.get('Alice')) }) it('logs an error and continues when rejoin throws', () => { const mockPlayer = { rejoin: vi.fn().mockImplementation(() => { throw new Error('network error') }) } vi.spyOn(Understudies, 'create').mockReturnValue(mockPlayer) - dynamicPropertyStore.set('simplayerRejoining', true) - dynamicPropertyStore.set('simplayersToRejoin', JSON.stringify(['Alice'])) + worldDynamicPropertyStore.set('simplayerRejoining', true) + worldDynamicPropertyStore.set('simplayersToRejoin', JSON.stringify(['Alice'])) const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {}) simplayerRejoining.onStartup() @@ -108,7 +108,7 @@ describe('SimplayerRejoining', () => { }) it('logs an error and rejoins nobody when saved data is invalid JSON', () => { - dynamicPropertyStore.set('simplayerRejoining', true) + worldDynamicPropertyStore.set('simplayerRejoining', true) world.getDynamicProperty.mockImplementation((key) => { if (key === 'simplayerRejoining') return JSON.stringify(true) if (key === 'simplayersToRejoin') return 'not-valid-json' @@ -121,8 +121,8 @@ describe('SimplayerRejoining', () => { }) it('rejoins nobody when saved data is corrupted', () => { - dynamicPropertyStore.set('simplayerRejoining', true) - dynamicPropertyStore.set('simplayersToRejoin', 'invalid data') + worldDynamicPropertyStore.set('simplayerRejoining', true) + worldDynamicPropertyStore.set('simplayersToRejoin', 'invalid data') vi.spyOn(Understudies, 'create') simplayerRejoining.onStartup() expect(Understudies.create).not.toHaveBeenCalled() diff --git a/__tests__/setup.js b/__tests__/setup.js deleted file mode 100644 index 878efe1..0000000 --- a/__tests__/setup.js +++ /dev/null @@ -1,16 +0,0 @@ -import { vi, beforeEach } from 'vitest' -import { world, dynamicPropertyStore, resetScheduler } from '@minecraft/server' - -beforeEach(() => { - vi.resetAllMocks() - resetScheduler() - dynamicPropertyStore.clear() - world.getDynamicProperty.mockImplementation((key) => dynamicPropertyStore.get(key)) - world.setDynamicProperty.mockImplementation((key, value) => { - if (value === undefined) - dynamicPropertyStore.delete(key) - else - dynamicPropertyStore.set(key, value) - }) - world.getDynamicPropertyIds.mockImplementation(() => [...dynamicPropertyStore.keys()]) -}) diff --git a/config.json b/config.json index cae7350..5711ce8 100644 --- a/config.json +++ b/config.json @@ -8,7 +8,16 @@ }, "regolith": { "dataPath": "./packs/data", - "filterDefinitions": {}, + "filterDefinitions": { + "bump_version": { + "runWith": "nodejs", + "script": "filters/bump_version/main.js" + }, + "package_mcpack": { + "runWith": "nodejs", + "script": "filters/package_mcpack/main.js" + } + }, "formatVersion": "1.7.0", "profiles": { "default": { @@ -28,6 +37,22 @@ "bpName": "project.name" }, "filters": [] + }, + "release": { + "export": { + "target": "none" + }, + "filters": [ + { "filter": "package_mcpack" } + ] + }, + "bump-version": { + "export": { + "target": "none" + }, + "filters": [ + { "filter": "bump_version" } + ] } } } diff --git a/eslint.config.js b/eslint.config.js index 5026993..cab17cd 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -69,16 +69,6 @@ export default [ "yoda": "error" } }, - { - files: ["**/__mocks__/**"], - rules: { - "max-lines-per-function": "off", - "max-lines": "off", - "max-classes-per-file": "off", - "max-depth": "off", - "no-use-before-define": "off" - } - }, { files: ["**/__tests__/**"], rules: { diff --git a/filters/bump_version/main.js b/filters/bump_version/main.js new file mode 100644 index 0000000..e47da9b --- /dev/null +++ b/filters/bump_version/main.js @@ -0,0 +1,168 @@ +import fs from 'fs'; +import path from 'path'; +import readline from 'readline'; +import { spawnSync } from 'child_process'; +import { tmpdir } from 'os'; +import { fileURLToPath } from 'url'; + +const dirname = path.dirname(fileURLToPath(import.meta.url)); +const projectRoot = path.resolve(dirname, '../..'); +const settings = JSON.parse(process.env.FILTER_SETTINGS || '{}'); + +function bumpVersion(versionStr, type) { + const parts = versionStr.split('.').map(Number); + if (type === 'major') { parts[0]++; parts[1] = 0; parts[2] = 0; } + else if (type === 'minor') { parts[1]++; parts[2] = 0; } + else { parts[2]++; } + return parts.join('.'); +} + +function getCurrentVersion() { + const content = fs.readFileSync( + path.join(projectRoot, 'packs', 'BP', 'scripts', 'main.js'), 'utf8' + ); + const match = content.match(/version:\s*['"]([^'"]+)['"]/); + if (!match) throw new Error('Could not find version in main.js'); + return match[1]; +} + +function updateMainJs(filePath, newVersion) { + let content = fs.readFileSync(filePath, 'utf8'); + content = content.replace(/(version:\s*['"])[^'"]+(['"])/, `$1${newVersion}$2`); + fs.writeFileSync(filePath, content, 'utf8'); +} + +function updateManifest(filePath, newVersion) { + let content = fs.readFileSync(filePath, 'utf8'); + const [maj, min, pat] = newVersion.split('.').map(Number); + + content = content.replace(/(["']name["']\s*:\s*["'][^"']*v)[\d.]+/, `$1${newVersion}`); + content = content.replace( + /("version":\s*\[)\s*\d+\s*,\s*\d+\s*,\s*\d+\s*(\])/, + `$1${maj}, ${min}, ${pat}$2` + ); + + fs.writeFileSync(filePath, content, 'utf8'); +} + +function buildWindowsPromptScript(currentVersion) { + const patch = bumpVersion(currentVersion, 'patch'); + const minor = bumpVersion(currentVersion, 'minor'); + const major = bumpVersion(currentVersion, 'major'); + + const csharp = 'using System; using System.IO; using System.Runtime.InteropServices; using Microsoft.Win32.SafeHandles;' + + ' public class ConsoleIO {' + + ' [DllImport("kernel32.dll", SetLastError=true, CharSet=CharSet.Auto)]' + + ' static extern IntPtr CreateFile(string n, uint a, uint s, IntPtr sec, uint d, uint f, IntPtr t);' + + ' public static FileStream OpenInput() { return new FileStream(new SafeFileHandle(CreateFile("CONIN$", 0x80000000u, 3u, IntPtr.Zero, 3u, 0u, IntPtr.Zero), true), FileAccess.Read); }' + + ' public static FileStream OpenOutput() { return new FileStream(new SafeFileHandle(CreateFile("CONOUT$", 0x40000000u, 3u, IntPtr.Zero, 3u, 0u, IntPtr.Zero), true), FileAccess.Write); }' + + ' }'; + return ` +try { + Add-Type -TypeDefinition '${csharp}' -ErrorAction Stop + $conIn = [ConsoleIO]::OpenInput() + $conOut = [ConsoleIO]::OpenOutput() +} catch { + Write-Output "[bump-version] Cannot access terminal: $($_.Exception.Message)" + exit 1 +} +$reader = New-Object System.IO.StreamReader($conIn) +$writer = New-Object System.IO.StreamWriter($conOut) +$writer.AutoFlush = $true +$writer.WriteLine('[bump-version] Current version: v${currentVersion}') +$writer.WriteLine(' 1) patch v${currentVersion} -> v${patch}') +$writer.WriteLine(' 2) minor v${currentVersion} -> v${minor}') +$writer.WriteLine(' 3) major v${currentVersion} -> v${major}') +$writer.Write('Select bump type [1-3] (default: 1): ') +$choice = $reader.ReadLine() +$conIn.Close(); $conOut.Close() +if (-not $choice) { $choice = '1' } +if ($choice -eq '2') { exit 2 } elseif ($choice -eq '3') { exit 3 } else { exit 1 } +`.trim(); +} + +function promptBumpTypeWindows(currentVersion) { + const tmpScript = path.join(tmpdir(), `bump_version_${process.pid}.ps1`); + fs.writeFileSync(tmpScript, '\ufeff' + buildWindowsPromptScript(currentVersion), 'utf8'); + + const result = spawnSync( + 'powershell', + ['-NoProfile', '-ExecutionPolicy', 'Bypass', '-File', tmpScript], + { stdio: 'inherit' } + ); + + try { fs.unlinkSync(tmpScript); } catch { /* cleanup best-effort */ } + + if (result.error || result.status === null) + throw new Error('PowerShell prompt failed'); + + if (result.status === 2) return 'minor'; + if (result.status === 3) return 'major'; + return 'patch'; +} + +function promptBumpTypeUnix(currentVersion) { + return new Promise((resolve, reject) => { + const patch = bumpVersion(currentVersion, 'patch'); + const minor = bumpVersion(currentVersion, 'minor'); + const major = bumpVersion(currentVersion, 'major'); + + let ttyInput; + let ttyOutput; + try { + ttyInput = fs.createReadStream('/dev/tty'); + ttyOutput = fs.createWriteStream('/dev/tty'); + } catch { + reject(new Error('No TTY available')); + return; + } + + const rl = readline.createInterface({ input: ttyInput, output: ttyOutput }); + + ttyOutput.write(`[bump-version] Current version: v${currentVersion}\n`); + ttyOutput.write(` 1) patch v${currentVersion} -> v${patch}\n`); + ttyOutput.write(` 2) minor v${currentVersion} -> v${minor}\n`); + ttyOutput.write(` 3) major v${currentVersion} -> v${major}\n`); + + rl.question('Select bump type [1-3] (default: 1): ', (answer) => { + rl.close(); + ttyInput.destroy(); + const choice = answer.trim() || '1'; + if (choice === '2') resolve('minor'); + else if (choice === '3') resolve('major'); + else resolve('patch'); + }); + + ttyInput.on('error', reject); + }); +} + +function promptBumpType(currentVersion) { + if (process.platform === 'win32') + return Promise.resolve(promptBumpTypeWindows(currentVersion)); + return promptBumpTypeUnix(currentVersion); +} + +async function main() { + const currentVersion = getCurrentVersion(); + + let bumpType; + try { + bumpType = await promptBumpType(currentVersion); + } catch { + bumpType = settings.bumpType || 'patch'; + } + + const newVersion = bumpVersion(currentVersion, bumpType); + console.log(`[bump-version] ${currentVersion} -> ${newVersion}`); + + updateMainJs(path.join(projectRoot, 'packs', 'BP', 'scripts', 'main.js'), newVersion); + updateManifest(path.join(projectRoot, 'packs', 'BP', 'manifest.json'), newVersion); + + console.log(`[bump-version] Updated to v${newVersion}`); +} + +main().catch(err => { + console.error('[bump-version] Error:', err.message); + process.exit(1); +}); diff --git a/filters/package_mcpack/main.js b/filters/package_mcpack/main.js new file mode 100644 index 0000000..9e8b2ec --- /dev/null +++ b/filters/package_mcpack/main.js @@ -0,0 +1,43 @@ +import fs from 'fs'; +import path from 'path'; +import { execFileSync } from 'child_process'; +import { fileURLToPath } from 'url'; + +const dirname = path.dirname(fileURLToPath(import.meta.url)); +const projectRoot = path.resolve(dirname, '../..'); +const buildDir = path.join(projectRoot, 'build'); +const projectName = JSON.parse(fs.readFileSync(path.join(projectRoot, 'config.json'), 'utf8')).name; + +function getPackVersion() { + const content = fs.readFileSync(path.join(projectRoot, 'packs', 'BP', 'scripts', 'main.js'), 'utf8'); + const match = content.match(/version:\s*['"]([^'"]+)['"]/); + return match ? match[1] : 'unknown'; +} + +function main() { + fs.mkdirSync(buildDir, { recursive: true }); + + const version = getPackVersion(); + const outputPath = path.join(buildDir, `${projectName}-v${version}.mcpack`); + + if (fs.existsSync(outputPath)) + fs.unlinkSync(outputPath); + + console.log(`[package-mcpack] Creating ${projectName}-v${version}.mcpack...`); + const bpDir = path.join(process.cwd(), 'BP'); + const licenseDst = path.join(bpDir, 'LICENSE'); + fs.copyFileSync(path.join(projectRoot, 'LICENSE'), licenseDst); + try { + execFileSync('zip', ['-r', outputPath, '.'], { cwd: bpDir, stdio: 'inherit' }); + } finally { + fs.unlinkSync(licenseDst); + } + console.log(`[package-mcpack] Saved to: ${outputPath}`); +} + +try { + main(); +} catch (err) { + console.error('[package-mcpack] Error:', err.message); + process.exit(1); +} diff --git a/package-lock.json b/package-lock.json index f826038..654bf82 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,12 +6,13 @@ "": { "name": "understudy", "dependencies": { - "@eslint/compat": "^1.4.1", "@minecraft/server": "^2.7.0-beta.1.26.14-stable", "@minecraft/server-gametest": "^1.0.0-beta.1.26.14-stable" }, "devDependencies": { + "@eslint/compat": "^1.4.1", "@eslint/js": "^9.39.4", + "@forestoflight/minecraft-vitest-mocks": "^1.0.5", "@vitest/coverage-v8": "^3.2.4", "eslint": "^9.39.4", "globals": "^17.5.0", @@ -538,7 +539,7 @@ "version": "4.9.1", "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.1.tgz", "integrity": "sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==", - "devOptional": true, + "dev": true, "license": "MIT", "dependencies": { "eslint-visitor-keys": "^3.4.3" @@ -557,7 +558,7 @@ "version": "3.4.3", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", - "devOptional": true, + "dev": true, "license": "Apache-2.0", "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -570,7 +571,7 @@ "version": "4.12.2", "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.2.tgz", "integrity": "sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==", - "devOptional": true, + "dev": true, "license": "MIT", "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" @@ -580,6 +581,7 @@ "version": "1.4.1", "resolved": "https://registry.npmjs.org/@eslint/compat/-/compat-1.4.1.tgz", "integrity": "sha512-cfO82V9zxxGBxcQDr1lfaYB7wykTa0b00mGa36FrJl7iTFd0Z2cHfEYuxcBRP/iNijCsWsEkA+jzT8hGYmv33w==", + "dev": true, "license": "Apache-2.0", "dependencies": { "@eslint/core": "^0.17.0" @@ -600,7 +602,7 @@ "version": "0.21.2", "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.2.tgz", "integrity": "sha512-nJl2KGTlrf9GjLimgIru+V/mzgSK0ABCDQRvxw5BjURL7WfH5uoWmizbH7QB6MmnMBd8cIC9uceWnezL1VZWWw==", - "devOptional": true, + "dev": true, "license": "Apache-2.0", "dependencies": { "@eslint/object-schema": "^2.1.7", @@ -615,14 +617,14 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "devOptional": true, + "dev": true, "license": "MIT" }, "node_modules/@eslint/config-array/node_modules/brace-expansion": { "version": "1.1.14", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz", "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==", - "devOptional": true, + "dev": true, "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", @@ -633,7 +635,7 @@ "version": "3.1.5", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", - "devOptional": true, + "dev": true, "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" @@ -646,7 +648,7 @@ "version": "0.4.2", "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.4.2.tgz", "integrity": "sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==", - "devOptional": true, + "dev": true, "license": "Apache-2.0", "dependencies": { "@eslint/core": "^0.17.0" @@ -659,6 +661,7 @@ "version": "0.17.0", "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.17.0.tgz", "integrity": "sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==", + "dev": true, "license": "Apache-2.0", "dependencies": { "@types/json-schema": "^7.0.15" @@ -671,7 +674,7 @@ "version": "3.3.5", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.5.tgz", "integrity": "sha512-4IlJx0X0qftVsN5E+/vGujTRIFtwuLbNsVUe7TO6zYPDR1O6nFwvwhIKEKSrl6dZchmYBITazxKoUYOjdtjlRg==", - "devOptional": true, + "dev": true, "license": "MIT", "dependencies": { "ajv": "^6.14.0", @@ -695,14 +698,14 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "devOptional": true, + "dev": true, "license": "MIT" }, "node_modules/@eslint/eslintrc/node_modules/brace-expansion": { "version": "1.1.14", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz", "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==", - "devOptional": true, + "dev": true, "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", @@ -713,7 +716,7 @@ "version": "14.0.0", "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", - "devOptional": true, + "dev": true, "license": "MIT", "engines": { "node": ">=18" @@ -726,7 +729,7 @@ "version": "3.1.5", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", - "devOptional": true, + "dev": true, "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" @@ -739,7 +742,7 @@ "version": "9.39.4", "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.4.tgz", "integrity": "sha512-nE7DEIchvtiFTwBw4Lfbu59PG+kCofhjsKaCWzxTpt4lfRjRMqG6uMBzKXuEcyXhOHoUp9riAm7/aWYGhXZ9cw==", - "devOptional": true, + "dev": true, "license": "MIT", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -752,7 +755,7 @@ "version": "2.1.7", "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.7.tgz", "integrity": "sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==", - "devOptional": true, + "dev": true, "license": "Apache-2.0", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -762,7 +765,7 @@ "version": "0.4.1", "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.4.1.tgz", "integrity": "sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==", - "devOptional": true, + "dev": true, "license": "Apache-2.0", "dependencies": { "@eslint/core": "^0.17.0", @@ -772,11 +775,20 @@ "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, + "node_modules/@forestoflight/minecraft-vitest-mocks": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@forestoflight/minecraft-vitest-mocks/-/minecraft-vitest-mocks-1.0.5.tgz", + "integrity": "sha512-jquY6DKa6y6uuwqoWKnj4bsgXQZPVBiPpZdNwq6HEetjcvh3Ch/AlRVCFJcrRkSzDZ68YvkZBXNPCGZCDnWbGQ==", + "dev": true, + "peerDependencies": { + "vitest": "*" + } + }, "node_modules/@humanfs/core": { "version": "0.19.2", "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.2.tgz", "integrity": "sha512-UhXNm+CFMWcbChXywFwkmhqjs3PRCmcSa/hfBgLIb7oQ5HNb1wS0icWsGtSAUNgefHeI+eBrA8I1fxmbHsGdvA==", - "devOptional": true, + "dev": true, "license": "Apache-2.0", "dependencies": { "@humanfs/types": "^0.15.0" @@ -789,7 +801,7 @@ "version": "0.16.8", "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.8.tgz", "integrity": "sha512-gE1eQNZ3R++kTzFUpdGlpmy8kDZD/MLyHqDwqjkVQI0JMdI1D51sy1H958PNXYkM2rAac7e5/CnIKZrHtPh3BQ==", - "devOptional": true, + "dev": true, "license": "Apache-2.0", "dependencies": { "@humanfs/core": "^0.19.2", @@ -804,7 +816,7 @@ "version": "0.15.0", "resolved": "https://registry.npmjs.org/@humanfs/types/-/types-0.15.0.tgz", "integrity": "sha512-ZZ1w0aoQkwuUuC7Yf+7sdeaNfqQiiLcSRbfI08oAxqLtpXQr9AIVX7Ay7HLDuiLYAaFPu8oBYNq/QIi9URHJ3Q==", - "devOptional": true, + "dev": true, "license": "Apache-2.0", "engines": { "node": ">=18.18.0" @@ -814,7 +826,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", - "devOptional": true, + "dev": true, "license": "Apache-2.0", "engines": { "node": ">=12.22" @@ -828,7 +840,7 @@ "version": "0.4.3", "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz", "integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==", - "devOptional": true, + "dev": true, "license": "Apache-2.0", "engines": { "node": ">=18.18" @@ -1322,13 +1334,14 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz", "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==", - "devOptional": true, + "dev": true, "license": "MIT" }, "node_modules/@types/json-schema": { "version": "7.0.15", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", + "dev": true, "license": "MIT" }, "node_modules/@vitest/coverage-v8": { @@ -1484,7 +1497,7 @@ "version": "8.16.0", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz", "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==", - "devOptional": true, + "dev": true, "license": "MIT", "bin": { "acorn": "bin/acorn" @@ -1497,7 +1510,7 @@ "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "devOptional": true, + "dev": true, "license": "MIT", "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" @@ -1507,7 +1520,7 @@ "version": "6.14.0", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz", "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==", - "devOptional": true, + "dev": true, "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", @@ -1550,7 +1563,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "devOptional": true, + "dev": true, "license": "Python-2.0" }, "node_modules/assertion-error": { @@ -1619,7 +1632,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "devOptional": true, + "dev": true, "license": "MIT", "engines": { "node": ">=6" @@ -1646,7 +1659,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "devOptional": true, + "dev": true, "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -1663,7 +1676,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "devOptional": true, + "dev": true, "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -1689,7 +1702,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "devOptional": true, + "dev": true, "license": "MIT", "dependencies": { "color-name": "~1.1.4" @@ -1702,21 +1715,21 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "devOptional": true, + "dev": true, "license": "MIT" }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "devOptional": true, + "dev": true, "license": "MIT" }, "node_modules/cross-spawn": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", - "devOptional": true, + "dev": true, "license": "MIT", "dependencies": { "path-key": "^3.1.0", @@ -1731,7 +1744,7 @@ "version": "4.4.3", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", - "devOptional": true, + "dev": true, "license": "MIT", "dependencies": { "ms": "^2.1.3" @@ -1759,7 +1772,7 @@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "devOptional": true, + "dev": true, "license": "MIT" }, "node_modules/eastasianwidth": { @@ -1829,7 +1842,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "devOptional": true, + "dev": true, "license": "MIT", "engines": { "node": ">=10" @@ -1842,7 +1855,7 @@ "version": "9.39.4", "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.4.tgz", "integrity": "sha512-XoMjdBOwe/esVgEvLmNsD3IRHkm7fbKIUGvrleloJXUZgDHig2IPWNniv+GwjyJXzuNqVjlr5+4yVUZjycJwfQ==", - "devOptional": true, + "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.8.0", @@ -1902,7 +1915,7 @@ "version": "8.4.0", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz", "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==", - "devOptional": true, + "dev": true, "license": "BSD-2-Clause", "dependencies": { "esrecurse": "^4.3.0", @@ -1919,7 +1932,7 @@ "version": "4.2.1", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz", "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==", - "devOptional": true, + "dev": true, "license": "Apache-2.0", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -1932,14 +1945,14 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "devOptional": true, + "dev": true, "license": "MIT" }, "node_modules/eslint/node_modules/brace-expansion": { "version": "1.1.14", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz", "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==", - "devOptional": true, + "dev": true, "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", @@ -1950,7 +1963,7 @@ "version": "3.1.5", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", - "devOptional": true, + "dev": true, "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" @@ -1963,7 +1976,7 @@ "version": "10.4.0", "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz", "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==", - "devOptional": true, + "dev": true, "license": "BSD-2-Clause", "dependencies": { "acorn": "^8.15.0", @@ -1981,7 +1994,7 @@ "version": "1.7.0", "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.7.0.tgz", "integrity": "sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==", - "devOptional": true, + "dev": true, "license": "BSD-3-Clause", "dependencies": { "estraverse": "^5.1.0" @@ -1994,7 +2007,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", - "devOptional": true, + "dev": true, "license": "BSD-2-Clause", "dependencies": { "estraverse": "^5.2.0" @@ -2007,7 +2020,7 @@ "version": "5.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "devOptional": true, + "dev": true, "license": "BSD-2-Clause", "engines": { "node": ">=4.0" @@ -2027,7 +2040,7 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", - "devOptional": true, + "dev": true, "license": "BSD-2-Clause", "engines": { "node": ">=0.10.0" @@ -2047,21 +2060,21 @@ "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "devOptional": true, + "dev": true, "license": "MIT" }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "devOptional": true, + "dev": true, "license": "MIT" }, "node_modules/fast-levenshtein": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", - "devOptional": true, + "dev": true, "license": "MIT" }, "node_modules/fdir": { @@ -2086,7 +2099,7 @@ "version": "8.0.0", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==", - "devOptional": true, + "dev": true, "license": "MIT", "dependencies": { "flat-cache": "^4.0.0" @@ -2099,7 +2112,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "devOptional": true, + "dev": true, "license": "MIT", "dependencies": { "locate-path": "^6.0.0", @@ -2116,7 +2129,7 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz", "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==", - "devOptional": true, + "dev": true, "license": "MIT", "dependencies": { "flatted": "^3.2.9", @@ -2130,7 +2143,7 @@ "version": "3.4.2", "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz", "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==", - "devOptional": true, + "dev": true, "license": "ISC" }, "node_modules/foreground-child": { @@ -2191,7 +2204,7 @@ "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "devOptional": true, + "dev": true, "license": "ISC", "dependencies": { "is-glob": "^4.0.3" @@ -2250,7 +2263,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "devOptional": true, + "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -2267,7 +2280,7 @@ "version": "5.3.2", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", - "devOptional": true, + "dev": true, "license": "MIT", "engines": { "node": ">= 4" @@ -2277,7 +2290,7 @@ "version": "3.3.1", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==", - "devOptional": true, + "dev": true, "license": "MIT", "dependencies": { "parent-module": "^1.0.0", @@ -2294,7 +2307,7 @@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", - "devOptional": true, + "dev": true, "license": "MIT", "engines": { "node": ">=0.8.19" @@ -2304,7 +2317,7 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "devOptional": true, + "dev": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -2324,7 +2337,7 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "devOptional": true, + "dev": true, "license": "MIT", "dependencies": { "is-extglob": "^2.1.1" @@ -2337,7 +2350,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "devOptional": true, + "dev": true, "license": "ISC" }, "node_modules/istanbul-lib-coverage": { @@ -2421,7 +2434,7 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz", "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==", - "devOptional": true, + "dev": true, "license": "MIT", "dependencies": { "argparse": "^2.0.1" @@ -2434,28 +2447,28 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", - "devOptional": true, + "dev": true, "license": "MIT" }, "node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "devOptional": true, + "dev": true, "license": "MIT" }, "node_modules/json-stable-stringify-without-jsonify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", - "devOptional": true, + "dev": true, "license": "MIT" }, "node_modules/keyv": { "version": "4.5.4", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", - "devOptional": true, + "dev": true, "license": "MIT", "dependencies": { "json-buffer": "3.0.1" @@ -2465,7 +2478,7 @@ "version": "0.4.1", "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", - "devOptional": true, + "dev": true, "license": "MIT", "dependencies": { "prelude-ls": "^1.2.1", @@ -2479,7 +2492,7 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "devOptional": true, + "dev": true, "license": "MIT", "dependencies": { "p-locate": "^5.0.0" @@ -2495,7 +2508,7 @@ "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "devOptional": true, + "dev": true, "license": "MIT" }, "node_modules/loupe": { @@ -2580,7 +2593,7 @@ "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "devOptional": true, + "dev": true, "license": "MIT" }, "node_modules/nanoid": { @@ -2606,14 +2619,14 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", - "devOptional": true, + "dev": true, "license": "MIT" }, "node_modules/optionator": { "version": "0.9.4", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", - "devOptional": true, + "dev": true, "license": "MIT", "dependencies": { "deep-is": "^0.1.3", @@ -2631,7 +2644,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "devOptional": true, + "dev": true, "license": "MIT", "dependencies": { "yocto-queue": "^0.1.0" @@ -2647,7 +2660,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "devOptional": true, + "dev": true, "license": "MIT", "dependencies": { "p-limit": "^3.0.2" @@ -2670,7 +2683,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "devOptional": true, + "dev": true, "license": "MIT", "dependencies": { "callsites": "^3.0.0" @@ -2683,7 +2696,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "devOptional": true, + "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -2693,7 +2706,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "devOptional": true, + "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -2786,7 +2799,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", - "devOptional": true, + "dev": true, "license": "MIT", "engines": { "node": ">= 0.8.0" @@ -2796,7 +2809,7 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", - "devOptional": true, + "dev": true, "license": "MIT", "engines": { "node": ">=6" @@ -2806,7 +2819,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "devOptional": true, + "dev": true, "license": "MIT", "engines": { "node": ">=4" @@ -2874,7 +2887,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "devOptional": true, + "dev": true, "license": "MIT", "dependencies": { "shebang-regex": "^3.0.0" @@ -2887,7 +2900,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "devOptional": true, + "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -3045,7 +3058,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "devOptional": true, + "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -3071,7 +3084,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "devOptional": true, + "dev": true, "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -3160,7 +3173,7 @@ "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", - "devOptional": true, + "dev": true, "license": "MIT", "dependencies": { "prelude-ls": "^1.2.1" @@ -3173,7 +3186,7 @@ "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "devOptional": true, + "dev": true, "license": "BSD-2-Clause", "dependencies": { "punycode": "^2.1.0" @@ -3354,7 +3367,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "devOptional": true, + "dev": true, "license": "ISC", "dependencies": { "isexe": "^2.0.0" @@ -3387,7 +3400,7 @@ "version": "1.2.5", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", - "devOptional": true, + "dev": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -3495,7 +3508,7 @@ "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "devOptional": true, + "dev": true, "license": "MIT", "engines": { "node": ">=10" diff --git a/package.json b/package.json index 1c8b2b5..37bc7d2 100644 --- a/package.json +++ b/package.json @@ -6,14 +6,15 @@ "lint": "eslint . --fix" }, "devDependencies": { + "@eslint/compat": "^1.4.1", "@eslint/js": "^9.39.4", + "@forestoflight/minecraft-vitest-mocks": "^1.0.5", "@vitest/coverage-v8": "^3.2.4", "eslint": "^9.39.4", "globals": "^17.5.0", "vitest": "^3.1.2" }, "dependencies": { - "@eslint/compat": "^1.4.1", "@minecraft/server": "^2.7.0-beta.1.26.14-stable", "@minecraft/server-gametest": "^1.0.0-beta.1.26.14-stable" } diff --git a/packs/BP/manifest.json b/packs/BP/manifest.json index a2923f3..a0df208 100644 --- a/packs/BP/manifest.json +++ b/packs/BP/manifest.json @@ -1,11 +1,11 @@ { "format_version": 2, "header": { - "name": "Understudy v1.2.1", + "name": "Understudy v1.2.2", "description": "Simulated player extension for §l§aCanopy§r by §aForestOfLight§r.", "uuid": "bb50de74-6e59-467b-871f-8ef829ab579f", - "min_engine_version": [1, 26, 10], - "version": [1, 2, 1] + "min_engine_version": [1, 26, 20], + "version": [1, 2, 2] }, "modules": [ { @@ -26,7 +26,7 @@ "dependencies": [ { "module_name": "@minecraft/server", - "version": "2.7.0-beta" + "version": "2.8.0-beta" }, { "module_name": "@minecraft/server-gametest", @@ -34,7 +34,7 @@ }, { "uuid": "7f6b23df-a583-476b-b0e4-87457e65f7c0", // Canopy BP - "version": [1, 5, 5] + "version": [1, 5, 6] } ] } diff --git a/packs/BP/scripts/main.js b/packs/BP/scripts/main.js index 235bfa3..b66c871 100644 --- a/packs/BP/scripts/main.js +++ b/packs/BP/scripts/main.js @@ -4,7 +4,7 @@ export const extension = new CanopyExtension({ author: 'ForestOfLight', name: 'Understudy', description: 'Simulated Players for §l§aCanopy§r', - version: '1.2.1' + version: '1.2.2' }); import './commands/join'; diff --git a/vitest.config.js b/vitest.config.js index e986a2e..d744abc 100644 --- a/vitest.config.js +++ b/vitest.config.js @@ -1,13 +1,14 @@ import { defineConfig } from 'vitest/config' -import { fileURLToPath } from 'node:url' -import { dirname, resolve } from 'node:path' - -const workingDirName = dirname(fileURLToPath(import.meta.url)) export default defineConfig({ test: { - setupFiles: [resolve(workingDirName, '__tests__/setup.js')], - exclude: ['**/node_modules/**', '.claude/**'], + setupFiles: '@forestoflight/minecraft-vitest-mocks/setup', + server: { + deps: { + inline: ['@forestoflight/minecraft-vitest-mocks'] + } + }, + include: ['__tests__/**/*.test.js'] }, plugins: [ { @@ -18,8 +19,8 @@ export default defineConfig({ ], resolve: { alias: { - '@minecraft/server': resolve(workingDirName, '__mocks__/@minecraft/server.js'), - '@minecraft/server-gametest': resolve(workingDirName, '__mocks__/@minecraft/server-gametest.js'), + '@minecraft/server': '@forestoflight/minecraft-vitest-mocks/server', + '@minecraft/server-gametest': '@forestoflight/minecraft-vitest-mocks/server-gametest', }, }, })