Skip to content

Commit

Permalink
Merge branch 'next' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
zardoy committed Aug 12, 2024
2 parents d5e5baa + 39ccf84 commit 8c5c575
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 25 deletions.
4 changes: 2 additions & 2 deletions README.MD
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ All components that are in [Storybook](https://mcraft.fun/storybook) are publish

### Recommended Settings

- Controls -> **Raw Input** -> **On** - This will make the controls more precise
- Controls -> **Touch Controls Type** -> **Joystick**
- Controls -> **Auto Full Screen** -> **On** - To avoid ctrl+w issue
- Interface -> **Chat Select** -> **On** - To select chat messages
- Controls -> **Raw Input** -> **On** - This will make the controls more precise (UPD: already enabled by default)
- Interface -> **Chat Select** -> **On** - To select chat messages (UPD: already enabled by default)

### World Loading

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
"http-browserify": "^1.7.0",
"http-server": "^14.1.1",
"https-browserify": "^1.0.0",
"mc-assets": "^0.2.10",
"mc-assets": "^0.2.11",
"minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
"mineflayer": "github:zardoy/mineflayer",
"mineflayer-pathfinder": "^2.4.4",
Expand Down
10 changes: 5 additions & 5 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ import { fsState } from './loadSave'
import { watchFov } from './rendererUtils'
import { loadInMemorySave } from './react/SingleplayerProvider'

import { downloadSoundsIfNeeded, earlyCheck as earlySoundsMapCheck } from './soundSystem'
import { downloadSoundsIfNeeded } from './soundSystem'
import { ua } from './react/utils'
import { handleMovementStickDelta, joystickPointer } from './react/TouchAreasControls'
import { possiblyHandleStateVariable } from './googledrive'
Expand Down Expand Up @@ -552,7 +552,6 @@ async function connect (connectOptions: ConnectOptions) {
// "mapDownloader-saveInternal": false, // do not save into memory, todo must be implemeneted as we do really care of ram
}) as unknown as typeof __type_bot
window.bot = bot
earlySoundsMapCheck()
customEvents.emit('mineflayerBotCreated')
if (singleplayer || p2pMultiplayer) {
// in case of p2pMultiplayer there is still flying-squid on the host side
Expand Down
4 changes: 2 additions & 2 deletions src/optionsStorage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const defaultOptions = {
multiplayerRenderDistance: 3,
closeConfirmation: true,
autoFullScreen: false,
mouseRawInput: false,
mouseRawInput: true,
autoExitFullscreen: false,
localUsername: 'wanderer',
mouseSensX: 50,
Expand Down Expand Up @@ -69,7 +69,7 @@ const defaultOptions = {
renderEntities: true,
smoothLighting: true,
newVersionsLighting: false,
chatSelect: false,
chatSelect: true,
autoJump: 'auto' as 'auto' | 'always' | 'never',
autoParkour: false,

Expand Down
13 changes: 0 additions & 13 deletions src/soundSystem.ts
Original file line number Diff line number Diff line change
Expand Up @@ -235,19 +235,6 @@ subscribeKey(miscUiState, 'gameLoaded', async () => {
// }
// }

export const earlyCheck = () => {
const { allSoundsMap } = globalObject
if (!allSoundsMap) return

// todo also use major versioned hardcoded sounds
const soundsMap = allSoundsMap[bot.version]

if (!soundsMap) {
console.warn('No sounds map for version', bot.version, 'supported versions are', Object.keys(allSoundsMap).join(', '))
showNotification('Warning', 'No sounds map for version ' + bot.version)
}
}

const getVersionedSound = (version: string, item: string, itemsMapSortedEntries: Array<[string, string[]]>) => {
const verNumber = versionToNumber(version)
for (const [itemsVer, items] of itemsMapSortedEntries) {
Expand Down

0 comments on commit 8c5c575

Please sign in to comment.