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/ClientLauncher.java b/Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncher.java index dee3cd85..9e523ce7 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; @@ -586,10 +586,10 @@ private ClientLauncher() { public interface ParamsAPI { ParamContainer read() throws Exception; - void write(ParamContainer p); + void write(ParamContainer p) throws Exception; } - public static final ParamsAPI container = new ParamsAPI() { + public static ParamsAPI container = new ParamsAPI() { @Override public ParamContainer read() throws Exception { ParamContainer p; @@ -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 { 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 { diff --git a/modules b/modules index 6f008f59..52818e6e 160000 --- a/modules +++ b/modules @@ -1 +1 @@ -Subproject commit 6f008f595975887b6a1366cb444b82b339e3afad +Subproject commit 52818e6ef05d90ad678d02e83f9bd4140d8eda34