diff --git a/src/main/java/net/moonlightflower/wc3libs/port/JMpqPort.java b/src/main/java/net/moonlightflower/wc3libs/port/JMpqPort.java index 3539ff38..300c6f44 100644 --- a/src/main/java/net/moonlightflower/wc3libs/port/JMpqPort.java +++ b/src/main/java/net/moonlightflower/wc3libs/port/JMpqPort.java @@ -54,8 +54,6 @@ public MpqPort.Out createOut() { public static class In extends MpqPort.In { private void commitJ(@Nonnull Vector mpqFiles) throws IOException { - Vector lines = new Vector<>(); - for (File mpqFile : mpqFiles) { try (JMpqEditor jmpq = new JMpqEditor(mpqFile, MPQOpenOption.FORCE_V0)) { diff --git a/src/main/java/net/moonlightflower/wc3libs/port/win/WinGameExeFinder.java b/src/main/java/net/moonlightflower/wc3libs/port/win/WinGameExeFinder.java index 73b34a12..8aaf4f4c 100644 --- a/src/main/java/net/moonlightflower/wc3libs/port/win/WinGameExeFinder.java +++ b/src/main/java/net/moonlightflower/wc3libs/port/win/WinGameExeFinder.java @@ -16,9 +16,17 @@ public class WinGameExeFinder extends GameExeFinder { public final static File X86_DIR = new File("x86"); public final static File X64_DIR = new File("x86_64"); + public final static File RETAIL_DIR = new File("_retail_"); + + public final static File RETAIL_X86_DIR = new File(RETAIL_DIR, "x86"); + public final static File RETAIL_X64_DIR = new File(RETAIL_DIR, "x86_64"); + public final static File X86_EXE_PATH_131 = new File(X86_DIR, WARCRAFT_III_EXE_PATH.toString()); public final static File X64_EXE_PATH_131 = new File(X64_DIR, WARCRAFT_III_EXE_PATH.toString()); + public final static File X86_EXE_PATH_132 = new File(RETAIL_X86_DIR, WARCRAFT_III_EXE_PATH.toString()); + public final static File X64_EXE_PATH_132 = new File(RETAIL_X64_DIR, WARCRAFT_III_EXE_PATH.toString()); + protected GameExeFinder getRegistryGameExeFinder() { return new WinRegistryGameExeFinder(); } @@ -89,7 +97,9 @@ public static File fromDirIgnoreVersion(@Nonnull File dir, @Nonnull Orient.WinAr FROZEN_THRONE_EXE_PATH, WAR3_EXE_PATH, X86_EXE_PATH_131, - X64_EXE_PATH_131 + X64_EXE_PATH_131, + X86_EXE_PATH_132, + X64_EXE_PATH_132 ); for (File relativeSearchPath : relativeSearchPaths) {