From 8cd46977f3fd9b544b6134e186646d33da76cd19 Mon Sep 17 00:00:00 2001
From: Kenzie Togami <ket1999@gmail.com>
Date: Mon, 28 Dec 2015 12:05:16 -0800
Subject: [PATCH 01/28] Add paging to //schematics.

-p <int> can be used to select a page. Defaults to page 1.

First implementation by @BangL.
---
 .../worldedit/command/SchematicCommands.java  | 68 +++++++++++++++----
 1 file changed, 54 insertions(+), 14 deletions(-)

diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java
index 817be6368..74e538ea9 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java
@@ -24,8 +24,6 @@ import com.sk89q.minecraft.util.commands.CommandContext;
 import com.sk89q.minecraft.util.commands.CommandException;
 import com.sk89q.minecraft.util.commands.CommandPermissions;
 import com.sk89q.worldedit.EditSession;
-import com.sk89q.worldedit.util.io.file.FilenameException;
-import com.sk89q.worldedit.util.io.file.FilenameResolutionException;
 import com.sk89q.worldedit.LocalConfiguration;
 import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.WorldEdit;
@@ -40,8 +38,11 @@ import com.sk89q.worldedit.extent.clipboard.io.ClipboardWriter;
 import com.sk89q.worldedit.function.operation.Operations;
 import com.sk89q.worldedit.math.transform.Transform;
 import com.sk89q.worldedit.session.ClipboardHolder;
-import com.sk89q.worldedit.util.io.Closer;
+import com.sk89q.worldedit.util.command.binding.Switch;
 import com.sk89q.worldedit.util.command.parametric.Optional;
+import com.sk89q.worldedit.util.io.Closer;
+import com.sk89q.worldedit.util.io.file.FilenameException;
+import com.sk89q.worldedit.util.io.file.FilenameResolutionException;
 import com.sk89q.worldedit.world.registry.WorldData;
 
 import java.io.BufferedInputStream;
@@ -51,8 +52,10 @@ import java.io.FileFilter;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
+import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -63,6 +66,10 @@ import static com.google.common.base.Preconditions.checkNotNull;
  */
 public class SchematicCommands {
 
+    /**
+     * 9 schematics per page fits in the MC chat window.
+     */
+    private static final int SCHEMATICS_PER_PAGE = 9;
     private static final Logger log = Logger.getLogger(SchematicCommands.class.getCanonicalName());
     private final WorldEdit worldEdit;
 
@@ -244,14 +251,16 @@ public class SchematicCommands {
     @Command(
             aliases = {"list", "all", "ls"},
             desc = "List saved schematics",
-            max = 0,
-            flags = "dn",
+            min = 0,
+            max = 1,
+            flags = "dnp",
             help = "List all schematics in the schematics directory\n" +
                     " -d sorts by date, oldest first\n" +
-                    " -n sorts by date, newest first\n"
+                    " -n sorts by date, newest first\n" +
+                    " -p <page> prints the requested page\n"
     )
     @CommandPermissions("worldedit.schematic.list")
-    public void list(Actor actor, CommandContext args) throws WorldEditException {
+    public void list(Actor actor, CommandContext args, @Switch('p') @Optional("1") int page) throws WorldEditException {
         File dir = worldEdit.getWorkingDirectoryFile(worldEdit.getConfiguration().saveDir);
         File[] files = dir.listFiles(new FileFilter(){
             @Override
@@ -265,6 +274,21 @@ public class SchematicCommands {
         if (files == null) {
             throw new FilenameResolutionException(dir.getPath(), "Schematics directory invalid or not found.");
         }
+        
+        if (files.length == 0) {
+            actor.printError("No schematics found.");
+            return;
+        }
+
+        int pageCount = files.length / SCHEMATICS_PER_PAGE + 1;
+        if (page < 1) {
+            actor.printError("Page must be at least 1");
+            return;
+        }
+        if (page > pageCount) {
+            actor.printError("Page must be less than " + (pageCount + 1));
+            return;
+        }
 
         final int sortType = args.hasFlag('d') ? -1 : args.hasFlag('n') ? 1 : 0;
         // cleanup file list
@@ -283,13 +307,23 @@ public class SchematicCommands {
             }
         });
 
-        actor.print("Available schematics (Filename (Format)):");
-        actor.print(listFiles("", files));
+        List<String> schematics = listFiles("", files);
+        int offset = (page - 1) * SCHEMATICS_PER_PAGE;
+
+        actor.print("Available schematics (Filename: Format) [" + page + "/" + pageCount + "]:");
+        StringBuilder build = new StringBuilder();
+        int limit = Math.min(offset + SCHEMATICS_PER_PAGE, schematics.size());
+        for (int i = offset; i < limit; i++) {
+            build.append(schematics.get(i));
+        }
+
+        actor.print(build.toString());
     }
 
-    private String listFiles(String prefix, File[] files) {
-        StringBuilder build = new StringBuilder();
+    private List<String> listFiles(String prefix, File[] files) {
+        List<String> result = new ArrayList<String>();
         for (File file : files) {
+            StringBuilder build = new StringBuilder();
             if (file.isDirectory()) {
                 build.append(listFiles(prefix + file.getName() + "/", file.listFiles()));
                 continue;
@@ -299,10 +333,16 @@ public class SchematicCommands {
                 continue;
             }
 
-            build.append("\n\u00a79");
+            if (!result.isEmpty()) { // prevent an empty line
+                build.append('\n');
+            }
+            build.append("\u00a79");
             ClipboardFormat format = ClipboardFormat.findByFile(file);
-            build.append(prefix).append(file.getName()).append(": ").append(format == null ? "Unknown" : format.name());
+            build.append(prefix).append(file.getName())
+               .append(": ").append(format == null ? "Unknown" : format.name());
+
+            result.add(build.toString());
         }
-        return build.toString();
+        return result;
     }
 }

From 2cd4412b5dc351ec70e4b1b49d1657ce930a98d5 Mon Sep 17 00:00:00 2001
From: wizjany <wizjany@gmail.com>
Date: Wed, 13 Jan 2016 17:34:58 -0500
Subject: [PATCH 02/28] Make mask parser create world-aware expression masks.
 This allows things like //gmask =queryRel(...) to work. Also the query*
 functions now allow -1 as a wildcard for either id or data.

---
 .../worldedit/extension/factory/DefaultMaskParser.java    | 8 +++++++-
 .../worldedit/internal/expression/runtime/Functions.java  | 4 +++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/DefaultMaskParser.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/DefaultMaskParser.java
index fa2cdf163..88d4b53ac 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/DefaultMaskParser.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/DefaultMaskParser.java
@@ -37,9 +37,11 @@ import com.sk89q.worldedit.function.mask.NoiseFilter;
 import com.sk89q.worldedit.function.mask.OffsetMask;
 import com.sk89q.worldedit.function.mask.RegionMask;
 import com.sk89q.worldedit.function.mask.SolidBlockMask;
+import com.sk89q.worldedit.internal.expression.Expression;
 import com.sk89q.worldedit.internal.expression.ExpressionException;
 import com.sk89q.worldedit.internal.registry.InputParser;
 import com.sk89q.worldedit.math.noise.RandomNoise;
+import com.sk89q.worldedit.regions.shape.WorldEditExpressionEnvironment;
 import com.sk89q.worldedit.session.request.Request;
 import com.sk89q.worldedit.session.request.RequestSelection;
 import com.sk89q.worldedit.world.biome.BaseBiome;
@@ -144,7 +146,11 @@ class DefaultMaskParser extends InputParser<Mask> {
 
             case '=':
                 try {
-                    return new ExpressionMask(component.substring(1));
+                    Expression exp = Expression.compile(component.substring(1), "x", "y", "z");
+                    WorldEditExpressionEnvironment env = new WorldEditExpressionEnvironment(
+                            Request.request().getEditSession(), Vector.ONE, Vector.ZERO);
+                    exp.setEnvironment(env);
+                    return new ExpressionMask(exp);
                 } catch (ExpressionException e) {
                     throw new InputParseException("Invalid expression: " + e.getMessage());
                 }
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/internal/expression/runtime/Functions.java b/worldedit-core/src/main/java/com/sk89q/worldedit/internal/expression/runtime/Functions.java
index 1a5981855..a9cf3b684 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/internal/expression/runtime/Functions.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/internal/expression/runtime/Functions.java
@@ -442,7 +442,9 @@ public final class Functions {
 
     private static double queryInternal(RValue type, RValue data, double typeId, double dataValue) throws EvaluationException {
         // Compare to input values and determine return value
-        final double ret = (typeId == type.getValue() && dataValue == data.getValue()) ? 1.0 : 0.0;
+        // -1 is a wildcard, always true
+        final double ret = ((type.getValue() == -1 || typeId == type.getValue())
+                && (data.getValue() == -1 || dataValue == data.getValue())) ? 1.0 : 0.0;
 
         if (type instanceof LValue) {
             ((LValue) type).assign(typeId);

From 62befe7594987d070fd7c5b5d3d9fc882d4fdd2e Mon Sep 17 00:00:00 2001
From: wizjany <wizjany@gmail.com>
Date: Wed, 13 Jan 2016 18:55:49 -0500
Subject: [PATCH 03/28] Fix schematics in directories.

---
 .../worldedit/command/SchematicCommands.java  | 84 ++++++++++---------
 1 file changed, 44 insertions(+), 40 deletions(-)

diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java
index 74e538ea9..9bc9de49d 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java
@@ -42,13 +42,11 @@ import com.sk89q.worldedit.util.command.binding.Switch;
 import com.sk89q.worldedit.util.command.parametric.Optional;
 import com.sk89q.worldedit.util.io.Closer;
 import com.sk89q.worldedit.util.io.file.FilenameException;
-import com.sk89q.worldedit.util.io.file.FilenameResolutionException;
 import com.sk89q.worldedit.world.registry.WorldData;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
-import java.io.FileFilter;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -58,6 +56,7 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.regex.Pattern;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -262,19 +261,10 @@ public class SchematicCommands {
     @CommandPermissions("worldedit.schematic.list")
     public void list(Actor actor, CommandContext args, @Switch('p') @Optional("1") int page) throws WorldEditException {
         File dir = worldEdit.getWorkingDirectoryFile(worldEdit.getConfiguration().saveDir);
-        File[] files = dir.listFiles(new FileFilter(){
-            @Override
-            public boolean accept(File file) {
-                // sort out directories from the schematic list
-                // if WE supports sub-directories in the future,
-                // this will have to be changed
-                return file.isFile();
-            }
-        });
-        if (files == null) {
-            throw new FilenameResolutionException(dir.getPath(), "Schematics directory invalid or not found.");
-        }
-        
+        List<File> fileList = allFiles(dir);
+        File[] files = new File[fileList.size()];
+        fileList.toArray(files);
+
         if (files.length == 0) {
             actor.printError("No schematics found.");
             return;
@@ -295,52 +285,66 @@ public class SchematicCommands {
         Arrays.sort(files, new Comparator<File>(){
             @Override
             public int compare(File f1, File f2) {
-                // this should no longer happen, as directory-ness is checked before
-                // however, if a directory slips through, this will break the contract
-                // of comparator transitivity
-                if (!f1.isFile() || !f2.isFile()) return -1;
                 // http://stackoverflow.com/questions/203030/best-way-to-list-files-in-java-sorted-by-date-modified
-                int result = sortType == 0 ? f1.getName().compareToIgnoreCase(f2.getName()) : // use name by default
-                    Long.valueOf(f1.lastModified()).compareTo(f2.lastModified()); // use date if there is a flag
-                if (sortType == 1) result = -result; // flip date for newest first instead of oldest first
-                return result;
+                int res;
+                if (sortType == 0) { // use name by default
+                    int p = f1.getParent().compareTo(f2.getParent());
+                    if (p == 0) { // same parent, compare names
+                        res = f1.getName().compareTo(f2.getName());
+                    } else { // different parent, sort by that
+                        res = p;
+                    }
+                } else {
+                    res = Long.valueOf(f1.lastModified()).compareTo(f2.lastModified()); // use date if there is a flag
+                    if (sortType == 1) res = -res; // flip date for newest first instead of oldest first
+                }
+                return res;
             }
         });
 
-        List<String> schematics = listFiles("", files);
+        List<String> schematics = listFiles(worldEdit.getConfiguration().saveDir, files);
         int offset = (page - 1) * SCHEMATICS_PER_PAGE;
 
         actor.print("Available schematics (Filename: Format) [" + page + "/" + pageCount + "]:");
         StringBuilder build = new StringBuilder();
         int limit = Math.min(offset + SCHEMATICS_PER_PAGE, schematics.size());
-        for (int i = offset; i < limit; i++) {
+        for (int i = offset; i < limit;) {
             build.append(schematics.get(i));
+            if (++i != limit) {
+                build.append("\n");
+            }
         }
 
         actor.print(build.toString());
     }
 
+    private List<File> allFiles(File root) {
+        File[] files = root.listFiles();
+        if (files == null) return null;
+        List<File> fileList = new ArrayList<File>();
+        for (File f : files) {
+            if (f.isDirectory()) {
+                List<File> subFiles = allFiles(f);
+                if (subFiles == null) continue; // empty subdir
+                fileList.addAll(subFiles);
+            } else {
+                fileList.add(f);
+            }
+        }
+        return fileList;
+    }
+
     private List<String> listFiles(String prefix, File[] files) {
+        if (prefix == null) prefix = "";
         List<String> result = new ArrayList<String>();
         for (File file : files) {
             StringBuilder build = new StringBuilder();
-            if (file.isDirectory()) {
-                build.append(listFiles(prefix + file.getName() + "/", file.listFiles()));
-                continue;
-            }
 
-            if (!file.isFile()) {
-                continue;
-            }
-
-            if (!result.isEmpty()) { // prevent an empty line
-                build.append('\n');
-            }
-            build.append("\u00a79");
+            build.append("\u00a72");
             ClipboardFormat format = ClipboardFormat.findByFile(file);
-            build.append(prefix).append(file.getName())
-               .append(": ").append(format == null ? "Unknown" : format.name());
-
+            boolean inRoot = file.getParentFile().getName().equals(prefix);
+            build.append(inRoot ? file.getName() : file.getPath().split(Pattern.quote(prefix + File.separator))[1])
+                    .append(": ").append(format == null ? "Unknown" : format.name());
             result.add(build.toString());
         }
         return result;

From 03f8843c2021425e5279aa82f9be6177d1802eed Mon Sep 17 00:00:00 2001
From: rlf <rasmus@lockfuglsang.dk>
Date: Mon, 12 Oct 2015 16:15:50 +0200
Subject: [PATCH 04/28] More efficient chunk calculation of CuboidRegion

---
 .../sk89q/worldedit/regions/CuboidRegion.java    | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/CuboidRegion.java b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/CuboidRegion.java
index 71143b3d3..258be2c6f 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/regions/CuboidRegion.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/regions/CuboidRegion.java
@@ -300,10 +300,9 @@ public class CuboidRegion extends AbstractRegion implements FlatRegion {
         Vector min = getMinimumPoint();
         Vector max = getMaximumPoint();
 
-        for (int x = min.getBlockX(); x <= max.getBlockX(); ++x) {
-            for (int z = min.getBlockZ(); z <= max.getBlockZ(); ++z) {
-                chunks.add(new BlockVector2D(x >> ChunkStore.CHUNK_SHIFTS,
-                        z >> ChunkStore.CHUNK_SHIFTS));
+        for (int x = min.getBlockX() >> ChunkStore.CHUNK_SHIFTS; x <= max.getBlockX() >> ChunkStore.CHUNK_SHIFTS; ++x) {
+            for (int z = min.getBlockZ() >> ChunkStore.CHUNK_SHIFTS; z <= max.getBlockZ() >> ChunkStore.CHUNK_SHIFTS; ++z) {
+                chunks.add(new BlockVector2D(x, z));
             }
         }
 
@@ -317,11 +316,10 @@ public class CuboidRegion extends AbstractRegion implements FlatRegion {
         Vector min = getMinimumPoint();
         Vector max = getMaximumPoint();
 
-        for (int x = min.getBlockX(); x <= max.getBlockX(); ++x) {
-            for (int y = min.getBlockY(); y <= max.getBlockY(); ++y) {
-                for (int z = min.getBlockZ(); z <= max.getBlockZ(); ++z) {
-                    chunks.add(new BlockVector(x >> ChunkStore.CHUNK_SHIFTS,
-                            y >> ChunkStore.CHUNK_SHIFTS, z >> ChunkStore.CHUNK_SHIFTS));
+        for (int x = min.getBlockX() >> ChunkStore.CHUNK_SHIFTS; x <= max.getBlockX() >> ChunkStore.CHUNK_SHIFTS; ++x) {
+            for (int z = min.getBlockZ() >> ChunkStore.CHUNK_SHIFTS; z <= max.getBlockZ() >> ChunkStore.CHUNK_SHIFTS; ++z) {
+                for (int y = min.getBlockY() >> ChunkStore.CHUNK_SHIFTS; y <= max.getBlockY() >> ChunkStore.CHUNK_SHIFTS; ++y) {
+                    chunks.add(new BlockVector(x, y, z));
                 }
             }
         }

From 1952c6f91acc144f1b435bc627c0b46845c1650c Mon Sep 17 00:00:00 2001
From: Kenzie Togami <ket1999@gmail.com>
Date: Sun, 31 Jan 2016 21:23:51 -0800
Subject: [PATCH 05/28] Compile on JDK 6, 7, and 8

Ensure that all JDKs are supported.
---
 .travis.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7b43b6822..3c13ded18 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,8 @@ notifications:
   email: false
 before_install: chmod +x gradlew
 install: ./gradlew setupCIWorkspace -S
-matrix:
-  include:
-  - jdk: oraclejdk7
-    script: ./gradlew build -S
\ No newline at end of file
+script: ./gradlew build -S
+jdk:
+  - oraclejdk8
+  - oraclejdk7
+  - openjdk6

From c14a3dfbde68f3bfd1debb8f51499715340cf11c Mon Sep 17 00:00:00 2001
From: Kenzie Togami <ket1999@gmail.com>
Date: Sun, 31 Jan 2016 21:24:59 -0800
Subject: [PATCH 06/28] Add caching to Travis

---
 .travis.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 3c13ded18..f1f614733 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,3 +8,10 @@ jdk:
   - oraclejdk8
   - oraclejdk7
   - openjdk6
+# Caching for Gradle files, prevents hitting Maven too much.
+before_cache:
+  - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
+cache:
+  directories:
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/

From 53b8f08e5eb0d42895eea77e5d5fb24919b6cf29 Mon Sep 17 00:00:00 2001
From: Kenzie Togami <ket1999@gmail.com>
Date: Sun, 31 Jan 2016 21:25:32 -0800
Subject: [PATCH 07/28] Have Travis give less verbose stack traces

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f1f614733..d7da99ae4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,8 @@ language: java
 notifications:
   email: false
 before_install: chmod +x gradlew
-install: ./gradlew setupCIWorkspace -S
-script: ./gradlew build -S
+install: ./gradlew setupCIWorkspace -s
+script: ./gradlew build -s
 jdk:
   - oraclejdk8
   - oraclejdk7

From 9dac0b30dbde2bc0c07541f609d2c6fda180c628 Mon Sep 17 00:00:00 2001
From: Kenzie Togami <ket1999@gmail.com>
Date: Sun, 31 Jan 2016 21:27:07 -0800
Subject: [PATCH 08/28] Speed up Travis by running on non-sudo containers

See why at
https://docs.travis-ci.com/user/workers/container-based-infrastructure/
---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index d7da99ae4..e526c902f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,3 +15,6 @@ cache:
   directories:
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
+
+# Faster builds without sudo.
+sudo: false

From 982420369d7709c6732261708d1f075245d99286 Mon Sep 17 00:00:00 2001
From: Kenzie Togami <ket1999@gmail.com>
Date: Sun, 31 Jan 2016 22:26:30 -0800
Subject: [PATCH 09/28] Rewrite Closer to compile on Java 6 wrt Jar/ZipFile.

---
 .../com/sk89q/worldedit/util/io/Closer.java   | 31 +++++++++++++++++--
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/io/Closer.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/io/Closer.java
index 2e733c6ab..6b5c37efe 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/io/Closer.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/io/Closer.java
@@ -29,6 +29,7 @@ import java.util.ArrayDeque;
 import java.util.Deque;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.zip.ZipFile;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -55,6 +56,7 @@ public final class Closer implements Closeable {
 
     // only need space for 2 elements in most cases, so try to use the smallest array possible
     private final Deque<Closeable> stack = new ArrayDeque<Closeable>(4);
+    private final Deque<ZipFile> zipStack = new ArrayDeque<ZipFile>(4);
     private Throwable thrown;
 
     @VisibleForTesting Closer(Suppressor suppressor) {
@@ -73,6 +75,17 @@ public final class Closer implements Closeable {
         return closeable;
     }
 
+    /**
+     * Registers the given {@code zipFile} to be closed when this {@code Closer} is
+     * {@linkplain #close closed}.
+     *
+     * @return the given {@code closeable}
+     */
+    public <Z extends ZipFile> Z register(Z zipFile) {
+        zipStack.push(zipFile);
+        return zipFile;
+    }
+
     /**
      * Stores the given throwable and rethrows it. It will be rethrown as is if it is an
      * {@code IOException}, {@code RuntimeException} or {@code Error}. Otherwise, it will be rethrown
@@ -161,6 +174,18 @@ public final class Closer implements Closeable {
                 }
             }
         }
+        while (!zipStack.isEmpty()) {
+            ZipFile zipFile = zipStack.pop();
+            try {
+                zipFile.close();
+            } catch (Throwable e) {
+                if (throwable == null) {
+                    throwable = e;
+                } else {
+                    suppressor.suppress(zipFile, throwable, e);
+                }
+            }
+        }
 
         if (thrown == null && throwable != null) {
             Throwables.propagateIfPossible(throwable, IOException.class);
@@ -177,7 +202,7 @@ public final class Closer implements Closeable {
          * the given closeable. {@code thrown} is the exception that is actually being thrown from the
          * method. Implementations of this method should not throw under any circumstances.
          */
-        void suppress(Closeable closeable, Throwable thrown, Throwable suppressed);
+        void suppress(Object closeable, Throwable thrown, Throwable suppressed);
     }
 
     /**
@@ -188,7 +213,7 @@ public final class Closer implements Closeable {
         static final LoggingSuppressor INSTANCE = new LoggingSuppressor();
 
         @Override
-        public void suppress(Closeable closeable, Throwable thrown, Throwable suppressed) {
+        public void suppress(Object closeable, Throwable thrown, Throwable suppressed) {
             // log to the same place as Closeables
             logger.log(Level.WARNING, "Suppressing exception thrown when closing " + closeable, suppressed);
         }
@@ -217,7 +242,7 @@ public final class Closer implements Closeable {
         }
 
         @Override
-        public void suppress(Closeable closeable, Throwable thrown, Throwable suppressed) {
+        public void suppress(Object closeable, Throwable thrown, Throwable suppressed) {
             // ensure no exceptions from addSuppressed
             if (thrown == suppressed) {
                 return;

From d6db9a97908204c9e2b91ed077fd51c0d864ca4e Mon Sep 17 00:00:00 2001
From: Kenzie Togami <ket1999@gmail.com>
Date: Sun, 7 Feb 2016 09:41:29 -0800
Subject: [PATCH 10/28] Update 1.7.10 Forge version

---
 worldedit-forge/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worldedit-forge/build.gradle b/worldedit-forge/build.gradle
index f7b51a33e..6c4e6c3a4 100644
--- a/worldedit-forge/build.gradle
+++ b/worldedit-forge/build.gradle
@@ -19,7 +19,7 @@ dependencies {
 }
 
 minecraft {
-    ext.forgeVersion = "10.13.1.1225"
+    ext.forgeVersion = "10.13.4.1614-1.7.10"
     version = "1.7.10-$forgeVersion"
 
     replaceIn "com/sk89q/worldedit/forge/ForgeWorldEdit.java"

From 6757b04d24f8920d863b0685aa76310ece3a1dc3 Mon Sep 17 00:00:00 2001
From: Kenzie Togami <ket1999@gmail.com>
Date: Sun, 7 Feb 2016 10:14:33 -0800
Subject: [PATCH 11/28] Add FMP as a dependency at compile

---
 worldedit-forge/build.gradle | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/worldedit-forge/build.gradle b/worldedit-forge/build.gradle
index 6c4e6c3a4..015e0f88d 100644
--- a/worldedit-forge/build.gradle
+++ b/worldedit-forge/build.gradle
@@ -15,7 +15,8 @@ apply plugin: 'forge'
 
 dependencies {
     compile project(':worldedit-core')
-    testCompile group: 'org.mockito', name: 'mockito-core', version:'1.9.0-rc1'
+    compile group: 'codechicken', name: 'ForgeMultipart', version: '1.2.0.345', classifier: 'dev'
+    testCompile group: 'org.mockito', name: 'mockito-core', version: '1.9.0-rc1'
 }
 
 minecraft {

From 10776f27a8c7b4840c7b02b51d5947131a693b27 Mon Sep 17 00:00:00 2001
From: Kenzie Togami <ket1999@gmail.com>
Date: Sun, 7 Feb 2016 10:42:13 -0800
Subject: [PATCH 12/28] Fix dependency

---
 worldedit-forge/build.gradle | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/worldedit-forge/build.gradle b/worldedit-forge/build.gradle
index 015e0f88d..a5857ecb8 100644
--- a/worldedit-forge/build.gradle
+++ b/worldedit-forge/build.gradle
@@ -13,9 +13,16 @@ buildscript {
 
 apply plugin: 'forge'
 
+repositories {
+    maven {
+        name 'forge'
+        url 'http://files.minecraftforge.net/maven/'
+    }
+}
+
 dependencies {
     compile project(':worldedit-core')
-    compile group: 'codechicken', name: 'ForgeMultipart', version: '1.2.0.345', classifier: 'dev'
+    compile group: 'codechicken', name: 'ForgeMultipart', version: '1.7.10-1.2.0.345', classifier: 'dev'
     testCompile group: 'org.mockito', name: 'mockito-core', version: '1.9.0-rc1'
 }
 

From 7271cca89ff5ff0621dcf4ef8d4e0ac7383045ea Mon Sep 17 00:00:00 2001
From: Kenzie Togami <ket1999@gmail.com>
Date: Sun, 7 Feb 2016 14:07:41 -0800
Subject: [PATCH 13/28] Implement FMP compatibility

---
 .../sk89q/worldedit/forge/ForgeWorldEdit.java | 13 ++++++++
 .../worldedit/forge/TileEntityUtils.java      | 24 +++++++++++---
 .../forge/compat/ForgeMultipartCompat.java    | 15 +++++++++
 .../compat/ForgeMultipartExistsCompat.java    | 33 +++++++++++++++++++
 .../forge/compat/NoForgeMultipartCompat.java  | 19 +++++++++++
 worldedit-forge/src/main/resources/mcmod.info |  3 +-
 6 files changed, 101 insertions(+), 6 deletions(-)
 create mode 100644 worldedit-forge/src/main/java/com/sk89q/worldedit/forge/compat/ForgeMultipartCompat.java
 create mode 100644 worldedit-forge/src/main/java/com/sk89q/worldedit/forge/compat/ForgeMultipartExistsCompat.java
 create mode 100644 worldedit-forge/src/main/java/com/sk89q/worldedit/forge/compat/NoForgeMultipartCompat.java

diff --git a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeWorldEdit.java b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeWorldEdit.java
index 7284796e6..989865815 100644
--- a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeWorldEdit.java
+++ b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeWorldEdit.java
@@ -26,8 +26,12 @@ import com.sk89q.worldedit.WorldVector;
 import com.sk89q.worldedit.blocks.BaseItemStack;
 import com.sk89q.worldedit.event.platform.PlatformReadyEvent;
 import com.sk89q.worldedit.extension.platform.Platform;
+import com.sk89q.worldedit.forge.compat.ForgeMultipartCompat;
+import com.sk89q.worldedit.forge.compat.ForgeMultipartExistsCompat;
+import com.sk89q.worldedit.forge.compat.NoForgeMultipartCompat;
 import com.sk89q.worldedit.internal.LocalWorldAdapter;
 import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
 import cpw.mods.fml.common.Mod.Instance;
@@ -76,6 +80,7 @@ public class ForgeWorldEdit {
     private ForgePlatform platform;
     private ForgeConfiguration config;
     private File workingDir;
+    private ForgeMultipartCompat compat = new NoForgeMultipartCompat();
 
     @EventHandler
     public void preInit(FMLPreInitializationEvent event) {
@@ -87,6 +92,10 @@ public class ForgeWorldEdit {
         config = new ForgeConfiguration(this);
         config.load();
 
+        if (Loader.isModLoaded("ForgeMultipart")) {
+            compat = new ForgeMultipartExistsCompat();
+        }
+
         FMLCommonHandler.instance().bus().register(ThreadSafeCache.getInstance());
     }
 
@@ -260,6 +269,10 @@ public class ForgeWorldEdit {
         return this.workingDir;
     }
 
+    public ForgeMultipartCompat getFMPCompat() {
+        return compat;
+    }
+
     /**
      * Get the version of the WorldEdit-for-Forge implementation.
      *
diff --git a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/TileEntityUtils.java b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/TileEntityUtils.java
index fd8d6e5fe..b3706f349 100644
--- a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/TileEntityUtils.java
+++ b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/TileEntityUtils.java
@@ -81,9 +81,10 @@ final class TileEntityUtils {
             tileEntity.readFromNBT(tag);
         }
 
-        world.setTileEntity(position.getBlockX(), position.getBlockY(), position.getBlockZ(), tileEntity);
-    }
+        tileEntity = ForgeWorldEdit.inst.getFMPCompat().overrideTileEntity(world, tag, tileEntity);
 
+        setTileEntity(world, position, tileEntity);
+    }
     /**
      * Set a tile entity at the given location using the tile entity ID from
      * the tag.
@@ -95,12 +96,26 @@ final class TileEntityUtils {
     static void setTileEntity(World world, Vector position, @Nullable NBTTagCompound tag) {
         if (tag != null) {
             updateForSet(tag, position);
-            TileEntity tileEntity = TileEntity.createAndLoadEntity(tag);
+            TileEntity tileEntity = makeTileEntity(world, position, tag);
             if (tileEntity != null) {
-                world.setTileEntity(position.getBlockX(), position.getBlockY(), position.getBlockZ(), tileEntity);
+                setTileEntity(world, position, tileEntity);
             }
         }
     }
+    
+    private static TileEntity makeTileEntity(World world, Vector position,
+            NBTTagCompound tag) {
+        TileEntity normal = TileEntity.createAndLoadEntity(tag);
+        return ForgeWorldEdit.inst.getFMPCompat().overrideTileEntity(world, tag,
+                normal);
+    }
+
+    private static void setTileEntity(World world, Vector position,
+            TileEntity tileEntity) {
+        world.setTileEntity(position.getBlockX(), position.getBlockY(),
+                position.getBlockZ(), tileEntity);
+        ForgeWorldEdit.inst.getFMPCompat().sendDescPacket(world, tileEntity);
+    }
 
     /**
      * Construct a tile entity from the given class.
@@ -139,5 +154,4 @@ final class TileEntityUtils {
         return genericTE;
     }
 
-
 }
diff --git a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/compat/ForgeMultipartCompat.java b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/compat/ForgeMultipartCompat.java
new file mode 100644
index 000000000..a9e8bd0de
--- /dev/null
+++ b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/compat/ForgeMultipartCompat.java
@@ -0,0 +1,15 @@
+package com.sk89q.worldedit.forge.compat;
+
+import javax.annotation.Nullable;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+
+public interface ForgeMultipartCompat {
+
+    TileEntity overrideTileEntity(World world, @Nullable NBTTagCompound tag,
+            TileEntity normal);
+
+    void sendDescPacket(World world, TileEntity entity);
+
+}
diff --git a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/compat/ForgeMultipartExistsCompat.java b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/compat/ForgeMultipartExistsCompat.java
new file mode 100644
index 000000000..1f5c82f30
--- /dev/null
+++ b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/compat/ForgeMultipartExistsCompat.java
@@ -0,0 +1,33 @@
+package com.sk89q.worldedit.forge.compat;
+
+import codechicken.multipart.MultipartHelper;
+import codechicken.multipart.TileMultipart;
+import javax.annotation.Nullable;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+
+public class ForgeMultipartExistsCompat implements ForgeMultipartCompat {
+
+    @Override
+    public TileEntity overrideTileEntity(World world,
+            @Nullable NBTTagCompound tag, TileEntity normal) {
+        if (tag == null) {
+            return normal;
+        }
+        TileEntity tile = MultipartHelper.createTileFromNBT(world, tag);
+        if (tile == null) {
+            return normal;
+        }
+        return tile;
+    }
+
+    @Override
+    public void sendDescPacket(World world, TileEntity entity) {
+        if (entity instanceof TileMultipart) {
+            TileMultipart multi = (TileMultipart) entity;
+            MultipartHelper.sendDescPacket(world, multi);
+        }
+    }
+
+}
diff --git a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/compat/NoForgeMultipartCompat.java b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/compat/NoForgeMultipartCompat.java
new file mode 100644
index 000000000..229a9ba40
--- /dev/null
+++ b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/compat/NoForgeMultipartCompat.java
@@ -0,0 +1,19 @@
+package com.sk89q.worldedit.forge.compat;
+
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+
+public class NoForgeMultipartCompat implements ForgeMultipartCompat {
+
+    @Override
+    public TileEntity overrideTileEntity(World world, NBTTagCompound tag,
+            TileEntity normal) {
+        return normal;
+    }
+
+    @Override
+    public void sendDescPacket(World world, TileEntity entity) {
+    }
+
+}
diff --git a/worldedit-forge/src/main/resources/mcmod.info b/worldedit-forge/src/main/resources/mcmod.info
index df47ddfac..f3f2f5b98 100644
--- a/worldedit-forge/src/main/resources/mcmod.info
+++ b/worldedit-forge/src/main/resources/mcmod.info
@@ -14,7 +14,8 @@
         "Forge@[${forgeVersion},)"
     ],
     "dependencies": [
-        "Forge@[${forgeVersion},)"
+        "Forge@[${forgeVersion},)",
+        "ForgeMultipart"
     ],
     "dependants": []
 }]

From 4088f26d198ba48ed4fbdfd63748bf45455a01dc Mon Sep 17 00:00:00 2001
From: Kenzie Togami <ket1999@gmail.com>
Date: Sun, 7 Feb 2016 14:21:24 -0800
Subject: [PATCH 14/28] Fix checkstyle errors

---
 config/checkstyle/import-control.xml          |  1 +
 .../forge/compat/ForgeMultipartCompat.java    | 19 +++++++++++++++++++
 .../compat/ForgeMultipartExistsCompat.java    | 18 ++++++++++++++++++
 .../forge/compat/NoForgeMultipartCompat.java  | 19 +++++++++++++++++++
 4 files changed, 57 insertions(+)

diff --git a/config/checkstyle/import-control.xml b/config/checkstyle/import-control.xml
index 7a5600470..1209aa71d 100644
--- a/config/checkstyle/import-control.xml
+++ b/config/checkstyle/import-control.xml
@@ -48,6 +48,7 @@
     </subpackage>
 
     <subpackage name="forge">
+      <allow pkg="codechicken.multipart"/>
       <allow pkg="cpw"/>
       <allow pkg="net.minecraft"/>
       <allow pkg="net.minecraftforge"/>
diff --git a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/compat/ForgeMultipartCompat.java b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/compat/ForgeMultipartCompat.java
index a9e8bd0de..00d1615e1 100644
--- a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/compat/ForgeMultipartCompat.java
+++ b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/compat/ForgeMultipartCompat.java
@@ -1,3 +1,22 @@
+/*
+ * 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.forge.compat;
 
 import javax.annotation.Nullable;
diff --git a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/compat/ForgeMultipartExistsCompat.java b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/compat/ForgeMultipartExistsCompat.java
index 1f5c82f30..d1b4752e4 100644
--- a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/compat/ForgeMultipartExistsCompat.java
+++ b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/compat/ForgeMultipartExistsCompat.java
@@ -1,3 +1,21 @@
+/*
+ * 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.forge.compat;
 
 import codechicken.multipart.MultipartHelper;
diff --git a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/compat/NoForgeMultipartCompat.java b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/compat/NoForgeMultipartCompat.java
index 229a9ba40..316509689 100644
--- a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/compat/NoForgeMultipartCompat.java
+++ b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/compat/NoForgeMultipartCompat.java
@@ -1,3 +1,22 @@
+/*
+ * 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.forge.compat;
 
 import net.minecraft.nbt.NBTTagCompound;

From 136c66868f20ca19cc6c46495e88acecaedad5e8 Mon Sep 17 00:00:00 2001
From: Kenzie Togami <ket1999@gmail.com>
Date: Mon, 22 Feb 2016 17:01:09 -0800
Subject: [PATCH 15/28] Move sponge dependency to mcmod

---
 .../main/java/com/sk89q/worldedit/forge/ForgeWorldEdit.java    | 2 +-
 worldedit-forge/src/main/resources/mcmod.info                  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeWorldEdit.java b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeWorldEdit.java
index 2ba05bf28..5ae29054e 100644
--- a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeWorldEdit.java
+++ b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeWorldEdit.java
@@ -59,7 +59,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 /**
  * The Forge implementation of WorldEdit.
  */
-@Mod(modid = ForgeWorldEdit.MOD_ID, name = "WorldEdit", version = "%VERSION%", acceptableRemoteVersions = "*", dependencies = "after:sponge")
+@Mod(modid = ForgeWorldEdit.MOD_ID, name = "WorldEdit", version = "%VERSION%", acceptableRemoteVersions = "*")
 public class ForgeWorldEdit {
 
     public static Logger logger;
diff --git a/worldedit-forge/src/main/resources/mcmod.info b/worldedit-forge/src/main/resources/mcmod.info
index b21a45185..02b53f838 100644
--- a/worldedit-forge/src/main/resources/mcmod.info
+++ b/worldedit-forge/src/main/resources/mcmod.info
@@ -14,7 +14,8 @@
         "Forge@[${forgeVersion},)"
     ],
     "dependencies": [
-        "Forge@[${forgeVersion},)"
+        "Forge@[${forgeVersion},)",
+        "sponge"
     ],
     "dependants": []
 }]

From a9fc46cef620c2b8b7cd97bd2ff47411f3e67e30 Mon Sep 17 00:00:00 2001
From: Kenzie Togami <ket1999@gmail.com>
Date: Mon, 22 Feb 2016 17:11:29 -0800
Subject: [PATCH 16/28] Correlate modids in code and mcmod.info

---
 worldedit-forge/src/main/resources/mcmod.info | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worldedit-forge/src/main/resources/mcmod.info b/worldedit-forge/src/main/resources/mcmod.info
index 02b53f838..599e2f5e1 100644
--- a/worldedit-forge/src/main/resources/mcmod.info
+++ b/worldedit-forge/src/main/resources/mcmod.info
@@ -1,5 +1,5 @@
 [{
-    "modid": "WorldEdit",
+    "modid": "worldedit",
     "name": "WorldEdit",
     "description": "WorldEdit is an easy-to-use in-game world editor for Minecraft, supporting both single player and multiplayer.",
     "version": "${internalVersion}",

From 74167b8b9f86870842b392a4cf34ae68e22b346b Mon Sep 17 00:00:00 2001
From: Kenzie Togami <ket1999@gmail.com>
Date: Mon, 22 Feb 2016 17:37:45 -0800
Subject: [PATCH 17/28] Update forge version.

Not really needed, but why not?
---
 worldedit-forge/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worldedit-forge/build.gradle b/worldedit-forge/build.gradle
index 2873f5608..e977bee24 100644
--- a/worldedit-forge/build.gradle
+++ b/worldedit-forge/build.gradle
@@ -27,7 +27,7 @@ repositories {
 }
 
 version = "6.1.1"
-ext.forgeVersion = "11.15.0.1695"
+ext.forgeVersion = "11.15.1.1760"
 ext.internalVersion = version + ";" + gitCommitHash
 
 minecraft {

From fb52a86eae56aed82b3b5b43f71adb23f1dd5d42 Mon Sep 17 00:00:00 2001
From: Kenzie Togami <ket1999@gmail.com>
Date: Mon, 22 Feb 2016 17:40:18 -0800
Subject: [PATCH 18/28] Update shadow plugin in build.gradle

Needed to build this with the latest Gradle release.
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index fbe0f78ad..aebadd65e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.0'
+        classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.3'
         classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:3.0.1'
         classpath 'org.ajoberstar:gradle-git:0.12.0'
     }

From 775075d3a732fdffea28cdb650c98fce90548864 Mon Sep 17 00:00:00 2001
From: Kenzie Togami <ket1999@gmail.com>
Date: Mon, 22 Feb 2016 17:41:03 -0800
Subject: [PATCH 19/28] Update gradle wrapper to 2.11.

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 53636 -> 53638 bytes
 gradle/wrapper/gradle-wrapper.properties |   4 ++--
 gradlew.bat                              |   2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 13372aef5e24af05341d49695ee84e5f9b594659..5ccda13e9cb94678ba179b32452cf3d60dc36353 100644
GIT binary patch
delta 2494
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
ZNX!=^01=ow(TPLsg{!-~g;BK(_%D0s@`L~Y

delta 2495
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
DxnnmS

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7f72d79da..b2c6e7a02 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Jan 12 02:06:32 PST 2016
+#Mon Feb 22 17:40:44 PST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-bin.zip
diff --git a/gradlew.bat b/gradlew.bat
index aec99730b..72d362daf 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -46,7 +46,7 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
 if "%@eval[2+2]" == "4" goto 4NT_args

From e53fb782d4fd4dbf8b375ae17eee5c3d1088949b Mon Sep 17 00:00:00 2001
From: Kenzie Togami <ket1999@gmail.com>
Date: Mon, 22 Feb 2016 18:21:46 -0800
Subject: [PATCH 20/28] Disable Grgit on 6.

It appears to be incompatible.
---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index aebadd65e..63aa60726 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,7 +28,7 @@ buildscript {
     dependencies {
         classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.3'
         classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:3.0.1'
-        classpath 'org.ajoberstar:gradle-git:0.12.0'
+        classpath 'org.ajoberstar:gradle-git:1.4.2'
     }
 }
 
@@ -36,7 +36,7 @@ if (!project.hasProperty("artifactory_contextUrl")) ext.artifactory_contextUrl =
 if (!project.hasProperty("artifactory_user")) ext.artifactory_user = "guest"
 if (!project.hasProperty("artifactory_password")) ext.artifactory_password = ""
 
-if (!project.hasProperty("gitCommitHash")) {
+if (!project.hasProperty("gitCommitHash") && !JavaVersion.current().isJava6()) {
     try {
         def repo = org.ajoberstar.grgit.Grgit.open(project.file('.'))
         ext.gitCommitHash = repo.head().abbreviatedId

From 698a610eaa8a6051e2a9e460be07055154d316fb Mon Sep 17 00:00:00 2001
From: Kenzie Togami <ket1999@gmail.com>
Date: Mon, 22 Feb 2016 18:31:55 -0800
Subject: [PATCH 21/28] Kill lock files in cache.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e526c902f..05606e10a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ jdk:
   - openjdk6
 # Caching for Gradle files, prevents hitting Maven too much.
 before_cache:
-  - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
+  - find $HOME/.gradle/ -name '*.lock' -print -exec 'rm -f {} \;'
 cache:
   directories:
     - $HOME/.gradle/caches/

From a1680886a461e1ca17fc92f925955aa404546d2b Mon Sep 17 00:00:00 2001
From: Kenzie Togami <ket1999@gmail.com>
Date: Mon, 22 Feb 2016 19:13:08 -0800
Subject: [PATCH 22/28] Weird hack for java6. I hope it works.

---
 build.gradle | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 63aa60726..264c20903 100644
--- a/build.gradle
+++ b/build.gradle
@@ -38,9 +38,12 @@ if (!project.hasProperty("artifactory_password")) ext.artifactory_password = ""
 
 if (!project.hasProperty("gitCommitHash") && !JavaVersion.current().isJava6()) {
     try {
-        def repo = org.ajoberstar.grgit.Grgit.open(project.file('.'))
+        def Grgit = Class.forName("org.ajoberstar.grgit.Grgit");
+        def Grgit_open = Grgit.getDeclaredMethod("open", File.class)
+        def repo = Grgit_open.invoke(null, project.file('.'))
         ext.gitCommitHash = repo.head().abbreviatedId
     } catch (Exception e) {
+        println "Error getting commit hash: " + e.getMessage()
         ext.gitCommitHash = "no_git_id"
     }
 }

From a64a53db7ff68acefbfef329b66b7f97abc00711 Mon Sep 17 00:00:00 2001
From: Kenzie Togami <ket1999@gmail.com>
Date: Mon, 22 Feb 2016 19:16:14 -0800
Subject: [PATCH 23/28] Default gitCommitHash

---
 build.gradle | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 264c20903..144b8de13 100644
--- a/build.gradle
+++ b/build.gradle
@@ -44,9 +44,11 @@ if (!project.hasProperty("gitCommitHash") && !JavaVersion.current().isJava6()) {
         ext.gitCommitHash = repo.head().abbreviatedId
     } catch (Exception e) {
         println "Error getting commit hash: " + e.getMessage()
-        ext.gitCommitHash = "no_git_id"
     }
 }
+if (!project.hasProperty("gitCommitHash")) {
+    ext.gitCommitHash = "no_git_id"
+}
 
 subprojects {
     apply plugin: 'java'

From f5c015317eedcdcba9f56fe77dced71de67de6af Mon Sep 17 00:00:00 2001
From: Kenzie Togami <ket1999@gmail.com>
Date: Mon, 22 Feb 2016 19:22:30 -0800
Subject: [PATCH 24/28] Fix finding locks

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 05606e10a..9321cf073 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ jdk:
   - openjdk6
 # Caching for Gradle files, prevents hitting Maven too much.
 before_cache:
-  - find $HOME/.gradle/ -name '*.lock' -print -exec 'rm -f {} \;'
+  - find $HOME/.gradle/ -name '*.lock' -print -exec rm -f {} \;
 cache:
   directories:
     - $HOME/.gradle/caches/

From de3578137b90a83e7b9322c6792fb0a7482244af Mon Sep 17 00:00:00 2001
From: wizjany <wizjany@gmail.com>
Date: Wed, 2 Mar 2016 18:14:18 -0500
Subject: [PATCH 25/28] Add bukkit adapter for MC 1.9.

---
 .../bukkit/adapter/impl/Spigot_v1_9_R1.class    | Bin 0 -> 14795 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 worldedit-bukkit/src/main/resources/com/sk89q/worldedit/bukkit/adapter/impl/Spigot_v1_9_R1.class

diff --git a/worldedit-bukkit/src/main/resources/com/sk89q/worldedit/bukkit/adapter/impl/Spigot_v1_9_R1.class b/worldedit-bukkit/src/main/resources/com/sk89q/worldedit/bukkit/adapter/impl/Spigot_v1_9_R1.class
new file mode 100644
index 0000000000000000000000000000000000000000..77edca3290e5d9d476666edf807cbe21268562b0
GIT binary patch
literal 14795
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
T#~=T#%+2Rl)HUk5`M&=LN2nK6

literal 0
HcmV?d00001


From 79290caaa7e0eab78e38787128148f80f7e877d0 Mon Sep 17 00:00:00 2001
From: Wyatt Childers <wchilders@nearce.com>
Date: Sat, 5 Mar 2016 16:10:03 -0500
Subject: [PATCH 26/28] Fixed a bug where virtually all mobs were determined to
 be Animals on the Forge 1.8 platform

---
 .../main/java/com/sk89q/worldedit/forge/ForgeEntityType.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeEntityType.java b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeEntityType.java
index 8fb19f3cd..c56375105 100644
--- a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeEntityType.java
+++ b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeEntityType.java
@@ -36,6 +36,7 @@ import net.minecraft.entity.item.EntityTNTPrimed;
 import net.minecraft.entity.item.EntityXPOrb;
 import net.minecraft.entity.monster.EntityGolem;
 import net.minecraft.entity.passive.EntityAmbientCreature;
+import net.minecraft.entity.passive.EntityAnimal;
 import net.minecraft.entity.passive.EntityTameable;
 import net.minecraft.entity.passive.IAnimals;
 import net.minecraft.entity.player.EntityPlayer;
@@ -108,7 +109,7 @@ public class ForgeEntityType implements EntityType {
 
     @Override
     public boolean isAnimal() {
-        return entity instanceof IAnimals;
+        return entity instanceof EntityAnimal;
     }
 
     @Override

From 6c03eea9b183687f5259c21a6bd27cffebcc1656 Mon Sep 17 00:00:00 2001
From: wizjany <wizjany@gmail.com>
Date: Mon, 7 Mar 2016 19:26:16 -0500
Subject: [PATCH 27/28] Force compilation on newer bukkit api. Since spigot
 like pulling the rug out from under us. Fixes WORLDEDIT-3400.

---
 worldedit-bukkit/build.gradle | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/worldedit-bukkit/build.gradle b/worldedit-bukkit/build.gradle
index ed882a1c0..cc23519df 100644
--- a/worldedit-bukkit/build.gradle
+++ b/worldedit-bukkit/build.gradle
@@ -1,11 +1,14 @@
 apply plugin: 'eclipse'
 apply plugin: 'idea'
 
+repositories {
+    maven { url "https://hub.spigotmc.org/nexus/content/groups/public" }
+}
+
 dependencies {
     compile project(':worldedit-core')
     compile 'com.sk89q:dummypermscompat:1.8'
-    compile 'org.sk89q.bukkit:bukkit-classloader-check:1.7.9-R0.2'
-    compile 'org.bukkit:bukkit:1.7.9-R0.2'
+    compile 'org.bukkit:bukkit:1.8.8-R0.1-SNAPSHOT' // zzz
     testCompile 'org.mockito:mockito-core:1.9.0-rc1'
 }
 

From 94ae1be2d1fa1d4a19e83816f22029d0d0b1e9a8 Mon Sep 17 00:00:00 2001
From: wizjany <wizjany@gmail.com>
Date: Tue, 8 Mar 2016 12:42:23 -0500
Subject: [PATCH 28/28] Fix NPE when using //schem list with not schematics
 present.

---
 .../com/sk89q/worldedit/command/SchematicCommands.java     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java
index 9bc9de49d..9439f8184 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/SchematicCommands.java
@@ -262,14 +262,15 @@ public class SchematicCommands {
     public void list(Actor actor, CommandContext args, @Switch('p') @Optional("1") int page) throws WorldEditException {
         File dir = worldEdit.getWorkingDirectoryFile(worldEdit.getConfiguration().saveDir);
         List<File> fileList = allFiles(dir);
-        File[] files = new File[fileList.size()];
-        fileList.toArray(files);
 
-        if (files.length == 0) {
+        if (fileList.isEmpty()) {
             actor.printError("No schematics found.");
             return;
         }
 
+        File[] files = new File[fileList.size()];
+        fileList.toArray(files);
+
         int pageCount = files.length / SCHEMATICS_PER_PAGE + 1;
         if (page < 1) {
             actor.printError("Page must be at least 1");