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-11-17 16:35:59 +01:00
parent d204950c38 48b12dcf67
commit b9f7ed5078
28 changed files with 154 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cache/src/main/java/net/runelite/cache/fs/flat/FlatStorage.java vendored
View File

@@ -210,7 +210,7 @@ public class FlatStorage implements Storage
@Override
public void save(Store store) throws IOException
{
store.getIndexes().sort(Comparator.comparing(Index::getId));
store.getIndexes().sort(Comparator.comparingInt(Index::getId));
for (Index idx : store.getIndexes())
{
String file = idx.getId() + EXTENSION;
@@ -222,7 +222,7 @@ public class FlatStorage implements Storage
br.printf("crc=%d\n", idx.getCrc());
br.printf("named=%b\n", idx.isNamed());
idx.getArchives().sort(Comparator.comparing(Archive::getArchiveId));
idx.getArchives().sort(Comparator.comparingInt(Archive::getArchiveId));
for (Archive archive : idx.getArchives())
{
br.printf("id=%d\n", archive.getArchiveId());

2
cache/src/main/java/net/runelite/cache/script/Instructions.java vendored
View File

@@ -505,6 +505,8 @@ public class Instructions implements Opcodes
add(CHAT_SETMESSAGEFILTER, "chat_setmessagefilter");
add(CHAT_GETMESSAGEFILTER, "chat_getmessagefilter");
add(WRITECONSOLE, "writeconsole");
add(CHAT_GETHISTORYEX_BYTYPEANDLINE, "chat_gethistoryex_bytypeandline");
add(CHAT_GETHISTORYEX_BYUID, "chat_gethistoryex_byuid");
add(GETWINDOWMODE, "getwindowmode");
add(SETWINDOWMODE, "setwindowmode");
add(GETDEFAULTWINDOWMODE, "getdefaultwindowmode");

2
cache/src/main/java/net/runelite/cache/script/Opcodes.java vendored
View File

@@ -497,6 +497,8 @@ public interface Opcodes
int CHAT_SETMESSAGEFILTER = 5021;
int CHAT_GETMESSAGEFILTER = 5022;
int WRITECONSOLE = 5023;
int CHAT_GETHISTORYEX_BYTYPEANDLINE = 5030;
int CHAT_GETHISTORYEX_BYUID = 5031;
int GETWINDOWMODE = 5306;
int SETWINDOWMODE = 5307;
int GETDEFAULTWINDOWMODE = 5308;