Use PrismarineJS docs for bedrock

Author: FreezeEngine

html/mainPage/index.html

@@ -140,7 +140,7 @@ <h3>Scripting (beta)</h3>
     <div class="split" id="sidebar">
         <div class="toolbar tab">
             <button class="tab-button tablinks-rightpanel active" onclick="openMenu(event, 'tree', '-rightpanel')">Data</button>
-            <button class="tab-button tablinks-rightpanel" id="wiki-button" onclick="openMenu(event, 'wikivg', '-rightpanel'); scrollWikiToCurrentPacket()">wiki.vg</button>
+            <button class="tab-button tablinks-rightpanel" id="wiki-button" onclick="openMenu(event, 'wikivg', '-rightpanel'); scrollWikiToCurrentPacket()">Docs</button>
             <button class="tab-button tablinks-rightpanel" onclick="openMenu(event, 'hex', '-rightpanel'); scrollWikiToCurrentPacket()">Hex view</button>
         </div>
         <div class="box" id="sidebar-box">

html/mainPage/js/main.js

@@ -562,9 +562,30 @@ var clusterize = new Clusterize({
 })
 
 // TODO: move to own file?
+const isPrismarineDocs = (url) => url && url.includes('prismarinejs.github.io/minecraft-data')
+
 async function fillWiki () {
-  let data = (await axios.get(sharedVars.proxyCapabilities.wikiVgPage)).data
-// Allow it to load properly
+  const wikiUrl = sharedVars.proxyCapabilities.wikiVgPage
+
+  if (isPrismarineDocs(wikiUrl)) {
+    const iframe = document.getElementById('iframe')
+    iframe.src = wikiUrl
+
+    const style = document.createElement('style')
+    style.id = 'wiki-iframe-style'
+    style.innerHTML = `
+      #iframe::-webkit-scrollbar { width: 17px; }
+      #iframe::-webkit-scrollbar-thumb { background: rgba(0, 0, 0, 0.3); border-radius: 10px; }
+      #iframe::-webkit-scrollbar-track { background: rgba(0, 0, 0, 0.2); border-radius: 10px; }
+      #iframe::-webkit-scrollbar-thumb:hover { background: rgba(0, 0, 0, 0.5); }
+      #iframe::-webkit-scrollbar-corner { background: #242424; }
+    `
+    document.head.appendChild(style)
+    return
+  }
+
+  // wiki.vg (Java): fetch HTML and inject
+  let data = (await axios.get(wikiUrl)).data
   data = data
     .split('/images/')
     .join('https://wiki.vg/images/')
@@ -573,7 +594,6 @@ async function fillWiki () {
     .split('/load.php?')
     .join('https://wiki.vg/load.php?')
 
-  // TODO: Break or modify links?
   document.getElementById('iframe').contentWindow.document.write(data)
 
   const style = document.createElement('style');
@@ -654,13 +674,26 @@ function scrollIdIntoView (id, bound) {
 }
 
 function scrollWikiToCurrentPacket () {
-  if (currentPacket) {
-    const packet = sharedVars.allPackets[currentPacket]
+  if (!currentPacket) return
+  const packet = sharedVars.allPackets[currentPacket]
+  const wikiUrl = sharedVars.proxyCapabilities.wikiVgPage
+
+  if (isPrismarineDocs(wikiUrl)) {
+    const baseUrl = wikiUrl.split('#')[0]
+    const packetAnchor = 'packet_' + (packet.meta.name || '')
+    const iframe = document.getElementById('iframe')
     try {
-      scrollIdIntoView(packet.hexIdString, packet.direction)
+      iframe.contentWindow.location = baseUrl + '#' + packetAnchor
     } catch (err) {
-      console.error(err);
+      console.error(err)
     }
+    return
+  }
+
+  try {
+    scrollIdIntoView(packet.hexIdString, packet.direction)
+  } catch (err) {
+    console.error(err)
   }
 }
 

src/proxy/bedrock/proxy.js

@@ -4,8 +4,8 @@ const minecraftFolder = require("minecraft-folder-path");
 
 let scriptingEnabled = false
 
-// http://prismarinejs.github.io/minecraft-data/?v=bedrock_1.19.62&d=protocol#packet_server_to_client_handshake
-// http://prismarinejs.github.io/minecraft-data/?v=bedrock_[VERSION]&d=protocol#[PACKET]
+// https://prismarinejs.github.io/minecraft-data/?v=bedrock_{VERSION}&d=protocol#packet_{packet_name}
+// Example: https://prismarinejs.github.io/minecraft-data/?v=bedrock_1.21.130&d=protocol#packet_correct_player_move_prediction
 
 exports.capabilities = {
   modifyPackets: true,
@@ -14,7 +14,7 @@ exports.capabilities = {
   scriptingSupport: true,
   clientboundPackets: {},
   serverboundPackets: {},
-  wikiVgPage: 'https://wiki.vg/Bedrock_Protocol',
+  wikiVgPage: undefined, // Set in startProxy with version-specific prismarinejs URL
   versionId: undefined
 }
 
@@ -81,8 +81,7 @@ exports.startProxy = function (passedHost, passedPort, passedListenPort, version
   exports.capabilities.clientboundPackets = toClientMappings
   exports.capabilities.serverboundPackets = toServerMappings
 
-  // TODO: minecraft-data docs should replace wikiVgPage
-  //exports.capabilities.wikiVgPage = "http://prismarinejs.github.io/minecraft-data/?v=bedrock_{VERSION}&d=protocol".replace("{VERSION}", version)
+  exports.capabilities.wikiVgPage = 'https://prismarinejs.github.io/minecraft-data/?v=bedrock_' + version + '&d=protocol'
 
   exports.capabilities.versionId = 'node-bedrock-protocol-' + version.split('.').join('-')