diff --git a/config.json b/config.json index ea27ca5a4..b5f40ad4e 100644 --- a/config.json +++ b/config.json @@ -7,22 +7,15 @@ "peerJsServerFallback": "https://p2p.mcraft.fun", "promoteServers": [ { - "ip": "wss://play.mcraft.fun" - }, - { - "ip": "wss://ws.fuchsmc.net" - }, - { - "ip": "wss://play2.mcraft.fun" + "ip": "wss://mcraft.ryzyn.xyz", + "version": "1.19.4" }, { - "ip": "wss://mcraft.ryzyn.xyz", + "ip": "grim.mcraft.fun", "version": "1.19.4" }, { - "ip": "kaboom.pw", - "version": "1.20.3", - "description": "Very nice a polite server. Must try for everyone!" + "ip": "wss://play.mcraft.fun" } ], "rightSideText": "A Minecraft client clone in the browser!", diff --git a/package.json b/package.json index 16f009f0b..8a84a7974 100644 --- a/package.json +++ b/package.json @@ -194,7 +194,7 @@ }, "pnpm": { "overrides": { - "@nxg-org/mineflayer-physics-util": "1.8.7", + "@nxg-org/mineflayer-physics-util": "latest", "buffer": "^6.0.3", "vec3": "0.1.10", "three": "0.154.0", @@ -229,5 +229,11 @@ "fsevents" ] }, + "deployAlwaysUpdate": [ + "@nxg-org/mineflayer-physics-util", + "mineflayer", + "@nxg-org/mineflayer-auto-jump", + "@nxg-org/mineflayer-tracker" + ], "packageManager": "pnpm@10.8.0+sha512.0e82714d1b5b43c74610193cb20734897c1d00de89d0e18420aebc5977fa13d780a9cb05734624e81ebd81cc876cd464794850641c48b9544326b5622ca29971" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 19248ee1e..59dc019b8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,7 +5,7 @@ settings: excludeLinksFromLockfile: false overrides: - '@nxg-org/mineflayer-physics-util': 1.8.7 + '@nxg-org/mineflayer-physics-util': latest buffer: ^6.0.3 vec3: 0.1.10 three: 0.154.0 @@ -43,7 +43,7 @@ importers: version: 0.26.28(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@nxg-org/mineflayer-auto-jump': specifier: ^0.7.12 - version: 0.7.12 + version: 0.7.16 '@nxg-org/mineflayer-tracker': specifier: 1.2.1 version: 1.2.1(encoding@0.1.13) @@ -2019,8 +2019,8 @@ packages: engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} deprecated: This functionality has been moved to @npmcli/fs - '@nxg-org/mineflayer-auto-jump@0.7.12': - resolution: {integrity: sha512-F5vX/lerlWx/5HVlkDNbvrtQ19PL6iG8i4ItPTIRtjGiFzusDefP7DI226zSFR8Wlaw45qHv0jn814p/4/qVdQ==} + '@nxg-org/mineflayer-auto-jump@0.7.16': + resolution: {integrity: sha512-UyOyb6SdxwknTO9y9+ntlh9Uv/tjKOgNeOEDlwYG1NhesX+3mPJNnBaW4acRl5eqLt0YXifDvaYaiLj7y6iuQA==} '@nxg-org/mineflayer-physics-util@1.8.7': resolution: {integrity: sha512-wtLYvHqoEFr/j0ny2lyogwjbMvwpFuG2aWI8sI14+EAiGFRpL5+cog2ujSDsnRTZruO7tUXMTiPc1kebjXwfJg==} @@ -11368,7 +11368,7 @@ snapshots: rimraf: 3.0.2 optional: true - '@nxg-org/mineflayer-auto-jump@0.7.12': + '@nxg-org/mineflayer-auto-jump@0.7.16': dependencies: '@nxg-org/mineflayer-physics-util': 1.8.7 strict-event-emitter-types: 2.0.0 diff --git a/src/react/components/LibraryVersions.tsx b/src/react/components/LibraryVersions.tsx new file mode 100644 index 000000000..0f4aa1cf3 --- /dev/null +++ b/src/react/components/LibraryVersions.tsx @@ -0,0 +1,45 @@ +import React from 'react' +import physicsUtilPkg from '@nxg-org/mineflayer-physics-util/package.json' +import mineflayerPkg from 'mineflayer/package.json' +import mcProtocolPkg from 'minecraft-protocol/package.json' +import { useSnapshot } from 'valtio' +import packageJson from '../../../package.json' +import { miscUiState } from '../../globalState' + +const LibraryVersions: React.FC = () => { + const versions = { + '@nxg-org/mineflayer-physics-util': physicsUtilPkg.version, + 'mineflayer': packageJson.devDependencies['mineflayer'], + 'minecraft-protocol': mcProtocolPkg.version + } + + // const { gameLoaded } = useSnapshot(miscUiState) + + // if (!gameLoaded) return null + + return ( +
+
Library Versions:
+ {Object.entries(versions).map(([lib, version]) => ( +
+ {lib}: {version} +
+ ))} +
+ ) +} + +export default LibraryVersions diff --git a/src/reactUi.tsx b/src/reactUi.tsx index c91c37d67..e94fd2fe8 100644 --- a/src/reactUi.tsx +++ b/src/reactUi.tsx @@ -47,6 +47,7 @@ import { options } from './optionsStorage' import BossBarOverlayProvider from './react/BossBarOverlayProvider' import ModsPage from './react/ModsPage' import DebugEdges from './react/DebugEdges' +import LibraryVersions from './react/components/LibraryVersions' import GameInteractionOverlay from './react/GameInteractionOverlay' import MineflayerPluginHud from './react/MineflayerPluginHud' import MineflayerPluginConsole from './react/MineflayerPluginConsole' @@ -222,6 +223,7 @@ const App = () => { +