From e7c1363c71947306d57d15431c755584cdd997a5 Mon Sep 17 00:00:00 2001 From: C0D3 M4513R <28912031+C0D3-M4513R@users.noreply.github.com> Date: Sat, 20 Jan 2024 18:29:21 +0100 Subject: [PATCH] Add back `loadExternalFileSystems` --- build.gradle | 2 +- .../java/org/kettingpowered/launcher/KettingLauncher.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index ba4e91e..a64f3b0 100644 --- a/build.gradle +++ b/build.gradle @@ -38,7 +38,7 @@ configurations { dependencies { compileOnly 'org.jetbrains:annotations:23.0.0' - implementation 'org.kettingpowered:kettingcommon:2.1.0' + implementation 'org.kettingpowered:kettingcommon:2.1.2' implementation 'com.google.code.gson:gson:2.10.1' //Used in Patcher implementation 'me.tongfei:progressbar:0.10.0' //Used to display progress transitive 'org.jline:jline-reader:3.21.0' //needed for progressbar diff --git a/src/main/java/org/kettingpowered/launcher/KettingLauncher.java b/src/main/java/org/kettingpowered/launcher/KettingLauncher.java index 8998453..927299a 100644 --- a/src/main/java/org/kettingpowered/launcher/KettingLauncher.java +++ b/src/main/java/org/kettingpowered/launcher/KettingLauncher.java @@ -335,6 +335,7 @@ void launch() throws Exception { downloadMCP.join(); if (Patcher.checkUpdateNeeded()) new Patcher(); + JavaHacks.clearReservedIdentifiers(); Arrays.stream(libs.getLoadedLibs()) .map(url-> { try { @@ -343,14 +344,13 @@ void launch() throws Exception { throw new RuntimeException(e); } }).forEach(jarFile -> Main.INST.appendToSystemClassLoaderSearch(jarFile)); - + JavaHacks.loadExternalFileSystems(KettingLauncher.class.getClassLoader()); System.out.println("Launching Ketting..."); final List arg_list = new ArrayList<>(args.args()); arg_list.add("--launchTarget"); arg_list.add(args.launchTarget()); - JavaHacks.clearReservedIdentifiers(); Class.forName("net.minecraftforge.bootstrap.ForgeBootstrap", true, KettingLauncher.class.getClassLoader()) .getMethod("main", String[].class)