From 347f0c0d24e4e9fa08da6f59a27674a8f927f4c5 Mon Sep 17 00:00:00 2001 From: Kyleeld <48519776+Kyleeld@users.noreply.github.com> Date: Sat, 18 May 2019 21:45:34 +0100 Subject: [PATCH] Hide Prayer Reformat (#299) * prayer bringup prayer bringup recoded to use switches instead of if's. * fix checkstyle fix checkstyle * Update HidePrayersPVMPlugin.java fix --- .../plugins/hideprayers/PVM/Armadyl.java | 47 --- .../plugins/hideprayers/PVM/Bandos.java | 47 --- .../plugins/hideprayers/PVM/Barrows.java | 47 --- .../hideprayers/PVM/HidePrayersPVMConfig.java | 100 +---- .../hideprayers/PVM/HidePrayersPVMPlugin.java | 385 ++++++++---------- .../PVM/{Cerberus.java => PVMPrayers.java} | 20 +- .../plugins/hideprayers/PVM/Saradomin.java | 47 --- .../plugins/hideprayers/PVM/Vorkath.java | 47 --- .../plugins/hideprayers/PVM/Zamorak.java | 47 --- .../plugins/hideprayers/PVM/Zulrah.java | 47 --- .../hideprayers/PVP/HidePrayersPVPConfig.java | 24 +- .../hideprayers/PVP/HidePrayersPVPPlugin.java | 380 ++++++++--------- 12 files changed, 382 insertions(+), 856 deletions(-) delete mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/Armadyl.java delete mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/Bandos.java delete mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/Barrows.java rename runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/{Cerberus.java => PVMPrayers.java} (76%) delete mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/Saradomin.java delete mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/Vorkath.java delete mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/Zamorak.java delete mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/Zulrah.java diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/Armadyl.java b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/Armadyl.java deleted file mode 100644 index fabdb13e33..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/Armadyl.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2018, Lotto - * Copyright (c) 2018, Raqes - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.client.plugins.hideprayers.PVM; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -@Getter -@AllArgsConstructor -public enum Armadyl -{ - DISABLED("Disabled"), - ARMADYL_CHEAP("Eagle eye"), - ARMADYL_EXPENSIVE("Rigour"); - - private String name; - - @Override - public String toString() - { - return getName(); - } -} \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/Bandos.java b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/Bandos.java deleted file mode 100644 index ef688cd8ed..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/Bandos.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2018, Lotto - * Copyright (c) 2018, Raqes - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.client.plugins.hideprayers.PVM; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -@Getter -@AllArgsConstructor -public enum Bandos -{ - DISABLED("Disabled"), - BANDOS_CHEAP("Low LVL Melee"), - BANDOS_EXPENSIVE("Piety"); - - private String name; - - @Override - public String toString() - { - return getName(); - } -} \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/Barrows.java b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/Barrows.java deleted file mode 100644 index e09c13d607..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/Barrows.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2018, Lotto - * Copyright (c) 2018, Raqes - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.client.plugins.hideprayers.PVM; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -@Getter -@AllArgsConstructor -public enum Barrows -{ - DISABLED("Disabled"), - BARROWS_CHEAP("Eagle/Mystic"), - BARROWS_EXPENSIVE("Augury/Rigour"); - - private String name; - - @Override - public String toString() - { - return getName(); - } -} \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/HidePrayersPVMConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/HidePrayersPVMConfig.java index a66461482c..31de44631b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/HidePrayersPVMConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/HidePrayersPVMConfig.java @@ -35,98 +35,14 @@ import net.runelite.client.config.ConfigItem; public interface HidePrayersPVMConfig extends Config { @ConfigItem - ( - position = 0, - keyName = "Barrows", - name = "Barrows", - description = "Shows prayers for Barrows" - ) - default Barrows Barrows() + ( + position = 0, + keyName = "PVMPrayers", + name = "PVM Prayers", + description = "Shows prayers based on prayer build" + ) + default PVMPrayers PVMPrayers() { - return Barrows.DISABLED; - } - - @ConfigItem - ( - position = 1, - keyName = "Cerberus", - name = "Cerberus", - description = "Shows prayers for Cerberus" - ) - default Cerberus Cerberus() - { - return Cerberus.DISABLED; - } - - @ConfigItem - ( - position = 2, - keyName = "Vorkath", - name = "Vorkath", - description = "Shows prayers for Vorkath" - ) - default Vorkath Vorkath() - { - return Vorkath.DISABLED; - } - - @ConfigItem - ( - position = 3, - keyName = "Zulrah", - name = "Zulrah", - description = "Shows prayers for Zulrah" - ) - default Zulrah Zulrah() - { - return Zulrah.DISABLED; - } - - @ConfigItem - ( - position = 4, - keyName = "Armadyl", - name = "Armadyl", - description = "Shows prayers for Armadyl" - ) - default Armadyl Armadyl() - { - return Armadyl.DISABLED; - } - - @ConfigItem - ( - position = 5, - keyName = "Bandos", - name = "Bandos", - description = "Shows prayers for Bandos" - ) - default Bandos Bandos() - { - return Bandos.DISABLED; - } - - @ConfigItem - ( - position = 6, - keyName = "Saradomin", - name = "Saradomin", - description = "Shows prayers for Saradomin" - ) - default Saradomin Saradomin() - { - return Saradomin.DISABLED; - } - - @ConfigItem - ( - position = 7, - keyName = "Zamorak", - name = "Zamorak", - description = "Shows prayers for Zamorak" - ) - default Zamorak Zamorak() - { - return Zamorak.DISABLED; + return PVMPrayers.DISABLED; } } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/HidePrayersPVMPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/HidePrayersPVMPlugin.java index fc4b75684a..24a8f6a037 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/HidePrayersPVMPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/HidePrayersPVMPlugin.java @@ -29,15 +29,7 @@ package net.runelite.client.plugins.hideprayers.PVM; import com.google.common.collect.ImmutableList; import com.google.inject.Provides; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; -import javax.inject.Inject; -import net.runelite.api.Client; -import net.runelite.api.GameState; -import net.runelite.api.HashTable; -import net.runelite.api.Prayer; -import net.runelite.api.WidgetNode; +import net.runelite.api.*; import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.WidgetLoaded; @@ -51,6 +43,11 @@ import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginType; import net.runelite.client.plugins.hideprayers.util.PrayerTabStates; +import javax.inject.Inject; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + @PluginDescriptor ( name = "Show/Hide PVM Prayers", @@ -115,7 +112,7 @@ public class HidePrayersPVMPlugin extends Plugin protected void startUp() throws Exception { hidePrayers(); - configManager.setConfiguration("runelite", "hideprayerspvmplugin", false); + configManager.setConfiguration("runelite", "hideprayersindividualplugin", false); configManager.setConfiguration("runelite", "hideprayerspvpplugin", false); } @@ -219,213 +216,171 @@ public class HidePrayersPVMPlugin extends Plugin Prayer prayer = Prayer.values()[index]; Widget prayerWidget = prayerWidgets.get(prayer.ordinal()); - if (config.Armadyl() == Armadyl.DISABLED - && config.Bandos() == Bandos.DISABLED - && config.Barrows() == Barrows.DISABLED - && config.Cerberus() == Cerberus.DISABLED - && config.Saradomin() == Saradomin.DISABLED - && config.Vorkath() == Vorkath.DISABLED - && config.Zamorak() == Zamorak.DISABLED - && config.Zulrah() == Zulrah.DISABLED - ) + switch (config.PVMPrayers()) { - prayerWidget.setHidden(false); - } + case DISABLED: + prayerWidget.setHidden(false); + break; - if (config.Zulrah() == Zulrah.ZULRAH_CHEAP) - { - prayerWidget.setHidden(true); - prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic - prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false);// Protect from Range - prayerWidgets.get(Prayer.values()[19].ordinal()).setHidden(false);// eagle eye - prayerWidgets.get(Prayer.values()[20].ordinal()).setHidden(false);// mystic might - prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false);// Redemption - prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve - } - - if (config.Zulrah() == Zulrah.ZULRAH_EXPENSIVE) - { - prayerWidget.setHidden(true); - prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic - prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false);// Protect from Range - prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false);// Redemption - prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve - prayerWidgets.get(Prayer.values()[27].ordinal()).setHidden(false);// Rigour - prayerWidgets.get(Prayer.values()[28].ordinal()).setHidden(false);// Augury - } - - if (config.Barrows() == Barrows.BARROWS_CHEAP) - { - prayerWidget.setHidden(true); - prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic - prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false);// Protect from Range - prayerWidgets.get(Prayer.values()[18].ordinal()).setHidden(false);// Protect from Melee - prayerWidgets.get(Prayer.values()[19].ordinal()).setHidden(false);// eagle eye - prayerWidgets.get(Prayer.values()[20].ordinal()).setHidden(false);// mystic might - prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false);// Redemption - prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve - } - - if (config.Barrows() == Barrows.BARROWS_EXPENSIVE) - { - prayerWidget.setHidden(true); - prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic - prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false);// Protect from Range - prayerWidgets.get(Prayer.values()[18].ordinal()).setHidden(false);// Protect from Melee - prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false);// Redemption - prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve - prayerWidgets.get(Prayer.values()[27].ordinal()).setHidden(false);// Rigour - prayerWidgets.get(Prayer.values()[28].ordinal()).setHidden(false);// Augury - } - - if (config.Vorkath() == Vorkath.VORKATH_CHEAP) - { - prayerWidget.setHidden(true); - prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic - prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false);// Protect from Range - prayerWidgets.get(Prayer.values()[19].ordinal()).setHidden(false);// eagle eye - prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false);// Redemption - prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve - } - - if (config.Vorkath() == Vorkath.VORKATH_EXPENSIVE) - { - prayerWidget.setHidden(true); - prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic - prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false);// Protect from Range - prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false);// Redemption - prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve - prayerWidgets.get(Prayer.values()[27].ordinal()).setHidden(false);// Rigour - } - - if (config.Cerberus() == Cerberus.CERBERUS_CHEAP) - { - prayerWidget.setHidden(true); - prayerWidgets.get(Prayer.values()[13].ordinal()).setHidden(false);// Steel PVM - prayerWidgets.get(Prayer.values()[14].ordinal()).setHidden(false);// Ultimate Strength - prayerWidgets.get(Prayer.values()[15].ordinal()).setHidden(false);// Incredible Reflex - prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic - prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false);// Protect from Range - prayerWidgets.get(Prayer.values()[18].ordinal()).setHidden(false);// Protect from Melee - prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false);// Redemption - prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve - } - - if (config.Cerberus() == Cerberus.CERBERUS_EXPENSIVE) - { - prayerWidget.setHidden(true); - prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic - prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false);// Protect from Range - prayerWidgets.get(Prayer.values()[18].ordinal()).setHidden(false);// Protect from Melee - prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false);// Redemption - prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve - prayerWidgets.get(Prayer.values()[26].ordinal()).setHidden(false);// Piety - } - - if (config.Cerberus() == Cerberus.CERBERUS_CHEAP_RANGE) - { - prayerWidget.setHidden(true); - prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic - prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false);// Protect from Range - prayerWidgets.get(Prayer.values()[18].ordinal()).setHidden(false);// Protect from Melee - prayerWidgets.get(Prayer.values()[19].ordinal()).setHidden(false);// eagle eye - prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false);// Redemption - prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve - } - - if (config.Cerberus() == Cerberus.CERBERUS_EXPENSIVE_RANGE) - { - prayerWidget.setHidden(true); - prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic - prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false);// Protect from Range - prayerWidgets.get(Prayer.values()[18].ordinal()).setHidden(false);// Protect from Melee - prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false);// Redemption - prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve - prayerWidgets.get(Prayer.values()[27].ordinal()).setHidden(false);// Rigour - } - - if (config.Armadyl() == Armadyl.ARMADYL_CHEAP) - { - prayerWidget.setHidden(true); - prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic - prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false);// Protect from Range - prayerWidgets.get(Prayer.values()[19].ordinal()).setHidden(false);// eagle eye - prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false);// Redemption - prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve - } - - if (config.Armadyl() == Armadyl.ARMADYL_EXPENSIVE) - { - prayerWidget.setHidden(true); - prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic - prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false);// Protect from Range - prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false);// Redemption - prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve - prayerWidgets.get(Prayer.values()[27].ordinal()).setHidden(false);// Rigour - } - - if (config.Bandos() == Bandos.BANDOS_CHEAP) - { - prayerWidget.setHidden(true); - prayerWidgets.get(Prayer.values()[13].ordinal()).setHidden(false);// Steel PVM - prayerWidgets.get(Prayer.values()[14].ordinal()).setHidden(false);// Ultimate Strength - prayerWidgets.get(Prayer.values()[15].ordinal()).setHidden(false);// Incredible Reflex - prayerWidgets.get(Prayer.values()[18].ordinal()).setHidden(false);// Protect from Melee - prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false);// Redemption - prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve - } - - if (config.Bandos() == Bandos.BANDOS_EXPENSIVE) - { - prayerWidget.setHidden(true); - prayerWidgets.get(Prayer.values()[18].ordinal()).setHidden(false);// Protect from Melee - prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false);// Redemption - prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve - prayerWidgets.get(Prayer.values()[26].ordinal()).setHidden(false);// Piety - } - - if (config.Saradomin() == Saradomin.SARDOMIN_CHEAP) - { - prayerWidget.setHidden(true); - prayerWidgets.get(Prayer.values()[13].ordinal()).setHidden(false);// Steel PVM - prayerWidgets.get(Prayer.values()[14].ordinal()).setHidden(false);// Ultimate Strength - prayerWidgets.get(Prayer.values()[15].ordinal()).setHidden(false);// Incredible Reflex - prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from magic - prayerWidgets.get(Prayer.values()[19].ordinal()).setHidden(false);// eagle eye - prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false);// Redemption - prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve - } - - if (config.Saradomin() == Saradomin.SARADOMIN_EXPENSIVE) - { - prayerWidget.setHidden(true); - prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic - prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false);// Redemption - prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve - prayerWidgets.get(Prayer.values()[26].ordinal()).setHidden(false);// Piety - prayerWidgets.get(Prayer.values()[27].ordinal()).setHidden(false);// Rigour - } - - if (config.Zamorak() == Zamorak.ZAMORAK_CHEAP) - { - prayerWidget.setHidden(true); - prayerWidgets.get(Prayer.values()[13].ordinal()).setHidden(false);// Steel Skin - prayerWidgets.get(Prayer.values()[14].ordinal()).setHidden(false);// Ultimate Strength - prayerWidgets.get(Prayer.values()[15].ordinal()).setHidden(false);// Incredible Reflex - prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic - prayerWidgets.get(Prayer.values()[18].ordinal()).setHidden(false);// Protect from Melee - prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false);// Redemption - prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve - } - - if (config.Zamorak() == Zamorak.ZAMORAK_EXPENSIVE) - { - prayerWidget.setHidden(true); - prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic - prayerWidgets.get(Prayer.values()[18].ordinal()).setHidden(false);// Protect from Melee - prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false);// Redemption - prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve - prayerWidgets.get(Prayer.values()[26].ordinal()).setHidden(false);// Piety + case ARMADYL_CHEAP: + prayerWidget.setHidden(true); + prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic + prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false);// Protect from Range + prayerWidgets.get(Prayer.values()[19].ordinal()).setHidden(false);// eagle eye + prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false);// Redemption + prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve + break; + case ARMADYL_EXPENSIVE: + prayerWidget.setHidden(true); + prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic + prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false);// Protect from Range + prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false);// Redemption + prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve + prayerWidgets.get(Prayer.values()[27].ordinal()).setHidden(false);// Rigour + break; + case BANDOS_CHEAP: + prayerWidget.setHidden(true); + prayerWidgets.get(Prayer.values()[13].ordinal()).setHidden(false);// Steel Skin + prayerWidgets.get(Prayer.values()[14].ordinal()).setHidden(false);// Ultimate Strength + prayerWidgets.get(Prayer.values()[15].ordinal()).setHidden(false);// Incredible Reflex + prayerWidgets.get(Prayer.values()[18].ordinal()).setHidden(false);// Protect from Melee + prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false);// Redemption + prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve + break; + case BANDOS_EXPENSIVE: + prayerWidget.setHidden(true); + prayerWidgets.get(Prayer.values()[18].ordinal()).setHidden(false);// Protect from Melee + prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false);// Redemption + prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve + prayerWidgets.get(Prayer.values()[26].ordinal()).setHidden(false);// Piety + break; + case BARROWS_CHEAP: + prayerWidget.setHidden(true); + prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic + prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false);// Protect from Range + prayerWidgets.get(Prayer.values()[18].ordinal()).setHidden(false);// Protect from Melee + prayerWidgets.get(Prayer.values()[19].ordinal()).setHidden(false);// eagle eye + prayerWidgets.get(Prayer.values()[20].ordinal()).setHidden(false);// mystic might + prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false);// Redemption + prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve + break; + case BARROWS_EXPENSIVE: + prayerWidget.setHidden(true); + prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic + prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false);// Protect from Range + prayerWidgets.get(Prayer.values()[18].ordinal()).setHidden(false);// Protect from Melee + prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false);// Redemption + prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve + prayerWidgets.get(Prayer.values()[27].ordinal()).setHidden(false);// Rigour + prayerWidgets.get(Prayer.values()[28].ordinal()).setHidden(false);// Augury + break; + case CERBERUS_CHEAP: + prayerWidget.setHidden(true); + prayerWidgets.get(Prayer.values()[13].ordinal()).setHidden(false);// Steel PVM + prayerWidgets.get(Prayer.values()[14].ordinal()).setHidden(false);// Ultimate Strength + prayerWidgets.get(Prayer.values()[15].ordinal()).setHidden(false);// Incredible Reflex + prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic + prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false);// Protect from Range + prayerWidgets.get(Prayer.values()[18].ordinal()).setHidden(false);// Protect from Melee + prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false);// Redemption + prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve + break; + case CERBERUS_CHEAP_RANGE: + prayerWidget.setHidden(true); + prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic + prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false);// Protect from Range + prayerWidgets.get(Prayer.values()[18].ordinal()).setHidden(false);// Protect from Melee + prayerWidgets.get(Prayer.values()[19].ordinal()).setHidden(false);// eagle eye + prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false);// Redemption + prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve + break; + case CERBERUS_EXPENSIVE: + prayerWidget.setHidden(true); + prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic + prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false);// Protect from Range + prayerWidgets.get(Prayer.values()[18].ordinal()).setHidden(false);// Protect from Melee + prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false);// Redemption + prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve + prayerWidgets.get(Prayer.values()[26].ordinal()).setHidden(false);// Piety + break; + case CERBERUS_EXPENSIVE_RANGE: + prayerWidget.setHidden(true); + prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic + prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false);// Protect from Range + prayerWidgets.get(Prayer.values()[18].ordinal()).setHidden(false);// Protect from Melee + prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false);// Redemption + prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve + prayerWidgets.get(Prayer.values()[27].ordinal()).setHidden(false);// Rigour + break; + case SARADOMIN_CHEAP: + prayerWidget.setHidden(true); + prayerWidgets.get(Prayer.values()[13].ordinal()).setHidden(false);// Steel Skin + prayerWidgets.get(Prayer.values()[14].ordinal()).setHidden(false);// Ultimate Strength + prayerWidgets.get(Prayer.values()[15].ordinal()).setHidden(false);// Incredible Reflex + prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from magic + prayerWidgets.get(Prayer.values()[19].ordinal()).setHidden(false);// eagle eye + prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false);// Redemption + prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve + break; + case SARADOMIN_EXPENSIVE: + prayerWidget.setHidden(true); + prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic + prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false);// Redemption + prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve + prayerWidgets.get(Prayer.values()[26].ordinal()).setHidden(false);// Piety + prayerWidgets.get(Prayer.values()[27].ordinal()).setHidden(false);// Rigour + break; + case VORKATH_CHEAP: + prayerWidget.setHidden(true); + prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic + prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false);// Protect from Range + prayerWidgets.get(Prayer.values()[19].ordinal()).setHidden(false);// eagle eye + prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false);// Redemption + prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve + break; + case VORKATH_EXPENSIVE: + prayerWidget.setHidden(true); + prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic + prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false);// Protect from Range + prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false);// Redemption + prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve + prayerWidgets.get(Prayer.values()[27].ordinal()).setHidden(false);// Rigour + break; + case ZAMORAK_CHEAP: + prayerWidget.setHidden(true); + prayerWidgets.get(Prayer.values()[13].ordinal()).setHidden(false);// Steel Skin + prayerWidgets.get(Prayer.values()[14].ordinal()).setHidden(false);// Ultimate Strength + prayerWidgets.get(Prayer.values()[15].ordinal()).setHidden(false);// Incredible Reflex + prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic + prayerWidgets.get(Prayer.values()[18].ordinal()).setHidden(false);// Protect from Melee + prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false);// Redemption + prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve + break; + case ZAMORAK_EXPENSIVE: + prayerWidget.setHidden(true); + prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic + prayerWidgets.get(Prayer.values()[18].ordinal()).setHidden(false);// Protect from Melee + prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false);// Redemption + prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve + prayerWidgets.get(Prayer.values()[26].ordinal()).setHidden(false);// Piety + break; + case ZULRAH_CHEAP: + prayerWidget.setHidden(true); + prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic + prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false);// Protect from Range + prayerWidgets.get(Prayer.values()[19].ordinal()).setHidden(false);// eagle eye + prayerWidgets.get(Prayer.values()[20].ordinal()).setHidden(false);// mystic might + prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false);// Redemption + prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve + break; + case ZULRAH_EXPENSIVE: + prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic + prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false);// Protect from Range + prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false);// Redemption + prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve + prayerWidgets.get(Prayer.values()[27].ordinal()).setHidden(false);// Rigour + prayerWidgets.get(Prayer.values()[28].ordinal()).setHidden(false);// Augury + break; } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/Cerberus.java b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/PVMPrayers.java similarity index 76% rename from runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/Cerberus.java rename to runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/PVMPrayers.java index 2bfecd2f1b..8fab96671c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/Cerberus.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/PVMPrayers.java @@ -31,18 +31,32 @@ import lombok.Getter; @Getter @AllArgsConstructor -public enum Cerberus +public enum PVMPrayers { DISABLED("Disabled"), + ARMADYL_CHEAP("Eagle eye"), + ARMADYL_EXPENSIVE("Rigour"), + BANDOS_CHEAP("Low LVL Melee"), + BANDOS_EXPENSIVE("Piety"), + BARROWS_CHEAP("Eagle/Mystic"), + BARROWS_EXPENSIVE("Augury/Rigour"), CERBERUS_CHEAP("Low LVL Melee"), CERBERUS_EXPENSIVE("Melee Piety"), CERBERUS_CHEAP_RANGE("Range Eagle Eye"), - CERBERUS_EXPENSIVE_RANGE("Range Rigour"); + CERBERUS_EXPENSIVE_RANGE("Range Rigour"), + SARADOMIN_CHEAP("Melee/Eagle"), + SARADOMIN_EXPENSIVE("Piety/Rigour"), + VORKATH_CHEAP("Eagle Eye"), + VORKATH_EXPENSIVE("Rigour"), + ZAMORAK_CHEAP("Low LVL Melee"), + ZAMORAK_EXPENSIVE("Piety"), + ZULRAH_CHEAP("Eagle/Mystic"), + ZULRAH_EXPENSIVE("Augury/Rigour"); private String name; @Override - public String toString() + public String toString() { return getName(); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/Saradomin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/Saradomin.java deleted file mode 100644 index 7c5fbf9fac..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/Saradomin.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2018, Lotto - * Copyright (c) 2018, Raqes - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.client.plugins.hideprayers.PVM; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -@Getter -@AllArgsConstructor -public enum Saradomin -{ - DISABLED("Disabled"), - SARDOMIN_CHEAP("Melee/Eagle"), - SARADOMIN_EXPENSIVE("Piety/Rigour"); - - private String name; - - @Override - public String toString() - { - return getName(); - } -} \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/Vorkath.java b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/Vorkath.java deleted file mode 100644 index a8754e908a..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/Vorkath.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2018, Lotto - * Copyright (c) 2018, Raqes - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.client.plugins.hideprayers.PVM; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -@Getter -@AllArgsConstructor -public enum Vorkath -{ - DISABLED("Disabled"), - VORKATH_CHEAP("Eagle Eye"), - VORKATH_EXPENSIVE("Rigour"); - - private String name; - - @Override - public String toString() - { - return getName(); - } -} \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/Zamorak.java b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/Zamorak.java deleted file mode 100644 index a3e859b390..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/Zamorak.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2018, Lotto - * Copyright (c) 2018, Raqes - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.client.plugins.hideprayers.PVM; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -@Getter -@AllArgsConstructor -public enum Zamorak -{ - DISABLED("Disabled"), - ZAMORAK_CHEAP("Low LVL Melee"), - ZAMORAK_EXPENSIVE("Piety"); - - private String name; - - @Override - public String toString() - { - return getName(); - } -} \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/Zulrah.java b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/Zulrah.java deleted file mode 100644 index 7f139000e0..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/Zulrah.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2018, Lotto - * Copyright (c) 2018, Raqes - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.client.plugins.hideprayers.PVM; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -@Getter -@AllArgsConstructor -public enum Zulrah -{ - DISABLED("Disabled"), - ZULRAH_CHEAP("Eagle/Mystic"), - ZULRAH_EXPENSIVE("Augury/Rigour"); - - private String name; - - @Override - public String toString() - { - return getName(); - } -} \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVP/HidePrayersPVPConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVP/HidePrayersPVPConfig.java index 30e482d489..61c47d33b4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVP/HidePrayersPVPConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVP/HidePrayersPVPConfig.java @@ -35,14 +35,26 @@ import net.runelite.client.config.ConfigItem; public interface HidePrayersPVPConfig extends Config { @ConfigItem - ( - position = 0, - keyName = "CombatPrayers", - name = "Combat Prayers", - description = "Shows prayers based on prayer build" - ) + ( + position = 0, + keyName = "CombatPrayers", + name = "Combat Prayers", + description = "Shows prayers based on prayer build" + ) default CombatPrayers CombatPrayers() { return CombatPrayers.DISABLED; } + + @ConfigItem + ( + position = 1, + keyName = "HideRapidHealRestore", + name = "Hide Rapid Heal and Rapid Restore", + description = "Hides the Rapid Heal and Rapid Restore prayers" + ) + default boolean HideRapidHealRestore() + { + return false; + } } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVP/HidePrayersPVPPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVP/HidePrayersPVPPlugin.java index 0fc21ec4a8..05d75d5b3a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVP/HidePrayersPVPPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVP/HidePrayersPVPPlugin.java @@ -29,15 +29,7 @@ package net.runelite.client.plugins.hideprayers.PVP; import com.google.common.collect.ImmutableList; import com.google.inject.Provides; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; -import javax.inject.Inject; -import net.runelite.api.Client; -import net.runelite.api.GameState; -import net.runelite.api.HashTable; -import net.runelite.api.Prayer; -import net.runelite.api.WidgetNode; +import net.runelite.api.*; import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.WidgetLoaded; @@ -51,6 +43,11 @@ import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginType; import net.runelite.client.plugins.hideprayers.util.PrayerTabStates; +import javax.inject.Inject; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + @PluginDescriptor ( name = "Show/Hide PVP Prayers", @@ -219,215 +216,176 @@ public class HidePrayersPVPPlugin extends Plugin Prayer prayer = Prayer.values()[index]; Widget prayerWidget = prayerWidgets.get(prayer.ordinal()); - if (config.CombatPrayers() == CombatPrayers.DISABLED) + if (config.HideRapidHealRestore()) { - prayerWidget.setHidden(false); + prayerWidgets.get(Prayer.values()[8].ordinal()).setHidden(true); // Rapid Restore + prayerWidgets.get(Prayer.values()[9].ordinal()).setHidden(true); // Rapid Heal } - - if (config.CombatPrayers() == CombatPrayers.PRAY1) + else { - prayerWidget.setHidden(true); - prayerWidgets.get(Prayer.values()[0].ordinal()).setHidden(false); // Thick Skin - } - - if (config.CombatPrayers() == CombatPrayers.PRAY13) - { - prayerWidget.setHidden(true); - prayerWidgets.get(Prayer.values()[0].ordinal()).setHidden(false); // Thick Skin - prayerWidgets.get(Prayer.values()[3].ordinal()).setHidden(false); // Sharp Eye - prayerWidgets.get(Prayer.values()[4].ordinal()).setHidden(false); // Mystic Will - prayerWidgets.get(Prayer.values()[5].ordinal()).setHidden(false); // Rock Skin - prayerWidgets.get(Prayer.values()[6].ordinal()).setHidden(false); // Super Human Strength - } - - if (config.CombatPrayers() == CombatPrayers.PRAY16) - { - prayerWidget.setHidden(true); - prayerWidgets.get(Prayer.values()[3].ordinal()).setHidden(false); // Sharp Eye - prayerWidgets.get(Prayer.values()[4].ordinal()).setHidden(false); // Mystic Will - prayerWidgets.get(Prayer.values()[5].ordinal()).setHidden(false); // Rock Skin - prayerWidgets.get(Prayer.values()[6].ordinal()).setHidden(false); // Super Human Strength - prayerWidgets.get(Prayer.values()[7].ordinal()).setHidden(false); // Improved Reflexed - } - - - if (config.CombatPrayers() == CombatPrayers.PRAY25) - { - prayerWidget.setHidden(true); - prayerWidgets.get(Prayer.values()[3].ordinal()).setHidden(false); // Sharp Eye - prayerWidgets.get(Prayer.values()[4].ordinal()).setHidden(false); // Mystic Will - prayerWidgets.get(Prayer.values()[5].ordinal()).setHidden(false); // Rock Skin - prayerWidgets.get(Prayer.values()[6].ordinal()).setHidden(false); // Super Human Strength - prayerWidgets.get(Prayer.values()[7].ordinal()).setHidden(false); // Improved Reflexed prayerWidgets.get(Prayer.values()[8].ordinal()).setHidden(false); // Rapid Restore prayerWidgets.get(Prayer.values()[9].ordinal()).setHidden(false); // Rapid Heal - prayerWidgets.get(Prayer.values()[10].ordinal()).setHidden(false); // Protect Item } - - if (config.CombatPrayers() == CombatPrayers.PRAY31) + switch (config.CombatPrayers()) { - prayerWidget.setHidden(true); - prayerWidgets.get(Prayer.values()[7].ordinal()).setHidden(false); // Improved Reflexed - prayerWidgets.get(Prayer.values()[8].ordinal()).setHidden(false); // Rapid Restore - prayerWidgets.get(Prayer.values()[9].ordinal()).setHidden(false); // Rapid Heal - prayerWidgets.get(Prayer.values()[10].ordinal()).setHidden(false); // Protect Item - prayerWidgets.get(Prayer.values()[11].ordinal()).setHidden(false); // Hawk Eye - prayerWidgets.get(Prayer.values()[12].ordinal()).setHidden(false); // Mystic Lore - prayerWidgets.get(Prayer.values()[13].ordinal()).setHidden(false); // Steel Skin - prayerWidgets.get(Prayer.values()[14].ordinal()).setHidden(false); // Ultimate Strength - } - - if (config.CombatPrayers() == CombatPrayers.PRAY43) - { - prayerWidget.setHidden(true); - prayerWidgets.get(Prayer.values()[8].ordinal()).setHidden(false); // Rapid Restore - prayerWidgets.get(Prayer.values()[9].ordinal()).setHidden(false); // Rapid Heal - prayerWidgets.get(Prayer.values()[10].ordinal()).setHidden(false); // Protect Item - prayerWidgets.get(Prayer.values()[11].ordinal()).setHidden(false); // Hawk Eye - prayerWidgets.get(Prayer.values()[12].ordinal()).setHidden(false); // Mystic Lore - prayerWidgets.get(Prayer.values()[13].ordinal()).setHidden(false); // Steel Skin - prayerWidgets.get(Prayer.values()[14].ordinal()).setHidden(false); // Ultimate Strength - prayerWidgets.get(Prayer.values()[15].ordinal()).setHidden(false); // Incredible Reflexes - prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false); // Protect from Magic - prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false); // Protect from Range - prayerWidgets.get(Prayer.values()[18].ordinal()).setHidden(false); // Protect from Melee - } - - if (config.CombatPrayers() == CombatPrayers.PRAY44) - { - prayerWidget.setHidden(true); - prayerWidgets.get(Prayer.values()[8].ordinal()).setHidden(false); // Rapid Restore - prayerWidgets.get(Prayer.values()[9].ordinal()).setHidden(false); // Rapid Heal - prayerWidgets.get(Prayer.values()[10].ordinal()).setHidden(false); // Protect Item - prayerWidgets.get(Prayer.values()[12].ordinal()).setHidden(false); // Mystic Lore - prayerWidgets.get(Prayer.values()[13].ordinal()).setHidden(false); // Steel Skin - prayerWidgets.get(Prayer.values()[14].ordinal()).setHidden(false); // Ultimate Strength - prayerWidgets.get(Prayer.values()[15].ordinal()).setHidden(false); // Incredible Reflexes - prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false); // Protect from Magic - prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false); // Protect from Range - prayerWidgets.get(Prayer.values()[18].ordinal()).setHidden(false); // Protect from Melee - prayerWidgets.get(Prayer.values()[19].ordinal()).setHidden(false); // Eagle Eye - } - - if (config.CombatPrayers() == CombatPrayers.PRAY45) - { - prayerWidget.setHidden(true); - prayerWidgets.get(Prayer.values()[8].ordinal()).setHidden(false); // Rapid Restore - prayerWidgets.get(Prayer.values()[9].ordinal()).setHidden(false); // Rapid Heal - prayerWidgets.get(Prayer.values()[10].ordinal()).setHidden(false); // Protect Item - prayerWidgets.get(Prayer.values()[13].ordinal()).setHidden(false); // Steel Skin - prayerWidgets.get(Prayer.values()[14].ordinal()).setHidden(false); // Ultimate Strength - prayerWidgets.get(Prayer.values()[15].ordinal()).setHidden(false); // Incredible Reflexes - prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false); // Protect from Magic - prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false); // Protect from Range - prayerWidgets.get(Prayer.values()[18].ordinal()).setHidden(false); // Protect from Melee - prayerWidgets.get(Prayer.values()[19].ordinal()).setHidden(false); // Eagle Eye - prayerWidgets.get(Prayer.values()[20].ordinal()).setHidden(false); // Mystic Might - } - - if (config.CombatPrayers() == CombatPrayers.PRAY52) - { - prayerWidget.setHidden(true); - prayerWidgets.get(Prayer.values()[8].ordinal()).setHidden(false); // Rapid Restore - prayerWidgets.get(Prayer.values()[9].ordinal()).setHidden(false); // Rapid Heal - prayerWidgets.get(Prayer.values()[10].ordinal()).setHidden(false); // Protect Item - prayerWidgets.get(Prayer.values()[13].ordinal()).setHidden(false); // Steel Skin - prayerWidgets.get(Prayer.values()[14].ordinal()).setHidden(false); // Ultimate Strength - prayerWidgets.get(Prayer.values()[15].ordinal()).setHidden(false); // Incredible Reflexes - prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false); // Protect from Magic - prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false); // Protect from Range - prayerWidgets.get(Prayer.values()[18].ordinal()).setHidden(false); // Protect from Melee - prayerWidgets.get(Prayer.values()[19].ordinal()).setHidden(false); // Eagle Eye - prayerWidgets.get(Prayer.values()[20].ordinal()).setHidden(false); // Mystic Might - prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false); // Redemption - prayerWidgets.get(Prayer.values()[23].ordinal()).setHidden(false); // Smite - } - - if (config.CombatPrayers() == CombatPrayers.PRAY55) - { - prayerWidget.setHidden(true); - prayerWidgets.get(Prayer.values()[8].ordinal()).setHidden(false); // Rapid Restore - prayerWidgets.get(Prayer.values()[9].ordinal()).setHidden(false); // Rapid Heal - prayerWidgets.get(Prayer.values()[10].ordinal()).setHidden(false); // Protect Item - prayerWidgets.get(Prayer.values()[13].ordinal()).setHidden(false); // Steel Skin - prayerWidgets.get(Prayer.values()[14].ordinal()).setHidden(false); // Ultimate Strength - prayerWidgets.get(Prayer.values()[15].ordinal()).setHidden(false); // Incredible Reflexes - prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false); // Protect from Magic - prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false); // Protect from Range - prayerWidgets.get(Prayer.values()[18].ordinal()).setHidden(false); // Protect from Melee - prayerWidgets.get(Prayer.values()[19].ordinal()).setHidden(false); // Eagle Eye - prayerWidgets.get(Prayer.values()[20].ordinal()).setHidden(false); // Mystic Might - prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false); // Redemption - prayerWidgets.get(Prayer.values()[23].ordinal()).setHidden(false); // Smite - prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false); // Preserve - } - - if (config.CombatPrayers() == CombatPrayers.PRAY60) - { - prayerWidget.setHidden(true); - prayerWidgets.get(Prayer.values()[8].ordinal()).setHidden(false); // Rapid Restore - prayerWidgets.get(Prayer.values()[9].ordinal()).setHidden(false); // Rapid Heal - prayerWidgets.get(Prayer.values()[10].ordinal()).setHidden(false); // Protect Item - prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false); // Protect from Magic - prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false); // Protect from Range - prayerWidgets.get(Prayer.values()[18].ordinal()).setHidden(false); // Protect from Melee - prayerWidgets.get(Prayer.values()[19].ordinal()).setHidden(false); // Eagle Eye - prayerWidgets.get(Prayer.values()[20].ordinal()).setHidden(false); // Mystic Might - prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false); // Redemption - prayerWidgets.get(Prayer.values()[23].ordinal()).setHidden(false); // Smite - prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false); // Preserve - prayerWidgets.get(Prayer.values()[25].ordinal()).setHidden(false); // Chivalry - } - - if (config.CombatPrayers() == CombatPrayers.PRAY70) - { - prayerWidget.setHidden(true); - prayerWidgets.get(Prayer.values()[8].ordinal()).setHidden(false); // Rapid Restore - prayerWidgets.get(Prayer.values()[9].ordinal()).setHidden(false); // Rapid Heal - prayerWidgets.get(Prayer.values()[10].ordinal()).setHidden(false); // Protect Item - prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false); // Protect from Magic - prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false); // Protect from Range - prayerWidgets.get(Prayer.values()[18].ordinal()).setHidden(false); // Protect from Melee - prayerWidgets.get(Prayer.values()[19].ordinal()).setHidden(false); // Eagle Eye - prayerWidgets.get(Prayer.values()[20].ordinal()).setHidden(false); // Mystic Might - prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false); // Redemption - prayerWidgets.get(Prayer.values()[23].ordinal()).setHidden(false); // Smite - prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false); // Preserve - prayerWidgets.get(Prayer.values()[26].ordinal()).setHidden(false); // Piety - } - - if (config.CombatPrayers() == CombatPrayers.PRAY74) - { - prayerWidget.setHidden(true); - prayerWidgets.get(Prayer.values()[8].ordinal()).setHidden(false); // Rapid Restore - prayerWidgets.get(Prayer.values()[9].ordinal()).setHidden(false); // Rapid Heal - prayerWidgets.get(Prayer.values()[10].ordinal()).setHidden(false); // Protect Item - prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false); // Protect from Magic - prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false); // Protect from Range - prayerWidgets.get(Prayer.values()[18].ordinal()).setHidden(false); // Protect from Melee - prayerWidgets.get(Prayer.values()[20].ordinal()).setHidden(false); // Mystic Might - prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false); // Redemption - prayerWidgets.get(Prayer.values()[23].ordinal()).setHidden(false); // Smite - prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false); // Preserve - prayerWidgets.get(Prayer.values()[26].ordinal()).setHidden(false); // Piety - prayerWidgets.get(Prayer.values()[27].ordinal()).setHidden(false); // Rigour - } - - if (config.CombatPrayers() == CombatPrayers.PRAY77) - { - prayerWidget.setHidden(true); - prayerWidgets.get(Prayer.values()[8].ordinal()).setHidden(false); // Rapid Restore - prayerWidgets.get(Prayer.values()[9].ordinal()).setHidden(false); // Rapid Heal - prayerWidgets.get(Prayer.values()[10].ordinal()).setHidden(false); // Protect Item - prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false); // Protect from Magic - prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false); // Protect from Range - prayerWidgets.get(Prayer.values()[18].ordinal()).setHidden(false); // Protect from Melee - prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false); // Redemption - prayerWidgets.get(Prayer.values()[23].ordinal()).setHidden(false); // Smite - prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false); // Preserve - prayerWidgets.get(Prayer.values()[26].ordinal()).setHidden(false); // Piety - prayerWidgets.get(Prayer.values()[27].ordinal()).setHidden(false); // Rigour - prayerWidgets.get(Prayer.values()[28].ordinal()).setHidden(false); // Augury + case DISABLED: + prayerWidget.setHidden(false); + break; + case PRAY1: + prayerWidget.setHidden(true); + prayerWidgets.get(Prayer.values()[0].ordinal()).setHidden(false); // Thick Skin + break; + case PRAY13: + prayerWidget.setHidden(true); + prayerWidgets.get(Prayer.values()[0].ordinal()).setHidden(false); // Thick Skin + prayerWidgets.get(Prayer.values()[3].ordinal()).setHidden(false); // Sharp Eye + prayerWidgets.get(Prayer.values()[4].ordinal()).setHidden(false); // Mystic Will + prayerWidgets.get(Prayer.values()[5].ordinal()).setHidden(false); // Rock Skin + prayerWidgets.get(Prayer.values()[6].ordinal()).setHidden(false); // Super Human Strength + break; + case PRAY16: + prayerWidget.setHidden(true); + prayerWidgets.get(Prayer.values()[3].ordinal()).setHidden(false); // Sharp Eye + prayerWidgets.get(Prayer.values()[4].ordinal()).setHidden(false); // Mystic Will + prayerWidgets.get(Prayer.values()[5].ordinal()).setHidden(false); // Rock Skin + prayerWidgets.get(Prayer.values()[6].ordinal()).setHidden(false); // Super Human Strength + prayerWidgets.get(Prayer.values()[7].ordinal()).setHidden(false); // Improved Reflexed + break; + case PRAY25: + prayerWidget.setHidden(true); + prayerWidgets.get(Prayer.values()[3].ordinal()).setHidden(false); // Sharp Eye + prayerWidgets.get(Prayer.values()[4].ordinal()).setHidden(false); // Mystic Will + prayerWidgets.get(Prayer.values()[5].ordinal()).setHidden(false); // Rock Skin + prayerWidgets.get(Prayer.values()[6].ordinal()).setHidden(false); // Super Human Strength + prayerWidgets.get(Prayer.values()[7].ordinal()).setHidden(false); // Improved Reflexed + prayerWidgets.get(Prayer.values()[10].ordinal()).setHidden(false); // Protect Item + break; + case PRAY31: + prayerWidget.setHidden(true); + prayerWidgets.get(Prayer.values()[7].ordinal()).setHidden(false); // Improved Reflexed + prayerWidgets.get(Prayer.values()[10].ordinal()).setHidden(false); // Protect Item + prayerWidgets.get(Prayer.values()[11].ordinal()).setHidden(false); // Hawk Eye + prayerWidgets.get(Prayer.values()[12].ordinal()).setHidden(false); // Mystic Lore + prayerWidgets.get(Prayer.values()[13].ordinal()).setHidden(false); // Steel Skin + prayerWidgets.get(Prayer.values()[14].ordinal()).setHidden(false); // Ultimate Strength + break; + case PRAY43: + prayerWidget.setHidden(true); + prayerWidgets.get(Prayer.values()[10].ordinal()).setHidden(false); // Protect Item + prayerWidgets.get(Prayer.values()[11].ordinal()).setHidden(false); // Hawk Eye + prayerWidgets.get(Prayer.values()[12].ordinal()).setHidden(false); // Mystic Lore + prayerWidgets.get(Prayer.values()[13].ordinal()).setHidden(false); // Steel Skin + prayerWidgets.get(Prayer.values()[14].ordinal()).setHidden(false); // Ultimate Strength + prayerWidgets.get(Prayer.values()[15].ordinal()).setHidden(false); // Incredible Reflexes + prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false); // Protect from Magic + prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false); // Protect from Range + prayerWidgets.get(Prayer.values()[18].ordinal()).setHidden(false); // Protect from Melee + break; + case PRAY44: + prayerWidget.setHidden(true); + prayerWidgets.get(Prayer.values()[10].ordinal()).setHidden(false); // Protect Item + prayerWidgets.get(Prayer.values()[12].ordinal()).setHidden(false); // Mystic Lore + prayerWidgets.get(Prayer.values()[13].ordinal()).setHidden(false); // Steel Skin + prayerWidgets.get(Prayer.values()[14].ordinal()).setHidden(false); // Ultimate Strength + prayerWidgets.get(Prayer.values()[15].ordinal()).setHidden(false); // Incredible Reflexes + prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false); // Protect from Magic + prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false); // Protect from Range + prayerWidgets.get(Prayer.values()[18].ordinal()).setHidden(false); // Protect from Melee + prayerWidgets.get(Prayer.values()[19].ordinal()).setHidden(false); // Eagle Eye + break; + case PRAY45: + prayerWidget.setHidden(true); + prayerWidgets.get(Prayer.values()[10].ordinal()).setHidden(false); // Protect Item + prayerWidgets.get(Prayer.values()[13].ordinal()).setHidden(false); // Steel Skin + prayerWidgets.get(Prayer.values()[14].ordinal()).setHidden(false); // Ultimate Strength + prayerWidgets.get(Prayer.values()[15].ordinal()).setHidden(false); // Incredible Reflexes + prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false); // Protect from Magic + prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false); // Protect from Range + prayerWidgets.get(Prayer.values()[18].ordinal()).setHidden(false); // Protect from Melee + prayerWidgets.get(Prayer.values()[19].ordinal()).setHidden(false); // Eagle Eye + prayerWidgets.get(Prayer.values()[20].ordinal()).setHidden(false); // Mystic Might + break; + case PRAY52: + prayerWidget.setHidden(true); + prayerWidgets.get(Prayer.values()[10].ordinal()).setHidden(false); // Protect Item + prayerWidgets.get(Prayer.values()[13].ordinal()).setHidden(false); // Steel Skin + prayerWidgets.get(Prayer.values()[14].ordinal()).setHidden(false); // Ultimate Strength + prayerWidgets.get(Prayer.values()[15].ordinal()).setHidden(false); // Incredible Reflexes + prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false); // Protect from Magic + prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false); // Protect from Range + prayerWidgets.get(Prayer.values()[18].ordinal()).setHidden(false); // Protect from Melee + prayerWidgets.get(Prayer.values()[19].ordinal()).setHidden(false); // Eagle Eye + prayerWidgets.get(Prayer.values()[20].ordinal()).setHidden(false); // Mystic Might + prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false); // Redemption + prayerWidgets.get(Prayer.values()[23].ordinal()).setHidden(false); // Smite + break; + case PRAY55: + prayerWidget.setHidden(true); + prayerWidgets.get(Prayer.values()[10].ordinal()).setHidden(false); // Protect Item + prayerWidgets.get(Prayer.values()[13].ordinal()).setHidden(false); // Steel Skin + prayerWidgets.get(Prayer.values()[14].ordinal()).setHidden(false); // Ultimate Strength + prayerWidgets.get(Prayer.values()[15].ordinal()).setHidden(false); // Incredible Reflexes + prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false); // Protect from Magic + prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false); // Protect from Range + prayerWidgets.get(Prayer.values()[18].ordinal()).setHidden(false); // Protect from Melee + prayerWidgets.get(Prayer.values()[19].ordinal()).setHidden(false); // Eagle Eye + prayerWidgets.get(Prayer.values()[20].ordinal()).setHidden(false); // Mystic Might + prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false); // Redemption + prayerWidgets.get(Prayer.values()[23].ordinal()).setHidden(false); // Smite + prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false); // Preserve + break; + case PRAY60: + prayerWidget.setHidden(true); + prayerWidgets.get(Prayer.values()[10].ordinal()).setHidden(false); // Protect Item + prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false); // Protect from Magic + prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false); // Protect from Range + prayerWidgets.get(Prayer.values()[18].ordinal()).setHidden(false); // Protect from Melee + prayerWidgets.get(Prayer.values()[19].ordinal()).setHidden(false); // Eagle Eye + prayerWidgets.get(Prayer.values()[20].ordinal()).setHidden(false); // Mystic Might + prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false); // Redemption + prayerWidgets.get(Prayer.values()[23].ordinal()).setHidden(false); // Smite + prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false); // Preserve + prayerWidgets.get(Prayer.values()[25].ordinal()).setHidden(false); // Chivalry + break; + case PRAY70: + prayerWidget.setHidden(true); + prayerWidgets.get(Prayer.values()[10].ordinal()).setHidden(false); // Protect Item + prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false); // Protect from Magic + prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false); // Protect from Range + prayerWidgets.get(Prayer.values()[18].ordinal()).setHidden(false); // Protect from Melee + prayerWidgets.get(Prayer.values()[19].ordinal()).setHidden(false); // Eagle Eye + prayerWidgets.get(Prayer.values()[20].ordinal()).setHidden(false); // Mystic Might + prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false); // Redemption + prayerWidgets.get(Prayer.values()[23].ordinal()).setHidden(false); // Smite + prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false); // Preserve + prayerWidgets.get(Prayer.values()[26].ordinal()).setHidden(false); // Piety + break; + case PRAY74: + prayerWidget.setHidden(true); + prayerWidgets.get(Prayer.values()[10].ordinal()).setHidden(false); // Protect Item + prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false); // Protect from Magic + prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false); // Protect from Range + prayerWidgets.get(Prayer.values()[18].ordinal()).setHidden(false); // Protect from Melee + prayerWidgets.get(Prayer.values()[20].ordinal()).setHidden(false); // Mystic Might + prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false); // Redemption + prayerWidgets.get(Prayer.values()[23].ordinal()).setHidden(false); // Smite + prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false); // Preserve + prayerWidgets.get(Prayer.values()[26].ordinal()).setHidden(false); // Piety + prayerWidgets.get(Prayer.values()[27].ordinal()).setHidden(false); // Rigour + break; + case PRAY77: + prayerWidget.setHidden(true); + prayerWidgets.get(Prayer.values()[10].ordinal()).setHidden(false); // Protect Item + prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false); // Protect from Magic + prayerWidgets.get(Prayer.values()[17].ordinal()).setHidden(false); // Protect from Range + prayerWidgets.get(Prayer.values()[18].ordinal()).setHidden(false); // Protect from Melee + prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false); // Redemption + prayerWidgets.get(Prayer.values()[23].ordinal()).setHidden(false); // Smite + prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false); // Preserve + prayerWidgets.get(Prayer.values()[26].ordinal()).setHidden(false); // Piety + prayerWidgets.get(Prayer.values()[27].ordinal()).setHidden(false); // Rigour + prayerWidgets.get(Prayer.values()[28].ordinal()).setHidden(false); // Augury + break; } } }