Refactor MenuModifier

runelite-client/src/main/java/net/runelite/client/plugins/menumodifier/MenuModifierConfig.java

@@ -31,24 +31,51 @@ import net.runelite.client.config.ConfigItem;
 @ConfigGroup("menumodifier")
 public interface MenuModifierConfig extends Config
 {
-    @ConfigItem(position = 0, keyName = "hideCancel", name = "Hide Cancel", description = "Hides the 'cancel' option from the right click menu")
+    @ConfigItem(
-    default boolean hideCancel() { return true; }
+    	position = 0,
-
+		keyName = "hideExamine",
-    @ConfigItem(position = 1, keyName = "hideExamine", name = "Hide Examine", description = "Hides the 'examine' option from the right click menu")
+		name = "Hide Examine",
+		description = "Hides the 'examine' option from the right click menu"
+	)
     default boolean hideExamine() { return true; }
 
-    @ConfigItem(position = 2, keyName = "hideTradeWith", name = "Hide Trade With", description = "Hides the 'trade with' option from the right click menu")
+    @ConfigItem(
+    	position = 1,
+		keyName = "hideTradeWith",
+		name = "Hide Trade With",
+		description = "Hides the 'trade with' option from the right click menu"
+	)
     default boolean hideTradeWith() { return true; }
 
-    @ConfigItem(position = 3, keyName = "hideReport", name = "Hide Report", description = "Hides the 'report' option from the right click menu")
+    @ConfigItem(
+    	position = 2,
+		keyName = "hideReport",
+		name = "Hide Report",
+		description = "Hides the 'report' option from the right click menu"
+	)
     default boolean hideReport() { return true; }
 
-    @ConfigItem(position = 4, keyName = "hideLookup", name = "Hide Lookup", description = "Hides the 'lookup' option from the right click menu")
+    @ConfigItem(
+    	position = 3,
+		keyName = "hideLookup",
+		name = "Hide Lookup",
+		description = "Hides the 'lookup' option from the right click menu"
+	)
     default boolean hideLookup() { return true; }
 
-	@ConfigItem(position = 4, keyName = "hideNet", name = "Hide Net", description = "Hides the 'net' option from the right click menu")
+	@ConfigItem(
+		position = 4,
+		keyName = "hideNet",
+		name = "Hide Net",
+		description = "Hides the 'net' option from the right click menu"
+	)
 	default boolean hideNet() { return true; }
 
-	@ConfigItem(position = 4, keyName = "hideBait", name = "Hide Bait", description = "Hides the 'Bait' option from the right click menu")
+	@ConfigItem(
+		position = 5,
+		keyName = "hideBait",
+		name = "Hide Bait",
+		description = "Hides the 'Bait' option from the right click menu"
+	)
 	default boolean hideBait() { return true; }
 }

runelite-client/src/main/java/net/runelite/client/plugins/menumodifier/MenuModifierInputListener.java

@@ -24,12 +24,11 @@
  */
 package net.runelite.client.plugins.menumodifier;
 
+import java.awt.event.KeyEvent;
+import javax.inject.Inject;
 import net.runelite.client.input.KeyListener;
 import net.runelite.client.input.MouseAdapter;
 
-import javax.inject.Inject;
-import java.awt.event.KeyEvent;
-
 public class MenuModifierInputListener extends MouseAdapter implements KeyListener
 {
 	private static final int HOTKEY = KeyEvent.VK_CONTROL;

runelite-client/src/main/java/net/runelite/client/plugins/menumodifier/MenuModifierPlugin.java

@@ -24,18 +24,19 @@
  */
 package net.runelite.client.plugins.menumodifier;
 
-import net.runelite.api.events.MenuOpened;
-import net.runelite.client.eventbus.Subscribe;
 import com.google.inject.Provides;
+import java.util.ArrayList;
+import java.util.List;
+import javax.inject.Inject;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
 import net.runelite.api.Client;
 import net.runelite.api.MenuEntry;
 import net.runelite.api.Player;
-import net.runelite.api.events.GameTick;
+import net.runelite.api.events.MenuOpened;
-import net.runelite.api.events.MenuEntryAdded;
 import net.runelite.client.config.ConfigManager;
+import net.runelite.client.eventbus.Subscribe;
 import net.runelite.client.input.KeyManager;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
@@ -43,12 +44,6 @@ import net.runelite.client.plugins.PluginType;
 import net.runelite.client.util.MiscUtils;
 import net.runelite.client.util.Text;
 
-import javax.inject.Inject;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
 @PluginDescriptor(
 	name = "Menu Modifier",
 	description = "Changes right click menu for players",
@@ -98,37 +93,55 @@ public class MenuModifierPlugin extends Plugin
 		Player localPlayer = client.getLocalPlayer();
 
 		if (localPlayer == null)
+		{
 			return;
+		}
 
 		if (!(MiscUtils.getWildernessLevelFrom(client, localPlayer.getWorldLocation()) >= 0))
+		{
 			return;
+		}
 
 		if (hotKeyPressed)
+		{
 			return;
+		}
 
-        List<MenuEntry> menu_entries = new ArrayList<MenuEntry>();
+		List<MenuEntry> menu_entries = new ArrayList<>();
 
 		for (MenuEntry entry : event.getMenuEntries())
 		{
 			String option = Text.removeTags(entry.getOption()).toLowerCase();
 
 			if (option.contains("trade with") && config.hideTradeWith())
+			{
 				continue;
+			}
 
 			if (option.contains("lookup") && config.hideLookup())
+			{
 				continue;
+			}
 
 			if (option.contains("report") && config.hideReport())
+			{
 				continue;
+			}
 
 			if (option.contains("examine") && config.hideExamine())
+			{
 				continue;
+			}
 
 			if (option.contains("net") && config.hideNet())
+			{
 				continue;
+			}
 
 			if (option.contains("bait") && config.hideBait())
+			{
 				continue;
+			}
 
 			int identifier = entry.getIdentifier();
 
@@ -136,7 +149,9 @@ public class MenuModifierPlugin extends Plugin
 			Player player = null;
 
 			if (identifier >= 0 && identifier < players.length)
+			{
 				player = players[identifier];
+			}
 
 			if (player == null)
 			{
@@ -145,7 +160,9 @@ public class MenuModifierPlugin extends Plugin
 			}
 
 			if ((option.contains("attack") || option.contains("cast")) && (player.isFriend() || player.isClanMember()))
+			{
 				continue;
+			}
 
 			menu_entries.add(entry);
 		}