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

Add dmmt world type and tournament hiscore endpoint

Browse Source
This commit is contained in:
Adam
2020-05-01 10:20:18 -04:00
parent 1c272bb649
commit d25546f5db
8 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java
View File

@@ -70,6 +70,7 @@ import net.runelite.http.api.hiscore.HiscoreSkill;
import static net.runelite.http.api.hiscore.HiscoreSkill.*;
import net.runelite.http.api.hiscore.HiscoreSkillType;
import net.runelite.http.api.hiscore.Skill;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
@Slf4j
@@ -113,6 +114,10 @@ public class HiscorePanel extends PluginPanel
ZALCANO, ZULRAH
);
private static final HiscoreEndpoint[] ENDPOINTS = new HiscoreEndpoint[] {
HiscoreEndpoint.NORMAL, HiscoreEndpoint.IRONMAN, HiscoreEndpoint.HARDCORE_IRONMAN, HiscoreEndpoint.ULTIMATE_IRONMAN, HiscoreEndpoint.DEADMAN, HiscoreEndpoint.TOURNAMENT
};
@Inject
ScheduledExecutorService executor;
@@ -200,7 +205,7 @@ public class HiscorePanel extends PluginPanel
tabGroup = new MaterialTabGroup();
tabGroup.setLayout(new GridLayout(1, 5, 7, 7));
for (HiscoreEndpoint endpoint : HiscoreEndpoint.values())
for (HiscoreEndpoint endpoint : ENDPOINTS)
{
final BufferedImage iconImage = ImageUtil.getResourceStreamFromClass(getClass(), endpoint.name().toLowerCase() + ".png");
@@ -681,7 +686,9 @@ public class HiscorePanel extends PluginPanel
private void resetEndpoints()
{
// Select the correct tab based on the world type.
tabGroup.select(tabGroup.getTab(selectWorldEndpoint().ordinal()));
HiscoreEndpoint endpoint = selectWorldEndpoint();
int idx = ArrayUtils.indexOf(ENDPOINTS, endpoint);
tabGroup.select(tabGroup.getTab(idx));
}
private HiscoreEndpoint selectWorldEndpoint()
@@ -690,7 +697,11 @@ public class HiscorePanel extends PluginPanel
{
EnumSet<WorldType> wTypes = client.getWorldType();
if (wTypes.contains(WorldType.DEADMAN))
if (wTypes.contains(WorldType.DEADMAN_TOURNAMENT))
{
return HiscoreEndpoint.TOURNAMENT;
}
else if (wTypes.contains(WorldType.DEADMAN))
{
return HiscoreEndpoint.DEADMAN;
}

6
runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java
View File

@@ -113,7 +113,11 @@ public class OpponentInfoPlugin extends Plugin
}
final EnumSet<WorldType> worldType = client.getWorldType();
if (worldType.contains(WorldType.DEADMAN))
if (worldType.contains(WorldType.DEADMAN_TOURNAMENT))
{
hiscoreEndpoint = HiscoreEndpoint.TOURNAMENT;
}
else if (worldType.contains(WorldType.DEADMAN))
{
hiscoreEndpoint = HiscoreEndpoint.DEADMAN;
}