Merge pull request #317 from xxDark/dev

Чистка кода

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

@@ -33,6 +33,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.zip.CRC32;
 
+import io.netty.channel.epoll.Epoll;
 import org.bouncycastle.crypto.util.PrivateKeyFactory;
 import org.bouncycastle.operator.OperatorCreationException;
 
@@ -359,7 +360,7 @@ public static void main(String... args) throws Throwable {
         LogHelper.printLicense("LaunchServer");
         if (!StarterAgent.isAgentStarted()) {
             LogHelper.error("StarterAgent is not started!");
-            LogHelper.error("Your should add to JVM options this option: `-javaagent:LaunchServer.jar`");
+            LogHelper.error("You should add to JVM options this option: `-javaagent:LaunchServer.jar`");
         }
 
         // Start LaunchServer
@@ -810,7 +811,7 @@ private void generateConfigIfNotExists(boolean testEnv) throws IOException {
         newConfig.netty.fileServerEnabled = true;
         newConfig.netty.binds = new NettyBindAddress[]{new NettyBindAddress("0.0.0.0", 9274)};
         newConfig.netty.performance = new NettyPerformanceConfig();
-        newConfig.netty.performance.usingEpoll = JVMHelper.OS_TYPE == JVMHelper.OS.LINUX; //Only linux
+        newConfig.netty.performance.usingEpoll = Epoll.isAvailable();
         newConfig.netty.performance.bossThread = 2;
         newConfig.netty.performance.workerThread = 8;
 

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

@@ -153,13 +153,17 @@ public void onCheckInfo(OshiHWID hwid, String username, Connection c) throws HWI
                     db_hwid.HWDiskSerial = set.getString(hwidFieldHWDiskSerial);
                     db_hwid.totalMemory = Long.valueOf(set.getString(hwidFieldTotalMemory));
                     db_hwid.macAddr = set.getString(hwidFieldMAC);
+                    if (LogHelper.isDevEnabled()) {
                         LogHelper.dev("Compare HWID: %s vs %s", hwid.getSerializeString(), db_hwid.getSerializeString());
+                    }
                     int compare_point = hwid.compare(db_hwid);
                     if (compare_point < compare) continue;
                     else {
+                        if (LogHelper.isDevEnabled()) {
                             LogHelper.debug("User %s hwid check: found compare %d in %d", username, compare_point, set.getInt("id"));
                         }
                     }
+                }
                 if (oneCompareMode) isOne = true;
                 boolean isBanned = set.getBoolean(hwidFieldBanned);
                 if (isBanned) {
@@ -175,7 +179,9 @@ public void onCheckInfo(OshiHWID hwid, String username, Connection c) throws HWI
     }
 
     public void setIsBanned(HWID hwid, boolean isBanned) {
+        if (LogHelper.isDebugEnabled()) {
             LogHelper.debug("%s Request HWID: %s", isBanned ? "Ban" : "UnBan", hwid.toString());
+        }
         if (hwid instanceof OshiHWID) {
             OshiHWID oshiHWID = (OshiHWID) hwid;
             try (Connection c = mySQLHolder.getConnection()) {
@@ -214,7 +220,9 @@ public void unban(List<HWID> list) {
     public List<HWID> getHwid(String username) {
         ArrayList<HWID> list = new ArrayList<>();
         try (Connection c = mySQLHolder.getConnection()) {
+            if (LogHelper.isDebugEnabled()) {
                 LogHelper.debug("Try find HWID from username %s", username);
+            }
             PreparedStatement s = c.prepareStatement(String.format("SELECT %s, %s FROM `%s` WHERE `%s` = ? LIMIT 1", userFieldHwid, userFieldLogin, tableUsers, userFieldLogin));
             s.setString(1, username);
 

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

@@ -20,11 +20,15 @@ public RequestTextureProvider(String skinURL, String cloakURL) {
     }
 
     private static Texture getTexture(String url, boolean cloak) throws IOException {
+        if (LogHelper.isDebugEnabled()) {
             LogHelper.debug("Getting texture: '%s'", url);
+        }
         try {
             return new Texture(url, cloak);
         } catch (FileNotFoundException ignored) {
+            if (LogHelper.isDebugEnabled()) {
                 LogHelper.subDebug("Texture not found :(");
+            }
             return null; // Simply not found
         }
     }

LaunchServer/src/main/java/pro/gravit/launchserver/command/dump/DumpSessionsCommand.java

@@ -4,6 +4,7 @@
 import java.io.Writer;
 import java.lang.reflect.Type;
 import java.nio.file.Paths;
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -41,7 +42,7 @@ public void invoke(String... args) throws Exception {
             public void invoke(String... args) throws Exception {
                 verifyArgs(args, 1);
                 LogHelper.info("Sessions write to %s", args[0]);
-                Set<Client> clientSet = server.sessionManager.getSessions();
+                Collection<Client> clientSet = server.sessionManager.getSessions();
                 try (Writer writer = IOHelper.newWriter(Paths.get(args[0]))) {
                     Launcher.gsonManager.configGson.toJson(clientSet, writer);
                 }

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

@@ -1,7 +1,11 @@
 package pro.gravit.launchserver.manangers;
 
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import pro.gravit.launcher.NeedGarbageCollection;
 import pro.gravit.launchserver.socket.Client;
@@ -10,53 +14,50 @@ public class SessionManager implements NeedGarbageCollection {
 
     public static final long SESSION_TIMEOUT = 3 * 60 * 60 * 1000; // 3 часа
     public static final boolean GARBAGE_SERVER = Boolean.parseBoolean(System.getProperty("launcher.garbageSessionsServer", "false"));
-    private HashSet<Client> clientSet = new HashSet<>(128);
+    private Map<Long, Client> clientSet = new HashMap<>(128);
 
 
     public boolean addClient(Client client) {
-        clientSet.add(client);
+        clientSet.put(client.session, client);
         return true;
     }
 
     @Override
     public void garbageCollection() {
         long time = System.currentTimeMillis();
-        clientSet.removeIf(c -> (c.timestamp + SESSION_TIMEOUT < time) && ((c.type == Client.Type.USER) || ((c.type == Client.Type.SERVER) && GARBAGE_SERVER)));
+        clientSet.entrySet().removeIf(entry -> {
+            Client c = entry.getValue();
+            return (c.timestamp + SESSION_TIMEOUT < time) && ((c.type == Client.Type.USER) || ((c.type == Client.Type.SERVER) && GARBAGE_SERVER));
+        });
     }
 
 
     public Client getClient(long session) {
-        for (Client c : clientSet)
+        return clientSet.get(session);
-            if (c.session == session) return c;
-        return null;
     }
 
 
     public Client getOrNewClient(long session) {
-        for (Client c : clientSet)
+        return clientSet.computeIfAbsent(session, Client::new);
-            if (c.session == session) return c;
-        Client newClient = new Client(session);
-        clientSet.add(newClient);
-        return newClient;
     }
 
 
     public void updateClient(long session) {
-        for (Client c : clientSet) {
+        Client c = clientSet.get(session);
-            if (c.session == session) {
+        if (c != null) {
             c.up();
             return;
         }
-        }
         Client newClient = new Client(session);
-        clientSet.add(newClient);
+        clientSet.put(session, newClient);
     }
 
     public Set<Client> getSessions() {
-        return clientSet;
+        // TODO: removeme
+        return new HashSet<>(clientSet.values());
     }
 
     public void loadSessions(Set<Client> set) {
-        clientSet.addAll(set);
+        clientSet.putAll(set.stream().collect(Collectors.toMap(c -> c.session, Function.identity())));
     }
 }

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

@@ -7,6 +7,7 @@
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.ChannelPipeline;
 import io.netty.channel.EventLoopGroup;
+import io.netty.channel.epoll.Epoll;
 import io.netty.channel.group.DefaultChannelGroup;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.handler.codec.http.HttpObjectAggregator;
@@ -20,7 +21,6 @@
 import pro.gravit.launchserver.socket.handlers.WebSocketFrameHandler;
 import pro.gravit.launchserver.socket.handlers.fileserver.FileServerHandler;
 import pro.gravit.utils.BiHookSet;
-import pro.gravit.utils.helper.JVMHelper;
 import pro.gravit.utils.helper.LogHelper;
 
 public class LauncherNettyServer implements AutoCloseable {
@@ -38,16 +38,16 @@ public LauncherNettyServer(LaunchServer server) {
         {
             LogHelper.debug("Netty: Epoll enabled");
         }
-        if(config.performance.usingEpoll && JVMHelper.OS_TYPE != JVMHelper.OS.LINUX)
+        if(config.performance.usingEpoll && !Epoll.isAvailable())
         {
-            LogHelper.error("netty,perfomance.usingEpoll work only Linux systems");
+            LogHelper.error("Epoll is not available: (netty,perfomance.usingEpoll configured wrongly)", Epoll.unavailabilityCause());
         }
         bossGroup = NettyObjectFactory.newEventLoopGroup(config.performance.bossThread);
         workerGroup = NettyObjectFactory.newEventLoopGroup(config.performance.workerThread);
         serverBootstrap = new ServerBootstrap();
         service = new WebSocketService(new DefaultChannelGroup(GlobalEventExecutor.INSTANCE), server);
         serverBootstrap.group(bossGroup, workerGroup)
-                .channel(NettyObjectFactory.getServerSocketChannelClass())
+                .channelFactory(NettyObjectFactory.getServerSocketChannelFactory())
                 .handler(new LoggingHandler(config.logLevel))
                 .childHandler(new ChannelInitializer<SocketChannel>() {
                     @Override

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

@@ -1,5 +1,6 @@
 package pro.gravit.launchserver.socket;
 
+import io.netty.channel.ChannelFactory;
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.ServerChannel;
 import io.netty.channel.epoll.EpollEventLoopGroup;
@@ -20,12 +21,12 @@ public static EventLoopGroup newEventLoopGroup(int threads)
         else
             return new NioEventLoopGroup(threads);
     }
-    public static Class<? extends ServerChannel> getServerSocketChannelClass()
+    public static ChannelFactory<? extends ServerChannel> getServerSocketChannelFactory()
     {
         if(epoll)
-            return EpollServerSocketChannel.class;
+            return EpollServerSocketChannel::new;
         else
-            return NioServerSocketChannel.class;
+            return NioServerSocketChannel::new;
     }
 
 }

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

@@ -9,6 +9,7 @@
 import io.netty.channel.ChannelFutureListener;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.group.ChannelGroup;
+import io.netty.channel.group.ChannelMatchers;
 import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
 import pro.gravit.launcher.Launcher;
 import pro.gravit.launcher.events.ExceptionEvent;
@@ -120,22 +121,22 @@ public static void registerResponses() {
     }
 
     public void sendObject(ChannelHandlerContext ctx, Object obj) {
-        ctx.writeAndFlush(new TextWebSocketFrame(gson.toJson(obj, WebSocketEvent.class)));
+        ctx.writeAndFlush(new TextWebSocketFrame(gson.toJson(obj, WebSocketEvent.class)), ctx.voidPromise());
     }
 
     public void sendObject(ChannelHandlerContext ctx, Object obj, Type type) {
-        ctx.writeAndFlush(new TextWebSocketFrame(gson.toJson(obj, type)));
+        ctx.writeAndFlush(new TextWebSocketFrame(gson.toJson(obj, type)), ctx.voidPromise());
     }
 
     public void sendObjectAll(Object obj) {
         for (Channel ch : channels) {
-            ch.writeAndFlush(new TextWebSocketFrame(gson.toJson(obj, WebSocketEvent.class)));
+            ch.writeAndFlush(new TextWebSocketFrame(gson.toJson(obj, WebSocketEvent.class)), ch.voidPromise());
         }
     }
 
     public void sendObjectAll(Object obj, Type type) {
         for (Channel ch : channels) {
-            ch.writeAndFlush(new TextWebSocketFrame(gson.toJson(obj, type)));
+            ch.writeAndFlush(new TextWebSocketFrame(gson.toJson(obj, type)), ch.voidPromise());
         }
     }
 
@@ -148,7 +149,7 @@ public void sendObjectAndClose(ChannelHandlerContext ctx, Object obj, Type type)
     }
 
     public void sendEvent(EventResult obj) {
-        channels.writeAndFlush(new TextWebSocketFrame(gson.toJson(obj)));
+        channels.writeAndFlush(new TextWebSocketFrame(gson.toJson(obj)), ChannelMatchers.all(), true);
     }
 
     public static class EventResult implements WebSocketEvent {

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

@@ -36,7 +36,9 @@ protected void decode(ChannelHandlerContext ctx, HttpRequest msg, List<Object> o
             realIP = headers.get("X-Real-IP");
         }
         if (realIP != null) {
+            if (LogHelper.isDevEnabled()) {
                 LogHelper.dev("Real IP address %s", realIP);
+            }
             context.ip = realIP;
         } else LogHelper.error("IpForwarding error. Headers not found");
         out.add(msg);

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

@@ -2,6 +2,7 @@
 
 import java.util.concurrent.TimeUnit;
 
+import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 import io.netty.handler.codec.http.websocketx.CloseWebSocketFrame;
@@ -40,11 +41,14 @@ public void setClient(Client client) {
 
     @Override
     public void channelActive(ChannelHandlerContext ctx) {
+        if (LogHelper.isDevEnabled()) {
             LogHelper.dev("New client %s", IOHelper.getIP(ctx.channel().remoteAddress()));
+        }
         client = new Client(0);
-        service.registerClient(ctx.channel());
+        Channel ch = ctx.channel();
+        service.registerClient(ch);
         ctx.executor().schedule(() -> {
-            ctx.channel().writeAndFlush(new PingWebSocketFrame());
+            ch.writeAndFlush(new PingWebSocketFrame(), ch.voidPromise());
         }, 30L, TimeUnit.SECONDS);
     }
 
@@ -58,7 +62,9 @@ protected void channelRead0(ChannelHandlerContext ctx, WebSocketFrame frame) {
             ctx.channel().writeAndFlush(new PongWebSocketFrame(frame.content()));
             //return;
         } else if ((frame instanceof PongWebSocketFrame)) {
+           if (LogHelper.isDevEnabled()) {
                LogHelper.dev("WebSocket Client received pong");
+           }
         } else if ((frame instanceof CloseWebSocketFrame)) {
             ctx.channel().close();
         } else {

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

@@ -112,6 +112,7 @@ public void execute(ChannelHandlerContext ctx, Client clientData) throws Excepti
             result.permissions = clientData.permissions;
             if (authType == ConnectTypes.SERVER && !clientData.permissions.canServer) {
                 AuthProvider.authError("authType: SERVER not allowed for this account");
+                return;
             }
             if (getSession) {
                 if (clientData.session == 0) {
@@ -123,8 +124,10 @@ public void execute(ChannelHandlerContext ctx, Client clientData) throws Excepti
             if (authType != ConnectTypes.API && server.config.protectHandler.allowGetAccessToken(context)) {
                 UUID uuid = pair.handler.auth(aresult);
                 result.playerProfile = ProfileByUUIDResponse.getProfile(uuid, aresult.username, client, clientData.auth.textureProvider);
+                if (LogHelper.isDebugEnabled()) {
                     LogHelper.debug("Auth: %s accessToken %s uuid: %s", login, result.accessToken, uuid.toString());
                 }
+            }
             sendResult(result);
         } catch (AuthException | HWIDException | HookException e) {
             sendError(e.getMessage());

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

@@ -27,7 +27,9 @@ public void execute(ChannelHandlerContext ctx, Client pClient) {
             result.uuid = pClient.auth.handler.checkServer(username, serverID);
             if (result.uuid != null)
                 result.playerProfile = ProfileByUUIDResponse.getProfile(result.uuid, username, client, pClient.auth.textureProvider);
+            if (LogHelper.isDebugEnabled()) {
                 LogHelper.debug("checkServer: %s uuid: %s serverID: %s", result.playerProfile.username, result.uuid.toString(), serverID);
+            }
         } catch (AuthException | HookException e) {
             sendError(e.getMessage());
             return;

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

@@ -27,7 +27,9 @@ public void execute(ChannelHandlerContext ctx, Client client) {
                 LogHelper.warning("Client auth is null. Using default.");
                 success = server.config.getAuthProviderPair().handler.joinServer(username, accessToken, serverID);
             } else success = client.auth.handler.joinServer(username, accessToken, serverID);
+            if (LogHelper.isDebugEnabled()) {
                 LogHelper.debug("joinServer: %s accessToken: %s serverID: %s", username, accessToken, serverID);
+            }
         } catch (AuthException | HookException e) {
             sendError(e.getMessage());
             return;

Launcher/src/main/java/pro/gravit/launcher/LauncherAgent.java

@@ -22,6 +22,7 @@
 import cpw.mods.fml.SafeExitJVMLegacy;
 import net.minecraftforge.fml.SafeExitJVM;
 import pro.gravit.launcher.utils.NativeJVMHalt;
+import pro.gravit.utils.helper.JVMHelper;
 import pro.gravit.utils.helper.LogHelper;
 
 @LauncherAPI
@@ -46,6 +47,9 @@ public static void premain(String agentArgument, Instrumentation instrumentation
         NativeJVMHalt.class.getName();
         NativeJVMHalt.initFunc();
         isAgentStarted = true;
+        if (System.getProperty("java.vm.name").toUpperCase(Locale.US).contains("HOTSPOT"))
+        	try {
+        	    if (JVMHelper.OS_TYPE == JVMHelper.OS.MUSTDIE) {
                     boolean pb = true;
                     boolean rt = true;
                     if (agentArgument != null) {
@@ -55,10 +59,8 @@ public static void premain(String agentArgument, Instrumentation instrumentation
                             if (trimmedArg.contains("r")) rt = false;
                         }
                     }
-        if (System.getProperty("java.vm.name").toUpperCase(Locale.US).contains("HOTSPOT"))
+                    replaceClasses(pb, rt);
-        	try {
+                } else replaceClasses(false, false);
-        		if (ManagementFactory.getOperatingSystemMXBean().getName().startsWith("Windows")) replaceClasses(pb, rt);
-        		else replaceClasses(false, false);
         	} catch (Error e) {
         		NativeJVMHalt.haltA(294);
         		throw e;

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

@@ -14,11 +14,15 @@
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.nio.file.attribute.PosixFilePermission;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import javax.swing.JOptionPane;
 
@@ -55,16 +59,16 @@
 
 public final class ClientLauncher {
     private static final class ClassPathFileVisitor extends SimpleFileVisitor<Path> {
-        private final Collection<Path> result;
+        private final Stream.Builder<Path> result;
 
-        private ClassPathFileVisitor(Collection<Path> result) {
+        private ClassPathFileVisitor(Stream.Builder<Path> result) {
             this.result = result;
         }
 
         @Override
         public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
             if (IOHelper.hasExtension(file, "jar") || IOHelper.hasExtension(file, "zip"))
-                result.add(file);
+                result.accept(file);
             return super.visitFile(file, attrs);
         }
     }
@@ -282,10 +286,17 @@ private static void launch(ClientProfile profile, Params params) throws Throwabl
             System.setProperty("minecraft.applet.TargetDirectory", params.clientDir.toString());
         }
         Collections.addAll(args, profile.getClientArgs());
-        LogHelper.debug("Args: " + args);
+        List<String> copy = new ArrayList<>(args);
+        for (int i = 0, l = copy.size(); i < l; i++) {
+            String s = copy.get(i);
+            if ( i + 1 < l && ("--accessToken".equals(s) || "--session".equals(s))) {
+                copy.set(i + 1, "censored");
+            }
+        }
+        LogHelper.debug("Args: " + copy);
         // Resolve main class and method
         Class<?> mainClass = classLoader.loadClass(profile.getMainClass());
-        MethodHandle mainMethod = MethodHandles.publicLookup().findStatic(mainClass, "main", MethodType.methodType(void.class, String[].class)).asFixedArity();
+        MethodHandle mainMethod = MethodHandles.publicLookup().findStatic(mainClass, "main", MethodType.methodType(void.class, String[].class));
         Launcher.LAUNCHED.set(true);
         JVMHelper.fullGC();
         // Invoke main method
@@ -407,7 +418,7 @@ public static Process launch(
                 Thread.sleep(200);
             }
             if (!clientStarted) {
-                LogHelper.error("Write Client Params not successful. Using debug mode for more information");
+                LogHelper.error("Client did not start properly. Enable debug mode for more information");
             }
         }
         clientStarted = false;
@@ -515,32 +526,27 @@ public static void main(String... args) throws Throwable {
     }
 
     private static URL[] resolveClassPath(Path clientDir, String... classPath) throws IOException {
-        Collection<Path> result = new LinkedList<>();
+        return resolveClassPathStream(clientDir, classPath).map(IOHelper::toURL).toArray(URL[]::new);
-        for (String classPathEntry : classPath) {
-            Path path = clientDir.resolve(IOHelper.toPath(classPathEntry));
-            if (IOHelper.isDir(path)) { // Recursive walking and adding
-                IOHelper.walk(path, new ClassPathFileVisitor(result), false);
-                continue;
-            }
-            result.add(path);
-        }
-        return result.stream().map(IOHelper::toURL).toArray(URL[]::new);
     }
 
     private static LinkedList<Path> resolveClassPathList(Path clientDir, String... classPath) throws IOException {
-        LinkedList<Path> result = new LinkedList<>();
+        return resolveClassPathStream(clientDir, classPath).collect(Collectors.toCollection(LinkedList::new));
+    }
+
+    private static Stream<Path> resolveClassPathStream(Path clientDir, String... classPath) throws IOException {
+        Stream.Builder<Path> builder = Stream.builder();
         for (String classPathEntry : classPath) {
             Path path = clientDir.resolve(IOHelper.toPath(classPathEntry));
             if (IOHelper.isDir(path)) { // Recursive walking and adding
-                IOHelper.walk(path, new ClassPathFileVisitor(result), false);
+                IOHelper.walk(path, new ClassPathFileVisitor(builder), false);
                 continue;
             }
-            result.add(path);
+            builder.accept(path);
         }
-        return result;
+        return builder.build();
     }
 
-    public static void initGson() {
+    private static void initGson() {
         Launcher.gsonManager = new ClientGsonManager();
         Launcher.gsonManager.initGson();
     }
@@ -552,8 +558,8 @@ public static void setProfile(ClientProfile profile) {
     }
 
     public static void verifyHDir(Path dir, HashedDir hdir, FileNameMatcher matcher, boolean digest) throws IOException {
-        if (matcher != null)
+        //if (matcher != null)
-            matcher = matcher.verifyOnly();
+        //    matcher = matcher.verifyOnly();
 
         // Hash directory and compare (ignore update-only matcher entries, it will break offline-mode)
         HashedDir currentHDir = new HashedDir(dir, matcher, true, digest);

Launcher/src/main/java/pro/gravit/launcher/client/LauncherUpdateController.java

@@ -72,7 +72,9 @@ public void postDiff(UpdateRequest request, UpdateRequestEvent e, HashedDir.Diff
                     //if(file.isSame(ret, true))
                     {
                         Path source = request.getDir().resolve(path);
+                        if (LogHelper.isDebugEnabled()) {
                             LogHelper.debug("Copy file %s to %s", ret.toAbsolutePath().toString(), source.toAbsolutePath().toString());
+                        }
                         //Let's go!
                         Files.copy(ret, source);
                         try (InputStream input = IOHelper.newInput(ret)) {
@@ -93,11 +95,15 @@ public Path tryFind(NewLauncherSettings.HashedStoreEntry en, HashedFile file) th
             if (entry.getType() == HashedEntry.Type.DIR) return HashedDir.WalkAction.CONTINUE;
             HashedFile tfile = (HashedFile) entry;
             if (tfile.isSame(file)) {
+                if (LogHelper.isDevEnabled()) {
                     LogHelper.dev("[DIR:%s] Found file %s in %s", en.name, name, path);
+                }
                 Path tdir = Paths.get(en.fullPath).resolve(path);
                 try {
                     if (tfile.isSame(tdir, true)) {
+                        if (LogHelper.isDevEnabled()) {
                             LogHelper.dev("[DIR:%s] Confirmed file %s in %s", en.name, name, path);
+                        }
                         ret.set(tdir);
                         return HashedDir.WalkAction.STOP;
                     }

Launcher/src/main/java/pro/gravit/launcher/hwid/OshiHWIDProvider.java

@@ -68,6 +68,7 @@ public String getHWDisk() {
 
     public String getMacAddr() {
         for (NetworkIF networkIF : hardware.getNetworkIFs()) {
+            if (networkIF.getNetworkInterface().isVirtual()) continue;
             for (String ipv4 : networkIF.getIPv4addr()) {
                 if (ipv4.startsWith("127.")) continue;
                 if (ipv4.startsWith("10.")) continue;

Launcher/src/main/java/pro/gravit/launcher/utils/DirWatcher.java

@@ -27,15 +27,6 @@
 
 public final class DirWatcher implements Runnable, AutoCloseable {
     private final class RegisterFileVisitor extends SimpleFileVisitor<Path> {
-        private final Deque<String> path = new LinkedList<>();
-
-        @Override
-        public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
-            FileVisitResult result = super.postVisitDirectory(dir, exc);
-            if (!DirWatcher.this.dir.equals(dir))
-                path.removeLast();
-            return result;
-        }
 
         @Override
         public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
@@ -46,7 +37,6 @@ public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) th
             }
 
             // Maybe it's unnecessary to go deeper
-            path.add(IOHelper.getFileName(dir));
             //if (matcher != null && !matcher.shouldVerify(path)) {
             //    return FileVisitResult.SKIP_SUBTREE;
             //}

LauncherAPI/src/main/java/pro/gravit/launcher/downloader/ListDownloader.java

@@ -60,7 +60,9 @@ public void download(String base, List<DownloadTask> applies, Path dstDirFile, D
                 URI u = new URI(scheme, host, path + apply.apply, "", "");
                 callback.stateChanged(apply.apply, 0L, apply.size);
                 Path targetPath = dstDirFile.resolve(apply.apply);
+                if (LogHelper.isDebugEnabled()) {
                     LogHelper.debug("Download URL: %s to file %s dir: %s", u.toString(), targetPath.toAbsolutePath().toString(), dstDirFile.toAbsolutePath().toString());
+                }
                 if (get == null) get = new HttpGet(u);
                 else {
                     get.reset();
@@ -104,7 +106,9 @@ public void downloadOne(String url, Path target) throws IOException, URISyntaxEx
 
             HttpGet get;
             URI u = new URL(url).toURI();
+            if (LogHelper.isDebugEnabled()) {
                 LogHelper.debug("Download URL: %s", u.toString());
+            }
             get = new HttpGet(u);
             httpclient.execute(get, new FileDownloadResponseHandler(target.toAbsolutePath()));
         }
@@ -168,7 +172,9 @@ public Path handleResponse(HttpResponse response) throws IOException {
                         if (callback != null) {
                             callback.stateChanged(entry.getName(), 0, entry.getSize());
                         }
+                        if (LogHelper.isDevEnabled()) {
                             LogHelper.dev("Resolved filename %s to %s", filename, target.toAbsolutePath().toString());
+                        }
                         transfer(source, target, filename, size, callback, totalCallback);
                         entry = input.getNextEntry();
                     }

LauncherAPI/src/main/java/pro/gravit/launcher/managers/SimpleModuleManager.java

@@ -50,7 +50,9 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO
     public void autoload(Path dir) throws IOException {
         LogHelper.info("Load modules");
         if (Files.notExists(dir)) Files.createDirectory(dir);
+        else {
             IOHelper.walk(dir, new ModulesVisitor(), true);
+        }
         sort();
         LogHelper.info("Loaded %d modules", modules.size());
     }

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

@@ -85,7 +85,7 @@ public void open() throws Exception {
 
     public ChannelFuture send(String text) {
         LogHelper.dev("Send: %s", text);
-        return ch.writeAndFlush(new TextWebSocketFrame(text));
+        return ch.writeAndFlush(new TextWebSocketFrame(text), ch.voidPromise());
     }
 
     abstract void onMessage(String message) throws Exception;
@@ -98,7 +98,7 @@ public void close() throws InterruptedException {
         //System.out.println("WebSocket Client sending close");
         isClosed = true;
         if (ch != null && ch.isActive()) {
-            ch.writeAndFlush(new CloseWebSocketFrame());
+            ch.writeAndFlush(new CloseWebSocketFrame(), ch.voidPromise());
             ch.closeFuture().sync();
         }
 
@@ -106,7 +106,7 @@ public void close() throws InterruptedException {
     }
 
     public void eval(final String text) throws IOException {
-        ch.writeAndFlush(new TextWebSocketFrame(text));
+        ch.writeAndFlush(new TextWebSocketFrame(text), ch.voidPromise());
     }
 
 }

LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/StandartClientWebSocketService.java

@@ -56,8 +56,8 @@ public boolean isDone() {
         @Override
         public WebSocketEvent get() throws InterruptedException, ExecutionException {
             if (isCanceled) return null;
-            while (!event.ready) {
             synchronized (event) {
+                while (!event.ready) {
                     event.wait();
                 }
             }
@@ -73,8 +73,8 @@ public WebSocketEvent get() throws InterruptedException, ExecutionException {
         @Override
         public WebSocketEvent get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException {
             if (isCanceled) return null;
-            while (!event.ready) {
             synchronized (event) {
+                while (!event.ready) {
                     event.wait(timeout);
                 }
             }

LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/WebSocketClientHandler.java

@@ -73,12 +73,14 @@ protected void channelRead0(ChannelHandlerContext ctx, Object msg) throws Except
         if (frame instanceof TextWebSocketFrame) {
             final TextWebSocketFrame textFrame = (TextWebSocketFrame) frame;
             clientJSONPoint.onMessage(textFrame.text());
+            if (LogHelper.isDevEnabled()) {
                 LogHelper.dev("Message: %s", textFrame.text());
+            }
             // uncomment to print request
             // logger.info(textFrame.text());
         } else if ((frame instanceof PingWebSocketFrame)) {
             frame.content().retain();
-            ctx.channel().writeAndFlush(new PongWebSocketFrame(frame.content()));
+            ch.writeAndFlush(new PongWebSocketFrame(frame.content()), ch.voidPromise());
             //return;
         } else if (frame instanceof PongWebSocketFrame) {
         } else if (frame instanceof CloseWebSocketFrame)

LauncherAuthlib/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java

@@ -46,8 +46,11 @@ public void findProfilesByNames(String[] usernames, Agent agent, ProfileLookupCa
             try {
                 sliceProfiles = new BatchProfileByUsernameRequest(sliceUsernames).request().playerProfiles;
             } catch (Exception e) {
+                boolean debug = LogHelper.isDebugEnabled();
                 for (String username : sliceUsernames) {
+                    if (debug) {
                         LogHelper.debug("Couldn't find profile '%s': %s", username, e);
+                    }
                     callback.onProfileLookupFailed(new GameProfile((UUID) null, username), e);
                 }
 
@@ -57,17 +60,23 @@ public void findProfilesByNames(String[] usernames, Agent agent, ProfileLookupCa
             }
 
             // Request succeeded!
-            for (int i = 0; i < sliceProfiles.length; i++) {
+            int len = sliceProfiles.length;
+            boolean debug = len > 0 && LogHelper.isDebugEnabled();
+            for (int i = 0; i < len; i++) {
                 PlayerProfile pp = sliceProfiles[i];
                 if (pp == null) {
                     String username = sliceUsernames[i];
+                    if (debug) {
                         LogHelper.debug("Couldn't find profile '%s'", username);
+                    }
                     callback.onProfileLookupFailed(new GameProfile((UUID) null, username), new ProfileNotFoundException("Server did not find the requested profile"));
                     continue;
                 }
 
                 // Report as looked up
+                if (debug) {
                     LogHelper.debug("Successfully looked up profile '%s'", pp.username);
+                }
                 callback.onProfileLookupSucceeded(YggdrasilMinecraftSessionService.toGameProfile(pp));
             }
 

LauncherAuthlib/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilMinecraftSessionService.java

@@ -33,7 +33,10 @@ public final class YggdrasilMinecraftSessionService extends BaseMinecraftSession
     public static final boolean NO_TEXTURES = Boolean.parseBoolean("launcher.com.mojang.authlib.noTextures");
 
     public static void fillTextureProperties(GameProfile profile, PlayerProfile pp) {
+        boolean debug = LogHelper.isDebugEnabled();
+        if (debug) {
             LogHelper.debug("fillTextureProperties, Username: '%s'", profile.getName());
+        }
         if (NO_TEXTURES)
             return;
 
@@ -42,14 +45,18 @@ public static void fillTextureProperties(GameProfile profile, PlayerProfile pp)
         if (pp.skin != null) {
             properties.put(Launcher.SKIN_URL_PROPERTY, new Property(Launcher.SKIN_URL_PROPERTY, pp.skin.url, ""));
             properties.put(Launcher.SKIN_DIGEST_PROPERTY, new Property(Launcher.SKIN_DIGEST_PROPERTY, SecurityHelper.toHex(pp.skin.digest), ""));
+            if (debug) {
                 LogHelper.debug("fillTextureProperties, Has skin texture for username '%s'", profile.getName());
             }
+        }
         if (pp.cloak != null) {
             properties.put(Launcher.CLOAK_URL_PROPERTY, new Property(Launcher.CLOAK_URL_PROPERTY, pp.cloak.url, ""));
             properties.put(Launcher.CLOAK_DIGEST_PROPERTY, new Property(Launcher.CLOAK_DIGEST_PROPERTY, SecurityHelper.toHex(pp.cloak.digest), ""));
+            if (debug) {
                 LogHelper.debug("fillTextureProperties, Has cloak texture for username '%s'", profile.getName());
             }
         }
+    }
 
     private static void getTexturesMojang(Map<MinecraftProfileTexture.Type, MinecraftProfileTexture> textures, String texturesBase64, GameProfile profile) {
         // Decode textures payload
@@ -92,7 +99,10 @@ public YggdrasilMinecraftSessionService(AuthenticationService service) {
     public GameProfile fillProfileProperties(GameProfile profile, boolean requireSecure) {
         // Verify has UUID
         UUID uuid = profile.getUUID();
+        boolean debug = LogHelper.isDebugEnabled();
+        if (debug) {
             LogHelper.debug("fillProfileProperties, UUID: %s", uuid);
+        }
         if (uuid == null)
             return profile;
 
@@ -101,25 +111,33 @@ public GameProfile fillProfileProperties(GameProfile profile, boolean requireSec
         try {
             pp = new ProfileByUUIDRequest(uuid).request().playerProfile;
         } catch (Exception e) {
+            if (debug) {
                 LogHelper.debug("Couldn't fetch profile properties for '%s': %s", profile, e);
+            }
             return profile;
         }
 
         // Verify is found
         if (pp == null) {
+            if (debug) {
                 LogHelper.debug("Couldn't fetch profile properties for '%s' as the profile does not exist", profile);
+            }
             return profile;
         }
 
         // Create new game profile from player profile
+        if (debug) {
             LogHelper.debug("Successfully fetched profile properties for '%s'", profile);
+        }
         fillTextureProperties(profile, pp);
         return toGameProfile(pp);
     }
 
     @Override
     public Map<MinecraftProfileTexture.Type, MinecraftProfileTexture> getTextures(GameProfile profile, boolean requireSecure) {
+        if (LogHelper.isDebugEnabled()) {
             LogHelper.debug("getTextures, Username: '%s', UUID: '%s'", profile.getName(), profile.getUUID());
+        }
         Map<MinecraftProfileTexture.Type, MinecraftProfileTexture> textures = new EnumMap<>(MinecraftProfileTexture.Type.class);
 
         // Add textures
@@ -151,7 +169,9 @@ public Map<MinecraftProfileTexture.Type, MinecraftProfileTexture> getTextures(Ga
     @Override
     public GameProfile hasJoinedServer(GameProfile profile, String serverID) throws AuthenticationUnavailableException {
         String username = profile.getName();
+        if (LogHelper.isDebugEnabled()) {
             LogHelper.debug("checkServer, Username: '%s', Server ID: %s", username, serverID);
+        }
 
         // Make checkServer request
         PlayerProfile pp;
@@ -180,7 +200,9 @@ public void joinServer(GameProfile profile, String accessToken, String serverID)
 
         // Join server
         String username = profile.getName();
+        if (LogHelper.isDebugEnabled()) {
             LogHelper.debug("joinServer, Username: '%s', Access token: %s, Server ID: %s", username, accessToken, serverID);
+        }
 
         // Make joinServer request
         boolean success;

LauncherAuthlib/src/main/java/cpw/mods/fml/SafeExitJVMLegacy.java

@@ -6,10 +6,6 @@
 // Не входящих в пакеты самого Forge
 public class SafeExitJVMLegacy {
     public static void exit(int code) {
-        try {
         JVMHelper.RUNTIME.halt(code);
-        } catch (Throwable e) {
-            System.exit(code);
-        }
     }
 }

LauncherAuthlib/src/main/java/net/minecraftforge/fml/SafeExitJVM.java

@@ -6,10 +6,6 @@
 // Не входящих в пакеты самого Forge
 public class SafeExitJVM {
     public static void exit(int code) {
-        try {
         JVMHelper.RUNTIME.halt(code);
-        } catch (Throwable e) {
-            System.exit(code);
-        }
     }
 }

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

@@ -173,16 +173,24 @@ public void removeR(String name) {
         for (String s : dirs) {
             HashedEntry e = current.get(s);
             if (e == null) {
+                if (LogHelper.isDebugEnabled()) {
                     LogHelper.debug("Null %s", s);
+                }
+                if (LogHelper.isDebugEnabled()) {
                     for (String x : current.keySet()) LogHelper.debug("Contains %s", x);
+                }
                 break;
             }
             if (e.getType() == Type.DIR) {
                 current = ((HashedDir) e).map;
+                if (LogHelper.isDebugEnabled()) {
                     LogHelper.debug("Found dir %s", s);
+                }
             } else {
                 current.remove(s);
+                if (LogHelper.isDebugEnabled()) {
                     LogHelper.debug("Found filename %s", s);
+                }
                 break;
             }
         }

LauncherCore/src/main/java/pro/gravit/launcher/hasher/HashedEntryAdapter.java

@@ -26,7 +26,6 @@ public HashedEntry deserialize(JsonElement json, Type typeOfT, JsonDeserializati
         if (typename.equals("dir")) cls = HashedDir.class;
         if (typename.equals("file")) cls = HashedFile.class;
 
-
         return (HashedEntry) context.deserialize(json, cls);
     }
 

LauncherCore/src/main/java/pro/gravit/launcher/managers/GarbageManager.java

@@ -1,6 +1,7 @@
 package pro.gravit.launcher.managers;
 
-import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.Timer;
 import java.util.TimerTask;
 
@@ -19,7 +20,7 @@ public Entry(NeedGarbageCollection invoke, long timer) {
 
     private static final Timer timer = new Timer("GarbageTimer");
 
-    private static final ArrayList<Entry> NEED_GARBARE_COLLECTION = new ArrayList<>();
+    private static final Set<Entry> NEED_GARBARE_COLLECTION = new HashSet<>();
 
     public static void gc() {
         for (Entry gc : NEED_GARBARE_COLLECTION)

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

@@ -624,7 +624,11 @@ public static void setSocketFlags(Socket socket) throws SocketException {
 
         // Set socket options
         socket.setSoTimeout(SOCKET_TIMEOUT);
+        try {
             socket.setTrafficClass(0b11100);
+        } catch (SocketException ignored) {
+            // Windows XP has no support for that
+        }
         socket.setPerformancePreferences(1, 0, 2);
     }
 

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

@@ -345,14 +345,9 @@ public static void subWarning(String format, Object... args) {
 
     @LauncherAPI
     public static String toString(Throwable exc) {
-        try (StringWriter sw = new StringWriter()) {
+        StringWriter sw = new StringWriter();
-            try (PrintWriter pw = new PrintWriter(sw)) {
+        exc.printStackTrace(new PrintWriter(sw));
-                exc.printStackTrace(pw);
-            }
         return sw.toString();
-        } catch (IOException e) {
-            throw new InternalError(e);
-        }
     }
 
     @LauncherAPI

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

@@ -105,7 +105,7 @@ public void run(String... args) throws Throwable {
             loadConfig();
             ServerWrapperSetup setup = new ServerWrapperSetup();
             setup.run();
-            System.exit(0);
+            System.exit(1);
         }
         modulesManager = new ModulesManager(wrapper);
         modulesManager.autoload(modulesDir);