diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java index 783cd1dba..e6ca70b6b 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java @@ -384,17 +384,6 @@ public final class Tools { return strList.toArray(new String[0]); } - public static String artifactToPath(String name) { - int idx = name.indexOf(":"); - assert idx != -1; - int idx2 = name.indexOf(":", idx+1); - assert idx2 != -1; - String group = name.substring(0, idx); - String artifact = name.substring(idx+1, idx2); - String version = name.substring(idx2+1).replace(':','-'); - return group.replaceAll("\\.", "/") + "/" + artifact + "/" + version + "/" + artifact + "-" + version + ".jar"; - } - public static String getPatchedFile(String version) { return DIR_HOME_VERSION + "/" + version + "/" + version + ".jar"; } @@ -617,7 +606,7 @@ public final class Tools { List libDir = new ArrayList<>(); for (DependentLibrary libItem: info.libraries) { if(!checkRules(libItem.rules)) continue; - libDir.add(Tools.DIR_HOME_LIBRARY + "/" + Tools.artifactToPath(libItem.name)); + libDir.add(Tools.DIR_HOME_LIBRARY + "/" + libItem.downloads.artifact.path; } return libDir.toArray(new String[0]); } diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/tasks/AsyncMinecraftDownloader.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/tasks/AsyncMinecraftDownloader.java index 4df5e7b78..42c01aa43 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/tasks/AsyncMinecraftDownloader.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/tasks/AsyncMinecraftDownloader.java @@ -141,7 +141,7 @@ public class AsyncMinecraftDownloader { continue; } - String libArtifact = Tools.artifactToPath(libItem.name); + String libArtifact = libItem.downloads.artifact.path; outLib = new File(Tools.DIR_HOME_LIBRARY + "/" + libArtifact); outLib.getParentFile().mkdirs();