Merge remote-tracking branch 'iris/master', release 1.3.0

HyperCubeMC · Nov 14, 2021 · a29015d · a29015d
1 parent 6fd8d07
commit a29015d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Version and packaging info
-version=1.2.5
+version=1.3.0
 maven_group=net.hypercubemc
 archives_base_name=Universe-Installer
 

diff --git a/src/main/java/net/hypercubemc/universe_installer/Installer.java b/src/main/java/net/hypercubemc/universe_installer/Installer.java
@@ -1,7 +1,7 @@
 package net.hypercubemc.universe_installer;
 
-import com.formdev.flatlaf.FlatLightLaf;
 import com.formdev.flatlaf.FlatDarkLaf;
+import com.formdev.flatlaf.FlatLightLaf;
 import net.fabricmc.installer.Main;
 import net.fabricmc.installer.util.MetaHandler;
 import net.fabricmc.installer.util.Reference;
@@ -239,9 +239,9 @@ public void start() {
             String loaderName = useCustomLoader ? "universe-fabric-loader" : "fabric-loader";
 
             try {
-                URL customLoaderVersionUrl = new URL("https://raw.githubusercontent.com/HyperCubeMC/Universe-Installer-Maven/master/latest-loader");
+                URL customLoaderVersionUrl = new URL(MAVEN_URL + "latest-loader");
                 String loaderVersion = useCustomLoader ? Utils.readTextFile(customLoaderVersionUrl) : Main.LOADER_META.getLatestVersion(false).getVersion();
-                boolean success = VanillaLauncherIntegration.installToLauncher(getVanillaGameDir(), getInstallDir(), useCustomLoader ? selectedEdition.displayName : "Fabric Loader " + selectedVersion, selectedVersion, loaderName, loaderVersion, useCustomLoader ? VanillaLauncherIntegration.Icon.UNIVERSE : VanillaLauncherIntegration.Icon.FABRIC);
+                boolean success = VanillaLauncherIntegration.installToLauncher(getVanillaGameDir(), getInstallDir(), useCustomLoader ? selectedEdition.displayName + " for " + selectedVersion : "Fabric Loader " + selectedVersion, selectedVersion, loaderName, loaderVersion, useCustomLoader ? VanillaLauncherIntegration.Icon.UNIVERSE : VanillaLauncherIntegration.Icon.FABRIC);
                 if (!success) {
                     System.out.println("Failed to install to launcher, canceling!");
                     return;
@@ -271,10 +271,10 @@ public void start() {
                         downloader.get();
                     } catch (InterruptedException | ExecutionException e) {
                         System.out.println("Failed to download zip!");
-                        e.getCause().printStackTrace();
+                        e.printStackTrace();
 
                         String msg = String.format("An error occurred while attempting to download the required files, please check your internet connection and try again! \nError: %s",
-                                e.getCause().toString());
+                                e);
                         JOptionPane.showMessageDialog(frame,
                                 msg, "Download Failed!", JOptionPane.ERROR_MESSAGE, null);
                         readyAll();
@@ -287,7 +287,7 @@ public void start() {
                     File installDir = getInstallDir().toFile();
                     if (!installDir.exists() || !installDir.isDirectory()) installDir.mkdirs();
 
-                    File modsFolder = getInstallDir().resolve(useCustomLoader ? "universe-reserved" : "mods").toFile();
+                    File modsFolder = useCustomLoader ? getInstallDir().resolve("universe-reserved").resolve(selectedVersion).toFile() : getInstallDir().resolve("mods").toFile();
                     File[] modsFolderContents = modsFolder.listFiles();
                     if (modsFolderContents != null) {
                         boolean isEmpty = modsFolderContents.length == 0;
@@ -303,7 +303,7 @@ public void start() {
                     }
 
                     if (useCustomLoader) deleteDirectory(modsFolder);
-                    if (!modsFolder.exists() || !modsFolder.isDirectory()) modsFolder.mkdir();
+                    if (!modsFolder.exists() || !modsFolder.isDirectory()) modsFolder.mkdirs();
 
                     boolean installSuccess = installFromPack(getStorageDirectory().resolve("repo").resolve(selectedVersion).resolve(selectedEdition.name).toFile());
                     if (installSuccess) {
@@ -428,7 +428,7 @@ private void installFiles(File[] files) throws IOException {
             String entryPath = getStorageDirectory().resolve("repo").resolve(selectedVersion).resolve(selectedEdition.name).relativize(entry.toPath()).toString();
 
             if (config.shouldUseCustomLoader() && entryPath.startsWith("mods" + File.separator)) {
-                entryPath = entryPath.replace("mods" + File.separator, "universe-reserved" + File.separator);
+                entryPath = entryPath.replace("mods" + File.separator, "universe-reserved" + File.separator + selectedVersion + File.separator);
             }
 
             File filePath = getInstallDir().resolve(entryPath).toFile();

diff --git a/src/main/java/net/hypercubemc/universe_installer/VanillaLauncherIntegration.java b/src/main/java/net/hypercubemc/universe_installer/VanillaLauncherIntegration.java
@@ -30,7 +30,7 @@ public static boolean installToLauncher(Path vanillaGameDir, Path instanceDir, S
     }
 
     public static void installVersion(Path mcDir, String gameVersion, String loaderName, String loaderVersion, ProfileInstaller.LauncherType launcherType) throws IOException {
-        System.out.println("Installing " + gameVersion + " with fabric " + loaderVersion + " to launcher " + launcherType);
+        System.out.println("Installing " + gameVersion + " with loader " + loaderVersion + " to launcher " + launcherType);
         String versionId = String.format("%s-%s-%s", loaderName, loaderVersion, gameVersion);
         Path versionsDir = mcDir.resolve("versions");
         Path profileDir = versionsDir.resolve(versionId);
@@ -49,7 +49,7 @@ public static void installVersion(Path mcDir, String gameVersion, String loaderN
         }
         Utils.writeToFile(profileJsonPath, profileJson.toString());
     }
-    
+
     private static void editVersionJson(Json profileJson) {
         Json.Factory factory = Json.factory();
         Map<String, Json> json = profileJson.asJsonMap();