Update WorldGuard for CommandBook 3

worldguard-bukkit/build.gradle.kts

@@ -11,6 +11,7 @@ applyPlatformAndCoreConfiguration()
 applyShadowConfiguration()
 
 repositories {
+    mavenLocal()
     maven {
         name = "paper"
         url = uri("https://papermc.io/repo/repository/maven-public/")
@@ -27,7 +28,7 @@ dependencies {
     "api"("com.destroystokyo.paper:paper-api:1.15-R0.1-SNAPSHOT")
     "implementation"("io.papermc:paperlib:1.0.2")
     "api"("com.sk89q.worldedit:worldedit-bukkit:${Versions.WORLDEDIT}") { isTransitive = false }
-    "implementation"("com.sk89q:commandbook:2.3") { isTransitive = false }
+    "implementation"("com.sk89q:commandbook:3.0-SNAPSHOT") { isTransitive = false }
     "implementation"("org.bstats:bstats-bukkit:1.5")
 }
 

worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardCommandBookListener.java

@@ -19,7 +19,7 @@
 
 package com.sk89q.worldguard.bukkit.listener;
 
-import com.sk89q.commandbook.InfoComponent;
+import com.sk89q.commandbook.component.info.InfoComponent;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.WorldGuard;
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/SetFlag.java

@@ -20,25 +20,18 @@
 package com.sk89q.worldguard.protection.flags;
 
 import com.google.common.collect.Sets;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Objects;
 import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 /**
  * Stores a set of types.
  */
 public class SetFlag<T> extends Flag<Set<T>> {
 
-    private static final Pattern ANY_MODIFIER = Pattern.compile("^(add|sub|subtract|rem|remove) (.*)$");
-    private static final Pattern REMOVE_MODIFIERS = Pattern.compile("^(sub|subtract|rem|remove) (.*)$");
-
     private Flag<T> subFlag;
 
     public SetFlag(String name, RegionGroup defaultGroup, Flag<T> subFlag) {
@@ -67,32 +60,10 @@ public class SetFlag<T> extends Flag<Set<T>> {
             return Sets.newHashSet();
         } else {
             Set<T> items = Sets.newHashSet();
-            boolean subtractive = false;
-
-            // If the input starts with particular keywords, attempt to load the existing values,
-            // and make this a modification, instead of an overwrite.
-            Matcher keywordMatcher = ANY_MODIFIER.matcher(input);
-            if (keywordMatcher.matches()) {
-                ProtectedRegion region = Objects.requireNonNull((ProtectedRegion) context.get("region"));
-
-                Set<T> existingValue = region.getFlag(this);
-                if (existingValue != null) {
-                    items.addAll(existingValue);
-                }
-
-                subtractive = REMOVE_MODIFIERS.matcher(input).matches();
-                input = keywordMatcher.group(2);
-            }
 
             for (String str : input.split(",")) {
                 FlagContext copy = context.copyWith(null, str, null);
-
-                T subFlagValue = subFlag.parseInput(copy);
-                if (subtractive) {
-                    items.remove(subFlagValue);
-                } else {
-                    items.add(subFlagValue);
-                }
+                items.add(subFlag.parseInput(copy));
             }
 
             return items;