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 new file mode 100644 index 0000000000..fabdb13e33 --- /dev/null +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/Armadyl.java @@ -0,0 +1,47 @@ +/* + * 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 new file mode 100644 index 0000000000..ef688cd8ed --- /dev/null +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/Bandos.java @@ -0,0 +1,47 @@ +/* + * 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 new file mode 100644 index 0000000000..e09c13d607 --- /dev/null +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/Barrows.java @@ -0,0 +1,47 @@ +/* + * 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/Cerberus.java b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/Cerberus.java new file mode 100644 index 0000000000..2bfecd2f1b --- /dev/null +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/Cerberus.java @@ -0,0 +1,49 @@ +/* + * 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 Cerberus +{ + DISABLED("Disabled"), + CERBERUS_CHEAP("Low LVL Melee"), + CERBERUS_EXPENSIVE("Melee Piety"), + CERBERUS_CHEAP_RANGE("Range Eagle Eye"), + CERBERUS_EXPENSIVE_RANGE("Range 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 1bc597966c..b4fac7e63f 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 @@ -37,162 +37,72 @@ public interface HidePrayersPVMConfig extends Config @ConfigItem ( position = 0, - keyName = "barrowscheap", - name = "Barrows Eagle Eye/Mystic Might", + keyName = "Barrows", + name = "Barrows", description = "Shows prayers for Barrows" ) - default boolean showBarrowsCheap() {return false;} + default Barrows Barrows() {return Barrows.DISABLED;} @ConfigItem ( position = 1, - keyName = "barrowsexpensive", - name = "Barrows Augury/Rigour", - description = "Shows prayers for Barrows" + keyName = "Cerberus", + name = "Cerberus", + description = "Shows prayers for Cerberus" ) - default boolean showBarrowsExpensive() {return false;} + default Cerberus Cerberus() {return Cerberus.DISABLED;} @ConfigItem ( position = 2, - keyName = "zulrahcheap", - name = "Zulrah Eagle Eye/Mystic Might", - description = "Show prayers for Zulrah" + keyName = "Vorkath", + name = "Vorkath", + description = "Shows prayers for Vorkath" ) - default boolean showZulrahCheap() {return false;} + default Vorkath Vorkath() {return Vorkath.DISABLED;} @ConfigItem ( position = 3, - keyName = "zulrahexpensive", - name = "Zulrah Augury/Rigour", + keyName = "Zulrah", + name = "Zulrah", description = "Shows prayers for Zulrah" ) - default boolean showZulrahExpensive() {return false;} + default Zulrah Zulrah() {return Zulrah.DISABLED;} @ConfigItem ( position = 4, - keyName = "vorkathcheap", - name = "Vorkath Eagle Eye", - description = "Shows prayers for Vorkath" + keyName = "Armadyl", + name = "Armadyl", + description = "Shows prayers for Armadyl" ) - default boolean showVorkathCheap() {return false;} + default Armadyl Armadyl() {return Armadyl.DISABLED;} @ConfigItem ( position = 5, - keyName = "vorkathexpensive", - name = "Vorkath Rigour", - description = "Shows prayers for Vorkath" + keyName = "Bandos", + name = "Bandos", + description = "Shows prayers for Bandos" ) - default boolean showVorkathExpensive() {return false;} + default Bandos Bandos() {return Bandos.DISABLED;} @ConfigItem ( position = 6, - keyName = "cerberuscheap", - name = "Cerberus Strength/Skin/Reflexes", - description = "Shows prayers for Cerberus" + keyName = "Saradomin", + name = "Saradomin", + description = "Shows prayers for Saradomin" ) - default boolean showCerberusCheap() {return false;} + default Saradomin Saradomin() {return Saradomin.DISABLED;} @ConfigItem ( position = 7, - keyName = "cerberusexpensive", - name = "Cerberus Piety", - description = "Shows prayers for Cerberus" + keyName = "Zamorak", + name = "Zamorak", + description = "Shows prayers for Zamorak" ) - default boolean showCerberusExpensive() {return false;} - - @ConfigItem - ( - position = 8, - keyName = "cerberusrangeexpensive", - name = "Cerberus Eagle Eye", - description = "Shows prayers for Cerberus" - ) - default boolean showCerberusRangeCheap() {return false;} - - @ConfigItem - ( - position = 9, - keyName = "cerberuserangexpensive", - name = "Cerberus Rigour", - description = "Shows prayers for Cerberus" - ) - default boolean showCerberusRangeExpensive() {return false;} - - @ConfigItem - ( - position = 10, - keyName = "armadylcheap", - name = "Armadyl Eagle eye", - description = "Shows prayers for Armadyl GWD" - ) - default boolean showArmadylCheap() {return false;} - - @ConfigItem - ( - position = 11, - keyName = "armadylexpensive", - name = "Armadyl Rigour", - description = "Shows prayers for Armadyl GWD" - ) - default boolean showArmadylExpensive() {return false;} - - @ConfigItem - ( - position = 12, - keyName = "bandoscheap", - name = "Bandos Strength/Skin/Reflexes", - description = "Shows prayers for Bandos GWD" - ) - default boolean showBandosCheap() {return false;} - - @ConfigItem - ( - position = 13, - keyName = "bandosexpensive", - name = "Bandos Piety", - description = "Shows prayers for Bandos GWD" - ) - default boolean showBandosExpensive() {return false;} - - @ConfigItem - ( - position = 14, - keyName = "sardomincheap", - name = "Saradomin Eagle eye/Steel Skin", - description = "Shows prayers for Saradomin GWD" - ) - default boolean showSaradominCheap() {return false;} - - @ConfigItem - ( - position = 15, - keyName = "saradominexpensive", - name = "Saradomin Piety/Rigour", - description = "Shows prayers for Saradomin GWD" - ) - default boolean showSaradominExpensive() {return false;} - - @ConfigItem - ( - position = 16, - keyName = "zamorakcheap", - name = "Zamorak Strength/Skin/Reflexes", - description = "Shows prayers for Zamorak GWD" - ) - default boolean showZamorakCheap() {return false;} - - @ConfigItem - ( - position = 17, - keyName = "zamorakexpensive", - name = "Zamorak Piety", - description = "Shows prayers for Zamorak GWD" - ) - default boolean showZamorakExpensive() {return false;} -} + default Zamorak Zamorak() {return Zamorak.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 a07358958d..a65383e5b5 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 @@ -200,28 +200,18 @@ public class HidePrayersPVMPlugin extends Plugin Prayer prayer = Prayer.values()[index]; Widget prayerWidget = prayerWidgets.get(prayer.ordinal()); - if (!config.showZulrahCheap() - && !config.showZulrahExpensive() - && !config.showBarrowsCheap() - && !config.showBarrowsExpensive() - && !config.showVorkathCheap() - && !config.showVorkathExpensive() - && !config.showCerberusCheap() - && !config.showCerberusExpensive() - && !config.showCerberusRangeCheap() - && !config.showCerberusRangeExpensive() - && !config.showArmadylCheap() - && !config.showArmadylExpensive() - && !config.showBandosCheap() - && !config.showBandosExpensive() - && !config.showSaradominCheap() - && !config.showSaradominExpensive() - && !config.showZamorakCheap() - && !config.showZamorakExpensive() + 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 ) prayerWidget.setHidden(false); - if (config.showZulrahCheap()) + if (config.Zulrah() == Zulrah.ZULRAH_CHEAP) { prayerWidget.setHidden(true); prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic @@ -232,7 +222,7 @@ public class HidePrayersPVMPlugin extends Plugin prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve } - if (config.showZulrahExpensive()) + if (config.Zulrah() == Zulrah.ZULRAH_EXPENSIVE) { prayerWidget.setHidden(true); prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic @@ -243,7 +233,7 @@ public class HidePrayersPVMPlugin extends Plugin prayerWidgets.get(Prayer.values()[28].ordinal()).setHidden(false);// Augury } - if (config.showBarrowsCheap()) + if (config.Barrows() == Barrows.BARROWS_CHEAP) { prayerWidget.setHidden(true); prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic @@ -255,7 +245,7 @@ public class HidePrayersPVMPlugin extends Plugin prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve } - if (config.showBarrowsExpensive()) + if (config.Barrows() == Barrows.BARROWS_EXPENSIVE) { prayerWidget.setHidden(true); prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic @@ -267,7 +257,7 @@ public class HidePrayersPVMPlugin extends Plugin prayerWidgets.get(Prayer.values()[28].ordinal()).setHidden(false);// Augury } - if (config.showVorkathCheap()) + if (config.Vorkath() == Vorkath.VORKATH_CHEAP) { prayerWidget.setHidden(true); prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic @@ -277,7 +267,7 @@ public class HidePrayersPVMPlugin extends Plugin prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve } - if (config.showVorkathExpensive()) + if (config.Vorkath() == Vorkath.VORKATH_EXPENSIVE) { prayerWidget.setHidden(true); prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic @@ -287,10 +277,10 @@ public class HidePrayersPVMPlugin extends Plugin prayerWidgets.get(Prayer.values()[27].ordinal()).setHidden(false);// Rigour } - if (config.showCerberusCheap()) + if (config.Cerberus() == Cerberus.CERBERUS_CHEAP) { prayerWidget.setHidden(true); - prayerWidgets.get(Prayer.values()[13].ordinal()).setHidden(false);// Steel Skin + 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 @@ -300,7 +290,7 @@ public class HidePrayersPVMPlugin extends Plugin prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve } - if (config.showCerberusExpensive()) + if (config.Cerberus() == Cerberus.CERBERUS_EXPENSIVE) { prayerWidget.setHidden(true); prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic @@ -311,7 +301,7 @@ public class HidePrayersPVMPlugin extends Plugin prayerWidgets.get(Prayer.values()[26].ordinal()).setHidden(false);// Piety } - if (config.showCerberusRangeCheap()) + if (config.Cerberus() == Cerberus.CERBERUS_CHEAP_RANGE) { prayerWidget.setHidden(true); prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic @@ -322,7 +312,7 @@ public class HidePrayersPVMPlugin extends Plugin prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve } - if (config.showCerberusRangeExpensive()) + if (config.Cerberus() == Cerberus.CERBERUS_EXPENSIVE_RANGE) { prayerWidget.setHidden(true); prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic @@ -333,7 +323,7 @@ public class HidePrayersPVMPlugin extends Plugin prayerWidgets.get(Prayer.values()[27].ordinal()).setHidden(false);// Rigour } - if (config.showArmadylCheap()) + if (config.Armadyl() == Armadyl.ARMADYL_CHEAP) { prayerWidget.setHidden(true); prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic @@ -343,7 +333,7 @@ public class HidePrayersPVMPlugin extends Plugin prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve } - if (config.showArmadylExpensive()) + if (config.Armadyl() == Armadyl.ARMADYL_EXPENSIVE) { prayerWidget.setHidden(true); prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic @@ -353,11 +343,10 @@ public class HidePrayersPVMPlugin extends Plugin prayerWidgets.get(Prayer.values()[27].ordinal()).setHidden(false);// Rigour } - - if (config.showBandosCheap()) + if (config.Bandos() == Bandos.BANDOS_CHEAP) { prayerWidget.setHidden(true); - prayerWidgets.get(Prayer.values()[13].ordinal()).setHidden(false);// Steel Skin + 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 @@ -365,7 +354,7 @@ public class HidePrayersPVMPlugin extends Plugin prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve } - if (config.showBandosExpensive()) + if (config.Bandos() == Bandos.BANDOS_EXPENSIVE) { prayerWidget.setHidden(true); prayerWidgets.get(Prayer.values()[18].ordinal()).setHidden(false);// Protect from Melee @@ -374,10 +363,10 @@ public class HidePrayersPVMPlugin extends Plugin prayerWidgets.get(Prayer.values()[26].ordinal()).setHidden(false);// Piety } - if (config.showSaradominCheap()) + if (config.Saradomin() == Saradomin.SARDOMIN_CHEAP) { prayerWidget.setHidden(true); - prayerWidgets.get(Prayer.values()[13].ordinal()).setHidden(false);// Steel Skin + 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 @@ -386,7 +375,7 @@ public class HidePrayersPVMPlugin extends Plugin prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve } - if (config.showSaradominExpensive()) + if (config.Saradomin() == Saradomin.SARADOMIN_EXPENSIVE) { prayerWidget.setHidden(true); prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic @@ -396,7 +385,7 @@ public class HidePrayersPVMPlugin extends Plugin prayerWidgets.get(Prayer.values()[27].ordinal()).setHidden(false);// Rigour } - if (config.showZamorakCheap()) + if (config.Zamorak() == Zamorak.ZAMORAK_CHEAP) { prayerWidget.setHidden(true); prayerWidgets.get(Prayer.values()[13].ordinal()).setHidden(false);// Steel Skin @@ -408,7 +397,7 @@ public class HidePrayersPVMPlugin extends Plugin prayerWidgets.get(Prayer.values()[24].ordinal()).setHidden(false);// Preserve } - if (config.showZamorakExpensive()) + if (config.Zamorak() == Zamorak.ZAMORAK_EXPENSIVE) { prayerWidget.setHidden(true); prayerWidgets.get(Prayer.values()[16].ordinal()).setHidden(false);// Protect from Magic @@ -420,4 +409,4 @@ public class HidePrayersPVMPlugin extends Plugin } } } -} +} \ No newline at end of file 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 new file mode 100644 index 0000000000..7c5fbf9fac --- /dev/null +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/Saradomin.java @@ -0,0 +1,47 @@ +/* + * 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 new file mode 100644 index 0000000000..a8754e908a --- /dev/null +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/Vorkath.java @@ -0,0 +1,47 @@ +/* + * 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 new file mode 100644 index 0000000000..a3e859b390 --- /dev/null +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/Zamorak.java @@ -0,0 +1,47 @@ +/* + * 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 new file mode 100644 index 0000000000..7f139000e0 --- /dev/null +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/PVM/Zulrah.java @@ -0,0 +1,47 @@ +/* + * 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