Merge branch 'master' of https://github.com/runelite/runelite into upstream-4-7-2020

Conflicts: http-api/src/main/java/net/runelite/http/api/item/ItemClient.java http-service/src/main/java/net/runelite/http/service/item/ItemController.java http-service/src/main/java/net/runelite/http/service/item/ItemEntry.java http-service/src/main/java/net/runelite/http/service/item/ItemService.java http-service/src/main/java/net/runelite/http/service/item/RSItem.java http-service/src/main/java/net/runelite/http/service/item/RSItemResponse.java runelite-api/src/main/java/net/runelite/api/ScriptID.java runelite-api/src/main/java/net/runelite/api/Varbits.java runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java runelite-client/src/main/java/net/runelite/client/callback/Hooks.java runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragConfig.java runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java runelite-client/src/main/java/net/runelite/client/plugins/camera/CameraPlugin.java runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java runelite-client/src/main/java/net/runelite/client/plugins/config/PluginHubPanel.java runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/BookPanel.java runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryConfig.java runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPanel.java runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java runelite-client/src/main/java/net/runelite/client/plugins/music/MusicPlugin.java runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java
2020-04-07 21:16:50 -04:00
parent b09ea94f2d 15b5dd0290
commit 8a00bd3ece
10 changed files with 166 additions and 93 deletions
--- a/runelite-api/src/main/java/net/runelite/api/ScriptID.java
+++ b/runelite-api/src/main/java/net/runelite/api/ScriptID.java
@@ -59,6 +59,12 @@ public final class ScriptID
 	@ScriptArguments(integer = 1, string = 1)
 	public static final int CHATBOX_INPUT = 96;

+	/**
+	 * Rebuilds the chatbox
+	 */
+	@ScriptArguments()
+	public static final int BUILD_CHATBOX = 216;
+
 	/**
 	 * Opens the Private Message chat interface
 	 *
@@ -127,6 +133,23 @@ public final class ScriptID
 	@ScriptArguments(integer = 20)
 	public static final int BANK_PIN_OP = 685;

+	/**
+	 * Builds the chatbox input widget
+	 */
+	@ScriptArguments()
+	public static final int CHAT_PROMPT_INIT = 223;
+
+	/**
+	 * Displays the game messages when clicking on an item inside the Items Kept on Death interface
+	 * <ul>
+	 * <li> int (boolean) Item kept on death </li>
+	 * <li> int Item Quantity </li>
+	 * <li> String Item Name </li>
+	 * </ul>
+	 */
+	@ScriptArguments(integer = 2, string = 1)
+	public static final int DEATH_KEEP_ITEM_EXAMINE = 1603;
+
 	/**
 	 * Checks the state of the given stash unit.
 	 * <ul>
@@ -135,7 +158,7 @@ public final class ScriptID
 	 * <li>int Bitpacked stash unit states 2</li>
 	 * <li>int Bitpacked stash unit states 3</li>
 	 * </ul>
-	 * <p>
+	 *
 	 * Returns a pair of booleans indicating if the stash unit is built and if it is filled
 	 */
 	@ScriptArguments(integer = 4)
@@ -163,8 +186,8 @@ public final class ScriptID
 	public static final int XPDROP_DISABLED = 2091;

 	/**
-	 * <ul>
 	 * Queries the completion state of a quest by its struct id
+	 * <ul>
 	 * <li> int (struct) The id of the quest
 	 * </ul>
 	 * Returns
@@ -185,6 +208,18 @@ public final class ScriptID
 	@ScriptArguments(integer = 2)
 	public static final int DIARY_QUEST_UPDATE_LINECOUNT = 2523;

+	/**
+	 * Handles zoom input
+	 *
+	 * Updates the VarClientInts (73, 74) to this same value
+	 * <ul>
+	 * <li> int  Reset zoom position </li>
+	 * <li> int  Reset zoom position </li>
+	 * </ul>
+	 */
+	@ScriptArguments(integer = 2)
+	public static final int CAMERA_DO_ZOOM = 42;
+
 	/**
 	 * Rebuilds the Spellbook
 	 */
@@ -206,6 +241,17 @@ public final class ScriptID
 	@ScriptArguments(string = 2)
 	public static final int PRIVMSG = 10004;

+	/**
+	 * Creates a disabled experience drop
+	 *
+	 * <ul>
+	 * <li>int (Skill ordinal) Sets what icon to use</li>
+	 * <li>int Amount of exp to drop</li>
+	 * </ul>
+	 */
+	@ScriptArguments(integer = 2)
+	public static final int XPDROP_DISABLED = 2091;
+
 	/**
 	 * Join a clan, duh
 	 */
@@ -309,4 +355,3 @@ public final class ScriptID
 	@ScriptArguments(integer = 7)
 	public static final int IGNORE_UPDATE = 630;
 }
-
--- a/runelite-api/src/main/java/net/runelite/api/VarClientInt.java
+++ b/runelite-api/src/main/java/net/runelite/api/VarClientInt.java
@@ -52,6 +52,12 @@ public enum VarClientInt
 	 */
 	INPUT_TYPE(5),

+	/**
+	 * The game sets this to the same value as {@link #CAMERA_ZOOM_RESIZABLE_VIEWPORT}
+	 */
+	CAMERA_ZOOM_FIXED_VIEWPORT(73),
+	CAMERA_ZOOM_RESIZABLE_VIEWPORT(74),
+
 	MEMBERSHIP_STATUS(103),

 	/**
--- a/runelite-api/src/main/java/net/runelite/api/Varbits.java
+++ b/runelite-api/src/main/java/net/runelite/api/Varbits.java
@@ -435,12 +435,12 @@ public enum Varbits
 	DAILY_ESSENCE_COLLECTED(4547),
 	DAILY_RUNES_COLLECTED(4540),
 	DAILY_SAND_COLLECTED(4549),
-	DAILY_ARROWS_STATE(4563),
 	DAILY_FLAX_STATE(4559),
+	DAILY_ARROWS_STATE(4563),
 	/**
 	 * This varbit tracks how much bonemeal has been redeemed from Robin
 	 * The player gets 13 for each diary completed above and including Medium, for a maxiumum of 39
-	 */
+ 	*/
 	DAILY_BONEMEAL_STATE(4543),

 	DAILY_DYNAMITE_COLLECTED(7939),
@@ -746,6 +746,22 @@ public enum Varbits
 	/**
 	 * Starts at 100, counts down every 10 ticks (6 seconds)
 	 */
+	TWISTED_LEAGUE_RELIC_1(10049),
+	TWISTED_LEAGUE_RELIC_2(10050),
+	TWISTED_LEAGUE_RELIC_3(10051),
+	TWISTED_LEAGUE_RELIC_4(10052),
+	TWISTED_LEAGUE_RELIC_5(10053),
+
+	/**
+	 * Whether the Special Attack orb is disabled due to being in a PvP area
+	 *
+	 * 0 = Enabled (player is not in PvP)
+	 * 1 = Disabled (player in in PvP)
+	 *
+	 * @see <a href="https://oldschool.runescape.wiki/w/Minimap#Special_attack_orb">The OSRS Wiki's Minimap page</a>
+	 */
+	PVP_SPEC_ORB(8121);
+
 	LMS_POISON_PROGRESS(5317),

 	/**
@@ -787,7 +803,6 @@ public enum Varbits
 	EMOTES_TAB_HOTKEY(4687),
 	CLAN_TAB_HOTKEY(4683),
 	MUSIC_TAB_HOTKEY(4688);
-
 	/**
 	 * The raw varbit ID.
 	 */
--- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
+++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
@@ -1321,6 +1321,7 @@ public class WidgetID

 	static class Options
 	{
+		static final int CAMERA_ZOOM_SLIDER_HANDLE = 15;
 		static final int MUSIC_SLIDER = 37;
 		static final int SOUND_EFFECT_SLIDER = 43;
 		static final int AREA_SOUND_SLIDER = 49;
--- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java
+++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java
@@ -592,9 +592,13 @@ public enum WidgetInfo
 	FOSSIL_MUSHROOM_MEADOW(WidgetID.FOSSIL_ISLAND_MUSHROOM_TELE_GROUP_ID, WidgetID.FossilMushroomTeleport.MUSHROOM_MEADOW),

 	MINIGAME_TELEPORT_BUTTON(WidgetID.MINIGAME_TAB_ID, WidgetID.Minigames.TELEPORT_BUTTON),
-
 	PVP_FOG_OVERLAY(WidgetID.PVP_GROUP_ID, WidgetID.Pvp.FOG_OVERLAY),
-	PVP_CONTAINER(WidgetID.PVP_GROUP_ID, WidgetID.Pvp.PVP_WIDGET_CONTAINER),
+	PVP_CONTAINER(WidgetID.PVP_GROUP_ID, WidgetID.Pvp.PVP_WIDGET_CONTAINER)
+	SPELL_LUMBRIDGE_HOME_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.StandardSpellBook.LUMBRIDGE_HOME_TELEPORT),
+	SPELL_EDGEVILLE_HOME_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.AncientSpellBook.EDGEVILLE_HOME_TELEPORT),
+	SPELL_LUNAR_HOME_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.LunarSpellBook.LUNAR_HOME_TELEPORT),
+	SPELL_ARCEUUS_HOME_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.ArceuusSpellBook.ARCEUUS_HOME_TELEPORT),
+	SPELL_KOUREND_HOME_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.StandardSpellBook.KOUREND_HOME_TELEPORT),

 	PVP_SKULL_CONTAINER(WidgetID.PVP_GROUP_ID, WidgetID.Pvp.SKULL_CONTAINER),
 	PVP_SKULL(WidgetID.PVP_GROUP_ID, WidgetID.Pvp.SKULL),
@@ -871,14 +875,13 @@ public enum WidgetInfo
 	SEED_VAULT_ITEM_CONTAINER(WidgetID.SEED_VAULT_GROUP_ID, WidgetID.SeedVault.ITEM_CONTAINER),
 	SEED_VAULT_ITEM_TEXT(WidgetID.SEED_VAULT_GROUP_ID, WidgetID.SeedVault.ITEM_TEXT),
 	SEED_VAULT_INVENTORY_ITEMS_CONTAINER(WidgetID.SEED_VAULT_INVENTORY_GROUP_ID, WidgetID.SeedVault.INVENTORY_ITEM_CONTAINER),
-
 	JEWELLERY_BOX_DUEL_RING(WidgetID.JEWELLERY_BOX_GROUP_ID, WidgetID.JewelBox.DUEL_RING),
 	JEWELLERY_BOX_GAME_NECK(WidgetID.JEWELLERY_BOX_GROUP_ID, WidgetID.JewelBox.GAME_NECK),
 	JEWELLERY_BOX_COMB_BRAC(WidgetID.JEWELLERY_BOX_GROUP_ID, WidgetID.JewelBox.COMB_BRAC),
 	JEWELLERY_BOX_SKIL_NECK(WidgetID.JEWELLERY_BOX_GROUP_ID, WidgetID.JewelBox.SKIL_NECK),
 	JEWELLERY_BOX_RING_OFGP(WidgetID.JEWELLERY_BOX_GROUP_ID, WidgetID.JewelBox.RING_OFGP),
 	JEWELLERY_BOX_AMUL_GLOR(WidgetID.JEWELLERY_BOX_GROUP_ID, WidgetID.JewelBox.AMUL_GLOR),
-
+	OPTIONS_CAMERA_ZOOM_SLIDER_HANDLE(WidgetID.OPTIONS_GROUP_ID, WidgetID.Options.CAMERA_ZOOM_SLIDER_HANDLE),
 	OPTIONS_MUSIC_SLIDER(WidgetID.OPTIONS_GROUP_ID, WidgetID.Options.MUSIC_SLIDER),
 	OPTIONS_SOUND_EFFECT_SLIDER(WidgetID.OPTIONS_GROUP_ID, WidgetID.Options.SOUND_EFFECT_SLIDER),
 	OPTIONS_AREA_SOUND_SLIDER(WidgetID.OPTIONS_GROUP_ID, WidgetID.Options.AREA_SOUND_SLIDER),
@@ -976,4 +979,4 @@ public enum WidgetInfo
 		return groupId << 16 | childId;
 	}

-}
+}