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

Merge branch 'master' of https://github.com/runelite/runelite into upstream-2122021

Browse Source 
 Conflicts:
	cache-client/pom.xml
	cache-updater/pom.xml
	cache/pom.xml
	http-api/pom.xml
	http-service/pom.xml
	pom.xml
	runelite-api/pom.xml
	runelite-api/src/main/java/net/runelite/api/MenuAction.java
	runelite-client/pom.xml
	runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java
	runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java
	runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java
	runelite-jshell/pom.xml
	runelite-script-assembler-plugin/pom.xml
This commit is contained in:
Justin
2021-12-02 09:06:51 +11:00
parent bfd86d79df 8944eb9be6
commit f41d8905ee
32 changed files with 1251 additions and 1010 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
runelite-api/src/main/java/net/runelite/api/ChatMessageType.java
View File

@@ -179,6 +179,8 @@ public enum ChatMessageType
CLAN_GIM_FORM_GROUP(111),
CLAN_GIM_GROUP_WITH(112),
CLAN_GIM_CHAT(-1),
CLAN_GIM_MESSAGE(-1),
/**
* An unknown message type.
*/
@@ -192,7 +194,10 @@ public enum ChatMessageType
{
for (ChatMessageType chatMessageType : values())
{
CHAT_MESSAGE_TYPES.put(chatMessageType.type, chatMessageType);
if (chatMessageType.type != -1)
{
CHAT_MESSAGE_TYPES.put(chatMessageType.type, chatMessageType);
}
}
}

5
runelite-api/src/main/java/net/runelite/api/MenuAction.java
View File

@@ -233,6 +233,11 @@ public enum MenuAction
*/
SPELL_CAST_ON_WIDGET(58),
/**
* Menu action for high priority runelite options
*/
RUNELITE_HIGH_PRIORITY(999),
/**
* Sub 1000 so it doesn't get sorted down in the list
*/