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

timers: update for if3 inv

Browse Source
This commit is contained in:
Adam
2022-04-21 08:50:09 -04:00
parent 96fbdda03d
commit d533285a32
1 changed files with 56 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java
View File

@@ -45,6 +45,7 @@ import net.runelite.api.ItemContainer;
import net.runelite.api.ItemID; import net.runelite.api.ItemID;
import static net.runelite.api.ItemID.FIRE_CAPE; import static net.runelite.api.ItemID.FIRE_CAPE;
import static net.runelite.api.ItemID.INFERNAL_CAPE; import static net.runelite.api.ItemID.INFERNAL_CAPE;
import net.runelite.api.MenuAction;
import net.runelite.api.NPC; import net.runelite.api.NPC;
import net.runelite.api.NpcID; import net.runelite.api.NpcID;
import net.runelite.api.Player; import net.runelite.api.Player;
@@ -439,64 +440,65 @@ public class TimersPlugin extends Plugin
@Subscribe @Subscribe
public void onMenuOptionClicked(MenuOptionClicked event) public void onMenuOptionClicked(MenuOptionClicked event)
{ {
if (config.showStamina() if (event.isItemOp() && event.getMenuOption().equals("Drink"))
&& event.getMenuOption().contains("Drink")
&& (event.getId() == ItemID.STAMINA_MIX1
|| event.getId() == ItemID.STAMINA_MIX2
|| event.getId() == ItemID.EGNIOL_POTION_1
|| event.getId() == ItemID.EGNIOL_POTION_2
|| event.getId() == ItemID.EGNIOL_POTION_3
|| event.getId() == ItemID.EGNIOL_POTION_4))
{ {
// Needs menu option hook because mixes use a common drink message, distinct from their standard potion messages if ((event.getItemId() == ItemID.STAMINA_MIX1
createStaminaTimer(); || event.getItemId() == ItemID.STAMINA_MIX2
return; || event.getItemId() == ItemID.EGNIOL_POTION_1
|| event.getItemId() == ItemID.EGNIOL_POTION_2
|| event.getItemId() == ItemID.EGNIOL_POTION_3
|| event.getItemId() == ItemID.EGNIOL_POTION_4)
&& config.showStamina())
{
// Needs menu option hook because mixes use a common drink message, distinct from their standard potion messages
createStaminaTimer();
return;
}
if ((event.getItemId() == ItemID.ANTIFIRE_MIX1
|| event.getItemId() == ItemID.ANTIFIRE_MIX2)
&& config.showAntiFire())
{
// Needs menu option hook because mixes use a common drink message, distinct from their standard potion messages
createGameTimer(ANTIFIRE);
return;
}
if ((event.getItemId() == ItemID.EXTENDED_ANTIFIRE_MIX1
|| event.getItemId() == ItemID.EXTENDED_ANTIFIRE_MIX2)
&& config.showAntiFire())
{
// Needs menu option hook because mixes use a common drink message, distinct from their standard potion messages
createGameTimer(EXANTIFIRE);
return;
}
if ((event.getItemId() == ItemID.SUPER_ANTIFIRE_MIX1
|| event.getItemId() == ItemID.SUPER_ANTIFIRE_MIX2)
&& config.showAntiFire())
{
// Needs menu option hook because mixes use a common drink message, distinct from their standard potion messages
createGameTimer(SUPERANTIFIRE);
return;
}
if ((event.getItemId() == ItemID.EXTENDED_SUPER_ANTIFIRE_MIX1
|| event.getItemId() == ItemID.EXTENDED_SUPER_ANTIFIRE_MIX2)
&& config.showAntiFire())
{
// Needs menu option hook because mixes use a common drink message, distinct from their standard potion messages
createGameTimer(EXSUPERANTIFIRE);
return;
}
} }
if (config.showAntiFire() if (event.getMenuAction() == MenuAction.CC_OP)
&& event.getMenuOption().contains("Drink")
&& (event.getId() == ItemID.ANTIFIRE_MIX1
|| event.getId() == ItemID.ANTIFIRE_MIX2))
{ {
// Needs menu option hook because mixes use a common drink message, distinct from their standard potion messages TeleportWidget teleportWidget = TeleportWidget.of(event.getParam1());
createGameTimer(ANTIFIRE); if (teleportWidget != null)
return; {
} lastTeleportClicked = teleportWidget;
}
if (config.showAntiFire()
&& event.getMenuOption().contains("Drink")
&& (event.getId() == ItemID.EXTENDED_ANTIFIRE_MIX1
|| event.getId() == ItemID.EXTENDED_ANTIFIRE_MIX2))
{
// Needs menu option hook because mixes use a common drink message, distinct from their standard potion messages
createGameTimer(EXANTIFIRE);
return;
}
if (config.showAntiFire()
&& event.getMenuOption().contains("Drink")
&& (event.getId() == ItemID.SUPER_ANTIFIRE_MIX1
|| event.getId() == ItemID.SUPER_ANTIFIRE_MIX2))
{
// Needs menu option hook because mixes use a common drink message, distinct from their standard potion messages
createGameTimer(SUPERANTIFIRE);
return;
}
if (config.showAntiFire()
&& event.getMenuOption().contains("Drink")
&& (event.getId() == ItemID.EXTENDED_SUPER_ANTIFIRE_MIX1
|| event.getId() == ItemID.EXTENDED_SUPER_ANTIFIRE_MIX2))
{
// Needs menu option hook because mixes use a common drink message, distinct from their standard potion messages
createGameTimer(EXSUPERANTIFIRE);
return;
}
TeleportWidget teleportWidget = TeleportWidget.of(event.getParam1());
if (teleportWidget != null)
{
lastTeleportClicked = teleportWidget;
} }
} }