chattranslationplugin: Combine nested if statemnets

This commit is contained in:
sdburns1998
2019-07-07 02:39:35 +02:00
parent 01bf7d7c4e
commit 0a0bdce375

View File

@@ -3,8 +3,17 @@ package net.runelite.client.plugins.chattranslation;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ObjectArrays; import com.google.common.collect.ObjectArrays;
import com.google.inject.Provides; import com.google.inject.Provides;
import java.awt.event.KeyEvent;
import java.util.ArrayList;
import javax.inject.Inject;
import javax.inject.Provider;
import javax.inject.Singleton; import javax.inject.Singleton;
import net.runelite.api.*; import net.runelite.api.Client;
import net.runelite.api.GameState;
import net.runelite.api.MenuAction;
import net.runelite.api.MenuEntry;
import net.runelite.api.MessageNode;
import net.runelite.api.VarClientStr;
import net.runelite.api.events.ChatMessage; import net.runelite.api.events.ChatMessage;
import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.MenuEntryAdded; import net.runelite.api.events.MenuEntryAdded;
@@ -24,11 +33,6 @@ import net.runelite.client.plugins.PluginType;
import net.runelite.client.util.Text; import net.runelite.client.util.Text;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import javax.inject.Inject;
import javax.inject.Provider;
import java.awt.event.KeyEvent;
import java.util.ArrayList;
@PluginDescriptor( @PluginDescriptor(
name = "Chat Translator", name = "Chat Translator",
description = "Translates messages from one Language to another.", description = "Translates messages from one Language to another.",
@@ -84,13 +88,10 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener
{ {
updateConfig(); updateConfig();
if (client != null) if (client != null && this.translateOptionVisable)
{
if (this.translateOptionVisable)
{ {
menuManager.get().addPlayerMenuItem(TRANSLATE); menuManager.get().addPlayerMenuItem(TRANSLATE);
} }
}
keyManager.registerKeyListener(this); keyManager.registerKeyListener(this);
playerNames.addAll(Text.fromCSV(config.getPlayerNames())); playerNames.addAll(Text.fromCSV(config.getPlayerNames()));
@@ -99,13 +100,10 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener
@Override @Override
protected void shutDown() throws Exception protected void shutDown() throws Exception
{ {
if (client != null) if (client != null && this.translateOptionVisable)
{
if (this.translateOptionVisable)
{ {
menuManager.get().removePlayerMenuItem(TRANSLATE); menuManager.get().removePlayerMenuItem(TRANSLATE);
} }
}
keyManager.unregisterKeyListener(this); keyManager.unregisterKeyListener(this);
playerNames.clear(); playerNames.clear();
@@ -246,9 +244,7 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener
Widget chatboxParent = client.getWidget(WidgetInfo.CHATBOX_PARENT); Widget chatboxParent = client.getWidget(WidgetInfo.CHATBOX_PARENT);
if (chatboxParent != null && chatboxParent.getOnKeyListener() != null) if (chatboxParent != null && chatboxParent.getOnKeyListener() != null && event.getKeyCode() == 0xA)
{
if (event.getKeyCode() == 0xA)
{ {
Translator translator = new Translator(); Translator translator = new Translator();
String message = client.getVar(VarClientStr.CHATBOX_TYPED_TEXT); String message = client.getVar(VarClientStr.CHATBOX_TYPED_TEXT);
@@ -289,7 +285,6 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener
} }
} }
} }
}
@Override @Override
public void keyReleased(KeyEvent e) public void keyReleased(KeyEvent e)