ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

menuentryswapper: Fix dupe keys when migrating (alse filter walk here and cancel for now)

Browse Source
This commit is contained in:
Owain van Brakel
2019-08-19 03:43:58 +02:00
parent f3916c8cb2
commit 1c5bd185cd
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
View File

@@ -34,13 +34,16 @@ import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.google.inject.Provides; import com.google.inject.Provides;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.GameState; import net.runelite.api.GameState;
import net.runelite.api.InventoryID; import net.runelite.api.InventoryID;
@@ -109,6 +112,7 @@ import org.apache.commons.lang3.ArrayUtils;
) )
@Singleton @Singleton
@PluginDependency(PvpToolsPlugin.class) @PluginDependency(PvpToolsPlugin.class)
@Slf4j
public class MenuEntrySwapperPlugin extends Plugin public class MenuEntrySwapperPlugin extends Plugin
{ {
private static final String CONFIG_GROUP = "shiftclick"; private static final String CONFIG_GROUP = "shiftclick";
@@ -487,6 +491,8 @@ public class MenuEntrySwapperPlugin extends Plugin
public void onMenuEntryAdded(MenuEntryAdded event) public void onMenuEntryAdded(MenuEntryAdded event)
{ {
log.info(String.valueOf(event));
if (client.getGameState() != GameState.LOGGED_IN) if (client.getGameState() != GameState.LOGGED_IN)
{ {
return; return;
@@ -1685,5 +1691,10 @@ public class MenuEntrySwapperPlugin extends Plugin
configManager.setConfiguration("menuentryswapper", "customSwaps", sb.toString()); configManager.setConfiguration("menuentryswapper", "customSwaps", sb.toString());
} }
// Ugly band-aid i'm sorry
configManager.setConfiguration("menuentryswapper", "customSwaps",
Arrays.stream(config.customSwaps().split("\n")).distinct().filter(swap -> !"walk here".equals(swap.split(":")[0].trim().toLowerCase())).filter(swap -> !"cancel".equals(swap.split(":")[0].trim().toLowerCase())).collect(Collectors.joining("\n"))
);
} }
} }