fix: sc2 version is no longer hardcoded to most recent version (#76)

This change uses GAME_EXE_PATH config value, which is set by first checking for the author's inputted path from setProcessPath() or "-e=<processPath>" command line argument, and defaults to path of the newest version otherwise if those aren't set. Co-authored-by: ketroc <[email protected]>
ocraft · Jul 21, 2024 · dd65981 · dd65981
1 parent 4c4c5ba
commit dd65981
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/...2client-api/src/main/java/com/github/ocraft/s2client/api/controller/ExecutableParser.java b/...2client-api/src/main/java/com/github/ocraft/s2client/api/controller/ExecutableParser.java
@@ -73,11 +73,7 @@ public static Map<String, Object> loadSettings(
         try {
             Map<String, Object> executableConfig = new HashMap<>();
 
-            if (customPath == null) {
-                executableConfig.put(GAME_EXE_PATH, findExecutablePath().toString());
-            } else {
-                executableConfig.put(GAME_EXE_PATH, customPath);
-            }
+            executableConfig.put(GAME_EXE_PATH, customPath == null ? findExecutablePath().toString() : customPath);
 
             Path executablePath = Paths.get((String) executableConfig.get(GAME_EXE_PATH));
 
@@ -106,7 +102,7 @@ public static Map<String, Object> loadSettings(
             String baseBuild = customBaseBuild;
 
             if (!isSet(baseBuild)) {
-                baseBuild = toNewestBaseBuild(exeFile).apply(gamePath.resolve(VERSIONS_DIR));
+                baseBuild = getBaseBuildFromGameExePath((String) executableConfig.get(GAME_EXE_PATH));
             }
 
             executableConfig.put(GAME_EXE_BUILD, baseBuild);
@@ -126,6 +122,16 @@ public static Map<String, Object> loadSettings(
         }
     }
 
+    private static String getBaseBuildFromGameExePath(String gameExePath) {
+        String[] dirTree = gameExePath.split("\\\\");
+        for (String dir : dirTree) {
+            if (dir.startsWith("Base")) {
+                return dir;
+            }
+        }
+        return null;
+    }
+
     private static Path findExecutablePath() {
         Path executeInfoPath = resolveExecuteInfoPath().filter(Files::exists).orElseThrow(required(EXECUTE_INFO));
         try (Stream<String> lines = Files.lines(executeInfoPath)) {

diff --git a/...ft-s2client-api/src/main/java/com/github/ocraft/s2client/api/controller/S2Controller.java b/...ft-s2client-api/src/main/java/com/github/ocraft/s2client/api/controller/S2Controller.java
@@ -210,12 +210,7 @@ private S2Controller launch() {
         log.info("Launching Starcraft II with configuration: {}.", cfg);
         try {
             Path gameRoot = Paths.get(cfg.getString(GAME_EXE_ROOT));
-            String exeFile = gameRoot
-                    .resolve(Paths.get(
-                            ExecutableParser.VERSIONS_DIR,
-                            cfg.getString(GAME_EXE_BUILD),
-                            cfg.getString(GAME_EXE_FILE)))
-                    .toString();
+            String exeFile = cfg.getString(GAME_EXE_PATH);
 
             List<String> args = new ArrayList<>();
             args.add(exeFile);

diff --git a/ocraft-s2client-api/src/test/java/com/github/ocraft/s2client/api/Fixtures.java b/ocraft-s2client-api/src/test/java/com/github/ocraft/s2client/api/Fixtures.java
@@ -65,7 +65,7 @@ public class Fixtures {
     public static final int CFG_NET_PORT = 5000;
     public static final String CFG_EXE_BUILD_NEW = "Base58400";
     public static final String CFG_EXE_BUILD_OLD = "Base55958";
-    public static final String CFG_EXE_DATA_VER = "2B06AEE58017A7DF2A3D452D733F1019";
+    public static final String CFG_EXE_DATA_VER = "5BD7C31B44525DAB46E64C4602A81DC2";
     public static final String GAME_DIR = "Starcraft II";
     public static final int CFG_WINDOW_W = 1024;
     public static final int CFG_WINDOW_H = 768;

diff --git a/...2client-api/src/test/java/com/github/ocraft/s2client/api/controller/S2ControllerTest.java b/...2client-api/src/test/java/com/github/ocraft/s2client/api/controller/S2ControllerTest.java
@@ -93,7 +93,7 @@ private Config expectedConfiguration() {
                 entry(GAME_NET_RETRY_COUNT, 10),
                 entry(GAME_EXE_ROOT, gameRoot.toString()),
                 entry(GAME_EXE_PATH, exePath),
-                entry(GAME_EXE_BUILD, CFG_EXE_BUILD_NEW),
+                entry(GAME_EXE_BUILD, CFG_EXE_BUILD_OLD),
                 entry(GAME_EXE_FILE, CFG_EXE_FILE),
                 entry(GAME_EXE_DATA_VER, CFG_EXE_DATA_VER),
                 entry(GAME_EXE_IS_64, true),