Refresh launcher path/OS handling for current Minecraft binaries and Windows support

README.md

@@ -3,5 +3,5 @@ Replacement for the Gameband Launcher
 This project is an open source replacement of the Gameband + Minecraft launcher.
 
 # Status
-So far it can launch the minecraft launcher on macOS. 
+So far it can launch the Minecraft launcher on macOS and Windows.
 At some point a PixelForge replacement will be implemented, though this requires some reverse engineering effort.

build.gradle

@@ -60,7 +60,7 @@ publishing {
 }
 
 task nativePackage(type: PackageTask, dependsOn: build) {
-    mainClass = 'org.opengameband.OpenGameband'
+    mainClass = 'org.opengameband.Main'
     bundleJre = true
     generateInstaller = false
     administratorRequired = false

src/main/java/org/opengameband/exceptions/LauncherFailiure.java

@@ -4,4 +4,12 @@ public class LauncherFailiure extends Exception {
     public LauncherFailiure() {
         super();
     }
+
+    public LauncherFailiure(String message) {
+        super(message);
+    }
+
+    public LauncherFailiure(Throwable cause) {
+        super(cause);
+    }
 }

src/main/java/org/opengameband/launcher/BasicLauncher.java

@@ -8,6 +8,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.Objects;
@@ -26,20 +27,29 @@ public BasicLauncher() {
 
     @Override
     public void start() throws LauncherFailiure {
+        File installDir = getInstallDir();
+        File gameDataDir = getGameDataDir();
+        if (installDir == null || gameDataDir == null) {
+            throw new LauncherFailiure("Launcher directories are not available");
+        }
         try {
-            switch (System.getProperty("os.name").split(" ")[0]) {
+            switch (getOsFamily()) {
                 case "Mac": {
-                    Runtime.getRuntime().exec(new String[]{GetMountPoint().getAbsolutePath() + "/Launchers/Official/Minecraft.app/Contents/MacOS/launcher",
+                    Runtime.getRuntime().exec(new String[]{new File(installDir, "Contents/MacOS/launcher").getAbsolutePath(),
                             "--workDir", getGameDataDir().getAbsolutePath()});
+                    break;
                 }
                 case "Windows": {
-                    Runtime.getRuntime().exec(new String[]{getInstallDir().getAbsolutePath() + "\\Minecraft.exe",
+                    Runtime.getRuntime().exec(new String[]{new File(installDir, "Minecraft.exe").getAbsolutePath(),
                             "--workDir", getGameDataDir().getAbsolutePath()});
+                    break;
                 }
+                default:
+                    throw new LauncherFailiure("Unsupported OS: " + System.getProperty("os.name"));
             }
         } catch (IOException e) {
             System.err.println(e.getMessage());
-            throw new LauncherFailiure();
+            throw new LauncherFailiure(e);
         }
     }
 
@@ -61,7 +71,7 @@ public void install() {
     }
 
     private void extract(String file) {
-        switch (System.getProperty("os.name").split(" ")[0]) {
+        switch (getOsFamily()) {
             case "Mac":
                 try {
                     Process p = Runtime.getRuntime().exec("hdiutil attach " + file);
@@ -79,12 +89,14 @@ private void extract(String file) {
                 break;
             case "Linux":
                 throw new RuntimeException("Not Yet Implemented");
+            default:
+                break;
         }
     }
 
     @Override
     public File getLauncherDir() {
-        return new File(GetMountPoint(), "/Launchers/Official");
+        return Path.of(GetMountPoint().getAbsolutePath(), "Launchers", "Official").toFile();
     }
 
     /**
@@ -93,11 +105,11 @@ public File getLauncherDir() {
     @Override
     public File getInstallDir() {
         if (GetMountPoint().exists() && GetMountPoint().isDirectory() && GetMountPoint().canRead()) {
-            switch (System.getProperty("os.name").split(" ")[0]) {
+            switch (getOsFamily()) {
                 case "Windows":
-                    return new File(getLauncherDir(), "\\win");
+                    return new File(getLauncherDir(), "win");
                 case "Mac":
-                    return new File(GetMountPoint(), "/Launchers/Official/Minecraft.app");
+                    return new File(getLauncherDir(), "Minecraft.app");
             }
         }
         return null;
@@ -106,13 +118,29 @@ public File getInstallDir() {
     @Override
     public File getGameDataDir() {
         if (GetMountPoint().exists() && GetMountPoint().isDirectory()) {
-            return new File(GetMountPoint(), "/Launchers/Official/Game");
+            return new File(getLauncherDir(), "Game");
         }
         return null;
     }
 
     @Override
     public boolean isInstalled() {
-        return getInstallDir().exists() && getInstallDir().listFiles().length > 0;
+        File installDir = getInstallDir();
+        File[] installFiles = installDir == null ? null : installDir.listFiles();
+        return installDir != null && installDir.exists() && installFiles != null && installFiles.length > 0;
+    }
+
+    private String getOsFamily() {
+        String os = System.getProperty("os.name", "").toLowerCase();
+        if (os.contains("win")) {
+            return "Windows";
+        }
+        if (os.contains("mac")) {
+            return "Mac";
+        }
+        if (os.contains("linux")) {
+            return "Linux";
+        }
+        return "Unknown";
     }
 }

src/main/java/org/opengameband/util/DownloadURLs.java

@@ -4,9 +4,9 @@
  * @author Zaprit
  */
 public enum DownloadURLs {
-    MAC("https://launcher.mojang.com/download/Minecraft.dmg", "/Minecraft.dmg"),
-    LIN("https://launcher.mojang.com/download/Minecraft.tar.gz", "/Minecraft.tar.gz"),
-    WIN("https://launcher.mojang.com/download/Minecraft.exe", "\\Minecraft.exe");
+    MAC("https://launcher.mojang.com/download/Minecraft.dmg", "Minecraft.dmg"),
+    LIN("https://launcher.mojang.com/download/Minecraft.tar.gz", "Minecraft.tar.gz"),
+    WIN("https://launcher.mojang.com/download/Minecraft.exe", "Minecraft.exe");
 
     private String url;
     private String file;

src/main/java/org/opengameband/util/MountPoint.java

@@ -1,6 +1,7 @@
 package org.opengameband.util;
 
 import java.io.File;
+import java.net.URISyntaxException;
 
 /**
  * @author Zaprit
@@ -14,6 +15,14 @@ public MountPoint() {
      * TODO: Add the ability to change this as it may be needed later
      */
     public static File GetMountPoint(){
-        return new File(MountPoint.class.getProtectionDomain().getCodeSource().getLocation().getPath());
+        try {
+            File codeSourceLocation = new File(MountPoint.class.getProtectionDomain().getCodeSource().getLocation().toURI());
+            if (codeSourceLocation.isFile()) {
+                return codeSourceLocation.getParentFile();
+            }
+            return codeSourceLocation;
+        } catch (URISyntaxException e) {
+            return new File(MountPoint.class.getProtectionDomain().getCodeSource().getLocation().getPath());
+        }
     }
 }