Release (#475)

Author: zardoy

config.json

@@ -18,7 +18,7 @@
       "ip": "wss://ws.fuchsmc.net"
     },
     {
-      "ip": "wss://play2.mcraft.fun"
+      "ip": "wss://play3.mcraft.fun"
     },
     {
       "ip": "wss://play-creative.mcraft.fun",

package.json

@@ -87,7 +87,7 @@
     "jszip": "^3.10.1",
     "lodash-es": "^4.17.21",
     "mcraft-fun-mineflayer": "^0.1.23",
-    "minecraft-data": "3.98.0",
+    "minecraft-data": "3.103.0",
     "minecraft-protocol": "github:PrismarineJS/node-minecraft-protocol#master",
     "mineflayer-item-map-downloader": "github:zardoy/mineflayer-item-map-downloader",
     "mojangson": "^2.0.4",
@@ -157,7 +157,7 @@
     "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",
+    "mineflayer-mouse": "^0.1.25",
     "npm-run-all": "^4.1.5",
     "os-browserify": "^0.3.0",
     "path-browserify": "^1.0.1",
@@ -205,7 +205,7 @@
       "diamond-square": "github:zardoy/diamond-square",
       "prismarine-block": "github:zardoy/prismarine-block#next-era",
       "prismarine-world": "github:zardoy/prismarine-world#next-era",
-      "minecraft-data": "3.98.0",
+      "minecraft-data": "3.103.0",
       "prismarine-provider-anvil": "github:zardoy/prismarine-provider-anvil#everything",
       "prismarine-physics": "github:zardoy/prismarine-physics",
       "minecraft-protocol": "github:PrismarineJS/node-minecraft-protocol#master",
@@ -222,7 +222,8 @@
     "patchedDependencies": {
       "pixelarticons@1.8.1": "patches/pixelarticons@1.8.1.patch",
       "mineflayer-item-map-downloader@1.2.0": "patches/mineflayer-item-map-downloader@1.2.0.patch",
-      "minecraft-protocol": "patches/minecraft-protocol.patch"
+      "minecraft-protocol": "patches/minecraft-protocol.patch",
+      "@nxg-org/mineflayer-physics-util": "patches/@nxg-org__mineflayer-physics-util.patch"
     },
     "ignoredBuiltDependencies": [
       "canvas",

patches/@nxg-org__mineflayer-physics-util.patch

@@ -0,0 +1,13 @@
+diff --git a/dist/physics/states/playerState.js b/dist/physics/states/playerState.js
+index df1bdc854473599014f398993b7ccfb9123c38c4..eaf20b44c26a469ac3306d572d35628e56ad0fa5 100644
+--- a/dist/physics/states/playerState.js
++++ b/dist/physics/states/playerState.js
+@@ -288,7 +288,7 @@ class PlayerState {
+                 break;
+             case "survival":
+             case "adventure":
+-                this.flySpeed = 0;
++                this.flySpeed = 0.05;
+                 this.mayFly = bot.entity.canFly;
+                 break;
+             default:

pnpm-lock.yaml

@@ -2,16 +2,18 @@ import { Vec3 } from 'vec3'
 import worldBlockProvider, { WorldBlockProvider } from 'mc-assets/dist/worldBlockProvider'
 import legacyJson from '../../../../src/preflatMap.json'
 import { BlockType } from '../../../playground/shared'
-import { World, BlockModelPartsResolved, WorldBlock as Block, WorldBlock } from './world'
-import { BlockElement, buildRotationMatrix, elemFaces, matmul3, matmulmat3, vecadd3, vecsub3 } from './modelsGeometryCommon'
+import moreBlockData from '../moreBlockDataGenerated.json'
 import { INVISIBLE_BLOCKS } from './worldConstants'
 import { MesherGeometryOutput, HighestBlockInfo } from './shared'
+import { BlockElement, buildRotationMatrix, elemFaces, matmul3, matmulmat3, vecadd3, vecsub3 } from './modelsGeometryCommon'
+import { World, BlockModelPartsResolved, WorldBlock as Block, WorldBlock } from './world'
 
 
 let blockProvider: WorldBlockProvider
 
 const tints: any = {}
 let needTiles = false
+let semiTransparentBlocks: string[] = []
 
 let tintsData
 try {
@@ -536,6 +538,7 @@ export function getSectionGeometry (sx: number, sy: number, sz: number, world: W
     t_uvs: [],
     indices: [],
     indicesCount: 0, // Track current index position
+    transparentIndicesStart: 0, // Will be set after opaque geometry
     using32Array: true,
     tiles: {},
     // todo this can be removed here
@@ -664,7 +667,7 @@ export function getSectionGeometry (sx: number, sy: number, sz: number, world: W
 
             for (const element of model.elements ?? []) {
               const ao = model.ao ?? block.boundingBox !== 'empty'
-              if (block.transparent) {
+              if (block.transparent && semiTransparentBlocks.includes(block.name)) {
                 const pos = cursor.clone()
                 delayedRender.push(() => {
                   renderElement(world, pos, element, ao, attr, globalMatrix, globalShift, block, biome)
@@ -681,6 +684,10 @@ export function getSectionGeometry (sx: number, sy: number, sz: number, world: W
     }
   }
 
+  // Track where transparent indices start (for separate material rendering)
+  // This must be set BEFORE delayedRender executes, as those are semi-transparent blocks
+  attr.transparentIndicesStart = attr.indicesCount
+
   for (const render of delayedRender) {
     render()
   }
@@ -750,12 +757,36 @@ function arrayNeedsUint32 (array) {
 
 }
 
-export const setBlockStatesData = (blockstatesModels, blocksAtlas: any, _needTiles = false, useUnknownBlockModel = true, version = 'latest') => {
+export const setBlockStatesData = (blockstatesModels, blocksAtlas: any, _needTiles = false, useUnknownBlockModel = true, version = 'latest', mcData = (globalThis as any).mcData) => {
   blockProvider = worldBlockProvider(blockstatesModels, blocksAtlas, version)
   globalThis.blockProvider = blockProvider
   if (useUnknownBlockModel) {
     unknownBlockModel = blockProvider.getAllResolvedModels0_1({ name: 'unknown', properties: {} })
   }
 
   needTiles = _needTiles
+
+  // Cache semi-transparent blocks based on regex patterns from moreBlockDataGenerated.json
+  const regexPatterns = Object.keys(moreBlockData.hasSemiTransparentTextuersRegex || {})
+  semiTransparentBlocks = []
+
+  // Get all block names from blockstatesModels
+  if (!Array.isArray(mcData.blocks)) throw new Error('mcData.blocks is not an array')
+  const allBlockNames = mcData.blocks.map(block => block.name)
+
+  // Filter blocks that match any of the regex patterns
+  for (const blockName of allBlockNames) {
+    for (const pattern of regexPatterns) {
+      try {
+        const regex = new RegExp(pattern)
+        if (regex.test(blockName)) {
+          semiTransparentBlocks.push(blockName)
+          break // Only add once per block
+        }
+      } catch (err) {
+        // Invalid regex pattern, skip
+        console.warn('Invalid regex pattern in hasSemiTransparentTextuersRegex:', pattern)
+      }
+    }
+  }
 }

renderer/viewer/lib/mesher/models.ts

@@ -37,6 +37,7 @@ export type MesherGeometryOutput = {
 
   indices: Uint32Array | Uint16Array | number[],
   indicesCount: number,
+  transparentIndicesStart: number, // Index where transparent geometry starts
   using32Array: boolean,
   tiles: Record<string, BlockType>,
   heads: Record<string, any>,

renderer/viewer/lib/mesher/shared.ts

@@ -33,7 +33,7 @@ export const setup = (version, initialBlocks: Array<[number[], string]>) => {
     }
   }
 
-  setBlockStatesData(blockStatesModels, blocksAtlasesJson, true, false, version)
+  setBlockStatesData(blockStatesModels, blocksAtlasesJson, true, false, version, { blocks: mcData.blocksArray })
   const reload = () => {
     mesherWorld.removeColumn(0, 0)
     mesherWorld.addColumn(0, 0, chunk1.toJson())

renderer/viewer/lib/mesher/test/mesherTester.ts

@@ -710,5 +710,13 @@
         "frogspawn": "rgb(64, 64, 255)",
         "reinforced_deepslate": "rgb(100, 100, 100)",
         "decorated_pot": "rgb(142, 60, 46)"
+    },
+    "hasSemiTransparentTextuersRegex": {
+        "_stained_glass$": true,
+        "_stained_glass_pane$": true,
+        "^ice$": true,
+        "^tinted_glass$": true,
+        "^slime_block$": true,
+        "^honey_block$": true
     }
 }

renderer/viewer/lib/moreBlockDataGenerated.json

@@ -19,6 +19,10 @@ export const WAYPOINT_CONFIG = {
     pixelSize: 50,
     paddingPx: 50,
   },
+  // Default visual scale factor (can be overridden globally or per-waypoint)
+  DEFAULT_VISUAL_SCALE: 1,
+  // Default opacity (can be overridden globally or per-waypoint)
+  DEFAULT_OPACITY: 1,
 }
 
 export type WaypointSprite = {
@@ -51,14 +55,31 @@ export function createWaypointSprite (options: {
   // Y offset in world units used by updateScaleWorld only (screen-pixel API ignores this)
   labelYOffset?: number,
   metadata?: any,
+  visualScale?: number,
+  opacity?: number,
 }): WaypointSprite {
   const color = options.color ?? 0xFF_00_00
   const depthTest = options.depthTest ?? false
   const labelYOffset = options.labelYOffset ?? 1.5
 
+  // Get visual scale from options, metadata, server metadata, or default
+  // Priority: options.visualScale > metadata.visualScale > window.serverMetadata?.waypointVisualScale > DEFAULT
+  const visualScale = options.visualScale
+    ?? options.metadata?.visualScale
+    ?? (typeof window === 'undefined' ? undefined : (window as any).serverMetadata?.waypointVisualScale)
+    ?? WAYPOINT_CONFIG.DEFAULT_VISUAL_SCALE
+
+  // Get opacity from options, metadata, server metadata, or default
+  // Priority: options.opacity > metadata.opacity > window.serverMetadata?.waypointOpacity > DEFAULT
+  const opacity = options.opacity
+    ?? options.metadata?.opacity
+    ?? (typeof window === 'undefined' ? undefined : (window as any).serverMetadata?.waypointOpacity)
+    ?? WAYPOINT_CONFIG.DEFAULT_OPACITY
+
   // Build combined sprite
-  const sprite = createCombinedSprite(color, options.label ?? '', '0m', depthTest)
+  const sprite = createCombinedSprite(color, options.label ?? '', '0m', depthTest, visualScale)
   sprite.renderOrder = 10
+  sprite.material.opacity = opacity
   let currentLabel = options.label ?? ''
 
   // Performance optimization: cache distance text to avoid unnecessary updates
@@ -79,7 +100,7 @@ export function createWaypointSprite (options: {
   group.position.set(x, y, z)
 
   function setColor (newColor: number) {
-    const canvas = drawCombinedCanvas(newColor, currentLabel, '0m')
+    const canvas = drawCombinedCanvas(newColor, currentLabel, '0m', visualScale)
     const texture = new THREE.CanvasTexture(canvas)
     const mat = sprite.material
     mat.map?.dispose()
@@ -89,7 +110,7 @@ export function createWaypointSprite (options: {
 
   function setLabel (newLabel?: string) {
     currentLabel = newLabel ?? ''
-    const canvas = drawCombinedCanvas(color, currentLabel, '0m')
+    const canvas = drawCombinedCanvas(color, currentLabel, '0m', visualScale)
     const texture = new THREE.CanvasTexture(canvas)
     const mat = sprite.material
     mat.map?.dispose()
@@ -104,7 +125,7 @@ export function createWaypointSprite (options: {
     }
     lastDistanceText = distanceText
 
-    const canvas = drawCombinedCanvas(color, label, distanceText)
+    const canvas = drawCombinedCanvas(color, label, distanceText, visualScale)
     const texture = new THREE.CanvasTexture(canvas)
     const mat = sprite.material
     mat.map?.dispose()
@@ -129,8 +150,8 @@ export function createWaypointSprite (options: {
   ) {
     const vFovRad = cameraFov * Math.PI / 180
     const worldUnitsPerScreenHeightAtDist = Math.tan(vFovRad / 2) * 2 * distance
-    // Use configured target screen size
-    const scale = worldUnitsPerScreenHeightAtDist * (WAYPOINT_CONFIG.TARGET_SCREEN_PX / viewportHeightPx)
+    // Use configured target screen size with visual scale multiplier
+    const scale = worldUnitsPerScreenHeightAtDist * (WAYPOINT_CONFIG.TARGET_SCREEN_PX * visualScale / viewportHeightPx)
     sprite.scale.set(scale, scale, 1)
   }
 
@@ -159,7 +180,7 @@ export function createWaypointSprite (options: {
     ctx.fill()
 
     const texture = new THREE.CanvasTexture(canvas)
-    const material = new THREE.SpriteMaterial({ map: texture, transparent: true, depthTest: false, depthWrite: false })
+    const material = new THREE.SpriteMaterial({ map: texture, transparent: true, depthTest: false, depthWrite: false, opacity })
     arrowSprite = new THREE.Sprite(material)
     arrowSprite.renderOrder = 12
     arrowSprite.visible = false
@@ -278,9 +299,9 @@ export function createWaypointSprite (options: {
     const angle = Math.atan2(ry, rx)
     arrowSprite.material.rotation = angle - Math.PI / 2
 
-    // Constant pixel size for arrow (use fixed placement distance)
+    // Constant pixel size for arrow (use fixed placement distance) with visual scale
     const worldUnitsPerScreenHeightAtDist = Math.tan(vFovRad / 2) * 2 * placeDist
-    const sPx = worldUnitsPerScreenHeightAtDist * (WAYPOINT_CONFIG.ARROW.pixelSize / viewportHeightPx)
+    const sPx = worldUnitsPerScreenHeightAtDist * (WAYPOINT_CONFIG.ARROW.pixelSize * visualScale / viewportHeightPx)
     arrowSprite.scale.set(sPx, sPx, 1)
     return false
   }
@@ -343,7 +364,7 @@ export function createWaypointSprite (options: {
 }
 
 // Internal helpers
-function drawCombinedCanvas (color: number, id: string, distance: string): HTMLCanvasElement {
+function drawCombinedCanvas (color: number, id: string, distance: string, visualScale = 1): HTMLCanvasElement {
   const scale = WAYPOINT_CONFIG.CANVAS_SCALE * (globalThis.devicePixelRatio || 1)
   const size = WAYPOINT_CONFIG.CANVAS_SIZE * scale
   const canvas = document.createElement('canvas')
@@ -354,11 +375,11 @@ function drawCombinedCanvas (color: number, id: string, distance: string): HTMLC
   // Clear canvas
   ctx.clearRect(0, 0, size, size)
 
-  // Draw dot
+  // Draw dot with visual scale applied
   const centerX = size / 2
   const dotY = Math.round(size * WAYPOINT_CONFIG.LAYOUT.DOT_Y)
-  const radius = Math.round(size * 0.05) // Dot takes up ~12% of canvas height
-  const borderWidth = Math.max(2, Math.round(4 * scale))
+  const radius = Math.round(size * 0.05 * visualScale) // Dot takes up ~5% of canvas height, scaled
+  const borderWidth = Math.max(2, Math.round(4 * scale * visualScale))
 
   // Outer border (black)
   ctx.beginPath()
@@ -376,21 +397,21 @@ function drawCombinedCanvas (color: number, id: string, distance: string): HTMLC
   ctx.textAlign = 'center'
   ctx.textBaseline = 'middle'
 
-  // Title
-  const nameFontPx = Math.round(size * 0.08) // ~8% of canvas height
-  const distanceFontPx = Math.round(size * 0.06) // ~6% of canvas height
+  // Title with visual scale applied
+  const nameFontPx = Math.round(size * 0.08 * visualScale) // ~8% of canvas height, scaled
+  const distanceFontPx = Math.round(size * 0.06 * visualScale) // ~6% of canvas height, scaled
   ctx.font = `bold ${nameFontPx}px mojangles`
-  ctx.lineWidth = Math.max(2, Math.round(3 * scale))
+  ctx.lineWidth = Math.max(2, Math.round(3 * scale * visualScale))
   const nameY = Math.round(size * WAYPOINT_CONFIG.LAYOUT.NAME_Y)
 
   ctx.strokeStyle = 'black'
   ctx.strokeText(id, centerX, nameY)
   ctx.fillStyle = 'white'
   ctx.fillText(id, centerX, nameY)
 
-  // Distance
+  // Distance with visual scale applied
   ctx.font = `bold ${distanceFontPx}px mojangles`
-  ctx.lineWidth = Math.max(2, Math.round(2 * scale))
+  ctx.lineWidth = Math.max(2, Math.round(2 * scale * visualScale))
   const distanceY = Math.round(size * WAYPOINT_CONFIG.LAYOUT.DISTANCE_Y)
 
   ctx.strokeStyle = 'black'
@@ -401,8 +422,8 @@ function drawCombinedCanvas (color: number, id: string, distance: string): HTMLC
   return canvas
 }
 
-function createCombinedSprite (color: number, id: string, distance: string, depthTest: boolean): THREE.Sprite {
-  const canvas = drawCombinedCanvas(color, id, distance)
+function createCombinedSprite (color: number, id: string, distance: string, depthTest: boolean, visualScale = 1): THREE.Sprite {
+  const canvas = drawCombinedCanvas(color, id, distance, visualScale)
   const texture = new THREE.CanvasTexture(canvas)
   texture.anisotropy = 1
   texture.magFilter = THREE.LinearFilter

renderer/viewer/three/waypointSprite.ts

@@ -47,6 +47,8 @@ export class WorldRendererThree extends WorldRendererCommon {
   entities = new Entities(this)
   cameraGroupVr?: THREE.Object3D
   material = new THREE.MeshLambertMaterial({ vertexColors: true, transparent: true, alphaTest: 0.1 })
+  // Separate material for semi-transparent blocks (like stained glass) - disables depth write for correct alpha blending
+  transparentMaterial = new THREE.MeshLambertMaterial({ vertexColors: true, transparent: true, alphaTest: 0.1, depthWrite: false })
   itemsTexture: THREE.Texture
   cursorBlock: CursorBlock
   onRender: Array<() => void> = []
@@ -241,6 +243,7 @@ export class WorldRendererThree extends WorldRendererCommon {
     texture.needsUpdate = true
     texture.flipY = false
     this.material.map = texture
+    this.transparentMaterial.map = texture
 
     const itemsTexture = loadThreeJsTextureFromBitmap(resources.itemsAtlasImage)
     itemsTexture.needsUpdate = true
@@ -415,7 +418,24 @@ export class WorldRendererThree extends WorldRendererCommon {
     geometry.setAttribute('uv', new THREE.BufferAttribute(data.geometry.uvs, 2))
     geometry.index = new THREE.BufferAttribute(data.geometry.indices as Uint32Array | Uint16Array, 1)
 
-    const mesh = new THREE.Mesh(geometry, this.material)
+    // Use draw groups to separate opaque and transparent geometry for proper alpha blending
+    const { transparentIndicesStart } = data.geometry
+    const totalIndices = data.geometry.indices.length
+    const hasTransparent = transparentIndicesStart < totalIndices
+
+    let mesh: THREE.Mesh
+    if (hasTransparent && transparentIndicesStart > 0) {
+      // Both opaque and transparent geometry - use multi-material with groups
+      geometry.addGroup(0, transparentIndicesStart, 0) // Opaque group
+      geometry.addGroup(transparentIndicesStart, totalIndices - transparentIndicesStart, 1) // Transparent group
+      mesh = new THREE.Mesh(geometry, [this.material, this.transparentMaterial])
+    } else if (hasTransparent) {
+      // Only transparent geometry
+      mesh = new THREE.Mesh(geometry, this.transparentMaterial)
+    } else {
+      // Only opaque geometry
+      mesh = new THREE.Mesh(geometry, this.material)
+    }
     mesh.position.set(data.geometry.sx, data.geometry.sy, data.geometry.sz)
     mesh.name = 'mesh'
     object = new THREE.Group()