2006-Scape/Parabot
1
0
Fork 0
mirror of https://github.com/2006-Scape/Parabot.git synced 2026-07-06 00:37:52 +00:00
Code Issues 2 Packages Projects Releases 3 Wiki Activity

Merge pull request #119 from Parabot/feature/issue-100

Browse Source 
[FEATURE] Added translations for Context
This commit is contained in:
Jeroen Ketelaar
2016-10-17 15:36:25 +02:00
committed by GitHub
parent 3470d656a8 c9751094eb
commit f523c08045
3 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
+1 -1
View File
@@ -73,7 +73,7 @@
<dependency> <dependency>
<groupId>org.parabot</groupId> <groupId>org.parabot</groupId>
<artifactId>internal-api</artifactId> <artifactId>internal-api</artifactId>
<version>1.02.7</version> <version>1.03.1</version>
</dependency> </dependency>
</dependencies> </dependencies>
src/main/java/org/parabot/Landing.java
+12 -11
View File
@@ -1,5 +1,6 @@
package org.parabot; package org.parabot;
import org.parabot.api.translations.TranslationHelper;
import org.parabot.core.Configuration; import org.parabot.core.Configuration;
import org.parabot.core.Core; import org.parabot.core.Core;
import org.parabot.core.Directories; import org.parabot.core.Directories;
@@ -32,10 +33,10 @@ public final class Landing {
parseArgs(args); parseArgs(args);
Core.verbose("Debug mode: " + Core.inDebugMode()); Core.verbose(TranslationHelper.translate("DEBUG_MODE") + Core.inDebugMode());
try { try {
Core.verbose("Setting look and feel: " Core.verbose(TranslationHelper.translate("SETTING_LOOK_AND_FEEL")
+ UIManager.getSystemLookAndFeelClassName()); + UIManager.getSystemLookAndFeelClassName());
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
} catch (Throwable t) { } catch (Throwable t) {
@@ -43,25 +44,25 @@ public final class Landing {
} }
if (!Core.inDebugMode() && !Core.isValid() && Core.hasValidation()) { if (!Core.inDebugMode() && !Core.isValid() && Core.hasValidation()) {
UILog.log("Updates", UILog.log(TranslationHelper.translate("UPDATES"),
"Please download the newest version of Parabot at " TranslationHelper.translate("DOWNLOAD_UPDATE_PARABOT_AT")
+ Configuration.DOWNLOAD_BOT, + Configuration.DOWNLOAD_BOT,
JOptionPane.INFORMATION_MESSAGE); JOptionPane.INFORMATION_MESSAGE);
URI uri = URI.create(Configuration.API_DOWNLOAD_BOT); URI uri = URI.create(Configuration.API_DOWNLOAD_BOT);
try { try {
Desktop.getDesktop().browse(uri); Desktop.getDesktop().browse(uri);
} catch (IOException e1) { } catch (IOException e1) {
JOptionPane.showMessageDialog(null, "Connection Error", JOptionPane.showMessageDialog(null, TranslationHelper.translate("CONNECTION_ERROR"),
"Error", JOptionPane.ERROR_MESSAGE); TranslationHelper.translate("ERROR"), JOptionPane.ERROR_MESSAGE);
e1.printStackTrace(); e1.printStackTrace();
} }
return; return;
} }
Core.verbose("Validating directories..."); Core.verbose(TranslationHelper.translate("VALIDATING_DIRECTORIES"));
Directories.validate(); Directories.validate();
Core.verbose("Validating account manager..."); Core.verbose(TranslationHelper.translate("VALIDATION_ACCOUNT_MANAGER"));
AccountManager.validate(); AccountManager.validate();
if (username != null && password != null) { if (username != null && password != null) {
@@ -71,7 +72,7 @@ public final class Landing {
return; return;
} }
Core.verbose("Starting login gui..."); Core.verbose(TranslationHelper.translate("STARTING_LOGIN_GUI"));
new BotUI(null, null); new BotUI(null, null);
} }
@@ -82,7 +83,7 @@ public final class Landing {
case "-createdirs": case "-createdirs":
Directories.validate(); Directories.validate();
System.out System.out
.println("Directories created, you can now run parabot."); .println(TranslationHelper.translate(("DIRECTORIES_CREATED")));
System.exit(0); System.exit(0);
break; break;
case "-debug": case "-debug":
@@ -131,7 +132,7 @@ public final class Landing {
case "-proxy": case "-proxy":
ProxyType type = ProxyType.valueOf(args[++i].toUpperCase()); ProxyType type = ProxyType.valueOf(args[++i].toUpperCase());
if (type == null) { if (type == null) {
System.err.println("Invalid proxy type: " + args[i]); System.err.println(TranslationHelper.translate("INVALID_PROXY_TYPE") + args[i]);
System.exit(1); System.exit(1);
return; return;
} }
src/main/java/org/parabot/core/Context.java
+14 -13
View File
@@ -1,6 +1,7 @@
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;
@@ -164,18 +165,18 @@ public class Context {
*/ */
public void load() { public void load() {
BotUI.getInstance().getJMenuBar().remove(2); BotUI.getInstance().getJMenuBar().remove(2);
Core.verbose("Parsing server jar..."); Core.verbose(TranslationHelper.translate("PARSING_SERVER_JAR"));
serverProvider.init(); serverProvider.init();
serverProvider.parseJar(); serverProvider.parseJar();
Core.verbose("Done."); Core.verbose(TranslationHelper.translate("DONE"));
Core.verbose("Injecting hooks..."); Core.verbose(TranslationHelper.translate("INJECTING_HOOKS"));
serverProvider.injectHooks(); serverProvider.injectHooks();
Core.verbose("Done."); Core.verbose(TranslationHelper.translate("DONE"));
Core.verbose("Fetching game applet..."); Core.verbose(TranslationHelper.translate("FETCHING_GAME_APPLET"));
if(Core.shouldDump()) { if(Core.shouldDump()) {
Core.verbose("Dumping injected client..."); Core.verbose(TranslationHelper.translate("DUMPING_INJECTED_CLIENT"));
classPath.dump(new File(Directories.getWorkspace(), "dump.jar")); classPath.dump(new File(Directories.getWorkspace(), "dump.jar"));
Core.verbose("Done."); Core.verbose(TranslationHelper.translate("DONE"));
} }
Applet applet = serverProvider.fetchApplet(); Applet applet = serverProvider.fetchApplet();
// if applet is null the server provider will call setApplet itself // if applet is null the server provider will call setApplet itself
@@ -195,7 +196,7 @@ public class Context {
setClientInstance(gameApplet); setClientInstance(gameApplet);
} }
Core.verbose("Applet fetched."); Core.verbose(TranslationHelper.translate("APPLET_FETCHED"));
final GamePanel panel = GamePanel.getInstance(); final GamePanel panel = GamePanel.getInstance();
final Dimension appletSize = serverProvider.getGameDimensions(); final Dimension appletSize = serverProvider.getGameDimensions();
@@ -221,14 +222,14 @@ public class Context {
} }
}, 1000); }, 1000);
Core.verbose("Initializing mouse..."); Core.verbose(TranslationHelper.translate("INIT_MOUSE"));
serverProvider.initMouse(); serverProvider.initMouse();
Core.verbose("Done."); Core.verbose(TranslationHelper.translate("DONE"));
Core.verbose("Initializing keyboard..."); Core.verbose(TranslationHelper.translate("INIT_KEYBOARD"));
serverProvider.initKeyboard(); serverProvider.initKeyboard();
Core.verbose("Done."); Core.verbose(TranslationHelper.translate("DONE"));
Core.verbose("Initializing key listener..."); Core.verbose(TranslationHelper.translate("INIT_KEY_LISTENER"));
this.pbKeyListener = new PBKeyListener(); this.pbKeyListener = new PBKeyListener();
applet.addKeyListener(this.pbKeyListener); applet.addKeyListener(this.pbKeyListener);