Always remove tags from player.getName()

- Move removal of tags to RSPlayerMixin
- Remove tags from players names where needed

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>

runelite-api/src/main/java/net/runelite/api/Text.java

@@ -22,7 +22,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package net.runelite.client.util;
+package net.runelite.api;
 
 /**
  * A set of utilities to use when dealing with text.

runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java

@@ -32,6 +32,7 @@ import java.util.concurrent.ScheduledExecutorService;
 import javax.imageio.ImageIO;
 import javax.inject.Inject;
 import javax.swing.SwingUtilities;
+import net.runelite.api.Text;
 import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.PlayerMenuOptionClicked;
 import net.runelite.client.config.ConfigManager;
@@ -138,7 +139,7 @@ public class HiscorePlugin extends Plugin
 					throw new RuntimeException(e);
 				}
 
-				hiscorePanel.lookup(event.getMenuTarget());
+				hiscorePanel.lookup(Text.removeTags(event.getMenuTarget()));
 			});
 		}
 	}

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

@@ -37,6 +37,7 @@ import net.runelite.api.Client;
 import net.runelite.api.GameState;
 import net.runelite.api.ItemComposition;
 import net.runelite.api.MenuEntry;
+import net.runelite.api.Text;
 import net.runelite.api.events.ConfigChanged;
 import net.runelite.api.events.MenuEntryAdded;
 import net.runelite.api.events.PostItemComposition;
@@ -52,7 +53,6 @@ import net.runelite.client.menus.WidgetMenuOption;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
 import net.runelite.client.ui.overlay.Overlay;
-import net.runelite.client.util.Text;
 
 @PluginDescriptor(
 	name = "Menu Entry Swapper",

runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZonePlugin.java

@@ -39,7 +39,7 @@ import net.runelite.client.config.ConfigManager;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
 import net.runelite.client.ui.overlay.Overlay;
-import net.runelite.client.util.Text;
+import net.runelite.api.Text;
 
 @PluginDescriptor(
 	name = "Nightmare Zone"

runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoOverlay.java

@@ -45,7 +45,7 @@ import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayPriority;
 import net.runelite.client.ui.overlay.components.BackgroundComponent;
 import net.runelite.client.ui.overlay.components.TextComponent;
-import net.runelite.client.util.Text;
+import net.runelite.api.Text;
 
 class OpponentInfoOverlay extends Overlay
 {

runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsMinimapOverlay.java

@@ -35,7 +35,6 @@ import net.runelite.client.ui.overlay.OverlayLayer;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayPriority;
 import net.runelite.client.ui.overlay.OverlayUtil;
-import net.runelite.client.util.Text;
 
 @Singleton
 public class PlayerIndicatorsMinimapOverlay extends Overlay
@@ -66,7 +65,7 @@ public class PlayerIndicatorsMinimapOverlay extends Overlay
 
 	private void renderPlayerOverlay(Graphics2D graphics, Player actor, Color color)
 	{
-		final String name = Text.removeTags(actor.getName());
+		final String name = actor.getName();
 		final net.runelite.api.Point minimapLocation = actor.getMinimapLocation();
 
 		if (minimapLocation != null)

runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java

@@ -51,7 +51,7 @@ import net.runelite.api.IndexedSprite;
 import net.runelite.api.Player;
 import net.runelite.api.PlayerNameMask;
 import net.runelite.api.events.SetMessage;
-import net.runelite.client.util.Text;
+import net.runelite.api.Text;
 
 @Singleton
 @Slf4j
@@ -113,7 +113,7 @@ public class PlayerIndicatorsService
 		{
 			if (player != null && player.getName() != null)
 			{
-				player.setName(Text.removeTags(player.getName()));
+				player.setName(player.getName());
 			}
 		}
 
@@ -228,11 +228,11 @@ public class PlayerIndicatorsService
 	private void injectData(final Player player, final Color color)
 	{
 		final StringBuilder stringBuilder = new StringBuilder();
-		final String strippedName = Text.removeTags(player.getName());
+		final String playerName = player.getName();
 
 		if (config.showClanRankIcons() && player.isClanMember())
 		{
-			final ClanMemberRank clanMemberRank = clanRanksCache.getUnchecked(strippedName);
+			final ClanMemberRank clanMemberRank = clanRanksCache.getUnchecked(playerName);
 
 			if (clanMemberRank != ClanMemberRank.UNRANKED)
 			{
@@ -244,7 +244,7 @@ public class PlayerIndicatorsService
 		}
 		
 		stringBuilder.append("<col=").append(parseColor(color)).append(">");
-		player.setName(stringBuilder.toString() + strippedName);
+		player.setName(stringBuilder.toString() + playerName);
 	}
 
 	private static String parseColor(final Color color)

runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java

@@ -70,7 +70,7 @@ import net.runelite.client.plugins.raids.solver.LayoutSolver;
 import net.runelite.client.plugins.raids.solver.RotationSolver;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.infobox.InfoBoxManager;
-import net.runelite.client.util.Text;
+import net.runelite.api.Text;
 
 @PluginDescriptor(
 	name = "Chambers Of Xeric"

runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java

@@ -78,7 +78,7 @@ import net.runelite.client.ui.FontManager;
 import net.runelite.client.ui.NavigationButton;
 import net.runelite.client.ui.TitleToolbar;
 import net.runelite.client.ui.overlay.OverlayRenderer;
-import net.runelite.client.util.Text;
+import net.runelite.api.Text;
 import net.runelite.http.api.RuneLiteAPI;
 import okhttp3.Call;
 import okhttp3.Callback;

runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java

@@ -57,7 +57,7 @@ import net.runelite.client.plugins.PluginDescriptor;
 import net.runelite.client.task.Schedule;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.infobox.InfoBoxManager;
-import net.runelite.client.util.Text;
+import net.runelite.api.Text;
 
 @PluginDescriptor(
 	name = "Slayer"

runelite-client/src/test/java/net/runelite/client/util/TextTest.java

@@ -24,6 +24,7 @@
  */
 package net.runelite.client.util;
 
+import net.runelite.api.Text;
 import static org.junit.Assert.assertEquals;
 import org.junit.Test;
 

runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerMixin.java

@@ -30,6 +30,7 @@ import java.util.List;
 import net.runelite.api.Model;
 import net.runelite.api.Perspective;
 import net.runelite.api.Point;
+import net.runelite.api.Text;
 import net.runelite.api.model.Triangle;
 import net.runelite.api.model.Vertex;
 import net.runelite.api.mixins.Inject;
@@ -63,7 +64,7 @@ public abstract class RSPlayerMixin implements RSPlayer
 			return null;
 		}
 
-		return name.replace('\u00A0', ' ');
+		return Text.removeTags(name.replace('\u00A0', ' '));
 	}
 
 	@Inject