From 4abf3a20c6fe3763e57b76ec873cc2355d067b90 Mon Sep 17 00:00:00 2001 From: TheKodeToad Date: Thu, 3 Nov 2022 18:39:34 +0000 Subject: [PATCH] More standard code formatting profile Signed-off-by: TheKodeToad --- libraries/launcher/formatting-profile.xml | 6 +- .../launcher/net/minecraft/Launcher.java | 62 +++++++++++-------- .../org/prismlauncher/EntryPoint.java | 17 ++--- .../launcher/impl/AbstractLauncher.java | 3 +- .../launcher/impl/StandardLauncher.java | 7 ++- .../launcher/impl/legacy/LegacyFrame.java | 12 ++-- .../launcher/impl/legacy/LegacyLauncher.java | 6 +- .../org/prismlauncher/utils/Parameters.java | 15 ++--- .../prismlauncher/utils/ReflectionUtils.java | 17 +++-- .../org/prismlauncher/utils/StringUtils.java | 6 +- 10 files changed, 75 insertions(+), 76 deletions(-) diff --git a/libraries/launcher/formatting-profile.xml b/libraries/launcher/formatting-profile.xml index bebc783e5..1b3348382 100644 --- a/libraries/launcher/formatting-profile.xml +++ b/libraries/launcher/formatting-profile.xml @@ -246,11 +246,11 @@ - + - + @@ -262,7 +262,7 @@ - + diff --git a/libraries/launcher/net/minecraft/Launcher.java b/libraries/launcher/net/minecraft/Launcher.java index ce9b59d40..3bd38e77f 100644 --- a/libraries/launcher/net/minecraft/Launcher.java +++ b/libraries/launcher/net/minecraft/Launcher.java @@ -81,10 +81,11 @@ public final class Launcher extends Applet implements AppletStub { private final URL documentBase; private boolean active = false; - public Launcher(Applet applet) { this(applet, null); } + public Launcher(Applet applet) { + this(applet, null); + } - public Launcher(Applet applet, URL documentBase) - { + public Launcher(Applet applet, URL documentBase) { setLayout(new BorderLayout()); this.add(applet, "Center"); @@ -108,8 +109,7 @@ public final class Launcher extends Applet implements AppletStub { } } - public void replace(Applet applet) - { + public void replace(Applet applet) { wrappedApplet = applet; applet.setStub(this); @@ -128,14 +128,17 @@ public final class Launcher extends Applet implements AppletStub { } @Override - public boolean isActive() { return active; } + public boolean isActive() { + return active; + } @Override - public URL getDocumentBase() { return documentBase; } + public URL getDocumentBase() { + return documentBase; + } @Override - public URL getCodeBase() - { + public URL getCodeBase() { try { // TODO: 2022-10-27 Can this be changed to https? return new URL("http://www.minecraft.net/game/"); @@ -145,8 +148,7 @@ public final class Launcher extends Applet implements AppletStub { } @Override - public String getParameter(String name) - { + public String getParameter(String name) { String param = params.get(name); if (param != null) @@ -161,54 +163,62 @@ public final class Launcher extends Applet implements AppletStub { } @Override - public void resize(int width, int height) { wrappedApplet.resize(width, height); } + public void resize(int width, int height) { + wrappedApplet.resize(width, height); + } @Override - public void resize(Dimension size) { wrappedApplet.resize(size); } + public void resize(Dimension size) { + wrappedApplet.resize(size); + } @Override - public void init() - { + public void init() { if (wrappedApplet != null) wrappedApplet.init(); } @Override - public void start() - { + public void start() { wrappedApplet.start(); active = true; } @Override - public void stop() - { + public void stop() { wrappedApplet.stop(); active = false; } @Override - public void destroy() { wrappedApplet.destroy(); } + public void destroy() { + wrappedApplet.destroy(); + } @Override - public void appletResize(int width, int height) { wrappedApplet.resize(width, height); } + public void appletResize(int width, int height) { + wrappedApplet.resize(width, height); + } @Override - public void setVisible(boolean visible) - { + public void setVisible(boolean visible) { super.setVisible(visible); wrappedApplet.setVisible(visible); } @Override - public void paint(Graphics graphics) {} + public void paint(Graphics graphics) { + } @Override - public void update(Graphics graphics) {} + public void update(Graphics graphics) { + } - public void setParameter(String name, String value) { params.put(name, value); } + public void setParameter(String name, String value) { + params.put(name, value); + } } diff --git a/libraries/launcher/org/prismlauncher/EntryPoint.java b/libraries/launcher/org/prismlauncher/EntryPoint.java index 06c6c79ca..5332bfc7c 100644 --- a/libraries/launcher/org/prismlauncher/EntryPoint.java +++ b/libraries/launcher/org/prismlauncher/EntryPoint.java @@ -72,10 +72,10 @@ import java.util.logging.Logger; public final class EntryPoint { private static final Logger LOGGER = Logger.getLogger("EntryPoint"); - private EntryPoint() {} + private EntryPoint() { + } - public static void main(String[] args) - { + public static void main(String[] args) { ExitCode exitCode = listen(); if (exitCode != ExitCode.NORMAL) { @@ -85,8 +85,7 @@ public final class EntryPoint { } } - private static PreLaunchAction parseLine(String input, Parameters params) throws ParseException - { + private static PreLaunchAction parseLine(String input, Parameters params) throws ParseException { if (input.isEmpty()) return PreLaunchAction.PROCEED; @@ -109,8 +108,7 @@ public final class EntryPoint { } } - private static ExitCode listen() - { + private static ExitCode listen() { Parameters parameters = new Parameters(); PreLaunchAction preLaunchAction = PreLaunchAction.PROCEED; @@ -179,7 +177,10 @@ public final class EntryPoint { private final int numericalCode; - ExitCode(int numericalCode) { this.numericalCode = numericalCode; } + ExitCode(int numericalCode) { + this.numericalCode = numericalCode; + } + } } diff --git a/libraries/launcher/org/prismlauncher/launcher/impl/AbstractLauncher.java b/libraries/launcher/org/prismlauncher/launcher/impl/AbstractLauncher.java index 7677df56d..938e34030 100644 --- a/libraries/launcher/org/prismlauncher/launcher/impl/AbstractLauncher.java +++ b/libraries/launcher/org/prismlauncher/launcher/impl/AbstractLauncher.java @@ -79,8 +79,7 @@ public abstract class AbstractLauncher implements Launcher { protected final String mainClassName; - protected AbstractLauncher(Parameters params) - { + protected AbstractLauncher(Parameters params) { this.mcParams = params.getList("param", new ArrayList()); this.mainClassName = params.getString("mainClass", "net.minecraft.client.Minecraft"); diff --git a/libraries/launcher/org/prismlauncher/launcher/impl/StandardLauncher.java b/libraries/launcher/org/prismlauncher/launcher/impl/StandardLauncher.java index 43d706d60..0652cbaee 100644 --- a/libraries/launcher/org/prismlauncher/launcher/impl/StandardLauncher.java +++ b/libraries/launcher/org/prismlauncher/launcher/impl/StandardLauncher.java @@ -62,11 +62,12 @@ import java.lang.invoke.MethodHandle; public final class StandardLauncher extends AbstractLauncher { - public StandardLauncher(Parameters params) { super(params); } + public StandardLauncher(Parameters params) { + super(params); + } @Override - public void launch() throws Throwable - { + public void launch() throws Throwable { // window size, title and state // FIXME: there is no good way to maximize the minecraft window from here. diff --git a/libraries/launcher/org/prismlauncher/launcher/impl/legacy/LegacyFrame.java b/libraries/launcher/org/prismlauncher/launcher/impl/legacy/LegacyFrame.java index 198fb61a7..d2496fa90 100644 --- a/libraries/launcher/org/prismlauncher/launcher/impl/legacy/LegacyFrame.java +++ b/libraries/launcher/org/prismlauncher/launcher/impl/legacy/LegacyFrame.java @@ -83,8 +83,7 @@ public final class LegacyFrame extends JFrame { private final Launcher launcher; - public LegacyFrame(String title, Applet applet) - { + public LegacyFrame(String title, Applet applet) { super(title); launcher = new Launcher(applet); @@ -101,8 +100,7 @@ public final class LegacyFrame extends JFrame { } public void start(String user, String session, int width, int height, boolean maximize, String serverAddress, - String serverPort, boolean isDemo) - { + String serverPort, boolean isDemo) { // Implements support for launching in to multiplayer on classic servers using a // mpticket // file generated by an external program and stored in the instance's root @@ -166,12 +164,10 @@ public final class LegacyFrame extends JFrame { private final class ForceExitHandler extends WindowAdapter { @Override - public void windowClosing(WindowEvent event) - { + public void windowClosing(WindowEvent event) { new Thread(new Runnable() { @Override - public void run() - { + public void run() { try { Thread.sleep(30000L); } catch (InterruptedException e) { diff --git a/libraries/launcher/org/prismlauncher/launcher/impl/legacy/LegacyLauncher.java b/libraries/launcher/org/prismlauncher/launcher/impl/legacy/LegacyLauncher.java index aa899a61c..953f83d97 100644 --- a/libraries/launcher/org/prismlauncher/launcher/impl/legacy/LegacyLauncher.java +++ b/libraries/launcher/org/prismlauncher/launcher/impl/legacy/LegacyLauncher.java @@ -81,8 +81,7 @@ public final class LegacyLauncher extends AbstractLauncher { private final boolean usesApplet; private final String cwd; - public LegacyLauncher(Parameters params) - { + public LegacyLauncher(Parameters params) { super(params); user = params.getString("userName"); @@ -97,8 +96,7 @@ public final class LegacyLauncher extends AbstractLauncher { } @Override - public void launch() throws Throwable - { + public void launch() throws Throwable { Class main = ClassLoader.getSystemClassLoader().loadClass(this.mainClassName); Field gameDirField = ReflectionUtils.getMinecraftGameDirField(main); diff --git a/libraries/launcher/org/prismlauncher/utils/Parameters.java b/libraries/launcher/org/prismlauncher/utils/Parameters.java index 3378775fc..d019aa410 100644 --- a/libraries/launcher/org/prismlauncher/utils/Parameters.java +++ b/libraries/launcher/org/prismlauncher/utils/Parameters.java @@ -68,8 +68,7 @@ public final class Parameters { private final Map> map = new HashMap<>(); - public void add(String key, String value) - { + public void add(String key, String value) { List params = map.get(key); if (params == null) { @@ -81,8 +80,7 @@ public final class Parameters { params.add(value); } - public List getList(String key) throws ParameterNotFoundException - { + public List getList(String key) throws ParameterNotFoundException { List params = map.get(key); if (params == null) @@ -91,8 +89,7 @@ public final class Parameters { return params; } - public List getList(String key, List def) - { + public List getList(String key, List def) { List params = map.get(key); if (params == null || params.isEmpty()) @@ -101,8 +98,7 @@ public final class Parameters { return params; } - public String getString(String key) throws ParameterNotFoundException - { + public String getString(String key) throws ParameterNotFoundException { List list = getList(key); if (list.isEmpty()) @@ -111,8 +107,7 @@ public final class Parameters { return list.get(0); } - public String getString(String key, String def) - { + public String getString(String key, String def) { List params = map.get(key); if (params == null || params.isEmpty()) diff --git a/libraries/launcher/org/prismlauncher/utils/ReflectionUtils.java b/libraries/launcher/org/prismlauncher/utils/ReflectionUtils.java index 6e8823876..99df70c38 100644 --- a/libraries/launcher/org/prismlauncher/utils/ReflectionUtils.java +++ b/libraries/launcher/org/prismlauncher/utils/ReflectionUtils.java @@ -52,7 +52,8 @@ public final class ReflectionUtils { private static final Logger LOGGER = Logger.getLogger("ReflectionUtils"); - private ReflectionUtils() {} + private ReflectionUtils() { + } /** * Instantiate an applet class by name @@ -67,8 +68,7 @@ public final class ReflectionUtils { * 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, @@ -83,8 +83,7 @@ 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; @@ -141,8 +140,7 @@ public final class ReflectionUtils { * @throws IllegalAccessException If method handles cannot access the entrypoint */ public static MethodHandle findMainEntrypoint(Class entrypointClass) - throws NoSuchMethodException, IllegalAccessException - { + throws NoSuchMethodException, IllegalAccessException { return MethodHandles.lookup().findStatic(entrypointClass, "main", MethodType.methodType(void.class, String[].class)); } @@ -168,7 +166,8 @@ public final class ReflectionUtils { * @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)); + } } diff --git a/libraries/launcher/org/prismlauncher/utils/StringUtils.java b/libraries/launcher/org/prismlauncher/utils/StringUtils.java index 08e6770e9..a371b0cba 100644 --- a/libraries/launcher/org/prismlauncher/utils/StringUtils.java +++ b/libraries/launcher/org/prismlauncher/utils/StringUtils.java @@ -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;