0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #486 from icelimetea/refactor-java-launcher

Browse Source 
Refactor some parts of NewLaunch
This commit is contained in:
Sefa Eyeoglu 2022-04-28 07:18:39 +02:00 committed by GitHub
commit bd946c78f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 130 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

167
libraries/launcher/org/multimc/EntryPoint.java
View File

@ -16,136 +16,123 @@ package org.multimc;/*
import org.multimc.onesix.OneSixLauncher;
import java.io.*;
import java.nio.charset.Charset;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.util.logging.Level;
import java.util.logging.Logger;
public class EntryPoint
{
private enum Action
{
Proceed,
Launch,
Abort
}
private static final Logger LOGGER = Logger.getLogger("EntryPoint");
private final ParamBucket params = new ParamBucket();
private org.multimc.Launcher launcher;
public static void main(String[] args)
{
EntryPoint listener = new EntryPoint();
int retCode = listener.listen();
if (retCode != 0)
{
System.out.println("Exiting with " + retCode);
LOGGER.info("Exiting with " + retCode);
System.exit(retCode);
}
}
private Action parseLine(String inData) throws ParseException
{
String[] pair = inData.split(" ", 2);
String[] tokens = inData.split("\\s+", 2);
if(pair.length == 1)
{
String command = pair[0];
if (pair[0].equals("launch"))
if (tokens.length == 0)
throw new ParseException("Unexpected empty string!");
switch (tokens[0]) {
case "launch": {
return Action.Launch;
}
else if (pair[0].equals("abort"))
case "abort": {
return Action.Abort;
}
else throw new ParseException("Error while parsing:" + pair[0]);
}
case "launcher": {
if (tokens.length != 2)
throw new ParseException("Expected 2 tokens, got " + tokens.length);
if(pair.length != 2)
throw new ParseException("Pair length is not 2.");
if (tokens[1].equals("onesix")) {
launcher = new OneSixLauncher();
String command = pair[0];
String param = pair[1];
LOGGER.info("Using onesix launcher.");
return Action.Proceed;
} else {
throw new ParseException("Invalid launcher type: " + tokens[1]);
}
}
default: {
if (tokens.length != 2)
throw new ParseException("Error while parsing:" + inData);
params.add(tokens[0], tokens[1]);
if(command.equals("launcher"))
{
if(param.equals("onesix"))
{
m_launcher = new OneSixLauncher();
Utils.log("Using onesix launcher.");
Utils.log();
return Action.Proceed;
}
else
throw new ParseException("Invalid launcher type: " + param);
}
m_params.add(command, param);
//System.out.println(command + " : " + param);
return Action.Proceed;
}
public int listen()
{
BufferedReader buffer;
try
{
buffer = new BufferedReader(new InputStreamReader(System.in, "UTF-8"));
} catch (UnsupportedEncodingException e)
{
System.err.println("For some reason, your java does not support UTF-8. Consider living in the current century.");
e.printStackTrace();
Action action = Action.Proceed;
try (BufferedReader reader = new BufferedReader(new InputStreamReader(
System.in,
StandardCharsets.UTF_8
))) {
String line;
while (action == Action.Proceed) {
if ((line = reader.readLine()) != null) {
action = parseLine(line);
} else {
action = Action.Abort;
}
}
} catch (IOException | ParseException e) {
LOGGER.log(Level.SEVERE, "Launcher ABORT due to exception:", e);
return 1;
}
boolean isListening = true;
boolean isAborted = false;
// Main loop
while (isListening)
if (action == Action.Abort)
{
String inData;
try
{
// Read from the pipe one line at a time
inData = buffer.readLine();
if (inData != null)
{
Action a = parseLine(inData);
if(a == Action.Abort)
{
isListening = false;
isAborted = true;
}
if(a == Action.Launch)
{
isListening = false;
}
}
else
{
isListening = false;
isAborted = true;
}
}
catch (IOException e)
{
System.err.println("Launcher ABORT due to IO exception:");
e.printStackTrace();
return 1;
}
catch (ParseException e)
{
System.err.println("Launcher ABORT due to PARSE exception:");
e.printStackTrace();
return 1;
}
}
if(isAborted)
{
System.err.println("Launch aborted by the launcher.");
LOGGER.info("Launch aborted by the launcher.");
return 1;
}
if(m_launcher != null)
if (launcher != null)
{
return m_launcher.launch(m_params);
return launcher.launch(params);
}
System.err.println("No valid launcher implementation specified.");
LOGGER.log(Level.SEVERE, "No valid launcher implementation specified.");
return 1;
}
private ParamBucket m_params = new ParamBucket();
private org.multimc.Launcher m_launcher;
private enum Action {
Proceed,
Launch,
Abort
}
}

2
libraries/launcher/org/multimc/Launcher.java
View File

@ -18,5 +18,5 @@ package org.multimc;
public interface Launcher
{
abstract int launch(ParamBucket params);
int launch(ParamBucket params);
}

51
libraries/launcher/org/multimc/ParamBucket.java
View File

@ -19,62 +19,62 @@ package org.multimc;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class ParamBucket
{
private final Map<String, List<String>> paramsMap = new HashMap<>();
public void add(String key, String value)
{
List<String> coll = null;
if(!m_params.containsKey(key))
{
coll = new ArrayList<String>();
m_params.put(key, coll);
}
else
{
coll = m_params.get(key);
}
coll.add(value);
paramsMap.computeIfAbsent(key, k -> new ArrayList<>())
.add(value);
}
public List<String> all(String key) throws NotFoundException
{
if(!m_params.containsKey(key))
List<String> params = paramsMap.get(key);
if (params == null)
throw new NotFoundException();
return m_params.get(key);
return params;
}
public List<String> allSafe(String key, List<String> def)
{
if(!m_params.containsKey(key) || m_params.get(key).size() < 1)
{
List<String> params = paramsMap.get(key);
if (params == null || params.isEmpty())
return def;
}
return m_params.get(key);
return params;
}
public List<String> allSafe(String key)
{
return allSafe(key, new ArrayList<String>());
return allSafe(key, new ArrayList<>());
}
public String first(String key) throws NotFoundException
{
List<String> list = all(key);
if(list.size() < 1)
{
if (list.isEmpty())
throw new NotFoundException();
}
return list.get(0);
}
public String firstSafe(String key, String def)
{
if(!m_params.containsKey(key) || m_params.get(key).size() < 1)
{
List<String> params = paramsMap.get(key);
if (params == null || params.isEmpty())
return def;
}
return m_params.get(key).get(0);
return params.get(0);
}
public String firstSafe(String key)
@ -82,5 +82,4 @@ public class ParamBucket
return firstSafe(key, "");
}
private HashMap<String, List<String>> m_params = new HashMap<String, List<String>>();
}

33
libraries/launcher/org/multimc/Utils.java
View File

@ -16,21 +16,10 @@
package org.multimc;
import java.io.*;
import java.io.File;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.net.URL;
import java.net.URLClassLoader;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.*;
import java.util.Arrays;
import java.util.Enumeration;
import java.util.List;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
public class Utils
{
@ -93,27 +82,5 @@ public class Utils
return null;
}
/**
* Log to the launcher console
*
* @param message A String containing the message
* @param level A String containing the level name. See MinecraftLauncher::getLevel()
*/
public static void log(String message, String level)
{
// Kinda dirty
String tag = "!![" + level + "]!";
System.out.println(tag + message.replace("\n", "\n" + tag));
}
public static void log(String message)
{
log(message, "Launcher");
}
public static void log()
{
System.out.println();
}
}

46
libraries/launcher/org/multimc/onesix/OneSixLauncher.java
View File

@ -19,14 +19,18 @@ import org.multimc.*;
import java.applet.Applet;
import java.io.File;
import java.io.IOException;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
public class OneSixLauncher implements Launcher
{
private static final Logger LOGGER = Logger.getLogger("OneSixLauncher");
// parameters, separated from ParamBucket
private List<String> libraries;
private List<String> mcparams;
@ -104,7 +108,7 @@ public class OneSixLauncher implements Launcher
if (f == null)
{
System.err.println("Could not find Minecraft path field.");
LOGGER.warning("Could not find Minecraft path field.");
}
else
{
@ -113,8 +117,12 @@ public class OneSixLauncher implements Launcher
}
} catch (Exception e)
{
System.err.println("Could not set base folder. Failed to find/access Minecraft main class:");
e.printStackTrace(System.err);
LOGGER.log(
Level.SEVERE,
"Could not set base folder. Failed to find/access Minecraft main class:",
e
);
return -1;
}
@ -122,7 +130,7 @@ public class OneSixLauncher implements Launcher
if(!traits.contains("noapplet"))
{
Utils.log("Launching with applet wrapper...");
LOGGER.info("Launching with applet wrapper...");
try
{
Class<?> MCAppletClass = cl.loadClass(appletClass);
@ -132,10 +140,9 @@ public class OneSixLauncher implements Launcher
return 0;
} catch (Exception e)
{
Utils.log("Applet wrapper failed:", "Error");
e.printStackTrace(System.err);
Utils.log();
Utils.log("Falling back to using main class.");
LOGGER.log(Level.SEVERE, "Applet wrapper failed:", e);
LOGGER.warning("Falling back to using main class.");
}
}
@ -147,8 +154,8 @@ public class OneSixLauncher implements Launcher
return 0;
} catch (Exception e)
{
Utils.log("Failed to invoke the Minecraft main class:", "Fatal");
e.printStackTrace(System.err);
LOGGER.log(Level.SEVERE, "Failed to invoke the Minecraft main class:", e);
return -1;
}
}
@ -185,8 +192,8 @@ public class OneSixLauncher implements Launcher
mc = cl.loadClass(mainClass);
} catch (ClassNotFoundException e)
{
System.err.println("Failed to find Minecraft main class:");
e.printStackTrace(System.err);
LOGGER.log(Level.SEVERE, "Failed to find Minecraft main class:", e);
return -1;
}
@ -197,8 +204,8 @@ public class OneSixLauncher implements Launcher
meth = mc.getMethod("main", String[].class);
} catch (NoSuchMethodException e)
{
System.err.println("Failed to acquire the main method:");
e.printStackTrace(System.err);
LOGGER.log(Level.SEVERE, "Failed to acquire the main method:", e);
return -1;
}
@ -210,8 +217,8 @@ public class OneSixLauncher implements Launcher
meth.invoke(null, (Object) paramsArray);
} catch (Exception e)
{
System.err.println("Failed to start Minecraft:");
e.printStackTrace(System.err);
LOGGER.log(Level.SEVERE, "Failed to start Minecraft:", e);
return -1;
}
return 0;
@ -226,8 +233,8 @@ public class OneSixLauncher implements Launcher
processParams(params);
} catch (NotFoundException e)
{
System.err.println("Not enough arguments.");
e.printStackTrace(System.err);
LOGGER.log(Level.SEVERE, "Not enough arguments!");
return -1;
}
@ -245,4 +252,5 @@ public class OneSixLauncher implements Launcher
return launchWithMainClass();
}
}
}