Attempt to mimic clang-format
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
@ -68,7 +68,8 @@ public final class Parameters {
|
||||
|
||||
private final Map<String, List<String>> map = new HashMap<>();
|
||||
|
||||
public void add(String key, String value) {
|
||||
public void add(String key, String value)
|
||||
{
|
||||
List<String> params = map.get(key);
|
||||
|
||||
if (params == null) {
|
||||
@ -80,7 +81,8 @@ public final class Parameters {
|
||||
params.add(value);
|
||||
}
|
||||
|
||||
public List<String> getList(String key) throws ParameterNotFoundException {
|
||||
public List<String> getList(String key) throws ParameterNotFoundException
|
||||
{
|
||||
List<String> params = map.get(key);
|
||||
|
||||
if (params == null)
|
||||
@ -89,7 +91,8 @@ public final class Parameters {
|
||||
return params;
|
||||
}
|
||||
|
||||
public List<String> getList(String key, List<String> def) {
|
||||
public List<String> getList(String key, List<String> def)
|
||||
{
|
||||
List<String> params = map.get(key);
|
||||
|
||||
if (params == null || params.isEmpty())
|
||||
@ -98,7 +101,8 @@ public final class Parameters {
|
||||
return params;
|
||||
}
|
||||
|
||||
public String getString(String key) throws ParameterNotFoundException {
|
||||
public String getString(String key) throws ParameterNotFoundException
|
||||
{
|
||||
List<String> list = getList(key);
|
||||
|
||||
if (list.isEmpty())
|
||||
@ -107,7 +111,8 @@ public final class Parameters {
|
||||
return list.get(0);
|
||||
}
|
||||
|
||||
public String getString(String key, String def) {
|
||||
public String getString(String key, String def)
|
||||
{
|
||||
List<String> params = map.get(key);
|
||||
|
||||
if (params == null || params.isEmpty())
|
||||
|
@ -38,7 +38,6 @@
|
||||
|
||||
package org.prismlauncher.utils;
|
||||
|
||||
|
||||
import java.applet.Applet;
|
||||
import java.io.File;
|
||||
import java.lang.invoke.MethodHandle;
|
||||
@ -53,8 +52,7 @@ public final class ReflectionUtils {
|
||||
|
||||
private static final Logger LOGGER = Logger.getLogger("ReflectionUtils");
|
||||
|
||||
private ReflectionUtils() {
|
||||
}
|
||||
private ReflectionUtils() {}
|
||||
|
||||
/**
|
||||
* Instantiate an applet class by name
|
||||
@ -65,13 +63,16 @@ public final class ReflectionUtils {
|
||||
*
|
||||
* @throws ClassNotFoundException if the provided class name cannot be found
|
||||
* @throws NoSuchMethodException if the no-args constructor cannot be found
|
||||
* @throws IllegalAccessException if the constructor cannot be accessed via method handles
|
||||
* @throws IllegalAccessException if the constructor cannot be accessed via
|
||||
* method handles
|
||||
* @throws Throwable any exceptions from the class's constructor
|
||||
*/
|
||||
public static Applet createAppletClass(String appletClassName) throws Throwable {
|
||||
public static Applet createAppletClass(String appletClassName) throws Throwable
|
||||
{
|
||||
Class<?> appletClass = ClassLoader.getSystemClassLoader().loadClass(appletClassName);
|
||||
|
||||
MethodHandle appletConstructor = MethodHandles.lookup().findConstructor(appletClass, MethodType.methodType(void.class));
|
||||
MethodHandle appletConstructor = MethodHandles.lookup().findConstructor(appletClass,
|
||||
MethodType.methodType(void.class));
|
||||
return (Applet) appletConstructor.invoke();
|
||||
}
|
||||
|
||||
@ -82,7 +83,8 @@ public final class ReflectionUtils {
|
||||
*
|
||||
* @return The found field.
|
||||
*/
|
||||
public static Field getMinecraftGameDirField(Class<?> minecraftMainClass) {
|
||||
public static Field getMinecraftGameDirField(Class<?> minecraftMainClass)
|
||||
{
|
||||
LOGGER.fine("Resolving minecraft game directory field");
|
||||
// Field we're looking for is always
|
||||
// private static File obfuscatedName = null;
|
||||
@ -94,7 +96,6 @@ public final class ReflectionUtils {
|
||||
|
||||
int fieldModifiers = field.getModifiers();
|
||||
|
||||
|
||||
// Must be static
|
||||
if (!Modifier.isStatic(fieldModifiers)) {
|
||||
LOGGER.log(Level.FINE, "Rejecting field {0} because it is not static", field.getName());
|
||||
@ -113,7 +114,8 @@ public final class ReflectionUtils {
|
||||
continue;
|
||||
}
|
||||
|
||||
LOGGER.log(Level.FINE, "Identified field {0} to match conditions for minecraft game directory field", field.getName());
|
||||
LOGGER.log(Level.FINE, "Identified field {0} to match conditions for minecraft game directory field",
|
||||
field.getName());
|
||||
|
||||
return field;
|
||||
}
|
||||
@ -124,8 +126,7 @@ public final class ReflectionUtils {
|
||||
/**
|
||||
* Resolve main entrypoint and returns method handle for it.
|
||||
* <p>
|
||||
* Resolves a method that matches the following signature
|
||||
* <code>
|
||||
* Resolves a method that matches the following signature <code>
|
||||
* public static void main(String[] args) {
|
||||
* <p>
|
||||
* }
|
||||
@ -135,34 +136,39 @@ public final class ReflectionUtils {
|
||||
*
|
||||
* @return The method handle for the resolved entrypoint
|
||||
*
|
||||
* @throws NoSuchMethodException If no method matching the correct signature can be found
|
||||
* @throws NoSuchMethodException If no method matching the correct signature
|
||||
* can be found
|
||||
* @throws IllegalAccessException If method handles cannot access the entrypoint
|
||||
*/
|
||||
public static MethodHandle findMainEntrypoint(Class<?> entrypointClass) throws NoSuchMethodException, IllegalAccessException {
|
||||
return MethodHandles.lookup().findStatic(entrypointClass, "main", MethodType.methodType(void.class, String[].class));
|
||||
public static MethodHandle findMainEntrypoint(Class<?> entrypointClass)
|
||||
throws NoSuchMethodException, IllegalAccessException
|
||||
{
|
||||
return MethodHandles.lookup().findStatic(entrypointClass, "main",
|
||||
MethodType.methodType(void.class, String[].class));
|
||||
}
|
||||
|
||||
/**
|
||||
* Resolve main entrypoint and returns method handle for it.
|
||||
* <p>
|
||||
* Resolves a method that matches the following signature
|
||||
* <code>
|
||||
* Resolves a method that matches the following signature <code>
|
||||
* public static void main(String[] args) {
|
||||
* <p>
|
||||
* }
|
||||
* </code>
|
||||
*
|
||||
* @param entrypointClassName The name of the entrypoint class to resolve the method from
|
||||
* @param entrypointClassName The name of the entrypoint class to resolve the
|
||||
* method from
|
||||
*
|
||||
* @return The method handle for the resolved entrypoint
|
||||
*
|
||||
* @throws ClassNotFoundException If a class cannot be found with the provided name
|
||||
* @throws NoSuchMethodException If no method matching the correct signature can be found
|
||||
* @throws ClassNotFoundException If a class cannot be found with the provided
|
||||
* name
|
||||
* @throws NoSuchMethodException If no method matching the correct signature
|
||||
* can be found
|
||||
* @throws IllegalAccessException If method handles cannot access the entrypoint
|
||||
*/
|
||||
public static MethodHandle findMainMethod(String entrypointClassName)
|
||||
throws ClassNotFoundException, NoSuchMethodException, IllegalAccessException {
|
||||
return findMainEntrypoint(ClassLoader.getSystemClassLoader().loadClass(entrypointClassName));
|
||||
}
|
||||
throws ClassNotFoundException, NoSuchMethodException, IllegalAccessException
|
||||
{ return findMainEntrypoint(ClassLoader.getSystemClassLoader().loadClass(entrypointClassName)); }
|
||||
|
||||
}
|
||||
|
@ -38,10 +38,10 @@ package org.prismlauncher.utils;
|
||||
|
||||
public final class StringUtils {
|
||||
|
||||
private StringUtils() {
|
||||
}
|
||||
private StringUtils() {}
|
||||
|
||||
public static String[] splitStringPair(char splitChar, String input) {
|
||||
public static String[] splitStringPair(char splitChar, String input)
|
||||
{
|
||||
int splitPoint = input.indexOf(splitChar);
|
||||
if (splitPoint == -1)
|
||||
return null;
|
||||
|
Reference in New Issue
Block a user