Add BETA option for installing to install latest beta

Author: Sk1er

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>cc.hyperium.installer</groupId>
     <artifactId>Installer</artifactId>
-    <version>1.4</version>
+    <version>1.5</version>
 
     <properties>
         <kotlin.version>1.2.50</kotlin.version>

src/main/java/cc/hyperium/installer/steps/VersionScreen.java

@@ -58,8 +58,11 @@ public void addComponents(Container c) {
         Arrays.stream(InstallerUtils.getManifest().getVersions()).filter(vm -> vm.getTargetInstaller() <= Installer.API_VERSION)
                 .forEach(vm -> versions.addItem(vm.getName()));
 
+        versions.addItem("BETA");
         versions.setSelectedItem(InstallerMain.INSTANCE.getConfig().getVersion().getName());
-        versions.addActionListener(e -> InstallerMain.INSTANCE.getConfig().setVersion(Arrays.stream(InstallerUtils.getManifest().getVersions()).filter(v -> v.getName().equals(versions.getSelectedItem())).findFirst().get()));
+        versions.addActionListener(e -> {
+            InstallerMain.INSTANCE.getConfig().setVersion(Arrays.stream(InstallerUtils.getManifest().getVersions()).filter(v -> v.getName().equals(versions.getSelectedItem())).findFirst().orElseGet(() -> InstallerUtils.getManifest().getLatest_beta()));
+        });
         versions.setBounds(c.getWidth() / 2 - tw / 2, c.getHeight() / 2 + 5, 250, 20);
         versions.setBackground(Colors.DARK.brighter());
         versions.setForeground(Color.WHITE);

src/main/java/cc/hyperium/utils/InstallerUtils.java

@@ -3,6 +3,8 @@
 import cc.hyperium.installer.api.entities.InstallerManifest;
 import cc.hyperium.installer.utils.JsonHolder;
 import com.google.gson.Gson;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
 import org.apache.commons.io.IOUtils;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpGet;
@@ -15,6 +17,7 @@
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.security.MessageDigest;
+import java.util.Iterator;
 import java.util.Locale;
 
 /*
@@ -55,10 +58,6 @@ else if (OS.contains("nux"))
         return os;
     }
 
-    public enum OSType {
-        Windows, MacOS, Linux, Other
-    }
-
     public static JsonHolder get(String url) {
         try {
             return new JsonHolder(getRaw(url));
@@ -77,8 +76,18 @@ public static InstallerManifest getManifest() {
             Gson gson = new Gson();
 
             try {
-                InstallerManifest im = gson.fromJson(get("https://api.hyperium.cc/versions").getObject(), InstallerManifest.class);
-                manifest = new InstallerManifest(im.getLatest(), im.getVersions(), gson.fromJson(InstallerUtils.getRaw("https://raw.githubusercontent.com/HyperiumClient/Hyperium-Repo/master/installer/addons.json"), InstallerManifest.class).getAddons());
+                JsonHolder jsonHolder = get("https://api.hyperium.cc/versions");
+                JsonArray versions = jsonHolder.optJSONArray("versions");
+                Iterator<JsonElement> iterator = versions.iterator();
+                while (iterator.hasNext()) {
+                    JsonHolder jsonHolder1 = new JsonHolder(iterator.next().getAsJsonObject());
+                    if (jsonHolder1.optBoolean("beta")) {
+                        iterator.remove();
+                    }
+                }
+                InstallerManifest im = gson.fromJson(jsonHolder.getObject(), InstallerManifest.class);
+
+                manifest = new InstallerManifest(im.getLatest(), im.getLatest_beta(), im.getVersions(), gson.fromJson(InstallerUtils.getRaw("https://raw.githubusercontent.com/HyperiumClient/Hyperium-Repo/master/installer/addons.json"), InstallerManifest.class).getAddons());
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -116,4 +125,8 @@ public static Class<?> loadClass(URL url, String c) throws ClassNotFoundExceptio
         return new URLClassLoader(new URL[]{url}).loadClass(c);
     }
 
+    public enum OSType {
+        Windows, MacOS, Linux, Other
+    }
+
 }

src/main/kotlin/cc/hyperium/installer/api/entities/InstallerManifest.kt

@@ -7,8 +7,10 @@ import java.util.*
  */
 data class InstallerManifest(
         val latest: VersionManifest,
+        val latest_beta: VersionManifest,
         val versions: Array<VersionManifest>,
         val addons: MutableList<AddonManifest> = mutableListOf()
+
 ) {
     override fun equals(other: Any?): Boolean {
         if (this === other) return true