From a6395ccc29a45ff30c5f54a31353fffb8237e8c2 Mon Sep 17 00:00:00 2001 From: Kyleeld <48519776+Kyleeld@users.noreply.github.com> Date: Thu, 27 Jun 2019 22:09:12 +0100 Subject: [PATCH] Prayer rework + bug fix (#764) * Update HidePrayersConfig.java * Update HidePrayersPlugin.java * Update WorldType.java * Update HidePrayersPlugin.java * Update WorldType.java * Update HidePrayersConfig.java --- .../main/java/net/runelite/api/WorldType.java | 39 ++++ .../hideprayers/HidePrayersConfig.java | 178 +++++++++--------- .../hideprayers/HidePrayersPlugin.java | 60 +++--- 3 files changed, 158 insertions(+), 119 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/WorldType.java b/runelite-api/src/main/java/net/runelite/api/WorldType.java index 167fd83f39..ec44fedd09 100644 --- a/runelite-api/src/main/java/net/runelite/api/WorldType.java +++ b/runelite-api/src/main/java/net/runelite/api/WorldType.java @@ -72,6 +72,30 @@ public enum WorldType private static final EnumSet HIGHRISK_WORLD_TYPES = EnumSet.of( HIGH_RISK ); + + private static final EnumSet ALL_HIGHRISK_WORLD_TYPES = EnumSet.of( + HIGH_RISK, + DEADMAN, + DEADMAN_TOURNAMENT, + SEASONAL_DEADMAN + ); + + private static final EnumSet ALL_PVP_WORLD_TYPES = EnumSet.of( + HIGH_RISK, + DEADMAN, + DEADMAN_TOURNAMENT, + PVP, + SEASONAL_DEADMAN + ); + + private static final EnumSet ALL_PK_WORLD_TYPES = EnumSet.of( + HIGH_RISK, + DEADMAN, + DEADMAN_TOURNAMENT, + PVP, + SEASONAL_DEADMAN, + BOUNTY + ); /** * Create enum set of world types from mask. @@ -133,4 +157,19 @@ public enum WorldType { return worldTypes.stream().anyMatch(HIGHRISK_WORLD_TYPES::contains); } + + public static boolean isAllHighRiskWorld(final Collection worldTypes) + { + return worldTypes.stream().anyMatch(ALL_HIGHRISK_WORLD_TYPES::contains); + } + + public static boolean isAllPvpWorld(final Collection worldTypes) + { + return worldTypes.stream().anyMatch(ALL_PVP_WORLD_TYPES::contains); + } + + public static boolean isAllPKWorld(final Collection worldTypes) + { + return worldTypes.stream().anyMatch(ALL_PK_WORLD_TYPES::contains); + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersConfig.java index 14bafcce93..4acdaa8dd4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersConfig.java @@ -58,182 +58,182 @@ public interface HidePrayersConfig extends Config @ConfigItem( position = 1, - keyName = "HideTHICK_SKIN", - name = "Hide Thick Skin", + keyName = "ShowTHICK_SKIN", + name = "Show Thick Skin", description = "Hide/Show Thick Skin", group = "Individual Prayers", hidden = true, unhide = "showindividualprayers" ) - default boolean HideTHICK_SKIN() + default boolean ShowTHICK_SKIN() { return false; } @ConfigItem( position = 2, - keyName = "HideBURST_OF_STRENGTH", - name = "Hide Burst of Strength", + keyName = "ShowBURST_OF_STRENGTH", + name = "Show Burst of Strength", description = "Hide/Show Burst of Strength", group = "Individual Prayers", hidden = true, unhide = "showindividualprayers" ) - default boolean HideBURST_OF_STRENGTH() + default boolean ShowBURST_OF_STRENGTH() { return false; } @ConfigItem( position = 3, - keyName = "HideCLARITY_OF_THOUGHT", - name = "Hide Clarity of Thought", + keyName = "ShowCLARITY_OF_THOUGHT", + name = "Show Clarity of Thought", description = "Hide/Show Clarity of Thought", group = "Individual Prayers", hidden = true, - unhide = "showindividualprayers" + unhide = "Showindividualprayers" ) - default boolean HideCLARITY_OF_THOUGHT() + default boolean ShowCLARITY_OF_THOUGHT() { return false; } @ConfigItem( position = 4, - keyName = "HideSHARP_EYE", - name = "Hide Sharp Eye", + keyName = "ShowSHARP_EYE", + name = "Show Sharp Eye", description = "Hide/Show Sharp Eye", group = "Individual Prayers", hidden = true, unhide = "showindividualprayers" ) - default boolean HideSHARP_EYE() + default boolean ShowSHARP_EYE() { return false; } @ConfigItem( position = 5, - keyName = "HideMYSTIC_WILL", - name = "Hide Mystic Will", + keyName = "ShowMYSTIC_WILL", + name = "Show Mystic Will", description = "Hide/Show Mystic Will", group = "Individual Prayers", hidden = true, unhide = "showindividualprayers" ) - default boolean HideMYSTIC_WILL() + default boolean ShowMYSTIC_WILL() { return false; } @ConfigItem( position = 6, - keyName = "HideROCK_SKIN", - name = "Hide Rock Skin", + keyName = "ShowROCK_SKIN", + name = "Show Rock Skin", description = "Hide/Show Rock Skin", group = "Individual Prayers", hidden = true, unhide = "showindividualprayers" ) - default boolean HideROCK_SKIN() + default boolean ShowROCK_SKIN() { return false; } @ConfigItem( position = 7, - keyName = "HideSUPERHUMAN_STRENGTH", - name = "Hide Super Human Strength", + keyName = "ShowSUPERHUMAN_STRENGTH", + name = "Show Super Human Strength", description = "Hide/Show Super Human Strength", group = "Individual Prayers", hidden = true, unhide = "showindividualprayers" ) - default boolean HideSUPERHUMAN_STRENGTH() + default boolean ShowSUPERHUMAN_STRENGTH() { return false; } @ConfigItem( position = 8, - keyName = "HideIMPROVED_REFLEXES", - name = "Hide Improved_Reflexes", + keyName = "ShowIMPROVED_REFLEXES", + name = "Show Improved_Reflexes", description = "Hide/Show Improved_Reflexes", group = "Individual Prayers", hidden = true, unhide = "showindividualprayers" ) - default boolean HideIMPROVED_REFLEXES() + default boolean ShowIMPROVED_REFLEXES() { return false; } @ConfigItem( position = 9, - keyName = "HideRapidRestore", - name = "Hide Rapid Restore", + keyName = "ShowRapidRestore", + name = "Show Rapid Restore", description = "Hide/Show Rapid Restore", group = "Individual Prayers", hidden = true, unhide = "showindividualprayers" ) - default boolean HideRapidRestore() + default boolean ShowRapidRestore() { return false; } @ConfigItem( position = 10, - keyName = "HideRapidHeal", - name = "Hide Rapid Heal", + keyName = "ShowRapidHeal", + name = "Show Rapid Heal", description = "Hide/Show Rapid Heal", group = "Individual Prayers", hidden = true, unhide = "showindividualprayers" ) - default boolean HideRapidHeal() + default boolean ShowRapidHeal() { return false; } @ConfigItem( position = 11, - keyName = "HideProtectItem", - name = "Hide Protect Item", + keyName = "ShowProtectItem", + name = "Show Protect Item", description = "Hide/Show Protect Item", group = "Individual Prayers", hidden = true, unhide = "showindividualprayers" ) - default boolean HideProtectItem() + default boolean ShowProtectItem() { return false; } @ConfigItem( position = 12, - keyName = "HideHAWK_EYE", - name = "Hide Hawk Eye", + keyName = "ShowHAWK_EYE", + name = "Show Hawk Eye", description = "Hide/Show Hawk Eye", group = "Individual Prayers", hidden = true, unhide = "showindividualprayers" ) - default boolean HideHAWK_EYE() + default boolean ShowHAWK_EYE() { return false; } @ConfigItem( position = 13, - keyName = "HideMYSTIC_LORE", - name = "Hide Mystic Lore", + keyName = "ShowMYSTIC_LORE", + name = "Show Mystic Lore", description = "Hide/Show Mystic Lore", group = "Individual Prayers", hidden = true, unhide = "showindividualprayers" ) - default boolean HideMYSTIC_LORE() + default boolean ShowMYSTIC_LORE() { return false; } @@ -241,224 +241,224 @@ public interface HidePrayersConfig extends Config @ConfigItem( position = 14, - keyName = "HideSteelSkin", - name = "Hide Steel Skin", + keyName = "ShowSteelSkin", + name = "Show Steel Skin", description = "Hide/Show Steel skin", group = "Individual Prayers", hidden = true, unhide = "showindividualprayers" ) - default boolean HideSteelSkin() + default boolean ShowSteelSkin() { return false; } @ConfigItem( position = 15, - keyName = "HideUltimateStrength", - name = "Hide Ultimate Strength", + keyName = "ShowUltimateStrength", + name = "Show Ultimate Strength", description = "Hide/Show Ultimate strength", group = "Individual Prayers", hidden = true, unhide = "showindividualprayers" ) - default boolean HideUltimateStrength() + default boolean ShowUltimateStrength() { return false; } @ConfigItem( position = 16, - keyName = "HideIncredibleReflex", - name = "Hide Incredible Reflex", + keyName = "ShowIncredibleReflex", + name = "Show Incredible Reflex", description = "Hide/Show Incredible Reflex", group = "Individual Prayers", hidden = true, unhide = "showindividualprayers" ) - default boolean HideIncredibleReflex() + default boolean ShowIncredibleReflex() { return false; } @ConfigItem( position = 17, - keyName = "HidePTFMagic", - name = "Hide Protect From Magic", + keyName = "ShowPTFMagic", + name = "Show Protect From Magic", description = "Hide/Show Protect From Magic", group = "Individual Prayers", hidden = true, unhide = "showindividualprayers" ) - default boolean HidePTFMagic() + default boolean ShowPTFMagic() { return false; } @ConfigItem( position = 18, - keyName = "HidePTFRange", - name = "Hide Protect From Range", + keyName = "ShowPTFRange", + name = "Show Protect From Range", description = "Hide/Show Protect from Range", group = "Individual Prayers", hidden = true, unhide = "showindividualprayers" ) - default boolean HidePTFRange() + default boolean ShowPTFRange() { return false; } @ConfigItem( position = 19, - keyName = "HidePTFMelee", - name = "Hide Protect From Melee", + keyName = "ShowPTFMelee", + name = "Show Protect From Melee", description = "Hide/Show Protect From Melee", group = "Individual Prayers", hidden = true, unhide = "showindividualprayers" ) - default boolean HidePTFMelee() + default boolean ShowPTFMelee() { return false; } @ConfigItem( position = 20, - keyName = "HideEagle", - name = "Hide Eagle Eye", + keyName = "ShowEagle", + name = "Show Eagle Eye", description = "Hide/Show Eagle Eye", group = "Individual Prayers", hidden = true, unhide = "showindividualprayers" ) - default boolean HideEagle() + default boolean ShowEagle() { return false; } @ConfigItem( position = 19, - keyName = "HideMystic", - name = "Hide Mystic Might", + keyName = "ShowMystic", + name = "Show Mystic Might", description = "Hide/Show Mystic Might", group = "Individual Prayers", hidden = true, unhide = "showindividualprayers" ) - default boolean HideMystic() + default boolean ShowMystic() { return false; } @ConfigItem( position = 21, - keyName = "HideRETRIBUTION", - name = "Hide Retribution", + keyName = "ShowRETRIBUTION", + name = "Show Retribution", description = "Hide/Show Retribution", group = "Individual Prayers", hidden = true, unhide = "showindividualprayers" ) - default boolean HideRETRIBUTION() + default boolean ShowRETRIBUTION() { return false; } @ConfigItem( position = 22, - keyName = "HideRedemption", - name = "Hide Redemption", + keyName = "ShowRedemption", + name = "Show Redemption", description = "Hide/Show Redemption", group = "Individual Prayers", hidden = true, unhide = "showindividualprayers" ) - default boolean HideRedemption() + default boolean ShowRedemption() { return false; } @ConfigItem( position = 23, - keyName = "HideSmite", - name = "Hide Smite", + keyName = "ShowSmite", + name = "Show Smite", description = "Hide/Show Smite", group = "Individual Prayers", hidden = true, unhide = "showindividualprayers" ) - default boolean HideSmite() + default boolean ShowSmite() { return false; } @ConfigItem( position = 24, - keyName = "HidePreserve", - name = "Hide Preserve", + keyName = "ShowPreserve", + name = "Show Preserve", description = "Hide/Show Preserve", group = "Individual Prayers", hidden = true, unhide = "showindividualprayers" ) - default boolean HidePreserve() + default boolean ShowPreserve() { return false; } @ConfigItem( position = 25, - keyName = "HideChivalry", - name = "Hide Chivalry", + keyName = "ShowChivalry", + name = "Show Chivalry", description = "Hide/Show Chivalry", group = "Individual Prayers", hidden = true, unhide = "showindividualprayers" ) - default boolean HideChivalry() + default boolean ShowChivalry() { return false; } @ConfigItem( position = 26, - keyName = "HidePiety", - name = "Hide Piety", + keyName = "ShowPiety", + name = "Show Piety", description = "Hide/Show Piety", group = "Individual Prayers", hidden = true, unhide = "showindividualprayers" ) - default boolean HidePiety() + default boolean ShowPiety() { return false; } @ConfigItem( position = 27, - keyName = "HideRigour", - name = "Hide Rigour", + keyName = "ShowRigour", + name = "Show Rigour", description = "Hide/Show Rigour", group = "Individual Prayers", hidden = true, unhide = "showindividualprayers" ) - default boolean HideRigour() + default boolean ShowRigour() { return false; } @ConfigItem( position = 28, - keyName = "HideAugury", - name = "Hide Augury", + keyName = "ShowAugury", + name = "Show Augury", description = "Hide/Show Augury", group = "Individual Prayers", hidden = true, unhide = "showindividualprayers" ) - default boolean HideAugury() + default boolean ShowAugury() { return false; } @@ -723,4 +723,4 @@ public interface HidePrayersConfig extends Config { return false; } -} \ No newline at end of file +} diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersPlugin.java index d2e4bba211..15ae602352 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersPlugin.java @@ -252,35 +252,35 @@ public class HidePrayersPlugin extends Plugin if (config.showindividualprayers()) { - prayerWidgets.get(0).setHidden(!config.HideTHICK_SKIN()); // Thick Skin - prayerWidgets.get(1).setHidden(!config.HideBURST_OF_STRENGTH()); // Burst of Strength - prayerWidgets.get(2).setHidden(!config.HideCLARITY_OF_THOUGHT()); // Clarity of Thought - prayerWidgets.get(3).setHidden(!config.HideSHARP_EYE()); // Sharp Eye - prayerWidgets.get(4).setHidden(!config.HideMYSTIC_WILL()); // Mystic Will - prayerWidgets.get(5).setHidden(!config.HideROCK_SKIN()); // Rock Skin - prayerWidgets.get(6).setHidden(!config.HideSUPERHUMAN_STRENGTH()); // Super Human Strength - prayerWidgets.get(7).setHidden(!config.HideIMPROVED_REFLEXES()); // Improved_Reflexes - prayerWidgets.get(8).setHidden(!config.HideRapidRestore()); // Rapid Restore - prayerWidgets.get(9).setHidden(!config.HideRapidHeal()); // Rapid Heal - prayerWidgets.get(10).setHidden(!config.HideProtectItem()); // Protect Item - prayerWidgets.get(11).setHidden(!config.HideHAWK_EYE()); // Hawk Eye - prayerWidgets.get(12).setHidden(!config.HideMYSTIC_LORE()); // Mystic Lore - prayerWidgets.get(13).setHidden(!config.HideSteelSkin()); // Steel Skin - prayerWidgets.get(14).setHidden(!config.HideUltimateStrength()); // Ultimate Strength - prayerWidgets.get(15).setHidden(!config.HideIncredibleReflex()); // Incredible Reflexes - prayerWidgets.get(16).setHidden(!config.HidePTFMagic()); // Protect from Magic - prayerWidgets.get(17).setHidden(!config.HidePTFRange()); // Protect from Range - prayerWidgets.get(18).setHidden(!config.HidePTFMelee()); // Protect from Melee - prayerWidgets.get(19).setHidden(!config.HideEagle()); // eagle eye - prayerWidgets.get(20).setHidden(!config.HideMystic()); // Mystic Might - prayerWidgets.get(21).setHidden(!config.HideRETRIBUTION()); // Retribution - prayerWidgets.get(22).setHidden(!config.HideRedemption()); // Redemption - prayerWidgets.get(23).setHidden(!config.HideSmite()); // Smite - prayerWidgets.get(24).setHidden(!config.HidePreserve()); // Preserve - prayerWidgets.get(25).setHidden(!config.HideChivalry()); // Chivalry - prayerWidgets.get(26).setHidden(!config.HidePiety()); // Piety - prayerWidgets.get(27).setHidden(!config.HideRigour()); // Rigour - prayerWidgets.get(28).setHidden(!config.HideAugury()); // Augury + prayerWidgets.get(0).setHidden(!config.ShowTHICK_SKIN()); // Thick Skin + prayerWidgets.get(1).setHidden(!config.ShowBURST_OF_STRENGTH()); // Burst of Strength + prayerWidgets.get(2).setHidden(!config.ShowCLARITY_OF_THOUGHT()); // Clarity of Thought + prayerWidgets.get(3).setHidden(!config.ShowSHARP_EYE()); // Sharp Eye + prayerWidgets.get(4).setHidden(!config.ShowMYSTIC_WILL()); // Mystic Will + prayerWidgets.get(5).setHidden(!config.ShowROCK_SKIN()); // Rock Skin + prayerWidgets.get(6).setHidden(!config.ShowSUPERHUMAN_STRENGTH()); // Super Human Strength + prayerWidgets.get(7).setHidden(!config.ShowIMPROVED_REFLEXES()); // Improved_Reflexes + prayerWidgets.get(8).setHidden(!config.ShowRapidRestore()); // Rapid Restore + prayerWidgets.get(9).setHidden(!config.ShowRapidHeal()); // Rapid Heal + prayerWidgets.get(10).setHidden(!config.ShowProtectItem()); // Protect Item + prayerWidgets.get(11).setHidden(!config.ShowHAWK_EYE()); // Hawk Eye + prayerWidgets.get(12).setHidden(!config.ShowMYSTIC_LORE()); // Mystic Lore + prayerWidgets.get(13).setHidden(!config.ShowSteelSkin()); // Steel Skin + prayerWidgets.get(14).setHidden(!config.ShowUltimateStrength()); // Ultimate Strength + prayerWidgets.get(15).setHidden(!config.ShowIncredibleReflex()); // Incredible Reflexes + prayerWidgets.get(16).setHidden(!config.ShowPTFMagic()); // Protect from Magic + prayerWidgets.get(17).setHidden(!config.ShowPTFRange()); // Protect from Range + prayerWidgets.get(18).setHidden(!config.ShowPTFMelee()); // Protect from Melee + prayerWidgets.get(19).setHidden(!config.ShowEagle()); // eagle eye + prayerWidgets.get(20).setHidden(!config.ShowMystic()); // Mystic Might + prayerWidgets.get(21).setHidden(!config.ShowRETRIBUTION()); // Retribution + prayerWidgets.get(22).setHidden(!config.ShowRedemption()); // Redemption + prayerWidgets.get(23).setHidden(!config.ShowSmite()); // Smite + prayerWidgets.get(24).setHidden(!config.ShowPreserve()); // Preserve + prayerWidgets.get(25).setHidden(!config.ShowChivalry()); // Chivalry + prayerWidgets.get(26).setHidden(!config.ShowPiety()); // Piety + prayerWidgets.get(27).setHidden(!config.ShowRigour()); // Rigour + prayerWidgets.get(28).setHidden(!config.ShowAugury()); // Augury } else if (config.getarmadylprayers()) @@ -509,7 +509,7 @@ public class HidePrayersPlugin extends Plugin prayerWidgets.get(9).setHidden(false); // Rapid Heal } - if (WorldType.isHighRiskWorld(client.getWorldType()) || client.getRealSkillLevel(Skill.PRAYER) <= 24) + if (WorldType.isAllHighRiskWorld(client.getWorldType()) || client.getRealSkillLevel(Skill.PRAYER) <= 24) { prayerWidgets.get(10).setHidden(true); // Protect Item }