diff --git a/Launcher/build.gradle b/Launcher/build.gradle index 904fba57..9aedbb43 100644 --- a/Launcher/build.gradle +++ b/Launcher/build.gradle @@ -36,7 +36,7 @@ } dependencies { - pack project(':LauncherAPI') + pack project(':LauncherAuthlib') bundle 'com.github.oshi:oshi-core:3.13.0' bundle 'com.jfoenix:jfoenix:8.0.8' bundle 'de.jensd:fontawesomefx:8.9' diff --git a/LauncherAPI/build.gradle b/LauncherAuthlib/build.gradle similarity index 100% rename from LauncherAPI/build.gradle rename to LauncherAuthlib/build.gradle diff --git a/LauncherAPI/src/main/java/com/mojang/authlib/minecraft/MinecraftProfileTexture.java b/LauncherAuthlib/src/main/java/com/mojang/authlib/minecraft/MinecraftProfileTexture.java similarity index 100% rename from LauncherAPI/src/main/java/com/mojang/authlib/minecraft/MinecraftProfileTexture.java rename to LauncherAuthlib/src/main/java/com/mojang/authlib/minecraft/MinecraftProfileTexture.java diff --git a/LauncherAPI/src/main/java/com/mojang/authlib/yggdrasil/CompatBridge.java b/LauncherAuthlib/src/main/java/com/mojang/authlib/yggdrasil/CompatBridge.java similarity index 100% rename from LauncherAPI/src/main/java/com/mojang/authlib/yggdrasil/CompatBridge.java rename to LauncherAuthlib/src/main/java/com/mojang/authlib/yggdrasil/CompatBridge.java diff --git a/LauncherAPI/src/main/java/com/mojang/authlib/yggdrasil/CompatProfile.java b/LauncherAuthlib/src/main/java/com/mojang/authlib/yggdrasil/CompatProfile.java similarity index 100% rename from LauncherAPI/src/main/java/com/mojang/authlib/yggdrasil/CompatProfile.java rename to LauncherAuthlib/src/main/java/com/mojang/authlib/yggdrasil/CompatProfile.java diff --git a/LauncherAPI/src/main/java/com/mojang/authlib/yggdrasil/LegacyBridge.java b/LauncherAuthlib/src/main/java/com/mojang/authlib/yggdrasil/LegacyBridge.java similarity index 100% rename from LauncherAPI/src/main/java/com/mojang/authlib/yggdrasil/LegacyBridge.java rename to LauncherAuthlib/src/main/java/com/mojang/authlib/yggdrasil/LegacyBridge.java diff --git a/LauncherAPI/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilAuthenticationService.java b/LauncherAuthlib/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilAuthenticationService.java similarity index 100% rename from LauncherAPI/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilAuthenticationService.java rename to LauncherAuthlib/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilAuthenticationService.java diff --git a/LauncherAPI/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java b/LauncherAuthlib/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java similarity index 100% rename from LauncherAPI/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java rename to LauncherAuthlib/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java diff --git a/LauncherAPI/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilMinecraftSessionService.java b/LauncherAuthlib/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilMinecraftSessionService.java similarity index 100% rename from LauncherAPI/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilMinecraftSessionService.java rename to LauncherAuthlib/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilMinecraftSessionService.java diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/downloader/ListDownloader.java b/LauncherAuthlib/src/main/java/ru/gravit/launcher/downloader/ListDownloader.java similarity index 100% rename from LauncherAPI/src/main/java/ru/gravit/launcher/downloader/ListDownloader.java rename to LauncherAuthlib/src/main/java/ru/gravit/launcher/downloader/ListDownloader.java diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/PingRequest.java b/LauncherAuthlib/src/main/java/ru/gravit/launcher/request/PingRequest.java similarity index 100% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/PingRequest.java rename to LauncherAuthlib/src/main/java/ru/gravit/launcher/request/PingRequest.java diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/Request.java b/LauncherAuthlib/src/main/java/ru/gravit/launcher/request/Request.java similarity index 100% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/Request.java rename to LauncherAuthlib/src/main/java/ru/gravit/launcher/request/Request.java diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/admin/ExecCommandRequest.java b/LauncherAuthlib/src/main/java/ru/gravit/launcher/request/admin/ExecCommandRequest.java similarity index 100% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/admin/ExecCommandRequest.java rename to LauncherAuthlib/src/main/java/ru/gravit/launcher/request/admin/ExecCommandRequest.java diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/AuthRequest.java b/LauncherAuthlib/src/main/java/ru/gravit/launcher/request/auth/AuthRequest.java similarity index 100% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/AuthRequest.java rename to LauncherAuthlib/src/main/java/ru/gravit/launcher/request/auth/AuthRequest.java diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/CheckServerRequest.java b/LauncherAuthlib/src/main/java/ru/gravit/launcher/request/auth/CheckServerRequest.java similarity index 100% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/CheckServerRequest.java rename to LauncherAuthlib/src/main/java/ru/gravit/launcher/request/auth/CheckServerRequest.java diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/GetAvailabilityAuthRequest.java b/LauncherAuthlib/src/main/java/ru/gravit/launcher/request/auth/GetAvailabilityAuthRequest.java similarity index 100% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/GetAvailabilityAuthRequest.java rename to LauncherAuthlib/src/main/java/ru/gravit/launcher/request/auth/GetAvailabilityAuthRequest.java diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/JoinServerRequest.java b/LauncherAuthlib/src/main/java/ru/gravit/launcher/request/auth/JoinServerRequest.java similarity index 100% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/JoinServerRequest.java rename to LauncherAuthlib/src/main/java/ru/gravit/launcher/request/auth/JoinServerRequest.java diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/RestoreSessionRequest.java b/LauncherAuthlib/src/main/java/ru/gravit/launcher/request/auth/RestoreSessionRequest.java similarity index 100% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/RestoreSessionRequest.java rename to LauncherAuthlib/src/main/java/ru/gravit/launcher/request/auth/RestoreSessionRequest.java diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/SetProfileRequest.java b/LauncherAuthlib/src/main/java/ru/gravit/launcher/request/auth/SetProfileRequest.java similarity index 100% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/SetProfileRequest.java rename to LauncherAuthlib/src/main/java/ru/gravit/launcher/request/auth/SetProfileRequest.java diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/update/LauncherRequest.java b/LauncherAuthlib/src/main/java/ru/gravit/launcher/request/update/LauncherRequest.java similarity index 100% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/update/LauncherRequest.java rename to LauncherAuthlib/src/main/java/ru/gravit/launcher/request/update/LauncherRequest.java diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/update/ProfilesRequest.java b/LauncherAuthlib/src/main/java/ru/gravit/launcher/request/update/ProfilesRequest.java similarity index 100% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/update/ProfilesRequest.java rename to LauncherAuthlib/src/main/java/ru/gravit/launcher/request/update/ProfilesRequest.java diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/update/UpdateListRequest.java b/LauncherAuthlib/src/main/java/ru/gravit/launcher/request/update/UpdateListRequest.java similarity index 100% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/update/UpdateListRequest.java rename to LauncherAuthlib/src/main/java/ru/gravit/launcher/request/update/UpdateListRequest.java diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/update/UpdateRequest.java b/LauncherAuthlib/src/main/java/ru/gravit/launcher/request/update/UpdateRequest.java similarity index 100% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/update/UpdateRequest.java rename to LauncherAuthlib/src/main/java/ru/gravit/launcher/request/update/UpdateRequest.java diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/uuid/BatchProfileByUsernameRequest.java b/LauncherAuthlib/src/main/java/ru/gravit/launcher/request/uuid/BatchProfileByUsernameRequest.java similarity index 100% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/uuid/BatchProfileByUsernameRequest.java rename to LauncherAuthlib/src/main/java/ru/gravit/launcher/request/uuid/BatchProfileByUsernameRequest.java diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/uuid/ProfileByUUIDRequest.java b/LauncherAuthlib/src/main/java/ru/gravit/launcher/request/uuid/ProfileByUUIDRequest.java similarity index 100% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/uuid/ProfileByUUIDRequest.java rename to LauncherAuthlib/src/main/java/ru/gravit/launcher/request/uuid/ProfileByUUIDRequest.java diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/uuid/ProfileByUsernameRequest.java b/LauncherAuthlib/src/main/java/ru/gravit/launcher/request/uuid/ProfileByUsernameRequest.java similarity index 100% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/uuid/ProfileByUsernameRequest.java rename to LauncherAuthlib/src/main/java/ru/gravit/launcher/request/uuid/ProfileByUsernameRequest.java diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/ClientJSONPoint.java b/LauncherAuthlib/src/main/java/ru/gravit/launcher/request/websockets/ClientJSONPoint.java similarity index 100% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/ClientJSONPoint.java rename to LauncherAuthlib/src/main/java/ru/gravit/launcher/request/websockets/ClientJSONPoint.java diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/ClientWebSocketService.java b/LauncherAuthlib/src/main/java/ru/gravit/launcher/request/websockets/ClientWebSocketService.java similarity index 100% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/ClientWebSocketService.java rename to LauncherAuthlib/src/main/java/ru/gravit/launcher/request/websockets/ClientWebSocketService.java diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/JsonRequestAdapter.java b/LauncherAuthlib/src/main/java/ru/gravit/launcher/request/websockets/JsonRequestAdapter.java similarity index 100% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/JsonRequestAdapter.java rename to LauncherAuthlib/src/main/java/ru/gravit/launcher/request/websockets/JsonRequestAdapter.java diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/JsonResultAdapter.java b/LauncherAuthlib/src/main/java/ru/gravit/launcher/request/websockets/JsonResultAdapter.java similarity index 100% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/JsonResultAdapter.java rename to LauncherAuthlib/src/main/java/ru/gravit/launcher/request/websockets/JsonResultAdapter.java diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/RequestInterface.java b/LauncherAuthlib/src/main/java/ru/gravit/launcher/request/websockets/RequestInterface.java similarity index 100% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/RequestInterface.java rename to LauncherAuthlib/src/main/java/ru/gravit/launcher/request/websockets/RequestInterface.java diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/StandartClientWebSocketService.java b/LauncherAuthlib/src/main/java/ru/gravit/launcher/request/websockets/StandartClientWebSocketService.java similarity index 100% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/StandartClientWebSocketService.java rename to LauncherAuthlib/src/main/java/ru/gravit/launcher/request/websockets/StandartClientWebSocketService.java diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/WaitEventHandler.java b/LauncherAuthlib/src/main/java/ru/gravit/launcher/request/websockets/WaitEventHandler.java similarity index 100% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/WaitEventHandler.java rename to LauncherAuthlib/src/main/java/ru/gravit/launcher/request/websockets/WaitEventHandler.java diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/WebSocketClientHandler.java b/LauncherAuthlib/src/main/java/ru/gravit/launcher/request/websockets/WebSocketClientHandler.java similarity index 100% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/WebSocketClientHandler.java rename to LauncherAuthlib/src/main/java/ru/gravit/launcher/request/websockets/WebSocketClientHandler.java diff --git a/ServerWrapper/build.gradle b/ServerWrapper/build.gradle index b2669795..6341136f 100644 --- a/ServerWrapper/build.gradle +++ b/ServerWrapper/build.gradle @@ -27,7 +27,7 @@ } dependencies { - pack project(':LauncherAPI') + pack project(':LauncherAuthlib') pack 'org.apache.httpcomponents:httpclient:4.5.7' pack 'io.netty:netty-all:4.1.32.Final' } diff --git a/settings.gradle b/settings.gradle index d10b250c..5f484d45 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,7 +3,7 @@ include 'Launcher' include 'Radon' include 'libLauncher' -include 'LauncherAPI' +include 'LauncherAuthlib' include 'ServerWrapper' include 'LaunchServer' include 'LaunchServerConsole'