From 1d0e0550fac2252869190c1c9676629dad983630 Mon Sep 17 00:00:00 2001 From: FalsePattern <30945458+FalsePattern@users.noreply.github.com> Date: Sun, 17 Apr 2022 16:42:42 +0200 Subject: [PATCH] Grimoire compatibility patch. Fixes #1. --- .../endlessids/mixin/plugin/MixinPlugin.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/falsepattern/endlessids/mixin/plugin/MixinPlugin.java b/src/main/java/com/falsepattern/endlessids/mixin/plugin/MixinPlugin.java index 34b502f..d024249 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/plugin/MixinPlugin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/plugin/MixinPlugin.java @@ -77,6 +77,8 @@ public class MixinPlugin implements IMixinConfigPlugin { return mixins; } + private int grimoireDetected = -1; + private boolean loadJarOf(final TargetedMod mod) { try { val jar = findJarOf(mod); @@ -86,10 +88,22 @@ public class MixinPlugin implements IMixinConfigPlugin { } LOG.info("Attempting to add " + jar + " to the URL Class Path"); - if(!jar.exists()) { + if (!jar.exists()) { throw new FileNotFoundException(jar.toString()); } - MinecraftURLClassPath.addJar(jar); + if (grimoireDetected < 0) { + try { + Class.forName("io.github.crucible.grimoire.Grimoire", false, getClass().getClassLoader()); + grimoireDetected = 1; + } catch (ClassNotFoundException ignored) { + grimoireDetected = 0; + } + } + if (grimoireDetected == 1) { + LOG.info("Not adding " + jar + " to the URL Class Path, because Grimoire breaks our utility class."); + } else { + MinecraftURLClassPath.addJar(jar); + } return true; } catch (Exception e) {