diff --git a/java-wrapper/pom.xml b/java-wrapper/pom.xml index d767278d..263fbbe0 100644 --- a/java-wrapper/pom.xml +++ b/java-wrapper/pom.xml @@ -134,6 +134,13 @@ org.apache.maven.plugins maven-jar-plugin 2.4 + + + + com.codedisaster.steamworks + + + diff --git a/server/src/main/java/com/codedisaster/steamworks/SteamEncryptedAppTicket.java b/java-wrapper/src/main/java/com/codedisaster/steamworks/SteamEncryptedAppTicket.java similarity index 100% rename from server/src/main/java/com/codedisaster/steamworks/SteamEncryptedAppTicket.java rename to java-wrapper/src/main/java/com/codedisaster/steamworks/SteamEncryptedAppTicket.java diff --git a/server/src/main/java/com/codedisaster/steamworks/SteamEncryptedAppTicketNative.java b/java-wrapper/src/main/java/com/codedisaster/steamworks/SteamEncryptedAppTicketNative.java similarity index 100% rename from server/src/main/java/com/codedisaster/steamworks/SteamEncryptedAppTicketNative.java rename to java-wrapper/src/main/java/com/codedisaster/steamworks/SteamEncryptedAppTicketNative.java diff --git a/server/src/main/java/com/codedisaster/steamworks/SteamGameServer.java b/java-wrapper/src/main/java/com/codedisaster/steamworks/SteamGameServer.java similarity index 100% rename from server/src/main/java/com/codedisaster/steamworks/SteamGameServer.java rename to java-wrapper/src/main/java/com/codedisaster/steamworks/SteamGameServer.java diff --git a/server/src/main/java/com/codedisaster/steamworks/SteamGameServerAPI.java b/java-wrapper/src/main/java/com/codedisaster/steamworks/SteamGameServerAPI.java similarity index 100% rename from server/src/main/java/com/codedisaster/steamworks/SteamGameServerAPI.java rename to java-wrapper/src/main/java/com/codedisaster/steamworks/SteamGameServerAPI.java diff --git a/server/src/main/java/com/codedisaster/steamworks/SteamGameServerAPINative.java b/java-wrapper/src/main/java/com/codedisaster/steamworks/SteamGameServerAPINative.java similarity index 100% rename from server/src/main/java/com/codedisaster/steamworks/SteamGameServerAPINative.java rename to java-wrapper/src/main/java/com/codedisaster/steamworks/SteamGameServerAPINative.java diff --git a/server/src/main/java/com/codedisaster/steamworks/SteamGameServerCallback.java b/java-wrapper/src/main/java/com/codedisaster/steamworks/SteamGameServerCallback.java similarity index 100% rename from server/src/main/java/com/codedisaster/steamworks/SteamGameServerCallback.java rename to java-wrapper/src/main/java/com/codedisaster/steamworks/SteamGameServerCallback.java diff --git a/server/src/main/java/com/codedisaster/steamworks/SteamGameServerCallbackAdapter.java b/java-wrapper/src/main/java/com/codedisaster/steamworks/SteamGameServerCallbackAdapter.java similarity index 100% rename from server/src/main/java/com/codedisaster/steamworks/SteamGameServerCallbackAdapter.java rename to java-wrapper/src/main/java/com/codedisaster/steamworks/SteamGameServerCallbackAdapter.java diff --git a/server/src/main/java/com/codedisaster/steamworks/SteamGameServerHTTP.java b/java-wrapper/src/main/java/com/codedisaster/steamworks/SteamGameServerHTTP.java similarity index 100% rename from server/src/main/java/com/codedisaster/steamworks/SteamGameServerHTTP.java rename to java-wrapper/src/main/java/com/codedisaster/steamworks/SteamGameServerHTTP.java diff --git a/server/src/main/java/com/codedisaster/steamworks/SteamGameServerHTTPNative.java b/java-wrapper/src/main/java/com/codedisaster/steamworks/SteamGameServerHTTPNative.java similarity index 100% rename from server/src/main/java/com/codedisaster/steamworks/SteamGameServerHTTPNative.java rename to java-wrapper/src/main/java/com/codedisaster/steamworks/SteamGameServerHTTPNative.java diff --git a/server/src/main/java/com/codedisaster/steamworks/SteamGameServerNative.java b/java-wrapper/src/main/java/com/codedisaster/steamworks/SteamGameServerNative.java similarity index 100% rename from server/src/main/java/com/codedisaster/steamworks/SteamGameServerNative.java rename to java-wrapper/src/main/java/com/codedisaster/steamworks/SteamGameServerNative.java diff --git a/server/src/main/java/com/codedisaster/steamworks/SteamGameServerNetworking.java b/java-wrapper/src/main/java/com/codedisaster/steamworks/SteamGameServerNetworking.java similarity index 100% rename from server/src/main/java/com/codedisaster/steamworks/SteamGameServerNetworking.java rename to java-wrapper/src/main/java/com/codedisaster/steamworks/SteamGameServerNetworking.java diff --git a/server/src/main/java/com/codedisaster/steamworks/SteamGameServerNetworkingNative.java b/java-wrapper/src/main/java/com/codedisaster/steamworks/SteamGameServerNetworkingNative.java similarity index 100% rename from server/src/main/java/com/codedisaster/steamworks/SteamGameServerNetworkingNative.java rename to java-wrapper/src/main/java/com/codedisaster/steamworks/SteamGameServerNetworkingNative.java diff --git a/server/src/main/java/com/codedisaster/steamworks/SteamGameServerStats.java b/java-wrapper/src/main/java/com/codedisaster/steamworks/SteamGameServerStats.java similarity index 100% rename from server/src/main/java/com/codedisaster/steamworks/SteamGameServerStats.java rename to java-wrapper/src/main/java/com/codedisaster/steamworks/SteamGameServerStats.java diff --git a/server/src/main/java/com/codedisaster/steamworks/SteamGameServerStatsCallback.java b/java-wrapper/src/main/java/com/codedisaster/steamworks/SteamGameServerStatsCallback.java similarity index 100% rename from server/src/main/java/com/codedisaster/steamworks/SteamGameServerStatsCallback.java rename to java-wrapper/src/main/java/com/codedisaster/steamworks/SteamGameServerStatsCallback.java diff --git a/server/src/main/java/com/codedisaster/steamworks/SteamGameServerStatsCallbackAdapter.java b/java-wrapper/src/main/java/com/codedisaster/steamworks/SteamGameServerStatsCallbackAdapter.java similarity index 100% rename from server/src/main/java/com/codedisaster/steamworks/SteamGameServerStatsCallbackAdapter.java rename to java-wrapper/src/main/java/com/codedisaster/steamworks/SteamGameServerStatsCallbackAdapter.java diff --git a/server/src/main/java/com/codedisaster/steamworks/SteamGameServerStatsNative.java b/java-wrapper/src/main/java/com/codedisaster/steamworks/SteamGameServerStatsNative.java similarity index 100% rename from server/src/main/java/com/codedisaster/steamworks/SteamGameServerStatsNative.java rename to java-wrapper/src/main/java/com/codedisaster/steamworks/SteamGameServerStatsNative.java diff --git a/server/src/main/native/SteamGameServerCallback.cpp b/java-wrapper/src/main/native/SteamGameServerCallback.cpp similarity index 100% rename from server/src/main/native/SteamGameServerCallback.cpp rename to java-wrapper/src/main/native/SteamGameServerCallback.cpp diff --git a/server/src/main/native/SteamGameServerCallback.h b/java-wrapper/src/main/native/SteamGameServerCallback.h similarity index 100% rename from server/src/main/native/SteamGameServerCallback.h rename to java-wrapper/src/main/native/SteamGameServerCallback.h diff --git a/server/src/main/native/SteamGameServerCallbackAdapter.cpp b/java-wrapper/src/main/native/SteamGameServerCallbackAdapter.cpp similarity index 100% rename from server/src/main/native/SteamGameServerCallbackAdapter.cpp rename to java-wrapper/src/main/native/SteamGameServerCallbackAdapter.cpp diff --git a/server/src/main/native/SteamGameServerCallbackAdapter.h b/java-wrapper/src/main/native/SteamGameServerCallbackAdapter.h similarity index 100% rename from server/src/main/native/SteamGameServerCallbackAdapter.h rename to java-wrapper/src/main/native/SteamGameServerCallbackAdapter.h diff --git a/server/src/main/native/SteamGameServerHTTPCallback.cpp b/java-wrapper/src/main/native/SteamGameServerHTTPCallback.cpp similarity index 100% rename from server/src/main/native/SteamGameServerHTTPCallback.cpp rename to java-wrapper/src/main/native/SteamGameServerHTTPCallback.cpp diff --git a/server/src/main/native/SteamGameServerHTTPCallback.h b/java-wrapper/src/main/native/SteamGameServerHTTPCallback.h similarity index 100% rename from server/src/main/native/SteamGameServerHTTPCallback.h rename to java-wrapper/src/main/native/SteamGameServerHTTPCallback.h diff --git a/server/src/main/native/SteamGameServerNetworkingCallback.cpp b/java-wrapper/src/main/native/SteamGameServerNetworkingCallback.cpp similarity index 100% rename from server/src/main/native/SteamGameServerNetworkingCallback.cpp rename to java-wrapper/src/main/native/SteamGameServerNetworkingCallback.cpp diff --git a/server/src/main/native/SteamGameServerNetworkingCallback.h b/java-wrapper/src/main/native/SteamGameServerNetworkingCallback.h similarity index 100% rename from server/src/main/native/SteamGameServerNetworkingCallback.h rename to java-wrapper/src/main/native/SteamGameServerNetworkingCallback.h diff --git a/server/src/main/native/SteamGameServerStatsCallback.cpp b/java-wrapper/src/main/native/SteamGameServerStatsCallback.cpp similarity index 100% rename from server/src/main/native/SteamGameServerStatsCallback.cpp rename to java-wrapper/src/main/native/SteamGameServerStatsCallback.cpp diff --git a/server/src/main/native/SteamGameServerStatsCallback.h b/java-wrapper/src/main/native/SteamGameServerStatsCallback.h similarity index 100% rename from server/src/main/native/SteamGameServerStatsCallback.h rename to java-wrapper/src/main/native/SteamGameServerStatsCallback.h diff --git a/jnigen/pom.xml b/jnigen/pom.xml index 3023eb31..adbc6863 100644 --- a/jnigen/pom.xml +++ b/jnigen/pom.xml @@ -32,11 +32,6 @@ steamworks4j 1.10.0-SNAPSHOT - - com.code-disaster.steamworks4j - steamworks4j-server - 1.10.0-SNAPSHOT - diff --git a/loader/gdx/pom.xml b/loader/gdx/pom.xml index 883e4655..ddd7571e 100644 --- a/loader/gdx/pom.xml +++ b/loader/gdx/pom.xml @@ -104,6 +104,13 @@ org.apache.maven.plugins maven-jar-plugin 2.4 + + + + com.codedisaster.steamworks.gdx + + + diff --git a/loader/gdx/src/main/java/com/codedisaster/steamworks/SteamLibraryLoaderGdx.java b/loader/gdx/src/main/java/com/codedisaster/steamworks/gdx/SteamLibraryLoaderGdx.java similarity index 94% rename from loader/gdx/src/main/java/com/codedisaster/steamworks/SteamLibraryLoaderGdx.java rename to loader/gdx/src/main/java/com/codedisaster/steamworks/gdx/SteamLibraryLoaderGdx.java index e352032a..407e9497 100644 --- a/loader/gdx/src/main/java/com/codedisaster/steamworks/SteamLibraryLoaderGdx.java +++ b/loader/gdx/src/main/java/com/codedisaster/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 index d32c1a5d..797b49fc 100644 --- a/loader/lwjgl3/pom.xml +++ b/loader/lwjgl3/pom.xml @@ -168,6 +168,13 @@ org.apache.maven.plugins maven-jar-plugin 2.4 + + + + com.codedisaster.steamworks.lwjgl3 + + + diff --git a/loader/lwjgl3/src/main/java/com/codedisaster/steamworks/SteamLibraryLoaderLwjgl3.java b/loader/lwjgl3/src/main/java/com/codedisaster/steamworks/lwjgl3/SteamLibraryLoaderLwjgl3.java similarity index 88% rename from loader/lwjgl3/src/main/java/com/codedisaster/steamworks/SteamLibraryLoaderLwjgl3.java rename to loader/lwjgl3/src/main/java/com/codedisaster/steamworks/lwjgl3/SteamLibraryLoaderLwjgl3.java index 2ad5f59c..88081181 100644 --- a/loader/lwjgl3/src/main/java/com/codedisaster/steamworks/SteamLibraryLoaderLwjgl3.java +++ b/loader/lwjgl3/src/main/java/com/codedisaster/steamworks/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 index 665a56d8..a32fee11 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,6 @@ jnigen loader/gdx loader/lwjgl3 - server tests diff --git a/server/pom.xml b/server/pom.xml deleted file mode 100644 index 1c19f095..00000000 --- a/server/pom.xml +++ /dev/null @@ -1,188 +0,0 @@ - - - 4.0.0 - - com.code-disaster.steamworks4j - steamworks4j-server - 1.10.0-SNAPSHOT - - jar - - Steam API Java Wrapper - GameServer - Java wrapper to access the Steamworks API. - http://github.com/code-disaster/steamworks4j - - - http://github.com/code-disaster/steamworks4j/issues - - - - - MIT License - http://www.opensource.org/licenses/mit-license.php - - - - - - Daniel Ludwig - codi@code-disaster.com - +1 - - - - - scm:git:https://github.com/code-disaster/steamworks4j.git - scm:git:https://github.com/code-disaster/steamworks4j.git - http://github.com/code-disaster/steamworks4j - - - - - release - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 3.0.1 - - - sign-artifacts - verify - - sign - - - - - - - - - snapshot - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - - - libs - - - - com.coderplus.maven.plugins - copy-rename-maven-plugin - 1.0 - - - copy-libs - compile - - copy - - - - - ../sdk/public/steam/lib/linux64/libsdkencryptedappticket.so - ${project.build.outputDirectory}/libsdkencryptedappticket.so - - - ../sdk/public/steam/lib/osx/libsdkencryptedappticket.dylib - ${project.build.outputDirectory}/libsdkencryptedappticket.dylib - - - ../sdk/public/steam/lib/win32/sdkencryptedappticket.dll - ${project.build.outputDirectory}/sdkencryptedappticket.dll - - - ../sdk/public/steam/lib/win64/sdkencryptedappticket64.dll - ${project.build.outputDirectory}/sdkencryptedappticket64.dll - - - - - - - - - - - - - UTF-8 - UTF-8 - - - - - com.code-disaster.steamworks4j - steamworks4j - 1.10.0-SNAPSHOT - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 2.4 - - - - - - maven-compiler-plugin - 3.0 - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - true - - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.3.1 - - - attach-javadocs - - jar - - - none - - - - - - - diff --git a/server/src/main/resources/libsteamworks4j-encryptedappticket.dylib b/server/src/main/resources/libsteamworks4j-encryptedappticket.dylib deleted file mode 100755 index 1f3f068b..00000000 Binary files a/server/src/main/resources/libsteamworks4j-encryptedappticket.dylib and /dev/null differ diff --git a/server/src/main/resources/libsteamworks4j-encryptedappticket.so b/server/src/main/resources/libsteamworks4j-encryptedappticket.so deleted file mode 100755 index dc759c6d..00000000 Binary files a/server/src/main/resources/libsteamworks4j-encryptedappticket.so and /dev/null differ diff --git a/server/src/main/resources/libsteamworks4j-server.dylib b/server/src/main/resources/libsteamworks4j-server.dylib deleted file mode 100755 index a627e5a6..00000000 Binary files a/server/src/main/resources/libsteamworks4j-server.dylib and /dev/null differ diff --git a/server/src/main/resources/libsteamworks4j-server.so b/server/src/main/resources/libsteamworks4j-server.so deleted file mode 100755 index 148ffe4f..00000000 Binary files a/server/src/main/resources/libsteamworks4j-server.so and /dev/null differ diff --git a/server/src/main/resources/steamworks4j-encryptedappticket.dll b/server/src/main/resources/steamworks4j-encryptedappticket.dll deleted file mode 100644 index e2c8bf06..00000000 Binary files a/server/src/main/resources/steamworks4j-encryptedappticket.dll and /dev/null differ diff --git a/server/src/main/resources/steamworks4j-encryptedappticket64.dll b/server/src/main/resources/steamworks4j-encryptedappticket64.dll deleted file mode 100644 index a0b25427..00000000 Binary files a/server/src/main/resources/steamworks4j-encryptedappticket64.dll and /dev/null differ diff --git a/server/src/main/resources/steamworks4j-server.dll b/server/src/main/resources/steamworks4j-server.dll deleted file mode 100644 index c8c880de..00000000 Binary files a/server/src/main/resources/steamworks4j-server.dll and /dev/null differ diff --git a/server/src/main/resources/steamworks4j-server64.dll b/server/src/main/resources/steamworks4j-server64.dll deleted file mode 100644 index d0445982..00000000 Binary files a/server/src/main/resources/steamworks4j-server64.dll and /dev/null differ diff --git a/tests/pom.xml b/tests/pom.xml index 08b22c29..a9b8c694 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -37,11 +37,6 @@ steamworks4j-lwjgl3 1.10.0-SNAPSHOT - - com.code-disaster.steamworks4j - steamworks4j-server - 1.10.0-SNAPSHOT - diff --git a/tests/src/main/java/com/codedisaster/steamworks/test/SteamTestApp.java b/tests/src/main/java/com/codedisaster/steamworks/test/SteamTestApp.java index 6e6872ca..ef7a43cb 100644 --- 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;