runelite-client: Update plugins to use Text.removeTags

This commit is contained in:
Joshua Filby
2018-03-11 11:52:55 -04:00
committed by Adam
parent e7f6793722
commit 85ac977324
5 changed files with 14 additions and 9 deletions

View File

@@ -39,6 +39,7 @@ import net.runelite.client.config.ConfigManager;
import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.util.Text;
@PluginDescriptor( @PluginDescriptor(
name = "Nightmare Zone" name = "Nightmare Zone"
@@ -110,7 +111,7 @@ public class NightmareZonePlugin extends Plugin
return; return;
} }
String msg = event.getMessage().replaceAll("<[^>]*>", " "); //remove color and linebreaks String msg = Text.removeTags(event.getMessage()); //remove color and linebreaks
if (msg.contains("The effects of overload have worn off, and you feel normal again.")) if (msg.contains("The effects of overload have worn off, and you feel normal again."))
{ {
notifier.notify("Your overload has worn off"); notifier.notify("Your overload has worn off");

View File

@@ -45,6 +45,7 @@ import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.OverlayPriority;
import net.runelite.client.ui.overlay.components.BackgroundComponent; import net.runelite.client.ui.overlay.components.BackgroundComponent;
import net.runelite.client.ui.overlay.components.TextComponent; import net.runelite.client.ui.overlay.components.TextComponent;
import net.runelite.client.util.Text;
class OpponentInfoOverlay extends Overlay class OpponentInfoOverlay extends Overlay
{ {
@@ -120,14 +121,14 @@ class OpponentInfoOverlay extends Overlay
{ {
lastTime = Instant.now(); lastTime = Instant.now();
lastRatio = (float) opponent.getHealthRatio() / (float) opponent.getHealth(); lastRatio = (float) opponent.getHealthRatio() / (float) opponent.getHealth();
opponentName = opponent.getName().replaceAll("<[^>]*>", ""); opponentName = Text.removeTags(opponent.getName());
lastMaxHealth = oppInfoHealth.get(opponentName + "_" + opponent.getCombatLevel()); lastMaxHealth = oppInfoHealth.get(opponentName + "_" + opponent.getCombatLevel());
Actor opponentsOpponent = opponent.getInteracting(); Actor opponentsOpponent = opponent.getInteracting();
if (opponentsOpponent != null if (opponentsOpponent != null
&& (opponentsOpponent != client.getLocalPlayer() || client.getSetting(Varbits.MULTICOMBAT_AREA) == 1)) && (opponentsOpponent != client.getLocalPlayer() || client.getSetting(Varbits.MULTICOMBAT_AREA) == 1))
{ {
opponentsOpponentName = opponentsOpponent.getName().replaceAll("<[^>]*>", ""); opponentsOpponentName = Text.removeTags(opponentsOpponent.getName());
} }
else else
{ {

View File

@@ -68,6 +68,7 @@ import net.runelite.client.plugins.raids.solver.LayoutSolver;
import net.runelite.client.plugins.raids.solver.RotationSolver; import net.runelite.client.plugins.raids.solver.RotationSolver;
import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.infobox.InfoBoxManager; import net.runelite.client.ui.overlay.infobox.InfoBoxManager;
import net.runelite.client.util.Text;
@PluginDescriptor( @PluginDescriptor(
name = "Chambers Of Xeric" name = "Chambers Of Xeric"
@@ -252,7 +253,7 @@ public class RaidsPlugin extends Plugin
{ {
if (inRaidChambers && event.getType() == ChatMessageType.CLANCHAT_INFO) if (inRaidChambers && event.getType() == ChatMessageType.CLANCHAT_INFO)
{ {
String message = event.getMessage().replaceAll("<[^>]*>", ""); String message = Text.removeTags(event.getMessage());
if (config.raidsTimer() && message.startsWith(RAID_START_MESSAGE)) if (config.raidsTimer() && message.startsWith(RAID_START_MESSAGE))
{ {

View File

@@ -81,6 +81,7 @@ import net.runelite.client.plugins.screenshot.imgur.ImageUploadResponse;
import net.runelite.client.ui.ClientUI; import net.runelite.client.ui.ClientUI;
import net.runelite.client.ui.FontManager; import net.runelite.client.ui.FontManager;
import net.runelite.client.ui.overlay.OverlayRenderer; import net.runelite.client.ui.overlay.OverlayRenderer;
import net.runelite.client.util.Text;
import net.runelite.http.api.RuneLiteAPI; import net.runelite.http.api.RuneLiteAPI;
import okhttp3.Call; import okhttp3.Call;
import okhttp3.Callback; import okhttp3.Callback;
@@ -227,7 +228,7 @@ public class ScreenshotPlugin extends Plugin
if (chatMessage.contains("You have completed") && chatMessage.contains("Treasure")) if (chatMessage.contains("You have completed") && chatMessage.contains("Treasure"))
{ {
Matcher m = NUMBER_PATTERN.matcher(chatMessage.replaceAll("<[^>]*>", "")); Matcher m = NUMBER_PATTERN.matcher(Text.removeTags(chatMessage));
if (m.find()) if (m.find())
{ {
clueNumber = Integer.valueOf(m.group()); clueNumber = Integer.valueOf(m.group());
@@ -238,7 +239,7 @@ public class ScreenshotPlugin extends Plugin
if (chatMessage.startsWith("Your Barrows chest count is")) if (chatMessage.startsWith("Your Barrows chest count is"))
{ {
Matcher m = NUMBER_PATTERN.matcher(chatMessage.replaceAll("<[^>]*>", "")); Matcher m = NUMBER_PATTERN.matcher(Text.removeTags(chatMessage));
if (m.find()) if (m.find())
{ {
barrowsNumber = Integer.valueOf(m.group()); barrowsNumber = Integer.valueOf(m.group());
@@ -248,7 +249,7 @@ public class ScreenshotPlugin extends Plugin
if (chatMessage.startsWith("Your completed Chambers of Xeric count is:")) if (chatMessage.startsWith("Your completed Chambers of Xeric count is:"))
{ {
Matcher m = NUMBER_PATTERN.matcher(chatMessage.replaceAll("<[^>]*>", "")); Matcher m = NUMBER_PATTERN.matcher(Text.removeTags(chatMessage));
if (m.find()) if (m.find())
{ {
raidsNumber = Integer.valueOf(m.group()); raidsNumber = Integer.valueOf(m.group());

View File

@@ -53,6 +53,7 @@ import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.task.Schedule; import net.runelite.client.task.Schedule;
import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.infobox.InfoBoxManager; import net.runelite.client.ui.overlay.infobox.InfoBoxManager;
import net.runelite.client.util.Text;
@PluginDescriptor( @PluginDescriptor(
name = "Slayer" name = "Slayer"
@@ -155,7 +156,7 @@ public class SlayerPlugin extends Plugin
Widget NPCDialog = client.getWidget(WidgetInfo.DIALOG_NPC_TEXT); Widget NPCDialog = client.getWidget(WidgetInfo.DIALOG_NPC_TEXT);
if (NPCDialog != null) if (NPCDialog != null)
{ {
String NPCText = NPCDialog.getText().replaceAll("<[^>]*>", " "); //remove color and linebreaks String NPCText = Text.removeTags(NPCDialog.getText()); //remove color and linebreaks
Matcher mAssign = NPC_ASSIGN_MESSAGE.matcher(NPCText); //number, name Matcher mAssign = NPC_ASSIGN_MESSAGE.matcher(NPCText); //number, name
Matcher mCurrent = NPC_CURRENT_MESSAGE.matcher(NPCText); //name, number Matcher mCurrent = NPC_CURRENT_MESSAGE.matcher(NPCText); //name, number
boolean found1 = mAssign.find(); boolean found1 = mAssign.find();
@@ -193,7 +194,7 @@ public class SlayerPlugin extends Plugin
return; return;
} }
String chatMsg = event.getMessage().replaceAll("<[^>]*>", ""); //remove color and linebreaks String chatMsg = Text.removeTags(event.getMessage()); //remove color and linebreaks
if (chatMsg.endsWith("; return to a Slayer master.")) if (chatMsg.endsWith("; return to a Slayer master."))
{ {
Matcher mComplete = CHAT_COMPLETE_MESSAGE.matcher(chatMsg); Matcher mComplete = CHAT_COMPLETE_MESSAGE.matcher(chatMsg);