feat: add module-info.java

pom.xml

@@ -23,7 +23,7 @@
     <jackson.version>2.17.1</jackson.version>
     <logback.version>1.5.6</logback.version>
     <netty.version>4.1.110.Final</netty.version>
-    <bouncycastle.version>2.73.6</bouncycastle.version>
+    <bouncycastle.version>2.73.5</bouncycastle.version>
     <javafx.version>22.0.1</javafx.version>
     <jfoenix.version>9.0.10</jfoenix.version>
   </properties>
@@ -85,6 +85,11 @@
         <artifactId>bcpkix-lts8on</artifactId>
         <version>${bouncycastle.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.bouncycastle</groupId>
+        <artifactId>bcprov-lts8on</artifactId>
+        <version>${bouncycastle.version}</version>
+      </dependency>
       <dependency>
         <groupId>com.jfoenix</groupId>
         <artifactId>jfoenix</artifactId>

urban-spork-client-gui/resource/startup.cmd

@@ -1,4 +1,4 @@
 @echo off
 set server="urban-spork-client-gui"
-start javaw --add-opens java.base/java.lang.reflect=ALL-UNNAMED -jar %server%.jar
+start javaw --add-opens java.base/java.lang.reflect=com.jfoenix --add-opens javafx.controls/com.sun.javafx.scene.control.behavior=com.jfoenix --add-opens javafx.controls/com.sun.javafx.scene.control=com.jfoenix -jar %server%.jar
 exit

urban-spork-client-gui/src/com/urbanspork/client/gui/Resource.java

@@ -23,11 +23,10 @@ public class Resource {
     public static final URL CONSOLE_CSS;
 
     static {
-        ClassLoader classLoader = Resource.class.getClassLoader();
-        String resourcePath = "resource/";
-        PROGRAM_ICON = Objects.requireNonNull(classLoader.getResource(resourcePath + PROGRAM_ICON_NAME));
-        TRAY_ICON = Objects.requireNonNull(classLoader.getResource(resourcePath + TRAY_ICON_NAME));
-        CONSOLE_CSS = Objects.requireNonNull(classLoader.getResource(resourcePath + CONSOLE_CSS_NAME));
+        String resourcePath = "/resource/";
+        PROGRAM_ICON = Objects.requireNonNull(Resource.class.getResource(resourcePath + PROGRAM_ICON_NAME));
+        TRAY_ICON = Objects.requireNonNull(Resource.class.getResource(resourcePath + TRAY_ICON_NAME));
+        CONSOLE_CSS = Objects.requireNonNull(Resource.class.getResource(resourcePath + CONSOLE_CSS_NAME));
         ClientConfig config = ConfigHandler.DEFAULT.read();
         if (config == null) {
             config = new ClientConfig();

urban-spork-client-gui/src/module-info.java

@@ -0,0 +1,17 @@
+module com.urbanspork.client.gui {
+    requires ch.qos.logback.classic;
+    requires ch.qos.logback.core;
+    requires com.fasterxml.jackson.databind;
+    requires com.jfoenix;
+    requires com.urbanspork.client;
+    requires com.urbanspork.common;
+    requires io.netty.handler;
+    requires java.datatransfer;
+    requires java.desktop;
+    requires javafx.base;
+    requires javafx.controls;
+    requires javafx.graphics;
+    requires org.slf4j;
+
+    exports com.urbanspork.client.gui.console to javafx.graphics, ch.qos.logback.core;
+}

urban-spork-client/src/module-info.java

@@ -0,0 +1,12 @@
+module com.urbanspork.client {
+    exports com.urbanspork.client;
+    requires com.urbanspork.common;
+    requires io.netty.buffer;
+    requires io.netty.codec.http;
+    requires io.netty.codec.socks;
+    requires io.netty.codec;
+    requires io.netty.common;
+    requires io.netty.handler;
+    requires io.netty.transport;
+    requires org.slf4j;
+}

urban-spork-common/src/module-info.java

@@ -0,0 +1,38 @@
+module com.urbanspork.common {
+    requires com.fasterxml.jackson.annotation;
+    requires com.fasterxml.jackson.core;
+    requires com.fasterxml.jackson.databind;
+    requires io.netty.buffer;
+    requires io.netty.codec.socks;
+    requires io.netty.codec;
+    requires io.netty.common;
+    requires io.netty.handler;
+    requires io.netty.transport;
+    requires org.bouncycastle.lts.prov;
+    requires org.slf4j;
+
+    exports com.urbanspork.common.channel;
+    exports com.urbanspork.common.codec.aead;
+    exports com.urbanspork.common.codec.shadowsocks.tcp;
+    exports com.urbanspork.common.codec.shadowsocks.udp;
+    exports com.urbanspork.common.codec.shadowsocks;
+    exports com.urbanspork.common.codec.socks;
+    exports com.urbanspork.common.codec.vmess;
+    exports com.urbanspork.common.codec;
+    exports com.urbanspork.common.config.shadowsocks;
+    exports com.urbanspork.common.config;
+    exports com.urbanspork.common.crypto;
+    exports com.urbanspork.common.lang;
+    exports com.urbanspork.common.manage.shadowsocks;
+    exports com.urbanspork.common.protocol.socks;
+    exports com.urbanspork.common.protocol.trojan;
+    exports com.urbanspork.common.protocol.vmess.aead;
+    exports com.urbanspork.common.protocol.vmess.encoding;
+    exports com.urbanspork.common.protocol.vmess.header;
+    exports com.urbanspork.common.protocol.vmess;
+    exports com.urbanspork.common.protocol;
+    exports com.urbanspork.common.transport.tcp;
+    exports com.urbanspork.common.transport.udp;
+    exports com.urbanspork.common.transport;
+    exports com.urbanspork.common.util;
+}

urban-spork-server/src/module-info.java

@@ -0,0 +1,12 @@
+module com.urbansport.server {
+    requires com.urbanspork.common;
+    requires io.netty.buffer;
+    requires io.netty.codec.http;
+    requires io.netty.codec.socks;
+    requires io.netty.codec;
+    requires io.netty.common;
+    requires io.netty.handler;
+    requires io.netty.transport;
+    requires org.bouncycastle.lts.prov;
+    requires org.slf4j;
+}