From bb0aa3cb91aeb060fd3c01554f640adf6a4a3bf5 Mon Sep 17 00:00:00 2001
From: sk89q <the.sk89q@gmail.com>
Date: Tue, 30 Nov 2010 20:14:01 -0800
Subject: [PATCH] Updated WE for the new Minecraft update.

---
 src/MinecraftServerInterface.java | 88 +++++++++++++++++++++++++++++++
 src/MinecraftSetBlockProxy.java   |  2 +-
 src/ServerInterface.java          | 47 +++--------------
 3 files changed, 95 insertions(+), 42 deletions(-)
 create mode 100644 src/MinecraftServerInterface.java

diff --git a/src/MinecraftServerInterface.java b/src/MinecraftServerInterface.java
new file mode 100644
index 000000000..a2327b481
--- /dev/null
+++ b/src/MinecraftServerInterface.java
@@ -0,0 +1,88 @@
+// $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/>.
+*/
+
+import java.util.logging.Logger;
+import java.util.logging.Level;
+import java.util.Random;
+import java.lang.reflect.*;
+import sun.reflect.ReflectionFactory;
+import com.sk89q.worldedit.*;
+
+/**
+ *
+ * @author sk89q
+ */
+public class MinecraftServerInterface {
+    /**
+     * Logger.
+     */
+    private static final Logger logger = Logger.getLogger("Minecraft.WorldEdit");
+    /**
+     * Random generator.
+     */
+    private static Random random = new Random();
+    /**
+     * Proxy for the tree generator.
+     */
+    private static MinecraftSetBlockProxy proxy;
+
+    /**
+     * Generate a tree at a location.
+     *
+     * @param pt
+     * @return
+     */
+    public static boolean generateTree(EditSession editSession, Vector pt) {
+        if (proxy == null) {
+            try {
+                proxy = createNoConstructor(MinecraftSetBlockProxy.class);
+            } catch (Throwable t) {
+                logger.log(Level.WARNING, "setBlock() proxy class failed to construct",
+                        t);
+                return false;
+            }
+        }
+        proxy.setEditSession(editSession);
+
+        bj treeGen = new hd();
+        return treeGen.a(proxy, random,
+                pt.getBlockX(), pt.getBlockY(), pt.getBlockZ());
+    }
+
+    /**
+     * Instantiate a class without calling its constructor.
+     *
+     * @param <T>
+     * @param clazz
+     * @return
+     * @throws Throwable
+     */
+    private static <T> T createNoConstructor(Class<T> clazz) throws Throwable {
+        try {
+            ReflectionFactory factory = ReflectionFactory.getReflectionFactory();
+            Constructor objectConstructor = Object.class.getDeclaredConstructor();
+            Constructor c = factory.newConstructorForSerialization(
+                clazz, objectConstructor
+            );
+            return clazz.cast(c.newInstance());
+        } catch (Throwable e) {
+            throw e;
+        }
+    }
+}
diff --git a/src/MinecraftSetBlockProxy.java b/src/MinecraftSetBlockProxy.java
index f0b66f18f..fafad940e 100644
--- a/src/MinecraftSetBlockProxy.java
+++ b/src/MinecraftSetBlockProxy.java
@@ -26,7 +26,7 @@ import com.sk89q.worldedit.blocks.BaseBlock;
  *
  * @author sk89q
  */
-public class MinecraftSetBlockProxy extends eo {
+public class MinecraftSetBlockProxy extends ep {
     /**
      * Edit session.
      */
diff --git a/src/ServerInterface.java b/src/ServerInterface.java
index d236670f4..8bd81e7ed 100644
--- a/src/ServerInterface.java
+++ b/src/ServerInterface.java
@@ -20,12 +20,9 @@
 import com.sk89q.worldedit.*;
 import com.sk89q.worldedit.blocks.BaseItem;
 import java.util.logging.Logger;
-import java.util.logging.Level;
 import java.util.Map;
 import java.util.HashMap;
 import java.util.Random;
-import java.lang.reflect.*;
-import sun.reflect.ReflectionFactory;
 
 /**
  *
@@ -40,10 +37,6 @@ public class ServerInterface {
      * Random generator.
      */
     private static Random random = new Random();
-    /**
-     * Proxy for the tree generator.
-     */
-    private static MinecraftSetBlockProxy proxy;
     
     /**
      * Set block type.
@@ -258,20 +251,13 @@ public class ServerInterface {
      * @return
      */
     public static boolean generateTree(EditSession editSession, Vector pt) {
-        if (proxy == null) {
-            try {
-                proxy = createNoConstructor(MinecraftSetBlockProxy.class);
-            } catch (Throwable t) {
-                logger.log(Level.WARNING, "setBlock() proxy class failed to construct",
-                        t);
-                return false;
-            }
+        try {
+            return MinecraftServerInterface.generateTree(editSession, pt);
+        } catch (Throwable t) {
+            logger.severe("Failed to create tree (do you need to update WorldEdit due to a Minecraft update?): "
+                    + t.getMessage());
+            return false;
         }
-        proxy.setEditSession(editSession);
-
-        bj treeGen = new hc();
-        return treeGen.a(proxy, random,
-                pt.getBlockX(), pt.getBlockY(), pt.getBlockZ());
     }
 
     /**
@@ -361,25 +347,4 @@ public class ServerInterface {
             dropItem(pt, type);
         }
     }
-
-    /**
-     * Instantiate a class without calling its constructor.
-     *
-     * @param <T>
-     * @param clazz
-     * @return
-     * @throws Throwable
-     */
-    private static <T> T createNoConstructor(Class<T> clazz) throws Throwable {
-        try {
-            ReflectionFactory factory = ReflectionFactory.getReflectionFactory();
-            Constructor objectConstructor = Object.class.getDeclaredConstructor();
-            Constructor c = factory.newConstructorForSerialization(
-                clazz, objectConstructor
-            );
-            return clazz.cast(c.newInstance());
-        } catch (Throwable e) {
-            throw e;
-        }
-    }
 }