Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2025-04-02 22:41:56 +03:00
Code Issues Projects Releases Packages Wiki Activity

Formatting fixes. (TODO: reformat by IDEA)

Browse source
This commit is contained in:
zaxar163 2019-01-06 15:48:40 +04:00
parent 9e0c94581c
commit 96d1d853e8
No known key found for this signature in database
GPG key ID: CEE900027AE098E0
38 changed files with 204 additions and 203 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java
View file

@ -65,7 +65,11 @@
import ru.gravit.launchserver.config.HWIDHandlerAdapter;
import ru.gravit.launchserver.config.PermissionsHandlerAdapter;
import ru.gravit.launchserver.config.TextureProviderAdapter;
import ru.gravit.launchserver.manangers.*;
import ru.gravit.launchserver.manangers.MirrorManager;
import ru.gravit.launchserver.manangers.ModulesManager;
import ru.gravit.launchserver.manangers.ReconfigurableManager;
import ru.gravit.launchserver.manangers.ReloadManager;
import ru.gravit.launchserver.manangers.SessionManager;
import ru.gravit.launchserver.manangers.hook.AuthHookManager;
import ru.gravit.launchserver.manangers.hook.BuildHookManager;
import ru.gravit.launchserver.manangers.hook.SocketHookManager;
@ -264,7 +268,8 @@ public static void main(String... args) throws Throwable {
public final Path privateKeyFile;
public final Path updatesDir;
public static LaunchServer server;
public static LaunchServer server = null;
public final Path profilesDir;
// Server config
@ -587,8 +592,6 @@ private void generateConfigIfNotExists() throws IOException {
}
}
@SuppressWarnings("ReturnOfCollectionOrArrayField")
public Collection<ClientProfile> getProfiles() {
return profilesList;
}

2
LaunchServer/src/main/java/ru/gravit/launchserver/auth/hwid/JsonHWIDHandler.java
View file

@ -17,11 +17,9 @@
public final class JsonHWIDHandler extends HWIDHandler {
private static final Gson gson = new Gson();
@SuppressWarnings("unused")
private URL url;
private URL urlBan;
private URL urlUnBan;
@SuppressWarnings("unused")
private URL urlGet;
public class banRequest {

2
LaunchServer/src/main/java/ru/gravit/launchserver/auth/permissions/JsonFilePermissionsHandler.java
View file

@ -11,9 +11,9 @@
import com.google.gson.reflect.TypeToken;
import ru.gravit.launcher.ClientPermissions;
import ru.gravit.launcher.Launcher;
import ru.gravit.launchserver.Reloadable;
import ru.gravit.launcher.ClientPermissions;
import ru.gravit.utils.helper.IOHelper;
import ru.gravit.utils.helper.LogHelper;

4
LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/AuthProvider.java
View file

@ -13,8 +13,6 @@
public abstract class AuthProvider implements AutoCloseable {
private static final Map<String, Class<? extends AuthProvider>> AUTH_PROVIDERS = new ConcurrentHashMap<>(8);
private static boolean registredProv = false;
protected transient LaunchServer server = LaunchServer.server;
public static AuthProviderResult authError(String message) throws AuthException {
throw new AuthException(message);
@ -42,7 +40,7 @@ public static void registerProviders() {
}
public AuthHandler getAccociateHandler(int this_position) {
return server.config.authHandler;
return LaunchServer.server.config.authHandler;
}

2
LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/AuthProviderResult.java
View file

@ -1,7 +1,7 @@
package ru.gravit.launchserver.auth.provider;
import ru.gravit.launchserver.LaunchServer;
import ru.gravit.launcher.ClientPermissions;
import ru.gravit.launchserver.LaunchServer;
public class AuthProviderResult {

2
LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/MySQLAuthProvider.java
View file

@ -5,8 +5,8 @@
import java.sql.ResultSet;
import java.sql.SQLException;
import ru.gravit.launchserver.auth.AuthException;
import ru.gravit.launcher.ClientPermissions;
import ru.gravit.launchserver.auth.AuthException;
import ru.gravit.launchserver.auth.MySQLSourceConfig;
import ru.gravit.utils.helper.CommonHelper;
import ru.gravit.utils.helper.SecurityHelper;

4
LaunchServer/src/main/java/ru/gravit/launchserver/auth/provider/RejectAuthProvider.java
View file

@ -1,12 +1,12 @@
package ru.gravit.launchserver.auth.provider;
import java.util.ArrayList;
import ru.gravit.launchserver.Reconfigurable;
import ru.gravit.launchserver.auth.AuthException;
import ru.gravit.utils.helper.LogHelper;
import ru.gravit.utils.helper.SecurityHelper;
import java.util.ArrayList;
public final class RejectAuthProvider extends AuthProvider implements Reconfigurable {
public RejectAuthProvider() {
}

67
LaunchServer/src/main/java/ru/gravit/launchserver/binary/JARLauncherBinary.java
View file

@ -1,49 +1,17 @@
package ru.gravit.launchserver.binary;
import static ru.gravit.utils.helper.IOHelper.newZipEntry;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.nio.file.FileVisitResult;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.SimpleFileVisitor;
import java.nio.file.attribute.BasicFileAttributes;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.jar.JarFile;
import java.util.zip.ZipEntry;
import java.util.zip.ZipException;
import java.util.zip.ZipInputStream;
import java.util.zip.ZipOutputStream;
import javassist.CannotCompileException;
import javassist.NotFoundException;
import proguard.Configuration;
import proguard.ConfigurationParser;
import proguard.ParseException;
import proguard.ProGuard;
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.tasks.LauncherBuildTask;
import ru.gravit.launchserver.binary.tasks.MainBuildTask;
import ru.gravit.launchserver.binary.tasks.ProGuardBuildTask;
import ru.gravit.launchserver.binary.tasks.UnpackBuildTask;
import ru.gravit.launchserver.manangers.hook.BuildHookManager.ZipBuildHook;
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 ru.gravit.utils.helper.SecurityHelper.DigestAlgorithm;
import ru.gravit.utils.helper.UnpackHelper;
public final class JARLauncherBinary extends LauncherBinary {
//public ClassMetadataReader reader;
@ -51,20 +19,10 @@ public final class JARLauncherBinary extends LauncherBinary {
public JARLauncherBinary(LaunchServer server) throws IOException {
super(server);
tasks = new ArrayList<>();
tasks.add(new UnpackBuildTask());
tasks.add(new MainBuildTask());
if(server.config.enabledProGuard) tasks.add(new ProGuardBuildTask());
tasks.add(new UnpackBuildTask(server));
tasks.add(new MainBuildTask(server));
if(server.config.enabledProGuard) tasks.add(new ProGuardBuildTask(server));
syncBinaryFile = server.dir.resolve(server.config.binaryName + ".jar");
/*runtimeDir = server.dir.resolve(Launcher.RUNTIME_DIR);
guardDir = server.dir.resolve(Launcher.GUARD_DIR);
initScriptFile = runtimeDir.resolve(Launcher.INIT_SCRIPT_FILE);
obfJar = server.dir.resolve(server.config.binaryName + "-obfPre.jar");
obfOutJar = server.config.buildPostTransform.enabled ? server.dir.resolve(server.config.binaryName + "-obf.jar")
: syncBinaryFile;
cleanJar = server.dir.resolve(server.config.binaryName + "-clean.jar");
reader = new ClassMetadataReader();
UnpackHelper.unpack(IOHelper.getResourceURL("Launcher.jar"), cleanJar);
reader.getCp().add(new JarFile(cleanJar.toFile()));*/
}
@Override
@ -118,25 +76,6 @@ public void build() throws IOException {
}
for (ZipBuildHook h : server.buildHookManager.getProguardBuildHooks())
h.build(output);
}
if (server.config.buildPostTransform.enabled)
transformedBuild();*/
}
private void transformedBuild() throws IOException {
/*List<String> cmd = new ArrayList<>(1);
for (String v : server.config.buildPostTransform.script)
cmd.add(CommonHelper.replace(v, "launcher-output", IOHelper.toAbsPathString(syncBinaryFile), "launcher-obf",
IOHelper.toAbsPathString(obfJar), "launcher-nonObf", IOHelper.toAbsPathString(binaryFile)));
ProcessBuilder builder = new ProcessBuilder();
builder.directory(IOHelper.toAbsPath(server.dir).toFile());
builder.inheritIO();
builder.command(cmd);
Process proc = builder.start();
try {
LogHelper.debug("Transformer process return code: " + proc.waitFor());
} catch (InterruptedException e) {
LogHelper.error(e);
}*/
}
}

35
LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/MainBuildTask.java
View file

@ -1,21 +1,7 @@
package ru.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.binary.BuildContext;
import ru.gravit.launchserver.binary.JAConfigurator;
import ru.gravit.launchserver.binary.JARLauncherBinary;
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 static ru.gravit.utils.helper.IOHelper.newZipEntry;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.nio.file.FileVisitResult;
@ -29,14 +15,26 @@
import java.util.zip.ZipInputStream;
import java.util.zip.ZipOutputStream;
import static ru.gravit.utils.helper.IOHelper.newZipEntry;
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.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 ru.gravit.utils.helper.UnpackHelper;
public class MainBuildTask implements LauncherBuildTask {
public static LaunchServer server = LaunchServer.server;
public final Path runtimeDir;
public final Path guardDir;
public final Path binaryFile;
public Path cleanJar;
private final LaunchServer server;
private final class RuntimeDirVisitor extends SimpleFileVisitor<Path> {
private final ZipOutputStream output;
private final Map<String, byte[]> runtime;
@ -106,7 +104,8 @@ private static ZipEntry newEntry(String fileName) {
private static ZipEntry newGuardEntry(String fileName) {
return newZipEntry(Launcher.GUARD_DIR + IOHelper.CROSS_SEPARATOR + fileName);
}
public MainBuildTask() {
public MainBuildTask(LaunchServer srv) {
server = srv;
runtimeDir = server.dir.resolve(Launcher.RUNTIME_DIR);
guardDir = server.dir.resolve(Launcher.GUARD_DIR);
binaryFile = server.dir.resolve(server.config.binaryName + "-main.jar");

15
LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/ProGuardBuildTask.java
View file

@ -1,17 +1,22 @@
package ru.gravit.launchserver.binary.tasks;
import java.io.IOException;
import java.nio.file.Path;
import proguard.Configuration;
import proguard.ConfigurationParser;
import proguard.ParseException;
import proguard.ProGuard;
import ru.gravit.launchserver.LaunchServer;
import java.io.IOException;
import java.nio.file.Path;
public class ProGuardBuildTask implements LauncherBuildTask {
public static LaunchServer server = LaunchServer.server;
@Override
private final LaunchServer server;
public ProGuardBuildTask(LaunchServer server) {
this.server = server;
}
@Override
public String getName() {
return "ProGuard";
}

17
LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/UnpackBuildTask.java
View file

@ -1,16 +1,21 @@
package ru.gravit.launchserver.binary.tasks;
import ru.gravit.launchserver.LaunchServer;
import ru.gravit.utils.helper.IOHelper;
import ru.gravit.utils.helper.UnpackHelper;
import java.io.IOException;
import java.net.URL;
import java.nio.file.Path;
import ru.gravit.launchserver.LaunchServer;
import ru.gravit.utils.helper.IOHelper;
import ru.gravit.utils.helper.UnpackHelper;
public class UnpackBuildTask implements LauncherBuildTask {
public static LaunchServer server = LaunchServer.server;
@Override
private final LaunchServer server;
public UnpackBuildTask(LaunchServer server) {
this.server = server;
}
@Override
public String getName() {
return "UnpackFromResources";
}

1
LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/RestartCommand.java
View file

@ -19,7 +19,6 @@ public String getUsageDescription() {
}
@Override
@SuppressWarnings("CallToSystemExit")
public void invoke(String... args) {
server.fullyRestart();
}

1
LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/StopCommand.java
View file

@ -20,7 +20,6 @@ public String getUsageDescription() {
}
@Override
@SuppressWarnings("CallToSystemExit")
public void invoke(String... args) {
JVMHelper.RUNTIME.exit(0);
}

2
LaunchServer/src/main/java/ru/gravit/launchserver/command/basic/TestCommand.java
View file

@ -36,7 +36,7 @@ public void invoke(String... args) throws Exception {
}
if (args[0].equals("profile")) {
ClientProfile profile = new ClientProfile("1.7.10","asset1.7.10",0,"Test1.7.10","localhost",25565,true,false,"net.minecraft.launchwrapper.Launch");
try(Writer writer = IOHelper.newWriter(LaunchServer.server.dir.resolve("profiles").resolve("Test.cfg")))
try(Writer writer = IOHelper.newWriter(server.dir.resolve("profiles").resolve("Test.cfg")))
{
LaunchServer.gson.toJson(profile,writer);
}

8
LaunchServer/src/main/java/ru/gravit/launchserver/command/handler/CommandHandler.java
View file

@ -44,7 +44,13 @@
import ru.gravit.launchserver.command.hash.UnindexAssetCommand;
import ru.gravit.launchserver.command.modules.LoadModuleCommand;
import ru.gravit.launchserver.command.modules.ModulesCommand;
import ru.gravit.launchserver.command.service.*;
import ru.gravit.launchserver.command.service.ConfigCommand;
import ru.gravit.launchserver.command.service.ConfigHelpCommand;
import ru.gravit.launchserver.command.service.ConfigListCommand;
import ru.gravit.launchserver.command.service.ReloadAllCommand;
import ru.gravit.launchserver.command.service.ReloadCommand;
import ru.gravit.launchserver.command.service.ReloadListCommand;
import ru.gravit.launchserver.command.service.SwapAuthProviderCommand;
import ru.gravit.utils.helper.LogHelper;
import ru.gravit.utils.helper.VerifyHelper;

43
LaunchServer/src/main/java/ru/gravit/launchserver/manangers/NodeTransformer.java
View file

@ -1,43 +0,0 @@
package ru.gravit.launchserver.manangers;
import java.util.ArrayList;
import java.util.List;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassWriter;
import org.objectweb.asm.tree.ClassNode;
import ru.gravit.launcher.LauncherConfig;
import ru.gravit.launchserver.asm.SafeClassWriter;
import ru.gravit.launchserver.binary.JARLauncherBinary;
import ru.gravit.launchserver.binary.tasks.MainBuildTask;
import ru.gravit.launchserver.manangers.hook.BuildHookManager.Transformer;
public class NodeTransformer implements Transformer {
@FunctionalInterface
public interface ClassNodeTransformer {
void transform(ClassNode node, String classname, JARLauncherBinary data);
}
private final List<ClassNodeTransformer> transLst;
public List<ClassNodeTransformer> getTransLst() {
return transLst;
}
public NodeTransformer() {
transLst = new ArrayList<>();
}
@Override
public byte[] transform(byte[] input, String classname, MainBuildTask data) {
//ClassReader cr = new ClassReader(input);
//ClassNode cn = new ClassNode();
//cr.accept(cn, data.server.config.env.equals(LauncherConfig.LauncherEnvironment.PROD) || data.server.config.env.equals(LauncherConfig.LauncherEnvironment.STD) ? ClassReader.SKIP_DEBUG : 0);
//for (ClassNodeTransformer tr : transLst) tr.transform(cn, classname, data);
//ClassWriter cw = new SafeClassWriter(data.reader, ClassWriter.COMPUTE_MAXS);
//cn.accept(cw);
//return cw.toByteArray();
return null;
}
}

6
LaunchServer/src/main/java/ru/gravit/launchserver/manangers/ReconfigurableManager.java
View file

@ -1,12 +1,12 @@
package ru.gravit.launchserver.manangers;
import java.util.HashMap;
import java.util.Objects;
import ru.gravit.launchserver.Reconfigurable;
import ru.gravit.utils.helper.LogHelper;
import ru.gravit.utils.helper.VerifyHelper;
import java.util.HashMap;
import java.util.Objects;
public class ReconfigurableManager {
private final HashMap<String, Reconfigurable> RECONFIGURABLE = new HashMap<>();
public void registerReconfigurable(String name, Reconfigurable reconfigurable)

6
LaunchServer/src/main/java/ru/gravit/launchserver/manangers/hook/AuthHookManager.java
View file

@ -1,11 +1,11 @@
package ru.gravit.launchserver.manangers.hook;
import ru.gravit.launchserver.response.auth.AuthResponse;
import ru.gravit.launchserver.socket.Client;
import java.util.HashSet;
import java.util.Set;
import ru.gravit.launchserver.response.auth.AuthResponse;
import ru.gravit.launchserver.socket.Client;
public class AuthHookManager {
private Set<AuthPreHook> PRE_HOOKS = new HashSet<>();
private Set<AuthPostHook> POST_HOOKS = new HashSet<>();

1
LaunchServer/src/main/java/ru/gravit/launchserver/manangers/hook/BuildHookManager.java
View file

@ -10,7 +10,6 @@
import ru.gravit.launcher.modules.TestClientModule;
import ru.gravit.launchserver.binary.BuildContext;
import ru.gravit.launchserver.binary.JAConfigurator;
import ru.gravit.launchserver.binary.JARLauncherBinary;
import ru.gravit.launchserver.binary.tasks.MainBuildTask;
import ru.gravit.launchserver.manangers.NodeTransformer;

6
LaunchServer/src/main/java/ru/gravit/launchserver/manangers/hook/SocketHookManager.java
View file

@ -1,12 +1,12 @@
package ru.gravit.launchserver.manangers.hook;
import ru.gravit.launcher.request.RequestException;
import ru.gravit.launchserver.socket.SocketContext;
import java.net.Socket;
import java.util.HashSet;
import java.util.Set;
import ru.gravit.launcher.request.RequestException;
import ru.gravit.launchserver.socket.SocketContext;
public class SocketHookManager {
@FunctionalInterface
public interface SocketPreHook

3
LaunchServer/src/main/java/ru/gravit/launchserver/response/Response.java
View file

@ -104,8 +104,7 @@ protected final void debug(String message, Object... args) {
public abstract void reply() throws Exception;
@SuppressWarnings("MethodMayBeStatic") // Intentionally not static
protected final void writeNoError(HOutput output) throws IOException {
protected static final void writeNoError(HOutput output) throws IOException {
output.writeString("", 0);
}
}

2
LaunchServer/src/main/java/ru/gravit/launchserver/socket/Client.java
View file

@ -1,7 +1,7 @@
package ru.gravit.launchserver.socket;
import ru.gravit.launcher.profiles.ClientProfile;
import ru.gravit.launcher.ClientPermissions;
import ru.gravit.launcher.profiles.ClientProfile;
public class Client {
public long session;

3
Launcher/src/main/java/ru/gravit/launcher/JSApplication.java
View file

@ -4,7 +4,6 @@
import java.util.concurrent.atomic.AtomicReference;
@SuppressWarnings("AbstractClassNeverImplemented")
public abstract class JSApplication extends Application {
private static final AtomicReference<JSApplication> INSTANCE = new AtomicReference<>();
@ -13,8 +12,6 @@ public static JSApplication getInstance() {
return INSTANCE.get();
}
@SuppressWarnings("ConstructorNotProtectedInAbstractClass")
public JSApplication() {
INSTANCE.set(this);
}

3
LauncherAPI/src/main/java/com/mojang/authlib/minecraft/MinecraftProfileTexture.java
View file

@ -41,17 +41,14 @@ public MinecraftProfileTexture(String url, String hash) {
this.hash = hash;
}
@SuppressWarnings("unused")
public String getHash() {
return hash;
}
@SuppressWarnings({"unused", "SameReturnValue"})
public String getMetadata(String key) {
return null;
}
@SuppressWarnings("unused")
public String getUrl() {
return url;
}

6
LauncherAPI/src/main/java/com/mojang/authlib/yggdrasil/CompatBridge.java
View file

@ -13,18 +13,15 @@
import java.util.UUID;
// Used to bypass Launcher's class name obfuscation and access API
@SuppressWarnings("unused")
@LauncherAPI
public final class CompatBridge {
public static final int PROFILES_MAX_BATCH_SIZE = SerializeLimits.MAX_BATCH_SIZE;
@SuppressWarnings("unused")
public static CompatProfile checkServer(String username, String serverID) throws Exception {
LogHelper.debug("CompatBridge.checkServer, Username: '%s', Server ID: %s", username, serverID);
return CompatProfile.fromPlayerProfile(new CheckServerRequest(username, serverID).request());
}
@SuppressWarnings("unused")
public static boolean joinServer(String username, String accessToken, String serverID) throws Exception {
// Join server
@ -32,17 +29,14 @@ public static boolean joinServer(String username, String accessToken, String ser
return new JoinServerRequest(username, accessToken, serverID).request();
}
@SuppressWarnings("unused")
public static CompatProfile profileByUsername(String username) throws Exception {
return CompatProfile.fromPlayerProfile(new ProfileByUsernameRequest(username).request());
}
@SuppressWarnings("unused")
public static CompatProfile profileByUUID(UUID uuid) throws Exception {
return CompatProfile.fromPlayerProfile(new ProfileByUUIDRequest(uuid).request());
}
@SuppressWarnings("unused")
public static CompatProfile[] profilesByUsername(String... usernames) throws Exception {
PlayerProfile[] profiles = new BatchProfileByUsernameRequest(usernames).request();

1
LauncherAPI/src/main/java/com/mojang/authlib/yggdrasil/CompatProfile.java
View file

@ -7,7 +7,6 @@
import java.util.UUID;
@SuppressWarnings("unused")
@LauncherAPI
public final class CompatProfile {
public static final String SKIN_URL_PROPERTY = Launcher.SKIN_URL_PROPERTY;

4
LauncherAPI/src/main/java/com/mojang/authlib/yggdrasil/LegacyBridge.java
View file

@ -10,27 +10,23 @@
// Used by 1.6.4 and below versions
@LauncherAPI
public final class LegacyBridge {
@SuppressWarnings("unused")
public static boolean checkServer(String username, String serverID) throws Exception {
LogHelper.debug("LegacyBridge.checkServer, Username: '%s', Server ID: %s", username, serverID);
return new CheckServerRequest(username, serverID).request() != null;
}
@SuppressWarnings("unused")
public static String getCloakURL(String username) {
LogHelper.debug("LegacyBridge.getCloakURL: '%s'", username);
return CommonHelper.replace(System.getProperty("launcher.legacy.cloaksURL",
"http://skins.minecraft.net/MinecraftCloaks/%username%.png"), "username", IOHelper.urlEncode(username));
}
@SuppressWarnings("unused")
public static String getSkinURL(String username) {
LogHelper.debug("LegacyBridge.getSkinURL: '%s'", username);
return CommonHelper.replace(System.getProperty("launcher.legacy.skinsURL",
"http://skins.minecraft.net/MinecraftSkins/%username%.png"), "username", IOHelper.urlEncode(username));
}
@SuppressWarnings("unused")
public static String joinServer(String username, String accessToken, String serverID) {
// Join server

1
LauncherAPI/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilAuthenticationService.java
View file

@ -10,7 +10,6 @@
import java.net.Proxy;
public final class YggdrasilAuthenticationService implements AuthenticationService {
@SuppressWarnings("UnusedParameters")
public YggdrasilAuthenticationService(Proxy proxy, String clientToken) {
LogHelper.debug("Patched AuthenticationService created: '%s'", clientToken);
}

1
LauncherAPI/src/main/java/ru/gravit/launcher/request/Request.java
View file

@ -54,7 +54,6 @@ protected final void readError(HInput input) throws IOException {
}
@LauncherAPI
@SuppressWarnings("DesignForExtension")
public R request() throws Exception {
if (!started.compareAndSet(false, true))
throw new IllegalStateException("Request already started");

1
LauncherAPI/src/main/java/ru/gravit/launcher/request/update/LauncherRequest.java
View file

@ -83,7 +83,6 @@ public Integer getType() {
}
@Override
@SuppressWarnings("CallToSystemExit")
protected Result requestDo(HInput input, HOutput output) throws Exception {
Path launcherPath = IOHelper.getCodeSource(LauncherRequest.class);
byte[] digest = SecurityHelper.digest(SecurityHelper.DigestAlgorithm.SHA512, launcherPath);

1
LauncherAPI/src/main/java/ru/gravit/launcher/request/update/LegacyLauncherRequest.java
View file

@ -93,7 +93,6 @@ public Integer getType() {
}
@Override
@SuppressWarnings("CallToSystemExit")
protected Result requestDo(HInput input, HOutput output) throws Exception {
output.writeBoolean(EXE_BINARY);
output.flush();

1
LauncherAPI/src/main/java/ru/gravit/launcher/request/websockets/JsonRequestAdapter.java
View file

@ -12,7 +12,6 @@ public JsonRequestAdapter(ClientWebSocketService service) {
this.service = service;
}
@SuppressWarnings("unchecked")
@Override
public RequestInterface deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
String typename = json.getAsJsonObject().getAsJsonPrimitive(PROP_NAME).getAsString();

1
ServerWrapper/src/main/java/ru/gravit/launcher/server/ServerAgent.java
View file

@ -46,7 +46,6 @@ public static long getObjSize(Object obj) {
public static Boolean isAutoloadLibraries = Boolean.getBoolean(System.getProperty("serverwrapper,agentlibrariesload", "false"));
public static Boolean isAgentProxy = Boolean.getBoolean(System.getProperty("serverwrapper,agentproxy", "false"));
@SuppressWarnings("JavaLangInvokeHandleSignature")
public static void premain(String agentArgument, Instrumentation instrumentation) {
LogHelper.debug("Server Agent");
inst = instrumentation;

3
ServerWrapper/src/main/java/ru/gravit/launcher/server/ServerWrapper.java
View file

@ -85,8 +85,7 @@ public static void initGson()
Launcher.gson = Launcher.gsonBuilder.create();
}
@SuppressWarnings("ConfusingArgumentToVarargsMethod")
public static void main(String[] args) throws Throwable {
public static void main(String... args) throws Throwable {
ServerWrapper wrapper = new ServerWrapper();
LogHelper.printVersion("ServerWrapper");
LogHelper.printLicense("ServerWrapper");

6
libLauncher/src/main/java/ru/gravit/launcher/AutogenConfig.java
View file

@ -5,7 +5,8 @@ public class AutogenConfig {
public String address;
public int port;
public int clientPort;
private boolean isInitModules;
@SuppressWarnings("unused")
private boolean isInitModules;
public boolean isUsingWrapper;
public boolean isDownloadJava; //Выставление этого флага требует модификации runtime части
public String secretKeyClient;
@ -17,11 +18,8 @@ public class AutogenConfig {
// 3 - Production (дебаг выключен, минимальный объем сообщений, stacktrace не выводится)
AutogenConfig() {
}
@SuppressWarnings("UnnecessaryReturnStatement")
public void initModules() {
if (isInitModules) return;
}
}

2
libLauncher/src/main/java/ru/gravit/launcher/LauncherConfig.java
View file

@ -84,7 +84,6 @@ public LauncherConfig(HInput input) throws IOException, InvalidKeySpecException
}
@LauncherAPI
@SuppressWarnings("AssignmentToCollectionOrArrayFieldFromParameter")
public LauncherConfig(String address, int port, RSAPublicKey publicKey, Map<String, byte[]> runtime, String projectname) {
this.address = InetSocketAddress.createUnresolved(address, port);
this.publicKey = Objects.requireNonNull(publicKey, "publicKey");
@ -97,7 +96,6 @@ public LauncherConfig(String address, int port, RSAPublicKey publicKey, Map<Stri
}
@LauncherAPI
@SuppressWarnings("AssignmentToCollectionOrArrayFieldFromParameter")
public LauncherConfig(String address, int port, RSAPublicKey publicKey, Map<String, byte[]> runtime) {
this.address = InetSocketAddress.createUnresolved(address, port);
this.publicKey = Objects.requireNonNull(publicKey, "publicKey");

130
libLauncher/src/main/java/ru/gravit/launcher/profiles/ClientProfile.java
View file

@ -10,9 +10,8 @@
import java.net.InetSocketAddress;
import java.util.*;
@SuppressWarnings("ComparableImplementedButEqualsNotOverridden")
public final class ClientProfile implements Comparable<ClientProfile> {
public ClientProfile(String version, String assetIndex, int sortIndex, String title, String serverAddress, int serverPort, boolean updateFastCheck, boolean useWhitelist, String mainClass) {
public ClientProfile(String version, String assetIndex, int sortIndex, String title, String serverAddress, int serverPort, boolean updateFastCheck, boolean useWhitelist, String mainClass) {
this.version = version;
this.assetIndex = assetIndex;
this.sortIndex = sortIndex;
@ -421,4 +420,131 @@ public void verify() {
// Client launcher
VerifyHelper.verify(getTitle(), VerifyHelper.NOT_EMPTY, "Main class can't be empty");
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((assetDir == null) ? 0 : assetDir.hashCode());
result = prime * result + ((assetIndex == null) ? 0 : assetIndex.hashCode());
result = prime * result + ((classPath == null) ? 0 : classPath.hashCode());
result = prime * result + ((clientArgs == null) ? 0 : clientArgs.hashCode());
result = prime * result + ((dir == null) ? 0 : dir.hashCode());
result = prime * result + ((jvmArgs == null) ? 0 : jvmArgs.hashCode());
result = prime * result + ((mainClass == null) ? 0 : mainClass.hashCode());
result = prime * result + ((serverAddress == null) ? 0 : serverAddress.hashCode());
result = prime * result + serverPort;
result = prime * result + sortIndex;
result = prime * result + ((title == null) ? 0 : title.hashCode());
result = prime * result + ((update == null) ? 0 : update.hashCode());
result = prime * result + ((updateExclusions == null) ? 0 : updateExclusions.hashCode());
result = prime * result + (updateFastCheck ? 1231 : 1237);
result = prime * result + ((updateOptional == null) ? 0 : updateOptional.hashCode());
result = prime * result + ((updateShared == null) ? 0 : updateShared.hashCode());
result = prime * result + ((updateVerify == null) ? 0 : updateVerify.hashCode());
result = prime * result + (useWhitelist ? 1231 : 1237);
result = prime * result + ((version == null) ? 0 : version.hashCode());
result = prime * result + ((whitelist == null) ? 0 : whitelist.hashCode());
return result;
}
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
ClientProfile other = (ClientProfile) obj;
if (assetDir == null) {
if (other.assetDir != null)
return false;
} else if (!assetDir.equals(other.assetDir))
return false;
if (assetIndex == null) {
if (other.assetIndex != null)
return false;
} else if (!assetIndex.equals(other.assetIndex))
return false;
if (classPath == null) {
if (other.classPath != null)
return false;
} else if (!classPath.equals(other.classPath))
return false;
if (clientArgs == null) {
if (other.clientArgs != null)
return false;
} else if (!clientArgs.equals(other.clientArgs))
return false;
if (dir == null) {
if (other.dir != null)
return false;
} else if (!dir.equals(other.dir))
return false;
if (jvmArgs == null) {
if (other.jvmArgs != null)
return false;
} else if (!jvmArgs.equals(other.jvmArgs))
return false;
if (mainClass == null) {
if (other.mainClass != null)
return false;
} else if (!mainClass.equals(other.mainClass))
return false;
if (serverAddress == null) {
if (other.serverAddress != null)
return false;
} else if (!serverAddress.equals(other.serverAddress))
return false;
if (serverPort != other.serverPort)
return false;
if (sortIndex != other.sortIndex)
return false;
if (title == null) {
if (other.title != null)
return false;
} else if (!title.equals(other.title))
return false;
if (update == null) {
if (other.update != null)
return false;
} else if (!update.equals(other.update))
return false;
if (updateExclusions == null) {
if (other.updateExclusions != null)
return false;
} else if (!updateExclusions.equals(other.updateExclusions))
return false;
if (updateFastCheck != other.updateFastCheck)
return false;
if (updateOptional == null) {
if (other.updateOptional != null)
return false;
} else if (!updateOptional.equals(other.updateOptional))
return false;
if (updateShared == null) {
if (other.updateShared != null)
return false;
} else if (!updateShared.equals(other.updateShared))
return false;
if (updateVerify == null) {
if (other.updateVerify != null)
return false;
} else if (!updateVerify.equals(other.updateVerify))
return false;
if (useWhitelist != other.useWhitelist)
return false;
if (version == null) {
if (other.version != null)
return false;
} else if (!version.equals(other.version))
return false;
if (whitelist == null) {
if (other.whitelist != null)
return false;
} else if (!whitelist.equals(other.whitelist))
return false;
return true;
}
}

3
libLauncher/src/main/java/ru/gravit/utils/helper/JVMHelper.java
View file

@ -14,7 +14,6 @@
import java.util.Map;
public final class JVMHelper {
@SuppressWarnings("unused")
@LauncherAPI
public enum OS {
MUSTDIE("mustdie"), LINUX("linux"), MACOSX("macosx");
@ -84,7 +83,6 @@ public static Class<?> firstClass(String... names) throws ClassNotFoundException
}
@LauncherAPI
@SuppressWarnings("CallToSystemGC")
public static void fullGC() {
RUNTIME.gc();
RUNTIME.runFinalization();
@ -122,7 +120,6 @@ public static void checkStackTrace(Class<?> mainClass) {
}
}
@SuppressWarnings("CallToSystemGetenv")
private static int getCorrectOSArch() {
// As always, mustdie must die
if (OS_TYPE == OS.MUSTDIE)