Re-enable --server and --port on patched 1.15.2 builds. (dscalzi#74)

Author: dscalzi

app/assets/js/assetguard.js

@@ -194,6 +194,26 @@ class Util {
         }
     }
 
+    static isAutoconnectBroken(forgeVersion) {
+
+        const forgeVer = forgeVersion.split('-')[1]
+
+        const minWorking = [31, 2, 15]
+        const verSplit = forgeVer.split('.').map(v => Number(v))
+
+        if(verSplit[0] === 31) {
+            for(let i=0; i<minWorking.length; i++) {
+                if(verSplit[i] > minWorking[i]) {
+                    return false
+                } else if(verSplit[i] < minWorking[i]) {
+                    return true
+                }
+            }
+        }
+
+        return false
+    }
+
 }
 
 

app/assets/js/processbuilder.js

@@ -474,11 +474,20 @@ class ProcessBuilder {
         }
 
         // Autoconnect
-        if(Util.mcVersionAtLeast('1.15', this.server.getMinecraftVersion())) {
-            logger.error('Server autoconnect disabled on 1.15+ due to OpenGL Stack Overflow issue.')
+        let isAutoconnectBroken
+        try {
+            isAutoconnectBroken = Util.isAutoconnectBroken(this.forgeData.id.split('-')[2])
+        } catch(err) {
+            logger.error('Forge version format changed.. assuming autoconnect works.')
+        }
+
+        if(isAutoconnectBroken) {
+            logger.error('Server autoconnect disabled on Forge 1.15.2 for builds earlier than 31.2.15 due to OpenGL Stack Overflow issue.')
+            logger.error('Please upgrade your Forge version to at least 31.2.15!')
         } else {
             this._processAutoConnectArg(args)
         }
+        
 
         // Forge Specific Arguments
         args = args.concat(this.forgeData.arguments.game)

package-lock.json

@@ -41,7 +41,7 @@
   },
   "devDependencies": {
     "cross-env": "^7.0.2",
-    "electron": "^9.0.3",
+    "electron": "^9.0.4",
     "electron-builder": "^22.7.0",
     "eslint": "^7.2.0"
   },