Fix installing OptiFine with 1.16+

LeafHacker · LeafHacker · commit 2405895db852 · 2021-01-02T22:03:20.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixes
+- Fix an error when attempting to install OptiFine with 1.16+
+
 ## [0.9.4] - 2021-01-02
 
 ### Fixes
diff --git a/src/main/java/io/github/ImpactDevelopment/installer/gui/pages/MainPage.java b/src/main/java/io/github/ImpactDevelopment/installer/gui/pages/MainPage.java
@@ -226,34 +226,40 @@ private JPanel buildOptiFineSetting(AppWindow app) {
         grid.add(radial);
 
         if (usingOptiFine) {
+            String version = config.getSettingValue(OptiFineSetting.INSTANCE);
+            String warningText = version == null ? "OptiFine is not currently supported on this version.<br>A new Installer that supports this combination may be released in the future."
+                    : "OptiFine can sometimes cause visual issues in Impact;<br>only include it if you need it!";
+
             JPanel warning = new JPanel(new FlowLayout());
-            warning.add(new JLabel("<html><center>OptiFine can sometimes cause visual issues in Impact;<br>only include it if you need it!</center></html>"));
+            warning.add(new JLabel("<html><center>" + warningText + "</center></html>"));
             grid.add(warning);
 
-            String version = config.getSettingValue(OptiFineSetting.INSTANCE);
-            if (!version.equals(MISSING)) {
-                grid.add(buildSetting(OptiFineSetting.INSTANCE, "OptiFine version", app));
-            }
-            switch (version) {
-                case MISSING:
-                case CUSTOM:
-                    grid.add(buildPathSetting(OptiFineFileSetting.INSTANCE, "OptiFine installer", JFileChooser.FILES_ONLY, app));
-                    break;
-            }
+            // OptiFine version can be null if it isn't supported
+            if (version != null) {
+                if (!version.equals(MISSING)) {
+                    grid.add(buildSetting(OptiFineSetting.INSTANCE, "OptiFine version", app));
+                }
+                switch (version) {
+                    case MISSING:
+                    case CUSTOM:
+                        grid.add(buildPathSetting(OptiFineFileSetting.INSTANCE, "OptiFine installer", JFileChooser.FILES_ONLY, app));
+                        break;
+                }
 
-            try {
-                FlowLayout layout = new FlowLayout();
-                layout.setHgap(0);
-                JPanel download = new JPanel(layout);
-                JLabel text = new JLabel("<html>You can download OptiFine from their website: </html>");
-                download.add(text);
-
-                JHyperlink link = new JHyperlink("optifine.net", "https://optifine.net/downloads");
-                download.add(link);
-
-                grid.add(download);
-            } catch (URISyntaxException e) {
-                throw new RuntimeException("", e);
+                try {
+                    FlowLayout layout = new FlowLayout();
+                    layout.setHgap(0);
+                    JPanel download = new JPanel(layout);
+                    JLabel text = new JLabel("<html>You can download OptiFine from their website: </html>");
+                    download.add(text);
+
+                    JHyperlink link = new JHyperlink("optifine.net", "https://optifine.net/downloads");
+                    download.add(link);
+
+                    grid.add(download);
+                } catch (URISyntaxException e) {
+                    throw new RuntimeException("", e);
+                }
             }
         }
 
diff --git a/src/main/java/io/github/ImpactDevelopment/installer/setting/settings/OptiFineSetting.java b/src/main/java/io/github/ImpactDevelopment/installer/setting/settings/OptiFineSetting.java
@@ -51,7 +51,7 @@ public enum OptiFineSetting implements ChoiceSetting<String> {
 
     @Override
     public List<String> getPossibleValues(InstallationConfig config) {
-        if (config.getSettingValue(InstallationModeSetting.INSTANCE) == InstallationModeOptions.FORGE || config.getSettingValue(InstallationModeSetting.INSTANCE) == InstallationModeOptions.FORGE_PLUS_LITELOADER || config.getSettingValue(MinecraftVersionSetting.INSTANCE).compareTo("1.15.2") > 0) {
+        if (config.getSettingValue(InstallationModeSetting.INSTANCE) == InstallationModeOptions.FORGE || config.getSettingValue(InstallationModeSetting.INSTANCE) == InstallationModeOptions.FORGE_PLUS_LITELOADER) {
             return Collections.emptyList();
         }
         String minecraftVersion = config.getSettingValue(MinecraftVersionSetting.INSTANCE);

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public enum OptiFineSetting implements ChoiceSetting<String> {`
`51`	`51`
`52`	`52`	`@Override`
`53`	`53`	`public List<String> getPossibleValues(InstallationConfig config) {`
`54`		`- if (config.getSettingValue(InstallationModeSetting.INSTANCE) == InstallationModeOptions.FORGE \|\| config.getSettingValue(InstallationModeSetting.INSTANCE) == InstallationModeOptions.FORGE_PLUS_LITELOADER \|\| config.getSettingValue(MinecraftVersionSetting.INSTANCE).compareTo("1.15.2") > 0) {`
	`54`	`+ if (config.getSettingValue(InstallationModeSetting.INSTANCE) == InstallationModeOptions.FORGE \|\| config.getSettingValue(InstallationModeSetting.INSTANCE) == InstallationModeOptions.FORGE_PLUS_LITELOADER) {`
`55`	`55`	`return Collections.emptyList();`
`56`	`56`	`}`
`57`	`57`	`String minecraftVersion = config.getSettingValue(MinecraftVersionSetting.INSTANCE);`