From 1ddaa79162d417c3e8855936eaf11bcfec7e4bb1 Mon Sep 17 00:00:00 2001 From: Vitaly Date: Fri, 15 Aug 2025 01:12:24 +0300 Subject: [PATCH] rm not tested pathfinder (#415) --- package.json | 1 - pnpm-lock.yaml | 16 ---------------- renderer/rsbuildSharedConfig.ts | 6 +++--- src/connect.ts | 2 -- 4 files changed, 3 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index b719b877..ba58b3da 100644 --- a/package.json +++ b/package.json @@ -157,7 +157,6 @@ "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next", "mineflayer": "github:zardoy/mineflayer#gen-the-master", "mineflayer-mouse": "^0.1.17", - "mineflayer-pathfinder": "^2.4.4", "npm-run-all": "^4.1.5", "os-browserify": "^0.3.0", "path-browserify": "^1.0.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index da2b3912..ac6a0a7c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -345,9 +345,6 @@ importers: mineflayer-mouse: specifier: ^0.1.17 version: 0.1.17 - mineflayer-pathfinder: - specifier: ^2.4.4 - version: 2.4.5 npm-run-all: specifier: ^4.1.5 version: 4.1.5 @@ -6671,9 +6668,6 @@ packages: resolution: {integrity: sha512-0eCR8pnGb42Qd9QmAxOjl0PhA5Fa+9+6H1G/YsbsO5rg5mDf94Tusqp/8NAGLPQCPVDzbarLskXdjR3h0E0bEQ==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - mineflayer-pathfinder@2.4.5: - resolution: {integrity: sha512-Jh3JnUgRLwhMh2Dugo4SPza68C41y+NPP5sdsgxRu35ydndo70i1JJGxauVWbXrpNwIxYNztUw78aFyb7icw8g==} - mineflayer@4.31.0: resolution: {integrity: sha512-oqiNa5uP4kXiPlj4+Jn+9QozPMsMy0U8/YP5d6+KSAeWthtuJHeQqcYgWG5lkC3LHMqHqtEu4MNdXt6GZjFNTQ==} engines: {node: '>=22'} @@ -17347,16 +17341,6 @@ snapshots: transitivePeerDependencies: - supports-color - mineflayer-pathfinder@2.4.5: - dependencies: - minecraft-data: 3.92.0 - prismarine-block: https://codeload.github.com/zardoy/prismarine-block/tar.gz/853c559bff2b402863ee9a75b125a3ca320838f9 - prismarine-entity: 2.5.0 - prismarine-item: 1.17.0 - prismarine-nbt: 2.7.0 - prismarine-physics: https://codeload.github.com/zardoy/prismarine-physics/tar.gz/353e25b800149393f40539ec381218be44cbb03b - vec3: 0.1.10 - mineflayer@4.31.0(encoding@0.1.13): dependencies: minecraft-data: 3.92.0 diff --git a/renderer/rsbuildSharedConfig.ts b/renderer/rsbuildSharedConfig.ts index 57091d99..45da30b1 100644 --- a/renderer/rsbuildSharedConfig.ts +++ b/renderer/rsbuildSharedConfig.ts @@ -73,12 +73,12 @@ export const appAndRendererSharedConfig = () => defineConfig({ }) export const rspackViewerConfig = (config, { appendPlugins, addRules, rspack }: ModifyRspackConfigUtils) => { - appendPlugins(new rspack.NormalModuleReplacementPlugin(/data/, (resource) => { + appendPlugins(new rspack.NormalModuleReplacementPlugin(/data|prismarine-physics/, (resource) => { let absolute: string const request = resource.request.replaceAll('\\', '/') absolute = path.join(resource.context, request).replaceAll('\\', '/') - if (request.includes('minecraft-data/data/pc/1.')) { - console.log('Error: incompatible resource', request, resource.contextInfo.issuer) + if (request.includes('minecraft-data/data/pc/1.') || request.includes('prismarine-physics')) { + console.log('Error: incompatible resource', request, 'from', resource.contextInfo.issuer) process.exit(1) // throw new Error(`${resource.request} was requested by ${resource.contextInfo.issuer}`) } diff --git a/src/connect.ts b/src/connect.ts index 914303c6..cb6b8f65 100644 --- a/src/connect.ts +++ b/src/connect.ts @@ -3,7 +3,6 @@ import MinecraftData from 'minecraft-data' import PrismarineBlock from 'prismarine-block' import PrismarineItem from 'prismarine-item' -import pathfinder from 'mineflayer-pathfinder' import { miscUiState } from './globalState' import supportedVersions from './supportedVersions.mjs' import { options } from './optionsStorage' @@ -65,7 +64,6 @@ export const loadMinecraftData = async (version: string) => { window.PrismarineItem = PrismarineItem(mcData.version.minecraftVersion!) window.loadedData = mcData window.mcData = mcData - window.pathfinder = pathfinder miscUiState.loadedDataVersion = version }