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

chat commands: fix to use exiting accounttype api

Browse Source
This commit is contained in:
Adam
2018-06-29 21:45:50 -04:00
parent dbf0f38f28
commit 10a1babd90
1 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java
View File

@@ -33,14 +33,13 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import javax.inject.Inject; import javax.inject.Inject;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.runelite.api.AccountType;
import net.runelite.api.ChatMessageType; import net.runelite.api.ChatMessageType;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.GameState; import net.runelite.api.GameState;
import net.runelite.api.ItemComposition; import net.runelite.api.ItemComposition;
import net.runelite.api.MessageNode; import net.runelite.api.MessageNode;
import net.runelite.api.Varbits;
import net.runelite.api.events.SetMessage; import net.runelite.api.events.SetMessage;
import net.runelite.api.vars.AccountType;
import net.runelite.client.chat.ChatColorType; import net.runelite.client.chat.ChatColorType;
import net.runelite.client.chat.ChatMessageBuilder; import net.runelite.client.chat.ChatMessageBuilder;
import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.chat.ChatMessageManager;
@@ -51,8 +50,8 @@ import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.util.StackFormatter; import net.runelite.client.util.StackFormatter;
import net.runelite.http.api.hiscore.HiscoreClient; import net.runelite.http.api.hiscore.HiscoreClient;
import net.runelite.http.api.hiscore.HiscoreResult;
import net.runelite.http.api.hiscore.HiscoreEndpoint; import net.runelite.http.api.hiscore.HiscoreEndpoint;
import net.runelite.http.api.hiscore.HiscoreResult;
import net.runelite.http.api.hiscore.HiscoreSkill; import net.runelite.http.api.hiscore.HiscoreSkill;
import net.runelite.http.api.hiscore.SingleHiscoreSkillResult; import net.runelite.http.api.hiscore.SingleHiscoreSkillResult;
import net.runelite.http.api.hiscore.Skill; import net.runelite.http.api.hiscore.Skill;
@@ -253,7 +252,7 @@ public class ChatCommandsPlugin extends Plugin
if (type.equals(ChatMessageType.PRIVATE_MESSAGE_SENT)) if (type.equals(ChatMessageType.PRIVATE_MESSAGE_SENT))
{ {
player = client.getLocalPlayer().getName(); player = client.getLocalPlayer().getName();
ironmanStatus = getIronmanStatusByVarbit(); ironmanStatus = getHiscoreEndpointType();
} }
else else
{ {
@@ -261,13 +260,13 @@ public class ChatCommandsPlugin extends Plugin
if (player.equals(client.getLocalPlayer().getName())) if (player.equals(client.getLocalPlayer().getName()))
{ {
// Get ironman btw status from varbit // Get ironman status from for the local player
ironmanStatus = getIronmanStatusByVarbit(); ironmanStatus = getHiscoreEndpointType();
} }
else else
{ {
// Get ironman btw status from their icon in chat // Get ironman status from their icon in chat
ironmanStatus = getIronmanStatusByName(setMessage.getName()); ironmanStatus = getHiscoreEndpointByName(setMessage.getName());
} }
} }
@@ -432,9 +431,9 @@ public class ChatCommandsPlugin extends Plugin
* Looks up the ironman status of the local player. Does NOT work on other players. * Looks up the ironman status of the local player. Does NOT work on other players.
* @return hiscore endpoint * @return hiscore endpoint
*/ */
private HiscoreEndpoint getIronmanStatusByVarbit() private HiscoreEndpoint getHiscoreEndpointType()
{ {
return toEndPoint(AccountType.fromVarbit(client.getVarbitValue(client.getVarps(), Varbits.IRONMAN_STATUS.getId()))); return toEndPoint(client.getAccountType());
} }
/** /**
@@ -442,9 +441,24 @@ public class ChatCommandsPlugin extends Plugin
* @param name player name * @param name player name
* @return hiscore endpoint * @return hiscore endpoint
*/ */
private static HiscoreEndpoint getIronmanStatusByName(final String name) private static HiscoreEndpoint getHiscoreEndpointByName(final String name)
{ {
return toEndPoint(AccountType.fromName(name)); if (name.contains("<img=2>"))
{
return toEndPoint(AccountType.IRONMAN);
}
else if (name.contains("<img=3>"))
{
return toEndPoint(AccountType.ULTIMATE_IRONMAN);
}
else if (name.contains("<img=10>"))
{
return toEndPoint(AccountType.HARDCORE_IRONMAN);
}
else
{
return toEndPoint(AccountType.NORMAL);
}
} }
/** /**