Fix installer and add a "--dist" option.

Author: Fox2Code

loader/src/main/java/com/fox2code/foxloader/installer/InstallerGUI.java

@@ -264,6 +264,14 @@ public void installMineCraft() {
     }
 
     public void extractMMCInstance() {
+        String fileName = Main.currentInstallerFile.getName();
+        if (fileName.endsWith("-installer.jar")) {
+            fileName = fileName.replace("-installer.jar", ".jar");
+        }
+        this.extractMMCInstance(fileName);
+    }
+
+    public void extractMMCInstance(String baseFileName) {
         if (this.checkInstaller(true)) {
             return;
         }
@@ -272,9 +280,8 @@ public void extractMMCInstance() {
             privateDevBuildSlimJarInput = DependencyHelper.getLocalSlimReIndevJarFile();
         }
 
-        String fileName = Main.currentInstallerFile.getName();
         File instanceDest = new File(Main.currentInstallerFile.getParentFile(),
-                fileName.substring(0, fileName.length() - 4) + "-mmc.zip");
+                baseFileName.substring(0, baseFileName.length() - 4) + "-mmc.zip");
         try (ZipOutputStream zipOutputStream = new ZipOutputStream(Files.newOutputStream(instanceDest.toPath()))) {
             zipOutputStream.putNextEntry(new ZipEntry("libraries/foxloader-" + BuildConfig.FOXLOADER_VERSION + ".jar"));
             copyCloseIn(Files.newInputStream(Main.currentInstallerFile.toPath()), zipOutputStream);
@@ -287,7 +294,7 @@ public void extractMMCInstance() {
             ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
             for (String entry : new String[]{"patches/com.fox2code.foxloader.json",
                     "patches/net.minecraft.json", "patches/net.minecraftforge.json",
-                    "instance.cfg", "mmc-pack.json"}) {
+                    "patches/org.lwjgl.json", "instance.cfg", "mmc-pack.json"}) {
                 zipOutputStream.putNextEntry(new ZipEntry(entry));
                 byteArrayOutputStream.reset();
                 IOUtils.copyAndClose(InstallerGUI.class.getResourceAsStream(

loader/src/main/java/com/fox2code/foxloader/installer/Main.java

@@ -7,6 +7,7 @@
 import java.awt.*;
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
 import java.util.Arrays;
 import java.util.Locale;
 
@@ -19,6 +20,7 @@ public static void main(String[] args) throws Throwable {
         }
         boolean platform = false;
         boolean update = false;
+        boolean dist = false;
         if (args.length >= 1) {
             boolean server = false;
             boolean nogui = false;
@@ -41,11 +43,30 @@ public static void main(String[] args) throws Throwable {
                 case "--server":
                     server = true;
                     break;
+                case "--dist":
+                    dist = true;
+                    break;
                 default:
                     System.out.println("Unknown argument: " + args[0]);
                     return;
             }
 
+            if (dist) {
+                String installerName = currentInstallerFile.getName();
+                InstallerGUI installerGUI = new InstallerGUI(InstallerPlatform.DEFAULT, LauncherType.MMC_LIKE);
+                if (installerName.startsWith("loader-") && !installerName.endsWith("-installer.jar")) {
+                    File newName = new File("fox" + installerName.substring(
+                            0, installerName.length() - 3) + "-installer.jar");
+                    if (!newName.exists()) {
+                        Files.copy(currentInstallerFile.toPath(), newName.toPath());
+                    }
+                    installerGUI.extractMMCInstance("fox" + installerName);
+                } else {
+                    installerGUI.extractMMCInstance();
+                }
+                return;
+            }
+
             if (server) {
                 if (nogui) {
                     ServerMain.main(new String[]{"nogui"});