From 600c65d2f2470f633b77e8e1ad5aa25e1992c10f Mon Sep 17 00:00:00 2001 From: Zaxar163 Date: Wed, 23 Oct 2019 15:23:50 +0200 Subject: [PATCH 1/5] =?UTF-8?q?[FIX]=20=D0=9E=D1=88=D0=B8=D0=B1=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=BD=D0=B0=20MAC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/pro/gravit/launcher/client/ClientLauncher.java | 2 +- modules | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncher.java b/Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncher.java index dee3cd85..e23fb046 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncher.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncher.java @@ -537,7 +537,7 @@ private static LinkedList resolveClassPathList(Path clientDir, String... c private static Stream resolveClassPathStream(Path clientDir, String... classPath) throws IOException { Stream.Builder builder = Stream.builder(); for (String classPathEntry : classPath) { - Path path = clientDir.resolve(IOHelper.toPath(classPathEntry)); + Path path = clientDir.resolve(IOHelper.toPath(classPathEntry.replace(IOHelper.CROSS_SEPARATOR, IOHelper.PLATFORM_SEPARATOR))); if (IOHelper.isDir(path)) { // Recursive walking and adding IOHelper.walk(path, new ClassPathFileVisitor(builder), false); continue; diff --git a/modules b/modules index 6f008f59..8bd7ee83 160000 --- a/modules +++ b/modules @@ -1 +1 @@ -Subproject commit 6f008f595975887b6a1366cb444b82b339e3afad +Subproject commit 8bd7ee839ad17cc75ff26653189f6cb995260989 From becb12887da36c53a5dac182792029f919310c89 Mon Sep 17 00:00:00 2001 From: Zaxar163 Date: Wed, 23 Oct 2019 17:45:25 +0200 Subject: [PATCH 2/5] =?UTF-8?q?[ANY]=20=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D0=B8?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules b/modules index 8bd7ee83..52818e6e 160000 --- a/modules +++ b/modules @@ -1 +1 @@ -Subproject commit 8bd7ee839ad17cc75ff26653189f6cb995260989 +Subproject commit 52818e6ef05d90ad678d02e83f9bd4140d8eda34 From a681f43312e23f5a9babeca1e8860181f7ee672c Mon Sep 17 00:00:00 2001 From: Zaxar163 Date: Thu, 24 Oct 2019 15:18:01 +0200 Subject: [PATCH 3/5] =?UTF-8?q?[FIX]=20=D0=9B=D0=B8=D1=88=D0=BD=D0=B8?= =?UTF-8?q?=D0=B9=20final?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/pro/gravit/launcher/client/ClientLauncher.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncher.java b/Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncher.java index e23fb046..008afe03 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncher.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncher.java @@ -589,7 +589,7 @@ public interface ParamsAPI { void write(ParamContainer p); } - public static final ParamsAPI container = new ParamsAPI() { + public static ParamsAPI container = new ParamsAPI() { @Override public ParamContainer read() throws Exception { ParamContainer p; From 5e294d1517724e7199e9fec86ed15f1c19980fa8 Mon Sep 17 00:00:00 2001 From: Zaxar163 Date: Thu, 24 Oct 2019 15:19:55 +0200 Subject: [PATCH 4/5] =?UTF-8?q?[FIX]=20=D0=90=20=D0=B5=D1=89=D1=91=20?= =?UTF-8?q?=D0=B8=D0=B4=D0=B5=D1=8F=20=D0=B2=20=D0=BD=D0=B5=D0=BA=D0=BE?= =?UTF-8?q?=D1=82=D0=BE=D1=80=D1=8B=D1=85=20=D0=BC=D0=B5=D1=81=D1=82=D0=B0?= =?UTF-8?q?=D1=85=20=D0=B8=D1=81=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=B2=20=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D1=84=D0=B5?= =?UTF-8?q?=D0=B9=D1=81=D0=B0=D1=85=20=D0=BF=D0=BE=D0=B5=D0=BB=D0=B0...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/pro/gravit/launcher/client/ClientLauncher.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncher.java b/Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncher.java index 008afe03..9e523ce7 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncher.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncher.java @@ -586,7 +586,7 @@ private ClientLauncher() { public interface ParamsAPI { ParamContainer read() throws Exception; - void write(ParamContainer p); + void write(ParamContainer p) throws Exception; } public static ParamsAPI container = new ParamsAPI() { @@ -603,7 +603,7 @@ public ParamContainer read() throws Exception { } @Override - public void write(ParamContainer p) { + public void write(ParamContainer p) throws Exception { setWriteParamsThread(CommonHelper.newThread("Client params writter", true, () -> { try { From e55f266b915b15eadd6796e5e10cfe9ef333eb08 Mon Sep 17 00:00:00 2001 From: Zaxar163 Date: Thu, 24 Oct 2019 15:22:17 +0200 Subject: [PATCH 5/5] =?UTF-8?q?[ANY]=20=D0=A0=D0=B5=D1=84=D0=B0=D0=BA?= =?UTF-8?q?=D1=82=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/binary/tasks/AdditionalFixesApplyTask.java | 2 -- .../pro/gravit/launchserver/command/service/SignJarCommand.java | 1 - .../main/java/pro/gravit/launchserver/helper/SignHelper.java | 1 - Launcher/src/main/java/pro/gravit/launcher/LauncherEngine.java | 1 - .../java/pro/gravit/launcher/client/ClientSecurityManager.java | 2 +- .../pro/gravit/launcher/request/auth/JoinServerRequest.java | 1 - 6 files changed, 1 insertion(+), 7 deletions(-) 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 57f2c311..b24262e0 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 @@ -7,9 +7,7 @@ import pro.gravit.launchserver.asm.ClassMetadataReader; import pro.gravit.launchserver.asm.SafeClassWriter; import pro.gravit.utils.helper.IOHelper; -import pro.gravit.utils.helper.LogHelper; -import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.nio.file.Path; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/SignJarCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/SignJarCommand.java index 6056597c..57c202e6 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/SignJarCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/SignJarCommand.java @@ -3,7 +3,6 @@ import pro.gravit.launchserver.LaunchServer; import pro.gravit.launchserver.binary.tasks.SignJarTask; import pro.gravit.launchserver.command.Command; -import pro.gravit.utils.helper.IOHelper; import pro.gravit.utils.helper.LogHelper; import java.nio.file.Files; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/helper/SignHelper.java b/LaunchServer/src/main/java/pro/gravit/launchserver/helper/SignHelper.java index 86e3a165..896d6f2c 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/helper/SignHelper.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/helper/SignHelper.java @@ -5,7 +5,6 @@ import org.bouncycastle.cms.CMSSignedDataGenerator; import org.bouncycastle.cms.SignerInfoGenerator; import org.bouncycastle.cms.jcajce.JcaSignerInfoGeneratorBuilder; -import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.operator.ContentSigner; import org.bouncycastle.operator.DigestCalculatorProvider; import org.bouncycastle.operator.OperatorCreationException; diff --git a/Launcher/src/main/java/pro/gravit/launcher/LauncherEngine.java b/Launcher/src/main/java/pro/gravit/launcher/LauncherEngine.java index 5f67a456..5b4fbb9b 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/LauncherEngine.java +++ b/Launcher/src/main/java/pro/gravit/launcher/LauncherEngine.java @@ -10,7 +10,6 @@ import pro.gravit.launcher.managers.ClientGsonManager; import pro.gravit.launcher.managers.ClientHookManager; import pro.gravit.launcher.managers.ConsoleManager; -import pro.gravit.launcher.modules.LauncherModule; import pro.gravit.launcher.modules.events.PreConfigPhase; import pro.gravit.launcher.request.Request; import pro.gravit.launcher.request.RequestException; diff --git a/Launcher/src/main/java/pro/gravit/launcher/client/ClientSecurityManager.java b/Launcher/src/main/java/pro/gravit/launcher/client/ClientSecurityManager.java index 28b4ab01..86fea872 100644 --- a/Launcher/src/main/java/pro/gravit/launcher/client/ClientSecurityManager.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/ClientSecurityManager.java @@ -24,6 +24,6 @@ public void checkPermission(Permission perm, Object context) { } public static class ExitTrappedException extends SecurityException { - + private static final long serialVersionUID = 6929785890434102330L; } } diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/JoinServerRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/JoinServerRequest.java index b50ada1a..f4ee91cf 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/JoinServerRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/JoinServerRequest.java @@ -5,7 +5,6 @@ import pro.gravit.launcher.events.request.JoinServerRequestEvent; import pro.gravit.launcher.request.Request; import pro.gravit.launcher.request.websockets.WebSocketRequest; -import pro.gravit.utils.helper.SecurityHelper; import pro.gravit.utils.helper.VerifyHelper; public final class JoinServerRequest extends Request implements WebSocketRequest {