3.0.1

Author: IMS212

gradle.properties

@@ -2,7 +2,7 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Version and packaging info
-version=3.0.0-pre4
+version=3.0.1
 maven_group=net.hypercubemc
 archives_base_name=Iris-Installer
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/net/hypercubemc/iris_installer/InstallerMeta.java

@@ -58,11 +58,18 @@ public static JSONObject readJsonFromUrl(String url) throws IOException {
 
     public static class Version {
         boolean outdated;
+        boolean snapshot;
         String name;
 
         public Version(HashMap<String, Object> jsonObject) {
             this.name = (String) jsonObject.get("name");
+            this.snapshot = (boolean) jsonObject.get("snapshot");
             this.outdated = (boolean) jsonObject.get("outdated");
         }
+
+        @Override
+        public String toString() {
+            return name;
+        }
     }
 }

src/main/java/net/hypercubemc/iris_installer/NewInstaller.java

@@ -21,10 +21,8 @@
 import java.util.concurrent.ExecutionException;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
-import javax.swing.ImageIcon;
-import javax.swing.JFileChooser;
-import javax.swing.JOptionPane;
-import javax.swing.SwingWorker;
+import javax.swing.*;
+
 import net.fabricmc.installer.Main;
 import net.fabricmc.installer.util.MetaHandler;
 import net.fabricmc.installer.util.Reference;
@@ -36,11 +34,12 @@
  * @author ims
  */
 @SuppressWarnings("serial")
-public class NewInstaller extends javax.swing.JFrame {
+public class NewInstaller extends JFrame {
 
     private static boolean dark = false;
     private boolean installAsMod;
     private String outdatedPlaceholder = "Warning: We have ended support for <version>.";
+    private String snapshotPlaceholder = "Warning: <version> is a snapshot build and may";
     private String BASE_URL = "https://raw.githubusercontent.com/IrisShaders/Iris-Installer-Files/master/";
     private boolean finishedSuccessfulInstall;
     private InstallerMeta.Version selectedVersion;
@@ -231,9 +230,9 @@ private void initComponents() {
 
         setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
         setIconImage(new ImageIcon(Objects.requireNonNull(Utils.class.getClassLoader().getResource("iris_profile_icon.png"))).getImage());
-        setMaximumSize(new java.awt.Dimension(480, 550));
-        setMinimumSize(new java.awt.Dimension(480, 550));
-        setPreferredSize(new java.awt.Dimension(480, 550));
+        setMaximumSize(new java.awt.Dimension(480, 600));
+        setMinimumSize(new java.awt.Dimension(480, 600));
+        setPreferredSize(new java.awt.Dimension(480, 600));
         setResizable(false);
         getContentPane().setLayout(new java.awt.GridBagLayout());
 
@@ -403,8 +402,8 @@ public void mouseClicked(java.awt.event.MouseEvent evt) {
         installButton.setFont(installButton.getFont().deriveFont((float)16));
         installButton.setText("Install");
         installButton.setToolTipText("");
-        installButton.setMargin(new java.awt.Insets(10, 65, 10, 65));
-        installButton.setMaximumSize(new java.awt.Dimension(300, 45));
+        installButton.setMargin(new java.awt.Insets(10, 70, 10, 70));
+        installButton.setMaximumSize(new java.awt.Dimension(320, 45));
         installButton.setMinimumSize(new java.awt.Dimension(173, 45));
         installButton.addMouseListener(new java.awt.event.MouseAdapter() {
             public void mouseClicked(java.awt.event.MouseEvent evt) {
@@ -444,6 +443,13 @@ private void gameVersionListItemStateChanged(java.awt.event.ItemEvent evt) {//GE
                 outdatedText1.setText(outdatedPlaceholder.replace("<version>", selectedVersion.name));
                 betaSelection.setVisible(false);
                 outdatedText1.setVisible(true);
+                outdatedText2.setText("The Iris version you get will most likely be outdated.");
+                outdatedText2.setVisible(true);
+            } else if (selectedVersion.snapshot) {
+                outdatedText1.setText(snapshotPlaceholder.replace("<version>", selectedVersion.name));
+                betaSelection.setVisible(false);
+                outdatedText1.setVisible(true);
+                outdatedText2.setText("lose support at any time.");
                 outdatedText2.setVisible(true);
             } else {
                 if (INSTALLER_META.hasBeta()) {
@@ -471,7 +477,7 @@ private void installButtonMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIR
             String profileName = installAsMod ? "Fabric Loader " : "Iris & Sodium for ";
             VanillaLauncherIntegration.Icon profileIcon = installAsMod ? VanillaLauncherIntegration.Icon.FABRIC : VanillaLauncherIntegration.Icon.IRIS;
             String loaderVersion = installAsMod ? Main.LOADER_META.getLatestVersion(false).getVersion() : Utils.readTextFile(loaderVersionUrl);
-            boolean success = VanillaLauncherIntegration.installToLauncher(getVanillaGameDir(), getInstallDir(), profileName + selectedVersion.name, selectedVersion.name, loaderName, loaderVersion, profileIcon);
+            boolean success = VanillaLauncherIntegration.installToLauncher(this, getVanillaGameDir(), getInstallDir(), profileName + selectedVersion.name, selectedVersion.name, loaderName, loaderVersion, profileIcon);
             if (!success) {
                 System.out.println("Failed to install to launcher, canceling!");
                 return;
@@ -489,6 +495,8 @@ private void installButtonMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIR
         }
 
         installButton.setText("Downloading...");
+        //installButton.setMargin(new java.awt.Insets(10, 90, 10, 90));
+
         installButton.setEnabled(false);
         progressBar.setForeground(new Color(76, 135, 200));
         progressBar.setValue(0);
@@ -606,6 +614,8 @@ private void installButtonMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIR
 
                 if (installSuccess) {
                     installButton.setText("Completed!");
+                    //installButton.setMargin(new java.awt.Insets(10, 80, 10, 80));
+
                     progressBar.setForeground(new Color(39, 195, 75));
                     installButton.setEnabled(true);
                     finishedSuccessfulInstall = true;

src/main/java/net/hypercubemc/iris_installer/VanillaLauncherIntegration.java

@@ -4,19 +4,22 @@
 import net.fabricmc.installer.client.ProfileInstaller;
 import net.fabricmc.installer.util.Reference;
 import net.fabricmc.installer.util.Utils;
+import org.json.JSONException;
 import org.json.JSONObject;
 
 import javax.swing.*;
+import java.awt.*;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.*;
+import java.util.List;
 import java.util.stream.Collectors;
 
 public class VanillaLauncherIntegration {
-    public static boolean installToLauncher(Path vanillaGameDir, Path instanceDir, String profileName, String gameVersion, String loaderName, String loaderVersion, Icon icon) throws IOException {
+    public static boolean installToLauncher(Component parent, Path vanillaGameDir, Path instanceDir, String profileName, String gameVersion, String loaderName, String loaderVersion, Icon icon) throws IOException {
         String versionId = String.format("%s-%s-%s", loaderName, loaderVersion, gameVersion);
 
         ProfileInstaller.LauncherType launcherType = System.getProperty("os.name").contains("Windows") ? getLauncherType(vanillaGameDir) : /* Return standalone if we aren't on Windows.*/ ProfileInstaller.LauncherType.WIN32;
@@ -25,7 +28,7 @@ public static boolean installToLauncher(Path vanillaGameDir, Path instanceDir, S
             return false;
         }
         installVersion(vanillaGameDir, gameVersion, loaderName, loaderVersion, launcherType);
-        installProfile(vanillaGameDir, instanceDir, profileName, versionId, icon, launcherType);
+        installProfile(parent, vanillaGameDir, instanceDir, profileName, versionId, icon, launcherType);
         return true;
     }
 
@@ -69,7 +72,7 @@ private static void editVersionJson(Json profileJson) {
         json.getOrDefault("arguments", Json.array()).asJsonMap().getOrDefault("jvm", Json.array()).asJsonList().add(factory.string("-Diris.installer=true"));
     }
 
-    private static void installProfile(Path mcDir, Path instanceDir, String profileName, String versionId, Icon icon, ProfileInstaller.LauncherType launcherType) throws IOException {
+    private static void installProfile(Component parent, Path mcDir, Path instanceDir, String profileName, String versionId, Icon icon, ProfileInstaller.LauncherType launcherType) throws IOException {
         Path launcherProfiles = mcDir.resolve(launcherType.profileJsonName);
         if (!Files.exists(launcherProfiles)) {
             System.out.println("Could not find launcher_profiles");
@@ -78,7 +81,14 @@ private static void installProfile(Path mcDir, Path instanceDir, String profileN
 
         System.out.println("Creating profile");
 
-        JSONObject jsonObject = new JSONObject(Utils.readString(launcherProfiles));
+        JSONObject jsonObject = null;
+
+        try {
+            jsonObject = new JSONObject(Utils.readString(launcherProfiles));
+        } catch (JSONException e) {
+            JOptionPane.showMessageDialog(parent, "Failed to add profile, you might not have logged into the launcher.");
+            return;
+        }
 
         JSONObject profiles = jsonObject.getJSONObject("profiles");