From fc65cad9364669aa98857e400f7571964621537b Mon Sep 17 00:00:00 2001 From: ShirosakiMio <852468399@qq.com> Date: Thu, 5 Sep 2024 08:41:43 +0800 Subject: [PATCH] fix asm download error --- .../com/tungsten/fclcore/util/LibFilter.java | 34 +++++++++++++------ 1 file changed, 23 insertions(+), 11 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 8d909735..43e7a7e9 100644 --- a/FCLCore/src/main/java/com/tungsten/fclcore/util/LibFilter.java +++ b/FCLCore/src/main/java/com/tungsten/fclcore/util/LibFilter.java @@ -10,14 +10,26 @@ import java.util.List; public class LibFilter { - private static final String ASM_ALL_5_2_STRING = - "{\n" + - " \"name\": \"org.ow2.asm:asm-all:5.2\"\n" + - "}"; - private static final String JNA_5_13_STRING = - "{\n" + - " \"name\": \"net.java.dev.jna:jna:5.13.0\"\n" + - "}"; + private static final String ASM_ALL_5_0_4_STRING = "{\n" + + " \"name\": \"org.ow2.asm:asm-all:5.0.4\",\n" + + " \"downloads\": {\n" + + " \"artifact\": {\n" + + " \"path\": \"org/ow2/asm/asm-all/5.0.4/asm-all-5.0.4.jar\",\n" + + " \"sha1\": \"e6244859997b3d4237a552669279780876228909\",\n" + + " \"url\": \"https://repo1.maven.org/maven2/org/ow2/asm/asm-all/5.0.4/asm-all-5.0.4.jar\"\n" + + " }\n" + + " }\n" + + " }"; + private static final String JNA_5_13_STRING = "{\n" + + " \"name\": \"net.java.dev.jna:jna:5.13.0\",\n" + + " \"downloads\": {\n" + + " \"artifact\": {\n" + + " \"path\": \"net/java/dev/jna/jna/5.13.0/jna-5.13.0.jar\",\n" + + " \"sha1\": \"1200e7ebeedbe0d10062093f32925a912020e747\",\n" + + " \"url\": \"https://repo1.maven.org/maven2/net/java/dev/jna/jna/5.13.0/jna-5.13.0.jar\"\n" + + " }\n" + + " }\n" + + " }"; private static final String OSHI_6_3_STRING = "{\n" + " \"name\": \"com.github.oshi:oshi-core:6.3.0\",\n" + " \"downloads\": {\n" + @@ -29,7 +41,7 @@ public class LibFilter { " }\n" + " }"; - private static final Library ASM_ALL_5_2 = GSON.fromJson(ASM_ALL_5_2_STRING, Library.class); + private static final Library ASM_ALL_5_0_4 = GSON.fromJson(ASM_ALL_5_0_4_STRING, Library.class); private static final Library JNA_5_13 = GSON.fromJson(JNA_5_13_STRING, Library.class); private static final Library OSHI_6_3 = GSON.fromJson(OSHI_6_3_STRING, Library.class); @@ -42,8 +54,8 @@ public class LibFilter { for (Library library : libraries) { if (!library.getName().contains("org.lwjgl") && !library.getName().contains("jinput-platform") && !library.getName().contains("twitch-platform")) { String[] version = library.getName().split(":")[2].split("\\."); - if (library.getArtifactId().equals("asm-all") && library.getVersion().equals("4.1")) { - newLibraries.add(ASM_ALL_5_2); + if (library.getArtifactId().equals("asm-all") && Integer.parseInt(version[0]) < 5) { + newLibraries.add(ASM_ALL_5_0_4); } else if (library.getName().startsWith("net.java.dev.jna:jna:")) { if (Integer.parseInt(version[0]) >= 5 && Integer.parseInt(version[1]) >= 13) { newLibraries.add(library);