diff --git a/LaunchServer/build.gradle b/LaunchServer/build.gradle index fde96714..0316c75a 100644 --- a/LaunchServer/build.gradle +++ b/LaunchServer/build.gradle @@ -1,5 +1,5 @@ -def mainClassName = "ru.gravit.launchserver.LaunchServer" -def mainAgentName = "ru.gravit.launchserver.StarterAgent" +def mainClassName = "pro.gravit.launchserver.LaunchServer" +def mainAgentName = "pro.gravit.launchserver.StarterAgent" evaluationDependsOn(':Launcher') diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java b/LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServer.java similarity index 93% rename from LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServer.java index e6f15e8d..e618b9c7 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/LaunchServer.java @@ -1,45 +1,47 @@ -package ru.gravit.launchserver; +package pro.gravit.launchserver; import io.netty.handler.logging.LogLevel; -import ru.gravit.launcher.Launcher; -import ru.gravit.launcher.LauncherConfig; -import ru.gravit.launcher.NeedGarbageCollection; -import ru.gravit.launcher.config.JsonConfigurable; -import ru.gravit.launcher.hasher.HashedDir; -import ru.gravit.launcher.managers.ConfigManager; -import ru.gravit.launcher.managers.GarbageManager; -import ru.gravit.launcher.profiles.ClientProfile; -import ru.gravit.launcher.serialize.signed.SignedObjectHolder; -import ru.gravit.launchserver.auth.AuthProviderPair; -import ru.gravit.launchserver.auth.handler.AuthHandler; -import ru.gravit.launchserver.auth.handler.MemoryAuthHandler; -import ru.gravit.launchserver.auth.hwid.AcceptHWIDHandler; -import ru.gravit.launchserver.auth.hwid.HWIDHandler; -import ru.gravit.launchserver.auth.permissions.DefaultPermissionsHandler; -import ru.gravit.launchserver.auth.permissions.JsonFilePermissionsHandler; -import ru.gravit.launchserver.auth.permissions.PermissionsHandler; -import ru.gravit.launchserver.auth.protect.NoProtectHandler; -import ru.gravit.launchserver.auth.protect.ProtectHandler; -import ru.gravit.launchserver.auth.provider.AuthProvider; -import ru.gravit.launchserver.auth.provider.RejectAuthProvider; -import ru.gravit.launchserver.auth.texture.RequestTextureProvider; -import ru.gravit.launchserver.auth.texture.TextureProvider; -import ru.gravit.launchserver.binary.*; -import ru.gravit.launchserver.components.AuthLimiterComponent; -import ru.gravit.launchserver.components.Component; -import ru.gravit.launchserver.config.LaunchServerRuntimeConfig; -import ru.gravit.launchserver.legacy.Response; -import ru.gravit.launchserver.manangers.*; -import ru.gravit.launchserver.manangers.hook.AuthHookManager; -import ru.gravit.launchserver.manangers.hook.BuildHookManager; -import ru.gravit.launchserver.manangers.hook.SocketHookManager; -import ru.gravit.launchserver.socket.ServerSocketHandler; -import ru.gravit.launchserver.websocket.NettyServerSocketHandler; -import ru.gravit.utils.Version; -import ru.gravit.utils.command.CommandHandler; -import ru.gravit.utils.command.JLineCommandHandler; -import ru.gravit.utils.command.StdCommandHandler; -import ru.gravit.utils.helper.*; +import pro.gravit.launchserver.auth.AuthProviderPair; +import pro.gravit.launchserver.auth.handler.AuthHandler; +import pro.gravit.launchserver.auth.handler.MemoryAuthHandler; +import pro.gravit.launchserver.auth.hwid.AcceptHWIDHandler; +import pro.gravit.launchserver.auth.hwid.HWIDHandler; +import pro.gravit.launchserver.auth.permissions.DefaultPermissionsHandler; +import pro.gravit.launchserver.auth.permissions.JsonFilePermissionsHandler; +import pro.gravit.launchserver.auth.permissions.PermissionsHandler; +import pro.gravit.launchserver.auth.protect.NoProtectHandler; +import pro.gravit.launchserver.auth.protect.ProtectHandler; +import pro.gravit.launchserver.auth.provider.AuthProvider; +import pro.gravit.launchserver.auth.provider.RejectAuthProvider; +import pro.gravit.launchserver.auth.texture.RequestTextureProvider; +import pro.gravit.launchserver.auth.texture.TextureProvider; +import pro.gravit.launchserver.binary.*; +import pro.gravit.launchserver.components.AuthLimiterComponent; +import pro.gravit.launchserver.components.Component; +import pro.gravit.launchserver.config.LaunchServerRuntimeConfig; +import pro.gravit.launchserver.legacy.Response; +import pro.gravit.launchserver.manangers.*; +import pro.gravit.launchserver.manangers.hook.AuthHookManager; +import pro.gravit.launchserver.manangers.hook.BuildHookManager; +import pro.gravit.launchserver.manangers.hook.SocketHookManager; +import pro.gravit.launchserver.socket.ServerSocketHandler; +import pro.gravit.launchserver.websocket.NettyServerSocketHandler; +import pro.gravit.launcher.Launcher; +import pro.gravit.launcher.LauncherConfig; +import pro.gravit.launcher.NeedGarbageCollection; +import pro.gravit.launcher.config.JsonConfigurable; +import pro.gravit.launcher.hasher.HashedDir; +import pro.gravit.launcher.managers.ConfigManager; +import pro.gravit.launcher.managers.GarbageManager; +import pro.gravit.launcher.profiles.ClientProfile; +import pro.gravit.launcher.serialize.signed.SignedObjectHolder; +import pro.gravit.utils.helper.*; +import pro.gravit.launchserver.binary.*; +import pro.gravit.launchserver.manangers.*; +import pro.gravit.utils.Version; +import pro.gravit.utils.command.CommandHandler; +import pro.gravit.utils.command.JLineCommandHandler; +import pro.gravit.utils.command.StdCommandHandler; import java.io.*; import java.lang.ProcessBuilder.Redirect; @@ -494,7 +496,7 @@ public LaunchServer(Path dir, boolean testEnv, String[] args) throws IOException localCommandHandler = new StdCommandHandler(true); LogHelper.warning("JLine2 isn't in classpath, using std"); } - ru.gravit.launchserver.command.handler.CommandHandler.registerCommands(localCommandHandler); + pro.gravit.launchserver.command.handler.CommandHandler.registerCommands(localCommandHandler); commandHandler = localCommandHandler; // Set key pair diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/Reconfigurable.java b/LaunchServer/src/main/java/pro/gravit/launchserver/Reconfigurable.java similarity index 77% rename from LaunchServer/src/main/java/ru/gravit/launchserver/Reconfigurable.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/Reconfigurable.java index 2fd01db1..45ee0193 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/Reconfigurable.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/Reconfigurable.java @@ -1,4 +1,4 @@ -package ru.gravit.launchserver; +package pro.gravit.launchserver; public interface Reconfigurable { void reconfig(String action, String[] args); diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/Reloadable.java b/LaunchServer/src/main/java/pro/gravit/launchserver/Reloadable.java similarity index 73% rename from LaunchServer/src/main/java/ru/gravit/launchserver/Reloadable.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/Reloadable.java index 87a077ad..7d790934 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/Reloadable.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/Reloadable.java @@ -1,4 +1,4 @@ -package ru.gravit.launchserver; +package pro.gravit.launchserver; @FunctionalInterface public interface Reloadable { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/StarterAgent.java b/LaunchServer/src/main/java/pro/gravit/launchserver/StarterAgent.java similarity index 98% rename from LaunchServer/src/main/java/ru/gravit/launchserver/StarterAgent.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/StarterAgent.java index 510d7342..c6baacd0 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/StarterAgent.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/StarterAgent.java @@ -1,4 +1,4 @@ -package ru.gravit.launchserver; +package pro.gravit.launchserver; import java.io.IOException; import java.lang.instrument.Instrumentation; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/asm/ClassMetadataReader.java b/LaunchServer/src/main/java/pro/gravit/launchserver/asm/ClassMetadataReader.java similarity index 97% rename from LaunchServer/src/main/java/ru/gravit/launchserver/asm/ClassMetadataReader.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/asm/ClassMetadataReader.java index 610f6925..a4cf806a 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/asm/ClassMetadataReader.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/asm/ClassMetadataReader.java @@ -1,9 +1,9 @@ -package ru.gravit.launchserver.asm; +package pro.gravit.launchserver.asm; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.Opcodes; -import ru.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.IOHelper; import java.io.Closeable; import java.io.IOException; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/asm/SafeClassWriter.java b/LaunchServer/src/main/java/pro/gravit/launchserver/asm/SafeClassWriter.java similarity index 97% rename from LaunchServer/src/main/java/ru/gravit/launchserver/asm/SafeClassWriter.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/asm/SafeClassWriter.java index 34ef1b44..05b340e0 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/asm/SafeClassWriter.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/asm/SafeClassWriter.java @@ -1,4 +1,4 @@ -package ru.gravit.launchserver.asm; +package pro.gravit.launchserver.asm; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/AuthException.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/AuthException.java similarity index 89% rename from LaunchServer/src/main/java/ru/gravit/launchserver/auth/AuthException.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/auth/AuthException.java index 60256964..13a6aae5 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/AuthException.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/AuthException.java @@ -1,4 +1,4 @@ -package ru.gravit.launchserver.auth; +package pro.gravit.launchserver.auth; import java.io.IOException; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/AuthProviderPair.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/AuthProviderPair.java similarity index 77% rename from LaunchServer/src/main/java/ru/gravit/launchserver/auth/AuthProviderPair.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/auth/AuthProviderPair.java index 7538b969..09fadaea 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/AuthProviderPair.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/AuthProviderPair.java @@ -1,8 +1,8 @@ -package ru.gravit.launchserver.auth; +package pro.gravit.launchserver.auth; -import ru.gravit.launchserver.auth.handler.AuthHandler; -import ru.gravit.launchserver.auth.provider.AuthProvider; -import ru.gravit.launchserver.auth.texture.TextureProvider; +import pro.gravit.launchserver.auth.handler.AuthHandler; +import pro.gravit.launchserver.auth.provider.AuthProvider; +import pro.gravit.launchserver.auth.texture.TextureProvider; import java.io.IOException; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/MySQLSourceConfig.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/MySQLSourceConfig.java similarity index 96% rename from LaunchServer/src/main/java/ru/gravit/launchserver/auth/MySQLSourceConfig.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/auth/MySQLSourceConfig.java index 5bae4ea5..82dafef4 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/MySQLSourceConfig.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/MySQLSourceConfig.java @@ -1,10 +1,10 @@ -package ru.gravit.launchserver.auth; +package pro.gravit.launchserver.auth; import com.mysql.cj.jdbc.MysqlDataSource; import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; -import ru.gravit.utils.helper.LogHelper; -import ru.gravit.utils.helper.VerifyHelper; +import pro.gravit.utils.helper.LogHelper; +import pro.gravit.utils.helper.VerifyHelper; import javax.sql.DataSource; import java.sql.Connection; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/AuthHandler.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/handler/AuthHandler.java similarity index 87% rename from LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/AuthHandler.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/auth/handler/AuthHandler.java index 8c49e93a..3ddca838 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/AuthHandler.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/handler/AuthHandler.java @@ -1,8 +1,8 @@ -package ru.gravit.launchserver.auth.handler; +package pro.gravit.launchserver.auth.handler; -import ru.gravit.launchserver.auth.AuthException; -import ru.gravit.launchserver.auth.provider.AuthProviderResult; -import ru.gravit.utils.ProviderMap; +import pro.gravit.launchserver.auth.provider.AuthProviderResult; +import pro.gravit.launchserver.auth.AuthException; +import pro.gravit.utils.ProviderMap; import java.io.IOException; import java.util.UUID; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/CachedAuthHandler.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/handler/CachedAuthHandler.java similarity index 93% rename from LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/CachedAuthHandler.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/auth/handler/CachedAuthHandler.java index 82b598fd..bc7cfea7 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/CachedAuthHandler.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/handler/CachedAuthHandler.java @@ -1,10 +1,10 @@ -package ru.gravit.launchserver.auth.handler; +package pro.gravit.launchserver.auth.handler; -import ru.gravit.launcher.NeedGarbageCollection; -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 pro.gravit.launchserver.auth.provider.AuthProviderResult; +import pro.gravit.launcher.NeedGarbageCollection; +import pro.gravit.utils.helper.CommonHelper; +import pro.gravit.utils.helper.SecurityHelper; +import pro.gravit.utils.helper.VerifyHelper; import java.io.IOException; import java.util.HashMap; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/JsonAuthHandler.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/handler/JsonAuthHandler.java similarity index 95% rename from LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/JsonAuthHandler.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/auth/handler/JsonAuthHandler.java index 34d099ef..19f8a987 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/JsonAuthHandler.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/handler/JsonAuthHandler.java @@ -1,7 +1,7 @@ -package ru.gravit.launchserver.auth.handler; +package pro.gravit.launchserver.auth.handler; -import ru.gravit.launcher.Launcher; -import ru.gravit.utils.HTTPRequest; +import pro.gravit.launcher.Launcher; +import pro.gravit.utils.HTTPRequest; import java.io.IOException; import java.net.URL; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/MemoryAuthHandler.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/handler/MemoryAuthHandler.java similarity index 91% rename from LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/MemoryAuthHandler.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/auth/handler/MemoryAuthHandler.java index 792900ab..289f2590 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/MemoryAuthHandler.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/handler/MemoryAuthHandler.java @@ -1,7 +1,7 @@ -package ru.gravit.launchserver.auth.handler; +package pro.gravit.launchserver.auth.handler; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.VerifyHelper; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.VerifyHelper; import java.nio.ByteBuffer; import java.util.Arrays; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/MySQLAuthHandler.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/handler/MySQLAuthHandler.java similarity index 96% rename from LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/MySQLAuthHandler.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/auth/handler/MySQLAuthHandler.java index 30f164a0..0a6b424a 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/MySQLAuthHandler.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/handler/MySQLAuthHandler.java @@ -1,7 +1,7 @@ -package ru.gravit.launchserver.auth.handler; +package pro.gravit.launchserver.auth.handler; -import ru.gravit.launchserver.auth.MySQLSourceConfig; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launchserver.auth.MySQLSourceConfig; +import pro.gravit.utils.helper.LogHelper; import java.io.IOException; import java.sql.Connection; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/NullAuthHandler.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/handler/NullAuthHandler.java similarity index 89% rename from LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/NullAuthHandler.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/auth/handler/NullAuthHandler.java index c0d5ace1..954998ef 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/NullAuthHandler.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/handler/NullAuthHandler.java @@ -1,7 +1,7 @@ -package ru.gravit.launchserver.auth.handler; +package pro.gravit.launchserver.auth.handler; -import ru.gravit.launchserver.auth.provider.AuthProviderResult; -import ru.gravit.utils.helper.VerifyHelper; +import pro.gravit.launchserver.auth.provider.AuthProviderResult; +import pro.gravit.utils.helper.VerifyHelper; import java.io.IOException; import java.util.Objects; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/RequestAuthHandler.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/handler/RequestAuthHandler.java similarity index 95% rename from LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/RequestAuthHandler.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/auth/handler/RequestAuthHandler.java index e04c63ed..e8d5bb7a 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/handler/RequestAuthHandler.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/handler/RequestAuthHandler.java @@ -1,8 +1,8 @@ -package ru.gravit.launchserver.auth.handler; +package pro.gravit.launchserver.auth.handler; -import ru.gravit.utils.helper.CommonHelper; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.utils.helper.CommonHelper; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.LogHelper; import java.io.IOException; import java.net.URL; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/AcceptHWIDHandler.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/hwid/AcceptHWIDHandler.java similarity index 88% rename from LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/AcceptHWIDHandler.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/auth/hwid/AcceptHWIDHandler.java index 06f29c91..2041df92 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/AcceptHWIDHandler.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/hwid/AcceptHWIDHandler.java @@ -1,6 +1,6 @@ -package ru.gravit.launchserver.auth.hwid; +package pro.gravit.launchserver.auth.hwid; -import ru.gravit.launcher.HWID; +import pro.gravit.launcher.HWID; import java.util.ArrayList; import java.util.List; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/HWIDException.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/hwid/HWIDException.java similarity index 90% rename from LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/HWIDException.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/auth/hwid/HWIDException.java index 82f238f2..697880da 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/HWIDException.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/hwid/HWIDException.java @@ -1,4 +1,4 @@ -package ru.gravit.launchserver.auth.hwid; +package pro.gravit.launchserver.auth.hwid; public class HWIDException extends Exception { /** diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/HWIDHandler.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/hwid/HWIDHandler.java similarity index 91% rename from LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/HWIDHandler.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/auth/hwid/HWIDHandler.java index 87039c1f..9cd2e891 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/HWIDHandler.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/hwid/HWIDHandler.java @@ -1,7 +1,7 @@ -package ru.gravit.launchserver.auth.hwid; +package pro.gravit.launchserver.auth.hwid; -import ru.gravit.launcher.HWID; -import ru.gravit.utils.ProviderMap; +import pro.gravit.launcher.HWID; +import pro.gravit.utils.ProviderMap; import java.util.List; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/JsonFileHWIDHandler.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/hwid/JsonFileHWIDHandler.java similarity index 93% rename from LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/JsonFileHWIDHandler.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/auth/hwid/JsonFileHWIDHandler.java index 2a42e881..521759bd 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/JsonFileHWIDHandler.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/hwid/JsonFileHWIDHandler.java @@ -1,10 +1,10 @@ -package ru.gravit.launchserver.auth.hwid; +package pro.gravit.launchserver.auth.hwid; import com.google.gson.reflect.TypeToken; -import ru.gravit.launcher.HWID; -import ru.gravit.launcher.Launcher; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launcher.HWID; +import pro.gravit.launcher.Launcher; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.LogHelper; import java.io.IOException; import java.io.Reader; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/JsonHWIDHandler.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/hwid/JsonHWIDHandler.java similarity index 95% rename from LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/JsonHWIDHandler.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/auth/hwid/JsonHWIDHandler.java index de0d1536..64a71b2f 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/JsonHWIDHandler.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/hwid/JsonHWIDHandler.java @@ -1,11 +1,11 @@ -package ru.gravit.launchserver.auth.hwid; +package pro.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.LogHelper; +import pro.gravit.launcher.HWID; +import pro.gravit.launcher.OshiHWID; +import pro.gravit.utils.HTTPRequest; +import pro.gravit.utils.helper.LogHelper; import java.io.IOException; import java.net.URL; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/MemoryHWIDHandler.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/hwid/MemoryHWIDHandler.java similarity index 96% rename from LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/MemoryHWIDHandler.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/auth/hwid/MemoryHWIDHandler.java index 91d98e6c..7e319640 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/MemoryHWIDHandler.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/hwid/MemoryHWIDHandler.java @@ -1,6 +1,6 @@ -package ru.gravit.launchserver.auth.hwid; +package pro.gravit.launchserver.auth.hwid; -import ru.gravit.launcher.HWID; +import pro.gravit.launcher.HWID; import java.util.LinkedList; import java.util.List; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/MysqlHWIDHandler.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/hwid/MysqlHWIDHandler.java similarity index 97% rename from LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/MysqlHWIDHandler.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/auth/hwid/MysqlHWIDHandler.java index 9bc6500e..0911bf53 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/MysqlHWIDHandler.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/hwid/MysqlHWIDHandler.java @@ -1,10 +1,10 @@ -package ru.gravit.launchserver.auth.hwid; +package pro.gravit.launchserver.auth.hwid; -import ru.gravit.launcher.HWID; -import ru.gravit.launcher.OshiHWID; -import ru.gravit.launchserver.auth.MySQLSourceConfig; -import ru.gravit.utils.helper.CommonHelper; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launcher.HWID; +import pro.gravit.launcher.OshiHWID; +import pro.gravit.launchserver.auth.MySQLSourceConfig; +import pro.gravit.utils.helper.CommonHelper; +import pro.gravit.utils.helper.LogHelper; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/permissions/ConfigPermissionsHandler.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/permissions/ConfigPermissionsHandler.java similarity index 86% rename from LaunchServer/src/main/java/ru/gravit/launchserver/auth/permissions/ConfigPermissionsHandler.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/auth/permissions/ConfigPermissionsHandler.java index 0ce83335..d9866ba7 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/permissions/ConfigPermissionsHandler.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/permissions/ConfigPermissionsHandler.java @@ -1,6 +1,6 @@ -package ru.gravit.launchserver.auth.permissions; +package pro.gravit.launchserver.auth.permissions; -import ru.gravit.launcher.ClientPermissions; +import pro.gravit.launcher.ClientPermissions; public class ConfigPermissionsHandler extends PermissionsHandler { public boolean isAdmin = false; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/permissions/DefaultPermissionsHandler.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/permissions/DefaultPermissionsHandler.java similarity index 81% rename from LaunchServer/src/main/java/ru/gravit/launchserver/auth/permissions/DefaultPermissionsHandler.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/auth/permissions/DefaultPermissionsHandler.java index 5622ef81..b91b9632 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/permissions/DefaultPermissionsHandler.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/permissions/DefaultPermissionsHandler.java @@ -1,6 +1,6 @@ -package ru.gravit.launchserver.auth.permissions; +package pro.gravit.launchserver.auth.permissions; -import ru.gravit.launcher.ClientPermissions; +import pro.gravit.launcher.ClientPermissions; public class DefaultPermissionsHandler extends PermissionsHandler { @Override diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/permissions/JsonFilePermissionsHandler.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/permissions/JsonFilePermissionsHandler.java similarity index 88% rename from LaunchServer/src/main/java/ru/gravit/launchserver/auth/permissions/JsonFilePermissionsHandler.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/auth/permissions/JsonFilePermissionsHandler.java index a516d2f6..d40307da 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/permissions/JsonFilePermissionsHandler.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/permissions/JsonFilePermissionsHandler.java @@ -1,11 +1,11 @@ -package ru.gravit.launchserver.auth.permissions; +package pro.gravit.launchserver.auth.permissions; import com.google.gson.reflect.TypeToken; -import ru.gravit.launcher.ClientPermissions; -import ru.gravit.launcher.Launcher; -import ru.gravit.launchserver.Reloadable; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launcher.ClientPermissions; +import pro.gravit.launcher.Launcher; +import pro.gravit.launchserver.Reloadable; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.LogHelper; import java.io.IOException; import java.io.Reader; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/permissions/JsonLongFilePermissionsHandler.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/permissions/JsonLongFilePermissionsHandler.java similarity index 88% rename from LaunchServer/src/main/java/ru/gravit/launchserver/auth/permissions/JsonLongFilePermissionsHandler.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/auth/permissions/JsonLongFilePermissionsHandler.java index 1c3458a9..8fc84c30 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/permissions/JsonLongFilePermissionsHandler.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/permissions/JsonLongFilePermissionsHandler.java @@ -1,11 +1,11 @@ -package ru.gravit.launchserver.auth.permissions; +package pro.gravit.launchserver.auth.permissions; import com.google.gson.reflect.TypeToken; -import ru.gravit.launcher.ClientPermissions; -import ru.gravit.launcher.Launcher; -import ru.gravit.launchserver.Reloadable; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launcher.ClientPermissions; +import pro.gravit.launcher.Launcher; +import pro.gravit.launchserver.Reloadable; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.LogHelper; import java.io.IOException; import java.io.Reader; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/permissions/PermissionsHandler.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/permissions/PermissionsHandler.java similarity index 86% rename from LaunchServer/src/main/java/ru/gravit/launchserver/auth/permissions/PermissionsHandler.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/auth/permissions/PermissionsHandler.java index 9124bf25..a074869e 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/permissions/PermissionsHandler.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/permissions/PermissionsHandler.java @@ -1,7 +1,7 @@ -package ru.gravit.launchserver.auth.permissions; +package pro.gravit.launchserver.auth.permissions; -import ru.gravit.launcher.ClientPermissions; -import ru.gravit.utils.ProviderMap; +import pro.gravit.launcher.ClientPermissions; +import pro.gravit.utils.ProviderMap; public abstract class PermissionsHandler implements AutoCloseable { public static ProviderMap providers = new ProviderMap<>("PermissionsHandler"); diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/protect/NoProtectHandler.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/protect/NoProtectHandler.java similarity index 80% rename from LaunchServer/src/main/java/ru/gravit/launchserver/auth/protect/NoProtectHandler.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/auth/protect/NoProtectHandler.java index 4b085c98..7f220703 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/protect/NoProtectHandler.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/protect/NoProtectHandler.java @@ -1,7 +1,7 @@ -package ru.gravit.launchserver.auth.protect; +package pro.gravit.launchserver.auth.protect; -import ru.gravit.launchserver.websocket.json.auth.AuthResponse; -import ru.gravit.utils.helper.SecurityHelper; +import pro.gravit.launchserver.websocket.json.auth.AuthResponse; +import pro.gravit.utils.helper.SecurityHelper; public class NoProtectHandler extends ProtectHandler { @Override diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/protect/ProtectHandler.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/protect/ProtectHandler.java similarity index 86% rename from LaunchServer/src/main/java/ru/gravit/launchserver/auth/protect/ProtectHandler.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/auth/protect/ProtectHandler.java index 47665989..a0041bb1 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/protect/ProtectHandler.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/protect/ProtectHandler.java @@ -1,7 +1,7 @@ -package ru.gravit.launchserver.auth.protect; +package pro.gravit.launchserver.auth.protect; -import ru.gravit.launchserver.websocket.json.auth.AuthResponse; -import ru.gravit.utils.ProviderMap; +import pro.gravit.launchserver.websocket.json.auth.AuthResponse; +import pro.gravit.utils.ProviderMap; public abstract class ProtectHandler { public static ProviderMap providers = new ProviderMap<>("ProtectHandler"); diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/AcceptAuthProvider.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/AcceptAuthProvider.java similarity index 77% rename from LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/AcceptAuthProvider.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/AcceptAuthProvider.java index ff35ba8e..e471a35f 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/AcceptAuthProvider.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/AcceptAuthProvider.java @@ -1,6 +1,6 @@ -package ru.gravit.launchserver.auth.provider; +package pro.gravit.launchserver.auth.provider; -import ru.gravit.utils.helper.SecurityHelper; +import pro.gravit.utils.helper.SecurityHelper; public final class AcceptAuthProvider extends AuthProvider { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/AuthProvider.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/AuthProvider.java similarity index 89% rename from LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/AuthProvider.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/AuthProvider.java index f9c30c9d..76ee25c9 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/AuthProvider.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/AuthProvider.java @@ -1,7 +1,7 @@ -package ru.gravit.launchserver.auth.provider; +package pro.gravit.launchserver.auth.provider; -import ru.gravit.launchserver.auth.AuthException; -import ru.gravit.utils.ProviderMap; +import pro.gravit.launchserver.auth.AuthException; +import pro.gravit.utils.ProviderMap; import java.io.IOException; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/AuthProviderResult.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/AuthProviderResult.java similarity index 81% rename from LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/AuthProviderResult.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/AuthProviderResult.java index 4d8ec016..b2502668 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/AuthProviderResult.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/AuthProviderResult.java @@ -1,7 +1,7 @@ -package ru.gravit.launchserver.auth.provider; +package pro.gravit.launchserver.auth.provider; -import ru.gravit.launcher.ClientPermissions; -import ru.gravit.launchserver.LaunchServer; +import pro.gravit.launcher.ClientPermissions; +import pro.gravit.launchserver.LaunchServer; public class AuthProviderResult { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/DigestAuthProvider.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/DigestAuthProvider.java similarity index 76% rename from LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/DigestAuthProvider.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/DigestAuthProvider.java index 8144cd11..f5c0391f 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/DigestAuthProvider.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/DigestAuthProvider.java @@ -1,8 +1,8 @@ -package ru.gravit.launchserver.auth.provider; +package pro.gravit.launchserver.auth.provider; -import ru.gravit.launchserver.auth.AuthException; -import ru.gravit.utils.helper.SecurityHelper; -import ru.gravit.utils.helper.SecurityHelper.DigestAlgorithm; +import pro.gravit.launchserver.auth.AuthException; +import pro.gravit.utils.helper.SecurityHelper; +import pro.gravit.utils.helper.SecurityHelper.DigestAlgorithm; public abstract class DigestAuthProvider extends AuthProvider { private DigestAlgorithm digest; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/JsonAuthProvider.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/JsonAuthProvider.java similarity index 91% rename from LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/JsonAuthProvider.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/JsonAuthProvider.java index e024282a..37f556a6 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/JsonAuthProvider.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/JsonAuthProvider.java @@ -1,10 +1,10 @@ -package ru.gravit.launchserver.auth.provider; +package pro.gravit.launchserver.auth.provider; import com.google.gson.Gson; import com.google.gson.JsonElement; -import ru.gravit.launcher.ClientPermissions; -import ru.gravit.utils.HTTPRequest; -import ru.gravit.utils.helper.SecurityHelper; +import pro.gravit.launcher.ClientPermissions; +import pro.gravit.utils.HTTPRequest; +import pro.gravit.utils.helper.SecurityHelper; import java.io.IOException; import java.net.URL; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/MySQLAuthProvider.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/MySQLAuthProvider.java similarity index 81% rename from LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/MySQLAuthProvider.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/MySQLAuthProvider.java index 2dac1451..2eb0381d 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/MySQLAuthProvider.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/MySQLAuthProvider.java @@ -1,12 +1,12 @@ -package ru.gravit.launchserver.auth.provider; +package pro.gravit.launchserver.auth.provider; -import ru.gravit.launcher.ClientPermissions; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.auth.AuthException; -import ru.gravit.launchserver.auth.MySQLSourceConfig; -import ru.gravit.utils.helper.CommonHelper; -import ru.gravit.utils.helper.LogHelper; -import ru.gravit.utils.helper.SecurityHelper; +import pro.gravit.launcher.ClientPermissions; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.auth.AuthException; +import pro.gravit.launchserver.auth.MySQLSourceConfig; +import pro.gravit.utils.helper.CommonHelper; +import pro.gravit.utils.helper.LogHelper; +import pro.gravit.utils.helper.SecurityHelper; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/NullAuthProvider.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/NullAuthProvider.java similarity index 89% rename from LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/NullAuthProvider.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/NullAuthProvider.java index 92fa8ea5..c00c09e4 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/NullAuthProvider.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/NullAuthProvider.java @@ -1,6 +1,6 @@ -package ru.gravit.launchserver.auth.provider; +package pro.gravit.launchserver.auth.provider; -import ru.gravit.utils.helper.VerifyHelper; +import pro.gravit.utils.helper.VerifyHelper; import java.io.IOException; import java.util.Objects; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/RejectAuthProvider.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/RejectAuthProvider.java similarity index 88% rename from LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/RejectAuthProvider.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/RejectAuthProvider.java index 6c880ab1..8e832c51 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/RejectAuthProvider.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/RejectAuthProvider.java @@ -1,9 +1,9 @@ -package ru.gravit.launchserver.auth.provider; +package pro.gravit.launchserver.auth.provider; -import ru.gravit.launchserver.Reconfigurable; -import ru.gravit.launchserver.auth.AuthException; -import ru.gravit.utils.helper.LogHelper; -import ru.gravit.utils.helper.SecurityHelper; +import pro.gravit.launchserver.Reconfigurable; +import pro.gravit.launchserver.auth.AuthException; +import pro.gravit.utils.helper.LogHelper; +import pro.gravit.utils.helper.SecurityHelper; import java.util.ArrayList; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/RequestAuthProvider.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/RequestAuthProvider.java similarity index 83% rename from LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/RequestAuthProvider.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/RequestAuthProvider.java index 83694199..78237dc1 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/RequestAuthProvider.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/RequestAuthProvider.java @@ -1,11 +1,11 @@ -package ru.gravit.launchserver.auth.provider; +package pro.gravit.launchserver.auth.provider; -import ru.gravit.launcher.ClientPermissions; -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 pro.gravit.launcher.ClientPermissions; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.utils.helper.CommonHelper; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.LogHelper; +import pro.gravit.utils.helper.SecurityHelper; import java.io.IOException; import java.net.URL; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/texture/NullTextureProvider.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/texture/NullTextureProvider.java similarity index 88% rename from LaunchServer/src/main/java/ru/gravit/launchserver/auth/texture/NullTextureProvider.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/auth/texture/NullTextureProvider.java index bcd63cde..b5f785f1 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/texture/NullTextureProvider.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/texture/NullTextureProvider.java @@ -1,7 +1,7 @@ -package ru.gravit.launchserver.auth.texture; +package pro.gravit.launchserver.auth.texture; -import ru.gravit.launcher.profiles.Texture; -import ru.gravit.utils.helper.VerifyHelper; +import pro.gravit.launcher.profiles.Texture; +import pro.gravit.utils.helper.VerifyHelper; import java.io.IOException; import java.util.Objects; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/texture/RequestTextureProvider.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/texture/RequestTextureProvider.java similarity index 86% rename from LaunchServer/src/main/java/ru/gravit/launchserver/auth/texture/RequestTextureProvider.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/auth/texture/RequestTextureProvider.java index 0d3fc1ff..ec7d1ee3 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/texture/RequestTextureProvider.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/texture/RequestTextureProvider.java @@ -1,10 +1,10 @@ -package ru.gravit.launchserver.auth.texture; +package pro.gravit.launchserver.auth.texture; -import ru.gravit.launcher.Launcher; -import ru.gravit.launcher.profiles.Texture; -import ru.gravit.utils.helper.CommonHelper; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launcher.Launcher; +import pro.gravit.launcher.profiles.Texture; +import pro.gravit.utils.helper.CommonHelper; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.LogHelper; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/texture/TextureProvider.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/texture/TextureProvider.java similarity index 88% rename from LaunchServer/src/main/java/ru/gravit/launchserver/auth/texture/TextureProvider.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/auth/texture/TextureProvider.java index 04191b9b..cb7d5861 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/texture/TextureProvider.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/texture/TextureProvider.java @@ -1,7 +1,7 @@ -package ru.gravit.launchserver.auth.texture; +package pro.gravit.launchserver.auth.texture; -import ru.gravit.launcher.profiles.Texture; -import ru.gravit.utils.ProviderMap; +import pro.gravit.launcher.profiles.Texture; +import pro.gravit.utils.ProviderMap; import java.io.IOException; import java.util.UUID; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/texture/VoidTextureProvider.java b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/texture/VoidTextureProvider.java similarity index 82% rename from LaunchServer/src/main/java/ru/gravit/launchserver/auth/texture/VoidTextureProvider.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/auth/texture/VoidTextureProvider.java index 9a5cad7c..ad3f3387 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/auth/texture/VoidTextureProvider.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/auth/texture/VoidTextureProvider.java @@ -1,6 +1,6 @@ -package ru.gravit.launchserver.auth.texture; +package pro.gravit.launchserver.auth.texture; -import ru.gravit.launcher.profiles.Texture; +import pro.gravit.launcher.profiles.Texture; import java.util.UUID; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/BuildContext.java b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/BuildContext.java similarity index 93% rename from LaunchServer/src/main/java/ru/gravit/launchserver/binary/BuildContext.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/binary/BuildContext.java index 48bf2272..60db1907 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/BuildContext.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/BuildContext.java @@ -1,7 +1,7 @@ -package ru.gravit.launchserver.binary; +package pro.gravit.launchserver.binary; -import ru.gravit.launchserver.binary.tasks.MainBuildTask; -import ru.gravit.utils.helper.IOHelper; +import pro.gravit.launchserver.binary.tasks.MainBuildTask; +import pro.gravit.utils.helper.IOHelper; import java.io.IOException; import java.io.InputStream; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/EXEL4JLauncherBinary.java b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/EXEL4JLauncherBinary.java similarity index 95% rename from LaunchServer/src/main/java/ru/gravit/launchserver/binary/EXEL4JLauncherBinary.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/binary/EXEL4JLauncherBinary.java index 0b754461..8afb1c2e 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/EXEL4JLauncherBinary.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/EXEL4JLauncherBinary.java @@ -1,12 +1,12 @@ -package ru.gravit.launchserver.binary; +package pro.gravit.launchserver.binary; import net.sf.launch4j.Builder; import net.sf.launch4j.Log; import net.sf.launch4j.config.*; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.utils.Version; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.utils.Version; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.LogHelper; import java.io.IOException; import java.nio.file.Path; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/EXELauncherBinary.java b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/EXELauncherBinary.java similarity index 74% rename from LaunchServer/src/main/java/ru/gravit/launchserver/binary/EXELauncherBinary.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/binary/EXELauncherBinary.java index 77b785ea..0e0c9e3f 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/EXELauncherBinary.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/EXELauncherBinary.java @@ -1,8 +1,8 @@ -package ru.gravit.launchserver.binary; +package pro.gravit.launchserver.binary; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.LogHelper; import java.io.IOException; import java.nio.file.Files; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/JAConfigurator.java b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/JAConfigurator.java similarity index 92% rename from LaunchServer/src/main/java/ru/gravit/launchserver/binary/JAConfigurator.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/binary/JAConfigurator.java index f3980d97..0991f291 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/JAConfigurator.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/JAConfigurator.java @@ -1,8 +1,8 @@ -package ru.gravit.launchserver.binary; +package pro.gravit.launchserver.binary; import javassist.*; -import ru.gravit.launcher.LauncherConfig; -import ru.gravit.launchserver.binary.tasks.MainBuildTask; +import pro.gravit.launcher.LauncherConfig; +import pro.gravit.launchserver.binary.tasks.MainBuildTask; import java.io.IOException; @@ -29,12 +29,12 @@ public JAConfigurator(String configclass, MainBuildTask jarLauncherBinary) throw } public void addModuleClass(String fullName) { - moduleBody.append("ru.gravit.launcher.modules.Module mod"); + moduleBody.append("pro.gravit.launcher.modules.Module mod"); moduleBody.append(autoincrement); moduleBody.append(" = new "); moduleBody.append(fullName); moduleBody.append("();"); - moduleBody.append("ru.gravit.launcher.Launcher.modulesManager.registerModule( mod"); + moduleBody.append("pro.gravit.launcher.Launcher.modulesManager.registerModule( mod"); moduleBody.append(autoincrement); moduleBody.append(");"); autoincrement++; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/JARLauncherBinary.java b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/JARLauncherBinary.java similarity index 89% rename from LaunchServer/src/main/java/ru/gravit/launchserver/binary/JARLauncherBinary.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/binary/JARLauncherBinary.java index bf61117a..5d43032a 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/JARLauncherBinary.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/JARLauncherBinary.java @@ -1,11 +1,12 @@ -package ru.gravit.launchserver.binary; +package pro.gravit.launchserver.binary; -import ru.gravit.launcher.Launcher; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.binary.tasks.*; -import ru.gravit.utils.helper.CommonHelper; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launchserver.binary.tasks.*; +import pro.gravit.launcher.Launcher; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.binary.tasks.*; +import pro.gravit.utils.helper.CommonHelper; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.LogHelper; import java.io.IOException; import java.nio.file.Files; @@ -24,7 +25,7 @@ public final class JARLauncherBinary extends LauncherBinary { public List addonLibs; public JARLauncherBinary(LaunchServer server) throws IOException { - super(server, LauncherBinary.resolve(server, ".jar")); + super(server, resolve(server, ".jar")); count = new AtomicLong(0); runtimeDir = server.dir.resolve(Launcher.RUNTIME_DIR); guardDir = server.dir.resolve(Launcher.GUARD_DIR); diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/LauncherBinary.java b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/LauncherBinary.java similarity index 84% rename from LaunchServer/src/main/java/ru/gravit/launchserver/binary/LauncherBinary.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/binary/LauncherBinary.java index ec3320c1..d6f1d879 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/LauncherBinary.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/LauncherBinary.java @@ -1,9 +1,9 @@ -package ru.gravit.launchserver.binary; +package pro.gravit.launchserver.binary; -import ru.gravit.launcher.serialize.signed.DigestBytesHolder; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.SecurityHelper; +import pro.gravit.launcher.serialize.signed.DigestBytesHolder; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.SecurityHelper; import java.io.IOException; import java.nio.file.Path; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/ProguardConf.java b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/ProguardConf.java similarity index 90% rename from LaunchServer/src/main/java/ru/gravit/launchserver/binary/ProguardConf.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/binary/ProguardConf.java index ec2c5ad5..e1dfd1ae 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/ProguardConf.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/ProguardConf.java @@ -1,10 +1,10 @@ -package ru.gravit.launchserver.binary; +package pro.gravit.launchserver.binary; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; -import ru.gravit.utils.helper.SecurityHelper; -import ru.gravit.utils.helper.UnpackHelper; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.LogHelper; +import pro.gravit.utils.helper.SecurityHelper; +import pro.gravit.utils.helper.UnpackHelper; import java.io.IOException; import java.io.OutputStreamWriter; @@ -62,7 +62,7 @@ public String[] buildConfig(Path inputJar, Path outputJar) { private void genConfig(boolean force) throws IOException { if (IOHelper.exists(config) && !force) return; Files.deleteIfExists(config); - UnpackHelper.unpack(IOHelper.getResourceURL("ru/gravit/launchserver/defaults/proguard.cfg"), config); + UnpackHelper.unpack(IOHelper.getResourceURL("pro/gravit/launchserver/defaults/proguard.cfg"), config); } public void genWords(boolean force) throws IOException { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/AdditionalFixesApplyTask.java b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/AdditionalFixesApplyTask.java similarity index 93% rename from LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/AdditionalFixesApplyTask.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/AdditionalFixesApplyTask.java index 75bc47a2..2a30d6b4 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/AdditionalFixesApplyTask.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/AdditionalFixesApplyTask.java @@ -1,12 +1,12 @@ -package ru.gravit.launchserver.binary.tasks; +package pro.gravit.launchserver.binary.tasks; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.tree.ClassNode; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.asm.ClassMetadataReader; -import ru.gravit.launchserver.asm.SafeClassWriter; -import ru.gravit.utils.helper.IOHelper; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.asm.ClassMetadataReader; +import pro.gravit.launchserver.asm.SafeClassWriter; +import pro.gravit.utils.helper.IOHelper; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/AttachJarsTask.java b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/AttachJarsTask.java similarity index 92% rename from LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/AttachJarsTask.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/AttachJarsTask.java index f68c3d4e..3ceae478 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/AttachJarsTask.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/AttachJarsTask.java @@ -1,8 +1,8 @@ -package ru.gravit.launchserver.binary.tasks; +package pro.gravit.launchserver.binary.tasks; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.LogHelper; import java.io.IOException; import java.nio.file.Path; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/LauncherBuildTask.java b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/LauncherBuildTask.java similarity index 81% rename from LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/LauncherBuildTask.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/LauncherBuildTask.java index b99e1036..5642b002 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/LauncherBuildTask.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/LauncherBuildTask.java @@ -1,4 +1,4 @@ -package ru.gravit.launchserver.binary.tasks; +package pro.gravit.launchserver.binary.tasks; import java.io.IOException; import java.nio.file.Path; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/MainBuildTask.java b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/MainBuildTask.java similarity index 93% rename from LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/MainBuildTask.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/MainBuildTask.java index 90eb8e45..7c923678 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/MainBuildTask.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/MainBuildTask.java @@ -1,18 +1,18 @@ -package ru.gravit.launchserver.binary.tasks; +package pro.gravit.launchserver.binary.tasks; import javassist.CannotCompileException; import javassist.NotFoundException; -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.binary.BuildContext; -import ru.gravit.launchserver.binary.JAConfigurator; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; -import ru.gravit.utils.helper.SecurityHelper; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.asm.ClassMetadataReader; +import pro.gravit.launchserver.binary.BuildContext; +import pro.gravit.launchserver.binary.JAConfigurator; +import pro.gravit.launcher.AutogenConfig; +import pro.gravit.launcher.Launcher; +import pro.gravit.launcher.LauncherConfig; +import pro.gravit.launcher.serialize.HOutput; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.LogHelper; +import pro.gravit.utils.helper.SecurityHelper; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -28,7 +28,7 @@ import java.util.zip.ZipInputStream; import java.util.zip.ZipOutputStream; -import static ru.gravit.utils.helper.IOHelper.newZipEntry; +import static pro.gravit.utils.helper.IOHelper.newZipEntry; public class MainBuildTask implements LauncherBuildTask { private final LaunchServer server; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/PrepareBuildTask.java b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/PrepareBuildTask.java similarity index 90% rename from LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/PrepareBuildTask.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/PrepareBuildTask.java index 6e9cb621..b412fb5b 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/PrepareBuildTask.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/PrepareBuildTask.java @@ -1,9 +1,9 @@ -package ru.gravit.launchserver.binary.tasks; +package pro.gravit.launchserver.binary.tasks; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; -import ru.gravit.utils.helper.UnpackHelper; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.LogHelper; +import pro.gravit.utils.helper.UnpackHelper; import java.io.IOException; import java.nio.file.FileVisitResult; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/ProGuardBuildTask.java b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/ProGuardBuildTask.java similarity index 88% rename from LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/ProGuardBuildTask.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/ProGuardBuildTask.java index efeae198..a0a5c519 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/ProGuardBuildTask.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/ProGuardBuildTask.java @@ -1,12 +1,12 @@ -package ru.gravit.launchserver.binary.tasks; +package pro.gravit.launchserver.binary.tasks; +import pro.gravit.launchserver.LaunchServer; import proguard.Configuration; import proguard.ConfigurationParser; import proguard.ParseException; import proguard.ProGuard; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.LogHelper; import java.io.IOException; import java.nio.file.Path; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/RadonBuildTask.java b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/RadonBuildTask.java similarity index 85% rename from LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/RadonBuildTask.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/RadonBuildTask.java index 0a9c0561..d539ebf1 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/RadonBuildTask.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/RadonBuildTask.java @@ -1,11 +1,11 @@ -package ru.gravit.launchserver.binary.tasks; +package pro.gravit.launchserver.binary.tasks; import me.itzsomebody.radon.Radon; import me.itzsomebody.radon.SessionInfo; import me.itzsomebody.radon.config.ConfigurationParser; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.UnpackHelper; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.UnpackHelper; import java.io.File; import java.io.IOException; @@ -35,7 +35,7 @@ public Path process(Path inputFile) throws IOException { Files.deleteIfExists(outputFile); if (srv.config.enabledRadon) { if (!IOHelper.isFile(config)) - UnpackHelper.unpack(IOHelper.getResourceURL("ru/gravit/launchserver/defaults/radon.cfg"), config); + UnpackHelper.unpack(IOHelper.getResourceURL("pro/gravit/launchserver/defaults/radon.cfg"), config); ConfigurationParser p = new ConfigurationParser(IOHelper.newInput(config)); SessionInfo info = p.createSessionFromConfig(); info.setInput(inputFile.toFile()); diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/TaskUtil.java b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/TaskUtil.java similarity index 97% rename from LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/TaskUtil.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/TaskUtil.java index 7be46ff0..9449952e 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/TaskUtil.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/TaskUtil.java @@ -1,4 +1,4 @@ -package ru.gravit.launchserver.binary.tasks; +package pro.gravit.launchserver.binary.tasks; import java.util.ArrayList; import java.util.List; diff --git a/LaunchServer/src/main/java/pro/gravit/launchserver/command/Command.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/Command.java new file mode 100644 index 00000000..83c28838 --- /dev/null +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/Command.java @@ -0,0 +1,14 @@ +package pro.gravit.launchserver.command; + +import pro.gravit.launchserver.LaunchServer; + +public abstract class Command extends pro.gravit.utils.command.Command { + + + protected final LaunchServer server; + + + protected Command(LaunchServer server) { + this.server = server; + } +} diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/auth/AuthCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/auth/AuthCommand.java similarity index 76% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/auth/AuthCommand.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/auth/AuthCommand.java index bd40d862..1b158954 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/auth/AuthCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/auth/AuthCommand.java @@ -1,11 +1,11 @@ -package ru.gravit.launchserver.command.auth; +package pro.gravit.launchserver.command.auth; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.auth.AuthProviderPair; -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; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.auth.AuthProviderPair; +import pro.gravit.launchserver.auth.provider.AuthProvider; +import pro.gravit.launchserver.auth.provider.AuthProviderResult; +import pro.gravit.launchserver.command.Command; +import pro.gravit.utils.helper.LogHelper; import java.util.UUID; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/auth/BanCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/auth/BanCommand.java similarity index 76% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/auth/BanCommand.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/auth/BanCommand.java index 3cfad3be..677cae25 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/auth/BanCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/auth/BanCommand.java @@ -1,8 +1,8 @@ -package ru.gravit.launchserver.command.auth; +package pro.gravit.launchserver.command.auth; -import ru.gravit.launcher.HWID; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.command.Command; +import pro.gravit.launcher.HWID; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.command.Command; import java.util.List; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/auth/GetHWIDCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/auth/GetHWIDCommand.java similarity index 79% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/auth/GetHWIDCommand.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/auth/GetHWIDCommand.java index f9bee554..16c40b46 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/auth/GetHWIDCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/auth/GetHWIDCommand.java @@ -1,9 +1,9 @@ -package ru.gravit.launchserver.command.auth; +package pro.gravit.launchserver.command.auth; -import ru.gravit.launcher.HWID; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.command.Command; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launcher.HWID; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.command.Command; +import pro.gravit.utils.helper.LogHelper; import java.util.List; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/auth/UUIDToUsernameCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/auth/UUIDToUsernameCommand.java similarity index 80% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/auth/UUIDToUsernameCommand.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/auth/UUIDToUsernameCommand.java index c78d76d2..9fc248af 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/auth/UUIDToUsernameCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/auth/UUIDToUsernameCommand.java @@ -1,10 +1,10 @@ -package ru.gravit.launchserver.command.auth; +package pro.gravit.launchserver.command.auth; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.auth.AuthProviderPair; -import ru.gravit.launchserver.command.Command; -import ru.gravit.utils.command.CommandException; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.auth.AuthProviderPair; +import pro.gravit.launchserver.command.Command; +import pro.gravit.utils.command.CommandException; +import pro.gravit.utils.helper.LogHelper; import java.io.IOException; import java.util.UUID; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/auth/UnbanCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/auth/UnbanCommand.java similarity index 76% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/auth/UnbanCommand.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/auth/UnbanCommand.java index a0c801a3..fdc84cf5 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/auth/UnbanCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/auth/UnbanCommand.java @@ -1,8 +1,8 @@ -package ru.gravit.launchserver.command.auth; +package pro.gravit.launchserver.command.auth; -import ru.gravit.launcher.HWID; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.command.Command; +import pro.gravit.launcher.HWID; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.command.Command; import java.util.List; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/auth/UsernameToUUIDCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/auth/UsernameToUUIDCommand.java similarity index 80% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/auth/UsernameToUUIDCommand.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/auth/UsernameToUUIDCommand.java index a7b2ddc3..770b99b2 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/auth/UsernameToUUIDCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/auth/UsernameToUUIDCommand.java @@ -1,10 +1,10 @@ -package ru.gravit.launchserver.command.auth; +package pro.gravit.launchserver.command.auth; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.auth.AuthProviderPair; -import ru.gravit.launchserver.command.Command; -import ru.gravit.utils.command.CommandException; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.auth.AuthProviderPair; +import pro.gravit.launchserver.command.Command; +import pro.gravit.utils.command.CommandException; +import pro.gravit.utils.helper.LogHelper; import java.io.IOException; import java.util.UUID; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/BuildCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/basic/BuildCommand.java similarity index 77% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/BuildCommand.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/basic/BuildCommand.java index 139e9254..cfbc5164 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/BuildCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/basic/BuildCommand.java @@ -1,7 +1,7 @@ -package ru.gravit.launchserver.command.basic; +package pro.gravit.launchserver.command.basic; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.command.Command; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.command.Command; public final class BuildCommand extends Command { public BuildCommand(LaunchServer server) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/LogConnectionsCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/basic/LogConnectionsCommand.java similarity index 80% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/LogConnectionsCommand.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/basic/LogConnectionsCommand.java index f3214401..8e9b2505 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/LogConnectionsCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/basic/LogConnectionsCommand.java @@ -1,8 +1,8 @@ -package ru.gravit.launchserver.command.basic; +package pro.gravit.launchserver.command.basic; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.command.Command; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.command.Command; +import pro.gravit.utils.helper.LogHelper; public final class LogConnectionsCommand extends Command { public LogConnectionsCommand(LaunchServer server) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/ProguardCleanCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/basic/ProguardCleanCommand.java similarity index 80% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/ProguardCleanCommand.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/basic/ProguardCleanCommand.java index 0594b4a6..7ec6460b 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/ProguardCleanCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/basic/ProguardCleanCommand.java @@ -1,7 +1,7 @@ -package ru.gravit.launchserver.command.basic; +package pro.gravit.launchserver.command.basic; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.command.Command; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.command.Command; import java.io.IOException; import java.nio.file.Files; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/RebindCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/basic/RebindCommand.java similarity index 74% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/RebindCommand.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/basic/RebindCommand.java index 41b73b09..6d48ef08 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/RebindCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/basic/RebindCommand.java @@ -1,7 +1,7 @@ -package ru.gravit.launchserver.command.basic; +package pro.gravit.launchserver.command.basic; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.command.Command; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.command.Command; public final class RebindCommand extends Command { public RebindCommand(LaunchServer server) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/RegenProguardDictCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/basic/RegenProguardDictCommand.java similarity index 78% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/RegenProguardDictCommand.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/basic/RegenProguardDictCommand.java index c1cdb794..214ec014 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/RegenProguardDictCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/basic/RegenProguardDictCommand.java @@ -1,7 +1,7 @@ -package ru.gravit.launchserver.command.basic; +package pro.gravit.launchserver.command.basic; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.command.Command; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.command.Command; import java.io.IOException; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/RemoveMappingsProguardCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/basic/RemoveMappingsProguardCommand.java similarity index 80% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/RemoveMappingsProguardCommand.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/basic/RemoveMappingsProguardCommand.java index ba069f28..f16d5374 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/RemoveMappingsProguardCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/basic/RemoveMappingsProguardCommand.java @@ -1,7 +1,7 @@ -package ru.gravit.launchserver.command.basic; +package pro.gravit.launchserver.command.basic; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.command.Command; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.command.Command; import java.io.IOException; import java.nio.file.Files; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/RestartCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/basic/RestartCommand.java similarity index 74% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/RestartCommand.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/basic/RestartCommand.java index 6d03eeca..5c84d09b 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/RestartCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/basic/RestartCommand.java @@ -1,7 +1,7 @@ -package ru.gravit.launchserver.command.basic; +package pro.gravit.launchserver.command.basic; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.command.Command; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.command.Command; public final class RestartCommand extends Command { public RestartCommand(LaunchServer server) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/StopCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/basic/StopCommand.java similarity index 69% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/StopCommand.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/basic/StopCommand.java index bb1983ac..c38a6797 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/StopCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/basic/StopCommand.java @@ -1,8 +1,8 @@ -package ru.gravit.launchserver.command.basic; +package pro.gravit.launchserver.command.basic; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.command.Command; -import ru.gravit.utils.helper.JVMHelper; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.command.Command; +import pro.gravit.utils.helper.JVMHelper; public final class StopCommand extends Command { public StopCommand(LaunchServer server) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/TestCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/basic/TestCommand.java similarity index 71% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/TestCommand.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/basic/TestCommand.java index 2437e7f0..a5b3fc28 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/TestCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/basic/TestCommand.java @@ -1,11 +1,11 @@ -package ru.gravit.launchserver.command.basic; +package pro.gravit.launchserver.command.basic; -import ru.gravit.launcher.events.PingEvent; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.command.Command; -import ru.gravit.launchserver.websocket.NettyServerSocketHandler; -import ru.gravit.launchserver.websocket.WebSocketFrameHandler; -import ru.gravit.utils.helper.CommonHelper; +import pro.gravit.launchserver.websocket.NettyServerSocketHandler; +import pro.gravit.launchserver.websocket.WebSocketFrameHandler; +import pro.gravit.launcher.events.PingEvent; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.command.Command; +import pro.gravit.utils.helper.CommonHelper; public class TestCommand extends Command { public TestCommand(LaunchServer server) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/VersionCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/basic/VersionCommand.java similarity index 70% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/VersionCommand.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/basic/VersionCommand.java index 613c0549..e5b4434c 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/VersionCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/basic/VersionCommand.java @@ -1,9 +1,9 @@ -package ru.gravit.launchserver.command.basic; +package pro.gravit.launchserver.command.basic; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.command.Command; -import ru.gravit.utils.Version; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.command.Command; +import pro.gravit.utils.Version; +import pro.gravit.utils.helper.LogHelper; public final class VersionCommand extends Command { public VersionCommand(LaunchServer server) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/dump/DumpEntryCacheCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/dump/DumpEntryCacheCommand.java similarity index 87% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/dump/DumpEntryCacheCommand.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/dump/DumpEntryCacheCommand.java index bafb2b60..ed82c180 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/dump/DumpEntryCacheCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/dump/DumpEntryCacheCommand.java @@ -1,12 +1,12 @@ -package ru.gravit.launchserver.command.dump; +package pro.gravit.launchserver.command.dump; -import ru.gravit.launcher.Launcher; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.auth.AuthProviderPair; -import ru.gravit.launchserver.auth.handler.CachedAuthHandler; -import ru.gravit.launchserver.command.Command; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launcher.Launcher; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.auth.AuthProviderPair; +import pro.gravit.launchserver.auth.handler.CachedAuthHandler; +import pro.gravit.launchserver.command.Command; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.LogHelper; import java.io.Reader; import java.io.Writer; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/dump/DumpSessionsCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/dump/DumpSessionsCommand.java similarity index 84% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/dump/DumpSessionsCommand.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/dump/DumpSessionsCommand.java index 503e4335..bdfe78b3 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/dump/DumpSessionsCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/dump/DumpSessionsCommand.java @@ -1,12 +1,12 @@ -package ru.gravit.launchserver.command.dump; +package pro.gravit.launchserver.command.dump; import com.google.gson.reflect.TypeToken; -import ru.gravit.launcher.Launcher; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.command.Command; -import ru.gravit.launchserver.socket.Client; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launcher.Launcher; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.command.Command; +import pro.gravit.launchserver.socket.Client; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.LogHelper; import java.io.Reader; import java.io.Writer; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/handler/CommandHandler.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/handler/CommandHandler.java similarity index 77% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/handler/CommandHandler.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/handler/CommandHandler.java index 47829d21..47f6e0b2 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/handler/CommandHandler.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/handler/CommandHandler.java @@ -1,24 +1,28 @@ -package ru.gravit.launchserver.command.handler; +package pro.gravit.launchserver.command.handler; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.command.auth.*; -import ru.gravit.launchserver.command.basic.*; -import ru.gravit.launchserver.command.dump.DumpEntryCacheCommand; -import ru.gravit.launchserver.command.dump.DumpSessionsCommand; -import ru.gravit.launchserver.command.hash.*; -import ru.gravit.launchserver.command.install.CheckInstallCommand; -import ru.gravit.launchserver.command.install.MultiCommand; -import ru.gravit.launchserver.command.modules.LoadModuleCommand; -import ru.gravit.launchserver.command.modules.ModulesCommand; -import ru.gravit.launchserver.command.service.*; -import ru.gravit.utils.command.BaseCommandCategory; -import ru.gravit.utils.command.basic.ClearCommand; -import ru.gravit.utils.command.basic.DebugCommand; -import ru.gravit.utils.command.basic.GCCommand; -import ru.gravit.utils.command.basic.HelpCommand; +import pro.gravit.launchserver.command.auth.*; +import pro.gravit.launchserver.command.basic.*; +import pro.gravit.launchserver.command.hash.*; +import pro.gravit.launchserver.command.install.CheckInstallCommand; +import pro.gravit.launchserver.command.install.MultiCommand; +import pro.gravit.launchserver.command.modules.LoadModuleCommand; +import pro.gravit.launchserver.command.modules.ModulesCommand; +import pro.gravit.launchserver.command.service.*; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.command.auth.*; +import pro.gravit.launchserver.command.basic.*; +import pro.gravit.launchserver.command.dump.DumpEntryCacheCommand; +import pro.gravit.launchserver.command.dump.DumpSessionsCommand; +import pro.gravit.launchserver.command.hash.*; +import pro.gravit.launchserver.command.service.*; +import pro.gravit.utils.command.BaseCommandCategory; +import pro.gravit.utils.command.basic.ClearCommand; +import pro.gravit.utils.command.basic.DebugCommand; +import pro.gravit.utils.command.basic.GCCommand; +import pro.gravit.utils.command.basic.HelpCommand; -public abstract class CommandHandler extends ru.gravit.utils.command.CommandHandler { - public static void registerCommands(ru.gravit.utils.command.CommandHandler handler) { +public abstract class CommandHandler extends pro.gravit.utils.command.CommandHandler { + public static void registerCommands(pro.gravit.utils.command.CommandHandler handler) { LaunchServer server = LaunchServer.server; BaseCommandCategory basic = new BaseCommandCategory(); // Register basic commands diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/DownloadAssetCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/DownloadAssetCommand.java similarity index 79% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/DownloadAssetCommand.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/DownloadAssetCommand.java index 3999cc1b..2b375724 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/DownloadAssetCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/DownloadAssetCommand.java @@ -1,11 +1,11 @@ -package ru.gravit.launchserver.command.hash; +package pro.gravit.launchserver.command.hash; -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; +import pro.gravit.launcher.profiles.ClientProfile.Version; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.command.Command; +import pro.gravit.utils.HttpDownloader; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.LogHelper; import java.nio.file.Files; import java.nio.file.Path; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/DownloadClientCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/DownloadClientCommand.java similarity index 82% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/DownloadClientCommand.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/DownloadClientCommand.java index 6a6c31fb..26668df1 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/DownloadClientCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/DownloadClientCommand.java @@ -1,14 +1,14 @@ -package ru.gravit.launchserver.command.hash; +package pro.gravit.launchserver.command.hash; -import ru.gravit.launcher.Launcher; -import ru.gravit.launcher.profiles.ClientProfile; -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.command.CommandException; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launcher.Launcher; +import pro.gravit.launcher.profiles.ClientProfile; +import pro.gravit.launcher.profiles.ClientProfile.Version; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.command.Command; +import pro.gravit.utils.HttpDownloader; +import pro.gravit.utils.command.CommandException; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.LogHelper; import java.io.BufferedReader; import java.io.BufferedWriter; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/IndexAssetCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/IndexAssetCommand.java similarity index 91% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/IndexAssetCommand.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/IndexAssetCommand.java index 5a36fcfd..f4628839 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/IndexAssetCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/IndexAssetCommand.java @@ -1,14 +1,14 @@ -package ru.gravit.launchserver.command.hash; +package pro.gravit.launchserver.command.hash; import com.google.gson.Gson; import com.google.gson.JsonObject; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.command.Command; -import ru.gravit.utils.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 pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.command.Command; +import pro.gravit.utils.command.CommandException; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.LogHelper; +import pro.gravit.utils.helper.SecurityHelper; +import pro.gravit.utils.helper.SecurityHelper.DigestAlgorithm; import java.io.BufferedWriter; import java.io.IOException; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/SyncBinariesCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/SyncBinariesCommand.java similarity index 75% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/SyncBinariesCommand.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/SyncBinariesCommand.java index 44326cd1..ec6b9cc0 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/SyncBinariesCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/SyncBinariesCommand.java @@ -1,8 +1,8 @@ -package ru.gravit.launchserver.command.hash; +package pro.gravit.launchserver.command.hash; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.command.Command; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.command.Command; +import pro.gravit.utils.helper.LogHelper; import java.io.IOException; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/SyncProfilesCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/SyncProfilesCommand.java similarity index 74% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/SyncProfilesCommand.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/SyncProfilesCommand.java index e31269ad..433fb4ff 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/SyncProfilesCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/SyncProfilesCommand.java @@ -1,8 +1,8 @@ -package ru.gravit.launchserver.command.hash; +package pro.gravit.launchserver.command.hash; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.command.Command; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.command.Command; +import pro.gravit.utils.helper.LogHelper; import java.io.IOException; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/SyncUpdatesCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/SyncUpdatesCommand.java similarity index 82% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/SyncUpdatesCommand.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/SyncUpdatesCommand.java index 6b741c12..8363f848 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/SyncUpdatesCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/SyncUpdatesCommand.java @@ -1,8 +1,8 @@ -package ru.gravit.launchserver.command.hash; +package pro.gravit.launchserver.command.hash; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.command.Command; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.command.Command; +import pro.gravit.utils.helper.LogHelper; import java.io.IOException; import java.util.Collections; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/UnindexAssetCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/UnindexAssetCommand.java similarity index 90% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/UnindexAssetCommand.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/UnindexAssetCommand.java index a755c011..f13c7907 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/hash/UnindexAssetCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/hash/UnindexAssetCommand.java @@ -1,13 +1,13 @@ -package ru.gravit.launchserver.command.hash; +package pro.gravit.launchserver.command.hash; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.command.Command; -import ru.gravit.utils.command.CommandException; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.command.Command; +import pro.gravit.utils.command.CommandException; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.LogHelper; import java.io.BufferedReader; import java.nio.file.Files; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/install/CheckInstallCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/install/CheckInstallCommand.java similarity index 67% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/install/CheckInstallCommand.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/install/CheckInstallCommand.java index 72e78c22..31d7a992 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/install/CheckInstallCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/install/CheckInstallCommand.java @@ -1,9 +1,9 @@ -package ru.gravit.launchserver.command.install; +package pro.gravit.launchserver.command.install; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.command.Command; -import ru.gravit.utils.helper.JVMHelper; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.command.Command; +import pro.gravit.utils.helper.JVMHelper; +import pro.gravit.utils.helper.LogHelper; public class CheckInstallCommand extends Command { public CheckInstallCommand(LaunchServer server) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/install/MultiCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/install/MultiCommand.java similarity index 76% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/install/MultiCommand.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/install/MultiCommand.java index 52fd7cd4..c5ddcd48 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/install/MultiCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/install/MultiCommand.java @@ -1,7 +1,7 @@ -package ru.gravit.launchserver.command.install; +package pro.gravit.launchserver.command.install; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.command.Command; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.command.Command; public class MultiCommand extends Command { public MultiCommand(LaunchServer server) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/modules/LoadModuleCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/modules/LoadModuleCommand.java similarity index 80% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/modules/LoadModuleCommand.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/modules/LoadModuleCommand.java index af69674b..c8e77a56 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/modules/LoadModuleCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/modules/LoadModuleCommand.java @@ -1,7 +1,7 @@ -package ru.gravit.launchserver.command.modules; +package pro.gravit.launchserver.command.modules; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.command.Command; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.command.Command; import java.net.URI; import java.nio.file.Paths; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/modules/ModulesCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/modules/ModulesCommand.java similarity index 74% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/modules/ModulesCommand.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/modules/ModulesCommand.java index 0c6d4c07..e18cbb43 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/modules/ModulesCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/modules/ModulesCommand.java @@ -1,7 +1,7 @@ -package ru.gravit.launchserver.command.modules; +package pro.gravit.launchserver.command.modules; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.command.Command; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.command.Command; public class ModulesCommand extends Command { public ModulesCommand(LaunchServer server) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/ComponentCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/ComponentCommand.java similarity index 89% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/service/ComponentCommand.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/service/ComponentCommand.java index 290d6f5d..0e5ec89c 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/ComponentCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/ComponentCommand.java @@ -1,12 +1,12 @@ -package ru.gravit.launchserver.command.service; +package pro.gravit.launchserver.command.service; -import ru.gravit.launcher.Launcher; -import ru.gravit.launcher.NeedGarbageCollection; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.command.Command; -import ru.gravit.launchserver.components.Component; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launcher.Launcher; +import pro.gravit.launcher.NeedGarbageCollection; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.command.Command; +import pro.gravit.launchserver.components.Component; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.LogHelper; import java.io.Reader; import java.nio.file.Paths; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/ConfigCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/ConfigCommand.java similarity index 79% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/service/ConfigCommand.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/service/ConfigCommand.java index a7cff15e..3c546609 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/ConfigCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/ConfigCommand.java @@ -1,8 +1,8 @@ -package ru.gravit.launchserver.command.service; +package pro.gravit.launchserver.command.service; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.command.Command; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.command.Command; +import pro.gravit.utils.helper.LogHelper; public class ConfigCommand extends Command { public ConfigCommand(LaunchServer server) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/ConfigHelpCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/ConfigHelpCommand.java similarity index 74% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/service/ConfigHelpCommand.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/service/ConfigHelpCommand.java index 277c162a..b1a0b749 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/ConfigHelpCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/ConfigHelpCommand.java @@ -1,8 +1,8 @@ -package ru.gravit.launchserver.command.service; +package pro.gravit.launchserver.command.service; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.command.Command; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.command.Command; +import pro.gravit.utils.helper.LogHelper; public class ConfigHelpCommand extends Command { public ConfigHelpCommand(LaunchServer server) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/ConfigListCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/ConfigListCommand.java similarity index 76% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/service/ConfigListCommand.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/service/ConfigListCommand.java index 3e2a19e2..9af0aee9 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/ConfigListCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/ConfigListCommand.java @@ -1,7 +1,7 @@ -package ru.gravit.launchserver.command.service; +package pro.gravit.launchserver.command.service; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.command.Command; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.command.Command; public class ConfigListCommand extends Command { public ConfigListCommand(LaunchServer server) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/GetModulusCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/GetModulusCommand.java similarity index 72% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/service/GetModulusCommand.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/service/GetModulusCommand.java index 16b8b75b..c4e1310d 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/GetModulusCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/GetModulusCommand.java @@ -1,8 +1,8 @@ -package ru.gravit.launchserver.command.service; +package pro.gravit.launchserver.command.service; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.command.Command; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.command.Command; +import pro.gravit.utils.helper.LogHelper; public class GetModulusCommand extends Command { public GetModulusCommand(LaunchServer server) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/GetPermissionsCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/GetPermissionsCommand.java similarity index 75% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/service/GetPermissionsCommand.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/service/GetPermissionsCommand.java index 80c022eb..05302816 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/GetPermissionsCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/GetPermissionsCommand.java @@ -1,9 +1,9 @@ -package ru.gravit.launchserver.command.service; +package pro.gravit.launchserver.command.service; -import ru.gravit.launcher.ClientPermissions; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.command.Command; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launcher.ClientPermissions; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.command.Command; +import pro.gravit.utils.helper.LogHelper; public class GetPermissionsCommand extends Command { public GetPermissionsCommand(LaunchServer server) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/GivePermissionsCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/GivePermissionsCommand.java similarity index 85% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/service/GivePermissionsCommand.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/service/GivePermissionsCommand.java index 32a04b2c..ebaa9615 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/GivePermissionsCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/GivePermissionsCommand.java @@ -1,9 +1,9 @@ -package ru.gravit.launchserver.command.service; +package pro.gravit.launchserver.command.service; -import ru.gravit.launcher.ClientPermissions; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.command.Command; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launcher.ClientPermissions; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.command.Command; +import pro.gravit.utils.helper.LogHelper; public class GivePermissionsCommand extends Command { public GivePermissionsCommand(LaunchServer server) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/ReloadAllCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/ReloadAllCommand.java similarity index 73% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/service/ReloadAllCommand.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/service/ReloadAllCommand.java index 54f39566..167256f5 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/ReloadAllCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/ReloadAllCommand.java @@ -1,8 +1,8 @@ -package ru.gravit.launchserver.command.service; +package pro.gravit.launchserver.command.service; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.command.Command; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.command.Command; +import pro.gravit.utils.helper.LogHelper; public class ReloadAllCommand extends Command { public ReloadAllCommand(LaunchServer server) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/ReloadCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/ReloadCommand.java similarity index 74% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/service/ReloadCommand.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/service/ReloadCommand.java index 4cefb231..df69f2a0 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/ReloadCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/ReloadCommand.java @@ -1,8 +1,8 @@ -package ru.gravit.launchserver.command.service; +package pro.gravit.launchserver.command.service; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.command.Command; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.command.Command; +import pro.gravit.utils.helper.LogHelper; public class ReloadCommand extends Command { public ReloadCommand(LaunchServer server) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/ReloadListCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/ReloadListCommand.java similarity index 75% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/service/ReloadListCommand.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/service/ReloadListCommand.java index 5273fdb5..6ea67833 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/ReloadListCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/ReloadListCommand.java @@ -1,7 +1,7 @@ -package ru.gravit.launchserver.command.service; +package pro.gravit.launchserver.command.service; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.command.Command; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.command.Command; public class ReloadListCommand extends Command { public ReloadListCommand(LaunchServer server) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/ServerStatusCommand.java b/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/ServerStatusCommand.java similarity index 82% rename from LaunchServer/src/main/java/ru/gravit/launchserver/command/service/ServerStatusCommand.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/command/service/ServerStatusCommand.java index b95640ec..9520dd45 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/service/ServerStatusCommand.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/command/service/ServerStatusCommand.java @@ -1,12 +1,12 @@ -package ru.gravit.launchserver.command.service; +package pro.gravit.launchserver.command.service; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.auth.AuthProviderPair; -import ru.gravit.launchserver.auth.handler.CachedAuthHandler; -import ru.gravit.launchserver.command.Command; -import ru.gravit.utils.command.CommandHandler; -import ru.gravit.utils.helper.JVMHelper; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.auth.AuthProviderPair; +import pro.gravit.launchserver.auth.handler.CachedAuthHandler; +import pro.gravit.launchserver.command.Command; +import pro.gravit.utils.command.CommandHandler; +import pro.gravit.utils.helper.JVMHelper; +import pro.gravit.utils.helper.LogHelper; public class ServerStatusCommand extends Command { public ServerStatusCommand(LaunchServer server) { diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/components/AuthLimiterComponent.java b/LaunchServer/src/main/java/pro/gravit/launchserver/components/AuthLimiterComponent.java similarity index 90% rename from LaunchServer/src/main/java/ru/gravit/launchserver/components/AuthLimiterComponent.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/components/AuthLimiterComponent.java index 4fbd8bfa..b13cbb85 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/components/AuthLimiterComponent.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/components/AuthLimiterComponent.java @@ -1,10 +1,10 @@ -package ru.gravit.launchserver.components; +package pro.gravit.launchserver.components; -import ru.gravit.launcher.NeedGarbageCollection; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.websocket.json.auth.AuthResponse; -import ru.gravit.utils.HookException; +import pro.gravit.launchserver.socket.Client; +import pro.gravit.launcher.NeedGarbageCollection; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.websocket.json.auth.AuthResponse; +import pro.gravit.utils.HookException; import java.util.ArrayList; import java.util.HashMap; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/components/CommandRemoverComponent.java b/LaunchServer/src/main/java/pro/gravit/launchserver/components/CommandRemoverComponent.java similarity index 87% rename from LaunchServer/src/main/java/ru/gravit/launchserver/components/CommandRemoverComponent.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/components/CommandRemoverComponent.java index 283bea13..69c2c609 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/components/CommandRemoverComponent.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/components/CommandRemoverComponent.java @@ -1,7 +1,7 @@ -package ru.gravit.launchserver.components; +package pro.gravit.launchserver.components; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.utils.command.Command; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.utils.command.Command; import java.util.HashMap; import java.util.Map; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/components/Component.java b/LaunchServer/src/main/java/pro/gravit/launchserver/components/Component.java similarity index 83% rename from LaunchServer/src/main/java/ru/gravit/launchserver/components/Component.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/components/Component.java index a10b6cb4..f19ebe1e 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/components/Component.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/components/Component.java @@ -1,7 +1,7 @@ -package ru.gravit.launchserver.components; +package pro.gravit.launchserver.components; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.utils.ProviderMap; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.utils.ProviderMap; public abstract class Component { public static ProviderMap providers = new ProviderMap<>(); diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/config/LaunchServerRuntimeConfig.java b/LaunchServer/src/main/java/pro/gravit/launchserver/config/LaunchServerRuntimeConfig.java similarity index 71% rename from LaunchServer/src/main/java/ru/gravit/launchserver/config/LaunchServerRuntimeConfig.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/config/LaunchServerRuntimeConfig.java index 31e55878..434df53f 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/config/LaunchServerRuntimeConfig.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/config/LaunchServerRuntimeConfig.java @@ -1,7 +1,7 @@ -package ru.gravit.launchserver.config; +package pro.gravit.launchserver.config; -import ru.gravit.utils.helper.LogHelper; -import ru.gravit.utils.helper.SecurityHelper; +import pro.gravit.utils.helper.LogHelper; +import pro.gravit.utils.helper.SecurityHelper; public class LaunchServerRuntimeConfig { public String clientToken; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/legacy/PingResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/legacy/PingResponse.java similarity index 58% rename from LaunchServer/src/main/java/ru/gravit/launchserver/legacy/PingResponse.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/legacy/PingResponse.java index 1575aec7..95e5128f 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/legacy/PingResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/legacy/PingResponse.java @@ -1,10 +1,10 @@ -package ru.gravit.launchserver.legacy; +package pro.gravit.launchserver.legacy; -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.socket.Client; +import pro.gravit.launchserver.socket.Client; +import pro.gravit.launcher.serialize.HInput; +import pro.gravit.launcher.serialize.HOutput; +import pro.gravit.launcher.serialize.SerializeLimits; +import pro.gravit.launchserver.LaunchServer; import java.io.IOException; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/legacy/Response.java b/LaunchServer/src/main/java/pro/gravit/launchserver/legacy/Response.java similarity index 81% rename from LaunchServer/src/main/java/ru/gravit/launchserver/legacy/Response.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/legacy/Response.java index 697f23c3..2dcf25c1 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/legacy/Response.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/legacy/Response.java @@ -1,14 +1,14 @@ -package ru.gravit.launchserver.legacy; +package pro.gravit.launchserver.legacy; -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.legacy.update.LauncherResponse; -import ru.gravit.launchserver.legacy.update.LegacyLauncherResponse; -import ru.gravit.launchserver.socket.Client; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launchserver.legacy.update.LauncherResponse; +import pro.gravit.launchserver.legacy.update.LegacyLauncherResponse; +import pro.gravit.launchserver.socket.Client; +import pro.gravit.launcher.request.RequestException; +import pro.gravit.launcher.request.RequestType; +import pro.gravit.launcher.serialize.HInput; +import pro.gravit.launcher.serialize.HOutput; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.utils.helper.LogHelper; import java.io.IOException; import java.util.Map; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/legacy/update/LauncherResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/legacy/update/LauncherResponse.java similarity index 73% rename from LaunchServer/src/main/java/ru/gravit/launchserver/legacy/update/LauncherResponse.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/legacy/update/LauncherResponse.java index 883b5274..6010207f 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/legacy/update/LauncherResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/legacy/update/LauncherResponse.java @@ -1,12 +1,12 @@ -package ru.gravit.launchserver.legacy.update; +package pro.gravit.launchserver.legacy.update; -import ru.gravit.launcher.serialize.HInput; -import ru.gravit.launcher.serialize.HOutput; -import ru.gravit.launcher.serialize.SerializeLimits; -import ru.gravit.launcher.serialize.signed.DigestBytesHolder; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.legacy.Response; -import ru.gravit.launchserver.socket.Client; +import pro.gravit.launchserver.socket.Client; +import pro.gravit.launcher.serialize.HInput; +import pro.gravit.launcher.serialize.HOutput; +import pro.gravit.launcher.serialize.SerializeLimits; +import pro.gravit.launcher.serialize.signed.DigestBytesHolder; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.legacy.Response; import java.io.IOException; import java.util.Arrays; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/legacy/update/LegacyLauncherResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/legacy/update/LegacyLauncherResponse.java similarity index 72% rename from LaunchServer/src/main/java/ru/gravit/launchserver/legacy/update/LegacyLauncherResponse.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/legacy/update/LegacyLauncherResponse.java index e1c11a78..812f8852 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/legacy/update/LegacyLauncherResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/legacy/update/LegacyLauncherResponse.java @@ -1,12 +1,12 @@ -package ru.gravit.launchserver.legacy.update; +package pro.gravit.launchserver.legacy.update; -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.legacy.Response; -import ru.gravit.launchserver.socket.Client; -import ru.gravit.utils.helper.SecurityHelper; +import pro.gravit.launchserver.socket.Client; +import pro.gravit.launcher.serialize.HInput; +import pro.gravit.launcher.serialize.HOutput; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.binary.LauncherBinary; +import pro.gravit.launchserver.legacy.Response; +import pro.gravit.utils.helper.SecurityHelper; import java.io.IOException; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/LaunchServerGsonManager.java b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/LaunchServerGsonManager.java similarity index 64% rename from LaunchServer/src/main/java/ru/gravit/launchserver/manangers/LaunchServerGsonManager.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/manangers/LaunchServerGsonManager.java index dbf16e3a..609a9150 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/LaunchServerGsonManager.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/LaunchServerGsonManager.java @@ -1,15 +1,15 @@ -package ru.gravit.launchserver.manangers; +package pro.gravit.launchserver.manangers; import com.google.gson.GsonBuilder; -import ru.gravit.launcher.managers.GsonManager; -import ru.gravit.launchserver.auth.handler.AuthHandler; -import ru.gravit.launchserver.auth.hwid.HWIDHandler; -import ru.gravit.launchserver.auth.permissions.PermissionsHandler; -import ru.gravit.launchserver.auth.protect.ProtectHandler; -import ru.gravit.launchserver.auth.provider.AuthProvider; -import ru.gravit.launchserver.auth.texture.TextureProvider; -import ru.gravit.launchserver.components.Component; -import ru.gravit.utils.UniversalJsonAdapter; +import pro.gravit.launcher.managers.GsonManager; +import pro.gravit.launchserver.auth.handler.AuthHandler; +import pro.gravit.launchserver.auth.hwid.HWIDHandler; +import pro.gravit.launchserver.auth.permissions.PermissionsHandler; +import pro.gravit.launchserver.auth.protect.ProtectHandler; +import pro.gravit.launchserver.auth.provider.AuthProvider; +import pro.gravit.launchserver.auth.texture.TextureProvider; +import pro.gravit.launchserver.components.Component; +import pro.gravit.utils.UniversalJsonAdapter; public class LaunchServerGsonManager extends GsonManager { @Override diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/MirrorManager.java b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/MirrorManager.java similarity index 95% rename from LaunchServer/src/main/java/ru/gravit/launchserver/manangers/MirrorManager.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/manangers/MirrorManager.java index 671e8618..f8356fc6 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/MirrorManager.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/MirrorManager.java @@ -1,6 +1,6 @@ -package ru.gravit.launchserver.manangers; +package pro.gravit.launchserver.manangers; -import ru.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.IOHelper; import java.net.MalformedURLException; import java.net.URL; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/ModulesManager.java b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/ModulesManager.java similarity index 62% rename from LaunchServer/src/main/java/ru/gravit/launchserver/manangers/ModulesManager.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/manangers/ModulesManager.java index 481dbe88..3e53598b 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/ModulesManager.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/ModulesManager.java @@ -1,11 +1,11 @@ -package ru.gravit.launchserver.manangers; +package pro.gravit.launchserver.manangers; -import ru.gravit.launcher.managers.SimpleModuleManager; -import ru.gravit.launcher.managers.SimpleModulesConfigManager; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.modules.CoreModule; -import ru.gravit.launchserver.modules.LaunchServerModuleContext; -import ru.gravit.utils.PublicURLClassLoader; +import pro.gravit.launcher.managers.SimpleModuleManager; +import pro.gravit.launcher.managers.SimpleModulesConfigManager; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.modules.CoreModule; +import pro.gravit.launchserver.modules.LaunchServerModuleContext; +import pro.gravit.utils.PublicURLClassLoader; import java.net.URL; import java.util.ArrayList; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/ReconfigurableManager.java b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/ReconfigurableManager.java similarity index 86% rename from LaunchServer/src/main/java/ru/gravit/launchserver/manangers/ReconfigurableManager.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/manangers/ReconfigurableManager.java index 66817aeb..691feb5d 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/ReconfigurableManager.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/ReconfigurableManager.java @@ -1,8 +1,8 @@ -package ru.gravit.launchserver.manangers; +package pro.gravit.launchserver.manangers; -import ru.gravit.launchserver.Reconfigurable; -import ru.gravit.utils.helper.LogHelper; -import ru.gravit.utils.helper.VerifyHelper; +import pro.gravit.launchserver.Reconfigurable; +import pro.gravit.utils.helper.LogHelper; +import pro.gravit.utils.helper.VerifyHelper; import java.util.HashMap; import java.util.Objects; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/ReloadManager.java b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/ReloadManager.java similarity index 86% rename from LaunchServer/src/main/java/ru/gravit/launchserver/manangers/ReloadManager.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/manangers/ReloadManager.java index fce8ea1e..c55ac8d9 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/ReloadManager.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/ReloadManager.java @@ -1,8 +1,8 @@ -package ru.gravit.launchserver.manangers; +package pro.gravit.launchserver.manangers; -import ru.gravit.launchserver.Reloadable; -import ru.gravit.utils.helper.LogHelper; -import ru.gravit.utils.helper.VerifyHelper; +import pro.gravit.launchserver.Reloadable; +import pro.gravit.utils.helper.LogHelper; +import pro.gravit.utils.helper.VerifyHelper; import java.util.HashMap; import java.util.Objects; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/SessionManager.java b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/SessionManager.java similarity index 92% rename from LaunchServer/src/main/java/ru/gravit/launchserver/manangers/SessionManager.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/manangers/SessionManager.java index 13e45f6c..66cc6ba5 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/SessionManager.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/SessionManager.java @@ -1,7 +1,7 @@ -package ru.gravit.launchserver.manangers; +package pro.gravit.launchserver.manangers; -import ru.gravit.launcher.NeedGarbageCollection; -import ru.gravit.launchserver.socket.Client; +import pro.gravit.launcher.NeedGarbageCollection; +import pro.gravit.launchserver.socket.Client; import java.util.HashSet; import java.util.Set; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/hook/AuthHookManager.java b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/hook/AuthHookManager.java similarity index 53% rename from LaunchServer/src/main/java/ru/gravit/launchserver/manangers/hook/AuthHookManager.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/manangers/hook/AuthHookManager.java index d50fc91f..fa42d7bd 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/hook/AuthHookManager.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/hook/AuthHookManager.java @@ -1,11 +1,11 @@ -package ru.gravit.launchserver.manangers.hook; +package pro.gravit.launchserver.manangers.hook; -import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.websocket.json.auth.AuthResponse; -import ru.gravit.launchserver.websocket.json.auth.CheckServerResponse; -import ru.gravit.launchserver.websocket.json.auth.JoinServerResponse; -import ru.gravit.launchserver.websocket.json.auth.SetProfileResponse; -import ru.gravit.utils.BiHookSet; +import pro.gravit.launchserver.socket.Client; +import pro.gravit.launchserver.websocket.json.auth.AuthResponse; +import pro.gravit.launchserver.websocket.json.auth.CheckServerResponse; +import pro.gravit.launchserver.websocket.json.auth.JoinServerResponse; +import pro.gravit.launchserver.websocket.json.auth.SetProfileResponse; +import pro.gravit.utils.BiHookSet; public class AuthHookManager { public BiHookSet preHook = new BiHookSet<>(); diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/hook/BuildHookManager.java b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/hook/BuildHookManager.java similarity index 91% rename from LaunchServer/src/main/java/ru/gravit/launchserver/manangers/hook/BuildHookManager.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/manangers/hook/BuildHookManager.java index ba82805d..7fd9c35a 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/hook/BuildHookManager.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/hook/BuildHookManager.java @@ -1,9 +1,9 @@ -package ru.gravit.launchserver.manangers.hook; +package pro.gravit.launchserver.manangers.hook; -import ru.gravit.launcher.AutogenConfig; -import ru.gravit.launchserver.binary.BuildContext; -import ru.gravit.launchserver.binary.JAConfigurator; -import ru.gravit.launchserver.binary.tasks.MainBuildTask; +import pro.gravit.launcher.AutogenConfig; +import pro.gravit.launchserver.binary.BuildContext; +import pro.gravit.launchserver.binary.JAConfigurator; +import pro.gravit.launchserver.binary.tasks.MainBuildTask; import java.util.HashMap; import java.util.HashSet; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/hook/SocketHookManager.java b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/hook/SocketHookManager.java similarity index 94% rename from LaunchServer/src/main/java/ru/gravit/launchserver/manangers/hook/SocketHookManager.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/manangers/hook/SocketHookManager.java index df510189..cdc7cc12 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/manangers/hook/SocketHookManager.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/manangers/hook/SocketHookManager.java @@ -1,7 +1,7 @@ -package ru.gravit.launchserver.manangers.hook; +package pro.gravit.launchserver.manangers.hook; -import ru.gravit.launcher.request.RequestException; -import ru.gravit.launchserver.socket.SocketContext; +import pro.gravit.launcher.request.RequestException; +import pro.gravit.launchserver.socket.SocketContext; import java.net.Socket; import java.util.HashSet; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/modules/CoreModule.java b/LaunchServer/src/main/java/pro/gravit/launchserver/modules/CoreModule.java similarity index 79% rename from LaunchServer/src/main/java/ru/gravit/launchserver/modules/CoreModule.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/modules/CoreModule.java index ba311709..5590aaf8 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/modules/CoreModule.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/modules/CoreModule.java @@ -1,8 +1,8 @@ -package ru.gravit.launchserver.modules; +package pro.gravit.launchserver.modules; -import ru.gravit.launcher.modules.Module; -import ru.gravit.launcher.modules.ModuleContext; -import ru.gravit.utils.Version; +import pro.gravit.launcher.modules.Module; +import pro.gravit.launcher.modules.ModuleContext; +import pro.gravit.utils.Version; public class CoreModule implements Module { @Override diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/modules/LaunchServerModuleContext.java b/LaunchServer/src/main/java/pro/gravit/launchserver/modules/LaunchServerModuleContext.java similarity index 69% rename from LaunchServer/src/main/java/ru/gravit/launchserver/modules/LaunchServerModuleContext.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/modules/LaunchServerModuleContext.java index 26bd9e1f..c8a5abb6 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/modules/LaunchServerModuleContext.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/modules/LaunchServerModuleContext.java @@ -1,11 +1,11 @@ -package ru.gravit.launchserver.modules; +package pro.gravit.launchserver.modules; -import ru.gravit.launcher.managers.SimpleModulesConfigManager; -import ru.gravit.launcher.modules.ModuleContext; -import ru.gravit.launcher.modules.ModulesConfigManager; -import ru.gravit.launcher.modules.ModulesManager; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.utils.PublicURLClassLoader; +import pro.gravit.launcher.managers.SimpleModulesConfigManager; +import pro.gravit.launcher.modules.ModuleContext; +import pro.gravit.launcher.modules.ModulesConfigManager; +import pro.gravit.launcher.modules.ModulesManager; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.utils.PublicURLClassLoader; public class LaunchServerModuleContext implements ModuleContext { public final LaunchServer launchServer; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/modules/SimpleModule.java b/LaunchServer/src/main/java/pro/gravit/launchserver/modules/SimpleModule.java similarity index 78% rename from LaunchServer/src/main/java/ru/gravit/launchserver/modules/SimpleModule.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/modules/SimpleModule.java index 7937cafd..6495cfd6 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/modules/SimpleModule.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/modules/SimpleModule.java @@ -1,8 +1,8 @@ -package ru.gravit.launchserver.modules; +package pro.gravit.launchserver.modules; -import ru.gravit.launcher.modules.Module; -import ru.gravit.launcher.modules.ModuleContext; -import ru.gravit.utils.Version; +import pro.gravit.launcher.modules.Module; +import pro.gravit.launcher.modules.ModuleContext; +import pro.gravit.utils.Version; public class SimpleModule implements Module { @Override diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/Client.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/Client.java similarity index 80% rename from LaunchServer/src/main/java/ru/gravit/launchserver/socket/Client.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/socket/Client.java index 80e008e9..b1b423e5 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/Client.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/Client.java @@ -1,10 +1,10 @@ -package ru.gravit.launchserver.socket; +package pro.gravit.launchserver.socket; -import ru.gravit.launcher.ClientPermissions; -import ru.gravit.launcher.profiles.ClientProfile; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.auth.AuthProviderPair; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launcher.ClientPermissions; +import pro.gravit.launcher.profiles.ClientProfile; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.auth.AuthProviderPair; +import pro.gravit.utils.helper.LogHelper; public class Client { public long session; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/ResponseThread.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/ResponseThread.java similarity index 89% rename from LaunchServer/src/main/java/ru/gravit/launchserver/socket/ResponseThread.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/socket/ResponseThread.java index ecc22283..e2e6bda5 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/ResponseThread.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/ResponseThread.java @@ -1,16 +1,16 @@ -package ru.gravit.launchserver.socket; +package pro.gravit.launchserver.socket; -import ru.gravit.launcher.Launcher; -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.legacy.Response; -import ru.gravit.launchserver.manangers.SessionManager; -import ru.gravit.launchserver.manangers.hook.SocketHookManager; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; -import ru.gravit.utils.helper.SecurityHelper; +import pro.gravit.launchserver.manangers.SessionManager; +import pro.gravit.launchserver.manangers.hook.SocketHookManager; +import pro.gravit.launcher.Launcher; +import pro.gravit.launcher.request.RequestException; +import pro.gravit.launcher.serialize.HInput; +import pro.gravit.launcher.serialize.HOutput; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.legacy.Response; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.LogHelper; +import pro.gravit.utils.helper.SecurityHelper; import java.io.IOException; import java.math.BigInteger; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/ServerSocketHandler.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/ServerSocketHandler.java similarity index 92% rename from LaunchServer/src/main/java/ru/gravit/launchserver/socket/ServerSocketHandler.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/socket/ServerSocketHandler.java index 1859a9c6..d7e7d3a0 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/ServerSocketHandler.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/ServerSocketHandler.java @@ -1,11 +1,11 @@ -package ru.gravit.launchserver.socket; +package pro.gravit.launchserver.socket; -import ru.gravit.launcher.Launcher; -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; +import pro.gravit.launchserver.manangers.SessionManager; +import pro.gravit.launcher.Launcher; +import pro.gravit.launcher.managers.GarbageManager; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.utils.helper.CommonHelper; +import pro.gravit.utils.helper.LogHelper; import java.io.IOException; import java.net.InetAddress; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/SocketContext.java b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/SocketContext.java similarity index 58% rename from LaunchServer/src/main/java/ru/gravit/launchserver/socket/SocketContext.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/socket/SocketContext.java index a3b142fa..31b8daf9 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/socket/SocketContext.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/socket/SocketContext.java @@ -1,7 +1,7 @@ -package ru.gravit.launchserver.socket; +package pro.gravit.launchserver.socket; -import ru.gravit.launcher.serialize.HInput; -import ru.gravit.launcher.serialize.HOutput; +import pro.gravit.launcher.serialize.HInput; +import pro.gravit.launcher.serialize.HOutput; public class SocketContext { public HInput input; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/LauncherNettyServer.java b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/LauncherNettyServer.java similarity index 90% rename from LaunchServer/src/main/java/ru/gravit/launchserver/websocket/LauncherNettyServer.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/websocket/LauncherNettyServer.java index 1cc9735a..cf1fb446 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/LauncherNettyServer.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/LauncherNettyServer.java @@ -1,4 +1,4 @@ -package ru.gravit.launchserver.websocket; +package pro.gravit.launchserver.websocket; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.ChannelFuture; @@ -13,12 +13,12 @@ import io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler; import io.netty.handler.codec.http.websocketx.extensions.compression.WebSocketServerCompressionHandler; import io.netty.handler.logging.LoggingHandler; -import ru.gravit.launcher.request.Request; -import ru.gravit.launcher.request.auth.AuthRequest; -import ru.gravit.launcher.request.websockets.StandartClientWebSocketService; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.websocket.fileserver.FileServerHandler; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launcher.request.Request; +import pro.gravit.launcher.request.auth.AuthRequest; +import pro.gravit.launcher.request.websockets.StandartClientWebSocketService; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.websocket.fileserver.FileServerHandler; +import pro.gravit.utils.helper.LogHelper; import java.net.InetSocketAddress; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/NettyConnectContext.java b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/NettyConnectContext.java similarity index 60% rename from LaunchServer/src/main/java/ru/gravit/launchserver/websocket/NettyConnectContext.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/websocket/NettyConnectContext.java index c1a66c8a..c9f95cad 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/NettyConnectContext.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/NettyConnectContext.java @@ -1,4 +1,4 @@ -package ru.gravit.launchserver.websocket; +package pro.gravit.launchserver.websocket; public class NettyConnectContext { public String ip = null; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/NettyIpForwardHandler.java b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/NettyIpForwardHandler.java similarity index 94% rename from LaunchServer/src/main/java/ru/gravit/launchserver/websocket/NettyIpForwardHandler.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/websocket/NettyIpForwardHandler.java index 380aeb50..d7c50394 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/NettyIpForwardHandler.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/NettyIpForwardHandler.java @@ -1,11 +1,11 @@ -package ru.gravit.launchserver.websocket; +package pro.gravit.launchserver.websocket; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToMessageDecoder; import io.netty.handler.codec.http.HttpHeaders; import io.netty.handler.codec.http.HttpRequest; import io.netty.util.ReferenceCounted; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.utils.helper.LogHelper; import java.util.List; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/NettyServerSocketHandler.java b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/NettyServerSocketHandler.java similarity index 95% rename from LaunchServer/src/main/java/ru/gravit/launchserver/websocket/NettyServerSocketHandler.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/websocket/NettyServerSocketHandler.java index 7e49dfbf..4555ae3e 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/NettyServerSocketHandler.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/NettyServerSocketHandler.java @@ -1,11 +1,11 @@ -package ru.gravit.launchserver.websocket; +package pro.gravit.launchserver.websocket; -import ru.gravit.launcher.ssl.LauncherKeyStore; -import ru.gravit.launcher.ssl.LauncherTrustManager; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.legacy.Response; -import ru.gravit.utils.helper.LogHelper; -import ru.gravit.utils.helper.VerifyHelper; +import pro.gravit.launcher.ssl.LauncherKeyStore; +import pro.gravit.launcher.ssl.LauncherTrustManager; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.legacy.Response; +import pro.gravit.utils.helper.LogHelper; +import pro.gravit.utils.helper.VerifyHelper; import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLContext; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/WebSocketFrameHandler.java b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/WebSocketFrameHandler.java similarity index 91% rename from LaunchServer/src/main/java/ru/gravit/launchserver/websocket/WebSocketFrameHandler.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/websocket/WebSocketFrameHandler.java index ac226eaf..1f7880d9 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/WebSocketFrameHandler.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/WebSocketFrameHandler.java @@ -1,4 +1,4 @@ -package ru.gravit.launchserver.websocket; +package pro.gravit.launchserver.websocket; import com.google.gson.GsonBuilder; import io.netty.channel.ChannelHandlerContext; @@ -6,10 +6,10 @@ import io.netty.channel.group.DefaultChannelGroup; import io.netty.handler.codec.http.websocketx.*; import io.netty.util.concurrent.GlobalEventExecutor; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.socket.Client; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.socket.Client; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.LogHelper; import java.util.concurrent.TimeUnit; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/WebSocketService.java b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/WebSocketService.java similarity index 81% rename from LaunchServer/src/main/java/ru/gravit/launchserver/websocket/WebSocketService.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/websocket/WebSocketService.java index e8319f6d..0622da42 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/WebSocketService.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/WebSocketService.java @@ -1,4 +1,4 @@ -package ru.gravit.launchserver.websocket; +package pro.gravit.launchserver.websocket; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -7,36 +7,37 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.channel.group.ChannelGroup; import io.netty.handler.codec.http.websocketx.TextWebSocketFrame; -import ru.gravit.launcher.events.ExceptionEvent; -import ru.gravit.launcher.events.RequestEvent; -import ru.gravit.launcher.events.request.AuthRequestEvent; -import ru.gravit.launcher.events.request.ErrorRequestEvent; -import ru.gravit.launcher.hasher.HashedEntry; -import ru.gravit.launcher.hasher.HashedEntryAdapter; -import ru.gravit.launcher.request.JsonResultSerializeAdapter; -import ru.gravit.launcher.request.Request; -import ru.gravit.launcher.request.RequestException; -import ru.gravit.launcher.request.ResultInterface; -import ru.gravit.launcher.request.admin.ProxyRequest; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.websocket.json.JsonResponseAdapter; -import ru.gravit.launchserver.websocket.json.JsonResponseInterface; -import ru.gravit.launchserver.websocket.json.SimpleResponse; -import ru.gravit.launchserver.websocket.json.admin.AddLogListenerResponse; -import ru.gravit.launchserver.websocket.json.admin.ExecCommandResponse; -import ru.gravit.launchserver.websocket.json.admin.ProxyCommandResponse; -import ru.gravit.launchserver.websocket.json.auth.*; -import ru.gravit.launchserver.websocket.json.profile.BatchProfileByUsername; -import ru.gravit.launchserver.websocket.json.profile.ProfileByUUIDResponse; -import ru.gravit.launchserver.websocket.json.profile.ProfileByUsername; -import ru.gravit.launchserver.websocket.json.secure.GetSecureTokenResponse; -import ru.gravit.launchserver.websocket.json.secure.VerifySecureTokenResponse; -import ru.gravit.launchserver.websocket.json.update.LauncherResponse; -import ru.gravit.launchserver.websocket.json.update.UpdateListResponse; -import ru.gravit.launchserver.websocket.json.update.UpdateResponse; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launchserver.websocket.json.JsonResponseAdapter; +import pro.gravit.launchserver.websocket.json.JsonResponseInterface; +import pro.gravit.launchserver.websocket.json.SimpleResponse; +import pro.gravit.launchserver.websocket.json.auth.*; +import pro.gravit.launcher.events.ExceptionEvent; +import pro.gravit.launcher.events.RequestEvent; +import pro.gravit.launcher.events.request.AuthRequestEvent; +import pro.gravit.launcher.events.request.ErrorRequestEvent; +import pro.gravit.launcher.hasher.HashedEntry; +import pro.gravit.launcher.hasher.HashedEntryAdapter; +import pro.gravit.launcher.request.JsonResultSerializeAdapter; +import pro.gravit.launcher.request.Request; +import pro.gravit.launcher.request.RequestException; +import pro.gravit.launcher.request.ResultInterface; +import pro.gravit.launcher.request.admin.ProxyRequest; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.socket.Client; +import pro.gravit.launchserver.websocket.json.admin.AddLogListenerResponse; +import pro.gravit.launchserver.websocket.json.admin.ExecCommandResponse; +import pro.gravit.launchserver.websocket.json.admin.ProxyCommandResponse; +import pro.gravit.launchserver.websocket.json.auth.*; +import pro.gravit.launchserver.websocket.json.profile.BatchProfileByUsername; +import pro.gravit.launchserver.websocket.json.profile.ProfileByUUIDResponse; +import pro.gravit.launchserver.websocket.json.profile.ProfileByUsername; +import pro.gravit.launchserver.websocket.json.secure.GetSecureTokenResponse; +import pro.gravit.launchserver.websocket.json.secure.VerifySecureTokenResponse; +import pro.gravit.launchserver.websocket.json.update.LauncherResponse; +import pro.gravit.launchserver.websocket.json.update.UpdateListResponse; +import pro.gravit.launchserver.websocket.json.update.UpdateResponse; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.LogHelper; import java.lang.reflect.Type; import java.util.HashMap; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/fileserver/ClosingChannelFutureListener.java b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/fileserver/ClosingChannelFutureListener.java similarity index 82% rename from LaunchServer/src/main/java/ru/gravit/launchserver/websocket/fileserver/ClosingChannelFutureListener.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/websocket/fileserver/ClosingChannelFutureListener.java index e9cc5a3b..19e47d62 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/fileserver/ClosingChannelFutureListener.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/fileserver/ClosingChannelFutureListener.java @@ -1,8 +1,8 @@ -package ru.gravit.launchserver.websocket.fileserver; +package pro.gravit.launchserver.websocket.fileserver; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelFutureListener; -import ru.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.IOHelper; import java.io.Closeable; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/fileserver/FileServerHandler.java b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/fileserver/FileServerHandler.java similarity index 99% rename from LaunchServer/src/main/java/ru/gravit/launchserver/websocket/fileserver/FileServerHandler.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/websocket/fileserver/FileServerHandler.java index 491becdf..0fcee80c 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/fileserver/FileServerHandler.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/fileserver/FileServerHandler.java @@ -1,4 +1,4 @@ -package ru.gravit.launchserver.websocket.fileserver; +package pro.gravit.launchserver.websocket.fileserver; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/JsonResponseAdapter.java b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/JsonResponseAdapter.java similarity index 91% rename from LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/JsonResponseAdapter.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/JsonResponseAdapter.java index f6f0610f..64c5994b 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/JsonResponseAdapter.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/JsonResponseAdapter.java @@ -1,7 +1,7 @@ -package ru.gravit.launchserver.websocket.json; +package pro.gravit.launchserver.websocket.json; import com.google.gson.*; -import ru.gravit.launchserver.websocket.WebSocketService; +import pro.gravit.launchserver.websocket.WebSocketService; import java.lang.reflect.Type; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/JsonResponseInterface.java b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/JsonResponseInterface.java similarity index 57% rename from LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/JsonResponseInterface.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/JsonResponseInterface.java index cd54596c..7a0431fd 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/JsonResponseInterface.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/JsonResponseInterface.java @@ -1,8 +1,8 @@ -package ru.gravit.launchserver.websocket.json; +package pro.gravit.launchserver.websocket.json; import io.netty.channel.ChannelHandlerContext; -import ru.gravit.launcher.request.websockets.RequestInterface; -import ru.gravit.launchserver.socket.Client; +import pro.gravit.launcher.request.websockets.RequestInterface; +import pro.gravit.launchserver.socket.Client; public interface JsonResponseInterface extends RequestInterface { String getType(); diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/SimpleResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/SimpleResponse.java similarity index 75% rename from LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/SimpleResponse.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/SimpleResponse.java index 4c29e9f5..3e22cfb1 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/SimpleResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/SimpleResponse.java @@ -1,11 +1,11 @@ -package ru.gravit.launchserver.websocket.json; +package pro.gravit.launchserver.websocket.json; import io.netty.channel.ChannelHandlerContext; -import ru.gravit.launcher.events.RequestEvent; -import ru.gravit.launcher.events.request.ErrorRequestEvent; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.websocket.WebSocketService; +import pro.gravit.launcher.events.RequestEvent; +import pro.gravit.launcher.events.request.ErrorRequestEvent; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.socket.Client; +import pro.gravit.launchserver.websocket.WebSocketService; import java.util.UUID; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/admin/AddLogListenerResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/admin/AddLogListenerResponse.java similarity index 83% rename from LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/admin/AddLogListenerResponse.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/admin/AddLogListenerResponse.java index 2cd70607..2b15bfe9 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/admin/AddLogListenerResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/admin/AddLogListenerResponse.java @@ -1,10 +1,10 @@ -package ru.gravit.launchserver.websocket.json.admin; +package pro.gravit.launchserver.websocket.json.admin; import io.netty.channel.ChannelHandlerContext; -import ru.gravit.launcher.events.request.LogEvent; -import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.websocket.json.SimpleResponse; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launchserver.socket.Client; +import pro.gravit.launchserver.websocket.json.SimpleResponse; +import pro.gravit.launcher.events.request.LogEvent; +import pro.gravit.utils.helper.LogHelper; public class AddLogListenerResponse extends SimpleResponse { public LogHelper.OutputTypes outputType = LogHelper.OutputTypes.PLAIN; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/admin/ExecCommandResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/admin/ExecCommandResponse.java similarity index 66% rename from LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/admin/ExecCommandResponse.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/admin/ExecCommandResponse.java index 50059923..09d4b850 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/admin/ExecCommandResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/admin/ExecCommandResponse.java @@ -1,10 +1,10 @@ -package ru.gravit.launchserver.websocket.json.admin; +package pro.gravit.launchserver.websocket.json.admin; import io.netty.channel.ChannelHandlerContext; -import ru.gravit.launcher.events.request.ExecCommandRequestEvent; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.websocket.json.SimpleResponse; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.socket.Client; +import pro.gravit.launchserver.websocket.json.SimpleResponse; +import pro.gravit.launcher.events.request.ExecCommandRequestEvent; public class ExecCommandResponse extends SimpleResponse { public String cmd; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/admin/ProxyCommandResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/admin/ProxyCommandResponse.java similarity index 74% rename from LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/admin/ProxyCommandResponse.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/admin/ProxyCommandResponse.java index 0a2d014d..d13ede9e 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/admin/ProxyCommandResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/admin/ProxyCommandResponse.java @@ -1,9 +1,9 @@ -package ru.gravit.launchserver.websocket.json.admin; +package pro.gravit.launchserver.websocket.json.admin; import io.netty.channel.ChannelHandlerContext; -import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.websocket.json.JsonResponseInterface; -import ru.gravit.launchserver.websocket.json.SimpleResponse; +import pro.gravit.launchserver.socket.Client; +import pro.gravit.launchserver.websocket.json.JsonResponseInterface; +import pro.gravit.launchserver.websocket.json.SimpleResponse; public class ProxyCommandResponse extends SimpleResponse { public JsonResponseInterface response; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/AuthResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/AuthResponse.java similarity index 86% rename from LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/AuthResponse.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/AuthResponse.java index d319933a..34d77b85 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/AuthResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/AuthResponse.java @@ -1,23 +1,23 @@ -package ru.gravit.launchserver.websocket.json.auth; +package pro.gravit.launchserver.websocket.json.auth; import io.netty.channel.ChannelHandlerContext; -import ru.gravit.launcher.OshiHWID; -import ru.gravit.launcher.events.request.AuthRequestEvent; -import ru.gravit.launcher.profiles.ClientProfile; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.auth.AuthException; -import ru.gravit.launchserver.auth.AuthProviderPair; -import ru.gravit.launchserver.auth.hwid.HWIDException; -import ru.gravit.launchserver.auth.provider.AuthProvider; -import ru.gravit.launchserver.auth.provider.AuthProviderResult; -import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.websocket.json.SimpleResponse; -import ru.gravit.launchserver.websocket.json.profile.ProfileByUUIDResponse; -import ru.gravit.utils.HookException; -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 pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.auth.AuthException; +import pro.gravit.launchserver.auth.AuthProviderPair; +import pro.gravit.launchserver.auth.hwid.HWIDException; +import pro.gravit.launchserver.auth.provider.AuthProvider; +import pro.gravit.launchserver.auth.provider.AuthProviderResult; +import pro.gravit.launchserver.socket.Client; +import pro.gravit.launchserver.websocket.json.SimpleResponse; +import pro.gravit.launchserver.websocket.json.profile.ProfileByUUIDResponse; +import pro.gravit.launcher.OshiHWID; +import pro.gravit.launcher.events.request.AuthRequestEvent; +import pro.gravit.launcher.profiles.ClientProfile; +import pro.gravit.utils.HookException; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.LogHelper; +import pro.gravit.utils.helper.SecurityHelper; +import pro.gravit.utils.helper.VerifyHelper; import javax.crypto.BadPaddingException; import javax.crypto.IllegalBlockSizeException; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/CheckServerResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/CheckServerResponse.java similarity index 71% rename from LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/CheckServerResponse.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/CheckServerResponse.java index 0b745ec4..bd218ea9 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/CheckServerResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/CheckServerResponse.java @@ -1,14 +1,14 @@ -package ru.gravit.launchserver.websocket.json.auth; +package pro.gravit.launchserver.websocket.json.auth; import io.netty.channel.ChannelHandlerContext; -import ru.gravit.launcher.events.request.CheckServerRequestEvent; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.auth.AuthException; -import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.websocket.json.SimpleResponse; -import ru.gravit.launchserver.websocket.json.profile.ProfileByUUIDResponse; -import ru.gravit.utils.HookException; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.auth.AuthException; +import pro.gravit.launchserver.socket.Client; +import pro.gravit.launchserver.websocket.json.SimpleResponse; +import pro.gravit.launchserver.websocket.json.profile.ProfileByUUIDResponse; +import pro.gravit.launcher.events.request.CheckServerRequestEvent; +import pro.gravit.utils.HookException; +import pro.gravit.utils.helper.LogHelper; public class CheckServerResponse extends SimpleResponse { public String serverID; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/GetAvailabilityAuthResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/GetAvailabilityAuthResponse.java similarity index 67% rename from LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/GetAvailabilityAuthResponse.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/GetAvailabilityAuthResponse.java index 436de2ba..08ff7874 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/GetAvailabilityAuthResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/GetAvailabilityAuthResponse.java @@ -1,11 +1,11 @@ -package ru.gravit.launchserver.websocket.json.auth; +package pro.gravit.launchserver.websocket.json.auth; import io.netty.channel.ChannelHandlerContext; -import ru.gravit.launcher.events.request.GetAvailabilityAuthRequestEvent; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.auth.AuthProviderPair; -import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.websocket.json.SimpleResponse; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.auth.AuthProviderPair; +import pro.gravit.launchserver.socket.Client; +import pro.gravit.launchserver.websocket.json.SimpleResponse; +import pro.gravit.launcher.events.request.GetAvailabilityAuthRequestEvent; import java.util.ArrayList; import java.util.List; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/JoinServerResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/JoinServerResponse.java similarity index 75% rename from LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/JoinServerResponse.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/JoinServerResponse.java index c222d6cc..5a62f153 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/JoinServerResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/JoinServerResponse.java @@ -1,13 +1,13 @@ -package ru.gravit.launchserver.websocket.json.auth; +package pro.gravit.launchserver.websocket.json.auth; import io.netty.channel.ChannelHandlerContext; -import ru.gravit.launcher.events.request.JoinServerRequestEvent; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.auth.AuthException; -import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.websocket.json.SimpleResponse; -import ru.gravit.utils.HookException; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.auth.AuthException; +import pro.gravit.launchserver.socket.Client; +import pro.gravit.launchserver.websocket.json.SimpleResponse; +import pro.gravit.launcher.events.request.JoinServerRequestEvent; +import pro.gravit.utils.HookException; +import pro.gravit.utils.helper.LogHelper; public class JoinServerResponse extends SimpleResponse { public String serverID; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/ProfilesResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/ProfilesResponse.java similarity index 60% rename from LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/ProfilesResponse.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/ProfilesResponse.java index 6f301057..f427b75b 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/ProfilesResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/ProfilesResponse.java @@ -1,11 +1,11 @@ -package ru.gravit.launchserver.websocket.json.auth; +package pro.gravit.launchserver.websocket.json.auth; import io.netty.channel.ChannelHandlerContext; -import ru.gravit.launcher.events.request.ErrorRequestEvent; -import ru.gravit.launcher.events.request.ProfilesRequestEvent; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.websocket.json.SimpleResponse; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.socket.Client; +import pro.gravit.launchserver.websocket.json.SimpleResponse; +import pro.gravit.launcher.events.request.ErrorRequestEvent; +import pro.gravit.launcher.events.request.ProfilesRequestEvent; public class ProfilesResponse extends SimpleResponse { @Override diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/RestoreSessionResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/RestoreSessionResponse.java similarity index 63% rename from LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/RestoreSessionResponse.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/RestoreSessionResponse.java index 713e3084..f3de34f0 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/RestoreSessionResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/RestoreSessionResponse.java @@ -1,12 +1,12 @@ -package ru.gravit.launchserver.websocket.json.auth; +package pro.gravit.launchserver.websocket.json.auth; import io.netty.channel.ChannelHandlerContext; -import ru.gravit.launcher.LauncherNetworkAPI; -import ru.gravit.launcher.events.request.RestoreSessionRequestEvent; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.websocket.WebSocketFrameHandler; -import ru.gravit.launchserver.websocket.json.SimpleResponse; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.socket.Client; +import pro.gravit.launchserver.websocket.WebSocketFrameHandler; +import pro.gravit.launchserver.websocket.json.SimpleResponse; +import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.events.request.RestoreSessionRequestEvent; public class RestoreSessionResponse extends SimpleResponse { @LauncherNetworkAPI diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/SetProfileResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/SetProfileResponse.java similarity index 76% rename from LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/SetProfileResponse.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/SetProfileResponse.java index be13da91..39b692f0 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/auth/SetProfileResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/auth/SetProfileResponse.java @@ -1,12 +1,12 @@ -package ru.gravit.launchserver.websocket.json.auth; +package pro.gravit.launchserver.websocket.json.auth; import io.netty.channel.ChannelHandlerContext; -import ru.gravit.launcher.events.request.SetProfileRequestEvent; -import ru.gravit.launcher.profiles.ClientProfile; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.websocket.json.SimpleResponse; -import ru.gravit.utils.HookException; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.socket.Client; +import pro.gravit.launchserver.websocket.json.SimpleResponse; +import pro.gravit.launcher.events.request.SetProfileRequestEvent; +import pro.gravit.launcher.profiles.ClientProfile; +import pro.gravit.utils.HookException; import java.util.Collection; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/profile/BatchProfileByUsername.java b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/profile/BatchProfileByUsername.java similarity index 75% rename from LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/profile/BatchProfileByUsername.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/profile/BatchProfileByUsername.java index 9df09489..d1ec5fe6 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/profile/BatchProfileByUsername.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/profile/BatchProfileByUsername.java @@ -1,12 +1,12 @@ -package ru.gravit.launchserver.websocket.json.profile; +package pro.gravit.launchserver.websocket.json.profile; import io.netty.channel.ChannelHandlerContext; -import ru.gravit.launcher.events.request.BatchProfileByUsernameRequestEvent; -import ru.gravit.launcher.profiles.PlayerProfile; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.websocket.json.SimpleResponse; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launchserver.socket.Client; +import pro.gravit.launchserver.websocket.json.SimpleResponse; +import pro.gravit.launcher.events.request.BatchProfileByUsernameRequestEvent; +import pro.gravit.launcher.profiles.PlayerProfile; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.utils.helper.LogHelper; import java.util.UUID; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/profile/ProfileByUUIDResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/profile/ProfileByUUIDResponse.java similarity index 78% rename from LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/profile/ProfileByUUIDResponse.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/profile/ProfileByUUIDResponse.java index d8ac236d..2387b58e 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/profile/ProfileByUUIDResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/profile/ProfileByUUIDResponse.java @@ -1,14 +1,14 @@ -package ru.gravit.launchserver.websocket.json.profile; +package pro.gravit.launchserver.websocket.json.profile; import io.netty.channel.ChannelHandlerContext; -import ru.gravit.launcher.events.request.ProfileByUUIDRequestEvent; -import ru.gravit.launcher.profiles.PlayerProfile; -import ru.gravit.launcher.profiles.Texture; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.auth.texture.TextureProvider; -import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.websocket.json.SimpleResponse; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launchserver.auth.texture.TextureProvider; +import pro.gravit.launchserver.socket.Client; +import pro.gravit.launchserver.websocket.json.SimpleResponse; +import pro.gravit.launcher.events.request.ProfileByUUIDRequestEvent; +import pro.gravit.launcher.profiles.PlayerProfile; +import pro.gravit.launcher.profiles.Texture; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.utils.helper.LogHelper; import java.io.IOException; import java.util.UUID; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/profile/ProfileByUsername.java b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/profile/ProfileByUsername.java similarity index 54% rename from LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/profile/ProfileByUsername.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/profile/ProfileByUsername.java index 604f1b6c..ffc251eb 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/profile/ProfileByUsername.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/profile/ProfileByUsername.java @@ -1,16 +1,14 @@ -package ru.gravit.launchserver.websocket.json.profile; +package pro.gravit.launchserver.websocket.json.profile; import io.netty.channel.ChannelHandlerContext; -import ru.gravit.launcher.events.request.ProfileByUsernameRequestEvent; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.websocket.json.SimpleResponse; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launchserver.socket.Client; +import pro.gravit.launchserver.websocket.json.SimpleResponse; +import pro.gravit.launcher.events.request.ProfileByUsernameRequestEvent; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.utils.helper.LogHelper; import java.util.UUID; -import static ru.gravit.launchserver.websocket.json.profile.ProfileByUUIDResponse.getProfile; - public class ProfileByUsername extends SimpleResponse { String username; String client; @@ -27,6 +25,6 @@ public void execute(ChannelHandlerContext ctx, Client client) throws Exception { LogHelper.warning("Client auth is null. Using default."); uuid = LaunchServer.server.config.getAuthProviderPair().handler.usernameToUUID(username); } else uuid = client.auth.handler.usernameToUUID(username); - sendResult(new ProfileByUsernameRequestEvent(getProfile(LaunchServer.server, uuid, username, this.client, client.auth.textureProvider))); + sendResult(new ProfileByUsernameRequestEvent(ProfileByUUIDResponse.getProfile(LaunchServer.server, uuid, username, this.client, client.auth.textureProvider))); } } diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/secure/GetSecureTokenResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/secure/GetSecureTokenResponse.java similarity index 63% rename from LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/secure/GetSecureTokenResponse.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/secure/GetSecureTokenResponse.java index 7203fabd..c3321723 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/secure/GetSecureTokenResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/secure/GetSecureTokenResponse.java @@ -1,10 +1,10 @@ -package ru.gravit.launchserver.websocket.json.secure; +package pro.gravit.launchserver.websocket.json.secure; import io.netty.channel.ChannelHandlerContext; -import ru.gravit.launcher.events.request.GetSecureTokenRequestEvent; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.websocket.json.SimpleResponse; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.socket.Client; +import pro.gravit.launchserver.websocket.json.SimpleResponse; +import pro.gravit.launcher.events.request.GetSecureTokenRequestEvent; public class GetSecureTokenResponse extends SimpleResponse { @Override diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/secure/VerifySecureTokenResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/secure/VerifySecureTokenResponse.java similarity index 66% rename from LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/secure/VerifySecureTokenResponse.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/secure/VerifySecureTokenResponse.java index 0098cde0..0f9f3e1e 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/secure/VerifySecureTokenResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/secure/VerifySecureTokenResponse.java @@ -1,10 +1,10 @@ -package ru.gravit.launchserver.websocket.json.secure; +package pro.gravit.launchserver.websocket.json.secure; import io.netty.channel.ChannelHandlerContext; -import ru.gravit.launcher.events.request.VerifySecureTokenRequestEvent; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.websocket.json.SimpleResponse; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.socket.Client; +import pro.gravit.launchserver.websocket.json.SimpleResponse; +import pro.gravit.launcher.events.request.VerifySecureTokenRequestEvent; public class VerifySecureTokenResponse extends SimpleResponse { public String secureToken; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/update/LauncherResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/update/LauncherResponse.java similarity index 85% rename from LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/update/LauncherResponse.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/update/LauncherResponse.java index add47b6f..1e9ae6e4 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/update/LauncherResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/update/LauncherResponse.java @@ -1,11 +1,11 @@ -package ru.gravit.launchserver.websocket.json.update; +package pro.gravit.launchserver.websocket.json.update; import io.netty.channel.ChannelHandlerContext; -import ru.gravit.launcher.events.request.LauncherRequestEvent; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.websocket.json.SimpleResponse; -import ru.gravit.utils.Version; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.socket.Client; +import pro.gravit.launchserver.websocket.json.SimpleResponse; +import pro.gravit.launcher.events.request.LauncherRequestEvent; +import pro.gravit.utils.Version; import java.util.Arrays; import java.util.Base64; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/update/UpdateListResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/update/UpdateListResponse.java similarity index 63% rename from LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/update/UpdateListResponse.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/update/UpdateListResponse.java index 437e7ec5..d8a844f5 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/update/UpdateListResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/update/UpdateListResponse.java @@ -1,12 +1,12 @@ -package ru.gravit.launchserver.websocket.json.update; +package pro.gravit.launchserver.websocket.json.update; import io.netty.channel.ChannelHandlerContext; -import ru.gravit.launcher.events.request.UpdateListRequestEvent; -import ru.gravit.launcher.hasher.HashedDir; -import ru.gravit.launcher.serialize.signed.SignedObjectHolder; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.websocket.json.SimpleResponse; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.socket.Client; +import pro.gravit.launchserver.websocket.json.SimpleResponse; +import pro.gravit.launcher.events.request.UpdateListRequestEvent; +import pro.gravit.launcher.hasher.HashedDir; +import pro.gravit.launcher.serialize.signed.SignedObjectHolder; import java.util.HashSet; import java.util.Map; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/update/UpdateResponse.java b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/update/UpdateResponse.java similarity index 76% rename from LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/update/UpdateResponse.java rename to LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/update/UpdateResponse.java index 5e03c7ef..410197aa 100644 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/websocket/json/update/UpdateResponse.java +++ b/LaunchServer/src/main/java/pro/gravit/launchserver/websocket/json/update/UpdateResponse.java @@ -1,14 +1,14 @@ -package ru.gravit.launchserver.websocket.json.update; +package pro.gravit.launchserver.websocket.json.update; import io.netty.channel.ChannelHandlerContext; -import ru.gravit.launcher.events.request.ErrorRequestEvent; -import ru.gravit.launcher.events.request.UpdateRequestEvent; -import ru.gravit.launcher.hasher.HashedDir; -import ru.gravit.launcher.profiles.ClientProfile; -import ru.gravit.launcher.serialize.signed.SignedObjectHolder; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.socket.Client; -import ru.gravit.launchserver.websocket.json.SimpleResponse; +import pro.gravit.launchserver.socket.Client; +import pro.gravit.launchserver.websocket.json.SimpleResponse; +import pro.gravit.launcher.events.request.ErrorRequestEvent; +import pro.gravit.launcher.events.request.UpdateRequestEvent; +import pro.gravit.launcher.hasher.HashedDir; +import pro.gravit.launcher.profiles.ClientProfile; +import pro.gravit.launcher.serialize.signed.SignedObjectHolder; +import pro.gravit.launchserver.LaunchServer; public class UpdateResponse extends SimpleResponse { public String dirName; diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/command/Command.java b/LaunchServer/src/main/java/ru/gravit/launchserver/command/Command.java deleted file mode 100644 index cd640f2a..00000000 --- a/LaunchServer/src/main/java/ru/gravit/launchserver/command/Command.java +++ /dev/null @@ -1,14 +0,0 @@ -package ru.gravit.launchserver.command; - -import ru.gravit.launchserver.LaunchServer; - -public abstract class Command extends ru.gravit.utils.command.Command { - - - protected final LaunchServer server; - - - protected Command(LaunchServer server) { - this.server = server; - } -} diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/config.cfg b/LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/config.cfg similarity index 100% rename from LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/config.cfg rename to LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/config.cfg diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.10.2.cfg b/LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.10.2.cfg similarity index 100% rename from LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.10.2.cfg rename to LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.10.2.cfg diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.11.2.cfg b/LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.11.2.cfg similarity index 100% rename from LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.11.2.cfg rename to LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.11.2.cfg diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.12.2.cfg b/LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.12.2.cfg similarity index 100% rename from LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.12.2.cfg rename to LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.12.2.cfg diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.13.1.cfg b/LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.13.1.cfg similarity index 100% rename from LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.13.1.cfg rename to LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.13.1.cfg diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.13.cfg b/LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.13.cfg similarity index 100% rename from LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.13.cfg rename to LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.13.cfg diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.4.7.cfg b/LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.4.7.cfg similarity index 100% rename from LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.4.7.cfg rename to LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.4.7.cfg diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.5.2.cfg b/LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.5.2.cfg similarity index 100% rename from LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.5.2.cfg rename to LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.5.2.cfg diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.6.4.cfg b/LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.6.4.cfg similarity index 100% rename from LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.6.4.cfg rename to LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.6.4.cfg diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.7.10.cfg b/LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.7.10.cfg similarity index 100% rename from LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.7.10.cfg rename to LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.7.10.cfg diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.7.2.cfg b/LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.7.2.cfg similarity index 100% rename from LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.7.2.cfg rename to LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.7.2.cfg diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.8.9.cfg b/LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.8.9.cfg similarity index 100% rename from LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.8.9.cfg rename to LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.8.9.cfg diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.9.4.cfg b/LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.9.4.cfg similarity index 100% rename from LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/profile1.9.4.cfg rename to LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/profile1.9.4.cfg diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/proguard.cfg b/LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/proguard.cfg similarity index 70% rename from LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/proguard.cfg rename to LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/proguard.cfg index b2e34d42..0f109a1d 100644 --- a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/proguard.cfg +++ b/LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/proguard.cfg @@ -14,39 +14,39 @@ -forceprocessing -overloadaggressively --repackageclasses 'ru.gravit.launcher' +-repackageclasses 'pro.gravit.launcher' -keepattributes SourceFile,LineNumberTable,*Annotation* -renamesourcefileattribute SourceFile -keepattributes Signature -adaptresourcefilecontents META-INF/MANIFEST.MF --keeppackagenames com.mojang.**,net.minecraftforge.fml.**,cpw.mods.fml.**,com.google.gson.**,ru.gravit.repackage.**,org.fusesource.** +-keeppackagenames com.mojang.**,net.minecraftforge.fml.**,cpw.mods.fml.**,com.google.gson.**,pro.gravit.repackage.**,org.fusesource.** --keep class com.mojang.**,net.minecraftforge.fml.**,cpw.mods.fml.**,com.google.gson.**,ru.gravit.repackage.**,org.fusesource.** { +-keep class com.mojang.**,net.minecraftforge.fml.**,cpw.mods.fml.**,com.google.gson.**,pro.gravit.repackage.**,org.fusesource.** { *; } --keepclassmembers @ru.gravit.launcher.LauncherAPI class ** { +-keepclassmembers @pro.gravit.launcher.LauncherAPI class ** { ; ; } --keepclassmembers @ru.gravit.launcher.LauncherNetworkAPI class ** { +-keepclassmembers @pro.gravit.launcher.LauncherNetworkAPI class ** { ; ; } -keepclassmembers class ** { - @ru.gravit.launcher.LauncherAPI + @pro.gravit.launcher.LauncherAPI ; - @ru.gravit.launcher.LauncherAPI + @pro.gravit.launcher.LauncherAPI ; } -keepclassmembers class ** { - @ru.gravit.launcher.LauncherNetworkAPI + @pro.gravit.launcher.LauncherNetworkAPI ; - @ru.gravit.launcher.LauncherNetworkAPI + @pro.gravit.launcher.LauncherNetworkAPI ; } diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/radon.cfg b/LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/radon.cfg similarity index 100% rename from LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/radon.cfg rename to LaunchServer/src/main/resources/pro/gravit/launchserver/defaults/radon.cfg diff --git a/LaunchServerConsole/build.gradle b/LaunchServerConsole/build.gradle index 78f606d2..82076206 100644 --- a/LaunchServerConsole/build.gradle +++ b/LaunchServerConsole/build.gradle @@ -1,4 +1,4 @@ -String mainClassName = "ru.gravit.launchserver.console.ConsoleMain" +String mainClassName = "pro.gravit.launchserver.console.ConsoleMain" repositories { diff --git a/LaunchServerConsole/src/main/java/ru/gravit/launchserver/console/ConsoleMain.java b/LaunchServerConsole/src/main/java/pro/gravit/launchserver/console/ConsoleMain.java similarity index 79% rename from LaunchServerConsole/src/main/java/ru/gravit/launchserver/console/ConsoleMain.java rename to LaunchServerConsole/src/main/java/pro/gravit/launchserver/console/ConsoleMain.java index a11fabcb..572a8bed 100644 --- a/LaunchServerConsole/src/main/java/ru/gravit/launchserver/console/ConsoleMain.java +++ b/LaunchServerConsole/src/main/java/pro/gravit/launchserver/console/ConsoleMain.java @@ -1,11 +1,11 @@ -package ru.gravit.launchserver.console; +package pro.gravit.launchserver.console; -import ru.gravit.launcher.server.ServerWrapper; -import ru.gravit.utils.command.CommandHandler; -import ru.gravit.utils.command.JLineCommandHandler; -import ru.gravit.utils.command.StdCommandHandler; -import ru.gravit.utils.command.basic.HelpCommand; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launcher.server.ServerWrapper; +import pro.gravit.utils.command.CommandHandler; +import pro.gravit.utils.command.JLineCommandHandler; +import pro.gravit.utils.command.StdCommandHandler; +import pro.gravit.utils.command.basic.HelpCommand; +import pro.gravit.utils.helper.LogHelper; import java.io.IOException; diff --git a/LaunchServerConsole/src/main/java/ru/gravit/launchserver/console/ExecCommand.java b/LaunchServerConsole/src/main/java/pro/gravit/launchserver/console/ExecCommand.java similarity index 64% rename from LaunchServerConsole/src/main/java/ru/gravit/launchserver/console/ExecCommand.java rename to LaunchServerConsole/src/main/java/pro/gravit/launchserver/console/ExecCommand.java index 8717264e..b35c10ef 100644 --- a/LaunchServerConsole/src/main/java/ru/gravit/launchserver/console/ExecCommand.java +++ b/LaunchServerConsole/src/main/java/pro/gravit/launchserver/console/ExecCommand.java @@ -1,9 +1,9 @@ -package ru.gravit.launchserver.console; +package pro.gravit.launchserver.console; -import ru.gravit.launcher.events.request.ExecCommandRequestEvent; -import ru.gravit.launcher.request.admin.ExecCommandRequest; -import ru.gravit.utils.command.Command; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launcher.events.request.ExecCommandRequestEvent; +import pro.gravit.launcher.request.admin.ExecCommandRequest; +import pro.gravit.utils.command.Command; +import pro.gravit.utils.helper.LogHelper; public class ExecCommand extends Command { @Override diff --git a/LaunchServerConsole/src/main/java/ru/gravit/launchserver/console/ExitCommand.java b/LaunchServerConsole/src/main/java/pro/gravit/launchserver/console/ExitCommand.java similarity index 81% rename from LaunchServerConsole/src/main/java/ru/gravit/launchserver/console/ExitCommand.java rename to LaunchServerConsole/src/main/java/pro/gravit/launchserver/console/ExitCommand.java index 52c80c45..f9c84c04 100644 --- a/LaunchServerConsole/src/main/java/ru/gravit/launchserver/console/ExitCommand.java +++ b/LaunchServerConsole/src/main/java/pro/gravit/launchserver/console/ExitCommand.java @@ -1,6 +1,6 @@ -package ru.gravit.launchserver.console; +package pro.gravit.launchserver.console; -import ru.gravit.utils.command.Command; +import pro.gravit.utils.command.Command; public class ExitCommand extends Command { public ExitCommand() { diff --git a/LaunchServerConsole/src/main/java/ru/gravit/launchserver/console/LogListenerCommand.java b/LaunchServerConsole/src/main/java/pro/gravit/launchserver/console/LogListenerCommand.java similarity index 76% rename from LaunchServerConsole/src/main/java/ru/gravit/launchserver/console/LogListenerCommand.java rename to LaunchServerConsole/src/main/java/pro/gravit/launchserver/console/LogListenerCommand.java index 1634efc6..dab6a1d7 100644 --- a/LaunchServerConsole/src/main/java/ru/gravit/launchserver/console/LogListenerCommand.java +++ b/LaunchServerConsole/src/main/java/pro/gravit/launchserver/console/LogListenerCommand.java @@ -1,11 +1,11 @@ -package ru.gravit.launchserver.console; +package pro.gravit.launchserver.console; -import ru.gravit.launcher.LauncherNetworkAPI; -import ru.gravit.launcher.events.request.LogEvent; -import ru.gravit.launcher.request.Request; -import ru.gravit.launcher.request.websockets.RequestInterface; -import ru.gravit.utils.command.Command; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.events.request.LogEvent; +import pro.gravit.launcher.request.Request; +import pro.gravit.launcher.request.websockets.RequestInterface; +import pro.gravit.utils.command.Command; +import pro.gravit.utils.helper.LogHelper; public class LogListenerCommand extends Command { public class LogListenerRequest implements RequestInterface { diff --git a/Launcher/build.gradle b/Launcher/build.gradle index ca0157a6..6e1553e9 100644 --- a/Launcher/build.gradle +++ b/Launcher/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.github.johnrengelman.shadow' -String mainClassName = "ru.gravit.launcher.ClientLauncherWrapper" -String mainAgentName = "ru.gravit.launcher.LauncherAgent" +String mainClassName = "pro.gravit.launcher.ClientLauncherWrapper" +String mainAgentName = "pro.gravit.launcher.LauncherAgent" repositories { maven { @@ -30,8 +30,8 @@ shadowJar { classifier = null - relocate 'org.objectweb.asm', 'ru.gravit.repackage.org.objectweb.asm' - relocate 'io.netty', 'ru.gravit.repackage.io.netty' + relocate 'org.objectweb.asm', 'pro.gravit.repackage.org.objectweb.asm' + relocate 'io.netty', 'pro.gravit.repackage.io.netty' configurations = [project.configurations.pack] exclude 'module-info.class' } diff --git a/Launcher/src/main/java/cpw/mods/fml/SafeExitJVMLegacy.java b/Launcher/src/main/java/cpw/mods/fml/SafeExitJVMLegacy.java index 2975b681..16372cfc 100644 --- a/Launcher/src/main/java/cpw/mods/fml/SafeExitJVMLegacy.java +++ b/Launcher/src/main/java/cpw/mods/fml/SafeExitJVMLegacy.java @@ -1,6 +1,6 @@ package cpw.mods.fml; -import ru.gravit.utils.helper.JVMHelper; +import pro.gravit.utils.helper.JVMHelper; // FMLSecurityManager запрещает делать System.exit из классов // Не входящих в пакеты самого Forge diff --git a/Launcher/src/main/java/net/minecraftforge/fml/SafeExitJVM.java b/Launcher/src/main/java/net/minecraftforge/fml/SafeExitJVM.java index 342ef1fc..ba36a8a5 100644 --- a/Launcher/src/main/java/net/minecraftforge/fml/SafeExitJVM.java +++ b/Launcher/src/main/java/net/minecraftforge/fml/SafeExitJVM.java @@ -1,6 +1,6 @@ package net.minecraftforge.fml; -import ru.gravit.utils.helper.JVMHelper; +import pro.gravit.utils.helper.JVMHelper; // FMLSecurityManager запрещает делать System.exit из классов // Не входящих в пакеты самого Forge diff --git a/Launcher/src/main/java/ru/gravit/launcher/ClientLauncherWrapper.java b/Launcher/src/main/java/pro/gravit/launcher/ClientLauncherWrapper.java similarity index 92% rename from Launcher/src/main/java/ru/gravit/launcher/ClientLauncherWrapper.java rename to Launcher/src/main/java/pro/gravit/launcher/ClientLauncherWrapper.java index f18db5f6..40a24e97 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/ClientLauncherWrapper.java +++ b/Launcher/src/main/java/pro/gravit/launcher/ClientLauncherWrapper.java @@ -1,11 +1,11 @@ -package ru.gravit.launcher; +package pro.gravit.launcher; -import ru.gravit.launcher.client.ClientLauncher; -import ru.gravit.launcher.client.DirBridge; -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 pro.gravit.launcher.client.ClientLauncher; +import pro.gravit.launcher.client.DirBridge; +import pro.gravit.utils.helper.EnvHelper; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.JVMHelper; +import pro.gravit.utils.helper.LogHelper; import java.io.IOException; import java.nio.file.Path; diff --git a/Launcher/src/main/java/ru/gravit/launcher/JSApplication.java b/Launcher/src/main/java/pro/gravit/launcher/JSApplication.java similarity index 93% rename from Launcher/src/main/java/ru/gravit/launcher/JSApplication.java rename to Launcher/src/main/java/pro/gravit/launcher/JSApplication.java index eb7f8010..47937e7c 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/JSApplication.java +++ b/Launcher/src/main/java/pro/gravit/launcher/JSApplication.java @@ -1,4 +1,4 @@ -package ru.gravit.launcher; +package pro.gravit.launcher; import javafx.application.Application; diff --git a/Launcher/src/main/java/ru/gravit/launcher/LauncherAgent.java b/Launcher/src/main/java/pro/gravit/launcher/LauncherAgent.java similarity index 98% rename from Launcher/src/main/java/ru/gravit/launcher/LauncherAgent.java rename to Launcher/src/main/java/pro/gravit/launcher/LauncherAgent.java index 164d9be4..34436d4e 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/LauncherAgent.java +++ b/Launcher/src/main/java/pro/gravit/launcher/LauncherAgent.java @@ -1,4 +1,4 @@ -package ru.gravit.launcher; +package pro.gravit.launcher; import cpw.mods.fml.SafeExitJVMLegacy; import net.minecraftforge.fml.SafeExitJVM; @@ -7,8 +7,8 @@ import org.objectweb.asm.tree.ClassNode; import org.objectweb.asm.tree.InsnNode; import org.objectweb.asm.tree.MethodNode; -import ru.gravit.launcher.utils.NativeJVMHalt; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launcher.utils.NativeJVMHalt; +import pro.gravit.utils.helper.LogHelper; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/Launcher/src/main/java/ru/gravit/launcher/LauncherEngine.java b/Launcher/src/main/java/pro/gravit/launcher/LauncherEngine.java similarity index 79% rename from Launcher/src/main/java/ru/gravit/launcher/LauncherEngine.java rename to Launcher/src/main/java/pro/gravit/launcher/LauncherEngine.java index e531d802..85634dfd 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/LauncherEngine.java +++ b/Launcher/src/main/java/pro/gravit/launcher/LauncherEngine.java @@ -1,23 +1,23 @@ -package ru.gravit.launcher; +package pro.gravit.launcher; -import ru.gravit.launcher.client.ClientModuleManager; -import ru.gravit.launcher.client.DirBridge; -import ru.gravit.launcher.client.FunctionalBridge; -import ru.gravit.launcher.client.LauncherUpdateController; -import ru.gravit.launcher.guard.LauncherGuardManager; -import ru.gravit.launcher.gui.JSRuntimeProvider; -import ru.gravit.launcher.gui.RuntimeProvider; -import ru.gravit.launcher.managers.ClientGsonManager; -import ru.gravit.launcher.managers.ConsoleManager; -import ru.gravit.launcher.request.Request; -import ru.gravit.launcher.request.RequestException; -import ru.gravit.launcher.request.auth.RestoreSessionRequest; -import ru.gravit.launcher.request.update.UpdateRequest; -import ru.gravit.launcher.request.websockets.StandartClientWebSocketService; -import ru.gravit.utils.helper.CommonHelper; -import ru.gravit.utils.helper.EnvHelper; -import ru.gravit.utils.helper.JVMHelper; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launcher.client.ClientModuleManager; +import pro.gravit.launcher.client.DirBridge; +import pro.gravit.launcher.client.FunctionalBridge; +import pro.gravit.launcher.client.LauncherUpdateController; +import pro.gravit.launcher.guard.LauncherGuardManager; +import pro.gravit.launcher.gui.JSRuntimeProvider; +import pro.gravit.launcher.gui.RuntimeProvider; +import pro.gravit.launcher.managers.ClientGsonManager; +import pro.gravit.launcher.managers.ConsoleManager; +import pro.gravit.launcher.request.Request; +import pro.gravit.launcher.request.RequestException; +import pro.gravit.launcher.request.auth.RestoreSessionRequest; +import pro.gravit.launcher.request.update.UpdateRequest; +import pro.gravit.launcher.request.websockets.StandartClientWebSocketService; +import pro.gravit.utils.helper.CommonHelper; +import pro.gravit.utils.helper.EnvHelper; +import pro.gravit.utils.helper.JVMHelper; +import pro.gravit.utils.helper.LogHelper; import java.util.Objects; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/Launcher/src/main/java/ru/gravit/launcher/NewLauncherSettings.java b/Launcher/src/main/java/pro/gravit/launcher/NewLauncherSettings.java similarity index 91% rename from Launcher/src/main/java/ru/gravit/launcher/NewLauncherSettings.java rename to Launcher/src/main/java/pro/gravit/launcher/NewLauncherSettings.java index 25e3b1fe..61179760 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/NewLauncherSettings.java +++ b/Launcher/src/main/java/pro/gravit/launcher/NewLauncherSettings.java @@ -1,8 +1,8 @@ -package ru.gravit.launcher; +package pro.gravit.launcher; -import ru.gravit.launcher.client.UserSettings; -import ru.gravit.launcher.hasher.HashedDir; -import ru.gravit.launcher.profiles.ClientProfile; +import pro.gravit.launcher.client.UserSettings; +import pro.gravit.launcher.hasher.HashedDir; +import pro.gravit.launcher.profiles.ClientProfile; import java.nio.file.Path; import java.util.*; diff --git a/Launcher/src/main/java/ru/gravit/launcher/bridge/GravitGuardBridge.java b/Launcher/src/main/java/pro/gravit/launcher/bridge/GravitGuardBridge.java similarity index 88% rename from Launcher/src/main/java/ru/gravit/launcher/bridge/GravitGuardBridge.java rename to Launcher/src/main/java/pro/gravit/launcher/bridge/GravitGuardBridge.java index cabe2cc6..69b654bb 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/bridge/GravitGuardBridge.java +++ b/Launcher/src/main/java/pro/gravit/launcher/bridge/GravitGuardBridge.java @@ -1,6 +1,6 @@ -package ru.gravit.launcher.bridge; +package pro.gravit.launcher.bridge; -import ru.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.LauncherAPI; import java.io.IOException; import java.net.HttpURLConnection; diff --git a/Launcher/src/main/java/ru/gravit/launcher/client/ClientLauncher.java b/Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncher.java similarity index 96% rename from Launcher/src/main/java/ru/gravit/launcher/client/ClientLauncher.java rename to Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncher.java index 64c155ca..602377f7 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/client/ClientLauncher.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncher.java @@ -1,24 +1,26 @@ -package ru.gravit.launcher.client; +package pro.gravit.launcher.client; -import ru.gravit.launcher.*; -import ru.gravit.launcher.guard.LauncherGuardManager; -import ru.gravit.launcher.gui.JSRuntimeProvider; -import ru.gravit.launcher.hasher.FileNameMatcher; -import ru.gravit.launcher.hasher.HashedDir; -import ru.gravit.launcher.managers.ClientGsonManager; -import ru.gravit.launcher.profiles.ClientProfile; -import ru.gravit.launcher.profiles.PlayerProfile; -import ru.gravit.launcher.request.Request; -import ru.gravit.launcher.request.RequestException; -import ru.gravit.launcher.request.auth.RestoreSessionRequest; -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.Version; -import ru.gravit.utils.helper.*; -import ru.gravit.utils.helper.JVMHelper.OS; +import pro.gravit.launcher.*; +import pro.gravit.launcher.hasher.FileNameMatcher; +import pro.gravit.launcher.hasher.HashedDir; +import pro.gravit.launcher.serialize.HInput; +import pro.gravit.launcher.serialize.HOutput; +import pro.gravit.launcher.serialize.stream.StreamObject; +import pro.gravit.utils.PublicURLClassLoader; +import pro.gravit.utils.Version; +import pro.gravit.utils.helper.*; +import pro.gravit.launcher.*; +import pro.gravit.launcher.guard.LauncherGuardManager; +import pro.gravit.launcher.gui.JSRuntimeProvider; +import pro.gravit.launcher.managers.ClientGsonManager; +import pro.gravit.launcher.profiles.ClientProfile; +import pro.gravit.launcher.profiles.PlayerProfile; +import pro.gravit.launcher.request.Request; +import pro.gravit.launcher.request.RequestException; +import pro.gravit.launcher.request.auth.RestoreSessionRequest; +import pro.gravit.launcher.utils.DirWatcher; +import pro.gravit.utils.helper.*; +import pro.gravit.utils.helper.JVMHelper.OS; import javax.swing.*; import java.io.IOException; diff --git a/Launcher/src/main/java/ru/gravit/launcher/client/ClientLauncherContext.java b/Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncherContext.java similarity index 71% rename from Launcher/src/main/java/ru/gravit/launcher/client/ClientLauncherContext.java rename to Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncherContext.java index c02fcb2c..07904f8a 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/client/ClientLauncherContext.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncherContext.java @@ -1,7 +1,7 @@ -package ru.gravit.launcher.client; +package pro.gravit.launcher.client; -import ru.gravit.launcher.profiles.ClientProfile; -import ru.gravit.launcher.profiles.PlayerProfile; +import pro.gravit.launcher.profiles.ClientProfile; +import pro.gravit.launcher.profiles.PlayerProfile; import java.nio.file.Path; import java.util.LinkedList; diff --git a/Launcher/src/main/java/ru/gravit/launcher/client/ClientModuleContext.java b/Launcher/src/main/java/pro/gravit/launcher/client/ClientModuleContext.java similarity index 66% rename from Launcher/src/main/java/ru/gravit/launcher/client/ClientModuleContext.java rename to Launcher/src/main/java/pro/gravit/launcher/client/ClientModuleContext.java index 1253b764..8f33f79c 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/client/ClientModuleContext.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/ClientModuleContext.java @@ -1,10 +1,10 @@ -package ru.gravit.launcher.client; +package pro.gravit.launcher.client; -import ru.gravit.launcher.Launcher; -import ru.gravit.launcher.LauncherEngine; -import ru.gravit.launcher.modules.ModuleContext; -import ru.gravit.launcher.modules.ModulesConfigManager; -import ru.gravit.launcher.modules.ModulesManager; +import pro.gravit.launcher.modules.ModuleContext; +import pro.gravit.launcher.modules.ModulesConfigManager; +import pro.gravit.launcher.modules.ModulesManager; +import pro.gravit.launcher.Launcher; +import pro.gravit.launcher.LauncherEngine; public class ClientModuleContext implements ModuleContext { public final LauncherEngine engine; diff --git a/Launcher/src/main/java/ru/gravit/launcher/client/ClientModuleManager.java b/Launcher/src/main/java/pro/gravit/launcher/client/ClientModuleManager.java similarity index 80% rename from Launcher/src/main/java/ru/gravit/launcher/client/ClientModuleManager.java rename to Launcher/src/main/java/pro/gravit/launcher/client/ClientModuleManager.java index 3beac090..ddff122c 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/client/ClientModuleManager.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/ClientModuleManager.java @@ -1,7 +1,7 @@ -package ru.gravit.launcher.client; +package pro.gravit.launcher.client; -import ru.gravit.launcher.LauncherEngine; -import ru.gravit.launcher.managers.SimpleModuleManager; +import pro.gravit.launcher.managers.SimpleModuleManager; +import pro.gravit.launcher.LauncherEngine; import java.net.URL; import java.util.ArrayList; diff --git a/Launcher/src/main/java/ru/gravit/launcher/client/DirBridge.java b/Launcher/src/main/java/pro/gravit/launcher/client/DirBridge.java similarity index 95% rename from Launcher/src/main/java/ru/gravit/launcher/client/DirBridge.java rename to Launcher/src/main/java/pro/gravit/launcher/client/DirBridge.java index 16996fd6..0cd9985f 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/client/DirBridge.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/DirBridge.java @@ -1,8 +1,8 @@ -package ru.gravit.launcher.client; +package pro.gravit.launcher.client; -import ru.gravit.launcher.LauncherAPI; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.JVMHelper; +import pro.gravit.launcher.LauncherAPI; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.JVMHelper; import java.io.IOException; import java.nio.file.Files; diff --git a/Launcher/src/main/java/ru/gravit/launcher/client/FunctionalBridge.java b/Launcher/src/main/java/pro/gravit/launcher/client/FunctionalBridge.java similarity index 82% rename from Launcher/src/main/java/ru/gravit/launcher/client/FunctionalBridge.java rename to Launcher/src/main/java/pro/gravit/launcher/client/FunctionalBridge.java index d7da0a43..aedde048 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/client/FunctionalBridge.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/FunctionalBridge.java @@ -1,18 +1,18 @@ -package ru.gravit.launcher.client; +package pro.gravit.launcher.client; -import ru.gravit.launcher.HWID; -import ru.gravit.launcher.LauncherAPI; -import ru.gravit.launcher.events.request.AuthRequestEvent; -import ru.gravit.launcher.guard.LauncherGuardManager; -import ru.gravit.launcher.hasher.FileNameMatcher; -import ru.gravit.launcher.hasher.HashedDir; -import ru.gravit.launcher.hwid.OshiHWIDProvider; -import ru.gravit.launcher.managers.ConsoleManager; -import ru.gravit.launcher.managers.HasherManager; -import ru.gravit.launcher.managers.HasherStore; -import ru.gravit.launcher.request.Request; -import ru.gravit.launcher.serialize.signed.SignedObjectHolder; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.hasher.FileNameMatcher; +import pro.gravit.launcher.hasher.HashedDir; +import pro.gravit.launcher.serialize.signed.SignedObjectHolder; +import pro.gravit.launcher.HWID; +import pro.gravit.launcher.events.request.AuthRequestEvent; +import pro.gravit.launcher.guard.LauncherGuardManager; +import pro.gravit.launcher.hwid.OshiHWIDProvider; +import pro.gravit.launcher.managers.ConsoleManager; +import pro.gravit.launcher.managers.HasherManager; +import pro.gravit.launcher.managers.HasherStore; +import pro.gravit.launcher.request.Request; +import pro.gravit.utils.helper.LogHelper; import java.nio.file.Path; import java.util.concurrent.Executors; diff --git a/Launcher/src/main/java/ru/gravit/launcher/client/LauncherUpdateController.java b/Launcher/src/main/java/pro/gravit/launcher/client/LauncherUpdateController.java similarity index 89% rename from Launcher/src/main/java/ru/gravit/launcher/client/LauncherUpdateController.java rename to Launcher/src/main/java/pro/gravit/launcher/client/LauncherUpdateController.java index 73a57835..b295df25 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/client/LauncherUpdateController.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/LauncherUpdateController.java @@ -1,15 +1,15 @@ -package ru.gravit.launcher.client; +package pro.gravit.launcher.client; -import ru.gravit.launcher.NewLauncherSettings; -import ru.gravit.launcher.downloader.ListDownloader; -import ru.gravit.launcher.events.request.UpdateRequestEvent; -import ru.gravit.launcher.hasher.HashedDir; -import ru.gravit.launcher.hasher.HashedEntry; -import ru.gravit.launcher.hasher.HashedFile; -import ru.gravit.launcher.managers.SettingsManager; -import ru.gravit.launcher.request.update.UpdateRequest; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launcher.hasher.HashedDir; +import pro.gravit.launcher.hasher.HashedEntry; +import pro.gravit.launcher.hasher.HashedFile; +import pro.gravit.launcher.NewLauncherSettings; +import pro.gravit.launcher.downloader.ListDownloader; +import pro.gravit.launcher.events.request.UpdateRequestEvent; +import pro.gravit.launcher.managers.SettingsManager; +import pro.gravit.launcher.request.update.UpdateRequest; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.LogHelper; import java.io.File; import java.io.IOException; diff --git a/Launcher/src/main/java/ru/gravit/launcher/client/ServerPinger.java b/Launcher/src/main/java/pro/gravit/launcher/client/ServerPinger.java similarity index 96% rename from Launcher/src/main/java/ru/gravit/launcher/client/ServerPinger.java rename to Launcher/src/main/java/pro/gravit/launcher/client/ServerPinger.java index 69928887..72efd152 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/client/ServerPinger.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/ServerPinger.java @@ -1,14 +1,14 @@ -package ru.gravit.launcher.client; +package pro.gravit.launcher.client; 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 pro.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.serialize.HInput; +import pro.gravit.launcher.serialize.HOutput; +import pro.gravit.launcher.profiles.ClientProfile; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.LogHelper; +import pro.gravit.utils.helper.VerifyHelper; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/Launcher/src/main/java/ru/gravit/launcher/client/UserSettings.java b/Launcher/src/main/java/pro/gravit/launcher/client/UserSettings.java similarity index 59% rename from Launcher/src/main/java/ru/gravit/launcher/client/UserSettings.java rename to Launcher/src/main/java/pro/gravit/launcher/client/UserSettings.java index b04c66c4..6504d459 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/client/UserSettings.java +++ b/Launcher/src/main/java/pro/gravit/launcher/client/UserSettings.java @@ -1,6 +1,6 @@ -package ru.gravit.launcher.client; +package pro.gravit.launcher.client; -import ru.gravit.utils.ProviderMap; +import pro.gravit.utils.ProviderMap; public class UserSettings { public static ProviderMap providers = new ProviderMap<>(); diff --git a/Launcher/src/main/java/ru/gravit/launcher/console/FeatureCommand.java b/Launcher/src/main/java/pro/gravit/launcher/console/FeatureCommand.java similarity index 81% rename from Launcher/src/main/java/ru/gravit/launcher/console/FeatureCommand.java rename to Launcher/src/main/java/pro/gravit/launcher/console/FeatureCommand.java index 79dd2b3c..9ac67446 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/console/FeatureCommand.java +++ b/Launcher/src/main/java/pro/gravit/launcher/console/FeatureCommand.java @@ -1,8 +1,8 @@ -package ru.gravit.launcher.console; +package pro.gravit.launcher.console; -import ru.gravit.launcher.managers.SettingsManager; -import ru.gravit.utils.command.Command; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.utils.command.Command; +import pro.gravit.launcher.managers.SettingsManager; +import pro.gravit.utils.helper.LogHelper; public class FeatureCommand extends Command { @Override diff --git a/Launcher/src/main/java/ru/gravit/launcher/console/UnlockCommand.java b/Launcher/src/main/java/pro/gravit/launcher/console/UnlockCommand.java similarity index 76% rename from Launcher/src/main/java/ru/gravit/launcher/console/UnlockCommand.java rename to Launcher/src/main/java/pro/gravit/launcher/console/UnlockCommand.java index a27a7ff3..ad44ee13 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/console/UnlockCommand.java +++ b/Launcher/src/main/java/pro/gravit/launcher/console/UnlockCommand.java @@ -1,9 +1,9 @@ -package ru.gravit.launcher.console; +package pro.gravit.launcher.console; -import ru.gravit.launcher.managers.ConsoleManager; -import ru.gravit.launcher.managers.SettingsManager; -import ru.gravit.utils.command.Command; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launcher.managers.ConsoleManager; +import pro.gravit.utils.command.Command; +import pro.gravit.launcher.managers.SettingsManager; +import pro.gravit.utils.helper.LogHelper; public class UnlockCommand extends Command { @Override diff --git a/Launcher/src/main/java/ru/gravit/launcher/console/admin/ExecCommand.java b/Launcher/src/main/java/pro/gravit/launcher/console/admin/ExecCommand.java similarity index 64% rename from Launcher/src/main/java/ru/gravit/launcher/console/admin/ExecCommand.java rename to Launcher/src/main/java/pro/gravit/launcher/console/admin/ExecCommand.java index 42520594..781f2479 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/console/admin/ExecCommand.java +++ b/Launcher/src/main/java/pro/gravit/launcher/console/admin/ExecCommand.java @@ -1,9 +1,9 @@ -package ru.gravit.launcher.console.admin; +package pro.gravit.launcher.console.admin; -import ru.gravit.launcher.events.request.ExecCommandRequestEvent; -import ru.gravit.launcher.request.admin.ExecCommandRequest; -import ru.gravit.utils.command.Command; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.utils.command.Command; +import pro.gravit.launcher.events.request.ExecCommandRequestEvent; +import pro.gravit.launcher.request.admin.ExecCommandRequest; +import pro.gravit.utils.helper.LogHelper; public class ExecCommand extends Command { @Override diff --git a/Launcher/src/main/java/ru/gravit/launcher/console/admin/LogListenerCommand.java b/Launcher/src/main/java/pro/gravit/launcher/console/admin/LogListenerCommand.java similarity index 77% rename from Launcher/src/main/java/ru/gravit/launcher/console/admin/LogListenerCommand.java rename to Launcher/src/main/java/pro/gravit/launcher/console/admin/LogListenerCommand.java index 32228c12..d66cd12c 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/console/admin/LogListenerCommand.java +++ b/Launcher/src/main/java/pro/gravit/launcher/console/admin/LogListenerCommand.java @@ -1,11 +1,11 @@ -package ru.gravit.launcher.console.admin; +package pro.gravit.launcher.console.admin; -import ru.gravit.launcher.LauncherNetworkAPI; -import ru.gravit.launcher.events.request.LogEvent; -import ru.gravit.launcher.request.Request; -import ru.gravit.launcher.request.websockets.RequestInterface; -import ru.gravit.utils.command.Command; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.utils.command.Command; +import pro.gravit.launcher.events.request.LogEvent; +import pro.gravit.launcher.request.Request; +import pro.gravit.launcher.request.websockets.RequestInterface; +import pro.gravit.utils.helper.LogHelper; public class LogListenerCommand extends Command { public class LogListenerRequest implements RequestInterface { diff --git a/Launcher/src/main/java/ru/gravit/launcher/console/store/CopyStoreDirCommand.java b/Launcher/src/main/java/pro/gravit/launcher/console/store/CopyStoreDirCommand.java similarity index 86% rename from Launcher/src/main/java/ru/gravit/launcher/console/store/CopyStoreDirCommand.java rename to Launcher/src/main/java/pro/gravit/launcher/console/store/CopyStoreDirCommand.java index 4b966ca5..1b92425b 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/console/store/CopyStoreDirCommand.java +++ b/Launcher/src/main/java/pro/gravit/launcher/console/store/CopyStoreDirCommand.java @@ -1,9 +1,9 @@ -package ru.gravit.launcher.console.store; +package pro.gravit.launcher.console.store; -import ru.gravit.launcher.NewLauncherSettings; -import ru.gravit.launcher.managers.SettingsManager; -import ru.gravit.utils.command.Command; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.utils.command.Command; +import pro.gravit.launcher.NewLauncherSettings; +import pro.gravit.launcher.managers.SettingsManager; +import pro.gravit.utils.helper.LogHelper; import java.nio.file.Files; import java.nio.file.Path; diff --git a/Launcher/src/main/java/ru/gravit/launcher/console/store/LinkStoreDirCommand.java b/Launcher/src/main/java/pro/gravit/launcher/console/store/LinkStoreDirCommand.java similarity index 85% rename from Launcher/src/main/java/ru/gravit/launcher/console/store/LinkStoreDirCommand.java rename to Launcher/src/main/java/pro/gravit/launcher/console/store/LinkStoreDirCommand.java index 712a04a1..dbed46f9 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/console/store/LinkStoreDirCommand.java +++ b/Launcher/src/main/java/pro/gravit/launcher/console/store/LinkStoreDirCommand.java @@ -1,9 +1,9 @@ -package ru.gravit.launcher.console.store; +package pro.gravit.launcher.console.store; -import ru.gravit.launcher.NewLauncherSettings; -import ru.gravit.launcher.managers.SettingsManager; -import ru.gravit.utils.command.Command; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.utils.command.Command; +import pro.gravit.launcher.NewLauncherSettings; +import pro.gravit.launcher.managers.SettingsManager; +import pro.gravit.utils.helper.LogHelper; import java.nio.file.Files; import java.nio.file.Path; diff --git a/Launcher/src/main/java/ru/gravit/launcher/console/store/StoreListCommand.java b/Launcher/src/main/java/pro/gravit/launcher/console/store/StoreListCommand.java similarity index 70% rename from Launcher/src/main/java/ru/gravit/launcher/console/store/StoreListCommand.java rename to Launcher/src/main/java/pro/gravit/launcher/console/store/StoreListCommand.java index 0770d172..56996ebc 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/console/store/StoreListCommand.java +++ b/Launcher/src/main/java/pro/gravit/launcher/console/store/StoreListCommand.java @@ -1,9 +1,9 @@ -package ru.gravit.launcher.console.store; +package pro.gravit.launcher.console.store; -import ru.gravit.launcher.NewLauncherSettings; -import ru.gravit.launcher.managers.SettingsManager; -import ru.gravit.utils.command.Command; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.utils.command.Command; +import pro.gravit.launcher.NewLauncherSettings; +import pro.gravit.launcher.managers.SettingsManager; +import pro.gravit.utils.helper.LogHelper; public class StoreListCommand extends Command { @Override diff --git a/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherGravitGuard.java b/Launcher/src/main/java/pro/gravit/launcher/guard/LauncherGravitGuard.java similarity index 88% rename from Launcher/src/main/java/ru/gravit/launcher/guard/LauncherGravitGuard.java rename to Launcher/src/main/java/pro/gravit/launcher/guard/LauncherGravitGuard.java index de9bd32f..c90292f2 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherGravitGuard.java +++ b/Launcher/src/main/java/pro/gravit/launcher/guard/LauncherGravitGuard.java @@ -1,14 +1,14 @@ -package ru.gravit.launcher.guard; +package pro.gravit.launcher.guard; -import ru.gravit.launcher.Launcher; -import ru.gravit.launcher.LauncherConfig; -import ru.gravit.launcher.bridge.GravitGuardBridge; -import ru.gravit.launcher.client.ClientLauncher; -import ru.gravit.launcher.client.ClientLauncherContext; -import ru.gravit.launcher.client.DirBridge; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.JVMHelper; -import ru.gravit.utils.helper.UnpackHelper; +import pro.gravit.launcher.bridge.GravitGuardBridge; +import pro.gravit.utils.helper.UnpackHelper; +import pro.gravit.launcher.Launcher; +import pro.gravit.launcher.LauncherConfig; +import pro.gravit.launcher.client.ClientLauncher; +import pro.gravit.launcher.client.ClientLauncherContext; +import pro.gravit.launcher.client.DirBridge; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.JVMHelper; import java.io.IOException; import java.nio.file.Path; diff --git a/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherGuardInterface.java b/Launcher/src/main/java/pro/gravit/launcher/guard/LauncherGuardInterface.java similarity index 79% rename from Launcher/src/main/java/ru/gravit/launcher/guard/LauncherGuardInterface.java rename to Launcher/src/main/java/pro/gravit/launcher/guard/LauncherGuardInterface.java index 41ed7b6a..e0be7852 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherGuardInterface.java +++ b/Launcher/src/main/java/pro/gravit/launcher/guard/LauncherGuardInterface.java @@ -1,6 +1,6 @@ -package ru.gravit.launcher.guard; +package pro.gravit.launcher.guard; -import ru.gravit.launcher.client.ClientLauncherContext; +import pro.gravit.launcher.client.ClientLauncherContext; import java.nio.file.Path; diff --git a/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherGuardManager.java b/Launcher/src/main/java/pro/gravit/launcher/guard/LauncherGuardManager.java similarity index 88% rename from Launcher/src/main/java/ru/gravit/launcher/guard/LauncherGuardManager.java rename to Launcher/src/main/java/pro/gravit/launcher/guard/LauncherGuardManager.java index 63a10397..86416803 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherGuardManager.java +++ b/Launcher/src/main/java/pro/gravit/launcher/guard/LauncherGuardManager.java @@ -1,7 +1,7 @@ -package ru.gravit.launcher.guard; +package pro.gravit.launcher.guard; -import ru.gravit.launcher.Launcher; -import ru.gravit.launcher.LauncherConfig; +import pro.gravit.launcher.Launcher; +import pro.gravit.launcher.LauncherConfig; import java.nio.file.Path; diff --git a/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherJavaGuard.java b/Launcher/src/main/java/pro/gravit/launcher/guard/LauncherJavaGuard.java similarity index 82% rename from Launcher/src/main/java/ru/gravit/launcher/guard/LauncherJavaGuard.java rename to Launcher/src/main/java/pro/gravit/launcher/guard/LauncherJavaGuard.java index 3d637628..8b4a013e 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherJavaGuard.java +++ b/Launcher/src/main/java/pro/gravit/launcher/guard/LauncherJavaGuard.java @@ -1,9 +1,9 @@ -package ru.gravit.launcher.guard; +package pro.gravit.launcher.guard; -import ru.gravit.launcher.client.ClientLauncher; -import ru.gravit.launcher.client.ClientLauncherContext; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.JVMHelper; +import pro.gravit.launcher.client.ClientLauncher; +import pro.gravit.launcher.client.ClientLauncherContext; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.JVMHelper; import java.nio.file.Path; import java.nio.file.Paths; diff --git a/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherNoGuard.java b/Launcher/src/main/java/pro/gravit/launcher/guard/LauncherNoGuard.java similarity index 81% rename from Launcher/src/main/java/ru/gravit/launcher/guard/LauncherNoGuard.java rename to Launcher/src/main/java/pro/gravit/launcher/guard/LauncherNoGuard.java index 4ae7b35e..2ca267a9 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherNoGuard.java +++ b/Launcher/src/main/java/pro/gravit/launcher/guard/LauncherNoGuard.java @@ -1,9 +1,9 @@ -package ru.gravit.launcher.guard; +package pro.gravit.launcher.guard; -import ru.gravit.launcher.client.ClientLauncherContext; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.JVMHelper; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launcher.client.ClientLauncherContext; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.JVMHelper; +import pro.gravit.utils.helper.LogHelper; import java.nio.file.Path; import java.nio.file.Paths; diff --git a/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherWrapperGuard.java b/Launcher/src/main/java/pro/gravit/launcher/guard/LauncherWrapperGuard.java similarity index 88% rename from Launcher/src/main/java/ru/gravit/launcher/guard/LauncherWrapperGuard.java rename to Launcher/src/main/java/pro/gravit/launcher/guard/LauncherWrapperGuard.java index 039c22a4..145300b9 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherWrapperGuard.java +++ b/Launcher/src/main/java/pro/gravit/launcher/guard/LauncherWrapperGuard.java @@ -1,12 +1,12 @@ -package ru.gravit.launcher.guard; +package pro.gravit.launcher.guard; -import ru.gravit.launcher.Launcher; -import ru.gravit.launcher.LauncherConfig; -import ru.gravit.launcher.client.ClientLauncherContext; -import ru.gravit.launcher.client.DirBridge; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.JVMHelper; -import ru.gravit.utils.helper.UnpackHelper; +import pro.gravit.launcher.client.ClientLauncherContext; +import pro.gravit.launcher.client.DirBridge; +import pro.gravit.utils.helper.UnpackHelper; +import pro.gravit.launcher.Launcher; +import pro.gravit.launcher.LauncherConfig; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.JVMHelper; import java.io.IOException; import java.nio.file.Path; diff --git a/Launcher/src/main/java/ru/gravit/launcher/gui/JSRuntimeProvider.java b/Launcher/src/main/java/pro/gravit/launcher/gui/JSRuntimeProvider.java similarity index 77% rename from Launcher/src/main/java/ru/gravit/launcher/gui/JSRuntimeProvider.java rename to Launcher/src/main/java/pro/gravit/launcher/gui/JSRuntimeProvider.java index 1436d4ea..29fd432e 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/gui/JSRuntimeProvider.java +++ b/Launcher/src/main/java/pro/gravit/launcher/gui/JSRuntimeProvider.java @@ -1,35 +1,39 @@ -package ru.gravit.launcher.gui; +package pro.gravit.launcher.gui; -import ru.gravit.launcher.*; -import ru.gravit.launcher.client.*; -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.managers.SettingsManager; -import ru.gravit.launcher.profiles.ClientProfile; -import ru.gravit.launcher.profiles.PlayerProfile; -import ru.gravit.launcher.profiles.Texture; -import ru.gravit.launcher.profiles.optional.OptionalFile; -import ru.gravit.launcher.request.PingRequest; -import ru.gravit.launcher.request.Request; -import ru.gravit.launcher.request.RequestException; -import ru.gravit.launcher.request.RequestType; -import ru.gravit.launcher.request.auth.*; -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; -import ru.gravit.launcher.request.uuid.ProfileByUsernameRequest; -import ru.gravit.launcher.serialize.HInput; -import ru.gravit.launcher.serialize.HOutput; -import ru.gravit.launcher.serialize.signed.SignedBytesHolder; -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.*; +import pro.gravit.launcher.*; +import pro.gravit.launcher.client.*; +import pro.gravit.launcher.hasher.FileNameMatcher; +import pro.gravit.launcher.hasher.HashedDir; +import pro.gravit.launcher.hasher.HashedEntry; +import pro.gravit.launcher.hasher.HashedFile; +import pro.gravit.launcher.profiles.optional.OptionalFile; +import pro.gravit.launcher.request.auth.*; +import pro.gravit.launcher.serialize.HInput; +import pro.gravit.launcher.serialize.HOutput; +import pro.gravit.launcher.serialize.signed.SignedBytesHolder; +import pro.gravit.launcher.serialize.signed.SignedObjectHolder; +import pro.gravit.launcher.serialize.stream.EnumSerializer; +import pro.gravit.launcher.serialize.stream.StreamObject; +import pro.gravit.utils.HTTPRequest; +import pro.gravit.utils.helper.*; +import pro.gravit.launcher.*; +import pro.gravit.launcher.client.*; +import pro.gravit.launcher.managers.SettingsManager; +import pro.gravit.launcher.profiles.ClientProfile; +import pro.gravit.launcher.profiles.PlayerProfile; +import pro.gravit.launcher.profiles.Texture; +import pro.gravit.launcher.request.PingRequest; +import pro.gravit.launcher.request.Request; +import pro.gravit.launcher.request.RequestException; +import pro.gravit.launcher.request.RequestType; +import pro.gravit.launcher.request.auth.*; +import pro.gravit.launcher.request.update.LauncherRequest; +import pro.gravit.launcher.request.update.ProfilesRequest; +import pro.gravit.launcher.request.update.UpdateRequest; +import pro.gravit.launcher.request.uuid.BatchProfileByUsernameRequest; +import pro.gravit.launcher.request.uuid.ProfileByUUIDRequest; +import pro.gravit.launcher.request.uuid.ProfileByUsernameRequest; +import pro.gravit.utils.helper.*; import javax.script.*; import java.io.BufferedReader; diff --git a/Launcher/src/main/java/ru/gravit/launcher/gui/RuntimeProvider.java b/Launcher/src/main/java/pro/gravit/launcher/gui/RuntimeProvider.java similarity index 84% rename from Launcher/src/main/java/ru/gravit/launcher/gui/RuntimeProvider.java rename to Launcher/src/main/java/pro/gravit/launcher/gui/RuntimeProvider.java index d53f2fde..ab31d734 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/gui/RuntimeProvider.java +++ b/Launcher/src/main/java/pro/gravit/launcher/gui/RuntimeProvider.java @@ -1,4 +1,4 @@ -package ru.gravit.launcher.gui; +package pro.gravit.launcher.gui; public interface RuntimeProvider { void run(String[] args) throws Exception; diff --git a/Launcher/src/main/java/ru/gravit/launcher/hwid/OshiHWIDProvider.java b/Launcher/src/main/java/pro/gravit/launcher/hwid/OshiHWIDProvider.java similarity index 96% rename from Launcher/src/main/java/ru/gravit/launcher/hwid/OshiHWIDProvider.java rename to Launcher/src/main/java/pro/gravit/launcher/hwid/OshiHWIDProvider.java index 3b5ec228..1288acec 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/hwid/OshiHWIDProvider.java +++ b/Launcher/src/main/java/pro/gravit/launcher/hwid/OshiHWIDProvider.java @@ -1,11 +1,11 @@ -package ru.gravit.launcher.hwid; +package pro.gravit.launcher.hwid; import oshi.SystemInfo; import oshi.hardware.*; -import ru.gravit.launcher.HWID; -import ru.gravit.launcher.LauncherHWIDInterface; -import ru.gravit.launcher.OshiHWID; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launcher.HWID; +import pro.gravit.launcher.LauncherHWIDInterface; +import pro.gravit.launcher.OshiHWID; +import pro.gravit.utils.helper.LogHelper; import java.net.NetworkInterface; diff --git a/Launcher/src/main/java/ru/gravit/launcher/managers/ClientGsonManager.java b/Launcher/src/main/java/pro/gravit/launcher/managers/ClientGsonManager.java similarity index 70% rename from Launcher/src/main/java/ru/gravit/launcher/managers/ClientGsonManager.java rename to Launcher/src/main/java/pro/gravit/launcher/managers/ClientGsonManager.java index 1798d0fe..3b1e43ec 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/managers/ClientGsonManager.java +++ b/Launcher/src/main/java/pro/gravit/launcher/managers/ClientGsonManager.java @@ -1,8 +1,8 @@ -package ru.gravit.launcher.managers; +package pro.gravit.launcher.managers; import com.google.gson.GsonBuilder; -import ru.gravit.launcher.client.UserSettings; -import ru.gravit.utils.UniversalJsonAdapter; +import pro.gravit.launcher.client.UserSettings; +import pro.gravit.utils.UniversalJsonAdapter; public class ClientGsonManager extends GsonManager { @Override diff --git a/Launcher/src/main/java/ru/gravit/launcher/managers/ConsoleManager.java b/Launcher/src/main/java/pro/gravit/launcher/managers/ConsoleManager.java similarity index 69% rename from Launcher/src/main/java/ru/gravit/launcher/managers/ConsoleManager.java rename to Launcher/src/main/java/pro/gravit/launcher/managers/ConsoleManager.java index 864ab65a..c1bbea96 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/managers/ConsoleManager.java +++ b/Launcher/src/main/java/pro/gravit/launcher/managers/ConsoleManager.java @@ -1,23 +1,23 @@ -package ru.gravit.launcher.managers; +package pro.gravit.launcher.managers; -import ru.gravit.launcher.Launcher; -import ru.gravit.launcher.console.FeatureCommand; -import ru.gravit.launcher.console.UnlockCommand; -import ru.gravit.launcher.console.admin.ExecCommand; -import ru.gravit.launcher.console.admin.LogListenerCommand; -import ru.gravit.launcher.console.store.CopyStoreDirCommand; -import ru.gravit.launcher.console.store.LinkStoreDirCommand; -import ru.gravit.launcher.console.store.StoreListCommand; -import ru.gravit.utils.command.BaseCommandCategory; -import ru.gravit.utils.command.CommandHandler; -import ru.gravit.utils.command.JLineCommandHandler; -import ru.gravit.utils.command.StdCommandHandler; -import ru.gravit.utils.command.basic.ClearCommand; -import ru.gravit.utils.command.basic.DebugCommand; -import ru.gravit.utils.command.basic.GCCommand; -import ru.gravit.utils.command.basic.HelpCommand; -import ru.gravit.utils.helper.CommonHelper; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launcher.console.FeatureCommand; +import pro.gravit.launcher.console.admin.ExecCommand; +import pro.gravit.launcher.console.admin.LogListenerCommand; +import pro.gravit.launcher.console.store.CopyStoreDirCommand; +import pro.gravit.launcher.console.store.LinkStoreDirCommand; +import pro.gravit.launcher.console.store.StoreListCommand; +import pro.gravit.utils.command.BaseCommandCategory; +import pro.gravit.utils.command.CommandHandler; +import pro.gravit.utils.command.JLineCommandHandler; +import pro.gravit.utils.command.StdCommandHandler; +import pro.gravit.utils.command.basic.ClearCommand; +import pro.gravit.utils.command.basic.DebugCommand; +import pro.gravit.utils.command.basic.GCCommand; +import pro.gravit.utils.command.basic.HelpCommand; +import pro.gravit.launcher.Launcher; +import pro.gravit.launcher.console.UnlockCommand; +import pro.gravit.utils.helper.CommonHelper; +import pro.gravit.utils.helper.LogHelper; import java.io.IOException; diff --git a/Launcher/src/main/java/ru/gravit/launcher/managers/HasherManager.java b/Launcher/src/main/java/pro/gravit/launcher/managers/HasherManager.java similarity index 83% rename from Launcher/src/main/java/ru/gravit/launcher/managers/HasherManager.java rename to Launcher/src/main/java/pro/gravit/launcher/managers/HasherManager.java index 6f7fdf15..eaf8c4c5 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/managers/HasherManager.java +++ b/Launcher/src/main/java/pro/gravit/launcher/managers/HasherManager.java @@ -1,4 +1,4 @@ -package ru.gravit.launcher.managers; +package pro.gravit.launcher.managers; public class HasherManager { public static final HasherStore defaultStore = new HasherStore(); diff --git a/Launcher/src/main/java/ru/gravit/launcher/managers/HasherStore.java b/Launcher/src/main/java/pro/gravit/launcher/managers/HasherStore.java similarity index 85% rename from Launcher/src/main/java/ru/gravit/launcher/managers/HasherStore.java rename to Launcher/src/main/java/pro/gravit/launcher/managers/HasherStore.java index 2270d2c6..35f5dc88 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/managers/HasherStore.java +++ b/Launcher/src/main/java/pro/gravit/launcher/managers/HasherStore.java @@ -1,12 +1,12 @@ -package ru.gravit.launcher.managers; +package pro.gravit.launcher.managers; -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.profiles.ClientProfile; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.hasher.FileNameMatcher; +import pro.gravit.launcher.hasher.HashedDir; +import pro.gravit.launcher.hasher.HashedEntry; +import pro.gravit.launcher.profiles.ClientProfile; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.LogHelper; import java.io.IOException; import java.nio.file.Files; diff --git a/Launcher/src/main/java/ru/gravit/launcher/managers/SettingsManager.java b/Launcher/src/main/java/pro/gravit/launcher/managers/SettingsManager.java similarity index 87% rename from Launcher/src/main/java/ru/gravit/launcher/managers/SettingsManager.java rename to Launcher/src/main/java/pro/gravit/launcher/managers/SettingsManager.java index 052dd999..03a7fd1a 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/managers/SettingsManager.java +++ b/Launcher/src/main/java/pro/gravit/launcher/managers/SettingsManager.java @@ -1,14 +1,14 @@ -package ru.gravit.launcher.managers; +package pro.gravit.launcher.managers; -import ru.gravit.launcher.LauncherAPI; -import ru.gravit.launcher.NewLauncherSettings; -import ru.gravit.launcher.client.DirBridge; -import ru.gravit.launcher.config.JsonConfigurable; -import ru.gravit.launcher.hasher.HashedDir; -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 pro.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.NewLauncherSettings; +import pro.gravit.launcher.client.DirBridge; +import pro.gravit.launcher.hasher.HashedDir; +import pro.gravit.launcher.serialize.HInput; +import pro.gravit.launcher.serialize.HOutput; +import pro.gravit.launcher.config.JsonConfigurable; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.LogHelper; import java.io.IOException; import java.lang.reflect.Type; diff --git a/Launcher/src/main/java/ru/gravit/launcher/utils/DirWatcher.java b/Launcher/src/main/java/pro/gravit/launcher/utils/DirWatcher.java similarity index 89% rename from Launcher/src/main/java/ru/gravit/launcher/utils/DirWatcher.java rename to Launcher/src/main/java/pro/gravit/launcher/utils/DirWatcher.java index ed608f7d..24939708 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/utils/DirWatcher.java +++ b/Launcher/src/main/java/pro/gravit/launcher/utils/DirWatcher.java @@ -1,15 +1,14 @@ -package ru.gravit.launcher.utils; +package pro.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.HashedEntry.Type; -import ru.gravit.launcher.hasher.HashedFile; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.JVMHelper; -import ru.gravit.utils.helper.JVMHelper.OS; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.hasher.FileNameMatcher; +import pro.gravit.launcher.hasher.HashedDir; +import pro.gravit.launcher.hasher.HashedEntry; +import pro.gravit.launcher.hasher.HashedFile; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.JVMHelper; +import pro.gravit.utils.helper.JVMHelper.OS; +import pro.gravit.utils.helper.LogHelper; import java.io.IOException; import java.nio.file.*; @@ -117,7 +116,7 @@ private void processKey(WatchKey key) throws IOException { // Verify is REALLY modified (not just attributes) if (kind.equals(StandardWatchEventKinds.ENTRY_MODIFY)) { HashedEntry entry = hdir.resolve(stringPath); - if (entry != null && (entry.getType() != Type.FILE || ((HashedFile) entry).isSame(path, digest))) + if (entry != null && (entry.getType() != HashedEntry.Type.FILE || ((HashedFile) entry).isSame(path, digest))) continue; // Modified attributes, not need to worry :D } diff --git a/Launcher/src/main/java/ru/gravit/launcher/utils/NativeJVMHalt.java b/Launcher/src/main/java/pro/gravit/launcher/utils/NativeJVMHalt.java similarity index 96% rename from Launcher/src/main/java/ru/gravit/launcher/utils/NativeJVMHalt.java rename to Launcher/src/main/java/pro/gravit/launcher/utils/NativeJVMHalt.java index bb215ee7..14fa7a04 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/utils/NativeJVMHalt.java +++ b/Launcher/src/main/java/pro/gravit/launcher/utils/NativeJVMHalt.java @@ -1,4 +1,4 @@ -package ru.gravit.launcher.utils; +package pro.gravit.launcher.utils; import cpw.mods.fml.SafeExitJVMLegacy; import net.minecraftforge.fml.SafeExitJVM; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/AutogenConfig.java b/LauncherAPI/src/main/java/pro/gravit/launcher/AutogenConfig.java similarity index 97% rename from LauncherAPI/src/main/java/ru/gravit/launcher/AutogenConfig.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/AutogenConfig.java index 355ba7be..8827a7cf 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/AutogenConfig.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/AutogenConfig.java @@ -1,4 +1,4 @@ -package ru.gravit.launcher; +package pro.gravit.launcher; public class AutogenConfig { public String projectname; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/ClientPermissions.java b/LauncherAPI/src/main/java/pro/gravit/launcher/ClientPermissions.java similarity index 94% rename from LauncherAPI/src/main/java/ru/gravit/launcher/ClientPermissions.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/ClientPermissions.java index 8e0e4bb2..dd5d394d 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/ClientPermissions.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/ClientPermissions.java @@ -1,7 +1,7 @@ -package ru.gravit.launcher; +package pro.gravit.launcher; -import ru.gravit.launcher.serialize.HInput; -import ru.gravit.launcher.serialize.HOutput; +import pro.gravit.launcher.serialize.HInput; +import pro.gravit.launcher.serialize.HOutput; import java.io.IOException; import java.util.StringJoiner; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/HWID.java b/LauncherAPI/src/main/java/pro/gravit/launcher/HWID.java similarity index 88% rename from LauncherAPI/src/main/java/ru/gravit/launcher/HWID.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/HWID.java index c72e8e74..3cc02197 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/HWID.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/HWID.java @@ -1,4 +1,4 @@ -package ru.gravit.launcher; +package pro.gravit.launcher; public interface HWID { String getSerializeString(); diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/Launcher.java b/LauncherAPI/src/main/java/pro/gravit/launcher/Launcher.java similarity index 92% rename from LauncherAPI/src/main/java/ru/gravit/launcher/Launcher.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/Launcher.java index 504d8386..bcdb6715 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/Launcher.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/Launcher.java @@ -1,12 +1,12 @@ -package ru.gravit.launcher; +package pro.gravit.launcher; -import ru.gravit.launcher.managers.GsonManager; -import ru.gravit.launcher.modules.ModulesManager; -import ru.gravit.launcher.profiles.ClientProfile; -import ru.gravit.launcher.serialize.HInput; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; -import ru.gravit.utils.helper.SecurityHelper; +import pro.gravit.launcher.managers.GsonManager; +import pro.gravit.launcher.modules.ModulesManager; +import pro.gravit.launcher.profiles.ClientProfile; +import pro.gravit.launcher.serialize.HInput; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.SecurityHelper; +import pro.gravit.utils.helper.LogHelper; import java.io.IOException; import java.net.URL; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/LauncherConfig.java b/LauncherAPI/src/main/java/pro/gravit/launcher/LauncherConfig.java similarity index 94% rename from LauncherAPI/src/main/java/ru/gravit/launcher/LauncherConfig.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/LauncherConfig.java index 6ce013de..51fa1691 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/LauncherConfig.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/LauncherConfig.java @@ -1,10 +1,10 @@ -package ru.gravit.launcher; +package pro.gravit.launcher; -import ru.gravit.launcher.serialize.HInput; -import ru.gravit.launcher.serialize.HOutput; -import ru.gravit.launcher.serialize.stream.StreamObject; -import ru.gravit.utils.helper.SecurityHelper; -import ru.gravit.utils.helper.VerifyHelper; +import pro.gravit.launcher.serialize.HInput; +import pro.gravit.launcher.serialize.HOutput; +import pro.gravit.launcher.serialize.stream.StreamObject; +import pro.gravit.utils.helper.SecurityHelper; +import pro.gravit.utils.helper.VerifyHelper; import java.io.IOException; import java.security.interfaces.RSAPublicKey; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/LauncherHWIDInterface.java b/LauncherAPI/src/main/java/pro/gravit/launcher/LauncherHWIDInterface.java similarity index 74% rename from LauncherAPI/src/main/java/ru/gravit/launcher/LauncherHWIDInterface.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/LauncherHWIDInterface.java index ffefbf39..99edce7f 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/LauncherHWIDInterface.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/LauncherHWIDInterface.java @@ -1,4 +1,4 @@ -package ru.gravit.launcher; +package pro.gravit.launcher; @FunctionalInterface public interface LauncherHWIDInterface { diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/OshiHWID.java b/LauncherAPI/src/main/java/pro/gravit/launcher/OshiHWID.java similarity index 99% rename from LauncherAPI/src/main/java/ru/gravit/launcher/OshiHWID.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/OshiHWID.java index e8794dbf..29cf1476 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/OshiHWID.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/OshiHWID.java @@ -1,4 +1,4 @@ -package ru.gravit.launcher; +package pro.gravit.launcher; import com.google.gson.Gson; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/config/JsonConfigurable.java b/LauncherAPI/src/main/java/pro/gravit/launcher/config/JsonConfigurable.java similarity index 93% rename from LauncherAPI/src/main/java/ru/gravit/launcher/config/JsonConfigurable.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/config/JsonConfigurable.java index 9546e85d..aa4a48bb 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/config/JsonConfigurable.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/config/JsonConfigurable.java @@ -1,8 +1,8 @@ -package ru.gravit.launcher.config; +package pro.gravit.launcher.config; -import ru.gravit.launcher.Launcher; -import ru.gravit.launcher.LauncherAPI; -import ru.gravit.utils.helper.IOHelper; +import pro.gravit.launcher.Launcher; +import pro.gravit.launcher.LauncherAPI; +import pro.gravit.utils.helper.IOHelper; import java.io.BufferedReader; import java.io.BufferedWriter; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/downloader/ListDownloader.java b/LauncherAPI/src/main/java/pro/gravit/launcher/downloader/ListDownloader.java similarity index 98% rename from LauncherAPI/src/main/java/ru/gravit/launcher/downloader/ListDownloader.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/downloader/ListDownloader.java index d31a5344..8e5e4222 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/downloader/ListDownloader.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/downloader/ListDownloader.java @@ -1,4 +1,4 @@ -package ru.gravit.launcher.downloader; +package pro.gravit.launcher.downloader; import org.apache.http.HttpResponse; import org.apache.http.client.ResponseHandler; @@ -6,8 +6,8 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.apache.http.impl.client.LaxRedirectStrategy; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.LogHelper; import java.io.EOFException; import java.io.IOException; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/events/ControlEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/events/ControlEvent.java similarity index 85% rename from LauncherAPI/src/main/java/ru/gravit/launcher/events/ControlEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/events/ControlEvent.java index 86ba0920..0fede5d4 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/events/ControlEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/ControlEvent.java @@ -1,6 +1,6 @@ -package ru.gravit.launcher.events; +package pro.gravit.launcher.events; -import ru.gravit.utils.event.EventInterface; +import pro.gravit.utils.event.EventInterface; import java.util.UUID; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/events/ExceptionEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/events/ExceptionEvent.java similarity index 90% rename from LauncherAPI/src/main/java/ru/gravit/launcher/events/ExceptionEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/events/ExceptionEvent.java index 5bde798d..9e7e9432 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/events/ExceptionEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/ExceptionEvent.java @@ -1,4 +1,4 @@ -package ru.gravit.launcher.events; +package pro.gravit.launcher.events; public class ExceptionEvent extends RequestEvent { public ExceptionEvent(Exception e) { diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/events/PingEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/events/PingEvent.java similarity index 81% rename from LauncherAPI/src/main/java/ru/gravit/launcher/events/PingEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/events/PingEvent.java index ac4112e4..291c1017 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/events/PingEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/PingEvent.java @@ -1,6 +1,6 @@ -package ru.gravit.launcher.events; +package pro.gravit.launcher.events; -import ru.gravit.utils.event.EventInterface; +import pro.gravit.utils.event.EventInterface; import java.util.UUID; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/events/RequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/events/RequestEvent.java similarity index 57% rename from LauncherAPI/src/main/java/ru/gravit/launcher/events/RequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/events/RequestEvent.java index 0c7869d7..8bc33efe 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/events/RequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/RequestEvent.java @@ -1,6 +1,6 @@ -package ru.gravit.launcher.events; +package pro.gravit.launcher.events; -import ru.gravit.launcher.request.ResultInterface; +import pro.gravit.launcher.request.ResultInterface; import java.util.UUID; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/events/SignalEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/events/SignalEvent.java similarity index 85% rename from LauncherAPI/src/main/java/ru/gravit/launcher/events/SignalEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/events/SignalEvent.java index 2e43aca3..93b58115 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/events/SignalEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/SignalEvent.java @@ -1,6 +1,6 @@ -package ru.gravit.launcher.events; +package pro.gravit.launcher.events; -import ru.gravit.utils.event.EventInterface; +import pro.gravit.utils.event.EventInterface; import java.util.UUID; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/AuthRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/AuthRequestEvent.java similarity index 85% rename from LauncherAPI/src/main/java/ru/gravit/launcher/events/request/AuthRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/events/request/AuthRequestEvent.java index 0c9eb407..c5d6f311 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/AuthRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/AuthRequestEvent.java @@ -1,10 +1,10 @@ -package ru.gravit.launcher.events.request; +package pro.gravit.launcher.events.request; -import ru.gravit.launcher.ClientPermissions; -import ru.gravit.launcher.LauncherNetworkAPI; -import ru.gravit.launcher.events.RequestEvent; -import ru.gravit.launcher.profiles.PlayerProfile; -import ru.gravit.utils.event.EventInterface; +import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.profiles.PlayerProfile; +import pro.gravit.utils.event.EventInterface; +import pro.gravit.launcher.ClientPermissions; +import pro.gravit.launcher.events.RequestEvent; import java.util.UUID; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/BatchProfileByUsernameRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/BatchProfileByUsernameRequestEvent.java similarity index 74% rename from LauncherAPI/src/main/java/ru/gravit/launcher/events/request/BatchProfileByUsernameRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/events/request/BatchProfileByUsernameRequestEvent.java index 2ca6fb6f..97065f0c 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/BatchProfileByUsernameRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/BatchProfileByUsernameRequestEvent.java @@ -1,9 +1,9 @@ -package ru.gravit.launcher.events.request; +package pro.gravit.launcher.events.request; -import ru.gravit.launcher.LauncherNetworkAPI; -import ru.gravit.launcher.events.RequestEvent; -import ru.gravit.launcher.profiles.PlayerProfile; -import ru.gravit.utils.event.EventInterface; +import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.profiles.PlayerProfile; +import pro.gravit.utils.event.EventInterface; +import pro.gravit.launcher.events.RequestEvent; import java.util.UUID; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/CheckServerRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/CheckServerRequestEvent.java similarity index 72% rename from LauncherAPI/src/main/java/ru/gravit/launcher/events/request/CheckServerRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/events/request/CheckServerRequestEvent.java index 0340cda2..322f3b2e 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/CheckServerRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/CheckServerRequestEvent.java @@ -1,9 +1,9 @@ -package ru.gravit.launcher.events.request; +package pro.gravit.launcher.events.request; -import ru.gravit.launcher.LauncherNetworkAPI; -import ru.gravit.launcher.events.RequestEvent; -import ru.gravit.launcher.profiles.PlayerProfile; -import ru.gravit.utils.event.EventInterface; +import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.profiles.PlayerProfile; +import pro.gravit.utils.event.EventInterface; +import pro.gravit.launcher.events.RequestEvent; import java.util.UUID; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/ErrorRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ErrorRequestEvent.java similarity index 72% rename from LauncherAPI/src/main/java/ru/gravit/launcher/events/request/ErrorRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ErrorRequestEvent.java index b84584df..b1b4e202 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/ErrorRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ErrorRequestEvent.java @@ -1,8 +1,8 @@ -package ru.gravit.launcher.events.request; +package pro.gravit.launcher.events.request; -import ru.gravit.launcher.LauncherNetworkAPI; -import ru.gravit.launcher.events.RequestEvent; -import ru.gravit.utils.event.EventInterface; +import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.utils.event.EventInterface; +import pro.gravit.launcher.events.RequestEvent; import java.util.UUID; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/ExecCommandRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ExecCommandRequestEvent.java similarity index 67% rename from LauncherAPI/src/main/java/ru/gravit/launcher/events/request/ExecCommandRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ExecCommandRequestEvent.java index de6e686c..988c2d5a 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/ExecCommandRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ExecCommandRequestEvent.java @@ -1,7 +1,7 @@ -package ru.gravit.launcher.events.request; +package pro.gravit.launcher.events.request; -import ru.gravit.launcher.LauncherNetworkAPI; -import ru.gravit.launcher.events.RequestEvent; +import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.events.RequestEvent; public class ExecCommandRequestEvent extends RequestEvent { @Override diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/GetAvailabilityAuthRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/GetAvailabilityAuthRequestEvent.java similarity index 82% rename from LauncherAPI/src/main/java/ru/gravit/launcher/events/request/GetAvailabilityAuthRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/events/request/GetAvailabilityAuthRequestEvent.java index 8b00427f..c4107dd0 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/GetAvailabilityAuthRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/GetAvailabilityAuthRequestEvent.java @@ -1,7 +1,7 @@ -package ru.gravit.launcher.events.request; +package pro.gravit.launcher.events.request; -import ru.gravit.launcher.LauncherNetworkAPI; -import ru.gravit.launcher.events.RequestEvent; +import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.events.RequestEvent; import java.util.List; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/GetSecureTokenRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/GetSecureTokenRequestEvent.java similarity index 69% rename from LauncherAPI/src/main/java/ru/gravit/launcher/events/request/GetSecureTokenRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/events/request/GetSecureTokenRequestEvent.java index 4b1dd940..d5741678 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/GetSecureTokenRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/GetSecureTokenRequestEvent.java @@ -1,7 +1,7 @@ -package ru.gravit.launcher.events.request; +package pro.gravit.launcher.events.request; -import ru.gravit.launcher.LauncherNetworkAPI; -import ru.gravit.launcher.events.RequestEvent; +import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.events.RequestEvent; public class GetSecureTokenRequestEvent extends RequestEvent { @LauncherNetworkAPI diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/JoinServerRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/JoinServerRequestEvent.java similarity index 72% rename from LauncherAPI/src/main/java/ru/gravit/launcher/events/request/JoinServerRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/events/request/JoinServerRequestEvent.java index 6b2c0c38..6c381ffa 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/JoinServerRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/JoinServerRequestEvent.java @@ -1,8 +1,8 @@ -package ru.gravit.launcher.events.request; +package pro.gravit.launcher.events.request; -import ru.gravit.launcher.LauncherNetworkAPI; -import ru.gravit.launcher.events.RequestEvent; -import ru.gravit.utils.event.EventInterface; +import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.utils.event.EventInterface; +import pro.gravit.launcher.events.RequestEvent; import java.util.UUID; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/LauncherRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/LauncherRequestEvent.java similarity index 84% rename from LauncherAPI/src/main/java/ru/gravit/launcher/events/request/LauncherRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/events/request/LauncherRequestEvent.java index 958790fd..d321aa90 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/LauncherRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/LauncherRequestEvent.java @@ -1,8 +1,8 @@ -package ru.gravit.launcher.events.request; +package pro.gravit.launcher.events.request; -import ru.gravit.launcher.LauncherNetworkAPI; -import ru.gravit.launcher.events.RequestEvent; -import ru.gravit.utils.event.EventInterface; +import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.utils.event.EventInterface; +import pro.gravit.launcher.events.RequestEvent; import java.util.UUID; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/LogEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/LogEvent.java similarity index 63% rename from LauncherAPI/src/main/java/ru/gravit/launcher/events/request/LogEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/events/request/LogEvent.java index c207eb72..065e31f2 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/LogEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/LogEvent.java @@ -1,7 +1,7 @@ -package ru.gravit.launcher.events.request; +package pro.gravit.launcher.events.request; -import ru.gravit.launcher.LauncherNetworkAPI; -import ru.gravit.launcher.request.ResultInterface; +import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.request.ResultInterface; public class LogEvent implements ResultInterface { @Override diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/ProfileByUUIDRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ProfileByUUIDRequestEvent.java similarity index 73% rename from LauncherAPI/src/main/java/ru/gravit/launcher/events/request/ProfileByUUIDRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ProfileByUUIDRequestEvent.java index 40b14f05..cab16b32 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/ProfileByUUIDRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ProfileByUUIDRequestEvent.java @@ -1,9 +1,9 @@ -package ru.gravit.launcher.events.request; +package pro.gravit.launcher.events.request; -import ru.gravit.launcher.LauncherNetworkAPI; -import ru.gravit.launcher.events.RequestEvent; -import ru.gravit.launcher.profiles.PlayerProfile; -import ru.gravit.utils.event.EventInterface; +import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.profiles.PlayerProfile; +import pro.gravit.utils.event.EventInterface; +import pro.gravit.launcher.events.RequestEvent; import java.util.UUID; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/ProfileByUsernameRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ProfileByUsernameRequestEvent.java similarity index 72% rename from LauncherAPI/src/main/java/ru/gravit/launcher/events/request/ProfileByUsernameRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ProfileByUsernameRequestEvent.java index c630f27c..3c0d7247 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/ProfileByUsernameRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ProfileByUsernameRequestEvent.java @@ -1,9 +1,9 @@ -package ru.gravit.launcher.events.request; +package pro.gravit.launcher.events.request; -import ru.gravit.launcher.LauncherNetworkAPI; -import ru.gravit.launcher.events.RequestEvent; -import ru.gravit.launcher.profiles.PlayerProfile; -import ru.gravit.utils.event.EventInterface; +import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.profiles.PlayerProfile; +import pro.gravit.utils.event.EventInterface; +import pro.gravit.launcher.events.RequestEvent; import java.util.UUID; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/ProfilesRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ProfilesRequestEvent.java similarity index 71% rename from LauncherAPI/src/main/java/ru/gravit/launcher/events/request/ProfilesRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ProfilesRequestEvent.java index 0de636c9..15374ad2 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/ProfilesRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/ProfilesRequestEvent.java @@ -1,9 +1,9 @@ -package ru.gravit.launcher.events.request; +package pro.gravit.launcher.events.request; -import ru.gravit.launcher.LauncherNetworkAPI; -import ru.gravit.launcher.events.RequestEvent; -import ru.gravit.launcher.profiles.ClientProfile; -import ru.gravit.utils.event.EventInterface; +import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.profiles.ClientProfile; +import pro.gravit.utils.event.EventInterface; +import pro.gravit.launcher.events.RequestEvent; import java.util.List; import java.util.UUID; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/RestoreSessionRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/RestoreSessionRequestEvent.java similarity index 61% rename from LauncherAPI/src/main/java/ru/gravit/launcher/events/request/RestoreSessionRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/events/request/RestoreSessionRequestEvent.java index 2262b152..eca76bb7 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/RestoreSessionRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/RestoreSessionRequestEvent.java @@ -1,6 +1,6 @@ -package ru.gravit.launcher.events.request; +package pro.gravit.launcher.events.request; -import ru.gravit.launcher.events.RequestEvent; +import pro.gravit.launcher.events.RequestEvent; public class RestoreSessionRequestEvent extends RequestEvent { @Override diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/SetProfileRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/SetProfileRequestEvent.java similarity index 68% rename from LauncherAPI/src/main/java/ru/gravit/launcher/events/request/SetProfileRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/events/request/SetProfileRequestEvent.java index a1bde862..13393fc3 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/SetProfileRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/SetProfileRequestEvent.java @@ -1,9 +1,9 @@ -package ru.gravit.launcher.events.request; +package pro.gravit.launcher.events.request; -import ru.gravit.launcher.LauncherNetworkAPI; -import ru.gravit.launcher.events.RequestEvent; -import ru.gravit.launcher.profiles.ClientProfile; -import ru.gravit.utils.event.EventInterface; +import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.profiles.ClientProfile; +import pro.gravit.utils.event.EventInterface; +import pro.gravit.launcher.events.RequestEvent; import java.util.UUID; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/UpdateListRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/UpdateListRequestEvent.java similarity index 74% rename from LauncherAPI/src/main/java/ru/gravit/launcher/events/request/UpdateListRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/events/request/UpdateListRequestEvent.java index 0c851812..fe326138 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/UpdateListRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/UpdateListRequestEvent.java @@ -1,8 +1,8 @@ -package ru.gravit.launcher.events.request; +package pro.gravit.launcher.events.request; -import ru.gravit.launcher.LauncherNetworkAPI; -import ru.gravit.launcher.events.RequestEvent; -import ru.gravit.utils.event.EventInterface; +import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.utils.event.EventInterface; +import pro.gravit.launcher.events.RequestEvent; import java.util.HashSet; import java.util.UUID; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/UpdateRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/UpdateRequestEvent.java similarity index 78% rename from LauncherAPI/src/main/java/ru/gravit/launcher/events/request/UpdateRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/events/request/UpdateRequestEvent.java index ddcaa6c6..48f44c90 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/UpdateRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/UpdateRequestEvent.java @@ -1,8 +1,8 @@ -package ru.gravit.launcher.events.request; +package pro.gravit.launcher.events.request; -import ru.gravit.launcher.LauncherNetworkAPI; -import ru.gravit.launcher.events.RequestEvent; -import ru.gravit.launcher.hasher.HashedDir; +import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.hasher.HashedDir; +import pro.gravit.launcher.events.RequestEvent; public class UpdateRequestEvent extends RequestEvent { @LauncherNetworkAPI diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/VerifySecureTokenRequestEvent.java b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/VerifySecureTokenRequestEvent.java similarity index 69% rename from LauncherAPI/src/main/java/ru/gravit/launcher/events/request/VerifySecureTokenRequestEvent.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/events/request/VerifySecureTokenRequestEvent.java index bb616d37..3f74c2d9 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/events/request/VerifySecureTokenRequestEvent.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/events/request/VerifySecureTokenRequestEvent.java @@ -1,7 +1,7 @@ -package ru.gravit.launcher.events.request; +package pro.gravit.launcher.events.request; -import ru.gravit.launcher.LauncherAPI; -import ru.gravit.launcher.events.RequestEvent; +import pro.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.events.RequestEvent; public class VerifySecureTokenRequestEvent extends RequestEvent { @LauncherAPI diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/managers/ConfigManager.java b/LauncherAPI/src/main/java/pro/gravit/launcher/managers/ConfigManager.java similarity index 89% rename from LauncherAPI/src/main/java/ru/gravit/launcher/managers/ConfigManager.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/managers/ConfigManager.java index 251efb48..cda96970 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/managers/ConfigManager.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/managers/ConfigManager.java @@ -1,8 +1,8 @@ -package ru.gravit.launcher.managers; +package pro.gravit.launcher.managers; -import ru.gravit.launcher.config.JsonConfigurable; -import ru.gravit.utils.helper.LogHelper; -import ru.gravit.utils.helper.VerifyHelper; +import pro.gravit.launcher.config.JsonConfigurable; +import pro.gravit.utils.helper.LogHelper; +import pro.gravit.utils.helper.VerifyHelper; import java.io.IOException; import java.nio.file.Path; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/managers/SimpleModuleManager.java b/LauncherAPI/src/main/java/pro/gravit/launcher/managers/SimpleModuleManager.java similarity index 93% rename from LauncherAPI/src/main/java/ru/gravit/launcher/managers/SimpleModuleManager.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/managers/SimpleModuleManager.java index d4662ca5..2725c858 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/managers/SimpleModuleManager.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/managers/SimpleModuleManager.java @@ -1,11 +1,11 @@ -package ru.gravit.launcher.managers; +package pro.gravit.launcher.managers; -import ru.gravit.launcher.modules.Module; -import ru.gravit.launcher.modules.ModuleContext; -import ru.gravit.launcher.modules.ModulesManager; -import ru.gravit.utils.PublicURLClassLoader; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launcher.modules.Module; +import pro.gravit.launcher.modules.ModuleContext; +import pro.gravit.launcher.modules.ModulesManager; +import pro.gravit.utils.PublicURLClassLoader; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.LogHelper; import java.io.IOException; import java.net.URISyntaxException; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/managers/SimpleModulesConfigManager.java b/LauncherAPI/src/main/java/pro/gravit/launcher/managers/SimpleModulesConfigManager.java similarity index 84% rename from LauncherAPI/src/main/java/ru/gravit/launcher/managers/SimpleModulesConfigManager.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/managers/SimpleModulesConfigManager.java index 7a588ece..889575b0 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/managers/SimpleModulesConfigManager.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/managers/SimpleModulesConfigManager.java @@ -1,8 +1,8 @@ -package ru.gravit.launcher.managers; +package pro.gravit.launcher.managers; -import ru.gravit.launcher.modules.ModulesConfigManager; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launcher.modules.ModulesConfigManager; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.LogHelper; import java.io.IOException; import java.nio.file.Files; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/modules/Module.java b/LauncherAPI/src/main/java/pro/gravit/launcher/modules/Module.java similarity index 82% rename from LauncherAPI/src/main/java/ru/gravit/launcher/modules/Module.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/modules/Module.java index da44ff2f..3f327ef5 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/modules/Module.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/modules/Module.java @@ -1,6 +1,6 @@ -package ru.gravit.launcher.modules; +package pro.gravit.launcher.modules; -import ru.gravit.utils.Version; +import pro.gravit.utils.Version; public interface Module extends AutoCloseable { diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/modules/ModuleContext.java b/LauncherAPI/src/main/java/pro/gravit/launcher/modules/ModuleContext.java similarity index 85% rename from LauncherAPI/src/main/java/ru/gravit/launcher/modules/ModuleContext.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/modules/ModuleContext.java index 2284593d..6b0c0613 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/modules/ModuleContext.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/modules/ModuleContext.java @@ -1,4 +1,4 @@ -package ru.gravit.launcher.modules; +package pro.gravit.launcher.modules; public interface ModuleContext { enum Type { diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/modules/ModulesConfigManager.java b/LauncherAPI/src/main/java/pro/gravit/launcher/modules/ModulesConfigManager.java similarity index 81% rename from LauncherAPI/src/main/java/ru/gravit/launcher/modules/ModulesConfigManager.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/modules/ModulesConfigManager.java index cbf70ce8..89f1c0de 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/modules/ModulesConfigManager.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/modules/ModulesConfigManager.java @@ -1,4 +1,4 @@ -package ru.gravit.launcher.modules; +package pro.gravit.launcher.modules; import java.nio.file.Path; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/modules/ModulesManager.java b/LauncherAPI/src/main/java/pro/gravit/launcher/modules/ModulesManager.java similarity index 92% rename from LauncherAPI/src/main/java/ru/gravit/launcher/modules/ModulesManager.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/modules/ModulesManager.java index 5ff7b7bc..54f8150a 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/modules/ModulesManager.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/modules/ModulesManager.java @@ -1,4 +1,4 @@ -package ru.gravit.launcher.modules; +package pro.gravit.launcher.modules; import java.net.URL; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/profiles/ClientProfile.java b/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfile.java similarity index 97% rename from LauncherAPI/src/main/java/ru/gravit/launcher/profiles/ClientProfile.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfile.java index 38d5ab29..cbdc2ea5 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/profiles/ClientProfile.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/ClientProfile.java @@ -1,12 +1,12 @@ -package ru.gravit.launcher.profiles; +package pro.gravit.launcher.profiles; -import ru.gravit.launcher.LauncherAPI; -import ru.gravit.launcher.hasher.FileNameMatcher; -import ru.gravit.launcher.hasher.HashedDir; -import ru.gravit.launcher.profiles.optional.OptionalFile; -import ru.gravit.launcher.profiles.optional.OptionalType; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.VerifyHelper; +import pro.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.hasher.FileNameMatcher; +import pro.gravit.launcher.hasher.HashedDir; +import pro.gravit.launcher.profiles.optional.OptionalFile; +import pro.gravit.launcher.profiles.optional.OptionalType; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.VerifyHelper; import java.io.IOException; import java.net.InetSocketAddress; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/profiles/PlayerProfile.java b/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/PlayerProfile.java similarity index 83% rename from LauncherAPI/src/main/java/ru/gravit/launcher/profiles/PlayerProfile.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/profiles/PlayerProfile.java index c174cc6e..94f419af 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/profiles/PlayerProfile.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/PlayerProfile.java @@ -1,11 +1,11 @@ -package ru.gravit.launcher.profiles; +package pro.gravit.launcher.profiles; -import ru.gravit.launcher.LauncherAPI; -import ru.gravit.launcher.serialize.HInput; -import ru.gravit.launcher.serialize.HOutput; -import ru.gravit.launcher.serialize.stream.StreamObject; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.VerifyHelper; +import pro.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.serialize.HInput; +import pro.gravit.launcher.serialize.HOutput; +import pro.gravit.launcher.serialize.stream.StreamObject; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.VerifyHelper; import java.io.IOException; import java.util.Objects; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/profiles/Texture.java b/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/Texture.java similarity index 82% rename from LauncherAPI/src/main/java/ru/gravit/launcher/profiles/Texture.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/profiles/Texture.java index 3cf976ac..b19e0b4c 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/profiles/Texture.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/Texture.java @@ -1,11 +1,11 @@ -package ru.gravit.launcher.profiles; +package pro.gravit.launcher.profiles; -import ru.gravit.launcher.LauncherAPI; -import ru.gravit.launcher.serialize.HInput; -import ru.gravit.launcher.serialize.HOutput; -import ru.gravit.launcher.serialize.stream.StreamObject; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.SecurityHelper; +import pro.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.serialize.HInput; +import pro.gravit.launcher.serialize.HOutput; +import pro.gravit.launcher.serialize.stream.StreamObject; +import pro.gravit.utils.helper.SecurityHelper; +import pro.gravit.utils.helper.IOHelper; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/profiles/optional/OptionalDepend.java b/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/OptionalDepend.java similarity index 58% rename from LauncherAPI/src/main/java/ru/gravit/launcher/profiles/optional/OptionalDepend.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/OptionalDepend.java index c49d9ddb..dcae88b7 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/profiles/optional/OptionalDepend.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/OptionalDepend.java @@ -1,6 +1,6 @@ -package ru.gravit.launcher.profiles.optional; +package pro.gravit.launcher.profiles.optional; -import ru.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.LauncherAPI; public class OptionalDepend { @LauncherAPI diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/profiles/optional/OptionalFile.java b/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/OptionalFile.java similarity index 92% rename from LauncherAPI/src/main/java/ru/gravit/launcher/profiles/optional/OptionalFile.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/OptionalFile.java index 378c34e9..396d1466 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/profiles/optional/OptionalFile.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/OptionalFile.java @@ -1,9 +1,9 @@ -package ru.gravit.launcher.profiles.optional; +package pro.gravit.launcher.profiles.optional; -import ru.gravit.launcher.LauncherAPI; -import ru.gravit.launcher.serialize.HInput; -import ru.gravit.launcher.serialize.HOutput; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.serialize.HInput; +import pro.gravit.launcher.serialize.HOutput; +import pro.gravit.utils.helper.LogHelper; import java.io.IOException; import java.util.Objects; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/profiles/optional/OptionalType.java b/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/OptionalType.java similarity index 65% rename from LauncherAPI/src/main/java/ru/gravit/launcher/profiles/optional/OptionalType.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/OptionalType.java index 5a737640..5965bdf3 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/profiles/optional/OptionalType.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/profiles/optional/OptionalType.java @@ -1,6 +1,6 @@ -package ru.gravit.launcher.profiles.optional; +package pro.gravit.launcher.profiles.optional; -import ru.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.LauncherAPI; @LauncherAPI public enum OptionalType { diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/JsonResultSerializeAdapter.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/JsonResultSerializeAdapter.java similarity index 93% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/JsonResultSerializeAdapter.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/request/JsonResultSerializeAdapter.java index 7dd07bf8..2c55201d 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/JsonResultSerializeAdapter.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/JsonResultSerializeAdapter.java @@ -1,4 +1,4 @@ -package ru.gravit.launcher.request; +package pro.gravit.launcher.request; import com.google.gson.*; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/PingRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/PingRequest.java similarity index 71% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/PingRequest.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/request/PingRequest.java index d620530a..a84a0bfc 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/PingRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/PingRequest.java @@ -1,6 +1,6 @@ -package ru.gravit.launcher.request; +package pro.gravit.launcher.request; -import ru.gravit.launcher.request.websockets.StandartClientWebSocketService; +import pro.gravit.launcher.request.websockets.StandartClientWebSocketService; public final class PingRequest extends Request { diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/Request.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/Request.java similarity index 81% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/Request.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/request/Request.java index 0570ba41..d0ddd42c 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/Request.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/Request.java @@ -1,11 +1,11 @@ -package ru.gravit.launcher.request; +package pro.gravit.launcher.request; -import ru.gravit.launcher.Launcher; -import ru.gravit.launcher.LauncherAPI; -import ru.gravit.launcher.LauncherNetworkAPI; -import ru.gravit.launcher.request.websockets.RequestInterface; -import ru.gravit.launcher.request.websockets.StandartClientWebSocketService; -import ru.gravit.utils.helper.SecurityHelper; +import pro.gravit.launcher.Launcher; +import pro.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.request.websockets.RequestInterface; +import pro.gravit.launcher.request.websockets.StandartClientWebSocketService; +import pro.gravit.utils.helper.SecurityHelper; import java.util.UUID; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/RequestException.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/RequestException.java similarity index 87% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/RequestException.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/request/RequestException.java index eecb8275..5b2fe42f 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/RequestException.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/RequestException.java @@ -1,6 +1,6 @@ -package ru.gravit.launcher.request; +package pro.gravit.launcher.request; -import ru.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.LauncherAPI; import java.io.IOException; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/RequestType.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/RequestType.java similarity index 82% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/RequestType.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/request/RequestType.java index 06fc497a..8c9ed549 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/RequestType.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/RequestType.java @@ -1,8 +1,8 @@ -package ru.gravit.launcher.request; +package pro.gravit.launcher.request; -import ru.gravit.launcher.LauncherAPI; -import ru.gravit.launcher.serialize.HInput; -import ru.gravit.launcher.serialize.stream.EnumSerializer; +import pro.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.serialize.HInput; +import pro.gravit.launcher.serialize.stream.EnumSerializer; import java.io.IOException; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/ResultInterface.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/ResultInterface.java similarity index 61% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/ResultInterface.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/request/ResultInterface.java index 814c26a6..6a2f8c3d 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/ResultInterface.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/ResultInterface.java @@ -1,4 +1,4 @@ -package ru.gravit.launcher.request; +package pro.gravit.launcher.request; public interface ResultInterface { String getType(); diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/admin/ExecCommandRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/admin/ExecCommandRequest.java similarity index 53% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/admin/ExecCommandRequest.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/request/admin/ExecCommandRequest.java index 76518c8f..9a2b2ea8 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/admin/ExecCommandRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/admin/ExecCommandRequest.java @@ -1,9 +1,9 @@ -package ru.gravit.launcher.request.admin; +package pro.gravit.launcher.request.admin; -import ru.gravit.launcher.LauncherAPI; -import ru.gravit.launcher.events.request.ExecCommandRequestEvent; -import ru.gravit.launcher.request.Request; -import ru.gravit.launcher.request.websockets.RequestInterface; +import pro.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.events.request.ExecCommandRequestEvent; +import pro.gravit.launcher.request.websockets.RequestInterface; +import pro.gravit.launcher.request.Request; public class ExecCommandRequest extends Request implements RequestInterface { @LauncherAPI diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/admin/ProxyRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/admin/ProxyRequest.java similarity index 66% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/admin/ProxyRequest.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/request/admin/ProxyRequest.java index f9855048..34b8e004 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/admin/ProxyRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/admin/ProxyRequest.java @@ -1,8 +1,8 @@ -package ru.gravit.launcher.request.admin; +package pro.gravit.launcher.request.admin; -import ru.gravit.launcher.request.Request; -import ru.gravit.launcher.request.ResultInterface; -import ru.gravit.launcher.request.websockets.RequestInterface; +import pro.gravit.launcher.request.Request; +import pro.gravit.launcher.request.ResultInterface; +import pro.gravit.launcher.request.websockets.RequestInterface; public class ProxyRequest extends Request implements RequestInterface { public RequestInterface response; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/AuthRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/AuthRequest.java similarity index 88% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/AuthRequest.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/AuthRequest.java index 899281ba..138ffb1c 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/AuthRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/AuthRequest.java @@ -1,12 +1,12 @@ -package ru.gravit.launcher.request.auth; +package pro.gravit.launcher.request.auth; -import ru.gravit.launcher.HWID; -import ru.gravit.launcher.LauncherAPI; -import ru.gravit.launcher.LauncherNetworkAPI; -import ru.gravit.launcher.events.request.AuthRequestEvent; -import ru.gravit.launcher.request.Request; -import ru.gravit.launcher.request.websockets.RequestInterface; -import ru.gravit.utils.helper.VerifyHelper; +import pro.gravit.launcher.HWID; +import pro.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.events.request.AuthRequestEvent; +import pro.gravit.launcher.request.websockets.RequestInterface; +import pro.gravit.utils.helper.VerifyHelper; +import pro.gravit.launcher.request.Request; public final class AuthRequest extends Request implements RequestInterface { @LauncherNetworkAPI diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/CheckServerRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/CheckServerRequest.java similarity index 60% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/CheckServerRequest.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/CheckServerRequest.java index ea351617..91e8f545 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/CheckServerRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/CheckServerRequest.java @@ -1,11 +1,11 @@ -package ru.gravit.launcher.request.auth; +package pro.gravit.launcher.request.auth; -import ru.gravit.launcher.LauncherAPI; -import ru.gravit.launcher.LauncherNetworkAPI; -import ru.gravit.launcher.events.request.CheckServerRequestEvent; -import ru.gravit.launcher.request.Request; -import ru.gravit.launcher.request.websockets.RequestInterface; -import ru.gravit.utils.helper.VerifyHelper; +import pro.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.events.request.CheckServerRequestEvent; +import pro.gravit.launcher.request.websockets.RequestInterface; +import pro.gravit.utils.helper.VerifyHelper; +import pro.gravit.launcher.request.Request; public final class CheckServerRequest extends Request implements RequestInterface { @LauncherNetworkAPI diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/GetAvailabilityAuthRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/GetAvailabilityAuthRequest.java new file mode 100644 index 00000000..11af4b13 --- /dev/null +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/GetAvailabilityAuthRequest.java @@ -0,0 +1,13 @@ +package pro.gravit.launcher.request.auth; + +import pro.gravit.launcher.events.request.GetAvailabilityAuthRequestEvent; +import pro.gravit.launcher.request.websockets.RequestInterface; +import pro.gravit.launcher.request.Request; + +public class GetAvailabilityAuthRequest extends Request implements RequestInterface { + + @Override + public String getType() { + return "getAvailabilityAuth"; + } +} diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/JoinServerRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/JoinServerRequest.java similarity index 63% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/JoinServerRequest.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/JoinServerRequest.java index 94354865..c3e8ed88 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/JoinServerRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/JoinServerRequest.java @@ -1,12 +1,12 @@ -package ru.gravit.launcher.request.auth; +package pro.gravit.launcher.request.auth; -import ru.gravit.launcher.LauncherAPI; -import ru.gravit.launcher.LauncherNetworkAPI; -import ru.gravit.launcher.events.request.JoinServerRequestEvent; -import ru.gravit.launcher.request.Request; -import ru.gravit.launcher.request.websockets.RequestInterface; -import ru.gravit.utils.helper.SecurityHelper; -import ru.gravit.utils.helper.VerifyHelper; +import pro.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.events.request.JoinServerRequestEvent; +import pro.gravit.launcher.request.websockets.RequestInterface; +import pro.gravit.utils.helper.SecurityHelper; +import pro.gravit.utils.helper.VerifyHelper; +import pro.gravit.launcher.request.Request; public final class JoinServerRequest extends Request implements RequestInterface { diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/RestoreSessionRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/RestoreSessionRequest.java similarity index 55% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/RestoreSessionRequest.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/RestoreSessionRequest.java index 2b49838d..2b72ddbe 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/RestoreSessionRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/RestoreSessionRequest.java @@ -1,9 +1,9 @@ -package ru.gravit.launcher.request.auth; +package pro.gravit.launcher.request.auth; -import ru.gravit.launcher.LauncherNetworkAPI; -import ru.gravit.launcher.events.request.RestoreSessionRequestEvent; -import ru.gravit.launcher.request.Request; -import ru.gravit.launcher.request.websockets.RequestInterface; +import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.events.request.RestoreSessionRequestEvent; +import pro.gravit.launcher.request.websockets.RequestInterface; +import pro.gravit.launcher.request.Request; public class RestoreSessionRequest extends Request implements RequestInterface { @LauncherNetworkAPI diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/SetProfileRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/SetProfileRequest.java similarity index 51% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/SetProfileRequest.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/SetProfileRequest.java index b8d116af..0a8f656d 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/SetProfileRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/auth/SetProfileRequest.java @@ -1,10 +1,10 @@ -package ru.gravit.launcher.request.auth; +package pro.gravit.launcher.request.auth; -import ru.gravit.launcher.LauncherNetworkAPI; -import ru.gravit.launcher.events.request.SetProfileRequestEvent; -import ru.gravit.launcher.profiles.ClientProfile; -import ru.gravit.launcher.request.Request; -import ru.gravit.launcher.request.websockets.RequestInterface; +import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.events.request.SetProfileRequestEvent; +import pro.gravit.launcher.profiles.ClientProfile; +import pro.gravit.launcher.request.websockets.RequestInterface; +import pro.gravit.launcher.request.Request; public class SetProfileRequest extends Request implements RequestInterface { @LauncherNetworkAPI diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/update/LauncherRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/update/LauncherRequest.java similarity index 80% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/update/LauncherRequest.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/request/update/LauncherRequest.java index dc0c4ee2..e0639372 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/update/LauncherRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/update/LauncherRequest.java @@ -1,17 +1,17 @@ -package ru.gravit.launcher.request.update; +package pro.gravit.launcher.request.update; -import ru.gravit.launcher.Launcher; -import ru.gravit.launcher.LauncherAPI; -import ru.gravit.launcher.LauncherNetworkAPI; -import ru.gravit.launcher.downloader.ListDownloader; -import ru.gravit.launcher.events.request.LauncherRequestEvent; -import ru.gravit.launcher.request.Request; -import ru.gravit.launcher.request.websockets.RequestInterface; -import ru.gravit.launcher.request.websockets.StandartClientWebSocketService; -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 pro.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.downloader.ListDownloader; +import pro.gravit.launcher.events.request.LauncherRequestEvent; +import pro.gravit.launcher.request.websockets.RequestInterface; +import pro.gravit.launcher.request.websockets.StandartClientWebSocketService; +import pro.gravit.utils.helper.JVMHelper; +import pro.gravit.utils.helper.SecurityHelper; +import pro.gravit.launcher.Launcher; +import pro.gravit.launcher.request.Request; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.LogHelper; import java.io.IOException; import java.nio.file.Path; diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/update/ProfilesRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/update/ProfilesRequest.java new file mode 100644 index 00000000..342821df --- /dev/null +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/update/ProfilesRequest.java @@ -0,0 +1,13 @@ +package pro.gravit.launcher.request.update; + +import pro.gravit.launcher.events.request.ProfilesRequestEvent; +import pro.gravit.launcher.request.websockets.RequestInterface; +import pro.gravit.launcher.request.Request; + +public final class ProfilesRequest extends Request implements RequestInterface { + + @Override + public String getType() { + return "profiles"; + } +} diff --git a/LauncherAPI/src/main/java/pro/gravit/launcher/request/update/UpdateListRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/update/UpdateListRequest.java new file mode 100644 index 00000000..884318e6 --- /dev/null +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/update/UpdateListRequest.java @@ -0,0 +1,13 @@ +package pro.gravit.launcher.request.update; + +import pro.gravit.launcher.events.request.UpdateListRequestEvent; +import pro.gravit.launcher.request.websockets.RequestInterface; +import pro.gravit.launcher.request.Request; + +public final class UpdateListRequest extends Request implements RequestInterface { + + @Override + public String getType() { + return "updateList"; + } +} diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/update/UpdateRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/update/UpdateRequest.java similarity index 92% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/update/UpdateRequest.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/request/update/UpdateRequest.java index 931e6828..6984d218 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/update/UpdateRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/update/UpdateRequest.java @@ -1,20 +1,20 @@ -package ru.gravit.launcher.request.update; +package pro.gravit.launcher.request.update; -import ru.gravit.launcher.Launcher; -import ru.gravit.launcher.LauncherAPI; -import ru.gravit.launcher.LauncherNetworkAPI; -import ru.gravit.launcher.downloader.ListDownloader; -import ru.gravit.launcher.events.request.UpdateRequestEvent; -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.request.Request; -import ru.gravit.launcher.request.update.UpdateRequest.State.Callback; -import ru.gravit.launcher.request.websockets.RequestInterface; -import ru.gravit.launcher.request.websockets.StandartClientWebSocketService; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.downloader.ListDownloader; +import pro.gravit.launcher.events.request.UpdateRequestEvent; +import pro.gravit.launcher.hasher.FileNameMatcher; +import pro.gravit.launcher.hasher.HashedDir; +import pro.gravit.launcher.hasher.HashedEntry; +import pro.gravit.launcher.hasher.HashedFile; +import pro.gravit.launcher.request.websockets.RequestInterface; +import pro.gravit.launcher.request.websockets.StandartClientWebSocketService; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.launcher.Launcher; +import pro.gravit.launcher.request.Request; +import pro.gravit.launcher.request.update.UpdateRequest.State.Callback; +import pro.gravit.utils.helper.LogHelper; import java.io.IOException; import java.nio.file.Files; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/uuid/BatchProfileByUsernameRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/uuid/BatchProfileByUsernameRequest.java similarity index 66% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/uuid/BatchProfileByUsernameRequest.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/request/uuid/BatchProfileByUsernameRequest.java index 433e7aaa..02e67ac5 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/uuid/BatchProfileByUsernameRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/uuid/BatchProfileByUsernameRequest.java @@ -1,13 +1,13 @@ -package ru.gravit.launcher.request.uuid; +package pro.gravit.launcher.request.uuid; -import ru.gravit.launcher.LauncherAPI; -import ru.gravit.launcher.LauncherNetworkAPI; -import ru.gravit.launcher.events.request.BatchProfileByUsernameRequestEvent; -import ru.gravit.launcher.request.Request; -import ru.gravit.launcher.request.websockets.RequestInterface; -import ru.gravit.launcher.serialize.SerializeLimits; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.VerifyHelper; +import pro.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.events.request.BatchProfileByUsernameRequestEvent; +import pro.gravit.launcher.request.websockets.RequestInterface; +import pro.gravit.launcher.serialize.SerializeLimits; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.VerifyHelper; +import pro.gravit.launcher.request.Request; import java.io.IOException; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/uuid/ProfileByUUIDRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/uuid/ProfileByUUIDRequest.java similarity index 58% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/uuid/ProfileByUUIDRequest.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/request/uuid/ProfileByUUIDRequest.java index fe99ec0d..9e1cc25a 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/uuid/ProfileByUUIDRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/uuid/ProfileByUUIDRequest.java @@ -1,10 +1,10 @@ -package ru.gravit.launcher.request.uuid; +package pro.gravit.launcher.request.uuid; -import ru.gravit.launcher.LauncherAPI; -import ru.gravit.launcher.LauncherNetworkAPI; -import ru.gravit.launcher.events.request.ProfileByUUIDRequestEvent; -import ru.gravit.launcher.request.Request; -import ru.gravit.launcher.request.websockets.RequestInterface; +import pro.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.events.request.ProfileByUUIDRequestEvent; +import pro.gravit.launcher.request.websockets.RequestInterface; +import pro.gravit.launcher.request.Request; import java.util.Objects; import java.util.UUID; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/uuid/ProfileByUsernameRequest.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/uuid/ProfileByUsernameRequest.java similarity index 53% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/uuid/ProfileByUsernameRequest.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/request/uuid/ProfileByUsernameRequest.java index b0308f23..fe8bd73b 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/uuid/ProfileByUsernameRequest.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/uuid/ProfileByUsernameRequest.java @@ -1,11 +1,11 @@ -package ru.gravit.launcher.request.uuid; +package pro.gravit.launcher.request.uuid; -import ru.gravit.launcher.LauncherAPI; -import ru.gravit.launcher.LauncherNetworkAPI; -import ru.gravit.launcher.events.request.ProfileByUsernameRequestEvent; -import ru.gravit.launcher.request.Request; -import ru.gravit.launcher.request.websockets.RequestInterface; -import ru.gravit.utils.helper.VerifyHelper; +import pro.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.events.request.ProfileByUsernameRequestEvent; +import pro.gravit.launcher.request.websockets.RequestInterface; +import pro.gravit.utils.helper.VerifyHelper; +import pro.gravit.launcher.request.Request; public final class ProfileByUsernameRequest extends Request implements RequestInterface { @LauncherNetworkAPI diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/ClientJSONPoint.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/ClientJSONPoint.java similarity index 97% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/ClientJSONPoint.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/ClientJSONPoint.java index 0c6cda23..690bc876 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/ClientJSONPoint.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/ClientJSONPoint.java @@ -1,4 +1,4 @@ -package ru.gravit.launcher.request.websockets; +package pro.gravit.launcher.request.websockets; import io.netty.bootstrap.Bootstrap; import io.netty.channel.*; @@ -14,7 +14,7 @@ import io.netty.handler.codec.http.websocketx.WebSocketVersion; import io.netty.handler.ssl.SslContext; import io.netty.handler.ssl.SslContextBuilder; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.utils.helper.LogHelper; import javax.net.ssl.SSLException; import java.io.IOException; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/ClientWebSocketService.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/ClientWebSocketService.java similarity index 94% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/ClientWebSocketService.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/ClientWebSocketService.java index 1749b9d0..a8324cbb 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/ClientWebSocketService.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/ClientWebSocketService.java @@ -1,13 +1,13 @@ -package ru.gravit.launcher.request.websockets; +package pro.gravit.launcher.request.websockets; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import ru.gravit.launcher.events.ExceptionEvent; -import ru.gravit.launcher.events.request.*; -import ru.gravit.launcher.hasher.HashedEntry; -import ru.gravit.launcher.hasher.HashedEntryAdapter; -import ru.gravit.launcher.request.ResultInterface; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launcher.events.ExceptionEvent; +import pro.gravit.launcher.events.request.*; +import pro.gravit.launcher.hasher.HashedEntry; +import pro.gravit.launcher.hasher.HashedEntryAdapter; +import pro.gravit.launcher.request.ResultInterface; +import pro.gravit.utils.helper.LogHelper; import javax.net.ssl.SSLException; import java.io.IOException; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/JsonRequestAdapter.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/JsonRequestAdapter.java similarity index 93% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/JsonRequestAdapter.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/JsonRequestAdapter.java index 3d3ab677..27eae85b 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/JsonRequestAdapter.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/JsonRequestAdapter.java @@ -1,7 +1,7 @@ -package ru.gravit.launcher.request.websockets; +package pro.gravit.launcher.request.websockets; import com.google.gson.*; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.utils.helper.LogHelper; import java.lang.reflect.Type; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/JsonResultAdapter.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/JsonResultAdapter.java similarity index 89% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/JsonResultAdapter.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/JsonResultAdapter.java index a1f4c6e2..c9bd5f93 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/JsonResultAdapter.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/JsonResultAdapter.java @@ -1,8 +1,8 @@ -package ru.gravit.launcher.request.websockets; +package pro.gravit.launcher.request.websockets; import com.google.gson.*; -import ru.gravit.launcher.request.ResultInterface; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launcher.request.ResultInterface; +import pro.gravit.utils.helper.LogHelper; import java.lang.reflect.Type; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/RequestInterface.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/RequestInterface.java similarity index 55% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/RequestInterface.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/RequestInterface.java index 4633413d..86c5638e 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/RequestInterface.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/RequestInterface.java @@ -1,4 +1,4 @@ -package ru.gravit.launcher.request.websockets; +package pro.gravit.launcher.request.websockets; public interface RequestInterface { String getType(); diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/StandartClientWebSocketService.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/StandartClientWebSocketService.java similarity index 93% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/StandartClientWebSocketService.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/StandartClientWebSocketService.java index bfdff933..8ed92f36 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/StandartClientWebSocketService.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/StandartClientWebSocketService.java @@ -1,12 +1,12 @@ -package ru.gravit.launcher.request.websockets; +package pro.gravit.launcher.request.websockets; import com.google.gson.GsonBuilder; -import ru.gravit.launcher.events.request.ErrorRequestEvent; -import ru.gravit.launcher.request.Request; -import ru.gravit.launcher.request.RequestException; -import ru.gravit.launcher.request.ResultInterface; -import ru.gravit.utils.helper.JVMHelper; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launcher.events.request.ErrorRequestEvent; +import pro.gravit.launcher.request.RequestException; +import pro.gravit.launcher.request.ResultInterface; +import pro.gravit.utils.helper.JVMHelper; +import pro.gravit.launcher.request.Request; +import pro.gravit.utils.helper.LogHelper; import javax.net.ssl.SSLException; import java.io.IOException; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/WaitEventHandler.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/WaitEventHandler.java similarity index 88% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/WaitEventHandler.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/WaitEventHandler.java index e9a4fb03..4547c7e2 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/WaitEventHandler.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/WaitEventHandler.java @@ -1,8 +1,8 @@ -package ru.gravit.launcher.request.websockets; +package pro.gravit.launcher.request.websockets; -import ru.gravit.launcher.events.RequestEvent; -import ru.gravit.launcher.request.ResultInterface; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launcher.events.RequestEvent; +import pro.gravit.launcher.request.ResultInterface; +import pro.gravit.utils.helper.LogHelper; import java.util.Set; import java.util.UUID; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/WebSocketClientHandler.java b/LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/WebSocketClientHandler.java similarity index 97% rename from LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/WebSocketClientHandler.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/WebSocketClientHandler.java index c7042963..0b68d069 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/WebSocketClientHandler.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/WebSocketClientHandler.java @@ -1,10 +1,10 @@ -package ru.gravit.launcher.request.websockets; +package pro.gravit.launcher.request.websockets; import io.netty.channel.*; import io.netty.handler.codec.http.FullHttpResponse; import io.netty.handler.codec.http.websocketx.*; import io.netty.util.CharsetUtil; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.utils.helper.LogHelper; import java.util.concurrent.TimeUnit; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/ssl/LauncherKeyStore.java b/LauncherAPI/src/main/java/pro/gravit/launcher/ssl/LauncherKeyStore.java similarity index 95% rename from LauncherAPI/src/main/java/ru/gravit/launcher/ssl/LauncherKeyStore.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/ssl/LauncherKeyStore.java index e4c11bab..fa3acb42 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/ssl/LauncherKeyStore.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/ssl/LauncherKeyStore.java @@ -1,4 +1,4 @@ -package ru.gravit.launcher.ssl; +package pro.gravit.launcher.ssl; import java.io.FileInputStream; import java.io.IOException; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/ssl/LauncherSSLContext.java b/LauncherAPI/src/main/java/pro/gravit/launcher/ssl/LauncherSSLContext.java similarity index 97% rename from LauncherAPI/src/main/java/ru/gravit/launcher/ssl/LauncherSSLContext.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/ssl/LauncherSSLContext.java index 480f52ce..e806892b 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/ssl/LauncherSSLContext.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/ssl/LauncherSSLContext.java @@ -1,4 +1,4 @@ -package ru.gravit.launcher.ssl; +package pro.gravit.launcher.ssl; import javax.net.ssl.*; import java.security.*; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/ssl/LauncherTrustManager.java b/LauncherAPI/src/main/java/pro/gravit/launcher/ssl/LauncherTrustManager.java similarity index 92% rename from LauncherAPI/src/main/java/ru/gravit/launcher/ssl/LauncherTrustManager.java rename to LauncherAPI/src/main/java/pro/gravit/launcher/ssl/LauncherTrustManager.java index d1ef8262..48389921 100644 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/ssl/LauncherTrustManager.java +++ b/LauncherAPI/src/main/java/pro/gravit/launcher/ssl/LauncherTrustManager.java @@ -1,4 +1,4 @@ -package ru.gravit.launcher.ssl; +package pro.gravit.launcher.ssl; import javax.net.ssl.X509TrustManager; diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/GetAvailabilityAuthRequest.java b/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/GetAvailabilityAuthRequest.java deleted file mode 100644 index f3bcd1e6..00000000 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/auth/GetAvailabilityAuthRequest.java +++ /dev/null @@ -1,13 +0,0 @@ -package ru.gravit.launcher.request.auth; - -import ru.gravit.launcher.events.request.GetAvailabilityAuthRequestEvent; -import ru.gravit.launcher.request.Request; -import ru.gravit.launcher.request.websockets.RequestInterface; - -public class GetAvailabilityAuthRequest extends Request implements RequestInterface { - - @Override - public String getType() { - return "getAvailabilityAuth"; - } -} diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/update/ProfilesRequest.java b/LauncherAPI/src/main/java/ru/gravit/launcher/request/update/ProfilesRequest.java deleted file mode 100644 index fcb70c01..00000000 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/update/ProfilesRequest.java +++ /dev/null @@ -1,13 +0,0 @@ -package ru.gravit.launcher.request.update; - -import ru.gravit.launcher.events.request.ProfilesRequestEvent; -import ru.gravit.launcher.request.Request; -import ru.gravit.launcher.request.websockets.RequestInterface; - -public final class ProfilesRequest extends Request implements RequestInterface { - - @Override - public String getType() { - return "profiles"; - } -} diff --git a/LauncherAPI/src/main/java/ru/gravit/launcher/request/update/UpdateListRequest.java b/LauncherAPI/src/main/java/ru/gravit/launcher/request/update/UpdateListRequest.java deleted file mode 100644 index 725f0492..00000000 --- a/LauncherAPI/src/main/java/ru/gravit/launcher/request/update/UpdateListRequest.java +++ /dev/null @@ -1,13 +0,0 @@ -package ru.gravit.launcher.request.update; - -import ru.gravit.launcher.events.request.UpdateListRequestEvent; -import ru.gravit.launcher.request.Request; -import ru.gravit.launcher.request.websockets.RequestInterface; - -public final class UpdateListRequest extends Request implements RequestInterface { - - @Override - public String getType() { - return "updateList"; - } -} diff --git a/LauncherAuthlib/src/main/java/com/mojang/authlib/yggdrasil/CompatBridge.java b/LauncherAuthlib/src/main/java/com/mojang/authlib/yggdrasil/CompatBridge.java index 8daeda25..fdf46a91 100644 --- a/LauncherAuthlib/src/main/java/com/mojang/authlib/yggdrasil/CompatBridge.java +++ b/LauncherAuthlib/src/main/java/com/mojang/authlib/yggdrasil/CompatBridge.java @@ -1,14 +1,14 @@ package com.mojang.authlib.yggdrasil; -import ru.gravit.launcher.LauncherAPI; -import ru.gravit.launcher.profiles.PlayerProfile; -import ru.gravit.launcher.request.auth.CheckServerRequest; -import ru.gravit.launcher.request.auth.JoinServerRequest; -import ru.gravit.launcher.request.uuid.BatchProfileByUsernameRequest; -import ru.gravit.launcher.request.uuid.ProfileByUUIDRequest; -import ru.gravit.launcher.request.uuid.ProfileByUsernameRequest; -import ru.gravit.launcher.serialize.SerializeLimits; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.profiles.PlayerProfile; +import pro.gravit.launcher.request.auth.CheckServerRequest; +import pro.gravit.launcher.request.auth.JoinServerRequest; +import pro.gravit.launcher.request.uuid.BatchProfileByUsernameRequest; +import pro.gravit.launcher.request.uuid.ProfileByUUIDRequest; +import pro.gravit.launcher.request.uuid.ProfileByUsernameRequest; +import pro.gravit.launcher.serialize.SerializeLimits; +import pro.gravit.utils.helper.LogHelper; import java.util.UUID; diff --git a/LauncherAuthlib/src/main/java/com/mojang/authlib/yggdrasil/CompatProfile.java b/LauncherAuthlib/src/main/java/com/mojang/authlib/yggdrasil/CompatProfile.java index fd19a64c..9a4cf670 100644 --- a/LauncherAuthlib/src/main/java/com/mojang/authlib/yggdrasil/CompatProfile.java +++ b/LauncherAuthlib/src/main/java/com/mojang/authlib/yggdrasil/CompatProfile.java @@ -1,9 +1,9 @@ package com.mojang.authlib.yggdrasil; -import ru.gravit.launcher.Launcher; -import ru.gravit.launcher.LauncherAPI; -import ru.gravit.launcher.profiles.PlayerProfile; -import ru.gravit.utils.helper.SecurityHelper; +import pro.gravit.launcher.Launcher; +import pro.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.profiles.PlayerProfile; +import pro.gravit.utils.helper.SecurityHelper; import java.util.UUID; diff --git a/LauncherAuthlib/src/main/java/com/mojang/authlib/yggdrasil/LegacyBridge.java b/LauncherAuthlib/src/main/java/com/mojang/authlib/yggdrasil/LegacyBridge.java index aa79f146..baa874e1 100644 --- a/LauncherAuthlib/src/main/java/com/mojang/authlib/yggdrasil/LegacyBridge.java +++ b/LauncherAuthlib/src/main/java/com/mojang/authlib/yggdrasil/LegacyBridge.java @@ -1,11 +1,11 @@ package com.mojang.authlib.yggdrasil; -import ru.gravit.launcher.LauncherAPI; -import ru.gravit.launcher.request.auth.CheckServerRequest; -import ru.gravit.launcher.request.auth.JoinServerRequest; -import ru.gravit.utils.helper.CommonHelper; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.request.auth.CheckServerRequest; +import pro.gravit.launcher.request.auth.JoinServerRequest; +import pro.gravit.utils.helper.CommonHelper; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.LogHelper; // Used by 1.6.4 and below versions @LauncherAPI diff --git a/LauncherAuthlib/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilAuthenticationService.java b/LauncherAuthlib/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilAuthenticationService.java index 6579f2e4..1e62153f 100644 --- a/LauncherAuthlib/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilAuthenticationService.java +++ b/LauncherAuthlib/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilAuthenticationService.java @@ -5,7 +5,7 @@ import com.mojang.authlib.GameProfileRepository; import com.mojang.authlib.UserAuthentication; import com.mojang.authlib.minecraft.MinecraftSessionService; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.utils.helper.LogHelper; import java.net.Proxy; diff --git a/LauncherAuthlib/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java b/LauncherAuthlib/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java index 37f330e3..c2b0dc2e 100644 --- a/LauncherAuthlib/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java +++ b/LauncherAuthlib/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java @@ -4,11 +4,11 @@ import com.mojang.authlib.GameProfile; import com.mojang.authlib.GameProfileRepository; import com.mojang.authlib.ProfileLookupCallback; -import ru.gravit.launcher.profiles.PlayerProfile; -import ru.gravit.launcher.request.uuid.BatchProfileByUsernameRequest; -import ru.gravit.launcher.serialize.SerializeLimits; -import ru.gravit.utils.helper.LogHelper; -import ru.gravit.utils.helper.VerifyHelper; +import pro.gravit.launcher.profiles.PlayerProfile; +import pro.gravit.launcher.request.uuid.BatchProfileByUsernameRequest; +import pro.gravit.launcher.serialize.SerializeLimits; +import pro.gravit.utils.helper.LogHelper; +import pro.gravit.utils.helper.VerifyHelper; import java.util.Arrays; import java.util.UUID; diff --git a/LauncherAuthlib/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilMinecraftSessionService.java b/LauncherAuthlib/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilMinecraftSessionService.java index a13032ce..d76b86f8 100644 --- a/LauncherAuthlib/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilMinecraftSessionService.java +++ b/LauncherAuthlib/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilMinecraftSessionService.java @@ -12,14 +12,14 @@ import com.mojang.authlib.minecraft.MinecraftProfileTexture; import com.mojang.authlib.properties.Property; import com.mojang.authlib.properties.PropertyMap; -import ru.gravit.launcher.Launcher; -import ru.gravit.launcher.profiles.PlayerProfile; -import ru.gravit.launcher.request.auth.CheckServerRequest; -import ru.gravit.launcher.request.auth.JoinServerRequest; -import ru.gravit.launcher.request.uuid.ProfileByUUIDRequest; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; -import ru.gravit.utils.helper.SecurityHelper; +import pro.gravit.launcher.Launcher; +import pro.gravit.launcher.profiles.PlayerProfile; +import pro.gravit.launcher.request.auth.CheckServerRequest; +import pro.gravit.launcher.request.auth.JoinServerRequest; +import pro.gravit.launcher.request.uuid.ProfileByUUIDRequest; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.LogHelper; +import pro.gravit.utils.helper.SecurityHelper; import java.net.InetAddress; import java.util.Base64; diff --git a/LauncherCore/src/main/java/ru/gravit/launcher/LauncherAPI.java b/LauncherCore/src/main/java/pro/gravit/launcher/LauncherAPI.java similarity index 93% rename from LauncherCore/src/main/java/ru/gravit/launcher/LauncherAPI.java rename to LauncherCore/src/main/java/pro/gravit/launcher/LauncherAPI.java index 9e10f218..644f0296 100644 --- a/LauncherCore/src/main/java/ru/gravit/launcher/LauncherAPI.java +++ b/LauncherCore/src/main/java/pro/gravit/launcher/LauncherAPI.java @@ -1,4 +1,4 @@ -package ru.gravit.launcher; +package pro.gravit.launcher; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/LauncherCore/src/main/java/ru/gravit/launcher/LauncherNetworkAPI.java b/LauncherCore/src/main/java/pro/gravit/launcher/LauncherNetworkAPI.java similarity index 91% rename from LauncherCore/src/main/java/ru/gravit/launcher/LauncherNetworkAPI.java rename to LauncherCore/src/main/java/pro/gravit/launcher/LauncherNetworkAPI.java index 52eacc8a..cd3ab1ef 100644 --- a/LauncherCore/src/main/java/ru/gravit/launcher/LauncherNetworkAPI.java +++ b/LauncherCore/src/main/java/pro/gravit/launcher/LauncherNetworkAPI.java @@ -1,4 +1,4 @@ -package ru.gravit.launcher; +package pro.gravit.launcher; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/LauncherCore/src/main/java/ru/gravit/launcher/NeedGarbageCollection.java b/LauncherCore/src/main/java/pro/gravit/launcher/NeedGarbageCollection.java similarity index 76% rename from LauncherCore/src/main/java/ru/gravit/launcher/NeedGarbageCollection.java rename to LauncherCore/src/main/java/pro/gravit/launcher/NeedGarbageCollection.java index 04c69b14..3f6147ea 100644 --- a/LauncherCore/src/main/java/ru/gravit/launcher/NeedGarbageCollection.java +++ b/LauncherCore/src/main/java/pro/gravit/launcher/NeedGarbageCollection.java @@ -1,4 +1,4 @@ -package ru.gravit.launcher; +package pro.gravit.launcher; @FunctionalInterface public interface NeedGarbageCollection { diff --git a/LauncherCore/src/main/java/ru/gravit/launcher/hasher/FileNameMatcher.java b/LauncherCore/src/main/java/pro/gravit/launcher/hasher/FileNameMatcher.java similarity index 95% rename from LauncherCore/src/main/java/ru/gravit/launcher/hasher/FileNameMatcher.java rename to LauncherCore/src/main/java/pro/gravit/launcher/hasher/FileNameMatcher.java index a0b9e0a6..1991c56a 100644 --- a/LauncherCore/src/main/java/ru/gravit/launcher/hasher/FileNameMatcher.java +++ b/LauncherCore/src/main/java/pro/gravit/launcher/hasher/FileNameMatcher.java @@ -1,6 +1,6 @@ -package ru.gravit.launcher.hasher; +package pro.gravit.launcher.hasher; -import ru.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.LauncherAPI; import java.util.Collection; diff --git a/LauncherCore/src/main/java/ru/gravit/launcher/hasher/HashedDir.java b/LauncherCore/src/main/java/pro/gravit/launcher/hasher/HashedDir.java similarity index 97% rename from LauncherCore/src/main/java/ru/gravit/launcher/hasher/HashedDir.java rename to LauncherCore/src/main/java/pro/gravit/launcher/hasher/HashedDir.java index 0fed474b..bb9a10df 100644 --- a/LauncherCore/src/main/java/ru/gravit/launcher/hasher/HashedDir.java +++ b/LauncherCore/src/main/java/pro/gravit/launcher/hasher/HashedDir.java @@ -1,13 +1,13 @@ -package ru.gravit.launcher.hasher; +package pro.gravit.launcher.hasher; -import ru.gravit.launcher.LauncherAPI; -import ru.gravit.launcher.LauncherNetworkAPI; -import ru.gravit.launcher.serialize.HInput; -import ru.gravit.launcher.serialize.HOutput; -import ru.gravit.launcher.serialize.stream.EnumSerializer; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; -import ru.gravit.utils.helper.VerifyHelper; +import pro.gravit.launcher.serialize.HInput; +import pro.gravit.launcher.serialize.HOutput; +import pro.gravit.launcher.serialize.stream.EnumSerializer; +import pro.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.LogHelper; +import pro.gravit.utils.helper.VerifyHelper; import java.io.IOException; import java.nio.file.FileVisitResult; diff --git a/LauncherCore/src/main/java/ru/gravit/launcher/hasher/HashedEntry.java b/LauncherCore/src/main/java/pro/gravit/launcher/hasher/HashedEntry.java similarity index 67% rename from LauncherCore/src/main/java/ru/gravit/launcher/hasher/HashedEntry.java rename to LauncherCore/src/main/java/pro/gravit/launcher/hasher/HashedEntry.java index 2045dbd5..8ff76e47 100644 --- a/LauncherCore/src/main/java/ru/gravit/launcher/hasher/HashedEntry.java +++ b/LauncherCore/src/main/java/pro/gravit/launcher/hasher/HashedEntry.java @@ -1,16 +1,15 @@ -package ru.gravit.launcher.hasher; +package pro.gravit.launcher.hasher; -import ru.gravit.launcher.LauncherAPI; -import ru.gravit.launcher.serialize.HInput; -import ru.gravit.launcher.serialize.stream.EnumSerializer; -import ru.gravit.launcher.serialize.stream.EnumSerializer.Itf; -import ru.gravit.launcher.serialize.stream.StreamObject; +import pro.gravit.launcher.serialize.HInput; +import pro.gravit.launcher.serialize.stream.EnumSerializer; +import pro.gravit.launcher.serialize.stream.StreamObject; +import pro.gravit.launcher.LauncherAPI; import java.io.IOException; public abstract class HashedEntry extends StreamObject { @LauncherAPI - public enum Type implements Itf { + public enum Type implements EnumSerializer.Itf { DIR(1), FILE(2); private static final EnumSerializer SERIALIZER = new EnumSerializer<>(Type.class); diff --git a/LauncherCore/src/main/java/ru/gravit/launcher/hasher/HashedEntryAdapter.java b/LauncherCore/src/main/java/pro/gravit/launcher/hasher/HashedEntryAdapter.java similarity index 97% rename from LauncherCore/src/main/java/ru/gravit/launcher/hasher/HashedEntryAdapter.java rename to LauncherCore/src/main/java/pro/gravit/launcher/hasher/HashedEntryAdapter.java index d31fce3a..64c0139d 100644 --- a/LauncherCore/src/main/java/ru/gravit/launcher/hasher/HashedEntryAdapter.java +++ b/LauncherCore/src/main/java/pro/gravit/launcher/hasher/HashedEntryAdapter.java @@ -1,4 +1,4 @@ -package ru.gravit.launcher.hasher; +package pro.gravit.launcher.hasher; import com.google.gson.*; diff --git a/LauncherCore/src/main/java/ru/gravit/launcher/hasher/HashedFile.java b/LauncherCore/src/main/java/pro/gravit/launcher/hasher/HashedFile.java similarity index 83% rename from LauncherCore/src/main/java/ru/gravit/launcher/hasher/HashedFile.java rename to LauncherCore/src/main/java/pro/gravit/launcher/hasher/HashedFile.java index 3827f77d..dfe5f3fc 100644 --- a/LauncherCore/src/main/java/ru/gravit/launcher/hasher/HashedFile.java +++ b/LauncherCore/src/main/java/pro/gravit/launcher/hasher/HashedFile.java @@ -1,13 +1,13 @@ -package ru.gravit.launcher.hasher; +package pro.gravit.launcher.hasher; -import ru.gravit.launcher.LauncherAPI; -import ru.gravit.launcher.LauncherNetworkAPI; -import ru.gravit.launcher.serialize.HInput; -import ru.gravit.launcher.serialize.HOutput; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.SecurityHelper; -import ru.gravit.utils.helper.SecurityHelper.DigestAlgorithm; -import ru.gravit.utils.helper.VerifyHelper; +import pro.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.serialize.HInput; +import pro.gravit.launcher.serialize.HOutput; +import pro.gravit.launcher.LauncherAPI; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.SecurityHelper; +import pro.gravit.utils.helper.SecurityHelper.DigestAlgorithm; +import pro.gravit.utils.helper.VerifyHelper; import java.io.IOException; import java.nio.file.Path; diff --git a/LauncherCore/src/main/java/ru/gravit/launcher/managers/GarbageManager.java b/LauncherCore/src/main/java/pro/gravit/launcher/managers/GarbageManager.java similarity index 93% rename from LauncherCore/src/main/java/ru/gravit/launcher/managers/GarbageManager.java rename to LauncherCore/src/main/java/pro/gravit/launcher/managers/GarbageManager.java index 44e21baa..743599ea 100644 --- a/LauncherCore/src/main/java/ru/gravit/launcher/managers/GarbageManager.java +++ b/LauncherCore/src/main/java/pro/gravit/launcher/managers/GarbageManager.java @@ -1,6 +1,6 @@ -package ru.gravit.launcher.managers; +package pro.gravit.launcher.managers; -import ru.gravit.launcher.NeedGarbageCollection; +import pro.gravit.launcher.NeedGarbageCollection; import java.util.ArrayList; import java.util.Timer; diff --git a/LauncherCore/src/main/java/ru/gravit/launcher/managers/GsonManager.java b/LauncherCore/src/main/java/pro/gravit/launcher/managers/GsonManager.java similarity index 83% rename from LauncherCore/src/main/java/ru/gravit/launcher/managers/GsonManager.java rename to LauncherCore/src/main/java/pro/gravit/launcher/managers/GsonManager.java index bf93aafd..655f21c2 100644 --- a/LauncherCore/src/main/java/ru/gravit/launcher/managers/GsonManager.java +++ b/LauncherCore/src/main/java/pro/gravit/launcher/managers/GsonManager.java @@ -1,10 +1,10 @@ -package ru.gravit.launcher.managers; +package pro.gravit.launcher.managers; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import ru.gravit.launcher.hasher.HashedEntry; -import ru.gravit.launcher.hasher.HashedEntryAdapter; -import ru.gravit.utils.helper.CommonHelper; +import pro.gravit.launcher.hasher.HashedEntry; +import pro.gravit.launcher.hasher.HashedEntryAdapter; +import pro.gravit.utils.helper.CommonHelper; public class GsonManager { public GsonBuilder gsonBuilder; diff --git a/LauncherCore/src/main/java/ru/gravit/launcher/serialize/HInput.java b/LauncherCore/src/main/java/pro/gravit/launcher/serialize/HInput.java similarity index 96% rename from LauncherCore/src/main/java/ru/gravit/launcher/serialize/HInput.java rename to LauncherCore/src/main/java/pro/gravit/launcher/serialize/HInput.java index f6811e27..56367213 100644 --- a/LauncherCore/src/main/java/ru/gravit/launcher/serialize/HInput.java +++ b/LauncherCore/src/main/java/pro/gravit/launcher/serialize/HInput.java @@ -1,7 +1,7 @@ -package ru.gravit.launcher.serialize; +package pro.gravit.launcher.serialize; -import ru.gravit.launcher.LauncherAPI; -import ru.gravit.utils.helper.IOHelper; +import pro.gravit.launcher.LauncherAPI; +import pro.gravit.utils.helper.IOHelper; import java.io.ByteArrayInputStream; import java.io.EOFException; diff --git a/LauncherCore/src/main/java/ru/gravit/launcher/serialize/HOutput.java b/LauncherCore/src/main/java/pro/gravit/launcher/serialize/HOutput.java similarity index 95% rename from LauncherCore/src/main/java/ru/gravit/launcher/serialize/HOutput.java rename to LauncherCore/src/main/java/pro/gravit/launcher/serialize/HOutput.java index 3931db32..23669ce3 100644 --- a/LauncherCore/src/main/java/ru/gravit/launcher/serialize/HOutput.java +++ b/LauncherCore/src/main/java/pro/gravit/launcher/serialize/HOutput.java @@ -1,7 +1,7 @@ -package ru.gravit.launcher.serialize; +package pro.gravit.launcher.serialize; -import ru.gravit.launcher.LauncherAPI; -import ru.gravit.utils.helper.IOHelper; +import pro.gravit.launcher.LauncherAPI; +import pro.gravit.utils.helper.IOHelper; import java.io.Flushable; import java.io.IOException; diff --git a/LauncherCore/src/main/java/ru/gravit/launcher/serialize/SerializeLimits.java b/LauncherCore/src/main/java/pro/gravit/launcher/serialize/SerializeLimits.java similarity index 89% rename from LauncherCore/src/main/java/ru/gravit/launcher/serialize/SerializeLimits.java rename to LauncherCore/src/main/java/pro/gravit/launcher/serialize/SerializeLimits.java index 9ee9c2bc..eb9848e8 100644 --- a/LauncherCore/src/main/java/ru/gravit/launcher/serialize/SerializeLimits.java +++ b/LauncherCore/src/main/java/pro/gravit/launcher/serialize/SerializeLimits.java @@ -1,6 +1,6 @@ -package ru.gravit.launcher.serialize; +package pro.gravit.launcher.serialize; -import ru.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.LauncherAPI; public class SerializeLimits { @LauncherAPI diff --git a/LauncherCore/src/main/java/ru/gravit/launcher/serialize/signed/DigestBytesHolder.java b/LauncherCore/src/main/java/pro/gravit/launcher/serialize/signed/DigestBytesHolder.java similarity index 83% rename from LauncherCore/src/main/java/ru/gravit/launcher/serialize/signed/DigestBytesHolder.java rename to LauncherCore/src/main/java/pro/gravit/launcher/serialize/signed/DigestBytesHolder.java index e848db3b..9e589d6d 100644 --- a/LauncherCore/src/main/java/ru/gravit/launcher/serialize/signed/DigestBytesHolder.java +++ b/LauncherCore/src/main/java/pro/gravit/launcher/serialize/signed/DigestBytesHolder.java @@ -1,10 +1,10 @@ -package ru.gravit.launcher.serialize.signed; +package pro.gravit.launcher.serialize.signed; -import ru.gravit.launcher.LauncherAPI; -import ru.gravit.launcher.serialize.HInput; -import ru.gravit.launcher.serialize.HOutput; -import ru.gravit.launcher.serialize.stream.StreamObject; -import ru.gravit.utils.helper.SecurityHelper; +import pro.gravit.launcher.serialize.HInput; +import pro.gravit.launcher.serialize.stream.StreamObject; +import pro.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.serialize.HOutput; +import pro.gravit.utils.helper.SecurityHelper; import java.io.IOException; import java.security.SignatureException; diff --git a/LauncherCore/src/main/java/ru/gravit/launcher/serialize/signed/SignedBytesHolder.java b/LauncherCore/src/main/java/pro/gravit/launcher/serialize/signed/SignedBytesHolder.java similarity index 82% rename from LauncherCore/src/main/java/ru/gravit/launcher/serialize/signed/SignedBytesHolder.java rename to LauncherCore/src/main/java/pro/gravit/launcher/serialize/signed/SignedBytesHolder.java index 1eb4bd4d..a92c90d7 100644 --- a/LauncherCore/src/main/java/ru/gravit/launcher/serialize/signed/SignedBytesHolder.java +++ b/LauncherCore/src/main/java/pro/gravit/launcher/serialize/signed/SignedBytesHolder.java @@ -1,10 +1,10 @@ -package ru.gravit.launcher.serialize.signed; +package pro.gravit.launcher.serialize.signed; -import ru.gravit.launcher.LauncherAPI; -import ru.gravit.launcher.serialize.HInput; -import ru.gravit.launcher.serialize.HOutput; -import ru.gravit.launcher.serialize.stream.StreamObject; -import ru.gravit.utils.helper.SecurityHelper; +import pro.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.serialize.HInput; +import pro.gravit.launcher.serialize.HOutput; +import pro.gravit.launcher.serialize.stream.StreamObject; +import pro.gravit.utils.helper.SecurityHelper; import java.io.IOException; import java.security.SignatureException; diff --git a/LauncherCore/src/main/java/ru/gravit/launcher/serialize/signed/SignedObjectHolder.java b/LauncherCore/src/main/java/pro/gravit/launcher/serialize/signed/SignedObjectHolder.java similarity index 86% rename from LauncherCore/src/main/java/ru/gravit/launcher/serialize/signed/SignedObjectHolder.java rename to LauncherCore/src/main/java/pro/gravit/launcher/serialize/signed/SignedObjectHolder.java index b326634a..8fc5cc24 100644 --- a/LauncherCore/src/main/java/ru/gravit/launcher/serialize/signed/SignedObjectHolder.java +++ b/LauncherCore/src/main/java/pro/gravit/launcher/serialize/signed/SignedObjectHolder.java @@ -1,8 +1,8 @@ -package ru.gravit.launcher.serialize.signed; +package pro.gravit.launcher.serialize.signed; -import ru.gravit.launcher.LauncherAPI; -import ru.gravit.launcher.serialize.HInput; -import ru.gravit.launcher.serialize.stream.StreamObject; +import pro.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.serialize.HInput; +import pro.gravit.launcher.serialize.stream.StreamObject; import java.io.IOException; import java.security.SignatureException; diff --git a/LauncherCore/src/main/java/ru/gravit/launcher/serialize/stream/EnumSerializer.java b/LauncherCore/src/main/java/pro/gravit/launcher/serialize/stream/EnumSerializer.java similarity index 75% rename from LauncherCore/src/main/java/ru/gravit/launcher/serialize/stream/EnumSerializer.java rename to LauncherCore/src/main/java/pro/gravit/launcher/serialize/stream/EnumSerializer.java index 87e91f41..ac6c283f 100644 --- a/LauncherCore/src/main/java/ru/gravit/launcher/serialize/stream/EnumSerializer.java +++ b/LauncherCore/src/main/java/pro/gravit/launcher/serialize/stream/EnumSerializer.java @@ -1,10 +1,10 @@ -package ru.gravit.launcher.serialize.stream; +package pro.gravit.launcher.serialize.stream; -import ru.gravit.launcher.LauncherAPI; -import ru.gravit.launcher.serialize.HInput; -import ru.gravit.launcher.serialize.HOutput; -import ru.gravit.launcher.serialize.stream.EnumSerializer.Itf; -import ru.gravit.utils.helper.VerifyHelper; +import pro.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.serialize.HInput; +import pro.gravit.launcher.serialize.HOutput; +import pro.gravit.launcher.serialize.stream.EnumSerializer.Itf; +import pro.gravit.utils.helper.VerifyHelper; import java.io.IOException; import java.util.HashMap; diff --git a/LauncherCore/src/main/java/ru/gravit/launcher/serialize/stream/StreamObject.java b/LauncherCore/src/main/java/pro/gravit/launcher/serialize/stream/StreamObject.java similarity index 76% rename from LauncherCore/src/main/java/ru/gravit/launcher/serialize/stream/StreamObject.java rename to LauncherCore/src/main/java/pro/gravit/launcher/serialize/stream/StreamObject.java index ab8f6366..58bc70ff 100644 --- a/LauncherCore/src/main/java/ru/gravit/launcher/serialize/stream/StreamObject.java +++ b/LauncherCore/src/main/java/pro/gravit/launcher/serialize/stream/StreamObject.java @@ -1,9 +1,9 @@ -package ru.gravit.launcher.serialize.stream; +package pro.gravit.launcher.serialize.stream; -import ru.gravit.launcher.LauncherAPI; -import ru.gravit.launcher.serialize.HInput; -import ru.gravit.launcher.serialize.HOutput; -import ru.gravit.utils.helper.IOHelper; +import pro.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.serialize.HInput; +import pro.gravit.launcher.serialize.HOutput; +import pro.gravit.utils.helper.IOHelper; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/LauncherCore/src/main/java/ru/gravit/utils/BiHookSet.java b/LauncherCore/src/main/java/pro/gravit/utils/BiHookSet.java similarity index 96% rename from LauncherCore/src/main/java/ru/gravit/utils/BiHookSet.java rename to LauncherCore/src/main/java/pro/gravit/utils/BiHookSet.java index f204b10d..28104f32 100644 --- a/LauncherCore/src/main/java/ru/gravit/utils/BiHookSet.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/BiHookSet.java @@ -1,4 +1,4 @@ -package ru.gravit.utils; +package pro.gravit.utils; import java.util.HashSet; import java.util.Set; diff --git a/LauncherCore/src/main/java/ru/gravit/utils/HTTPRequest.java b/LauncherCore/src/main/java/pro/gravit/utils/HTTPRequest.java similarity index 96% rename from LauncherCore/src/main/java/ru/gravit/utils/HTTPRequest.java rename to LauncherCore/src/main/java/pro/gravit/utils/HTTPRequest.java index cb8fc713..0d7b1e33 100644 --- a/LauncherCore/src/main/java/ru/gravit/utils/HTTPRequest.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/HTTPRequest.java @@ -1,9 +1,9 @@ -package ru.gravit.utils; +package pro.gravit.utils; import com.google.gson.JsonElement; import com.google.gson.JsonParser; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.LogHelper; import java.io.IOException; import java.io.InputStreamReader; diff --git a/LauncherCore/src/main/java/ru/gravit/utils/HookException.java b/LauncherCore/src/main/java/pro/gravit/utils/HookException.java similarity index 95% rename from LauncherCore/src/main/java/ru/gravit/utils/HookException.java rename to LauncherCore/src/main/java/pro/gravit/utils/HookException.java index 3fa56a8b..b345b0dd 100644 --- a/LauncherCore/src/main/java/ru/gravit/utils/HookException.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/HookException.java @@ -1,4 +1,4 @@ -package ru.gravit.utils; +package pro.gravit.utils; public class HookException extends RuntimeException { private static final long serialVersionUID = -529141998961943161L; diff --git a/LauncherCore/src/main/java/ru/gravit/utils/HookSet.java b/LauncherCore/src/main/java/pro/gravit/utils/HookSet.java similarity index 95% rename from LauncherCore/src/main/java/ru/gravit/utils/HookSet.java rename to LauncherCore/src/main/java/pro/gravit/utils/HookSet.java index cd15470b..242584b0 100644 --- a/LauncherCore/src/main/java/ru/gravit/utils/HookSet.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/HookSet.java @@ -1,4 +1,4 @@ -package ru.gravit.utils; +package pro.gravit.utils; import java.util.HashSet; import java.util.Set; diff --git a/LauncherCore/src/main/java/ru/gravit/utils/HttpDownloader.java b/LauncherCore/src/main/java/pro/gravit/utils/HttpDownloader.java similarity index 95% rename from LauncherCore/src/main/java/ru/gravit/utils/HttpDownloader.java rename to LauncherCore/src/main/java/pro/gravit/utils/HttpDownloader.java index efb58d97..9bfa165e 100644 --- a/LauncherCore/src/main/java/ru/gravit/utils/HttpDownloader.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/HttpDownloader.java @@ -1,7 +1,7 @@ -package ru.gravit.utils; +package pro.gravit.utils; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.LogHelper; import java.io.BufferedInputStream; import java.io.FileOutputStream; diff --git a/LauncherCore/src/main/java/ru/gravit/utils/ProviderMap.java b/LauncherCore/src/main/java/pro/gravit/utils/ProviderMap.java similarity index 94% rename from LauncherCore/src/main/java/ru/gravit/utils/ProviderMap.java rename to LauncherCore/src/main/java/pro/gravit/utils/ProviderMap.java index 2b744cb6..e50d5bbe 100644 --- a/LauncherCore/src/main/java/ru/gravit/utils/ProviderMap.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/ProviderMap.java @@ -1,6 +1,6 @@ -package ru.gravit.utils; +package pro.gravit.utils; -import ru.gravit.utils.helper.VerifyHelper; +import pro.gravit.utils.helper.VerifyHelper; import java.util.Map; import java.util.Objects; diff --git a/LauncherCore/src/main/java/ru/gravit/utils/PublicURLClassLoader.java b/LauncherCore/src/main/java/pro/gravit/utils/PublicURLClassLoader.java similarity index 97% rename from LauncherCore/src/main/java/ru/gravit/utils/PublicURLClassLoader.java rename to LauncherCore/src/main/java/pro/gravit/utils/PublicURLClassLoader.java index f5866008..6ea17422 100644 --- a/LauncherCore/src/main/java/ru/gravit/utils/PublicURLClassLoader.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/PublicURLClassLoader.java @@ -1,6 +1,6 @@ -package ru.gravit.utils; +package pro.gravit.utils; -import ru.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.LauncherAPI; import java.net.URL; import java.net.URLClassLoader; diff --git a/LauncherCore/src/main/java/ru/gravit/utils/UniversalJsonAdapter.java b/LauncherCore/src/main/java/pro/gravit/utils/UniversalJsonAdapter.java similarity index 95% rename from LauncherCore/src/main/java/ru/gravit/utils/UniversalJsonAdapter.java rename to LauncherCore/src/main/java/pro/gravit/utils/UniversalJsonAdapter.java index c375d4d3..3c949304 100644 --- a/LauncherCore/src/main/java/ru/gravit/utils/UniversalJsonAdapter.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/UniversalJsonAdapter.java @@ -1,7 +1,7 @@ -package ru.gravit.utils; +package pro.gravit.utils; import com.google.gson.*; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.utils.helper.LogHelper; import java.lang.reflect.Type; diff --git a/LauncherCore/src/main/java/ru/gravit/utils/Version.java b/LauncherCore/src/main/java/pro/gravit/utils/Version.java similarity index 97% rename from LauncherCore/src/main/java/ru/gravit/utils/Version.java rename to LauncherCore/src/main/java/pro/gravit/utils/Version.java index e314edd1..1f27de0e 100644 --- a/LauncherCore/src/main/java/ru/gravit/utils/Version.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/Version.java @@ -1,6 +1,6 @@ -package ru.gravit.utils; +package pro.gravit.utils; -import ru.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.LauncherAPI; import java.util.*; diff --git a/LauncherCore/src/main/java/ru/gravit/utils/command/BaseCommandCategory.java b/LauncherCore/src/main/java/pro/gravit/utils/command/BaseCommandCategory.java similarity index 91% rename from LauncherCore/src/main/java/ru/gravit/utils/command/BaseCommandCategory.java rename to LauncherCore/src/main/java/pro/gravit/utils/command/BaseCommandCategory.java index 41d1d157..2d64cb5e 100644 --- a/LauncherCore/src/main/java/ru/gravit/utils/command/BaseCommandCategory.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/command/BaseCommandCategory.java @@ -1,6 +1,6 @@ -package ru.gravit.utils.command; +package pro.gravit.utils.command; -import ru.gravit.utils.helper.VerifyHelper; +import pro.gravit.utils.helper.VerifyHelper; import java.util.Map; import java.util.Objects; diff --git a/LauncherCore/src/main/java/ru/gravit/utils/command/Command.java b/LauncherCore/src/main/java/pro/gravit/utils/command/Command.java similarity index 92% rename from LauncherCore/src/main/java/ru/gravit/utils/command/Command.java rename to LauncherCore/src/main/java/pro/gravit/utils/command/Command.java index 7e594d50..d5ab95f7 100644 --- a/LauncherCore/src/main/java/ru/gravit/utils/command/Command.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/command/Command.java @@ -1,6 +1,6 @@ -package ru.gravit.utils.command; +package pro.gravit.utils.command; -import ru.gravit.utils.helper.VerifyHelper; +import pro.gravit.utils.helper.VerifyHelper; import java.util.UUID; diff --git a/LauncherCore/src/main/java/ru/gravit/utils/command/CommandCategory.java b/LauncherCore/src/main/java/pro/gravit/utils/command/CommandCategory.java similarity index 87% rename from LauncherCore/src/main/java/ru/gravit/utils/command/CommandCategory.java rename to LauncherCore/src/main/java/pro/gravit/utils/command/CommandCategory.java index 6f4754e1..6bb1c128 100644 --- a/LauncherCore/src/main/java/ru/gravit/utils/command/CommandCategory.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/command/CommandCategory.java @@ -1,4 +1,4 @@ -package ru.gravit.utils.command; +package pro.gravit.utils.command; import java.util.Map; diff --git a/LauncherCore/src/main/java/ru/gravit/utils/command/CommandException.java b/LauncherCore/src/main/java/pro/gravit/utils/command/CommandException.java similarity index 91% rename from LauncherCore/src/main/java/ru/gravit/utils/command/CommandException.java rename to LauncherCore/src/main/java/pro/gravit/utils/command/CommandException.java index ce2009b1..c0fe5122 100644 --- a/LauncherCore/src/main/java/ru/gravit/utils/command/CommandException.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/command/CommandException.java @@ -1,4 +1,4 @@ -package ru.gravit.utils.command; +package pro.gravit.utils.command; public final class CommandException extends Exception { private static final long serialVersionUID = -6588814993972117772L; diff --git a/LauncherCore/src/main/java/ru/gravit/utils/command/CommandHandler.java b/LauncherCore/src/main/java/pro/gravit/utils/command/CommandHandler.java similarity index 97% rename from LauncherCore/src/main/java/ru/gravit/utils/command/CommandHandler.java rename to LauncherCore/src/main/java/pro/gravit/utils/command/CommandHandler.java index c25bfe6b..e40cb923 100644 --- a/LauncherCore/src/main/java/ru/gravit/utils/command/CommandHandler.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/command/CommandHandler.java @@ -1,7 +1,7 @@ -package ru.gravit.utils.command; +package pro.gravit.utils.command; -import ru.gravit.utils.helper.CommonHelper; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.utils.helper.CommonHelper; +import pro.gravit.utils.helper.LogHelper; import java.io.IOException; import java.util.ArrayList; diff --git a/LauncherCore/src/main/java/ru/gravit/utils/command/JLineCommandHandler.java b/LauncherCore/src/main/java/pro/gravit/utils/command/JLineCommandHandler.java similarity index 98% rename from LauncherCore/src/main/java/ru/gravit/utils/command/JLineCommandHandler.java rename to LauncherCore/src/main/java/pro/gravit/utils/command/JLineCommandHandler.java index 0a3431cf..0b6bc25b 100644 --- a/LauncherCore/src/main/java/ru/gravit/utils/command/JLineCommandHandler.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/command/JLineCommandHandler.java @@ -1,4 +1,4 @@ -package ru.gravit.utils.command; +package pro.gravit.utils.command; import org.jline.reader.*; import org.jline.terminal.Terminal; diff --git a/LauncherCore/src/main/java/ru/gravit/utils/command/StdCommandHandler.java b/LauncherCore/src/main/java/pro/gravit/utils/command/StdCommandHandler.java similarity index 88% rename from LauncherCore/src/main/java/ru/gravit/utils/command/StdCommandHandler.java rename to LauncherCore/src/main/java/pro/gravit/utils/command/StdCommandHandler.java index 27cab6cd..62934e01 100644 --- a/LauncherCore/src/main/java/ru/gravit/utils/command/StdCommandHandler.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/command/StdCommandHandler.java @@ -1,6 +1,6 @@ -package ru.gravit.utils.command; +package pro.gravit.utils.command; -import ru.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.IOHelper; import java.io.BufferedReader; import java.io.IOException; diff --git a/LauncherCore/src/main/java/ru/gravit/utils/command/basic/ClearCommand.java b/LauncherCore/src/main/java/pro/gravit/utils/command/basic/ClearCommand.java similarity index 74% rename from LauncherCore/src/main/java/ru/gravit/utils/command/basic/ClearCommand.java rename to LauncherCore/src/main/java/pro/gravit/utils/command/basic/ClearCommand.java index 54443c99..840a5f7f 100644 --- a/LauncherCore/src/main/java/ru/gravit/utils/command/basic/ClearCommand.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/command/basic/ClearCommand.java @@ -1,8 +1,8 @@ -package ru.gravit.utils.command.basic; +package pro.gravit.utils.command.basic; -import ru.gravit.utils.command.Command; -import ru.gravit.utils.command.CommandHandler; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.utils.command.Command; +import pro.gravit.utils.command.CommandHandler; +import pro.gravit.utils.helper.LogHelper; public final class ClearCommand extends Command { private CommandHandler handler; diff --git a/LauncherCore/src/main/java/ru/gravit/utils/command/basic/DebugCommand.java b/LauncherCore/src/main/java/pro/gravit/utils/command/basic/DebugCommand.java similarity index 88% rename from LauncherCore/src/main/java/ru/gravit/utils/command/basic/DebugCommand.java rename to LauncherCore/src/main/java/pro/gravit/utils/command/basic/DebugCommand.java index 306c171d..b8080c52 100644 --- a/LauncherCore/src/main/java/ru/gravit/utils/command/basic/DebugCommand.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/command/basic/DebugCommand.java @@ -1,7 +1,7 @@ -package ru.gravit.utils.command.basic; +package pro.gravit.utils.command.basic; -import ru.gravit.utils.command.Command; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.utils.command.Command; +import pro.gravit.utils.helper.LogHelper; public class DebugCommand extends Command { @Override diff --git a/LauncherCore/src/main/java/ru/gravit/utils/command/basic/GCCommand.java b/LauncherCore/src/main/java/pro/gravit/utils/command/basic/GCCommand.java similarity index 76% rename from LauncherCore/src/main/java/ru/gravit/utils/command/basic/GCCommand.java rename to LauncherCore/src/main/java/pro/gravit/utils/command/basic/GCCommand.java index ed04861e..1faf7e55 100644 --- a/LauncherCore/src/main/java/ru/gravit/utils/command/basic/GCCommand.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/command/basic/GCCommand.java @@ -1,9 +1,9 @@ -package ru.gravit.utils.command.basic; +package pro.gravit.utils.command.basic; -import ru.gravit.launcher.managers.GarbageManager; -import ru.gravit.utils.command.Command; -import ru.gravit.utils.helper.JVMHelper; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launcher.managers.GarbageManager; +import pro.gravit.utils.command.Command; +import pro.gravit.utils.helper.JVMHelper; +import pro.gravit.utils.helper.LogHelper; public class GCCommand extends Command { @Override diff --git a/LauncherCore/src/main/java/ru/gravit/utils/command/basic/HelpCommand.java b/LauncherCore/src/main/java/pro/gravit/utils/command/basic/HelpCommand.java similarity index 91% rename from LauncherCore/src/main/java/ru/gravit/utils/command/basic/HelpCommand.java rename to LauncherCore/src/main/java/pro/gravit/utils/command/basic/HelpCommand.java index eb759e79..eee6e537 100644 --- a/LauncherCore/src/main/java/ru/gravit/utils/command/basic/HelpCommand.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/command/basic/HelpCommand.java @@ -1,11 +1,11 @@ -package ru.gravit.utils.command.basic; +package pro.gravit.utils.command.basic; import org.fusesource.jansi.Ansi; -import ru.gravit.utils.command.Command; -import ru.gravit.utils.command.CommandException; -import ru.gravit.utils.command.CommandHandler; -import ru.gravit.utils.helper.FormatHelper; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.utils.command.Command; +import pro.gravit.utils.command.CommandException; +import pro.gravit.utils.command.CommandHandler; +import pro.gravit.utils.helper.FormatHelper; +import pro.gravit.utils.helper.LogHelper; import java.util.Map.Entry; diff --git a/LauncherCore/src/main/java/ru/gravit/utils/event/EventHandler.java b/LauncherCore/src/main/java/pro/gravit/utils/event/EventHandler.java similarity index 81% rename from LauncherCore/src/main/java/ru/gravit/utils/event/EventHandler.java rename to LauncherCore/src/main/java/pro/gravit/utils/event/EventHandler.java index f7f02e54..eaef7e9e 100644 --- a/LauncherCore/src/main/java/ru/gravit/utils/event/EventHandler.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/event/EventHandler.java @@ -1,4 +1,4 @@ -package ru.gravit.utils.event; +package pro.gravit.utils.event; import java.util.UUID; diff --git a/LauncherCore/src/main/java/ru/gravit/utils/event/EventInterface.java b/LauncherCore/src/main/java/pro/gravit/utils/event/EventInterface.java similarity index 71% rename from LauncherCore/src/main/java/ru/gravit/utils/event/EventInterface.java rename to LauncherCore/src/main/java/pro/gravit/utils/event/EventInterface.java index 4bc39c73..35522ed9 100644 --- a/LauncherCore/src/main/java/ru/gravit/utils/event/EventInterface.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/event/EventInterface.java @@ -1,4 +1,4 @@ -package ru.gravit.utils.event; +package pro.gravit.utils.event; import java.util.UUID; diff --git a/LauncherCore/src/main/java/ru/gravit/utils/event/EventManager.java b/LauncherCore/src/main/java/pro/gravit/utils/event/EventManager.java similarity index 96% rename from LauncherCore/src/main/java/ru/gravit/utils/event/EventManager.java rename to LauncherCore/src/main/java/pro/gravit/utils/event/EventManager.java index d592fd65..c624dfb9 100644 --- a/LauncherCore/src/main/java/ru/gravit/utils/event/EventManager.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/event/EventManager.java @@ -1,7 +1,7 @@ -package ru.gravit.utils.event; +package pro.gravit.utils.event; -import ru.gravit.utils.helper.CommonHelper; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.utils.helper.CommonHelper; +import pro.gravit.utils.helper.LogHelper; import java.util.ArrayList; import java.util.Arrays; diff --git a/LauncherCore/src/main/java/ru/gravit/utils/helper/CommonHelper.java b/LauncherCore/src/main/java/pro/gravit/utils/helper/CommonHelper.java similarity index 97% rename from LauncherCore/src/main/java/ru/gravit/utils/helper/CommonHelper.java rename to LauncherCore/src/main/java/pro/gravit/utils/helper/CommonHelper.java index 11e00272..41f2b478 100644 --- a/LauncherCore/src/main/java/ru/gravit/utils/helper/CommonHelper.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/helper/CommonHelper.java @@ -1,7 +1,7 @@ -package ru.gravit.utils.helper; +package pro.gravit.utils.helper; -import ru.gravit.launcher.LauncherAPI; -import ru.gravit.utils.command.CommandException; +import pro.gravit.launcher.LauncherAPI; +import pro.gravit.utils.command.CommandException; import javax.script.ScriptEngine; import javax.script.ScriptEngineFactory; diff --git a/LauncherCore/src/main/java/ru/gravit/utils/helper/EnvHelper.java b/LauncherCore/src/main/java/pro/gravit/utils/helper/EnvHelper.java similarity index 97% rename from LauncherCore/src/main/java/ru/gravit/utils/helper/EnvHelper.java rename to LauncherCore/src/main/java/pro/gravit/utils/helper/EnvHelper.java index dfe0b35f..5dbdd172 100644 --- a/LauncherCore/src/main/java/ru/gravit/utils/helper/EnvHelper.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/helper/EnvHelper.java @@ -1,4 +1,4 @@ -package ru.gravit.utils.helper; +package pro.gravit.utils.helper; import java.util.Locale; import java.util.Map; diff --git a/LauncherCore/src/main/java/ru/gravit/utils/helper/FormatHelper.java b/LauncherCore/src/main/java/pro/gravit/utils/helper/FormatHelper.java similarity index 98% rename from LauncherCore/src/main/java/ru/gravit/utils/helper/FormatHelper.java rename to LauncherCore/src/main/java/pro/gravit/utils/helper/FormatHelper.java index b8d244cb..f4c46571 100644 --- a/LauncherCore/src/main/java/ru/gravit/utils/helper/FormatHelper.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/helper/FormatHelper.java @@ -1,7 +1,7 @@ -package ru.gravit.utils.helper; +package pro.gravit.utils.helper; import org.fusesource.jansi.Ansi; -import ru.gravit.utils.Version; +import pro.gravit.utils.Version; /* * Nashorn при инициализации LogHelper пытается инициализировтаь все доступные в нем методы. diff --git a/LauncherCore/src/main/java/ru/gravit/utils/helper/IOHelper.java b/LauncherCore/src/main/java/pro/gravit/utils/helper/IOHelper.java similarity index 99% rename from LauncherCore/src/main/java/ru/gravit/utils/helper/IOHelper.java rename to LauncherCore/src/main/java/pro/gravit/utils/helper/IOHelper.java index 0885aeb4..e5f596f0 100644 --- a/LauncherCore/src/main/java/ru/gravit/utils/helper/IOHelper.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/helper/IOHelper.java @@ -1,6 +1,6 @@ -package ru.gravit.utils.helper; +package pro.gravit.utils.helper; -import ru.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.LauncherAPI; import javax.imageio.ImageIO; import javax.imageio.ImageReader; diff --git a/LauncherCore/src/main/java/ru/gravit/utils/helper/JVMHelper.java b/LauncherCore/src/main/java/pro/gravit/utils/helper/JVMHelper.java similarity index 98% rename from LauncherCore/src/main/java/ru/gravit/utils/helper/JVMHelper.java rename to LauncherCore/src/main/java/pro/gravit/utils/helper/JVMHelper.java index f0351c92..4bfda28a 100644 --- a/LauncherCore/src/main/java/ru/gravit/utils/helper/JVMHelper.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/helper/JVMHelper.java @@ -1,6 +1,6 @@ -package ru.gravit.utils.helper; +package pro.gravit.utils.helper; -import ru.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.LauncherAPI; import java.io.File; import java.lang.invoke.MethodHandles; diff --git a/LauncherCore/src/main/java/ru/gravit/utils/helper/JarHelper.java b/LauncherCore/src/main/java/pro/gravit/utils/helper/JarHelper.java similarity index 98% rename from LauncherCore/src/main/java/ru/gravit/utils/helper/JarHelper.java rename to LauncherCore/src/main/java/pro/gravit/utils/helper/JarHelper.java index 032c86ca..f707f677 100644 --- a/LauncherCore/src/main/java/ru/gravit/utils/helper/JarHelper.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/helper/JarHelper.java @@ -1,4 +1,4 @@ -package ru.gravit.utils.helper; +package pro.gravit.utils.helper; import java.io.IOException; import java.nio.file.Path; diff --git a/LauncherCore/src/main/java/ru/gravit/utils/helper/LogHelper.java b/LauncherCore/src/main/java/pro/gravit/utils/helper/LogHelper.java similarity index 99% rename from LauncherCore/src/main/java/ru/gravit/utils/helper/LogHelper.java rename to LauncherCore/src/main/java/pro/gravit/utils/helper/LogHelper.java index a1739758..a61fa757 100644 --- a/LauncherCore/src/main/java/ru/gravit/utils/helper/LogHelper.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/helper/LogHelper.java @@ -1,10 +1,10 @@ -package ru.gravit.utils.helper; +package pro.gravit.utils.helper; import org.fusesource.jansi.Ansi; import org.fusesource.jansi.AnsiConsole; import org.fusesource.jansi.AnsiOutputStream; -import ru.gravit.launcher.LauncherAPI; -import ru.gravit.launcher.LauncherNetworkAPI; +import pro.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.LauncherNetworkAPI; import java.io.*; import java.nio.file.Path; diff --git a/LauncherCore/src/main/java/ru/gravit/utils/helper/SecurityHelper.java b/LauncherCore/src/main/java/pro/gravit/utils/helper/SecurityHelper.java similarity index 99% rename from LauncherCore/src/main/java/ru/gravit/utils/helper/SecurityHelper.java rename to LauncherCore/src/main/java/pro/gravit/utils/helper/SecurityHelper.java index 97da776f..c3326318 100644 --- a/LauncherCore/src/main/java/ru/gravit/utils/helper/SecurityHelper.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/helper/SecurityHelper.java @@ -1,6 +1,6 @@ -package ru.gravit.utils.helper; +package pro.gravit.utils.helper; -import ru.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.LauncherAPI; import javax.crypto.Cipher; import javax.crypto.KeyGenerator; diff --git a/LauncherCore/src/main/java/ru/gravit/utils/helper/UnpackHelper.java b/LauncherCore/src/main/java/pro/gravit/utils/helper/UnpackHelper.java similarity index 98% rename from LauncherCore/src/main/java/ru/gravit/utils/helper/UnpackHelper.java rename to LauncherCore/src/main/java/pro/gravit/utils/helper/UnpackHelper.java index 75709a15..410e55e8 100644 --- a/LauncherCore/src/main/java/ru/gravit/utils/helper/UnpackHelper.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/helper/UnpackHelper.java @@ -1,4 +1,4 @@ -package ru.gravit.utils.helper; +package pro.gravit.utils.helper; import java.io.IOException; import java.io.InputStream; diff --git a/LauncherCore/src/main/java/ru/gravit/utils/helper/VerifyHelper.java b/LauncherCore/src/main/java/pro/gravit/utils/helper/VerifyHelper.java similarity index 98% rename from LauncherCore/src/main/java/ru/gravit/utils/helper/VerifyHelper.java rename to LauncherCore/src/main/java/pro/gravit/utils/helper/VerifyHelper.java index 1d9566ed..4db1741b 100644 --- a/LauncherCore/src/main/java/ru/gravit/utils/helper/VerifyHelper.java +++ b/LauncherCore/src/main/java/pro/gravit/utils/helper/VerifyHelper.java @@ -1,6 +1,6 @@ -package ru.gravit.utils.helper; +package pro.gravit.utils.helper; -import ru.gravit.launcher.LauncherAPI; +import pro.gravit.launcher.LauncherAPI; import java.util.Map; import java.util.Objects; diff --git a/LauncherTest/src/main/java/ru/gravit/launcher/test/utils/EXENonWarningLauncherBinary.java b/LauncherTest/src/main/java/pro/gravit/launcher/test/utils/EXENonWarningLauncherBinary.java similarity index 70% rename from LauncherTest/src/main/java/ru/gravit/launcher/test/utils/EXENonWarningLauncherBinary.java rename to LauncherTest/src/main/java/pro/gravit/launcher/test/utils/EXENonWarningLauncherBinary.java index 3d8b409c..373bff84 100644 --- a/LauncherTest/src/main/java/ru/gravit/launcher/test/utils/EXENonWarningLauncherBinary.java +++ b/LauncherTest/src/main/java/pro/gravit/launcher/test/utils/EXENonWarningLauncherBinary.java @@ -1,8 +1,8 @@ -package ru.gravit.launcher.test.utils; +package pro.gravit.launcher.test.utils; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.launchserver.binary.LauncherBinary; -import ru.gravit.utils.helper.IOHelper; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.launchserver.binary.LauncherBinary; +import pro.gravit.utils.helper.IOHelper; import java.io.IOException; import java.nio.file.Files; diff --git a/LauncherTest/src/test/java/ru/gravit/launcher/StartTest.java b/LauncherTest/src/test/java/pro/gravit/launcher/StartTest.java similarity index 82% rename from LauncherTest/src/test/java/ru/gravit/launcher/StartTest.java rename to LauncherTest/src/test/java/pro/gravit/launcher/StartTest.java index 2cc2273a..99ebd9e5 100644 --- a/LauncherTest/src/test/java/ru/gravit/launcher/StartTest.java +++ b/LauncherTest/src/test/java/pro/gravit/launcher/StartTest.java @@ -1,11 +1,11 @@ -package ru.gravit.launcher; +package pro.gravit.launcher; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import ru.gravit.launcher.test.utils.EXENonWarningLauncherBinary; -import ru.gravit.launchserver.LaunchServer; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.launcher.test.utils.EXENonWarningLauncherBinary; +import pro.gravit.launchserver.LaunchServer; +import pro.gravit.utils.helper.LogHelper; import java.io.IOException; import java.nio.file.Path; diff --git a/ServerWrapper/build.gradle b/ServerWrapper/build.gradle index ecdddd82..62795a88 100644 --- a/ServerWrapper/build.gradle +++ b/ServerWrapper/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.github.johnrengelman.shadow' -String mainClassName = "ru.gravit.launcher.server.ServerWrapper" -String mainAgentName = "ru.gravit.launcher.server.ServerAgent" +String mainClassName = "pro.gravit.launcher.server.ServerWrapper" +String mainAgentName = "pro.gravit.launcher.server.ServerAgent" configurations { pack @@ -34,7 +34,7 @@ pack project(':LauncherAuthlib') shadowJar { classifier = null - relocate 'io.netty', 'ru.gravit.repackage.io.netty' + relocate 'io.netty', 'pro.gravit.repackage.io.netty' configurations = [project.configurations.pack] exclude 'module-info.class' } diff --git a/ServerWrapper/src/main/java/ru/gravit/launcher/server/ModulesManager.java b/ServerWrapper/src/main/java/pro/gravit/launcher/server/ModulesManager.java similarity index 73% rename from ServerWrapper/src/main/java/ru/gravit/launcher/server/ModulesManager.java rename to ServerWrapper/src/main/java/pro/gravit/launcher/server/ModulesManager.java index ee27ea51..f757f5a8 100644 --- a/ServerWrapper/src/main/java/ru/gravit/launcher/server/ModulesManager.java +++ b/ServerWrapper/src/main/java/pro/gravit/launcher/server/ModulesManager.java @@ -1,8 +1,8 @@ -package ru.gravit.launcher.server; +package pro.gravit.launcher.server; -import ru.gravit.launcher.managers.SimpleModuleManager; -import ru.gravit.launcher.managers.SimpleModulesConfigManager; -import ru.gravit.utils.PublicURLClassLoader; +import pro.gravit.launcher.managers.SimpleModuleManager; +import pro.gravit.launcher.managers.SimpleModulesConfigManager; +import pro.gravit.utils.PublicURLClassLoader; import java.net.URL; import java.nio.file.Paths; diff --git a/ServerWrapper/src/main/java/ru/gravit/launcher/server/ServerAgent.java b/ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerAgent.java similarity index 96% rename from ServerWrapper/src/main/java/ru/gravit/launcher/server/ServerAgent.java rename to ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerAgent.java index 73d81cec..6be3c3c4 100644 --- a/ServerWrapper/src/main/java/ru/gravit/launcher/server/ServerAgent.java +++ b/ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerAgent.java @@ -1,7 +1,7 @@ -package ru.gravit.launcher.server; +package pro.gravit.launcher.server; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.LogHelper; import java.io.IOException; import java.lang.instrument.Instrumentation; diff --git a/ServerWrapper/src/main/java/ru/gravit/launcher/server/ServerModuleContext.java b/ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerModuleContext.java similarity index 70% rename from ServerWrapper/src/main/java/ru/gravit/launcher/server/ServerModuleContext.java rename to ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerModuleContext.java index f1e47397..6817b4c4 100644 --- a/ServerWrapper/src/main/java/ru/gravit/launcher/server/ServerModuleContext.java +++ b/ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerModuleContext.java @@ -1,11 +1,11 @@ -package ru.gravit.launcher.server; +package pro.gravit.launcher.server; -import ru.gravit.launcher.Launcher; -import ru.gravit.launcher.managers.SimpleModulesConfigManager; -import ru.gravit.launcher.modules.ModuleContext; -import ru.gravit.launcher.modules.ModulesConfigManager; -import ru.gravit.launcher.modules.ModulesManager; -import ru.gravit.utils.PublicURLClassLoader; +import pro.gravit.launcher.managers.SimpleModulesConfigManager; +import pro.gravit.launcher.modules.ModuleContext; +import pro.gravit.launcher.modules.ModulesConfigManager; +import pro.gravit.launcher.modules.ModulesManager; +import pro.gravit.utils.PublicURLClassLoader; +import pro.gravit.launcher.Launcher; public class ServerModuleContext implements ModuleContext { public final PublicURLClassLoader classLoader; diff --git a/ServerWrapper/src/main/java/ru/gravit/launcher/server/ServerWrapper.java b/ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapper.java similarity index 92% rename from ServerWrapper/src/main/java/ru/gravit/launcher/server/ServerWrapper.java rename to ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapper.java index 9665347b..b78e5dc1 100644 --- a/ServerWrapper/src/main/java/ru/gravit/launcher/server/ServerWrapper.java +++ b/ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapper.java @@ -1,21 +1,21 @@ -package ru.gravit.launcher.server; +package pro.gravit.launcher.server; -import ru.gravit.launcher.ClientPermissions; -import ru.gravit.launcher.Launcher; -import ru.gravit.launcher.LauncherConfig; -import ru.gravit.launcher.config.JsonConfigurable; -import ru.gravit.launcher.events.request.ProfilesRequestEvent; -import ru.gravit.launcher.profiles.ClientProfile; -import ru.gravit.launcher.request.Request; -import ru.gravit.launcher.request.RequestException; -import ru.gravit.launcher.request.auth.AuthRequest; -import ru.gravit.launcher.request.update.ProfilesRequest; -import ru.gravit.launcher.server.setup.ServerWrapperSetup; -import ru.gravit.utils.PublicURLClassLoader; -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 pro.gravit.launcher.profiles.ClientProfile; +import pro.gravit.launcher.server.setup.ServerWrapperSetup; +import pro.gravit.utils.PublicURLClassLoader; +import pro.gravit.utils.helper.SecurityHelper; +import pro.gravit.launcher.ClientPermissions; +import pro.gravit.launcher.Launcher; +import pro.gravit.launcher.LauncherConfig; +import pro.gravit.launcher.config.JsonConfigurable; +import pro.gravit.launcher.events.request.ProfilesRequestEvent; +import pro.gravit.launcher.request.Request; +import pro.gravit.launcher.request.RequestException; +import pro.gravit.launcher.request.auth.AuthRequest; +import pro.gravit.launcher.request.update.ProfilesRequest; +import pro.gravit.utils.helper.CommonHelper; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.LogHelper; import java.io.IOException; import java.lang.invoke.MethodHandle; diff --git a/ServerWrapper/src/main/java/ru/gravit/launcher/server/ServerWrapperGsonManager.java b/ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapperGsonManager.java similarity index 71% rename from ServerWrapper/src/main/java/ru/gravit/launcher/server/ServerWrapperGsonManager.java rename to ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapperGsonManager.java index 98813aac..352af61a 100644 --- a/ServerWrapper/src/main/java/ru/gravit/launcher/server/ServerWrapperGsonManager.java +++ b/ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapperGsonManager.java @@ -1,7 +1,7 @@ -package ru.gravit.launcher.server; +package pro.gravit.launcher.server; import com.google.gson.GsonBuilder; -import ru.gravit.launcher.managers.GsonManager; +import pro.gravit.launcher.managers.GsonManager; public class ServerWrapperGsonManager extends GsonManager { @Override diff --git a/ServerWrapper/src/main/java/ru/gravit/launcher/server/setup/ServerWrapperCommands.java b/ServerWrapper/src/main/java/pro/gravit/launcher/server/setup/ServerWrapperCommands.java similarity index 79% rename from ServerWrapper/src/main/java/ru/gravit/launcher/server/setup/ServerWrapperCommands.java rename to ServerWrapper/src/main/java/pro/gravit/launcher/server/setup/ServerWrapperCommands.java index 015b22b0..5d3477e2 100644 --- a/ServerWrapper/src/main/java/ru/gravit/launcher/server/setup/ServerWrapperCommands.java +++ b/ServerWrapper/src/main/java/pro/gravit/launcher/server/setup/ServerWrapperCommands.java @@ -1,9 +1,9 @@ -package ru.gravit.launcher.server.setup; +package pro.gravit.launcher.server.setup; -import ru.gravit.utils.command.CommandHandler; -import ru.gravit.utils.command.JLineCommandHandler; -import ru.gravit.utils.command.StdCommandHandler; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.utils.command.CommandHandler; +import pro.gravit.utils.command.JLineCommandHandler; +import pro.gravit.utils.command.StdCommandHandler; +import pro.gravit.utils.helper.LogHelper; import java.io.IOException; diff --git a/ServerWrapper/src/main/java/ru/gravit/launcher/server/setup/ServerWrapperSetup.java b/ServerWrapper/src/main/java/pro/gravit/launcher/server/setup/ServerWrapperSetup.java similarity index 94% rename from ServerWrapper/src/main/java/ru/gravit/launcher/server/setup/ServerWrapperSetup.java rename to ServerWrapper/src/main/java/pro/gravit/launcher/server/setup/ServerWrapperSetup.java index 1f3d4713..1e9b242a 100644 --- a/ServerWrapper/src/main/java/ru/gravit/launcher/server/setup/ServerWrapperSetup.java +++ b/ServerWrapper/src/main/java/pro/gravit/launcher/server/setup/ServerWrapperSetup.java @@ -1,10 +1,10 @@ -package ru.gravit.launcher.server.setup; +package pro.gravit.launcher.server.setup; -import ru.gravit.launcher.server.ServerWrapper; -import ru.gravit.utils.PublicURLClassLoader; -import ru.gravit.utils.helper.IOHelper; -import ru.gravit.utils.helper.JVMHelper; -import ru.gravit.utils.helper.LogHelper; +import pro.gravit.utils.PublicURLClassLoader; +import pro.gravit.launcher.server.ServerWrapper; +import pro.gravit.utils.helper.IOHelper; +import pro.gravit.utils.helper.JVMHelper; +import pro.gravit.utils.helper.LogHelper; import java.io.IOException; import java.io.Writer; diff --git a/ServerWrapper/src/main/resources/ru/gravit/launcher/server/ServerWrapper.cfg b/ServerWrapper/src/main/resources/pro/gravit/launcher/server/ServerWrapper.cfg similarity index 100% rename from ServerWrapper/src/main/resources/ru/gravit/launcher/server/ServerWrapper.cfg rename to ServerWrapper/src/main/resources/pro/gravit/launcher/server/ServerWrapper.cfg diff --git a/build.gradle b/build.gradle index a14b4905..9180f813 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ apply plugin: 'eclipse' apply plugin: 'java' - group = 'ru.gravit' + group = 'pro.gravit' repositories { mavenCentral() diff --git a/compat/LaunchWrapper.patch b/compat/LaunchWrapper.patch index 6e533e9b..81059396 100644 --- a/compat/LaunchWrapper.patch +++ b/compat/LaunchWrapper.patch @@ -7,7 +7,7 @@ index f4e83af..d3a6d7f 100644 addClassLoaderExclusion("net.minecraft.launchwrapper."); + // classloader launcher exclusions -+ addClassLoaderExclusion("ru.gravit.launcher."); ++ addClassLoaderExclusion("pro.gravit.launcher."); + addClassLoaderExclusion("com.mojang."); + addClassLoaderExclusion("com.google.gson."); + addClassLoaderExclusion("org.json."); diff --git a/modules b/modules index 5c3aa4d1..5ca06c28 160000 --- a/modules +++ b/modules @@ -1 +1 @@ -Subproject commit 5c3aa4d10e6973799315c5befed2ecb7cd98b203 +Subproject commit 5ca06c2847a2bd0712e84877d1dba3f77c95cffd