mirror of
https://github.com/GravitLauncher/Launcher
synced 2024-11-15 11:39:11 +03:00
Merge branch 'feature/renameall' into dev
This commit is contained in:
Gravit
commit
03ef5265dd
367 changed files with 1710 additions and 1700 deletions
|
|
@ -1,5 +1,5 @@
|
||||||
def mainClassName = "ru.gravit.launchserver.LaunchServer"
|
def mainClassName = "pro.gravit.launchserver.LaunchServer"
|
||||||
def mainAgentName = "ru.gravit.launchserver.StarterAgent"
|
def mainAgentName = "pro.gravit.launchserver.StarterAgent"
|
||||||
|
|
||||||
evaluationDependsOn(':Launcher')
|
evaluationDependsOn(':Launcher')
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,45 +1,47 @@
|
||||||
package ru.gravit.launchserver;
|
package pro.gravit.launchserver;
|
||||||
|
|
||||||
import io.netty.handler.logging.LogLevel;
|
import io.netty.handler.logging.LogLevel;
|
||||||
import ru.gravit.launcher.Launcher;
|
import pro.gravit.launchserver.auth.AuthProviderPair;
|
||||||
import ru.gravit.launcher.LauncherConfig;
|
import pro.gravit.launchserver.auth.handler.AuthHandler;
|
||||||
import ru.gravit.launcher.NeedGarbageCollection;
|
import pro.gravit.launchserver.auth.handler.MemoryAuthHandler;
|
||||||
import ru.gravit.launcher.config.JsonConfigurable;
|
import pro.gravit.launchserver.auth.hwid.AcceptHWIDHandler;
|
||||||
import ru.gravit.launcher.hasher.HashedDir;
|
import pro.gravit.launchserver.auth.hwid.HWIDHandler;
|
||||||
import ru.gravit.launcher.managers.ConfigManager;
|
import pro.gravit.launchserver.auth.permissions.DefaultPermissionsHandler;
|
||||||
import ru.gravit.launcher.managers.GarbageManager;
|
import pro.gravit.launchserver.auth.permissions.JsonFilePermissionsHandler;
|
||||||
import ru.gravit.launcher.profiles.ClientProfile;
|
import pro.gravit.launchserver.auth.permissions.PermissionsHandler;
|
||||||
import ru.gravit.launcher.serialize.signed.SignedObjectHolder;
|
import pro.gravit.launchserver.auth.protect.NoProtectHandler;
|
||||||
import ru.gravit.launchserver.auth.AuthProviderPair;
|
import pro.gravit.launchserver.auth.protect.ProtectHandler;
|
||||||
import ru.gravit.launchserver.auth.handler.AuthHandler;
|
import pro.gravit.launchserver.auth.provider.AuthProvider;
|
||||||
import ru.gravit.launchserver.auth.handler.MemoryAuthHandler;
|
import pro.gravit.launchserver.auth.provider.RejectAuthProvider;
|
||||||
import ru.gravit.launchserver.auth.hwid.AcceptHWIDHandler;
|
import pro.gravit.launchserver.auth.texture.RequestTextureProvider;
|
||||||
import ru.gravit.launchserver.auth.hwid.HWIDHandler;
|
import pro.gravit.launchserver.auth.texture.TextureProvider;
|
||||||
import ru.gravit.launchserver.auth.permissions.DefaultPermissionsHandler;
|
import pro.gravit.launchserver.binary.*;
|
||||||
import ru.gravit.launchserver.auth.permissions.JsonFilePermissionsHandler;
|
import pro.gravit.launchserver.components.AuthLimiterComponent;
|
||||||
import ru.gravit.launchserver.auth.permissions.PermissionsHandler;
|
import pro.gravit.launchserver.components.Component;
|
||||||
import ru.gravit.launchserver.auth.protect.NoProtectHandler;
|
import pro.gravit.launchserver.config.LaunchServerRuntimeConfig;
|
||||||
import ru.gravit.launchserver.auth.protect.ProtectHandler;
|
import pro.gravit.launchserver.legacy.Response;
|
||||||
import ru.gravit.launchserver.auth.provider.AuthProvider;
|
import pro.gravit.launchserver.manangers.*;
|
||||||
import ru.gravit.launchserver.auth.provider.RejectAuthProvider;
|
import pro.gravit.launchserver.manangers.hook.AuthHookManager;
|
||||||
import ru.gravit.launchserver.auth.texture.RequestTextureProvider;
|
import pro.gravit.launchserver.manangers.hook.BuildHookManager;
|
||||||
import ru.gravit.launchserver.auth.texture.TextureProvider;
|
import pro.gravit.launchserver.manangers.hook.SocketHookManager;
|
||||||
import ru.gravit.launchserver.binary.*;
|
import pro.gravit.launchserver.socket.ServerSocketHandler;
|
||||||
import ru.gravit.launchserver.components.AuthLimiterComponent;
|
import pro.gravit.launchserver.websocket.NettyServerSocketHandler;
|
||||||
import ru.gravit.launchserver.components.Component;
|
import pro.gravit.launcher.Launcher;
|
||||||
import ru.gravit.launchserver.config.LaunchServerRuntimeConfig;
|
import pro.gravit.launcher.LauncherConfig;
|
||||||
import ru.gravit.launchserver.legacy.Response;
|
import pro.gravit.launcher.NeedGarbageCollection;
|
||||||
import ru.gravit.launchserver.manangers.*;
|
import pro.gravit.launcher.config.JsonConfigurable;
|
||||||
import ru.gravit.launchserver.manangers.hook.AuthHookManager;
|
import pro.gravit.launcher.hasher.HashedDir;
|
||||||
import ru.gravit.launchserver.manangers.hook.BuildHookManager;
|
import pro.gravit.launcher.managers.ConfigManager;
|
||||||
import ru.gravit.launchserver.manangers.hook.SocketHookManager;
|
import pro.gravit.launcher.managers.GarbageManager;
|
||||||
import ru.gravit.launchserver.socket.ServerSocketHandler;
|
import pro.gravit.launcher.profiles.ClientProfile;
|
||||||
import ru.gravit.launchserver.websocket.NettyServerSocketHandler;
|
import pro.gravit.launcher.serialize.signed.SignedObjectHolder;
|
||||||
import ru.gravit.utils.Version;
|
import pro.gravit.utils.helper.*;
|
||||||
import ru.gravit.utils.command.CommandHandler;
|
import pro.gravit.launchserver.binary.*;
|
||||||
import ru.gravit.utils.command.JLineCommandHandler;
|
import pro.gravit.launchserver.manangers.*;
|
||||||
import ru.gravit.utils.command.StdCommandHandler;
|
import pro.gravit.utils.Version;
|
||||||
import ru.gravit.utils.helper.*;
|
import pro.gravit.utils.command.CommandHandler;
|
||||||
|
import pro.gravit.utils.command.JLineCommandHandler;
|
||||||
|
import pro.gravit.utils.command.StdCommandHandler;
|
||||||
|
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.lang.ProcessBuilder.Redirect;
|
import java.lang.ProcessBuilder.Redirect;
|
||||||
|
|
@ -494,7 +496,7 @@ public LaunchServer(Path dir, boolean testEnv, String[] args) throws IOException
|
||||||
localCommandHandler = new StdCommandHandler(true);
|
localCommandHandler = new StdCommandHandler(true);
|
||||||
LogHelper.warning("JLine2 isn't in classpath, using std");
|
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;
|
commandHandler = localCommandHandler;
|
||||||
|
|
||||||
// Set key pair
|
// Set key pair
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package ru.gravit.launchserver;
|
package pro.gravit.launchserver;
|
||||||
|
|
||||||
public interface Reconfigurable {
|
public interface Reconfigurable {
|
||||||
void reconfig(String action, String[] args);
|
void reconfig(String action, String[] args);
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package ru.gravit.launchserver;
|
package pro.gravit.launchserver;
|
||||||
|
|
||||||
@FunctionalInterface
|
@FunctionalInterface
|
||||||
public interface Reloadable {
|
public interface Reloadable {
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package ru.gravit.launchserver;
|
package pro.gravit.launchserver;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.lang.instrument.Instrumentation;
|
import java.lang.instrument.Instrumentation;
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
package ru.gravit.launchserver.asm;
|
package pro.gravit.launchserver.asm;
|
||||||
|
|
||||||
import org.objectweb.asm.ClassReader;
|
import org.objectweb.asm.ClassReader;
|
||||||
import org.objectweb.asm.ClassVisitor;
|
import org.objectweb.asm.ClassVisitor;
|
||||||
import org.objectweb.asm.Opcodes;
|
import org.objectweb.asm.Opcodes;
|
||||||
import ru.gravit.utils.helper.IOHelper;
|
import pro.gravit.utils.helper.IOHelper;
|
||||||
|
|
||||||
import java.io.Closeable;
|
import java.io.Closeable;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package ru.gravit.launchserver.asm;
|
package pro.gravit.launchserver.asm;
|
||||||
|
|
||||||
import org.objectweb.asm.ClassReader;
|
import org.objectweb.asm.ClassReader;
|
||||||
import org.objectweb.asm.ClassWriter;
|
import org.objectweb.asm.ClassWriter;
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package ru.gravit.launchserver.auth;
|
package pro.gravit.launchserver.auth;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
package ru.gravit.launchserver.auth;
|
package pro.gravit.launchserver.auth;
|
||||||
|
|
||||||
import ru.gravit.launchserver.auth.handler.AuthHandler;
|
import pro.gravit.launchserver.auth.handler.AuthHandler;
|
||||||
import ru.gravit.launchserver.auth.provider.AuthProvider;
|
import pro.gravit.launchserver.auth.provider.AuthProvider;
|
||||||
import ru.gravit.launchserver.auth.texture.TextureProvider;
|
import pro.gravit.launchserver.auth.texture.TextureProvider;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
package ru.gravit.launchserver.auth;
|
package pro.gravit.launchserver.auth;
|
||||||
|
|
||||||
import com.mysql.cj.jdbc.MysqlDataSource;
|
import com.mysql.cj.jdbc.MysqlDataSource;
|
||||||
import com.zaxxer.hikari.HikariConfig;
|
import com.zaxxer.hikari.HikariConfig;
|
||||||
import com.zaxxer.hikari.HikariDataSource;
|
import com.zaxxer.hikari.HikariDataSource;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
import ru.gravit.utils.helper.VerifyHelper;
|
import pro.gravit.utils.helper.VerifyHelper;
|
||||||
|
|
||||||
import javax.sql.DataSource;
|
import javax.sql.DataSource;
|
||||||
import java.sql.Connection;
|
import java.sql.Connection;
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
package ru.gravit.launchserver.auth.handler;
|
package pro.gravit.launchserver.auth.handler;
|
||||||
|
|
||||||
import ru.gravit.launchserver.auth.AuthException;
|
import pro.gravit.launchserver.auth.provider.AuthProviderResult;
|
||||||
import ru.gravit.launchserver.auth.provider.AuthProviderResult;
|
import pro.gravit.launchserver.auth.AuthException;
|
||||||
import ru.gravit.utils.ProviderMap;
|
import pro.gravit.utils.ProviderMap;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
package ru.gravit.launchserver.auth.handler;
|
package pro.gravit.launchserver.auth.handler;
|
||||||
|
|
||||||
import ru.gravit.launcher.NeedGarbageCollection;
|
import pro.gravit.launchserver.auth.provider.AuthProviderResult;
|
||||||
import ru.gravit.launchserver.auth.provider.AuthProviderResult;
|
import pro.gravit.launcher.NeedGarbageCollection;
|
||||||
import ru.gravit.utils.helper.CommonHelper;
|
import pro.gravit.utils.helper.CommonHelper;
|
||||||
import ru.gravit.utils.helper.SecurityHelper;
|
import pro.gravit.utils.helper.SecurityHelper;
|
||||||
import ru.gravit.utils.helper.VerifyHelper;
|
import pro.gravit.utils.helper.VerifyHelper;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
package ru.gravit.launchserver.auth.handler;
|
package pro.gravit.launchserver.auth.handler;
|
||||||
|
|
||||||
import ru.gravit.launcher.Launcher;
|
import pro.gravit.launcher.Launcher;
|
||||||
import ru.gravit.utils.HTTPRequest;
|
import pro.gravit.utils.HTTPRequest;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
package ru.gravit.launchserver.auth.handler;
|
package pro.gravit.launchserver.auth.handler;
|
||||||
|
|
||||||
import ru.gravit.utils.helper.IOHelper;
|
import pro.gravit.utils.helper.IOHelper;
|
||||||
import ru.gravit.utils.helper.VerifyHelper;
|
import pro.gravit.utils.helper.VerifyHelper;
|
||||||
|
|
||||||
import java.nio.ByteBuffer;
|
import java.nio.ByteBuffer;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
package ru.gravit.launchserver.auth.handler;
|
package pro.gravit.launchserver.auth.handler;
|
||||||
|
|
||||||
import ru.gravit.launchserver.auth.MySQLSourceConfig;
|
import pro.gravit.launchserver.auth.MySQLSourceConfig;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.sql.Connection;
|
import java.sql.Connection;
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
package ru.gravit.launchserver.auth.handler;
|
package pro.gravit.launchserver.auth.handler;
|
||||||
|
|
||||||
import ru.gravit.launchserver.auth.provider.AuthProviderResult;
|
import pro.gravit.launchserver.auth.provider.AuthProviderResult;
|
||||||
import ru.gravit.utils.helper.VerifyHelper;
|
import pro.gravit.utils.helper.VerifyHelper;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
package ru.gravit.launchserver.auth.handler;
|
package pro.gravit.launchserver.auth.handler;
|
||||||
|
|
||||||
import ru.gravit.utils.helper.CommonHelper;
|
import pro.gravit.utils.helper.CommonHelper;
|
||||||
import ru.gravit.utils.helper.IOHelper;
|
import pro.gravit.utils.helper.IOHelper;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
|
|
@ -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.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package ru.gravit.launchserver.auth.hwid;
|
package pro.gravit.launchserver.auth.hwid;
|
||||||
|
|
||||||
public class HWIDException extends Exception {
|
public class HWIDException extends Exception {
|
||||||
/**
|
/**
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
package ru.gravit.launchserver.auth.hwid;
|
package pro.gravit.launchserver.auth.hwid;
|
||||||
|
|
||||||
import ru.gravit.launcher.HWID;
|
import pro.gravit.launcher.HWID;
|
||||||
import ru.gravit.utils.ProviderMap;
|
import pro.gravit.utils.ProviderMap;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
package ru.gravit.launchserver.auth.hwid;
|
package pro.gravit.launchserver.auth.hwid;
|
||||||
|
|
||||||
import com.google.gson.reflect.TypeToken;
|
import com.google.gson.reflect.TypeToken;
|
||||||
import ru.gravit.launcher.HWID;
|
import pro.gravit.launcher.HWID;
|
||||||
import ru.gravit.launcher.Launcher;
|
import pro.gravit.launcher.Launcher;
|
||||||
import ru.gravit.utils.helper.IOHelper;
|
import pro.gravit.utils.helper.IOHelper;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.Reader;
|
import java.io.Reader;
|
||||||
|
|
@ -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.Gson;
|
||||||
import com.google.gson.JsonElement;
|
import com.google.gson.JsonElement;
|
||||||
import ru.gravit.launcher.HWID;
|
import pro.gravit.launcher.HWID;
|
||||||
import ru.gravit.launcher.OshiHWID;
|
import pro.gravit.launcher.OshiHWID;
|
||||||
import ru.gravit.utils.HTTPRequest;
|
import pro.gravit.utils.HTTPRequest;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
|
|
@ -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.LinkedList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
package ru.gravit.launchserver.auth.hwid;
|
package pro.gravit.launchserver.auth.hwid;
|
||||||
|
|
||||||
import ru.gravit.launcher.HWID;
|
import pro.gravit.launcher.HWID;
|
||||||
import ru.gravit.launcher.OshiHWID;
|
import pro.gravit.launcher.OshiHWID;
|
||||||
import ru.gravit.launchserver.auth.MySQLSourceConfig;
|
import pro.gravit.launchserver.auth.MySQLSourceConfig;
|
||||||
import ru.gravit.utils.helper.CommonHelper;
|
import pro.gravit.utils.helper.CommonHelper;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
|
|
||||||
import java.sql.Connection;
|
import java.sql.Connection;
|
||||||
import java.sql.PreparedStatement;
|
import java.sql.PreparedStatement;
|
||||||
|
|
@ -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 class ConfigPermissionsHandler extends PermissionsHandler {
|
||||||
public boolean isAdmin = false;
|
public boolean isAdmin = false;
|
||||||
|
|
@ -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 {
|
public class DefaultPermissionsHandler extends PermissionsHandler {
|
||||||
@Override
|
@Override
|
||||||
|
|
@ -1,11 +1,11 @@
|
||||||
package ru.gravit.launchserver.auth.permissions;
|
package pro.gravit.launchserver.auth.permissions;
|
||||||
|
|
||||||
import com.google.gson.reflect.TypeToken;
|
import com.google.gson.reflect.TypeToken;
|
||||||
import ru.gravit.launcher.ClientPermissions;
|
import pro.gravit.launcher.ClientPermissions;
|
||||||
import ru.gravit.launcher.Launcher;
|
import pro.gravit.launcher.Launcher;
|
||||||
import ru.gravit.launchserver.Reloadable;
|
import pro.gravit.launchserver.Reloadable;
|
||||||
import ru.gravit.utils.helper.IOHelper;
|
import pro.gravit.utils.helper.IOHelper;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.Reader;
|
import java.io.Reader;
|
||||||
|
|
@ -1,11 +1,11 @@
|
||||||
package ru.gravit.launchserver.auth.permissions;
|
package pro.gravit.launchserver.auth.permissions;
|
||||||
|
|
||||||
import com.google.gson.reflect.TypeToken;
|
import com.google.gson.reflect.TypeToken;
|
||||||
import ru.gravit.launcher.ClientPermissions;
|
import pro.gravit.launcher.ClientPermissions;
|
||||||
import ru.gravit.launcher.Launcher;
|
import pro.gravit.launcher.Launcher;
|
||||||
import ru.gravit.launchserver.Reloadable;
|
import pro.gravit.launchserver.Reloadable;
|
||||||
import ru.gravit.utils.helper.IOHelper;
|
import pro.gravit.utils.helper.IOHelper;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.Reader;
|
import java.io.Reader;
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
package ru.gravit.launchserver.auth.permissions;
|
package pro.gravit.launchserver.auth.permissions;
|
||||||
|
|
||||||
import ru.gravit.launcher.ClientPermissions;
|
import pro.gravit.launcher.ClientPermissions;
|
||||||
import ru.gravit.utils.ProviderMap;
|
import pro.gravit.utils.ProviderMap;
|
||||||
|
|
||||||
public abstract class PermissionsHandler implements AutoCloseable {
|
public abstract class PermissionsHandler implements AutoCloseable {
|
||||||
public static ProviderMap<PermissionsHandler> providers = new ProviderMap<>("PermissionsHandler");
|
public static ProviderMap<PermissionsHandler> providers = new ProviderMap<>("PermissionsHandler");
|
||||||
|
|
@ -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 pro.gravit.launchserver.websocket.json.auth.AuthResponse;
|
||||||
import ru.gravit.utils.helper.SecurityHelper;
|
import pro.gravit.utils.helper.SecurityHelper;
|
||||||
|
|
||||||
public class NoProtectHandler extends ProtectHandler {
|
public class NoProtectHandler extends ProtectHandler {
|
||||||
@Override
|
@Override
|
||||||
|
|
@ -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 pro.gravit.launchserver.websocket.json.auth.AuthResponse;
|
||||||
import ru.gravit.utils.ProviderMap;
|
import pro.gravit.utils.ProviderMap;
|
||||||
|
|
||||||
public abstract class ProtectHandler {
|
public abstract class ProtectHandler {
|
||||||
public static ProviderMap<ProtectHandler> providers = new ProviderMap<>("ProtectHandler");
|
public static ProviderMap<ProtectHandler> providers = new ProviderMap<>("ProtectHandler");
|
||||||
|
|
@ -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 {
|
public final class AcceptAuthProvider extends AuthProvider {
|
||||||
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
package ru.gravit.launchserver.auth.provider;
|
package pro.gravit.launchserver.auth.provider;
|
||||||
|
|
||||||
import ru.gravit.launchserver.auth.AuthException;
|
import pro.gravit.launchserver.auth.AuthException;
|
||||||
import ru.gravit.utils.ProviderMap;
|
import pro.gravit.utils.ProviderMap;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
package ru.gravit.launchserver.auth.provider;
|
package pro.gravit.launchserver.auth.provider;
|
||||||
|
|
||||||
import ru.gravit.launcher.ClientPermissions;
|
import pro.gravit.launcher.ClientPermissions;
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
|
|
||||||
|
|
||||||
public class AuthProviderResult {
|
public class AuthProviderResult {
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
package ru.gravit.launchserver.auth.provider;
|
package pro.gravit.launchserver.auth.provider;
|
||||||
|
|
||||||
import ru.gravit.launchserver.auth.AuthException;
|
import pro.gravit.launchserver.auth.AuthException;
|
||||||
import ru.gravit.utils.helper.SecurityHelper;
|
import pro.gravit.utils.helper.SecurityHelper;
|
||||||
import ru.gravit.utils.helper.SecurityHelper.DigestAlgorithm;
|
import pro.gravit.utils.helper.SecurityHelper.DigestAlgorithm;
|
||||||
|
|
||||||
public abstract class DigestAuthProvider extends AuthProvider {
|
public abstract class DigestAuthProvider extends AuthProvider {
|
||||||
private DigestAlgorithm digest;
|
private DigestAlgorithm digest;
|
||||||
|
|
@ -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.Gson;
|
||||||
import com.google.gson.JsonElement;
|
import com.google.gson.JsonElement;
|
||||||
import ru.gravit.launcher.ClientPermissions;
|
import pro.gravit.launcher.ClientPermissions;
|
||||||
import ru.gravit.utils.HTTPRequest;
|
import pro.gravit.utils.HTTPRequest;
|
||||||
import ru.gravit.utils.helper.SecurityHelper;
|
import pro.gravit.utils.helper.SecurityHelper;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
package ru.gravit.launchserver.auth.provider;
|
package pro.gravit.launchserver.auth.provider;
|
||||||
|
|
||||||
import ru.gravit.launcher.ClientPermissions;
|
import pro.gravit.launcher.ClientPermissions;
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.auth.AuthException;
|
import pro.gravit.launchserver.auth.AuthException;
|
||||||
import ru.gravit.launchserver.auth.MySQLSourceConfig;
|
import pro.gravit.launchserver.auth.MySQLSourceConfig;
|
||||||
import ru.gravit.utils.helper.CommonHelper;
|
import pro.gravit.utils.helper.CommonHelper;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
import ru.gravit.utils.helper.SecurityHelper;
|
import pro.gravit.utils.helper.SecurityHelper;
|
||||||
|
|
||||||
import java.sql.Connection;
|
import java.sql.Connection;
|
||||||
import java.sql.PreparedStatement;
|
import java.sql.PreparedStatement;
|
||||||
|
|
@ -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.io.IOException;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
package ru.gravit.launchserver.auth.provider;
|
package pro.gravit.launchserver.auth.provider;
|
||||||
|
|
||||||
import ru.gravit.launchserver.Reconfigurable;
|
import pro.gravit.launchserver.Reconfigurable;
|
||||||
import ru.gravit.launchserver.auth.AuthException;
|
import pro.gravit.launchserver.auth.AuthException;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
import ru.gravit.utils.helper.SecurityHelper;
|
import pro.gravit.utils.helper.SecurityHelper;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
|
|
@ -1,11 +1,11 @@
|
||||||
package ru.gravit.launchserver.auth.provider;
|
package pro.gravit.launchserver.auth.provider;
|
||||||
|
|
||||||
import ru.gravit.launcher.ClientPermissions;
|
import pro.gravit.launcher.ClientPermissions;
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.utils.helper.CommonHelper;
|
import pro.gravit.utils.helper.CommonHelper;
|
||||||
import ru.gravit.utils.helper.IOHelper;
|
import pro.gravit.utils.helper.IOHelper;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
import ru.gravit.utils.helper.SecurityHelper;
|
import pro.gravit.utils.helper.SecurityHelper;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
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 ru.gravit.utils.helper.VerifyHelper;
|
import pro.gravit.utils.helper.VerifyHelper;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
package ru.gravit.launchserver.auth.texture;
|
package pro.gravit.launchserver.auth.texture;
|
||||||
|
|
||||||
import ru.gravit.launcher.Launcher;
|
import pro.gravit.launcher.Launcher;
|
||||||
import ru.gravit.launcher.profiles.Texture;
|
import pro.gravit.launcher.profiles.Texture;
|
||||||
import ru.gravit.utils.helper.CommonHelper;
|
import pro.gravit.utils.helper.CommonHelper;
|
||||||
import ru.gravit.utils.helper.IOHelper;
|
import pro.gravit.utils.helper.IOHelper;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
|
|
||||||
import java.io.FileNotFoundException;
|
import java.io.FileNotFoundException;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
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 ru.gravit.utils.ProviderMap;
|
import pro.gravit.utils.ProviderMap;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
@ -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;
|
import java.util.UUID;
|
||||||
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
package ru.gravit.launchserver.binary;
|
package pro.gravit.launchserver.binary;
|
||||||
|
|
||||||
import ru.gravit.launchserver.binary.tasks.MainBuildTask;
|
import pro.gravit.launchserver.binary.tasks.MainBuildTask;
|
||||||
import ru.gravit.utils.helper.IOHelper;
|
import pro.gravit.utils.helper.IOHelper;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
package ru.gravit.launchserver.binary;
|
package pro.gravit.launchserver.binary;
|
||||||
|
|
||||||
import net.sf.launch4j.Builder;
|
import net.sf.launch4j.Builder;
|
||||||
import net.sf.launch4j.Log;
|
import net.sf.launch4j.Log;
|
||||||
import net.sf.launch4j.config.*;
|
import net.sf.launch4j.config.*;
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.utils.Version;
|
import pro.gravit.utils.Version;
|
||||||
import ru.gravit.utils.helper.IOHelper;
|
import pro.gravit.utils.helper.IOHelper;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
package ru.gravit.launchserver.binary;
|
package pro.gravit.launchserver.binary;
|
||||||
|
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.utils.helper.IOHelper;
|
import pro.gravit.utils.helper.IOHelper;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
package ru.gravit.launchserver.binary;
|
package pro.gravit.launchserver.binary;
|
||||||
|
|
||||||
import javassist.*;
|
import javassist.*;
|
||||||
import ru.gravit.launcher.LauncherConfig;
|
import pro.gravit.launcher.LauncherConfig;
|
||||||
import ru.gravit.launchserver.binary.tasks.MainBuildTask;
|
import pro.gravit.launchserver.binary.tasks.MainBuildTask;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
|
|
@ -29,12 +29,12 @@ public JAConfigurator(String configclass, MainBuildTask jarLauncherBinary) throw
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addModuleClass(String fullName) {
|
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(autoincrement);
|
||||||
moduleBody.append(" = new ");
|
moduleBody.append(" = new ");
|
||||||
moduleBody.append(fullName);
|
moduleBody.append(fullName);
|
||||||
moduleBody.append("();");
|
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);
|
||||||
moduleBody.append(");");
|
moduleBody.append(");");
|
||||||
autoincrement++;
|
autoincrement++;
|
||||||
|
|
@ -1,11 +1,12 @@
|
||||||
package ru.gravit.launchserver.binary;
|
package pro.gravit.launchserver.binary;
|
||||||
|
|
||||||
import ru.gravit.launcher.Launcher;
|
import pro.gravit.launchserver.binary.tasks.*;
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launcher.Launcher;
|
||||||
import ru.gravit.launchserver.binary.tasks.*;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.utils.helper.CommonHelper;
|
import pro.gravit.launchserver.binary.tasks.*;
|
||||||
import ru.gravit.utils.helper.IOHelper;
|
import pro.gravit.utils.helper.CommonHelper;
|
||||||
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.IOException;
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
|
|
@ -24,7 +25,7 @@ public final class JARLauncherBinary extends LauncherBinary {
|
||||||
public List<Path> addonLibs;
|
public List<Path> addonLibs;
|
||||||
|
|
||||||
public JARLauncherBinary(LaunchServer server) throws IOException {
|
public JARLauncherBinary(LaunchServer server) throws IOException {
|
||||||
super(server, LauncherBinary.resolve(server, ".jar"));
|
super(server, resolve(server, ".jar"));
|
||||||
count = new AtomicLong(0);
|
count = new AtomicLong(0);
|
||||||
runtimeDir = server.dir.resolve(Launcher.RUNTIME_DIR);
|
runtimeDir = server.dir.resolve(Launcher.RUNTIME_DIR);
|
||||||
guardDir = server.dir.resolve(Launcher.GUARD_DIR);
|
guardDir = server.dir.resolve(Launcher.GUARD_DIR);
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
package ru.gravit.launchserver.binary;
|
package pro.gravit.launchserver.binary;
|
||||||
|
|
||||||
import ru.gravit.launcher.serialize.signed.DigestBytesHolder;
|
import pro.gravit.launcher.serialize.signed.DigestBytesHolder;
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.utils.helper.IOHelper;
|
import pro.gravit.utils.helper.IOHelper;
|
||||||
import ru.gravit.utils.helper.SecurityHelper;
|
import pro.gravit.utils.helper.SecurityHelper;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
package ru.gravit.launchserver.binary;
|
package pro.gravit.launchserver.binary;
|
||||||
|
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.utils.helper.IOHelper;
|
import pro.gravit.utils.helper.IOHelper;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
import ru.gravit.utils.helper.SecurityHelper;
|
import pro.gravit.utils.helper.SecurityHelper;
|
||||||
import ru.gravit.utils.helper.UnpackHelper;
|
import pro.gravit.utils.helper.UnpackHelper;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.OutputStreamWriter;
|
import java.io.OutputStreamWriter;
|
||||||
|
|
@ -62,7 +62,7 @@ public String[] buildConfig(Path inputJar, Path outputJar) {
|
||||||
private void genConfig(boolean force) throws IOException {
|
private void genConfig(boolean force) throws IOException {
|
||||||
if (IOHelper.exists(config) && !force) return;
|
if (IOHelper.exists(config) && !force) return;
|
||||||
Files.deleteIfExists(config);
|
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 {
|
public void genWords(boolean force) throws IOException {
|
||||||
|
|
@ -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.ClassReader;
|
||||||
import org.objectweb.asm.ClassWriter;
|
import org.objectweb.asm.ClassWriter;
|
||||||
import org.objectweb.asm.tree.ClassNode;
|
import org.objectweb.asm.tree.ClassNode;
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.asm.ClassMetadataReader;
|
import pro.gravit.launchserver.asm.ClassMetadataReader;
|
||||||
import ru.gravit.launchserver.asm.SafeClassWriter;
|
import pro.gravit.launchserver.asm.SafeClassWriter;
|
||||||
import ru.gravit.utils.helper.IOHelper;
|
import pro.gravit.utils.helper.IOHelper;
|
||||||
|
|
||||||
import java.io.ByteArrayOutputStream;
|
import java.io.ByteArrayOutputStream;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
package ru.gravit.launchserver.binary.tasks;
|
package pro.gravit.launchserver.binary.tasks;
|
||||||
|
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.utils.helper.IOHelper;
|
import pro.gravit.utils.helper.IOHelper;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package ru.gravit.launchserver.binary.tasks;
|
package pro.gravit.launchserver.binary.tasks;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
|
|
@ -1,18 +1,18 @@
|
||||||
package ru.gravit.launchserver.binary.tasks;
|
package pro.gravit.launchserver.binary.tasks;
|
||||||
|
|
||||||
import javassist.CannotCompileException;
|
import javassist.CannotCompileException;
|
||||||
import javassist.NotFoundException;
|
import javassist.NotFoundException;
|
||||||
import ru.gravit.launcher.AutogenConfig;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launcher.Launcher;
|
import pro.gravit.launchserver.asm.ClassMetadataReader;
|
||||||
import ru.gravit.launcher.LauncherConfig;
|
import pro.gravit.launchserver.binary.BuildContext;
|
||||||
import ru.gravit.launcher.serialize.HOutput;
|
import pro.gravit.launchserver.binary.JAConfigurator;
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launcher.AutogenConfig;
|
||||||
import ru.gravit.launchserver.asm.ClassMetadataReader;
|
import pro.gravit.launcher.Launcher;
|
||||||
import ru.gravit.launchserver.binary.BuildContext;
|
import pro.gravit.launcher.LauncherConfig;
|
||||||
import ru.gravit.launchserver.binary.JAConfigurator;
|
import pro.gravit.launcher.serialize.HOutput;
|
||||||
import ru.gravit.utils.helper.IOHelper;
|
import pro.gravit.utils.helper.IOHelper;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
import ru.gravit.utils.helper.SecurityHelper;
|
import pro.gravit.utils.helper.SecurityHelper;
|
||||||
|
|
||||||
import java.io.ByteArrayOutputStream;
|
import java.io.ByteArrayOutputStream;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
@ -28,7 +28,7 @@
|
||||||
import java.util.zip.ZipInputStream;
|
import java.util.zip.ZipInputStream;
|
||||||
import java.util.zip.ZipOutputStream;
|
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 {
|
public class MainBuildTask implements LauncherBuildTask {
|
||||||
private final LaunchServer server;
|
private final LaunchServer server;
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
package ru.gravit.launchserver.binary.tasks;
|
package pro.gravit.launchserver.binary.tasks;
|
||||||
|
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.utils.helper.IOHelper;
|
import pro.gravit.utils.helper.IOHelper;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
import ru.gravit.utils.helper.UnpackHelper;
|
import pro.gravit.utils.helper.UnpackHelper;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.nio.file.FileVisitResult;
|
import java.nio.file.FileVisitResult;
|
||||||
|
|
@ -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.Configuration;
|
||||||
import proguard.ConfigurationParser;
|
import proguard.ConfigurationParser;
|
||||||
import proguard.ParseException;
|
import proguard.ParseException;
|
||||||
import proguard.ProGuard;
|
import proguard.ProGuard;
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.utils.helper.IOHelper;
|
||||||
import ru.gravit.utils.helper.IOHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
|
|
@ -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.Radon;
|
||||||
import me.itzsomebody.radon.SessionInfo;
|
import me.itzsomebody.radon.SessionInfo;
|
||||||
import me.itzsomebody.radon.config.ConfigurationParser;
|
import me.itzsomebody.radon.config.ConfigurationParser;
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.utils.helper.IOHelper;
|
import pro.gravit.utils.helper.IOHelper;
|
||||||
import ru.gravit.utils.helper.UnpackHelper;
|
import pro.gravit.utils.helper.UnpackHelper;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
@ -35,7 +35,7 @@ public Path process(Path inputFile) throws IOException {
|
||||||
Files.deleteIfExists(outputFile);
|
Files.deleteIfExists(outputFile);
|
||||||
if (srv.config.enabledRadon) {
|
if (srv.config.enabledRadon) {
|
||||||
if (!IOHelper.isFile(config))
|
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));
|
ConfigurationParser p = new ConfigurationParser(IOHelper.newInput(config));
|
||||||
SessionInfo info = p.createSessionFromConfig();
|
SessionInfo info = p.createSessionFromConfig();
|
||||||
info.setInput(inputFile.toFile());
|
info.setInput(inputFile.toFile());
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
package ru.gravit.launchserver.binary.tasks;
|
package pro.gravit.launchserver.binary.tasks;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
@ -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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,11 +1,11 @@
|
||||||
package ru.gravit.launchserver.command.auth;
|
package pro.gravit.launchserver.command.auth;
|
||||||
|
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.auth.AuthProviderPair;
|
import pro.gravit.launchserver.auth.AuthProviderPair;
|
||||||
import ru.gravit.launchserver.auth.provider.AuthProvider;
|
import pro.gravit.launchserver.auth.provider.AuthProvider;
|
||||||
import ru.gravit.launchserver.auth.provider.AuthProviderResult;
|
import pro.gravit.launchserver.auth.provider.AuthProviderResult;
|
||||||
import ru.gravit.launchserver.command.Command;
|
import pro.gravit.launchserver.command.Command;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
|
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
package ru.gravit.launchserver.command.auth;
|
package pro.gravit.launchserver.command.auth;
|
||||||
|
|
||||||
import ru.gravit.launcher.HWID;
|
import pro.gravit.launcher.HWID;
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.command.Command;
|
import pro.gravit.launchserver.command.Command;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
package ru.gravit.launchserver.command.auth;
|
package pro.gravit.launchserver.command.auth;
|
||||||
|
|
||||||
import ru.gravit.launcher.HWID;
|
import pro.gravit.launcher.HWID;
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.command.Command;
|
import pro.gravit.launchserver.command.Command;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
package ru.gravit.launchserver.command.auth;
|
package pro.gravit.launchserver.command.auth;
|
||||||
|
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.auth.AuthProviderPair;
|
import pro.gravit.launchserver.auth.AuthProviderPair;
|
||||||
import ru.gravit.launchserver.command.Command;
|
import pro.gravit.launchserver.command.Command;
|
||||||
import ru.gravit.utils.command.CommandException;
|
import pro.gravit.utils.command.CommandException;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
package ru.gravit.launchserver.command.auth;
|
package pro.gravit.launchserver.command.auth;
|
||||||
|
|
||||||
import ru.gravit.launcher.HWID;
|
import pro.gravit.launcher.HWID;
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.command.Command;
|
import pro.gravit.launchserver.command.Command;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
package ru.gravit.launchserver.command.auth;
|
package pro.gravit.launchserver.command.auth;
|
||||||
|
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.auth.AuthProviderPair;
|
import pro.gravit.launchserver.auth.AuthProviderPair;
|
||||||
import ru.gravit.launchserver.command.Command;
|
import pro.gravit.launchserver.command.Command;
|
||||||
import ru.gravit.utils.command.CommandException;
|
import pro.gravit.utils.command.CommandException;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
package ru.gravit.launchserver.command.basic;
|
package pro.gravit.launchserver.command.basic;
|
||||||
|
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.command.Command;
|
import pro.gravit.launchserver.command.Command;
|
||||||
|
|
||||||
public final class BuildCommand extends Command {
|
public final class BuildCommand extends Command {
|
||||||
public BuildCommand(LaunchServer server) {
|
public BuildCommand(LaunchServer server) {
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
package ru.gravit.launchserver.command.basic;
|
package pro.gravit.launchserver.command.basic;
|
||||||
|
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.command.Command;
|
import pro.gravit.launchserver.command.Command;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
|
|
||||||
public final class LogConnectionsCommand extends Command {
|
public final class LogConnectionsCommand extends Command {
|
||||||
public LogConnectionsCommand(LaunchServer server) {
|
public LogConnectionsCommand(LaunchServer server) {
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
package ru.gravit.launchserver.command.basic;
|
package pro.gravit.launchserver.command.basic;
|
||||||
|
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.command.Command;
|
import pro.gravit.launchserver.command.Command;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
package ru.gravit.launchserver.command.basic;
|
package pro.gravit.launchserver.command.basic;
|
||||||
|
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.command.Command;
|
import pro.gravit.launchserver.command.Command;
|
||||||
|
|
||||||
public final class RebindCommand extends Command {
|
public final class RebindCommand extends Command {
|
||||||
public RebindCommand(LaunchServer server) {
|
public RebindCommand(LaunchServer server) {
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
package ru.gravit.launchserver.command.basic;
|
package pro.gravit.launchserver.command.basic;
|
||||||
|
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.command.Command;
|
import pro.gravit.launchserver.command.Command;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
package ru.gravit.launchserver.command.basic;
|
package pro.gravit.launchserver.command.basic;
|
||||||
|
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.command.Command;
|
import pro.gravit.launchserver.command.Command;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
package ru.gravit.launchserver.command.basic;
|
package pro.gravit.launchserver.command.basic;
|
||||||
|
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.command.Command;
|
import pro.gravit.launchserver.command.Command;
|
||||||
|
|
||||||
public final class RestartCommand extends Command {
|
public final class RestartCommand extends Command {
|
||||||
public RestartCommand(LaunchServer server) {
|
public RestartCommand(LaunchServer server) {
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
package ru.gravit.launchserver.command.basic;
|
package pro.gravit.launchserver.command.basic;
|
||||||
|
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.command.Command;
|
import pro.gravit.launchserver.command.Command;
|
||||||
import ru.gravit.utils.helper.JVMHelper;
|
import pro.gravit.utils.helper.JVMHelper;
|
||||||
|
|
||||||
public final class StopCommand extends Command {
|
public final class StopCommand extends Command {
|
||||||
public StopCommand(LaunchServer server) {
|
public StopCommand(LaunchServer server) {
|
||||||
|
|
@ -1,11 +1,11 @@
|
||||||
package ru.gravit.launchserver.command.basic;
|
package pro.gravit.launchserver.command.basic;
|
||||||
|
|
||||||
import ru.gravit.launcher.events.PingEvent;
|
import pro.gravit.launchserver.websocket.NettyServerSocketHandler;
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.websocket.WebSocketFrameHandler;
|
||||||
import ru.gravit.launchserver.command.Command;
|
import pro.gravit.launcher.events.PingEvent;
|
||||||
import ru.gravit.launchserver.websocket.NettyServerSocketHandler;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.websocket.WebSocketFrameHandler;
|
import pro.gravit.launchserver.command.Command;
|
||||||
import ru.gravit.utils.helper.CommonHelper;
|
import pro.gravit.utils.helper.CommonHelper;
|
||||||
|
|
||||||
public class TestCommand extends Command {
|
public class TestCommand extends Command {
|
||||||
public TestCommand(LaunchServer server) {
|
public TestCommand(LaunchServer server) {
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
package ru.gravit.launchserver.command.basic;
|
package pro.gravit.launchserver.command.basic;
|
||||||
|
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.command.Command;
|
import pro.gravit.launchserver.command.Command;
|
||||||
import ru.gravit.utils.Version;
|
import pro.gravit.utils.Version;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
|
|
||||||
public final class VersionCommand extends Command {
|
public final class VersionCommand extends Command {
|
||||||
public VersionCommand(LaunchServer server) {
|
public VersionCommand(LaunchServer server) {
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
package ru.gravit.launchserver.command.dump;
|
package pro.gravit.launchserver.command.dump;
|
||||||
|
|
||||||
import ru.gravit.launcher.Launcher;
|
import pro.gravit.launcher.Launcher;
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.auth.AuthProviderPair;
|
import pro.gravit.launchserver.auth.AuthProviderPair;
|
||||||
import ru.gravit.launchserver.auth.handler.CachedAuthHandler;
|
import pro.gravit.launchserver.auth.handler.CachedAuthHandler;
|
||||||
import ru.gravit.launchserver.command.Command;
|
import pro.gravit.launchserver.command.Command;
|
||||||
import ru.gravit.utils.helper.IOHelper;
|
import pro.gravit.utils.helper.IOHelper;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
|
|
||||||
import java.io.Reader;
|
import java.io.Reader;
|
||||||
import java.io.Writer;
|
import java.io.Writer;
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
package ru.gravit.launchserver.command.dump;
|
package pro.gravit.launchserver.command.dump;
|
||||||
|
|
||||||
import com.google.gson.reflect.TypeToken;
|
import com.google.gson.reflect.TypeToken;
|
||||||
import ru.gravit.launcher.Launcher;
|
import pro.gravit.launcher.Launcher;
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.command.Command;
|
import pro.gravit.launchserver.command.Command;
|
||||||
import ru.gravit.launchserver.socket.Client;
|
import pro.gravit.launchserver.socket.Client;
|
||||||
import ru.gravit.utils.helper.IOHelper;
|
import pro.gravit.utils.helper.IOHelper;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
|
|
||||||
import java.io.Reader;
|
import java.io.Reader;
|
||||||
import java.io.Writer;
|
import java.io.Writer;
|
||||||
|
|
@ -1,24 +1,28 @@
|
||||||
package ru.gravit.launchserver.command.handler;
|
package pro.gravit.launchserver.command.handler;
|
||||||
|
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.command.auth.*;
|
||||||
import ru.gravit.launchserver.command.auth.*;
|
import pro.gravit.launchserver.command.basic.*;
|
||||||
import ru.gravit.launchserver.command.basic.*;
|
import pro.gravit.launchserver.command.hash.*;
|
||||||
import ru.gravit.launchserver.command.dump.DumpEntryCacheCommand;
|
import pro.gravit.launchserver.command.install.CheckInstallCommand;
|
||||||
import ru.gravit.launchserver.command.dump.DumpSessionsCommand;
|
import pro.gravit.launchserver.command.install.MultiCommand;
|
||||||
import ru.gravit.launchserver.command.hash.*;
|
import pro.gravit.launchserver.command.modules.LoadModuleCommand;
|
||||||
import ru.gravit.launchserver.command.install.CheckInstallCommand;
|
import pro.gravit.launchserver.command.modules.ModulesCommand;
|
||||||
import ru.gravit.launchserver.command.install.MultiCommand;
|
import pro.gravit.launchserver.command.service.*;
|
||||||
import ru.gravit.launchserver.command.modules.LoadModuleCommand;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.command.modules.ModulesCommand;
|
import pro.gravit.launchserver.command.auth.*;
|
||||||
import ru.gravit.launchserver.command.service.*;
|
import pro.gravit.launchserver.command.basic.*;
|
||||||
import ru.gravit.utils.command.BaseCommandCategory;
|
import pro.gravit.launchserver.command.dump.DumpEntryCacheCommand;
|
||||||
import ru.gravit.utils.command.basic.ClearCommand;
|
import pro.gravit.launchserver.command.dump.DumpSessionsCommand;
|
||||||
import ru.gravit.utils.command.basic.DebugCommand;
|
import pro.gravit.launchserver.command.hash.*;
|
||||||
import ru.gravit.utils.command.basic.GCCommand;
|
import pro.gravit.launchserver.command.service.*;
|
||||||
import ru.gravit.utils.command.basic.HelpCommand;
|
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 abstract class CommandHandler extends pro.gravit.utils.command.CommandHandler {
|
||||||
public static void registerCommands(ru.gravit.utils.command.CommandHandler handler) {
|
public static void registerCommands(pro.gravit.utils.command.CommandHandler handler) {
|
||||||
LaunchServer server = LaunchServer.server;
|
LaunchServer server = LaunchServer.server;
|
||||||
BaseCommandCategory basic = new BaseCommandCategory();
|
BaseCommandCategory basic = new BaseCommandCategory();
|
||||||
// Register basic commands
|
// Register basic commands
|
||||||
|
|
@ -1,11 +1,11 @@
|
||||||
package ru.gravit.launchserver.command.hash;
|
package pro.gravit.launchserver.command.hash;
|
||||||
|
|
||||||
import ru.gravit.launcher.profiles.ClientProfile.Version;
|
import pro.gravit.launcher.profiles.ClientProfile.Version;
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.command.Command;
|
import pro.gravit.launchserver.command.Command;
|
||||||
import ru.gravit.utils.HttpDownloader;
|
import pro.gravit.utils.HttpDownloader;
|
||||||
import ru.gravit.utils.helper.IOHelper;
|
import pro.gravit.utils.helper.IOHelper;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
|
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
|
|
@ -1,14 +1,14 @@
|
||||||
package ru.gravit.launchserver.command.hash;
|
package pro.gravit.launchserver.command.hash;
|
||||||
|
|
||||||
import ru.gravit.launcher.Launcher;
|
import pro.gravit.launcher.Launcher;
|
||||||
import ru.gravit.launcher.profiles.ClientProfile;
|
import pro.gravit.launcher.profiles.ClientProfile;
|
||||||
import ru.gravit.launcher.profiles.ClientProfile.Version;
|
import pro.gravit.launcher.profiles.ClientProfile.Version;
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.command.Command;
|
import pro.gravit.launchserver.command.Command;
|
||||||
import ru.gravit.utils.HttpDownloader;
|
import pro.gravit.utils.HttpDownloader;
|
||||||
import ru.gravit.utils.command.CommandException;
|
import pro.gravit.utils.command.CommandException;
|
||||||
import ru.gravit.utils.helper.IOHelper;
|
import pro.gravit.utils.helper.IOHelper;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
|
|
||||||
import java.io.BufferedReader;
|
import java.io.BufferedReader;
|
||||||
import java.io.BufferedWriter;
|
import java.io.BufferedWriter;
|
||||||
|
|
@ -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.Gson;
|
||||||
import com.google.gson.JsonObject;
|
import com.google.gson.JsonObject;
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.command.Command;
|
import pro.gravit.launchserver.command.Command;
|
||||||
import ru.gravit.utils.command.CommandException;
|
import pro.gravit.utils.command.CommandException;
|
||||||
import ru.gravit.utils.helper.IOHelper;
|
import pro.gravit.utils.helper.IOHelper;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
import ru.gravit.utils.helper.SecurityHelper;
|
import pro.gravit.utils.helper.SecurityHelper;
|
||||||
import ru.gravit.utils.helper.SecurityHelper.DigestAlgorithm;
|
import pro.gravit.utils.helper.SecurityHelper.DigestAlgorithm;
|
||||||
|
|
||||||
import java.io.BufferedWriter;
|
import java.io.BufferedWriter;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
package ru.gravit.launchserver.command.hash;
|
package pro.gravit.launchserver.command.hash;
|
||||||
|
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.command.Command;
|
import pro.gravit.launchserver.command.Command;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
package ru.gravit.launchserver.command.hash;
|
package pro.gravit.launchserver.command.hash;
|
||||||
|
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.command.Command;
|
import pro.gravit.launchserver.command.Command;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
package ru.gravit.launchserver.command.hash;
|
package pro.gravit.launchserver.command.hash;
|
||||||
|
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.command.Command;
|
import pro.gravit.launchserver.command.Command;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
|
|
@ -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.JsonElement;
|
||||||
import com.google.gson.JsonObject;
|
import com.google.gson.JsonObject;
|
||||||
import com.google.gson.JsonParser;
|
import com.google.gson.JsonParser;
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.command.Command;
|
import pro.gravit.launchserver.command.Command;
|
||||||
import ru.gravit.utils.command.CommandException;
|
import pro.gravit.utils.command.CommandException;
|
||||||
import ru.gravit.utils.helper.IOHelper;
|
import pro.gravit.utils.helper.IOHelper;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
|
|
||||||
import java.io.BufferedReader;
|
import java.io.BufferedReader;
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
package ru.gravit.launchserver.command.install;
|
package pro.gravit.launchserver.command.install;
|
||||||
|
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.command.Command;
|
import pro.gravit.launchserver.command.Command;
|
||||||
import ru.gravit.utils.helper.JVMHelper;
|
import pro.gravit.utils.helper.JVMHelper;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
|
|
||||||
public class CheckInstallCommand extends Command {
|
public class CheckInstallCommand extends Command {
|
||||||
public CheckInstallCommand(LaunchServer server) {
|
public CheckInstallCommand(LaunchServer server) {
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
package ru.gravit.launchserver.command.install;
|
package pro.gravit.launchserver.command.install;
|
||||||
|
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.command.Command;
|
import pro.gravit.launchserver.command.Command;
|
||||||
|
|
||||||
public class MultiCommand extends Command {
|
public class MultiCommand extends Command {
|
||||||
public MultiCommand(LaunchServer server) {
|
public MultiCommand(LaunchServer server) {
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
package ru.gravit.launchserver.command.modules;
|
package pro.gravit.launchserver.command.modules;
|
||||||
|
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.command.Command;
|
import pro.gravit.launchserver.command.Command;
|
||||||
|
|
||||||
import java.net.URI;
|
import java.net.URI;
|
||||||
import java.nio.file.Paths;
|
import java.nio.file.Paths;
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
package ru.gravit.launchserver.command.modules;
|
package pro.gravit.launchserver.command.modules;
|
||||||
|
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.command.Command;
|
import pro.gravit.launchserver.command.Command;
|
||||||
|
|
||||||
public class ModulesCommand extends Command {
|
public class ModulesCommand extends Command {
|
||||||
public ModulesCommand(LaunchServer server) {
|
public ModulesCommand(LaunchServer server) {
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
package ru.gravit.launchserver.command.service;
|
package pro.gravit.launchserver.command.service;
|
||||||
|
|
||||||
import ru.gravit.launcher.Launcher;
|
import pro.gravit.launcher.Launcher;
|
||||||
import ru.gravit.launcher.NeedGarbageCollection;
|
import pro.gravit.launcher.NeedGarbageCollection;
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.command.Command;
|
import pro.gravit.launchserver.command.Command;
|
||||||
import ru.gravit.launchserver.components.Component;
|
import pro.gravit.launchserver.components.Component;
|
||||||
import ru.gravit.utils.helper.IOHelper;
|
import pro.gravit.utils.helper.IOHelper;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
|
|
||||||
import java.io.Reader;
|
import java.io.Reader;
|
||||||
import java.nio.file.Paths;
|
import java.nio.file.Paths;
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
package ru.gravit.launchserver.command.service;
|
package pro.gravit.launchserver.command.service;
|
||||||
|
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.command.Command;
|
import pro.gravit.launchserver.command.Command;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
|
|
||||||
public class ConfigCommand extends Command {
|
public class ConfigCommand extends Command {
|
||||||
public ConfigCommand(LaunchServer server) {
|
public ConfigCommand(LaunchServer server) {
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
package ru.gravit.launchserver.command.service;
|
package pro.gravit.launchserver.command.service;
|
||||||
|
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.command.Command;
|
import pro.gravit.launchserver.command.Command;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
|
|
||||||
public class ConfigHelpCommand extends Command {
|
public class ConfigHelpCommand extends Command {
|
||||||
public ConfigHelpCommand(LaunchServer server) {
|
public ConfigHelpCommand(LaunchServer server) {
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
package ru.gravit.launchserver.command.service;
|
package pro.gravit.launchserver.command.service;
|
||||||
|
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.command.Command;
|
import pro.gravit.launchserver.command.Command;
|
||||||
|
|
||||||
public class ConfigListCommand extends Command {
|
public class ConfigListCommand extends Command {
|
||||||
public ConfigListCommand(LaunchServer server) {
|
public ConfigListCommand(LaunchServer server) {
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
package ru.gravit.launchserver.command.service;
|
package pro.gravit.launchserver.command.service;
|
||||||
|
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.command.Command;
|
import pro.gravit.launchserver.command.Command;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
|
|
||||||
public class GetModulusCommand extends Command {
|
public class GetModulusCommand extends Command {
|
||||||
public GetModulusCommand(LaunchServer server) {
|
public GetModulusCommand(LaunchServer server) {
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
package ru.gravit.launchserver.command.service;
|
package pro.gravit.launchserver.command.service;
|
||||||
|
|
||||||
import ru.gravit.launcher.ClientPermissions;
|
import pro.gravit.launcher.ClientPermissions;
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.command.Command;
|
import pro.gravit.launchserver.command.Command;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
|
|
||||||
public class GetPermissionsCommand extends Command {
|
public class GetPermissionsCommand extends Command {
|
||||||
public GetPermissionsCommand(LaunchServer server) {
|
public GetPermissionsCommand(LaunchServer server) {
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
package ru.gravit.launchserver.command.service;
|
package pro.gravit.launchserver.command.service;
|
||||||
|
|
||||||
import ru.gravit.launcher.ClientPermissions;
|
import pro.gravit.launcher.ClientPermissions;
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.command.Command;
|
import pro.gravit.launchserver.command.Command;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
|
|
||||||
public class GivePermissionsCommand extends Command {
|
public class GivePermissionsCommand extends Command {
|
||||||
public GivePermissionsCommand(LaunchServer server) {
|
public GivePermissionsCommand(LaunchServer server) {
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
package ru.gravit.launchserver.command.service;
|
package pro.gravit.launchserver.command.service;
|
||||||
|
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.command.Command;
|
import pro.gravit.launchserver.command.Command;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
|
|
||||||
public class ReloadAllCommand extends Command {
|
public class ReloadAllCommand extends Command {
|
||||||
public ReloadAllCommand(LaunchServer server) {
|
public ReloadAllCommand(LaunchServer server) {
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
package ru.gravit.launchserver.command.service;
|
package pro.gravit.launchserver.command.service;
|
||||||
|
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.command.Command;
|
import pro.gravit.launchserver.command.Command;
|
||||||
import ru.gravit.utils.helper.LogHelper;
|
import pro.gravit.utils.helper.LogHelper;
|
||||||
|
|
||||||
public class ReloadCommand extends Command {
|
public class ReloadCommand extends Command {
|
||||||
public ReloadCommand(LaunchServer server) {
|
public ReloadCommand(LaunchServer server) {
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
package ru.gravit.launchserver.command.service;
|
package pro.gravit.launchserver.command.service;
|
||||||
|
|
||||||
import ru.gravit.launchserver.LaunchServer;
|
import pro.gravit.launchserver.LaunchServer;
|
||||||
import ru.gravit.launchserver.command.Command;
|
import pro.gravit.launchserver.command.Command;
|
||||||
|
|
||||||
public class ReloadListCommand extends Command {
|
public class ReloadListCommand extends Command {
|
||||||
public ReloadListCommand(LaunchServer server) {
|
public ReloadListCommand(LaunchServer server) {
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue