FIX allow to reassign movement keyboard buttons fixes #428

FIX colored banners

Author: zardoy

package.json

@@ -144,7 +144,7 @@
     "browserify-zlib": "^0.2.0",
     "buffer": "^6.0.3",
     "constants-browserify": "^1.0.0",
-    "contro-max": "^0.1.9",
+    "contro-max": "^0.1.12",
     "crypto-browserify": "^3.12.0",
     "cypress-esbuild-preprocessor": "^1.0.2",
     "eslint": "^8.50.0",
@@ -154,7 +154,7 @@
     "http-browserify": "^1.7.0",
     "http-server": "^14.1.1",
     "https-browserify": "^1.0.0",
-    "mc-assets": "^0.2.62",
+    "mc-assets": "^0.2.72",
     "minecraft-inventory-gui": "github:zardoy/minecraft-inventory-gui#next",
     "mineflayer": "github:zardoy/mineflayer#gen-the-master",
     "mineflayer-mouse": "^0.1.24",

pnpm-lock.yaml

@@ -143,10 +143,11 @@ export const renderBanner = (
 
   ctx.imageSmoothingEnabled = false
 
-  // Always render base color first (even if no patterns)
-  const baseColorHex = BANNER_COLORS[baseColor] || BANNER_COLORS[15]
-  ctx.fillStyle = baseColorHex
-  ctx.fillRect(0, 0, BANNER_WIDTH * scale, BANNER_HEIGHT * scale)
+  // Base color rendering disabled
+  // // Always render base color first (even if no patterns)
+  // const baseColorHex = BANNER_COLORS[baseColor] || BANNER_COLORS[15]
+  // ctx.fillStyle = baseColorHex
+  // ctx.fillRect(0, 0, BANNER_WIDTH * scale, BANNER_HEIGHT * scale)
 
   // Render patterns on top of base color (if any)
   if (blockEntity?.Patterns && blockEntity.Patterns.length > 0) {

renderer/viewer/three/bannerRenderer.ts

@@ -43,15 +43,20 @@ const controlOptions = {
 
 export const contro = new ControMax({
   commands: {
-    general: {
-      // movement
+    movement: {
+      forward: ['KeyW'],
+      back: ['KeyS'],
+      left: ['KeyA'],
+      right: ['KeyD'],
       jump: ['Space', 'A'],
-      inventory: ['KeyE', 'X'],
-      drop: ['KeyQ', 'B'],
-      dropStack: [null],
       sneak: ['ShiftLeft', 'Down'],
       toggleSneakOrDown: [null, 'Right Stick'],
       sprint: ['ControlLeft', 'Left Stick'],
+    },
+    general: {
+      inventory: ['KeyE', 'X'],
+      drop: ['KeyQ', 'B'],
+      dropStack: [null],
       // game interactions
       nextHotbarSlot: [null, 'Right Bumper'],
       prevHotbarSlot: [null, 'Left Bumper'],
@@ -95,7 +100,6 @@ export const contro = new ControMax({
     //   showLookingBlockUsages: ['Numpad4']
     // }
   } satisfies Record<string, Record<string, SchemaCommandInput>>,
-  movementKeymap: 'WASD',
   movementVector: '2d',
   groupedCommands: {
     general: {
@@ -181,17 +185,14 @@ contro.on('movementUpdate', ({ vector, soleVector, gamepadIndex }) => {
   }
 
   for (const key of ['forward', 'back', 'left', 'right'] as const) {
-    if (newState[key] === bot.controlState[key]) continue
+    if (!!(newState[key]) === !!(bot.controlState[key])) continue
     const action = !!newState[key]
     if (action && !isGameActive(true)) continue
     bot.setControlState(key, action)
 
     if (key === 'forward') {
       // todo workaround: need to refactor
-      if (action) {
-        void contro.emit('trigger', { command: 'general.forward' } as any)
-      } else {
-        void contro.emit('release', { command: 'general.forward' } as any)
+      if (!action) {
         setSprinting(false)
       }
     }
@@ -201,12 +202,12 @@ contro.on('movementUpdate', ({ vector, soleVector, gamepadIndex }) => {
 let lastCommandTrigger = null as { command: string, time: number } | null
 
 const secondActionActivationTimeout = 300
-const secondActionCommands = {
-  'general.jump' () {
+const secondActionCommands: Partial<Record<Command, () => void>> = {
+  'movement.jump' () {
     // if (bot.game.gameMode === 'spectator') return
     toggleFly()
   },
-  'general.forward' () {
+  'movement.forward' () {
     setSprinting(true)
   }
 }
@@ -300,11 +301,10 @@ const setSneaking = (state: boolean) => {
 const onTriggerOrReleased = (command: Command, pressed: boolean) => {
   // always allow release!
   if (!bot || !isGameActive(false)) return
-  if (stringStartsWith(command, 'general')) {
-    // handle general commands
-    // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
+
+  if (stringStartsWith(command, 'movement')) {
     switch (command) {
-      case 'general.jump':
+      case 'movement.jump':
         if (isSpectatingEntity()) break
         // if (viewer.world.freeFlyMode) {
         //   const moveSpeed = 0.5
@@ -313,27 +313,45 @@ const onTriggerOrReleased = (command: Command, pressed: boolean) => {
         bot.setControlState('jump', pressed)
         // }
         break
-      case 'general.sneak':
+      case 'movement.sneak':
         // if (viewer.world.freeFlyMode) {
         //   const moveSpeed = 0.5
         //   viewer.world.freeFlyState.position.add(new Vec3(0, pressed ? -moveSpeed : 0, 0))
         // } else {
         setSneaking(pressed)
         // }
         break
-      case 'general.sprint':
+      case 'movement.sprint':
         // todo add setting to change behavior
         if (pressed) {
           setSprinting(pressed)
         }
         break
-      case 'general.toggleSneakOrDown':
+      case 'movement.toggleSneakOrDown':
         if (gameAdditionalState.isFlying) {
           setSneaking(pressed)
         } else if (pressed) {
           setSneaking(!gameAdditionalState.isSneaking)
         }
         break
+      case 'movement.forward':
+        contro.setMovement('forward', pressed)
+        break
+      case 'movement.back':
+        contro.setMovement('backward', pressed)
+        break
+      case 'movement.left':
+        contro.setMovement('left', pressed)
+        break
+      case 'movement.right':
+        contro.setMovement('right', pressed)
+        break
+    }
+  }
+  if (stringStartsWith(command, 'general')) {
+    // handle general commands
+    // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
+    switch (command) {
       case 'general.attackDestroy':
         document.dispatchEvent(new MouseEvent(pressed ? 'mousedown' : 'mouseup', { button: 0 }))
         break
@@ -479,7 +497,7 @@ contro.on('trigger', ({ command }) => {
   if (secondActionCommand) {
     if (command === lastCommandTrigger?.command && Date.now() - lastCommandTrigger.time < secondActionActivationTimeout) {
       const commandToTrigger = secondActionCommands[lastCommandTrigger.command]
-      commandToTrigger()
+      commandToTrigger?.()
       lastCommandTrigger = null
     } else {
       lastCommandTrigger = {
@@ -493,10 +511,6 @@ contro.on('trigger', ({ command }) => {
 
   if (stringStartsWith(command, 'general')) {
     switch (command) {
-      case 'general.jump':
-      case 'general.sneak':
-      case 'general.toggleSneakOrDown':
-      case 'general.sprint':
       case 'general.attackDestroy':
       case 'general.rotateCameraLeft':
       case 'general.rotateCameraRight':
@@ -952,10 +966,6 @@ export const handleMobileButtonActionCommand = (command: ActionType | ActionHold
   if (typeof commandValue === 'string' && !stringStartsWith(commandValue, 'custom')) {
     const event: CommandEventArgument<typeof contro['_commandsRaw']> = {
       command: commandValue as Command,
-      schema: {
-        keys: [],
-        gamepad: []
-      }
     }
     if (isDown) {
       contro.emit('trigger', event)

src/controls.ts

@@ -403,12 +403,14 @@ export const openItemsCanvas = (type, _bot = bot as typeof bot | null) => {
 }
 
 const upWindowItemsLocal = () => {
-  if (!lastWindow && bot.currentWindow) {
-    // edge case: might happen due to high ping, inventory should be closed soon!
-    // openWindow(implementedContainersGuiMap[bot.currentWindow.type])
-    return
-  }
-  void Promise.resolve().then(() => upInventoryItems(lastWindowType === null))
+  void Promise.resolve().then(() => {
+    if (!lastWindow && bot.currentWindow) {
+      // edge case: might happen due to high ping, inventory should be closed soon!
+      // openWindow(implementedContainersGuiMap[bot.currentWindow.type])
+      return
+    }
+    upInventoryItems(lastWindowType === null)
+  })
 }
 
 let skipClosePacketSending = false

src/inventoryWindows.ts

@@ -42,6 +42,9 @@ export default ({
 
   const lockConnect = appQueryParams.lockConnect === 'true'
   const connectOptions = lastConnectOptions.value
+  const connectionProxy =
+    connectOptions?.server && !connectOptions.server.startsWith('ws://') && !connectOptions.server.startsWith('wss://')
+      ? connectOptions.proxy : undefined
 
   return (
     <div className=''>
@@ -73,9 +76,9 @@ export default ({
             <p className={styles['last-status']}>{lastStatus ? `Last status: ${lastStatus}` : lastStatus}</p>
             {isError && <p className={`app-status-title-context-info ${styles.appStatusTitleContextInfo}`}>
               S: {connectOptions?.server ?? 'N/A'} {' '}
-              P: {connectOptions?.proxy ?? 'N/A'} {' '}
+              P: {connectionProxy ?? 'N/A'} {' '}
               V: {connectOptions?.botVersion ?? 'auto'} {' '}
-              U: {connectOptions?.username ?? 'N/A'}
+              U: {connectOptions?.username ?? 'N/A'}{' '}
               cV: {process.env.RELEASE_TAG ?? 'N/A'}
             </p>}
           </>