Merge remote-tracking branch 'runelite/master' into ready-set-action
Conflicts: .gitignore cache-client/pom.xml cache-updater/pom.xml cache/pom.xml cache/src/main/java/net/runelite/cache/definitions/loaders/ParamLoader.java deobfuscator/src/main/java/net/runelite/deob/clientver/ClientVersion.java http-api/pom.xml http-service/pom.xml http-service/src/test/java/net/runelite/http/service/hiscore/HiscoreServiceTest.java pom.xml protocol-api/pom.xml protocol/pom.xml runelite-api/pom.xml runelite-api/src/main/java/net/runelite/api/Client.java runelite-client/pom.xml runelite-client/src/main/java/net/runelite/client/RuneLite.java runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java runelite-client/src/main/java/net/runelite/client/config/RuneLiteConfig.java runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java runelite-client/src/main/java/net/runelite/client/plugins/camera/CameraConfig.java runelite-client/src/main/java/net/runelite/client/plugins/camera/CameraPlugin.java runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonConfig.java runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java runelite-client/src/main/java/net/runelite/client/plugins/config/HotkeyButton.java runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java runelite-client/src/main/java/net/runelite/client/plugins/musicindicator/MusicIndicatorPlugin.java runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java runelite-client/src/main/java/net/runelite/client/plugins/slayer/Task.java runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/Tree.java runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingPlugin.java runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableHeader.java runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java runelite-client/src/main/java/net/runelite/client/rs/CountingInputStream.java runelite-client/src/main/java/net/runelite/client/ui/FatalErrorDialog.java runelite-client/src/main/java/net/runelite/client/ui/SplashScreen.java runelite-client/src/main/java/net/runelite/client/util/CountingInputStream.java runelite-client/src/main/java/net/runelite/client/util/ImageUtil.java runelite-client/src/main/java/net/runelite/client/util/SwingUtil.java runelite-client/src/main/resources/net/runelite/client/runelite.properties runelite-client/src/main/resources/npc_health.json runelite-client/src/test/java/net/runelite/client/plugins/hiscore/HiscorePanelTest.java runelite-client/src/test/java/net/runelite/client/plugins/raids/RaidsPluginTest.java runelite-script-assembler-plugin/pom.xml
This commit is contained in:
Owain van Brakel
@@ -203,7 +203,7 @@ public class HiscoreResult
|
||||
return chaosElemental;
|
||||
case CHAOS_FANATIC:
|
||||
return chaosFanatic;
|
||||
case COMMMANDER_ZILYANA:
|
||||
case COMMANDER_ZILYANA:
|
||||
return commanderZilyana;
|
||||
case CORPOREAL_BEAST:
|
||||
return corporealBeast;
|
||||
|
||||
@@ -94,8 +94,8 @@ class HiscoreResultBuilder
|
||||
hiscoreResult.setAlchemicalHydra(skills.get(index++));
|
||||
hiscoreResult.setBarrowsChests(skills.get(index++));
|
||||
hiscoreResult.setBryophyta(skills.get(index++));
|
||||
// hiscoreResult.setCallisto(skills.get(index++));
|
||||
// hiscoreResult.setCerberus(skills.get(index++));
|
||||
hiscoreResult.setCallisto(skills.get(index++));
|
||||
hiscoreResult.setCerberus(skills.get(index++));
|
||||
hiscoreResult.setChambersOfXeric(skills.get(index++));
|
||||
hiscoreResult.setChambersOfXericChallengeMode(skills.get(index++));
|
||||
hiscoreResult.setChaosElemental(skills.get(index++));
|
||||
|
||||
@@ -26,89 +26,93 @@ package net.runelite.http.api.hiscore;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
import static net.runelite.http.api.hiscore.HiscoreSkillType.SKILL;
|
||||
import static net.runelite.http.api.hiscore.HiscoreSkillType.ACTIVITY;
|
||||
import static net.runelite.http.api.hiscore.HiscoreSkillType.BOSS;
|
||||
|
||||
@AllArgsConstructor
|
||||
@Getter
|
||||
public enum HiscoreSkill
|
||||
{
|
||||
OVERALL("Overall"),
|
||||
ATTACK("Attack"),
|
||||
DEFENCE("Defence"),
|
||||
STRENGTH("Strength"),
|
||||
HITPOINTS("Hitpoints"),
|
||||
RANGED("Ranged"),
|
||||
PRAYER("Prayer"),
|
||||
MAGIC("Magic"),
|
||||
COOKING("Cooking"),
|
||||
WOODCUTTING("Woodcutting"),
|
||||
FLETCHING("Fletching"),
|
||||
FISHING("Fishing"),
|
||||
FIREMAKING("Firemaking"),
|
||||
CRAFTING("Crafting"),
|
||||
SMITHING("Smithing"),
|
||||
MINING("Mining"),
|
||||
HERBLORE("Herblore"),
|
||||
AGILITY("Agility"),
|
||||
THIEVING("Thieving"),
|
||||
SLAYER("Slayer"),
|
||||
FARMING("Farming"),
|
||||
RUNECRAFT("Runecraft"),
|
||||
HUNTER("Hunter"),
|
||||
CONSTRUCTION("Construction"),
|
||||
LEAGUE_POINTS("League Points"),
|
||||
BOUNTY_HUNTER_HUNTER("Bounty Hunter - Hunter"),
|
||||
BOUNTY_HUNTER_ROGUE("Bounty Hunter - Rogue"),
|
||||
CLUE_SCROLL_ALL("Clue Scrolls (all)"),
|
||||
CLUE_SCROLL_BEGINNER("Clue Scrolls (beginner)"),
|
||||
CLUE_SCROLL_EASY("Clue Scrolls (easy)"),
|
||||
CLUE_SCROLL_MEDIUM("Clue Scrolls (medium)"),
|
||||
CLUE_SCROLL_HARD("Clue Scrolls (hard)"),
|
||||
CLUE_SCROLL_ELITE("Clue Scrolls (elite)"),
|
||||
CLUE_SCROLL_MASTER("Clue Scrolls (master)"),
|
||||
LAST_MAN_STANDING("Last Man Standing"),
|
||||
ABYSSAL_SIRE("Abyssal Sire"),
|
||||
ALCHEMICAL_HYDRA("Alchemical Hydra"),
|
||||
BARROWS_CHESTS("Barrows Chests"),
|
||||
BRYOPHYTA("Bryophyta"),
|
||||
CALLISTO("Callisto"),
|
||||
CERBERUS("Cerberus"),
|
||||
CHAMBERS_OF_XERIC("Chambers of Xeric"),
|
||||
CHAMBERS_OF_XERIC_CHALLENGE_MODE("Chambers of Xeric: Challenge Mode"),
|
||||
CHAOS_ELEMENTAL("Chaos Elemental"),
|
||||
CHAOS_FANATIC("Chaos Fanatic"),
|
||||
COMMMANDER_ZILYANA("Commander Zilyana"),
|
||||
CORPOREAL_BEAST("Corporeal Beast"),
|
||||
CRAZY_ARCHAEOLOGIST("Crazy Archaeologist"),
|
||||
DAGANNOTH_PRIME("Dagannoth Prime"),
|
||||
DAGANNOTH_REX("Dagannoth Rex"),
|
||||
DAGANNOTH_SUPREME("Dagannoth Supreme"),
|
||||
DERANGED_ARCHAEOLOGIST("Deranged Archaeologist"),
|
||||
GENERAL_GRAARDOR("General Graardor"),
|
||||
GIANT_MOLE("Giant Mole"),
|
||||
GROTESQUE_GUARDIANS("Grotesque Guardians"),
|
||||
HESPORI("Hespori"),
|
||||
KALPHITE_QUEEN("Kalphite Queen"),
|
||||
KING_BLACK_DRAGON("King Black Dragon"),
|
||||
KRAKEN("Kraken"),
|
||||
KREEARRA("Kree'Arra"),
|
||||
KRIL_TSUTSAROTH("K'ril Tsutsaroth"),
|
||||
MIMIC("Mimic"),
|
||||
OBOR("Obor"),
|
||||
SARACHNIS("Sarachnis"),
|
||||
SCORPIA("Scorpia"),
|
||||
SKOTIZO("Skotizo"),
|
||||
THE_GAUNTLET("The Gauntlet"),
|
||||
THE_CORRUPTED_GAUNTLET("The Corrupted Gauntlet"),
|
||||
THEATRE_OF_BLOOD("Theatre of Blood"),
|
||||
THERMONUCLEAR_SMOKE_DEVIL("Thermonuclear Smoke Devil"),
|
||||
TZKAL_ZUK("TzKal-Zuk"),
|
||||
TZTOK_JAD("TzTok-Jad"),
|
||||
VENENATIS("Venenatis"),
|
||||
VETION("Vet'ion"),
|
||||
VORKATH("Vorkath"),
|
||||
WINTERTODT("Wintertodt"),
|
||||
ZALCANO("Zalcano"),
|
||||
ZULRAH("Zulrah");
|
||||
OVERALL("Overall", HiscoreSkillType.OVERALL),
|
||||
ATTACK("Attack", SKILL),
|
||||
DEFENCE("Defence", SKILL),
|
||||
STRENGTH("Strength", SKILL),
|
||||
HITPOINTS("Hitpoints", SKILL),
|
||||
RANGED("Ranged", SKILL),
|
||||
PRAYER("Prayer", SKILL),
|
||||
MAGIC("Magic", SKILL),
|
||||
COOKING("Cooking", SKILL),
|
||||
WOODCUTTING("Woodcutting", SKILL),
|
||||
FLETCHING("Fletching", SKILL),
|
||||
FISHING("Fishing", SKILL),
|
||||
FIREMAKING("Firemaking", SKILL),
|
||||
CRAFTING("Crafting", SKILL),
|
||||
SMITHING("Smithing", SKILL),
|
||||
MINING("Mining", SKILL),
|
||||
HERBLORE("Herblore", SKILL),
|
||||
AGILITY("Agility", SKILL),
|
||||
THIEVING("Thieving", SKILL),
|
||||
SLAYER("Slayer", SKILL),
|
||||
FARMING("Farming", SKILL),
|
||||
RUNECRAFT("Runecraft", SKILL),
|
||||
HUNTER("Hunter", SKILL),
|
||||
CONSTRUCTION("Construction", SKILL),
|
||||
LEAGUE_POINTS("League Points", ACTIVITY),
|
||||
BOUNTY_HUNTER_HUNTER("Bounty Hunter - Hunter", ACTIVITY),
|
||||
BOUNTY_HUNTER_ROGUE("Bounty Hunter - Rogue", ACTIVITY),
|
||||
CLUE_SCROLL_ALL("Clue Scrolls (all)", ACTIVITY),
|
||||
CLUE_SCROLL_BEGINNER("Clue Scrolls (beginner)", ACTIVITY),
|
||||
CLUE_SCROLL_EASY("Clue Scrolls (easy)", ACTIVITY),
|
||||
CLUE_SCROLL_MEDIUM("Clue Scrolls (medium)", ACTIVITY),
|
||||
CLUE_SCROLL_HARD("Clue Scrolls (hard)", ACTIVITY),
|
||||
CLUE_SCROLL_ELITE("Clue Scrolls (elite)", ACTIVITY),
|
||||
CLUE_SCROLL_MASTER("Clue Scrolls (master)", ACTIVITY),
|
||||
LAST_MAN_STANDING("Last Man Standing", ACTIVITY),
|
||||
ABYSSAL_SIRE("Abyssal Sire", BOSS),
|
||||
ALCHEMICAL_HYDRA("Alchemical Hydra", BOSS),
|
||||
BARROWS_CHESTS("Barrows Chests", BOSS),
|
||||
BRYOPHYTA("Bryophyta", BOSS),
|
||||
CALLISTO("Callisto", BOSS),
|
||||
CERBERUS("Cerberus", BOSS),
|
||||
CHAMBERS_OF_XERIC("Chambers of Xeric", BOSS),
|
||||
CHAMBERS_OF_XERIC_CHALLENGE_MODE("Chambers of Xeric: Challenge Mode", BOSS),
|
||||
CHAOS_ELEMENTAL("Chaos Elemental", BOSS),
|
||||
CHAOS_FANATIC("Chaos Fanatic", BOSS),
|
||||
COMMANDER_ZILYANA("Commander Zilyana", BOSS),
|
||||
CORPOREAL_BEAST("Corporeal Beast", BOSS),
|
||||
CRAZY_ARCHAEOLOGIST("Crazy Archaeologist", BOSS),
|
||||
DAGANNOTH_PRIME("Dagannoth Prime", BOSS),
|
||||
DAGANNOTH_REX("Dagannoth Rex", BOSS),
|
||||
DAGANNOTH_SUPREME("Dagannoth Supreme", BOSS),
|
||||
DERANGED_ARCHAEOLOGIST("Deranged Archaeologist", BOSS),
|
||||
GENERAL_GRAARDOR("General Graardor", BOSS),
|
||||
GIANT_MOLE("Giant Mole", BOSS),
|
||||
GROTESQUE_GUARDIANS("Grotesque Guardians", BOSS),
|
||||
HESPORI("Hespori", BOSS),
|
||||
KALPHITE_QUEEN("Kalphite Queen", BOSS),
|
||||
KING_BLACK_DRAGON("King Black Dragon", BOSS),
|
||||
KRAKEN("Kraken", BOSS),
|
||||
KREEARRA("Kree'Arra", BOSS),
|
||||
KRIL_TSUTSAROTH("K'ril Tsutsaroth", BOSS),
|
||||
MIMIC("Mimic", BOSS),
|
||||
OBOR("Obor", BOSS),
|
||||
SARACHNIS("Sarachnis", BOSS),
|
||||
SCORPIA("Scorpia", BOSS),
|
||||
SKOTIZO("Skotizo", BOSS),
|
||||
THE_GAUNTLET("The Gauntlet", BOSS),
|
||||
THE_CORRUPTED_GAUNTLET("The Corrupted Gauntlet", BOSS),
|
||||
THEATRE_OF_BLOOD("Theatre of Blood", BOSS),
|
||||
THERMONUCLEAR_SMOKE_DEVIL("Thermonuclear Smoke Devil", BOSS),
|
||||
TZKAL_ZUK("TzKal-Zuk", BOSS),
|
||||
TZTOK_JAD("TzTok-Jad", BOSS),
|
||||
VENENATIS("Venenatis", BOSS),
|
||||
VETION("Vet'ion", BOSS),
|
||||
VORKATH("Vorkath", BOSS),
|
||||
WINTERTODT("Wintertodt", BOSS),
|
||||
ZALCANO("Zalcano", BOSS),
|
||||
ZULRAH("Zulrah", BOSS);
|
||||
|
||||
private final String name;
|
||||
private final HiscoreSkillType type;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
/*
|
||||
* Copyright (c) 2019, Bram91 <https://github.com/bram91>
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
||||
* list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||
* this list of conditions and the following disclaimer in the documentation
|
||||
* and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (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.http.api.hiscore;
|
||||
|
||||
public enum HiscoreSkillType
|
||||
{
|
||||
OVERALL,
|
||||
SKILL,
|
||||
ACTIVITY,
|
||||
BOSS
|
||||
}
|
||||
Reference in New Issue
Block a user