From f67d0ce9851c5591ba555ff98425181f3c57acf9 Mon Sep 17 00:00:00 2001 From: Jeroen Ketelaar Date: Tue, 21 May 2019 22:12:18 -0500 Subject: [PATCH] [TASK] Formatted code --- .../environment/servers/ServerProvider.java | 49 ++++++++++--------- .../servers/loader/ServerLoader.java | 5 +- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/src/main/java/org/parabot/environment/servers/ServerProvider.java b/src/main/java/org/parabot/environment/servers/ServerProvider.java index ae9b5ba..78ca006 100644 --- a/src/main/java/org/parabot/environment/servers/ServerProvider.java +++ b/src/main/java/org/parabot/environment/servers/ServerProvider.java @@ -77,7 +77,7 @@ public abstract class ServerProvider implements Opcodes { return; } - HookParser parser = hookFile.getParser(); + HookParser parser = hookFile.getParser(); Injectable[] injectables = parser.getInjectables(); if (injectables == null) { @@ -92,17 +92,18 @@ public abstract class ServerProvider implements Opcodes { index++; } } catch (NullPointerException ex) { - if(!crashed) { + if (!crashed) { Injectable inj = injectables[index]; - int resp = UILog.alert("Outdated client", "This server currently has outdated hooks, please report it to a member of the Parabot staff.\r\n\r\n" + - "Broken hook:\r\n"+inj, new Object[]{"Close", "Report here..."}, JOptionPane.ERROR_MESSAGE); + int resp = UILog.alert("Outdated client", "This server currently has outdated hooks, please report it to the Parabot staff.\r\n\r\n" + + "Broken hook:\r\n" + inj, new Object[]{ "Close", "Report here..." }, JOptionPane.ERROR_MESSAGE); - if(resp == 1) { + if (resp == 1) { URI uri = URI.create(Configuration.COMMUNITY_PAGE + "forum/135-reports/"); try { Desktop.getDesktop().browse(uri); - } catch (IOException ignore) {} + } catch (IOException ignore) { + } } } crashed = true; @@ -112,20 +113,6 @@ public abstract class ServerProvider implements Opcodes { Context.getInstance().setHookParser(parser); } - private HookFile fetchHookFile() { - HookFile hookFile = getHookFile(); - if (hookFile != null) { - return hookFile; - } - - URL hookLocation = getHooks(); - if (hookLocation == null) { - return null; - } - - return new HookFile(hookLocation, HookFile.TYPE_XML); - } - /** * Add custom items to the bot menu bar * @@ -156,16 +143,16 @@ public abstract class ServerProvider implements Opcodes { public void initMouse() { final Context context = Context.getInstance(); - final Applet applet = context.getApplet(); - final Mouse mouse = new Mouse(applet); + final Applet applet = context.getApplet(); + final Mouse mouse = new Mouse(applet); applet.addMouseListener(mouse); applet.addMouseMotionListener(mouse); context.setMouse(mouse); } public void initKeyboard() { - final Context context = Context.getInstance(); - final Applet applet = context.getApplet(); + final Context context = Context.getInstance(); + final Applet applet = context.getApplet(); final Keyboard keyboard = new Keyboard(applet); applet.addKeyListener(keyboard); context.setKeyboard(keyboard); @@ -191,4 +178,18 @@ public abstract class ServerProvider implements Opcodes { } + private HookFile fetchHookFile() { + HookFile hookFile = getHookFile(); + if (hookFile != null) { + return hookFile; + } + + URL hookLocation = getHooks(); + if (hookLocation == null) { + return null; + } + + return new HookFile(hookLocation, HookFile.TYPE_XML); + } + } diff --git a/src/main/java/org/parabot/environment/servers/loader/ServerLoader.java b/src/main/java/org/parabot/environment/servers/loader/ServerLoader.java index 4ed965b..7f214a6 100644 --- a/src/main/java/org/parabot/environment/servers/loader/ServerLoader.java +++ b/src/main/java/org/parabot/environment/servers/loader/ServerLoader.java @@ -29,8 +29,9 @@ public class ServerLoader extends ASMClassLoader { public final String[] getServerClassNames() { final List classNames = new ArrayList(); for (ClassNode c : classPath.classes.values()) { - if (c.superName.replace('/', '.').equals( - ServerProvider.class.getName())) { + if (c.superName + .replace('/', '.') + .equals(ServerProvider.class.getName())) { classNames.add(c.name.replace('/', '.')); } }