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

project: Merge upstream

Browse Source
This commit is contained in:
Owain van Brakel
2021-09-09 22:26:51 +02:00
parent d836090df5 342e0169e3
commit 8ef5a07d87
14 changed files with 583 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
runelite-client/src/main/java/net/runelite/client/externalplugins/ExternalPluginManager.java
View File

@@ -424,6 +424,13 @@ public class ExternalPluginManager
public static void loadBuiltin(Class<? extends Plugin>... plugins)
{
boolean assertsEnabled = false;
assert (assertsEnabled = true);
if (!assertsEnabled)
{
throw new RuntimeException("Assertions are not enabled, add '-ea' to your VM options. Enabling assertions during development catches undefined behavior and incorrect API usage.");
}
builtinExternals = plugins;
}
}

2
runelite-client/src/main/java/net/runelite/client/game/npcoverlay/NpcMinimapOverlay.java
View File

@@ -80,7 +80,7 @@ class NpcMinimapOverlay extends Overlay
if (minimapLocation != null)
{
Color color = highlightedNpc.getHighlightColor();
OverlayUtil.renderMinimapLocation(graphics, minimapLocation, color.darker());
OverlayUtil.renderMinimapLocation(graphics, minimapLocation, color);
if (highlightedNpc.isNameOnMinimap() && actor.getName() != null)
{

31
runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java
View File

@@ -495,12 +495,7 @@ public class BankTagsPlugin extends Plugin implements MouseWheelListener
return;
}
if (event.getScriptId() != ScriptID.BANKMAIN_BUILD || !config.removeSeparators())
{
return;
}
if (!tabInterface.isActive())
if (event.getScriptId() != ScriptID.BANKMAIN_BUILD)
{
return;
}
@@ -511,6 +506,20 @@ public class BankTagsPlugin extends Plugin implements MouseWheelListener
return;
}
if (tabInterface.isTagTabActive())
{
int numTabs = (int) Arrays.stream(itemContainer.getDynamicChildren())
.filter(child -> child.getItemId() != -1 && !child.isHidden())
.count();
updateBankContainerScrollHeight(numTabs);
return;
}
if (!tabInterface.isActive() || !config.removeSeparators())
{
return;
}
int items = 0;
Widget[] containerChildren = itemContainer.getDynamicChildren();
@@ -550,10 +559,15 @@ public class BankTagsPlugin extends Plugin implements MouseWheelListener
}
}
final Widget bankItemContainer = client.getWidget(WidgetInfo.BANK_ITEM_CONTAINER);
updateBankContainerScrollHeight(items);
}
private void updateBankContainerScrollHeight(int items)
{
Widget bankItemContainer = client.getWidget(WidgetInfo.BANK_ITEM_CONTAINER);
int itemContainerHeight = bankItemContainer.getHeight();
final int adjustedScrollHeight = (Math.max(0, items - 1) / ITEMS_PER_ROW) * ITEM_VERTICAL_SPACING + ITEM_VERTICAL_SPACING + ITEM_CONTAINER_BOTTOM_PADDING;
itemContainer.setScrollHeight(Math.max(adjustedScrollHeight, itemContainerHeight));
bankItemContainer.setScrollHeight(Math.max(adjustedScrollHeight, itemContainerHeight));
final int itemContainerScroll = bankItemContainer.getScrollY();
clientThread.invokeLater(() ->
@@ -561,7 +575,6 @@ public class BankTagsPlugin extends Plugin implements MouseWheelListener
WidgetInfo.BANK_SCROLLBAR.getId(),
WidgetInfo.BANK_ITEM_CONTAINER.getId(),
itemContainerScroll));
}
@Subscribe

2
runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatChanges.java
View File

@@ -209,7 +209,7 @@ public class ItemStatChanges
add(combo(range(food(1), food(3)), heal(RUN_ENERGY, 10)), PURPLE_SWEETS_10476);
add(new SpicyStew(), SPICY_STEW);
add(boost(MAGIC, perc(.10, 1)), IMBUED_HEART);
add(combo(boost(ATTACK, 2), boost(STRENGTH, 1), heal(DEFENCE, -1)), JANGERBERRIES);
add(combo(boost(ATTACK, 2), boost(STRENGTH, 1), heal(PRAYER, 1), heal(DEFENCE, -1)), JANGERBERRIES);
// Gauntlet items
add(heal(HITPOINTS, 16), CRYSTAL_PADDLEFISH, CORRUPTED_PADDLEFISH);

226
runelite-client/src/main/resources/item_variations.json
View File

@@ -276,6 +276,10 @@
20854,
23873
],
"tuna": [
361,
26149
],
"shark": [
385,
6969,
@@ -6479,7 +6483,11 @@
9739,
9741,
9743,
9745
9745,
26150,
26151,
26152,
26153
],
"attack cape": [
9747,
@@ -9920,5 +9928,221 @@
25947,
25950,
25953
],
"tumekens heka": [
25987,
25989
],
"sigil of resilience": [
25990,
25991
],
"sigil of consistency": [
25993,
25994
],
"sigil of the formidable fighter": [
25996,
25997
],
"sigil of the rigorous ranger": [
25999,
26000
],
"sigil of the meticulous mage": [
26002,
26003
],
"sigil of fortification": [
26005,
26006
],
"sigil of barrows": [
26008,
26009
],
"sigil of deft strikes": [
26011,
26012
],
"sigil of freedom": [
26014,
26015
],
"sigil of enhanced harvest": [
26017,
26018
],
"sigil of storage": [
26020,
26021
],
"sigil of the smith": [
26023,
26024
],
"sigil of the alchemist": [
26026,
26027
],
"sigil of the fletcher": [
26029,
26030
],
"sigil of the chef": [
26032,
26033
],
"sigil of the craftsman": [
26035,
26036
],
"sigil of the abyss": [
26038,
26039
],
"sigil of stamina": [
26041,
26042
],
"sigil of the potion master": [
26044,
26045
],
"sigil of the eternal jeweller": [
26047,
26048
],
"sigil of the treasure hunter": [
26050,
26051
],
"sigil of mobility": [
26053,
26054
],
"sigil of exaggeration": [
26056,
26057
],
"sigil of specialised strikes": [
26059,
26060
],
"sigil of the porcupine": [
26062,
26063
],
"sigil of binding": [
26065,
26066
],
"sigil of escaping": [
26068,
26069
],
"sigil of the ruthless ranger": [
26071,
26072
],
"sigil of the feral fighter": [
26074,
26075
],
"sigil of the menacing mage": [
26077,
26078
],
"sigil of prosperity": [
26080,
26081
],
"sigil of the dwarves": [
26083,
26084
],
"sigil of the elves": [
26086,
26087
],
"sigil of the barbarians": [
26089,
26090
],
"sigil of the gnomes": [
26092,
26093
],
"sigil of nature": [
26095,
26096
],
"sigil of devotion": [
26098,
26099
],
"sigil of the forager": [
26101,
26102
],
"sigil of garments": [
26104,
26105
],
"sigil of slaughter": [
26107,
26108
],
"sigil of the fortune farmer": [
26110,
26111
],
"sigil of versatility": [
26113,
26114
],
"sigil of the serpent": [
26116,
26117
],
"sigil of supreme stamina": [
26119,
26120
],
"sigil of preservation": [
26122,
26123
],
"sigil of finality": [
26125,
26126
],
"sigil of pious protection": [
26128,
26129
],
"sigil of aggression": [
26131,
26132
],
"sigil of rampage": [
26134,
26135
],
"sigil of the skiller": [
26137,
26138
],
"sigil of remote storage": [
26140,
26141
],
"sigil of last recall": [
26143,
26144
],
"sigil of the guardian angel": [
26146,
26147
]
}

2
runelite-client/src/main/scripts/LayoutResizableStones.hash
View File

@@ -1 +1 @@
A9D5E42A864BFEEE2BB8CAF4A111A68426B7CE5DF5C982AF168F90A28CAE4423
877DB1B5A5AC999371A3E16052E79A613DD060A217FCEF6CB3D5611D42D780AC

148
runelite-client/src/main/scripts/LayoutResizableStones.rs2asm
View File

@@ -14,11 +14,11 @@
istore 4
iload 1
switch
1745: LABEL145
1129: LABEL125
1130: LABEL95
1745: LABEL169
1129: LABEL149
1130: LABEL107
1131: LABEL9
jump LABEL220
jump LABEL244
LABEL9:
iconst 10747945
if_getwidth
@@ -96,8 +96,22 @@ LABEL69:
iconst 10551330
enum
2122
jump LABEL84
jump LABEL96
LABEL77:
get_varbit 13037
iconst 1
if_icmpeq LABEL81
jump LABEL89
LABEL81:
iconst 3513
iconst 73
iconst 73
iload 1
iconst 10551330
enum
2122
jump LABEL96
LABEL89:
iconst 2154
iconst 73
iconst 73
@@ -105,26 +119,26 @@ LABEL77:
iconst 10551330
enum
2122
LABEL84:
LABEL96:
clientclock
set_varc_int 384
invoke 2357
iconst 1
if_icmpeq LABEL90
jump LABEL94
LABEL90:
if_icmpeq LABEL102
jump LABEL106
LABEL102:
get_varbit 12986
invoke 633
iconst 10747930
if_sethide
LABEL94:
jump LABEL220
LABEL95:
LABEL106:
jump LABEL244
LABEL107:
get_varbit 4084
iconst 1
if_icmpeq LABEL99
jump LABEL107
LABEL99:
if_icmpeq LABEL111
jump LABEL119
LABEL111:
iconst 1178
iconst 73
iconst 73
@@ -132,8 +146,22 @@ LABEL99:
iconst 10551330
enum
2122
jump LABEL114
LABEL107:
jump LABEL138
LABEL119:
get_varbit 13037
iconst 1
if_icmpeq LABEL123
jump LABEL131
LABEL123:
iconst 3513
iconst 73
iconst 73
iload 1
iconst 10551330
enum
2122
jump LABEL138
LABEL131:
iconst 2154
iconst 73
iconst 73
@@ -141,26 +169,26 @@ LABEL107:
iconst 10551330
enum
2122
LABEL114:
LABEL138:
clientclock
set_varc_int 384
invoke 2357
iconst 1
if_icmpeq LABEL120
jump LABEL124
LABEL120:
if_icmpeq LABEL144
jump LABEL148
LABEL144:
get_varbit 12986
invoke 633
iconst 10551322
if_sethide
LABEL124:
jump LABEL220
LABEL125:
LABEL148:
jump LABEL244
LABEL149:
invoke 3297
iconst 1
if_icmpeq LABEL129
jump LABEL137
LABEL129:
if_icmpeq LABEL153
jump LABEL161
LABEL153:
iconst 2422
iconst 73
iconst 73
@@ -168,8 +196,8 @@ LABEL129:
iconst 10551330
enum
2122
jump LABEL144
LABEL137:
jump LABEL168
LABEL161:
iconst 1200
iconst 73
iconst 73
@@ -177,22 +205,22 @@ LABEL137:
iconst 10551330
enum
2122
LABEL144:
jump LABEL220
LABEL145:
LABEL168:
jump LABEL244
LABEL169:
get_varbit 6257
iconst 1
if_icmpeq LABEL152
if_icmpeq LABEL176
get_varbit 542
iconst 1
if_icmpeq LABEL152
jump LABEL156
LABEL152:
if_icmpeq LABEL176
jump LABEL180
LABEL176:
iconst 1
iconst 39387175
if_sethide
jump LABEL211
LABEL156:
jump LABEL235
LABEL180:
iconst 0
iconst 39387175
if_sethide
@@ -201,11 +229,11 @@ LABEL156:
2308
get_varbit 6255
switch
1: LABEL173
2: LABEL165
3: LABEL181
jump LABEL189
LABEL165:
1: LABEL197
2: LABEL189
3: LABEL205
jump LABEL213
LABEL189:
iconst 1718
iconst 39387177
if_setgraphic
@@ -213,8 +241,8 @@ LABEL165:
sconst "Toggle single-tap mode"
iconst 39387175
if_setop
jump LABEL196
LABEL173:
jump LABEL220
LABEL197:
iconst 1717
iconst 39387177
if_setgraphic
@@ -222,8 +250,8 @@ LABEL173:
sconst "Toggle tap-to-drop mode"
iconst 39387175
if_setop
jump LABEL196
LABEL181:
jump LABEL220
LABEL205:
iconst 1716
iconst 39387177
if_setgraphic
@@ -231,8 +259,8 @@ LABEL181:
sconst "Show Keyboard"
iconst 39387175
if_setop
jump LABEL196
LABEL189:
jump LABEL220
LABEL213:
iconst 1715
iconst 39387177
if_setgraphic
@@ -240,26 +268,26 @@ LABEL189:
sconst ""
iconst 39387175
if_setop
LABEL196:
LABEL220:
get_varbit 6255
iconst 3
if_icmpne LABEL200
jump LABEL208
LABEL200:
if_icmpne LABEL224
jump LABEL232
LABEL224:
get_varbit 6256
iconst 0
if_icmpeq LABEL204
jump LABEL208
LABEL204:
if_icmpeq LABEL228
jump LABEL232
LABEL228:
iconst 155
iconst 39387177
if_settrans
jump LABEL211
LABEL208:
jump LABEL235
LABEL232:
iconst 0
iconst 39387177
if_settrans
LABEL211:
LABEL235:
invoke 2581
get_varbit 6254
invoke 633
@@ -269,5 +297,5 @@ LABEL211:
pop_int
clientclock
set_varc_int 384
LABEL220:
LABEL244:
return