Merge pull request #2 from nexia-cts/dev

add installing fabric support

.gitignore

@@ -37,4 +37,8 @@ bin/
 .vscode/
 
 ### Mac OS ###
-.DS_Store
+.DS_Store
+
+
+### cache ###
+cache/

build.gradle

@@ -7,7 +7,7 @@ sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 
 group = 'com.nexia'
-version = '1.0.1'
+version = '1.0.2'
 
 repositories {
     mavenCentral()

src/main/java/com/nexia/installer/InstallerGUI.java

@@ -1,6 +1,7 @@
 package com.nexia.installer;
 
 import com.nexia.installer.util.InstallerHelper;
+import com.nexia.installer.util.fabric.FabricInstallerHelper;
 
 import javax.swing.*;
 import java.awt.*;
@@ -11,13 +12,18 @@
 public class InstallerGUI extends JFrame {
     public static InstallerGUI instance;
 
+    public JPanel vanilla;
+
+    public JPanel fabric;
+
+    public JTabbedPane pane;
+
     public InstallerGUI() {
-        InstallerHelper helper = new InstallerHelper();
-        JPanel panel = helper.setPanel(this);
+        this.vanilla = new InstallerHelper().setPanel(this);
+        this.fabric = new FabricInstallerHelper().setPanel(this);
 
         setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
 
-        add(panel);
         instance = this;
     }
 
@@ -43,14 +49,23 @@ public static void load() throws UnsupportedLookAndFeelException, ClassNotFoundE
         }
 
         InstallerGUI gui = new InstallerGUI();
+
+        gui.pane = new JTabbedPane(JTabbedPane.TOP);
+
+        gui.pane.addTab(Main.BUNDLE.getString("installer.tab.vanilla"), gui.vanilla);
+        gui.pane.addTab(Main.BUNDLE.getString("installer.tab.fabric"), gui.fabric);
+
+        gui.setContentPane(gui.pane);
+
+
         gui.updateSize(true);
         gui.setTitle(Main.BUNDLE.getString("installer.title"));
         gui.setIconImage(Main.icon);
         gui.setLocationRelativeTo(null);
         gui.setVisible(true);
     }
 
-    public void updateSize(boolean updateMinimum) {
+    private void updateSize(boolean updateMinimum) {
         if (updateMinimum) setMinimumSize(null);
         setPreferredSize(null);
         pack();

src/main/java/com/nexia/installer/Main.java

@@ -36,14 +36,13 @@ public ResourceBundle newBundle(String baseName, Locale locale, String format, C
 
     public static void main(String[] args) throws UnsupportedLookAndFeelException, ClassNotFoundException, InstantiationException, IllegalAccessException {
 
+        os = OS.LINUX;
+
         if(System.getProperty("os.name").startsWith("Windows")){
             os = OS.WINDOWS;
             System.setProperty("javax.net.ssl.trustStoreType", "WINDOWS-ROOT");
         }
 
-        if(System.getProperty("os.name").startsWith("lin"))
-            os = OS.LINUX;
-
         if(System.getProperty("os.name").startsWith("mac"))
             os = OS.MAC;
 

src/main/java/com/nexia/installer/util/HttpAPI.java

@@ -0,0 +1,33 @@
+package com.nexia.installer.util;
+
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+public class HttpAPI {
+
+    public static String userAgent = "Mozilla/5.0 (compatible; combat-test-installer; +https://github.com/nexia-cts/combat-test-installer)";
+
+    public static String get(String url) {
+        try {
+            URL apiUrl = new URL(url);
+
+            HttpURLConnection connection = (HttpURLConnection) apiUrl.openConnection();
+
+            connection.setRequestProperty("User-Agent", userAgent);
+            connection.setRequestMethod("GET");
+
+            BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+            String line;
+            StringBuilder response = new StringBuilder();
+            while ((line = reader.readLine()) != null) {
+                response.append(line);
+            }
+
+            reader.close();
+            connection.disconnect();
+
+            return response.toString();
+        } catch (Exception ignored) { return null; }
+    }
+}

src/main/java/com/nexia/installer/util/InstallerHelper.java

@@ -55,7 +55,7 @@ public JPanel setPanel(InstallerGUI gui) {
         buttonInstall.addActionListener(e -> {
             buttonInstall.setEnabled(false);
             try {
-                install();
+                launch();
             } catch (IOException ex) {
                 throw new RuntimeException(ex);
             }
@@ -107,7 +107,7 @@ public void addRow(Container parent, GridBagConstraints c, boolean last, String
         c.gridx = 0;
     }
 
-    private void install() throws IOException {
+    public void launch() throws IOException {
 
         String stringGameVersion = (String) gameVersionComboBox.getSelectedItem();
         VersionHandler.GameVersion gameVersion = VersionHandler.identifyGameVersion(stringGameVersion);

src/main/java/com/nexia/installer/util/InstallerUtils.java

@@ -1,14 +1,12 @@
 package com.nexia.installer.util;
 
+import com.nexia.installer.InstallerGUI;
 import com.nexia.installer.Main;
 import com.nexia.installer.game.VersionHandler;
 
 import javax.swing.*;
-import java.awt.*;
 import java.io.File;
-import java.io.IOException;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -115,7 +113,7 @@ public static void install(Path mcDir, VersionHandler.GameVersion gameVersion) {
         }).start();
     }
 
-    private static ProfileInstaller.LauncherType showLauncherTypeSelection() {
+    public static ProfileInstaller.LauncherType showLauncherTypeSelection() {
         Object[] options = { Main.BUNDLE.getString("installer.prompt.launcher.type.xbox"), Main.BUNDLE.getString("installer.prompt.launcher.type.win32")};
 
         int result = JOptionPane.showOptionDialog(null,
@@ -135,7 +133,7 @@ private static ProfileInstaller.LauncherType showLauncherTypeSelection() {
         return result == JOptionPane.YES_OPTION ? ProfileInstaller.LauncherType.MICROSOFT_STORE : ProfileInstaller.LauncherType.WIN32;
     }
 
-    private static void showDone(VersionHandler.GameVersion gameVersion) throws URISyntaxException, IOException {
+    private static void showDone(VersionHandler.GameVersion gameVersion) {
         Object[] options = {"OK", "Install Fabric"};
         int result = JOptionPane.showOptionDialog(null,
                 MessageFormat.format(Main.BUNDLE.getString("installer.prompt.install.done"), gameVersion.getVersion()),
@@ -147,6 +145,6 @@ private static void showDone(VersionHandler.GameVersion gameVersion) throws URIS
                 options[0]
         );
 
-        if(result == JOptionPane.NO_OPTION && Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) Desktop.getDesktop().browse(new URI("https://github.com/rizecookey/fabric-installer/releases"));
+        if(result == JOptionPane.NO_OPTION) InstallerGUI.instance.pane.setSelectedComponent(InstallerGUI.instance.fabric);
     }
 }

src/main/java/com/nexia/installer/util/ProfileInstaller.java

@@ -81,13 +81,17 @@ private static Json createProfile(String name) {
     }
 
     public enum LauncherType {
-        WIN32("launcher_profiles.json"),
-        MICROSOFT_STORE("launcher_profiles_microsoft_store.json");
+        WIN32("win32", "launcher_profiles.json"),
+        MICROSOFT_STORE("microsoft_store", "launcher_profiles_microsoft_store.json");
 
         public final String profileJsonName;
 
-        LauncherType(String profileJsonName) {
+        public final String name;
+
+        LauncherType(String name, String profileJsonName) {
+            this.name = name;
             this.profileJsonName = profileJsonName;
         }
+
     }
 }

src/main/java/com/nexia/installer/util/Utils.java

@@ -25,7 +25,7 @@ public class Utils {
     public static void extractZip(Path file, Path path) throws IOException {
         ZipInputStream zipIn = new ZipInputStream(Files.newInputStream(Paths.get(file.toString())));
         ZipEntry entry = zipIn.getNextEntry();
-        String filePath = "";
+        String filePath;
         // iterates over entries in the zip file
         while (entry != null) {
             filePath = path + File.separator + entry.getName();
@@ -136,9 +136,7 @@ public static String getProfileIcon() {
 
             return "data:image/png;base64," + Base64.getEncoder().encodeToString(Arrays.copyOf(ret, offset));
         } catch (IOException e) {
-            e.printStackTrace();
+            return "furnace"; // Fallback to furnace icon if we cant load Nexia icon.
         }
-
-        return "furnace"; // Fallback to furnace icon if we cant load CTS icon.
     }
 }