From 818a92bcc94a5dd38ebf98f68befc94ff6fabd6c Mon Sep 17 00:00:00 2001 From: vanni <43923017+gazivodag@users.noreply.github.com> Date: Mon, 24 Jun 2019 04:12:56 -0400 Subject: [PATCH] Ignore comment lines on custom menu entry swapper (#721) Any line that starts with // will be ignored, giving you the ability to categorize your swaps. ![alt text](https://i.gyazo.com/09fe3443ac466ddbc7f7e691aae18bdf.png) --- .../menuentryswapper/MenuEntrySwapperPlugin.java | 12 +++++++++++- .../client/plugins/menuentryswapper/Parse.java | 12 +++++++++++- 2 files changed, 22 insertions(+), 2 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 624d4af184..b059d84ca3 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 @@ -1309,7 +1309,17 @@ public class MenuEntrySwapperPlugin extends Plugin if (!Strings.isNullOrEmpty(config)) { - Map split = NEWLINE_SPLITTER.withKeyValueSeparator(':').split(config); + StringBuilder sb = new StringBuilder(); + + for (String str : config.split("\n")) + { + if (!str.startsWith("//")) + { + sb.append(str + "\n"); + } + } + + Map split = NEWLINE_SPLITTER.withKeyValueSeparator(':').split(sb); for (Map.Entry entry : split.entrySet()) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/Parse.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/Parse.java index a44b56eb5e..d4e9785f5f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/Parse.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/Parse.java @@ -32,12 +32,22 @@ public class Parse { try { + StringBuilder sb = new StringBuilder(); + + for (String str : value.split("\n")) + { + if (!str.startsWith("//")) + { + sb.append(str + "\n"); + } + } + Splitter NEWLINE_SPLITTER = Splitter .on("\n") .omitEmptyStrings() .trimResults(); - NEWLINE_SPLITTER.withKeyValueSeparator(':').split(value); + NEWLINE_SPLITTER.withKeyValueSeparator(':').split(sb); return true; } catch (IllegalArgumentException ex)