diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tmorph/Parse.java b/runelite-client/src/main/java/net/runelite/client/plugins/tmorph/Parse.java index b80f893360..fa4ba34ec8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tmorph/Parse.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tmorph/Parse.java @@ -1,6 +1,5 @@ package net.runelite.client.plugins.tmorph; -import com.google.common.base.Splitter; import java.util.Arrays; import java.util.Map; import javax.inject.Singleton; @@ -21,13 +20,7 @@ public class Parse sb.append(str).append("\n"); } } - - final Splitter NEWLINE_SPLITTER = Splitter - .on("\n") - .omitEmptyStrings() - .trimResults(); - - final Map tmp = NEWLINE_SPLITTER.withKeyValueSeparator(':').split(sb); + final Map tmp = TMorph.getNEWLINE_SPLITTER().withKeyValueSeparator(':').split(sb); for (Map.Entry entry : tmp.entrySet()) { @@ -36,7 +29,7 @@ public class Parse return false; } - int[] ints = Arrays.stream(entry.getKey().split(",")).map(String::trim).mapToInt(Integer::parseInt).toArray(); + final int[] ints = Arrays.stream(entry.getKey().split(",")).map(String::trim).mapToInt(Integer::parseInt).toArray(); if (ints.length <= 1) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tmorph/TMorph.java b/runelite-client/src/main/java/net/runelite/client/plugins/tmorph/TMorph.java index bdc60b701f..c335267cdd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tmorph/TMorph.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tmorph/TMorph.java @@ -84,9 +84,9 @@ public class TMorph extends Plugin private TMorphConfig config; @Inject private EventBus eventBus; - private String set1; - private String set2; - private String set3; + private Map set1; + private Map set2; + private Map set3; private int animation; private int globalAnimSwap; private int globalGraphicSwap; @@ -155,7 +155,7 @@ public class TMorph extends Plugin { final Actor actor = event.getActor(); - if (actor.getAnimation() != -1) + if (actor.getAnimation() == -1) { return; } @@ -190,10 +190,6 @@ public class TMorph extends Plugin return; } - final Map set1 = NEWLINE_SPLITTER.withKeyValueSeparator(':').split(this.set1); - final Map set2 = NEWLINE_SPLITTER.withKeyValueSeparator(':').split(this.set2); - final Map set3 = NEWLINE_SPLITTER.withKeyValueSeparator(':').split(this.set3); - updateGear(set1, player); updateGear(set2, player); updateGear(set3, player); @@ -201,6 +197,11 @@ public class TMorph extends Plugin private void updateGear(Map map, Player player) { + if (map == null || map.isEmpty()) + { + return; + } + for (Map.Entry entry : map.entrySet()) { if (!kit.containsKey(entry.getValue())) @@ -236,9 +237,9 @@ public class TMorph extends Plugin private void updateConfig() { - this.set1 = config.set1(); - this.set2 = config.set2(); - this.set3 = config.set3(); + this.set1 = NEWLINE_SPLITTER.withKeyValueSeparator(':').split(config.set1()); + this.set2 = NEWLINE_SPLITTER.withKeyValueSeparator(':').split(config.set2()); + this.set3 = NEWLINE_SPLITTER.withKeyValueSeparator(':').split(config.set3()); this.animation = config.animationSwap(); this.globalAnimSwap = config.globalAnimSwap(); this.globalGraphicSwap = config.globalGraphicSwap();