Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2024-12-23 00:51:01 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'feature/eccrypt' of github.com:GravitLauncher/Launcher into feature/eccrypt

Browse source
This commit is contained in:
Gravit 2019-10-26 07:12:37 +07:00
commit 4ccf11f461
No known key found for this signature in database
GPG key ID: 061981E1E85D3216
8 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/AdditionalFixesApplyTask.java
View file

@ -7,9 +7,7 @@
import pro.gravit.launchserver.asm.ClassMetadataReader; import pro.gravit.launchserver.asm.ClassMetadataReader;
import pro.gravit.launchserver.asm.SafeClassWriter; import pro.gravit.launchserver.asm.SafeClassWriter;
import pro.gravit.utils.helper.IOHelper; import pro.gravit.utils.helper.IOHelper;
import pro.gravit.utils.helper.LogHelper;
import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.nio.file.Path; import java.nio.file.Path;

1
LaunchServer/src/main/java/pro/gravit/launchserver/command/service/SignJarCommand.java
View file

@ -3,7 +3,6 @@
import pro.gravit.launchserver.LaunchServer; import pro.gravit.launchserver.LaunchServer;
import pro.gravit.launchserver.binary.tasks.SignJarTask; import pro.gravit.launchserver.binary.tasks.SignJarTask;
import pro.gravit.launchserver.command.Command; import pro.gravit.launchserver.command.Command;
import pro.gravit.utils.helper.IOHelper;
import pro.gravit.utils.helper.LogHelper; import pro.gravit.utils.helper.LogHelper;
import java.nio.file.Files; import java.nio.file.Files;

1
LaunchServer/src/main/java/pro/gravit/launchserver/helper/SignHelper.java
View file

@ -5,7 +5,6 @@
import org.bouncycastle.cms.CMSSignedDataGenerator; import org.bouncycastle.cms.CMSSignedDataGenerator;
import org.bouncycastle.cms.SignerInfoGenerator; import org.bouncycastle.cms.SignerInfoGenerator;
import org.bouncycastle.cms.jcajce.JcaSignerInfoGeneratorBuilder; import org.bouncycastle.cms.jcajce.JcaSignerInfoGeneratorBuilder;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.bouncycastle.operator.ContentSigner; import org.bouncycastle.operator.ContentSigner;
import org.bouncycastle.operator.DigestCalculatorProvider; import org.bouncycastle.operator.DigestCalculatorProvider;
import org.bouncycastle.operator.OperatorCreationException; import org.bouncycastle.operator.OperatorCreationException;

1
Launcher/src/main/java/pro/gravit/launcher/LauncherEngine.java
View file

@ -10,7 +10,6 @@
import pro.gravit.launcher.managers.ClientGsonManager; import pro.gravit.launcher.managers.ClientGsonManager;
import pro.gravit.launcher.managers.ClientHookManager; import pro.gravit.launcher.managers.ClientHookManager;
import pro.gravit.launcher.managers.ConsoleManager; import pro.gravit.launcher.managers.ConsoleManager;
import pro.gravit.launcher.modules.LauncherModule;
import pro.gravit.launcher.modules.events.PreConfigPhase; import pro.gravit.launcher.modules.events.PreConfigPhase;
import pro.gravit.launcher.request.Request; import pro.gravit.launcher.request.Request;
import pro.gravit.launcher.request.RequestException; import pro.gravit.launcher.request.RequestException;

8
Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncher.java
View file

@ -537,7 +537,7 @@ private static LinkedList<Path> resolveClassPathList(Path clientDir, String... c
private static Stream<Path> resolveClassPathStream(Path clientDir, String... classPath) throws IOException { private static Stream<Path> resolveClassPathStream(Path clientDir, String... classPath) throws IOException {
Stream.Builder<Path> builder = Stream.builder(); Stream.Builder<Path> builder = Stream.builder();
for (String classPathEntry : classPath) { 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 if (IOHelper.isDir(path)) { // Recursive walking and adding
IOHelper.walk(path, new ClassPathFileVisitor(builder), false); IOHelper.walk(path, new ClassPathFileVisitor(builder), false);
continue; continue;
@ -586,10 +586,10 @@ private ClientLauncher() {
public interface ParamsAPI { public interface ParamsAPI {
ParamContainer read() throws Exception; 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 @Override
public ParamContainer read() throws Exception { public ParamContainer read() throws Exception {
ParamContainer p; ParamContainer p;
@ -603,7 +603,7 @@ public ParamContainer read() throws Exception {
} }
@Override @Override
public void write(ParamContainer p) { public void write(ParamContainer p) throws Exception {
setWriteParamsThread(CommonHelper.newThread("Client params writter", true, () -> setWriteParamsThread(CommonHelper.newThread("Client params writter", true, () ->
{ {
try { try {

2
Launcher/src/main/java/pro/gravit/launcher/client/ClientSecurityManager.java
View file

@ -24,6 +24,6 @@ public void checkPermission(Permission perm, Object context) {
} }
public static class ExitTrappedException extends SecurityException { public static class ExitTrappedException extends SecurityException {
private static final long serialVersionUID = 6929785890434102330L;
} }
} }

1
LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/JoinServerRequest.java
View file

@ -5,7 +5,6 @@
import pro.gravit.launcher.events.request.JoinServerRequestEvent; import pro.gravit.launcher.events.request.JoinServerRequestEvent;
import pro.gravit.launcher.request.Request; import pro.gravit.launcher.request.Request;
import pro.gravit.launcher.request.websockets.WebSocketRequest; import pro.gravit.launcher.request.websockets.WebSocketRequest;
import pro.gravit.utils.helper.SecurityHelper;
import pro.gravit.utils.helper.VerifyHelper; import pro.gravit.utils.helper.VerifyHelper;
public final class JoinServerRequest extends Request<JoinServerRequestEvent> implements WebSocketRequest { public final class JoinServerRequest extends Request<JoinServerRequestEvent> implements WebSocketRequest {

2
modules

@ -1 +1 @@
Subproject commit 6f008f595975887b6a1366cb444b82b339e3afad Subproject commit 52818e6ef05d90ad678d02e83f9bd4140d8eda34