From 899a0152badf00869048a3ebd60053ec9f9c2aa6 Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Wed, 6 May 2020 09:19:17 -0700
Subject: [PATCH] Add /mmoxpbar disable

---
 1                                                     | 11 -----------
 Changelog.txt                                         |  4 ++++
 .../gmail/nossr50/commands/player/XPBarCommand.java   |  5 +++++
 .../nossr50/util/experience/ExperienceBarManager.java | 10 +++++++++-
 src/main/resources/locale/locale_en_US.properties     |  1 +
 5 files changed, 19 insertions(+), 12 deletions(-)
 delete mode 100644 1

diff --git a/1 b/1
deleted file mode 100644
index c0087c86d..000000000
--- a/1
+++ /dev/null
@@ -1,11 +0,0 @@
-SkillShot tweaks
-# Please enter the commit message for your changes. Lines starting
-# with '#' will be ignored, and an empty message aborts the commit.
-#
-# On branch master
-# Your branch is up to date with 'origin/master'.
-#
-# Changes to be committed:
-#	modified:   src/main/java/com/gmail/nossr50/skills/archery/Archery.java
-#	modified:   src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
-#
diff --git a/Changelog.txt b/Changelog.txt
index 301cc60b4..07fe2bc73 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,3 +1,7 @@
+Version 2.1.129
+    Added new subcommand /mmoxpbar disable - Hides all mcMMO XP bars
+    New locale string 'Commands.XPBar.DisableAll'
+
 Version 2.1.128
     The first rank of Iron Arm for Unarmed now only gives 1.5 bonus damage instead of 4 (other ranks are the same as before)
     Blast Mining nerf reverted
diff --git a/src/main/java/com/gmail/nossr50/commands/player/XPBarCommand.java b/src/main/java/com/gmail/nossr50/commands/player/XPBarCommand.java
index 1d933df03..99b6a6afb 100644
--- a/src/main/java/com/gmail/nossr50/commands/player/XPBarCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/player/XPBarCommand.java
@@ -38,6 +38,9 @@ public class XPBarCommand implements TabExecutor {
               if(option.equalsIgnoreCase(ExperienceBarManager.XPBarSettingTarget.RESET.toString())) {
                   mmoPlayer.getExperienceBarManager().xpBarSettingToggle(ExperienceBarManager.XPBarSettingTarget.RESET, null);
                   return true;
+              } else if(option.equalsIgnoreCase(ExperienceBarManager.XPBarSettingTarget.DISABLE.toString())) {
+                  mmoPlayer.getExperienceBarManager().disableAllBars();
+                  return true;
               } else {
                   return false;
               }
@@ -80,6 +83,8 @@ public class XPBarCommand implements TabExecutor {
                 return ExperienceBarManager.XPBarSettingTarget.SHOW;
             case "reset":
                 return ExperienceBarManager.XPBarSettingTarget.RESET;
+            case "disable":
+                return ExperienceBarManager.XPBarSettingTarget.DISABLE;
         }
 
         return null;
diff --git a/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarManager.java b/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarManager.java
index 9bd52cd57..7a49a1260 100644
--- a/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarManager.java
+++ b/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarManager.java
@@ -92,6 +92,14 @@ public class ExperienceBarManager {
         experienceBarHideTaskHashMap.remove(primarySkillType);
     }
 
+    public void disableAllBars() {
+        for(PrimarySkillType primarySkillType : PrimarySkillType.values()) {
+            xpBarSettingToggle(XPBarSettingTarget.HIDE, primarySkillType);
+        }
+
+        NotificationManager.sendPlayerInformationChatOnlyPrefixed(mcMMOPlayer.getPlayer(), "Commands.XPBar.DisableAll");
+    }
+
     public void xpBarSettingToggle(@NotNull XPBarSettingTarget settingTarget, @Nullable PrimarySkillType skillType) {
         switch(settingTarget) {
             case SHOW:
@@ -147,5 +155,5 @@ public class ExperienceBarManager {
         }
     }
 
-    public enum XPBarSettingTarget { SHOW, HIDE, RESET }
+    public enum XPBarSettingTarget { SHOW, HIDE, RESET, DISABLE }
 }
diff --git a/src/main/resources/locale/locale_en_US.properties b/src/main/resources/locale/locale_en_US.properties
index be987166e..869b99c3e 100644
--- a/src/main/resources/locale/locale_en_US.properties
+++ b/src/main/resources/locale/locale_en_US.properties
@@ -1115,3 +1115,4 @@ Commands.Description.mmoxpbar=Player settings for mcMMO XP bars
 Commands.Description.mmocompat=Information about mcMMO and whether or not its in compatibility mode or fully functional.
 Compatibility.Layer.Unsupported=[[GOLD]]Compatibility for [[GREEN]]{0}[[GOLD]] is not supported by this version of Minecraft.
 Compatibility.Layer.PartialSupport=[[GOLD]]Compatibility for [[GREEN]]{0}[[GOLD]] is not fully supported by this version of Minecraft, but mcMMO is running a secondary system to emulate some of the missing features.
+Commands.XPBar.DisableAll=[[GOLD]] All mcMMO XP bars are now disabled, use /mmoxpbar reset to restore default settings.
\ No newline at end of file