From 1e6cf0f5c7d7a3b330111b4f0d9dc54439e9e6d5 Mon Sep 17 00:00:00 2001 From: Lucwousin Date: Thu, 19 Sep 2019 17:38:10 +0200 Subject: [PATCH] Clean up merge and remove standardizedtarget field as it's not really used --- runelite-api/src/main/java/net/runelite/api/MenuEntry.java | 5 ----- .../runelite/client/plugins/blackjack/BlackjackPlugin.java | 3 ++- .../plugins/menuentryswapper/MenuEntrySwapperPlugin.java | 6 ++---- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/MenuEntry.java b/runelite-api/src/main/java/net/runelite/api/MenuEntry.java index e22fb2721d..68a51ee1e9 100644 --- a/runelite-api/src/main/java/net/runelite/api/MenuEntry.java +++ b/runelite-api/src/main/java/net/runelite/api/MenuEntry.java @@ -28,7 +28,6 @@ import lombok.AccessLevel; import lombok.Data; import lombok.NoArgsConstructor; import lombok.Setter; -import net.runelite.api.util.Text; /** * A menu entry in a right-click menu. @@ -83,7 +82,6 @@ public class MenuEntry this.param0 = param0; this.param1 = param1; this.forceLeftClick = forceLeftClick; - this.standardizedTarget = Text.standardize(target, true); } public static MenuEntry copy(MenuEntry src) @@ -102,8 +100,5 @@ public class MenuEntry public void setTarget(String target) { this.target = target; - this.standardizedTarget = Text.standardize(target, true); } - - private String standardizedTarget; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blackjack/BlackjackPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/blackjack/BlackjackPlugin.java index 36d59a1bb2..a40f8a6c80 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/blackjack/BlackjackPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/blackjack/BlackjackPlugin.java @@ -38,6 +38,7 @@ import net.runelite.api.events.ChatMessage; import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; +import net.runelite.api.util.Text; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.EventBus; import net.runelite.client.menus.AbstractComparableEntry; @@ -181,7 +182,7 @@ public class BlackjackPlugin extends Plugin public boolean matches(MenuEntry entry) { return - entry.getStandardizedTarget().equals(this.getTarget()) && + Text.removeTags(entry.getTarget(), true).equalsIgnoreCase(this.getTarget()) && entry.getOption().equalsIgnoreCase(this.getOption()); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java index db1d196c9d..3609602357 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java @@ -114,8 +114,6 @@ import net.runelite.client.plugins.pvptools.PvpToolsConfig; import net.runelite.client.plugins.pvptools.PvpToolsPlugin; import net.runelite.client.util.HotkeyListener; import static net.runelite.client.util.MenuUtil.swap; -import net.runelite.client.util.MiscUtils; -import org.apache.commons.lang3.StringUtils; @PluginDescriptor( name = "Menu Entry Swapper", @@ -1167,7 +1165,7 @@ public class MenuEntrySwapperPlugin extends Plugin menuManager.removePriorityEntry("Activate", "Box trap"); menuManager.removePriorityEntry("Assignment"); menuManager.removePriorityEntry("Bank"); - menuManager.removePriorityEntry("Buy All"); + menuManager.removePriorityEntry("Buy All"); menuManager.removePriorityEntry("Buy-plank"); menuManager.removePriorityEntry("Buy-plank", "Sawmill operator"); menuManager.removePriorityEntry("Charter"); @@ -1233,7 +1231,7 @@ public class MenuEntrySwapperPlugin extends Plugin menuManager.removePriorityEntry("Story"); menuManager.removePriorityEntry("Stun", "Hoop snake"); menuManager.removePriorityEntry("Take-boat"); - menuManager.removePriorityEntry("Tan All"); + menuManager.removePriorityEntry("Tan All"); menuManager.removePriorityEntry("Teleport menu", "Portal nexus"); menuManager.removePriorityEntry("Teleport", "Crafting cape"); menuManager.removePriorityEntry("Teleport", "Crafting cape(t)");