From b1e0fb65df5c4fc0518c245b8895f2a2be192fb7 Mon Sep 17 00:00:00 2001 From: zaxar163 Date: Sat, 27 Apr 2019 18:31:18 +0300 Subject: [PATCH] =?UTF-8?q?[FIX]=20=D0=A3=D0=B1=D1=80=D0=B0=D0=BD=D1=8B=20?= =?UTF-8?q?=D0=BB=D0=B8=D1=88=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BB=D0=B0=D1=81?= =?UTF-8?q?=D1=81=D1=8B=20=D0=B8=D0=B7=20libLauncher.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cpw/mods/fml/SafeExitJVMLegacy.java | 0 .../src/main/java/net/minecraftforge/fml/SafeExitJVM.java | 0 .../src/main/java/ru/gravit/launcher/LauncherAgent.java | 3 ++- .../src/main/java/ru/gravit/launcher/LauncherEngine.java | 3 +-- .../java/ru/gravit/launcher/client/ClientLauncher.java | 6 +----- .../java/ru/gravit/launcher/managers}/NativeJVMHalt.java | 2 +- .../main/java/ru/gravit/launcher/utils}/DirWatcher.java | 8 ++++++-- 7 files changed, 11 insertions(+), 11 deletions(-) rename {libLauncher => Launcher}/src/main/java/cpw/mods/fml/SafeExitJVMLegacy.java (100%) rename {libLauncher => Launcher}/src/main/java/net/minecraftforge/fml/SafeExitJVM.java (100%) rename {libLauncher/src/main/java/ru/gravit/utils => Launcher/src/main/java/ru/gravit/launcher/managers}/NativeJVMHalt.java (96%) rename {libLauncher/src/main/java/ru/gravit/launcher/hasher => Launcher/src/main/java/ru/gravit/launcher/utils}/DirWatcher.java (95%) diff --git a/libLauncher/src/main/java/cpw/mods/fml/SafeExitJVMLegacy.java b/Launcher/src/main/java/cpw/mods/fml/SafeExitJVMLegacy.java similarity index 100% rename from libLauncher/src/main/java/cpw/mods/fml/SafeExitJVMLegacy.java rename to Launcher/src/main/java/cpw/mods/fml/SafeExitJVMLegacy.java diff --git a/libLauncher/src/main/java/net/minecraftforge/fml/SafeExitJVM.java b/Launcher/src/main/java/net/minecraftforge/fml/SafeExitJVM.java similarity index 100% rename from libLauncher/src/main/java/net/minecraftforge/fml/SafeExitJVM.java rename to Launcher/src/main/java/net/minecraftforge/fml/SafeExitJVM.java diff --git a/Launcher/src/main/java/ru/gravit/launcher/LauncherAgent.java b/Launcher/src/main/java/ru/gravit/launcher/LauncherAgent.java index f42740fc..9b879f62 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/LauncherAgent.java +++ b/Launcher/src/main/java/ru/gravit/launcher/LauncherAgent.java @@ -7,7 +7,8 @@ import org.objectweb.asm.tree.ClassNode; import org.objectweb.asm.tree.InsnNode; import org.objectweb.asm.tree.MethodNode; -import ru.gravit.utils.NativeJVMHalt; + +import ru.gravit.launcher.managers.NativeJVMHalt; import ru.gravit.utils.helper.LogHelper; import java.io.ByteArrayOutputStream; diff --git a/Launcher/src/main/java/ru/gravit/launcher/LauncherEngine.java b/Launcher/src/main/java/ru/gravit/launcher/LauncherEngine.java index 85f82be1..52c4d22b 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/LauncherEngine.java +++ b/Launcher/src/main/java/ru/gravit/launcher/LauncherEngine.java @@ -9,7 +9,6 @@ import ru.gravit.launcher.managers.ClientGsonManager; import ru.gravit.launcher.managers.ConsoleManager; import ru.gravit.launcher.request.Request; -import ru.gravit.launcher.request.websockets.ClientWebSocketService; import ru.gravit.launcher.request.websockets.StandartClientWebSocketService; import ru.gravit.utils.helper.CommonHelper; import ru.gravit.utils.helper.EnvHelper; @@ -25,7 +24,7 @@ public static void main(String... args) throws Throwable { JVMHelper.checkStackTrace(LauncherEngine.class); JVMHelper.verifySystemProperties(Launcher.class, true); EnvHelper.checkDangerousParams(); - //if(!LauncherAgent.isStarted()) throw new SecurityException("JavaAgent not set"); + if(!LauncherAgent.isStarted()) throw new SecurityException("JavaAgent not set"); LogHelper.printVersion("Launcher"); LogHelper.printLicense("Launcher"); // Start Launcher diff --git a/Launcher/src/main/java/ru/gravit/launcher/client/ClientLauncher.java b/Launcher/src/main/java/ru/gravit/launcher/client/ClientLauncher.java index 3609fe38..6a623aec 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/client/ClientLauncher.java +++ b/Launcher/src/main/java/ru/gravit/launcher/client/ClientLauncher.java @@ -3,10 +3,8 @@ import ru.gravit.launcher.*; import ru.gravit.launcher.guard.LauncherGuardManager; import ru.gravit.launcher.gui.JSRuntimeProvider; -import ru.gravit.launcher.hasher.DirWatcher; import ru.gravit.launcher.hasher.FileNameMatcher; import ru.gravit.launcher.hasher.HashedDir; -import ru.gravit.launcher.hasher.HashedEntry; import ru.gravit.launcher.managers.ClientGsonManager; import ru.gravit.launcher.profiles.ClientProfile; import ru.gravit.launcher.profiles.PlayerProfile; @@ -15,12 +13,12 @@ import ru.gravit.launcher.serialize.HInput; import ru.gravit.launcher.serialize.HOutput; import ru.gravit.launcher.serialize.stream.StreamObject; +import ru.gravit.launcher.utils.DirWatcher; import ru.gravit.utils.PublicURLClassLoader; import ru.gravit.utils.helper.*; import ru.gravit.utils.helper.JVMHelper.OS; import javax.swing.*; -import java.io.File; import java.io.IOException; import java.lang.ProcessBuilder.Redirect; import java.lang.invoke.MethodHandle; @@ -36,10 +34,8 @@ import java.nio.file.attribute.BasicFileAttributes; import java.nio.file.attribute.PosixFilePermission; import java.util.*; -import java.util.concurrent.atomic.AtomicBoolean; public final class ClientLauncher { - private static final class ClassPathFileVisitor extends SimpleFileVisitor { private final Collection result; diff --git a/libLauncher/src/main/java/ru/gravit/utils/NativeJVMHalt.java b/Launcher/src/main/java/ru/gravit/launcher/managers/NativeJVMHalt.java similarity index 96% rename from libLauncher/src/main/java/ru/gravit/utils/NativeJVMHalt.java rename to Launcher/src/main/java/ru/gravit/launcher/managers/NativeJVMHalt.java index 5a154c50..cf166035 100644 --- a/libLauncher/src/main/java/ru/gravit/utils/NativeJVMHalt.java +++ b/Launcher/src/main/java/ru/gravit/launcher/managers/NativeJVMHalt.java @@ -1,4 +1,4 @@ -package ru.gravit.utils; +package ru.gravit.launcher.managers; import cpw.mods.fml.SafeExitJVMLegacy; import net.minecraftforge.fml.SafeExitJVM; diff --git a/libLauncher/src/main/java/ru/gravit/launcher/hasher/DirWatcher.java b/Launcher/src/main/java/ru/gravit/launcher/utils/DirWatcher.java similarity index 95% rename from libLauncher/src/main/java/ru/gravit/launcher/hasher/DirWatcher.java rename to Launcher/src/main/java/ru/gravit/launcher/utils/DirWatcher.java index cc0aaba8..f9157c35 100644 --- a/libLauncher/src/main/java/ru/gravit/launcher/hasher/DirWatcher.java +++ b/Launcher/src/main/java/ru/gravit/launcher/utils/DirWatcher.java @@ -1,8 +1,12 @@ -package ru.gravit.launcher.hasher; +package ru.gravit.launcher.utils; import ru.gravit.launcher.LauncherAPI; +import ru.gravit.launcher.hasher.FileNameMatcher; +import ru.gravit.launcher.hasher.HashedDir; +import ru.gravit.launcher.hasher.HashedEntry; +import ru.gravit.launcher.hasher.HashedFile; import ru.gravit.launcher.hasher.HashedEntry.Type; -import ru.gravit.utils.NativeJVMHalt; +import ru.gravit.launcher.managers.NativeJVMHalt; import ru.gravit.utils.helper.IOHelper; import ru.gravit.utils.helper.JVMHelper; import ru.gravit.utils.helper.JVMHelper.OS;