From 3d06024d368f15dc6d4e34e4aff5341bad538226 Mon Sep 17 00:00:00 2001 From: Dark98 Date: Wed, 6 Oct 2021 15:23:14 +0100 Subject: [PATCH] Remove TranslationHelper api Services --- src/main/java/org/parabot/Landing.java | 11 ++++----- src/main/java/org/parabot/core/Context.java | 27 ++++++++++----------- src/main/java/org/parabot/core/Core.java | 9 +++---- 3 files changed, 22 insertions(+), 25 deletions(-) diff --git a/src/main/java/org/parabot/Landing.java b/src/main/java/org/parabot/Landing.java index 06466bd..c6130fa 100644 --- a/src/main/java/org/parabot/Landing.java +++ b/src/main/java/org/parabot/Landing.java @@ -1,6 +1,5 @@ package org.parabot; -import org.parabot.api.translations.TranslationHelper; import org.parabot.core.Context; import org.parabot.core.Core; import org.parabot.core.Directories; @@ -41,10 +40,10 @@ public final class Landing { Directories.validate(); - Core.verbose(TranslationHelper.translate("DEBUG_MODE") + Core.inDebugMode()); + Core.verbose("Debug mode: " + Core.inDebugMode()); try { - Core.verbose(TranslationHelper.translate("SETTING_LOOK_AND_FEEL") + Core.verbose("Setting look and feel: " + UIManager.getSystemLookAndFeelClassName()); UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); } catch (Throwable t) { @@ -58,7 +57,7 @@ public final class Landing { } } - Core.verbose(TranslationHelper.translate("VALIDATION_ACCOUNT_MANAGER")); + Core.verbose("Validating account manager..."); if (username != null && password != null) { new BotUI(username, password); @@ -67,7 +66,7 @@ public final class Landing { return; } - Core.verbose(TranslationHelper.translate("STARTING_LOGIN_GUI")); + Core.verbose("Starting login gui..."); Core.setDebug(true); //offline mode Directories.clearCache(); //clear cache ServerSelector.initServer = "2006Scape"; @@ -80,7 +79,7 @@ public final class Landing { switch (arg.toLowerCase()) { case "-createdirs": Directories.validate(); - System.out.println(TranslationHelper.translate(("DIRECTORIES_CREATED"))); + System.out.println("Directories created, you can now run parabot."); System.exit(0); break; case "-debug": diff --git a/src/main/java/org/parabot/core/Context.java b/src/main/java/org/parabot/core/Context.java index 36cb62f..fd76e2f 100644 --- a/src/main/java/org/parabot/core/Context.java +++ b/src/main/java/org/parabot/core/Context.java @@ -1,7 +1,6 @@ package org.parabot.core; import org.json.simple.parser.JSONParser; -import org.parabot.api.translations.TranslationHelper; import org.parabot.core.asm.ASMClassLoader; import org.parabot.core.classpath.ClassPath; import org.parabot.core.desc.ServerProviderInfo; @@ -197,7 +196,7 @@ public class Context { setClientInstance(gameApplet); } - Core.verbose(TranslationHelper.translate("APPLET_FETCHED")); + Core.verbose("Applet fetched."); final GamePanel panel = GamePanel.getInstance(); final Dimension appletSize = serverProvider.getGameDimensions(); @@ -227,14 +226,14 @@ public class Context { } }, 1000); - Core.verbose(TranslationHelper.translate("INIT_MOUSE")); + Core.verbose("Initializing mouse..."); serverProvider.initMouse(); - Core.verbose(TranslationHelper.translate("DONE")); - Core.verbose(TranslationHelper.translate("INIT_KEYBOARD")); + Core.verbose("Done."); + Core.verbose("Initializing keyboard..."); serverProvider.initKeyboard(); - Core.verbose(TranslationHelper.translate("DONE")); + Core.verbose("Done."); - Core.verbose(TranslationHelper.translate("INIT_KEY_LISTENER")); + Core.verbose("Initializing key listener..."); this.pbKeyListener = new PBKeyListener(); applet.addKeyListener(this.pbKeyListener); @@ -247,18 +246,18 @@ public class Context { * Loads the game */ public void load() { - Core.verbose(TranslationHelper.translate("PARSING_SERVER_JAR")); + Core.verbose("Parsing server jar..."); serverProvider.init(); serverProvider.parseJar(); - Core.verbose(TranslationHelper.translate("DONE")); - Core.verbose(TranslationHelper.translate("INJECTING_HOOKS")); + Core.verbose("Done."); + Core.verbose("Injecting hooks..."); serverProvider.injectHooks(); - Core.verbose(TranslationHelper.translate("DONE")); - Core.verbose(TranslationHelper.translate("FETCHING_GAME_APPLET")); + Core.verbose("Done."); + Core.verbose("Fetching game applet..."); if (Core.shouldDump()) { - Core.verbose(TranslationHelper.translate("DUMPING_INJECTED_CLIENT")); + Core.verbose("Dumping injected client..."); classPath.dump(new File(Directories.getWorkspace(), "dump.jar")); - Core.verbose(TranslationHelper.translate("DONE")); + Core.verbose("Done."); } Applet applet = serverProvider.fetchApplet(); diff --git a/src/main/java/org/parabot/core/Core.java b/src/main/java/org/parabot/core/Core.java index 70412dc..9622a7b 100644 --- a/src/main/java/org/parabot/core/Core.java +++ b/src/main/java/org/parabot/core/Core.java @@ -3,7 +3,6 @@ package org.parabot.core; import org.json.simple.JSONObject; import org.json.simple.parser.ParseException; import org.parabot.Landing; -import org.parabot.api.translations.TranslationHelper; import org.parabot.core.ui.utils.UILog; import org.parabot.environment.api.utils.Version; import org.parabot.environment.api.utils.WebUtil; @@ -183,16 +182,16 @@ public class Core { } public static void downloadNewVersion() { - UILog.log(TranslationHelper.translate("UPDATES"), - TranslationHelper.translate("DOWNLOAD_UPDATE_PARABOT_AT") + UILog.log("Updates", + "Please download the newest version of Parabot at " + Configuration.DOWNLOAD_BOT + (currentVersion.isNightly() ? Configuration.NIGHTLY_APPEND : ""), JOptionPane.INFORMATION_MESSAGE); URI uri = URI.create(Configuration.API_DOWNLOAD_BOT + (currentVersion.isNightly() ? Configuration.NIGHTLY_APPEND : "")); try { Desktop.getDesktop().browse(uri); } catch (IOException e1) { - JOptionPane.showMessageDialog(null, TranslationHelper.translate("CONNECTION_ERROR"), - TranslationHelper.translate("ERROR"), JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(null, "Connection Error", + "Error", JOptionPane.ERROR_MESSAGE); e1.printStackTrace(); } }