Probably fix Windows issue

TetraTau · May 3, 2023 · d52fd72 · d52fd72
1 parent fbe871e
commit d52fd72
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 11 deletions.
diff --git a/fabric-loader b/fabric-loader
diff --git a/gradle.properties b/gradle.properties
@@ -9,7 +9,7 @@ mcVersion=1.19
 
 # Toki info
 gameVersion=1.19.4
-tokiVersion=0.1.2
+tokiVersion=0.1.2.1
 spigotMappingsRef=177811e1fa90f674897a302820f3ed84e4d65688
 mojangMappingsRef=bc44f6dd84cd2f3ad8c0caad850eaca9e82067e3
 

diff --git a/paper-api b/paper-api
diff --git a/paper-mojang-api b/paper-mojang-api
diff --git a/paper-server b/paper-server
diff --git a/paperclip b/paperclip
diff --git a/patches/paperclip/0002-Implement-Fabric-Loader.patch b/patches/paperclip/0002-Implement-Fabric-Loader.patch
@@ -415,18 +415,26 @@ index 0000000000000000000000000000000000000000..794e208181d3f640b396d8c1aff0bfd0
 +	}
 +}
 diff --git a/java17/src/main/java/io/papermc/paperclip/Paperclip.java b/java17/src/main/java/io/papermc/paperclip/Paperclip.java
-index a10744d8d489b9ef3b6fcad850885c719a66b90f..6698942629eb64c08e24a8d942941ff30bc38ce4 100644
+index a10744d8d489b9ef3b6fcad850885c719a66b90f..3dd3b783aa35800dc77b4413efd874526ca52adc 100644
 --- a/java17/src/main/java/io/papermc/paperclip/Paperclip.java
 +++ b/java17/src/main/java/io/papermc/paperclip/Paperclip.java
-@@ -18,6 +18,7 @@ import java.util.HashMap;
+@@ -7,6 +7,7 @@ import java.io.InputStreamReader;
+ import java.lang.invoke.MethodHandle;
+ import java.lang.invoke.MethodHandles;
+ import java.lang.invoke.MethodType;
++import java.net.URISyntaxException;
+ import java.net.URL;
+ import java.net.URLClassLoader;
+ import java.nio.file.FileSystem;
+@@ -18,6 +19,7 @@ import java.util.HashMap;
  import java.util.Map;
 
  public final class Paperclip {
 +	public static Collection<URL> versions; // Toki
 
      public static void main(final String[] args) {
          if (Path.of("").toAbsolutePath().toString().contains("!")) {
-@@ -25,21 +26,31 @@ public final class Paperclip {
+@@ -25,21 +27,31 @@ public final class Paperclip {
              System.exit(1);
          }
 
@@ -464,12 +472,16 @@ index a10744d8d489b9ef3b6fcad850885c719a66b90f..6698942629eb64c08e24a8d942941ff3
              } catch (final Throwable t) {
                  throw Util.sneakyThrow(t);
              }
-@@ -81,11 +92,16 @@ public final class Paperclip {
+@@ -81,11 +93,20 @@ public final class Paperclip {
          final Collection<URL> versionUrls = classpathUrls.get("versions").values();
          final Collection<URL> libraryUrls = classpathUrls.get("libraries").values();
 
 +		Paperclip.versions = versionUrls;
-+		System.setProperty("fabric.gameJarPath", versionUrls.stream().findFirst().orElseThrow(() -> new IllegalStateException("Didn't find any versions!")).getPath()); // Toky - implement fabric loader
++		try {
++			System.setProperty("fabric.gameJarPath", Path.of(versionUrls.stream().findFirst().orElseThrow(() -> new IllegalStateException("Didn't find any versions!")).toURI()).toAbsolutePath().toString()); // Toky - implement fabric loader
++		} catch (Throwable e) {
++			throw new RuntimeException("Something went wrong while trying to set fabric's game jar path: ", e);
++		}
 +
          final URL[] emptyArray = new URL[0];
 +		/*