From dd177b7e1ed8ad84c1fc60f2784a992d6e6d0c75 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Sun, 17 Oct 2021 20:28:10 +0700 Subject: [PATCH] Update Tools.java --- .../src/main/java/net/kdt/pojavlaunch/Tools.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 73bf2a9ed..eae477835 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java @@ -365,7 +365,6 @@ public final class Tools { libStr.append(getPatchedFile(actualname)); } for (String perJar : classpath) { - Log.d(APP_NAME, "ADDED lib = " + perJar); if (!new File(perJar).exists()) { Log.d(APP_NAME, "Ignored non-exists file: " + perJar); continue; @@ -556,6 +555,13 @@ public final class Tools { List libDir = new ArrayList(); for (DependentLibrary libItem: info.libraries) { + if (libItem.rules != null) { + for (JMinecraftVersionList.Arguments.ArgValue.ArgRules rule : libItem.rules) { + if (rule.action.equals("allow") && rule.os.name.equals("osx")) { + continue; + } + } + } String[] libInfos = libItem.name.split(":"); libDir.add(Tools.DIR_HOME_LIBRARY + "/" + Tools.artifactToPath(libInfos[0], libInfos[1], libInfos[2])); }