rename bossbar 'flags' to bossbar 'options'

DenizenScript · May 31, 2020 · 7fed178 · 7fed178
1 parent 2ea973f
commit 7fed178
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/BossBarCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/BossBarCommand.java
@@ -22,14 +22,14 @@ public class BossBarCommand extends AbstractCommand {
 
     public BossBarCommand() {
         setName("bossbar");
-        setSyntax("bossbar ({create}/update/remove) [<id>] (players:<player>|...) (title:<title>) (progress:<#.#>) (color:<color>) (style:<style>) (flags:<flag>|...)");
+        setSyntax("bossbar ({create}/update/remove) [<id>] (players:<player>|...) (title:<title>) (progress:<#.#>) (color:<color>) (style:<style>) (options:<option>|...)");
         setRequiredArguments(1, 8);
         isProcedural = false;
     }
 
     // <--[command]
     // @Name BossBar
-    // @Syntax bossbar ({create}/update/remove) [<id>] (players:<player>|...) (title:<title>) (progress:<#.#>) (color:<color>) (style:<style>) (flags:<flag>|...)
+    // @Syntax bossbar ({create}/update/remove) [<id>] (players:<player>|...) (title:<title>) (progress:<#.#>) (color:<color>) (style:<style>) (options:<option>|...)
     // @Required 1
     // @Maximum 8
     // @Short Shows players a boss bar.
@@ -45,7 +45,7 @@ public BossBarCommand() {
     //
     // Valid colors: BLUE, GREEN, PINK, PURPLE, RED, WHITE, YELLOW.
     // Valid styles: SEGMENTED_10, SEGMENTED_12, SEGMENTED_20, SEGMENTED_6, SOLID.
-    // Valid flags: CREATE_FOG, DARKEN_SKY, PLAY_BOSS_MUSIC.
+    // Valid options: CREATE_FOG, DARKEN_SKY, PLAY_BOSS_MUSIC.
     //
     // @Tags
     // <server.current_bossbars>
@@ -99,10 +99,10 @@ else if (!scriptEntry.hasObject("style")
                     && arg.matchesEnum(BarStyle.values())) {
                 scriptEntry.addObject("style", arg.asElement());
             }
-            else if (!scriptEntry.hasObject("flags")
-                    && arg.matchesPrefix("flags", "flag", "f")
+            else if (!scriptEntry.hasObject("options")
+                    && arg.matchesPrefix("options", "option", "opt", "o", "flags", "flag", "f")
                     && arg.matchesEnumList(BarFlag.values())) {
-                scriptEntry.addObject("flags", arg.asType(ListTag.class));
+                scriptEntry.addObject("options", arg.asType(ListTag.class));
             }
             else if (!scriptEntry.hasObject("action")
                     && arg.matchesEnum(Action.values())) {
@@ -150,7 +150,7 @@ public void execute(ScriptEntry scriptEntry) {
         ElementTag progress = scriptEntry.getElement("progress");
         ElementTag color = scriptEntry.getElement("color");
         ElementTag style = scriptEntry.getElement("style");
-        ListTag flags = scriptEntry.getObjectTag("flags");
+        ListTag options = scriptEntry.getObjectTag("options");
 
         if (scriptEntry.dbCallShouldDebug()) {
 
@@ -160,7 +160,7 @@ public void execute(ScriptEntry scriptEntry) {
                     + (progress != null ? progress.debug() : "")
                     + (color != null ? color.debug() : "")
                     + (style != null ? style.debug() : "")
-                    + (flags != null ? flags.debug() : ""));
+                    + (options != null ? options.debug() : ""));
 
         }
 
@@ -177,10 +177,10 @@ public void execute(ScriptEntry scriptEntry) {
                 double barProgress = progress != null ? progress.asDouble() : 1D;
                 BarColor barColor = color != null ? BarColor.valueOf(color.asString().toUpperCase()) : BarColor.WHITE;
                 BarStyle barStyle = style != null ? BarStyle.valueOf(style.asString().toUpperCase()) : BarStyle.SOLID;
-                BarFlag[] barFlags = new BarFlag[flags != null ? flags.size() : 0];
-                if (flags != null) {
-                    for (int i = 0; i < flags.size(); i++) {
-                        barFlags[i] = (BarFlag.valueOf(flags.get(i).toUpperCase()));
+                BarFlag[] barFlags = new BarFlag[options != null ? options.size() : 0];
+                if (options != null) {
+                    for (int i = 0; i < options.size(); i++) {
+                        barFlags[i] = (BarFlag.valueOf(options.get(i).toUpperCase()));
                     }
                 }
                 BossBar bossBar = Bukkit.createBossBar(barTitle, barColor, barStyle, barFlags);
@@ -215,10 +215,10 @@ public void execute(ScriptEntry scriptEntry) {
                 if (style != null) {
                     bossBar1.setStyle(BarStyle.valueOf(style.asString().toUpperCase()));
                 }
-                if (flags != null) {
+                if (options != null) {
                     HashSet<BarFlag> oldFlags = new HashSet<>(Arrays.asList(BarFlag.values()));
-                    HashSet<BarFlag> newFlags = new HashSet<>(flags.size());
-                    for (String flagName : flags) {
+                    HashSet<BarFlag> newFlags = new HashSet<>(options.size());
+                    for (String flagName : options) {
                         BarFlag flag = BarFlag.valueOf(flagName.toUpperCase());
                         newFlags.add(flag);
                         oldFlags.remove(flag);