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

Merge remote-tracking branch 'upstream/master' into master

Browse Source
This commit is contained in:
ThatGamerBlue
2021-04-07 20:25:02 +01:00
parent 2e4dc55f9b a14e864e35
commit fe9970827f
18 changed files with 166 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-client/src/main/java/com/openosrs/client/game/PlayerManager.java
View File

@@ -384,7 +384,7 @@ public class PlayerManager
}
else if (itemComposition.isTradeable())
{
prices.put(id, itemManager.getItemPrice(id, false));
prices.put(id, itemManager.getItemPrice(id));
}
}

9
runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java
View File

@@ -131,13 +131,16 @@ public class ChatMessageManager
case MODCHAT:
{
String sanitizedUsername = Text.removeTags(chatMessage.getName());
boolean isFriend = client.isFriended(sanitizedUsername, true) && !client.getLocalPlayer().getName().equals(sanitizedUsername);
if (isFriend)
if (client.getLocalPlayer().getName().equals(sanitizedUsername))
{
usernameColor = isChatboxTransparent ? chatColorConfig.transparentPlayerUsername() : chatColorConfig.opaquePlayerUsername();
}
else if (client.isFriended(sanitizedUsername, true))
{
usernameColor = isChatboxTransparent ? chatColorConfig.transparentPublicFriendUsernames() : chatColorConfig.opaquePublicFriendUsernames();
}
if (usernameColor == null)
else
{
usernameColor = isChatboxTransparent ? chatColorConfig.transparentUsername() : chatColorConfig.opaqueUsername();
}

18
runelite-client/src/main/java/net/runelite/client/config/ChatColorConfig.java
View File

@@ -313,6 +313,15 @@ public interface ChatColorConfig extends Config
)
Color opaquePublicFriendUsernames();
@ConfigItem(
position = 28,
keyName = "opaquePlayerUsername",
name = "Your username",
description = "Color of your username",
section = opaqueSection
)
Color opaquePlayerUsername();
@ConfigItem(
position = 51,
keyName = "transparentPublicChat",
@@ -579,4 +588,13 @@ public interface ChatColorConfig extends Config
section = transparentSection
)
Color transparentPublicFriendUsernames();
@ConfigItem(
position = 78,
keyName = "transparentPlayerUsername",
name = "Your username (transparent)",
description = "Color of your username (transparent)",
section = transparentSection
)
Color transparentPlayerUsername();
}

24
runelite-client/src/main/java/net/runelite/client/game/ItemManager.java
View File

@@ -299,19 +299,6 @@ public class ItemManager
return getItemPriceWithSource(itemID, runeLiteConfig.useWikiItemPrices());
}
/**
* Look up an item's price
*
* @param itemID item id
* @param ignoreUntradeableMap skip untradeables
* @return item price
*/
@Deprecated(since = "4.1.0", forRemoval = true)
public int getItemPrice(int itemID, boolean ignoreUntradeableMap)
{
return getItemPriceWithSource(itemID, runeLiteConfig.useWikiItemPrices(), ignoreUntradeableMap);
}
/**
* Look up an item's price
*
@@ -320,12 +307,6 @@ public class ItemManager
* @return item price
*/
public int getItemPriceWithSource(int itemID, boolean useWikiPrice)
{
return getItemPriceWithSource(itemID, useWikiPrice, false);
}
// TODO: inline this back to getItemPriceWithSource(int, boolean) next minor ver
private int getItemPriceWithSource(int itemID, boolean useWikiPrice, boolean ignoreUntradeableMap)
{
if (itemID == COINS_995)
{
@@ -360,11 +341,6 @@ public class ItemManager
{
for (final ItemMapping mappedItem : mappedItems)
{
if (ignoreUntradeableMap && mappedItem.isUntradeable())
{
continue;
}
price += getItemPriceWithSource(mappedItem.getTradeableItem(), useWikiPrice) * mappedItem.getQuantity();
}
}

2
runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPlugin.java
View File

@@ -347,7 +347,7 @@ public class DevToolsPlugin extends Plugin
int id = Integer.parseInt(args[0]);
Player localPlayer = client.getLocalPlayer();
localPlayer.setAnimation(id);
localPlayer.setActionFrame(0);
localPlayer.setAnimationFrame(0);
break;
}
case "gfx":