From 90502cb0e1b473235d931fc50249e12e16b34846 Mon Sep 17 00:00:00 2001 From: Jonathan <48493132+Raieverr@users.noreply.github.com> Date: Sun, 12 May 2019 01:18:38 -0600 Subject: [PATCH 1/3] Configurable Boss Update -Added Vorkath Cheap/Expensive -Added Cerberus Melee/Range Cheap/Expensive -Added all GWD Bosses Cheap/Expensive --- .../hideprayers/PVM/HidePrayersPVMConfig.java | 126 ++++++++++++++++++ 1 file changed, 126 insertions(+) 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 cf42dc8f27..477c8180a9 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 @@ -81,4 +81,130 @@ public interface HidePrayersPVMConfig extends Config { return false; } + + @ConfigItem + ( + position = 4, + keyName = "vorkathcheap", + name = "Vorkath Eagle Eye", + description = "Shows prayers for Vorkath" + ) +default boolean showVorkathCheap() {return false;} + + @ConfigItem + ( + position = 5, + keyName = "vorkathexpensive", + name = "Vorkath Augury/Rigour", + description = "Shows prayers for Vorkath" + ) + default boolean showVorkathExpensive() {return false;} + + @ConfigItem + ( + position = 6, + keyName = "cerberuscheap", + name = "Cerberus Strength/Skin/Reflexes", + description = "Shows prayers for Cerberus" + ) + default boolean showCerberusCheap() {return false;} + + @ConfigItem + ( + position = 7, + keyName = "cerberusexpensive", + name = "Cerberus Piety", + description = "Shows prayers for Cerberus" + ) + 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/Preserve", + description = "Shows prayers for Armadyl GWD" + ) + default boolean showArmadylCheap() {return false;} + + @ConfigItem + ( + position = 11, + keyName = "armadylexpensive", + name = "Armadyl Preserve/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 Preserve/Piety", + description = "Shows prayers for Bandos GWD" + ) + default boolean showBandosExpensive() {return false;} + + @ConfigItem + ( + position = 14, + keyName = "sardomincheap", + name = "Saradomin Eagle/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 Preserve/Piety", + description = "Shows prayers for Zamorak GWD" + ) + default boolean showZamorakExpensive() {return false;} } From cb63d421ba506d267a0d95b3888e8e15b875f5ff Mon Sep 17 00:00:00 2001 From: Jonathan <48493132+Raieverr@users.noreply.github.com> Date: Sun, 12 May 2019 01:19:24 -0600 Subject: [PATCH 2/3] Configurable Boss Update -Added Vorkath Cheap/Expensive -Added Cerberus Melee/Range Cheap/Expensive -Added all GWD Bosses Cheap/Expensive --- .../hideprayers/PVM/HidePrayersPVMPlugin.java | 159 +++++++++++++++++- 1 file changed, 157 insertions(+), 2 deletions(-) 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 d6660e22b1..7373cf3c7a 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 @@ -214,6 +214,7 @@ public class HidePrayersPVMPlugin extends Plugin 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.showZulrahExpensive()) @@ -221,9 +222,10 @@ public class HidePrayersPVMPlugin extends Plugin 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 - prayerWidgets.get(Prayer.values()[22].ordinal()).setHidden(false);// Redemption } if (config.showBarrowsCheap()) @@ -235,6 +237,7 @@ public class HidePrayersPVMPlugin extends Plugin 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.showBarrowsExpensive()) @@ -243,11 +246,163 @@ public class HidePrayersPVMPlugin extends Plugin 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.showVorkathCheap()) + { + 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.showVorkathExpensive()) + { + 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.showCerberusCheap()) + { + 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()[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.showCerberusExpensive()) + { + 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.showCerberusRangeCheap()) + { + 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.showCerberusRangeExpensive()) + { + 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.showArmadylCheap()) + { + 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.showArmadylExpensive()) + { + 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.showBandosCheap()) + { + 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 + } + + if (config.showBandosExpensive()) + { + 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.showSaradominCheap()) + { + 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 + } + + if (config.showSaradominExpensive()) + { + 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.showZamorakCheap()) + { + 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.showZamorakExpensive()) + { + 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 } } } } -} \ No newline at end of file +} From 384e4c4374b5e7b2366156bb3195ad9af9886fca Mon Sep 17 00:00:00 2001 From: Jonathan <48493132+Raieverr@users.noreply.github.com> Date: Sun, 12 May 2019 01:33:01 -0600 Subject: [PATCH 3/3] Code cleanup --- .../hideprayers/PVM/HidePrayersPVMConfig.java | 34 ++++++------------- 1 file changed, 11 insertions(+), 23 deletions(-) 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 477c8180a9..fc68d4ab19 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 @@ -41,10 +41,7 @@ public interface HidePrayersPVMConfig extends Config name = "Barrows Eagle Eye/Mystic Might", description = "Shows prayers for Barrows" ) - default boolean showBarrowsCheap() - { - return false; - } + default boolean showBarrowsCheap() {return false;} @ConfigItem ( @@ -53,10 +50,7 @@ public interface HidePrayersPVMConfig extends Config name = "Barrows Augury/Rigour", description = "Shows prayers for Barrows" ) - default boolean showBarrowsExpensive() - { - return false; - } + default boolean showBarrowsExpensive() {return false;} @ConfigItem ( @@ -65,10 +59,7 @@ public interface HidePrayersPVMConfig extends Config name = "Zulrah Eagle Eye/Mystic Might", description = "Show prayers for Zulrah" ) - default boolean showZulrahCheap() - { - return false; - } + default boolean showZulrahCheap() {return false;} @ConfigItem ( @@ -77,10 +68,7 @@ public interface HidePrayersPVMConfig extends Config name = "Zulrah Augury/Rigour", description = "Shows prayers for Zulrah" ) - default boolean showZulrahExpensive() - { - return false; - } + default boolean showZulrahExpensive() {return false;} @ConfigItem ( @@ -89,13 +77,13 @@ public interface HidePrayersPVMConfig extends Config name = "Vorkath Eagle Eye", description = "Shows prayers for Vorkath" ) -default boolean showVorkathCheap() {return false;} + default boolean showVorkathCheap() {return false;} @ConfigItem ( position = 5, keyName = "vorkathexpensive", - name = "Vorkath Augury/Rigour", + name = "Vorkath Rigour", description = "Shows prayers for Vorkath" ) default boolean showVorkathExpensive() {return false;} @@ -140,7 +128,7 @@ default boolean showVorkathCheap() {return false;} ( position = 10, keyName = "armadylcheap", - name = "Armadyl Eagle eye/Preserve", + name = "Armadyl Eagle eye", description = "Shows prayers for Armadyl GWD" ) default boolean showArmadylCheap() {return false;} @@ -149,7 +137,7 @@ default boolean showVorkathCheap() {return false;} ( position = 11, keyName = "armadylexpensive", - name = "Armadyl Preserve/Rigour", + name = "Armadyl Rigour", description = "Shows prayers for Armadyl GWD" ) default boolean showArmadylExpensive() {return false;} @@ -167,7 +155,7 @@ default boolean showVorkathCheap() {return false;} ( position = 13, keyName = "bandosexpensive", - name = "Bandos Preserve/Piety", + name = "Bandos Piety", description = "Shows prayers for Bandos GWD" ) default boolean showBandosExpensive() {return false;} @@ -176,7 +164,7 @@ default boolean showVorkathCheap() {return false;} ( position = 14, keyName = "sardomincheap", - name = "Saradomin Eagle/Steel Skin", + name = "Saradomin Eagle eye/Steel Skin", description = "Shows prayers for Saradomin GWD" ) default boolean showSaradominCheap() {return false;} @@ -203,7 +191,7 @@ default boolean showVorkathCheap() {return false;} ( position = 17, keyName = "zamorakexpensive", - name = "Zamorak Preserve/Piety", + name = "Zamorak Piety", description = "Shows prayers for Zamorak GWD" ) default boolean showZamorakExpensive() {return false;}