From a4e5ef9d01b6a42c8590794dfd7defd6df146495 Mon Sep 17 00:00:00 2001 From: Gravita <12893402+gravit0@users.noreply.github.com> Date: Fri, 31 May 2024 23:30:19 +0700 Subject: [PATCH] [FIX] Bouncy Castle --- LaunchServer/build.gradle | 3 +-- .../src/main/java/pro/gravit/launchserver/Main.java | 9 +++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/LaunchServer/build.gradle b/LaunchServer/build.gradle index 45f15d29..fbf36cdc 100644 --- a/LaunchServer/build.gradle +++ b/LaunchServer/build.gradle @@ -77,8 +77,7 @@ pack project(':LauncherAPI') bundle group: 'org.jline', name: 'jline-reader', version: rootProject['verJline'] bundle group: 'org.jline', name: 'jline-terminal', version: rootProject['verJline'] bundle group: 'org.bouncycastle', name: 'bcprov-jdk18on', version: rootProject['verBcpkix'] - bundle group: 'org.bouncycastle', name: 'bcpkix-jdk15to18', version: rootProject['verBcpkix'] - bundle group: 'org.bouncycastle', name: 'bcutil-jdk18on', version: rootProject['verBcpkix'] + bundle group: 'org.bouncycastle', name: 'bcpkix-jdk18on', version: rootProject['verBcpkix'] bundle group: 'org.ow2.asm', name: 'asm-commons', version: rootProject['verAsm'] bundle group: 'io.netty', name: 'netty-codec-http', version: rootProject['verNetty'] bundle group: 'io.netty', name: 'netty-transport-classes-epoll', version: rootProject['verNetty'] diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/Main.java b/LaunchServer/src/main/java/pro/gravit/launchserver/Main.java index 26cb56ca..8ca8b467 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/Main.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/Main.java @@ -20,6 +20,7 @@ public class Main { private static final List classpathOnly = List.of("proguard", "jline", "progressbar", "kotlin", "epoll"); private static final String LOG4J_PROPERTY = "log4j2.configurationFile"; + private static final String DEBUG_PROPERTY = "launchserver.main.debug"; private static boolean isClasspathOnly(Path path) { var fileName = path.getFileName().toString(); for(var e : classpathOnly) { @@ -78,6 +79,14 @@ public static void main(String[] args) throws Throwable { ModuleLayer.Controller controller = (ModuleLayer.Controller) control.getJava9ModuleController(); LaunchServerControlHolder.setControl(control); LaunchServerControlHolder.setController(controller); + if(Boolean.getBoolean(DEBUG_PROPERTY)) { + for(var e : controller.layer().modules()) { + System.out.printf("Module %s\n", e.getName()); + for(var p : e.getPackages()) { + System.out.printf("Package %s\n", p); + } + } + } launch.launch("pro.gravit.launchserver.LaunchServerStarter", null, Arrays.asList(args)); } }