From 7979989724a7404f971a530c784697ee56373495 Mon Sep 17 00:00:00 2001 From: Zaxar163 Date: Thu, 30 Jan 2020 16:11:39 +0100 Subject: [PATCH] =?UTF-8?q?[ANY]=20=D0=A3=D0=B4=D0=B0=D0=BB=D0=B8=D0=BB=20?= =?UTF-8?q?=D1=81=D1=82=D0=B0=D1=80=D1=8B=D0=B5=20usePermission=20+=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=B4=D1=87=D0=B8=D1=81=D1=82=D0=B8=D0=BB=20=D0=B8?= =?UTF-8?q?=D0=BC=D0=BF=D0=BE=D1=80=D1=82=D1=8B.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/pro/gravit/launchserver/auth/AuthProviderPair.java | 1 - .../launchserver/auth/provider/PostgreSQLAuthProvider.java | 1 - .../java/pro/gravit/launchserver/binary/BuildContext.java | 1 - .../launchserver/binary/tasks/AdditionalFixesApplyTask.java | 2 -- .../pro/gravit/launchserver/binary/tasks/MainBuildTask.java | 6 ------ .../java/pro/gravit/launchserver/ASMTransformersTest.java | 5 ----- .../main/java/pro/gravit/launcher/server/ServerWrapper.java | 1 - modules | 2 +- 8 files changed, 1 insertion(+), 18 deletions(-) diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/AuthProviderPair.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/AuthProviderPair.java index 592f9462..5af479e3 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/AuthProviderPair.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/AuthProviderPair.java @@ -7,7 +7,6 @@ import pro.gravit.launchserver.auth.texture.TextureProvider; import java.io.IOException; -import java.util.HashMap; import java.util.Map; public class AuthProviderPair { diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/PostgreSQLAuthProvider.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/PostgreSQLAuthProvider.java index f85ea7ea..3599f249 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/PostgreSQLAuthProvider.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/PostgreSQLAuthProvider.java @@ -19,7 +19,6 @@ public final class PostgreSQLAuthProvider extends AuthProvider { private String query; private String message; private String[] queryParams; - private boolean usePermission; @Override public AuthProviderResult auth(String login, AuthRequest.AuthPasswordInterface password, String ip) throws SQLException, AuthException { diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/binary/BuildContext.java b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/BuildContext.java index 2adc9a08..24692d17 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/binary/BuildContext.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/BuildContext.java @@ -5,7 +5,6 @@ import pro.gravit.launcher.serialize.stream.StreamObject; import pro.gravit.launchserver.binary.tasks.MainBuildTask; import pro.gravit.utils.helper.IOHelper; -import pro.gravit.utils.helper.JarHelper; import pro.gravit.utils.helper.LogHelper; import pro.gravit.utils.helper.SecurityHelper; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/AdditionalFixesApplyTask.java b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/AdditionalFixesApplyTask.java index eac0696f..fdbe43ed 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/AdditionalFixesApplyTask.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/AdditionalFixesApplyTask.java @@ -11,10 +11,8 @@ import java.io.IOException; import java.io.InputStream; import java.nio.file.Path; -import java.util.List; import java.util.function.Predicate; import java.util.jar.JarFile; -import java.util.stream.Collectors; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; import java.util.zip.ZipOutputStream; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/MainBuildTask.java b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/MainBuildTask.java index c17f8c05..41c66644 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/MainBuildTask.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/MainBuildTask.java @@ -17,7 +17,6 @@ import pro.gravit.launchserver.binary.BuildContext; import pro.gravit.launchserver.binary.LauncherConfigurator; import pro.gravit.utils.HookException; -import pro.gravit.utils.HookSet; import pro.gravit.utils.helper.IOHelper; import pro.gravit.utils.helper.JarHelper; import pro.gravit.utils.helper.LogHelper; @@ -29,13 +28,8 @@ import java.util.*; import java.util.jar.JarFile; import java.util.stream.Collectors; -import java.util.zip.ZipEntry; -import java.util.zip.ZipException; -import java.util.zip.ZipInputStream; import java.util.zip.ZipOutputStream; -import static pro.gravit.utils.helper.IOHelper.newZipEntry; - public class MainBuildTask implements LauncherBuildTask { private final LaunchServer server; public final ClassMetadataReader reader; diff --git a/LaunchServer/src/test/java/pro/gravit/launchserver/ASMTransformersTest.java b/LaunchServer/src/test/java/pro/gravit/launchserver/ASMTransformersTest.java index 6e63d794..fe27cab0 100644 --- a/LaunchServer/src/test/java/pro/gravit/launchserver/ASMTransformersTest.java +++ b/LaunchServer/src/test/java/pro/gravit/launchserver/ASMTransformersTest.java @@ -6,15 +6,10 @@ import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.tree.ClassNode; -import org.objectweb.asm.tree.FieldNode; import pro.gravit.launcher.LauncherInject; -import pro.gravit.launcher.LauncherInjectionConstructor; import pro.gravit.launchserver.asm.InjectClassAcceptor; -import pro.gravit.utils.PublicURLClassLoader; import pro.gravit.utils.helper.JarHelper; -import pro.gravit.utils.helper.LogHelper; -import java.io.InputStream; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.HashMap; diff --git a/ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapper.java b/ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapper.java index a81b9f1f..a003ef25 100644 --- a/ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapper.java +++ b/ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapper.java @@ -27,7 +27,6 @@ import java.net.URL; import java.nio.file.Path; import java.nio.file.Paths; -import java.security.AuthProvider; import java.security.interfaces.ECPublicKey; import java.security.spec.InvalidKeySpecException; import java.util.Arrays; diff --git a/modules b/modules index e7162df3..f4197b87 160000 --- a/modules +++ b/modules @@ -1 +1 @@ -Subproject commit e7162df352259e2e261a210b8b5cd85fdf722fa2 +Subproject commit f4197b877313a01edd024cbdc8533515266f534f