diff --git a/config.json b/config.json index 05bc6538..c7e8b61c 100644 --- a/config.json +++ b/config.json @@ -3,5 +3,5 @@ "defaultHostPort": 25565, "defaultProxy": "", "defaultProxyPort": 0, - "defaultVersion": "1.18.2" + "defaultVersion": "" } diff --git a/package.json b/package.json index 3811a163..03928e61 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "react": "^18.2.0", "react-dom": "^18.2.0", "react-refresh": "^0.14.0", - "space-squid": "github:zardoy/space-squid#everything", + "flying-squid": "github:zardoy/space-squid#everything", "speed-measure-webpack-plugin": "^1.5.0", "stats.js": "^0.17.0", "url": "^0.11.1", diff --git a/src/createLocalServer.js b/src/createLocalServer.js index d60c49ff..93133629 100644 --- a/src/createLocalServer.js +++ b/src/createLocalServer.js @@ -1,4 +1,5 @@ -import mcServer from 'space-squid' +//@ts-check +import mcServer from 'flying-squid' import serverOptions from './defaultLocalServerOptions' import { LocalServer } from './customServer' diff --git a/src/index.js b/src/index.js index c6e70a4b..8c5038f0 100644 --- a/src/index.js +++ b/src/index.js @@ -385,7 +385,7 @@ async function connect (connectOptions) { // tcpDns() skipped since we define connect option // in setProtocol: we emit 'connect' here below so in that file we send set_protocol and login_start (onLogin handler) // Client (class) of flying-squid (in server/login.js of mc-protocol): onLogin handler: skip most logic & go to loginClient() which assigns uuid and sends 'success' back to client (onLogin handler) and emits 'login' on the server (login.js in flying-squid handler) - // flying-squid: 'login' -> player.login -> now sends 'login' event to the client (handled in many plugins in mineflayer) -> then 'update_health' is sent which emits 'spawn' + // flying-squid: 'login' -> player.login -> now sends 'login' event to the client (handled in many plugins in mineflayer) -> then 'update_health' is sent which emits 'spawn' in mineflayer setLoadingScreenStatus('Starting local server') window.serverDataChannel ??= {} diff --git a/src/loadSave.ts b/src/loadSave.ts index 49ebd05d..e2c5cab2 100644 --- a/src/loadSave.ts +++ b/src/loadSave.ts @@ -1,5 +1,5 @@ import fs from 'fs' -import { supportedVersions } from 'space-squid/src/lib/version' +import { supportedVersions } from 'flying-squid/src/lib/version' import * as nbt from 'prismarine-nbt' import { promisify } from 'util' import { options } from './optionsStorage'