Comp Installer - 1.0.1

Author: EminGT

gradle.properties

@@ -2,7 +2,7 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Version and packaging info
-version=1.0.0
+version=1.0.1
 maven_group=
 archives_base_name=Complementary-Installer
 

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

@@ -101,7 +101,7 @@
           <Color blue="0" green="cc" red="ff" type="rgb"/>
         </Property>
         <Property name="horizontalAlignment" type="int" value="0"/>
-        <Property name="text" type="java.lang.String" value="Warning: Iris shader loader have ended support for &lt;version&gt;."/>
+        <Property name="text" type="java.lang.String" value="Warning: Iris shader loader has ended support for &lt;version&gt;."/>
         <Property name="horizontalTextPosition" type="int" value="0"/>
         <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
           <Dimension value="[400, 21]"/>

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

@@ -34,7 +34,7 @@ public class NewInstaller extends JFrame {
 
     private static boolean dark = false;
     private boolean installAsMod;
-    private String outdatedPlaceholder = "Warning: Iris shader loader have ended support for <version>.";
+    private String outdatedPlaceholder = "Warning: Iris shader loader has 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;
@@ -262,7 +262,7 @@ private void initComponents() {
         outdatedText1.setFont(outdatedText1.getFont().deriveFont((float)16));
         outdatedText1.setForeground(new java.awt.Color(255, 204, 0));
         outdatedText1.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
-        outdatedText1.setText("Warning: Iris shader loader have ended support for <version>.");
+        outdatedText1.setText("Warning: Iris shader loader has ended support for <version>.");
         outdatedText1.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
         outdatedText1.setMaximumSize(new java.awt.Dimension(400, 21));
         outdatedText1.setMinimumSize(new java.awt.Dimension(310, 21));
@@ -466,6 +466,11 @@ private void fabricTypeMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:
     }//GEN-LAST:event_fabricTypeMouseClicked
 
     private void installButtonMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_installButtonMouseClicked
+        installButton.setText("Downloading...");
+        installButton.setEnabled(false);
+        progressBar.setForeground(new Color(76, 135, 200));
+        progressBar.setValue(0);
+
         String loaderName = installAsMod ? "fabric-loader" : "iris-fabric-loader";
 
         try {
@@ -490,21 +495,14 @@ private void installButtonMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIR
             storageDir.mkdir();
         }
 
-        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);
-
         String zipName = (betaSelection.isSelected() ? "Iris-Sodium-Beta" : "Iris-Sodium") + "-" + selectedVersion.name + ".zip";
         String irisDownURL = "https://github.com/IrisShaders/Iris-Installer-Files/releases/latest/download/" + zipName;
         File saveLocation = getStorageDirectory().resolve(zipName).toFile();
 
         final Downloader downloaderI = new Downloader(irisDownURL, saveLocation);
         downloaderI.addPropertyChangeListener(eventI -> {
             if ("progress".equals(eventI.getPropertyName())) {
-                progressBar.setValue(((Integer) eventI.getNewValue() ) * 3 / 4);
+                progressBar.setValue(((Integer) eventI.getNewValue() ) / 2);
             } else if (eventI.getNewValue() == SwingWorker.StateValue.DONE) {
                 try {
                     downloaderI.get();
@@ -639,7 +637,7 @@ private void installButtonMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIR
                     String finalShaderName = shaderName;
                     downloaderC.addPropertyChangeListener(eventC -> {
                         if ("progress".equals(eventC.getPropertyName())) {
-                            progressBar.setValue(285 + ((Integer) eventC.getNewValue() ) / 4);
+                            progressBar.setValue(50 + ((Integer) eventC.getNewValue() ) / 2);
                         } else if (eventC.getNewValue() == SwingWorker.StateValue.DONE) {
                             try {
                                 downloaderC.get();
@@ -684,10 +682,10 @@ private void installButtonMouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIR
                             installButton.setEnabled(false);
                             finishedSuccessfulInstall = true;
                             System.out.println("Finished Successful Install");
-                            String loaderMsg = installAsMod ? "fabric-loader" : "iris-fabric-loader";
+                            String loaderSt = installAsMod ? "fabric-loader" : "iris-fabric-loader";
                             String msg = "Successfully installed Iris, Sodium, and "
-                                         +finalShaderName+
-                                         "\nYou can launch the game by selecting the "+loaderMsg+" installation in your Minecraft launcher.";
+                                         +finalShaderName+"."+
+                                         "\nYou can run the game by selecting "+loaderSt+" in your Minecraft launcher.";
                             JOptionPane.showMessageDialog(this,
                                     msg, "Installation Complete!", JOptionPane.PLAIN_MESSAGE, new ImageIcon(Objects.requireNonNull(Utils.class.getClassLoader().getResource("green_tick.png"))));
                             System.exit(0);