From c157514faa328b06c29d19f85c696942f5df0531 Mon Sep 17 00:00:00 2001 From: jamesahhh Date: Wed, 28 Mar 2018 05:36:59 -0600 Subject: [PATCH] Add antipoison and superantipoison timers (#1159) Add new timers for antipoison and superantipoison and respective resource images. --- .../client/plugins/timers/GameTimer.java | 4 ++- .../client/plugins/timers/TimersConfig.java | 20 +++++++++++++++ .../client/plugins/timers/TimersPlugin.java | 24 ++++++++++++++++++ .../client/plugins/timers/antipoison.png | Bin 0 -> 793 bytes .../client/plugins/timers/superantipoison.png | Bin 0 -> 19781 bytes 5 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 runelite-client/src/main/resources/net/runelite/client/plugins/timers/antipoison.png create mode 100644 runelite-client/src/main/resources/net/runelite/client/plugins/timers/superantipoison.png 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 0000000000000000000000000000000000000000..050abed267b321f7a63a56b87e8aa30d28eae893 GIT binary patch literal 793 zcmV+!1LpjRP)Px%(@8`@R7l62mQ8CDQ51%sd+wb{r?nQrQbE@W;$izKFarg z_Nwp~MG0@+m|~+6v$3(s`mZ_*58f9hHbqrWO&-G96n1&_J4cUSjyg2Yh%Q5lV~WWQu+P=gNmXwnNl5)%AYFUIU0>RwR&|oNuw@39nLwt_cS)^ z)ao^Awd!tss{GvCJW(_Rc%1j#xpSAFKh{}VDi1se1ASU9m)W;(46Rd>c;^t2!jm;H zX%v-EO5vQREo~?1u6zm;SC{eL<6G@35tIm%$4~Cgr_(DFI1)xLK5bPu?0NYL`#C0A zv+(@CNR_|(Xq>&~aL?NhA77&l=uo3W&D53QT-v_vj~-|Zh6GQNmeQaDFaeklOlilY z%3pgt&afQpy+KJ30SQ3@&|w;RwA)BW_6tIQBknCHptYp5A(&9-(n>ew^(W(mW~_6P zh_g_VN?=MF3G_hP9@5gNVAzAB+20eACNcq(qI_EErYuE6U6jq95G^R3YMN@>p*?Y_ zmo_5}M+D92z-=Z1+6dC^fOf9Bc_L{ofp%nl#B!n_H zc(1mF(jca7EsY6V2f}R8G>F=MjB`T?S){|#n1GJON*!$lyqY=ojh#F_!|I~77B)U5 zJiA>7yvm>xs$0YkwzuCJRuBqt)e+aBvS#`6<}WMv8*{B`mV XHjpkb>ekOi00000NkvXXu0mjftwL|F literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3b01076737ef4909f4b34e0d531dbb442cb2b73f GIT binary patch literal 19781 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 literal 0 HcmV?d00001