From b46f488dcf8a78771a0fca9384d280ac98711e4f Mon Sep 17 00:00:00 2001 From: ZekerZhayard Date: Thu, 26 Nov 2020 21:53:13 +0800 Subject: [PATCH] Remove Mixin version checker. --- ...OptiForgeWrapperTransformationService.java | 2 +- .../optiforge/asm/fml/VersionChecker.java | 21 ------------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/src/main/java/io/github/zekerzhayard/optiforge/asm/fml/OptiForgeWrapperTransformationService.java b/src/main/java/io/github/zekerzhayard/optiforge/asm/fml/OptiForgeWrapperTransformationService.java index 6be8665..5bae067 100644 --- a/src/main/java/io/github/zekerzhayard/optiforge/asm/fml/OptiForgeWrapperTransformationService.java +++ b/src/main/java/io/github/zekerzhayard/optiforge/asm/fml/OptiForgeWrapperTransformationService.java @@ -91,7 +91,7 @@ public void initialize(@Nonnull IEnvironment environment) { // We should check if it is under development environments or loaded required versions successfully. if (checked = Files.isDirectory(path) || currentFMLVersion.length() == 0) { // Nothing to do. - } else if (checked = VersionChecker.IS_LOADED && VersionChecker.checkOptiFineVersion(VersionChecker.DEFAULT_FUNCTION, true) && VersionChecker.checkMixinVersion(VersionChecker.DEFAULT_FUNCTION) && VersionChecker.checkForgeVersion(VersionChecker.DEFAULT_FUNCTION, currentFMLVersion.toString())) { + } else if (checked = VersionChecker.IS_LOADED && VersionChecker.checkOptiFineVersion(VersionChecker.DEFAULT_FUNCTION, true) && VersionChecker.checkForgeVersion(VersionChecker.DEFAULT_FUNCTION, currentFMLVersion.toString())) { // FML can't detect IModLocator when ITransformationService exists in the same jar, so we must add it manually. ModDirTransformerDiscoverer.getExtraLocators().add(path); } else { diff --git a/src/main/java/io/github/zekerzhayard/optiforge/asm/fml/VersionChecker.java b/src/main/java/io/github/zekerzhayard/optiforge/asm/fml/VersionChecker.java index 6922b90..73141ee 100644 --- a/src/main/java/io/github/zekerzhayard/optiforge/asm/fml/VersionChecker.java +++ b/src/main/java/io/github/zekerzhayard/optiforge/asm/fml/VersionChecker.java @@ -181,27 +181,6 @@ public static String getOptiFineVersionFromJar(Path optifine) { return null; } - /** - * Mixin has it own version checker system, so this method only check if Mixin exists. - */ - public static boolean checkMixinVersion(Function function) { - try { - Class.forName("org.spongepowered.asm.launch.MixinBootstrap").getField("VERSION"); - } catch (Exception e) { - StringBuilder message = new StringBuilder( - "It looks like you have not install Mixin, you can download it from https://www.curseforge.com/minecraft/mc-mods/mixinbootstrap.\n" + - "The game will continue, and run without OptiFine and OptiForge.\n\n" + - e + "\n" - ); - for (StackTraceElement traceElement : e.getStackTrace()) { - message.append("\tat ").append(traceElement).append("\n"); - } - LOGGER.error(message.toString()); - return function.apply(message.toString()); - } - return true; - } - /** * FML can't check the build number and if can't match minor version, game won't crash or prompt players prompts */