From fb395041b9e40449819e5a8d0361f06264bfa80b Mon Sep 17 00:00:00 2001
From: Vitaly Turovsky <vital2580@icloud.com>
Date: Mon, 11 Aug 2025 01:39:08 +0300
Subject: [PATCH] fix: fix on 1.18.2 many blocks like mushrom blocks, fence
 gates, deepslate, basalt, copper stuff like ore, infested stone, cakes and
 tinted glass was resulting in instant breaking on the client dev: add
 debugTestPing

---
 scripts/makeOptimizedMcData.mjs |  7 +++--
 src/mineflayer/mc-protocol.ts   | 49 ++++++++++++++++++++++++++++++++-
 2 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/scripts/makeOptimizedMcData.mjs b/scripts/makeOptimizedMcData.mjs
index 0b5752d8..76e0f1c2 100644
--- a/scripts/makeOptimizedMcData.mjs
+++ b/scripts/makeOptimizedMcData.mjs
@@ -90,16 +90,19 @@ const dataTypeBundling = {
   },
   blocks: {
     arrKey: 'name',
-    processData(current, prev) {
+    processData(current, prev, _, version) {
       for (const block of current) {
+        const prevBlock = prev?.find(x => x.name === block.name)
         if (block.transparent) {
           const forceOpaque = block.name.includes('shulker_box') || block.name.match(/^double_.+_slab\d?$/) || ['melon_block', 'lit_pumpkin', 'lit_redstone_ore', 'lit_furnace'].includes(block.name)
 
-          const prevBlock = prev?.find(x => x.name === block.name)
           if (forceOpaque || (prevBlock && !prevBlock.transparent)) {
             block.transparent = false
           }
         }
+        if (block.hardness === 0 && prevBlock && prevBlock.hardness > 0) {
+          block.hardness = prevBlock.hardness
+        }
       }
     }
     // ignoreRemoved: true,
diff --git a/src/mineflayer/mc-protocol.ts b/src/mineflayer/mc-protocol.ts
index 2376cd03..a0348c5d 100644
--- a/src/mineflayer/mc-protocol.ts
+++ b/src/mineflayer/mc-protocol.ts
@@ -1,8 +1,11 @@
+import net from 'net'
 import { Client } from 'minecraft-protocol'
 import { appQueryParams } from '../appParams'
 import { downloadAllMinecraftData, getVersionAutoSelect } from '../connect'
 import { gameAdditionalState } from '../globalState'
 import { ProgressReporter } from '../core/progressReporter'
+import { parseServerAddress } from '../parseServerAddress'
+import { getCurrentProxy } from '../react/ServersList'
 import { pingServerVersion, validatePacket } from './minecraft-protocol-extra'
 import { getWebsocketStream } from './websocket-core'
 
@@ -35,7 +38,7 @@ setInterval(() => {
 }, 1000)
 
 
-export const getServerInfo = async (ip: string, port?: number, preferredVersion = getVersionAutoSelect(), ping = false, progressReporter?: ProgressReporter) => {
+export const getServerInfo = async (ip: string, port?: number, preferredVersion = getVersionAutoSelect(), ping = false, progressReporter?: ProgressReporter, setProxyParams?: ProxyParams) => {
   await downloadAllMinecraftData()
   const isWebSocket = ip.startsWith('ws://') || ip.startsWith('wss://')
   let stream
@@ -43,6 +46,8 @@ export const getServerInfo = async (ip: string, port?: number, preferredVersion
     progressReporter?.setMessage('Connecting to WebSocket server')
     stream = (await getWebsocketStream(ip)).mineflayerStream
     progressReporter?.setMessage('WebSocket connected. Ping packet sent, waiting for response')
+  } else if (setProxyParams) {
+    setProxy(setProxyParams)
   }
   window.setLoadingMessage = (message?: string) => {
     if (message === undefined) {
@@ -59,3 +64,45 @@ export const getServerInfo = async (ip: string, port?: number, preferredVersion
     window.setLoadingMessage = undefined
   })
 }
+
+globalThis.debugTestPing = async (ip: string) => {
+  const parsed = parseServerAddress(ip, false)
+  const result = await getServerInfo(parsed.host, parsed.port ? Number(parsed.port) : undefined, undefined, true, undefined, { address: getCurrentProxy(), })
+  console.log('result', result)
+  return result
+}
+
+export const getDefaultProxyParams = () => {
+  return {
+    headers: {
+      Authorization: `Bearer ${new URLSearchParams(location.search).get('token') ?? ''}`
+    }
+  }
+}
+
+export type ProxyParams = {
+  address?: string
+  headers?: Record<string, string>
+}
+
+export const setProxy = (proxyParams: ProxyParams) => {
+  if (proxyParams.address?.startsWith(':')) {
+    proxyParams.address = `${location.protocol}//${location.hostname}${proxyParams.address}`
+  }
+  if (proxyParams.address && location.port !== '80' && location.port !== '443' && !/:\d+$/.test(proxyParams.address)) {
+    const https = proxyParams.address.startsWith('https://') || location.protocol === 'https:'
+    proxyParams.address = `${proxyParams.address}:${https ? 443 : 80}`
+  }
+
+  const parsedProxy = parseServerAddress(proxyParams.address, false)
+  const proxy = { host: parsedProxy.host, port: parsedProxy.port }
+  proxyParams.headers ??= getDefaultProxyParams().headers
+  net['setProxy']({
+    hostname: proxy.host,
+    port: proxy.port,
+    headers: proxyParams.headers
+  })
+  return {
+    proxy
+  }
+}