@@ -415,18 +415,26 @@ index 0000000000000000000000000000000000000000..794e208181d3f640b396d8c1aff0bfd0
415415+ }
416416+ }
417417diff --git a/java17/src/main/java/io/papermc/paperclip/Paperclip.java b/java17/src/main/java/io/papermc/paperclip/Paperclip.java
418- index a10744d8d489b9ef3b6fcad850885c719a66b90f..6698942629eb64c08e24a8d942941ff30bc38ce4 100644
418+ index a10744d8d489b9ef3b6fcad850885c719a66b90f..3dd3b783aa35800dc77b4413efd874526ca52adc 100644
419419--- a/java17/src/main/java/io/papermc/paperclip/Paperclip.java
420420+++ b/java17/src/main/java/io/papermc/paperclip/Paperclip.java
421- @@ -18,6 +18,7 @@ import java.util.HashMap;
421+ @@ -7,6 +7,7 @@ import java.io.InputStreamReader;
422+ import java.lang.invoke.MethodHandle;
423+ import java.lang.invoke.MethodHandles;
424+ import java.lang.invoke.MethodType;
425+ + import java.net.URISyntaxException;
426+ import java.net.URL;
427+ import java.net.URLClassLoader;
428+ import java.nio.file.FileSystem;
429+ @@ -18,6 +19,7 @@ import java.util.HashMap;
422430 import java.util.Map;
423431
424432 public final class Paperclip {
425433+ public static Collection<URL> versions; // Toki
426434
427435 public static void main(final String[] args) {
428436 if (Path.of("").toAbsolutePath().toString().contains("!")) {
429- @@ -25,21 +26 ,31 @@ public final class Paperclip {
437+ @@ -25,21 +27 ,31 @@ public final class Paperclip {
430438 System.exit(1);
431439 }
432440
@@ -464,12 +472,16 @@ index a10744d8d489b9ef3b6fcad850885c719a66b90f..6698942629eb64c08e24a8d942941ff3
464472 } catch (final Throwable t) {
465473 throw Util.sneakyThrow(t);
466474 }
467- @@ -81,11 +92,16 @@ public final class Paperclip {
475+ @@ -81,11 +93,20 @@ public final class Paperclip {
468476 final Collection<URL> versionUrls = classpathUrls.get("versions").values();
469477 final Collection<URL> libraryUrls = classpathUrls.get("libraries").values();
470478
471479+ Paperclip.versions = versionUrls;
472- + System.setProperty("fabric.gameJarPath", versionUrls.stream().findFirst().orElseThrow(() -> new IllegalStateException("Didn't find any versions!")).getPath()); // Toky - implement fabric loader
480+ + try {
481+ + System.setProperty("fabric.gameJarPath", Path.of(versionUrls.stream().findFirst().orElseThrow(() -> new IllegalStateException("Didn't find any versions!")).toURI()).toAbsolutePath().toString()); // Toky - implement fabric loader
482+ + } catch (Throwable e) {
483+ + throw new RuntimeException("Something went wrong while trying to set fabric's game jar path: ", e);
484+ + }
473485+
474486 final URL[] emptyArray = new URL[0];
475487+ /*
0 commit comments