Merge branch 'experimental/nojava8support' into dev

LaunchServer/build.gradle

@@ -1,4 +1,4 @@
-def mainClassName = "pro.gravit.launchserver.LaunchServerStarter"
+def mainClassName = "pro.gravit.launchserver.Main"
 def mainAgentName = "pro.gravit.launchserver.StarterAgent"
 
 evaluationDependsOn(':Launcher')
@@ -37,9 +37,6 @@
     manifest.attributes("Main-Class": mainClassName,
             "Premain-Class": mainAgentName,
             "Multi-Release": "true",
-            "Can-Redefine-Classes": "true",
-            "Can-Retransform-Classes": "true",
-            "Can-Set-Native-Method-Prefix": "true"
     )
 }
 
@@ -65,9 +62,7 @@
     archiveClassifier.set('clean')
     manifest.attributes("Main-Class": mainClassName,
             "Premain-Class": mainAgentName,
-            "Can-Redefine-Classes": "true",
+            "Automatic-Module-Name": "launchserver"
-            "Can-Retransform-Classes": "true",
-            "Can-Set-Native-Method-Prefix": "true"
     )
     from sourceSets.main.output
 }
@@ -75,7 +70,6 @@
 
 dependencies {
     pack project(':LauncherAPI')
-    pack project(':LauncherModernCore')
     bundle group: 'me.tongfei', name: 'progressbar', version: '0.9.2'
     bundle group: 'com.github.Marcono1234', name: 'gson-record-type-adapter-factory', version: 'v0.2.0'
     bundle group: 'org.fusesource.jansi', name: 'jansi', version: rootProject['verJansi']
@@ -84,13 +78,15 @@ pack project(':LauncherModernCore')
     bundle group: 'org.jline', name: 'jline-terminal', version: rootProject['verJline']
     bundle group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: rootProject['verBcpkix']
     bundle group: 'org.ow2.asm', name: 'asm-commons', version: rootProject['verAsm']
-    bundle group: 'io.netty', name: 'netty-all', version: rootProject['verNetty']
+    bundle group: 'io.netty', name: 'netty-codec-http', version: rootProject['verNetty']
+    bundle group: 'io.netty', name: 'netty-transport-classes-epoll', version: rootProject['verNetty']
+    bundle group: 'io.netty', name: 'netty-transport-native-epoll', version: rootProject['verNetty'], classifier: 'linux-x86_64'
     bundle group: 'org.slf4j', name: 'slf4j-api', version: rootProject['verSlf4j']
     bundle group: 'com.mysql', name: 'mysql-connector-j', version: rootProject['verMySQLConn']
     bundle group: 'org.postgresql', name: 'postgresql', version: rootProject['verPostgreSQLConn']
     bundle group: 'com.guardsquare', name: 'proguard-base', version: rootProject['verProguard']
     bundle group: 'org.apache.logging.log4j', name: 'log4j-core', version: rootProject['verLog4j']
-    bundle group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: rootProject['verLog4j']
+    bundle group: 'org.apache.logging.log4j', name: 'log4j-slf4j2-impl', version: rootProject['verLog4j']
     bundle group: 'io.jsonwebtoken', name: 'jjwt-api', version: rootProject['verJwt']
     bundle group: 'io.jsonwebtoken', name: 'jjwt-impl', version: rootProject['verJwt']
     bundle group: 'io.jsonwebtoken', name: 'jjwt-gson', version: rootProject['verJwt']
@@ -104,16 +100,6 @@ pack project(':LauncherModernCore')
         exclude group: 'org.slf4j'
     }
 
-    launch4j('net.sf.launch4j:launch4j:' + rootProject['verLaunch4j']) {
-        exclude group: 'org.apache.ant'
-        exclude group: 'net.java.abeille'
-        exclude group: 'foxtrot'
-        exclude group: 'com.jgoodies'
-        exclude group: 'org.slf4j'
-    }
-    launch4j('net.sf.launch4j:launch4j:' + rootProject['verLaunch4j'] + ':workdir-win32') { transitive = false }
-    launch4j('net.sf.launch4j:launch4j:' + rootProject['verLaunch4j'] + ':workdir-linux64') { transitive = false }
-
     compileOnlyA group: 'com.google.guava', name: 'guava', version: rootProject['verGuavaC']
     // Do not update (laggy deps).
     compileOnlyA 'log4j:log4j:1.2.17'
@@ -126,27 +112,9 @@ pack project(':LauncherModernCore')
     from configurations.hikari
 }
 
-tasks.register('launch4j', Copy) {
-    duplicatesStrategy = 'EXCLUDE'
-    into "$buildDir/libs/libraries/launch4j"
-    from(configurations.launch4j.collect {
-        it.isDirectory() ? it : ((it.getName().startsWith("launch4j") && it.getName().contains("workdir")) ? zipTree(it) : it)
-    })
-    includeEmptyDirs false
-    eachFile { FileCopyDetails fcp ->
-        if (fcp.relativePath.pathString.startsWith("launch4j-") &&
-                fcp.relativePath.pathString.contains("workdir")) {
-            def segments = fcp.relativePath.segments
-            def pathSegments = segments[1..-1] as String[]
-            fcp.relativePath = new RelativePath(!fcp.file.isDirectory(), pathSegments)
-        } else if (fcp.relativePath.pathString.contains("META-INF")) fcp.exclude()
-        fcp.mode = 0755
-    }
-}
-
 tasks.register('dumpLibs', Copy) {
     duplicatesStrategy = 'EXCLUDE'
-    dependsOn tasks.hikari, tasks.launch4j
+    dependsOn tasks.hikari
     into "$buildDir/libs/libraries"
     from configurations.bundleOnly
 }

LaunchServer/src/main/java/pro/gravit/launchserver/HttpRequester.java

@@ -1,7 +1,7 @@
 package pro.gravit.launchserver;
 
 import com.google.gson.JsonElement;
-import pro.gravit.launcher.Launcher;
+import pro.gravit.launcher.base.Launcher;
 import pro.gravit.launchserver.helper.HttpHelper;
 
 import java.io.IOException;

LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServer.java

@@ -2,15 +2,13 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.Launcher;
+import pro.gravit.launcher.base.Launcher;
-import pro.gravit.launcher.events.RequestEvent;
+import pro.gravit.launcher.base.events.RequestEvent;
-import pro.gravit.launcher.events.request.ProfilesRequestEvent;
+import pro.gravit.launcher.base.events.request.ProfilesRequestEvent;
-import pro.gravit.launcher.managers.ConfigManager;
+import pro.gravit.launcher.base.modules.events.ClosePhase;
-import pro.gravit.launcher.modules.events.ClosePhase;
+import pro.gravit.launcher.base.profiles.ClientProfile;
-import pro.gravit.launcher.profiles.ClientProfile;
 import pro.gravit.launchserver.auth.AuthProviderPair;
 import pro.gravit.launchserver.auth.core.RejectAuthCoreProvider;
-import pro.gravit.launchserver.binary.EXEL4JLauncherBinary;
 import pro.gravit.launchserver.binary.EXELauncherBinary;
 import pro.gravit.launchserver.binary.JARLauncherBinary;
 import pro.gravit.launchserver.binary.LauncherBinary;
@@ -300,12 +298,6 @@ private LauncherBinary binary() {
         if(event.binary != null) {
             return event.binary;
         }
-        try {
-            Class.forName("net.sf.launch4j.Builder");
-            if (config.launch4j.enabled) return new EXEL4JLauncherBinary(this);
-        } catch (ClassNotFoundException ignored) {
-            logger.warn("Launch4J isn't in classpath.");
-        }
         return new EXELauncherBinary(this);
     }
 
@@ -393,7 +385,7 @@ public void syncLauncherBinaries() throws IOException {
 
         // Syncing launcher EXE binary
         logger.info("Syncing launcher EXE binary file");
-        if (!launcherEXEBinary.sync() && config.launch4j.enabled)
+        if (!launcherEXEBinary.sync())
             logger.warn("Missing launcher EXE binary file");
 
     }

LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServerStarter.java

@@ -3,13 +3,13 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import pro.gravit.launcher.Launcher;
+import pro.gravit.launcher.base.Launcher;
-import pro.gravit.launcher.LauncherTrustManager;
+import pro.gravit.launcher.core.LauncherTrustManager;
-import pro.gravit.launcher.modules.events.PreConfigPhase;
+import pro.gravit.launcher.base.modules.events.PreConfigPhase;
-import pro.gravit.launcher.profiles.optional.actions.OptionalAction;
+import pro.gravit.launcher.base.profiles.optional.actions.OptionalAction;
-import pro.gravit.launcher.profiles.optional.triggers.OptionalTrigger;
+import pro.gravit.launcher.base.profiles.optional.triggers.OptionalTrigger;
-import pro.gravit.launcher.request.auth.AuthRequest;
+import pro.gravit.launcher.base.request.auth.AuthRequest;
-import pro.gravit.launcher.request.auth.GetAvailabilityAuthRequest;
+import pro.gravit.launcher.base.request.auth.GetAvailabilityAuthRequest;
 import pro.gravit.launchserver.auth.core.AuthCoreProvider;
 import pro.gravit.launchserver.auth.mix.MixProvider;
 import pro.gravit.launchserver.auth.password.PasswordVerifier;
@@ -42,15 +42,10 @@ public class LaunchServerStarter {
     private static final Logger logger = LogManager.getLogger();
 
     public static void main(String[] args) throws Exception {
-        JVMHelper.checkStackTrace(LaunchServerStarter.class);
+        JVMHelper.verifySystemProperties(LaunchServer.class, false);
-        JVMHelper.verifySystemProperties(LaunchServer.class, true);
         //LogHelper.addOutput(IOHelper.WORKING_DIR.resolve("LaunchServer.log"));
         LogHelper.printVersion("LaunchServer");
         LogHelper.printLicense("LaunchServer");
-        if (!StarterAgent.isAgentStarted()) {
-            LogHelper.error("StarterAgent is not started!");
-            LogHelper.error("You should add to JVM options this option: `-javaagent:LaunchServer.jar`");
-        }
         Path dir = IOHelper.WORKING_DIR;
         Path configFile, runtimeConfigFile;
         try {

LaunchServer/src/main/java/pro/gravit/launchserver/Main.java

@@ -0,0 +1,79 @@
+package pro.gravit.launchserver;
+
+import pro.gravit.utils.helper.IOHelper;
+import pro.gravit.utils.launch.ClassLoaderControl;
+import pro.gravit.utils.launch.LaunchOptions;
+import pro.gravit.utils.launch.ModuleLaunch;
+
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.FileVisitOption;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Stream;
+
+public class Main {
+    private static final List<String> classpathOnly = List.of("proguard", "jline", "kotlin", "epoll");
+    private static final String LOG4J_PROPERTY = "log4j2.configurationFile";
+    private static boolean isClasspathOnly(Path path) {
+        var fileName = path.getFileName().toString();
+        for(var e : classpathOnly) {
+            if(fileName.contains(e)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private static void unpackLog4j() {
+        String log4jConfigurationFile = System.getProperty(LOG4J_PROPERTY);
+        if(log4jConfigurationFile == null) {
+            Path log4jConfigPath = Path.of("log4j2.xml");
+            if(!Files.exists(log4jConfigPath)) {
+                try(FileOutputStream output = new FileOutputStream(log4jConfigPath.toFile())) {
+                    try(InputStream input = Main.class.getResourceAsStream("log4j2.xml")) {
+                        if(input == null) {
+                            return;
+                        }
+                        input.transferTo(output);
+                    }
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+            System.setProperty(LOG4J_PROPERTY, log4jConfigPath.toAbsolutePath().toString());
+        }
+    }
+
+    public static void main(String[] args) throws Throwable {
+        unpackLog4j();
+        ModuleLaunch launch = new ModuleLaunch();
+        LaunchOptions options = new LaunchOptions();
+        options.disablePackageDelegateSupport = true;
+        options.moduleConf = new LaunchOptions.ModuleConf();
+        List<Path> libraries;
+        try(Stream<Path> files = Files.walk(Path.of("libraries"), FileVisitOption.FOLLOW_LINKS)) {
+            libraries = new ArrayList<>(files.filter(e -> e.getFileName().toString().endsWith(".jar")).toList());
+        }
+        List<Path> classpath = new ArrayList<>();
+        List<String> modulepath = new ArrayList<>();
+        for(var l : libraries) {
+            if(isClasspathOnly(l)) {
+                classpath.add(l);
+            } else {
+                modulepath.add(l.toAbsolutePath().toString());
+            }
+        }
+        classpath.add(IOHelper.getCodeSource(LaunchServerStarter.class));
+        options.moduleConf.modulePath.addAll(modulepath);
+        options.moduleConf.modules.add("ALL-MODULE-PATH");
+        ClassLoaderControl control = launch.init(classpath, "natives", options);
+        ModuleLayer.Controller controller = (ModuleLayer.Controller) control.getJava9ModuleController();
+        launch.launch("pro.gravit.launchserver.LaunchServerStarter", null, Arrays.asList(args));
+    }
+}

LaunchServer/src/main/java/pro/gravit/launchserver/StarterAgent.java

@@ -1,13 +1,7 @@
 package pro.gravit.launchserver;
 
-import java.io.IOException;
 import java.lang.instrument.Instrumentation;
 import java.nio.file.*;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.nio.file.attribute.PosixFileAttributeView;
-import java.nio.file.attribute.PosixFilePermission;
-import java.util.*;
-import java.util.jar.JarFile;
 
 public final class StarterAgent {
 
@@ -20,47 +14,6 @@ public static boolean isAgentStarted() {
     }
 
     public static void premain(String agentArgument, Instrumentation inst) {
-        StarterAgent.inst = inst;
+        throw new UnsupportedOperationException("Please remove -javaagent option from start.sh");
-        libraries = Paths.get(Optional.ofNullable(agentArgument).map(String::trim).filter(e -> !e.isEmpty()).orElse("libraries"));
-        isStarted = true;
-        try {
-            Files.walkFileTree(libraries, Collections.singleton(FileVisitOption.FOLLOW_LINKS), Integer.MAX_VALUE, new StarterVisitor());
-        } catch (IOException e) {
-            e.printStackTrace(System.err);
-        }
-    }
-
-    private static final class StarterVisitor extends SimpleFileVisitor<Path> {
-        private static final Set<PosixFilePermission> DPERMS;
-
-        static {
-            Set<PosixFilePermission> perms = new HashSet<>(Arrays.asList(PosixFilePermission.values()));
-            perms.remove(PosixFilePermission.OTHERS_WRITE);
-            perms.remove(PosixFilePermission.GROUP_WRITE);
-            DPERMS = Collections.unmodifiableSet(perms);
-        }
-
-        private final boolean fixLib;
-
-        private StarterVisitor() {
-            Path filef = StarterAgent.libraries.resolve(".libraries_chmoded");
-            this.fixLib = !Files.exists(filef) && !Boolean.getBoolean("launcher.noLibrariesPosixPermsFix");
-            if (fixLib) {
-                try {
-                    Files.deleteIfExists(filef);
-                    Files.createFile(filef);
-                } catch (Throwable ignored) {
-                }
-            }
-        }
-
-        @Override
-        public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
-            if (fixLib && Files.getFileAttributeView(file, PosixFileAttributeView.class) != null)
-                Files.setPosixFilePermissions(file, DPERMS);
-            if (file.toFile().getName().endsWith(".jar"))
-                inst.appendToSystemClassLoaderSearch(new JarFile(file.toFile()));
-            return super.visitFile(file, attrs);
-        }
     }
 }

LaunchServer/src/main/java/pro/gravit/launchserver/asm/InjectClassAcceptor.java

@@ -4,8 +4,8 @@
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.*;
-import pro.gravit.launcher.LauncherInject;
+import pro.gravit.launcher.core.LauncherInject;
-import pro.gravit.launcher.LauncherInjectionConstructor;
+import pro.gravit.launcher.core.LauncherInjectionConstructor;
 import pro.gravit.launchserver.binary.BuildContext;
 import pro.gravit.launchserver.binary.tasks.MainBuildTask;
 

LaunchServer/src/main/java/pro/gravit/launchserver/auth/AuthException.java

@@ -1,6 +1,6 @@
 package pro.gravit.launchserver.auth;
 
-import pro.gravit.launcher.events.request.AuthRequestEvent;
+import pro.gravit.launcher.base.events.request.AuthRequestEvent;
 
 import java.io.IOException;
 import java.io.Serial;

LaunchServer/src/main/java/pro/gravit/launchserver/auth/AuthProviderPair.java

@@ -57,7 +57,7 @@ public static void getFeatures(Class<?> clazz, Set<String> list) {
         }
     }
 
-    public final <T> T isSupport(Class<T> clazz) {
+    public <T> T isSupport(Class<T> clazz) {
         if (core == null) return null;
         T result = core.isSupport(clazz);
         if (result == null && mixes != null) {
@@ -71,7 +71,7 @@ public final <T> T isSupport(Class<T> clazz) {
         return result;
     }
 
-    public final void init(LaunchServer srv, String name) {
+    public void init(LaunchServer srv, String name) {
         this.name = name;
         if (links != null) link(srv);
         core.init(srv);
@@ -85,7 +85,7 @@ public final void init(LaunchServer srv, String name) {
         }
     }
 
-    public final void link(LaunchServer srv) {
+    public void link(LaunchServer srv) {
         links.forEach((k, v) -> {
             AuthProviderPair pair = srv.config.getAuthProviderPair(v);
             if (pair == null) {
@@ -99,7 +99,7 @@ public final void link(LaunchServer srv) {
         });
     }
 
-    public final void close() throws IOException {
+    public void close() throws IOException {
         core.close();
         if (textureProvider != null) {
             textureProvider.close();

LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/AbstractSQLCoreProvider.java

@@ -4,9 +4,9 @@
 import io.jsonwebtoken.JwtException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.ClientPermissions;
+import pro.gravit.launcher.base.ClientPermissions;
-import pro.gravit.launcher.request.auth.AuthRequest;
+import pro.gravit.launcher.base.request.auth.AuthRequest;
-import pro.gravit.launcher.request.auth.password.AuthPlainPassword;
+import pro.gravit.launcher.base.request.auth.password.AuthPlainPassword;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.auth.AuthException;
 import pro.gravit.launchserver.auth.MySQLSourceConfig;

LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/AuthCoreProvider.java

@@ -3,12 +3,12 @@
 import com.google.gson.reflect.TypeToken;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.Launcher;
+import pro.gravit.launcher.base.Launcher;
-import pro.gravit.launcher.events.request.GetAvailabilityAuthRequestEvent;
+import pro.gravit.launcher.base.events.request.GetAvailabilityAuthRequestEvent;
-import pro.gravit.launcher.request.auth.AuthRequest;
+import pro.gravit.launcher.base.request.auth.AuthRequest;
-import pro.gravit.launcher.request.auth.details.AuthPasswordDetails;
+import pro.gravit.launcher.base.request.auth.details.AuthPasswordDetails;
-import pro.gravit.launcher.request.auth.password.AuthPlainPassword;
+import pro.gravit.launcher.base.request.auth.password.AuthPlainPassword;
-import pro.gravit.launcher.request.secure.HardwareReportRequest;
+import pro.gravit.launcher.base.request.secure.HardwareReportRequest;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.Reconfigurable;
 import pro.gravit.launchserver.auth.AuthException;

LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/MemoryAuthCoreProvider.java

@@ -1,9 +1,9 @@
 package pro.gravit.launchserver.auth.core;
 
-import pro.gravit.launcher.ClientPermissions;
+import pro.gravit.launcher.base.ClientPermissions;
-import pro.gravit.launcher.events.request.GetAvailabilityAuthRequestEvent;
+import pro.gravit.launcher.base.events.request.GetAvailabilityAuthRequestEvent;
-import pro.gravit.launcher.request.auth.AuthRequest;
+import pro.gravit.launcher.base.request.auth.AuthRequest;
-import pro.gravit.launcher.request.auth.details.AuthLoginOnlyDetails;
+import pro.gravit.launcher.base.request.auth.details.AuthLoginOnlyDetails;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.auth.AuthException;
 import pro.gravit.launchserver.manangers.AuthManager;

LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/MergeAuthCoreProvider.java

@@ -2,7 +2,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.request.auth.AuthRequest;
+import pro.gravit.launcher.base.request.auth.AuthRequest;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.auth.AuthException;
 import pro.gravit.launchserver.manangers.AuthManager;

LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/MySQLCoreProvider.java

@@ -1,7 +1,7 @@
 package pro.gravit.launchserver.auth.core;
 
-import pro.gravit.launcher.ClientPermissions;
+import pro.gravit.launcher.base.ClientPermissions;
-import pro.gravit.launcher.request.secure.HardwareReportRequest;
+import pro.gravit.launcher.base.request.secure.HardwareReportRequest;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.auth.MySQLSourceConfig;
 import pro.gravit.launchserver.auth.SQLSourceConfig;
@@ -332,7 +332,7 @@ public String toString() {
         }
     }
 
-    public class MySQLUser extends SQLUser {
+    public static class MySQLUser extends SQLUser {
         protected long hwidId;
 
         public MySQLUser(UUID uuid, String username, String accessToken, String serverId, String password, ClientPermissions permissions, long hwidId) {

LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/RejectAuthCoreProvider.java

@@ -1,6 +1,6 @@
 package pro.gravit.launchserver.auth.core;
 
-import pro.gravit.launcher.request.auth.AuthRequest;
+import pro.gravit.launcher.base.request.auth.AuthRequest;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.auth.AuthException;
 import pro.gravit.launchserver.manangers.AuthManager;

LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/User.java

@@ -1,6 +1,6 @@
 package pro.gravit.launchserver.auth.core;
 
-import pro.gravit.launcher.ClientPermissions;
+import pro.gravit.launcher.base.ClientPermissions;
 
 import java.util.UUID;
 

LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/interfaces/UserHardware.java

@@ -1,6 +1,6 @@
 package pro.gravit.launchserver.auth.core.interfaces;
 
-import pro.gravit.launcher.request.secure.HardwareReportRequest;
+import pro.gravit.launcher.base.request.secure.HardwareReportRequest;
 
 public interface UserHardware {
     HardwareReportRequest.HardwareInfo getHardwareInfo();

LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/interfaces/provider/AuthSupportAssetUpload.java

@@ -1,8 +1,8 @@
 package pro.gravit.launchserver.auth.core.interfaces.provider;
 
-import pro.gravit.launcher.events.request.AssetUploadInfoRequestEvent;
+import pro.gravit.launcher.base.events.request.AssetUploadInfoRequestEvent;
-import pro.gravit.launcher.events.request.AuthRequestEvent;
+import pro.gravit.launcher.base.events.request.AuthRequestEvent;
-import pro.gravit.launcher.events.request.GetAssetUploadUrlRequestEvent;
+import pro.gravit.launcher.base.events.request.GetAssetUploadUrlRequestEvent;
 import pro.gravit.launchserver.auth.Feature;
 import pro.gravit.launchserver.auth.core.User;
 

LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/interfaces/provider/AuthSupportExtendedCheckServer.java

@@ -1,6 +1,5 @@
 package pro.gravit.launchserver.auth.core.interfaces.provider;
 
-import pro.gravit.launchserver.auth.core.User;
 import pro.gravit.launchserver.auth.core.UserSession;
 import pro.gravit.launchserver.socket.Client;
 

LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/interfaces/provider/AuthSupportHardware.java

@@ -1,6 +1,6 @@
 package pro.gravit.launchserver.auth.core.interfaces.provider;
 
-import pro.gravit.launcher.request.secure.HardwareReportRequest;
+import pro.gravit.launcher.base.request.secure.HardwareReportRequest;
 import pro.gravit.launchserver.auth.core.User;
 import pro.gravit.launchserver.auth.core.UserSession;
 import pro.gravit.launchserver.auth.core.interfaces.UserHardware;

LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/interfaces/provider/AuthSupportRegistration.java

@@ -1,6 +1,6 @@
 package pro.gravit.launchserver.auth.core.interfaces.provider;
 
-import pro.gravit.launcher.request.auth.AuthRequest;
+import pro.gravit.launcher.base.request.auth.AuthRequest;
 import pro.gravit.launchserver.auth.Feature;
 import pro.gravit.launchserver.auth.core.User;
 

LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/interfaces/user/UserSupportTextures.java

@@ -1,7 +1,7 @@
 package pro.gravit.launchserver.auth.core.interfaces.user;
 
-import pro.gravit.launcher.profiles.ClientProfile;
+import pro.gravit.launcher.base.profiles.ClientProfile;
-import pro.gravit.launcher.profiles.Texture;
+import pro.gravit.launcher.base.profiles.Texture;
 
 import java.util.HashMap;
 import java.util.Map;

LaunchServer/src/main/java/pro/gravit/launchserver/auth/mix/UploadAssetMixProvider.java

@@ -1,6 +1,6 @@
 package pro.gravit.launchserver.auth.mix;
 
-import pro.gravit.launcher.events.request.AssetUploadInfoRequestEvent;
+import pro.gravit.launcher.base.events.request.AssetUploadInfoRequestEvent;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.auth.core.AuthCoreProvider;
 import pro.gravit.launchserver.auth.core.User;

LaunchServer/src/main/java/pro/gravit/launchserver/auth/password/JsonPasswordVerifier.java

@@ -2,7 +2,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.Launcher;
+import pro.gravit.launcher.base.Launcher;
 
 import java.io.InputStream;
 import java.io.InputStreamReader;

LaunchServer/src/main/java/pro/gravit/launchserver/auth/protect/AdvancedProtectHandler.java

@@ -4,9 +4,9 @@
 import io.jsonwebtoken.Jwts;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.events.request.GetSecureLevelInfoRequestEvent;
+import pro.gravit.launcher.base.events.request.GetSecureLevelInfoRequestEvent;
-import pro.gravit.launcher.events.request.HardwareReportRequestEvent;
+import pro.gravit.launcher.base.events.request.HardwareReportRequestEvent;
-import pro.gravit.launcher.events.request.VerifySecureLevelKeyRequestEvent;
+import pro.gravit.launcher.base.events.request.VerifySecureLevelKeyRequestEvent;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.auth.AuthProviderPair;
 import pro.gravit.launchserver.auth.core.interfaces.UserHardware;

LaunchServer/src/main/java/pro/gravit/launchserver/auth/protect/StdProtectHandler.java

@@ -2,7 +2,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.profiles.ClientProfile;
+import pro.gravit.launcher.base.profiles.ClientProfile;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.auth.protect.interfaces.ProfilesProtectHandler;
 import pro.gravit.launchserver.socket.Client;
@@ -22,7 +22,7 @@ public boolean allowGetAccessToken(AuthResponse.AuthContext context) {
 
     @Override
     public void init(LaunchServer server) {
-        if (profileWhitelist != null && profileWhitelist.size() > 0) {
+        if (profileWhitelist != null && !profileWhitelist.isEmpty()) {
             logger.warn("profileWhitelist deprecated. Please use permission 'launchserver.profile.PROFILE_UUID.show' and 'launchserver.profile.PROFILE_UUID.enter'");
         }
     }

LaunchServer/src/main/java/pro/gravit/launchserver/auth/protect/interfaces/ProfilesProtectHandler.java

@@ -1,6 +1,6 @@
 package pro.gravit.launchserver.auth.protect.interfaces;
 
-import pro.gravit.launcher.profiles.ClientProfile;
+import pro.gravit.launcher.base.profiles.ClientProfile;
 import pro.gravit.launchserver.socket.Client;
 
 public interface ProfilesProtectHandler {

LaunchServer/src/main/java/pro/gravit/launchserver/auth/protect/interfaces/SecureProtectHandler.java

@@ -1,8 +1,8 @@
 package pro.gravit.launchserver.auth.protect.interfaces;
 
-import pro.gravit.launcher.events.request.GetSecureLevelInfoRequestEvent;
+import pro.gravit.launcher.base.events.request.GetSecureLevelInfoRequestEvent;
-import pro.gravit.launcher.events.request.SecurityReportRequestEvent;
+import pro.gravit.launcher.base.events.request.SecurityReportRequestEvent;
-import pro.gravit.launcher.events.request.VerifySecureLevelKeyRequestEvent;
+import pro.gravit.launcher.base.events.request.VerifySecureLevelKeyRequestEvent;
 import pro.gravit.launchserver.socket.Client;
 import pro.gravit.launchserver.socket.response.secure.SecurityReportResponse;
 import pro.gravit.utils.helper.SecurityHelper;

LaunchServer/src/main/java/pro/gravit/launchserver/auth/texture/JsonTextureProvider.java

@@ -3,7 +3,7 @@
 import com.google.gson.reflect.TypeToken;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.profiles.Texture;
+import pro.gravit.launcher.base.profiles.Texture;
 import pro.gravit.launchserver.HttpRequester;
 import pro.gravit.utils.helper.SecurityHelper;
 

LaunchServer/src/main/java/pro/gravit/launchserver/auth/texture/NullTextureProvider.java

@@ -1,6 +1,6 @@
 package pro.gravit.launchserver.auth.texture;
 
-import pro.gravit.launcher.profiles.Texture;
+import pro.gravit.launcher.base.profiles.Texture;
 import pro.gravit.utils.helper.VerifyHelper;
 
 import java.io.IOException;

LaunchServer/src/main/java/pro/gravit/launchserver/auth/texture/RequestTextureProvider.java

@@ -1,7 +1,7 @@
 package pro.gravit.launchserver.auth.texture;
 
-import pro.gravit.launcher.Launcher;
+import pro.gravit.launcher.base.Launcher;
-import pro.gravit.launcher.profiles.Texture;
+import pro.gravit.launcher.base.profiles.Texture;
 import pro.gravit.utils.helper.CommonHelper;
 import pro.gravit.utils.helper.IOHelper;
 

LaunchServer/src/main/java/pro/gravit/launchserver/auth/texture/TextureProvider.java

@@ -1,6 +1,6 @@
 package pro.gravit.launchserver.auth.texture;
 
-import pro.gravit.launcher.profiles.Texture;
+import pro.gravit.launcher.base.profiles.Texture;
 import pro.gravit.utils.ProviderMap;
 
 import java.io.IOException;

LaunchServer/src/main/java/pro/gravit/launchserver/auth/texture/VoidTextureProvider.java

@@ -1,6 +1,6 @@
 package pro.gravit.launchserver.auth.texture;
 
-import pro.gravit.launcher.profiles.Texture;
+import pro.gravit.launcher.base.profiles.Texture;
 
 import java.util.UUID;
 

LaunchServer/src/main/java/pro/gravit/launchserver/binary/BinaryPipeline.java

@@ -7,12 +7,10 @@
 import pro.gravit.utils.helper.IOHelper;
 
 import java.io.IOException;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 

LaunchServer/src/main/java/pro/gravit/launchserver/binary/BuildContext.java

@@ -2,9 +2,9 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.Launcher;
+import pro.gravit.launcher.base.Launcher;
-import pro.gravit.launcher.serialize.HOutput;
+import pro.gravit.launcher.core.serialize.HOutput;
-import pro.gravit.launcher.serialize.stream.StreamObject;
+import pro.gravit.launcher.core.serialize.stream.StreamObject;
 import pro.gravit.launchserver.binary.tasks.MainBuildTask;
 import pro.gravit.utils.helper.IOHelper;
 import pro.gravit.utils.helper.SecurityHelper;

LaunchServer/src/main/java/pro/gravit/launchserver/binary/EXEL4JLauncherBinary.java

@@ -1,17 +0,0 @@
-package pro.gravit.launchserver.binary;
-
-import pro.gravit.launchserver.LaunchServer;
-import pro.gravit.launchserver.binary.tasks.exe.Launch4JTask;
-
-public final class EXEL4JLauncherBinary extends LauncherBinary {
-
-
-    public EXEL4JLauncherBinary(LaunchServer server) {
-        super(server, LauncherBinary.resolve(server, ".exe"), "Launcher-%s.exe");
-    }
-
-    @Override
-    public void init() {
-        tasks.add(new Launch4JTask(server));
-    }
-}

LaunchServer/src/main/java/pro/gravit/launchserver/binary/JARLauncherBinary.java

@@ -1,6 +1,6 @@
 package pro.gravit.launchserver.binary;
 
-import pro.gravit.launcher.Launcher;
+import pro.gravit.launcher.base.Launcher;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.binary.tasks.*;
 

LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/MainBuildTask.java

@@ -8,8 +8,8 @@
 import org.objectweb.asm.tree.AnnotationNode;
 import org.objectweb.asm.tree.ClassNode;
 import org.objectweb.asm.tree.FieldNode;
-import pro.gravit.launcher.Launcher;
+import pro.gravit.launcher.base.Launcher;
-import pro.gravit.launcher.LauncherConfig;
+import pro.gravit.launcher.base.LauncherConfig;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.asm.ClassMetadataReader;
 import pro.gravit.launchserver.asm.InjectClassAcceptor;

LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/exe/Launch4JTask.java

@@ -1,125 +0,0 @@
-package pro.gravit.launchserver.binary.tasks.exe;
-
-import net.sf.launch4j.Builder;
-import net.sf.launch4j.Log;
-import net.sf.launch4j.config.*;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import pro.gravit.launchserver.LaunchServer;
-import pro.gravit.launchserver.binary.tasks.LauncherBuildTask;
-import pro.gravit.utils.Version;
-import pro.gravit.utils.helper.IOHelper;
-
-import java.io.IOException;
-import java.nio.file.Path;
-
-public class Launch4JTask implements LauncherBuildTask, BuildExeMainTask {
-    public static final String DOWNLOAD_URL = "https://bell-sw.com/pages/downloads/?version=java-8-lts&os=Windows&package=jre-full"; // BellSoft
-    private static final String VERSION = Version.getVersion().getVersionString();
-    private static final int BUILD = Version.getVersion().build;
-    private final Path faviconFile;
-    private final LaunchServer server;
-    private transient final Logger logger = LogManager.getLogger();
-
-    public Launch4JTask(LaunchServer launchServer) {
-        this.server = launchServer;
-        faviconFile = launchServer.dir.resolve("favicon.ico");
-    }
-
-    public static String formatVars(String mask) {
-        return mask.formatted(VERSION, BUILD);
-    }
-
-    @Override
-    public String getName() {
-        return "launch4j";
-    }
-
-    @Override
-    public Path process(Path inputFile) throws IOException {
-        logger.info("Building launcher EXE binary file (Using Launch4J)");
-        Path output = setConfig();
-
-        // Set favicon path
-        Config config = ConfigPersister.getInstance().getConfig();
-        if (IOHelper.isFile(faviconFile))
-            config.setIcon(faviconFile.toFile());
-        else {
-            config.setIcon(null);
-            logger.warn("Missing favicon.ico file");
-        }
-
-        // Start building
-        Builder builder = new Builder(Launch4JLog.INSTANCE);
-        try {
-            builder.build();
-        } catch (Throwable e) {
-            throw new IOException(e);
-        }
-        return output;
-    }
-
-    private Path setConfig() {
-        Path path = server.launcherEXEBinary.nextPath(getName());
-        Config config = new Config();
-        // Set file options
-        config.setChdir(".");
-        config.setErrTitle("JVM Error");
-        config.setDownloadUrl(server.config.launch4j.downloadUrl);
-        if (server.config.launch4j.supportURL != null) config.setSupportUrl(server.config.launch4j.supportURL);
-        // Set boolean options
-        config.setPriorityIndex(0);
-        config.setHeaderType(Config.GUI_HEADER);
-        config.setStayAlive(false);
-        config.setRestartOnCrash(false);
-
-        // Prepare JRE
-        Jre jre = new Jre();
-        jre.setMinVersion(server.config.launch4j.minVersion);
-        if (server.config.launch4j.setMaxVersion)
-            jre.setMaxVersion(server.config.launch4j.maxVersion);
-        jre.setPath(System.getProperty("java.home"));
-        config.setJre(jre);
-
-        // Prepare version info (product)
-        VersionInfo info = new VersionInfo();
-        info.setProductName(server.config.launch4j.productName);
-        info.setProductVersion(formatVars(server.config.launch4j.productVer));
-        info.setFileDescription(server.config.launch4j.fileDesc);
-        info.setFileVersion(formatVars(server.config.launch4j.fileVer));
-        info.setCopyright(server.config.launch4j.copyright);
-        info.setTrademarks(server.config.launch4j.trademarks);
-        info.setInternalName(formatVars(server.config.launch4j.internalName));
-        // Prepare version info (file)
-        info.setTxtFileVersion(formatVars(server.config.launch4j.txtFileVersion));
-        info.setTxtProductVersion(formatVars(server.config.launch4j.txtProductVersion));
-        // Prepare version info (misc)
-        info.setOriginalFilename(path.getFileName().toString());
-        info.setLanguage(LanguageID.RUSSIAN);
-        config.setVersionInfo(info);
-
-        // Set JAR wrapping options
-        config.setDontWrapJar(false);
-        config.setJar(server.launcherBinary.syncBinaryFile.toFile());
-        config.setOutfile(path.toFile());
-
-        // Return prepared config
-        ConfigPersister.getInstance().setAntConfig(config, null);
-        return path;
-    }
-
-    private final static class Launch4JLog extends Log {
-        private static final Launch4JLog INSTANCE = new Launch4JLog();
-        private static final Logger logger = LogManager.getLogger();
-
-        @Override
-        public void append(String s) {
-            logger.info(s);
-        }
-
-        @Override
-        public void clear() {
-            // Do nothing
-        }
-    }
-}

LaunchServer/src/main/java/pro/gravit/launchserver/command/Command.java

@@ -3,9 +3,9 @@
 import me.tongfei.progressbar.ProgressBar;
 import me.tongfei.progressbar.ProgressBarBuilder;
 import me.tongfei.progressbar.ProgressBarStyle;
-import pro.gravit.launcher.Launcher;
+import pro.gravit.launcher.base.Launcher;
-import pro.gravit.launcher.modern.Downloader;
+import pro.gravit.launcher.base.Downloader;
-import pro.gravit.launcher.profiles.ClientProfile;
+import pro.gravit.launcher.base.profiles.ClientProfile;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.utils.command.CommandException;
 

LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/DownloadAssetCommand.java

@@ -3,8 +3,8 @@
 import com.google.gson.JsonObject;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.Launcher;
+import pro.gravit.launcher.base.Launcher;
-import pro.gravit.launcher.modern.Downloader;
+import pro.gravit.launcher.base.Downloader;
 import pro.gravit.launchserver.HttpRequester;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.command.Command;

LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/DownloadClientCommand.java

@@ -3,9 +3,9 @@
 import com.google.gson.JsonElement;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.Launcher;
+import pro.gravit.launcher.base.Launcher;
-import pro.gravit.launcher.profiles.ClientProfile;
+import pro.gravit.launcher.base.profiles.ClientProfile;
-import pro.gravit.launcher.profiles.ClientProfileVersions;
+import pro.gravit.launcher.base.profiles.ClientProfileVersions;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.command.Command;
 import pro.gravit.launchserver.helper.MakeProfileHelper;

LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/IndexAssetCommand.java

@@ -3,7 +3,7 @@
 import com.google.gson.JsonObject;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.Launcher;
+import pro.gravit.launcher.base.Launcher;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.command.Command;
 import pro.gravit.utils.command.CommandException;

LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/MakeProfileCommand.java

@@ -2,8 +2,8 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.Launcher;
+import pro.gravit.launcher.base.Launcher;
-import pro.gravit.launcher.profiles.ClientProfile;
+import pro.gravit.launcher.base.profiles.ClientProfile;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.command.Command;
 import pro.gravit.launchserver.helper.MakeProfileHelper;

LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/SaveProfilesCommand.java

@@ -2,8 +2,8 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.Launcher;
+import pro.gravit.launcher.base.Launcher;
-import pro.gravit.launcher.profiles.ClientProfile;
+import pro.gravit.launcher.base.profiles.ClientProfile;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.command.Command;
 import pro.gravit.utils.helper.IOHelper;
@@ -24,7 +24,7 @@ public SaveProfilesCommand(LaunchServer server) {
 
     public static void saveProfile(ClientProfile profile, Path path) throws IOException {
         if (profile.getUUID() == null) profile.setUUID(UUID.randomUUID());
-        if (profile.getServers().size() == 0) {
+        if (profile.getServers().isEmpty()) {
             ClientProfile.ServerProfile serverProfile = new ClientProfile.ServerProfile();
             serverProfile.isDefault = true;
             serverProfile.name = profile.getTitle();

LaunchServer/src/main/java/pro/gravit/launchserver/command/modules/ModulesCommand.java

@@ -2,9 +2,9 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.LauncherTrustManager;
+import pro.gravit.launcher.core.LauncherTrustManager;
-import pro.gravit.launcher.modules.LauncherModule;
+import pro.gravit.launcher.base.modules.LauncherModule;
-import pro.gravit.launcher.modules.LauncherModuleInfo;
+import pro.gravit.launcher.base.modules.LauncherModuleInfo;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.command.Command;
 import pro.gravit.launchserver.launchermodules.LauncherModuleLoader;

LaunchServer/src/main/java/pro/gravit/launchserver/command/service/ComponentCommand.java

@@ -2,7 +2,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.Launcher;
+import pro.gravit.launcher.base.Launcher;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.command.Command;
 import pro.gravit.launchserver.components.Component;

LaunchServer/src/main/java/pro/gravit/launchserver/command/service/NotifyCommand.java

@@ -1,7 +1,7 @@
 package pro.gravit.launchserver.command.service;
 
-import pro.gravit.launcher.events.NotificationEvent;
+import pro.gravit.launcher.base.events.NotificationEvent;
-import pro.gravit.launcher.request.WebSocketEvent;
+import pro.gravit.launcher.base.request.WebSocketEvent;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.command.Command;
 import pro.gravit.launchserver.socket.WebSocketService;

LaunchServer/src/main/java/pro/gravit/launchserver/command/service/SecurityCheckCommand.java

@@ -2,7 +2,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.profiles.ClientProfile;
+import pro.gravit.launcher.base.profiles.ClientProfile;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.auth.protect.AdvancedProtectHandler;
 import pro.gravit.launchserver.auth.protect.NoProtectHandler;

LaunchServer/src/main/java/pro/gravit/launchserver/command/service/TokenCommand.java

@@ -3,7 +3,7 @@
 import io.jsonwebtoken.Jwts;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.profiles.ClientProfile;
+import pro.gravit.launcher.base.profiles.ClientProfile;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.auth.AuthProviderPair;
 import pro.gravit.launchserver.command.Command;

LaunchServer/src/main/java/pro/gravit/launchserver/components/Component.java

@@ -11,7 +11,6 @@ public abstract class Component {
     public static void registerComponents() {
         if (!registredComp) {
             providers.register("authLimiter", AuthLimiterComponent.class);
-            providers.register("regLimiter", RegLimiterComponent.class);
             providers.register("commandRemover", CommandRemoverComponent.class);
             providers.register("proguard", ProGuardComponent.class);
             providers.register("whitelist", WhitelistComponent.class);

LaunchServer/src/main/java/pro/gravit/launchserver/components/RegLimiterComponent.java

@@ -1,34 +0,0 @@
-package pro.gravit.launchserver.components;
-
-import pro.gravit.launchserver.LaunchServer;
-import pro.gravit.launchserver.manangers.hook.AuthHookManager;
-import pro.gravit.utils.HookException;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class RegLimiterComponent extends IPLimiter implements AutoCloseable {
-
-    public transient LaunchServer launchServer;
-    public String message;
-
-    public List<String> excludeIps = new ArrayList<>();
-
-    @Override
-    public void init(LaunchServer launchServer) {
-        this.launchServer = launchServer;
-        launchServer.authHookManager.registraion.registerHook(this::registerHook);
-    }
-
-    public boolean registerHook(AuthHookManager.RegContext context) {
-        if (!check(context.ip)) {
-            throw new HookException(message);
-        }
-        return false;
-    }
-
-    @Override
-    public void close() {
-        launchServer.authHookManager.registraion.unregisterHook(this::registerHook);
-    }
-}

LaunchServer/src/main/java/pro/gravit/launchserver/config/LaunchServerConfig.java

@@ -4,20 +4,17 @@
 import io.netty.handler.logging.LogLevel;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.Launcher;
+import pro.gravit.launcher.base.Launcher;
-import pro.gravit.launcher.LauncherConfig;
+import pro.gravit.launcher.base.LauncherConfig;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.auth.AuthProviderPair;
 import pro.gravit.launchserver.auth.core.RejectAuthCoreProvider;
 import pro.gravit.launchserver.auth.protect.ProtectHandler;
 import pro.gravit.launchserver.auth.protect.StdProtectHandler;
 import pro.gravit.launchserver.auth.texture.RequestTextureProvider;
-import pro.gravit.launchserver.binary.tasks.exe.Launch4JTask;
 import pro.gravit.launchserver.components.AuthLimiterComponent;
 import pro.gravit.launchserver.components.Component;
 import pro.gravit.launchserver.components.ProGuardComponent;
-import pro.gravit.launchserver.components.RegLimiterComponent;
-import pro.gravit.utils.Version;
 import pro.gravit.utils.helper.JVMHelper;
 
 import java.io.File;
@@ -27,7 +24,9 @@
 import static java.util.concurrent.TimeUnit.SECONDS;
 
 public final class LaunchServerConfig {
-    private final static List<String> oldMirrorList = List.of("https://mirror.gravit.pro/5.2.x/", "https://mirror.gravit.pro/5.3.x/", "https://mirror.gravitlauncher.com/5.2.x/", "https://mirror.gravitlauncher.com/5.3.x/", "https://mirror.gravitlauncher.com/5.4.x/");
+    private final static List<String> oldMirrorList = List.of("https://mirror.gravit.pro/5.2.x/", "https://mirror.gravit.pro/5.3.x/",
+            "https://mirror.gravitlauncher.com/5.2.x/", "https://mirror.gravitlauncher.com/5.3.x/", "https://mirror.gravitlauncher.com/5.4.x/",
+            "https://mirror.gravitlauncher.com/5.5.x/");
     private transient final Logger logger = LogManager.getLogger();
     public String projectName;
     public String[] mirrors;
@@ -39,7 +38,6 @@ public final class LaunchServerConfig {
     // Handlers & Providers
     public ProtectHandler protectHandler;
     public Map<String, Component> components;
-    public ExeConf launch4j;
     public NettyConfig netty;
     public LauncherConf launcher;
     public JarSignerConf sign;
@@ -49,19 +47,7 @@ public final class LaunchServerConfig {
 
     public static LaunchServerConfig getDefault(LaunchServer.LaunchServerEnv env) {
         LaunchServerConfig newConfig = new LaunchServerConfig();
-        newConfig.mirrors = new String[]{"https://mirror.gravitlauncher.com/5.5.x/", "https://gravit-launcher-mirror.storage.googleapis.com/"};
+        newConfig.mirrors = new String[]{"https://mirror.gravitlauncher.com/5.6.x/", "https://gravit-launcher-mirror.storage.googleapis.com/"};
-        newConfig.launch4j = new LaunchServerConfig.ExeConf();
-        newConfig.launch4j.enabled = false;
-        newConfig.launch4j.copyright = "© GravitLauncher Team";
-        newConfig.launch4j.fileDesc = "GravitLauncher ".concat(Version.getVersion().getVersionString());
-        newConfig.launch4j.fileVer = Version.getVersion().getVersionString().concat(".").concat(String.valueOf(Version.getVersion().patch));
-        newConfig.launch4j.internalName = "Launcher";
-        newConfig.launch4j.trademarks = "This product is licensed under GPLv3";
-        newConfig.launch4j.txtFileVersion = "%s, build %d";
-        newConfig.launch4j.txtProductVersion = "%s, build %d";
-        newConfig.launch4j.productName = "GravitLauncher";
-        newConfig.launch4j.productVer = newConfig.launch4j.fileVer;
-        newConfig.launch4j.maxVersion = "99.0.0";
         newConfig.env = LauncherConfig.LauncherEnvironment.STD;
         newConfig.startScript = JVMHelper.OS_TYPE.equals(JVMHelper.OS.MUSTDIE) ? "." + File.separator + "start.bat" : "." + File.separator + "start.sh";
         newConfig.auth = new HashMap<>();
@@ -100,11 +86,6 @@ public static LaunchServerConfig getDefault(LaunchServer.LaunchServerEnv env) {
         authLimiterComponent.rateLimitMillis = SECONDS.toMillis(8);
         authLimiterComponent.message = "Превышен лимит авторизаций";
         newConfig.components.put("authLimiter", authLimiterComponent);
-        RegLimiterComponent regLimiterComponent = new RegLimiterComponent();
-        regLimiterComponent.rateLimit = 3;
-        regLimiterComponent.rateLimitMillis = HOURS.toMillis(10);
-        regLimiterComponent.message = "Превышен лимит регистраций";
-        newConfig.components.put("regLimiter", regLimiterComponent);
         ProGuardComponent proGuardComponent = new ProGuardComponent();
         newConfig.components.put("proguard", proGuardComponent);
         return newConfig;
@@ -142,7 +123,7 @@ public void setEnv(LauncherConfig.LauncherEnvironment env) {
     }
 
     public void verify() {
-        if (auth == null || auth.size() < 1) {
+        if (auth == null || auth.isEmpty()) {
             throw new NullPointerException("AuthProviderPair`s count should be at least one");
         }
 
@@ -171,8 +152,8 @@ public void verify() {
             if (!updateMirror) {
                 for (int i = 0; i < mirrors.length; ++i) {
                     if (mirrors[i] != null && oldMirrorList.contains(mirrors[i])) {
-                        logger.warn("Replace mirror '{}' to 'https://mirror.gravitlauncher.com/5.5.x/'. If you really need to use original url, use '-Dlaunchserver.config.disableUpdateMirror=true'", mirrors[i]);
+                        logger.warn("Replace mirror '{}' to 'https://mirror.gravitlauncher.com/5.6.x/'. If you really need to use original url, use '-Dlaunchserver.config.disableUpdateMirror=true'", mirrors[i]);
-                        mirrors[i] = "https://mirror.gravitlauncher.com/5.5.x/";
+                        mirrors[i] = "https://mirror.gravitlauncher.com/5.6.x/";
                     }
                 }
             }
@@ -230,25 +211,6 @@ public void close(LaunchServer.ReloadType type) {
         }
     }
 
-    public static class ExeConf {
-        public boolean enabled;
-        public boolean setMaxVersion;
-        public String maxVersion;
-        public String minVersion = "17.0.0";
-        public String supportURL = null;
-        public String downloadUrl = Launch4JTask.DOWNLOAD_URL;
-        public String productName;
-        public String productVer;
-        public String fileDesc;
-        public String fileVer;
-        public String internalName;
-        public String copyright;
-        public String trademarks;
-
-        public String txtFileVersion;
-        public String txtProductVersion;
-    }
-
     public static class JarSignerConf {
         public boolean enabled = false;
         public String keyStore = "pathToKey";

LaunchServer/src/main/java/pro/gravit/launchserver/helper/HttpHelper.java

@@ -3,8 +3,8 @@
 import com.google.gson.JsonElement;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.Launcher;
+import pro.gravit.launcher.base.Launcher;
-import pro.gravit.launcher.request.RequestException;
+import pro.gravit.launcher.base.request.RequestException;
 
 import java.io.IOException;
 import java.io.InputStream;

LaunchServer/src/main/java/pro/gravit/launchserver/helper/MakeProfileHelper.java

@@ -1,12 +1,12 @@
 package pro.gravit.launchserver.helper;
 
-import pro.gravit.launcher.profiles.ClientProfile;
+import pro.gravit.launcher.base.profiles.ClientProfile;
-import pro.gravit.launcher.profiles.ClientProfileBuilder;
+import pro.gravit.launcher.base.profiles.ClientProfileBuilder;
-import pro.gravit.launcher.profiles.ClientProfileVersions;
+import pro.gravit.launcher.base.profiles.ClientProfileVersions;
-import pro.gravit.launcher.profiles.optional.OptionalFile;
+import pro.gravit.launcher.base.profiles.optional.OptionalFile;
-import pro.gravit.launcher.profiles.optional.actions.OptionalActionFile;
+import pro.gravit.launcher.base.profiles.optional.actions.OptionalActionFile;
-import pro.gravit.launcher.profiles.optional.actions.OptionalActionJvmArgs;
+import pro.gravit.launcher.base.profiles.optional.actions.OptionalActionJvmArgs;
-import pro.gravit.launcher.profiles.optional.triggers.OSTrigger;
+import pro.gravit.launcher.base.profiles.optional.triggers.OSTrigger;
 import pro.gravit.utils.helper.JVMHelper;
 
 import java.io.IOException;

LaunchServer/src/main/java/pro/gravit/launchserver/launchermodules/LauncherModuleLoader.java

@@ -2,8 +2,8 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.Launcher;
+import pro.gravit.launcher.base.Launcher;
-import pro.gravit.launcher.LauncherTrustManager;
+import pro.gravit.launcher.core.LauncherTrustManager;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.asm.InjectClassAcceptor;
 import pro.gravit.launchserver.binary.tasks.MainBuildTask;

LaunchServer/src/main/java/pro/gravit/launchserver/manangers/AuthManager.java

@@ -4,12 +4,12 @@
 import io.jsonwebtoken.Jwts;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.ClientPermissions;
+import pro.gravit.launcher.base.ClientPermissions;
-import pro.gravit.launcher.events.request.AuthRequestEvent;
+import pro.gravit.launcher.base.events.request.AuthRequestEvent;
-import pro.gravit.launcher.profiles.ClientProfile;
+import pro.gravit.launcher.base.profiles.ClientProfile;
-import pro.gravit.launcher.profiles.PlayerProfile;
+import pro.gravit.launcher.base.profiles.PlayerProfile;
-import pro.gravit.launcher.request.auth.AuthRequest;
+import pro.gravit.launcher.base.request.auth.AuthRequest;
-import pro.gravit.launcher.request.auth.password.*;
+import pro.gravit.launcher.base.request.auth.password.*;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.auth.AuthException;
 import pro.gravit.launchserver.auth.AuthProviderPair;

LaunchServer/src/main/java/pro/gravit/launchserver/manangers/CertificateManager.java

@@ -11,7 +11,7 @@
 import org.bouncycastle.util.io.pem.PemObject;
 import org.bouncycastle.util.io.pem.PemReader;
 import org.bouncycastle.util.io.pem.PemWriter;
-import pro.gravit.launcher.LauncherTrustManager;
+import pro.gravit.launcher.core.LauncherTrustManager;
 import pro.gravit.utils.helper.IOHelper;
 import pro.gravit.utils.helper.JVMHelper;
 

LaunchServer/src/main/java/pro/gravit/launchserver/manangers/ConfigManager.java

@@ -1,6 +1,6 @@
-package pro.gravit.launcher.managers;
+package pro.gravit.launchserver.manangers;
 
-import pro.gravit.launcher.config.JsonConfigurable;
+import pro.gravit.launcher.base.config.JsonConfigurable;
 import pro.gravit.utils.helper.LogHelper;
 import pro.gravit.utils.helper.VerifyHelper;
 

LaunchServer/src/main/java/pro/gravit/launchserver/manangers/LaunchServerGsonManager.java

@@ -2,16 +2,16 @@
 
 import com.google.gson.GsonBuilder;
 import marcono1234.gson.recordadapter.RecordTypeAdapterFactory;
-import pro.gravit.launcher.events.request.GetAvailabilityAuthRequestEvent;
+import pro.gravit.launcher.base.events.request.GetAvailabilityAuthRequestEvent;
-import pro.gravit.launcher.managers.GsonManager;
+import pro.gravit.launcher.core.managers.GsonManager;
-import pro.gravit.launcher.modules.events.PreGsonPhase;
+import pro.gravit.launcher.base.modules.events.PreGsonPhase;
-import pro.gravit.launcher.profiles.ClientProfile;
+import pro.gravit.launcher.base.profiles.ClientProfile;
-import pro.gravit.launcher.profiles.optional.actions.OptionalAction;
+import pro.gravit.launcher.base.profiles.optional.actions.OptionalAction;
-import pro.gravit.launcher.profiles.optional.triggers.OptionalTrigger;
+import pro.gravit.launcher.base.profiles.optional.triggers.OptionalTrigger;
-import pro.gravit.launcher.request.JsonResultSerializeAdapter;
+import pro.gravit.launcher.base.request.JsonResultSerializeAdapter;
-import pro.gravit.launcher.request.WebSocketEvent;
+import pro.gravit.launcher.base.request.WebSocketEvent;
-import pro.gravit.launcher.request.auth.AuthRequest;
+import pro.gravit.launcher.base.request.auth.AuthRequest;
-import pro.gravit.launcher.request.auth.GetAvailabilityAuthRequest;
+import pro.gravit.launcher.base.request.auth.GetAvailabilityAuthRequest;
 import pro.gravit.launchserver.auth.core.AuthCoreProvider;
 import pro.gravit.launchserver.auth.mix.MixProvider;
 import pro.gravit.launchserver.auth.password.PasswordVerifier;

LaunchServer/src/main/java/pro/gravit/launchserver/manangers/MirrorManager.java

@@ -3,7 +3,7 @@
 import com.google.gson.JsonElement;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.Launcher;
+import pro.gravit.launcher.base.Launcher;
 import pro.gravit.utils.helper.IOHelper;
 
 import java.io.IOException;

LaunchServer/src/main/java/pro/gravit/launchserver/manangers/UpdatesManager.java

@@ -2,9 +2,9 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.hasher.HashedDir;
+import pro.gravit.launcher.core.hasher.HashedDir;
-import pro.gravit.launcher.serialize.HInput;
+import pro.gravit.launcher.core.serialize.HInput;
-import pro.gravit.launcher.serialize.HOutput;
+import pro.gravit.launcher.core.serialize.HOutput;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.modules.events.LaunchServerUpdatesSyncEvent;
 import pro.gravit.utils.helper.IOHelper;

LaunchServer/src/main/java/pro/gravit/launchserver/manangers/hook/AuthHookManager.java

@@ -16,19 +16,4 @@ public class AuthHookManager {
     public final BiHookSet<AuthManager.CheckServerReport, Client> postCheckServerHook = new BiHookSet<>();
     public final BiHookSet<JoinServerResponse, Client> joinServerHook = new BiHookSet<>();
     public final BiHookSet<SetProfileResponse, Client> setProfileHook = new BiHookSet<>();
-    public final HookSet<RegContext> registraion = new HookSet<>();
-
-    public static class RegContext {
-        public final String login;
-        public final String password;
-        public final String ip;
-        public final boolean trustContext;
-
-        public RegContext(String login, String password, String ip, boolean trustContext) {
-            this.login = login;
-            this.password = password;
-            this.ip = ip;
-            this.trustContext = trustContext;
-        }
-    }
 }

LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/LaunchServerFullInitEvent.java

@@ -1,6 +1,6 @@
 package pro.gravit.launchserver.modules.events;
 
-import pro.gravit.launcher.modules.LauncherModule;
+import pro.gravit.launcher.base.modules.LauncherModule;
 import pro.gravit.launchserver.LaunchServer;
 
 public class LaunchServerFullInitEvent extends LauncherModule.Event {

LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/LaunchServerInitPhase.java

@@ -1,6 +1,6 @@
 package pro.gravit.launchserver.modules.events;
 
-import pro.gravit.launcher.modules.events.InitPhase;
+import pro.gravit.launcher.base.modules.events.InitPhase;
 import pro.gravit.launchserver.LaunchServer;
 
 public class LaunchServerInitPhase extends InitPhase {

LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/LaunchServerLauncherExeInit.java

@@ -1,6 +1,6 @@
 package pro.gravit.launchserver.modules.events;
 
-import pro.gravit.launcher.modules.LauncherModule;
+import pro.gravit.launcher.base.modules.LauncherModule;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.binary.LauncherBinary;
 

LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/LaunchServerNettyFullInitEvent.java

@@ -1,6 +1,6 @@
 package pro.gravit.launchserver.modules.events;
 
-import pro.gravit.launcher.modules.LauncherModule;
+import pro.gravit.launcher.base.modules.LauncherModule;
 import pro.gravit.launchserver.LaunchServer;
 
 public class LaunchServerNettyFullInitEvent extends LauncherModule.Event {

LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/LaunchServerPostInitPhase.java

@@ -1,6 +1,6 @@
 package pro.gravit.launchserver.modules.events;
 
-import pro.gravit.launcher.modules.events.PostInitPhase;
+import pro.gravit.launcher.base.modules.events.PostInitPhase;
 import pro.gravit.launchserver.LaunchServer;
 
 public class LaunchServerPostInitPhase extends PostInitPhase {

LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/LaunchServerProfilesSyncEvent.java

@@ -1,6 +1,6 @@
 package pro.gravit.launchserver.modules.events;
 
-import pro.gravit.launcher.modules.LauncherModule;
+import pro.gravit.launcher.base.modules.LauncherModule;
 import pro.gravit.launchserver.LaunchServer;
 
 public class LaunchServerProfilesSyncEvent extends LauncherModule.Event {

LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/LaunchServerUpdatesSyncEvent.java

@@ -1,6 +1,6 @@
 package pro.gravit.launchserver.modules.events;
 
-import pro.gravit.launcher.modules.LauncherModule;
+import pro.gravit.launcher.base.modules.LauncherModule;
 import pro.gravit.launchserver.LaunchServer;
 
 public class LaunchServerUpdatesSyncEvent extends LauncherModule.Event {

LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/NewLaunchServerInstanceEvent.java

@@ -1,6 +1,6 @@
 package pro.gravit.launchserver.modules.events;
 
-import pro.gravit.launcher.modules.LauncherModule;
+import pro.gravit.launcher.base.modules.LauncherModule;
 import pro.gravit.launchserver.LaunchServer;
 
 public class NewLaunchServerInstanceEvent extends LauncherModule.Event {

LaunchServer/src/main/java/pro/gravit/launchserver/modules/events/security/SecurityReportModuleEvent.java

@@ -1,7 +1,7 @@
 package pro.gravit.launchserver.modules.events.security;
 
-import pro.gravit.launcher.events.request.SecurityReportRequestEvent;
+import pro.gravit.launcher.base.events.request.SecurityReportRequestEvent;
-import pro.gravit.launcher.modules.LauncherModule;
+import pro.gravit.launcher.base.modules.LauncherModule;
 import pro.gravit.launchserver.socket.Client;
 import pro.gravit.launchserver.socket.response.secure.SecurityReportResponse;
 

LaunchServer/src/main/java/pro/gravit/launchserver/modules/impl/LaunchServerCoreModule.java

@@ -1,9 +1,9 @@
 package pro.gravit.launchserver.modules.impl;
 
-import pro.gravit.launcher.modules.LauncherInitContext;
+import pro.gravit.launcher.base.modules.LauncherInitContext;
-import pro.gravit.launcher.modules.LauncherModule;
+import pro.gravit.launcher.base.modules.LauncherModule;
-import pro.gravit.launcher.modules.LauncherModuleInfo;
+import pro.gravit.launcher.base.modules.LauncherModuleInfo;
-import pro.gravit.launcher.modules.events.InitPhase;
+import pro.gravit.launcher.base.modules.events.InitPhase;
 import pro.gravit.utils.Version;
 
 public class LaunchServerCoreModule extends LauncherModule {

LaunchServer/src/main/java/pro/gravit/launchserver/modules/impl/LaunchServerInitContext.java

@@ -1,6 +1,6 @@
 package pro.gravit.launchserver.modules.impl;
 
-import pro.gravit.launcher.modules.LauncherInitContext;
+import pro.gravit.launcher.base.modules.LauncherInitContext;
 import pro.gravit.launchserver.LaunchServer;
 
 public class LaunchServerInitContext implements LauncherInitContext {

LaunchServer/src/main/java/pro/gravit/launchserver/modules/impl/LaunchServerModulesManager.java

@@ -1,8 +1,8 @@
 package pro.gravit.launchserver.modules.impl;
 
-import pro.gravit.launcher.LauncherTrustManager;
+import pro.gravit.launcher.core.LauncherTrustManager;
-import pro.gravit.launcher.modules.LauncherModule;
+import pro.gravit.launcher.base.modules.LauncherModule;
-import pro.gravit.launcher.modules.impl.SimpleModuleManager;
+import pro.gravit.launcher.base.modules.impl.SimpleModuleManager;
 import pro.gravit.launchserver.LaunchServer;
 
 import java.nio.file.Path;

LaunchServer/src/main/java/pro/gravit/launchserver/socket/Client.java

@@ -1,8 +1,7 @@
 package pro.gravit.launchserver.socket;
 
-import pro.gravit.launcher.ClientPermissions;
+import pro.gravit.launcher.base.ClientPermissions;
-import pro.gravit.launcher.profiles.ClientProfile;
+import pro.gravit.launcher.base.profiles.ClientProfile;
-import pro.gravit.launcher.request.secure.HardwareReportRequest;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.auth.AuthProviderPair;
 import pro.gravit.launchserver.auth.core.interfaces.UserHardware;

LaunchServer/src/main/java/pro/gravit/launchserver/socket/WebSocketService.java

@@ -8,11 +8,11 @@
 import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.Launcher;
+import pro.gravit.launcher.base.Launcher;
-import pro.gravit.launcher.events.RequestEvent;
+import pro.gravit.launcher.base.events.RequestEvent;
-import pro.gravit.launcher.events.request.ErrorRequestEvent;
+import pro.gravit.launcher.base.events.request.ErrorRequestEvent;
-import pro.gravit.launcher.events.request.ExitRequestEvent;
+import pro.gravit.launcher.base.events.request.ExitRequestEvent;
-import pro.gravit.launcher.request.WebSocketEvent;
+import pro.gravit.launcher.base.request.WebSocketEvent;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.socket.handlers.WebSocketFrameHandler;
 import pro.gravit.launchserver.socket.response.SimpleResponse;

LaunchServer/src/main/java/pro/gravit/launchserver/socket/handlers/NettyWebAPIHandler.java

@@ -7,7 +7,7 @@
 import io.netty.handler.codec.http.*;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.Launcher;
+import pro.gravit.launcher.base.Launcher;
 import pro.gravit.launchserver.socket.NettyConnectContext;
 import pro.gravit.utils.helper.IOHelper;
 

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/SimpleResponse.java

@@ -1,8 +1,8 @@
 package pro.gravit.launchserver.socket.response;
 
 import io.netty.channel.ChannelHandlerContext;
-import pro.gravit.launcher.events.RequestEvent;
+import pro.gravit.launcher.base.events.RequestEvent;
-import pro.gravit.launcher.events.request.ErrorRequestEvent;
+import pro.gravit.launcher.base.events.request.ErrorRequestEvent;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.socket.WebSocketService;
 

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/WebSocketServerResponse.java

@@ -1,7 +1,7 @@
 package pro.gravit.launchserver.socket.response;
 
 import io.netty.channel.ChannelHandlerContext;
-import pro.gravit.launcher.request.websockets.WebSocketRequest;
+import pro.gravit.launcher.base.request.websockets.WebSocketRequest;
 import pro.gravit.launchserver.socket.Client;
 
 public interface WebSocketServerResponse extends WebSocketRequest {

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/AdditionalDataResponse.java

@@ -1,7 +1,7 @@
 package pro.gravit.launchserver.socket.response.auth;
 
 import io.netty.channel.ChannelHandlerContext;
-import pro.gravit.launcher.events.request.AdditionalDataRequestEvent;
+import pro.gravit.launcher.base.events.request.AdditionalDataRequestEvent;
 import pro.gravit.launchserver.auth.AuthProviderPair;
 import pro.gravit.launchserver.auth.core.User;
 import pro.gravit.launchserver.auth.core.interfaces.user.UserSupportAdditionalData;

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/AuthResponse.java

@@ -3,8 +3,8 @@
 import io.netty.channel.ChannelHandlerContext;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.events.request.AuthRequestEvent;
+import pro.gravit.launcher.base.events.request.AuthRequestEvent;
-import pro.gravit.launcher.request.auth.AuthRequest;
+import pro.gravit.launcher.base.request.auth.AuthRequest;
 import pro.gravit.launchserver.auth.AuthException;
 import pro.gravit.launchserver.auth.AuthProviderPair;
 import pro.gravit.launchserver.manangers.AuthManager;

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/CheckServerResponse.java

@@ -3,7 +3,7 @@
 import io.netty.channel.ChannelHandlerContext;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.events.request.CheckServerRequestEvent;
+import pro.gravit.launcher.base.events.request.CheckServerRequestEvent;
 import pro.gravit.launchserver.auth.AuthException;
 import pro.gravit.launchserver.auth.core.interfaces.session.UserSessionSupportHardware;
 import pro.gravit.launchserver.auth.core.interfaces.session.UserSessionSupportProperties;

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/CurrentUserResponse.java

@@ -1,7 +1,7 @@
 package pro.gravit.launchserver.socket.response.auth;
 
 import io.netty.channel.ChannelHandlerContext;
-import pro.gravit.launcher.events.request.CurrentUserRequestEvent;
+import pro.gravit.launcher.base.events.request.CurrentUserRequestEvent;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.socket.Client;
 import pro.gravit.launchserver.socket.response.SimpleResponse;

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/ExitResponse.java

@@ -2,8 +2,8 @@
 
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
-import pro.gravit.launcher.events.RequestEvent;
+import pro.gravit.launcher.base.events.RequestEvent;
-import pro.gravit.launcher.events.request.ExitRequestEvent;
+import pro.gravit.launcher.base.events.request.ExitRequestEvent;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.auth.core.UserSession;
 import pro.gravit.launchserver.auth.core.interfaces.provider.AuthSupportExit;
@@ -43,6 +43,10 @@ public void execute(ChannelHandlerContext ctx, Client client) {
             return;
         }
         if (username == null) {
+            if(!client.isAuth || client.auth == null) {
+                sendError("You are not authorized");
+                return;
+            }
             {
                 WebSocketFrameHandler handler = ctx.pipeline().get(WebSocketFrameHandler.class);
                 if (handler == null) {
@@ -65,7 +69,6 @@ public void execute(ChannelHandlerContext ctx, Client client) {
                 }
                 sendResult(new ExitRequestEvent(ExitRequestEvent.ExitReason.CLIENT));
             }
-            sendResult(new ExitRequestEvent(ExitRequestEvent.ExitReason.CLIENT));
         } else {
             service.forEachActiveChannels(((channel, webSocketFrameHandler) -> {
                 Client client1 = webSocketFrameHandler.getClient();

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/FetchClientProfileKeyResponse.java

@@ -1,7 +1,7 @@
 package pro.gravit.launchserver.socket.response.auth;
 
 import io.netty.channel.ChannelHandlerContext;
-import pro.gravit.launcher.events.request.FetchClientProfileKeyRequestEvent;
+import pro.gravit.launcher.base.events.request.FetchClientProfileKeyRequestEvent;
 import pro.gravit.launchserver.auth.core.UserSession;
 import pro.gravit.launchserver.auth.core.interfaces.session.UserSessionSupportKeys;
 import pro.gravit.launchserver.socket.Client;

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/GetAvailabilityAuthResponse.java

@@ -1,7 +1,7 @@
 package pro.gravit.launchserver.socket.response.auth;
 
 import io.netty.channel.ChannelHandlerContext;
-import pro.gravit.launcher.events.request.GetAvailabilityAuthRequestEvent;
+import pro.gravit.launcher.base.events.request.GetAvailabilityAuthRequestEvent;
 import pro.gravit.launchserver.auth.AuthProviderPair;
 import pro.gravit.launchserver.socket.Client;
 import pro.gravit.launchserver.socket.response.SimpleResponse;

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/JoinServerResponse.java

@@ -3,7 +3,7 @@
 import io.netty.channel.ChannelHandlerContext;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import pro.gravit.launcher.events.request.JoinServerRequestEvent;
+import pro.gravit.launcher.base.events.request.JoinServerRequestEvent;
 import pro.gravit.launchserver.auth.AuthException;
 import pro.gravit.launchserver.auth.protect.interfaces.JoinServerProtectHandler;
 import pro.gravit.launchserver.socket.Client;

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/ProfilesResponse.java

@@ -1,8 +1,8 @@
 package pro.gravit.launchserver.socket.response.auth;
 
 import io.netty.channel.ChannelHandlerContext;
-import pro.gravit.launcher.events.request.ProfilesRequestEvent;
+import pro.gravit.launcher.base.events.request.ProfilesRequestEvent;
-import pro.gravit.launcher.profiles.ClientProfile;
+import pro.gravit.launcher.base.profiles.ClientProfile;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.auth.protect.interfaces.ProfilesProtectHandler;
 import pro.gravit.launchserver.socket.Client;

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/RefreshTokenResponse.java

@@ -1,8 +1,8 @@
 package pro.gravit.launchserver.socket.response.auth;
 
 import io.netty.channel.ChannelHandlerContext;
-import pro.gravit.launcher.events.request.AuthRequestEvent;
+import pro.gravit.launcher.base.events.request.AuthRequestEvent;
-import pro.gravit.launcher.events.request.RefreshTokenRequestEvent;
+import pro.gravit.launcher.base.events.request.RefreshTokenRequestEvent;
 import pro.gravit.launchserver.auth.AuthProviderPair;
 import pro.gravit.launchserver.manangers.AuthManager;
 import pro.gravit.launchserver.socket.Client;

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/RestoreResponse.java

@@ -1,9 +1,9 @@
 package pro.gravit.launchserver.socket.response.auth;
 
 import io.netty.channel.ChannelHandlerContext;
-import pro.gravit.launcher.events.request.AuthRequestEvent;
+import pro.gravit.launcher.base.events.request.AuthRequestEvent;
-import pro.gravit.launcher.events.request.LauncherRequestEvent;
+import pro.gravit.launcher.base.events.request.LauncherRequestEvent;
-import pro.gravit.launcher.events.request.RestoreRequestEvent;
+import pro.gravit.launcher.base.events.request.RestoreRequestEvent;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.auth.AuthProviderPair;
 import pro.gravit.launchserver.auth.core.AuthCoreProvider;

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/auth/SetProfileResponse.java

@@ -1,8 +1,8 @@
 package pro.gravit.launchserver.socket.response.auth;
 
 import io.netty.channel.ChannelHandlerContext;
-import pro.gravit.launcher.events.request.SetProfileRequestEvent;
+import pro.gravit.launcher.base.events.request.SetProfileRequestEvent;
-import pro.gravit.launcher.profiles.ClientProfile;
+import pro.gravit.launcher.base.profiles.ClientProfile;
 import pro.gravit.launchserver.auth.protect.interfaces.ProfilesProtectHandler;
 import pro.gravit.launchserver.socket.Client;
 import pro.gravit.launchserver.socket.response.SimpleResponse;

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/cabinet/GetAssetUploadInfoResponse.java

@@ -1,7 +1,7 @@
 package pro.gravit.launchserver.socket.response.cabinet;
 
 import io.netty.channel.ChannelHandlerContext;
-import pro.gravit.launcher.events.request.GetAssetUploadUrlRequestEvent;
+import pro.gravit.launcher.base.events.request.GetAssetUploadUrlRequestEvent;
 import pro.gravit.launchserver.auth.core.interfaces.provider.AuthSupportAssetUpload;
 import pro.gravit.launchserver.socket.Client;
 import pro.gravit.launchserver.socket.response.SimpleResponse;

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/management/FeaturesResponse.java

@@ -1,7 +1,7 @@
 package pro.gravit.launchserver.socket.response.management;
 
 import io.netty.channel.ChannelHandlerContext;
-import pro.gravit.launcher.events.request.FeaturesRequestEvent;
+import pro.gravit.launcher.base.events.request.FeaturesRequestEvent;
 import pro.gravit.launchserver.socket.Client;
 import pro.gravit.launchserver.socket.response.SimpleResponse;
 

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/management/GetPublicKeyResponse.java

@@ -1,7 +1,7 @@
 package pro.gravit.launchserver.socket.response.management;
 
 import io.netty.channel.ChannelHandlerContext;
-import pro.gravit.launcher.events.request.GetPublicKeyRequestEvent;
+import pro.gravit.launcher.base.events.request.GetPublicKeyRequestEvent;
 import pro.gravit.launchserver.socket.Client;
 import pro.gravit.launchserver.socket.response.SimpleResponse;
 

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/profile/BatchProfileByUsername.java

@@ -1,8 +1,8 @@
 package pro.gravit.launchserver.socket.response.profile;
 
 import io.netty.channel.ChannelHandlerContext;
-import pro.gravit.launcher.events.request.BatchProfileByUsernameRequestEvent;
+import pro.gravit.launcher.base.events.request.BatchProfileByUsernameRequestEvent;
-import pro.gravit.launcher.profiles.PlayerProfile;
+import pro.gravit.launcher.base.profiles.PlayerProfile;
 import pro.gravit.launchserver.auth.AuthProviderPair;
 import pro.gravit.launchserver.socket.Client;
 import pro.gravit.launchserver.socket.response.SimpleResponse;

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/profile/ProfileByUUIDResponse.java

@@ -1,7 +1,7 @@
 package pro.gravit.launchserver.socket.response.profile;
 
 import io.netty.channel.ChannelHandlerContext;
-import pro.gravit.launcher.events.request.ProfileByUUIDRequestEvent;
+import pro.gravit.launcher.base.events.request.ProfileByUUIDRequestEvent;
 import pro.gravit.launchserver.auth.AuthProviderPair;
 import pro.gravit.launchserver.auth.core.User;
 import pro.gravit.launchserver.socket.Client;

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/profile/ProfileByUsername.java

@@ -1,8 +1,8 @@
 package pro.gravit.launchserver.socket.response.profile;
 
 import io.netty.channel.ChannelHandlerContext;
-import pro.gravit.launcher.events.request.ProfileByUsernameRequestEvent;
+import pro.gravit.launcher.base.events.request.ProfileByUsernameRequestEvent;
-import pro.gravit.launcher.profiles.PlayerProfile;
+import pro.gravit.launcher.base.profiles.PlayerProfile;
 import pro.gravit.launchserver.auth.AuthProviderPair;
 import pro.gravit.launchserver.socket.Client;
 import pro.gravit.launchserver.socket.response.SimpleResponse;

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/secure/GetSecureLevelInfoResponse.java

@@ -1,7 +1,7 @@
 package pro.gravit.launchserver.socket.response.secure;
 
 import io.netty.channel.ChannelHandlerContext;
-import pro.gravit.launcher.events.request.GetSecureLevelInfoRequestEvent;
+import pro.gravit.launcher.base.events.request.GetSecureLevelInfoRequestEvent;
 import pro.gravit.launchserver.auth.protect.interfaces.SecureProtectHandler;
 import pro.gravit.launchserver.socket.Client;
 import pro.gravit.launchserver.socket.response.SimpleResponse;

LaunchServer/src/main/java/pro/gravit/launchserver/socket/response/secure/HardwareReportResponse.java

@@ -1,8 +1,8 @@
 package pro.gravit.launchserver.socket.response.secure;
 
 import io.netty.channel.ChannelHandlerContext;
-import pro.gravit.launcher.events.request.HardwareReportRequestEvent;
+import pro.gravit.launcher.base.events.request.HardwareReportRequestEvent;
-import pro.gravit.launcher.request.secure.HardwareReportRequest;
+import pro.gravit.launcher.base.request.secure.HardwareReportRequest;
 import pro.gravit.launchserver.auth.protect.interfaces.HardwareProtectHandler;
 import pro.gravit.launchserver.socket.Client;
 import pro.gravit.launchserver.socket.response.SimpleResponse;