Fixed HMCL-dev#68

huanghongxun · huanghongxun · commit 75c4a24cbd24 · 2016-05-10T13:24:06.000+08:00
diff --git a/HMCL/obfuscate_2.3.3.map b/HMCL/obfuscate_2.3.3.map
diff --git a/HMCL/obfuscate_2.3.4.map b/HMCL/obfuscate_2.3.4.map
diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/OptiFineInstaller.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/optifine/OptiFineInstaller.java
@@ -72,7 +72,8 @@ public void executeTask() throws Exception {
                     mv.mainClass = "net.minecraft.launchwrapper.Launch";
                     mv.libraries.add(1, new MinecraftLibrary("net.minecraft:launchwrapper:1.7"));
                 }
-                mv.minecraftArguments += " --tweakClass optifine.OptiFineTweaker";
+                if (!mv.minecraftArguments.contains("FMLTweaker"))
+                    mv.minecraftArguments += " --tweakClass optifine.OptiFineTweaker";
             }
         }
         File loc = new File(service.baseDirectory(), "versions/" + mv.id);
diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/GameLauncher.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/launch/GameLauncher.java
@@ -120,7 +120,7 @@ public IMinecraftLoader makeLaunchCommand() throws AuthenticationException, Game
      *
      * @throws IOException failed creating process
      */
-    public void launch(List str) throws IOException {
+    public void launch(List<String> str) throws IOException {
         if (!service.version().onLaunch(options.getLaunchVersion()))
             return;
         if (StrUtils.isNotBlank(options.getPrecalledCommand())) {
@@ -133,6 +133,7 @@ public void launch(List str) throws IOException {
             }
         }
         HMCLog.log("Starting process");
+        HMCLog.log(str.toString());
         ProcessBuilder builder = new ProcessBuilder(str);
         if (options.getLaunchVersion() == null || service.baseDirectory() == null)
             throw new Error("Fucking bug!");
diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersion.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersion.java
@@ -121,7 +121,7 @@ protected MinecraftVersion resolve(IMinecraftProvider provider, Set<String> reso
             this.assets != null ? this.assets : parent.assets,
             this.jar != null ? this.jar : parent.jar,
             null, this.runDir, parent.minimumLauncherVersion,
-            this.libraries != null ? ArrayUtils.merge(this.libraries, parent.libraries) : parent.libraries, this.hidden,
+            this.libraries != null ? ArrayUtils.merge(parent.libraries, this.libraries) : parent.libraries, this.hidden,
             this.downloads != null ? this.downloads : parent.downloads,
             this.assetIndex != null ? this.assetIndex : parent.assetIndex);
 
diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/StrUtils.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/StrUtils.java
@@ -184,7 +184,7 @@ else if (param.getClass().isArray()) {
         return sb.toString();
     }
 
-    public static boolean isEquals(String base, String to) {
+    public static boolean equals(String base, String to) {
         if (base == null)
             return (to == null);
         else
@@ -240,4 +240,14 @@ public static String getStackTrace(Throwable t) {
         t.printStackTrace(writer);
         return trace.toString();
     }
+
+    public static List<Integer> findAllPos(String t, String p) {
+        ArrayList<Integer> ret = new ArrayList<>();
+        int i = 0, index;
+        while ((index = t.indexOf(p, i)) != -1) {
+            ret.add(index);
+            i = index + p.length();
+        }
+        return ret;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,8 @@ public void executeTask() throws Exception {`
`72`	`72`	`mv.mainClass = "net.minecraft.launchwrapper.Launch";`
`73`	`73`	`mv.libraries.add(1, new MinecraftLibrary("net.minecraft:launchwrapper:1.7"));`
`74`	`74`	`}`
`75`		`- mv.minecraftArguments += " --tweakClass optifine.OptiFineTweaker";`
	`75`	`+ if (!mv.minecraftArguments.contains("FMLTweaker"))`
	`76`	`+ mv.minecraftArguments += " --tweakClass optifine.OptiFineTweaker";`
`76`	`77`	`}`
`77`	`78`	`}`
`78`	`79`	`File loc = new File(service.baseDirectory(), "versions/" + mv.id);`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ public IMinecraftLoader makeLaunchCommand() throws AuthenticationException, Game`
`120`	`120`	`*`
`121`	`121`	`* @throws IOException failed creating process`
`122`	`122`	`*/`
`123`		`- public void launch(List str) throws IOException {`
	`123`	`+ public void launch(List<String> str) throws IOException {`
`124`	`124`	`if (!service.version().onLaunch(options.getLaunchVersion()))`
`125`	`125`	`return;`
`126`	`126`	`if (StrUtils.isNotBlank(options.getPrecalledCommand())) {`
`@@ -133,6 +133,7 @@ public void launch(List str) throws IOException {`
`133`	`133`	`}`
`134`	`134`	`}`
`135`	`135`	`HMCLog.log("Starting process");`
	`136`	`+ HMCLog.log(str.toString());`
`136`	`137`	`ProcessBuilder builder = new ProcessBuilder(str);`
`137`	`138`	`if (options.getLaunchVersion() == null \|\| service.baseDirectory() == null)`
`138`	`139`	`throw new Error("Fucking bug!");`