code-disaster · tlf30 · Jan 10, 2023
diff --git a/java-wrapper/pom.xml b/java-wrapper/pom.xml
@@ -134,6 +134,13 @@
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-jar-plugin</artifactId>
 					<version>2.4</version>
+					<configuration>
+						<archive>
+							<manifestEntries>
+								<Automatic-Module-Name>com.codedisaster.steamworks</Automatic-Module-Name>
+							</manifestEntries>
+						</archive>
+					</configuration>
 				</plugin>
 			</plugins>
 		</pluginManagement>

diff --git a/...r/steamworks/SteamEncryptedAppTicket.java → ...r/steamworks/SteamEncryptedAppTicket.java b/...r/steamworks/SteamEncryptedAppTicket.java → ...r/steamworks/SteamEncryptedAppTicket.java
diff --git a/...mworks/SteamEncryptedAppTicketNative.java → ...mworks/SteamEncryptedAppTicketNative.java b/...mworks/SteamEncryptedAppTicketNative.java → ...mworks/SteamEncryptedAppTicketNative.java
diff --git a/...edisaster/steamworks/SteamGameServer.java → ...edisaster/steamworks/SteamGameServer.java b/...edisaster/steamworks/SteamGameServer.java → ...edisaster/steamworks/SteamGameServer.java
diff --git a/...saster/steamworks/SteamGameServerAPI.java → ...saster/steamworks/SteamGameServerAPI.java b/...saster/steamworks/SteamGameServerAPI.java → ...saster/steamworks/SteamGameServerAPI.java
diff --git a/.../steamworks/SteamGameServerAPINative.java → .../steamworks/SteamGameServerAPINative.java b/.../steamworks/SteamGameServerAPINative.java → .../steamworks/SteamGameServerAPINative.java
diff --git a/...r/steamworks/SteamGameServerCallback.java → ...r/steamworks/SteamGameServerCallback.java b/...r/steamworks/SteamGameServerCallback.java → ...r/steamworks/SteamGameServerCallback.java
diff --git a/...works/SteamGameServerCallbackAdapter.java → ...works/SteamGameServerCallbackAdapter.java b/...works/SteamGameServerCallbackAdapter.java → ...works/SteamGameServerCallbackAdapter.java
diff --git a/...aster/steamworks/SteamGameServerHTTP.java → ...aster/steamworks/SteamGameServerHTTP.java b/...aster/steamworks/SteamGameServerHTTP.java → ...aster/steamworks/SteamGameServerHTTP.java
diff --git a/...steamworks/SteamGameServerHTTPNative.java → ...steamworks/SteamGameServerHTTPNative.java b/...steamworks/SteamGameServerHTTPNative.java → ...steamworks/SteamGameServerHTTPNative.java
diff --git a/...ter/steamworks/SteamGameServerNative.java → ...ter/steamworks/SteamGameServerNative.java b/...ter/steamworks/SteamGameServerNative.java → ...ter/steamworks/SteamGameServerNative.java
diff --git a/...steamworks/SteamGameServerNetworking.java → ...steamworks/SteamGameServerNetworking.java b/...steamworks/SteamGameServerNetworking.java → ...steamworks/SteamGameServerNetworking.java
diff --git a/...orks/SteamGameServerNetworkingNative.java → ...orks/SteamGameServerNetworkingNative.java b/...orks/SteamGameServerNetworkingNative.java → ...orks/SteamGameServerNetworkingNative.java
diff --git a/...ster/steamworks/SteamGameServerStats.java → ...ster/steamworks/SteamGameServerStats.java b/...ster/steamworks/SteamGameServerStats.java → ...ster/steamworks/SteamGameServerStats.java
diff --git a/...amworks/SteamGameServerStatsCallback.java → ...amworks/SteamGameServerStatsCallback.java b/...amworks/SteamGameServerStatsCallback.java → ...amworks/SteamGameServerStatsCallback.java
diff --git a/.../SteamGameServerStatsCallbackAdapter.java → .../SteamGameServerStatsCallbackAdapter.java b/.../SteamGameServerStatsCallbackAdapter.java → .../SteamGameServerStatsCallbackAdapter.java
diff --git a/...teamworks/SteamGameServerStatsNative.java → ...teamworks/SteamGameServerStatsNative.java b/...teamworks/SteamGameServerStatsNative.java → ...teamworks/SteamGameServerStatsNative.java
diff --git a/...c/main/native/SteamGameServerCallback.cpp → ...c/main/native/SteamGameServerCallback.cpp b/...c/main/native/SteamGameServerCallback.cpp → ...c/main/native/SteamGameServerCallback.cpp
diff --git a/...src/main/native/SteamGameServerCallback.h → ...src/main/native/SteamGameServerCallback.h b/...src/main/native/SteamGameServerCallback.h → ...src/main/native/SteamGameServerCallback.h
diff --git a/...native/SteamGameServerCallbackAdapter.cpp → ...native/SteamGameServerCallbackAdapter.cpp b/...native/SteamGameServerCallbackAdapter.cpp → ...native/SteamGameServerCallbackAdapter.cpp
diff --git a/...n/native/SteamGameServerCallbackAdapter.h → ...n/native/SteamGameServerCallbackAdapter.h b/...n/native/SteamGameServerCallbackAdapter.h → ...n/native/SteamGameServerCallbackAdapter.h
diff --git a/...in/native/SteamGameServerHTTPCallback.cpp → ...in/native/SteamGameServerHTTPCallback.cpp b/...in/native/SteamGameServerHTTPCallback.cpp → ...in/native/SteamGameServerHTTPCallback.cpp
diff --git a/...main/native/SteamGameServerHTTPCallback.h → ...main/native/SteamGameServerHTTPCallback.h b/...main/native/SteamGameServerHTTPCallback.h → ...main/native/SteamGameServerHTTPCallback.h
diff --git a/...ive/SteamGameServerNetworkingCallback.cpp → ...ive/SteamGameServerNetworkingCallback.cpp b/...ive/SteamGameServerNetworkingCallback.cpp → ...ive/SteamGameServerNetworkingCallback.cpp
diff --git a/...ative/SteamGameServerNetworkingCallback.h → ...ative/SteamGameServerNetworkingCallback.h b/...ative/SteamGameServerNetworkingCallback.h → ...ative/SteamGameServerNetworkingCallback.h
diff --git a/...n/native/SteamGameServerStatsCallback.cpp → ...n/native/SteamGameServerStatsCallback.cpp b/...n/native/SteamGameServerStatsCallback.cpp → ...n/native/SteamGameServerStatsCallback.cpp
diff --git a/...ain/native/SteamGameServerStatsCallback.h → ...ain/native/SteamGameServerStatsCallback.h b/...ain/native/SteamGameServerStatsCallback.h → ...ain/native/SteamGameServerStatsCallback.h
diff --git a/jnigen/pom.xml b/jnigen/pom.xml
@@ -32,11 +32,6 @@
 			<artifactId>steamworks4j</artifactId>
 			<version>1.10.0-SNAPSHOT</version>
 		</dependency>
-		<dependency>
-			<groupId>com.code-disaster.steamworks4j</groupId>
-			<artifactId>steamworks4j-server</artifactId>
-			<version>1.10.0-SNAPSHOT</version>
-		</dependency>
 	</dependencies>
 
 	<build>

diff --git a/loader/gdx/pom.xml b/loader/gdx/pom.xml
@@ -104,6 +104,13 @@
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-jar-plugin</artifactId>
 					<version>2.4</version>
+					<configuration>
+						<archive>
+							<manifestEntries>
+								<Automatic-Module-Name>com.codedisaster.steamworks.gdx</Automatic-Module-Name>
+							</manifestEntries>
+						</archive>
+					</configuration>
 				</plugin>
 			</plugins>
 		</pluginManagement>

diff --git a/...ter/steamworks/SteamLibraryLoaderGdx.java → ...steamworks/gdx/SteamLibraryLoaderGdx.java b/...ter/steamworks/SteamLibraryLoaderGdx.java → ...steamworks/gdx/SteamLibraryLoaderGdx.java
@@ -1,6 +1,7 @@
-package com.codedisaster.steamworks;
+package com.codedisaster.steamworks.gdx;
 
 import com.badlogic.gdx.utils.SharedLibraryLoader;
+import com.codedisaster.steamworks.SteamLibraryLoader;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;

diff --git a/loader/lwjgl3/pom.xml b/loader/lwjgl3/pom.xml
@@ -168,6 +168,13 @@
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-jar-plugin</artifactId>
 					<version>2.4</version>
+					<configuration>
+						<archive>
+							<manifestEntries>
+								<Automatic-Module-Name>com.codedisaster.steamworks.lwjgl3</Automatic-Module-Name>
+							</manifestEntries>
+						</archive>
+					</configuration>
 				</plugin>
 			</plugins>
 		</pluginManagement>

diff --git a/.../steamworks/SteamLibraryLoaderLwjgl3.java → ...orks/lwjgl3/SteamLibraryLoaderLwjgl3.java b/.../steamworks/SteamLibraryLoaderLwjgl3.java → ...orks/lwjgl3/SteamLibraryLoaderLwjgl3.java
@@ -1,5 +1,6 @@
-package com.codedisaster.steamworks;
+package com.codedisaster.steamworks.lwjgl3;
 
+import com.codedisaster.steamworks.SteamLibraryLoader;
 import org.lwjgl.system.Library;
 import org.lwjgl.system.Platform;
 

diff --git a/pom.xml b/pom.xml
@@ -17,7 +17,6 @@
 		<module>jnigen</module>
 		<module>loader/gdx</module>
 		<module>loader/lwjgl3</module>
-		<module>server</module>
 		<module>tests</module>
 	</modules>
 

diff --git a/server/pom.xml b/server/pom.xml
diff --git a/server/src/main/resources/libsteamworks4j-encryptedappticket.dylib b/server/src/main/resources/libsteamworks4j-encryptedappticket.dylib
diff --git a/server/src/main/resources/libsteamworks4j-encryptedappticket.so b/server/src/main/resources/libsteamworks4j-encryptedappticket.so
diff --git a/server/src/main/resources/libsteamworks4j-server.dylib b/server/src/main/resources/libsteamworks4j-server.dylib
diff --git a/server/src/main/resources/libsteamworks4j-server.so b/server/src/main/resources/libsteamworks4j-server.so
diff --git a/server/src/main/resources/steamworks4j-encryptedappticket.dll b/server/src/main/resources/steamworks4j-encryptedappticket.dll
diff --git a/server/src/main/resources/steamworks4j-encryptedappticket64.dll b/server/src/main/resources/steamworks4j-encryptedappticket64.dll
diff --git a/server/src/main/resources/steamworks4j-server.dll b/server/src/main/resources/steamworks4j-server.dll
diff --git a/server/src/main/resources/steamworks4j-server64.dll b/server/src/main/resources/steamworks4j-server64.dll
diff --git a/tests/pom.xml b/tests/pom.xml
@@ -37,11 +37,6 @@
 			<artifactId>steamworks4j-lwjgl3</artifactId>
 			<version>1.10.0-SNAPSHOT</version>
 		</dependency>
-		<dependency>
-			<groupId>com.code-disaster.steamworks4j</groupId>
-			<artifactId>steamworks4j-server</artifactId>
-			<version>1.10.0-SNAPSHOT</version>
-		</dependency>
 	</dependencies>
 
 	<build>

diff --git a/tests/src/main/java/com/codedisaster/steamworks/test/SteamTestApp.java b/tests/src/main/java/com/codedisaster/steamworks/test/SteamTestApp.java
@@ -1,6 +1,8 @@
 package com.codedisaster.steamworks.test;
 
 import com.codedisaster.steamworks.*;
+import com.codedisaster.steamworks.gdx.SteamLibraryLoaderGdx;
+import com.codedisaster.steamworks.lwjgl3.SteamLibraryLoaderLwjgl3;
 
 import java.util.Scanner;