From aadfb88aa6206d08b28d4738d0d95b3b48bef1e9 Mon Sep 17 00:00:00 2001 From: ThatGamerBlue Date: Mon, 8 Feb 2021 10:47:27 +0000 Subject: [PATCH] mes: these dont need to be static you can @Inject a plugin instance --- .../menuentryswapper/MenuEntrySwapperPlugin.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 6c9b6cd800..0dabbef623 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 @@ -152,7 +152,7 @@ public class MenuEntrySwapperPlugin extends Plugin @Getter private boolean configuringShiftClick = false; - private static final Multimap swaps = LinkedHashMultimap.create(); + private final Multimap swaps = LinkedHashMultimap.create(); private final ArrayListMultimap optionIndexes = ArrayListMultimap.create(); @Provides @@ -361,22 +361,22 @@ public class MenuEntrySwapperPlugin extends Plugin swap("eat", "guzzle", config::swapRockCake); } - public static void swap(String option, String swappedOption, Supplier enabled) + public void swap(String option, String swappedOption, Supplier enabled) { swap(option, alwaysTrue(), swappedOption, enabled); } - private void swap(String option, String target, String swappedOption, Supplier enabled) + public void swap(String option, String target, String swappedOption, Supplier enabled) { swap(option, equalTo(target), swappedOption, enabled); } - private static void swap(String option, Predicate targetPredicate, String swappedOption, Supplier enabled) + public void swap(String option, Predicate targetPredicate, String swappedOption, Supplier enabled) { swaps.put(option, new Swap(alwaysTrue(), targetPredicate, swappedOption, enabled, true)); } - private void swapContains(String option, Predicate targetPredicate, String swappedOption, Supplier enabled) + public void swapContains(String option, Predicate targetPredicate, String swappedOption, Supplier enabled) { swaps.put(option, new Swap(alwaysTrue(), targetPredicate, swappedOption, enabled, false)); }