Compare commits
No commits in common. "master" and "1.0.1" have entirely different histories.
13
CHANGELOG.md
13
CHANGELOG.md
|
|
@ -1,18 +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
|
||||
|
||||
**1.0.3**
|
||||
* Improve Java Binary Testing
|
||||
|
||||
**1.0.2**
|
||||
* Fix 32-Bit OpenJDk Installation
|
||||
|
||||
**1.0.1**
|
||||
* Add Wrapping To Conflict Dialog
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
}
|
||||
```
|
||||
|
|
@ -3,14 +3,14 @@ org.gradle.jvmargs = -Xmx1G
|
|||
|
||||
# Fabric Properties
|
||||
# check these on https://fabricmc.net/use
|
||||
minecraft_version = 1.16.3
|
||||
minecraft_version = 1.16.2
|
||||
curseforge_id = 398250
|
||||
simple_minecraft_version = 1.16.3
|
||||
yarn_build = 47
|
||||
fabric_loader_version = 0.10.3+build.211
|
||||
simple_minecraft_version = 1.16.2
|
||||
yarn_build = 6
|
||||
fabric_loader_version = 0.9.0+build.204
|
||||
|
||||
# Mod Properties
|
||||
mod_version = 1.0.5
|
||||
mod_version = 1.0.1
|
||||
maven_group = com.thebrokenrail
|
||||
|
||||
# Dependencies
|
||||
|
|
|
|||
|
|
@ -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,13 +17,13 @@ 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);
|
||||
}
|
||||
|
||||
ReLaunchUtil.reLaunch(true);
|
||||
ReLaunchUtil.reLaunch();
|
||||
|
||||
// Download Available JDKs
|
||||
AdoptOpenJDK.JDK jdk = AdoptOpenJDK.get().get(PlatformUtil.getPlatform());
|
||||
|
|
@ -45,12 +44,13 @@ public class FreshCoffee implements PreLaunchEntrypoint {
|
|||
File dir = Util.getJavaDir(jdk.version.semver);
|
||||
|
||||
if (dir.exists()) {
|
||||
Util.removeInvalidJDK(dir);
|
||||
Util.getLogger().info("Removing Invalid Java Installation: " + dir.getAbsolutePath());
|
||||
Util.deleteDirectory(dir);
|
||||
}
|
||||
|
||||
ExtractUtil.extract(url, dir);
|
||||
|
||||
ReLaunchUtil.reLaunch(false);
|
||||
ReLaunchUtil.reLaunch();
|
||||
}
|
||||
|
||||
System.exit(1);
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
||||
|
|
@ -17,7 +16,6 @@ public final class HardcodedConfig {
|
|||
public static final String LIMIT_TEXT = "version %s required by %s";
|
||||
|
||||
public static final String JAVA_IMPLEMENTATION = "hotspot";
|
||||
public static final String HEAP_SIZE = "normal";
|
||||
|
||||
public static final String OUTDATED_JAVA_MESSAGE = "An installed mod requires a newer version of Java (%s).";
|
||||
public static final String OUTDATED_JAVA_WITH_OFFER_MESSAGE = OUTDATED_JAVA_MESSAGE + " Would you like to install it?\n%s will be downloaded.";
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ public final class AdoptOpenJDK {
|
|||
private String project;
|
||||
|
||||
private boolean isValid() {
|
||||
return heap_size.equals(HardcodedConfig.HEAP_SIZE) && image_type.equals("jre") && project.equals("jdk") && (packageObj.link.endsWith(".zip") || packageObj.link.endsWith(".tar.gz"));
|
||||
return heap_size.equals("normal") && image_type.equals("jre") && project.equals("jdk") && (packageObj.link.endsWith(".zip") || packageObj.link.endsWith(".tar.gz"));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -85,7 +85,7 @@ public final class AdoptOpenJDK {
|
|||
}
|
||||
|
||||
private static final String[] PLATFORM_TYPES = new String[]{"linux", "win", "macosx"};
|
||||
private static final String[] ARCHITECTURE_TYPES = new String[]{"x64", "x32", "aarch64", "arm"};
|
||||
private static final String[] ARCHITECTURE_TYPES = new String[]{"x64", "i686", "aarch64", "arm32"};
|
||||
|
||||
private static final Platform[] PLATFORMS;
|
||||
|
||||
|
|
|
|||
|
|
@ -22,13 +22,13 @@ public final class PlatformUtil {
|
|||
case "x86":
|
||||
case "i386":
|
||||
case "i686": {
|
||||
return "x32";
|
||||
return "i686";
|
||||
}
|
||||
case "amd64": {
|
||||
return "x64";
|
||||
}
|
||||
case "arm": {
|
||||
return "arm";
|
||||
return "arm32";
|
||||
}
|
||||
case "aarch64_be":
|
||||
case "armv8b":
|
||||
|
|
|
|||
|
|
@ -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");
|
||||
}
|
||||
}
|
||||
|
|
@ -1,13 +1,16 @@
|
|||
package com.thebrokenrail.freshcoffee.util;
|
||||
|
||||
import com.thebrokenrail.freshcoffee.config.HardcodedConfig;
|
||||
import net.fabricmc.loader.api.FabricLoader;
|
||||
import net.fabricmc.loader.FabricLoader;
|
||||
import net.fabricmc.loader.game.MinecraftGameProvider;
|
||||
import net.fabricmc.loader.util.Arguments;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.io.UncheckedIOException;
|
||||
import java.lang.management.ManagementFactory;
|
||||
import java.lang.reflect.Field;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
|
@ -44,7 +47,15 @@ public final class ReLaunchUtil {
|
|||
// Set Entry-Point
|
||||
mainArgs.add(Util.getMainClass());
|
||||
// Get Parameters
|
||||
String[] launchArgs = FabricLoader.getInstance().getLaunchArguments(false);
|
||||
String[] launchArgs;
|
||||
try {
|
||||
Field launchArgsField = MinecraftGameProvider.class.getDeclaredField("arguments");
|
||||
launchArgsField.setAccessible(true);
|
||||
//noinspection deprecation
|
||||
launchArgs = ((Arguments) launchArgsField.get(FabricLoader.INSTANCE.getGameProvider())).toArray();
|
||||
} catch (IllegalAccessException | NoSuchFieldException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
// Add Parameters
|
||||
mainArgs.addAll(Arrays.asList(launchArgs));
|
||||
return mainArgs;
|
||||
|
|
@ -57,14 +68,6 @@ public final class ReLaunchUtil {
|
|||
List<String> vmArgs = new ArrayList<>(ManagementFactory.getRuntimeMXBean().getInputArguments());
|
||||
// Remove Debugger
|
||||
vmArgs.removeIf(arg -> arg.startsWith("-agentlib") || arg.startsWith("-javaagent"));
|
||||
// Enable Java Preview Features
|
||||
if (PreviewUtil.arePreviewFeaturesRequired()) {
|
||||
if (!vmArgs.contains("--enable-preview")) {
|
||||
vmArgs.add("--enable-preview");
|
||||
}
|
||||
} else {
|
||||
vmArgs.remove("--enable-preview");
|
||||
}
|
||||
|
||||
List<String> mainArgs = getMainArgs();
|
||||
|
||||
|
|
@ -107,33 +110,7 @@ public final class ReLaunchUtil {
|
|||
}
|
||||
}
|
||||
|
||||
private static void javaBinaryTestFailed(String reason) {
|
||||
Util.getLogger().debug("Java Binary Test Failed: " + reason);
|
||||
}
|
||||
|
||||
private static boolean testJavaBinary(String javaBinary) {
|
||||
Util.getLogger().debug("Testing Java Binary: " + javaBinary);
|
||||
|
||||
Process process;
|
||||
try {
|
||||
process = new ProcessBuilder(javaBinary, "-version").start();
|
||||
} catch (IOException e) {
|
||||
javaBinaryTestFailed(e.toString());
|
||||
return false;
|
||||
}
|
||||
|
||||
try {
|
||||
int status = process.waitFor();
|
||||
javaBinaryTestFailed("Exit Code: " + status);
|
||||
return status == 0;
|
||||
} catch (InterruptedException e) {
|
||||
javaBinaryTestFailed(e.toString());
|
||||
process.destroy();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public static void reLaunch(boolean testJavaBinary) {
|
||||
public static void reLaunch() {
|
||||
File[] files = HardcodedConfig.INSTALL_DIR.listFiles();
|
||||
if (files != null) {
|
||||
List<String> list = new ArrayList<>();
|
||||
|
|
@ -146,13 +123,10 @@ public final class ReLaunchUtil {
|
|||
String newestVersion = JavaVersionUtil.getNewest(list.toArray(new String[0]));
|
||||
|
||||
if (newestVersion != null) {
|
||||
File javaDir = Util.getJavaDir(newestVersion);
|
||||
File javaBinary = new File(new File(javaDir, "bin"), "java" + PlatformUtil.getExecutableExtension());
|
||||
if (!testJavaBinary || testJavaBinary(javaBinary.getAbsolutePath())) {
|
||||
File javaBinary = new File(new File(Util.getJavaDir(newestVersion), "bin"), "java" + PlatformUtil.getExecutableExtension());
|
||||
if (javaBinary.exists() && javaBinary.canExecute()) {
|
||||
Util.getLogger().info("Using Java Executable: " + javaBinary.getAbsolutePath());
|
||||
reLaunch(javaBinary.getAbsolutePath());
|
||||
} else {
|
||||
Util.removeInvalidJDK(javaDir);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ public final class Util {
|
|||
return new File(HardcodedConfig.INSTALL_DIR, version);
|
||||
}
|
||||
|
||||
private static void deleteDirectory(File directoryToBeDeleted) {
|
||||
public static void deleteDirectory(File directoryToBeDeleted) {
|
||||
File[] allContents = directoryToBeDeleted.listFiles();
|
||||
if (allContents != null) {
|
||||
for (File file : allContents) {
|
||||
|
|
@ -66,9 +66,4 @@ public final class Util {
|
|||
String pre = (si ? "kMGTPE" : "KMGTPE").charAt(exp - 1) + (si ? "" : "i");
|
||||
return String.format("%.1f %sB", bytes / Math.pow(unit, exp), pre);
|
||||
}
|
||||
|
||||
public static void removeInvalidJDK(File dir) {
|
||||
Util.getLogger().info("Removing Invalid Java Installation: " + dir.getAbsolutePath());
|
||||
Util.deleteDirectory(dir);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Reference in New Issue
Block a user