allow no image, fix for minecraft run on Windows

Author: robin4002

build.gradle

@@ -28,7 +28,7 @@ repositories {
 
 group = 'net.minecraftforgefrance'
 archivesBaseName = 'installer'
-version = '2.1.1'
+version = '2.1.2'
 targetCompatibility = '1.6'
 sourceCompatibility = '1.6'
 

src/main/java/fr/minecraftforgefrance/installer/InstallerFrame.java

@@ -13,7 +13,6 @@
 import java.awt.event.WindowEvent;
 import java.awt.image.BufferedImage;
 import java.io.File;
-import java.io.IOException;
 import java.net.URI;
 
 import javax.imageio.ImageIO;
@@ -25,8 +24,6 @@
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 
-import com.google.common.base.Throwables;
-
 import argo.jdom.JsonRootNode;
 import fr.minecraftforgefrance.common.EnumOS;
 import fr.minecraftforgefrance.common.FileChecker;
@@ -60,33 +57,36 @@ public InstallerFrame()
             }
         }
 
-        BufferedImage image;
+        BufferedImage image = null;
         try
         {
             image = ImageIO.read(this.getClass().getResourceAsStream("/installer/logo.png"));
         }
-        catch(IOException e)
+        catch(Exception e)
         {
-            throw Throwables.propagate(e);
+
         }
 
         final Dimension dim = Toolkit.getDefaultToolkit().getScreenSize();
 
         JPanel panel = new JPanel();
         panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
-        ImageIcon icon = new ImageIcon(image);
-        JLabel logoLabel = new JLabel(icon);
-        logoLabel.setAlignmentX(CENTER_ALIGNMENT);
-        logoLabel.setAlignmentY(CENTER_ALIGNMENT);
-        if(image.getWidth() > dim.width || image.getHeight() + 10 > dim.height)
-        {
-            JOptionPane.showMessageDialog(null, LANG.getTranslation("err.bigimage"), LANG.getTranslation("misc.error"), JOptionPane.ERROR_MESSAGE);
-            this.dispose();
-        }
-        else
+        if(image != null)
         {
-            logoLabel.setSize(image.getWidth(), image.getHeight());
-            panel.add(logoLabel);
+            ImageIcon icon = new ImageIcon(image);
+            JLabel logoLabel = new JLabel(icon);
+            logoLabel.setAlignmentX(CENTER_ALIGNMENT);
+            logoLabel.setAlignmentY(CENTER_ALIGNMENT);
+            if(image.getWidth() > dim.width || image.getHeight() + 10 > dim.height)
+            {
+                JOptionPane.showMessageDialog(null, LANG.getTranslation("err.bigimage"), LANG.getTranslation("misc.error"), JOptionPane.ERROR_MESSAGE);
+                this.dispose();
+            }
+            else
+            {
+                logoLabel.setSize(image.getWidth(), image.getHeight());
+                panel.add(logoLabel);
+            }
         }
 
         JPanel buttonPanel = new JPanel();

src/main/java/fr/minecraftforgefrance/installer/SuccessFrame.java

@@ -8,6 +8,7 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
+import java.io.IOException;
 
 import javax.swing.JButton;
 import javax.swing.JFrame;
@@ -53,13 +54,34 @@ public void actionPerformed(ActionEvent e)
             @Override
             public void actionPerformed(ActionEvent e)
             {
-                try
-                {   
-                    Runtime.getRuntime().exec(EnumOS.getJavaExecutable() + " -jar " + Installer.frame.mcDir.getPath() + File.separator + "launcher.jar");
+                File launcher = new File(Installer.frame.mcDir.getPath(), "launcher.jar");
+                if(launcher.exists())
+                {
+                    try
+                    {
+                        Runtime.getRuntime().exec(EnumOS.getJavaExecutable() + " -jar " + Installer.frame.mcDir.getPath() + File.separator + "launcher.jar");
+                    }
+                    catch(IOException ex)
+                    {
+                        ex.printStackTrace();
+                        JOptionPane.showMessageDialog(null, LANG.getTranslation("err.runminecraft"), LANG.getTranslation("misc.error"), JOptionPane.ERROR_MESSAGE);
+                    }
+                }
+                else if(EnumOS.getPlatform() == EnumOS.WINDOWS)
+                {
+                    // fix for Minecraft installer on Windows
+                    try
+                    {
+                        Runtime.getRuntime().exec(EnumOS.getJavaExecutable() + " -jar " + "\"C:\\Program Files (x86)\\Minecraft\\game\\launcher.jar\"");
+                    }
+                    catch(IOException ex2)
+                    {
+                        ex2.printStackTrace();
+                        JOptionPane.showMessageDialog(null, LANG.getTranslation("err.runminecraft"), LANG.getTranslation("misc.error"), JOptionPane.ERROR_MESSAGE);
+                    }
                 }
-                catch(Exception ex)
+                else
                 {
-                    ex.printStackTrace();
                     JOptionPane.showMessageDialog(null, LANG.getTranslation("err.runminecraft"), LANG.getTranslation("misc.error"), JOptionPane.ERROR_MESSAGE);
                 }
                 SuccessFrame.this.dispose();