From 69f21ce3868015922e7b40ebc517d0c8c18eb748 Mon Sep 17 00:00:00 2001 From: Dark98 Date: Wed, 6 Oct 2021 16:11:35 +0100 Subject: [PATCH] Cleanup & Remove Some Uneeded Args(-server/-login/-loadlocal) --- src/main/java/org/parabot/Landing.java | 37 +++----------------- src/main/java/org/parabot/core/Core.java | 34 ------------------ src/main/java/org/parabot/core/ui/BotUI.java | 4 +-- 3 files changed, 6 insertions(+), 69 deletions(-) diff --git a/src/main/java/org/parabot/Landing.java b/src/main/java/org/parabot/Landing.java index c6130fa..f1b0e8a 100644 --- a/src/main/java/org/parabot/Landing.java +++ b/src/main/java/org/parabot/Landing.java @@ -21,8 +21,6 @@ import javax.swing.UIManager; * @see Homepage */ public final class Landing { - private static String username; - private static String password; public static void main(String... args) { // Thread.setDefaultUncaughtExceptionHandler(new FileExceptionHandler(ExceptionHandler.ExceptionType.CLIENT)); @@ -40,8 +38,6 @@ public final class Landing { Directories.validate(); - Core.verbose("Debug mode: " + Core.inDebugMode()); - try { Core.verbose("Setting look and feel: " + UIManager.getSystemLookAndFeelClassName()); @@ -50,27 +46,16 @@ public final class Landing { t.printStackTrace(); } - if (!Core.inDebugMode() && Core.hasValidation() && !Core.isValid()) { + if (Core.hasValidation() && !Core.isValid()) { if (Core.newVersionAlert() == JOptionPane.YES_OPTION) { Core.downloadNewVersion(); return; } } - Core.verbose("Validating account manager..."); - - if (username != null && password != null) { - new BotUI(username, password); - username = null; - password = null; - return; - } - - Core.verbose("Starting login gui..."); - Core.setDebug(true); //offline mode - Directories.clearCache(); //clear cache + Core.verbose("Starting 2006Scape..."); ServerSelector.initServer = "2006Scape"; - new BotUI(null, null); + new BotUI(); } private static void parseArgs(String... args) { @@ -82,28 +67,14 @@ public final class Landing { System.out.println("Directories created, you can now run parabot."); System.exit(0); break; + case "-dump": case "-debug": Core.setDump(true); - case "-offlinemode": - Core.setDebug(true); break; case "-v": case "-verbose": Core.setVerbose(true); break; - case "-server": - ServerSelector.initServer = args[++i]; - break; - case "-login": - username = args[++i]; - password = args[++i]; - break; - case "-loadlocal": - Core.setLoadLocal(true); - break; - case "-dump": - Core.setDump(true); - break; case "-scriptsbin": Directories.setScriptCompiledDirectory(new File(args[++i])); break; diff --git a/src/main/java/org/parabot/core/Core.java b/src/main/java/org/parabot/core/Core.java index 9622a7b..0ca68e0 100644 --- a/src/main/java/org/parabot/core/Core.java +++ b/src/main/java/org/parabot/core/Core.java @@ -30,10 +30,8 @@ public class Core { private static final Version currentVersion = Configuration.BOT_VERSION; private static int quickLaunchByUuid = -1; // used like -server, but denoted by an Int rather than the server name - private static boolean debug; // Debug mode is Offline Mode. No BDN connection for Servers/Scripts/User Login. Not related to debug messages. private static boolean verbose; private static boolean dump; - private static boolean loadLocal; //Loads both local and public scripts/servers private static boolean validate = true; private static boolean secure = true; @@ -53,31 +51,6 @@ public class Core { Core.quickLaunchByUuid = quickLaunchByUuid; } - /** - * Enabled loadLocal mode - * - * @param loadLocal - */ - public static void setLoadLocal(final boolean loadLocal) { - Core.loadLocal = loadLocal; - } - - /** - * @return if the client is in loadLocal mode. - */ - public static boolean inLoadLocal() { - return loadLocal; - } - - /** - * Set debug mode AKA Offline Mode. If true, BDN login will be skipped, so BDN Servers or Scripts will be unavailable. - * - * @param debug - */ - public static void setDebug(final boolean debug) { - Core.debug = debug; - } - /** * Enables dump mode * @@ -101,13 +74,6 @@ public class Core { return secure; } - /** - * @return if the client is in debug mode AKA Offline Mode. BDN Servers and Scripts are unavailable. - */ - public static boolean inDebugMode() { - return debug; - } - /** * @return if the client is in verbose mode. */ diff --git a/src/main/java/org/parabot/core/ui/BotUI.java b/src/main/java/org/parabot/core/ui/BotUI.java index d2e1089..6c448f8 100644 --- a/src/main/java/org/parabot/core/ui/BotUI.java +++ b/src/main/java/org/parabot/core/ui/BotUI.java @@ -56,7 +56,7 @@ public class BotUI extends JFrame implements ActionListener, ComponentListener, private JMenuItem run, pause, stop, cacheClear, notifications; private boolean runScript, pauseScript; - public BotUI(String username, String password) { + public BotUI() { if (instance != null) { throw new IllegalStateException("BotUI already created"); } @@ -73,7 +73,7 @@ public class BotUI extends JFrame implements ActionListener, ComponentListener, addWindowListener(this); add(GamePanel.getInstance()); - GamePanel.getInstance().add(VerboseLoader.get(username, password), BorderLayout.CENTER); + GamePanel.getInstance().add(VerboseLoader.get(), BorderLayout.CENTER); add(Logger.getInstance(), BorderLayout.SOUTH); SwingUtil.setParabotIcons(this);