From d3805ecd2704454f5211ae7b4312113413d5b094 Mon Sep 17 00:00:00 2001 From: ShirosakiMio <852468399@qq.com> Date: Tue, 27 Aug 2024 09:38:12 +0800 Subject: [PATCH] Revert "Update LibFilter.java" & fix This reverts commit 3a245cd806fb2cd36b225a3159dde8c583b3a7e6. --- .../com/tungsten/fclcore/util/LibFilter.java | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/FCLCore/src/main/java/com/tungsten/fclcore/util/LibFilter.java b/FCLCore/src/main/java/com/tungsten/fclcore/util/LibFilter.java index 2d2a8dd1..8d909735 100644 --- a/FCLCore/src/main/java/com/tungsten/fclcore/util/LibFilter.java +++ b/FCLCore/src/main/java/com/tungsten/fclcore/util/LibFilter.java @@ -18,10 +18,16 @@ public class LibFilter { "{\n" + " \"name\": \"net.java.dev.jna:jna:5.13.0\"\n" + "}"; - private static final String OSHI_6_3_STRING = - "{\n" + - " \"name\": \"com.github.oshi:oshi-core:6.3.0\"\n" + - "}"; + private static final String OSHI_6_3_STRING = "{\n" + + " \"name\": \"com.github.oshi:oshi-core:6.3.0\",\n" + + " \"downloads\": {\n" + + " \"artifact\": {\n" + + " \"path\": \"com/github/oshi/oshi-core/6.3.0/oshi-core-6.3.0.jar\",\n" + + " \"sha1\": \"9e98cf55be371cafdb9c70c35d04ec2a8c2b42ac\",\n" + + " \"url\": \"https://repo1.maven.org/maven2/com/github/oshi/oshi-core/6.3.0/oshi-core-6.3.0.jar\"\n" + + " }\n" + + " }\n" + + " }"; private static final Library ASM_ALL_5_2 = GSON.fromJson(ASM_ALL_5_2_STRING, Library.class); private static final Library JNA_5_13 = GSON.fromJson(JNA_5_13_STRING, Library.class); @@ -44,6 +50,12 @@ public class LibFilter { } else { newLibraries.add(JNA_5_13); } + } else if (library.getName().startsWith("com.github.oshi:oshi-core:")) { + if (Integer.parseInt(version[0]) != 6 || Integer.parseInt(version[1]) != 2) { + newLibraries.add(library); + } else { + newLibraries.add(OSHI_6_3); + } } else { newLibraries.add(library); }