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

idea cleanup serverwrapper

Browse source
This commit is contained in:
dima_dencep 2022-09-24 00:44:02 +07:00
parent 642cec3886
commit 7ae6b6dbb6
8 changed files with 83 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapper.java
View file

@ -30,7 +30,10 @@
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.*; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class ServerWrapper extends JsonConfigurable<ServerWrapper.Config> { public class ServerWrapper extends JsonConfigurable<ServerWrapper.Config> {
public static final Path configFile = Paths.get(System.getProperty("serverwrapper.configFile", "ServerWrapperConfig.json")); public static final Path configFile = Paths.get(System.getProperty("serverwrapper.configFile", "ServerWrapperConfig.json"));

1
ServerWrapper/src/main/java/pro/gravit/launcher/server/ServerWrapperGsonManager.java
View file

@ -2,7 +2,6 @@
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
import pro.gravit.launcher.managers.GsonManager; import pro.gravit.launcher.managers.GsonManager;
import pro.gravit.launcher.modules.events.PreGsonPhase;
import pro.gravit.launcher.request.websockets.ClientWebSocketService; import pro.gravit.launcher.request.websockets.ClientWebSocketService;
public class ServerWrapperGsonManager extends GsonManager { public class ServerWrapperGsonManager extends GsonManager {

1
ServerWrapper/src/main/java/pro/gravit/launcher/server/authlib/DownloadContextModifier.java
View file

@ -7,7 +7,6 @@
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths;
public class DownloadContextModifier implements LibrariesHashFileModifier { public class DownloadContextModifier implements LibrariesHashFileModifier {
@Override @Override

2
ServerWrapper/src/main/java/pro/gravit/launcher/server/authlib/InstallAuthlib.java
View file

@ -15,12 +15,14 @@
public class InstallAuthlib { public class InstallAuthlib {
private static Map<String, LibrariesHashFileModifier> modifierMap; private static Map<String, LibrariesHashFileModifier> modifierMap;
static { static {
modifierMap = new HashMap<>(); modifierMap = new HashMap<>();
modifierMap.put("META-INF/libraries.list", new LibrariesLstModifier()); modifierMap.put("META-INF/libraries.list", new LibrariesLstModifier());
modifierMap.put("patch.properties", new PatchPropertiesModifier()); modifierMap.put("patch.properties", new PatchPropertiesModifier());
modifierMap.put("META-INF/download-context", new DownloadContextModifier()); modifierMap.put("META-INF/download-context", new DownloadContextModifier());
} }
public void run(String... args) throws Exception { public void run(String... args) throws Exception {
boolean deleteAuthlibAfterInstall = false; boolean deleteAuthlibAfterInstall = false;
InstallAuthlibContext context = new InstallAuthlibContext(); InstallAuthlibContext context = new InstallAuthlibContext();

2
ServerWrapper/src/main/java/pro/gravit/launcher/server/setup/ServerWrapperSetup.java
View file

@ -11,14 +11,12 @@
import pro.gravit.utils.helper.JVMHelper; import pro.gravit.utils.helper.JVMHelper;
import pro.gravit.utils.helper.LogHelper; import pro.gravit.utils.helper.LogHelper;
import java.io.Closeable;
import java.io.IOException; import java.io.IOException;
import java.io.Writer; import java.io.Writer;
import java.net.URL; import java.net.URL;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.HashMap;
import java.util.jar.JarFile; import java.util.jar.JarFile;
public class ServerWrapperSetup { public class ServerWrapperSetup {

17
ServerWrapper/src/main/java11/pro/gravit/launcher/server/launch/ModuleLaunch.java
View file

@ -13,9 +13,16 @@
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
public class ModuleLaunch implements Launch { public class ModuleLaunch implements Launch {
private static String getPackageFromClass(String clazz) {
int index = clazz.lastIndexOf(".");
if (index >= 0) {
return clazz.substring(0, index);
}
return clazz;
}
@Override @Override
@SuppressWarnings("ConfusingArgumentToVarargsMethod") @SuppressWarnings("ConfusingArgumentToVarargsMethod")
public void run(ServerWrapper.Config config, String[] args) throws Throwable { public void run(ServerWrapper.Config config, String[] args) throws Throwable {
@ -59,12 +66,4 @@ public void run(ServerWrapper.Config config, String[] args) throws Throwable {
MethodHandle mainMethod = MethodHandles.lookup().findStatic(mainClass, "main", MethodType.methodType(void.class, String[].class)); MethodHandle mainMethod = MethodHandles.lookup().findStatic(mainClass, "main", MethodType.methodType(void.class, String[].class));
mainMethod.invoke(args); mainMethod.invoke(args);
} }
private static String getPackageFromClass(String clazz) {
int index = clazz.lastIndexOf(".");
if(index >= 0) {
return clazz.substring(0, index);
}
return clazz;
}
} }