From 608471f30d7bad0160f58e2937025095ae7512df Mon Sep 17 00:00:00 2001 From: Ian William O'Neill Date: Sun, 30 Jun 2019 02:32:13 +0100 Subject: [PATCH] Clean-up for Travis. --- .../ChatTranslationConfig.java | 10 ++++-- .../ChatTranslationPlugin.java | 34 +++++++++++++------ .../plugins/chattranslation/Languages.java | 3 +- .../plugins/chattranslation/Translator.java | 6 ++-- 4 files changed, 37 insertions(+), 16 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationConfig.java index 8a05db21b0..d93356c2a5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationConfig.java @@ -15,7 +15,10 @@ public interface ChatTranslationConfig extends Config position = 0, group = "Public Chat Translation" ) - default boolean publicChat() { return false; } + default boolean publicChat() + { + return false; + } @ConfigItem( keyName = "publicTargetLanguage", @@ -38,7 +41,10 @@ public interface ChatTranslationConfig extends Config position = 2, group = "Player Message Translation" ) - default boolean playerChat() { return false; } + default boolean playerChat() + { + return false; + } @ConfigItem( keyName = "playerTargetLanguage", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java index fde7c98be7..743f89a096 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java @@ -21,7 +21,6 @@ import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginType; import org.apache.commons.lang3.ArrayUtils; -import javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Provider; import java.awt.event.KeyEvent; @@ -32,7 +31,8 @@ import java.awt.event.KeyEvent; tags = {"translate", "language", "english", "spanish", "dutch", "french"}, type = PluginType.UTILITY ) -public class ChatTranslationPlugin extends Plugin implements KeyListener { +public class ChatTranslationPlugin extends Plugin implements KeyListener +{ public static final String TRANSLATE = "Translate"; private static final ImmutableList AFTER_OPTIONS = ImmutableList.of("Message", "Add ignore", "Remove friend", "Kick"); @@ -144,7 +144,8 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener { Translator translator = new Translator(); - try { + try + { //Automatically check language of message and translate to selected language. String translation = translator.translate("auto", config.publicTargetLanguage().toString(), message); if (translation != null) @@ -153,7 +154,9 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener { messageNode.setRuneLiteFormatMessage(translation); chatMessageManager.update(messageNode); } - } catch (Exception e) { + } + catch (Exception e) + { e.printStackTrace(); } @@ -161,8 +164,10 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener { } @Override - public void keyPressed(KeyEvent event) { - if (client.getGameState() != GameState.LOADING && client.getGameState() != GameState.LOGGED_IN) { + public void keyPressed(KeyEvent event) + { + if (client.getGameState() != GameState.LOADING && client.getGameState() != GameState.LOGGED_IN) + { return; } @@ -183,7 +188,8 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener { String message = client.getVar(VarClientStr.CHATBOX_TYPED_TEXT); - try { + try + { //Automatically check language of message and translate to selected language. String translation = translator.translate("auto", config.playerTargetLanguage().toString(), message); @@ -191,18 +197,24 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener { { client.setVar(VarClientStr.CHATBOX_TYPED_TEXT, translation); - clientThread.invoke(() -> { + clientThread.invoke(() -> + { client.runScript(96, 0, translation); - }); + } + ); } client.setVar(VarClientStr.CHATBOX_TYPED_TEXT, ""); - } catch (Exception e) { + } + catch (Exception e) + { e.printStackTrace(); } } - } else { + } + else + { return; } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/Languages.java b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/Languages.java index 695c1a637d..3ec7b3ad81 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/Languages.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/Languages.java @@ -1,6 +1,7 @@ package net.runelite.client.plugins.chattranslation; -public enum Languages { +public enum Languages +{ ENGLISH("en"), DUTCH("nl"), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/Translator.java b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/Translator.java index 220ba888e8..df8f26ea29 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/Translator.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/Translator.java @@ -8,7 +8,8 @@ import java.net.HttpURLConnection; import java.net.URL; import java.net.URLEncoder; -public class Translator { +public class Translator +{ public String translate(String source, String target, String message) throws Exception { @@ -23,7 +24,8 @@ public class Translator { String inputLine; StringBuffer response = new StringBuffer(); - while ((inputLine = in.readLine()) != null) { + while ((inputLine = in.readLine()) != null) + { response.append(inputLine); } in.close();