Merge branch 'v4.1.x' of github.com:GravitLauncher/Launcher into v4.1.x

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

@@ -33,19 +33,16 @@
 
 import ru.gravit.launcher.Launcher;
 import ru.gravit.launcher.hasher.HashedDir;
-import ru.gravit.launcher.serialize.config.entry.*;
-import ru.gravit.launchserver.manangers.MirrorManager;
-import ru.gravit.utils.helper.CommonHelper;
-import ru.gravit.utils.helper.IOHelper;
-import ru.gravit.utils.helper.JVMHelper;
-import ru.gravit.utils.helper.LogHelper;
-import ru.gravit.utils.helper.SecurityHelper;
-import ru.gravit.utils.helper.VerifyHelper;
 import ru.gravit.launcher.managers.GarbageManager;
 import ru.gravit.launcher.profiles.ClientProfile;
 import ru.gravit.launcher.serialize.config.ConfigObject;
 import ru.gravit.launcher.serialize.config.TextConfigReader;
 import ru.gravit.launcher.serialize.config.TextConfigWriter;
+import ru.gravit.launcher.serialize.config.entry.BlockConfigEntry;
+import ru.gravit.launcher.serialize.config.entry.BooleanConfigEntry;
+import ru.gravit.launcher.serialize.config.entry.IntegerConfigEntry;
+import ru.gravit.launcher.serialize.config.entry.ListConfigEntry;
+import ru.gravit.launcher.serialize.config.entry.StringConfigEntry;
 import ru.gravit.launcher.serialize.signed.SignedObjectHolder;
 import ru.gravit.launchserver.auth.AuthLimiter;
 import ru.gravit.launchserver.auth.handler.AuthHandler;
@@ -59,11 +56,18 @@
 import ru.gravit.launchserver.command.handler.JLineCommandHandler;
 import ru.gravit.launchserver.command.handler.StdCommandHandler;
 import ru.gravit.launchserver.manangers.BuildHookManager;
+import ru.gravit.launchserver.manangers.MirrorManager;
 import ru.gravit.launchserver.manangers.ModulesManager;
 import ru.gravit.launchserver.manangers.SessionManager;
 import ru.gravit.launchserver.response.Response;
 import ru.gravit.launchserver.socket.ServerSocketHandler;
 import ru.gravit.launchserver.texture.TextureProvider;
+import ru.gravit.utils.helper.CommonHelper;
+import ru.gravit.utils.helper.IOHelper;
+import ru.gravit.utils.helper.JVMHelper;
+import ru.gravit.utils.helper.LogHelper;
+import ru.gravit.utils.helper.SecurityHelper;
+import ru.gravit.utils.helper.VerifyHelper;
 
 public final class LaunchServer implements Runnable, AutoCloseable {
     public static final class Config extends ConfigObject {

LaunchServer/src/main/java/ru/gravit/launchserver/ProguardConf.java

@@ -40,8 +40,8 @@ public ProguardConf(LaunchServer srv) {
         prepare(false);
         if (srv.config.genMappings) confStrs.add("-printmapping \'" + mappings.toFile().getName() + "\'");
         confStrs.add("-obfuscationdictionary \'" + words.toFile().getName() + "\'");
-        confStrs.add("-injar \'" + srv.dir.toAbsolutePath() + IOHelper.PLATFORM_SEPARATOR + srv.config.binaryName + ".jar\'");
+        confStrs.add("-injar \'" + srv.dir.toAbsolutePath() + IOHelper.PLATFORM_SEPARATOR + srv.config.binaryName + "-nonObf.jar\'");
-        confStrs.add("-outjar \'" + srv.dir.toAbsolutePath() + IOHelper.PLATFORM_SEPARATOR + srv.config.binaryName + "-obf.jar\'");
+        confStrs.add("-outjar \'" + srv.dir.toAbsolutePath() + IOHelper.PLATFORM_SEPARATOR + srv.config.binaryName + "-obfed.jar\'");
         confStrs.add("-classobfuscationdictionary \'" + words.toFile().getName() + "\'");
         confStrs.add(readConf());
 

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

@@ -0,0 +1,93 @@
+package ru.gravit.launchserver.asm;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.jar.JarFile;
+
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.Opcodes;
+
+import ru.gravit.utils.helper.IOHelper;
+
+/**
+ * Позволяет искать методы внутри незагруженных классов и общие суперклассы для
+ * чего угодно. Работает через поиск class-файлов в classpath.
+ */
+public class ClassMetadataReader {
+	private class CheckSuperClassVisitor extends ClassVisitor {
+
+		String superClassName;
+
+		public CheckSuperClassVisitor() {
+			super(Opcodes.ASM5);
+		}
+
+		@Override
+		public void visit(int version, int access, String name, String signature, String superName,
+				String[] interfaces) {
+			superClassName = superName;
+		}
+	}
+
+	private final List<JarFile> cp;
+
+	public ClassMetadataReader(List<JarFile> cp) {
+		this.cp = cp;
+	}
+	
+	public List<JarFile> getCp() {
+		return cp;
+	}
+
+	public ClassMetadataReader() {
+		this.cp = new ArrayList<>();
+	}
+
+	public void acceptVisitor(byte[] classData, ClassVisitor visitor) {
+		new ClassReader(classData).accept(visitor, 0);
+	}
+
+	public void acceptVisitor(String className, ClassVisitor visitor) throws IOException {
+		acceptVisitor(getClassData(className), visitor);
+	}
+
+	public byte[] getClassData(String className) throws IOException {
+		for (JarFile f : cp) {
+			if (f.getEntry(className + ".class") != null) try (InputStream in = f.getInputStream(f.getEntry(className + ".class"))) { return IOHelper.read(in); }
+		}
+		return IOHelper.read(IOHelper.getResourceURL(className + ".class"));
+	}
+
+	public String getSuperClass(String type) {
+		if (type.equals("java/lang/Object")) return null;
+		try {
+			return getSuperClassASM(type);
+		} catch (Exception e) {
+			return "java/lang/Object";
+		}
+	}
+
+	protected String getSuperClassASM(String type) throws IOException {
+		CheckSuperClassVisitor cv = new CheckSuperClassVisitor();
+		acceptVisitor(type, cv);
+		return cv.superClassName;
+	}
+
+	/**
+	 * Возвращает суперклассы в порядке возрастающей конкретности (начиная с
+	 * java/lang/Object и заканчивая данным типом)
+	 */
+	public ArrayList<String> getSuperClasses(String type) {
+		ArrayList<String> superclasses = new ArrayList<>(1);
+		superclasses.add(type);
+		while ((type = getSuperClass(type)) != null)
+			superclasses.add(type);
+		Collections.reverse(superclasses);
+		return superclasses;
+	}
+
+}

LaunchServer/src/main/java/ru/gravit/launchserver/asm/SafeClassWriter.java

@@ -0,0 +1,40 @@
+package ru.gravit.launchserver.asm;
+
+import java.util.ArrayList;
+
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassWriter;
+
+/**
+ * ClassWriter с другой реализацией метода getCommonSuperClass: при его
+ * использовании не происходит загрузки классов.
+ */
+public class SafeClassWriter extends ClassWriter {
+
+	private final ClassMetadataReader classMetadataReader;
+
+	public SafeClassWriter(ClassMetadataReader classMetadataReader, int flags) {
+		super(flags);
+		this.classMetadataReader = classMetadataReader;
+	}
+
+	public SafeClassWriter(ClassReader classReader, ClassMetadataReader classMetadataReader, int flags) {
+		super(classReader, flags);
+		this.classMetadataReader = classMetadataReader;
+	}
+	
+	@Override
+	protected String getCommonSuperClass(String type1, String type2) {
+		ArrayList<String> superClasses1 = classMetadataReader.getSuperClasses(type1);
+		ArrayList<String> superClasses2 = classMetadataReader.getSuperClasses(type2);
+		int size = Math.min(superClasses1.size(), superClasses2.size());
+		int i;
+		for (i = 0; i < size && superClasses1.get(i).equals(superClasses2.get(i)); i++)
+			;
+		if (i == 0)
+			return "java/lang/Object";
+		else
+			return superClasses1.get(i - 1);
+	}
+
+}

LaunchServer/src/main/java/ru/gravit/launchserver/auth/MySQLSourceConfig.java

@@ -9,13 +9,13 @@
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
 
-import ru.gravit.utils.helper.LogHelper;
-import ru.gravit.utils.helper.VerifyHelper;
 import ru.gravit.launcher.serialize.config.ConfigObject;
 import ru.gravit.launcher.serialize.config.entry.BlockConfigEntry;
 import ru.gravit.launcher.serialize.config.entry.BooleanConfigEntry;
 import ru.gravit.launcher.serialize.config.entry.IntegerConfigEntry;
 import ru.gravit.launcher.serialize.config.entry.StringConfigEntry;
+import ru.gravit.utils.helper.LogHelper;
+import ru.gravit.utils.helper.VerifyHelper;
 
 public final class MySQLSourceConfig extends ConfigObject implements AutoCloseable {
 

LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/AuthHandler.java

@@ -6,11 +6,11 @@
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 
-import ru.gravit.utils.helper.VerifyHelper;
 import ru.gravit.launcher.serialize.config.ConfigObject;
 import ru.gravit.launcher.serialize.config.entry.BlockConfigEntry;
 import ru.gravit.launchserver.auth.AuthException;
 import ru.gravit.launchserver.auth.provider.AuthProviderResult;
+import ru.gravit.utils.helper.VerifyHelper;
 
 public abstract class AuthHandler extends ConfigObject implements AutoCloseable {
     private static final Map<String, Adapter<AuthHandler>> AUTH_HANDLERS = new ConcurrentHashMap<>(4);

LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/BinaryFileAuthHandler.java

@@ -5,10 +5,10 @@
 import java.util.Set;
 import java.util.UUID;
 
-import ru.gravit.utils.helper.IOHelper;
 import ru.gravit.launcher.serialize.HInput;
 import ru.gravit.launcher.serialize.HOutput;
 import ru.gravit.launcher.serialize.config.entry.BlockConfigEntry;
+import ru.gravit.utils.helper.IOHelper;
 
 public final class BinaryFileAuthHandler extends FileAuthHandler {
     public BinaryFileAuthHandler(BlockConfigEntry block) {

LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/CachedAuthHandler.java

@@ -8,12 +8,12 @@
 
 import ru.gravit.launcher.NeedGarbageCollection;
 import ru.gravit.launcher.managers.GarbageManager;
+import ru.gravit.launcher.serialize.config.entry.BlockConfigEntry;
 import ru.gravit.launcher.serialize.config.entry.BooleanConfigEntry;
+import ru.gravit.launchserver.auth.provider.AuthProviderResult;
 import ru.gravit.utils.helper.CommonHelper;
 import ru.gravit.utils.helper.SecurityHelper;
 import ru.gravit.utils.helper.VerifyHelper;
-import ru.gravit.launcher.serialize.config.entry.BlockConfigEntry;
-import ru.gravit.launchserver.auth.provider.AuthProviderResult;
 
 public abstract class CachedAuthHandler extends AuthHandler implements NeedGarbageCollection {
     public static final class Entry {

LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/FileAuthHandler.java

@@ -10,11 +10,6 @@
 import java.util.UUID;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import ru.gravit.utils.helper.CommonHelper;
-import ru.gravit.utils.helper.IOHelper;
-import ru.gravit.utils.helper.LogHelper;
-import ru.gravit.utils.helper.SecurityHelper;
-import ru.gravit.utils.helper.VerifyHelper;
 import ru.gravit.launcher.profiles.PlayerProfile;
 import ru.gravit.launcher.serialize.HInput;
 import ru.gravit.launcher.serialize.HOutput;
@@ -23,6 +18,11 @@
 import ru.gravit.launcher.serialize.config.entry.StringConfigEntry;
 import ru.gravit.launcher.serialize.stream.StreamObject;
 import ru.gravit.launchserver.auth.provider.AuthProviderResult;
+import ru.gravit.utils.helper.CommonHelper;
+import ru.gravit.utils.helper.IOHelper;
+import ru.gravit.utils.helper.LogHelper;
+import ru.gravit.utils.helper.SecurityHelper;
+import ru.gravit.utils.helper.VerifyHelper;
 
 public abstract class FileAuthHandler extends AuthHandler {
     public static final class Entry extends StreamObject {

LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/MemoryAuthHandler.java

@@ -4,10 +4,10 @@
 import java.util.Arrays;
 import java.util.UUID;
 
+import ru.gravit.launcher.serialize.config.entry.BlockConfigEntry;
 import ru.gravit.utils.helper.IOHelper;
 import ru.gravit.utils.helper.LogHelper;
 import ru.gravit.utils.helper.VerifyHelper;
-import ru.gravit.launcher.serialize.config.entry.BlockConfigEntry;
 
 public final class MemoryAuthHandler extends CachedAuthHandler {
     private static String toUsername(UUID uuid) {

LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/MySQLAuthHandler.java

@@ -7,10 +7,10 @@
 import java.sql.SQLException;
 import java.util.UUID;
 
-import ru.gravit.utils.helper.VerifyHelper;
 import ru.gravit.launcher.serialize.config.entry.BlockConfigEntry;
 import ru.gravit.launcher.serialize.config.entry.StringConfigEntry;
 import ru.gravit.launchserver.auth.MySQLSourceConfig;
+import ru.gravit.utils.helper.VerifyHelper;
 
 public final class MySQLAuthHandler extends CachedAuthHandler {
     private final MySQLSourceConfig mySQLHolder;

LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/NullAuthHandler.java

@@ -4,9 +4,9 @@
 import java.util.Objects;
 import java.util.UUID;
 
-import ru.gravit.utils.helper.VerifyHelper;
 import ru.gravit.launcher.serialize.config.entry.BlockConfigEntry;
 import ru.gravit.launchserver.auth.provider.AuthProviderResult;
+import ru.gravit.utils.helper.VerifyHelper;
 
 public final class NullAuthHandler extends AuthHandler {
     private volatile AuthHandler handler;

LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/TextFileAuthHandler.java

@@ -8,14 +8,14 @@
 import java.util.Set;
 import java.util.UUID;
 
-import ru.gravit.utils.helper.IOHelper;
-import ru.gravit.utils.helper.VerifyHelper;
 import ru.gravit.launcher.serialize.config.TextConfigReader;
 import ru.gravit.launcher.serialize.config.TextConfigWriter;
 import ru.gravit.launcher.serialize.config.entry.BlockConfigEntry;
 import ru.gravit.launcher.serialize.config.entry.ConfigEntry;
 import ru.gravit.launcher.serialize.config.entry.ConfigEntry.Type;
 import ru.gravit.launcher.serialize.config.entry.StringConfigEntry;
+import ru.gravit.utils.helper.IOHelper;
+import ru.gravit.utils.helper.VerifyHelper;
 
 public final class TextFileAuthHandler extends FileAuthHandler {
     private static StringConfigEntry cc(String value) {

LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/HWIDHandler.java

@@ -6,9 +6,9 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import ru.gravit.launcher.HWID;
-import ru.gravit.utils.helper.VerifyHelper;
 import ru.gravit.launcher.serialize.config.ConfigObject;
 import ru.gravit.launcher.serialize.config.entry.BlockConfigEntry;
+import ru.gravit.utils.helper.VerifyHelper;
 
 public abstract class HWIDHandler extends ConfigObject implements AutoCloseable {
     private static final Map<String, Adapter<HWIDHandler>> HW_HANDLERS = new ConcurrentHashMap<>(4);

LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/JsonHWIDHandler.java

@@ -1,20 +1,21 @@
 package ru.gravit.launchserver.auth.hwid;
 
-import com.google.gson.Gson;
-import com.google.gson.JsonElement;
-import ru.gravit.launcher.HWID;
-import ru.gravit.launcher.OshiHWID;
-import ru.gravit.utils.HTTPRequest;
-import ru.gravit.utils.helper.IOHelper;
-import ru.gravit.utils.helper.LogHelper;
-import ru.gravit.launcher.serialize.config.entry.BlockConfigEntry;
-import ru.gravit.launcher.serialize.config.entry.StringConfigEntry;
-
 import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+
+import ru.gravit.launcher.HWID;
+import ru.gravit.launcher.OshiHWID;
+import ru.gravit.launcher.serialize.config.entry.BlockConfigEntry;
+import ru.gravit.launcher.serialize.config.entry.StringConfigEntry;
+import ru.gravit.utils.HTTPRequest;
+import ru.gravit.utils.helper.IOHelper;
+import ru.gravit.utils.helper.LogHelper;
+
 public final class JsonHWIDHandler extends HWIDHandler {
     private static final Gson gson = new Gson();
 

LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/MysqlHWIDHandler.java

@@ -1,14 +1,5 @@
 package ru.gravit.launchserver.auth.hwid;
 
-import ru.gravit.launcher.HWID;
-import ru.gravit.launcher.OshiHWID;
-import ru.gravit.utils.helper.CommonHelper;
-import ru.gravit.utils.helper.VerifyHelper;
-import ru.gravit.launcher.serialize.config.entry.BlockConfigEntry;
-import ru.gravit.launcher.serialize.config.entry.ListConfigEntry;
-import ru.gravit.launcher.serialize.config.entry.StringConfigEntry;
-import ru.gravit.launchserver.auth.MySQLSourceConfig;
-
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -16,7 +7,15 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import ru.gravit.launcher.HWID;
+import ru.gravit.launcher.OshiHWID;
+import ru.gravit.launcher.serialize.config.entry.BlockConfigEntry;
+import ru.gravit.launcher.serialize.config.entry.ListConfigEntry;
+import ru.gravit.launcher.serialize.config.entry.StringConfigEntry;
+import ru.gravit.launchserver.auth.MySQLSourceConfig;
+import ru.gravit.utils.helper.CommonHelper;
 import ru.gravit.utils.helper.LogHelper;
+import ru.gravit.utils.helper.VerifyHelper;
 
 public class MysqlHWIDHandler extends HWIDHandler {
     private final MySQLSourceConfig mySQLHolder;

LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/AcceptAuthProvider.java

@@ -1,10 +1,10 @@
 package ru.gravit.launchserver.auth.provider;
 
+import ru.gravit.launcher.serialize.config.entry.BlockConfigEntry;
 import ru.gravit.launcher.serialize.config.entry.BooleanConfigEntry;
 import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launchserver.auth.ClientPermissions;
 import ru.gravit.utils.helper.SecurityHelper;
-import ru.gravit.launcher.serialize.config.entry.BlockConfigEntry;
 
 public final class AcceptAuthProvider extends AuthProvider {
     private final boolean isAdminAccess;

LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/AuthProvider.java

@@ -5,12 +5,12 @@
 import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 
-import ru.gravit.launchserver.LaunchServer;
-import ru.gravit.launchserver.auth.handler.AuthHandler;
-import ru.gravit.utils.helper.VerifyHelper;
 import ru.gravit.launcher.serialize.config.ConfigObject;
 import ru.gravit.launcher.serialize.config.entry.BlockConfigEntry;
+import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launchserver.auth.AuthException;
+import ru.gravit.launchserver.auth.handler.AuthHandler;
+import ru.gravit.utils.helper.VerifyHelper;
 
 public abstract class AuthProvider extends ConfigObject implements AutoCloseable {
     private static final Map<String, ServerAdapter<AuthProvider>> AUTH_PROVIDERS = new ConcurrentHashMap<>(8);

LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/DigestAuthProvider.java

@@ -1,11 +1,11 @@
 package ru.gravit.launchserver.auth.provider;
 
-import ru.gravit.launchserver.LaunchServer;
-import ru.gravit.utils.helper.SecurityHelper;
-import ru.gravit.utils.helper.SecurityHelper.DigestAlgorithm;
 import ru.gravit.launcher.serialize.config.entry.BlockConfigEntry;
 import ru.gravit.launcher.serialize.config.entry.StringConfigEntry;
+import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launchserver.auth.AuthException;
+import ru.gravit.utils.helper.SecurityHelper;
+import ru.gravit.utils.helper.SecurityHelper.DigestAlgorithm;
 
 public abstract class DigestAuthProvider extends AuthProvider {
     private final DigestAlgorithm digest;

LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/FileAuthProvider.java

@@ -8,18 +8,18 @@
 import java.util.Map;
 import java.util.Set;
 
-import ru.gravit.launchserver.LaunchServer;
-import ru.gravit.utils.helper.CommonHelper;
-import ru.gravit.utils.helper.IOHelper;
-import ru.gravit.utils.helper.LogHelper;
-import ru.gravit.utils.helper.SecurityHelper;
-import ru.gravit.utils.helper.VerifyHelper;
 import ru.gravit.launcher.serialize.config.ConfigObject;
 import ru.gravit.launcher.serialize.config.TextConfigReader;
 import ru.gravit.launcher.serialize.config.entry.BlockConfigEntry;
 import ru.gravit.launcher.serialize.config.entry.ConfigEntry;
 import ru.gravit.launcher.serialize.config.entry.ConfigEntry.Type;
 import ru.gravit.launcher.serialize.config.entry.StringConfigEntry;
+import ru.gravit.launchserver.LaunchServer;
+import ru.gravit.utils.helper.CommonHelper;
+import ru.gravit.utils.helper.IOHelper;
+import ru.gravit.utils.helper.LogHelper;
+import ru.gravit.utils.helper.SecurityHelper;
+import ru.gravit.utils.helper.VerifyHelper;
 
 public final class FileAuthProvider extends DigestAuthProvider {
     private static final class Entry extends ConfigObject {

LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/JsonAuthProvider.java

@@ -5,13 +5,14 @@
 
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
+
+import ru.gravit.launcher.serialize.config.entry.BlockConfigEntry;
+import ru.gravit.launcher.serialize.config.entry.StringConfigEntry;
 import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launchserver.auth.ClientPermissions;
 import ru.gravit.utils.HTTPRequest;
 import ru.gravit.utils.helper.IOHelper;
 import ru.gravit.utils.helper.SecurityHelper;
-import ru.gravit.launcher.serialize.config.entry.BlockConfigEntry;
-import ru.gravit.launcher.serialize.config.entry.StringConfigEntry;
 
 public final class JsonAuthProvider extends AuthProvider {
     private final Gson gson = new Gson();

LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/MojangAuthProvider.java

@@ -8,9 +8,10 @@
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
+
+import ru.gravit.launcher.serialize.config.entry.BlockConfigEntry;
 import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.utils.HTTPRequest;
-import ru.gravit.launcher.serialize.config.entry.BlockConfigEntry;
 
 public final class MojangAuthProvider extends AuthProvider {
     private static final Pattern UUID_REGEX = Pattern.compile("(\\w{8})(\\w{4})(\\w{4})(\\w{4})(\\w{12})");

LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/MySQLAuthProvider.java

@@ -5,17 +5,17 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import ru.gravit.launcher.serialize.config.entry.BlockConfigEntry;
 import ru.gravit.launcher.serialize.config.entry.BooleanConfigEntry;
+import ru.gravit.launcher.serialize.config.entry.ListConfigEntry;
+import ru.gravit.launcher.serialize.config.entry.StringConfigEntry;
 import ru.gravit.launchserver.LaunchServer;
+import ru.gravit.launchserver.auth.AuthException;
 import ru.gravit.launchserver.auth.ClientPermissions;
+import ru.gravit.launchserver.auth.MySQLSourceConfig;
 import ru.gravit.utils.helper.CommonHelper;
 import ru.gravit.utils.helper.SecurityHelper;
 import ru.gravit.utils.helper.VerifyHelper;
-import ru.gravit.launcher.serialize.config.entry.BlockConfigEntry;
-import ru.gravit.launcher.serialize.config.entry.ListConfigEntry;
-import ru.gravit.launcher.serialize.config.entry.StringConfigEntry;
-import ru.gravit.launchserver.auth.AuthException;
-import ru.gravit.launchserver.auth.MySQLSourceConfig;
 
 public final class MySQLAuthProvider extends AuthProvider {
     private final MySQLSourceConfig mySQLHolder;

LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/NullAuthProvider.java

@@ -3,9 +3,9 @@
 import java.io.IOException;
 import java.util.Objects;
 
+import ru.gravit.launcher.serialize.config.entry.BlockConfigEntry;
 import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.utils.helper.VerifyHelper;
-import ru.gravit.launcher.serialize.config.entry.BlockConfigEntry;
 
 public final class NullAuthProvider extends AuthProvider {
     private volatile AuthProvider provider;

LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/RejectAuthProvider.java

@@ -1,10 +1,10 @@
 package ru.gravit.launchserver.auth.provider;
 
-import ru.gravit.launchserver.LaunchServer;
-import ru.gravit.utils.helper.VerifyHelper;
 import ru.gravit.launcher.serialize.config.entry.BlockConfigEntry;
 import ru.gravit.launcher.serialize.config.entry.StringConfigEntry;
+import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launchserver.auth.AuthException;
+import ru.gravit.utils.helper.VerifyHelper;
 
 public final class RejectAuthProvider extends AuthProvider {
     private final String message;

LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/RequestAuthProvider.java

@@ -5,14 +5,14 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import ru.gravit.launcher.serialize.config.entry.BlockConfigEntry;
 import ru.gravit.launcher.serialize.config.entry.BooleanConfigEntry;
+import ru.gravit.launcher.serialize.config.entry.StringConfigEntry;
 import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launchserver.auth.ClientPermissions;
 import ru.gravit.utils.helper.CommonHelper;
 import ru.gravit.utils.helper.IOHelper;
 import ru.gravit.utils.helper.SecurityHelper;
-import ru.gravit.launcher.serialize.config.entry.BlockConfigEntry;
-import ru.gravit.launcher.serialize.config.entry.StringConfigEntry;
 
 public final class RequestAuthProvider extends AuthProvider {
     private final String url;

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

@@ -1,21 +1,23 @@
 package ru.gravit.launchserver.binary;
 
-import ru.gravit.utils.helper.IOHelper;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Set;
-import java.util.jar.JarInputStream;
 import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
 
+import ru.gravit.utils.helper.IOHelper;
+
 public class BuildContext {
     public final ZipOutputStream output;
     public final JAConfigurator config;
+    public final JARLauncherBinary data;
 
-    public BuildContext(ZipOutputStream output, JAConfigurator config) {
+    public BuildContext(ZipOutputStream output, JAConfigurator config, JARLauncherBinary data) {
         this.output = output;
         this.config = config;
+        this.data = data;
     }
 
     public void pushFile(String filename, InputStream inputStream) throws IOException {
@@ -24,7 +26,7 @@ public void pushFile(String filename, InputStream inputStream) throws IOExceptio
         IOHelper.transfer(inputStream, output);
     }
 
-    public void pushJarFile(JarInputStream input) throws IOException {
+    public void pushJarFile(ZipInputStream input) throws IOException {
         ZipEntry e = input.getNextEntry();
         while (e != null) {
             output.putNextEntry(e);
@@ -33,7 +35,7 @@ public void pushJarFile(JarInputStream input) throws IOException {
         }
     }
 
-    public void pushJarFile(JarInputStream input, Set<String> blacklist) throws IOException {
+    public void pushJarFile(ZipInputStream input, Set<String> blacklist) throws IOException {
         ZipEntry e = input.getNextEntry();
         while (e != null) {
             if (blacklist.contains(e.getName())) {

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

@@ -3,10 +3,6 @@
 import java.io.IOException;
 import java.nio.file.Path;
 
-import ru.gravit.launcher.Launcher;
-import ru.gravit.utils.helper.IOHelper;
-import ru.gravit.utils.helper.LogHelper;
-import ru.gravit.launchserver.LaunchServer;
 import net.sf.launch4j.Builder;
 import net.sf.launch4j.Log;
 import net.sf.launch4j.config.Config;
@@ -14,6 +10,10 @@
 import net.sf.launch4j.config.Jre;
 import net.sf.launch4j.config.LanguageID;
 import net.sf.launch4j.config.VersionInfo;
+import ru.gravit.launcher.Launcher;
+import ru.gravit.launchserver.LaunchServer;
+import ru.gravit.utils.helper.IOHelper;
+import ru.gravit.utils.helper.LogHelper;
 
 public final class EXEL4JLauncherBinary extends LauncherBinary {
     private final static class Launch4JLog extends Log {
@@ -32,8 +32,7 @@ public void clear() {
 
     // URL constants
     private static final String DOWNLOAD_URL = "http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html"; // Oracle
-    // JRE
+    // JRE 8
-    // 8
 
     // File constants
     private final Path faviconFile;

LaunchServer/src/main/java/ru/gravit/launchserver/binary/EXELauncherBinary.java

@@ -3,9 +3,9 @@
 import java.io.IOException;
 import java.nio.file.Files;
 
+import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.utils.helper.IOHelper;
 import ru.gravit.utils.helper.LogHelper;
-import ru.gravit.launchserver.LaunchServer;
 
 public class EXELauncherBinary extends LauncherBinary {
 

LaunchServer/src/main/java/ru/gravit/launchserver/binary/JAConfigurator.java

@@ -1,21 +1,29 @@
-package ru.gravit.launchserver.binary;
+	package ru.gravit.launchserver.binary;
 
 import java.io.IOException;
 
-import javassist.*;
+import javassist.CannotCompileException;
+import javassist.ClassPool;
+import javassist.CtClass;
+import javassist.CtConstructor;
+import javassist.CtMethod;
+import javassist.NotFoundException;
 
 public class JAConfigurator implements AutoCloseable {
-    ClassPool pool = ClassPool.getDefault();
+    public ClassPool pool;
-    CtClass ctClass;
+    public CtClass ctClass;
-    CtConstructor ctConstructor;
+    public CtConstructor ctConstructor;
-    CtMethod initModuleMethod;
+    public CtMethod initModuleMethod;
     String classname;
     StringBuilder body;
     StringBuilder moduleBody;
     int autoincrement;
 
-    public JAConfigurator(Class<?> configclass) throws NotFoundException {
+    public JAConfigurator(String configclass, JARLauncherBinary jarLauncherBinary) throws NotFoundException {
-        classname = configclass.getName();
+    	pool = new ClassPool(false);
+    	pool.insertClassPath(jarLauncherBinary.cleanJar.toFile().getAbsolutePath());
+    	pool.appendSystemPath();
+        classname = configclass;
         ctClass = pool.get(classname);
         ctConstructor = ctClass.getDeclaredConstructor(null);
         initModuleMethod = ctClass.getDeclaredMethod("initModules");

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

@@ -5,13 +5,16 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.nio.file.*;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipException;
 import java.util.zip.ZipInputStream;
@@ -19,25 +22,26 @@
 
 import javassist.CannotCompileException;
 import javassist.NotFoundException;
+import proguard.Configuration;
+import proguard.ConfigurationParser;
+import proguard.ParseException;
+import proguard.ProGuard;
 import ru.gravit.launcher.AutogenConfig;
 import ru.gravit.launcher.Launcher;
 import ru.gravit.launcher.LauncherConfig;
+import ru.gravit.launcher.serialize.HOutput;
+import ru.gravit.launchserver.LaunchServer;
+import ru.gravit.launchserver.asm.ClassMetadataReader;
+import ru.gravit.launchserver.manangers.BuildHookManager.ZipBuildHook;
 import ru.gravit.utils.helper.CommonHelper;
 import ru.gravit.utils.helper.IOHelper;
 import ru.gravit.utils.helper.LogHelper;
 import ru.gravit.utils.helper.SecurityHelper;
 import ru.gravit.utils.helper.SecurityHelper.DigestAlgorithm;
-import ru.gravit.launcher.serialize.HOutput;
+import ru.gravit.utils.helper.UnpackHelper;
-import ru.gravit.launchserver.LaunchServer;
-import proguard.Configuration;
-import proguard.ConfigurationParser;
-import proguard.ParseException;
-import proguard.ProGuard;
 
 public final class JARLauncherBinary extends LauncherBinary {
 
-    public static final String[] guardFileList = {"Avanguard64.dll", "Avanguard32.dll", "wrapper64.exe", "wrapper32.exe"};
-
 	private final class RuntimeDirVisitor extends SimpleFileVisitor<Path> {
 		private final ZipOutputStream output;
 		private final Map<String, byte[]> runtime;
@@ -108,32 +112,33 @@ private static ZipEntry newGuardEntry(String fileName) {
 		return newZipEntry(Launcher.GUARD_DIR + IOHelper.CROSS_SEPARATOR + fileName);
 	}
 
-
+	public final Path cleanJar;
 	public final Path runtimeDir;
 	public final Path guardDir;
-
-
 	public final Path initScriptFile;
-
-
 	public final Path obfJar;
-
+	public final Path obfOutJar;
+	public ClassMetadataReader reader;
 
 	public JARLauncherBinary(LaunchServer server) throws IOException {
-        super(server, server.dir.resolve(server.config.binaryName + ".jar"),
+		super(server, server.dir.resolve(server.config.binaryName + "-nonObf.jar"),
-                server.dir.resolve(server.config.binaryName + "-obf.jar"));
+				server.dir.resolve(server.config.binaryName + ".jar"));
 		runtimeDir = server.dir.resolve(Launcher.RUNTIME_DIR);
-        guardDir = server.dir.resolve("guard");
+		guardDir = server.dir.resolve(Launcher.GUARD_DIR);
 		initScriptFile = runtimeDir.resolve(Launcher.INIT_SCRIPT_FILE);
-        obfJar = syncBinaryFile;
+		obfJar = server.dir.resolve(server.config.binaryName + "-obfed.jar");
-        tryUnpackRuntime();
+		obfOutJar = server.config.buildPostTransform.enabled ? server.dir.resolve(server.config.binaryName + "-obf.jar")
-        tryUnpackGuard();
+				: syncBinaryFile;
+		cleanJar = server.dir.resolve(server.config.binaryName + "-clean.jar");
+		reader = new ClassMetadataReader();
+		UnpackHelper.unpack(IOHelper.getResourceURL("Launcher.jar"), cleanJar);
+		reader.getCp().add(new JarFile(cleanJar.toFile()));
+		tryUnpack();
 	}
 
 	@Override
 	public void build() throws IOException {
-        tryUnpackRuntime();
+		tryUnpack();
-        tryUnpackGuard();
 
 		// Build launcher binary
 		LogHelper.info("Building launcher binary file");
@@ -141,8 +146,7 @@ public void build() throws IOException {
 
 		// ProGuard
 		Configuration proguard_cfg = new Configuration();
-        ConfigurationParser parser = new ConfigurationParser(
+		ConfigurationParser parser = new ConfigurationParser(server.proguardConf.confStrs.toArray(new String[0]),
-                server.proguardConf.confStrs.toArray(new String[0]),
 				server.proguardConf.proguard.toFile(), System.getProperties());
 		try {
 			parser.parse(proguard_cfg);
@@ -151,26 +155,22 @@ public void build() throws IOException {
 		} catch (ParseException e1) {
 			e1.printStackTrace();
 		}
-        if (server.buildHookManager.isNeedPostProguardHook()) {
+		for (Runnable r : server.buildHookManager.getPostProguardRunHooks())
-            Path obfPath = Paths.get(server.config.binaryName + "-obf.jar");
+			r.run();
-            Path tmpPath = Paths.get(server.config.binaryName + "-tmp.jar");
+		try (ZipInputStream input = new ZipInputStream(IOHelper.newInput(obfJar));
-            IOHelper.move(obfPath, tmpPath);
+				ZipOutputStream output = new ZipOutputStream(IOHelper.newOutput(obfOutJar))) {
-            try (ZipOutputStream output = new ZipOutputStream(IOHelper.newOutput(obfPath))) {
-                try (ZipInputStream input = new ZipInputStream(
-                        IOHelper.newInput(tmpPath))) {
 			ZipEntry e = input.getNextEntry();
 			while (e != null) {
 				String filename = e.getName();
-                        output.putNextEntry(e);
+				output.putNextEntry(IOHelper.newZipEntry(e.getName()));
 				if (filename.endsWith(".class")) {
-                            CharSequence classname = filename.replace('/', '.').subSequence(0,
+					String classname = filename.replace('/', '.').substring(0, filename.length() - ".class".length());
-                                    filename.length() - ".class".length());
 					byte[] bytes;
 					try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream(2048)) {
 						IOHelper.transfer(input, outputStream);
 						bytes = outputStream.toByteArray();
 					}
-                            bytes = server.buildHookManager.proGuardClassTransform(bytes, classname);
+					bytes = server.buildHookManager.proGuardClassTransform(bytes, classname, this);
 					try (ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes)) {
 						IOHelper.transfer(inputStream, output);
 					}
@@ -178,8 +178,8 @@ public void build() throws IOException {
 					IOHelper.transfer(input, output);
 				e = input.getNextEntry();
 			}
-                }
+			for (ZipBuildHook h : server.buildHookManager.getProguardBuildHooks())
-            }
+				h.build(output);
 		}
 		if (server.config.buildPostTransform.enabled)
 			transformedBuild();
@@ -187,7 +187,9 @@ public void build() throws IOException {
 
 	private void transformedBuild() throws IOException {
 		List<String> cmd = new ArrayList<>(1);
-    	server.config.buildPostTransform.script.forEach(v -> CommonHelper.replace(v, "launcher-output", IOHelper.toAbsPathString(syncBinaryFile), "launcher-obf", IOHelper.toAbsPathString(obfJar), "launcher-nonObf", IOHelper.toAbsPathString(binaryFile)));
+		for (String v : server.config.buildPostTransform.script)
+			cmd.add(CommonHelper.replace(v, "launcher-output", IOHelper.toAbsPathString(syncBinaryFile), "launcher-obf",
+					IOHelper.toAbsPathString(obfJar), "launcher-nonObf", IOHelper.toAbsPathString(binaryFile)));
 		ProcessBuilder builder = new ProcessBuilder();
 		builder.directory(IOHelper.toAbsPath(server.dir).toFile());
 		builder.inheritIO();
@@ -202,8 +204,9 @@ private void transformedBuild() throws IOException {
 
 	private void stdBuild() throws IOException {
 		try (ZipOutputStream output = new ZipOutputStream(IOHelper.newOutput(binaryFile));
-             JAConfigurator jaConfigurator = new JAConfigurator(AutogenConfig.class)) {
+				JAConfigurator jaConfigurator = new JAConfigurator(AutogenConfig.class.getName(), this)) {
-            BuildContext context = new BuildContext(output, jaConfigurator);
+			jaConfigurator.pool.insertClassPath(cleanJar.toFile().getAbsolutePath());
+			BuildContext context = new BuildContext(output, jaConfigurator, this);
 			server.buildHookManager.preHook(context);
 			jaConfigurator.setAddress(server.config.getAddress());
 			jaConfigurator.setPort(server.config.port);
@@ -213,8 +216,7 @@ private void stdBuild() throws IOException {
 			jaConfigurator.setUsingWrapper(server.config.isUsingWrapper);
 			jaConfigurator.setDownloadJava(server.config.isDownloadJava);
 			server.buildHookManager.registerAllClientModuleClass(jaConfigurator);
-            try (ZipInputStream input = new ZipInputStream(
+			try (ZipInputStream input = new ZipInputStream(IOHelper.newInput(cleanJar))) {
-                    IOHelper.newInput(IOHelper.getResourceURL("Launcher.jar")))) {
 				ZipEntry e = input.getNextEntry();
 				while (e != null) {
 					String filename = e.getName();
@@ -223,34 +225,33 @@ private void stdBuild() throws IOException {
 						continue;
 					}
 					try {
-                        output.putNextEntry(e);
+						output.putNextEntry(IOHelper.newZipEntry(e.getName()));
 					} catch (ZipException ex) {
 						LogHelper.error(ex);
 						e = input.getNextEntry();
 						continue;
 					}
 					if (filename.endsWith(".class")) {
-                        CharSequence classname = filename.replace('/', '.').subSequence(0,
+						String classname = filename.replace('/', '.').substring(0,
 								filename.length() - ".class".length());
 						byte[] bytes;
 						try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream(2048)) {
 							IOHelper.transfer(input, outputStream);
 							bytes = outputStream.toByteArray();
 						}
-                        bytes = server.buildHookManager.classTransform(bytes, classname);
+						bytes = server.buildHookManager.classTransform(bytes, classname, this);
 						try (ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes)) {
 							IOHelper.transfer(inputStream, output);
 						}
 					} else
 						IOHelper.transfer(input, output);
-                    // }
 					e = input.getNextEntry();
 				}
 			}
 			// write additional classes
 			for (Entry<String, byte[]> ent : server.buildHookManager.getIncludeClass().entrySet()) {
 				output.putNextEntry(newZipEntry(ent.getKey().replace('.', '/').concat(".class")));
-                output.write(server.buildHookManager.classTransform(ent.getValue(), ent.getKey()));
+				output.write(server.buildHookManager.classTransform(ent.getValue(), ent.getKey(), this));
 			}
 			// map for guard
 			Map<String, byte[]> runtime = new HashMap<>(256);
@@ -260,7 +261,7 @@ private void stdBuild() throws IOException {
 					throw new IOException(String.format("Missing init script file ('%s')", Launcher.INIT_SCRIPT_FILE));
 				// Write launcher guard dir
 				IOHelper.walk(runtimeDir, new RuntimeDirVisitor(output, runtime), false);
-                //IOHelper.walk(guardDir, new GuardDirVisitor(output, runtime), false);
+				// IOHelper.walk(guardDir, new GuardDirVisitor(output, runtime), false);
 			}
 			// Create launcher config file
 			byte[] launcherConfigBytes;
@@ -285,44 +286,9 @@ private void stdBuild() throws IOException {
 		}
 	}
 
-
+	public void tryUnpack() throws IOException {
-    public void tryUnpackRuntime() throws IOException {
+		LogHelper.info("Unpacking launcher native guard files and runtime");
-        // Verify is guard dir unpacked
+		UnpackHelper.unpackZipNoCheck("guard.zip", guardDir);
-        if (IOHelper.isDir(runtimeDir))
+		UnpackHelper.unpackZipNoCheck("runtime.zip", runtimeDir);
-            return; // Already unpacked
-
-        // Unpack launcher guard files
-        Files.createDirectory(runtimeDir);
-        LogHelper.info("Unpacking launcher runtime files");
-        if (Launcher.class.getResource("/runtime.zip") == null) return;
-        try (ZipInputStream input = IOHelper.newZipInput(IOHelper.getResourceURL("runtime.zip"))) {
-            for (ZipEntry entry = input.getNextEntry(); entry != null; entry = input.getNextEntry()) {
-                if (entry.isDirectory())
-                    continue; // Skip dirs
-
-                // Unpack guard file
-                IOHelper.transfer(input, runtimeDir.resolve(IOHelper.toPath(entry.getName())));
-            }
-        }
-    }
-
-    public void tryUnpackGuard() throws IOException {
-        // Verify is guard dir unpacked
-        if (IOHelper.isDir(guardDir))
-            return; // Already unpacked
-
-        // Unpack launcher guard files
-        Files.createDirectory(guardDir);
-        LogHelper.info("Unpacking launcher native guard files");
-        if (Launcher.class.getResource("/guard.zip") == null) return;
-        try (ZipInputStream input = IOHelper.newZipInput(IOHelper.getResourceURL("guard.zip"))) {
-            for (ZipEntry entry = input.getNextEntry(); entry != null; entry = input.getNextEntry()) {
-                if (entry.isDirectory())
-                    continue; // Skip dirs
-
-                // Unpack guard file
-                IOHelper.transfer(input, guardDir.resolve(IOHelper.toPath(entry.getName())));
-            }
-        }
 	}
 }

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

@@ -4,16 +4,16 @@
 import java.nio.file.Path;
 
 import ru.gravit.launcher.serialize.signed.DigestBytesHolder;
-import ru.gravit.utils.helper.IOHelper;
 import ru.gravit.launchserver.LaunchServer;
+import ru.gravit.utils.helper.IOHelper;
 import ru.gravit.utils.helper.SecurityHelper;
 
 public abstract class LauncherBinary {
 
-    protected final LaunchServer server;
+    public final LaunchServer server;
 
-    protected final Path binaryFile;
+    public final Path binaryFile;
-    protected final Path syncBinaryFile;
+    public final Path syncBinaryFile;
     private volatile DigestBytesHolder binary;
     private volatile byte[] sign;
 

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

@@ -2,8 +2,8 @@
 
 import java.util.UUID;
 
-import ru.gravit.utils.helper.VerifyHelper;
 import ru.gravit.launchserver.LaunchServer;
+import ru.gravit.utils.helper.VerifyHelper;
 
 public abstract class Command {
 

LaunchServer/src/main/java/ru/gravit/launchserver/command/auth/AuthCommand.java

@@ -2,11 +2,11 @@
 
 import java.util.UUID;
 
-import ru.gravit.launchserver.auth.provider.AuthProvider;
-import ru.gravit.utils.helper.LogHelper;
 import ru.gravit.launchserver.LaunchServer;
+import ru.gravit.launchserver.auth.provider.AuthProvider;
 import ru.gravit.launchserver.auth.provider.AuthProviderResult;
 import ru.gravit.launchserver.command.Command;
+import ru.gravit.utils.helper.LogHelper;
 
 public final class AuthCommand extends Command {
     public AuthCommand(LaunchServer server) {

LaunchServer/src/main/java/ru/gravit/launchserver/command/auth/BanCommand.java

@@ -2,8 +2,8 @@
 
 import java.util.List;
 
-import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launcher.HWID;
+import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launchserver.command.Command;
 
 public class BanCommand extends Command {

LaunchServer/src/main/java/ru/gravit/launchserver/command/auth/UUIDToUsernameCommand.java

@@ -3,10 +3,10 @@
 import java.io.IOException;
 import java.util.UUID;
 
-import ru.gravit.utils.helper.LogHelper;
 import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launchserver.command.Command;
 import ru.gravit.launchserver.command.CommandException;
+import ru.gravit.utils.helper.LogHelper;
 
 public final class UUIDToUsernameCommand extends Command {
     public UUIDToUsernameCommand(LaunchServer server) {

LaunchServer/src/main/java/ru/gravit/launchserver/command/auth/UnbanCommand.java

@@ -2,8 +2,8 @@
 
 import java.util.List;
 
-import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launcher.HWID;
+import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launchserver.command.Command;
 
 public class UnbanCommand extends Command {

LaunchServer/src/main/java/ru/gravit/launchserver/command/auth/UsernameToUUIDCommand.java

@@ -3,10 +3,10 @@
 import java.io.IOException;
 import java.util.UUID;
 
-import ru.gravit.utils.helper.LogHelper;
 import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launchserver.command.Command;
 import ru.gravit.launchserver.command.CommandException;
+import ru.gravit.utils.helper.LogHelper;
 
 public final class UsernameToUUIDCommand extends Command {
     public UsernameToUUIDCommand(LaunchServer server) {

LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/ClearCommand.java

@@ -1,8 +1,8 @@
 package ru.gravit.launchserver.command.basic;
 
-import ru.gravit.utils.helper.LogHelper;
 import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launchserver.command.Command;
+import ru.gravit.utils.helper.LogHelper;
 
 public final class ClearCommand extends Command {
     public ClearCommand(LaunchServer server) {

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

@@ -1,8 +1,8 @@
 package ru.gravit.launchserver.command.basic;
 
-import ru.gravit.utils.helper.LogHelper;
 import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launchserver.command.Command;
+import ru.gravit.utils.helper.LogHelper;
 
 public final class DebugCommand extends Command {
     public DebugCommand(LaunchServer server) {

LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/GCCommand.java

@@ -1,10 +1,10 @@
 package ru.gravit.launchserver.command.basic;
 
-import ru.gravit.utils.helper.JVMHelper;
-import ru.gravit.utils.helper.LogHelper;
 import ru.gravit.launcher.managers.GarbageManager;
 import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launchserver.command.Command;
+import ru.gravit.utils.helper.JVMHelper;
+import ru.gravit.utils.helper.LogHelper;
 
 public final class GCCommand extends Command {
     public GCCommand(LaunchServer server) {

LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/HelpCommand.java

@@ -2,10 +2,10 @@
 
 import java.util.Map.Entry;
 
-import ru.gravit.utils.helper.LogHelper;
 import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launchserver.command.Command;
 import ru.gravit.launchserver.command.CommandException;
+import ru.gravit.utils.helper.LogHelper;
 
 public final class HelpCommand extends Command {
     private static void printCommand(String name, Command command) {

LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/LogConnectionsCommand.java

@@ -1,8 +1,8 @@
 package ru.gravit.launchserver.command.basic;
 
-import ru.gravit.utils.helper.LogHelper;
 import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launchserver.command.Command;
+import ru.gravit.utils.helper.LogHelper;
 
 public final class LogConnectionsCommand extends Command {
     public LogConnectionsCommand(LaunchServer server) {

LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/StopCommand.java

@@ -1,8 +1,8 @@
 package ru.gravit.launchserver.command.basic;
 
-import ru.gravit.utils.helper.JVMHelper;
 import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launchserver.command.Command;
+import ru.gravit.utils.helper.JVMHelper;
 
 public final class StopCommand extends Command {
     public StopCommand(LaunchServer server) {

LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/VersionCommand.java

@@ -1,9 +1,9 @@
 package ru.gravit.launchserver.command.basic;
 
 import ru.gravit.launcher.Launcher;
-import ru.gravit.utils.helper.LogHelper;
 import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launchserver.command.Command;
+import ru.gravit.utils.helper.LogHelper;
 
 public final class VersionCommand extends Command {
     public VersionCommand(LaunchServer server) {

LaunchServer/src/main/java/ru/gravit/launchserver/command/handler/CommandHandler.java

@@ -11,9 +11,6 @@
 import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 
-import ru.gravit.launchserver.command.basic.*;
-import ru.gravit.utils.helper.LogHelper;
-import ru.gravit.utils.helper.VerifyHelper;
 import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launchserver.command.Command;
 import ru.gravit.launchserver.command.CommandException;
@@ -22,6 +19,19 @@
 import ru.gravit.launchserver.command.auth.UUIDToUsernameCommand;
 import ru.gravit.launchserver.command.auth.UnbanCommand;
 import ru.gravit.launchserver.command.auth.UsernameToUUIDCommand;
+import ru.gravit.launchserver.command.basic.BuildCommand;
+import ru.gravit.launchserver.command.basic.ClearCommand;
+import ru.gravit.launchserver.command.basic.DebugCommand;
+import ru.gravit.launchserver.command.basic.GCCommand;
+import ru.gravit.launchserver.command.basic.HelpCommand;
+import ru.gravit.launchserver.command.basic.LogConnectionsCommand;
+import ru.gravit.launchserver.command.basic.ProguardCleanCommand;
+import ru.gravit.launchserver.command.basic.RebindCommand;
+import ru.gravit.launchserver.command.basic.RegenProguardDictCommand;
+import ru.gravit.launchserver.command.basic.RemoveMappingsProguardCommand;
+import ru.gravit.launchserver.command.basic.StopCommand;
+import ru.gravit.launchserver.command.basic.TestCommand;
+import ru.gravit.launchserver.command.basic.VersionCommand;
 import ru.gravit.launchserver.command.hash.DownloadAssetCommand;
 import ru.gravit.launchserver.command.hash.DownloadClientCommand;
 import ru.gravit.launchserver.command.hash.IndexAssetCommand;
@@ -31,6 +41,8 @@
 import ru.gravit.launchserver.command.hash.UnindexAssetCommand;
 import ru.gravit.launchserver.command.modules.LoadModuleCommand;
 import ru.gravit.launchserver.command.modules.ModulesCommand;
+import ru.gravit.utils.helper.LogHelper;
+import ru.gravit.utils.helper.VerifyHelper;
 
 public abstract class CommandHandler implements Runnable {
     private static String[] parse(CharSequence line) throws CommandException {

LaunchServer/src/main/java/ru/gravit/launchserver/command/handler/JLineCommandHandler.java

@@ -3,9 +3,9 @@
 import java.io.IOException;
 
 import jline.console.ConsoleReader;
+import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.utils.helper.LogHelper;
 import ru.gravit.utils.helper.LogHelper.Output;
-import ru.gravit.launchserver.LaunchServer;
 
 public final class JLineCommandHandler extends CommandHandler {
     private final class JLineOutput implements Output {

LaunchServer/src/main/java/ru/gravit/launchserver/command/handler/StdCommandHandler.java

@@ -3,8 +3,8 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 
-import ru.gravit.utils.helper.IOHelper;
 import ru.gravit.launchserver.LaunchServer;
+import ru.gravit.utils.helper.IOHelper;
 
 public final class StdCommandHandler extends CommandHandler {
     private final BufferedReader reader;

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

@@ -4,12 +4,12 @@
 import java.nio.file.Path;
 import java.util.Collections;
 
-import ru.gravit.utils.HttpDownloader;
-import ru.gravit.utils.helper.IOHelper;
-import ru.gravit.utils.helper.LogHelper;
 import ru.gravit.launcher.profiles.ClientProfile.Version;
 import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launchserver.command.Command;
+import ru.gravit.utils.HttpDownloader;
+import ru.gravit.utils.helper.IOHelper;
+import ru.gravit.utils.helper.LogHelper;
 
 public final class DownloadAssetCommand extends Command {
 

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

@@ -7,9 +7,6 @@
 import java.nio.file.Path;
 import java.util.Collections;
 
-import ru.gravit.utils.HttpDownloader;
-import ru.gravit.utils.helper.IOHelper;
-import ru.gravit.utils.helper.LogHelper;
 import ru.gravit.launcher.profiles.ClientProfile;
 import ru.gravit.launcher.profiles.ClientProfile.Version;
 import ru.gravit.launcher.serialize.config.TextConfigReader;
@@ -18,6 +15,9 @@
 import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launchserver.command.Command;
 import ru.gravit.launchserver.command.CommandException;
+import ru.gravit.utils.HttpDownloader;
+import ru.gravit.utils.helper.IOHelper;
+import ru.gravit.utils.helper.LogHelper;
 
 public final class DownloadClientCommand extends Command {
 

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

@@ -11,13 +11,14 @@
 
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
+
+import ru.gravit.launchserver.LaunchServer;
+import ru.gravit.launchserver.command.Command;
+import ru.gravit.launchserver.command.CommandException;
 import ru.gravit.utils.helper.IOHelper;
 import ru.gravit.utils.helper.LogHelper;
 import ru.gravit.utils.helper.SecurityHelper;
 import ru.gravit.utils.helper.SecurityHelper.DigestAlgorithm;
-import ru.gravit.launchserver.LaunchServer;
-import ru.gravit.launchserver.command.Command;
-import ru.gravit.launchserver.command.CommandException;
 
 public final class IndexAssetCommand extends Command {
     private static Gson gson = new Gson();

LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/SyncBinariesCommand.java

@@ -2,9 +2,9 @@
 
 import java.io.IOException;
 
-import ru.gravit.utils.helper.LogHelper;
 import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launchserver.command.Command;
+import ru.gravit.utils.helper.LogHelper;
 
 public final class SyncBinariesCommand extends Command {
     public SyncBinariesCommand(LaunchServer server) {

LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/SyncProfilesCommand.java

@@ -2,9 +2,9 @@
 
 import java.io.IOException;
 
-import ru.gravit.utils.helper.LogHelper;
 import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launchserver.command.Command;
+import ru.gravit.utils.helper.LogHelper;
 
 public final class SyncProfilesCommand extends Command {
     public SyncProfilesCommand(LaunchServer server) {

LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/SyncUpdatesCommand.java

@@ -5,9 +5,9 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import ru.gravit.utils.helper.LogHelper;
 import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launchserver.command.Command;
+import ru.gravit.utils.helper.LogHelper;
 
 public final class SyncUpdatesCommand extends Command {
     public SyncUpdatesCommand(LaunchServer server) {

LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/UnindexAssetCommand.java

@@ -6,12 +6,15 @@
 import java.util.Collections;
 import java.util.Map;
 
-import com.google.gson.*;
+import com.google.gson.JsonElement;
-import ru.gravit.utils.helper.IOHelper;
+import com.google.gson.JsonObject;
-import ru.gravit.utils.helper.LogHelper;
+import com.google.gson.JsonParser;
+
 import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launchserver.command.Command;
 import ru.gravit.launchserver.command.CommandException;
+import ru.gravit.utils.helper.IOHelper;
+import ru.gravit.utils.helper.LogHelper;
 
 public final class UnindexAssetCommand extends Command {
     private static JsonParser parser = new JsonParser();

LaunchServer/src/main/java/ru/gravit/launchserver/fileserver/FileServerHandler.java

@@ -1,5 +1,32 @@
 package ru.gravit.launchserver.fileserver;
 
+import static io.netty.handler.codec.http.HttpMethod.GET;
+import static io.netty.handler.codec.http.HttpResponseStatus.BAD_REQUEST;
+import static io.netty.handler.codec.http.HttpResponseStatus.FORBIDDEN;
+import static io.netty.handler.codec.http.HttpResponseStatus.FOUND;
+import static io.netty.handler.codec.http.HttpResponseStatus.INTERNAL_SERVER_ERROR;
+import static io.netty.handler.codec.http.HttpResponseStatus.METHOD_NOT_ALLOWED;
+import static io.netty.handler.codec.http.HttpResponseStatus.NOT_FOUND;
+import static io.netty.handler.codec.http.HttpResponseStatus.NOT_MODIFIED;
+import static io.netty.handler.codec.http.HttpResponseStatus.OK;
+import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.RandomAccessFile;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.nio.file.Path;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Locale;
+import java.util.TimeZone;
+import java.util.regex.Pattern;
+
+import javax.activation.MimetypesFileTypeMap;
+
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelFuture;
@@ -15,34 +42,15 @@
 import io.netty.handler.codec.http.FullHttpResponse;
 import io.netty.handler.codec.http.HttpChunkedInput;
 import io.netty.handler.codec.http.HttpHeaderNames;
-import io.netty.handler.codec.http.HttpUtil;
 import io.netty.handler.codec.http.HttpHeaderValues;
 import io.netty.handler.codec.http.HttpResponse;
 import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpUtil;
 import io.netty.handler.codec.http.LastHttpContent;
 import io.netty.handler.ssl.SslHandler;
 import io.netty.handler.stream.ChunkedFile;
 import io.netty.util.CharsetUtil;
 
-import javax.activation.MimetypesFileTypeMap;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.RandomAccessFile;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.nio.file.Path;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Locale;
-import java.util.TimeZone;
-import java.util.regex.Pattern;
-
-import static io.netty.handler.codec.http.HttpMethod.*;
-import static io.netty.handler.codec.http.HttpResponseStatus.*;
-import static io.netty.handler.codec.http.HttpVersion.*;
-
 public class FileServerHandler extends SimpleChannelInboundHandler<FullHttpRequest> {
 
     public static final String HTTP_DATE_FORMAT = "EEE, dd MMM yyyy HH:mm:ss zzz";

LaunchServer/src/main/java/ru/gravit/launchserver/manangers/BuildHookManager.java

@@ -4,41 +4,49 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.zip.ZipOutputStream;
 
 import ru.gravit.launcher.AutogenConfig;
 import ru.gravit.launcher.modules.TestClientModule;
 import ru.gravit.launchserver.binary.BuildContext;
 import ru.gravit.launchserver.binary.JAConfigurator;
+import ru.gravit.launchserver.binary.JARLauncherBinary;
 
 public class BuildHookManager {
     @FunctionalInterface
-    public interface PostBuildHook {
+    public static interface ZipBuildHook {
+        void build(ZipOutputStream context);
+    }
+
+    @FunctionalInterface
+    public static interface BuildHook {
         void build(BuildContext context);
     }
 
     @FunctionalInterface
-    public interface PreBuildHook {
+    public static interface Transformer {
-        void build(BuildContext context);
+        byte[] transform(byte[] input, String classname, JARLauncherBinary data);
-    }
-
-    @FunctionalInterface
-    public interface Transformer {
-        byte[] transform(byte[] input, CharSequence classname);
     }
 
     private boolean BUILDRUNTIME;
-    private final Set<PostBuildHook> POST_HOOKS;
+    private final Set<BuildHook> POST_HOOKS;
+    private final Set<Runnable> POST_PROGUARDRUN_HOOKS;
     private final Set<Transformer> POST_PROGUARD_HOOKS;
-    private final Set<PreBuildHook> PRE_HOOKS;
+    private final Set<BuildHook> PRE_HOOKS;
+    private final Set<ZipBuildHook> POST_PROGUARD_BUILDHOOKS;
     private final Set<Transformer> CLASS_TRANSFORMER;
     private final Set<String> CLASS_BLACKLIST;
     private final Set<String> MODULE_CLASS;
     private final Map<String, byte[]> INCLUDE_CLASS;
+    private final NodeTransformer noder;
+    private final NodeTransformer proguardNoder;
 
     public BuildHookManager() {
         POST_HOOKS = new HashSet<>(4);
+        POST_PROGUARDRUN_HOOKS = new HashSet<>(4);
         POST_PROGUARD_HOOKS = new HashSet<>(4);
         PRE_HOOKS = new HashSet<>(4);
+        POST_PROGUARD_BUILDHOOKS = new HashSet<>(4);
         CLASS_BLACKLIST = new HashSet<>(4);
         MODULE_CLASS = new HashSet<>(4);
         INCLUDE_CLASS = new HashMap<>(4);
@@ -49,6 +57,34 @@ public BuildHookManager() {
         registerIgnoredClass("META-INF/LICENSE");
         registerIgnoredClass("META-INF/NOTICE");
         registerClientModuleClass(TestClientModule.class.getName());
+        noder = new NodeTransformer();
+        registerClassTransformer(noder);
+        proguardNoder = new NodeTransformer();
+        registerProGuardHook(proguardNoder);
+    }
+
+    public NodeTransformer getProguardNoder() {
+		return proguardNoder;
+	}
+
+	public NodeTransformer getNoder() {
+		return noder;
+	}
+
+	public Set<ZipBuildHook> getProguardBuildHooks() {
+		return POST_PROGUARD_BUILDHOOKS;
+	}
+
+	public Set<Runnable> getPostProguardRunHooks() {
+		return POST_PROGUARDRUN_HOOKS;
+	}
+    
+    public void addPostProguardRunHook(Runnable hook) {
+    	POST_PROGUARDRUN_HOOKS.add(hook);
+    }
+    
+    public void addPostProguardRunHook(ZipBuildHook hook) {
+    	POST_PROGUARD_BUILDHOOKS.add(hook);
     }
 
 	public void autoRegisterIgnoredClass(String clazz) {
@@ -59,15 +95,15 @@ public boolean buildRuntime() {
         return BUILDRUNTIME;
     }
 
-    public byte[] classTransform(byte[] clazz, CharSequence classname) {
+    public byte[] classTransform(byte[] clazz, String classname, JARLauncherBinary reader) {
         byte[] result = clazz;
-        for (Transformer transformer : CLASS_TRANSFORMER) result = transformer.transform(result, classname);
+        for (Transformer transformer : CLASS_TRANSFORMER) result = transformer.transform(result, classname, reader);
         return result;
     }
 
-    public byte[] proGuardClassTransform(byte[] clazz, CharSequence classname) {
+    public byte[] proGuardClassTransform(byte[] clazz, String classname, JARLauncherBinary reader) {
         byte[] result = clazz;
-        for (Transformer transformer : POST_PROGUARD_HOOKS) result = transformer.transform(result, classname);
+        for (Transformer transformer : POST_PROGUARD_HOOKS) result = transformer.transform(result, classname, reader);
         return result;
     }
 
@@ -80,15 +116,18 @@ public Map<String, byte[]> getIncludeClass() {
     }
 
     public boolean isContainsBlacklist(String clazz) {
-        return CLASS_BLACKLIST.contains(clazz);
+    	for (String classB : CLASS_BLACKLIST) {
+    		if (clazz.startsWith(classB)) return true;
+    	}
+    	return false;
     }
 
     public void postHook(BuildContext context) {
-        for (PostBuildHook hook : POST_HOOKS) hook.build(context);
+        for (BuildHook hook : POST_HOOKS) hook.build(context);
     }
 
     public void preHook(BuildContext context) {
-        for (PreBuildHook hook : PRE_HOOKS) hook.build(context);
+        for (BuildHook hook : PRE_HOOKS) hook.build(context);
     }
 
     public void registerAllClientModuleClass(JAConfigurator cfg) {
@@ -107,7 +146,7 @@ public void registerIgnoredClass(String clazz) {
         CLASS_BLACKLIST.add(clazz);
     }
 
-    public void registerPostHook(PostBuildHook hook) {
+    public void registerPostHook(BuildHook hook) {
         POST_HOOKS.add(hook);
     }
 
@@ -116,10 +155,10 @@ public void registerProGuardHook(Transformer hook) {
     }
 
     public boolean isNeedPostProguardHook() {
-        return !POST_PROGUARD_HOOKS.isEmpty();
+        return POST_PROGUARD_HOOKS.size() > 1 || !POST_PROGUARDRUN_HOOKS.isEmpty() || !POST_PROGUARD_BUILDHOOKS.isEmpty() || !proguardNoder.getTransLst().isEmpty();
     }
 
-    public void registerPreHook(PreBuildHook hook) {
+    public void registerPreHook(BuildHook hook) {
         PRE_HOOKS.add(hook);
     }
 

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

@@ -1,11 +1,11 @@
 package ru.gravit.launchserver.manangers;
 
-import ru.gravit.utils.helper.IOHelper;
-
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
 
+import ru.gravit.utils.helper.IOHelper;
+
 public class MirrorManager {
     public class Mirror {
         URL url;

LaunchServer/src/main/java/ru/gravit/launchserver/manangers/ModulesManager.java

@@ -3,11 +3,11 @@
 import java.net.URL;
 import java.util.ArrayList;
 
-import ru.gravit.utils.PublicURLClassLoader;
 import ru.gravit.launcher.modules.SimpleModuleManager;
 import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launchserver.modules.CoreModule;
 import ru.gravit.launchserver.modules.LaunchServerModuleContext;
+import ru.gravit.utils.PublicURLClassLoader;
 
 public class ModulesManager extends SimpleModuleManager {
     public ModulesManager(LaunchServer lsrv) {

LaunchServer/src/main/java/ru/gravit/launchserver/manangers/NodeTransformer.java

@@ -0,0 +1,40 @@
+package ru.gravit.launchserver.manangers;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.tree.ClassNode;
+
+import ru.gravit.launchserver.asm.SafeClassWriter;
+import ru.gravit.launchserver.binary.JARLauncherBinary;
+import ru.gravit.launchserver.manangers.BuildHookManager.Transformer;
+
+public class NodeTransformer implements Transformer {
+	@FunctionalInterface
+	public static interface ClassNodeTransformer {
+		void transform(ClassNode node, String classname, JARLauncherBinary data);
+	}
+	
+	private final List<ClassNodeTransformer> transLst;
+	
+	public List<ClassNodeTransformer> getTransLst() {
+		return transLst;
+	}
+
+	public NodeTransformer() {
+		transLst = new ArrayList<>();
+	}
+	
+	@Override
+	public byte[] transform(byte[] input, String classname, JARLauncherBinary data) {
+		ClassReader cr = new ClassReader(input);
+		ClassNode cn = new ClassNode();
+		cr.accept(cn, ClassReader.SKIP_FRAMES | ClassReader.SKIP_DEBUG);
+		for (ClassNodeTransformer tr : transLst) tr.transform(cn, classname, data);
+		ClassWriter cw = new SafeClassWriter(data.reader, ClassWriter.COMPUTE_MAXS);
+		cn.accept(cw);
+		return cw.toByteArray();
+	}
+}

LaunchServer/src/main/java/ru/gravit/launchserver/modules/CoreModule.java

@@ -1,9 +1,9 @@
 package ru.gravit.launchserver.modules;
 
 import ru.gravit.launcher.Launcher;
-import ru.gravit.utils.Version;
 import ru.gravit.launcher.modules.Module;
 import ru.gravit.launcher.modules.ModuleContext;
+import ru.gravit.utils.Version;
 
 public class CoreModule implements Module {
     @Override

LaunchServer/src/main/java/ru/gravit/launchserver/modules/LaunchServerModuleContext.java

@@ -1,9 +1,9 @@
 package ru.gravit.launchserver.modules;
 
-import ru.gravit.utils.PublicURLClassLoader;
 import ru.gravit.launcher.modules.ModuleContext;
 import ru.gravit.launcher.modules.ModulesManagerInterface;
 import ru.gravit.launchserver.LaunchServer;
+import ru.gravit.utils.PublicURLClassLoader;
 
 public class LaunchServerModuleContext implements ModuleContext {
     public final LaunchServer launchServer;

LaunchServer/src/main/java/ru/gravit/launchserver/modules/SimpleModule.java

@@ -1,8 +1,8 @@
 package ru.gravit.launchserver.modules;
 
-import ru.gravit.utils.Version;
 import ru.gravit.launcher.modules.Module;
 import ru.gravit.launcher.modules.ModuleContext;
+import ru.gravit.utils.Version;
 
 public class SimpleModule implements Module {
     @Override

LaunchServer/src/main/java/ru/gravit/launchserver/response/Response.java

@@ -4,17 +4,26 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import ru.gravit.launchserver.response.auth.*;
-import ru.gravit.launchserver.response.update.*;
-import ru.gravit.utils.helper.LogHelper;
 import ru.gravit.launcher.request.RequestException;
 import ru.gravit.launcher.request.RequestType;
 import ru.gravit.launcher.serialize.HInput;
 import ru.gravit.launcher.serialize.HOutput;
 import ru.gravit.launchserver.LaunchServer;
+import ru.gravit.launchserver.response.auth.AuthResponse;
+import ru.gravit.launchserver.response.auth.AuthServerResponse;
+import ru.gravit.launchserver.response.auth.ChangeServerResponse;
+import ru.gravit.launchserver.response.auth.CheckServerResponse;
+import ru.gravit.launchserver.response.auth.JoinServerResponse;
+import ru.gravit.launchserver.response.auth.SetProfileResponse;
 import ru.gravit.launchserver.response.profile.BatchProfileByUsernameResponse;
 import ru.gravit.launchserver.response.profile.ProfileByUUIDResponse;
 import ru.gravit.launchserver.response.profile.ProfileByUsernameResponse;
+import ru.gravit.launchserver.response.update.LauncherResponse;
+import ru.gravit.launchserver.response.update.LegacyLauncherResponse;
+import ru.gravit.launchserver.response.update.ProfilesResponse;
+import ru.gravit.launchserver.response.update.UpdateListResponse;
+import ru.gravit.launchserver.response.update.UpdateResponse;
+import ru.gravit.utils.helper.LogHelper;
 
 public abstract class Response {
     @FunctionalInterface

LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/AuthResponse.java

@@ -8,11 +8,6 @@
 import javax.crypto.IllegalBlockSizeException;
 
 import ru.gravit.launcher.OshiHWID;
-import ru.gravit.launchserver.socket.Client;
-import ru.gravit.utils.helper.IOHelper;
-import ru.gravit.utils.helper.LogHelper;
-import ru.gravit.utils.helper.SecurityHelper;
-import ru.gravit.utils.helper.VerifyHelper;
 import ru.gravit.launcher.profiles.ClientProfile;
 import ru.gravit.launcher.serialize.HInput;
 import ru.gravit.launcher.serialize.HOutput;
@@ -25,6 +20,11 @@
 import ru.gravit.launchserver.auth.provider.AuthProviderResult;
 import ru.gravit.launchserver.response.Response;
 import ru.gravit.launchserver.response.profile.ProfileByUUIDResponse;
+import ru.gravit.launchserver.socket.Client;
+import ru.gravit.utils.helper.IOHelper;
+import ru.gravit.utils.helper.LogHelper;
+import ru.gravit.utils.helper.SecurityHelper;
+import ru.gravit.utils.helper.VerifyHelper;
 
 public final class AuthResponse extends Response {
     private static String echo(int length) {

LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/AuthServerResponse.java

@@ -1,5 +1,11 @@
 package ru.gravit.launchserver.response.auth;
 
+import java.util.Arrays;
+import java.util.Collection;
+
+import javax.crypto.BadPaddingException;
+import javax.crypto.IllegalBlockSizeException;
+
 import ru.gravit.launcher.profiles.ClientProfile;
 import ru.gravit.launcher.serialize.HInput;
 import ru.gravit.launcher.serialize.HOutput;
@@ -17,11 +23,6 @@
 import ru.gravit.utils.helper.SecurityHelper;
 import ru.gravit.utils.helper.VerifyHelper;
 
-import javax.crypto.BadPaddingException;
-import javax.crypto.IllegalBlockSizeException;
-import java.util.Arrays;
-import java.util.Collection;
-
 public final class AuthServerResponse extends Response {
     private static String echo(int length) {
         char[] chars = new char[length];

LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/CheckServerResponse.java

@@ -3,8 +3,6 @@
 import java.io.IOException;
 import java.util.UUID;
 
-import ru.gravit.utils.helper.LogHelper;
-import ru.gravit.utils.helper.VerifyHelper;
 import ru.gravit.launcher.serialize.HInput;
 import ru.gravit.launcher.serialize.HOutput;
 import ru.gravit.launcher.serialize.SerializeLimits;
@@ -12,6 +10,8 @@
 import ru.gravit.launchserver.auth.AuthException;
 import ru.gravit.launchserver.response.Response;
 import ru.gravit.launchserver.response.profile.ProfileByUUIDResponse;
+import ru.gravit.utils.helper.LogHelper;
+import ru.gravit.utils.helper.VerifyHelper;
 
 public final class CheckServerResponse extends Response {
 

LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/JoinServerResponse.java

@@ -2,15 +2,15 @@
 
 import java.io.IOException;
 
-import ru.gravit.utils.helper.LogHelper;
-import ru.gravit.utils.helper.SecurityHelper;
-import ru.gravit.utils.helper.VerifyHelper;
 import ru.gravit.launcher.serialize.HInput;
 import ru.gravit.launcher.serialize.HOutput;
 import ru.gravit.launcher.serialize.SerializeLimits;
 import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launchserver.auth.AuthException;
 import ru.gravit.launchserver.response.Response;
+import ru.gravit.utils.helper.LogHelper;
+import ru.gravit.utils.helper.SecurityHelper;
+import ru.gravit.utils.helper.VerifyHelper;
 
 public final class JoinServerResponse extends Response {
 

LaunchServer/src/main/java/ru/gravit/launchserver/response/auth/SetProfileResponse.java

@@ -1,5 +1,7 @@
 package ru.gravit.launchserver.response.auth;
 
+import java.util.Collection;
+
 import ru.gravit.launcher.profiles.ClientProfile;
 import ru.gravit.launcher.serialize.HInput;
 import ru.gravit.launcher.serialize.HOutput;
@@ -9,8 +11,6 @@
 import ru.gravit.launchserver.response.Response;
 import ru.gravit.launchserver.socket.Client;
 
-import java.util.Collection;
-
 public class SetProfileResponse extends Response {
     public SetProfileResponse(LaunchServer server, long session, HInput input, HOutput output, String ip) {
         super(server, session, input, output, ip);

LaunchServer/src/main/java/ru/gravit/launchserver/response/profile/BatchProfileByUsernameResponse.java

@@ -3,12 +3,12 @@
 import java.io.IOException;
 import java.util.Arrays;
 
-import ru.gravit.utils.helper.VerifyHelper;
 import ru.gravit.launcher.serialize.HInput;
 import ru.gravit.launcher.serialize.HOutput;
 import ru.gravit.launcher.serialize.SerializeLimits;
 import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launchserver.response.Response;
+import ru.gravit.utils.helper.VerifyHelper;
 
 public final class BatchProfileByUsernameResponse extends Response {
 

LaunchServer/src/main/java/ru/gravit/launchserver/response/profile/ProfileByUUIDResponse.java

@@ -3,7 +3,6 @@
 import java.io.IOException;
 import java.util.UUID;
 
-import ru.gravit.utils.helper.LogHelper;
 import ru.gravit.launcher.profiles.PlayerProfile;
 import ru.gravit.launcher.profiles.Texture;
 import ru.gravit.launcher.serialize.HInput;
@@ -11,6 +10,7 @@
 import ru.gravit.launcher.serialize.SerializeLimits;
 import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launchserver.response.Response;
+import ru.gravit.utils.helper.LogHelper;
 
 public final class ProfileByUUIDResponse extends Response {
 

LaunchServer/src/main/java/ru/gravit/launchserver/response/profile/ProfileByUsernameResponse.java

@@ -3,12 +3,12 @@
 import java.io.IOException;
 import java.util.UUID;
 
-import ru.gravit.utils.helper.VerifyHelper;
 import ru.gravit.launcher.serialize.HInput;
 import ru.gravit.launcher.serialize.HOutput;
 import ru.gravit.launcher.serialize.SerializeLimits;
 import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launchserver.response.Response;
+import ru.gravit.utils.helper.VerifyHelper;
 
 public final class ProfileByUsernameResponse extends Response {
 

LaunchServer/src/main/java/ru/gravit/launchserver/response/update/LauncherResponse.java

@@ -1,5 +1,8 @@
 package ru.gravit.launchserver.response.update;
 
+import java.io.IOException;
+import java.util.Arrays;
+
 import ru.gravit.launcher.serialize.HInput;
 import ru.gravit.launcher.serialize.HOutput;
 import ru.gravit.launcher.serialize.signed.DigestBytesHolder;
@@ -7,9 +10,6 @@
 import ru.gravit.launchserver.response.Response;
 import ru.gravit.launchserver.socket.Client;
 
-import java.io.IOException;
-import java.util.Arrays;
-
 public final class LauncherResponse extends Response {
 
     public LauncherResponse(LaunchServer server, long session, HInput input, HOutput output, String ip) {

LaunchServer/src/main/java/ru/gravit/launchserver/response/update/LegacyLauncherResponse.java

@@ -2,12 +2,12 @@
 
 import java.io.IOException;
 
-import ru.gravit.launchserver.binary.LauncherBinary;
-import ru.gravit.utils.helper.SecurityHelper;
 import ru.gravit.launcher.serialize.HInput;
 import ru.gravit.launcher.serialize.HOutput;
 import ru.gravit.launchserver.LaunchServer;
+import ru.gravit.launchserver.binary.LauncherBinary;
 import ru.gravit.launchserver.response.Response;
+import ru.gravit.utils.helper.SecurityHelper;
 
 public final class LegacyLauncherResponse extends Response {
 

LaunchServer/src/main/java/ru/gravit/launchserver/response/update/ProfilesResponse.java

@@ -3,14 +3,14 @@
 import java.io.IOException;
 import java.util.Collection;
 
-import ru.gravit.launchserver.socket.Client;
-import ru.gravit.utils.helper.LogHelper;
 import ru.gravit.launcher.profiles.ClientProfile;
 import ru.gravit.launcher.serialize.HInput;
 import ru.gravit.launcher.serialize.HOutput;
 import ru.gravit.launcher.serialize.signed.SignedObjectHolder;
 import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launchserver.response.Response;
+import ru.gravit.launchserver.socket.Client;
+import ru.gravit.utils.helper.LogHelper;
 
 public final class ProfilesResponse extends Response {
 

LaunchServer/src/main/java/ru/gravit/launchserver/response/update/UpdateResponse.java

@@ -12,8 +12,6 @@
 import ru.gravit.launcher.hasher.HashedEntry;
 import ru.gravit.launcher.hasher.HashedEntry.Type;
 import ru.gravit.launcher.profiles.ClientProfile;
-import ru.gravit.launchserver.socket.Client;
-import ru.gravit.utils.helper.IOHelper;
 import ru.gravit.launcher.request.UpdateAction;
 import ru.gravit.launcher.serialize.HInput;
 import ru.gravit.launcher.serialize.HOutput;
@@ -21,6 +19,8 @@
 import ru.gravit.launcher.serialize.signed.SignedObjectHolder;
 import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launchserver.response.Response;
+import ru.gravit.launchserver.socket.Client;
+import ru.gravit.utils.helper.IOHelper;
 
 public final class UpdateResponse extends Response {
 

LaunchServer/src/main/java/ru/gravit/launchserver/socket/NettyServerSocketHandler.java

@@ -1,5 +1,34 @@
 package ru.gravit.launchserver.socket;
 
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.nio.channels.Selector;
+import java.nio.channels.ServerSocketChannel;
+import java.security.KeyManagementException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.security.UnrecoverableKeyException;
+import java.security.cert.CertificateException;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
+
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLServerSocketFactory;
+import javax.net.ssl.TrustManager;
+
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelInitializer;
@@ -24,26 +53,6 @@
 import ru.gravit.utils.helper.LogHelper;
 import ru.gravit.utils.helper.VerifyHelper;
 
-import javax.net.ssl.*;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.nio.channels.Selector;
-import java.nio.channels.ServerSocketChannel;
-import java.security.*;
-import java.security.cert.CertificateException;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.AtomicReference;
-
 @SuppressWarnings({"unused", "rawtypes"})
 public final class NettyServerSocketHandler implements Runnable, AutoCloseable {
     private static final String WEBSOCKET_PATH = "/api";

LaunchServer/src/main/java/ru/gravit/launchserver/socket/ResponseThread.java

@@ -6,15 +6,15 @@
 import java.net.SocketException;
 
 import ru.gravit.launcher.Launcher;
-import ru.gravit.utils.helper.IOHelper;
-import ru.gravit.utils.helper.LogHelper;
-import ru.gravit.utils.helper.SecurityHelper;
 import ru.gravit.launcher.request.RequestException;
 import ru.gravit.launcher.serialize.HInput;
 import ru.gravit.launcher.serialize.HOutput;
 import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launchserver.manangers.SessionManager;
 import ru.gravit.launchserver.response.Response;
+import ru.gravit.utils.helper.IOHelper;
+import ru.gravit.utils.helper.LogHelper;
+import ru.gravit.utils.helper.SecurityHelper;
 
 public final class ResponseThread implements Runnable {
     class Handshake {

LaunchServer/src/main/java/ru/gravit/launchserver/socket/ServerSocketHandler.java

@@ -12,11 +12,11 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
 
-import ru.gravit.utils.helper.CommonHelper;
-import ru.gravit.utils.helper.LogHelper;
 import ru.gravit.launcher.managers.GarbageManager;
 import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launchserver.manangers.SessionManager;
+import ru.gravit.utils.helper.CommonHelper;
+import ru.gravit.utils.helper.LogHelper;
 
 public final class ServerSocketHandler implements Runnable, AutoCloseable {
     public interface Listener {

LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/WebSocketFrameHandler.java

@@ -1,6 +1,7 @@
 package ru.gravit.launchserver.socket.websocket;
 
 import com.google.gson.GsonBuilder;
+
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 import io.netty.channel.group.DefaultChannelGroup;

LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/WebSocketIndexPageHandler.java

@@ -1,12 +1,5 @@
 package ru.gravit.launchserver.socket.websocket;
 
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import io.netty.channel.*;
-import io.netty.handler.codec.http.*;
-import io.netty.handler.ssl.SslHandler;
-import io.netty.util.CharsetUtil;
-
 import static io.netty.handler.codec.http.HttpMethod.GET;
 import static io.netty.handler.codec.http.HttpResponseStatus.BAD_REQUEST;
 import static io.netty.handler.codec.http.HttpResponseStatus.FORBIDDEN;
@@ -14,6 +7,22 @@
 import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
 import static io.netty.handler.codec.rtsp.RtspResponseStatuses.NOT_FOUND;
 
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.SimpleChannelInboundHandler;
+import io.netty.handler.codec.http.DefaultFullHttpResponse;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpUtil;
+import io.netty.handler.ssl.SslHandler;
+import io.netty.util.CharsetUtil;
+
 public class WebSocketIndexPageHandler extends SimpleChannelInboundHandler<FullHttpRequest> {
 
     private final String websocketPath;

LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/WebSocketService.java

@@ -1,17 +1,20 @@
 package ru.gravit.launchserver.socket.websocket;
 
+import java.util.HashMap;
+
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFutureListener;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.group.ChannelGroup;
 import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
 import ru.gravit.launcher.hasher.HashedEntry;
+import ru.gravit.launcher.hasher.HashedEntryAdapter;
 import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launchserver.socket.Client;
 import ru.gravit.launchserver.socket.websocket.json.EchoResponse;
-import ru.gravit.launcher.hasher.HashedEntryAdapter;
 import ru.gravit.launchserver.socket.websocket.json.JsonResponseAdapter;
 import ru.gravit.launchserver.socket.websocket.json.JsonResponseInterface;
 import ru.gravit.launchserver.socket.websocket.json.auth.AuthResponse;
@@ -21,8 +24,6 @@
 import ru.gravit.launchserver.socket.websocket.json.update.UpdateListResponse;
 import ru.gravit.utils.helper.LogHelper;
 
-import java.util.HashMap;
-
 @SuppressWarnings({"unused", "rawtypes"})
 public class WebSocketService {
     public final ChannelGroup channels;

LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/JsonResponseAdapter.java

@@ -1,10 +1,18 @@
 package ru.gravit.launchserver.socket.websocket.json;
 
-import com.google.gson.*;
-import ru.gravit.launchserver.socket.websocket.WebSocketService;
-
 import java.lang.reflect.Type;
 
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+
+import ru.gravit.launchserver.socket.websocket.WebSocketService;
+
 public class JsonResponseAdapter implements JsonSerializer<JsonResponseInterface>, JsonDeserializer<JsonResponseInterface> {
     private final WebSocketService service;
     private static final String PROP_NAME = "type";

LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/auth/AuthResponse.java

@@ -1,11 +1,13 @@
 package ru.gravit.launchserver.socket.websocket.json.auth;
 
+import java.util.Collection;
+
 import io.netty.channel.ChannelHandlerContext;
+import ru.gravit.launcher.HWID;
 import ru.gravit.launcher.profiles.ClientProfile;
 import ru.gravit.launcher.serialize.signed.SignedObjectHolder;
 import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launchserver.auth.AuthException;
-import ru.gravit.launcher.HWID;
 import ru.gravit.launchserver.auth.hwid.HWIDException;
 import ru.gravit.launchserver.auth.provider.AuthProvider;
 import ru.gravit.launchserver.auth.provider.AuthProviderResult;
@@ -15,8 +17,6 @@
 import ru.gravit.utils.helper.IOHelper;
 import ru.gravit.utils.helper.VerifyHelper;
 
-import java.util.Collection;
-
 public class AuthResponse implements JsonResponseInterface {
     public String login;
     public String client;

LaunchServer/src/main/java/ru/gravit/launchserver/socket/websocket/json/update/LauncherResponse.java

@@ -1,5 +1,8 @@
 package ru.gravit.launchserver.socket.websocket.json.update;
 
+import java.util.Arrays;
+import java.util.Base64;
+
 import io.netty.channel.ChannelHandlerContext;
 import ru.gravit.launchserver.LaunchServer;
 import ru.gravit.launchserver.socket.Client;
@@ -7,9 +10,6 @@
 import ru.gravit.launchserver.socket.websocket.json.JsonResponseInterface;
 import ru.gravit.utils.Version;
 
-import java.util.Arrays;
-import java.util.Base64;
-
 public class LauncherResponse implements JsonResponseInterface {
     public Version version;
     public String hash;

LaunchServer/src/main/java/ru/gravit/launchserver/texture/NullTextureProvider.java

@@ -4,9 +4,9 @@
 import java.util.Objects;
 import java.util.UUID;
 
-import ru.gravit.utils.helper.VerifyHelper;
 import ru.gravit.launcher.profiles.Texture;
 import ru.gravit.launcher.serialize.config.entry.BlockConfigEntry;
+import ru.gravit.utils.helper.VerifyHelper;
 
 public final class NullTextureProvider extends TextureProvider {
     private volatile TextureProvider provider;

LaunchServer/src/main/java/ru/gravit/launchserver/texture/RequestTextureProvider.java

@@ -5,12 +5,12 @@
 import java.util.UUID;
 
 import ru.gravit.launcher.Launcher;
-import ru.gravit.utils.helper.CommonHelper;
-import ru.gravit.utils.helper.IOHelper;
-import ru.gravit.utils.helper.LogHelper;
 import ru.gravit.launcher.profiles.Texture;
 import ru.gravit.launcher.serialize.config.entry.BlockConfigEntry;
 import ru.gravit.launcher.serialize.config.entry.StringConfigEntry;
+import ru.gravit.utils.helper.CommonHelper;
+import ru.gravit.utils.helper.IOHelper;
+import ru.gravit.utils.helper.LogHelper;
 
 public final class RequestTextureProvider extends TextureProvider {
     private static final UUID ZERO_UUID = new UUID(0, 0);

LaunchServer/src/main/java/ru/gravit/launchserver/texture/TextureProvider.java

@@ -6,10 +6,10 @@
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 
-import ru.gravit.utils.helper.VerifyHelper;
 import ru.gravit.launcher.profiles.Texture;
 import ru.gravit.launcher.serialize.config.ConfigObject;
 import ru.gravit.launcher.serialize.config.entry.BlockConfigEntry;
+import ru.gravit.utils.helper.VerifyHelper;
 
 public abstract class TextureProvider extends ConfigObject implements AutoCloseable {
     private static final Map<String, Adapter<TextureProvider>> TEXTURE_PROVIDERS = new ConcurrentHashMap<>(2);

LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/config.cfg

@@ -55,12 +55,12 @@ binaryName: "Launcher";
 launch4J: {
     enabled: true;
     productName: "sashok724's Launcher v3 mod by Gravit";
-    productVer: "1.0.0.0";
+    productVer: "4.1.0.0";
     fileDesc: "sashok724's Launcher v3 mod by Gravit";
-    fileVer: "1.0.0.0";
+    fileVer: "1.1.0.0";
     internalName: "Launcher";
     copyright: "© sashok724 LLC";
-    trademarks: "This product is licensed under MIT License";
+    trademarks: "This product is licensed under GNU GPL v3.0 License";
     # version and build number
     txtFileVersion: "%s, build %d";
     txtProductVersion: "%s, build %d";

Launcher/src/main/java/ru/gravit/launcher/ClientLauncherWrapper.java

@@ -1,11 +1,5 @@
 package ru.gravit.launcher;
 
-import ru.gravit.launcher.client.ClientLauncher;
-import ru.gravit.utils.helper.EnvHelper;
-import ru.gravit.utils.helper.IOHelper;
-import ru.gravit.utils.helper.JVMHelper;
-import ru.gravit.utils.helper.LogHelper;
-
 import java.io.IOException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -13,6 +7,12 @@
 import java.util.LinkedList;
 import java.util.List;
 
+import ru.gravit.launcher.client.ClientLauncher;
+import ru.gravit.utils.helper.EnvHelper;
+import ru.gravit.utils.helper.IOHelper;
+import ru.gravit.utils.helper.JVMHelper;
+import ru.gravit.utils.helper.LogHelper;
+
 public class ClientLauncherWrapper {
     public static void main(String[] arguments) throws IOException, InterruptedException {
         LogHelper.printVersion("Launcher");

Launcher/src/main/java/ru/gravit/launcher/LauncherEngine.java

@@ -5,7 +5,8 @@
 import java.net.URL;
 import java.time.Duration;
 import java.time.Instant;
-import java.util.*;
+import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.script.Bindings;
@@ -14,7 +15,12 @@
 import javax.script.ScriptEngine;
 import javax.script.ScriptException;
 
-import ru.gravit.launcher.client.*;
+import ru.gravit.launcher.client.ClientLauncher;
+import ru.gravit.launcher.client.ClientModuleManager;
+import ru.gravit.launcher.client.DirBridge;
+import ru.gravit.launcher.client.FunctionalBridge;
+import ru.gravit.launcher.client.LauncherSettings;
+import ru.gravit.launcher.client.ServerPinger;
 import ru.gravit.launcher.gui.choosebox.CheckComboBox;
 import ru.gravit.launcher.gui.choosebox.CheckComboBoxSkin;
 import ru.gravit.launcher.gui.choosebox.CheckModel;
@@ -25,17 +31,6 @@
 import ru.gravit.launcher.hasher.HashedDir;
 import ru.gravit.launcher.hasher.HashedEntry;
 import ru.gravit.launcher.hasher.HashedFile;
-import ru.gravit.launcher.request.auth.SetProfileRequest;
-import ru.gravit.launcher.request.update.LauncherRequest;
-import ru.gravit.launcher.request.update.ProfilesRequest;
-import ru.gravit.utils.HTTPRequest;
-import ru.gravit.utils.helper.CommonHelper;
-import ru.gravit.utils.helper.EnvHelper;
-import ru.gravit.utils.helper.IOHelper;
-import ru.gravit.utils.helper.JVMHelper;
-import ru.gravit.utils.helper.LogHelper;
-import ru.gravit.utils.helper.SecurityHelper;
-import ru.gravit.utils.helper.VerifyHelper;
 import ru.gravit.launcher.profiles.ClientProfile;
 import ru.gravit.launcher.profiles.PlayerProfile;
 import ru.gravit.launcher.profiles.Texture;
@@ -47,6 +42,9 @@
 import ru.gravit.launcher.request.auth.AuthRequest;
 import ru.gravit.launcher.request.auth.CheckServerRequest;
 import ru.gravit.launcher.request.auth.JoinServerRequest;
+import ru.gravit.launcher.request.auth.SetProfileRequest;
+import ru.gravit.launcher.request.update.LauncherRequest;
+import ru.gravit.launcher.request.update.ProfilesRequest;
 import ru.gravit.launcher.request.update.UpdateRequest;
 import ru.gravit.launcher.request.uuid.BatchProfileByUsernameRequest;
 import ru.gravit.launcher.request.uuid.ProfileByUUIDRequest;
@@ -66,6 +64,14 @@
 import ru.gravit.launcher.serialize.signed.SignedObjectHolder;
 import ru.gravit.launcher.serialize.stream.EnumSerializer;
 import ru.gravit.launcher.serialize.stream.StreamObject;
+import ru.gravit.utils.HTTPRequest;
+import ru.gravit.utils.helper.CommonHelper;
+import ru.gravit.utils.helper.EnvHelper;
+import ru.gravit.utils.helper.IOHelper;
+import ru.gravit.utils.helper.JVMHelper;
+import ru.gravit.utils.helper.LogHelper;
+import ru.gravit.utils.helper.SecurityHelper;
+import ru.gravit.utils.helper.VerifyHelper;
 
 public class LauncherEngine {
     @LauncherAPI

Launcher/src/main/java/ru/gravit/launcher/RequestWorker.java

@@ -1,10 +1,10 @@
 package ru.gravit.launcher;
 
-import ru.gravit.utils.helper.LogHelper;
-
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 
+import ru.gravit.utils.helper.LogHelper;
+
 public class RequestWorker implements Runnable {
     public RequestWorker()
     {

Launcher/src/main/java/ru/gravit/launcher/client/ClientLauncher.java

@@ -5,7 +5,10 @@
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
-import java.net.*;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.URL;
 import java.nio.file.FileVisitResult;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -13,16 +16,34 @@
 import java.nio.file.attribute.BasicFileAttributes;
 import java.nio.file.attribute.PosixFilePermission;
 import java.security.interfaces.RSAPublicKey;
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
 
 import javax.swing.JOptionPane;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
-import ru.gravit.launcher.*;
+
+import ru.gravit.launcher.Launcher;
+import ru.gravit.launcher.LauncherAPI;
+import ru.gravit.launcher.LauncherAgent;
+import ru.gravit.launcher.LauncherConfig;
+import ru.gravit.launcher.LauncherEngine;
 import ru.gravit.launcher.hasher.DirWatcher;
 import ru.gravit.launcher.hasher.FileNameMatcher;
 import ru.gravit.launcher.hasher.HashedDir;
+import ru.gravit.launcher.profiles.ClientProfile;
+import ru.gravit.launcher.profiles.PlayerProfile;
+import ru.gravit.launcher.request.update.LegacyLauncherRequest;
+import ru.gravit.launcher.serialize.HInput;
+import ru.gravit.launcher.serialize.HOutput;
+import ru.gravit.launcher.serialize.signed.SignedObjectHolder;
+import ru.gravit.launcher.serialize.stream.StreamObject;
 import ru.gravit.utils.PublicURLClassLoader;
 import ru.gravit.utils.helper.CommonHelper;
 import ru.gravit.utils.helper.EnvHelper;
@@ -31,13 +52,6 @@
 import ru.gravit.utils.helper.JVMHelper.OS;
 import ru.gravit.utils.helper.LogHelper;
 import ru.gravit.utils.helper.SecurityHelper;
-import ru.gravit.launcher.profiles.ClientProfile;
-import ru.gravit.launcher.profiles.PlayerProfile;
-import ru.gravit.launcher.request.update.LegacyLauncherRequest;
-import ru.gravit.launcher.serialize.HInput;
-import ru.gravit.launcher.serialize.HOutput;
-import ru.gravit.launcher.serialize.signed.SignedObjectHolder;
-import ru.gravit.launcher.serialize.stream.StreamObject;
 
 public final class ClientLauncher {
     private static Gson gson = new Gson();

Launcher/src/main/java/ru/gravit/launcher/client/DirBridge.java

@@ -1,11 +1,11 @@
 package ru.gravit.launcher.client;
 
-import ru.gravit.launcher.LauncherAPI;
-import ru.gravit.utils.helper.IOHelper;
-
 import java.io.IOException;
 import java.nio.file.Path;
 
+import ru.gravit.launcher.LauncherAPI;
+import ru.gravit.utils.helper.IOHelper;
+
 public class DirBridge {
     @LauncherAPI
     public static Path dir;

Launcher/src/main/java/ru/gravit/launcher/client/FunctionalBridge.java

@@ -1,5 +1,9 @@
 package ru.gravit.launcher.client;
 
+import java.io.IOException;
+import java.nio.file.Path;
+import java.security.SignatureException;
+
 import javafx.concurrent.Task;
 import ru.gravit.launcher.HWID;
 import ru.gravit.launcher.LauncherAPI;
@@ -13,10 +17,6 @@
 import ru.gravit.launcher.serialize.signed.SignedObjectHolder;
 import ru.gravit.utils.helper.LogHelper;
 
-import java.io.IOException;
-import java.nio.file.Path;
-import java.security.SignatureException;
-
 public class FunctionalBridge {
     @LauncherAPI
     public static LauncherSettings settings;
@@ -55,8 +55,9 @@ public static void makeJsonRequest(RequestInterface request, Runnable callback)
     {
 
     }
+
     @LauncherAPI
-    public static void startTask(Task task)
+    public static void startTask(@SuppressWarnings("rawtypes") Task task)
     {
         try {
             worker.queue.put(task);

Launcher/src/main/java/ru/gravit/launcher/client/LauncherSettings.java

@@ -1,17 +1,5 @@
 package ru.gravit.launcher.client;
 
-import ru.gravit.launcher.Launcher;
-import ru.gravit.launcher.LauncherAPI;
-import ru.gravit.launcher.client.DirBridge;
-import ru.gravit.launcher.hasher.HashedDir;
-import ru.gravit.launcher.profiles.ClientProfile;
-import ru.gravit.launcher.serialize.HInput;
-import ru.gravit.launcher.serialize.HOutput;
-import ru.gravit.launcher.serialize.signed.SignedObjectHolder;
-import ru.gravit.utils.helper.*;
-
-import javax.crypto.BadPaddingException;
-import javax.crypto.IllegalBlockSizeException;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.security.SignatureException;
@@ -21,6 +9,22 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.crypto.BadPaddingException;
+import javax.crypto.IllegalBlockSizeException;
+
+import ru.gravit.launcher.Launcher;
+import ru.gravit.launcher.LauncherAPI;
+import ru.gravit.launcher.hasher.HashedDir;
+import ru.gravit.launcher.profiles.ClientProfile;
+import ru.gravit.launcher.serialize.HInput;
+import ru.gravit.launcher.serialize.HOutput;
+import ru.gravit.launcher.serialize.signed.SignedObjectHolder;
+import ru.gravit.utils.helper.IOHelper;
+import ru.gravit.utils.helper.JVMHelper;
+import ru.gravit.utils.helper.LogHelper;
+import ru.gravit.utils.helper.SecurityHelper;
+import ru.gravit.utils.helper.VerifyHelper;
+
 public class LauncherSettings {
     public static int settingsMagic = 0xc0de7;
     @LauncherAPI

Launcher/src/main/java/ru/gravit/launcher/client/ServerPinger.java

@@ -12,13 +12,14 @@
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+
 import ru.gravit.launcher.LauncherAPI;
+import ru.gravit.launcher.profiles.ClientProfile;
+import ru.gravit.launcher.serialize.HInput;
+import ru.gravit.launcher.serialize.HOutput;
 import ru.gravit.utils.helper.IOHelper;
 import ru.gravit.utils.helper.LogHelper;
 import ru.gravit.utils.helper.VerifyHelper;
-import ru.gravit.launcher.serialize.HInput;
-import ru.gravit.launcher.serialize.HOutput;
-import ru.gravit.launcher.profiles.ClientProfile;
 
 public final class ServerPinger {
     private JsonParser parser = new JsonParser();

Launcher/src/main/java/ru/gravit/launcher/gui/choosebox/CheckComboBox.java

@@ -13,7 +13,6 @@
 import javafx.collections.ObservableList;
 import javafx.scene.control.Skin;
 import javafx.util.StringConverter;
-
 import ru.gravit.launcher.LauncherAPI;
 
 public class CheckComboBox<T> extends ControlsFXControl {

Launcher/src/main/java/ru/gravit/launcher/gui/indicator/ProgressCircleIndicator.java

@@ -4,14 +4,14 @@
 import java.util.Collections;
 import java.util.List;
 
-import javafx.beans.property.*;
+import com.sun.javafx.css.converters.SizeConverter;
+
+import javafx.beans.property.DoubleProperty;
 import javafx.css.CssMetaData;
 import javafx.css.Styleable;
 import javafx.css.StyleableDoubleProperty;
 import javafx.css.StyleableProperty;
 import javafx.scene.control.Control;
-
-import com.sun.javafx.css.converters.SizeConverter;
 import javafx.scene.control.ProgressIndicator;
 
 abstract class ProgressCircleIndicator extends ProgressIndicator {

Launcher/src/main/java/ru/gravit/launcher/gui/indicator/RingProgressIndicator.java

@@ -4,6 +4,8 @@
 import java.util.Collections;
 import java.util.List;
 
+import com.sun.javafx.css.converters.SizeConverter;
+
 import javafx.beans.property.DoubleProperty;
 import javafx.css.CssMetaData;
 import javafx.css.Styleable;
@@ -11,8 +13,6 @@
 import javafx.css.StyleableProperty;
 import javafx.scene.control.Control;
 import javafx.scene.control.Skin;
-
-import com.sun.javafx.css.converters.SizeConverter;
 import ru.gravit.launcher.LauncherAPI;
 import ru.gravit.utils.helper.LogHelper;