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

Merge remote-tracking branch 'runelite/master'

Browse Source
This commit is contained in:
Owain van Brakel
2021-10-06 14:00:00 +02:00
parent 5e9375bc8b 4322c372ec
commit 69faa1b0fb
21 changed files with 642 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/Dependencies.kt
+1 -1
View File
@@ -25,7 +25,7 @@
object ProjectVersions {
const val launcherVersion = "2.2.0"
const val rlVersion = "1.7.24"
const val rlVersion = "1.7.25"
const val openosrsVersion = "4.12.0"
runelite-api/src/main/java/net/runelite/api/ChatMessageType.java
+3
View File
@@ -176,6 +176,9 @@ public enum ChatMessageType
* Clan wars challenge for clans rather than FCs
*/
CLAN_CLAN_WARS_CHALLENGE(110),
CLAN_GIM_FORM_GROUP(111),
CLAN_GIM_GROUP_WITH(112),
/**
* An unknown message type.
*/
runelite-api/src/main/java/net/runelite/api/ItemID.java
+46
View File
@@ -12151,5 +12151,51 @@ public final class ItemID
public static final int COMBAT_POTION2_26152 = 26152;
public static final int COMBAT_POTION1_26153 = 26153;
public static final int MOUNT_KARUULM_DIARY = 26154;
public static final int GROUP_IRON_HELM = 26156;
public static final int GROUP_IRON_PLATEBODY = 26158;
public static final int GROUP_IRON_PLATEBODY_26160 = 26160;
public static final int GROUP_IRON_PLATEBODY_26162 = 26162;
public static final int GROUP_IRON_PLATEBODY_26164 = 26164;
public static final int GROUP_IRON_PLATELEGS = 26166;
public static final int GROUP_IRON_BRACERS = 26168;
public static final int HARDCORE_GROUP_IRON_HELM = 26170;
public static final int HARDCORE_GROUP_IRON_PLATEBODY = 26172;
public static final int HARDCORE_GROUP_IRON_PLATEBODY_26174 = 26174;
public static final int HARDCORE_GROUP_IRON_PLATEBODY_26176 = 26176;
public static final int HARDCORE_GROUP_IRON_PLATEBODY_26178 = 26178;
public static final int HARDCORE_GROUP_IRON_PLATELEGS = 26180;
public static final int HARDCORE_GROUP_IRON_BRACERS = 26182;
public static final int BLUE_ICON_26184 = 26184;
public static final int BLUE_ICON_26185 = 26185;
public static final int BLUE_ICON_26186 = 26186;
public static final int BLUE_ICON_26187 = 26187;
public static final int BLUE_ICON_26188 = 26188;
public static final int BLUE_ICON_26189 = 26189;
public static final int BLUE_ICON_26190 = 26190;
public static final int BLUE_ICON_26191 = 26191;
public static final int BLUE_ICON_26192 = 26192;
public static final int BLUE_ICON_26193 = 26193;
public static final int BLUE_ICON_26194 = 26194;
public static final int BLUE_ICON_26195 = 26195;
public static final int BLUE_ICON_26196 = 26196;
public static final int BLUE_ICON_26197 = 26197;
public static final int BLUE_ICON_26198 = 26198;
public static final int BLUE_ICON_26199 = 26199;
public static final int RED_ICON_26200 = 26200;
public static final int RED_ICON_26201 = 26201;
public static final int RED_ICON_26202 = 26202;
public static final int RED_ICON_26203 = 26203;
public static final int RED_ICON_26204 = 26204;
public static final int RED_ICON_26205 = 26205;
public static final int RED_ICON_26206 = 26206;
public static final int RED_ICON_26207 = 26207;
public static final int RED_ICON_26208 = 26208;
public static final int RED_ICON_26209 = 26209;
public static final int RED_ICON_26210 = 26210;
public static final int RED_ICON_26211 = 26211;
public static final int RED_ICON_26212 = 26212;
public static final int RED_ICON_26213 = 26213;
public static final int RED_ICON_26214 = 26214;
public static final int RED_ICON_26215 = 26215;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NpcID.java
+7
View File
@@ -9470,5 +9470,12 @@ public final class NpcID
public static final int GUARD_11209 = 11209;
public static final int GUARD_11210 = 11210;
public static final int PRIFDDINAS_GUARD_11211 = 11211;
public static final int D3AD1I_F15HER = 11225;
public static final int BOAR31337KILLER = 11226;
public static final int ENRAGED_BOAR = 11227;
public static final int R0CK_5MASHER = 11228;
public static final int REGENT = 11229;
public static final int GROUP_STORAGE_TUTOR = 11230;
public static final int GROUP_IRON_TUTOR = 11231;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullItemID.java
+15
View File
@@ -13794,5 +13794,20 @@ public final class NullItemID
public static final int NULL_26145 = 26145;
public static final int NULL_26148 = 26148;
public static final int NULL_26155 = 26155;
public static final int NULL_26157 = 26157;
public static final int NULL_26159 = 26159;
public static final int NULL_26161 = 26161;
public static final int NULL_26163 = 26163;
public static final int NULL_26165 = 26165;
public static final int NULL_26167 = 26167;
public static final int NULL_26169 = 26169;
public static final int NULL_26171 = 26171;
public static final int NULL_26173 = 26173;
public static final int NULL_26175 = 26175;
public static final int NULL_26177 = 26177;
public static final int NULL_26179 = 26179;
public static final int NULL_26181 = 26181;
public static final int NULL_26183 = 26183;
public static final int NULL_26216 = 26216;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullObjectID.java
+4
View File
@@ -20991,5 +20991,9 @@ public final class NullObjectID
public static final int NULL_42802 = 42802;
public static final int NULL_42804 = 42804;
public static final int NULL_42816 = 42816;
public static final int NULL_42829 = 42829;
public static final int NULL_42830 = 42830;
public static final int NULL_42835 = 42835;
public static final int NULL_42836 = 42836;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/ObjectID.java
+16
View File
@@ -21812,5 +21812,21 @@ public final class ObjectID
public static final int BANNER_42814 = 42814;
public static final int BANNER_42815 = 42815;
public static final int ROCKS_42817 = 42817;
public static final int LIGHT_42818 = 42818;
public static final int PORTAL_42819 = 42819;
public static final int PORTAL_42820 = 42820;
public static final int PLANTS = 42821;
public static final int STATUE_42822 = 42822;
public static final int STATUE_42823 = 42823;
public static final int FURNACE_42824 = 42824;
public static final int ANVIL_42825 = 42825;
public static final int ROWBOAT_42826 = 42826;
public static final int ARMOUR_CRATE = 42827;
public static final int HARDCORE_ARMOUR_CRATE = 42828;
public static final int OAK_42831 = 42831;
public static final int TREE_42832 = 42832;
public static final int ROCKS_42833 = 42833;
public static final int CHEST_42834 = 42834;
public static final int BANK_BOOTH_42837 = 42837;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/ScriptID.java
+1 -1
View File
@@ -257,7 +257,7 @@ public final class ScriptID
/**
* Builds the widget for making an offer in Grand Exchange
*/
@ScriptArguments(integer = 15)
@ScriptArguments(integer = 16)
public static final int GE_OFFERS_SETUP_BUILD = 779;
/**
runelite-api/src/main/java/net/runelite/api/widgets/ItemQuantityMode.java
+1 -1
View File
@@ -28,7 +28,7 @@ package net.runelite.api.widgets;
/**
* Utility class mapping Widget ItemQuantityMode values
*/
public class ItemQuantityMode
public final class ItemQuantityMode
{
/**
* Never show item quantity number
runelite-api/src/main/java/net/runelite/api/widgets/WidgetConfig.java
+1 -1
View File
@@ -31,7 +31,7 @@ package net.runelite.api.widgets;
*
* @see Widget#getClickMask()
*/
public class WidgetConfig
public final class WidgetConfig
{
/**
* Enables displaying a ninth option on a menu.
runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
+13 -15
View File
@@ -34,7 +34,7 @@ package net.runelite.api.widgets;
* For a more direct group-child widget mapping, use the
* {@link WidgetInfo} enum class.
*/
public class WidgetID
public final class WidgetID
{
public static final int FAIRY_RING_PANEL_GROUP_ID = 381;
public static final int FAIRY_RING_GROUP_ID = 398;
@@ -292,20 +292,18 @@ public class WidgetID
static final int ITEM_COUNT_TOP = 5;
static final int ITEM_COUNT_BAR = 6;
static final int ITEM_COUNT_BOTTOM = 7;
static final int CONTENT_CONTAINER = 9;
static final int TAB_CONTAINER = 10;
static final int ITEM_CONTAINER = 12;
static final int SCROLLBAR = 13;
static final int UNNOTED_BUTTON = 21;
static final int NOTED_BUTTON = 23;
static final int SEARCH_BUTTON_BACKGROUND = 39;
static final int DEPOSIT_INVENTORY = 41;
static final int DEPOSIT_EQUIPMENT = 43;
static final int INCINERATOR = 45;
static final int INCINERATOR_CONFIRM = 46;
static final int EQUIPMENT_CONTENT_CONTAINER = 68;
static final int SETTINGS_BUTTON = 111;
static final int EQUIPMENT_BUTTON = 112;
static final int CONTENT_CONTAINER = 10;
static final int TAB_CONTAINER = 11;
static final int ITEM_CONTAINER = 13;
static final int SCROLLBAR = 14;
static final int SEARCH_BUTTON_BACKGROUND = 40;
static final int DEPOSIT_INVENTORY = 42;
static final int DEPOSIT_EQUIPMENT = 44;
static final int INCINERATOR = 46;
static final int INCINERATOR_CONFIRM = 47;
static final int EQUIPMENT_CONTENT_CONTAINER = 69;
static final int SETTINGS_BUTTON = 112;
static final int EQUIPMENT_BUTTON = 113;
}
static class GrandExchange
runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java
-3
View File
@@ -578,9 +578,6 @@ public enum WidgetInfo
PEST_CONTROL_EXCHANGE_WINDOW(WidgetID.PEST_CONTROL_EXCHANGE_WINDOW_GROUP_ID, 0),
PEST_CONTROL_EXCHANGE_WINDOW_POINTS(WidgetID.PEST_CONTROL_EXCHANGE_WINDOW_GROUP_ID, WidgetID.PestControlExchangeWindow.POINTS),
BANK_UNNOTED_BUTTON(WidgetID.BANK_GROUP_ID, WidgetID.Bank.UNNOTED_BUTTON),
BANK_NOTED_BUTTON(WidgetID.BANK_GROUP_ID, WidgetID.Bank.NOTED_BUTTON),
GRAND_EXCHANGE_HISTORY_BUTTON(WidgetID.GRAND_EXCHANGE_GROUP_ID, WidgetID.GrandExchange.HISTORY_BUTTON),
GRAND_EXCHANGE_BACK_BUTTON(WidgetID.GRAND_EXCHANGE_GROUP_ID, WidgetID.GrandExchange.BACK_BUTTON),
GRAND_EXCHANGE_OFFER1(WidgetID.GRAND_EXCHANGE_GROUP_ID, WidgetID.GrandExchange.OFFER1),
runelite-api/src/main/java/net/runelite/api/widgets/WidgetModalMode.java
+1 -1
View File
@@ -24,7 +24,7 @@
*/
package net.runelite.api.widgets;
public class WidgetModalMode
public final class WidgetModalMode
{
public static final int MODAL_NOCLICKTHROUGH = 0;
public static final int NON_MODAL = 1;
runelite-api/src/main/java/net/runelite/api/widgets/WidgetModelType.java
+1 -1
View File
@@ -24,7 +24,7 @@
*/
package net.runelite.api.widgets;
public class WidgetModelType
public final class WidgetModelType
{
public static final int NULL = 0;
public static final int MODEL = 1;
runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java
+11 -6
View File
@@ -183,7 +183,6 @@ public class GrandExchangePlugin extends Plugin
private RuneLiteConfig runeLiteConfig;
private Widget grandExchangeText;
private Widget grandExchangeItem;
private String grandExchangeExamine;
@Inject
@@ -319,7 +318,6 @@ public class GrandExchangePlugin extends Plugin
mouseManager.unregisterMouseListener(inputListener);
keyManager.unregisterKeyListener(inputListener);
grandExchangeText = null;
grandExchangeItem = null;
lastUsername = machineUuid = null;
tradeSeq = 0;
}
@@ -597,14 +595,11 @@ public class GrandExchangePlugin extends Plugin
{
// Grand exchange was opened.
case WidgetID.GRAND_EXCHANGE_GROUP_ID:
Widget grandExchangeOffer = client.getWidget(WidgetInfo.GRAND_EXCHANGE_OFFER_CONTAINER);
grandExchangeText = client.getWidget(WidgetInfo.GRAND_EXCHANGE_OFFER_TEXT);
grandExchangeItem = grandExchangeOffer.getChild(OFFER_CONTAINER_ITEM);
break;
// Grand exchange was closed (if it was open before).
case WidgetID.INVENTORY_GROUP_ID:
grandExchangeText = null;
grandExchangeItem = null;
break;
}
}
@@ -825,7 +820,17 @@ public class GrandExchangePlugin extends Plugin
private void rebuildGeText()
{
if (grandExchangeText == null || grandExchangeItem == null || grandExchangeItem.isHidden())
if (grandExchangeText == null)
{
return;
}
Widget grandExchangeOffer = client.getWidget(WidgetInfo.GRAND_EXCHANGE_OFFER_CONTAINER);
if (grandExchangeOffer == null)
{
return;
}
Widget grandExchangeItem = grandExchangeOffer.getChild(OFFER_CONTAINER_ITEM);
if (grandExchangeItem == null || grandExchangeItem.isHidden())
{
return;
}
runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java
+1 -1
View File
@@ -114,7 +114,7 @@ public class HiscorePanel extends PluginPanel
);
private static final HiscoreEndpoint[] ENDPOINTS = {
HiscoreEndpoint.NORMAL, HiscoreEndpoint.IRONMAN, HiscoreEndpoint.HARDCORE_IRONMAN, HiscoreEndpoint.ULTIMATE_IRONMAN, HiscoreEndpoint.DEADMAN, HiscoreEndpoint.TOURNAMENT
HiscoreEndpoint.NORMAL, HiscoreEndpoint.IRONMAN, HiscoreEndpoint.HARDCORE_IRONMAN, HiscoreEndpoint.ULTIMATE_IRONMAN, HiscoreEndpoint.DEADMAN, HiscoreEndpoint.LEAGUE
};
private final HiscorePlugin plugin;
runelite-client/src/main/resources/item_variations.json
+46 -2
View File
@@ -9752,7 +9752,23 @@
25224,
25225,
25226,
25227
25227,
26184,
26185,
26186,
26187,
26188,
26189,
26190,
26191,
26192,
26193,
26194,
26195,
26196,
26197,
26198,
26199
],
"red icon": [
25228,
@@ -9770,7 +9786,23 @@
25240,
25241,
25242,
25243
25243,
26200,
26201,
26202,
26203,
26204,
26205,
26206,
26207,
26208,
26209,
26210,
26211,
26212,
26213,
26214,
26215
],
"essence pack": [
25280,
@@ -10144,5 +10176,17 @@
"sigil of the guardian angel": [
26146,
26147
],
"group iron platebody": [
26158,
26160,
26162,
26164
],
"hardcore group iron platebody": [
26172,
26174,
26176,
26178
]
}
runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/league.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 195 B

runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/tournament.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.9 KiB

runelite-client/src/main/scripts/ChatBuilder.hash
+1 -1
View File
@@ -1 +1 @@
D8865833BC828A91FC7D4A10B6A7629786ED2099E2F45689BECD55A9E933323D
09B4102BE45BA918A3B5D24F9DC1BF92925B15BEC9FAA67638AFB26DF13D8F88
runelite-client/src/main/scripts/ChatBuilder.rs2asm
+473 -271
View File
File diff suppressed because it is too large Load Diff