diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameTimer.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameTimer.java index 5b4b33254d..0838bf65bf 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameTimer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/GameTimer.java @@ -66,7 +66,9 @@ public enum GameTimer SANFEW("sanfew", "Sanfew serum", 6, ChronoUnit.MINUTES), OVERLOAD_RAID("overloadraid", "Overload", 5, ChronoUnit.MINUTES), PRAYER_ENHANCE("prayerenhance", "Prayer enhance", 290, ChronoUnit.SECONDS), - GOD_WARS_ALTAR("altar", "God wars altar", 10, ChronoUnit.MINUTES); + GOD_WARS_ALTAR("altar", "God wars altar", 10, ChronoUnit.MINUTES), + ANTIPOISON("antipoison", "Antipoison", 90, ChronoUnit.SECONDS), + SUPERANTIPOISON("superantipoison", "Superantipoison", 346, ChronoUnit.SECONDS); @Getter private final String imageResource; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersConfig.java index b1ec803fb4..b16c1a1a5e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersConfig.java @@ -224,4 +224,24 @@ public interface TimersConfig extends Config { return true; } + + @ConfigItem( + keyName = "showAntipoison", + name = "Antipoison timer", + description = "Configures whether Antipoison timer is displayed" + ) + default boolean showAntiPoison() + { + return true; + } + + @ConfigItem( + keyName = "showSuperantipoison", + name = "Superantipoison timer", + description = "Configures whether Superantipoison timer is displayed" + ) + default boolean showSuperantipoison() + { + return true; + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java index def40f6305..b0882c1427 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.timers; import static net.runelite.client.plugins.timers.GameTimer.ANTIDOTEPLUS; import static net.runelite.client.plugins.timers.GameTimer.ANTIDOTEPLUSPLUS; import static net.runelite.client.plugins.timers.GameTimer.ANTIFIRE; +import static net.runelite.client.plugins.timers.GameTimer.ANTIPOISON; import static net.runelite.client.plugins.timers.GameTimer.ANTIVENOM; import static net.runelite.client.plugins.timers.GameTimer.ANTIVENOMPLUS; import static net.runelite.client.plugins.timers.GameTimer.CANNON; @@ -53,6 +54,7 @@ import static net.runelite.client.plugins.timers.GameTimer.ICEBURST; import static net.runelite.client.plugins.timers.GameTimer.ICERUSH; import static net.runelite.client.plugins.timers.GameTimer.IMBUEDHEART; import static net.runelite.client.plugins.timers.GameTimer.SNARE; +import static net.runelite.client.plugins.timers.GameTimer.SUPERANTIPOISON; import static net.runelite.client.plugins.timers.GameTimer.VENGEANCE; import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; @@ -239,6 +241,28 @@ public class TimersPlugin extends Plugin createGameTimer(ANTIDOTEPLUS); return; } + + if (config.showAntiPoison() + && event.getMenuOption().contains("Drink") + && (event.getId() == ItemID.ANTIPOISON1 + || event.getId() == ItemID.ANTIPOISON2 + || event.getId() == ItemID.ANTIPOISON3 + || event.getId() == ItemID.ANTIPOISON4)) + { + createGameTimer(ANTIPOISON); + return; + } + + if (config.showSuperantipoison() + && event.getMenuOption().contains("Drink") + && (event.getId() == ItemID.SUPERANTIPOISON1 + || event.getId() == ItemID.SUPERANTIPOISON2 + || event.getId() == ItemID.SUPERANTIPOISON3 + || event.getId() == ItemID.SUPERANTIPOISON4)) + { + createGameTimer(SUPERANTIPOISON); + return; + } } @Subscribe diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/antipoison.png b/runelite-client/src/main/resources/net/runelite/client/plugins/timers/antipoison.png new file mode 100644 index 0000000000..050abed267 Binary files /dev/null and b/runelite-client/src/main/resources/net/runelite/client/plugins/timers/antipoison.png differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/timers/superantipoison.png b/runelite-client/src/main/resources/net/runelite/client/plugins/timers/superantipoison.png new file mode 100644 index 0000000000..3b01076737 Binary files /dev/null and b/runelite-client/src/main/resources/net/runelite/client/plugins/timers/superantipoison.png differ