Registry changes & additions

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockCategoryRegistry.java

@@ -0,0 +1,52 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.worldedit.bukkit;
+
+import com.sk89q.worldedit.registry.Category;
+import com.sk89q.worldedit.world.block.BlockType;
+import com.sk89q.worldedit.world.registry.BlockCategoryRegistry;
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
+import org.bukkit.Tag;
+
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class BukkitBlockCategoryRegistry implements BlockCategoryRegistry {
+
+    private Set<BlockType> getFromBukkitTag(Tag<Material> tag) {
+        return tag.getValues().stream().map(BukkitAdapter::asBlockType).collect(Collectors.toSet());
+    }
+
+    @Override
+    public Set<BlockType> getCategorisedByName(String category) {
+        String[] split = category.split(":");
+        String namespace = split.length > 1 ? split[0] : "minecraft";
+        String key =  split.length > 1 ? split[1] : category;
+        Tag<Material> tag = Bukkit.getTag(Tag.REGISTRY_BLOCKS, new NamespacedKey(namespace, key), Material.class);
+        return getFromBukkitTag(tag);
+    }
+
+    @Override
+    public Set<BlockType> getAll(Category<BlockType> category) {
+        return getCategorisedByName(category.getId());
+    }
+}

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitItemCategoryRegistry.java

@@ -0,0 +1,52 @@
+/*
+ * WorldEdit, a Minecraft world manipulation toolkit
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldEdit team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.worldedit.bukkit;
+
+import com.sk89q.worldedit.registry.Category;
+import com.sk89q.worldedit.world.item.ItemType;
+import com.sk89q.worldedit.world.registry.ItemCategoryRegistry;
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
+import org.bukkit.Tag;
+
+import java.util.Set;
+import java.util.stream.Collectors;
+
+public class BukkitItemCategoryRegistry implements ItemCategoryRegistry {
+
+    private Set<ItemType> getFromBukkitTag(Tag<Material> tag) {
+        return tag.getValues().stream().map(BukkitAdapter::asItemType).collect(Collectors.toSet());
+    }
+
+    @Override
+    public Set<ItemType> getCategorisedByName(String category) {
+        String[] split = category.split(":");
+        String namespace = split.length > 1 ? split[0] : "minecraft";
+        String key =  split.length > 1 ? split[1] : category;
+        Tag<Material> tag = Bukkit.getTag(Tag.REGISTRY_ITEMS, new NamespacedKey(namespace, key), Material.class);
+        return getFromBukkitTag(tag);
+    }
+
+    @Override
+    public Set<ItemType> getAll(Category<ItemType> category) {
+        return getCategorisedByName(category.getId());
+    }
+}

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitRegistries.java

@@ -31,6 +31,8 @@ class BukkitRegistries extends BundledRegistries {
     private final ItemRegistry itemRegistry = new BukkitItemRegistry();
     private final BiomeRegistry biomeRegistry = new BukkitBiomeRegistry();
     private final EntityRegistry entityRegistry = new BukkitEntityRegistry();
+    private final BlockCategoryRegistry blockCategoryRegistry = new BukkitBlockCategoryRegistry();
+    private final ItemCategoryRegistry itemCategoryRegistry = new BukkitItemCategoryRegistry();
 
     /**
      * Create a new instance.
@@ -43,6 +45,11 @@ class BukkitRegistries extends BundledRegistries {
         return blockRegistry;
     }
     
+    @Override
+    public BlockCategoryRegistry getBlockCategoryRegistry() {
+    	return blockCategoryRegistry;
+    }
+
     @Override
     public BiomeRegistry getBiomeRegistry() {
         return biomeRegistry;
@@ -53,6 +60,11 @@ class BukkitRegistries extends BundledRegistries {
         return itemRegistry;
     }
     
+    @Override
+    public ItemCategoryRegistry getItemCategoryRegistry() {
+    	return itemCategoryRegistry;
+    }
+
     @Override
     public EntityRegistry getEntityRegistry() {
         return entityRegistry;

worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/parser/mask/DefaultMaskParser.java

@@ -23,7 +23,7 @@ import com.boydti.fawe.command.FaweParser;
 import com.boydti.fawe.command.SuggestInputParseException;
 import com.boydti.fawe.config.BBC;
 import com.boydti.fawe.util.StringMan;
-import com.plotsquared.general.commands.Command.CommandException;
+import com.sk89q.minecraft.util.commands.CommandException;
 import com.sk89q.minecraft.util.commands.CommandLocals;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.command.MaskCommands;

worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/CategoryRegistry.java

@@ -37,12 +37,4 @@ public interface CategoryRegistry<T> {
     Set<T> getCategorisedByName(String category);
 
     Set<T> getAll(final Category<T> category);
-
-    /**
-     * Gets a list of categories given to a value.
-     *
-     * @param categorised The value
-     * @return A set of categories
-     */
-    Set<String> getCategories(T categorised);
 }