Merge branch 'release/5.7.9'

Author: gravit0

build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "com.gravitlauncher.launcher"
-version = "5.7.8"
+version = "5.7.9"
 
 
 val myVersion = version

components/launcher-api/src/main/java/pro/gravit/launcher/base/Downloader.java

@@ -5,7 +5,6 @@
 import pro.gravit.launcher.core.CertificatePinningTrustManager;
 import pro.gravit.launcher.core.LauncherInject;
 import pro.gravit.utils.helper.IOHelper;
-import pro.gravit.utils.helper.LogHelper;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocketFactory;

…avit/launchserver/helper/HttpHelper.java …pro/gravit/launcher/base/HttpHelper.javacomponents/launchserver/src/main/java/pro/gravit/launchserver/helper/HttpHelper.java renamed to components/launcher-api/src/main/java/pro/gravit/launcher/base/HttpHelper.java components/launchserver/src/main/java/pro/gravit/launchserver/helper/HttpHelper.java renamed to components/launcher-api/src/main/java/pro/gravit/launcher/base/HttpHelper.java

@@ -1,9 +1,8 @@
-package pro.gravit.launchserver.helper;
+package pro.gravit.launcher.base;
 
 import com.google.gson.JsonElement;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.base.Launcher;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import pro.gravit.launcher.base.request.RequestException;
 
 import java.io.IOException;
@@ -22,7 +21,7 @@
 import java.util.function.Function;
 
 public final class HttpHelper {
-    private static final Logger logger = LogManager.getLogger();
+    private static final Logger logger = LoggerFactory.getLogger(HttpHelper.class);
 
     private HttpHelper() {
         throw new UnsupportedOperationException();

components/launcher-api/src/main/java/pro/gravit/launcher/base/LauncherConfig.java

@@ -13,7 +13,6 @@
 import pro.gravit.launcher.core.serialize.stream.StreamObject;
 import pro.gravit.utils.Version;
 import pro.gravit.utils.helper.JVMHelper;
-import pro.gravit.utils.helper.LogHelper;
 import pro.gravit.utils.helper.SecurityHelper;
 import pro.gravit.utils.helper.VerifyHelper;
 
@@ -66,6 +65,12 @@ public final class LauncherConfig extends StreamObject {
     public Map<String, String> customJavaDownload;
     @LauncherInject("runtimeconfig.forceUseCustomJava")
     public boolean forceUseCustomJava;
+    @LauncherInject("launcher.build.privatekey")
+    public String ecdsaBuildPrivateKey;
+    @LauncherInject("launcher.build.publickey")
+    public String ecdsaBuildPublicKey;
+    @LauncherInject("launcher.useHttpApi")
+    public boolean useHttpApi;
 
     private static class ModernModulesClass {
         @LauncherInject("launcher.modules")

components/launcher-api/src/main/java/pro/gravit/launcher/base/api/AuthService.java

@@ -2,14 +2,15 @@
 
 import pro.gravit.launcher.base.ClientPermissions;
 import pro.gravit.launcher.base.profiles.ClientProfile;
+import pro.gravit.launcher.core.api.model.UserPermissions;
 
 import java.util.List;
 import java.util.UUID;
 
 public class AuthService {
     public static String projectName;
     public static String username;
-    public static ClientPermissions permissions = new ClientPermissions();
+    public static UserPermissions permissions = new ClientPermissions();
     public static UUID uuid;
     public static ClientProfile profile;
 
@@ -20,8 +21,4 @@ public static boolean hasPermission(String permission) {
     public static boolean hasRole(String role) {
         return permissions.hasRole(role);
     }
-
-    public static List<String> getRoles() {
-        return permissions.getRoles();
-    }
 }

components/launcher-api/src/main/java/pro/gravit/launcher/base/config/JsonConfigurableInterface.java

@@ -3,7 +3,6 @@
 import com.google.gson.Gson;
 import pro.gravit.launcher.base.Launcher;
 import pro.gravit.utils.helper.IOHelper;
-import pro.gravit.utils.helper.LogHelper;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;

components/launcher-api/src/main/java/pro/gravit/launcher/base/events/request/GetAvailabilityAuthRequestEvent.java

@@ -1,13 +1,9 @@
 package pro.gravit.launcher.base.events.request;
 
-import pro.gravit.launcher.base.request.auth.details.AuthLoginOnlyDetails;
-import pro.gravit.launcher.base.request.auth.details.AuthWebViewDetails;
 import pro.gravit.launcher.core.LauncherNetworkAPI;
 import pro.gravit.launcher.base.events.RequestEvent;
 import pro.gravit.launcher.core.api.method.AuthMethod;
 import pro.gravit.launcher.core.api.method.AuthMethodDetails;
-import pro.gravit.launcher.core.api.method.details.AuthPasswordDetails;
-import pro.gravit.launcher.core.api.method.details.AuthWebDetails;
 import pro.gravit.utils.TypeSerializeInterface;
 
 import java.util.ArrayList;

components/launcher-api/src/main/java/pro/gravit/launcher/base/modules/impl/SimpleModuleManager.java

@@ -6,7 +6,6 @@
 import pro.gravit.launcher.base.modules.*;
 import pro.gravit.utils.Version;
 import pro.gravit.utils.helper.IOHelper;
-import pro.gravit.utils.helper.LogHelper;
 
 import java.io.IOException;
 import java.lang.invoke.MethodHandles;
@@ -105,7 +104,7 @@ public void initModules(LauncherInitContext initContext) {
                 module.setInitStatus(LauncherModule.InitStatus.FINISH);
             } else if (module.getInitStatus().equals(LauncherModule.InitStatus.PRE_INIT_WAIT)) {
                 LauncherModuleInfo info = module.getModuleInfo();
-                logger.error("Module {} skip pre-init phase. This module NOT finish loading", info.name, Arrays.toString(info.dependencies));
+                logger.error("Module {} skip pre-init phase. This module NOT finish loading. Dependencies: {}", info.name, Arrays.toString(info.dependencies));
             }
         }
     }

components/launcher-api/src/main/java/pro/gravit/launcher/base/modules/impl/SimpleModulesConfigManager.java

@@ -5,7 +5,6 @@
 import pro.gravit.launcher.base.config.SimpleConfigurable;
 import pro.gravit.launcher.base.modules.ModulesConfigManager;
 import pro.gravit.utils.helper.IOHelper;
-import pro.gravit.utils.helper.LogHelper;
 
 import java.io.IOException;
 import java.nio.file.Files;

components/launcher-api/src/main/java/pro/gravit/launcher/base/profiles/ClientProfile.java

@@ -7,7 +7,6 @@
 import pro.gravit.launcher.base.profiles.optional.OptionalFile;
 import pro.gravit.launcher.base.profiles.optional.triggers.OptionalTrigger;
 import pro.gravit.launcher.core.api.features.ProfileFeatureAPI;
-import pro.gravit.utils.helper.IOHelper;
 import pro.gravit.utils.helper.VerifyHelper;
 import pro.gravit.utils.launch.LaunchOptions;