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
2020-06-25 19:01:09 +02:00
parent 4105e13f9e f7a233b90d
commit 151a3e7119
22 changed files with 987 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java
View File

@@ -44,7 +44,7 @@ import okhttp3.HttpUrl;
@Slf4j
public class ClientLoader implements Supplier<Applet>
{
private static final String CONFIG_URL = "http://oldschool.runescape.com/jav_config.ws";
private static final String CONFIG_URL = "https://oldschool.runescape.com/jav_config.ws";
private static final String BACKUP_CONFIG_URL = "https://raw.githubusercontent.com/open-osrs/hosting/master/jav_config.ws";
private static final int NUM_ATTEMPTS = 10;

20
runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java
View File

@@ -115,6 +115,7 @@ public class ClientUI
private static final String CONFIG_CLIENT_MAXIMIZED = "clientMaximized";
private static final String CONFIG_OPACITY = "enableOpacity";
private static final String CONFIG_OPACITY_AMOUNT = "opacityPercentage";
private static final String CONFIG_CLIENT_SIDEBAR_CLOSED = "clientSidebarClosed";
private static final int CLIENT_WELL_HIDDEN_MARGIN = 160;
private static final int CLIENT_WELL_HIDDEN_MARGIN_TOP = 10;
public static final BufferedImage ICON = ImageUtil.getResourceStreamFromClass(ClientUI.class, "/openosrs.png");
@@ -502,7 +503,8 @@ public class ClientUI
sidebarNavigationButton = NavigationButton
.builder()
.priority(100)
.icon(sidebarClosedIcon)
.icon(sidebarOpenIcon)
.tooltip("Open SideBar")
.onClick(this::toggleSidebar)
.build();
@@ -512,7 +514,12 @@ public class ClientUI
null);
titleToolbar.addComponent(sidebarNavigationButton, sidebarNavigationJButton);
toggleSidebar();
// Open sidebar if the config closed state is unset
if (configManager.getConfiguration(CONFIG_GROUP, CONFIG_CLIENT_SIDEBAR_CLOSED) == null)
{
toggleSidebar();
}
});
}
@@ -918,6 +925,7 @@ public class ClientUI
{
sidebarNavigationJButton.setIcon(new ImageIcon(sidebarOpenIcon));
sidebarNavigationJButton.setToolTipText("Open SideBar");
configManager.setConfiguration(CONFIG_GROUP, CONFIG_CLIENT_SIDEBAR_CLOSED, true);
contract();
@@ -928,6 +936,7 @@ public class ClientUI
{
sidebarNavigationJButton.setIcon(new ImageIcon(sidebarClosedIcon));
sidebarNavigationJButton.setToolTipText("Close SideBar");
configManager.unsetConfiguration(CONFIG_GROUP, CONFIG_CLIENT_SIDEBAR_CLOSED);
// Try to restore last panel
expand(currentNavButton);
@@ -1164,15 +1173,8 @@ public class ClientUI
}
else
{
// Try to expand sidebar
if (!sidebarOpen)
{
bounds.width += pluginToolbar.getWidth();
}
if (config.automaticResizeType() == ExpandResizeType.KEEP_GAME_SIZE)
{
// Try to contract plugin panel
if (pluginPanel != null)
{

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

@@ -2470,7 +2470,6 @@
22519,
22520,
24367,
24418,
24426
],
"empty cup": [
@@ -7904,7 +7903,8 @@
],
"soft clay pack": [
12009,
12010
12010,
24851
],
"black wizard robe": [
12449,
@@ -8617,6 +8617,10 @@
13652,
20784
],
"bag of gems": [
19473,
24853
],
"heavy ballista": [
19481,
23630
@@ -9752,6 +9756,10 @@
24403,
24411
],
"gravestone": [
24418,
24524
],
"iced gingerbread shield": [
24438,
24439,

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

@@ -1 +1 @@
62A149F6CCCF18FEEA3F247F12F10BBC349239EFD5F87CF83DC5629636D790ED
85382CB95B13EA567E72410A58D18DAD6754D3361E584DFF0A1E417989E8214C

2
runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm
View File

@@ -62,7 +62,7 @@ LABEL49:
iconst 73
iconst 73
iload 6
iconst 10551327
iconst 10551328
enum
if_getheight
add

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

@@ -1 +1 @@
8CD8829FDF85B9AD7748CE4EA9CA4DD31138ACA1AF4BB35038A982B75F32791C
91023012B55ED61B5DA93FAD2CB6A92EBB9AA8C8633AC5AC6FB337C2AFC6365F

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

@@ -20,11 +20,11 @@
1131: LABEL9
jump LABEL201
LABEL9:
iconst 10747938
iconst 10747939
if_getwidth
iconst 33
sub
iconst 10747938
iconst 10747939
if_getheight
istore 3
istore 2
@@ -33,7 +33,7 @@ LABEL9:
iconst 73
iconst 73
iload 1
iconst 10551327
iconst 10551328
enum
if_getwidth
sub
@@ -47,7 +47,7 @@ LABEL9:
LABEL29:
iconst 0
iload 3
iconst 10747953
iconst 10747954
if_getheight
add
iconst 2
@@ -55,14 +55,14 @@ LABEL29:
iconst 73
iconst 73
iload 1
iconst 10747970
iconst 10747971
enum
if_setposition
iconst 0
iload 3
iconst 2
iconst 2
iconst 10747953
iconst 10747954
if_setposition
jump LABEL65
LABEL49:
@@ -73,14 +73,14 @@ LABEL49:
iconst 73
iconst 73
iload 1
iconst 10747970
iconst 10747971
enum
if_setposition
iload 2
iconst 0
iconst 2
iconst 2
iconst 10747953
iconst 10747954
if_setposition
LABEL65:
get_varbit 4084
@@ -92,7 +92,7 @@ LABEL69:
iconst 73
iconst 73
iload 1
iconst 10551323
iconst 10551324
enum
2122
jump LABEL84
@@ -101,7 +101,7 @@ LABEL77:
iconst 73
iconst 73
iload 1
iconst 10551323
iconst 10551324
enum
2122
LABEL84:
@@ -118,7 +118,7 @@ LABEL91:
iconst 73
iconst 73
iload 1
iconst 10551323
iconst 10551324
enum
2122
jump LABEL106
@@ -127,7 +127,7 @@ LABEL99:
iconst 73
iconst 73
iload 1
iconst 10551323
iconst 10551324
enum
2122
LABEL106:
@@ -144,7 +144,7 @@ LABEL113:
iconst 73
iconst 73
iload 1
iconst 10551323
iconst 10551324
enum
2122
jump LABEL128
@@ -153,7 +153,7 @@ LABEL121:
iconst 73
iconst 73
iload 1
iconst 10551323
iconst 10551324
enum
2122
LABEL128:
@@ -165,15 +165,15 @@ LABEL129:
jump LABEL137
LABEL133:
iconst 1
iconst 39387168
iconst 39387169
if_sethide
jump LABEL192
LABEL137:
iconst 0
iconst 39387168
iconst 39387169
if_sethide
iconst 1
iconst 39387168
iconst 39387169
2308
get_varbit 6255
switch
@@ -183,38 +183,38 @@ LABEL137:
jump LABEL170
LABEL146:
iconst 1718
iconst 39387170
iconst 39387171
if_setgraphic
iconst 1
sconst "Toggle single-tap mode"
iconst 39387168
iconst 39387169
if_setop
jump LABEL177
LABEL154:
iconst 1717
iconst 39387170
iconst 39387171
if_setgraphic
iconst 1
sconst "Toggle tap-to-drop mode"
iconst 39387168
iconst 39387169
if_setop
jump LABEL177
LABEL162:
iconst 1716
iconst 39387170
iconst 39387171
if_setgraphic
iconst 1
sconst "Show Keyboard"
iconst 39387168
iconst 39387169
if_setop
jump LABEL177
LABEL170:
iconst 1715
iconst 39387170
iconst 39387171
if_setgraphic
iconst 1
sconst ""
iconst 39387168
iconst 39387169
if_setop
LABEL177:
get_varbit 6255
@@ -228,18 +228,18 @@ LABEL181:
jump LABEL189
LABEL185:
iconst 155
iconst 39387170
iconst 39387171
if_settrans
jump LABEL192
LABEL189:
iconst 0
iconst 39387170
iconst 39387171
if_settrans
LABEL192:
invoke 2581
get_varbit 6254
invoke 633
iconst 39387159
iconst 39387160
if_sethide
invoke 2526
pop_int