CHANGELOG.md

@@ -1,8 +1,5 @@
 # Changelog
 
-**1.0.5**
-* Allow Forcing Preview Features With ``freshcoffee:preview_features_required``
-
 **1.0.4**
 * Replace Reflection With New Fabric Loader API
 * Enable Java Preview Features

README.md

@@ -35,13 +35,4 @@ You can set a maximum version of Java by adding this to ``fabric.mod.json``:
         "freshcoffee:maximum_java_version": 14
     }
 }
-```
-
-You can also force Java preview features:
-```json
-{
-    "custom": {
-        "freshcoffee:preview_features_required": true
-    }
-}
 ```

gradle.properties

@@ -10,7 +10,7 @@ org.gradle.jvmargs = -Xmx1G
     fabric_loader_version = 0.10.3+build.211
 
 # Mod Properties
-    mod_version = 1.0.5
+    mod_version = 1.0.4
     maven_group = com.thebrokenrail
 
 # Dependencies

src/main/java/com/thebrokenrail/freshcoffee/FreshCoffee.java

@@ -4,7 +4,6 @@ import com.thebrokenrail.freshcoffee.config.HardcodedConfig;
 import com.thebrokenrail.freshcoffee.dialog.Dialog;
 import com.thebrokenrail.freshcoffee.download.AdoptOpenJDK;
 import com.thebrokenrail.freshcoffee.util.PlatformUtil;
-import com.thebrokenrail.freshcoffee.util.PreviewUtil;
 import com.thebrokenrail.freshcoffee.util.ReLaunchUtil;
 import com.thebrokenrail.freshcoffee.util.Util;
 import com.thebrokenrail.freshcoffee.util.ExtractUtil;
@@ -18,7 +17,7 @@ import java.net.URL;
 public class FreshCoffee implements PreLaunchEntrypoint {
     @Override
     public void onPreLaunch() {
-        if (Util.JAVA_VERSION < LimitUtil.getMinimumJavaVersion().getValue() || Util.JAVA_VERSION > LimitUtil.getMaximumJavaVersion().getValue() || (PreviewUtil.arePreviewFeaturesRequired() && !PreviewUtil.arePreviewFeaturesEnabled())) {
+        if (Util.JAVA_VERSION < LimitUtil.getMinimumJavaVersion().getValue() || Util.JAVA_VERSION > LimitUtil.getMaximumJavaVersion().getValue()) {
             if (LimitUtil.getMinimumJavaVersion().getValue() > LimitUtil.getMaximumJavaVersion().getValue()) {
                 Dialog.getInstance().showErrorDialog(String.format(HardcodedConfig.MINIMUM_HIGHER_THAN_MAXIMUM_MESSAGE, LimitUtil.getMinimumJavaVersion().toString(), LimitUtil.getMaximumJavaVersion().toString()));
                 System.exit(1);

src/main/java/com/thebrokenrail/freshcoffee/config/HardcodedConfig.java

@@ -5,7 +5,6 @@ import java.io.File;
 public final class HardcodedConfig {
     public static final String MINIMUM_JSON_KEY = "freshcoffee:minimum_java_version";
     public static final String MAXIMUM_JSON_KEY = "freshcoffee:maximum_java_version";
-    public static final String PREVIEW_JSON_KEY = "freshcoffee:preview_features_required";
 
     public static final String TITLE = "FreshCoffee";
 

src/main/java/com/thebrokenrail/freshcoffee/util/PreviewUtil.java

@@ -1,34 +0,0 @@
-package com.thebrokenrail.freshcoffee.util;
-
-import com.thebrokenrail.freshcoffee.config.HardcodedConfig;
-import net.fabricmc.loader.api.FabricLoader;
-import net.fabricmc.loader.api.ModContainer;
-import net.fabricmc.loader.api.metadata.ModMetadata;
-
-import java.lang.management.ManagementFactory;
-import java.util.ArrayList;
-import java.util.List;
-
-public final class PreviewUtil {
-    public static boolean arePreviewFeaturesRequired() {
-        for (ModContainer mod : FabricLoader.getInstance().getAllMods()) {
-            ModMetadata metadata = mod.getMetadata();
-            if (metadata.containsCustomValue(HardcodedConfig.PREVIEW_JSON_KEY)) {
-                try {
-                    boolean newValue = metadata.getCustomValue(HardcodedConfig.PREVIEW_JSON_KEY).getAsBoolean();
-                    if (newValue) {
-                        return true;
-                    }
-                } catch (ClassCastException e) {
-                    Util.getLogger().error("Invalid Value For Preview Features: " + metadata.getId());
-                }
-            }
-        }
-        return false;
-    }
-
-    public static boolean arePreviewFeaturesEnabled() {
-        List<String> vmArgs = new ArrayList<>(ManagementFactory.getRuntimeMXBean().getInputArguments());
-        return vmArgs.contains("--enable-preview");
-    }
-}

src/main/java/com/thebrokenrail/freshcoffee/util/ReLaunchUtil.java

@@ -58,12 +58,8 @@ public final class ReLaunchUtil {
         // Remove Debugger
         vmArgs.removeIf(arg -> arg.startsWith("-agentlib") || arg.startsWith("-javaagent"));
         // Enable Java Preview Features
-        if (PreviewUtil.arePreviewFeaturesRequired()) {
+        if (!vmArgs.contains("--enable-preview")) {
-            if (!vmArgs.contains("--enable-preview")) {
+            vmArgs.add("--enable-preview");
-                vmArgs.add("--enable-preview");
-            }
-        } else {
-            vmArgs.remove("--enable-preview");
         }
 
         List<String> mainArgs = getMainArgs();