ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

raids: add world region to scout overlay

Browse Source 
Adds the region of the world the scout was performed.
Before: W303         Username
Now:    W303 (DE)    Username

Co-authored-by: melkypie <melkypie@users.noreply.github.com>
This commit is contained in:
Adam
2020-03-24 11:24:35 -04:00
committed by Adam
parent c930a5d261
commit 21b7ccd2e8
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java
View File

@@ -35,6 +35,7 @@ import net.runelite.api.ClanMemberManager;
import net.runelite.api.Client;
import static net.runelite.api.MenuAction.RUNELITE_OVERLAY;
import static net.runelite.api.MenuAction.RUNELITE_OVERLAY_CONFIG;
import net.runelite.client.game.WorldService;
import net.runelite.client.plugins.raids.solver.Room;
import net.runelite.client.ui.overlay.Overlay;
import static net.runelite.client.ui.overlay.OverlayManager.OPTION_CONFIGURE;
@@ -45,6 +46,9 @@ import net.runelite.client.ui.overlay.components.ComponentConstants;
import net.runelite.client.ui.overlay.components.LineComponent;
import net.runelite.client.ui.overlay.components.PanelComponent;
import net.runelite.client.ui.overlay.components.TitleComponent;
import net.runelite.http.api.worlds.World;
import net.runelite.http.api.worlds.WorldRegion;
import net.runelite.http.api.worlds.WorldResult;
public class RaidsOverlay extends Overlay
{
@@ -61,6 +65,9 @@ public class RaidsOverlay extends Overlay
@Setter
private boolean scoutOverlayShown = false;
@Inject
private WorldService worldService;
@Inject
private RaidsOverlay(Client client, RaidsPlugin plugin, RaidsConfig config)
{
@@ -113,7 +120,20 @@ public class RaidsOverlay extends Overlay
color = Color.RED;
ClanMemberManager clanMemberManager = client.getClanMemberManager();
FontMetrics metrics = graphics.getFontMetrics();
String worldString = "W" + client.getWorld();
WorldResult worldResult = worldService.getWorlds();
if (worldResult != null)
{
World world = worldResult.findWorld(client.getWorld());
WorldRegion region = world.getRegion();
if (region != null)
{
String countryCode = region.getAlpha2();
worldString += " (" + countryCode + ")";
}
}
String clanOwner = "Join a CC";
if (clanMemberManager != null)
{