diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/SetProfileRequest.java b/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/SetProfileRequest.java index c749edfa..8c391fe6 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/SetProfileRequest.java +++ b/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/SetProfileRequest.java @@ -8,12 +8,10 @@ import ru.gravit.launcher.request.websockets.RequestInterface; public class SetProfileRequest extends Request implements RequestInterface { - private transient ClientProfile profile; @LauncherNetworkAPI public String client; public SetProfileRequest(ClientProfile profile) { - this.profile = profile; this.client = profile.getTitle(); } diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/update/UpdateRequest.java b/LauncherAPI/src/main/java/ru/gravit/launcher/request/update/UpdateRequest.java index 25258cf9..68401d5b 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/update/UpdateRequest.java +++ b/LauncherAPI/src/main/java/ru/gravit/launcher/request/update/UpdateRequest.java @@ -10,7 +10,6 @@ import ru.gravit.launcher.hasher.HashedEntry; import ru.gravit.launcher.hasher.HashedFile; import ru.gravit.launcher.request.Request; -import ru.gravit.launcher.request.UpdateAction; import ru.gravit.launcher.request.update.UpdateRequest.State.Callback; import ru.gravit.launcher.request.websockets.LegacyRequestBridge; import ru.gravit.launcher.request.websockets.RequestInterface; @@ -26,7 +25,6 @@ import java.util.List; import java.util.Map.Entry; import java.util.Objects; -import java.util.Queue; public final class UpdateRequest extends Request implements RequestInterface { @@ -168,26 +166,6 @@ public double getTotalSizeMiB() { } } - private static void fillActionsQueue(Queue queue, HashedDir mismatch) { - for (Entry mapEntry : mismatch.map().entrySet()) { - String name = mapEntry.getKey(); - HashedEntry entry = mapEntry.getValue(); - HashedEntry.Type entryType = entry.getType(); - switch (entryType) { - case DIR: // cd - get - cd .. - queue.add(new UpdateAction(UpdateAction.Type.CD, name, entry)); - fillActionsQueue(queue, (HashedDir) entry); - queue.add(UpdateAction.CD_BACK); - break; - case FILE: // get - queue.add(new UpdateAction(UpdateAction.Type.GET, name, entry)); - break; - default: - throw new AssertionError("Unsupported hashed entry type: " + entryType.name()); - } - } - } - @Override public UpdateRequestEvent requestDo() throws Exception { LogHelper.debug("Start update request"); diff --git a/ServerWrapper/src/main/java/ru/gravit/launcher/server/ServerWrapper.java b/ServerWrapper/src/main/java/ru/gravit/launcher/server/ServerWrapper.java index 115f978b..ec2974cc 100644 --- a/ServerWrapper/src/main/java/ru/gravit/launcher/server/ServerWrapper.java +++ b/ServerWrapper/src/main/java/ru/gravit/launcher/server/ServerWrapper.java @@ -37,7 +37,7 @@ public class ServerWrapper extends JsonConfigurable { public ClassLoader loader; public ClientPermissions permissions; public static ServerWrapper wrapper; - private static Gson gson; + public static Gson gson; private static GsonBuilder gsonBuiler; public static Path modulesDir = Paths.get(System.getProperty("serverwrapper.modulesDir", "modules")); diff --git a/ServerWrapper/src/main/java/ru/gravit/launcher/server/setup/ServerWrapperSetup.java b/ServerWrapper/src/main/java/ru/gravit/launcher/server/setup/ServerWrapperSetup.java index d583d160..b7d192ec 100644 --- a/ServerWrapper/src/main/java/ru/gravit/launcher/server/setup/ServerWrapperSetup.java +++ b/ServerWrapper/src/main/java/ru/gravit/launcher/server/setup/ServerWrapperSetup.java @@ -1,6 +1,5 @@ package ru.gravit.launcher.server.setup; -import ru.gravit.launcher.LauncherConfig; import ru.gravit.launcher.server.ServerWrapper; import ru.gravit.utils.PublicURLClassLoader; import ru.gravit.utils.helper.IOHelper; @@ -24,20 +23,22 @@ public void run() throws IOException { System.out.println("Print jar filename:"); String jarName = commands.commandHandler.readLine(); Path jarPath = Paths.get(jarName); - JarFile file = new JarFile(jarPath.toFile()); - URL jarURL = jarPath.toUri().toURL(); - urlClassLoader = new PublicURLClassLoader(new URL[]{jarURL}); - LogHelper.info("Check jar MainClass"); - String mainClassName = file.getManifest().getMainAttributes().getValue("Main-Class"); - if (mainClassName == null) { - LogHelper.error("Main-Class not found in MANIFEST"); - return; - } - try { - Class mainClass = Class.forName(mainClassName, false, urlClassLoader); - } catch (ClassNotFoundException e) { - LogHelper.error(e); - return; + String mainClassName = null; + try (JarFile file = new JarFile(jarPath.toFile())) { + URL jarURL = jarPath.toUri().toURL(); + urlClassLoader = new PublicURLClassLoader(new URL[]{jarURL}); + LogHelper.info("Check jar MainClass"); + mainClassName = file.getManifest().getMainAttributes().getValue("Main-Class"); + if (mainClassName == null) { + LogHelper.error("Main-Class not found in MANIFEST"); + return; + } + try { + Class.forName(mainClassName, false, urlClassLoader); + } catch (ClassNotFoundException e) { + LogHelper.error(e); + return; + } } LogHelper.info("Found MainClass %s", mainClassName); System.out.println("Print launchserver websocket host:"); @@ -66,7 +67,6 @@ public void run() throws IOException { wrapper.config.password = password; wrapper.config.title = title; wrapper.config.stopOnError = false; - LauncherConfig cfg = null; if (wrapper.auth()) { break; diff --git a/libLauncher/src/main/java/ru/gravit/launcher/managers/ConfigManager.java b/libLauncher/src/main/java/ru/gravit/launcher/managers/ConfigManager.java index 7723de55..d2269162 100644 --- a/libLauncher/src/main/java/ru/gravit/launcher/managers/ConfigManager.java +++ b/libLauncher/src/main/java/ru/gravit/launcher/managers/ConfigManager.java @@ -9,8 +9,9 @@ import java.util.HashMap; import java.util.Objects; +@SuppressWarnings("rawtypes") public class ConfigManager { - private final HashMap CONFIGURABLE = new HashMap<>(); + private final HashMap CONFIGURABLE = new HashMap<>(); public void registerConfigurable(String name, JsonConfigurable reconfigurable) { VerifyHelper.putIfAbsent(CONFIGURABLE, name.toLowerCase(), Objects.requireNonNull(reconfigurable, "adapter"),