Add online mode support

Heath123 · Dec 4, 2020 · fc85913 · fc85913
1 parent 9d3d6fe
commit fc85913
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 15 deletions.
diff --git a/html/startPage/index.html b/html/startPage/index.html
@@ -85,6 +85,13 @@ <h1 class='title'>pakkit</h1>
         <label for="listen-port">Listen port:</label>
         <input type="text" name="listen-port" id="listen-port" value="25566" placeholder="25566">
       </p>
+      <div id="consent-box" style="display: none;">
+        <br>
+        <p>
+          <label for="consent">Consent</label>
+          <input id="consent" type="checkbox" value="consent"> Allow pakkit to use my auth token from launcher_profiles.json for logging in to online mode servers (can be revoked by pressing F12 and typing <code>localStorage.authConsentGiven = false</code>)
+        </p>
+      </div>
       <br>
       <p>
         <label for="start"></label>

diff --git a/html/startPage/script.js b/html/startPage/script.js
@@ -8,6 +8,10 @@ new customTitlebar.Titlebar({
     backgroundColor: customTitlebar.Color.fromHex('#FFF')
 }); */
 
+if (localStorage.getItem('authConsentGiven') !== 'true') {
+  document.getElementById('consent-box').style.display = 'contents'
+}
+
 var isLoading = false
 
 let connectAddress
@@ -87,7 +91,11 @@ window.startProxy = function (event) {
     connectPort = (connectPort === '') ? '25565' : connectPort
     listenPort = (listenPort === '') ? '25566' : listenPort
   }
+  if (document.getElementById('consent').checked) {
+    localStorage.setItem('authConsentGiven', 'true')
+  }
   ipcRenderer.send('startProxy', JSON.stringify({
+    consent: localStorage.getItem('authConsentGiven') === 'true',
     connectAddress: connectAddress,
     connectPort: connectPort,
     listenPort: listenPort,

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -46,7 +46,8 @@
     "escape-html": "^1.0.3",
     "md5-file": "^5.0.0",
     "minecraft-data": "^2.70.2",
-    "minecraft-protocol": "^1.19.0",
+    "minecraft-folder-path": "^1.1.0",
+    "minecraft-protocol": "github:Heath123/node-minecraft-protocol#ph0t0shop",
     "node-eval": "^2.0.0",
     "source-map-support": "^0.5.19"
   }

diff --git a/src/index.js b/src/index.js
@@ -128,7 +128,7 @@ ipcMain.on('startProxy', (event, arg) => {
     proxy = bedrockProxy
   }
   packetHandler.init(BrowserWindow.getAllWindows()[0], ipcMain, proxy)
-  proxy.startProxy(ipcMessage.connectAddress, ipcMessage.connectPort, ipcMessage.listenPort, ipcMessage.version, packetHandler.packetHandler, dataFolder)
+  proxy.startProxy(ipcMessage.connectAddress, ipcMessage.connectPort, ipcMessage.listenPort, ipcMessage.version, ipcMessage.consent, packetHandler.packetHandler, dataFolder)
   BrowserWindow.getAllWindows()[0].loadFile('html/mainPage/index.html')
 })
 

diff --git a/src/proxy/bedrock/proxy.js b/src/proxy/bedrock/proxy.js
@@ -58,7 +58,7 @@ exports.capabilities = {
   jsonData: false
 }
 
-exports.startProxy = function (host, port, listenPort, version, callback, dataFolder) {
+exports.startProxy = function (host, port, listenPort, version, authConsent, callback, dataFolder) {
   storedCallback = callback
   fs.writeFileSync(dataFolder + '/proxypass/config.yml', `
   proxy:

diff --git a/src/proxy/java/proxy.js b/src/proxy/java/proxy.js
@@ -1,6 +1,7 @@
 // Modified from https://github.com/PrismarineJS/node-minecraft-protocol/blob/master/examples/proxy/proxy.js
 
 const mc = require('minecraft-protocol')
+const minecraftFolder = require('minecraft-folder-path')
 
 const states = mc.states
 
@@ -17,7 +18,7 @@ exports.capabilities = {
   serverboundPackets: []
 }
 
-exports.startProxy = function (host, port, listenPort, version, callback, dataFolder) {
+exports.startProxy = function (host, port, listenPort, version, authConsent, callback, dataFolder) {
   storedCallback = callback
   const mcdata = require('minecraft-data')(version) // Used to get packets, may remove if I find a better way
   toClientMappings = mcdata.protocol.play.toClient.types.packet[1][0].type[1].mappings
@@ -55,12 +56,18 @@ exports.startProxy = function (host, port, listenPort, version, callback, dataFo
       console.log(err.stack)
       if (!endedTargetClient) { targetClient.end('Error') }
     })
+    if (authConsent) {
+      console.log('Will attempt to use launcher_profiles.json for online mode login data')
+    } else {
+      console.warn('Consent not given to use launcher_profiles.json - online mode will not work')
+    }
     const targetClient = mc.createClient({
       host: host,
       port: port,
       username: client.username,
       keepAlive: false,
-      version: version
+      version: version,
+      profilesFolder: authConsent ? minecraftFolder : undefined
     })
     realServer = targetClient
     client.on('packet', function (data, meta) {