Cleaned up some code, changed WorldEdit to be world-aware (finally).

src/com/sk89q/worldedit/ServerInterface.java

@@ -15,113 +15,92 @@
  *
  * 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;
 
 import com.sk89q.worldedit.blocks.BaseItemStack;
 
 /**
- *
+ * 
  * @author sk89q
  */
 public abstract class ServerInterface {
-    /**
-     * Instance.
-     */
-    private static ServerInterface instance;
-    
-    /**
-     * Get the current instance.
-     * 
-     * @return
-     */
-    public static ServerInterface getInstance() {
-        return instance;
-    }
-    
-    /**
-     * Set up an instance.
-     * @param instance
-     */
-    public static void setup(ServerInterface instance) {
-        ServerInterface.instance = instance;
-    }
-    
     /**
      * Set block type.
-     *
+     * 
      * @param pt
      * @param type
      * @return
      */
-    public abstract boolean setBlockType(Vector pt, int type);
-    
+    public abstract boolean setBlockType(LocalWorld world, Vector pt, int type);
+
     /**
      * Get block type.
-     *
+     * 
      * @param pt
      * @return
      */
-    public abstract int getBlockType(Vector pt);
+    public abstract int getBlockType(LocalWorld world, Vector pt);
 
     /**
      * Set block data.
-     *
+     * 
      * @param pt
      * @param data
      * @return
      */
-    public abstract void setBlockData(Vector pt, int data);
+    public abstract void setBlockData(LocalWorld world, Vector pt, int data);
 
     /**
      * Get block data.
-     *
+     * 
      * @param pt
      * @return
      */
-    public abstract int getBlockData(Vector pt);
-    
+    public abstract int getBlockData(LocalWorld world, Vector pt);
+
     /**
      * Set sign text.
-     *
+     * 
      * @param pt
      * @param text
      */
-    public abstract void setSignText(Vector pt, String[] text);
-    
+    public abstract void setSignText(LocalWorld world, Vector pt, String[] text);
+
     /**
      * Get sign text.
-     *
+     * 
      * @param pt
      * @return
      */
-    public abstract String[] getSignText(Vector pt);
+    public abstract String[] getSignText(LocalWorld world, Vector pt);
 
     /**
      * Gets the contents of chests. Will return null if the chest does not
      * really exist or it is the second block for a double chest.
-     *
+     * 
      * @param pt
      * @return
      */
-    public abstract BaseItemStack[] getChestContents(Vector pt);
+    public abstract BaseItemStack[] getChestContents(LocalWorld world, Vector pt);
 
     /**
      * Sets a chest slot.
-     *
+     * 
      * @param pt
      * @param contents
      * @return
      */
-    public abstract boolean setChestContents(Vector pt, BaseItemStack[] contents);
+    public abstract boolean setChestContents(LocalWorld world, Vector pt,
+            BaseItemStack[] contents);
 
     /**
      * Clear a chest's contents.
      * 
      * @param pt
      */
-    public abstract boolean clearChest(Vector pt);
+    public abstract boolean clearChest(LocalWorld world, Vector pt);
 
     /**
      * Checks if a mob type is valid.
@@ -133,19 +112,20 @@ public abstract class ServerInterface {
 
     /**
      * Set mob spawner mob type.
-     *
+     * 
      * @param pt
      * @param mobType
      */
-    public abstract void setMobSpawnerType(Vector pt, String mobType);
+    public abstract void setMobSpawnerType(LocalWorld world, Vector pt,
+            String mobType);
 
     /**
      * Get mob spawner mob type. May return an empty string.
-     *
+     * 
      * @param pt
      * @param mobType
      */
-    public abstract String getMobSpawnerType(Vector pt);
+    public abstract String getMobSpawnerType(LocalWorld world, Vector pt);
 
     /**
      * Generate a tree at a location.
@@ -153,45 +133,48 @@ public abstract class ServerInterface {
      * @param pt
      * @return
      */
-    public abstract boolean generateTree(EditSession editSession, Vector pt);
+    public abstract boolean generateTree(EditSession editSession,
+            LocalWorld world, Vector pt);
 
     /**
      * Drop an item.
-     *
+     * 
      * @param pt
      * @param type
      * @param count
      * @param times
      */
-    public abstract void dropItem(Vector pt, int type, int count, int times);
+    public abstract void dropItem(LocalWorld world, Vector pt, int type,
+            int count, int times);
 
     /**
      * Drop an item.
-     *
+     * 
      * @param pt
      * @param type
      * @param count
      * @param times
      */
-    public abstract void dropItem(Vector pt, int type, int count);
+    public abstract void dropItem(LocalWorld world, Vector pt, int type,
+            int count);
 
     /**
      * Drop an item.
-     *
+     * 
      * @param pt
      * @param type
      * @param count
      * @param times
      */
-    public abstract void dropItem(Vector pt, int type);
+    public abstract void dropItem(LocalWorld world, Vector pt, int type);
 
     /**
      * Simulate a block being mined.
      * 
      * @param pt
      */
-    public abstract void simulateBlockMine(Vector pt);
-    
+    public abstract void simulateBlockMine(LocalWorld world, Vector pt);
+
     /**
      * Resolves an item name to its ID.
      * 
@@ -207,5 +190,5 @@ public abstract class ServerInterface {
      * @param radius
      * @return
      */
-    public abstract int killMobs(Vector origin, int radius);
+    public abstract int killMobs(LocalWorld world, Vector origin, int radius);
 }