Remove TranslationHelper api Services

This commit is contained in:
Dark98
2021-10-06 15:23:14 +01:00
parent 160ce2e72e
commit 3d06024d36
3 changed files with 22 additions and 25 deletions
+5 -6
View File
@@ -1,6 +1,5 @@
package org.parabot; package org.parabot;
import org.parabot.api.translations.TranslationHelper;
import org.parabot.core.Context; import org.parabot.core.Context;
import org.parabot.core.Core; import org.parabot.core.Core;
import org.parabot.core.Directories; import org.parabot.core.Directories;
@@ -41,10 +40,10 @@ public final class Landing {
Directories.validate(); Directories.validate();
Core.verbose(TranslationHelper.translate("DEBUG_MODE") + Core.inDebugMode()); Core.verbose("Debug mode: " + Core.inDebugMode());
try { try {
Core.verbose(TranslationHelper.translate("SETTING_LOOK_AND_FEEL") Core.verbose("Setting look and feel: "
+ UIManager.getSystemLookAndFeelClassName()); + UIManager.getSystemLookAndFeelClassName());
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
} catch (Throwable t) { } 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) { if (username != null && password != null) {
new BotUI(username, password); new BotUI(username, password);
@@ -67,7 +66,7 @@ public final class Landing {
return; return;
} }
Core.verbose(TranslationHelper.translate("STARTING_LOGIN_GUI")); Core.verbose("Starting login gui...");
Core.setDebug(true); //offline mode Core.setDebug(true); //offline mode
Directories.clearCache(); //clear cache Directories.clearCache(); //clear cache
ServerSelector.initServer = "2006Scape"; ServerSelector.initServer = "2006Scape";
@@ -80,7 +79,7 @@ public final class Landing {
switch (arg.toLowerCase()) { switch (arg.toLowerCase()) {
case "-createdirs": case "-createdirs":
Directories.validate(); Directories.validate();
System.out.println(TranslationHelper.translate(("DIRECTORIES_CREATED"))); System.out.println("Directories created, you can now run parabot.");
System.exit(0); System.exit(0);
break; break;
case "-debug": case "-debug":
+13 -14
View File
@@ -1,7 +1,6 @@
package org.parabot.core; package org.parabot.core;
import org.json.simple.parser.JSONParser; import org.json.simple.parser.JSONParser;
import org.parabot.api.translations.TranslationHelper;
import org.parabot.core.asm.ASMClassLoader; import org.parabot.core.asm.ASMClassLoader;
import org.parabot.core.classpath.ClassPath; import org.parabot.core.classpath.ClassPath;
import org.parabot.core.desc.ServerProviderInfo; import org.parabot.core.desc.ServerProviderInfo;
@@ -197,7 +196,7 @@ public class Context {
setClientInstance(gameApplet); setClientInstance(gameApplet);
} }
Core.verbose(TranslationHelper.translate("APPLET_FETCHED")); Core.verbose("Applet fetched.");
final GamePanel panel = GamePanel.getInstance(); final GamePanel panel = GamePanel.getInstance();
final Dimension appletSize = serverProvider.getGameDimensions(); final Dimension appletSize = serverProvider.getGameDimensions();
@@ -227,14 +226,14 @@ public class Context {
} }
}, 1000); }, 1000);
Core.verbose(TranslationHelper.translate("INIT_MOUSE")); Core.verbose("Initializing mouse...");
serverProvider.initMouse(); serverProvider.initMouse();
Core.verbose(TranslationHelper.translate("DONE")); Core.verbose("Done.");
Core.verbose(TranslationHelper.translate("INIT_KEYBOARD")); Core.verbose("Initializing keyboard...");
serverProvider.initKeyboard(); 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(); this.pbKeyListener = new PBKeyListener();
applet.addKeyListener(this.pbKeyListener); applet.addKeyListener(this.pbKeyListener);
@@ -247,18 +246,18 @@ public class Context {
* Loads the game * Loads the game
*/ */
public void load() { public void load() {
Core.verbose(TranslationHelper.translate("PARSING_SERVER_JAR")); Core.verbose("Parsing server jar...");
serverProvider.init(); serverProvider.init();
serverProvider.parseJar(); serverProvider.parseJar();
Core.verbose(TranslationHelper.translate("DONE")); Core.verbose("Done.");
Core.verbose(TranslationHelper.translate("INJECTING_HOOKS")); Core.verbose("Injecting hooks...");
serverProvider.injectHooks(); serverProvider.injectHooks();
Core.verbose(TranslationHelper.translate("DONE")); Core.verbose("Done.");
Core.verbose(TranslationHelper.translate("FETCHING_GAME_APPLET")); Core.verbose("Fetching game applet...");
if (Core.shouldDump()) { if (Core.shouldDump()) {
Core.verbose(TranslationHelper.translate("DUMPING_INJECTED_CLIENT")); Core.verbose("Dumping injected client...");
classPath.dump(new File(Directories.getWorkspace(), "dump.jar")); classPath.dump(new File(Directories.getWorkspace(), "dump.jar"));
Core.verbose(TranslationHelper.translate("DONE")); Core.verbose("Done.");
} }
Applet applet = serverProvider.fetchApplet(); Applet applet = serverProvider.fetchApplet();
+4 -5
View File
@@ -3,7 +3,6 @@ package org.parabot.core;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import org.json.simple.parser.ParseException; import org.json.simple.parser.ParseException;
import org.parabot.Landing; import org.parabot.Landing;
import org.parabot.api.translations.TranslationHelper;
import org.parabot.core.ui.utils.UILog; import org.parabot.core.ui.utils.UILog;
import org.parabot.environment.api.utils.Version; import org.parabot.environment.api.utils.Version;
import org.parabot.environment.api.utils.WebUtil; import org.parabot.environment.api.utils.WebUtil;
@@ -183,16 +182,16 @@ public class Core {
} }
public static void downloadNewVersion() { public static void downloadNewVersion() {
UILog.log(TranslationHelper.translate("UPDATES"), UILog.log("Updates",
TranslationHelper.translate("DOWNLOAD_UPDATE_PARABOT_AT") "Please download the newest version of Parabot at "
+ Configuration.DOWNLOAD_BOT + (currentVersion.isNightly() ? Configuration.NIGHTLY_APPEND : ""), + Configuration.DOWNLOAD_BOT + (currentVersion.isNightly() ? Configuration.NIGHTLY_APPEND : ""),
JOptionPane.INFORMATION_MESSAGE); JOptionPane.INFORMATION_MESSAGE);
URI uri = URI.create(Configuration.API_DOWNLOAD_BOT + (currentVersion.isNightly() ? Configuration.NIGHTLY_APPEND : "")); URI uri = URI.create(Configuration.API_DOWNLOAD_BOT + (currentVersion.isNightly() ? Configuration.NIGHTLY_APPEND : ""));
try { try {
Desktop.getDesktop().browse(uri); Desktop.getDesktop().browse(uri);
} catch (IOException e1) { } catch (IOException e1) {
JOptionPane.showMessageDialog(null, TranslationHelper.translate("CONNECTION_ERROR"), JOptionPane.showMessageDialog(null, "Connection Error",
TranslationHelper.translate("ERROR"), JOptionPane.ERROR_MESSAGE); "Error", JOptionPane.ERROR_MESSAGE);
e1.printStackTrace(); e1.printStackTrace();
} }
} }