Now that WorldEdit has YAML handling classes, YAMLConfiguration is separate from BukkitConfiguration.

src/main/java/com/sk89q/bukkit/util/FallbackRegistrationListener.java

@@ -0,0 +1,28 @@
+package com.sk89q.bukkit.util;
+
+import org.bukkit.command.CommandMap;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+import org.bukkit.event.player.PlayerListener;
+
+/**
+* @author zml2008
+*/
+public class FallbackRegistrationListener extends PlayerListener {
+
+    private final CommandMap commandRegistration;
+
+    public FallbackRegistrationListener(CommandMap commandRegistration) {
+        this.commandRegistration = commandRegistration;
+    }
+
+    @Override
+    public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
+        if (event.isCancelled()) {
+            return;
+        }
+
+        if (commandRegistration.dispatch(event.getPlayer(), event.getMessage())) {
+            event.setCancelled(true);
+        }
+    }
+}

src/main/java/com/sk89q/worldedit/bukkit/BukkitConfiguration.java

@@ -1,125 +1,42 @@
-// $Id$
+/*
-/*
+ * WorldEdit
- * WorldEdit
+ * Copyright (C) 2011 sk89q <http://www.sk89q.com>
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
- *
+ * This program is free software: you can redistribute it and/or modify
- * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
- * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
- * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
- * (at your option) any later version.
+ *
- *
+ * This program is distributed in the hope that it will be useful,
- * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
- * GNU General Public License for more details.
+ *
- *
+ * You should have received a copy of the GNU General Public License
- * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
-*/
+
-
+package com.sk89q.worldedit.bukkit;
-package com.sk89q.worldedit.bukkit;
+
-
+import com.sk89q.util.yaml.YAMLProcessor;
-import java.io.IOException;
+import com.sk89q.worldedit.util.YAMLConfiguration;
-import java.util.HashSet;
+
-import java.util.logging.FileHandler;
+import java.util.logging.Logger;
-import java.util.logging.Handler;
+
-import java.util.logging.Level;
+/**
-import java.util.logging.Logger;
+ * YAMLConfiguration but with setting for no op permissions.
-
+ */
-import com.sk89q.util.yaml.YAMLProcessor;
+public class BukkitConfiguration extends YAMLConfiguration {
-import com.sk89q.worldedit.LocalConfiguration;
+
-import com.sk89q.worldedit.LocalSession;
+    public boolean noOpPermissions = false;
-import com.sk89q.worldedit.LogFormat;
+
-import com.sk89q.worldedit.snapshots.SnapshotRepository;
+    public BukkitConfiguration(YAMLProcessor config, Logger logger) {
-
+        super(config, logger);
-public class BukkitConfiguration extends LocalConfiguration {
+    }
-    private YAMLProcessor config;
+    
-    private Logger logger;
+    @Override
-    private FileHandler logFileHandler;
+    public void load() {
-
+        super.load();
-    public boolean noOpPermissions = false;
+        noOpPermissions = config.getBoolean("no-op-permissions", false);
-
+    }
-    public BukkitConfiguration(YAMLProcessor config, Logger logger) {
+}
-        this.config = config;
-        this.logger = logger;
-    }
-
-    @Override
-    public void load() {
-        try {
-            config.load();
-        } catch (IOException e) {
-            logger.severe("Error loading WorldEdit configuration: " + e);
-            e.printStackTrace();
-        }
-        showFirstUseVersion = false;
-
-        profile = config.getBoolean("debug", profile);
-        wandItem = config.getInt("wand-item", wandItem);
-        defaultChangeLimit = Math.max(-1, config.getInt(
-                "limits.max-blocks-changed.default", defaultChangeLimit));
-        maxChangeLimit = Math.max(-1,
-                config.getInt("limits.max-blocks-changed.maximum", maxChangeLimit));
-        maxRadius = Math.max(-1, config.getInt("limits.max-radius", maxRadius));
-        maxSuperPickaxeSize = Math.max(1, config.getInt(
-                "limits.max-super-pickaxe-size", maxSuperPickaxeSize));
-        registerHelp = true;
-        logCommands = config.getBoolean("logging.log-commands", logCommands);
-        superPickaxeDrop = config.getBoolean("super-pickaxe.drop-items",
-                superPickaxeDrop);
-        superPickaxeManyDrop = config.getBoolean(
-                "super-pickaxe.many-drop-items", superPickaxeManyDrop);
-        noDoubleSlash = config.getBoolean("no-double-slash", noDoubleSlash);
-        useInventory = config.getBoolean("use-inventory.enable", useInventory);
-        useInventoryOverride = config.getBoolean("use-inventory.allow-override",
-                useInventoryOverride);
-        maxBrushRadius = config.getInt("limits.max-brush-radius", maxBrushRadius);
-
-        navigationWand = config.getInt("navigation-wand.item", navigationWand);
-        navigationWandMaxDistance = config.getInt("navigation-wand.max-distance", navigationWandMaxDistance);
-
-        scriptTimeout = config.getInt("scripting.timeout", scriptTimeout);
-        scriptsDir = config.getString("scripting.dir", scriptsDir);
-
-        saveDir = config.getString("saving.dir", saveDir);
-
-        disallowedBlocks = new HashSet<Integer>(config.getIntList("limits.disallowed-blocks", null));
-
-        allowedDataCycleBlocks = new HashSet<Integer>(config.getIntList("limits.allowed-data-cycle-blocks", null));
-
-        noOpPermissions = config.getBoolean("no-op-permissions", false);
-
-        LocalSession.MAX_HISTORY_SIZE = Math.max(0, config.getInt("history.size", 15));
-        LocalSession.EXPIRATION_GRACE = config.getInt("history.expiration", 10) * 60 * 1000;
-
-        String snapshotsDir = config.getString("snapshots.directory", "");
-        if (!snapshotsDir.isEmpty()) {
-            snapshotRepo = new SnapshotRepository(snapshotsDir);
-        }
-
-        String type = config.getString("shell-save-type", "").trim();
-        shellSaveType = type.equals("") ? null : type;
-
-        String logFile = config.getString("logging.file", "");
-        if (!logFile.equals("")) {
-            try {
-                logFileHandler = new FileHandler(logFile, true);
-                logFileHandler.setFormatter(new LogFormat());
-                logger.addHandler(logFileHandler);
-            } catch (IOException e) {
-                logger.log(Level.WARNING, "Could not use log file " + logFile + ": "
-                        + e.getMessage());
-            }
-        } else {
-            for (Handler handler : logger.getHandlers()) {
-                logger.removeHandler(handler);
-            }
-        }
-    }
-
-    public void unload() {
-        if (logFileHandler != null) {
-            logFileHandler.close();
-        }
-    }
-}

src/main/java/com/sk89q/worldedit/util/YAMLConfiguration.java

@@ -0,0 +1,126 @@
+// $Id$
+/*
+ * WorldEdit
+ * Copyright (C) 2010 sk89q <http://www.sk89q.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package com.sk89q.worldedit.util;
+
+import com.sk89q.util.yaml.YAMLProcessor;
+import com.sk89q.worldedit.LocalConfiguration;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.LogFormat;
+import com.sk89q.worldedit.snapshots.SnapshotRepository;
+
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.logging.FileHandler;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * A less simple implementation of {@link LocalConfiguration} using YAML configuration files.
+ *
+ * @author sk89q
+ */
+public class YAMLConfiguration extends LocalConfiguration {
+    protected final YAMLProcessor config;
+    protected final Logger logger;
+    private FileHandler logFileHandler;
+
+    public YAMLConfiguration(YAMLProcessor config, Logger logger) {
+        this.config = config;
+        this.logger = logger;
+    }
+
+    @Override
+    public void load() {
+        try {
+            config.load();
+        } catch (IOException e) {
+            logger.severe("Error loading WorldEdit configuration: " + e);
+            e.printStackTrace();
+        }
+        showFirstUseVersion = false;
+
+        profile = config.getBoolean("debug", profile);
+        wandItem = config.getInt("wand-item", wandItem);
+        defaultChangeLimit = Math.max(-1, config.getInt(
+                "limits.max-blocks-changed.default", defaultChangeLimit));
+        maxChangeLimit = Math.max(-1,
+                config.getInt("limits.max-blocks-changed.maximum", maxChangeLimit));
+        maxRadius = Math.max(-1, config.getInt("limits.max-radius", maxRadius));
+        maxSuperPickaxeSize = Math.max(1, config.getInt(
+                "limits.max-super-pickaxe-size", maxSuperPickaxeSize));
+        registerHelp = true;
+        logCommands = config.getBoolean("logging.log-commands", logCommands);
+        superPickaxeDrop = config.getBoolean("super-pickaxe.drop-items",
+                superPickaxeDrop);
+        superPickaxeManyDrop = config.getBoolean(
+                "super-pickaxe.many-drop-items", superPickaxeManyDrop);
+        noDoubleSlash = config.getBoolean("no-double-slash", noDoubleSlash);
+        useInventory = config.getBoolean("use-inventory.enable", useInventory);
+        useInventoryOverride = config.getBoolean("use-inventory.allow-override",
+                useInventoryOverride);
+        maxBrushRadius = config.getInt("limits.max-brush-radius", maxBrushRadius);
+
+        navigationWand = config.getInt("navigation-wand.item", navigationWand);
+        navigationWandMaxDistance = config.getInt("navigation-wand.max-distance", navigationWandMaxDistance);
+
+        scriptTimeout = config.getInt("scripting.timeout", scriptTimeout);
+        scriptsDir = config.getString("scripting.dir", scriptsDir);
+
+        saveDir = config.getString("saving.dir", saveDir);
+
+        disallowedBlocks = new HashSet<Integer>(config.getIntList("limits.disallowed-blocks", null));
+
+        allowedDataCycleBlocks = new HashSet<Integer>(config.getIntList("limits.allowed-data-cycle-blocks", null));
+
+        LocalSession.MAX_HISTORY_SIZE = Math.max(0, config.getInt("history.size", 15));
+        LocalSession.EXPIRATION_GRACE = config.getInt("history.expiration", 10) * 60 * 1000;
+
+        String snapshotsDir = config.getString("snapshots.directory", "");
+        if (!snapshotsDir.isEmpty()) {
+            snapshotRepo = new SnapshotRepository(snapshotsDir);
+        }
+
+        String type = config.getString("shell-save-type", "").trim();
+        shellSaveType = type.equals("") ? null : type;
+
+        String logFile = config.getString("logging.file", "");
+        if (!logFile.equals("")) {
+            try {
+                logFileHandler = new FileHandler(logFile, true);
+                logFileHandler.setFormatter(new LogFormat());
+                logger.addHandler(logFileHandler);
+            } catch (IOException e) {
+                logger.log(Level.WARNING, "Could not use log file " + logFile + ": "
+                        + e.getMessage());
+            }
+        } else {
+            for (Handler handler : logger.getHandlers()) {
+                logger.removeHandler(handler);
+            }
+        }
+    }
+
+    public void unload() {
+        if (logFileHandler != null) {
+            logFileHandler.close();
+        }
+    }
+}