diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/asm/InjectClassAcceptor.java b/LaunchServer/src/main/java/pro/gravit/launchserver/asm/InjectClassAcceptor.java index 8fd50502..0ac01be2 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/asm/InjectClassAcceptor.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/asm/InjectClassAcceptor.java @@ -146,7 +146,7 @@ private static Serializer serializerClass(int opcode) { @Override public InsnList serialize(Number value) { InsnList ret = new InsnList(); - ret.add(NodeUtils.push(((Number) value).intValue())); + ret.add(NodeUtils.push(value.intValue())); ret.add(new InsnNode(opcode)); return ret; } diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/JsonAuthProvider.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/JsonAuthProvider.java index aa8796d6..435069c6 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/JsonAuthProvider.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/JsonAuthProvider.java @@ -52,11 +52,13 @@ public static class authRequest { final String password; final String ip; String apiKey; + public authRequest(String username, String password, String ip) { this.username = username; this.password = password; this.ip = ip; } + public authRequest(String username, String password, String ip, String apiKey) { this.username = username; this.password = password; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/RejectAuthProvider.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/RejectAuthProvider.java index 1d4c2a5a..fe52e5f3 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/RejectAuthProvider.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/RejectAuthProvider.java @@ -19,6 +19,7 @@ public final class RejectAuthProvider extends AuthProvider implements Reconfigur public RejectAuthProvider() { } + public RejectAuthProvider(String message) { this.message = message; } diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/binary/ProguardConf.java b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/ProguardConf.java index 18ffb72b..bf3cb6bd 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/binary/ProguardConf.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/ProguardConf.java @@ -29,6 +29,7 @@ public class ProguardConf { public final Path mappings; public final Path words; public transient final LaunchServer srv; + public ProguardConf(LaunchServer srv) { proguard = srv.dir.resolve("proguard"); config = proguard.resolve("proguard.config"); diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/CertificateAutogenTask.java b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/CertificateAutogenTask.java index ee7e0ae3..47451bf0 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/CertificateAutogenTask.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/CertificateAutogenTask.java @@ -36,6 +36,7 @@ public class CertificateAutogenTask implements LauncherBuildTask { public X509CertificateHolder bcCertificate; public CMSSignedDataGenerator signedDataGenerator; private LaunchServer server; + public CertificateAutogenTask(LaunchServer server) { this.server = server; } 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 9154399d..dcab43f4 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 @@ -34,6 +34,7 @@ public class MainBuildTask implements LauncherBuildTask { public IOHookSet preBuildHook = new IOHookSet<>(); public IOHookSet postBuildHook = new IOHookSet<>(); public Map properties = new HashMap<>(); + public MainBuildTask(LaunchServer srv) { server = srv; reader = new ClassMetadataReader(); diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/IndexAssetCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/IndexAssetCommand.java index c20ddf36..035ef716 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/IndexAssetCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/IndexAssetCommand.java @@ -24,6 +24,7 @@ public final class IndexAssetCommand extends Command { public static final String OBJECTS_DIR = "objects"; private static final Gson gson = new Gson(); private static final String JSON_EXTENSION = ".json"; + public IndexAssetCommand(LaunchServer server) { super(server); } diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/AuthResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/AuthResponse.java index ad449a93..520d6675 100644 --- a/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/AuthResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/AuthResponse.java @@ -122,6 +122,7 @@ public static class AuthContext { public final Client client; @Deprecated public int password_length; //Use AuthProvider for get password + public AuthContext(Client client, String login, String profileName, String ip, ConnectTypes authType) { this.client = client; this.login = login; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/ExceptionEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/events/ExceptionEvent.java index ec655340..910d8395 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/ExceptionEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/ExceptionEvent.java @@ -7,6 +7,7 @@ public class ExceptionEvent extends RequestEvent { public final String message; @LauncherNetworkAPI public final String clazz; + public ExceptionEvent(Exception e) { this.message = e.getMessage(); this.clazz = e.getClass().getName(); diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/AuthRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/AuthRequestEvent.java index 998cef63..4206f999 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/AuthRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/AuthRequestEvent.java @@ -17,6 +17,7 @@ public class AuthRequestEvent extends RequestEvent { public String protectToken; @LauncherNetworkAPI public long session; + public AuthRequestEvent() { } diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/GetAvailabilityAuthRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/GetAvailabilityAuthRequestEvent.java index 0072b34a..85eb03a5 100644 --- a/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/GetAvailabilityAuthRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/GetAvailabilityAuthRequestEvent.java @@ -15,6 +15,7 @@ public GetAvailabilityAuthRequestEvent(List list) { this.list = list; this.features = ServerFeature.FEATURE_SUPPORT.val; } + public GetAvailabilityAuthRequestEvent(List list, long features) { this.list = list; this.features = features; diff --git a/LauncherCore/src/main/java/pro/gravit/launcher/LauncherInject.java b/LauncherCore/src/main/java/pro/gravit/launcher/LauncherInject.java index c8e37c2a..b76203ad 100644 --- a/LauncherCore/src/main/java/pro/gravit/launcher/LauncherInject.java +++ b/LauncherCore/src/main/java/pro/gravit/launcher/LauncherInject.java @@ -9,6 +9,6 @@ @Retention(CLASS) @Target(FIELD) public @interface LauncherInject { - public String value(); // target of inject + String value(); // target of inject } diff --git a/LauncherCore/src/main/java/pro/gravit/utils/helper/LogHelper.java b/LauncherCore/src/main/java/pro/gravit/utils/helper/LogHelper.java index fdf65ff2..00369289 100644 --- a/LauncherCore/src/main/java/pro/gravit/utils/helper/LogHelper.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/helper/LogHelper.java @@ -69,6 +69,7 @@ public final class LogHelper { } } } + private LogHelper() { } diff --git a/modules b/modules index 07e4380a..fc31be1e 160000 --- a/modules +++ b/modules @@ -1 +1 @@ -Subproject commit 07e4380ad52c4ef08378b8eb2202d8a1bd3639a2 +Subproject commit fc31be1ed9ce7cc57e8c33d7de80d75261d39aef