From b4bc2a1cd089a6906c97a556e1e2cc8f1a739ce5 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Tue, 31 Oct 2023 13:21:26 +0100 Subject: [PATCH] Turn GoogleTranslate into an enum --- .../net/wurstclient/hacks/ChatTranslatorHack.java | 5 +---- .../java/net/wurstclient/util/GoogleTranslate.java | 14 ++++++++------ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/main/java/net/wurstclient/hacks/ChatTranslatorHack.java b/src/main/java/net/wurstclient/hacks/ChatTranslatorHack.java index 7dc8e112..bea50443 100644 --- a/src/main/java/net/wurstclient/hacks/ChatTranslatorHack.java +++ b/src/main/java/net/wurstclient/hacks/ChatTranslatorHack.java @@ -23,9 +23,6 @@ import net.wurstclient.util.GoogleTranslate; "google translator", "GoogleTranslation", "google translation"}) public final class ChatTranslatorHack extends Hack implements ChatInputListener { - private static final GoogleTranslate googleTranslate = - new GoogleTranslate(); - private final EnumSetting langFrom = new EnumSetting<>( "Translate from", FromLanguage.values(), FromLanguage.AUTO_DETECT); @@ -79,7 +76,7 @@ public final class ChatTranslatorHack extends Hack implements ChatInputListener || incomingMsg.startsWith(translatorPrefix)) return; - String translated = googleTranslate.translate(incomingMsg, + String translated = GoogleTranslate.translate(incomingMsg, langFrom.getSelected().value, langTo.getSelected().value); if(translated == null) diff --git a/src/main/java/net/wurstclient/util/GoogleTranslate.java b/src/main/java/net/wurstclient/util/GoogleTranslate.java index 8b68b3fa..b982b34b 100644 --- a/src/main/java/net/wurstclient/util/GoogleTranslate.java +++ b/src/main/java/net/wurstclient/util/GoogleTranslate.java @@ -18,9 +18,11 @@ import java.net.URLEncoder; import java.util.regex.Matcher; import java.util.regex.Pattern; -public class GoogleTranslate +public enum GoogleTranslate { - public String translate(String text, String langFrom, String langTo) + ; + + public static String translate(String text, String langFrom, String langTo) { String html = getHTML(text, langFrom, langTo); String translated = parseHTML(html); @@ -31,7 +33,7 @@ public class GoogleTranslate return translated; } - private String getHTML(String text, String langFrom, String langTo) + private static String getHTML(String text, String langFrom, String langTo) { URL url = createURL(text, langFrom, langTo); @@ -57,7 +59,7 @@ public class GoogleTranslate } } - private URL createURL(String text, String langFrom, String langTo) + private static URL createURL(String text, String langFrom, String langTo) { try { @@ -75,7 +77,7 @@ public class GoogleTranslate } } - private URLConnection setupConnection(URL url) throws IOException + private static URLConnection setupConnection(URL url) throws IOException { URLConnection connection = url.openConnection(); @@ -87,7 +89,7 @@ public class GoogleTranslate } @SuppressWarnings("deprecation") - private String parseHTML(String html) + private static String parseHTML(String html) { String regex = "class=\"result-container\">([^<]*)<\\/div>"; Pattern pattern = Pattern.compile(regex, Pattern.MULTILINE);