Skip to content

Commit 66d179e

Browse files
committed
detect both legacy and new grimoire classes
1 parent 6fcd7af commit 66d179e

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

src/main/java/com/falsepattern/lib/mixin/MinecraftURLClassPath.java

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,17 @@ public final class MinecraftURLClassPath {
2626
private static final boolean GRIMOIRE;
2727

2828
static {
29-
boolean grimoire;
30-
try {
31-
Class.forName("io.github.crucible.grimoire.common.GrimoireCore", false, MinecraftURLClassPath.class.getClassLoader());
32-
grimoire = true;
33-
} catch (ClassNotFoundException ignored) {
34-
grimoire = false;
29+
boolean grimoire = false;
30+
String[] knownGrimoireClassNames = new String[]{
31+
"io.github.crucible.grimoire.Grimoire",
32+
"io.github.crucible.grimoire.common.GrimoireCore"
33+
};
34+
for (val className: knownGrimoireClassNames) {
35+
try {
36+
Class.forName(className, false, MinecraftURLClassPath.class.getClassLoader());
37+
grimoire = true;
38+
break;
39+
} catch (ClassNotFoundException ignored) {}
3540
}
3641
GRIMOIRE = grimoire;
3742
if (!GRIMOIRE) {

0 commit comments

Comments
 (0)