From 3a69e622ec048dca466e1c78a0f278786f8b40c1 Mon Sep 17 00:00:00 2001
From: zaxar163 <zahar.vcherachny@yandex.ru>
Date: Sun, 21 Apr 2019 16:01:16 +0300
Subject: [PATCH] =?UTF-8?q?[ANY]=20=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82?=
 =?UTF-8?q?=D0=BE=D1=80=D0=B8=D0=BD=D0=B3.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../launchserver/manangers/LaunchServerGsonManager.java     | 2 --
 .../ru/gravit/launchserver/websocket/WebSocketService.java  | 2 +-
 .../src/main/java/ru/gravit/launcher/request/Request.java   | 3 ++-
 .../request/websockets/StandartClientWebSocketService.java  | 5 +++--
 libLauncher/build.gradle                                    | 6 +++---
 libLauncher/src/main/java/ru/gravit/utils/ProviderMap.java  | 1 -
 modules                                                     | 2 +-
 7 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/LaunchServerGsonManager.java b/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/LaunchServerGsonManager.java
index 069a1960..dbf16e3a 100644
--- a/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/LaunchServerGsonManager.java
+++ b/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/LaunchServerGsonManager.java
@@ -1,7 +1,6 @@
 package ru.gravit.launchserver.manangers;
 
 import com.google.gson.GsonBuilder;
-import ru.gravit.launcher.Launcher;
 import ru.gravit.launcher.managers.GsonManager;
 import ru.gravit.launchserver.auth.handler.AuthHandler;
 import ru.gravit.launchserver.auth.hwid.HWIDHandler;
@@ -11,7 +10,6 @@
 import ru.gravit.launchserver.auth.texture.TextureProvider;
 import ru.gravit.launchserver.components.Component;
 import ru.gravit.utils.UniversalJsonAdapter;
-import ru.gravit.utils.helper.LogHelper;
 
 public class LaunchServerGsonManager extends GsonManager {
     @Override
diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/WebSocketService.java b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/WebSocketService.java
index 1493e12a..915fc9f3 100644
--- a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/WebSocketService.java
+++ b/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/WebSocketService.java
@@ -36,7 +36,7 @@
 import java.lang.reflect.Type;
 import java.util.HashMap;
 
-@SuppressWarnings({"unused", "rawtypes"})
+@SuppressWarnings("rawtypes")
 public class WebSocketService {
     public final ChannelGroup channels;
 
diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/Request.java b/LauncherAPI/src/main/java/ru/gravit/launcher/request/Request.java
index 6f1ad51e..4469ad4b 100644
--- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/Request.java
+++ b/LauncherAPI/src/main/java/ru/gravit/launcher/request/Request.java
@@ -39,7 +39,8 @@ public R request() throws Exception {
         return requestDo();
     }
 
-    protected R requestDo() throws Exception
+    @SuppressWarnings("unchecked")
+	protected R requestDo() throws Exception
     {
         return (R) service.sendRequest(this);
     }
diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/StandartClientWebSocketService.java b/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/StandartClientWebSocketService.java
index 22c84ea0..68b2ff3c 100644
--- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/StandartClientWebSocketService.java
+++ b/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/StandartClientWebSocketService.java
@@ -18,12 +18,13 @@ public class StandartClientWebSocketService extends ClientWebSocketService {
     public StandartClientWebSocketService(GsonBuilder gsonBuilder, String address, int i) {
         super(gsonBuilder, address, i);
     }
-    public class RequestFuture implements Future
+    public class RequestFuture implements Future<ResultInterface>
     {
         public final WaitEventHandler.ResultEvent event;
         public boolean isCanceled = false;
 
-        public RequestFuture(RequestInterface request) throws IOException {
+        @SuppressWarnings("rawtypes")
+		public RequestFuture(RequestInterface request) throws IOException {
             event = new WaitEventHandler.ResultEvent();
             event.type = request.getType();
             if(request instanceof Request)
diff --git a/libLauncher/build.gradle b/libLauncher/build.gradle
index 4e6a7d5c..e5db09f7 100644
--- a/libLauncher/build.gradle
+++ b/libLauncher/build.gradle
@@ -2,7 +2,7 @@
 targetCompatibility = '1.8'
 
 dependencies {
-    compileOnly 'org.fusesource.jansi:jansi:1.17.1'
-    compileOnly 'jline:jline:2.14.6'
-    compile 'com.google.code.gson:gson:2.8.5'
+	compileOnly 'org.fusesource.jansi:jansi:1.17.1'
+	compileOnly 'jline:jline:2.14.6'
+	compile 'com.google.code.gson:gson:2.8.5'
 }
diff --git a/libLauncher/src/main/java/ru/gravit/utils/ProviderMap.java b/libLauncher/src/main/java/ru/gravit/utils/ProviderMap.java
index 0e244d98..ce32eef1 100644
--- a/libLauncher/src/main/java/ru/gravit/utils/ProviderMap.java
+++ b/libLauncher/src/main/java/ru/gravit/utils/ProviderMap.java
@@ -1,6 +1,5 @@
 package ru.gravit.utils;
 
-import ru.gravit.utils.helper.LogHelper;
 import ru.gravit.utils.helper.VerifyHelper;
 
 import java.util.Map;
diff --git a/modules b/modules
index 24f19095..412ac81c 160000
--- a/modules
+++ b/modules
@@ -1 +1 @@
-Subproject commit 24f1909589b8bfa23064725fe65a734a9f7af281
+Subproject commit 412ac81c5c60b572d4e36ebdb7c2828dbac86876