Skip to content

Commit ba01d8e

Browse files
authored
Merge pull request chsami#1667 from chsami/development
Bank Fixes + Update latest runelite
2 parents 1c83a9c + e659fff commit ba01d8e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1418
-899
lines changed

common.settings.gradle.kts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,12 @@ gradle.afterProject {
102102
isReproducibleFileOrder = true
103103
}
104104

105+
tasks.withType<Test> {
106+
testLogging {
107+
exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
108+
}
109+
}
110+
105111
extensions.findByType<org.gradle.plugins.ide.idea.model.IdeaModel>()?.run {
106112
module {
107113
isDownloadSources = true

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ org.gradle.parallel=true
2828
org.gradle.caching=false
2929

3030
project.build.group=net.runelite
31-
project.build.version=1.12.13
31+
project.build.version=1.12.14
3232

3333
glslang.path=
34-
microbot.version=2.1.15
34+
microbot.version=2.1.16
3535
microbot.commit.sha=nogit
3636
microbot.repo.url=http://138.201.81.246:8081/repository/microbot-snapshot/
3737
microbot.repo.username=

runelite-api/src/main/interfaces/interfaces.toml

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -58,24 +58,23 @@ tutorial_button=4
5858
item_count_top=5
5959
item_count_bar=6
6060
item_count_bottom=7
61-
group_storage_button=8
62-
content_container=10
63-
tab_container=11
64-
item_container=13
65-
scrollbar=14
66-
search_button_background=42
67-
deposit_inventory=44
68-
deposit_equipment=46
69-
potion_store=48
70-
incinerator=49
71-
incinerator_confirm=50
72-
potionstore_content=52
73-
equipment_parent=80
74-
equipment_set_bonus=121
75-
settings_button=125
76-
equipment_button=126
77-
popup=128
78-
equipment_stat_bonus=134
61+
content_container=9
62+
tab_container=10
63+
item_container=12
64+
scrollbar=13
65+
search_button_background=41
66+
deposit_inventory=43
67+
deposit_equipment=45
68+
potion_store=119
69+
incinerator=48
70+
incinerator_confirm=49
71+
potionstore_content=51
72+
equipment_parent=54
73+
equipment_set_bonus=95
74+
settings_button=99
75+
equipment_button=100
76+
popup=102
77+
equipment_stat_bonus=108
7978

8079
[bank_inventory]
8180
id=15

runelite-api/src/main/java/net/runelite/api/IconID.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,10 @@ public enum IconID
4848
NO_ENTRY(11),
4949
CHAIN_LINK(12),
5050
BOUNTY_HUNTER_EMBLEM(20),
51-
LEAGUE(22);
51+
LEAGUE(22),
52+
GROUP_IRONMAN(41),
53+
HARDCORE_GROUP_IRONMAN(42),
54+
UNRANKED_GROUP_IRONMAN(43);
5255

5356
private final int index;
5457

runelite-api/src/main/java/net/runelite/api/ItemID.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16132,5 +16132,7 @@ public final class ItemID
1613216132
public static final int HOODED_SLAYER_HELMET_I = 33068;
1613316133
public static final int HOODED_SLAYER_HELMET_I_33070 = 33070;
1613416134
public static final int HOODED_SLAYER_HELMET_I_33072 = 33072;
16135+
public static final int FACILITY_BOTTLE_EMPTY = 33074;
16136+
public static final int FACILITY_BOTTLE_FULL = 33077;
1613516137
/* This file is automatically generated. Do not edit. */
1613616138
}

runelite-api/src/main/java/net/runelite/api/NullItemID.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16632,5 +16632,7 @@ public final class NullItemID
1663216632
public static final int NULL_33069 = 33069;
1663316633
public static final int NULL_33071 = 33071;
1663416634
public static final int NULL_33073 = 33073;
16635+
public static final int NULL_33075 = 33075;
16636+
public static final int NULL_33076 = 33076;
1663516637
/* This file is automatically generated. Do not edit. */
1663616638
}

runelite-api/src/main/java/net/runelite/api/NullObjectID.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31329,8 +31329,8 @@ public final class NullObjectID
3132931329
public static final int NULL_60617 = 60617;
3133031330
public static final int NULL_60618 = 60618;
3133131331
public static final int NULL_60643 = 60643;
31332-
public static final int NULL_60644 = 60644;
31333-
public static final int NULL_60645 = 60645;
3133431332
public static final int NULL_60646 = 60646;
31333+
public static final int NULL_60661 = 60661;
31334+
public static final int NULL_60662 = 60662;
3133531335
/* This file is automatically generated. Do not edit. */
3133631336
}

runelite-api/src/main/java/net/runelite/api/ScriptID.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ public final class ScriptID
272272
* <li> int (WidgetID) * 16, various widgets making up the bank interface </li>
273273
* </ul>
274274
*/
275-
@ScriptArguments(integer = 17)
275+
@ScriptArguments(integer = 20)
276276
public static final int BANKMAIN_SEARCH_REFRESH = 283;
277277

278278
@ScriptArguments(integer = 6)
@@ -308,7 +308,7 @@ public final class ScriptID
308308
@ScriptArguments(integer = 4, string = 1)
309309
public static final int XPDROPS_SETDROPSIZE = 996;
310310

311-
@ScriptArguments(integer = 34)
311+
@ScriptArguments(integer = 35)
312312
public static final int BANKMAIN_INIT = 274;
313313

314314
/**
@@ -317,10 +317,10 @@ public final class ScriptID
317317
* <li>int (WidgetID) * 17, various widgets making up the bank interface</li>
318318
* </ul>
319319
*/
320-
@ScriptArguments(integer = 17)
320+
@ScriptArguments(integer = 20)
321321
public static final int BANKMAIN_BUILD = 277;
322322

323-
@ScriptArguments(integer = 19)
323+
@ScriptArguments(integer = 22)
324324
public static final int BANKMAIN_FINISHBUILDING = 505;
325325

326326
@ScriptArguments()
@@ -337,7 +337,7 @@ public final class ScriptID
337337
* These can be retrieved from the onInvTransmitListener of BANK_ITEM_CONTAINER. Note that this array also
338338
* contains the script ID for the bank layout script in the first index
339339
*/
340-
@ScriptArguments(integer = 18)
340+
@ScriptArguments(integer = 21)
341341
public static final int BANKMAIN_SEARCH_TOGGLE = 281;
342342

343343
@ScriptArguments(integer = 6)
@@ -500,4 +500,7 @@ public final class ScriptID
500500

501501
@ScriptArguments(integer = 6, string = 9)
502502
public static final int INTERFACE_INV_DRAW_SLOT_BIG = 154;
503+
504+
@ScriptArguments(integer = 4)
505+
public static final int BANKMAIN_POPUP_TAB_DRAW = 9221;
503506
}

runelite-api/src/main/java/net/runelite/api/gameval/DBTableID.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13693,6 +13693,11 @@ public static final class SailingBoatFacility
1369313693
*/
1369413694
public static final int COL_FACILITY_CUSTOMISATION_ORDER = 25;
1369513695

13696+
/**
13697+
* integer
13698+
*/
13699+
public static final int COL_FACILITY_BOTTLE_ID = 26;
13700+
1369613701
public static final class Row
1369713702
{
1369813703
public static final int SAILING_BOAT_FACILITY_BRONZE_CANNON = 8427;

0 commit comments

Comments
 (0)