Full rework ice adapter

build.gradle

@@ -2,8 +2,12 @@ plugins {
     id 'java'
     id 'com.diffplug.spotless' version '6.25.0'
     id 'com.github.johnrengelman.shadow' version '7.1.2'
+    id 'org.openjfx.javafxplugin' version '0.1.0'
 }
 
+javafx {
+    modules = ['javafx.controls', 'javafx.fxml']
+}
 
 group 'com.faforever'
 version '1.0-SNAPSHOT'

client/build.gradle

@@ -1,6 +1,7 @@
 
 apply plugin: 'java'
 apply plugin: 'com.github.johnrengelman.shadow'
+apply plugin: 'org.openjfx.javafxplugin'
 
 group 'com.faforever'
 version '1.0-SNAPSHOT'
@@ -15,19 +16,28 @@ dependencies {
     annotationProcessor("org.projectlombok:lombok:$lombokVersion")
     implementation("org.projectlombok:lombok:$lombokVersion")
 
-    implementation("org.openjfx:javafx-base:${javafxVersion}:${javafxPlatform}")
-    implementation("org.openjfx:javafx-controls:${javafxVersion}:${javafxPlatform}")
-    implementation("org.openjfx:javafx-graphics:${javafxVersion}:${javafxPlatform}")
-    implementation("org.openjfx:javafx-fxml:${javafxVersion}:${javafxPlatform}")
-    implementation("org.openjfx:javafx-web:${javafxVersion}:${javafxPlatform}")
-    implementation("org.openjfx:javafx-media:${javafxVersion}:${javafxPlatform}")
+    if (javafxClasspath == "compileOnly") {
+        compileOnly("org.openjfx:javafx-base:${javafxVersion}:${javafxPlatform}")
+        compileOnly("org.openjfx:javafx-controls:${javafxVersion}:${javafxPlatform}")
+        compileOnly("org.openjfx:javafx-graphics:${javafxVersion}:${javafxPlatform}")
+        compileOnly("org.openjfx:javafx-fxml:${javafxVersion}:${javafxPlatform}")
+        compileOnly("org.openjfx:javafx-web:${javafxVersion}:${javafxPlatform}")
+        compileOnly("org.openjfx:javafx-media:${javafxVersion}:${javafxPlatform}")
+    } else {
+        implementation("org.openjfx:javafx-base:${javafxVersion}:${javafxPlatform}")
+        implementation("org.openjfx:javafx-controls:${javafxVersion}:${javafxPlatform}")
+        implementation("org.openjfx:javafx-graphics:${javafxVersion}:${javafxPlatform}")
+        implementation("org.openjfx:javafx-fxml:${javafxVersion}:${javafxPlatform}")
+        implementation("org.openjfx:javafx-web:${javafxVersion}:${javafxPlatform}")
+        implementation("org.openjfx:javafx-media:${javafxVersion}:${javafxPlatform}")
+    }
 
     implementation project(":shared")
-//    implementation project(":ice-adapter")
+    implementation project(":ice-adapter")
     implementation("com.sun.jna:jna:3.0.9")
     implementation("net.java.dev.jna:jna-platform:5.12.1")
     implementation("commons-io:commons-io:2.11.0")
-    implementation("com.github.Geosearchef:JJsonRpc:master")
+    implementation("com.github.faforever:JJsonRpc:37669e0fed")
     implementation("com.google.code.gson:gson:$gsonVersion")
     implementation("com.google.guava:guava:$guavaVersion")
 }

client/src/main/java/client/TestClient.java

@@ -80,7 +80,7 @@ private static void informationThread() {
 
 
 	public static void main(String args[]) {
-		boolean skipGDRP = false;
+		boolean skipGDRP = true;
 		if (args.length >= 1) {
             for (String arg : args) {
                 if (arg.equals("--debug")) {

client/src/main/java/client/ice/ICEAdapter.java

@@ -214,15 +214,14 @@ public static void startICEAdapter() {
 			String command[] = new String[]{
 //					(System.getProperty("os.name").contains("Windows") ? "faf-ice-adapter.exe" : "./faf-ice-adapter"),
 					"java",
+//					"-Djava.net.preferIPv4Stack=true",
 					"-jar",
 					"faf-ice-adapter.jar",
 					"--id", String.valueOf(TestClient.playerID),
 					"--login", TestClient.username,
 					"--rpc-port", String.valueOf(ADAPTER_PORT),
-//				"--gpgnet-port", String.valueOf(GPG_PORT), retrieved afterwards
-//				"--lobby-port", String.valueOf(LOBBY_PORT),
+					"--game-id", String.valueOf(100),
 					"--log-level", LOG_LEVEL,
-//					"--log-directory", "iceAdapterLogs/"
 			};
 
 			ProcessBuilder processBuilder = new ProcessBuilder(command);

ice-adapter/build.gradle

@@ -10,6 +10,7 @@ apply plugin: 'java'
 apply plugin: 'java-library'
 apply plugin: 'com.github.johnrengelman.shadow'
 apply plugin: 'com.diffplug.spotless'
+apply plugin: 'org.openjfx.javafxplugin'
 
 group 'com.faforever'
 
@@ -30,15 +31,16 @@ dependencies {
     annotationProcessor("info.picocli:picocli-codegen:$picocliVersion")
     implementation("info.picocli:picocli:$picocliVersion")
 
-    implementation("org.jitsi:ice4j:3.0-66-g1c60acc")
+    implementation("org.jitsi:ice4j:3.2-12-gc2cbf61")
     implementation("com.github.faforever:JJsonRpc:37669e0fed")
     implementation("com.google.guava:guava:$guavaVersion")
-    implementation("org.slf4j:slf4j-api:1.7.36")
+    implementation("org.slf4j:slf4j-api:2.0.13")
     implementation("ch.qos.logback:logback-classic:$logbackVersion")
     implementation("ch.qos.logback:logback-core:$logbackVersion")
     implementation("org.java-websocket:Java-WebSocket:1.5.3")
     implementation('com.fasterxml.jackson.core:jackson-databind:2.13.4.2')
     implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.4")
+    implementation("org.apache.commons:commons-lang3:3.20.0")
 
     if(javafxClasspath == "compileOnly") {
         compileOnly("org.openjfx:javafx-base:${javafxVersion}:${javafxPlatform}")
@@ -55,6 +57,10 @@ dependencies {
         implementation("org.openjfx:javafx-web:${javafxVersion}:${javafxPlatform}")
         implementation("org.openjfx:javafx-media:${javafxVersion}:${javafxPlatform}")
     }
+
+    testImplementation('org.junit.jupiter:junit-jupiter-api:5.10.2')
+    testRuntimeOnly('org.junit.jupiter:junit-jupiter-engine:5.10.2')
+    testImplementation('org.junit.jupiter:junit-jupiter-params:5.10.2')
 }
 
 shadowJar {
@@ -78,4 +84,8 @@ spotless {
         cleanthat()
         palantirJavaFormat()
     }
+}
+
+test {
+    useJUnitPlatform()
 }