raids plugin: Use Sprite ID for raids timer

This commit is contained in:
Jordan Atwood
2018-07-18 10:38:36 -07:00
parent 470966d0d6
commit 24bc03bb1d
2 changed files with 6 additions and 26 deletions

View File

@@ -27,15 +27,12 @@ package net.runelite.client.plugins.raids;
import com.google.common.eventbus.Subscribe; import com.google.common.eventbus.Subscribe;
import com.google.inject.Binder; import com.google.inject.Binder;
import com.google.inject.Provides; import com.google.inject.Provides;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.time.Instant; import java.time.Instant;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import javax.imageio.ImageIO;
import javax.inject.Inject; import javax.inject.Inject;
import lombok.Getter; import lombok.Getter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -46,6 +43,7 @@ import net.runelite.api.InstanceTemplates;
import net.runelite.api.NullObjectID; import net.runelite.api.NullObjectID;
import static net.runelite.api.Perspective.SCENE_SIZE; import static net.runelite.api.Perspective.SCENE_SIZE;
import net.runelite.api.Point; import net.runelite.api.Point;
import static net.runelite.api.SpriteID.TAB_QUESTS_BROWN_RAIDING_PARTY;
import net.runelite.api.Tile; import net.runelite.api.Tile;
import net.runelite.api.VarPlayer; import net.runelite.api.VarPlayer;
import net.runelite.api.Varbits; import net.runelite.api.Varbits;
@@ -60,6 +58,7 @@ import net.runelite.client.chat.ChatMessageBuilder;
import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.chat.ChatMessageManager;
import net.runelite.client.chat.QueuedMessage; import net.runelite.client.chat.QueuedMessage;
import net.runelite.client.config.ConfigManager; import net.runelite.client.config.ConfigManager;
import net.runelite.client.game.SpriteManager;
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.plugins.raids.solver.Layout; import net.runelite.client.plugins.raids.solver.Layout;
@@ -86,7 +85,6 @@ public class RaidsPlugin extends Plugin
private static final String SPLIT_REGEX = "\\s*,\\s*"; private static final String SPLIT_REGEX = "\\s*,\\s*";
private static final Pattern ROTATION_REGEX = Pattern.compile("\\[(.*?)]"); private static final Pattern ROTATION_REGEX = Pattern.compile("\\[(.*?)]");
private BufferedImage raidsIcon;
private RaidsTimer timer; private RaidsTimer timer;
@Getter @Getter
@@ -116,6 +114,9 @@ public class RaidsPlugin extends Plugin
@Inject @Inject
private LayoutSolver layoutSolver; private LayoutSolver layoutSolver;
@Inject
private SpriteManager spriteManager;
@Getter @Getter
private Raid raid; private Raid raid;
@@ -270,7 +271,7 @@ public class RaidsPlugin extends Plugin
if (config.raidsTimer() && message.startsWith(RAID_START_MESSAGE)) if (config.raidsTimer() && message.startsWith(RAID_START_MESSAGE))
{ {
timer = new RaidsTimer(getRaidsIcon(), this, Instant.now()); timer = new RaidsTimer(spriteManager.getSprite(TAB_QUESTS_BROWN_RAIDING_PARTY, 0), this, Instant.now());
infoBoxManager.addInfoBox(timer); infoBoxManager.addInfoBox(timer);
} }
@@ -602,25 +603,4 @@ public class RaidsPlugin extends Plugin
return room; return room;
} }
private BufferedImage getRaidsIcon()
{
if (raidsIcon != null)
{
return raidsIcon;
}
try
{
synchronized (ImageIO.class)
{
raidsIcon = ImageIO.read(RaidsPlugin.class.getResourceAsStream("raids_icon.png"));
}
}
catch (IOException ex)
{
log.warn("Unable to load image", ex);
}
return raidsIcon;
}
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB