.github/workflows/push.yml

@@ -35,17 +35,13 @@ jobs:
         run: |
           mkdir -p artifacts/modules
           cd LaunchServer/build/libs
-          mv proguard proguard-libraries
           zip -r -9 ../../../artifacts/libraries.zip * -x "LaunchServer.jar" -x "LaunchServer-clean.jar"
           cp LaunchServer.jar ../../../artifacts/LaunchServer.jar
           cd ../../..
           cp ServerWrapper/build/libs/ServerWrapper.jar artifacts/ServerWrapper.jar
-          cp ServerWrapper/build/libs/ServerWrapper-inline.jar artifacts/ServerWrapperInline.jar
           cp LauncherAuthlib/build/libs/LauncherAuthlib.jar artifacts/LauncherAuthlib.jar || true
           cp modules/*_module/build/libs/*.jar artifacts/modules || true
           cp modules/*_lmodule/build/libs/*.jar artifacts/modules || true
-          cp javaargs.txt artifacts/javaargs.txt || true
-          cp java24args.txt artifacts/java24args.txt || true
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4

LaunchServer/build.gradle

@@ -13,37 +13,30 @@
     maven {
         url "https://jitpack.io/"
     }
-    maven {
-        url 'https://maven.gravit-support.ru/repository/jitpack'
-        credentials {
-            username = 'gravitlauncher'
-            password = 'gravitlauncher'
-        }
-    }
 }
 
 sourceCompatibility = '21'
 targetCompatibility = '21'
 
 configurations {
+    compileOnlyA
     bundleOnly
     bundle
+    hikari
     pack
-    proguardPack
+    launch4j
     bundleOnly.extendsFrom bundle
-    api.extendsFrom bundle, pack
+    api.extendsFrom bundle, hikari, pack, launch4j
 }
 
 jar {
     dependsOn parent.childProjects.Launcher.tasks.assemble
     from { configurations.pack.collect { it.isDirectory() ? it : zipTree(it) } }
-    exclude("module-info.class")
     from(parent.childProjects.Launcher.tasks.shadowJar)
     from(parent.childProjects.Launcher.tasks.genRuntimeJS)
     manifest.attributes("Main-Class": mainClassName,
             "Premain-Class": mainAgentName,
             "Multi-Release": "true",
-            "Automatic-Module-Name": "launchserver"
     )
 }
 
@@ -75,35 +68,25 @@
 
 
 dependencies {
-    pack(project(':LauncherAPI')) {
-        exclude group: "com.google.code.gson"
-    }
-    bundle group: 'com.google.code.gson', name: 'gson', version: rootProject['verGson']
+    pack project(':LauncherAPI')
     bundle group: 'me.tongfei', name: 'progressbar', version: '0.10.1'
     bundle group: 'org.fusesource.jansi', name: 'jansi', version: rootProject['verJansi']
-    bundle group: 'org.jline', name: 'jline-native', version: rootProject['verJline']
+    bundle group: 'org.jline', name: 'jline', version: rootProject['verJline']
     bundle group: 'org.jline', name: 'jline-reader', version: rootProject['verJline']
-    bundle group: 'org.jline', name: 'jline-terminal-ffm', version: rootProject['verJline']
+    bundle group: 'org.jline', name: 'jline-terminal', version: rootProject['verJline']
     bundle group: 'org.bouncycastle', name: 'bcprov-jdk18on', version: rootProject['verBcpkix']
     bundle group: 'org.bouncycastle', name: 'bcpkix-jdk18on', version: rootProject['verBcpkix']
     bundle group: 'org.ow2.asm', name: 'asm-commons', version: rootProject['verAsm']
     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: 'io.netty', name: 'netty-transport-native-epoll', version: rootProject['verNetty'], classifier: 'linux-aarch_64'
-    bundle group: 'io.netty', name: 'netty-transport-classes-io_uring', version: rootProject['verNetty']
-    bundle group: 'io.netty', name: 'netty-transport-native-io_uring', version: rootProject['verNetty'], classifier: 'linux-x86_64'
-    //bundle group: 'io.netty', name: 'netty-transport-native-io_uring', version: rootProject['verNetty'], classifier: 'linux-aarch_64'
-    // Netty
-    bundle 'org.jboss.marshalling:jboss-marshalling:1.4.11.Final'
-    bundle 'com.google.protobuf.nano:protobuf-javanano:3.1.0'
-    //
+    bundle group: 'io.netty', name: 'netty-transport-native-epoll', version: rootProject['verNetty'], classifier: 'linux-aarch_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.mariadb.jdbc', name: 'mariadb-java-client', version: rootProject['verMariaDBConn']
     bundle group: 'org.postgresql', name: 'postgresql', version: rootProject['verPostgreSQLConn']
     bundle group: 'com.h2database', name: 'h2', version: rootProject['verH2Conn']
-    proguardPack group: 'com.guardsquare', name: 'proguard-base', version: rootProject['verProguard']
+    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-slf4j2-impl', version: rootProject['verLog4j']
     bundle group: 'io.jsonwebtoken', name: 'jjwt-api', version: rootProject['verJwt']
@@ -113,32 +96,40 @@
     annotationProcessor(group: 'org.apache.logging.log4j', name: 'log4j-core', version: rootProject['verLog4j'])
     testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter', version: rootProject['verJunit']
 
-    bundle 'io.micrometer:micrometer-core:1.14.4'
-    bundle('com.zaxxer:HikariCP:6.2.1') {
+    hikari 'io.micrometer:micrometer-core:1.13.1'
+    hikari('com.zaxxer:HikariCP:5.1.0') {
         exclude group: 'javassist'
         exclude group: 'io.micrometer'
         exclude group: 'org.slf4j'
     }
 }
 
+tasks.register('hikari', Copy) {
+    duplicatesStrategy = 'EXCLUDE'
+    into "$buildDir/libs/libraries/hikaricp"
+    from configurations.hikari
+}
+
 tasks.register('dumpLibs', Copy) {
     duplicatesStrategy = 'EXCLUDE'
+    dependsOn tasks.hikari
     into "$buildDir/libs/libraries"
     from configurations.bundleOnly
 }
 
-tasks.register('dumpProguard', Copy) {
+tasks.register('dumpCompileOnlyLibs', Copy) {
     duplicatesStrategy = 'EXCLUDE'
-    into "$buildDir/libs/proguard"
-    from configurations.proguardPack
+    into "$buildDir/libs/launcher-libraries-compile"
+    from configurations.compileOnlyA
 }
 
 tasks.register('bundle', Zip) {
     duplicatesStrategy = 'EXCLUDE'
-    dependsOn parent.childProjects.Launcher.tasks.build, tasks.dumpLibs, tasks.jar
+    dependsOn parent.childProjects.Launcher.tasks.build, tasks.dumpLibs, tasks.dumpCompileOnlyLibs, tasks.jar
     archiveFileName = 'LaunchServer.zip'
     destinationDirectory = file("$buildDir")
     from(tasks.dumpLibs.destinationDir) { into 'libraries' }
+    from(tasks.dumpCompileOnlyLibs.destinationDir) { into 'launcher-libraries-compile' }
     from(tasks.jar)
     from(parent.childProjects.Launcher.tasks.dumpLibs) { into 'launcher-libraries' }
 }
@@ -149,7 +140,7 @@
     from parent.childProjects.Launcher.tasks.dumpLibs
 }
 
-assemble.dependsOn tasks.dumpLibs, tasks.dumpClientLibs, tasks.bundle, tasks.cleanjar, tasks.dumpProguard
+assemble.dependsOn tasks.dumpLibs, tasks.dumpCompileOnlyLibs, tasks.dumpClientLibs, tasks.bundle, tasks.cleanjar
 
 
 publishing {

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

@@ -2,6 +2,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import pro.gravit.launcher.base.Launcher;
 import pro.gravit.launcher.base.events.RequestEvent;
 import pro.gravit.launcher.base.events.request.ProfilesRequestEvent;
 import pro.gravit.launcher.base.modules.events.ClosePhase;
@@ -20,18 +21,21 @@
 import pro.gravit.launchserver.modules.events.*;
 import pro.gravit.launchserver.modules.impl.LaunchServerModulesManager;
 import pro.gravit.launchserver.socket.Client;
-import pro.gravit.launchserver.socket.SocketCommandServer;
 import pro.gravit.launchserver.socket.handlers.NettyServerSocketHandler;
+import pro.gravit.launchserver.socket.response.auth.ProfilesResponse;
 import pro.gravit.launchserver.socket.response.auth.RestoreResponse;
 import pro.gravit.utils.command.Command;
 import pro.gravit.utils.command.CommandHandler;
 import pro.gravit.utils.command.SubCommand;
 import pro.gravit.utils.helper.CommonHelper;
+import pro.gravit.utils.helper.IOHelper;
 import pro.gravit.utils.helper.JVMHelper;
 import pro.gravit.utils.helper.SecurityHelper;
 
+import java.io.BufferedReader;
 import java.io.IOException;
 import java.nio.file.*;
+import java.nio.file.attribute.BasicFileAttributes;
 import java.security.KeyStore;
 import java.time.Duration;
 import java.time.Instant;
@@ -81,8 +85,6 @@ public final class LaunchServer implements Runnable, AutoCloseable, Reconfigurab
     public final Path modulesDir;
     public final Path launcherModulesDir;
     public final Path librariesDir;
-    public final Path controlFile;
-    public final Path proguardDir;
     /**
      * This object contains runtime configuration
      */
@@ -111,7 +113,6 @@ public final class LaunchServer implements Runnable, AutoCloseable, Reconfigurab
     // Server
     public final CommandHandler commandHandler;
     public final NettyServerSocketHandler nettyServerSocketHandler;
-    public final SocketCommandServer socketCommandServer;
     public final ScheduledExecutorService service;
     public final AtomicBoolean started = new AtomicBoolean(false);
     public final LauncherModuleLoader launcherModuleLoader;
@@ -138,8 +139,6 @@ public LaunchServer(LaunchServerDirectories directories, LaunchServerEnv env, La
         modulesDir = directories.modules;
         launcherModulesDir = directories.launcherModules;
         librariesDir = directories.librariesDir;
-        controlFile = directories.controlFile;
-        proguardDir = directories.proguardDir;
         this.shardId = shardId;
         if(!Files.isDirectory(launcherPack)) {
             Files.createDirectories(launcherPack);
@@ -191,7 +190,6 @@ public LaunchServer(LaunchServerDirectories directories, LaunchServerEnv env, La
         }
         launcherModuleLoader.init();
         nettyServerSocketHandler = new NettyServerSocketHandler(this);
-        socketCommandServer = new SocketCommandServer(commandHandler, controlFile);
         if(config.sign.checkCertificateExpired) {
             checkCertificateExpired();
             service.scheduleAtFixedRate(this::checkCertificateExpired, 24, 24, TimeUnit.HOURS);
@@ -355,7 +353,6 @@ public void run() {
                 }
             }));
             CommonHelper.newThread("Command Thread", true, commandHandler).start();
-            CommonHelper.newThread("Socket Command Thread", true, socketCommandServer).start();
             // Sync updates dir
             CommonHelper.newThread("Profiles and updates sync", true, () -> {
                 try {
@@ -464,22 +461,18 @@ public interface LaunchServerConfigManager {
     public static class LaunchServerDirectories {
         public static final String UPDATES_NAME = "updates",
                 TRUSTSTORE_NAME = "truststore", LAUNCHERLIBRARIES_NAME = "launcher-libraries",
-                LAUNCHERLIBRARIESCOMPILE_NAME = "launcher-libraries-compile", LAUNCHERPACK_NAME = "launcher-pack",
-                KEY_NAME = ".keys", MODULES = "modules", LAUNCHER_MODULES = "launcher-modules",
-                LIBRARIES = "libraries", CONTROL_FILE = "control-file", PROGUARD_DIR = "proguard-libraries";
+                LAUNCHERLIBRARIESCOMPILE_NAME = "launcher-libraries-compile", LAUNCHERPACK_NAME = "launcher-pack", KEY_NAME = ".keys", MODULES = "modules", LAUNCHER_MODULES = "launcher-modules", LIBRARIES = "libraries";
         public Path updatesDir;
         public Path librariesDir;
         public Path launcherLibrariesDir;
         public Path launcherLibrariesCompileDir;
         public Path launcherPackDir;
         public Path keyDirectory;
-        public Path proguardDir;
         public Path dir;
         public Path trustStore;
         public Path tmpDir;
         public Path modules;
         public Path launcherModules;
-        public Path controlFile;
 
         public void collect() {
             if (updatesDir == null) updatesDir = getPath(UPDATES_NAME);
@@ -493,8 +486,6 @@ public void collect() {
             if (modules == null) modules = getPath(MODULES);
             if (launcherModules == null) launcherModules = getPath(LAUNCHER_MODULES);
             if (librariesDir == null) librariesDir = getPath(LIBRARIES);
-            if (controlFile == null) controlFile = getPath(CONTROL_FILE);
-            if (proguardDir == null) proguardDir = getPath(PROGUARD_DIR);
             if (tmpDir == null)
                 tmpDir = Paths.get(System.getProperty("java.io.tmpdir")).resolve("launchserver-%s".formatted(SecurityHelper.randomStringToken()));
         }

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

@@ -36,6 +36,7 @@
 import java.nio.file.Path;
 import java.security.Security;
 import java.security.cert.CertificateException;
+import java.util.ArrayList;
 import java.util.List;
 
 public class LaunchServerStarter {
@@ -62,7 +63,7 @@ public static void main(String[] args) throws Exception {
         directories.collect();
         CertificateManager certificateManager = new CertificateManager();
         try {
-            certificateManager.readTrustStore(directories.trustStore);
+            certificateManager.readTrustStore(dir.resolve("truststore"));
         } catch (CertificateException e) {
             throw new IOException(e);
         }

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

@@ -18,7 +18,7 @@
 import java.util.stream.Stream;
 
 public class Main {
-    private static final List<String> classpathOnly = List.of("proguard", "progressbar", "kotlin");
+    private static final List<String> classpathOnly = List.of("proguard", "jline", "progressbar", "kotlin", "epoll");
     private static final String LOG4J_PROPERTY = "log4j2.configurationFile";
     private static final String DEBUG_PROPERTY = "launchserver.main.debug";
     private static final String LIBRARIES_PROPERTY = "launchserver.dir.libraries";
@@ -74,8 +74,6 @@ public static void main(String[] args) throws Throwable {
         classpath.add(IOHelper.getCodeSource(LaunchServerStarter.class));
         options.moduleConf.modulePath.addAll(modulepath);
         options.moduleConf.modules.add("ALL-MODULE-PATH");
-        options.moduleConf.enableNativeAccess.add("org.fusesource.jansi");
-        options.moduleConf.enableNativeAccess.add("io.netty.common");
         ClassLoaderControl control = launch.init(classpath, "natives", options);
         control.clearLauncherPackages();
         control.addLauncherPackage("pro.gravit.utils.launch");

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

@@ -1,17 +1,16 @@
 package pro.gravit.launchserver.asm;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.Opcodes;
 import pro.gravit.utils.helper.IOHelper;
 
 import java.io.Closeable;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 import java.util.jar.JarFile;
 
 /**
@@ -19,32 +18,14 @@
  * чего угодно. Работает через поиск class-файлов в classpath.
  */
 public class ClassMetadataReader implements Closeable {
-    private final Logger logger = LogManager.getLogger(ClassMetadataReader.class);
     private final List<JarFile> cp;
-    private final Map<String, Module> moduleClassFinder;
 
     public ClassMetadataReader(List<JarFile> cp) {
         this.cp = cp;
-        //var moduleLayer = ClassMetadataReader.class.getModule().getLayer() == null ? ModuleLayer.boot() : ClassMetadataReader.class.getModule().getLayer();
-        var moduleLayer = ModuleLayer.boot();
-        moduleClassFinder = collectModulePackages(moduleLayer);
     }
 
     public ClassMetadataReader() {
         this.cp = new ArrayList<>();
-        //var moduleLayer = ClassMetadataReader.class.getModule().getLayer() == null ? ModuleLayer.boot() : ClassMetadataReader.class.getModule().getLayer();
-        var moduleLayer = ModuleLayer.boot();
-        moduleClassFinder = collectModulePackages(moduleLayer);
-    }
-
-    private Map<String, Module> collectModulePackages(ModuleLayer layer) {
-        var map = new HashMap<String, Module>();
-        for(var m : layer.modules()) {
-            for(var p : m.getPackages()) {
-                map.put(p, m);
-            }
-        }
-        return map;
     }
 
     public List<JarFile> getCp() {
@@ -77,42 +58,7 @@ public byte[] getClassData(String className) throws IOException {
                 return bytes;
             }
         }
-        if(ClassMetadataReader.class.getModule().isNamed()) {
-            String pkg = getClassPackage(className).replace('/', '.');
-            var module = moduleClassFinder.get(pkg);
-            if(module != null) {
-                var cl = module.getClassLoader();
-                if(cl == null) {
-                    cl = ClassLoader.getPlatformClassLoader();
-                }
-                var stream = cl.getResourceAsStream(className+".class");
-                if(stream != null) {
-                    try(stream) {
-                        return IOHelper.read(stream);
-                    }
-                } else {
-                    throw new FileNotFoundException("Class "+className + ".class");
-                }
-            } else {
-                throw new FileNotFoundException("Package "+pkg);
-            }
-        }
-        var stream = ClassLoader.getSystemClassLoader().getResourceAsStream(className+".class");
-        if(stream != null) {
-            try(stream) {
-                return IOHelper.read(stream);
-            }
-        } else {
-            throw new FileNotFoundException(className + ".class");
-        }
-    }
-
-    private String getClassPackage(String type) {
-        int idx = type.lastIndexOf("/");
-        if(idx <= 0) {
-            return type;
-        }
-        return type.substring(0, idx);
+        return IOHelper.read(IOHelper.getResourceURL(className + ".class"));
     }
 
     public String getSuperClass(String type) {
@@ -120,7 +66,6 @@ public String getSuperClass(String type) {
         try {
             return getSuperClassASM(type);
         } catch (Exception e) {
-            logger.warn("getSuperClass: type {} not found ({}: {})", type, e.getClass().getName(), e.getMessage());
             return "java/lang/Object";
         }
     }
@@ -155,7 +100,7 @@ private static class CheckSuperClassVisitor extends ClassVisitor {
         String superClassName;
 
         public CheckSuperClassVisitor() {
-            super(Opcodes.ASM9);
+            super(Opcodes.ASM7);
         }
 
         @Override

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

@@ -9,22 +9,15 @@
 import java.util.function.Consumer;
 
 public class HikariSQLSourceConfig implements SQLSourceConfig {
-    private transient volatile HikariDataSource dataSource;
+    private transient HikariDataSource dataSource;
     private String dsClass;
     private Properties dsProps;
     private String driverClass;
     private String jdbcUrl;
     private String username;
     private String password;
-    private boolean initializeAtStart;
 
     public void init() {
-        if(initializeAtStart) {
-            initializeConnection();
-        }
-    }
-
-    private void initializeConnection() {
         if (dataSource != null) {
             return;
         }
@@ -41,11 +34,6 @@ private void initializeConnection() {
 
     @Override
     public Connection getConnection() throws SQLException {
-        if(dataSource == null && !initializeAtStart) {
-            synchronized (this) {
-                initializeConnection();
-            }
-        }
         return dataSource.getConnection();
     }
 

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

@@ -174,7 +174,7 @@ public AuthManager.AuthReport sudo(User user, boolean shadow) throws IOException
     }
 
     @Override
-    public User checkServer(Client client, String username, String serverID) {
+    public User checkServer(Client client, String username, String serverID) throws IOException {
         SQLUser user = (SQLUser) getUserByUsername(username);
         if (user == null) {
             return null;
@@ -295,9 +295,7 @@ private SQLUser queryUser(String sql, String value) throws SQLException {
                 user = constructUser(set);
             }
         }
-        if(user != null) {
-            user.permissions = requestPermissions(user.uuid.toString());
-        }
+        user.permissions = requestPermissions(user.uuid.toString());
         return user;
     }
 

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

@@ -1,5 +1,6 @@
 package pro.gravit.launchserver.auth.core;
 
+import pro.gravit.launcher.base.ClientPermissions;
 import pro.gravit.launcher.base.request.secure.HardwareReportRequest;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.auth.AuthProviderPair;
@@ -43,7 +44,6 @@ public SQLSourceConfig getSQLConfig() {
     @Override
     public void init(LaunchServer server, AuthProviderPair pair) {
         super.init(server, pair);
-        logger.warn("Method 'mysql' deprecated and may be removed in future release. Please use new 'sql' method: https://gravitlauncher.com/auth");
         String userInfoCols = makeUserCols();
         String hardwareInfoCols = "id, hwDiskId, baseboardSerialNumber, displayId, bitness, totalMemory, logicalProcessors, physicalProcessors, processorMaxFreq, battery, id, graphicCard, banned, publicKey";
         if (sqlFindHardwareByPublicKey == null)

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

@@ -1,7 +1,5 @@
 package pro.gravit.launchserver.auth.core;
 
-import pro.gravit.launchserver.LaunchServer;
-import pro.gravit.launchserver.auth.AuthProviderPair;
 import pro.gravit.launchserver.auth.PostgreSQLSourceConfig;
 import pro.gravit.launchserver.auth.SQLSourceConfig;
 
@@ -12,10 +10,4 @@ public class PostgresSQLCoreProvider extends AbstractSQLCoreProvider {
     public SQLSourceConfig getSQLConfig() {
         return postgresSQLHolder;
     }
-
-    @Override
-    public void init(LaunchServer server, AuthProviderPair pair) {
-        super.init(server, pair);
-        logger.warn("Method 'postgresql' deprecated and may be removed in future release. Please use new 'sql' method: https://gravitlauncher.com/auth");
-    }
 }

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

@@ -41,12 +41,12 @@ public AuthManager.AuthReport authorize(String login, AuthResponse.AuthContext c
     }
 
     @Override
-    public User checkServer(Client client, String username, String serverID) {
+    public User checkServer(Client client, String username, String serverID) throws IOException {
         return null;
     }
 
     @Override
-    public boolean joinServer(Client client, String username, UUID uuid, String accessToken, String serverID) {
+    public boolean joinServer(Client client, String username, UUID uuid, String accessToken, String serverID) throws IOException {
         return false;
     }
 

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

@@ -1,25 +1,11 @@
 package pro.gravit.launchserver.auth.core;
 
-import pro.gravit.launcher.base.request.secure.HardwareReportRequest;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.auth.AuthProviderPair;
 import pro.gravit.launchserver.auth.HikariSQLSourceConfig;
-import pro.gravit.launchserver.auth.MySQLSourceConfig;
 import pro.gravit.launchserver.auth.SQLSourceConfig;
-import pro.gravit.launchserver.auth.core.interfaces.UserHardware;
-import pro.gravit.launchserver.auth.core.interfaces.provider.AuthSupportExtendedCheckServer;
-import pro.gravit.launchserver.auth.core.interfaces.provider.AuthSupportHardware;
-import pro.gravit.launchserver.auth.core.interfaces.session.UserSessionSupportHardware;
-import pro.gravit.launchserver.socket.Client;
 
-import java.io.IOException;
-import java.sql.*;
-import java.util.Base64;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.UUID;
-
-public class SQLCoreProvider extends AbstractSQLCoreProvider implements AuthSupportHardware, AuthSupportExtendedCheckServer {
+public class SQLCoreProvider extends AbstractSQLCoreProvider {
     public HikariSQLSourceConfig holder;
 
     @Override
@@ -28,364 +14,14 @@ public void close() {
         holder.close();
     }
 
-    @Override
-    public SQLSourceConfig getSQLConfig() {
-        return holder;
-    }
-
-
-    public String hardwareIdColumn;
-    public String tableHWID = "hwids";
-    public String tableHWIDLog = "hwidLog";
-    public double criticalCompareLevel = 1.0;
-    private transient String sqlFindHardwareByPublicKey;
-    private transient String sqlFindHardwareByData;
-    private transient String sqlFindHardwareById;
-    private transient String sqlCreateHardware;
-    private transient String sqlCreateHWIDLog;
-    private transient String sqlUpdateHardwarePublicKey;
-    private transient String sqlUpdateHardwareBanned;
-    private transient String sqlUpdateUsers;
-    private transient String sqlUsersByHwidId;
-
     @Override
     public void init(LaunchServer server, AuthProviderPair pair) {
         holder.init();
         super.init(server, pair);
-        String userInfoCols = makeUserCols();
-        String hardwareInfoCols = "id, hwDiskId, baseboardSerialNumber, displayId, bitness, totalMemory, logicalProcessors, physicalProcessors, processorMaxFreq, battery, id, graphicCard, banned, publicKey";
-        if (sqlFindHardwareByPublicKey == null)
-            sqlFindHardwareByPublicKey = "SELECT %s FROM %s WHERE publicKey = ?".formatted(hardwareInfoCols, tableHWID);
-        if (sqlFindHardwareById == null)
-            sqlFindHardwareById = "SELECT %s FROM %s WHERE id = ?".formatted(hardwareInfoCols, tableHWID);
-        if (sqlUsersByHwidId == null)
-            sqlUsersByHwidId = "SELECT %s FROM %s WHERE %s = ?".formatted(userInfoCols, table, hardwareIdColumn);
-        if (sqlFindHardwareByData == null)
-            sqlFindHardwareByData = "SELECT %s FROM %s".formatted(hardwareInfoCols, tableHWID);
-        if (sqlCreateHardware == null)
-            sqlCreateHardware = "INSERT INTO %s (publickey, hwDiskId, baseboardSerialNumber, displayId, bitness, totalMemory, logicalProcessors, physicalProcessors, processorMaxFreq, graphicCard, battery, banned) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, '0')".formatted(tableHWID);
-        if (sqlCreateHWIDLog == null)
-            sqlCreateHWIDLog = "INSERT INTO %s (hwidId, newPublicKey) VALUES (?, ?)".formatted(tableHWIDLog);
-        if (sqlUpdateHardwarePublicKey == null)
-            sqlUpdateHardwarePublicKey = "UPDATE %s SET publicKey = ? WHERE id = ?".formatted(tableHWID);
-        sqlUpdateHardwareBanned = "UPDATE %s SET banned = ? WHERE id = ?".formatted(tableHWID);
-        sqlUpdateUsers = "UPDATE %s SET %s = ? WHERE %s = ?".formatted(table, hardwareIdColumn, uuidColumn);
     }
 
     @Override
-    protected String makeUserCols() {
-        return super.makeUserCols().concat(", ").concat(hardwareIdColumn);
-    }
-
-    @Override
-    protected SQLUser constructUser(ResultSet set) throws SQLException {
-        return set.next() ? new SQLUser(UUID.fromString(set.getString(uuidColumn)), set.getString(usernameColumn),
-                set.getString(accessTokenColumn), set.getString(serverIDColumn), set.getString(passwordColumn), set.getLong(hardwareIdColumn)) : null;
-    }
-
-    private SQLUserHardware fetchHardwareInfo(ResultSet set) throws SQLException {
-        HardwareReportRequest.HardwareInfo hardwareInfo = new HardwareReportRequest.HardwareInfo();
-        hardwareInfo.hwDiskId = set.getString("hwDiskId");
-        hardwareInfo.baseboardSerialNumber = set.getString("baseboardSerialNumber");
-        byte[] displayId = set.getBytes("displayId");
-        hardwareInfo.displayId = displayId == null ? null : displayId;
-        hardwareInfo.bitness = set.getInt("bitness");
-        hardwareInfo.totalMemory = set.getLong("totalMemory");
-        hardwareInfo.logicalProcessors = set.getInt("logicalProcessors");
-        hardwareInfo.physicalProcessors = set.getInt("physicalProcessors");
-        hardwareInfo.processorMaxFreq = set.getLong("processorMaxFreq");
-        hardwareInfo.battery = set.getBoolean("battery");
-        hardwareInfo.graphicCard = set.getString("graphicCard");
-        byte[] publicKey = set.getBytes("publicKey");
-        long id = set.getLong("id");
-        boolean banned = set.getBoolean("banned");
-        return new SQLUserHardware(hardwareInfo, publicKey, id, banned);
-    }
-
-    private void setUserHardwareId(Connection connection, UUID uuid, long hwidId) throws SQLException {
-        PreparedStatement s = connection.prepareStatement(sqlUpdateUsers);
-        s.setLong(1, hwidId);
-        s.setString(2, uuid.toString());
-        s.executeUpdate();
-    }
-
-    @Override
-    public UserHardware getHardwareInfoByPublicKey(byte[] publicKey) {
-        try (Connection connection = holder.getConnection()) {
-            connection.setAutoCommit(false);
-            PreparedStatement s = connection.prepareStatement(sqlFindHardwareByPublicKey);
-            s.setBytes(1, publicKey);
-            try (ResultSet set = s.executeQuery()) {
-                if (set.next()) {
-                    connection.commit();
-                    return fetchHardwareInfo(set);
-                } else {
-                    connection.commit();
-                    return null;
-                }
-            }
-        } catch (SQLException throwables) {
-            logger.error("SQL Error", throwables);
-            return null;
-        }
-    }
-
-    @Override
-    public UserHardware getHardwareInfoByData(HardwareReportRequest.HardwareInfo info) {
-        try (Connection connection = holder.getConnection()) {
-            connection.setAutoCommit(false);
-            PreparedStatement s = connection.prepareStatement(sqlFindHardwareByData);
-            try (ResultSet set = s.executeQuery()) {
-                while (set.next()) {
-                    SQLUserHardware hw = fetchHardwareInfo(set);
-                    AuthSupportHardware.HardwareInfoCompareResult result = compareHardwareInfo(hw.getHardwareInfo(), info);
-                    if (result.compareLevel > criticalCompareLevel) {
-                        connection.commit();
-                        return hw;
-                    } else {
-                        connection.commit();
-                    }
-                }
-            }
-        } catch (SQLException throwables) {
-            logger.error("SQL Error", throwables);
-        }
-        return null;
-    }
-
-    @Override
-    public UserHardware getHardwareInfoById(String id) {
-        try (Connection connection = holder.getConnection()) {
-            connection.setAutoCommit(false);
-            PreparedStatement s = connection.prepareStatement(sqlFindHardwareById);
-            s.setLong(1, Long.parseLong(id));
-            try (ResultSet set = s.executeQuery()) {
-                if (set.next()) {
-                    connection.commit();
-                    return fetchHardwareInfo(set);
-                } else {
-                    connection.commit();
-                    return null;
-                }
-            }
-        } catch (SQLException throwables) {
-            logger.error("SQL Error", throwables);
-            return null;
-        }
-    }
-
-    @Override
-    public UserHardware createHardwareInfo(HardwareReportRequest.HardwareInfo hardwareInfo, byte[] publicKey) {
-        try (Connection connection = holder.getConnection()) {
-            connection.setAutoCommit(false);
-            PreparedStatement s = connection.prepareStatement(sqlCreateHardware, Statement.RETURN_GENERATED_KEYS);
-            s.setBytes(1, publicKey);
-            s.setString(2, hardwareInfo.hwDiskId);
-            s.setString(3, hardwareInfo.baseboardSerialNumber);
-            s.setBytes(4, hardwareInfo.displayId == null ? null : hardwareInfo.displayId);
-            s.setInt(5, hardwareInfo.bitness);
-            s.setLong(6, hardwareInfo.totalMemory);
-            s.setInt(7, hardwareInfo.logicalProcessors);
-            s.setInt(8, hardwareInfo.physicalProcessors);
-            s.setLong(9, hardwareInfo.processorMaxFreq);
-            s.setString(10, hardwareInfo.graphicCard);
-            s.setBoolean(11, hardwareInfo.battery);
-            s.executeUpdate();
-            try (ResultSet generatedKeys = s.getGeneratedKeys()) {
-                if (generatedKeys.next()) {
-                    //writeHwidLog(connection, generatedKeys.getLong(1), publicKey);
-                    long id = generatedKeys.getLong(1);
-                    connection.commit();
-                    return new SQLUserHardware(hardwareInfo, publicKey, id, false);
-                }
-            }
-            connection.commit();
-            return null;
-        } catch (SQLException throwables) {
-            logger.error("SQL Error", throwables);
-            return null;
-        }
-    }
-
-    @Override
-    public void connectUserAndHardware(UserSession userSession, UserHardware hardware) {
-        AbstractSQLCoreProvider.SQLUserSession SQLUserSession = (AbstractSQLCoreProvider.SQLUserSession) userSession;
-        SQLUser SQLUser = (SQLUser) SQLUserSession.getUser();
-        SQLUserHardware SQLUserHardware = (SQLUserHardware) hardware;
-        if (SQLUser.hwidId == SQLUserHardware.id) return;
-        SQLUser.hwidId = SQLUserHardware.id;
-        try (Connection connection = holder.getConnection()) {
-            setUserHardwareId(connection, SQLUser.getUUID(), SQLUserHardware.id);
-        } catch (SQLException throwables) {
-            logger.error("SQL Error", throwables);
-        }
-    }
-
-    @Override
-    public void addPublicKeyToHardwareInfo(UserHardware hardware, byte[] publicKey) {
-        SQLUserHardware SQLUserHardware = (SQLUserHardware) hardware;
-        SQLUserHardware.publicKey = publicKey;
-        try (Connection connection = holder.getConnection()) {
-            connection.setAutoCommit(false);
-            PreparedStatement s = connection.prepareStatement(sqlUpdateHardwarePublicKey);
-            s.setBytes(1, publicKey);
-            s.setLong(2, SQLUserHardware.id);
-            s.executeUpdate();
-            connection.commit();
-        } catch (SQLException e) {
-            logger.error("SQL error", e);
-        }
-    }
-
-    @Override
-    public Iterable<User> getUsersByHardwareInfo(UserHardware hardware) {
-        List<User> users = new LinkedList<>();
-        try (Connection c = holder.getConnection()) {
-            c.setAutoCommit(false);
-            PreparedStatement s = c.prepareStatement(sqlUsersByHwidId);
-            s.setLong(1, Long.parseLong(hardware.getId()));
-            s.setQueryTimeout(MySQLSourceConfig.TIMEOUT);
-            try (ResultSet set = s.executeQuery()) {
-                while (!set.isLast()) {
-                    users.add(constructUser(set));
-                }
-            }
-            c.commit();
-        } catch (SQLException e) {
-            logger.error("SQL error", e);
-            return null;
-        }
-        return users;
-    }
-
-    @Override
-    public void banHardware(UserHardware hardware) {
-        SQLUserHardware SQLUserHardware = (SQLUserHardware) hardware;
-        SQLUserHardware.banned = true;
-        try (Connection connection = holder.getConnection()) {
-            PreparedStatement s = connection.prepareStatement(sqlUpdateHardwareBanned);
-            s.setBoolean(1, true);
-            s.setLong(2, SQLUserHardware.id);
-            s.executeUpdate();
-        } catch (SQLException e) {
-            logger.error("SQL Error", e);
-        }
-    }
-
-    @Override
-    public void unbanHardware(UserHardware hardware) {
-        SQLUserHardware SQLUserHardware = (SQLUserHardware) hardware;
-        SQLUserHardware.banned = false;
-        try (Connection connection = holder.getConnection()) {
-            PreparedStatement s = connection.prepareStatement(sqlUpdateHardwareBanned);
-            s.setBoolean(1, false);
-            s.setLong(2, SQLUserHardware.id);
-            s.executeUpdate();
-        } catch (SQLException e) {
-            logger.error("SQL error", e);
-        }
-    }
-
-    @Override
-    protected AbstractSQLCoreProvider.SQLUserSession createSession(AbstractSQLCoreProvider.SQLUser user) {
-        return new SQLUserSession(user);
-    }
-
-    @Override
-    public UserSession extendedCheckServer(Client client, String username, String serverID) {
-        AbstractSQLCoreProvider.SQLUser user = (AbstractSQLCoreProvider.SQLUser) getUserByUsername(username);
-        if (user == null) {
-            return null;
-        }
-        if (user.getUsername().equals(username) && user.getServerId().equals(serverID)) {
-            return createSession(user);
-        }
-        return null;
-    }
-
-    public class SQLUserSession extends AbstractSQLCoreProvider.SQLUserSession implements UserSessionSupportHardware {
-        private transient SQLUser SQLUser;
-        protected transient SQLUserHardware hardware;
-
-        public SQLUserSession(AbstractSQLCoreProvider.SQLUser user) {
-            super(user);
-            SQLUser = (SQLUser) user;
-        }
-
-        @Override
-        public String getHardwareId() {
-            return SQLUser.hwidId == 0 ? null : String.valueOf(SQLUser.hwidId);
-        }
-
-        @Override
-        public UserHardware getHardware() {
-            if(hardware == null) {
-                hardware = (SQLUserHardware) getHardwareInfoById(String.valueOf(SQLUser.hwidId));
-            }
-            return hardware;
-        }
-    }
-
-    public static class SQLUserHardware implements UserHardware {
-        private final HardwareReportRequest.HardwareInfo hardwareInfo;
-        private final long id;
-        private byte[] publicKey;
-        private boolean banned;
-
-        public SQLUserHardware(HardwareReportRequest.HardwareInfo hardwareInfo, byte[] publicKey, long id, boolean banned) {
-            this.hardwareInfo = hardwareInfo;
-            this.publicKey = publicKey;
-            this.id = id;
-            this.banned = banned;
-        }
-
-        @Override
-        public HardwareReportRequest.HardwareInfo getHardwareInfo() {
-            return hardwareInfo;
-        }
-
-        @Override
-        public byte[] getPublicKey() {
-            return publicKey;
-        }
-
-        @Override
-        public String getId() {
-            return String.valueOf(id);
-        }
-
-        @Override
-        public boolean isBanned() {
-            return banned;
-        }
-
-        @Override
-        public String toString() {
-            return "SQLUserHardware{" +
-                    "hardwareInfo=" + hardwareInfo +
-                    ", publicKey=" + (publicKey == null ? null : new String(Base64.getEncoder().encode(publicKey))) +
-                    ", id=" + id +
-                    ", banned=" + banned +
-                    '}';
-        }
-    }
-
-    public static class SQLUser extends AbstractSQLCoreProvider.SQLUser {
-        protected long hwidId;
-
-        public SQLUser(UUID uuid, String username, String accessToken, String serverId, String password, long hwidId) {
-            super(uuid, username, accessToken, serverId, password);
-            this.hwidId = hwidId;
-        }
-
-        @Override
-        public String toString() {
-            return "SQLUser{" +
-                    "uuid=" + uuid +
-                    ", username='" + username + '\'' +
-                    ", permissions=" + permissions +
-                    ", hwidId=" + hwidId +
-                    '}';
-        }
+    public SQLSourceConfig getSQLConfig() {
+        return holder;
     }
 }

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

@@ -6,5 +6,5 @@
 import java.io.IOException;
 
 public interface AuthSupportExtendedCheckServer {
-    UserSession extendedCheckServer(Client client, String username, String serverID);
+    UserSession extendedCheckServer(Client client, String username, String serverID) throws IOException;
 }

LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/openid/OpenIDAuthCoreProvider.java

@@ -143,7 +143,7 @@ public void init(LaunchServer server, AuthProviderPair pair) {
     }
 
     @Override
-    public User checkServer(Client client, String username, String serverID) {
+    public User checkServer(Client client, String username, String serverID) throws IOException {
         var savedServerId = sqlSessionStore.getServerIdByUsername(username);
         if (!serverID.equals(savedServerId)) {
             return null;
@@ -153,7 +153,7 @@ public User checkServer(Client client, String username, String serverID) {
     }
 
     @Override
-    public boolean joinServer(Client client, String username, UUID uuid, String accessToken, String serverID) {
+    public boolean joinServer(Client client, String username, UUID uuid, String accessToken, String serverID) throws IOException {
         User user;
         try {
             user = createUserFromMinecraftToken(accessToken);

LaunchServer/src/main/java/pro/gravit/launchserver/auth/core/openid/SQLServerSessionStore.java

@@ -3,6 +3,8 @@
 import pro.gravit.launchserver.auth.SQLSourceConfig;
 import pro.gravit.utils.helper.LogHelper;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.sql.SQLException;
 import java.util.UUID;
 

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

@@ -4,7 +4,9 @@
 import org.apache.logging.log4j.Logger;
 import pro.gravit.launchserver.binary.tasks.LauncherBuildTask;
 import pro.gravit.utils.helper.CommonHelper;
+import pro.gravit.utils.helper.IOHelper;
 
+import java.io.IOException;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;

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

@@ -56,7 +56,7 @@ public final byte[] getDigest() {
     public void init() {
     }
 
-    public final boolean sync() {
+    public final boolean sync() throws IOException {
         try {
             var target = syncBinaryFile.toString();
             var path = server.config.updatesProvider.download(null, List.of(target)).get(target);

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

@@ -54,7 +54,7 @@ public static void apply(Path inputFile, Path addFile, ZipOutputStream output, L
     private static byte[] classFix(InputStream input, ClassMetadataReader reader, boolean stripNumbers) throws IOException {
         ClassReader cr = new ClassReader(input);
         ClassNode cn = new ClassNode();
-        cr.accept(cn, stripNumbers ? (ClassReader.SKIP_DEBUG) : 0);
+        cr.accept(cn, stripNumbers ? (ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES) : ClassReader.SKIP_FRAMES);
         ClassWriter cw = new SafeClassWriter(reader, ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS);
         cn.accept(cw);
         return cw.toByteArray();

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

@@ -146,7 +146,7 @@ public byte[] transformClass(byte[] bytes, String classname, BuildContext contex
                 asmTransformer.transform(cn, classname, context);
                 continue;
             } else if (cn != null) {
-                writer = new SafeClassWriter(reader, 0);
+                writer = new SafeClassWriter(reader, ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS);
                 cn.accept(writer);
                 result = writer.toByteArray();
             }
@@ -157,7 +157,7 @@ public byte[] transformClass(byte[] bytes, String classname, BuildContext contex
             }
         }
         if (cn != null) {
-            writer = new SafeClassWriter(reader, 0);
+            writer = new SafeClassWriter(reader, ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS);
             cn.accept(writer);
             result = writer.toByteArray();
         }
@@ -175,7 +175,7 @@ default byte[] transform(byte[] input, String classname, BuildContext context) {
             ClassNode cn = new ClassNode();
             reader.accept(cn, 0);
             transform(cn, classname, context);
-            SafeClassWriter writer = new SafeClassWriter(context.task.reader, 0);
+            SafeClassWriter writer = new SafeClassWriter(context.task.reader, ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS);
             cn.accept(writer);
             return writer.toByteArray();
         }

LaunchServer/src/main/java/pro/gravit/launchserver/command/basic/DebugCommand.java

@@ -32,7 +32,6 @@ public void invoke(String... args) throws Exception {
         boolean value = Boolean.parseBoolean(args[0]);
         LoggerContext ctx = (LoggerContext) LogManager.getContext(false);
         Configuration config = ctx.getConfiguration();
-        config.getWatchManager().setIntervalSeconds(-1);
         LoggerConfig loggerConfig = config.getLoggerConfig("pro.gravit");
         loggerConfig.setLevel(value ? Level.TRACE : Level.DEBUG);
         ctx.updateLoggers();

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

@@ -13,6 +13,7 @@
 import pro.gravit.utils.command.CommandException;
 import pro.gravit.utils.helper.IOHelper;
 
+import java.io.BufferedWriter;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Collections;

LaunchServer/src/main/java/pro/gravit/launchserver/command/profiles/CloneProfileCommand.java

@@ -2,13 +2,17 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import pro.gravit.launcher.base.Launcher;
 import pro.gravit.launcher.base.profiles.ClientProfile;
 import pro.gravit.launcher.base.profiles.ClientProfileBuilder;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.command.Command;
+import pro.gravit.utils.helper.CommonHelper;
 import pro.gravit.utils.helper.IOHelper;
 
 import java.io.IOException;
+import java.io.Reader;
+import java.io.Writer;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;

LaunchServer/src/main/java/pro/gravit/launchserver/command/profiles/DeleteProfileCommand.java

@@ -5,7 +5,9 @@
 import pro.gravit.launcher.base.profiles.ClientProfile;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.command.Command;
+import pro.gravit.utils.helper.IOHelper;
 
+import java.nio.file.Files;
 import java.util.UUID;
 
 public class DeleteProfileCommand extends Command {

LaunchServer/src/main/java/pro/gravit/launchserver/command/profiles/ListProfilesCommand.java

@@ -22,7 +22,7 @@ public String getUsageDescription() {
     }
 
     @Override
-    public void invoke(String... args) {
+    public void invoke(String... args) throws Exception {
         for(var profile : server.getProfiles()) {
             logger.info("{} ({}) {}", profile.getTitle(), profile.getVersion().toString(), profile.isLimited() ? "limited" : "");
         }

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

@@ -2,10 +2,14 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import pro.gravit.launcher.base.Launcher;
 import pro.gravit.launcher.base.profiles.ClientProfile;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.command.Command;
 import pro.gravit.launchserver.helper.MakeProfileHelper;
+import pro.gravit.utils.helper.IOHelper;
+
+import java.io.Writer;
 
 public class MakeProfileCommand extends Command {
     private transient final Logger logger = LogManager.getLogger();

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

@@ -2,10 +2,17 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import pro.gravit.launcher.base.Launcher;
 import pro.gravit.launcher.base.profiles.ClientProfile;
 import pro.gravit.launchserver.LaunchServer;
 import pro.gravit.launchserver.command.Command;
+import pro.gravit.utils.helper.IOHelper;
 
+import java.io.IOException;
+import java.io.Reader;
+import java.io.Writer;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.UUID;
 
 public class SaveProfilesCommand extends Command {

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

@@ -117,7 +117,7 @@ public void invoke(String... args) throws Exception {
                 Files.deleteIfExists(proguardConf.mappings);
             }
         });
-        return commands;
+        return null;
     }
 
     public static class ProGuardMultiReleaseFixer implements LauncherBuildTask {
@@ -213,7 +213,7 @@ public Path process(Path inputFile) throws IOException {
                     args.add(IOHelper.resolveJavaBin(IOHelper.JVM_DIR).toAbsolutePath().toString());
                     args.addAll(component.jvmArgs);
                     args.add("-cp");
-                    try(Stream<Path> files = Files.walk(server.proguardDir, FileVisitOption.FOLLOW_LINKS)) {
+                    try(Stream<Path> files = Files.walk(server.librariesDir, FileVisitOption.FOLLOW_LINKS)) {
                         args.add(files
                                 .filter(e -> e.getFileName().toString().endsWith(".jar"))
                                 .map(path -> path.toAbsolutePath().toString())

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

@@ -1,5 +1,6 @@
 package pro.gravit.launchserver.config;
 
+import io.netty.channel.epoll.Epoll;
 import io.netty.handler.logging.LogLevel;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -18,7 +19,6 @@
 import pro.gravit.launchserver.components.AuthLimiterComponent;
 import pro.gravit.launchserver.components.Component;
 import pro.gravit.launchserver.components.ProGuardComponent;
-import pro.gravit.launchserver.socket.NettyObjectFactory;
 
 import java.util.*;
 
@@ -64,7 +64,12 @@ public static LaunchServerConfig getDefault(LaunchServer.LaunchServerEnv env) {
         newConfig.netty.fileServerEnabled = true;
         newConfig.netty.binds = new NettyBindAddress[]{new NettyBindAddress("0.0.0.0", 9274)};
         newConfig.netty.performance = new NettyPerformanceConfig();
-        newConfig.netty.performance.mode = NettyObjectFactory.NettyFactoryMode.AUTO;
+        try {
+            newConfig.netty.performance.usingEpoll = Epoll.isAvailable();
+        } catch (Throwable e) {
+            // Epoll class line 51+ catch (Exception) but Error will be thrown by System.load
+            newConfig.netty.performance.usingEpoll = false;
+        } // such as on ARM
         newConfig.netty.performance.bossThread = 2;
         newConfig.netty.performance.workerThread = 8;
         newConfig.netty.performance.schedulerThread = 2;
@@ -272,7 +277,7 @@ public static class NettyConfig {
     }
 
     public static class NettyPerformanceConfig {
-        public NettyObjectFactory.NettyFactoryMode mode = NettyObjectFactory.NettyFactoryMode.AUTO;
+        public boolean usingEpoll;
         public int bossThread;
         public int workerThread;
         public int schedulerThread;

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

@@ -49,6 +49,7 @@ public static ClientProfile makeProfile(ClientProfile.Version version, String ti
         // Official Mojang launcher java arguments
         if (version.compareTo(ClientProfileVersions.MINECRAFT_1_12_2) <= 0) {
             // lwjgl3ify arguments https://github.com/GTNewHorizons/lwjgl3ify
+            jvmArgs.add("-Djava.security.manager=allow");
             jvmArgs.add("--add-opens");
             jvmArgs.add("java.base/jdk.internal.loader=ALL-UNNAMED");
             jvmArgs.add("--add-opens");

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

@@ -29,7 +29,6 @@
 public class CertificateManager {
     private transient final Logger logger = LogManager.getLogger();
     public LauncherTrustManager trustManager;
-    private Path truststorePath;
 
     public void writePrivateKey(Path file, PrivateKey privateKey) throws IOException {
         writePrivateKey(IOHelper.newWriter(file), privateKey);
@@ -92,7 +91,6 @@ public X509CertificateHolder readCertificate(Reader reader) throws IOException {
     }
 
     public void readTrustStore(Path dir) throws IOException, CertificateException {
-        this.truststorePath = dir;
         if (!IOHelper.isDir(dir)) {
             Files.createDirectories(dir);
             try {
@@ -133,8 +131,4 @@ public LauncherTrustManager.CheckClassResult checkClass(Class<?> clazz) {
         X509Certificate[] certificates = JVMHelper.getCertificates(clazz);
         return trustManager.checkCertificates(certificates, trustManager::stdCertificateChecker);
     }
-
-    public Path getTruststorePath() {
-        return truststorePath;
-    }
 }

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

@@ -1,10 +1,20 @@
 package pro.gravit.launchserver.manangers;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import pro.gravit.launcher.core.hasher.HashedDir;
+import pro.gravit.launcher.core.serialize.HInput;
+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;
 
 import java.io.IOException;
+import java.nio.file.DirectoryStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.*;
+import java.util.stream.Stream;
 
 public class UpdatesManager {
     private final LaunchServer server;
@@ -14,12 +24,12 @@ public UpdatesManager(LaunchServer server) {
     }
 
     @Deprecated
-    public void readUpdatesFromCache() {
+    public void readUpdatesFromCache() throws IOException {
 
     }
 
     @Deprecated
-    public void readUpdatesDir() {
+    public void readUpdatesDir() throws IOException {
 
     }
 

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

@@ -4,6 +4,7 @@
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.ChannelPipeline;
 import io.netty.channel.EventLoopGroup;
+import io.netty.channel.epoll.Epoll;
 import io.netty.channel.group.DefaultChannelGroup;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.handler.codec.http.HttpObjectAggregator;
@@ -35,9 +36,14 @@ public class LauncherNettyServer implements AutoCloseable {
 
     public LauncherNettyServer(LaunchServer server) {
         LaunchServerConfig.NettyConfig config = server.config.netty;
-        NettyObjectFactory.setMode(config.performance.mode);
+        NettyObjectFactory.setUsingEpoll(config.performance.usingEpoll);
         Logger logger = LogManager.getLogger();
-        logger.info("Netty usage {} transport mode", NettyObjectFactory.getMode());
+        if (config.performance.usingEpoll) {
+            logger.debug("Netty: Epoll enabled");
+        }
+        if (config.performance.usingEpoll && !Epoll.isAvailable()) {
+            logger.error("Epoll is not available: (netty,perfomance.usingEpoll configured wrongly)", Epoll.unavailabilityCause());
+        }
         bossGroup = NettyObjectFactory.newEventLoopGroup(config.performance.bossThread, "LauncherNettyServer.bossGroup");
         workerGroup = NettyObjectFactory.newEventLoopGroup(config.performance.workerThread, "LauncherNettyServer.workerGroup");
         serverBootstrap = new ServerBootstrap();

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

@@ -2,58 +2,30 @@
 
 import io.netty.channel.ChannelFactory;
 import io.netty.channel.EventLoopGroup;
-import io.netty.channel.MultiThreadIoEventLoopGroup;
 import io.netty.channel.ServerChannel;
-import io.netty.channel.epoll.Epoll;
-import io.netty.channel.epoll.EpollIoHandler;
+import io.netty.channel.epoll.EpollEventLoopGroup;
 import io.netty.channel.epoll.EpollServerSocketChannel;
-import io.netty.channel.nio.NioIoHandler;
+import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.nio.NioServerSocketChannel;
-import io.netty.channel.uring.IoUring;
-import io.netty.channel.uring.IoUringIoHandler;
-import io.netty.channel.uring.IoUringServerSocketChannel;
 
 public class NettyObjectFactory {
-    private static NettyFactoryMode mode;
+    private static boolean epoll = false;
 
-    public static void setMode(NettyFactoryMode mode) {
-        NettyObjectFactory.mode = mode;
-        if(mode == NettyFactoryMode.AUTO) {
-            if(IoUring.isAvailable()) {
-                NettyObjectFactory.mode = NettyFactoryMode.IO_URING;
-                return;
-            }
-            if(Epoll.isAvailable()) {
-                NettyObjectFactory.mode = NettyFactoryMode.EPOLL;
-                return;
-            }
-            NettyObjectFactory.mode = NettyFactoryMode.NIO;
-        }
-    }
-
-    public static NettyFactoryMode getMode() {
-        return mode;
+    public static void setUsingEpoll(boolean value) {
+        epoll = value;
     }
 
     public static EventLoopGroup newEventLoopGroup(int threads, String poolName) {
-        return switch (mode) {
-            case AUTO -> null;
-            case NIO -> new MultiThreadIoEventLoopGroup(threads, NioIoHandler.newFactory());
-            case EPOLL -> new MultiThreadIoEventLoopGroup(threads, EpollIoHandler.newFactory());
-            case IO_URING -> new MultiThreadIoEventLoopGroup(threads, IoUringIoHandler.newFactory());
-        };
+        if (epoll)
+            return new EpollEventLoopGroup(threads);
+        else
+            return new NioEventLoopGroup(threads);
     }
 
     public static ChannelFactory<? extends ServerChannel> getServerSocketChannelFactory() {
-        return switch (mode) {
-            case AUTO -> null;
-            case NIO -> NioServerSocketChannel::new;
-            case EPOLL -> EpollServerSocketChannel::new;
-            case IO_URING -> IoUringServerSocketChannel::new;
-        };
-    }
-
-    public enum NettyFactoryMode {
-        AUTO, NIO, EPOLL, IO_URING
+        if (epoll)
+            return EpollServerSocketChannel::new;
+        else
+            return NioServerSocketChannel::new;
     }
 }

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

@@ -1,94 +0,0 @@
-package pro.gravit.launchserver.socket;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import pro.gravit.launchserver.config.log4j.LogAppender;
-import pro.gravit.utils.command.CommandHandler;
-
-import java.net.StandardProtocolFamily;
-import java.net.UnixDomainSocketAddress;
-import java.nio.ByteBuffer;
-import java.nio.channels.ServerSocketChannel;
-import java.nio.channels.SocketChannel;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-public class SocketCommandServer implements Runnable {
-    private final Logger logger = LogManager.getLogger(SocketCommandServer.class);
-    private ServerSocketChannel channel;
-    private Path path;
-    private UnixDomainSocketAddress address;
-    private ServerSocketChannel serverChannel;
-    private CommandHandler commandHandler;
-    private transient SocketChannel clientChannel;
-
-    public SocketCommandServer(CommandHandler commandHandler, Path path) {
-        this.commandHandler = commandHandler;
-        this.path = path;
-    }
-
-    private void runCommand(SocketChannel channel, String command) {
-        logger.info("Command '{}' from socket", command);
-        clientChannel = channel;
-        try {
-            commandHandler.evalNative(command, false);
-        } catch (Throwable e) {
-            logger.error("Error when execute command", e);
-        } finally {
-            clientChannel = null;
-
-        }
-    }
-
-    @Override
-    public void run() {
-        try {
-            Files.deleteIfExists(path);
-            this.address = UnixDomainSocketAddress.of(path);
-            serverChannel = ServerSocketChannel.open(StandardProtocolFamily.UNIX);
-            serverChannel.configureBlocking(true);
-            serverChannel.bind(address);
-            LogAppender.getInstance().addListener((logEvent -> {
-                if(clientChannel != null && clientChannel.isOpen()) {
-                    try {
-                        String s = logEvent.getMessage().getFormattedMessage()+"\n";
-                        byte[] bytes = s.getBytes(StandardCharsets.UTF_8);
-                        ByteBuffer buffer = ByteBuffer.wrap(bytes);
-                        clientChannel.write(buffer);
-                    } catch (Throwable ignored) {
-                    }
-                }
-            }));
-            ByteBuffer buffer = ByteBuffer.allocate(1024);
-            while (true) {
-                SocketChannel channel = serverChannel.accept();
-                try (channel) {
-                    channel.configureBlocking(true);
-                    String command = null;
-                    mark:
-                    while (true) {
-                        int bytesRead = channel.read(buffer);
-                        if (bytesRead < 0) {
-                            break;
-                        }
-                        for (var i = 0; i < buffer.limit(); i++) {
-                            if (buffer.get(i) == '\n') {
-                                command = new String(buffer.array(), 0, i);
-                                break mark;
-                            }
-                        }
-
-                    }
-                    if (command != null) {
-                        runCommand(channel, command);
-                    }
-                } finally {
-                    buffer.clear();
-                }
-            }
-        } catch (Throwable e) {
-            logger.error("Unix command socket server error", e);
-        }
-    }
-}

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

@@ -9,7 +9,6 @@
 import org.apache.logging.log4j.Logger;
 import pro.gravit.launcher.base.Launcher;
 import pro.gravit.launchserver.socket.NettyConnectContext;
-import pro.gravit.launchserver.socket.severlet.StatusSeverlet;
 import pro.gravit.utils.helper.IOHelper;
 
 import java.net.URLDecoder;
@@ -35,7 +34,6 @@ public class NettyWebAPIHandler extends SimpleChannelInboundHandler<FullHttpRequ
     public NettyWebAPIHandler(NettyConnectContext context) {
         super();
         this.context = context;
-        addNewSeverlet("status", new StatusSeverlet());
     }
 
     public static void addNewSeverlet(String path, SimpleSeverletHandler callback) {

LaunchServer/src/main/java/pro/gravit/launchserver/socket/handlers/fileserver/FileServerHandler.java

@@ -22,6 +22,7 @@
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoField;
+import java.time.temporal.ChronoUnit;
 import java.time.temporal.TemporalAccessor;
 import java.time.temporal.UnsupportedTemporalTypeException;
 import java.util.Arrays;

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

@@ -7,7 +7,7 @@
 public interface WebSocketServerResponse extends WebSocketRequest {
     String getType();
 
-    void execute(ChannelHandlerContext ctx, Client client);
+    void execute(ChannelHandlerContext ctx, Client client) throws Exception;
 
     default ThreadSafeStatus getThreadSafeStatus() {
         return ThreadSafeStatus.READ;

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

@@ -23,7 +23,7 @@ public String getType() {
     }
 
     @Override
-    public void execute(ChannelHandlerContext ctx, Client client) {
+    public void execute(ChannelHandlerContext ctx, Client client) throws Exception {
         sendResult(new CurrentUserRequestEvent(collectUserInfoFromClient(server, client)));
     }
 }

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

@@ -44,7 +44,7 @@ public String getType() {
     }
 
     @Override
-    public void execute(ChannelHandlerContext ctx, Client client) {
+    public void execute(ChannelHandlerContext ctx, Client client) throws Exception {
         if (accessToken == null && !client.isAuth && needUserInfo) {
             sendError("Invalid request");
             return;

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

@@ -12,7 +12,7 @@ public String getType() {
     }
 
     @Override
-    public void execute(ChannelHandlerContext ctx, Client client) {
+    public void execute(ChannelHandlerContext ctx, Client client) throws Exception {
         if(!client.isAuth || client.auth == null || client.getUser() == null) {
             sendError("Access denied");
             return;

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

@@ -14,7 +14,7 @@ public String getType() {
     }
 
     @Override
-    public void execute(ChannelHandlerContext ctx, Client client) {
+    public void execute(ChannelHandlerContext ctx, Client client) throws Exception {
         if(!client.isAuth || client.auth == null || client.getUser() == null) {
             sendError("Access denied");
             return;

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

@@ -12,7 +12,7 @@ public String getType() {
     }
 
     @Override
-    public void execute(ChannelHandlerContext ctx, Client client) {
+    public void execute(ChannelHandlerContext ctx, Client client) throws Exception {
         sendResult(new GetConnectUUIDRequestEvent(connectUUID, server.shardId));
     }
 }

LaunchServer/src/main/java/pro/gravit/launchserver/socket/severlet/StatusSeverlet.java

@@ -1,15 +0,0 @@
-package pro.gravit.launchserver.socket.severlet;
-
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.codec.http.DefaultFullHttpResponse;
-import io.netty.handler.codec.http.FullHttpRequest;
-import io.netty.handler.codec.http.HttpResponseStatus;
-import pro.gravit.launchserver.socket.NettyConnectContext;
-import pro.gravit.launchserver.socket.handlers.NettyWebAPIHandler;
-
-public class StatusSeverlet implements NettyWebAPIHandler.SimpleSeverletHandler {
-    @Override
-    public void handle(ChannelHandlerContext ctx, FullHttpRequest msg, NettyConnectContext context) {
-        sendHttpResponse(ctx, new DefaultFullHttpResponse(msg.protocolVersion(), HttpResponseStatus.OK));
-    }
-}

Launcher/src/main/java/pro/gravit/launcher/runtime/client/ClientLauncherProcess.java

@@ -28,6 +28,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.*;
+import java.util.stream.Collectors;
 
 public class ClientLauncherProcess {
     public final List<String> pre = new LinkedList<>();

Launcher/src/main/java/pro/gravit/launcher/runtime/debug/DebugMain.java

@@ -28,7 +28,6 @@ public class DebugMain {
     public static String webSocketURL = System.getProperty("launcherdebug.websocket", "ws://localhost:9274/api");
     public static String projectName = System.getProperty("launcherdebug.projectname", "Minecraft");
     public static String unlockSecret = System.getProperty("launcherdebug.unlocksecret", "");
-    public static boolean disableConsole = Boolean.getBoolean("launcherdebug.disableConsole");
     public static boolean offlineMode = Boolean.getBoolean("launcherdebug.offlinemode");
     public static boolean disableAutoRefresh = Boolean.getBoolean("launcherdebug.disableautorefresh");
     public static String[] moduleClasses = System.getProperty("launcherdebug.modules", "").split(",");
@@ -38,14 +37,6 @@ public class DebugMain {
     public static void main(String[] args) throws Throwable {
         LogHelper.printVersion("Launcher");
         LogHelper.printLicense("Launcher");
-        initialize();
-        LogHelper.debug("Initialization LauncherEngine");
-        LauncherEngine instance = LauncherEngine.newInstance(false, ClientRuntimeProvider.class);
-        instance.start(args);
-        LauncherEngine.exitLauncher(0);
-    }
-
-    public static void initialize() throws Exception {
         IS_DEBUG.set(true);
         LogHelper.info("Launcher start in DEBUG mode (Only for developers)");
         LogHelper.debug("Initialization LauncherConfig");
@@ -65,9 +56,7 @@ public static void initialize() throws Exception {
         }
         LauncherEngine.modulesManager.initModules(null);
         LauncherEngine.initGson(LauncherEngine.modulesManager);
-        if(!disableConsole) {
-            ConsoleManager.initConsole();
-        }
+        ConsoleManager.initConsole();
         LauncherEngine.modulesManager.invokeEvent(new PreConfigPhase());
         RequestService service;
         if (offlineMode) {
@@ -83,6 +72,10 @@ public static void initialize() throws Exception {
         if(!disableAutoRefresh) {
             Request.startAutoRefresh();
         }
+        LogHelper.debug("Initialization LauncherEngine");
+        LauncherEngine instance = LauncherEngine.newInstance(false, ClientRuntimeProvider.class);
+        instance.start(args);
+        LauncherEngine.exitLauncher(0);
     }
 
     @SuppressWarnings("unchecked")

Launcher/src/main/java/pro/gravit/launcher/runtime/debug/DebugMainInlineInitializer.java

@@ -1,7 +0,0 @@
-package pro.gravit.launcher.runtime.debug;
-
-public class DebugMainInlineInitializer {
-    public static void run() throws Exception {
-        DebugMain.initialize();
-    }
-}

LauncherAPI/src/main/java/pro/gravit/launcher/base/Downloader.java

@@ -141,6 +141,7 @@ public void cancel() {
             }
         }
         tasks.clear();
+        executor.shutdownNow();
     }
 
     public boolean isCanceled() {

LauncherAPI/src/main/java/pro/gravit/launcher/base/profiles/ClientProfile.java

@@ -12,6 +12,7 @@
 
 import java.lang.reflect.Type;
 import java.net.InetSocketAddress;
+import java.nio.file.Path;
 import java.util.*;
 
 public final class ClientProfile implements Comparable<ClientProfile> {

LauncherAPI/src/main/java/pro/gravit/launcher/base/request/Request.java

@@ -154,7 +154,7 @@ public static String getRefreshToken() {
 
     public static void reconnect() throws Exception {
 
-        getRequestService().connect();
+        getRequestService().open();
         restore();
     }
 

LauncherAPI/src/main/java/pro/gravit/launcher/base/request/RequestException.java

@@ -3,6 +3,7 @@
 import java.io.IOException;
 
 public final class RequestException extends IOException {
+    private static final long serialVersionUID = 7558237657082664821L;
 
 
     public RequestException(String message) {

LauncherAPI/src/main/java/pro/gravit/launcher/base/request/RequestService.java

@@ -6,7 +6,7 @@
 
 public interface RequestService {
     <T extends WebSocketEvent> CompletableFuture<T> request(Request<T> request) throws IOException;
-    void connect() throws Exception;
+    void open() throws Exception;
 
     void registerEventHandler(EventHandler handler);
 

LauncherAPI/src/main/java/pro/gravit/launcher/base/request/websockets/ClientJSONPoint.java

@@ -9,7 +9,6 @@
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.WebSocket;
-import java.nio.ByteBuffer;
 import java.security.KeyManagementException;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
@@ -34,7 +33,7 @@ public abstract class ClientJSONPoint implements WebSocket.Listener {
     private final Object sendSyncObject = new Object();
     private volatile StringBuilder builder = new StringBuilder();
 
-    public ClientJSONPoint(final String uri) {
+    public ClientJSONPoint(final String uri) throws SSLException {
         this(URI.create(uri));
     }
 
@@ -64,7 +63,7 @@ public ClientJSONPoint(URI uri) {
         }
     }
 
-    public void connect() throws Exception {
+    public void open() throws Exception {
         webSocket = webSocketBuilder.buildAsync(uri, this).get();
     }
 
@@ -98,17 +97,6 @@ public CompletionStage<?> onClose(WebSocket webSocket, int statusCode, String re
         return WebSocket.Listener.super.onClose(webSocket, statusCode, reason);
     }
 
-    @Override
-    public void onOpen(WebSocket webSocket) {
-        onOpen();
-        WebSocket.Listener.super.onOpen(webSocket);
-    }
-
-    @Override
-    public CompletionStage<?> onBinary(WebSocket webSocket, ByteBuffer data, boolean last) {
-        return WebSocket.Listener.super.onBinary(webSocket, data, last);
-    }
-
     @Override
     public void onError(WebSocket webSocket, Throwable error) {
         LogHelper.error(error);
@@ -126,7 +114,7 @@ public void send(String text) {
 
     abstract void onOpen();
 
-    public void close() {
+    public void close() throws InterruptedException {
         webSocket.abort();
     }
 

LauncherAPI/src/main/java/pro/gravit/launcher/base/request/websockets/ClientWebSocketService.java

@@ -33,7 +33,7 @@ public abstract class ClientWebSocketService extends ClientJSONPoint {
     public OnCloseCallback onCloseCallback;
     public ReconnectCallback reconnectCallback;
 
-    public ClientWebSocketService(String address) {
+    public ClientWebSocketService(String address) throws SSLException {
         super(createURL(address));
         this.gson = Launcher.gsonManager.gson;
         this.onConnect = true;

LauncherAPI/src/main/java/pro/gravit/launcher/base/request/websockets/OfflineRequestService.java

@@ -45,7 +45,7 @@ public <T extends WebSocketEvent> CompletableFuture<T> request(Request<T> reques
     }
 
     @Override
-    public void connect() {
+    public void open() {
 
     }
 

LauncherAPI/src/main/java/pro/gravit/launcher/base/request/websockets/StdWebSocketService.java

@@ -11,12 +11,9 @@
 
 import javax.net.ssl.SSLException;
 import java.io.IOException;
-import java.net.http.WebSocket;
-import java.nio.ByteBuffer;
 import java.util.HashSet;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutionException;
 
@@ -43,7 +40,11 @@ public static CompletableFuture<StdWebSocketService> initWebSockets(String addre
         service.openAsync(() -> {
             future.complete(service);
             JVMHelper.RUNTIME.addShutdownHook(new Thread(() -> {
-                service.close();
+                try {
+                    service.close();
+                } catch (InterruptedException e) {
+                    LogHelper.error(e);
+                }
             }));
         }, future::completeExceptionally);
         return future;

LauncherAPI/src/main/java/pro/gravit/launcher/base/request/websockets/VoidRequestService.java

@@ -26,7 +26,7 @@ public <T extends WebSocketEvent> CompletableFuture<T> request(Request<T> reques
     }
 
     @Override
-    public void connect() {
+    public void open() {
 
     }
 

LauncherAPI/src/test/java/pro/gravit/launcher/ClientVersionTest.java

@@ -7,9 +7,9 @@
 public class ClientVersionTest {
     @Test
     public void parseTest() {
-        Assertions.assertEquals("1.0.0", ClientProfile.Version.of("1.0.0").toCleanString());
-        Assertions.assertEquals("1.0.0.1", ClientProfile.Version.of("1.0.0-1").toCleanString());
-        Assertions.assertEquals("1.0.0", ClientProfile.Version.of("-----1.0.0").toCleanString());
+        Assertions.assertEquals(ClientProfile.Version.of("1.0.0").toCleanString(), "1.0.0");
+        Assertions.assertEquals(ClientProfile.Version.of("1.0.0-1").toCleanString(), "1.0.0.1");
+        Assertions.assertEquals(ClientProfile.Version.of("-----1.0.0").toCleanString(), "1.0.0");
     }
 
     @Test

LauncherAPI/src/test/java/pro/gravit/launcher/ModulesTest.java

@@ -49,12 +49,12 @@ public void dependenciesTest() {
         moduleManager.loadModule(new Depend3Module());
         moduleManager.loadModule(new MainModule());
         moduleManager.initModules(null);
-        Assertions.assertEquals(LauncherModule.InitStatus.FINISH, moduleManager.getModule("depend1").getInitStatus());
-        Assertions.assertEquals(LauncherModule.InitStatus.FINISH, moduleManager.getModule("depend2").getInitStatus());
-        Assertions.assertEquals(LauncherModule.InitStatus.FINISH, moduleManager.getModule("depend3").getInitStatus());
-        Assertions.assertEquals(LauncherModule.InitStatus.FINISH, moduleManager.getModule("internal").getInitStatus());
-        Assertions.assertEquals(LauncherModule.InitStatus.FINISH, moduleManager.getModule("virtual").getInitStatus());
-        Assertions.assertEquals(LauncherModule.InitStatus.FINISH, moduleManager.getModule("main").getInitStatus());
+        Assertions.assertEquals(moduleManager.getModule("depend1").getInitStatus(), LauncherModule.InitStatus.FINISH);
+        Assertions.assertEquals(moduleManager.getModule("depend2").getInitStatus(), LauncherModule.InitStatus.FINISH);
+        Assertions.assertEquals(moduleManager.getModule("depend3").getInitStatus(), LauncherModule.InitStatus.FINISH);
+        Assertions.assertEquals(moduleManager.getModule("internal").getInitStatus(), LauncherModule.InitStatus.FINISH);
+        Assertions.assertEquals(moduleManager.getModule("virtual").getInitStatus(), LauncherModule.InitStatus.FINISH);
+        Assertions.assertEquals(moduleManager.getModule("main").getInitStatus(), LauncherModule.InitStatus.FINISH);
     }
 
     @Test
@@ -62,7 +62,7 @@ public void cyclicTest() {
         moduleManager.loadModule(new CyclicDependModule());
         moduleManager.loadModule(new Cyclic2DependModule());
         moduleManager.initModules(null);
-        Assertions.assertEquals(LauncherModule.InitStatus.FINISH, moduleManager.getModule("cyclic1").getInitStatus());
-        Assertions.assertEquals(LauncherModule.InitStatus.FINISH, moduleManager.getModule("cyclic2").getInitStatus());
+        Assertions.assertEquals(moduleManager.getModule("cyclic1").getInitStatus(), LauncherModule.InitStatus.FINISH);
+        Assertions.assertEquals(moduleManager.getModule("cyclic2").getInitStatus(), LauncherModule.InitStatus.FINISH);
     }
 }

LauncherAPI/src/test/java/pro/gravit/launcher/impl/Depend1Module.java

@@ -16,10 +16,10 @@ public Depend1Module() {
     @Override
     public void init(LauncherInitContext initContext) {
         InternalModule module = modulesManager.getModule(InternalModule.class);
-        Assertions.assertEquals(InitStatus.FINISH, module.getInitStatus());
+        Assertions.assertEquals(module.getInitStatus(), InitStatus.FINISH);
         Depend3Module module1 = modulesManager.getModule(Depend3Module.class);
-        Assertions.assertEquals(InitStatus.FINISH, module1.getInitStatus());
+        Assertions.assertEquals(module1.getInitStatus(), InitStatus.FINISH);
         VirtualInterface virtualInterface = modulesManager.getModuleByInterface(VirtualInterface.class);
-        Assertions.assertEquals(InitStatus.FINISH, ((LauncherModule) virtualInterface).getInitStatus());
+        Assertions.assertEquals(((LauncherModule) virtualInterface).getInitStatus(), InitStatus.FINISH);
     }
 }

LauncherAPI/src/test/java/pro/gravit/launcher/impl/MainModule.java

@@ -17,8 +17,8 @@ public MainModule() {
     @Override
     public void init(LauncherInitContext initContext) {
         Depend1Module module = modulesManager.getModule(Depend1Module.class);
-        Assertions.assertEquals(InitStatus.FINISH, module.getInitStatus());
+        Assertions.assertEquals(module.getInitStatus(), InitStatus.FINISH);
         Depend2Module module2 = modulesManager.getModule(Depend2Module.class);
-        Assertions.assertEquals(InitStatus.FINISH, module2.getInitStatus());
+        Assertions.assertEquals(module2.getInitStatus(), InitStatus.FINISH);
     }
 }

LauncherClient/src/main/java/pro/gravit/launcher/client/ClientLauncherEntryPoint.java

@@ -88,7 +88,7 @@ private static void realMain(String[] args) throws Throwable {
         ClientParams params = readParams(new InetSocketAddress("127.0.0.1", Launcher.getConfig().clientPort));
         ClientLauncherMethods.verifyNoAgent();
         if(params.timestamp > System.currentTimeMillis() || params.timestamp + 30*1000 < System.currentTimeMillis() ) {
-            LogHelper.error("Timestamp failed: current %d | params %d | diff %d", System.currentTimeMillis(), params.timestamp, System.currentTimeMillis() - params.timestamp);
+            LogHelper.error("Timestamp failed. Exit");
             ClientLauncherMethods.exitLauncher(-662);
             return;
         }
@@ -116,6 +116,15 @@ private static void realMain(String[] args) throws Throwable {
 
         // Verify ClientLauncher sign and classpath
         LogHelper.debug("Verifying ClientLauncher sign and classpath");
+        Set<Path> ignoredPath = new HashSet<>();
+        List<Path> classpath = resolveClassPath(ignoredPath, clientDir, params.actions, params.profile)
+                .collect(Collectors.toCollection(ArrayList::new));
+        if(LogHelper.isDevEnabled()) {
+            for(var e : classpath) {
+                LogHelper.dev("Classpath entry %s", e);
+            }
+        }
+        List<URL> classpathURLs = classpath.stream().map(IOHelper::toURL).collect(Collectors.toList());
         // Start client with WatchService monitoring
         RequestService service;
         if (params.offlineMode) {
@@ -149,18 +158,6 @@ private static void realMain(String[] args) throws Throwable {
                 System.load(Paths.get(params.nativesDir).resolve(ClientService.findLibrary(e)).toAbsolutePath().toString());
             }
         }
-        Set<Path> ignoredPath = new HashSet<>();
-        if(options.moduleConf != null && options.moduleConf.modulePath != null) {
-            List<Path> resolvedModulePath = resolveClassPathStream(ignoredPath, clientDir, options.moduleConf.modulePath).toList();
-        }
-        List<Path> classpath = resolveClassPath(ignoredPath, clientDir, params.actions, params.profile)
-                .collect(Collectors.toCollection(ArrayList::new));
-        if(LogHelper.isDevEnabled()) {
-            for(var e : classpath) {
-                LogHelper.dev("Classpath entry %s", e);
-            }
-        }
-        List<URL> classpathURLs = classpath.stream().map(IOHelper::toURL).toList();
         if (classLoaderConfig == ClientProfile.ClassLoaderConfig.LAUNCHER || classLoaderConfig == ClientProfile.ClassLoaderConfig.MODULE) {
             if(JVMHelper.JVM_VERSION <= 11) {
                 launch = new LegacyLaunch();
@@ -277,11 +274,9 @@ private static Stream<Path> resolveClassPathStream(Set<Path> ignorePaths, Path c
 
     public static Stream<Path> resolveClassPath(Set<Path> ignorePaths, Path clientDir, Set<OptionalAction> actions, ClientProfile profile) throws IOException {
         Stream<Path> result = resolveClassPathStream(ignorePaths, clientDir, profile.getClassPath());
-        if(actions != null) {
-            for (OptionalAction a : actions) {
-                if (a instanceof OptionalActionClassPath)
-                    result = Stream.concat(result, resolveClassPathStream(ignorePaths, clientDir, ((OptionalActionClassPath) a).args));
-            }
+        for (OptionalAction a : actions) {
+            if (a instanceof OptionalActionClassPath)
+                result = Stream.concat(result, resolveClassPathStream(ignorePaths, clientDir, ((OptionalActionClassPath) a).args));
         }
         return result;
     }

LauncherCore/src/main/java/pro/gravit/launcher/core/hasher/HashedDir.java

@@ -282,7 +282,7 @@ public enum WalkAction {
 
     @FunctionalInterface
     public interface WalkCallback {
-        WalkAction walked(String path, String name, HashedEntry entry);
+        WalkAction walked(String path, String name, HashedEntry entry) throws IOException;
     }
 
     public static class FindRecursiveResult {

LauncherCore/src/main/java/pro/gravit/utils/HookException.java

@@ -1,6 +1,7 @@
 package pro.gravit.utils;
 
 public class HookException extends RuntimeException {
+    private static final long serialVersionUID = -529141998961943161L;
 
     public HookException(String message) {
         super(message);

LauncherCore/src/main/java/pro/gravit/utils/Version.java

@@ -6,7 +6,7 @@ public final class Version implements Comparable<Version> {
 
     public static final int MAJOR = 5;
     public static final int MINOR = 6;
-    public static final int PATCH = 16;
+    public static final int PATCH = 6;
     public static final int BUILD = 1;
     public static final Version.Type RELEASE = Type.STABLE;
     public final int major;

LauncherCore/src/main/java/pro/gravit/utils/command/CommandException.java

@@ -1,6 +1,7 @@
 package pro.gravit.utils.command;
 
 public final class CommandException extends Exception {
+    private static final long serialVersionUID = -6588814993972117772L;
 
 
     public CommandException(String message) {

LauncherCore/src/main/java/pro/gravit/utils/command/CommandHandler.java

@@ -10,18 +10,8 @@
 import java.util.Map;
 
 public abstract class CommandHandler implements Runnable {
-    protected final List<Category> categories;
-    protected final CommandCategory baseCategory;
-
-    public CommandHandler() {
-        this.categories = new ArrayList<>();
-        this.baseCategory = new BaseCommandCategory();
-    }
-
-    protected CommandHandler(List<Category> categories, CommandCategory baseCategory) {
-        this.categories = categories;
-        this.baseCategory = baseCategory;
-    }
+    private final List<Category> categories = new ArrayList<>();
+    private final CommandCategory baseCategory = new BaseCommandCategory();
 
     public void eval(String line, boolean bell) {
         LogHelper.info("Command '%s'", line);

LauncherCore/src/main/java/pro/gravit/utils/command/StdCommandHandler.java

@@ -5,8 +5,6 @@
 
 import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
 
 public class StdCommandHandler extends CommandHandler {
     private final BufferedReader reader;
@@ -16,31 +14,6 @@ public StdCommandHandler(boolean readCommands) {
         reader = readCommands ? IOHelper.newReader(System.in) : null;
     }
 
-    public StdCommandHandler(InputStream stream) {
-        super();
-        this.reader = IOHelper.newReader(stream);
-    }
-
-    public StdCommandHandler(BufferedReader reader) {
-        super();
-        this.reader = reader;
-    }
-
-    protected StdCommandHandler(List<Category> categories, CommandCategory baseCategory, boolean readCommands) {
-        super(categories, baseCategory);
-        this.reader = readCommands ? IOHelper.newReader(System.in) : null;
-    }
-
-    protected StdCommandHandler(List<Category> categories, CommandCategory baseCategory, InputStream stream) {
-        super(categories, baseCategory);
-        this.reader = IOHelper.newReader(stream);
-    }
-
-    protected StdCommandHandler(List<Category> categories, CommandCategory baseCategory, BufferedReader reader) {
-        super(categories, baseCategory);
-        this.reader = reader;
-    }
-
     @Override
     public void bell() {
     }
@@ -64,16 +37,4 @@ public void clear() throws IOException {
     public String readLine() throws IOException {
         return reader == null ? null : reader.readLine();
     }
-
-    public StdCommandHandler ofHandler(CommandHandler commandHandler, boolean readCommands) {
-        return new StdCommandHandler(commandHandler.categories, commandHandler.baseCategory, readCommands);
-    }
-
-    public StdCommandHandler ofHandler(CommandHandler commandHandler, InputStream stream) {
-        return new StdCommandHandler(commandHandler.categories, commandHandler.baseCategory, stream);
-    }
-
-    public StdCommandHandler ofHandler(CommandHandler commandHandler, BufferedReader reader) {
-        return new StdCommandHandler(commandHandler.categories, commandHandler.baseCategory, reader);
-    }
 }

LauncherCore/src/main/java/pro/gravit/utils/helper/CommonHelper.java

@@ -221,39 +221,37 @@ public static ArgsParseResult parseJavaArgs(List<String> args) {
                     continue;
                 }
             }
-            switch (arg) {
-                case "--module-path", "-p" -> {
-                    prevArgType = PrevArgType.MODULE_PATH;
-                    continue;
-                }
-                case "--classpath", "-cp" -> {
-                    prevArgType = PrevArgType.CLASSPATH;
-                    continue;
-                }
-                case "--add-modules" -> {
-                    prevArgType = PrevArgType.ADD_MODULES;
-                    continue;
-                }
-                case "--add-opens" -> {
-                    prevArgType = PrevArgType.ADD_OPENS;
-                    continue;
-                }
-                case "--add-exports" -> {
-                    prevArgType = PrevArgType.ADD_EXPORTS;
-                    continue;
-                }
-                case "--add-reads" -> {
-                    prevArgType = PrevArgType.ADD_READS;
-                    continue;
-                }
-                case "--module", "-m" -> {
-                    prevArgType = PrevArgType.MODULE;
-                    continue;
-                }
-                case "-jar" -> {
-                    prevArgType = PrevArgType.JAR;
-                    continue;
-                }
+            if(arg.equals("--module-path") || arg.equals("-p")) {
+                prevArgType = PrevArgType.MODULE_PATH;
+                continue;
+            }
+            if(arg.equals("--classpath") || arg.equals("-cp")) {
+                prevArgType = PrevArgType.CLASSPATH;
+                continue;
+            }
+            if(arg.equals("--add-modules")) {
+                prevArgType = PrevArgType.ADD_MODULES;
+                continue;
+            }
+            if(arg.equals("--add-opens")) {
+                prevArgType = PrevArgType.ADD_OPENS;
+                continue;
+            }
+            if(arg.equals("--add-exports")) {
+                prevArgType = PrevArgType.ADD_EXPORTS;
+                continue;
+            }
+            if(arg.equals("--add-reads")) {
+                prevArgType = PrevArgType.ADD_READS;
+                continue;
+            }
+            if(arg.equals("--module") || arg.equals("-m")) {
+                prevArgType = PrevArgType.MODULE;
+                continue;
+            }
+            if(arg.equals("-jar")) {
+                prevArgType = PrevArgType.JAR;
+                continue;
             }
             jvmArgs.add(arg);
         }

LauncherCore/src/main/java/pro/gravit/utils/helper/JarHelper.java

@@ -83,7 +83,7 @@ public static byte[] getClassBytes(Class<?> clazz, ClassLoader classLoader) thro
         return IOHelper.read(classLoader.getResourceAsStream(getClassFile(clazz)));
     }
 
-    public static InputStream getClassBytesStream(Class<?> clazz) {
+    public static InputStream getClassBytesStream(Class<?> clazz) throws IOException {
         return getClassBytesStream(clazz, clazz.getClassLoader());
     }
 

LauncherCore/src/main/java/pro/gravit/utils/launch/BasicLaunch.java

@@ -68,7 +68,7 @@ public void addTransformer(ClassTransformer transformer) {
             }
             instrumentation.addTransformer(new ClassFileTransformer() {
                 @Override
-                public byte[] transform(ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) {
+                public byte[] transform(ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws IllegalClassFormatException {
                     if(transformer.filter(null, className)) {
                         return transformer.transform(null, className, protectionDomain, classfileBuffer);
                     }

LauncherCore/src/main/java/pro/gravit/utils/launch/LaunchOptions.java

@@ -14,6 +14,5 @@ public static final class ModuleConf {
         public Map<String, String> exports = new HashMap<>();
         public Map<String, String> opens = new HashMap<>();
         public Map<String, String> reads = new HashMap<>();
-        public List<String> enableNativeAccess = new ArrayList<>();
     }
 }

LauncherCore/src/main/java/pro/gravit/utils/launch/LegacyLaunch.java

@@ -123,9 +123,6 @@ protected Class<?> findClass(String name) throws ClassNotFoundException {
 
         @Override
         public String findLibrary(String name) {
-            if(nativePath == null) {
-                return null;
-            }
             return nativePath.concat(IOHelper.PLATFORM_SEPARATOR).concat(JVMHelper.NATIVE_PREFIX).concat(name).concat(JVMHelper.NATIVE_EXTENSION);
         }
 

LauncherCore/src/main/java/pro/gravit/utils/launch/ModuleLaunch.java

@@ -29,18 +29,6 @@ public class ModuleLaunch implements Launch {
     private ModuleLayer layer;
     private MethodHandles.Lookup hackLookup;
     private boolean disablePackageDelegateSupport;
-    private static final MethodHandle ENABLE_NATIVE_ACCESS;
-
-    static {
-        MethodHandle mh;
-        try {
-            mh = MethodHandles.lookup().findVirtual(ModuleLayer.Controller.class, "enableNativeAccess", MethodType.methodType(ModuleLayer.Controller.class, Module.class));
-        } catch (NoSuchMethodException | IllegalAccessException e) {
-            mh = null;
-        }
-        ENABLE_NATIVE_ACCESS = mh;
-    }
-
     @Override
     public ClassLoaderControl init(List<Path> files, String nativePath, LaunchOptions options) {
         this.disablePackageDelegateSupport = options.disablePackageDelegateSupport;
@@ -132,20 +120,6 @@ public ClassLoaderControl init(List<Path> files, String nativePath, LaunchOption
                         controller.addReads(source, target);
                     }
                 }
-                for(var e : options.moduleConf.enableNativeAccess) {
-                    LogHelper.dev("Enable Native Access %s", e);
-                    Module source = layer.findModule(e).orElse(null);
-                    if(source == null) {
-                        throw new RuntimeException(String.format("Module %s not found", e));
-                    }
-                    if(ENABLE_NATIVE_ACCESS != null) {
-                        try {
-                            ENABLE_NATIVE_ACCESS.invoke(controller, source);
-                        } catch (Throwable ex) {
-                            throw new RuntimeException(ex);
-                        }
-                    }
-                }
                 moduleClassLoader.initializeWithLayer(layer);
             }
         }
@@ -288,9 +262,6 @@ protected Class<?> findClass(String moduleName, String name) {
 
         @Override
         public String findLibrary(String name) {
-            if(nativePath == null) {
-                return null;
-            }
             return nativePath.concat(IOHelper.PLATFORM_SEPARATOR).concat(JVMHelper.NATIVE_PREFIX).concat(name).concat(JVMHelper.NATIVE_EXTENSION);
         }
 

LauncherCore/src/test/java/pro/gravit/launcher/SerializeTest.java

@@ -30,8 +30,8 @@ public void main() {
         String json2 = gson.toJson(new MyTestClass2("BBBB"), TestInterface.class);
         TestInterface test1 = gson.fromJson(json, TestInterface.class);
         TestInterface test2 = gson.fromJson(json2, TestInterface.class);
-        Assertions.assertEquals("AAAA", test1.get());
-        Assertions.assertEquals("BBBB", test2.get());
+        Assertions.assertEquals(test1.get(), "AAAA");
+        Assertions.assertEquals(test2.get(), "BBBB");
     }
 
     public interface TestInterface {

ServerWrapper/build.gradle

@@ -48,21 +48,6 @@ pack project(':LauncherAPI')
     exclude 'module-info.class'
 }
 
-tasks.register('inlinejar', Jar) {
-    dependsOn configurations.runtimeClasspath
-    from {
-        configurations.runtimeClasspath.filter {! (it.name =~ /gson.*\.jar/  || it.name =~ /error_prone_annotations.*\.jar/)}.collect { it.isDirectory() ? it : zipTree(it) }
-    }
-    from {
-        sourceSets.main.output
-    }
-    archiveClassifier.set('inline')
-    manifest.attributes("Main-Class": mainClassName,
-            "Automatic-Module-Name": "ServerWrapper"
-    )
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-}
-
 publishing {
     publications {
         serverwrapperapi(MavenPublication) {
@@ -109,4 +94,4 @@ pack project(':LauncherAPI')
     sign publishing.publications.serverwrapperapi
 }
 
-assemble.dependsOn tasks.shadowJar, tasks.inlinejar
+assemble.dependsOn tasks.shadowJar

ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapper.java

@@ -25,18 +25,14 @@
 import pro.gravit.utils.launch.*;
 
 import java.io.File;
-import java.io.IOException;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.lang.reflect.Type;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.*;
-import java.util.function.Function;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 public class ServerWrapper extends JsonConfigurable<ServerWrapper.Config> {
     public static final Path configFile = Paths.get(System.getProperty("serverwrapper.configFile", "ServerWrapperConfig.json"));
@@ -103,20 +99,30 @@ public void getProfiles() throws Exception {
         }
     }
 
-
-    public void initialize() throws Exception {
+    public void run(String... args) throws Throwable {
         initGson();
         AuthRequest.registerProviders();
         GetAvailabilityAuthRequest.registerProviders();
         OptionalAction.registerProviders();
         OptionalTrigger.registerProviders();
+        if (args.length > 0 && args[0].equalsIgnoreCase("setup") && !disableSetup) {
+            LogHelper.debug("Read ServerWrapperConfig.json");
+            loadConfig();
+            ServerWrapperSetup setup = new ServerWrapperSetup();
+            setup.run();
+            System.exit(0);
+        }
+        if (args.length > 1 && args[0].equalsIgnoreCase("installAuthlib") && !disableSetup) {
+            LogHelper.debug("Read ServerWrapperConfig.json");
+            loadConfig();
+            InstallAuthlib command = new InstallAuthlib();
+            command. run(args[1]);
+            System.exit(0);
+        }
         LogHelper.debug("Read ServerWrapperConfig.json");
         loadConfig();
-    }
-
-    public void connect() throws Exception {
-        config.applyEnv();
         updateLauncherConfig();
+        Launcher.applyLauncherEnv(Objects.requireNonNullElse(config.env, LauncherConfig.LauncherEnvironment.STD));
         StdWebSocketService service = StdWebSocketService.initWebSockets(config.address).get();
         service.reconnectCallback = () ->
         {
@@ -128,6 +134,11 @@ public void connect() throws Exception {
                 LogHelper.error(e);
             }
         };
+        if(config.properties != null) {
+            for(Map.Entry<String, String> e : config.properties.entrySet()) {
+                System.setProperty(e.getKey(), e.getValue());
+            }
+        }
         Request.setRequestService(service);
         if (config.logFile != null) LogHelper.addOutput(IOHelper.newWriter(Paths.get(config.logFile), true));
         {
@@ -140,47 +151,6 @@ public void connect() throws Exception {
         if(config.encodedServerEcPublicKey != null) {
             KeyService.serverEcPublicKey = SecurityHelper.toPublicECDSAKey(config.encodedServerEcPublicKey);
         }
-        ClientService.nativePath = config.nativesDir;
-        ConfigService.serverName = config.serverName;
-        if(config.configServiceSettings != null) {
-            config.configServiceSettings.apply();
-        }
-    }
-
-    public void runCompatClasses() throws Throwable {
-        if(config.compatClasses != null) {
-            for (String e : config.compatClasses) {
-                Class<?> clazz = classLoaderControl == null ? Class.forName(e) : classLoaderControl.getClass(e);
-                MethodHandle runMethod = MethodHandles.lookup().findStatic(clazz, "run", MethodType.methodType(void.class, ClassLoaderControl.class));
-                runMethod.invoke(classLoaderControl);
-            }
-        }
-    }
-
-    public void run(String... args) throws Throwable {
-        initialize();
-        if (args.length > 0 && args[0].equalsIgnoreCase("setup") && !disableSetup) {
-            ServerWrapperSetup setup = new ServerWrapperSetup();
-            setup.run();
-            System.exit(0);
-        }
-        if (args.length > 1 && args[0].equalsIgnoreCase("installAuthlib") && !disableSetup) {
-            InstallAuthlib command = new InstallAuthlib();
-            command. run(args[1]);
-            System.exit(0);
-        }
-        connect();
-        if(config.properties != null) {
-            for(Map.Entry<String, String> e : config.properties.entrySet()) {
-                System.setProperty(e.getKey(), e.getValue());
-            }
-        }
-        if(config.encodedServerRsaPublicKey != null) {
-            KeyService.serverRsaPublicKey = SecurityHelper.toPublicRSAKey(config.encodedServerRsaPublicKey);
-        }
-        if(config.encodedServerEcPublicKey != null) {
-            KeyService.serverEcPublicKey = SecurityHelper.toPublicECDSAKey(config.encodedServerEcPublicKey);
-        }
         String classname = (config.mainclass == null || config.mainclass.isEmpty()) ? args[0] : config.mainclass;
         if (classname.isEmpty()) {
             LogHelper.error("MainClass not found. Please set MainClass for ServerWrapper.json or first commandline argument");
@@ -210,6 +180,8 @@ public void run(String... args) throws Throwable {
             System.arraycopy(args, 1, real_args, 0, args.length - 1);
         } else real_args = args;
         Launch launch;
+        ClientService.nativePath = config.nativesDir;
+        ConfigService.serverName = config.serverName;
         if(config.loadNatives != null) {
             for(String e : config.loadNatives) {
                 System.load(Paths.get(config.nativesDir).resolve(ClientService.findLibrary(e)).toAbsolutePath().toString());
@@ -235,27 +207,24 @@ public void run(String... args) throws Throwable {
         LaunchOptions options = new LaunchOptions();
         options.enableHacks = config.enableHacks;
         options.moduleConf = config.moduleConf;
-        classLoaderControl = launch.init(config.classpath.stream()
-                .map(Paths::get)
-                        .flatMap(p -> {
-                            if(!Files.isDirectory(p)) {
-                                return Stream.of(p);
-                            }
-                            try {
-                                return Files.walk(p).filter(e -> e.getFileName().toString().endsWith(".jar"));
-                            } catch (IOException e) {
-                                throw new RuntimeException(e);
-                            }
-                        })
-                .collect(Collectors.toCollection(ArrayList::new)), config.nativesDir, options);
+        classLoaderControl = launch.init(config.classpath.stream().map(Paths::get).collect(Collectors.toCollection(ArrayList::new)), config.nativesDir, options);
         if(ServerAgent.isAgentStarted()) {
             ClientService.instrumentation = ServerAgent.inst;
         }
         ClientService.classLoaderControl = classLoaderControl;
         ClientService.baseURLs = classLoaderControl.getURLs();
+        if(config.configServiceSettings != null) {
+            config.configServiceSettings.apply();
+        }
         LogHelper.info("Start Minecraft Server");
         try {
-            runCompatClasses();
+            if(config.compatClasses != null) {
+                for (String e : config.compatClasses) {
+                    Class<?> clazz = classLoaderControl.getClass(e);
+                    MethodHandle runMethod = MethodHandles.lookup().findStatic(clazz, "run", MethodType.methodType(void.class, ClassLoaderControl.class));
+                    runMethod.invoke(classLoaderControl);
+                }
+            }
             LogHelper.debug("Invoke main method %s with %s", classname, launch.getClass().getName());
             launch.launch(config.mainclass, config.mainmodule, Arrays.asList(real_args));
         } catch (Throwable e) {
@@ -282,12 +251,12 @@ public void setConfig(Config config) {
     @Override
     public Config getDefaultConfig() {
         Config newConfig = new Config();
-        newConfig.serverName = "";
+        newConfig.serverName = "your server name";
         newConfig.mainclass = "";
         newConfig.extendedTokens = new HashMap<>();
         newConfig.args = new ArrayList<>();
         newConfig.classpath = new ArrayList<>();
-        newConfig.address = "";
+        newConfig.address = "ws://localhost:9274/api";
         newConfig.classLoaderConfig = ClientProfile.ClassLoaderConfig.SYSTEM_ARGS;
         newConfig.env = LauncherConfig.LauncherEnvironment.STD;
         newConfig.properties = new HashMap<>();
@@ -335,38 +304,5 @@ public void apply() {
                 ConfigService.checkServerConfig.needProperties = checkServerNeedProperties;
             }
         }
-
-        public void applyEnv() {
-            this.authId = applyEnvOrDefault("SERVERWRAPPER_AUTH_ID", this.authId);
-            this.address = applyEnvOrDefault("SERVERWRAPPER_ADDRESS", this.address);
-            this.serverName = applyEnvOrDefault("SERVERWRAPPER_SERVER_NAME", this.serverName);
-            this.encodedServerEcPublicKey = applyEnvOrDefault("SERVERWRAPPER_EC_PUBLIC_KEY", Base64.getUrlDecoder()::decode, null);
-            this.encodedServerRsaPublicKey = applyEnvOrDefault("SERVERWRAPPER_RSA_PUBLIC_KEY", Base64.getUrlDecoder()::decode, null);
-            {
-                String token = System.getenv("SERVERWRAPPER_CHECK_SERVER_TOKEN");
-                if(token != null) {
-                    if(extendedTokens == null) {
-                        extendedTokens = new HashMap<>();
-                    }
-                    extendedTokens.put("checkServer", new Request.ExtendedToken(token, 0L));
-                }
-            }
-        }
-
-        private static String applyEnvOrDefault(String envName, String def) {
-            String value = System.getenv(envName);
-            if(value == null) {
-                return def;
-            }
-            return value;
-        }
-
-        private static<T> T applyEnvOrDefault(String envName, Function<String, T> mappingFunction, T def) {
-            String value = System.getenv(envName);
-            if(value == null) {
-                return def;
-            }
-            return mappingFunction.apply(value);
-        }
     }
 }

ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapperInlineInitializer.java

@@ -1,10 +0,0 @@
-package pro.gravit.launcher.server;
-
-public class ServerWrapperInlineInitializer {
-    public static void run() throws Throwable {
-        ServerWrapper.wrapper = new ServerWrapper(ServerWrapper.Config.class, ServerWrapper.configFile);
-        ServerWrapper.wrapper.initialize();
-        ServerWrapper.wrapper.connect();
-        ServerWrapper.wrapper.runCompatClasses();
-    }
-}

ServerWrapper/src/main/java/pro/gravit/launcher/server/setup/ServerWrapperSetup.java

@@ -30,11 +30,8 @@ public ServerWrapperSetup() throws IOException {
 
     public void run() throws Exception {
         ServerWrapper wrapper = ServerWrapper.wrapper;
-        String jarName = System.getenv("SERVERWRAPPER_JAR_NAME");
-        if(jarName == null) {
-            System.out.println("Print server jar filename:");
-            jarName = commands.commandHandler.readLine();
-        }
+        System.out.println("Print server jar filename:");
+        String jarName = commands.commandHandler.readLine();
         Path jarPath = Paths.get(jarName);
         String mainClassName;
         String agentClassName;
@@ -59,18 +56,14 @@ public void run() throws Exception {
         if (agentClassName != null) {
             LogHelper.info("Found PremainClass %s", agentClassName);
         }
-        if(wrapper.config.serverName == null || wrapper.config.serverName.isEmpty()) {
-            System.out.println("Print your server name:");
-            wrapper.config.serverName = commands.commandHandler.readLine();
-        }
+        System.out.println("Print your server name:");
+        wrapper.config.serverName = commands.commandHandler.readLine();
         wrapper.config.mainclass = mainClassName;
         boolean altMode = false;
         for (int i = 0; i < 10; ++i) {
             if(!Request.isAvailable() || Request.getRequestService().isClosed()) {
-                if(wrapper.config.address == null || wrapper.config.address.isEmpty()) {
-                    System.out.println("Print launchserver websocket host( ws://host:port/api ):");
-                    wrapper.config.address = commands.commandHandler.readLine();
-                }
+                System.out.println("Print launchserver websocket host( ws://host:port/api ):");
+                wrapper.config.address = commands.commandHandler.readLine();
                 StdWebSocketService service;
                 try {
                     service = StdWebSocketService.initWebSockets(wrapper.config.address).get();
@@ -80,11 +73,9 @@ public void run() throws Exception {
                 }
                 Request.setRequestService(service);
             }
-            if(wrapper.config.extendedTokens == null || wrapper.config.extendedTokens.get("checkServer") == null) {
-                System.out.println("Print server token:");
-                String checkServerToken = commands.commandHandler.readLine();
-                wrapper.config.extendedTokens.put("checkServer", new Request.ExtendedToken(checkServerToken, 0));
-            }
+            System.out.println("Print server token:");
+            String checkServerToken = commands.commandHandler.readLine();
+            wrapper.config.extendedTokens.put("checkServer", new Request.ExtendedToken(checkServerToken, 0));
             wrapper.updateLauncherConfig();
             try {
                 wrapper.restore();
@@ -102,9 +93,7 @@ public void run() throws Exception {
         }
         if(wrapper.profile != null && wrapper.profile.getVersion().compareTo(ClientProfileVersions.MINECRAFT_1_18) >= 0) {
             LogHelper.info("Switch to alternative start mode (1.18)");
-            if(!wrapper.config.classpath.contains(jarName)) {
-                wrapper.config.classpath.add(jarName);
-            }
+            wrapper.config.classpath.add(jarName);
             wrapper.config.classLoaderConfig = ClientProfile.ClassLoaderConfig.LAUNCHER;
             altMode = true;
         }

build.gradle

@@ -1,11 +1,11 @@
 plugins {
-    id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
+    id 'com.github.johnrengelman.shadow' version '7.1.2' apply false
     id 'maven-publish'
     id 'signing'
     id 'org.openjfx.javafxplugin' version '0.1.0' apply false
 }
 group = 'pro.gravit.launcher'
-version = '5.6.16'
+version = '5.6.6'
 
 apply from: 'props.gradle'
 
@@ -30,13 +30,6 @@
         maven {
             url "https://jitpack.io/"
         }
-        maven {
-            url 'https://maven.gravit-support.ru/repository/jitpack'
-            credentials {
-                username = 'gravitlauncher'
-                password = 'gravitlauncher'
-            }
-        }
     }
 
     jar {
@@ -71,6 +64,10 @@
         repositories {
             maven {
                 url = version.endsWith('SNAPSHOT') ? getProperty('mavenSnapshotRepository') : getProperty('mavenReleaseRepository')
+                credentials {
+                    username getProperty('mavenUsername')
+                    password getProperty('mavenPassword')
+                }
             }
         }
     }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -86,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -205,7 +206,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.

java24args.txt

@@ -1,2 +0,0 @@
---enable-native-access=org.fusesource.jansi
---enable-native-access=io.netty.common

javaargs.txt

@@ -1,4 +0,0 @@
---add-opens java.base/java.lang.invoke=launchserver
---add-modules java.net.http
--Dlauncher.useSlf4j=true
--Dio.netty.noUnsafe=true

modules

@@ -1 +1 @@
-Subproject commit a2c3ccecadb7f864039b88e6269583c4b77fba13
+Subproject commit 65f882bd90623aa1581ad24cfa4f52563ea95bc0

props.gradle

@@ -1,18 +1,18 @@
 project.ext {
-    verAsm = '9.7.1'
-    verNetty = '4.2.0.Final'
-    verOshiCore = '6.8.0'
-    verJunit = '5.11.4'
+    verAsm = '9.7'
+    verNetty = '4.1.111.Final'
+    verOshiCore = '6.6.2'
+    verJunit = '5.10.2'
     verJansi = '2.4.1'
-    verJline = '3.29.0'
-    verJwt = '0.12.6'
-    verGson = '2.12.1'
-    verBcpkix = '1.80'
-    verSlf4j = '2.0.17'
-    verLog4j = '2.24.3'
-    verMySQLConn = '9.2.0'
-    verMariaDBConn = '3.5.3'
-    verPostgreSQLConn = '42.7.5'
-    verH2Conn = '2.3.232'
-    verProguard = '7.7.0'
+    verJline = '3.26.1'
+    verJwt = '0.12.5'
+    verGson = '2.11.0'
+    verBcpkix = '1.78.1'
+    verSlf4j = '2.0.13'
+    verLog4j = '2.23.1'
+    verMySQLConn = '9.0.0'
+    verMariaDBConn = '3.4.0'
+    verPostgreSQLConn = '42.7.3'
+    verH2Conn = '2.2.224'
+    verProguard = '7.5.0'
 }