From d2308c7ede7b80b449947c983cdfe42ddc1a7cef Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 5 Apr 2022 12:55:12 -0400 Subject: [PATCH] Revert "menu swapper: Add uncharged cell swap for gotr (#14795)" This reverts commit 0609c246a5766d871dc0614b601a7e1556cb402b. This is superseded by the new object swap --- .../MenuEntrySwapperConfig.java | 19 ------------------- .../MenuEntrySwapperPlugin.java | 5 ----- 2 files changed, 24 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java index dd0737f414..64eb37734b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java @@ -849,23 +849,4 @@ public interface MenuEntrySwapperConfig extends Config { return false; } - - enum UnchargedCellsMode - { - TAKE, - TAKE_1, - TAKE_5, - TAKE_10 - } - - @ConfigItem( - keyName = "swapUnchargedCells", - name = "Uncharged Cells", - description = "Swap the take option for Uncharged Cells in Guardians of the Rift.", - section = objectSection - ) - default UnchargedCellsMode swapUnchargedCells() - { - return UnchargedCellsMode.TAKE; - } } 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 99b6c488ef..21782eaa01 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 @@ -78,7 +78,6 @@ import static net.runelite.client.plugins.menuentryswapper.MenuEntrySwapperConfi import static net.runelite.client.plugins.menuentryswapper.MenuEntrySwapperConfig.KaramjaGlovesMode; import static net.runelite.client.plugins.menuentryswapper.MenuEntrySwapperConfig.MorytaniaLegsMode; import static net.runelite.client.plugins.menuentryswapper.MenuEntrySwapperConfig.RadasBlessingMode; -import static net.runelite.client.plugins.menuentryswapper.MenuEntrySwapperConfig.UnchargedCellsMode; import net.runelite.client.util.Text; @PluginDescriptor( @@ -442,10 +441,6 @@ public class MenuEntrySwapperPlugin extends Plugin swap("climb", "climb-down", () -> (shiftModifier() ? config.swapStairsShiftClick() : config.swapStairsLeftClick()) == MenuEntrySwapperConfig.StairsMode.CLIMB_DOWN); swap("deposit", "deposit-runes", config::swapDepositPool); - - swap("take", "uncharged cells", "take-1", () -> config.swapUnchargedCells() == UnchargedCellsMode.TAKE_1); - swap("take", "uncharged cells", "take-5", () -> config.swapUnchargedCells() == UnchargedCellsMode.TAKE_5); - swap("take", "uncharged cells", "take-10", () -> config.swapUnchargedCells() == UnchargedCellsMode.TAKE_10); } private void swap(String option, String swappedOption, Supplier enabled)