Patching launchwrapperTM

Author: Cubxity

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>cc.hyperium.installer</groupId>
     <artifactId>Installer</artifactId>
-    <version>1.2</version>
+    <version>1.3</version>
 
     <properties>
         <kotlin.version>1.2.50</kotlin.version>
@@ -129,6 +129,18 @@
             <artifactId>guava</artifactId>
             <version>17.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.github.Cubxity</groupId>
+            <artifactId>LaunchWrapperPatcher</artifactId>
+            <version>81f509b36c</version>
+        </dependency>
     </dependencies>
 
+    <repositories>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
+    </repositories>
+
 </project>

src/main/java/cc/hyperium/installer/api/Installer.java

@@ -14,6 +14,7 @@
 import com.google.common.io.Files;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonPrimitive;
+import me.cubxity.asm.LaunchWrapperPatcher;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;
@@ -32,7 +33,7 @@
  * Created by Cubxity on 06/07/2018
  */
 public class Installer {
-    public static final int API_VERSION = 1;
+    public static final int API_VERSION = 2;
 
     private final InstallerConfig config;
 
@@ -257,6 +258,34 @@ public void install() {
                 return;
             }
 
+            File launchWrapper = new File(libraries, "net" + sep + "minecraft" + sep + "launchwrapper" + sep + "1.7" + sep + "launchwrapper-1.7.jar");
+            launchWrapper.getParentFile().mkdirs();
+            if (!launchWrapper.exists()) {
+                phrase = Phrase.DOWNLOAD_LAUNCHER;
+                try {
+                    DownloadTask dl = new DownloadTask("https://libraries.minecraft.net/net/minecraft/launchwrapper/1.7/launchwrapper-1.7.jar", launchWrapper.getParentFile().getAbsolutePath());
+                    dl.addPropertyChangeListener(evt -> {
+                        if (evt.getNewValue() instanceof Integer)
+                            callback.accept(new StatusCallback(Phrase.DOWNLOAD_COMPONENTS, "Downloading LaunchWrapper (" + evt.getNewValue() + "%)", null));
+                    });
+                    dl.execute();
+                    dl.get();
+                } catch (Exception ex) {
+                    callback.accept(new ErrorCallback(ex, phrase, "Failed to download LaunchWrapper, " + ex.getMessage()));
+                    return;
+                }
+            }
+
+            File customLaunchWrapper = new File(launchWrapper.getParentFile().getParentFile(), "Hyperium" + sep + "launchwrapper-Hyperium.jar");
+            customLaunchWrapper.getParentFile().mkdir();
+            phrase = Phrase.PATCH_LAUNCHER;
+            try {
+                LaunchWrapperPatcher.patch(launchWrapper, "cc/hyperium/utils/CrashHandler", "handle", "(Ljava/lang/Exception;)V", customLaunchWrapper);
+            } catch (Exception ex) {
+                callback.accept(new ErrorCallback(ex, phrase, "Failed to patch LaunchWrapper: " + ex.getMessage()));
+                return;
+            }
+
             phrase = Phrase.CREATE_PROFILE;
             callback.accept(new StatusCallback(phrase, "Creating profile", null));
             if (mmc) {
@@ -350,7 +379,8 @@ public void install() {
                 );
                 libs.add(
                         new JsonHolder()
-                                .put("name", "net.minecraft:launchwrapper:1.7")
+                                .put("name", "net.minecraft:launchwrapper:Hyperium")
+                                .put("MMC-hint", "local")
                                 .getObject()
                 );
                 if (of)
@@ -397,7 +427,7 @@ public void install() {
                 lib.put("name", config.getVersion().getName().equals("LOCAL") ? "cc.hyperium:Hyperium:LOCAL" : config.getVersion().getArtifactId());
                 JsonArray libs = json.optJSONArray("libraries");
                 libs.add(lib.getObject());
-                libs.add(new JsonHolder().put("name", "net.minecraft:launchwrapper:1.7").getObject());
+                libs.add(new JsonHolder().put("name", "net.minecraft:launchwrapper:Hyperium").getObject());
                 if (of)
                     libs.add(new JsonHolder().put("name", "optifine:OptiFine:1.8.9_HD_U_I7").getObject());
                 json.put("libraries", libs);

src/main/java/cc/hyperium/installer/api/callbacks/Phrase.java

@@ -45,12 +45,25 @@ public enum Phrase {
      */
     PATCH_OPTIFINE,
 
+    /**
+     * @since 1.3
+     *
+     * When it's downloading launchwrapper
+     */
+    DOWNLOAD_LAUNCHER,
+
+    /**
+     * @since 1.3
+     *
+     * When it's patching launchwrapper
+     */
+    PATCH_LAUNCHER,
+
     /**
      * When it's creating launcher profile
      */
     CREATE_PROFILE,
 
-
     /**
      * When installation has finished
      */