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

Fix Blackjack Plugin to use menuManager

Browse Source
This commit is contained in:
Ganom
2019-06-01 21:31:36 -04:00
committed by GitHub
parent fb27baa29d
commit 30ec4ca631
1 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
runelite-client/src/main/java/net/runelite/client/plugins/blackjack/BlackjackPlugin.java
View File

@@ -1,5 +1,7 @@
/* /*
* Copyright (c) 2018, https://runelitepl.us * Copyright (c) 2018 gazivodag <https://github.com/gazivodag>
* Copyright (c) 2019 lucwousin <https://github.com/lucwousin>
* Copyright (c) 2019 infinitay <https://github.com/Infinitay>
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -33,12 +35,11 @@ import net.runelite.api.GameState;
import net.runelite.api.Varbits; import net.runelite.api.Varbits;
import net.runelite.api.events.ChatMessage; import net.runelite.api.events.ChatMessage;
import net.runelite.api.events.MenuEntryAdded; import net.runelite.api.events.MenuEntryAdded;
import net.runelite.api.events.VarbitChanged;
import net.runelite.client.eventbus.Subscribe; import net.runelite.client.eventbus.Subscribe;
import net.runelite.client.menus.MenuManager;
import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.plugins.PluginType; import net.runelite.client.plugins.PluginType;
import net.runelite.client.util.MenuUtil;
import net.runelite.client.util.Text; import net.runelite.client.util.Text;
import org.apache.commons.lang3.RandomUtils; import org.apache.commons.lang3.RandomUtils;
@@ -55,21 +56,22 @@ import org.apache.commons.lang3.RandomUtils;
@Slf4j @Slf4j
public class BlackjackPlugin extends Plugin public class BlackjackPlugin extends Plugin
{ {
private static int POLLNIVNEACH_REGION = 13358;
@Inject @Inject
private Client client; private Client client;
private boolean isKnockedOut = false; @Inject
private boolean ableToBlackJack = false; private MenuManager menuManager;
private static final int POLLNIVNEACH_REGION = 13358;
private boolean isKnockedOut = false;
private long nextKnockOutTick = 0; private long nextKnockOutTick = 0;
@Subscribe @Subscribe
public void onMenuEntryAdded(MenuEntryAdded event) public void onMenuEntryAdded(MenuEntryAdded event)
{ {
if (client.getGameState() != GameState.LOGGED_IN if (client.getGameState() != GameState.LOGGED_IN ||
|| (client.getLocalPlayer().getWorldLocation().getRegionID() != POLLNIVNEACH_REGION || !ableToBlackJack)) client.getVar(Varbits.QUEST_THE_FEUD) < 13 ||
client.getLocalPlayer().getWorldLocation().getRegionID() != POLLNIVNEACH_REGION)
{ {
return; return;
} }
@@ -78,28 +80,24 @@ public class BlackjackPlugin extends Plugin
String target = Text.removeTags(event.getTarget().toLowerCase()); String target = Text.removeTags(event.getTarget().toLowerCase());
if (isKnockedOut && nextKnockOutTick >= client.getTickCount()) if (isKnockedOut && nextKnockOutTick >= client.getTickCount())
{ {
MenuUtil.swap(client, "pickpocket", option, target); menuManager.addSwap("", target, "pickpocket", target, false, false);
} }
else else
{ {
MenuUtil.swap(client, "knock-out", option, target); menuManager.addSwap("", target, "knock-out", target, false, false);
} }
} }
@Subscribe @Subscribe
public void onChatMessage(ChatMessage event) public void onChatMessage(ChatMessage event)
{ {
if (event.getType() == ChatMessageType.SPAM if (event.getType() == ChatMessageType.SPAM)
&& event.getMessage().equals("You smack the bandit over the head and render them unconscious."))
{ {
isKnockedOut = true; if (event.getMessage().equals("You smack the bandit over the head and render them unconscious."))
nextKnockOutTick = client.getTickCount() + RandomUtils.nextInt(3, 4); {
isKnockedOut = true;
nextKnockOutTick = client.getTickCount() + RandomUtils.nextInt(3, 4);
}
} }
} }
@Subscribe
public void onVarbitChanged(VarbitChanged event)
{
ableToBlackJack = client.getVar(Varbits.QUEST_THE_FEUD) >= 13;
}
} }