Merge remote-tracking branch 'runelite/master' into rl-upstream-16072020
# Conflicts: # cache/src/main/java/net/runelite/cache/util/XteaKeyManager.java # http-api/pom.xml # http-api/src/main/java/net/runelite/http/api/account/AccountClient.java # http-api/src/main/java/net/runelite/http/api/chat/ChatClient.java # http-api/src/main/java/net/runelite/http/api/item/ItemClient.java # http-api/src/main/java/net/runelite/http/api/osbuddy/OSBGrandExchangeClient.java # http-api/src/main/java/net/runelite/http/api/xtea/XteaClient.java # http-service/src/main/java/net/runelite/http/service/hiscore/HiscoreService.java # runelite-api/src/main/java/net/runelite/api/Client.java # runelite-api/src/main/java/net/runelite/api/EnumID.java # runelite-api/src/main/java/net/runelite/api/IndexDataBase.java # runelite-api/src/main/java/net/runelite/api/ItemComposition.java # runelite-api/src/main/java/net/runelite/api/PlayerComposition.java # runelite-api/src/main/java/net/runelite/api/ScriptID.java # runelite-api/src/main/java/net/runelite/api/VarbitComposition.java # runelite-api/src/main/java/net/runelite/api/events/ActorDeath.java # runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java # runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java # runelite-client/src/main/java/net/runelite/client/ClientSessionManager.java # runelite-client/src/main/java/net/runelite/client/RuneLite.java # runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java # runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java # runelite-client/src/main/java/net/runelite/client/SessionClient.java # runelite-client/src/main/java/net/runelite/client/account/SessionManager.java # runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java # runelite-client/src/main/java/net/runelite/client/externalplugins/ExternalPluginManager.java # runelite-client/src/main/java/net/runelite/client/game/ItemManager.java # runelite-client/src/main/java/net/runelite/client/game/WorldService.java # runelite-client/src/main/java/net/runelite/client/input/KeyListener.java # runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityConfig.java # runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityOverlay.java # runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/agility/Obstacles.java # runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java # runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterConfig.java # runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsConfig.java # runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java # runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/SkillChallengeClue.java # runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java # runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListPanel.java # runelite-client/src/main/java/net/runelite/client/plugins/devtools/VarInspector.java # runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java # runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPanel.java # runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeItemPanel.java # runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOfferSlot.java # runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java # runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeConfig.java # runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java # runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingListener.java # runelite-client/src/main/java/net/runelite/client/plugins/loginscreen/LoginScreenPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerConfig.java # runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsConfig.java # runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/raids/Raid.java # runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidRoom.java # runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsConfig.java # runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/raids/RoomType.java # runelite-client/src/main/java/net/runelite/client/plugins/randomevents/RandomEventConfig.java # runelite-client/src/main/java/net/runelite/client/plugins/randomevents/RandomEventPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiSearchChatboxTextInput.java # runelite-client/src/main/java/net/runelite/client/plugins/worldmap/MinigameLocation.java # runelite-client/src/main/java/net/runelite/client/plugins/worldmap/MiningSiteLocation.java # runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TeleportLocationData.java # runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TransportationPointLocation.java # runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/xpupdater/XpUpdaterPlugin.java # runelite-client/src/main/java/net/runelite/client/plugins/xtea/XteaPlugin.java # runelite-client/src/main/java/net/runelite/client/rs/ClientConfigLoader.java # runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java # runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_fletching.json # runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java # runelite-client/src/test/java/net/runelite/client/plugins/bank/BankPluginTest.java # runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java # runelite-client/src/test/java/net/runelite/client/plugins/examine/ExaminePluginTest.java # runelite-client/src/test/java/net/runelite/client/plugins/grandexchange/GrandExchangePluginTest.java # runelite-client/src/test/java/net/runelite/client/plugins/hiscore/HiscorePanelTest.java # runelite-client/src/test/java/net/runelite/client/plugins/keyremapping/KeyRemappingListenerTest.java # runelite-client/src/test/java/net/runelite/client/plugins/loottracker/LootTrackerPluginTest.java # runelite-client/src/test/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPluginTest.java # runelite-client/src/test/java/net/runelite/client/plugins/raids/RaidsPluginTest.java # runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java # runelite-client/src/test/java/net/runelite/client/plugins/xptracker/XpTrackerPluginTest.java # runelite-client/src/test/java/net/runelite/client/rs/ClientConfigLoaderTest.java # runelite-client/src/test/java/net/runelite/client/ui/overlay/infobox/InfoBoxManagerTest.java
This commit is contained in:
ThatGamerBlue
@@ -407,11 +407,6 @@ public interface Client extends GameShell
|
||||
*/
|
||||
IndexDataBase getIndexScripts();
|
||||
|
||||
/**
|
||||
* Gets the config archive, containing Varplayer and Varbit definitions
|
||||
*/
|
||||
IndexDataBase getConfigArchive();
|
||||
|
||||
/**
|
||||
* Gets the config index.
|
||||
*/
|
||||
@@ -498,6 +493,7 @@ public interface Client extends GameShell
|
||||
* @param widget the widget info
|
||||
* @return the widget
|
||||
*/
|
||||
@Nullable
|
||||
Widget getWidget(WidgetInfo widget);
|
||||
|
||||
/**
|
||||
@@ -510,6 +506,7 @@ public interface Client extends GameShell
|
||||
* @param childId the child widget ID
|
||||
* @return the widget corresponding to the group and child pair
|
||||
*/
|
||||
@Nullable
|
||||
Widget getWidget(int groupId, int childId);
|
||||
|
||||
/**
|
||||
|
||||
@@ -33,6 +33,7 @@ public final class EnumID
|
||||
{
|
||||
public static final int MUSIC_TRACK_NAMES = 812;
|
||||
public static final int MUSIC_TRACK_IDS = 819;
|
||||
public static final int XPDROP_COLORS = 1169;
|
||||
|
||||
/**
|
||||
* Translates spellbook varbit into enum ID
|
||||
|
||||
@@ -1,3 +1,27 @@
|
||||
/*
|
||||
* Copyright (c) 2020, Lucas <https://github.com/Lucwousin>
|
||||
* 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.api;
|
||||
|
||||
/**
|
||||
|
||||
@@ -33,6 +33,14 @@ public enum InventoryID
|
||||
* Reward from fishing trawler
|
||||
*/
|
||||
FISHING_TRAWLER_REWARD(0),
|
||||
/**
|
||||
* The trade inventory.
|
||||
*/
|
||||
TRADE(90),
|
||||
/**
|
||||
* The other trade inventory.
|
||||
*/
|
||||
TRADEOTHER(90 | 0x8000),
|
||||
/**
|
||||
* Standard player inventory.
|
||||
*/
|
||||
|
||||
@@ -11578,5 +11578,10 @@ public final class ItemID
|
||||
public static final int ZIGGY = 24849;
|
||||
public static final int SOFT_CLAY_PACK_24851 = 24851;
|
||||
public static final int BAG_FULL_OF_GEMS_24853 = 24853;
|
||||
public static final int MYTHICAL_MAX_CAPE = 24855;
|
||||
public static final int MYTHICAL_MAX_HOOD = 24857;
|
||||
public static final int WARRIOR_PATH_STARTER_KIT = 24859;
|
||||
public static final int WIZARD_PATH_STARTER_KIT = 24860;
|
||||
public static final int RANGER_PATH_STARTER_KIT = 24861;
|
||||
/* This file is automatically generated. Do not edit. */
|
||||
}
|
||||
|
||||
@@ -13068,5 +13068,7 @@ public final class NullItemID
|
||||
public static final int NULL_24850 = 24850;
|
||||
public static final int NULL_24852 = 24852;
|
||||
public static final int NULL_24854 = 24854;
|
||||
public static final int NULL_24856 = 24856;
|
||||
public static final int NULL_24858 = 24858;
|
||||
/* This file is automatically generated. Do not edit. */
|
||||
}
|
||||
|
||||
@@ -20090,5 +20090,6 @@ public final class ObjectID
|
||||
public static final int STAIRS_39609 = 39609;
|
||||
public static final int CRYPT = 39617;
|
||||
public static final int COFFIN_39620 = 39620;
|
||||
public static final int MOUNTED_MAX_CAPE_39621 = 39621;
|
||||
/* This file is automatically generated. Do not edit. */
|
||||
}
|
||||
|
||||
@@ -167,8 +167,8 @@ public final class ScriptID
|
||||
*
|
||||
* Updates the VarClientInts (73, 74) to this same value
|
||||
* <ul>
|
||||
* <li> int Reset zoom position </li>
|
||||
* <li> int Reset zoom position </li>
|
||||
* <li> int Reset zoom position for fixed viewport mode</li>
|
||||
* <li> int Reset zoom position for resizable viewport mode</li>
|
||||
* </ul>
|
||||
*/
|
||||
@ScriptArguments(integer = 2)
|
||||
@@ -241,12 +241,6 @@ public final class ScriptID
|
||||
@ScriptArguments(integer = 18)
|
||||
public static final int BANKMAIN_SEARCH_TOGGLE = 281;
|
||||
|
||||
/**
|
||||
* Builds the items kept on death widget
|
||||
*/
|
||||
@ScriptArguments(integer = 4, string = 2)
|
||||
public static final int DEATH_KEEP_BUILD = 1601;
|
||||
|
||||
/**
|
||||
* Builds the widget that holds all of the players inside a friends chat
|
||||
*/
|
||||
@@ -329,4 +323,13 @@ public final class ScriptID
|
||||
*/
|
||||
@ScriptArguments(integer = 2)
|
||||
public static final int TOPLEVEL_REDRAW = 907;
|
||||
|
||||
/**
|
||||
* Called to set position of an xpdrop text and sprite(s)
|
||||
* <ul>
|
||||
* <li> XP drop parent component </li>
|
||||
* </ul>
|
||||
*/
|
||||
@ScriptArguments(integer = 4, string = 1)
|
||||
public static final int XPDROPS_SETDROPSIZE = 996;
|
||||
}
|
||||
|
||||
+4
-4
@@ -25,13 +25,13 @@
|
||||
package net.runelite.api.events;
|
||||
|
||||
import lombok.Value;
|
||||
import net.runelite.api.Player;
|
||||
import net.runelite.api.Actor;
|
||||
|
||||
/**
|
||||
* An event when a player dies.
|
||||
* An event fired when an actor dies.
|
||||
*/
|
||||
@Value
|
||||
public class PlayerDeath implements Event
|
||||
public class ActorDeath implements Event
|
||||
{
|
||||
Player player;
|
||||
Actor actor;
|
||||
}
|
||||
@@ -170,6 +170,7 @@ public class WidgetID
|
||||
public static final int ADVENTURE_LOG_ID = 187;
|
||||
public static final int GENERIC_SCROLL_GROUP_ID = 625;
|
||||
public static final int GAUNTLET_TIMER_GROUP_ID = 637;
|
||||
public static final int HEALTH_OVERLAY_BAR_GROUP_ID = 303;
|
||||
|
||||
static class WorldMap
|
||||
{
|
||||
@@ -1357,4 +1358,9 @@ public class WidgetID
|
||||
{
|
||||
static final int CONTAINER = 2;
|
||||
}
|
||||
|
||||
static class EncounterHealthBar
|
||||
{
|
||||
static final int CONTAINER = 6;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -890,7 +890,9 @@ public enum WidgetInfo
|
||||
SECOND_TRADING_WITH_MY_ITEMS(WidgetID.PLAYER_TRADE_CONFIRM_GROUP_ID, WidgetID.TradeScreen.SECOND_MY_ITEMS),
|
||||
SECOND_TRADING_WITH_THEIR_ITEMS(WidgetID.PLAYER_TRADE_CONFIRM_GROUP_ID, WidgetID.TradeScreen.SECOND_THEIR_ITEMS),
|
||||
|
||||
GAUNTLET_TIMER_CONTAINER(WidgetID.GAUNTLET_TIMER_GROUP_ID, WidgetID.GauntletTimer.CONTAINER);
|
||||
GAUNTLET_TIMER_CONTAINER(WidgetID.GAUNTLET_TIMER_GROUP_ID, WidgetID.GauntletTimer.CONTAINER),
|
||||
|
||||
HEALTH_OVERLAY_BAR(WidgetID.HEALTH_OVERLAY_BAR_GROUP_ID, WidgetID.EncounterHealthBar.CONTAINER);
|
||||
|
||||
private final int groupId;
|
||||
private final int childId;
|
||||
|
||||
Reference in New Issue
Block a user