Revert "Upstream, generics, formatting"

This reverts commit cd88e513a8.

worldedit-core/src/main/java/com/boydti/fawe/jnbt/anvil/HeightMapMCAGenerator.java

@@ -217,10 +217,10 @@ public class HeightMapMCAGenerator extends MCAWriter implements StreamChange, Dr
         super(width, length, regionFolder);
 
         blocks = new DifferentialBlockBuffer(width, length);
-        heights = new DifferentialArray<>(new byte[getArea()]);
-        biomes = new DifferentialArray<>(new byte[getArea()]);
-        floor = new DifferentialArray<>(new int[getArea()]);
-        main = new DifferentialArray<>(new int[getArea()]);
+        heights = new DifferentialArray(new byte[getArea()]);
+        biomes = new DifferentialArray(new byte[getArea()]);
+        floor = new DifferentialArray(new int[getArea()]);
+        main = new DifferentialArray(new int[getArea()]);
 
         int stone = BlockID.STONE;
         int grass = BlockTypes.GRASS_BLOCK.getDefaultState().with(PropertyKey.SNOWY, false).getInternalId();

worldedit-core/src/main/java/com/boydti/fawe/jnbt/anvil/MCAChunk.java

@@ -6,6 +6,7 @@ import com.boydti.fawe.object.FaweChunk;
 import com.boydti.fawe.object.FaweQueue;
 import com.boydti.fawe.object.io.FastByteArrayOutputStream;
 import com.boydti.fawe.object.number.MutableLong;
+import com.boydti.fawe.util.ArrayUtil;
 import com.boydti.fawe.util.MainUtil;
 import com.boydti.fawe.util.MathMan;
 import com.boydti.fawe.util.ReflectionUtils;
@@ -190,8 +191,8 @@ public class MCAChunk extends FaweChunk<Void> {
                             setNibble(endIndex, thisSkyLight, (byte) 0);
                             setNibble(endIndex, thisBlockLight, (byte) 0);
                         }
-                        Arrays.fill(thisBlockLight, startIndexShift, endIndex + 1, (byte) 0);
-                        Arrays.fill(thisBlockLight, startIndexShift, endIndexShift + 1, (byte) 0);
+                        ArrayUtil.fill(thisSkyLight, startIndexShift, endIndexShift + 1, (byte) 0);
+                        ArrayUtil.fill(thisBlockLight, startIndexShift, endIndexShift + 1, (byte) 0);
                     }
                 }
                 continue;
@@ -291,8 +292,8 @@ public class MCAChunk extends FaweChunk<Void> {
                     if (otherIds == null) {
                         if (currentIds != null) {
                             Arrays.fill(currentIds, indexStart, indexEnd, 0);
-                            Arrays.fill(skyLight[thisLayer], indexStartShift, indexEndShift, (byte) 0);
-                            Arrays.fill(blockLight[thisLayer], indexStartShift, indexEndShift, (byte) 0);
+                            ArrayUtil.fill(skyLight[thisLayer], indexStartShift, indexEndShift, (byte) 0);
+                            ArrayUtil.fill(blockLight[thisLayer], indexStartShift, indexEndShift, (byte) 0);
                         }
                     } else {
                         if (currentIds == null) {
@@ -319,8 +320,8 @@ public class MCAChunk extends FaweChunk<Void> {
                         continue;
                     }
                     Arrays.fill(thisIds, thisStartIndex, thisStartIndex + 256, 0);
-                    Arrays.fill(this.skyLight[thisLayer], thisStartIndexShift, thisStartIndexShift + 128, (byte) 0);
-                    Arrays.fill(this.blockLight[thisLayer], thisStartIndexShift, thisStartIndexShift + 128, (byte) 0);
+                    ArrayUtil.fill(this.skyLight[thisLayer], thisStartIndexShift, thisStartIndexShift + 128, (byte) 0);
+                    ArrayUtil.fill(this.blockLight[thisLayer], thisStartIndexShift, thisStartIndexShift + 128, (byte) 0);
                     continue;
                 } else if (thisIds == null) {
                     ids[thisLayer] = thisIds = new int[4096];

worldedit-core/src/main/java/com/boydti/fawe/jnbt/anvil/MCAFile.java

@@ -56,9 +56,24 @@ public class MCAFile {
     private final int X, Z;
     private final Int2ObjectOpenHashMap<MCAChunk> chunks = new Int2ObjectOpenHashMap<>();
 
-    final ThreadLocal<byte[]> byteStore1 = ThreadLocal.withInitial(() -> new byte[4096]);
-    final ThreadLocal<byte[]> byteStore2 = ThreadLocal.withInitial(() -> new byte[4096]);
-    final ThreadLocal<byte[]> byteStore3 = ThreadLocal.withInitial(() -> new byte[1024]);
+    final ThreadLocal<byte[]> byteStore1 = new ThreadLocal<byte[]>() {
+        @Override
+        protected byte[] initialValue() {
+            return new byte[4096];
+        }
+    };
+    final ThreadLocal<byte[]> byteStore2 = new ThreadLocal<byte[]>() {
+        @Override
+        protected byte[] initialValue() {
+            return new byte[4096];
+        }
+    };
+    final ThreadLocal<byte[]> byteStore3 = new ThreadLocal<byte[]>() {
+        @Override
+        protected byte[] initialValue() {
+            return new byte[1024];
+        }
+    };
 
     public MCAFile(FaweQueue parent, File file) {
         this.queue = parent;
@@ -189,10 +204,9 @@ public class MCAFile {
         if (offset == 0) {
             return null;
         }
-        MCAChunk chunk;
-        try (NBTInputStream nis = getChunkIS(offset)) {
-            chunk = new MCAChunk(nis, queue, cx, cz, false);
-        }
+        NBTInputStream nis = getChunkIS(offset);
+        MCAChunk chunk = new MCAChunk(nis, queue, cx, cz, false);
+        nis.close();
         int pair = MathMan.pair((short) (cx & 31), (short) (cz & 31));
         synchronized (chunks) {
             chunks.put(pair, chunk);
@@ -333,6 +347,7 @@ public class MCAFile {
     public void streamChunk(byte[] data, RunnableVal<NBTStreamer> withStream) throws IOException {
         if (data != null) {
             try {
+                FastByteArrayInputStream nbtIn = new FastByteArrayInputStream(data);
                 FastByteArrayInputStream bais = new FastByteArrayInputStream(data);
                 InflaterInputStream iis = new InflaterInputStream(bais, new Inflater(), 1);
                 fieldBuf2.set(iis, byteStore2.get());
@@ -377,7 +392,8 @@ public class MCAFile {
             return null;
         }
         byte[] uncompressed = chunk.toBytes(byteStore3.get());
-        return MainUtil.compress(uncompressed, byteStore2.get(), null);
+        byte[] compressed = MainUtil.compress(uncompressed, byteStore2.get(), null);
+        return compressed;
     }
 
     private byte[] getChunkBytes(int cx, int cz) throws Exception {
@@ -493,21 +509,24 @@ public class MCAFile {
                     modified = true;
                     chunk.setLastUpdate(now);
                     if (!chunk.isDeleted()) {
-                        pool.submit(() -> {
-                            try {
-                                byte[] compressed = toBytes(chunk);
-                                int pair = MathMan.pair((short) (chunk.getX() & 31), (short) (chunk.getZ() & 31));
-                                Int2ObjectOpenHashMap<byte[]> map;
-                                if (getOffset(chunk.getX(), chunk.getZ()) == 0) {
-                                    map = append;
-                                } else {
-                                    map = compressedMap;
+                        pool.submit(new Runnable() {
+                            @Override
+                            public void run() {
+                                try {
+                                    byte[] compressed = toBytes(chunk);
+                                    int pair = MathMan.pair((short) (chunk.getX() & 31), (short) (chunk.getZ() & 31));
+                                    Int2ObjectOpenHashMap map;
+                                    if (getOffset(chunk.getX(), chunk.getZ()) == 0) {
+                                        map = append;
+                                    } else {
+                                        map = compressedMap;
+                                    }
+                                    synchronized (map) {
+                                        map.put(pair, compressed);
+                                    }
+                                } catch (Throwable e) {
+                                    e.printStackTrace();
                                 }
-                                synchronized (map) {
-                                    map.put(pair, compressed);
-                                }
-                            } catch (Throwable e) {
-                                e.printStackTrace();
                             }
                         });
                     }

worldedit-core/src/main/java/com/boydti/fawe/jnbt/anvil/MCAQueue.java

@@ -1,6 +1,7 @@
 package com.boydti.fawe.jnbt.anvil;
 
 import com.boydti.fawe.Fawe;
+import com.boydti.fawe.example.IntFaweChunk;
 import com.boydti.fawe.example.NMSMappedFaweQueue;
 import com.boydti.fawe.example.NullFaweChunk;
 import com.boydti.fawe.jnbt.anvil.filters.DelegateMCAFilter;
@@ -17,7 +18,6 @@ import com.boydti.fawe.util.MainUtil;
 import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.world.biome.BiomeType;
-
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -25,6 +25,11 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import java.nio.file.attribute.BasicFileAttributes;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.TimeUnit;
 
@@ -34,7 +39,12 @@ public class MCAQueue extends NMSMappedFaweQueue<FaweQueue, FaweChunk, FaweChunk
     private NMSMappedFaweQueue parentNMS;
     private final boolean hasSky;
     private final File saveFolder;
-    private final ThreadLocal<MutableMCABackedBaseBlock> blockStore = ThreadLocal.withInitial(MutableMCABackedBaseBlock::new);
+    private final ThreadLocal<MutableMCABackedBaseBlock> blockStore = new ThreadLocal<MutableMCABackedBaseBlock>() {
+        @Override
+        protected MutableMCABackedBaseBlock initialValue() {
+            return new MutableMCABackedBaseBlock();
+        }
+    };
 
     @Override
     protected void finalize() throws Throwable {
@@ -114,7 +124,7 @@ public class MCAQueue extends NMSMappedFaweQueue<FaweQueue, FaweChunk, FaweChunk
         boolean changed = false;
             for (int otherCZ = otherBCZ; otherCZ <= otherTCZ; otherCZ++) {
             for (int otherCX = otherBCX; otherCX <= otherTCX; otherCX++) {
-                FaweChunk<? extends Object> chunk;
+                FaweChunk chunk;
                 synchronized (this) {
                     chunk = this.getFaweChunk(otherCX, otherCZ);
                 }
@@ -192,7 +202,7 @@ public class MCAQueue extends NMSMappedFaweQueue<FaweQueue, FaweChunk, FaweChunk
                             int tz = bz + 15;
                             if (oX == 0 && oZ == 0) {
                                 if (bx >= regionTo.minX && tx <= regionTo.maxX && bz >= regionTo.minZ && tz <= regionTo.maxZ) {
-                                    FaweChunk<? extends Object> chunk = from.getFaweChunk(cx - oCX, cz - oCZ);
+                                    FaweChunk chunk = from.getFaweChunk(cx - oCX, cz - oCZ);
                                     if (!(chunk instanceof NullFaweChunk)) {
 //                                        if (regionTo.minY == 0 && regionTo.maxY == 255) {
 //                                            System.out.println("Vertical");
@@ -241,7 +251,7 @@ public class MCAQueue extends NMSMappedFaweQueue<FaweQueue, FaweChunk, FaweChunk
                             int cbz = (cz << 4) - oZ;
                             for (int otherCZ = otherBCZ; otherCZ <= otherTCZ; otherCZ++) {
                                 for (int otherCX = otherBCX; otherCX <= otherTCX; otherCX++) {
-                                    FaweChunk<? extends Object> chunk = from.getFaweChunk(otherCX, otherCZ);
+                                    FaweChunk chunk = from.getFaweChunk(otherCX, otherCZ);
                                     if (!(chunk instanceof NullFaweChunk)) {
                                         MCAChunk other = (MCAChunk) chunk;
                                         int ocbx = otherCX << 4;
@@ -437,7 +447,7 @@ public class MCAQueue extends NMSMappedFaweQueue<FaweQueue, FaweChunk, FaweChunk
         final int minMCAZ = region.minZ >> 9;
         final int maxMCAX = region.maxX >> 9;
         final int maxMCAZ = region.maxZ >> 9;
-        long mcaArea = (maxMCAX - minMCAX + 1L) * (maxMCAZ - minMCAZ + 1L);
+        long mcaArea = (maxMCAX - minMCAX + 1l) * (maxMCAZ - minMCAZ + 1l);
         if (mcaArea < 128) {
             this.filterWorld(delegate, new RunnableVal2<Path, RunnableVal2<Path, BasicFileAttributes>>() {
                 @Override
@@ -504,46 +514,49 @@ public class MCAQueue extends NMSMappedFaweQueue<FaweQueue, FaweChunk, FaweChunk
                             finalFile.forEachSortedChunk(new RunnableVal4<Integer, Integer, Integer, Integer>() {
                                 @Override
                                 public void run(final Integer rcx, final Integer rcz, Integer offset, Integer size) {
-                                    pool.submit(() -> {
-                                        try {
-                                            int cx = cbx + rcx;
-                                            int cz = cbz + rcz;
-                                            if (filter.appliesChunk(cx, cz)) {
-                                                MCAChunk chunk = finalFile.getChunk(cx, cz);
-                                                try {
-                                                    final G value = filter.get();
-                                                    chunk = filter.applyChunk(chunk, value);
-                                                    if (chunk != null) {
-                                                        final MutableMCABackedBaseBlock mutableBlock = blockStore.get();
-                                                        mutableBlock.setChunk(chunk);
-                                                        int bx = cx << 4;
-                                                        int bz = cz << 4;
-                                                        for (int layer = 0; layer < 16; layer++) {
-                                                            if (chunk.doesSectionExist(layer)) {
-                                                                mutableBlock.setArrays(layer);
-                                                                int yStart = layer << 4;
-                                                                int index = 0;
-                                                                for (int y = yStart; y < yStart + 16; y++) {
-                                                                    mutableBlock.setY(y);
-                                                                    for (int z = bz; z < bz + 16; z++) {
-                                                                        mutableBlock.setZ(z);
-                                                                        for (int x = bx; x < bx + 16; x++, index++) {
-                                                                            mutableBlock.setX(x);
-                                                                            mutableBlock.setIndex(index);
-                                                                            filter.applyBlock(x, y, z, mutableBlock, value);
+                                    pool.submit(new Runnable() {
+                                        @Override
+                                        public void run() {
+                                            try {
+                                                int cx = cbx + rcx;
+                                                int cz = cbz + rcz;
+                                                if (filter.appliesChunk(cx, cz)) {
+                                                    MCAChunk chunk = finalFile.getChunk(cx, cz);
+                                                    try {
+                                                        final G value = filter.get();
+                                                        chunk = filter.applyChunk(chunk, value);
+                                                        if (chunk != null) {
+                                                            final MutableMCABackedBaseBlock mutableBlock = blockStore.get();
+                                                            mutableBlock.setChunk(chunk);
+                                                            int bx = cx << 4;
+                                                            int bz = cz << 4;
+                                                            for (int layer = 0; layer < 16; layer++) {
+                                                                if (chunk.doesSectionExist(layer)) {
+                                                                    mutableBlock.setArrays(layer);
+                                                                    int yStart = layer << 4;
+                                                                    int index = 0;
+                                                                    for (int y = yStart; y < yStart + 16; y++) {
+                                                                        mutableBlock.setY(y);
+                                                                        for (int z = bz; z < bz + 16; z++) {
+                                                                            mutableBlock.setZ(z);
+                                                                            for (int x = bx; x < bx + 16; x++, index++) {
+                                                                                mutableBlock.setX(x);
+                                                                                mutableBlock.setIndex(index);
+                                                                                filter.applyBlock(x, y, z, mutableBlock, value);
+                                                                            }
                                                                         }
                                                                     }
                                                                 }
                                                             }
+                                                            filter.finishChunk(chunk, value);
                                                         }
-                                                        filter.finishChunk(chunk, value);
+                                                    } catch (Throwable e) {
+                                                        e.printStackTrace();
                                                     }
-                                                } catch (Throwable e) {
-                                                    e.printStackTrace();
                                                 }
+                                            } catch (Throwable e) {
+                                                e.printStackTrace();
                                             }
-                                        } catch (Throwable e) {
-                                            e.printStackTrace();
                                         }
                                     });
                                 }
@@ -555,8 +568,8 @@ public class MCAQueue extends NMSMappedFaweQueue<FaweQueue, FaweChunk, FaweChunk
                                 try {
                                     original.close(pool);
                                     file.delete();
-                                } catch (Throwable e) {
-                                    e.printStackTrace();
+                                } catch (Throwable ignore) {
+                                    ignore.printStackTrace();
                                 }
                             }
                             pool.awaitQuiescence(Long.MAX_VALUE, TimeUnit.MILLISECONDS);
@@ -566,8 +579,8 @@ public class MCAQueue extends NMSMappedFaweQueue<FaweQueue, FaweChunk, FaweChunk
                             file.delete();
                         }
                     }
-                } catch (Throwable e) {
-                    e.printStackTrace();
+                } catch (Throwable ignore) {
+                    ignore.printStackTrace();
                 }
             }
         };
@@ -597,6 +610,15 @@ public class MCAQueue extends NMSMappedFaweQueue<FaweQueue, FaweChunk, FaweChunk
         });
     }
 
+    public <G, T extends MCAFilter<G>> T filterWorld(final T filter, Comparator<File> comparator) {
+        return filterWorld(filter, new RunnableVal2<Path, RunnableVal2<Path, BasicFileAttributes>>() {
+            @Override
+            public void run(Path value1, RunnableVal2<Path, BasicFileAttributes> value2) {
+                MainUtil.forEachFile(value1, value2, comparator);
+            }
+        });
+    }
+
     @Override
     public boolean supports(Capability capability) {
         if (capability == Capability.CHANGE_TASKS) {

worldedit-core/src/main/java/com/boydti/fawe/jnbt/anvil/filters/RemoveLayerFilter.java

@@ -3,6 +3,7 @@ package com.boydti.fawe.jnbt.anvil.filters;
 import com.boydti.fawe.jnbt.anvil.MCAChunk;
 import com.boydti.fawe.jnbt.anvil.MCAFilterCounter;
 import com.boydti.fawe.object.number.MutableLong;
+import com.boydti.fawe.util.ArrayUtil;
 import com.sk89q.worldedit.world.block.BlockTypes;
 
 import java.util.Arrays;

worldedit-core/src/main/java/com/boydti/fawe/object/DelegateConsumer.java

@@ -3,9 +3,9 @@ package com.boydti.fawe.object;
 import java.util.function.Consumer;
 
 public abstract class DelegateConsumer<T> implements Consumer<T> {
-    private final Consumer<T> parent;
+    private final Consumer parent;
 
-    public DelegateConsumer(Consumer<T> parent) {
+    public DelegateConsumer(Consumer parent) {
         this.parent = parent;
     }
 

worldedit-core/src/main/java/com/boydti/fawe/object/change/CFIChange.java

@@ -23,7 +23,7 @@ public class CFIChange implements Change {
     }
 
     private HeightMapMCAGenerator getQueue(UndoContext context) {
-        ExtentTraverser found = new ExtentTraverser<>(context.getExtent()).find(HasFaweQueue.class);
+        ExtentTraverser found = new ExtentTraverser(context.getExtent()).find(HasFaweQueue.class);
         if (found != null) {
             FaweQueue queue = ((HasFaweQueue) found.get()).getQueue();
             if (queue instanceof HeightMapMCAGenerator) return (HeightMapMCAGenerator) queue;

worldedit-core/src/main/java/com/boydti/fawe/object/change/MutableBlockChange.java

@@ -44,7 +44,7 @@ public class MutableBlockChange implements Change {
         if (!checkedQueue) {
             checkedQueue = true;
             Extent extent = context.getExtent();
-            ExtentTraverser found = new ExtentTraverser<>(extent).find(HasFaweQueue.class);
+            ExtentTraverser found = new ExtentTraverser(extent).find(HasFaweQueue.class);
             if (found != null) {
                 (queue = ((HasFaweQueue) found.get()).getQueue()).setBlock(x, y, z, combinedId);
             } else {

worldedit-core/src/main/java/com/boydti/fawe/object/change/MutableChunkChange.java

@@ -43,7 +43,7 @@ public class MutableChunkChange implements Change {
         if (!checkedQueue) {
             checkedQueue = true;
             Extent extent = context.getExtent();
-            ExtentTraverser found = new ExtentTraverser<>(extent).find(HasFaweQueue.class);
+            ExtentTraverser found = new ExtentTraverser(extent).find(HasFaweQueue.class);
             if (found != null) {
                 perform(queue = ((HasFaweQueue) found.get()).getQueue(), undo);
             } else {
@@ -68,4 +68,4 @@ public class MutableChunkChange implements Change {
             queue.setChunk(to);
         }
     }
-}
+}

worldedit-core/src/main/java/com/boydti/fawe/object/change/MutableEntityChange.java

@@ -48,7 +48,7 @@ public class MutableEntityChange implements Change {
 
     public void delete(UndoContext context) {
         Extent extent = context.getExtent();
-        ExtentTraverser<FastWorldEditExtent> find = new ExtentTraverser<>(extent).find(FastWorldEditExtent.class);
+        ExtentTraverser<FastWorldEditExtent> find = new ExtentTraverser(extent).find(FastWorldEditExtent.class);
         if (find != null) {
             FastWorldEditExtent fwee = find.get();
             Map<String, Tag> map = tag.getValue();
@@ -85,7 +85,7 @@ public class MutableEntityChange implements Change {
         if (!checkedQueue) {
             checkedQueue = true;
             Extent extent = context.getExtent();
-            ExtentTraverser found = new ExtentTraverser<>(extent).find(HasFaweQueue.class);
+            ExtentTraverser found = new ExtentTraverser(extent).find(HasFaweQueue.class);
             if (found != null) {
                 perform(queue = ((HasFaweQueue) found.get()).getQueue());
             } else {

worldedit-core/src/main/java/com/boydti/fawe/object/change/MutableFullBlockChange.java

@@ -51,7 +51,7 @@ public class MutableFullBlockChange implements Change {
         if (!checkedQueue) {
             checkedQueue = true;
             Extent extent = context.getExtent();
-            ExtentTraverser found = new ExtentTraverser<>(extent).find(HasFaweQueue.class);
+            ExtentTraverser found = new ExtentTraverser(extent).find(HasFaweQueue.class);
             if (found != null) {
                 perform(queue = ((HasFaweQueue) found.get()).getQueue());
             } else {

worldedit-core/src/main/java/com/boydti/fawe/object/change/MutableTileChange.java

@@ -47,7 +47,7 @@ public class MutableTileChange implements Change {
         if (!checkedQueue) {
             checkedQueue = true;
             Extent extent = context.getExtent();
-            ExtentTraverser found = new ExtentTraverser<>(extent).find(HasFaweQueue.class);
+            ExtentTraverser found = new ExtentTraverser(extent).find(HasFaweQueue.class);
             if (found != null) {
                 perform(queue = ((HasFaweQueue) found.get()).getQueue());
             } else {

worldedit-core/src/main/java/com/boydti/fawe/object/changeset/DiskStorageHistory.java

@@ -43,10 +43,10 @@ public class DiskStorageHistory extends FaweStreamChangeSet {
 
     /*
      * Block data
-     *
+     * 
      * [header]
      * {int origin x, int origin z}
-     *
+     * 
      * [contents]...
      * { short rel x, short rel z, unsigned byte y, short combinedFrom, short combinedTo }
      */
@@ -143,6 +143,10 @@ public class DiskStorageHistory extends FaweStreamChangeSet {
         deleteFiles();
     }
 
+    public void undo(FawePlayer fp) {
+        undo(fp, null);
+    }
+
     public void redo(FawePlayer fp, Region[] regions) {
         EditSession session = toEditSession(fp, regions);
         session.redo(session);
@@ -519,6 +523,6 @@ public class DiskStorageHistory extends FaweStreamChangeSet {
 	@Override
 	public void setRecordChanges(boolean recordChanges) {
 		// TODO Auto-generated method stub
-
+		
 	}
 }

worldedit-core/src/main/java/com/boydti/fawe/object/changeset/MutableAnvilChange.java

@@ -34,7 +34,7 @@ public class MutableAnvilChange implements Change {
         if (!checkedQueue) {
             checkedQueue = true;
             Extent extent = context.getExtent();
-            ExtentTraverser found = new ExtentTraverser<>(extent).find(HasFaweQueue.class);
+            ExtentTraverser found = new ExtentTraverser(extent).find(HasFaweQueue.class);
             if (found != null) {
                 queue = ((HasFaweQueue) found.get()).getQueue();
                 destDir = queue.getSaveFolder().toPath();
@@ -51,11 +51,14 @@ public class MutableAnvilChange implements Change {
             Files.move(source, dest, StandardCopyOption.ATOMIC_MOVE);
         } catch (IOException ignore) {
             int[] coords = MainUtil.regionNameToCoords(source.toString());
-            queue.setMCA(coords[0], coords[1], RegionWrapper.GLOBAL(), () -> {
-                try {
-                    Files.move(source, dest, StandardCopyOption.ATOMIC_MOVE);
-                } catch (IOException e1) {
-                    e1.printStackTrace();
+            queue.setMCA(coords[0], coords[1], RegionWrapper.GLOBAL(), new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        Files.move(source, dest, StandardCopyOption.ATOMIC_MOVE);
+                    } catch (IOException e1) {
+                        e1.printStackTrace();
+                    }
                 }
             }, false, true);
         }

worldedit-core/src/main/java/com/boydti/fawe/object/collection/ObjObjMap.java

@@ -5,232 +5,229 @@ import java.util.Arrays;
 
 import static it.unimi.dsi.fastutil.HashCommon.arraySize;
 
-public class ObjObjMap<K, V> {
+public class ObjObjMap<K, V>
+{
     private static final Object FREE_KEY = new Object();
     private static final Object REMOVED_KEY = new Object();
 
-    /**
-     * Keys and values
-     */
+    /** Keys and values */
     private Object[] m_data;
 
-    /**
-     * Value for the null key (if inserted into a map)
-     */
+    /** Value for the null key (if inserted into a map) */
     private Object m_nullValue;
     private boolean m_hasNull;
 
-    /**
-     * Fill factor, must be between (0 and 1)
-     */
+    /** Fill factor, must be between (0 and 1) */
     private final float m_fillFactor;
-    /**
-     * We will resize a map once it reaches this size
-     */
+    /** We will resize a map once it reaches this size */
     private int m_threshold;
-    /**
-     * Current map size
-     */
+    /** Current map size */
     private int m_size;
-    /**
-     * Mask to calculate the original position
-     */
+    /** Mask to calculate the original position */
     private int m_mask;
-    /**
-     * Mask to wrap the actual array pointer
-     */
+    /** Mask to wrap the actual array pointer */
     private int m_mask2;
 
-    public ObjObjMap(final int size, final float fillFactor) {
-        if (fillFactor <= 0 || fillFactor >= 1) {
-            throw new IllegalArgumentException("FillFactor must be in (0, 1)");
-        }
-        if (size <= 0) {
-            throw new IllegalArgumentException("Size must be positive!");
-        }
+    public ObjObjMap( final int size, final float fillFactor )
+    {
+        if ( fillFactor <= 0 || fillFactor >= 1 )
+            throw new IllegalArgumentException( "FillFactor must be in (0, 1)" );
+        if ( size <= 0 )
+            throw new IllegalArgumentException( "Size must be positive!" );
         final int capacity = arraySize(size, fillFactor);
         m_mask = capacity - 1;
         m_mask2 = capacity * 2 - 1;
         m_fillFactor = fillFactor;
 
         m_data = new Object[capacity * 2];
-        Arrays.fill(m_data, FREE_KEY);
+        Arrays.fill( m_data, FREE_KEY );
 
         m_threshold = (int) (capacity * fillFactor);
     }
 
-    public V get(@Nonnull final K key) {
+    public V get( @Nonnull final K key )
+    {
 //        if ( key == null )
 //            return (V) m_nullValue; //we null it on remove, so safe not to check a flag here
 
         int ptr = (key.hashCode() & m_mask) << 1;
-        Object k = m_data[ptr];
+        Object k = m_data[ ptr ];
 
 //        if ( k == FREE_KEY )
 //            return null;  //end of chain already
-        if (k == (key)) //we check FREE and REMOVED prior to this call
+        if ( k == ( key ) ) //we check FREE and REMOVED prior to this call
+            return (V) m_data[ ptr + 1 ];
+        while ( true )
         {
-            return (V) m_data[ptr + 1];
-        }
-        while (true) {
             ptr = (ptr + 2) & m_mask2; //that's next index
-            k = m_data[ptr];
+            k = m_data[ ptr ];
 //            if ( k == FREE_KEY )
 //                return null;
-            if (k == (key)) {
-                return (V) m_data[ptr + 1];
-            }
+            if ( k == ( key ) )
+                return (V) m_data[ ptr + 1 ];
         }
     }
 
-    public V put(final K key, final V value) {
-        if (key == null) {
+    public V put( final K key, final V value )
+    {
+        if ( key == null )
             return insertNullKey(value);
-        }
 
         int ptr = getStartIndex(key) << 1;
         Object k = m_data[ptr];
 
-        if (k == FREE_KEY) //end of chain already
+        if ( k == FREE_KEY ) //end of chain already
         {
-            m_data[ptr] = key;
-            m_data[ptr + 1] = value;
-            if (m_size >= m_threshold) {
-                rehash(m_data.length * 2); //size is set inside
-            } else {
+            m_data[ ptr ] = key;
+            m_data[ ptr + 1 ] = value;
+            if ( m_size >= m_threshold )
+                rehash( m_data.length * 2 ); //size is set inside
+            else
                 ++m_size;
-            }
             return null;
-        } else if (k == (key)) //we check FREE and REMOVED prior to this call
+        }
+        else if ( k == ( key ) ) //we check FREE and REMOVED prior to this call
         {
-            final Object ret = m_data[ptr + 1];
-            m_data[ptr + 1] = value;
+            final Object ret = m_data[ ptr + 1 ];
+            m_data[ ptr + 1 ] = value;
             return (V) ret;
         }
 
         int firstRemoved = -1;
-        if (k == REMOVED_KEY) {
+        if ( k == REMOVED_KEY )
             firstRemoved = ptr; //we may find a key later
-        }
 
-        while (true) {
-            ptr = (ptr + 2) & m_mask2; //that's next index calculation
-            k = m_data[ptr];
-            if (k == FREE_KEY) {
-                if (firstRemoved != -1) {
+        while ( true )
+        {
+            ptr = ( ptr + 2 ) & m_mask2; //that's next index calculation
+            k = m_data[ ptr ];
+            if ( k == FREE_KEY )
+            {
+                if ( firstRemoved != -1 )
                     ptr = firstRemoved;
-                }
-                m_data[ptr] = key;
-                m_data[ptr + 1] = value;
-                if (m_size >= m_threshold) {
-                    rehash(m_data.length * 2); //size is set inside
-                } else {
+                m_data[ ptr ] = key;
+                m_data[ ptr + 1 ] = value;
+                if ( m_size >= m_threshold )
+                    rehash( m_data.length * 2 ); //size is set inside
+                else
                     ++m_size;
-                }
                 return null;
-            } else if (k == (key)) {
-                final Object ret = m_data[ptr + 1];
-                m_data[ptr + 1] = value;
+            }
+            else if ( k == ( key ) )
+            {
+                final Object ret = m_data[ ptr + 1 ];
+                m_data[ ptr + 1 ] = value;
                 return (V) ret;
-            } else if (k == REMOVED_KEY) {
-                if (firstRemoved == -1) {
+            }
+            else if ( k == REMOVED_KEY )
+            {
+                if ( firstRemoved == -1 )
                     firstRemoved = ptr;
-                }
             }
         }
     }
 
-    public V remove(final K key) {
-        if (key == null) {
+    public V remove( final K key )
+    {
+        if ( key == null )
             return removeNullKey();
-        }
 
         int ptr = getStartIndex(key) << 1;
-        Object k = m_data[ptr];
-        if (k == FREE_KEY) {
+        Object k = m_data[ ptr ];
+        if ( k == FREE_KEY )
             return null;  //end of chain already
-        } else if (k == (key)) //we check FREE and REMOVED prior to this call
+        else if ( k == ( key ) ) //we check FREE and REMOVED prior to this call
         {
             --m_size;
-            if (m_data[(ptr + 2) & m_mask2] == FREE_KEY) {
-                m_data[ptr] = FREE_KEY;
-            } else {
-                m_data[ptr] = REMOVED_KEY;
-            }
-            final V ret = (V) m_data[ptr + 1];
-            m_data[ptr + 1] = null;
+            if ( m_data[ ( ptr + 2 ) & m_mask2 ] == FREE_KEY )
+                m_data[ ptr ] = FREE_KEY;
+            else
+                m_data[ ptr ] = REMOVED_KEY;
+            final V ret = (V) m_data[ ptr + 1 ];
+            m_data[ ptr + 1 ] = null;
             return ret;
         }
-        while (true) {
-            ptr = (ptr + 2) & m_mask2; //that's next index calculation
-            k = m_data[ptr];
-            if (k == FREE_KEY) {
+        while ( true )
+        {
+            ptr = ( ptr + 2 ) & m_mask2; //that's next index calculation
+            k = m_data[ ptr ];
+            if ( k == FREE_KEY )
                 return null;
-            } else if (k == (key)) {
+            else if ( k == ( key ) )
+            {
                 --m_size;
-                if (m_data[(ptr + 2) & m_mask2] == FREE_KEY) {
-                    m_data[ptr] = FREE_KEY;
-                } else {
-                    m_data[ptr] = REMOVED_KEY;
-                }
-                final V ret = (V) m_data[ptr + 1];
-                m_data[ptr + 1] = null;
+                if ( m_data[ ( ptr + 2 ) & m_mask2 ] == FREE_KEY )
+                    m_data[ ptr ] = FREE_KEY;
+                else
+                    m_data[ ptr ] = REMOVED_KEY;
+                final V ret = (V) m_data[ ptr + 1 ];
+                m_data[ ptr + 1 ] = null;
                 return ret;
             }
         }
     }
 
-    private V insertNullKey(final V value) {
-        if (m_hasNull) {
+    private V insertNullKey(final V value)
+    {
+        if ( m_hasNull )
+        {
             final Object ret = m_nullValue;
             m_nullValue = value;
             return (V) ret;
-        } else {
+        }
+        else
+        {
             m_nullValue = value;
             ++m_size;
             return null;
         }
     }
 
-    private V removeNullKey() {
-        if (m_hasNull) {
+    private V removeNullKey()
+    {
+        if ( m_hasNull )
+        {
             final Object ret = m_nullValue;
             m_nullValue = null;
             m_hasNull = false;
             --m_size;
             return (V) ret;
-        } else {
+        }
+        else
+        {
             return null;
         }
     }
 
-    public int size() {
+    public int size()
+    {
         return m_size;
     }
 
-    private void rehash(final int newCapacity) {
-        m_threshold = (int) (newCapacity / 2 * m_fillFactor);
-        m_mask = newCapacity / 2 - 1;
+    private void rehash( final int newCapacity )
+    {
+        m_threshold = (int) (newCapacity/2 * m_fillFactor);
+        m_mask = newCapacity/2 - 1;
         m_mask2 = newCapacity - 1;
 
         final int oldCapacity = m_data.length;
         final Object[] oldData = m_data;
 
-        m_data = new Object[newCapacity];
-        Arrays.fill(m_data, FREE_KEY);
+        m_data = new Object[ newCapacity ];
+        Arrays.fill( m_data, FREE_KEY );
 
         m_size = m_hasNull ? 1 : 0;
 
-        for (int i = 0; i < oldCapacity; i += 2) {
-            final Object oldKey = oldData[i];
-            if (oldKey != FREE_KEY && oldKey != REMOVED_KEY) {
-                put((K) oldKey, (V) oldData[i + 1]);
-            }
+        for ( int i = 0; i < oldCapacity; i += 2 ) {
+            final Object oldKey = oldData[ i ];
+            if( oldKey != FREE_KEY && oldKey != REMOVED_KEY )
+                put( (K)oldKey, (V)oldData[ i + 1 ]);
         }
     }
 
-    public int getStartIndex(final Object key) {
+    public int getStartIndex( final Object key )
+    {
         //key is not null here
         return key.hashCode() & m_mask;
     }
-}
+}

worldedit-core/src/main/java/com/boydti/fawe/object/collection/SummedAreaTable.java

@@ -28,9 +28,10 @@ public class SummedAreaTable {
 
     public void processSummedAreaTable() {
         int rowSize = source.length / width;
+        int colSize = width;
         int index = 0;
         for (int i = 0; i < rowSize; i++) {
-            for (int j = 0; j < width; j++, index++) {
+            for (int j = 0; j < colSize; j++, index++) {
                 long val = getVal(i, j, index, source[index]);
                 summed[index] = val;
             }
@@ -93,4 +94,4 @@ public class SummedAreaTable {
             return curr + leftSum + topSum - topLeftSum;
         }
     }
-}
+}

worldedit-core/src/main/java/com/boydti/fawe/object/extent/MultiTransform.java

@@ -28,7 +28,7 @@ public class MultiTransform extends RandomTransform {
     @Override
     public void add(ResettableExtent extent, double chance) {
         super.add(extent, chance);
-        this.extents = getExtents().toArray(new ResettableExtent[0]);
+        this.extents = getExtents().toArray(new ResettableExtent[getExtents().size()]);
     }
 
     @Override

worldedit-core/src/main/java/com/boydti/fawe/object/visitor/Fast2DIterator.java

@@ -4,7 +4,9 @@ import com.boydti.fawe.config.Settings;
 import com.boydti.fawe.example.MappedFaweQueue;
 import com.boydti.fawe.object.FaweQueue;
 import com.boydti.fawe.object.HasFaweQueue;
+import com.boydti.fawe.util.ExtentTraverser;
 import com.sk89q.worldedit.EditSession;
+import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.math.BlockVector2;
 
 import java.util.Iterator;
@@ -20,13 +22,17 @@ public class Fast2DIterator implements Iterable<BlockVector2> {
         this(iter, (HasFaweQueue) extent);
     }
 
+    public Fast2DIterator(@Nonnull Iterable<? extends BlockVector2> iter, @Nullable Extent extent) {
+        this(iter, (HasFaweQueue) (extent != null ? (extent instanceof HasFaweQueue ? extent : new ExtentTraverser(extent).findAndGet(HasFaweQueue.class)) : null));
+    }
+
     public Fast2DIterator(@Nonnull Iterable<? extends BlockVector2> iter, @Nullable HasFaweQueue editSession) {
         this(iter, (FaweQueue) (editSession != null ? editSession.getQueue() : null));
     }
 
     public Fast2DIterator(@Nonnull Iterable<? extends BlockVector2> iter, @Nullable FaweQueue faweQueue) {
         this.iterable = iter;
-        this.queue = faweQueue instanceof MappedFaweQueue ? (MappedFaweQueue) faweQueue : null;
+        this.queue = faweQueue != null && faweQueue instanceof MappedFaweQueue ? (MappedFaweQueue) faweQueue : null;
     }
 
     public Iterable<? extends BlockVector2> getIterable() {

worldedit-core/src/main/java/com/boydti/fawe/regions/general/plot/PlotTrim.java

@@ -124,7 +124,10 @@ public class PlotTrim {
             @Override
             public boolean appliesFile(int mcaX, int mcaZ) {
                 ChunkLoc loc = new ChunkLoc(mcaX, mcaZ);
-                return !mcas.contains(loc);
+                if (mcas.contains(loc)) {
+                    return false;
+                }
+                return true;
             }
 
             @Override

worldedit-core/src/main/java/com/boydti/fawe/util/ArrayUtil.java

@@ -0,0 +1,27 @@
+package com.boydti.fawe.util;
+
+import java.util.Arrays;
+
+public class ArrayUtil {
+    public static final void fill(byte[] a, int fromIndex, int toIndex, byte val) {
+        for (int i = fromIndex; i < toIndex; i++) a[i] = val;
+    }
+
+    public static final void fill(char[] a, int fromIndex, int toIndex, char val) {
+        for (int i = fromIndex; i < toIndex; i++) a[i] = val;
+    }
+
+    public static <T> T[] concatAll(T[] first, T[]... rest) {
+        int totalLength = first.length;
+        for (T[] array : rest) {
+            totalLength += array.length;
+        }
+        T[] result = Arrays.copyOf(first, totalLength);
+        int offset = first.length;
+        for (T[] array : rest) {
+            System.arraycopy(array, 0, result, offset, array.length);
+            offset += array.length;
+        }
+        return result;
+    }
+}

worldedit-core/src/main/java/com/boydti/fawe/util/BrushCache.java

@@ -20,7 +20,6 @@ import java.util.WeakHashMap;
 public final class BrushCache {
     private static final WeakHashMap<Object, BrushTool> brushCache = new WeakHashMap<>();
     private static final Gson gson = new GsonBuilder().setPrettyPrinting().create();
-    private static final ThreadLocal<Boolean> RECURSION = new ThreadLocal<>();
 
     private static final CompoundTag getNBT(BaseItem item) {
         return item.hasNbtData() ? item.getNbtData() : null;
@@ -30,29 +29,21 @@ public final class BrushCache {
         return item.getNativeItem();
     }
 
+    private static final ThreadLocal<Boolean> RECURSION = new ThreadLocal<>();
+
     public static final BrushTool getTool(Player player, LocalSession session, BaseItem item) {
-        if (!item.hasNbtData()) {
-            return null;
-        }
+        if (!item.hasNbtData()) return null;
         Object key = getKey(item);
-        if (key == null) {
-            return null;
-        }
+        if (key == null) return null;
         BrushTool cached = brushCache.get(key);
-        if (cached != null) {
-            return cached;
-        }
+        if (cached != null) return cached;
 
         CompoundTag nbt = item.getNbtData();
-        if (nbt == null) {
-            return null;
-        }
+        if (nbt == null) return null;
         StringTag json = (StringTag) nbt.getValue().get("weBrushJson");
         if (json != null) {
             try {
-                if (RECURSION.get() != null) {
-                    return null;
-                }
+                if (RECURSION.get() != null) return null;
                 RECURSION.set(true);
 
                 BrushTool tool = BrushTool.fromString(player, session, json.getValue());
@@ -73,16 +64,12 @@ public final class BrushCache {
 
     public static BrushTool getCachedTool(BaseItem item) {
         Object key = getKey(item);
-        if (key != null) {
-            return brushCache.get(key);
-        }
+        if (key != null) return brushCache.get(key);
         return null;
     }
 
     public static final BrushTool setTool(BaseItem item, BrushTool tool) {
-        if (item.getNativeItem() == null) {
-            return null;
-        }
+        if (item.getNativeItem() == null) return null;
 
         CompoundTag nbt = item.getNbtData();
         Map<String, Tag> map;
@@ -109,12 +96,8 @@ public final class BrushCache {
             displayMap.put("Lore", FaweCache.asTag(json.split("\\r?\\n")));
             String primary = (String) tool.getPrimary().getSettings().get(BrushSettings.SettingType.BRUSH);
             String secondary = (String) tool.getSecondary().getSettings().get(BrushSettings.SettingType.BRUSH);
-            if (primary == null) {
-                primary = secondary;
-            }
-            if (secondary == null) {
-                secondary = primary;
-            }
+            if (primary == null) primary = secondary;
+            if (secondary == null) secondary = primary;
             if (primary != null) {
                 String name = primary == secondary ? primary.split(" ")[0] : primary.split(" ")[0] + " / " + secondary.split(" ")[0];
                 displayMap.put("Name", new StringTag("{\"text\":\"" + name + "\"}"));

worldedit-core/src/main/java/com/boydti/fawe/util/CachedMathMan.java

@@ -5,17 +5,29 @@ public class CachedMathMan {
     private static final int ATAN2_BITS2 = ATAN2_BITS << 1;
     private static final int ATAN2_MASK = ~(-1 << ATAN2_BITS2);
     private static final int ATAN2_COUNT = ATAN2_MASK + 1;
+    private static final int ATAN2_DIM = (int) Math.sqrt(ATAN2_COUNT);
+    private static final float INV_ATAN2_DIM_MINUS_1 = 1.0f / (ATAN2_DIM - 1);
+    private static final float[] atan2 = new float[ATAN2_COUNT];
 
+    static {
+        for (int i = 0; i < ATAN2_DIM; i++) {
+            for (int j = 0; j < ATAN2_DIM; j++) {
+                float x0 = (float) i / ATAN2_DIM;
+                float y0 = (float) j / ATAN2_DIM;
+
+                atan2[(j * ATAN2_DIM) + i] = (float) Math.atan2(y0, x0);
+            }
+        }
+    }
 
     private static float[] ANGLES = new float[65536];
-    private static char[] SQRT = new char[65536];
-
     static {
         for (int i = 0; i < 65536; ++i) {
             ANGLES[i] = (float) Math.sin((double) i * 3.141592653589793D * 2.0D / 65536.0D);
         }
     }
 
+    private static char[] SQRT = new char[65536];
     static {
         for (int i = 0; i < SQRT.length; i++) {
             SQRT[i] = (char) Math.round(Math.sqrt(i));
@@ -24,7 +36,6 @@ public class CachedMathMan {
 
     /**
      * Optimized for i elem 0,65536 (characters)
-     *
      * @param i
      * @return square root
      */
@@ -40,4 +51,37 @@ public class CachedMathMan {
         return ANGLES[(int) (paramFloat * 10430.378F + 16384.0F) & 0xFFFF];
     }
 
+    protected static final float atan2(float y, float x) {
+        float add, mul;
+
+        if (x < 0.0f) {
+            if (y < 0.0f) {
+                x = -x;
+                y = -y;
+
+                mul = 1.0f;
+            } else {
+                x = -x;
+                mul = -1.0f;
+            }
+
+            add = -3.141592653f;
+        } else {
+            if (y < 0.0f) {
+                y = -y;
+                mul = -1.0f;
+            } else {
+                mul = 1.0f;
+            }
+
+            add = 0.0f;
+        }
+
+        float invDiv = 1.0f / ((Math.max(x, y)) * INV_ATAN2_DIM_MINUS_1);
+
+        int xi = (int) (x * invDiv);
+        int yi = (int) (y * invDiv);
+
+        return (atan2[(yi * ATAN2_DIM) + xi] + add) * mul;
+    }
 }

worldedit-core/src/main/java/com/boydti/fawe/util/CachedTextureUtil.java

@@ -1,8 +1,11 @@
 package com.boydti.fawe.util;
 
-import com.sk89q.worldedit.world.block.BlockType;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import com.boydti.fawe.FaweCache;
 
+import com.sk89q.worldedit.world.block.BlockState;
+import com.sk89q.worldedit.world.block.BlockType;
+import com.sk89q.worldedit.world.block.BlockTypes;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import java.io.FileNotFoundException;
 
 public class CachedTextureUtil extends DelegateTextureUtil {
@@ -40,7 +43,7 @@ public class CachedTextureUtil extends DelegateTextureUtil {
         }
         BiomeColor result = parent.getNearestBiome(color);
         if (result != null) {
-            colorBiomeMap.put(color, (Integer) result.id);
+            colorBiomeMap.put((int) color, (Integer) result.id);
         }
         return result;
     }
@@ -53,7 +56,7 @@ public class CachedTextureUtil extends DelegateTextureUtil {
         }
         BlockType result = parent.getNearestBlock(color);
         if (result != null) {
-            colorBlockMap.put(color, result);
+            colorBlockMap.put((int) color, result);
         }
         return result;
     }

worldedit-core/src/main/java/com/boydti/fawe/util/CleanTextureUtil.java

@@ -14,12 +14,8 @@ public class CleanTextureUtil extends TextureUtil {
         int maxIndex = ((parent.distances.length - 1) * maxPercent) / 100;
         long min = parent.distances[minIndex];
         long max = parent.distances[maxIndex];
-        for (; minIndex > 0 && parent.distances[minIndex - 1] == min; minIndex--) {
-            ;
-        }
-        for (; maxIndex < parent.distances.length - 1 && parent.distances[maxIndex + 1] == max; maxIndex++) {
-            ;
-        }
+        for (; minIndex > 0 && parent.distances[minIndex - 1] == min; minIndex--) ;
+        for (; maxIndex < parent.distances.length - 1 && parent.distances[maxIndex + 1] == max; maxIndex++) ;
         int num = maxIndex - minIndex + 1;
         this.validMixBiomeColors = parent.validMixBiomeColors;
         this.validMixBiomeIds = parent.validMixBiomeIds;
@@ -48,4 +44,4 @@ public class CleanTextureUtil extends TextureUtil {
     public int getMax() {
         return max;
     }
-}
+}

worldedit-core/src/main/java/com/boydti/fawe/util/ColorUtil.java

@@ -1,6 +1,6 @@
 package com.boydti.fawe.util;
 
-import java.awt.*;
+import java.awt.Color;
 import java.lang.reflect.Field;
 import java.util.Locale;
 
@@ -17,13 +17,13 @@ public class ColorUtil {
                 throw new IllegalArgumentException("Invalid color specification");
             }
             type = PARSE_PERCENT;
-            color = color.substring(0, color.length() - 1).trim();
+            color = color.substring(0, color.length()-1).trim();
         } else if (type == PARSE_PERCENT) {
             throw new IllegalArgumentException("Invalid color specification");
         }
         float c = ((type == PARSE_COMPONENT)
-                   ? Integer.parseInt(color)
-                   : Float.parseFloat(color));
+                ? Integer.parseInt(color)
+                : Float.parseFloat(color));
         switch (type) {
             case PARSE_ALPHA:
                 return (c < 0f) ? 0f : (Math.min(c, 1f));
@@ -35,39 +35,39 @@ public class ColorUtil {
                 return ((c < 0f)
                         ? ((c % 360f) + 360f)
                         : ((c > 360f)
-                           ? (c % 360f)
-                           : c));
+                        ? (c % 360f)
+                        : c));
         }
 
         throw new IllegalArgumentException("Invalid color specification");
     }
 
-    private static Color parseRGBColor(String color, int roff) {
+    private static Color parseRGBColor(String color, int roff)
+    {
         try {
             int rend = color.indexOf(',', roff);
-            int gend = rend < 0 ? -1 : color.indexOf(',', rend + 1);
-            int bend = gend < 0 ? -1 : color.indexOf(gend + 1);
+            int gend = rend < 0 ? -1 : color.indexOf(',', rend+1);
+            int bend = gend < 0 ? -1 : color.indexOf(gend+1);
             float r = parseComponent(color, roff, rend, PARSE_COMPONENT);
-            float g = parseComponent(color, rend + 1, gend, PARSE_COMPONENT);
-            float b = parseComponent(color, gend + 1, bend, PARSE_COMPONENT);
+            float g = parseComponent(color, rend+1, gend, PARSE_COMPONENT);
+            float b = parseComponent(color, gend+1, bend, PARSE_COMPONENT);
             return new Color(r, g, b);
-        } catch (NumberFormatException ignored) {
-        }
+        } catch (NumberFormatException nfe) {}
 
         throw new IllegalArgumentException("Invalid color specification");
     }
 
-    private static Color parseHSLColor(String color, int hoff) {
+    private static Color parseHSLColor(String color, int hoff)
+    {
         try {
             int hend = color.indexOf(',', hoff);
-            int send = hend < 0 ? -1 : color.indexOf(',', hend + 1);
-            int lend = send < 0 ? -1 : color.indexOf(send + 1);
+            int send = hend < 0 ? -1 : color.indexOf(',', hend+1);
+            int lend = send < 0 ? -1 : color.indexOf(send+1);
             float h = parseComponent(color, hoff, hend, PARSE_ANGLE);
-            float s = parseComponent(color, hend + 1, send, PARSE_PERCENT);
-            float l = parseComponent(color, send + 1, lend, PARSE_PERCENT);
+            float s = parseComponent(color, hend+1, send, PARSE_PERCENT);
+            float l = parseComponent(color, send+1, lend, PARSE_PERCENT);
             return Color.getHSBColor(h, s, l);
-        } catch (NumberFormatException ignored) {
-        }
+        } catch (NumberFormatException nfe) {}
 
         throw new IllegalArgumentException("Invalid color specification");
     }
@@ -104,8 +104,7 @@ public class ColorUtil {
             try {
                 Field field = java.awt.Color.class.getField(color.toLowerCase());
                 col = (Color) field.get(null);
-            } catch (Throwable ignore) {
-            }
+            } catch (Throwable ignore) {}
             if (col != null) {
                 return col;
             }
@@ -117,6 +116,7 @@ public class ColorUtil {
             int r;
             int g;
             int b;
+            int a;
 
             if (len == 3) {
                 r = Integer.parseInt(color.substring(0, 1), 16);
@@ -139,8 +139,7 @@ public class ColorUtil {
                 b = Integer.parseInt(color.substring(4, 6), 16);
                 return new Color(r, g, b);
             }
-        } catch (NumberFormatException ignored) {
-        }
+        } catch (NumberFormatException nfe) {}
 
         throw new IllegalArgumentException("Invalid color specification");
     }

worldedit-core/src/main/java/com/boydti/fawe/util/DelegateTextureUtil.java

@@ -1,7 +1,9 @@
 package com.boydti.fawe.util;
 
 
+import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.world.block.BlockType;
+import com.sk89q.worldedit.world.block.BlockTypes;
 
 import java.awt.image.BufferedImage;
 import java.io.File;
@@ -16,10 +18,6 @@ public class DelegateTextureUtil extends TextureUtil {
         this.parent = parent;
     }
 
-    public static int hueDistance(int red1, int green1, int blue1, int red2, int green2, int blue2) {
-        return TextureUtil.hueDistance(red1, green1, blue1, red2, green2, blue2);
-    }
-
     @Override
     public BlockType getNearestBlock(int color) {
         return parent.getNearestBlock(color);
@@ -125,6 +123,10 @@ public class DelegateTextureUtil extends TextureUtil {
         return parent.colorDistance(red1, green1, blue1, c2);
     }
 
+    public static int hueDistance(int red1, int green1, int blue1, int red2, int green2, int blue2) {
+        return TextureUtil.hueDistance(red1, green1, blue1, red2, green2, blue2);
+    }
+
     @Override
     public long getDistance(BufferedImage image, int c1) {
         return parent.getDistance(image, c1);

worldedit-core/src/main/java/com/boydti/fawe/util/DocumentationPrinter.java

@@ -24,8 +24,28 @@ import com.boydti.fawe.command.CFICommands;
 import com.sk89q.minecraft.util.commands.Command;
 import com.sk89q.minecraft.util.commands.CommandPermissions;
 import com.sk89q.minecraft.util.commands.NestedCommand;
-import com.sk89q.worldedit.command.*;
-
+import com.sk89q.worldedit.command.BiomeCommands;
+import com.sk89q.worldedit.command.BrushCommands;
+import com.sk89q.worldedit.command.BrushOptionsCommands;
+import com.sk89q.worldedit.command.ChunkCommands;
+import com.sk89q.worldedit.command.ClipboardCommands;
+import com.sk89q.worldedit.command.GenerationCommands;
+import com.sk89q.worldedit.command.HistoryCommands;
+import com.sk89q.worldedit.command.MaskCommands;
+import com.sk89q.worldedit.command.NavigationCommands;
+import com.sk89q.worldedit.command.OptionsCommands;
+import com.sk89q.worldedit.command.PatternCommands;
+import com.sk89q.worldedit.command.RegionCommands;
+import com.sk89q.worldedit.command.SchematicCommands;
+import com.sk89q.worldedit.command.ScriptingCommands;
+import com.sk89q.worldedit.command.SelectionCommands;
+import com.sk89q.worldedit.command.SnapshotCommands;
+import com.sk89q.worldedit.command.SnapshotUtilCommands;
+import com.sk89q.worldedit.command.SuperPickaxeCommands;
+import com.sk89q.worldedit.command.ToolCommands;
+import com.sk89q.worldedit.command.TransformCommands;
+import com.sk89q.worldedit.command.UtilityCommands;
+import com.sk89q.worldedit.command.WorldEditCommands;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
@@ -54,9 +74,9 @@ public final class DocumentationPrinter {
 
             stream.print("## Overview\n");
             stream.print("This page is generated from the source. " +
-                                 "Click one of the edit buttons below to modify a command class. " +
-                                 "You will need to find the parts which correspond to the documentation. " +
-                                 "Command documentation will be consistent with what is available ingame");
+                    "Click one of the edit buttons below to modify a command class. " +
+                    "You will need to find the parts which correspond to the documentation. " +
+                    "Command documentation will be consistent with what is available ingame");
             stream.println();
             stream.println();
             stream.print("To view this information ingame use `//help [category|command]`\n");
@@ -159,10 +179,10 @@ public final class DocumentationPrinter {
 
             Command cmd = method.getAnnotation(Command.class);
             String[] aliases = cmd.aliases();
-            StringBuilder usage = new StringBuilder(prefix + aliases[0] + " " + cmd.usage());
+            String usage = prefix + aliases[0] + " " + cmd.usage();
             if (!cmd.flags().isEmpty()) {
                 for (char c : cmd.flags().toCharArray()) {
-                    usage.append(" [-").append(c).append("]");
+                    usage += " [-" + c + "]";
                 }
             }
 //            stream.append("#### [`" + usage + "`](" + "https://github.com/boy0001/FastAsyncWorldedit/wiki/" + aliases[0] + ")\n");
@@ -185,9 +205,7 @@ public final class DocumentationPrinter {
             }
         }
         stream.append("\n");
-        if (title) {
-            stream.append("---");
-        }
+        if (title) stream.append("---");
         stream.append("\n");
         stream.append("\n");
     }

worldedit-core/src/main/java/com/boydti/fawe/util/EditSessionBuilder.java

@@ -4,11 +4,7 @@ import com.boydti.fawe.Fawe;
 import com.boydti.fawe.FaweAPI;
 import com.boydti.fawe.config.Settings;
 import com.boydti.fawe.logging.rollback.RollbackOptimizedHistory;
-import com.boydti.fawe.object.FaweLimit;
-import com.boydti.fawe.object.FawePlayer;
-import com.boydti.fawe.object.FaweQueue;
-import com.boydti.fawe.object.NullChangeSet;
-import com.boydti.fawe.object.RegionWrapper;
+import com.boydti.fawe.object.*;
 import com.boydti.fawe.object.changeset.DiskStorageHistory;
 import com.boydti.fawe.object.changeset.FaweChangeSet;
 import com.boydti.fawe.object.changeset.MemoryOptimizedHistory;
@@ -18,10 +14,9 @@ import com.sk89q.worldedit.extent.inventory.BlockBag;
 import com.sk89q.worldedit.regions.Region;
 import com.sk89q.worldedit.util.eventbus.EventBus;
 import com.sk89q.worldedit.world.World;
-
+import java.util.UUID;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import java.util.UUID;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -107,8 +102,8 @@ public class EditSessionBuilder {
     }
 
     /**
-     * @param disk If it should be stored on disk
-     * @param uuid The uuid to store it under (if on disk)
+     * @param disk        If it should be stored on disk
+     * @param uuid        The uuid to store it under (if on disk)
      * @param compression Compression level (0-9)
      * @return
      */
@@ -196,6 +191,6 @@ public class EditSessionBuilder {
     }
 
     public EditSession build() {
-        return new EditSession(worldName, world, queue, player, limit, changeSet, allowedRegions, autoQueue, fastmode, checkMemory, combineStages, blockBag, eventBus, event);
+            return new EditSession(worldName, world, queue, player, limit, changeSet, allowedRegions, autoQueue, fastmode, checkMemory, combineStages, blockBag, eventBus, event);
     }
 }

worldedit-core/src/main/java/com/boydti/fawe/util/ExtentTraverser.java

@@ -2,7 +2,6 @@ package com.boydti.fawe.util;
 
 import com.sk89q.worldedit.extent.AbstractDelegateExtent;
 import com.sk89q.worldedit.extent.Extent;
-
 import java.lang.reflect.Field;
 
 public class ExtentTraverser<T extends Extent> {

worldedit-core/src/main/java/com/boydti/fawe/util/FaweTimer.java

@@ -3,17 +3,13 @@ package com.boydti.fawe.util;
 public class FaweTimer implements Runnable {
 
     private final double[] history = new double[]{20d, 20d, 20d, 20d, 20d, 20d, 20d, 20d, 20d, 20d, 20d, 20d, 20d, 20d, 20d, 20d, 20d, 20d, 20d, 20d};
-    private final long tickInterval = 5;
-    private final double millisPer20Interval = tickInterval * 50 * 20;
     private int historyIndex = 0;
     private long lastPoll = System.currentTimeMillis();
     private long tickStart = System.currentTimeMillis();
+    private final long tickInterval = 5;
+    private final double millisPer20Interval = tickInterval * 50 * 20;
     private long tick = 0;
     private long tickMod = 0;
-    private long lastGetTPSTick = 0;
-    private double lastGetTPSValue = 20d;
-    private long skip = 0;
-    private long skipTick = 0;
 
     @Override
     public void run() {
@@ -36,6 +32,9 @@ public class FaweTimer implements Runnable {
         lastPoll = tickStart;
     }
 
+    private long lastGetTPSTick = 0;
+    private double lastGetTPSValue = 20d;
+
     public double getTPS() {
         if (tick < lastGetTPSTick + tickInterval) {
             return lastGetTPSValue;
@@ -61,6 +60,9 @@ public class FaweTimer implements Runnable {
         return tickStart;
     }
 
+    private long skip = 0;
+    private long skipTick = 0;
+
     public boolean isAbove(double tps) {
         if (tps <= 0) {
             return true;

worldedit-core/src/main/java/com/boydti/fawe/util/FilteredTextureUtil.java

@@ -1,5 +1,9 @@
 package com.boydti.fawe.util;
 
+import com.boydti.fawe.FaweCache;
+
+import com.sk89q.worldedit.world.block.BlockState;
+import com.sk89q.worldedit.world.block.BlockStateHolder;
 import com.sk89q.worldedit.world.block.BlockType;
 import com.sk89q.worldedit.world.block.BlockTypes;
 
@@ -7,9 +11,11 @@ import java.io.FileNotFoundException;
 import java.util.Set;
 
 public class FilteredTextureUtil extends TextureUtil {
+    private final Set<BlockType> blocks;
 
     public FilteredTextureUtil(TextureUtil parent, Set<BlockType> blocks) throws FileNotFoundException {
         super(parent.getFolder());
+        this.blocks = blocks;
         this.validMixBiomeColors = parent.validMixBiomeColors;
         this.validMixBiomeIds = parent.validMixBiomeIds;
         this.validBiomes = parent.validBiomes;
@@ -21,9 +27,7 @@ public class FilteredTextureUtil extends TextureUtil {
         int num = 0;
         for (int i = 0; i < parent.validBlockIds.length; i++) {
             BlockType block = BlockTypes.get(parent.validBlockIds[i]);
-            if (blocks.contains(block)) {
-                num++;
-            }
+            if (blocks.contains(block)) num++;
         }
         this.validBlockIds = new int[num];
         this.validColors = new int[num];
@@ -37,4 +41,4 @@ public class FilteredTextureUtil extends TextureUtil {
         }
         this.calculateLayerArrays();
     }
-}
+}

worldedit-core/src/main/java/com/boydti/fawe/util/IOUtil.java

@@ -1,41 +1,48 @@
 package com.boydti.fawe.util;
 
-import java.io.DataOutput;
-import java.io.EOFException;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
 import java.net.URI;
 
 public final class IOUtil {
-    public static int readInt(InputStream in) throws IOException {
+    public InputStream toInputStream(URI uri) throws IOException {
+        String scheme = uri.getScheme();
+        switch (scheme.toLowerCase()) {
+            case "file":
+                return new FileInputStream(uri.getPath());
+            case "http":
+            case "https":
+                return uri.toURL().openStream();
+            default:
+                return null;
+        }
+    }
+
+    public static final int readInt(InputStream in) throws IOException {
         int ch1 = in.read();
         int ch2 = in.read();
         int ch3 = in.read();
         int ch4 = in.read();
-        if ((ch1 | ch2 | ch3 | ch4) < 0) {
+        if ((ch1 | ch2 | ch3 | ch4) < 0)
             throw new EOFException();
-        }
         return ((ch1 << 24) + (ch2 << 16) + (ch3 << 8) + (ch4 << 0));
     }
 
-    public static void writeInt(OutputStream out, int v) throws IOException {
+    public static final void writeInt(OutputStream out, int v) throws IOException {
         out.write((v >>> 24) & 0xFF);
         out.write((v >>> 16) & 0xFF);
-        out.write((v >>> 8) & 0xFF);
-        out.write((v >>> 0) & 0xFF);
+        out.write((v >>>  8) & 0xFF);
+        out.write((v >>>  0) & 0xFF);
     }
 
-    public static void writeVarInt(final OutputStream out, int i) throws IOException {
-        while ((i & -128) != 0) {
+    public static final void writeVarInt(final OutputStream out, int i) throws IOException {
+        while((i & -128) != 0) {
             out.write(i & 127 | 128);
             i >>>= 7;
         }
         out.write(i);
     }
 
-    public static int readVarInt(InputStream in) throws IOException {
+    public static final int readVarInt(InputStream in) throws IOException {
         int i = 0;
         int offset = 0;
         int b;
@@ -47,7 +54,7 @@ public final class IOUtil {
         return i;
     }
 
-    public static void copy(InputStream in, OutputStream out) throws IOException {
+    public static final void copy(InputStream in, OutputStream out) throws IOException {
         byte[] buf = new byte[8192];
         while (true) {
             int r = in.read(buf);
@@ -58,7 +65,7 @@ public final class IOUtil {
         }
     }
 
-    public static int copy(InputStream in, OutputStream out, int len) throws IOException {
+    public static final int copy(InputStream in, OutputStream out, int len) throws IOException {
         byte[] buf = new byte[8192];
         while (len > 0) {
             int r = in.read(buf, 0, Math.min(buf.length, len));
@@ -71,7 +78,7 @@ public final class IOUtil {
         return len;
     }
 
-    public static void copy(InputStream in, DataOutput out) throws IOException {
+    public static final void copy(InputStream in, DataOutput out) throws IOException {
         byte[] buf = new byte[8192];
         while (true) {
             int r = in.read(buf);
@@ -81,5 +88,4 @@ public final class IOUtil {
             out.write(buf, 0, r);
         }
     }
-
 }

worldedit-core/src/main/java/com/boydti/fawe/util/ImgurUtility.java

@@ -1,12 +1,9 @@
 package com.boydti.fawe.util;
 
+import com.boydti.fawe.object.io.FastByteArrayOutputStream;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
+import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLEncoder;
@@ -15,6 +12,21 @@ import java.util.Base64;
 public class ImgurUtility {
     public static final String CLIENT_ID = "50e34b65351eb07";
 
+    public static URL uploadImage(File file) throws IOException {
+        return uploadImage(new FileInputStream(file));
+    }
+
+    public static URL uploadImage(InputStream is) throws IOException {
+        is = new BufferedInputStream(is);
+        FastByteArrayOutputStream baos = new FastByteArrayOutputStream(Short.MAX_VALUE);
+        int d;
+        while ((d = is.read()) != -1) {
+            baos.write(d);
+        }
+        baos.flush();
+        return uploadImage(baos.toByteArray());
+    }
+
     public static URL uploadImage(byte[] image) throws IOException {
         String json = getImgurContent(CLIENT_ID, image);
         Gson gson = new Gson();

worldedit-core/src/main/java/com/boydti/fawe/util/IncendoPaster.java

@@ -5,23 +5,12 @@ import com.google.common.base.Charsets;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
+import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
 import java.nio.file.Files;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
+import java.util.*;
 
 /**
  * Single class paster for the Incendo paste service
@@ -39,8 +28,8 @@ public final class IncendoPaster {
      * Valid paste applications
      */
     public static final Collection<String>
-            VALID_APPLICATIONS = Arrays
-            .asList("plotsquared", "fastasyncworldedit", "incendopermissions", "kvantum");
+        VALID_APPLICATIONS = Arrays
+        .asList("plotsquared", "fastasyncworldedit", "incendopermissions", "kvantum");
 
     private final Collection<PasteFile> files = new ArrayList<>();
     private final String pasteApplication;
@@ -56,85 +45,11 @@ public final class IncendoPaster {
         }
         if (!VALID_APPLICATIONS.contains(pasteApplication.toLowerCase(Locale.ENGLISH))) {
             throw new IllegalArgumentException(
-                    String.format("Unknown application name: %s", pasteApplication));
+                String.format("Unknown application name: %s", pasteApplication));
         }
         this.pasteApplication = pasteApplication;
     }
 
-    public static String debugPaste() throws IOException {
-        final IncendoPaster incendoPaster = new IncendoPaster("fastasyncworldedit");
-
-        StringBuilder b = new StringBuilder();
-        b.append(
-                "# Welcome to this paste\n# It is meant to provide us at IntellectualSites with better information about your "
-                        + "problem\n");
-        b.append("\n# Server Information\n");
-        b.append("server.platform: ").append(Fawe.imp().getPlatform()).append('\n');
-        b.append(Fawe.imp().getDebugInfo()).append('\n');
-        b.append("\n\n# YAY! Now, let's see what we can find in your JVM\n");
-        Runtime runtime = Runtime.getRuntime();
-        b.append("memory.free: ").append(runtime.freeMemory()).append('\n');
-        b.append("memory.max: ").append(runtime.maxMemory()).append('\n');
-        b.append("java.specification.version: '").append(System.getProperty("java.specification.version")).append("'\n");
-        b.append("java.vendor: '").append(System.getProperty("java.vendor")).append("'\n");
-        b.append("java.version: '").append(System.getProperty("java.version")).append("'\n");
-        b.append("os.arch: '").append(System.getProperty("os.arch")).append("'\n");
-        b.append("os.name: '").append(System.getProperty("os.name")).append("'\n");
-        b.append("os.version: '").append(System.getProperty("os.version")).append("'\n\n");
-        b.append("# Okay :D Great. You are now ready to create your bug report!");
-        b.append("\n# You can do so at https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13/issues");
-        b.append("\n# or via our Discord at https://discord.gg/ngZCzbU");
-        incendoPaster.addFile(new IncendoPaster.PasteFile("information", b.toString()));
-
-        try {
-            final File logFile = new File(Fawe.imp().getDirectory(), "../../logs/latest.log");
-            final String file;
-            if (Files.size(logFile.toPath()) > 14_000_000) {
-                file = "too big :(";
-            } else {
-                file = readFile(logFile);
-            }
-            incendoPaster.addFile(new IncendoPaster.PasteFile("latest.log", file));
-        } catch (IOException ignored) {
-        }
-
-        incendoPaster.addFile(new PasteFile("config.yml", readFile(new File(Fawe.imp().getDirectory(), "config.yml"))));
-        incendoPaster.addFile(new PasteFile("config-legacy.yml", readFile(new File(Fawe.imp().getDirectory(), "config-legacy.yml"))));
-        incendoPaster.addFile(new PasteFile("message.yml", readFile(new File(Fawe.imp().getDirectory(), "message.yml"))));
-        incendoPaster.addFile(new PasteFile("commands.yml", readFile(new File(Fawe.imp().getDirectory(), "commands.yml"))));
-
-        final String rawResponse;
-        try {
-            rawResponse = incendoPaster.upload();
-        } catch (Throwable throwable) {
-            throw new IOException(String.format("Failed to upload files: %s", throwable.getMessage()), throwable);
-        }
-        final JsonObject jsonObject = new JsonParser().parse(rawResponse).getAsJsonObject();
-
-        if (jsonObject.has("created")) {
-            final String pasteId = jsonObject.get("paste_id").getAsString();
-            return String.format("https://athion.net/ISPaster/paste/view/%s", pasteId);
-        } else {
-            throw new IOException(String.format("Failed to upload files: %s",
-                                                jsonObject.get("response").getAsString()));
-        }
-    }
-
-    private static String readFile(final File file) throws IOException {
-        final StringBuilder content = new StringBuilder();
-        final List<String> lines = new ArrayList<>();
-        try (final BufferedReader reader = new BufferedReader(new FileReader(file))) {
-            String line;
-            while ((line = reader.readLine()) != null) {
-                lines.add(line);
-            }
-        }
-        for (int i = Math.max(0, lines.size() - 1000); i < lines.size(); i++) {
-            content.append(lines.get(i)).append("\n");
-        }
-        return content.toString();
-    }
-
     /**
      * Get an immutable collection containing all the files that have been added to this paster
      *
@@ -157,7 +72,7 @@ public final class IncendoPaster {
         for (final PasteFile pasteFile : this.files) {
             if (pasteFile.fileName.equalsIgnoreCase(file.getFileName())) {
                 throw new IllegalArgumentException(String.format("Found duplicate file with name %s",
-                                                                 file.getFileName()));
+                    file.getFileName()));
             }
         }
         this.files.add(file);
@@ -184,7 +99,7 @@ public final class IncendoPaster {
         while (fileIterator.hasNext()) {
             final PasteFile file = fileIterator.next();
             builder.append("\"file-").append(file.getFileName()).append("\": \"")
-                   .append(file.getContent().replaceAll("\"", "\\\\\"")).append("\"");
+                .append(file.getContent().replaceAll("\"", "\\\\\"")).append("\"");
             if (fileIterator.hasNext()) {
                 builder.append(",\n");
             }
@@ -215,7 +130,7 @@ public final class IncendoPaster {
         }
         if (!httpURLConnection.getResponseMessage().contains("OK")) {
             throw new IllegalStateException(String.format("Server returned status: %d %s",
-                                                          httpURLConnection.getResponseCode(), httpURLConnection.getResponseMessage()));
+                httpURLConnection.getResponseCode(), httpURLConnection.getResponseMessage()));
         }
         final StringBuilder input = new StringBuilder();
         try (final BufferedReader inputStream = new BufferedReader(new InputStreamReader(httpURLConnection.getInputStream()))) {
@@ -271,4 +186,78 @@ public final class IncendoPaster {
         }
     }
 
+    public static String debugPaste() throws IOException {
+        final IncendoPaster incendoPaster = new IncendoPaster("fastasyncworldedit");
+
+        StringBuilder b = new StringBuilder();
+        b.append(
+            "# Welcome to this paste\n# It is meant to provide us at IntellectualSites with better information about your "
+                + "problem\n");
+        b.append("\n# Server Information\n");
+        b.append("server.platform: ").append(Fawe.imp().getPlatform()).append('\n');
+        b.append(Fawe.imp().getDebugInfo()).append('\n');
+        b.append("\n\n# YAY! Now, let's see what we can find in your JVM\n");
+        Runtime runtime = Runtime.getRuntime();
+        b.append("memory.free: ").append(runtime.freeMemory()).append('\n');
+        b.append("memory.max: ").append(runtime.maxMemory()).append('\n');
+        b.append("java.specification.version: '").append(System.getProperty("java.specification.version")).append("'\n");
+        b.append("java.vendor: '").append(System.getProperty("java.vendor")).append("'\n");
+        b.append("java.version: '").append(System.getProperty("java.version")).append("'\n");
+        b.append("os.arch: '").append(System.getProperty("os.arch")).append("'\n");
+        b.append("os.name: '").append(System.getProperty("os.name")).append("'\n");
+        b.append("os.version: '").append(System.getProperty("os.version")).append("'\n\n");
+        b.append("# Okay :D Great. You are now ready to create your bug report!");
+        b.append("\n# You can do so at https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13/issues");
+        b.append("\n# or via our Discord at https://discord.gg/ngZCzbU");
+        incendoPaster.addFile(new IncendoPaster.PasteFile("information", b.toString()));
+
+        try {
+            final File logFile = new File(Fawe.imp().getDirectory(), "../../logs/latest.log");
+            final String file;
+            if (Files.size(logFile.toPath()) > 14_000_000) {
+                file = "too big :(";
+            } else {
+                file = readFile(logFile);
+            }
+            incendoPaster.addFile(new IncendoPaster.PasteFile("latest.log", file));
+        } catch (IOException ignored) {
+        }
+
+        incendoPaster.addFile(new PasteFile("config.yml", readFile(new File(Fawe.imp().getDirectory(), "config.yml"))));
+        incendoPaster.addFile(new PasteFile("config-legacy.yml", readFile(new File(Fawe.imp().getDirectory(), "config-legacy.yml"))));
+        incendoPaster.addFile(new PasteFile("message.yml", readFile(new File(Fawe.imp().getDirectory(), "message.yml"))));
+        incendoPaster.addFile(new PasteFile("commands.yml", readFile(new File(Fawe.imp().getDirectory(), "commands.yml"))));
+
+        final String rawResponse;
+        try {
+            rawResponse = incendoPaster.upload();
+        } catch (Throwable throwable) {
+            throw new IOException(String.format("Failed to upload files: %s", throwable.getMessage()), throwable);
+        }
+        final JsonObject jsonObject = new JsonParser().parse(rawResponse).getAsJsonObject();
+
+        if (jsonObject.has("created")) {
+            final String pasteId = jsonObject.get("paste_id").getAsString();
+            return String.format("https://athion.net/ISPaster/paste/view/%s", pasteId);
+        } else {
+            throw new IOException(String.format("Failed to upload files: %s",
+                jsonObject.get("response").getAsString()));
+        }
+    }
+
+    private static String readFile(final File file) throws IOException {
+        final StringBuilder content = new StringBuilder();
+        final List<String> lines = new ArrayList<>();
+        try (final BufferedReader reader = new BufferedReader(new FileReader(file))) {
+            String line;
+            while ((line = reader.readLine()) != null) {
+                lines.add(line);
+            }
+        }
+        for (int i = Math.max(0, lines.size() - 1000); i < lines.size(); i++) {
+            content.append(lines.get(i)).append("\n");
+        }
+        return content.toString();
+    }
+
 }

worldedit-core/src/main/java/com/boydti/fawe/util/Jars.java

@@ -1,7 +1,6 @@
 package com.boydti.fawe.util;
 
 import com.boydti.fawe.Fawe;
-
 import java.io.DataInputStream;
 import java.io.IOException;
 import java.net.URL;
@@ -12,10 +11,10 @@ import java.util.Base64;
 public enum Jars {
 
     MM_v1_4_0("https://github.com/InventivetalentDev/MapManager/releases/download/1.4.0-SNAPSHOT/MapManager_v1.4.0-SNAPSHOT.jar",
-              "AEO5SKBUGN4YJRS8XGGNLBM2QRZPTI1KF0/1W1URTGA=", 163279),
+            "AEO5SKBUGN4YJRS8XGGNLBM2QRZPTI1KF0/1W1URTGA=", 163279),
 
     PL_v3_6_0("https://github.com/InventivetalentDev/PacketListenerAPI/releases/download/3.6.0-SNAPSHOT/PacketListenerAPI_v3.6.0-SNAPSHOT.jar",
-              "OYBE75VIU+NNWHRVREBLDARWA+/TBDQZ1RC562QULBA=", 166508),
+            "OYBE75VIU+NNWHRVREBLDARWA+/TBDQZ1RC562QULBA=", 166508),
 
     ;
 
@@ -24,9 +23,12 @@ public enum Jars {
     public final String digest;
 
     /**
-     * @param url Where this jar can be found and downloaded
-     * @param digest The SHA-256 hexadecimal digest
-     * @param filesize Size of this jar in bytes
+     * @param url
+     *            Where this jar can be found and downloaded
+     * @param digest
+     *            The SHA-256 hexadecimal digest
+     * @param filesize
+     *            Size of this jar in bytes
      */
     Jars(String url, String digest, int filesize) {
         this.url = url;
@@ -34,9 +36,7 @@ public enum Jars {
         this.filesize = filesize;
     }
 
-    /**
-     * download a jar, verify hash, return byte[] containing the jar
-     */
+    /** download a jar, verify hash, return byte[] containing the jar */
     public byte[] download() throws IOException {
         byte[] jarBytes = new byte[this.filesize];
         URL url = new URL(this.url);

worldedit-core/src/main/java/com/boydti/fawe/util/MainUtil.java

@@ -3,35 +3,19 @@ package com.boydti.fawe.util;
 import com.boydti.fawe.Fawe;
 import com.boydti.fawe.config.BBC;
 import com.boydti.fawe.config.Settings;
-import com.boydti.fawe.object.FaweInputStream;
-import com.boydti.fawe.object.FaweOutputStream;
-import com.boydti.fawe.object.FawePlayer;
-import com.boydti.fawe.object.RegionWrapper;
-import com.boydti.fawe.object.RunnableVal;
-import com.boydti.fawe.object.RunnableVal2;
+import com.boydti.fawe.object.*;
 import com.boydti.fawe.object.changeset.CPUOptimizedChangeSet;
 import com.boydti.fawe.object.changeset.FaweStreamChangeSet;
 import com.boydti.fawe.object.io.AbstractDelegateOutputStream;
 import com.github.luben.zstd.ZstdInputStream;
 import com.github.luben.zstd.ZstdOutputStream;
-import com.sk89q.jnbt.CompoundTag;
-import com.sk89q.jnbt.DoubleTag;
-import com.sk89q.jnbt.IntTag;
-import com.sk89q.jnbt.ListTag;
-import com.sk89q.jnbt.StringTag;
-import com.sk89q.jnbt.Tag;
+import com.sk89q.jnbt.*;
 import com.sk89q.worldedit.entity.Entity;
 import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormat;
 import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormats;
 import com.sk89q.worldedit.history.changeset.ChangeSet;
 import com.sk89q.worldedit.util.Location;
-import net.jpountz.lz4.LZ4BlockInputStream;
-import net.jpountz.lz4.LZ4BlockOutputStream;
-import net.jpountz.lz4.LZ4Compressor;
-import net.jpountz.lz4.LZ4Factory;
-import net.jpountz.lz4.LZ4FastDecompressor;
-import net.jpountz.lz4.LZ4InputStream;
-import net.jpountz.lz4.LZ4Utils;
+import net.jpountz.lz4.*;
 
 import javax.annotation.Nullable;
 import javax.imageio.ImageIO;
@@ -39,49 +23,28 @@ import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.*;
 import java.lang.reflect.Array;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.URLConnection;
+import java.lang.reflect.Method;
+import java.net.*;
 import java.nio.channels.Channels;
 import java.nio.channels.FileChannel;
 import java.nio.channels.ReadableByteChannel;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.FileVisitResult;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.SimpleFileVisitor;
-import java.nio.file.StandardCopyOption;
+import java.nio.file.*;
 import java.nio.file.attribute.BasicFileAttributes;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
 import java.util.List;
-import java.util.Map;
-import java.util.Scanner;
-import java.util.UUID;
+import java.util.*;
+import java.util.Map.Entry;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.regex.Pattern;
-import java.util.zip.DataFormatException;
-import java.util.zip.Deflater;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.Inflater;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
+import java.util.zip.*;
 
 import static java.lang.System.arraycopy;
 
 public class MainUtil {
-    private static final LZ4Factory FACTORY = LZ4Factory.fastestInstance();
-    private static final LZ4Compressor COMPRESSOR = FACTORY.fastCompressor();
-    private static final LZ4FastDecompressor DECOMPRESSOR = FACTORY.fastDecompressor();
-
     /*
      * Generic non plugin related utils
      *  e.g. sending messages
@@ -142,6 +105,10 @@ public class MainUtil {
         return Double.parseDouble(version.substring(0, pos));
     }
 
+    public static void stacktrace() {
+        new Exception().printStackTrace();
+    }
+
     public static void traverse(Path path, final BiConsumer<Path, BasicFileAttributes> onEach) {
         try {
             Files.walkFileTree(path, new SimpleFileVisitor<Path>() {
@@ -170,9 +137,7 @@ public class MainUtil {
     }
 
     public static File resolveRelative(File file) {
-        if (!file.exists()) {
-            return new File(relativize(file.getPath()));
-        }
+        if (!file.exists()) return new File(relativize(file.getPath()));
         return file;
     }
 
@@ -182,15 +147,11 @@ public class MainUtil {
         int skip = 0;
         int len = split.length - 1;
         for (int i = len; i >= 0; i--) {
-            if (skip > 0) {
-                skip--;
-            } else {
+            if (skip > 0) skip--;
+            else {
                 String arg = split[i];
-                if (arg.equals("..")) {
-                    skip++;
-                } else {
-                    out.insert(0, arg + (i == len ? "" : File.separator));
-                }
+                if (arg.equals("..")) skip++;
+                else out.insert(0, arg + (i == len ? "" : File.separator));
             }
         }
         return out.toString();
@@ -198,13 +159,9 @@ public class MainUtil {
 
     public static void forEachFile(Path path, final RunnableVal2<Path, BasicFileAttributes> onEach, Comparator<File> comparator) {
         File dir = path.toFile();
-        if (!dir.exists()) {
-            return;
-        }
+        if (!dir.exists()) return;
         File[] files = path.toFile().listFiles();
-        if (comparator != null) {
-            Arrays.sort(files, comparator);
-        }
+        if (comparator != null) Arrays.sort(files, comparator);
         for (File file : files) {
             Path filePath = file.toPath();
             try {
@@ -225,13 +182,9 @@ public class MainUtil {
                 val = StringMan.toInteger(name, 0, name.length());
             } else {
                 int i = name.lastIndexOf('.');
-                if (i != -1) {
-                    val = StringMan.toInteger(name, 0, i);
-                }
-            }
-            if (val != null && val > max[0]) {
-                max[0] = val;
+                if (i != -1) val = StringMan.toInteger(name, 0, i);
             }
+            if (val != null && val > max[0]) max[0] = val;
             return false;
         });
         return max[0] + 1;
@@ -269,6 +222,10 @@ public class MainUtil {
         return getCompressedOS(os, amount, Settings.IMP.HISTORY.BUFFER_SIZE);
     }
 
+    private static final LZ4Factory FACTORY = LZ4Factory.fastestInstance();
+    private static final LZ4Compressor COMPRESSOR = FACTORY.fastCompressor();
+    private static final LZ4FastDecompressor DECOMPRESSOR = FACTORY.fastDecompressor();
+
     public static int getMaxCompressedLength(int size) {
         return LZ4Utils.maxCompressedLength(size);
     }
@@ -287,9 +244,7 @@ public class MainUtil {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         while (!deflate.finished()) {
             int n = deflate.deflate(buffer);
-            if (n != 0) {
-                baos.write(buffer, 0, n);
-            }
+            if (n != 0) baos.write(buffer, 0, n);
         }
         return baos.toByteArray();
     }
@@ -307,9 +262,7 @@ public class MainUtil {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         while (!inflater.finished()) {
             int n = inflater.inflate(buffer);
-            if (n != 0) {
-                baos.write(buffer, 0, n);
-            }
+            if (n != 0) baos.write(buffer, 0, n);
         }
         return baos.toByteArray();
     }
@@ -491,6 +444,36 @@ public class MainUtil {
         }
     }
 
+    private static final Class[] parameters = new Class[]{URL.class};
+
+    public static ClassLoader loadURLClasspath(URL u) throws IOException {
+        ClassLoader sysloader = ClassLoader.getSystemClassLoader();
+
+        Class sysclass = URLClassLoader.class;
+
+        try {
+            Method method = sysclass.getDeclaredMethod("addURL", parameters);
+            method.setAccessible(true);
+            if (sysloader instanceof URLClassLoader) {
+                method.invoke(sysloader, new Object[]{u});
+            } else {
+                ClassLoader loader = MainUtil.class.getClassLoader();
+                while (!(loader instanceof URLClassLoader) && loader.getParent() != null) {
+                    loader = loader.getParent();
+                }
+                if (loader instanceof URLClassLoader) {
+                    method.invoke(sysloader, new Object[]{u});
+                } else {
+                    loader = new URLClassLoader(new URL[]{u}, MainUtil.class.getClassLoader());
+                    return loader;
+                }
+            }
+        } catch (Throwable throwable) {
+            throwable.printStackTrace();
+        }
+        return sysloader;
+    }
+
     public static String getText(String url) throws IOException {
         try (Scanner scanner = new Scanner(new URL(url).openStream(), "UTF-8")) {
             return scanner.useDelimiter("\\A").next();
@@ -568,12 +551,12 @@ public class MainUtil {
     }
 
     public static Thread[] getThreads() {
-        ThreadGroup rootGroup = Thread.currentThread().getThreadGroup();
+        ThreadGroup rootGroup = Thread.currentThread( ).getThreadGroup( );
         ThreadGroup parentGroup;
-        while ((parentGroup = rootGroup.getParent()) != null) {
+        while ( ( parentGroup = rootGroup.getParent() ) != null ) {
             rootGroup = parentGroup;
         }
-        Thread[] threads = new Thread[rootGroup.activeCount()];
+        Thread[] threads = new Thread[ rootGroup.activeCount() ];
         if (threads.length != 0) {
             while (rootGroup.enumerate(threads, true) == threads.length) {
                 threads = new Thread[threads.length * 2];
@@ -615,9 +598,7 @@ public class MainUtil {
     }
 
     public static BufferedImage toRGB(BufferedImage src) {
-        if (src == null) {
-            return src;
-        }
+        if (src == null) return src;
         BufferedImage img = new BufferedImage(src.getWidth(), src.getHeight(), BufferedImage.TYPE_INT_ARGB);
         Graphics2D g2d = img.createGraphics();
         g2d.drawImage(src, 0, 0, null);
@@ -695,6 +676,60 @@ public class MainUtil {
 //        if (!debug) {
         e.printStackTrace();
         return;
+//        }
+//        String header = "====== FAWE: " + e.getLocalizedMessage() + " ======";
+//        Fawe.debug(header);
+//        String[] trace = getTrace(e);
+//        for (int i = 0; i < trace.length && i < 8; i++) {
+//            Fawe.debug(" - " + trace[i]);
+//        }
+//        String[] cause = getTrace(e.getCause());
+//        Fawe.debug("Cause: " + (cause.length == 0 ? "N/A" : ""));
+//        for (int i = 0; i < cause.length && i < 8; i++) {
+//            Fawe.debug(" - " + cause[i]);
+//        }
+//        Fawe.debug(StringMan.repeat("=", header.length()));
+    }
+
+    public static String[] getTrace(Throwable e) {
+        if (e == null) {
+            return new String[0];
+        }
+        StackTraceElement[] elems = e.getStackTrace();
+        String[] msg = new String[elems.length];//[elems.length + 1];
+//        HashSet<String> packages = new HashSet<>();
+        for (int i = 0; i < elems.length; i++) {
+            StackTraceElement elem = elems[i];
+            elem.getLineNumber();
+            String methodName = elem.getMethodName();
+            int index = elem.getClassName().lastIndexOf('.');
+            String className = elem.getClassName();
+//            if (!(index == -1 || className.startsWith("io.netty") || className.startsWith("javax") || className.startsWith("java") || className.startsWith("sun") || className.startsWith("net.minecraft") || className.startsWith("org.spongepowered") || className.startsWith("org.bukkit") || className.startsWith("com.google"))) {
+//                packages.add(className.substring(0, index-1));
+//            }
+            String name = className.substring(index == -1 ? 0 : index + 1);
+            name = name.length() == 0 ? elem.getClassName() : name;
+            String argString = "(...)";
+            try {
+                for (Method method : Class.forName(elem.getClassName()).getDeclaredMethods()) {
+                    if (method.getName().equals(methodName)) {
+                        Class<?>[] params = method.getParameterTypes();
+                        argString = "";
+                        String prefix = "";
+                        for (Class param : params) {
+                            argString += prefix + param.getSimpleName();
+                            prefix = ",";
+                        }
+                        argString = "[" + method.getReturnType().getSimpleName() + "](" + argString + ")";
+                        break;
+                    }
+                }
+            } catch (Throwable ignore) {
+            }
+            msg[i] = name + "." + methodName + argString + ":" + elem.getLineNumber();
+        }
+//        msg[msg.length-1] = StringMan.getString(packages);
+        return msg;
     }
 
     public static void warnDeprecated(Class... alternatives) {
@@ -711,12 +746,16 @@ public class MainUtil {
                     String className = creatorElement.getClassName();
                     Class clazz = Class.forName(className);
                     String creator = clazz.getSimpleName();
+                    String packageName = clazz.getPackage().getName();
 
-                    String myName = Class.forName(stack.getClassName()).getSimpleName();
-                    Fawe.debug("@" + creator + " used by " + myName + "." + stack.getMethodName() + "():" + stack.getLineNumber() + " is deprecated.");
+                    StackTraceElement deprecatedElement = stack;
+                    String myName = Class.forName(deprecatedElement.getClassName()).getSimpleName();
+                    Fawe.debug("@" + creator + " used by " + myName + "." + deprecatedElement.getMethodName() + "():" + deprecatedElement.getLineNumber() + " is deprecated.");
                     Fawe.debug(" - Alternatives: " + StringMan.getString(alternatives));
                 } catch (Throwable throwable) {
                     throwable.printStackTrace();
+                } finally {
+                    break;
                 }
             }
         }
@@ -743,9 +782,7 @@ public class MainUtil {
                     break;
                 case '.':
                     res[index--] = val;
-                    if (index == -1) {
-                        return res;
-                    }
+                    if (index == -1) return res;
                     val = 0;
                     numIndex = 1;
                     break;
@@ -768,26 +805,18 @@ public class MainUtil {
         }
         if (allowDir) {
             File file = MainUtil.resolveRelative(new File(dir, filename));
-            if (file.exists() && file.isDirectory()) {
-                return file;
-            }
+            if (file.exists() && file.isDirectory()) return file;
         }
         for (ClipboardFormat f : ClipboardFormats.getAll()) {
             File file = MainUtil.resolveRelative(new File(dir, filename + "." + f.getPrimaryFileExtension()));
-            if (file.exists()) {
-                return file;
-            }
+            if (file.exists()) return file;
         }
         return null;
     }
 
     public static boolean isInSubDirectory(File dir, File file) throws IOException {
-        if (file == null) {
-            return false;
-        }
-        if (file.equals(dir)) {
-            return true;
-        }
+        if (file == null) return false;
+        if (file.equals(dir)) return true;
         file = file.getCanonicalFile();
         dir = dir.getCanonicalFile();
         return isInSubDirectory(dir, file.getParentFile());
@@ -951,6 +980,10 @@ public class MainUtil {
         return time;
     }
 
+    public static void deleteOlder(File directory, final long timeDiff) {
+        deleteOlder(directory, timeDiff, true);
+    }
+
     public static void deleteOlder(File directory, final long timeDiff, boolean printDebug) {
         final long now = System.currentTimeMillis();
         ForkJoinPool pool = new ForkJoinPool();
@@ -958,9 +991,7 @@ public class MainUtil {
             long age = now - file.lastModified();
             if (age > timeDiff) {
                 pool.submit(file::delete);
-                if (printDebug) {
-                    BBC.FILE_DELETED.send(null, file);
-                }
+                if (printDebug) BBC.FILE_DELETED.send(null, file);
             }
         });
         pool.shutdown();
@@ -971,6 +1002,49 @@ public class MainUtil {
         }
     }
 
+    public static boolean deleteDirectory(File directory) {
+        return deleteDirectory(directory, true);
+    }
+
+    public static boolean deleteDirectory(File directory, boolean printDebug) {
+        if (directory.exists()) {
+            File[] files = directory.listFiles();
+            if (null != files) {
+                for (File file : files) {
+                    if (file.isDirectory()) {
+                        deleteDirectory(file, printDebug);
+                    } else {
+                        file.delete();
+                        if (printDebug) BBC.FILE_DELETED.send(null, file);
+                    }
+                }
+            }
+        }
+        return (directory.delete());
+    }
+
+    public static boolean isValidTag(Tag tag) {
+        if (tag instanceof EndTag) {
+            return false;
+        } else if (tag instanceof ListTag) {
+            ListTag lt = (ListTag) tag;
+            if ((lt).getType() == EndTag.class) {
+                return false;
+            }
+        } else if (tag instanceof CompoundTag) {
+            for (Entry<String, Tag> entry : ((CompoundTag) tag).getValue().entrySet()) {
+                if (!isValidTag(entry.getValue())) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    public enum OS {
+        LINUX, WINDOWS, MACOS, UNKNOWN;
+    }
+
     public static File getWorkingDirectory(String applicationName) {
         String userHome = System.getProperty("user.home", ".");
         File workingDirectory;
@@ -1014,8 +1088,4 @@ public class MainUtil {
         }
         return OS.UNKNOWN;
     }
-
-    public enum OS {
-        LINUX, WINDOWS, MACOS, UNKNOWN;
-    }
 }

worldedit-core/src/main/java/com/boydti/fawe/util/MaskTraverser.java

@@ -3,7 +3,6 @@ package com.boydti.fawe.util;
 import com.boydti.fawe.object.mask.ResettableMask;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.function.mask.Mask;
-
 import java.lang.reflect.Field;
 import java.util.Collection;
 

worldedit-core/src/main/java/com/boydti/fawe/util/MathMan.java

@@ -4,7 +4,6 @@ public class MathMan {
 
     /**
      * Optimized for i elem 0,65536 (characters)
-     *
      * @param i
      * @return square root
      */
@@ -23,7 +22,7 @@ public class MathMan {
         return CachedMathMan.cosInexact(paramFloat);
     }
 
-    public static int log2nlz(int bits) {
+    public static int log2nlz( int bits ) {
         return Integer.SIZE - Integer.numberOfLeadingZeros(bits);
     }
 
@@ -52,6 +51,16 @@ public class MathMan {
         return max;
     }
 
+    public static int min(int... values) {
+        int min = Integer.MAX_VALUE;
+        for (int d : values) {
+            if (d < min) {
+                min = d;
+            }
+        }
+        return min;
+    }
+
     public static double min(double... values) {
         double min = Double.MAX_VALUE;
         for (double d : values) {
@@ -62,6 +71,11 @@ public class MathMan {
         return min;
     }
 
+    public static int ceilZero(float floatNumber) {
+        int floor = (int) floatNumber;
+        return floatNumber > (float) floor ? floor + 1 : floor;
+    }
+
     public static int sqr(int val) {
         return val * val;
     }
@@ -107,59 +121,72 @@ public class MathMan {
         }
     }
 
-    public static int pair(short x, short y) {
+    public static final long inverseRound(double val) {
+        long round = Math.round(val);
+        return (long) (round + Math.signum(val - round));
+    }
+
+    public static final int pair(short x, short y) {
         return (x << 16) | (y & 0xFFFF);
     }
 
-    public static short unpairX(int hash) {
+    public static final short unpairX(int hash) {
         return (short) (hash >> 16);
     }
 
-    public static short unpairY(int hash) {
+    public static final short unpairY(int hash) {
         return (short) (hash & 0xFFFF);
     }
 
-    public static short pairByte(int x, int y) {
+    public static final short pairByte(int x, int y) {
         return (short) ((x << 8) | (y & 0xFF));
     }
 
-    public static byte unpairShortX(short pair) {
+    public static final byte unpairShortX(short pair) {
         return (byte) (pair >> 8);
     }
 
-    public static byte unpairShortY(short pair) {
+    public static final byte unpairShortY(short pair) {
         return (byte) pair;
     }
 
-    public static long pairInt(int x, int y) {
+    public static final long pairInt(int x, int y) {
         return (((long) x) << 32) | (y & 0xffffffffL);
     }
 
-    public static long untripleWorldCoordX(long triple) {
+    public static final long tripleWorldCoord(int x, int y, int z) {
+        return y + (((long) x & 0x3FFFFFF) << 8) + (((long) z & 0x3FFFFFF) << 34);
+    }
+
+    public static final long untripleWorldCoordX(long triple) {
         return (((triple >> 8) & 0x3FFFFFF) << 38) >> 38;
     }
 
-    public static long untripleWorldCoordY(long triple) {
+    public static final long untripleWorldCoordY(long triple) {
         return triple & 0xFF;
     }
 
-    public static short tripleBlockCoord(int x, int y, int z) {
+    public static final long untripleWorldCoordZ(long triple) {
+        return (((triple >> 34) & 0x3FFFFFF) << 38) >> 38;
+    }
+
+    public static final short tripleBlockCoord(int x, int y, int z) {
         return (short) ((x & 15) << 12 | (z & 15) << 8 | y);
     }
 
-    public static char tripleBlockCoordChar(int x, int y, int z) {
+    public static final char tripleBlockCoordChar(int x, int y, int z) {
         return (char) ((x & 15) << 12 | (z & 15) << 8 | y);
     }
 
-    public static int untripleBlockCoordX(int triple) {
+    public static final int untripleBlockCoordX(int triple) {
         return (triple >> 12) & 0xF;
     }
 
-    public static int untripleBlockCoordY(int triple) {
+    public static final int untripleBlockCoordY(int triple) {
         return (triple & 0xFF);
     }
 
-    public static int untripleBlockCoordZ(int triple) {
+    public static final int untripleBlockCoordZ(int triple) {
         return (triple >> 8) & 0xF;
     }
 
@@ -204,27 +231,31 @@ public class MathMan {
         return y3 + (y2 << 4) + (y1 << 12);
     }
 
-    public static int unpairIntX(long pair) {
+    public static final long chunkXZ2Int(int x, int z) {
+        return (long) x & 4294967295L | ((long) z & 4294967295L) << 32;
+    }
+
+    public static final int unpairIntX(long pair) {
         return (int) (pair >> 32);
     }
 
-    public static int unpairIntY(long pair) {
+    public static final int unpairIntY(long pair) {
         return (int) pair;
     }
 
-    public static byte pair16(int x, int y) {
+    public static final byte pair16(int x, int y) {
         return (byte) (x + (y << 4));
     }
 
-    public static byte unpair16x(byte value) {
+    public static final byte unpair16x(byte value) {
         return (byte) (value & 0xF);
     }
 
-    public static byte unpair16y(byte value) {
+    public static final byte unpair16y(byte value) {
         return (byte) ((value >> 4) & 0xF);
     }
 
-    public static byte pair8(int x, int y) {
+    public static final byte pair8(int x, int y) {
         return (byte) (x + (y << 3));
     }
 
@@ -236,14 +267,18 @@ public class MathMan {
         return (byte) ((value >> 3) & 0x7F);
     }
 
-    public static int gcd(int a, int b) {
+    public static final int lossyFastDivide(int a, int b) {
+        return (a * ((1 << 16) / b)) >> 16;
+    }
+
+    public static final int gcd(int a, int b) {
         if (b == 0) {
             return a;
         }
         return gcd(b, a % b);
     }
 
-    public static int gcd(int[] a) {
+    public static final int gcd(int[] a) {
         int result = a[0];
         for (int i = 1; i < a.length; i++) {
             result = gcd(result, a[i]);
@@ -252,7 +287,15 @@ public class MathMan {
     }
 
 
-    public static double getMean(double[] array) {
+    public static final double getMean(int[] array) {
+        double count = 0;
+        for (int i : array) {
+            count += i;
+        }
+        return count / array.length;
+    }
+
+    public static final double getMean(double[] array) {
         double count = 0;
         for (double i : array) {
             count += i;
@@ -267,24 +310,50 @@ public class MathMan {
      * @param pitch
      * @return
      */
-    public static float[] getDirection(float yaw, float pitch) {
+    public static final float[] getDirection(float yaw, float pitch) {
         double pitch_sin = Math.sin(pitch);
         return new float[]{(float) (pitch_sin * Math.cos(yaw)), (float) (pitch_sin * Math.sin(yaw)), (float) Math.cos(pitch)};
     }
 
-    public static int roundInt(double value) {
+    public static final int roundInt(double value) {
         return (int) (value < 0 ? (value == (int) value) ? value : value - 1 : value);
     }
 
-    public static float sqrtApprox(float f) {
+    /**
+     * Returns [ pitch, yaw ]
+     *
+     * @param x
+     * @param y
+     * @param z
+     * @return
+     */
+    public static final float[] getPitchAndYaw(float x, float y, float z) {
+        float distance = sqrtApprox((z * z) + (x * x));
+        return new float[]{atan2(y, distance), atan2(x, z)};
+    }
+
+    public static final float atan2(float y, float x) {
+        return CachedMathMan.atan2(y, x);
+    }
+
+    public static final float sqrtApprox(float f) {
         return f * Float.intBitsToFloat(0x5f375a86 - (Float.floatToIntBits(f) >> 1));
     }
 
-    public static double sqrtApprox(double d) {
-        return Double.longBitsToDouble(((Double.doubleToLongBits(d) - (1L << 52)) >> 1) + (1L << 61));
+    public static final double sqrtApprox(double d) {
+        return Double.longBitsToDouble(((Double.doubleToLongBits(d) - (1l << 52)) >> 1) + (1l << 61));
     }
 
-    public static boolean isInteger(CharSequence str) {
+    public static final float invSqrt(float x) {
+        float xhalf = 0.5f * x;
+        int i = Float.floatToIntBits(x);
+        i = 0x5f3759df - (i >> 1);
+        x = Float.intBitsToFloat(i);
+        x = x * (1.5f - (xhalf * x * x));
+        return x;
+    }
+
+    public static final boolean isInteger(CharSequence str) {
         if (str == null) {
             return false;
         }
@@ -308,8 +377,41 @@ public class MathMan {
         return true;
     }
 
-    public static int absByte(int value) {
+    public static final double getSD(double[] array, double av) {
+        double sd = 0;
+        for (double element : array) {
+            sd += Math.pow(Math.abs(element - av), 2);
+        }
+        return Math.sqrt(sd / array.length);
+    }
+
+    public static final double getSD(int[] array, double av) {
+        double sd = 0;
+        for (int element : array) {
+            sd += Math.pow(Math.abs(element - av), 2);
+        }
+        return Math.sqrt(sd / array.length);
+    }
+
+    public static final int absByte(int value) {
         return (value ^ (value >> 8)) - (value >> 8);
     }
 
+    public static final int mod(int x, int y) {
+        if (isPowerOfTwo(y)) {
+            return x & (y - 1);
+        }
+        return x % y;
+    }
+
+    public static final int unsignedmod(int x, int y) {
+        if (isPowerOfTwo(y)) {
+            return x & (y - 1);
+        }
+        return x % y;
+    }
+
+    public static final boolean isPowerOfTwo(int x) {
+        return (x & (x - 1)) == 0;
+    }
 }

worldedit-core/src/main/java/com/boydti/fawe/util/MemUtil.java

@@ -1,7 +1,6 @@
 package com.boydti.fawe.util;
 
 import com.boydti.fawe.config.Settings;
-
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -9,8 +8,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
 public class MemUtil {
 
     private static AtomicBoolean memory = new AtomicBoolean(false);
-    private static Queue<Runnable> memoryLimitedTasks = new ConcurrentLinkedQueue<>();
-    private static Queue<Runnable> memoryPlentifulTasks = new ConcurrentLinkedQueue<>();
 
     public static boolean isMemoryFree() {
         return !memory.get();
@@ -31,7 +28,8 @@ public class MemUtil {
     }
 
     public static long getUsedBytes() {
-        return Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory();
+        long used = Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory();
+        return used;
     }
 
     public static long getFreeBytes() {
@@ -53,16 +51,17 @@ public class MemUtil {
         return size;
     }
 
+    private static Queue<Runnable> memoryLimitedTasks = new ConcurrentLinkedQueue<>();
+    private static Queue<Runnable> memoryPlentifulTasks = new ConcurrentLinkedQueue<>();
+
     public static void addMemoryLimitedTask(Runnable run) {
-        if (run != null) {
+        if (run != null)
             memoryLimitedTasks.add(run);
-        }
     }
 
     public static void addMemoryPlentifulTask(Runnable run) {
-        if (run != null) {
+        if (run != null)
             memoryPlentifulTasks.add(run);
-        }
     }
 
     public static void memoryLimitedTask() {

worldedit-core/src/main/java/com/boydti/fawe/util/Perm.java

@@ -16,6 +16,14 @@ public enum Perm {
         this.cat = cat;
     }
 
+    public boolean has(final FawePlayer<?> player) {
+        return this.hasPermission(player, this);
+    }
+
+    public boolean hasPermission(final FawePlayer<?> player, final Perm perm) {
+        return hasPermission(player, perm.s);
+    }
+
     public static boolean hasPermission(final FawePlayer<?> player, final String perm) {
         if ((player == null) || player.hasPermission(ADMIN.s)) {
             return true;
@@ -33,12 +41,4 @@ public enum Perm {
         }
         return false;
     }
-
-    public boolean has(final FawePlayer<?> player) {
-        return this.hasPermission(player, this);
-    }
-
-    public boolean hasPermission(final FawePlayer<?> player, final Perm perm) {
-        return hasPermission(player, perm.s);
-    }
 }

worldedit-core/src/main/java/com/boydti/fawe/util/RandomTextureUtil.java

@@ -8,13 +8,14 @@ import java.util.concurrent.ThreadLocalRandom;
 
 public class RandomTextureUtil extends CachedTextureUtil {
 
+    public RandomTextureUtil(TextureUtil parent) throws FileNotFoundException {
+        super(parent);
+    }
+
     private int index;
     private int[] biomeMixBuffer = new int[3];
     private Int2ObjectOpenHashMap<Integer> offsets = new Int2ObjectOpenHashMap<>();
     private Int2ObjectOpenHashMap<int[]> biomeMixes = new Int2ObjectOpenHashMap<>();
-    public RandomTextureUtil(TextureUtil parent) throws FileNotFoundException {
-        super(parent);
-    }
 
     protected int addRandomColor(int c1, int c2) {
         int red1 = (c1 >> 16) & 0xFF;
@@ -49,9 +50,7 @@ public class RandomTextureUtil extends CachedTextureUtil {
             mix[3] = average;
             biomeMixes.put(color, mix);
         }
-        if (++index > 2) {
-            index = 0;
-        }
+        if (++index > 2) index = 0;
         int biomeId = mix[index];
         int biomeAvColor = mix[3];
         int blockColor = getColor(block);
@@ -74,9 +73,7 @@ public class RandomTextureUtil extends CachedTextureUtil {
             mix[3] = average;
             biomeMixes.put(color, mix);
         }
-        if (++index > 2) {
-            index = 0;
-        }
+        if (++index > 2) index = 0;
         int biomeId = mix[index];
         return getBiome(biomeId);
     }
@@ -90,9 +87,7 @@ public class RandomTextureUtil extends CachedTextureUtil {
             offsetColor = color;
         }
         BlockType res = super.getNearestBlock(offsetColor);
-        if (res == null) {
-            return null;
-        }
+        if (res == null) return null;
         int newColor = getColor(res);
         {
             byte dr = (byte) (((color >> 16) & 0xFF) - ((newColor >> 16) & 0xFF));

worldedit-core/src/main/java/com/boydti/fawe/util/ReflectionUtils.java

@@ -1,9 +1,5 @@
 package com.boydti.fawe.util;
 
-import sun.reflect.ConstructorAccessor;
-import sun.reflect.FieldAccessor;
-import sun.reflect.ReflectionFactory;
-
 import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.Array;
 import java.lang.reflect.Constructor;
@@ -11,12 +7,11 @@ import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+
+import sun.reflect.ConstructorAccessor;
+import sun.reflect.FieldAccessor;
+import sun.reflect.ReflectionFactory;
 
 /**
  * @author DPOH-VAR
@@ -24,8 +19,6 @@ import java.util.Map;
  */
 @SuppressWarnings({"UnusedDeclaration", "rawtypes"})
 public class ReflectionUtils {
-    private static Class<?> UNMODIFIABLE_MAP = Collections.unmodifiableMap(Collections.EMPTY_MAP).getClass();
-
     public static <T> T as(Class<T> t, Object o) {
         return t.isInstance(o) ? t.cast(o) : null;
     }
@@ -59,21 +52,21 @@ public class ReflectionUtils {
 
             // 2. Copy it
             T[] previousValues = (T[]) valuesField.get(enumType);
-            List<T> values = new ArrayList<>(Arrays.asList(previousValues));
+            List values = new ArrayList(Arrays.asList(previousValues));
 
             // 3. build new enum
             T newValue = (T) makeEnum(enumType, // The target enum class
-                                      enumName, // THE NEW ENUM INSTANCE TO BE DYNAMICALLY ADDED
-                                      values.size(),
-                                      additionalTypes, // can be used to pass values to the enum constructor
-                                      additionalValues); // can be used to pass values to the enum constructor
+                    enumName, // THE NEW ENUM INSTANCE TO BE DYNAMICALLY ADDED
+                    values.size(),
+                    additionalTypes, // can be used to pass values to the enum constructor
+                    additionalValues); // can be used to pass values to the enum constructor
 
             // 4. add new value
             values.add(newValue);
 
             // 5. Set new values field
             setFailsafeFieldValue(valuesField, null,
-                                  values.toArray((T[]) Array.newInstance(enumType, 0)));
+                    values.toArray((T[]) Array.newInstance(enumType, 0)));
 
             // 6. Clean enum cache
             cleanEnumCache(enumType);
@@ -114,9 +107,7 @@ public class ReflectionUtils {
             Class<? extends Enum> clazz = dest.getClass();
             Object newEnum = makeEnum(clazz, value, dest.ordinal(), additionalTypes, additionalValues);
             for (Field field : clazz.getDeclaredFields()) {
-                if (Modifier.isStatic(field.getModifiers())) {
-                    continue;
-                }
+                if (Modifier.isStatic(field.getModifiers())) continue;
                 field.setAccessible(true);
                 Object newValue = field.get(newEnum);
                 setField(field, dest, newValue);
@@ -127,7 +118,7 @@ public class ReflectionUtils {
     }
 
     public static Object makeEnum(Class<?> enumClass, String value, int ordinal,
-                                  Class<?>[] additionalTypes, Object[] additionalValues) throws Exception {
+                                   Class<?>[] additionalTypes, Object[] additionalValues) throws Exception {
         Object[] parms = new Object[additionalValues.length + 2];
         parms[0] = value;
         parms[1] = ordinal;
@@ -141,7 +132,7 @@ public class ReflectionUtils {
         parameterTypes[0] = String.class;
         parameterTypes[1] = int.class;
         System.arraycopy(additionalParameterTypes, 0,
-                         parameterTypes, 2, additionalParameterTypes.length);
+                parameterTypes, 2, additionalParameterTypes.length);
         return ReflectionFactory.getReflectionFactory().newConstructorAccessor(enumClass.getDeclaredConstructor(parameterTypes));
     }
 
@@ -189,12 +180,12 @@ public class ReflectionUtils {
         blankField(enumClass, "enumConstants"); // IBM JDK
     }
 
+    private static Class<?> UNMODIFIABLE_MAP = Collections.unmodifiableMap(Collections.EMPTY_MAP).getClass();
+
     public static <T, V> Map<T, V> getMap(Map<T, V> map) {
         try {
             Class<? extends Map> clazz = map.getClass();
-            if (clazz != UNMODIFIABLE_MAP) {
-                return map;
-            }
+            if (clazz != UNMODIFIABLE_MAP) return map;
             Field m = clazz.getDeclaredField("m");
             m.setAccessible(true);
             return (Map<T, V>) m.get(map);
@@ -207,9 +198,7 @@ public class ReflectionUtils {
     public static <T> List<T> getList(List<T> list) {
         try {
             Class<? extends List> clazz = (Class<? extends List>) Class.forName("java.util.Collections$UnmodifiableList");
-            if (!clazz.isInstance(list)) {
-                return list;
-            }
+            if (!clazz.isInstance(list)) return list;
             Field m = clazz.getDeclaredField("list");
             m.setAccessible(true);
             return (List<T>) m.get(list);
@@ -316,25 +305,19 @@ public class ReflectionUtils {
             if (returnType == null || method.getReturnType() == returnType) {
                 Class<?>[] mp = method.getParameterTypes();
                 int mods = method.getModifiers();
-                if ((mods & hasMods) != hasMods || (mods & noMods) != 0) {
-                    continue;
-                }
+                if ((mods & hasMods) != hasMods || (mods & noMods) != 0) continue;
                 if (params == null) {
-                    if (index-- == 0) {
-                        return setAccessible(method);
-                    } else {
+                    if (index-- == 0) return setAccessible(method);
+                    else {
                         continue;
                     }
                 }
                 if (mp.length == params.length) {
                     for (int i = 0; i < mp.length; i++) {
-                        if (mp[i] != params[i]) {
-                            continue outer;
-                        }
+                        if (mp[i] != params[i]) continue outer;
                     }
-                    if (index-- == 0) {
-                        return setAccessible(method);
-                    } else {
+                    if (index-- == 0) return setAccessible(method);
+                    else {
                         continue;
                     }
                 }
@@ -455,7 +438,7 @@ public class ReflectionUtils {
         /**
          * get existing method by name and types
          *
-         * @param name name
+         * @param name  name
          * @param types method parameters. can be Class or RefClass
          * @return RefMethod object
          * @throws RuntimeException if method not found

worldedit-core/src/main/java/com/boydti/fawe/util/ReflectionUtils9.java

@@ -2,11 +2,7 @@ package com.boydti.fawe.util;
 
 import sun.misc.Unsafe;
 
-import java.lang.reflect.AccessibleObject;
-import java.lang.reflect.Array;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
+import java.lang.reflect.*;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -33,12 +29,12 @@ public class ReflectionUtils9 {
 
             // 2. Copy it
             T[] previousValues = (T[]) valuesField.get(enumType);
-            List<T> values = new ArrayList<>(Arrays.asList(previousValues));
+            List values = new ArrayList(Arrays.asList(previousValues));
 
             // 3. build new enum
             T newValue = (T) makeEnum(enumType, // The target enum class
-                                      enumName, // THE NEW ENUM INSTANCE TO BE DYNAMICALLY ADDED
-                                      values.size()); // can be used to pass values to the enum constuctor
+                    enumName, // THE NEW ENUM INSTANCE TO BE DYNAMICALLY ADDED
+                    values.size()); // can be used to pass values to the enum constuctor
 
             // 4. add new value
             values.add(newValue);
@@ -46,7 +42,7 @@ public class ReflectionUtils9 {
             // 5. Set new values field
             try {
                 setFailsafeFieldValue(valuesField, null,
-                                      values.toArray((T[]) Array.newInstance(enumType, 0)));
+                        values.toArray((T[]) Array.newInstance(enumType, 0)));
             } catch (Throwable e) {
                 Field ordinalField = Enum.class.getDeclaredField("ordinal");
                 setFailsafeFieldValue(ordinalField, newValue, 0);
@@ -121,11 +117,8 @@ public class ReflectionUtils9 {
         }
 
         try {
-            if (target == null) {
-                field.set(null, value);
-            } else {
-                field.set(target, value);
-            }
+            if (target == null) field.set(null, value);
+            else field.set(target, value);
         } catch (NoSuchMethodError error) {
             field.set(target, value);
         }

worldedit-core/src/main/java/com/boydti/fawe/util/SetQueue.java

@@ -5,7 +5,6 @@ import com.boydti.fawe.config.Settings;
 import com.boydti.fawe.object.FaweQueue;
 import com.boydti.fawe.wrappers.WorldWrapper;
 import com.sk89q.worldedit.world.World;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -22,29 +21,61 @@ public class SetQueue {
      * The implementation specific queue
      */
     public static final SetQueue IMP = new SetQueue();
+    private double targetTPS = 18;
+
+    public enum QueueStage {
+        INACTIVE, ACTIVE, NONE;
+    }
+
     private final ConcurrentLinkedDeque<FaweQueue> activeQueues;
     private final ConcurrentLinkedDeque<FaweQueue> inactiveQueues;
     private final ConcurrentLinkedDeque<Runnable> tasks;
-    /**
-     * A queue of tasks that will run when the queue is empty
-     */
-    private final ConcurrentLinkedDeque<Runnable> emptyTasks = new ConcurrentLinkedDeque<>();
-    private double targetTPS = 18;
+
     /**
      * Used to calculate elapsed time in milliseconds and ensure block placement doesn't lag the server
      */
     private long last;
     private long allocate = 50;
     private long lastSuccess;
+
+    /**
+     * A queue of tasks that will run when the queue is empty
+     */
+    private final ConcurrentLinkedDeque<Runnable> emptyTasks = new ConcurrentLinkedDeque<>();
+
     private ForkJoinPool pool = new ForkJoinPool();
     private ExecutorCompletionService completer = new ExecutorCompletionService(pool);
+
+    /**
+     * @return ForkJoinPool
+     * @see TaskManager#getPublicForkJoinPool()
+     */
+    @Deprecated
+    public ExecutorCompletionService getCompleterService() {
+        return completer;
+    }
+
+    @Deprecated
+    public ForkJoinPool getForkJoinPool() {
+        return pool;
+    }
+
+    public void runMiscTasks() {
+        while (Fawe.get().getTimer().isAbove(targetTPS)) {
+            Runnable task = tasks.poll();
+            if (task != null) {
+                task.run();
+            } else {
+                break;
+            }
+        }
+    }
+
     public SetQueue() {
         tasks = new ConcurrentLinkedDeque<>();
         activeQueues = new ConcurrentLinkedDeque<>();
         inactiveQueues = new ConcurrentLinkedDeque<>();
-        if (TaskManager.IMP == null) {
-            return;
-        }
+        if (TaskManager.IMP == null) return;
         TaskManager.IMP.repeat(() -> {
             try {
                 long now = System.currentTimeMillis();
@@ -139,7 +170,16 @@ public class SetQueue {
                     e.printStackTrace();
                 }
                 if (pool.getQueuedSubmissionCount() != 0 || pool.getRunningThreadCount() != 0 || pool.getQueuedTaskCount() != 0) {
-                    pool.awaitQuiescence(Long.MAX_VALUE, TimeUnit.MILLISECONDS);
+//                        if (Fawe.get().isJava8())
+                    {
+                        pool.awaitQuiescence(Long.MAX_VALUE, TimeUnit.MILLISECONDS);
+                    }
+//                        else {
+//                            pool.shutdown();
+//                            pool.awaitTermination(Long.MAX_VALUE, TimeUnit.MILLISECONDS);
+//                            pool = new ForkJoinPool();
+//                            completer = new ExecutorCompletionService(pool);
+//                        }
                 }
                 queue.endSet(parallel);
             } catch (Throwable e) {
@@ -148,31 +188,6 @@ public class SetQueue {
         }, 1);
     }
 
-    /**
-     * @return ForkJoinPool
-     * @see TaskManager#getPublicForkJoinPool()
-     */
-    @Deprecated
-    public ExecutorCompletionService getCompleterService() {
-        return completer;
-    }
-
-    @Deprecated
-    public ForkJoinPool getForkJoinPool() {
-        return pool;
-    }
-
-    public void runMiscTasks() {
-        while (Fawe.get().getTimer().isAbove(targetTPS)) {
-            Runnable task = tasks.poll();
-            if (task != null) {
-                task.run();
-            } else {
-                break;
-            }
-        }
-    }
-
     public QueueStage getStage(FaweQueue queue) {
         return queue.getStage();
     }
@@ -226,9 +241,7 @@ public class SetQueue {
 
     public FaweQueue getNewQueue(World world, boolean fast, boolean autoqueue) {
         world = WorldWrapper.unwrap(world);
-        if (world instanceof FaweQueue) {
-            return (FaweQueue) world;
-        }
+        if (world instanceof FaweQueue) return (FaweQueue) world;
         FaweQueue queue = Fawe.imp().getNewQueue(world, fast);
         if (autoqueue) {
             queue.setStage(QueueStage.INACTIVE);
@@ -431,8 +444,4 @@ public class SetQueue {
         }
         return true;
     }
-
-    public enum QueueStage {
-        INACTIVE, ACTIVE, NONE;
-    }
 }

worldedit-core/src/main/java/com/boydti/fawe/util/ShapeInterpolator.java

@@ -1,6 +1,7 @@
 package com.boydti.fawe.util;
 
-import java.awt.*;
+import java.awt.Rectangle;
+import java.awt.Shape;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.FlatteningPathIterator;
 import java.awt.geom.IllegalPathStateException;
@@ -53,6 +54,53 @@ public class ShapeInterpolator {
         return instance.evaluate(v0, v1, fraction, unionBounds);
     }
 
+    /**
+     * Creates an interpolated shape from tight bounds.
+     */
+    public Shape evaluate(Shape v0, Shape v1, float fraction) {
+        return evaluate(v0, v1, fraction, false);
+    }
+
+    /**
+     * Creates an interpolated shape.
+     *
+     * @param v0          the first shape
+     * @param v1          the second shape
+     * @param fraction    the fraction from zero (just first shape) to one (just second shape)
+     * @param unionBounds if `true`, the shape reports bounds which are the union of
+     *                    the bounds of both shapes, if `false` it reports "tight" bounds
+     *                    using the actual interpolated path.
+     */
+    public Shape evaluate(Shape v0, Shape v1, float fraction, boolean unionBounds) {
+        if (savedV0 != v0 || savedV1 != v1) {
+            if (savedV0 == v1 && savedV1 == v0) {
+                // Just swap the geometries
+                final Geometry tmp = geom0;
+                geom0 = geom1;
+                geom1 = tmp;
+            } else {
+                recalculate(v0, v1);
+            }
+            savedV0 = v0;
+            savedV1 = v1;
+        }
+        return getShape(fraction, unionBounds);
+    }
+
+    private void recalculate(Shape v0, Shape v1) {
+        geom0 = new Geometry(v0);
+        geom1 = new Geometry(v1);
+        final float[] tVals0 = geom0.getTVals();
+        final float[] tVals1 = geom1.getTVals();
+        final float[] masterTVals = mergeTVals(tVals0, tVals1);
+        geom0.setTVals(masterTVals);
+        geom1.setTVals(masterTVals);
+    }
+
+    private Shape getShape(float fraction, boolean unionBounds) {
+        return new MorphedShape(geom0, geom1, fraction, unionBounds);
+    }
+
     private static float[] mergeTVals(float[] tVals0, float[] tVals1) {
         final int count = sortTVals(tVals0, tVals1, null);
         final float[] newTVals = new float[count];
@@ -90,53 +138,6 @@ public class ShapeInterpolator {
         return (v0 + ((v1 - v0) * t));
     }
 
-    /**
-     * Creates an interpolated shape from tight bounds.
-     */
-    public Shape evaluate(Shape v0, Shape v1, float fraction) {
-        return evaluate(v0, v1, fraction, false);
-    }
-
-    /**
-     * Creates an interpolated shape.
-     *
-     * @param v0 the first shape
-     * @param v1 the second shape
-     * @param fraction the fraction from zero (just first shape) to one (just second shape)
-     * @param unionBounds if `true`, the shape reports bounds which are the union of
-     * the bounds of both shapes, if `false` it reports "tight" bounds
-     * using the actual interpolated path.
-     */
-    public Shape evaluate(Shape v0, Shape v1, float fraction, boolean unionBounds) {
-        if (savedV0 != v0 || savedV1 != v1) {
-            if (savedV0 == v1 && savedV1 == v0) {
-                // Just swap the geometries
-                final Geometry tmp = geom0;
-                geom0 = geom1;
-                geom1 = tmp;
-            } else {
-                recalculate(v0, v1);
-            }
-            savedV0 = v0;
-            savedV1 = v1;
-        }
-        return getShape(fraction, unionBounds);
-    }
-
-    private void recalculate(Shape v0, Shape v1) {
-        geom0 = new Geometry(v0);
-        geom1 = new Geometry(v1);
-        final float[] tVals0 = geom0.getTVals();
-        final float[] tVals1 = geom1.getTVals();
-        final float[] masterTVals = mergeTVals(tVals0, tVals1);
-        geom0.setTVals(masterTVals);
-        geom1.setTVals(masterTVals);
-    }
-
-    private Shape getShape(float fraction, boolean unionBounds) {
-        return new MorphedShape(geom0, geom1, fraction, unionBounds);
-    }
-
     private static class Geometry {
         static final float THIRD = (1f / 3f);
         static final float MIN_LEN = 0.001f;
@@ -262,8 +263,8 @@ public class ShapeInterpolator {
                 // Copy all coordinates from minPt to the end of the
                 // array to the beginning of the new array
                 System.arraycopy(bezierCoordinates, minPt,
-                                 newCoordinates, 0,
-                                 numCoordinates - minPt);
+                        newCoordinates, 0,
+                        numCoordinates - minPt);
                 // Now we do not want to copy 0,1 as they are duplicates
                 // of the last 2 coordinates which we just copied.  So
                 // we start the source copy at index 2, but we still
@@ -272,8 +273,8 @@ public class ShapeInterpolator {
                 // of the array, thus ensuring that thew new array starts
                 // and ends with the same pair of coordinates...
                 System.arraycopy(bezierCoordinates, 2,
-                                 newCoordinates, numCoordinates - minPt,
-                                 minPt);
+                        newCoordinates, numCoordinates - minPt,
+                        minPt);
                 bezierCoordinates = newCoordinates;
             }
             /* Clockwise enforcement:
@@ -349,24 +350,24 @@ public class ShapeInterpolator {
         private void appendLineTo(float x0, float y0,
                                   float x1, float y1) {
             appendCubicTo(// A third of the way from xy0 to xy1:
-                          interp(x0, x1, THIRD),
-                          interp(y0, y1, THIRD),
-                          // A third of the way from xy1 back to xy0:
-                          interp(x1, x0, THIRD),
-                          interp(y1, y0, THIRD),
-                          x1, y1);
+                    interp(x0, x1, THIRD),
+                    interp(y0, y1, THIRD),
+                    // A third of the way from xy1 back to xy0:
+                    interp(x1, x0, THIRD),
+                    interp(y1, y0, THIRD),
+                    x1, y1);
         }
 
         private void appendQuadTo(float x0, float y0,
                                   float ctrlX, float ctrlY,
                                   float x1, float y1) {
             appendCubicTo(// A third of the way from ctrl X/Y back to xy0:
-                          interp(ctrlX, x0, THIRD),
-                          interp(ctrlY, y0, THIRD),
-                          // A third of the way from ctrl X/Y to xy1:
-                          interp(ctrlX, x1, THIRD),
-                          interp(ctrlY, y1, THIRD),
-                          x1, y1);
+                    interp(ctrlX, x0, THIRD),
+                    interp(ctrlY, y0, THIRD),
+                    // A third of the way from ctrl X/Y to xy1:
+                    interp(ctrlX, x1, THIRD),
+                    interp(ctrlY, y1, THIRD),
+                    x1, y1);
         }
 
         private void appendCubicTo(float ctrlX1, float ctrlY1,
@@ -671,21 +672,21 @@ public class ShapeInterpolator {
         }
 
         /**
-         * @inheritDoc
+         * @{inheritDoc}
          */
         public int getWindingRule() {
             return (t < 0.5 ? g0.getWindingRule() : g1.getWindingRule());
         }
 
         /**
-         * @inheritDoc
+         * @{inheritDoc}
          */
         public boolean isDone() {
             return (cIndex > g0.getNumCoordinates());
         }
 
         /**
-         * @inheritDoc
+         * @{inheritDoc}
          */
         public void next() {
             if (cIndex == 0) {
@@ -696,7 +697,7 @@ public class ShapeInterpolator {
         }
 
         /**
-         * @inheritDoc
+         * @{inheritDoc}
          */
         public int currentSegment(float[] coordinates) {
             int type;

worldedit-core/src/main/java/com/boydti/fawe/util/StringMan.java

@@ -1,5 +1,7 @@
 package com.boydti.fawe.util;
 
+import com.sk89q.util.StringUtil;
+
 import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -10,6 +12,9 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.function.Function;
+import java.util.function.IntConsumer;
+import java.util.function.IntFunction;
+import java.util.function.Predicate;
 
 public class StringMan {
     public static String replaceFromMap(final String string, final Map<String, String> replacements) {
@@ -35,9 +40,7 @@ public class StringMan {
 
     public static boolean containsAny(CharSequence sequence, String any) {
         for (int i = 0; i < sequence.length(); i++) {
-            if (any.indexOf(sequence.charAt(i)) != -1) {
-                return true;
-            }
+            if (any.indexOf(sequence.charAt(i)) != -1) return true;
         }
         return false;
     }
@@ -45,9 +48,7 @@ public class StringMan {
     public static int findMatchingBracket(CharSequence sequence, int index) {
         char startC = sequence.charAt(index);
         char lookC = getMatchingBracket(startC);
-        if (lookC == startC) {
-            return -1;
-        }
+        if (lookC == startC) return -1;
         boolean forward = isBracketForwards(startC);
         int increment = forward ? 1 : -1;
         int end = forward ? sequence.length() : -1;
@@ -64,17 +65,10 @@ public class StringMan {
     }
 
     public static String prettyFormat(double d) {
-        if (d == Double.MIN_VALUE) {
-            return "-∞";
-        }
-        if (d == Double.MAX_VALUE) {
-            return "∞";
-        }
-        if (d == (long) d) {
-            return String.format("%d", (long) d);
-        } else {
-            return String.format("%s", d);
-        }
+        if (d == Double.MIN_VALUE) return "-∞";
+        if (d == Double.MAX_VALUE) return "∞";
+        if(d == (long) d) return String.format("%d",(long)d);
+        else return String.format("%s",d);
     }
 
     public static boolean isBracketForwards(char c) {
@@ -84,31 +78,21 @@ public class StringMan {
             case '{':
             case '<':
                 return true;
-            default:
-                return false;
+            default: return false;
         }
     }
 
     public static char getMatchingBracket(char c) {
         switch (c) {
-            case '[':
-                return ']';
-            case '(':
-                return ')';
-            case '{':
-                return '}';
-            case '<':
-                return '>';
-            case ']':
-                return '[';
-            case ')':
-                return '(';
-            case '}':
-                return '{';
-            case '>':
-                return '<';
-            default:
-                return c;
+            case '[': return ']';
+            case '(': return ')';
+            case '{': return '}';
+            case '<': return '>';
+            case ']': return '[';
+            case ')': return '(';
+            case '}': return '{';
+            case '>': return '<';
+            default: return c;
         }
     }
 
@@ -155,9 +139,7 @@ public class StringMan {
     public static int indexOf(String input, int start, char... values) {
         for (int i = start; i < input.length(); i++) {
             for (char c : values) {
-                if (c == input.charAt(i)) {
-                    return i;
-                }
+                if (c == input.charAt(i)) return i;
             }
         }
         return -1;
@@ -176,15 +158,11 @@ public class StringMan {
         for (int current = 0; current < input.length(); current++) {
             char currentChar = input.charAt(current);
             boolean atLastChar = (current == input.length() - 1);
-            if (!atLastChar && (bracket > 0 || (currentChar == '{' && ++bracket > 0) || (current == '}' && --bracket <= 0))) {
+            if (!atLastChar && (bracket > 0 || (currentChar == '{' && ++bracket > 0) || (current == '}' && --bracket <= 0)))
                 continue;
-            }
-            if (currentChar == '\"') {
-                inQuotes = !inQuotes; // toggle state
-            }
-            if (atLastChar) {
-                result.add(input.substring(start));
-            } else if (currentChar == delim && !inQuotes) {
+            if (currentChar == '\"') inQuotes = !inQuotes; // toggle state
+            if (atLastChar) result.add(input.substring(start));
+            else if (currentChar == delim && !inQuotes) {
                 String toAdd = input.substring(start, current);
                 if (toAdd.startsWith("\"")) {
                     toAdd = toAdd.substring(1, toAdd.length() - 1);
@@ -369,9 +347,7 @@ public class StringMan {
             char ai = input.charAt(i);
             outer:
             while (true) {
-                if (j >= item.length()) {
-                    return Integer.MAX_VALUE;
-                }
+                if (j >= item.length()) return Integer.MAX_VALUE;
 
                 char bj = item.charAt(j++);
                 if (sequentail) {
@@ -379,9 +355,7 @@ public class StringMan {
                         case ':':
                         case '_':
                             sequentail = false;
-                            if (bj == ai) {
-                                break outer;
-                            }
+                            if (bj == ai) break outer;
                             continue;
                     }
                     continue;
@@ -481,9 +455,8 @@ public class StringMan {
         if (char0 == '-') {
             negative = true;
             start++;
-        } else {
-            negative = false;
         }
+        else negative = false;
         for (int i = start; i < end; i++) {
             char c = string.charAt(i);
             switch (c) {

worldedit-core/src/main/java/com/boydti/fawe/util/TaskManager.java

@@ -6,13 +6,13 @@ import com.boydti.fawe.object.FaweQueue;
 import com.boydti.fawe.object.RunnableVal;
 import org.jetbrains.annotations.NotNull;
 
-import javax.annotation.Nullable;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Supplier;
+import javax.annotation.Nullable;
 
 public abstract class TaskManager {
 
@@ -78,7 +78,7 @@ public abstract class TaskManager {
     /**
      * Run a bunch of tasks in parallel
      *
-     * @param runnables The tasks to run
+     * @param runnables  The tasks to run
      * @param numThreads Number of threads (null = config.yml parallel threads)
      */
     @Deprecated
@@ -228,8 +228,8 @@ public abstract class TaskManager {
      * Break up a task and run it in fragments of 5ms.<br>
      * - Each task will run on the main thread.<br>
      *
-     * @param objects - The list of objects to run the task for
-     * @param task - The task to run on each object
+     * @param objects  - The list of objects to run the task for
+     * @param task     - The task to run on each object
      * @param whenDone - When the object task completes
      * @param <T>
      */
@@ -312,7 +312,7 @@ public abstract class TaskManager {
      * - Usualy wait time is around 25ms<br>
      *
      * @param function
-     * @param timeout - How long to wait for execution
+     * @param timeout  - How long to wait for execution
      * @param <T>
      * @return
      */
@@ -361,7 +361,7 @@ public abstract class TaskManager {
      * - Usualy wait time is around 25ms<br>
      *
      * @param function
-     * @param timeout - How long to wait for execution
+     * @param timeout  - How long to wait for execution
      * @param <T>
      * @return
      */

worldedit-core/src/main/java/com/boydti/fawe/util/TextureUtil.java

@@ -1,19 +1,25 @@
 package com.boydti.fawe.util;
 
 import com.boydti.fawe.Fawe;
+import com.boydti.fawe.FaweCache;
 import com.boydti.fawe.config.Settings;
 import com.boydti.fawe.object.pattern.PatternExtent;
 import com.boydti.fawe.util.image.ImageUtil;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.google.gson.stream.JsonReader;
+
+import com.sk89q.worldedit.util.command.binding.Text;
+import com.sk89q.worldedit.world.block.BlockState;
 import com.sk89q.worldedit.extent.clipboard.Clipboard;
 import com.sk89q.worldedit.function.mask.Mask;
 import com.sk89q.worldedit.function.pattern.BlockPattern;
 import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.world.block.BlockStateHolder;
 import com.sk89q.worldedit.world.block.BlockType;
 import com.sk89q.worldedit.world.block.BlockTypes;
 import com.sk89q.worldedit.world.registry.BlockMaterial;
+import com.sk89q.worldedit.world.registry.BundledBlockData;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.ints.IntArraySet;
@@ -21,330 +27,19 @@ import it.unimi.dsi.fastutil.longs.LongArrayList;
 
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
+import java.io.*;
 import java.lang.reflect.Type;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Pattern;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
 // TODO FIXME
-public class
-TextureUtil implements TextureHolder {
-
-    private static final int[] FACTORS = new int[766];
-
-    static {
-        for (int i = 1; i < FACTORS.length; i++) {
-            FACTORS[i] = 65535 / i;
-        }
-    }
-
-    private final File folder;
-    protected int[] blockColors = new int[BlockTypes.size()];
-    protected long[] blockDistance = new long[BlockTypes.size()];
-    protected long[] distances;
-    protected int[] validColors;
-    protected int[] validBlockIds;
-    protected int[] validLayerColors;
-    protected int[][] validLayerBlocks;
-    protected int[] validMixBiomeColors;
-    protected long[] validMixBiomeIds;
-    /**
-     * https://github.com/erich666/Mineways/blob/master/Win/biomes.cpp
-     */
-    protected BiomeColor[] validBiomes;
-    private BiomeColor[] biomes = new BiomeColor[]{
-            //    ID    Name             Temperature, rainfall, grass, foliage colors
-            //    - note: the colors here are just placeholders, they are computed in the program
-            new BiomeColor(0, "Ocean", 0.5f, 0.5f, 0x92BD59, 0x77AB2F),
-            // default values of temp and rain
-            new BiomeColor(1, "Plains", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(2, "Desert", 2.0f, 0.0f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(3, "Extreme Hills", 0.2f, 0.3f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(4, "Forest", 0.7f, 0.8f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(5, "Taiga", 0.25f, 0.8f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(6, "Swampland", 0.8f, 0.9f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(7, "River", 0.5f, 0.5f, 0x92BD59, 0x77AB2F),
-            // default values of temp and rain
-            new BiomeColor(8, "Nether", 2.0f, 0.0f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(9, "End", 0.5f, 0.5f, 0x92BD59, 0x77AB2F),
-            // default values of temp and rain
-            new BiomeColor(10, "Frozen Ocean", 0.0f, 0.5f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(11, "Frozen River", 0.0f, 0.5f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(12, "Ice Plains", 0.0f, 0.5f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(13, "Ice Mountains", 0.0f, 0.5f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(14, "Mushroom Island", 0.9f, 1.0f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(15, "Mushroom Island Shore", 0.9f, 1.0f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(16, "Beach", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(17, "Desert Hills", 2.0f, 0.0f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(18, "Forest Hills", 0.7f, 0.8f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(19, "Taiga Hills", 0.25f, 0.8f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(20, "Extreme Hills Edge", 0.2f, 0.3f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(21, "Jungle", 0.95f, 0.9f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(22, "Jungle Hills", 0.95f, 0.9f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(23, "Jungle Edge", 0.95f, 0.8f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(24, "Deep Ocean", 0.5f, 0.5f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(25, "Stone Beach", 0.2f, 0.3f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(26, "Cold Beach", 0.05f, 0.3f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(27, "Birch Forest", 0.6f, 0.6f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(28, "Birch Forest Hills", 0.6f, 0.6f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(29, "Roofed Forest", 0.7f, 0.8f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(30, "Cold Taiga", -0.5f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(31, "Cold Taiga Hills", -0.5f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(32, "Mega Taiga", 0.3f, 0.8f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(33, "Mega Taiga Hills", 0.3f, 0.8f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(34, "Extreme Hills+", 0.2f, 0.3f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(35, "Savanna", 1.2f, 0.0f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(36, "Savanna Plateau", 1.0f, 0.0f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(37, "Mesa", 2.0f, 0.0f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(38, "Mesa Plateau F", 2.0f, 0.0f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(39, "Mesa Plateau", 2.0f, 0.0f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(40, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(41, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(42, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(43, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(44, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(45, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(46, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(47, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(48, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(49, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(50, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(51, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(52, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(53, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(54, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(55, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(56, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(57, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(58, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(59, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(60, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(61, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(62, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(63, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(64, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(65, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(66, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(67, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(68, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(69, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(70, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(71, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(72, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(73, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(74, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(75, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(76, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(77, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(78, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(79, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(80, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(81, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(82, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(83, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(84, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(85, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(86, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(87, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(88, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(89, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(90, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(91, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(92, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(93, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(94, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(95, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(96, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(97, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(98, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(99, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(100, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(101, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(102, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(103, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(104, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(105, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(106, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(107, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(108, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(109, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(110, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(111, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(112, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(113, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(114, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(115, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(116, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(117, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(118, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(119, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(120, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(121, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(122, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(123, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(124, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(125, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(126, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(127, "The Void", 0.5f, 0.5f, 0x92BD59, 0x77AB2F),
-            // default values of temp and rain; also, no height differences
-            new BiomeColor(128, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(129, "Sunflower Plains", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(130, "Desert M", 2.0f, 0.0f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(131, "Extreme Hills M", 0.2f, 0.3f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(132, "Flower Forest", 0.7f, 0.8f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(133, "Taiga M", 0.25f, 0.8f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(134, "Swampland M", 0.8f, 0.9f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(135, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(136, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(137, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(138, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(139, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(140, "Ice Plains Spikes", 0.0f, 0.5f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(141, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(142, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(143, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(144, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(145, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(146, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(147, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(148, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(149, "Jungle M", 0.95f, 0.9f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(150, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(151, "JungleEdge M", 0.95f, 0.8f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(152, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(153, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(154, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(155, "Birch Forest M", 0.6f, 0.6f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(156, "Birch Forest Hills M", 0.6f, 0.6f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(157, "Roofed Forest M", 0.7f, 0.8f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(158, "Cold Taiga M", -0.5f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(159, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(160, "Mega Spruce Taiga", 0.25f, 0.8f, 0x92BD59, 0x77AB2F),
-            // special exception, temperature not 0.3
-            new BiomeColor(161, "Mega Spruce Taiga Hills", 0.25f, 0.8f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(162, "Extreme Hills+ M", 0.2f, 0.3f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(163, "Savanna M", 1.1f, 0.0f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(164, "Savanna Plateau M", 1.0f, 0.0f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(165, "Mesa (Bryce)", 2.0f, 0.0f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(166, "Mesa Plateau F M", 2.0f, 0.0f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(167, "Mesa Plateau M", 2.0f, 0.0f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(168, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(169, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(170, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(171, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(172, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(173, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(174, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(175, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(176, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(177, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(178, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(179, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(180, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(181, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(182, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(183, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(184, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(185, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(186, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(187, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(188, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(189, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(190, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(191, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(192, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(193, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(194, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(195, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(196, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(197, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(198, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(199, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(200, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(201, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(202, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(203, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(204, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(205, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(206, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(207, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(208, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(209, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(210, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(211, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(212, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(213, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(214, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(215, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(216, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(217, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(218, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(219, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(220, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(221, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(222, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(223, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(224, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(225, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(226, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(227, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(228, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(229, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(230, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(231, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(232, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(233, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(234, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(235, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(236, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(237, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(238, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(239, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(240, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(241, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(242, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(243, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(244, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(245, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(246, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(247, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(248, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(249, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(250, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(251, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(252, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(253, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(254, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
-            new BiomeColor(255, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),};
-    private BlockType[] layerBuffer = new BlockType[2];
-    public TextureUtil() throws FileNotFoundException {
-        this(MainUtil.getFile(Fawe.imp().getDirectory(), Settings.IMP.PATHS.TEXTURES));
-    }
-
-    public TextureUtil(File folder) throws FileNotFoundException {
-        this.folder = folder;
-        if (!folder.exists()) {
-            throw new FileNotFoundException(
-                    "Please create a `FastAsyncWorldEdit/textures` folder with `.minecraft/versions` jar or mods in it.");
-        }
-    }
+public class TextureUtil implements TextureHolder {
 
     public static TextureUtil fromClipboard(Clipboard clipboard) throws FileNotFoundException {
         boolean[] ids = new boolean[BlockTypes.size()];
@@ -380,25 +75,312 @@ TextureUtil implements TextureHolder {
         return fromBlocks(blocks);
     }
 
-    protected static int hueDistance(int red1, int green1, int blue1, int red2, int green2,
-                                     int blue2) {
-        int total1 = (red1 + green1 + blue1);
-        int total2 = (red2 + green2 + blue2);
-        if (total1 == 0 || total2 == 0) {
-            return 0;
-        }
-        int factor1 = FACTORS[total1];
-        int factor2 = FACTORS[total2];
-        long r = (512 * (red1 * factor1 - red2 * factor2)) >> 10;
-        long g = (green1 * factor1 - green2 * factor2);
-        long b = (767 * (blue1 * factor1 - blue2 * factor2)) >> 10;
-        return (int) ((r * r + g * g + b * b) >> 25);
-    }
-
     @Override public TextureUtil getTextureUtil() {
         return this;
     }
 
+    private final File folder;
+    private static final int[] FACTORS = new int[766];
+
+    static {
+        for (int i = 1; i < FACTORS.length; i++) {
+            FACTORS[i] = 65535 / i;
+        }
+    }
+
+    protected int[] blockColors = new int[BlockTypes.size()];
+    protected long[] blockDistance = new long[BlockTypes.size()];
+    protected long[] distances;
+    protected int[] validColors;
+    protected int[] validBlockIds;
+
+    protected int[] validLayerColors;
+    protected int[][] validLayerBlocks;
+
+    protected int[] validMixBiomeColors;
+    protected long[] validMixBiomeIds;
+
+    /**
+     * https://github.com/erich666/Mineways/blob/master/Win/biomes.cpp
+     */
+    protected BiomeColor[] validBiomes;
+    private BiomeColor[] biomes = new BiomeColor[] {
+        //    ID    Name             Temperature, rainfall, grass, foliage colors
+        //    - note: the colors here are just placeholders, they are computed in the program
+        new BiomeColor(0, "Ocean", 0.5f, 0.5f, 0x92BD59, 0x77AB2F),
+        // default values of temp and rain
+        new BiomeColor(1, "Plains", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(2, "Desert", 2.0f, 0.0f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(3, "Extreme Hills", 0.2f, 0.3f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(4, "Forest", 0.7f, 0.8f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(5, "Taiga", 0.25f, 0.8f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(6, "Swampland", 0.8f, 0.9f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(7, "River", 0.5f, 0.5f, 0x92BD59, 0x77AB2F),
+        // default values of temp and rain
+        new BiomeColor(8, "Nether", 2.0f, 0.0f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(9, "End", 0.5f, 0.5f, 0x92BD59, 0x77AB2F),
+        // default values of temp and rain
+        new BiomeColor(10, "Frozen Ocean", 0.0f, 0.5f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(11, "Frozen River", 0.0f, 0.5f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(12, "Ice Plains", 0.0f, 0.5f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(13, "Ice Mountains", 0.0f, 0.5f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(14, "Mushroom Island", 0.9f, 1.0f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(15, "Mushroom Island Shore", 0.9f, 1.0f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(16, "Beach", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(17, "Desert Hills", 2.0f, 0.0f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(18, "Forest Hills", 0.7f, 0.8f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(19, "Taiga Hills", 0.25f, 0.8f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(20, "Extreme Hills Edge", 0.2f, 0.3f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(21, "Jungle", 0.95f, 0.9f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(22, "Jungle Hills", 0.95f, 0.9f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(23, "Jungle Edge", 0.95f, 0.8f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(24, "Deep Ocean", 0.5f, 0.5f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(25, "Stone Beach", 0.2f, 0.3f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(26, "Cold Beach", 0.05f, 0.3f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(27, "Birch Forest", 0.6f, 0.6f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(28, "Birch Forest Hills", 0.6f, 0.6f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(29, "Roofed Forest", 0.7f, 0.8f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(30, "Cold Taiga", -0.5f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(31, "Cold Taiga Hills", -0.5f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(32, "Mega Taiga", 0.3f, 0.8f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(33, "Mega Taiga Hills", 0.3f, 0.8f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(34, "Extreme Hills+", 0.2f, 0.3f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(35, "Savanna", 1.2f, 0.0f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(36, "Savanna Plateau", 1.0f, 0.0f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(37, "Mesa", 2.0f, 0.0f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(38, "Mesa Plateau F", 2.0f, 0.0f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(39, "Mesa Plateau", 2.0f, 0.0f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(40, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(41, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(42, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(43, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(44, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(45, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(46, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(47, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(48, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(49, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(50, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(51, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(52, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(53, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(54, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(55, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(56, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(57, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(58, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(59, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(60, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(61, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(62, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(63, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(64, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(65, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(66, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(67, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(68, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(69, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(70, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(71, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(72, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(73, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(74, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(75, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(76, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(77, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(78, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(79, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(80, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(81, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(82, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(83, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(84, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(85, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(86, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(87, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(88, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(89, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(90, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(91, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(92, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(93, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(94, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(95, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(96, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(97, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(98, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(99, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(100, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(101, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(102, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(103, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(104, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(105, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(106, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(107, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(108, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(109, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(110, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(111, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(112, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(113, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(114, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(115, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(116, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(117, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(118, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(119, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(120, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(121, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(122, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(123, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(124, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(125, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(126, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(127, "The Void", 0.5f, 0.5f, 0x92BD59, 0x77AB2F),
+        // default values of temp and rain; also, no height differences
+        new BiomeColor(128, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(129, "Sunflower Plains", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(130, "Desert M", 2.0f, 0.0f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(131, "Extreme Hills M", 0.2f, 0.3f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(132, "Flower Forest", 0.7f, 0.8f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(133, "Taiga M", 0.25f, 0.8f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(134, "Swampland M", 0.8f, 0.9f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(135, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(136, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(137, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(138, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(139, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(140, "Ice Plains Spikes", 0.0f, 0.5f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(141, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(142, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(143, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(144, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(145, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(146, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(147, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(148, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(149, "Jungle M", 0.95f, 0.9f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(150, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(151, "JungleEdge M", 0.95f, 0.8f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(152, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(153, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(154, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(155, "Birch Forest M", 0.6f, 0.6f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(156, "Birch Forest Hills M", 0.6f, 0.6f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(157, "Roofed Forest M", 0.7f, 0.8f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(158, "Cold Taiga M", -0.5f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(159, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(160, "Mega Spruce Taiga", 0.25f, 0.8f, 0x92BD59, 0x77AB2F),
+        // special exception, temperature not 0.3
+        new BiomeColor(161, "Mega Spruce Taiga Hills", 0.25f, 0.8f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(162, "Extreme Hills+ M", 0.2f, 0.3f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(163, "Savanna M", 1.1f, 0.0f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(164, "Savanna Plateau M", 1.0f, 0.0f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(165, "Mesa (Bryce)", 2.0f, 0.0f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(166, "Mesa Plateau F M", 2.0f, 0.0f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(167, "Mesa Plateau M", 2.0f, 0.0f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(168, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(169, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(170, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(171, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(172, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(173, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(174, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(175, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(176, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(177, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(178, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(179, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(180, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(181, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(182, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(183, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(184, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(185, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(186, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(187, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(188, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(189, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(190, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(191, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(192, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(193, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(194, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(195, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(196, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(197, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(198, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(199, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(200, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(201, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(202, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(203, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(204, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(205, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(206, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(207, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(208, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(209, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(210, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(211, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(212, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(213, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(214, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(215, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(216, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(217, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(218, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(219, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(220, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(221, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(222, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(223, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(224, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(225, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(226, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(227, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(228, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(229, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(230, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(231, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(232, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(233, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(234, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(235, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(236, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(237, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(238, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(239, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(240, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(241, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(242, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(243, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(244, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(245, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(246, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(247, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(248, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(249, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(250, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(251, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(252, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(253, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(254, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),
+        new BiomeColor(255, "Unknown Biome", 0.8f, 0.4f, 0x92BD59, 0x77AB2F),};
+
+    public TextureUtil() throws FileNotFoundException {
+        this(MainUtil.getFile(Fawe.imp().getDirectory(), Settings.IMP.PATHS.TEXTURES));
+    }
+
+    public TextureUtil(File folder) throws FileNotFoundException {
+        this.folder = folder;
+        if (!folder.exists()) {
+            throw new FileNotFoundException(
+                "Please create a `FastAsyncWorldEdit/textures` folder with `.minecraft/versions` jar or mods in it.");
+        }
+    }
+
     public BlockType getNearestBlock(int color) {
         long min = Long.MAX_VALUE;
         int closest = 0;
@@ -453,6 +435,8 @@ TextureUtil implements TextureHolder {
         return BlockTypes.get(closest);
     }
 
+    private BlockType[] layerBuffer = new BlockType[2];
+
     /**
      * Returns the block combined ids as an array
      *
@@ -498,14 +482,14 @@ TextureUtil implements TextureHolder {
     }
 
     public boolean getIsBlockCloserThanBiome(int[] blockAndBiomeIdOutput, int color,
-                                             int biomePriority) {
+        int biomePriority) {
         BlockType block = getNearestBlock(color);
         TextureUtil.BiomeColor biome = getNearestBiome(color);
         int blockColor = getColor(block);
         blockAndBiomeIdOutput[0] = block.getInternalId();
         blockAndBiomeIdOutput[1] = biome.id;
         if (colorDistance(biome.grassCombined, color) - biomePriority > colorDistance(blockColor,
-                                                                                      color)) {
+            color)) {
             return true;
         }
         return false;
@@ -605,7 +589,7 @@ TextureUtil implements TextureHolder {
             }
             if (files.length == 0) {
                 Fawe.debug(
-                        "Please create a `FastAsyncWorldEdit/textures` folder with `.minecraft/versions/1.13.jar` jar or mods in it. If the file exists, please make sure the server has read access to the directory");
+                    "Please create a `FastAsyncWorldEdit/textures` folder with `.minecraft/versions/1.13.jar` jar or mods in it. If the file exists, please make sure the server has read access to the directory");
             } else {
                 for (File file : files) {
                     ZipFile zipFile = new ZipFile(file);
@@ -622,7 +606,7 @@ TextureUtil implements TextureHolder {
                             Path path = Paths.get(name);
                             if (path.startsWith("assets" + File.separator)) {
                                 String[] split =
-                                        path.toString().split(Pattern.quote(File.separator));
+                                    path.toString().split(Pattern.quote(File.separator));
                                 if (split.length > 1) {
                                     String modId = split[1];
                                     mods.add(modId);
@@ -659,7 +643,7 @@ TextureUtil implements TextureHolder {
                             String textureFileName;
                             try (InputStream is = zipFile.getInputStream(entry)) {
                                 JsonReader reader = new JsonReader(
-                                        new InputStreamReader(is, StandardCharsets.UTF_8));
+                                    new InputStreamReader(is, StandardCharsets.UTF_8));
                                 Map<String, Object> root = gson.fromJson(reader, typeToken);
                                 Map<String, Object> textures = (Map) root.get("textures");
 
@@ -669,7 +653,7 @@ TextureUtil implements TextureHolder {
                                 Set<String> models = new HashSet<>();
                                 // Get models
                                 for (Map.Entry<String, Object> stringObjectEntry : textures
-                                        .entrySet()) {
+                                    .entrySet()) {
                                     Object value = stringObjectEntry.getValue();
                                     if (value instanceof String) {
                                         models.add((String) value);
@@ -685,7 +669,7 @@ TextureUtil implements TextureHolder {
                                 }
 
                                 textureFileName =
-                                        String.format(texturesDir, nameSpace, models.iterator().next());
+                                    String.format(texturesDir, nameSpace, models.iterator().next());
                             }
 
                             BufferedImage image = readImage(zipFile, textureFileName);
@@ -703,7 +687,7 @@ TextureUtil implements TextureHolder {
                         Integer grass = null;
                         {
                             String grassFileName =
-                                    String.format(texturesDir, "minecraft", "grass_block_top");
+                                String.format(texturesDir, "minecraft", "grass_block_top");
                             BufferedImage image = readImage(zipFile, grassFileName);
                             if (image != null) {
                                 grass = ImageUtil.getColor(image);
@@ -712,16 +696,16 @@ TextureUtil implements TextureHolder {
                         if (grass != null) {
                             // assets\minecraft\textures\colormap
                             ZipEntry grassEntry = getEntry(zipFile,
-                                                           "assets/minecraft/textures/colormap/grass_block.png");
+                                "assets/minecraft/textures/colormap/grass_block.png");
                             if (grassEntry != null) {
                                 try (InputStream is = zipFile.getInputStream(grassEntry)) {
                                     BufferedImage image = ImageIO.read(is);
                                     // Update biome colors
                                     for (BiomeColor biome : biomes) {
                                         float adjTemp =
-                                                MathMan.clamp(biome.temperature, 0.0f, 1.0f);
+                                            MathMan.clamp(biome.temperature, 0.0f, 1.0f);
                                         float adjRainfall =
-                                                MathMan.clamp(biome.rainfall, 0.0f, 1.0f) * adjTemp;
+                                            MathMan.clamp(biome.rainfall, 0.0f, 1.0f) * adjTemp;
                                         int x = (int) (255 - adjTemp * 255);
                                         int z = (int) (255 - adjRainfall * 255);
                                         biome.grass = image.getRGB(x, z);
@@ -732,10 +716,9 @@ TextureUtil implements TextureHolder {
                                 biomes[134].grass = 0;
                                 // roofed forest: averaged w/ 0x28340A
                                 biomes[29].grass =
-                                        //TODO the following expressions will always overflow because they will be bigger than MAX_INT
-                                        multiplyColor(biomes[29].grass, 0x28340A + (255 << 24));
+                                    multiplyColor(biomes[29].grass, 0x28340A + (255 << 24));
                                 biomes[157].grass =
-                                        multiplyColor(biomes[157].grass, 0x28340A + (255 << 24));
+                                    multiplyColor(biomes[157].grass, 0x28340A + (255 << 24));
                                 // mesa : 0x90814D
                                 biomes[37].grass = 0x90814D + (255 << 24);
                                 biomes[38].grass = 0x90814D + (255 << 24);
@@ -747,12 +730,12 @@ TextureUtil implements TextureHolder {
                                 for (BiomeColor biome : biomes) {
                                     //                                biome.grass = multiplyColor(biome.grass, grass);
                                     if (biome.grass != 0 && !biome.name
-                                            .equalsIgnoreCase("Unknown Biome")) {
+                                        .equalsIgnoreCase("Unknown Biome")) {
                                         valid.add(biome);
                                     }
                                     biome.grassCombined = multiplyColor(grass, biome.grass);
                                 }
-                                this.validBiomes = valid.toArray(new BiomeColor[0]);
+                                this.validBiomes = valid.toArray(new BiomeColor[valid.size()]);
 
                                 {
                                     ArrayList<BiomeColor> uniqueColors = new ArrayList<>();
@@ -775,13 +758,13 @@ TextureUtil implements TextureHolder {
                                                 BiomeColor c2 = uniqueColors.get(j);
                                                 BiomeColor c3 = uniqueColors.get(k);
                                                 int average =
-                                                        averageColor(c1.grass, c2.grass, c3.grass);
+                                                    averageColor(c1.grass, c2.grass, c3.grass);
                                                 if (uniqueBiomesColors.add(average)) {
                                                     count++;
                                                     layerColors.add((long) average);
                                                     layerIds.add(
-                                                            (long) ((c1.id) + (c2.id << 8) + (c3.id
-                                                                    << 16)));
+                                                        (long) ((c1.id) + (c2.id << 8) + (c3.id
+                                                            << 16)));
                                                 }
                                             }
                                         }
@@ -906,7 +889,7 @@ TextureUtil implements TextureHolder {
                     if (!hasAlpha(colorOther)) {
                         int combinedOther = validBlockIds[j];
                         int combinedColor = combineTransparency(color, colorOther);
-                        colorLayerMap.put(combinedColor, new int[]{combined, combinedOther});
+                        colorLayerMap.put(combinedColor, new int[] {combined, combinedOther});
                     }
                 }
             }
@@ -991,7 +974,22 @@ TextureUtil implements TextureHolder {
         int b = blue1 - blue2;
         int hd = hueDistance(red1, green1, blue1, red2, green2, blue2);
         return (((512 + rmean) * r * r) >> 8) + 4 * g * g + (((767 - rmean) * b * b) >> 8) + (hd
-                * hd);
+            * hd);
+    }
+
+    protected static int hueDistance(int red1, int green1, int blue1, int red2, int green2,
+        int blue2) {
+        int total1 = (red1 + green1 + blue1);
+        int total2 = (red2 + green2 + blue2);
+        if (total1 == 0 || total2 == 0) {
+            return 0;
+        }
+        int factor1 = FACTORS[total1];
+        int factor2 = FACTORS[total2];
+        long r = (512 * (red1 * factor1 - red2 * factor2)) >> 10;
+        long g = (green1 * factor1 - green2 * factor2);
+        long b = (767 * (blue1 * factor1 - blue2 * factor2)) >> 10;
+        return (int) ((r * r + g * g + b * b) >> 25);
     }
 
     public long getDistance(BufferedImage image, int c1) {
@@ -1012,10 +1010,6 @@ TextureUtil implements TextureHolder {
         return totalDistSqr / area;
     }
 
-    public int[] getValidBlockIds() {
-        return validBlockIds.clone();
-    }
-
     public static class BiomeColor {
         public int id;
         public String name;
@@ -1026,7 +1020,7 @@ TextureUtil implements TextureHolder {
         public int foliage;
 
         public BiomeColor(int id, String name, float temperature, float rainfall, int grass,
-                          int foliage) {
+            int foliage) {
             this.id = id;
             this.name = name;
             this.temperature = temperature;
@@ -1036,4 +1030,8 @@ TextureUtil implements TextureHolder {
             this.foliage = foliage;
         }
     }
+
+    public int[] getValidBlockIds() {
+        return validBlockIds.clone();
+    }
 }

worldedit-core/src/main/java/com/boydti/fawe/util/WEManager.java

@@ -14,12 +14,9 @@ import com.sk89q.worldedit.extent.AbstractDelegateExtent;
 import com.sk89q.worldedit.extent.Extent;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.regions.Region;
-
 import java.lang.reflect.Field;
-import java.util.ArrayDeque;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
+import java.util.*;
+import java.util.stream.Collectors;
 
 public class WEManager {
 
@@ -127,9 +124,7 @@ public class WEManager {
                         }
                     }
                 }
-                if (!removed) {
-                    return regions.toArray(new Region[0]);
-                }
+                if (!removed) return regions.toArray(new Region[0]);
                 masks.clear();
             }
         }
@@ -137,16 +132,12 @@ public class WEManager {
         for (final FaweMaskManager manager : managers) {
             if (player.hasPermission("fawe." + manager.getKey())) {
                 try {
-                    if (manager.isExclusive() && !masks.isEmpty()) {
-                        continue;
-                    }
+                    if (manager.isExclusive() && !masks.isEmpty()) continue;
                     final FaweMask mask = manager.getMask(player, FaweMaskManager.MaskType.getDefaultMaskType());
                     if (mask != null) {
                         regions.add(mask.getRegion());
                         masks.add(mask);
-                        if (manager.isExclusive()) {
-                            break;
-                        }
+                        if (manager.isExclusive()) break;
                     }
                 } catch (Throwable e) {
                     e.printStackTrace();
@@ -164,10 +155,10 @@ public class WEManager {
 
 
     public boolean intersects(final Region region1, final Region region2) {
-        BlockVector3 rg1P1 = region1.getMinimumPoint();
-        BlockVector3 rg1P2 = region1.getMaximumPoint();
-        BlockVector3 rg2P1 = region2.getMinimumPoint();
-        BlockVector3 rg2P2 = region2.getMaximumPoint();
+    	BlockVector3 rg1P1 = region1.getMinimumPoint();
+    	BlockVector3 rg1P2 = region1.getMaximumPoint();
+    	BlockVector3 rg2P1 = region2.getMinimumPoint();
+    	BlockVector3 rg2P2 = region2.getMaximumPoint();
 
         return (rg1P1.getBlockX() <= rg2P2.getBlockX()) && (rg1P2.getBlockX() >= rg2P1.getBlockX()) && (rg1P1.getBlockZ() <= rg2P2.getBlockZ()) && (rg1P2.getBlockZ() >= rg2P1.getBlockZ());
     }

worldedit-core/src/main/java/com/boydti/fawe/util/chat/Message.java

@@ -5,7 +5,6 @@ import com.boydti.fawe.config.BBC;
 import com.boydti.fawe.object.FawePlayer;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.extension.platform.Actor;
-
 import java.util.Objects;
 
 public class Message {
@@ -98,11 +97,9 @@ public class Message {
 
     public Message cmdOptions(String prefix, String suffix, String... options) {
         for (int i = 0; i < options.length; i++) {
-            if (i != 0) {
-                text(" &8|&7 ");
-            }
+            if (i != 0) text(" &8|&7 ");
             text("&7[&a" + options[i] + "&7]")
-                    .cmdTip(prefix + options[i] + suffix);
+            .cmdTip(prefix + options[i] + suffix);
         }
         return this;
     }
@@ -135,10 +132,10 @@ public class Message {
         }
         if (page < totalPages && page > 1) { // Back | Next
             this.text("&f<<").command(baseCommand + " " + (page - 1)).text("&8 | ").text("&f>>")
-                .command(baseCommand + " " + (page + 1));
+                    .command(baseCommand + " " + (page + 1));
         } else if (page <= 1 && totalPages > page) { // Next
             this.text("&8 -").text(" | ").text("&f>>")
-                .command(baseCommand + " " + (page + 1));
+                    .command(baseCommand + " " + (page + 1));
 
         } else if (page == totalPages && totalPages > 1) { // Back
             this.text("&f<<").command(baseCommand + " " + (page - 1)).text("&8 | ").text("- ");

worldedit-core/src/main/java/com/boydti/fawe/util/chat/PlainChatManager.java

@@ -3,7 +3,6 @@ package com.boydti.fawe.util.chat;
 
 import com.boydti.fawe.config.BBC;
 import com.boydti.fawe.object.FawePlayer;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -21,12 +20,10 @@ public class PlainChatManager implements ChatManager<List<StringBuilder>> {
     }
 
     @Override
-    public void tooltip(Message message, Message... tooltips) {
-    }
+    public void tooltip(Message message, Message... tooltips) {}
 
     @Override
-    public void command(Message message, String command) {
-    }
+    public void command(Message message, String command) {}
 
     @Override
     public void text(Message message, String text) {
@@ -43,10 +40,8 @@ public class PlainChatManager implements ChatManager<List<StringBuilder>> {
     }
 
     @Override
-    public void suggest(Message plotMessage, String command) {
-    }
+    public void suggest(Message plotMessage, String command) {}
 
     @Override
-    public void link(Message message, String url) {
-    }
-}
+    public void link(Message message, String url) {}
+}

worldedit-core/src/main/java/com/boydti/fawe/util/chat/UsageMessage.java

@@ -15,11 +15,11 @@ import com.sk89q.worldedit.util.command.Parameter;
 import com.sk89q.worldedit.util.command.PrimaryAliasComparator;
 import com.sk89q.worldedit.util.command.binding.Range;
 import com.sk89q.worldedit.util.command.parametric.ParameterData;
-
-import javax.annotation.Nullable;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.Nullable;
+
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -27,7 +27,7 @@ public class UsageMessage extends Message {
     /**
      * Create a new usage box.
      *
-     * @param command the command to describe
+     * @param command       the command to describe
      * @param commandString the command that was used, such as "/we" or "/brush sphere"
      */
     public UsageMessage(CommandCallable command, String commandString) {
@@ -37,9 +37,9 @@ public class UsageMessage extends Message {
     /**
      * Create a new usage box.
      *
-     * @param command the command to describe
+     * @param command       the command to describe
      * @param commandString the command that was used, such as "/we" or "/brush sphere"
-     * @param locals list of locals to use
+     * @param locals        list of locals to use
      */
     public UsageMessage(CommandCallable command, String commandString, @Nullable CommandLocals locals) {
         checkNotNull(command);
@@ -85,14 +85,12 @@ public class UsageMessage extends Message {
                 String arg;
                 if (param.getFlag() != null) {
                     arg = "-" + param.getFlag();
-                    if (param.isValueFlag()) {
+                    if (param.isValueFlag())
                         arg += param.getName();
-                    }
                 } else {
                     arg = param.getName();
-                    if (param.getDefaultValue() != null && param.getDefaultValue().length > 0) {
+                    if (param.getDefaultValue() != null && param.getDefaultValue().length > 0)
                         arg += "=" + StringMan.join(param.getDefaultValue(), ",");
-                    }
                 }
                 usage[i] = optional ? ("[" + arg + "]") : ("<" + arg + ">");
             }
@@ -106,9 +104,7 @@ public class UsageMessage extends Message {
             String argStr = usage[i];
             text(separateArg(argStr.replaceAll("[\\[|\\]|<|>]", "&0$0&7")));
 
-            if (params.isEmpty()) {
-                continue;
-            }
+            if (params.isEmpty()) continue;
             Parameter param = params.get(i);
 
             StringBuilder tooltip = new StringBuilder();
@@ -145,9 +141,7 @@ public class UsageMessage extends Message {
                 tooltip.append("\nClick for more info");
             }
             tooltip(tooltip.toString());
-            if (command != null) {
-                command(command);
-            }
+            if (command != null) command(command);
         }
 
         newline();

worldedit-core/src/main/java/com/boydti/fawe/util/image/ImageUtil.java

@@ -7,7 +7,9 @@ import com.boydti.fawe.util.MathMan;
 import com.sk89q.worldedit.util.command.parametric.ParameterException;
 
 import javax.annotation.Nullable;
-import java.awt.*;
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
+import java.awt.Transparency;
 import java.awt.image.BufferedImage;
 import java.awt.image.DataBufferInt;
 import java.io.File;
@@ -23,56 +25,54 @@ public class ImageUtil {
                                                   int targetWidth,
                                                   int targetHeight,
                                                   Object hint,
-                                                  boolean higherQuality) {
+                                                  boolean higherQuality)
+    {
         if (img.getHeight() == targetHeight && img.getWidth() == targetWidth) {
             return img;
         }
-        int type = (img.getTransparency() == Transparency.OPAQUE) ? BufferedImage.TYPE_INT_RGB : BufferedImage.TYPE_INT_ARGB;
+        int type = (img.getTransparency() == Transparency.OPAQUE) ?
+                BufferedImage.TYPE_INT_RGB : BufferedImage.TYPE_INT_ARGB;
         BufferedImage ret = img;
-        int width, height;
+        int w, h;
         if (higherQuality) {
             // Use multi-step technique: start with original size, then
             // scale down in multiple passes with drawImage()
             // until the target size is reached
-            width = ret.getWidth();
-            height = ret.getHeight();
+            w = ret.getWidth();
+            h = ret.getHeight();
         } else {
             // Use one-step technique: scale directly from original
             // size to target size with a single drawImage() call
-            width = targetWidth;
-            height = targetHeight;
+            w = targetWidth;
+            h = targetHeight;
         }
 
         do {
-            if (higherQuality && width > targetWidth) {
-                width /= 2;
-                if (width < targetWidth) {
-                    width = targetWidth;
+            if (higherQuality && w > targetWidth) {
+                w /= 2;
+                if (w < targetWidth) {
+                    w = targetWidth;
                 }
-            } else if (width < targetWidth) {
-                width = targetWidth;
-            }
+            } else if (w < targetWidth) w = targetWidth;
 
-            if (higherQuality && height > targetHeight) {
-                height /= 2;
-                if (height < targetHeight) {
-                    height = targetHeight;
+            if (higherQuality && h > targetHeight) {
+                h /= 2;
+                if (h < targetHeight) {
+                    h = targetHeight;
                 }
-            } else if (height < targetHeight) {
-                height = targetHeight;
-            }
+            } else if (h < targetHeight) h = targetHeight;
 
-            BufferedImage tmp = new BufferedImage(width, height, type);
+            BufferedImage tmp = new BufferedImage(w, h, type);
             Graphics2D g2 = tmp.createGraphics();
             g2.setRenderingHint(RenderingHints.KEY_INTERPOLATION, hint);
             g2.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_SPEED);
             g2.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_SPEED);
             g2.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION, RenderingHints.VALUE_ALPHA_INTERPOLATION_SPEED);
-            g2.drawImage(ret, 0, 0, width, height, null);
+            g2.drawImage(ret, 0, 0, w, h, null);
             g2.dispose();
 
             ret = tmp;
-        } while (width != targetWidth || height != targetHeight);
+        } while (w != targetWidth || h != targetHeight);
 
         return ret;
     }
@@ -107,9 +107,8 @@ public class ImageUtil {
                 if (alpha != 0) {
                     float dx2 = sqrX[x];
                     float distSqr = dz2 + dx2;
-                    if (distSqr > 1) {
-                        raw[index] = 0;
-                    } else {
+                    if (distSqr > 1) raw[index] = 0;
+                    else {
                         alpha = (int) (alpha * (1 - distSqr));
                         raw[index] = (color & 0x00FFFFFF) + (alpha << 24);
                     }

worldedit-core/src/main/java/com/boydti/fawe/util/image/ImageViewer.java

@@ -2,6 +2,6 @@ package com.boydti.fawe.util.image;
 
 import java.io.Closeable;
 
-public interface ImageViewer extends Closeable {
+public interface ImageViewer extends Closeable{
     public void view(Drawable drawable);
 }

worldedit-core/src/main/java/com/boydti/fawe/util/task/TaskBuilder.java

@@ -6,7 +6,6 @@ import com.boydti.fawe.object.Metadatable;
 import com.boydti.fawe.object.RunnableVal;
 import com.boydti.fawe.util.SetQueue;
 import com.boydti.fawe.util.TaskManager;
-
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Objects;
@@ -19,12 +18,6 @@ public class TaskBuilder extends Metadatable {
     private final ArrayDeque<RunnableTask> tasks;
     private Object result = null;
     private Thread.UncaughtExceptionHandler handler;
-    private FaweQueue queue;
-    private long last;
-    private long start;
-    private Object asyncWaitLock = new Object();
-    private Object syncWaitLock = new Object();
-    private boolean finished;
 
     public TaskBuilder() {
         this(null);
@@ -175,9 +168,7 @@ public class TaskBuilder extends Metadatable {
 
     public TaskBuilder abortIfTrue(final Runnable run) {
         tasks.add(RunnableTask.adapt((Task<Boolean, Boolean>) previous -> {
-            if (previous == Boolean.TRUE) {
-                run.run();
-            }
+            if (previous == Boolean.TRUE) run.run();
             return previous == Boolean.TRUE;
         }, TaskType.ABORT));
         return this;
@@ -185,9 +176,7 @@ public class TaskBuilder extends Metadatable {
 
     public TaskBuilder abortIfNull(final Runnable run) {
         tasks.add(RunnableTask.adapt((Task<Boolean, Object>) previous -> {
-            if (previous == null) {
-                run.run();
-            }
+            if (previous == null) run.run();
             return previous == null;
         }, TaskType.ABORT));
         return this;
@@ -195,9 +184,7 @@ public class TaskBuilder extends Metadatable {
 
     public TaskBuilder abortIfEqual(final Runnable run, final Object other) {
         tasks.add(RunnableTask.adapt((Task<Boolean, Object>) previous -> {
-            if (Objects.equals(previous, other)) {
-                run.run();
-            }
+            if (Objects.equals(previous, other)) run.run();
             return Objects.equals(previous, other);
         }, TaskType.ABORT));
         return this;
@@ -205,9 +192,7 @@ public class TaskBuilder extends Metadatable {
 
     public TaskBuilder abortIfNotEqual(final Runnable run, final Object other) {
         tasks.add(RunnableTask.adapt((Task<Boolean, Object>) previous -> {
-            if (!Objects.equals(previous, other)) {
-                run.run();
-            }
+            if (!Objects.equals(previous, other)) run.run();
             return !Objects.equals(previous, other);
         }, TaskType.ABORT));
         return this;
@@ -329,15 +314,6 @@ public class TaskBuilder extends Metadatable {
             }
         }
     }
-    private enum TaskType {
-        SYNC,
-        ASYNC,
-        SYNC_PARALLEL,
-        ASYNC_PARALLEL,
-        SYNC_WHEN_FREE,
-        DELAY,
-        ABORT
-    }
 
     public static final class TaskAbortException extends RuntimeException {
         @Override
@@ -346,6 +322,13 @@ public class TaskBuilder extends Metadatable {
         }
     }
 
+    private FaweQueue queue;
+    private long last;
+    private long start;
+    private Object asyncWaitLock = new Object();
+    private Object syncWaitLock = new Object();
+    private boolean finished;
+
     private static abstract class RunnableTask<T> extends RunnableVal<T> {
         public final TaskType type;
         private boolean aborted;
@@ -354,6 +337,14 @@ public class TaskBuilder extends Metadatable {
             this.type = type;
         }
 
+        public void abortNextTasks() {
+            this.aborted = true;
+        }
+
+        public boolean isAborted() {
+            return aborted;
+        }
+
         public static RunnableTask adapt(final Task task, TaskType type) {
             return new RunnableTask(type) {
                 @Override
@@ -396,14 +387,6 @@ public class TaskBuilder extends Metadatable {
             };
         }
 
-        public void abortNextTasks() {
-            this.aborted = true;
-        }
-
-        public boolean isAborted() {
-            return aborted;
-        }
-
         public abstract T exec(Object previous);
 
         @Override
@@ -418,6 +401,13 @@ public class TaskBuilder extends Metadatable {
             super(type);
         }
 
+        @Override
+        public Object exec(Object previous) {
+            return previous;
+        }
+
+        public abstract int delay(Object previous);
+
         public static RunnableDelayedTask adapt(final DelayedTask task) {
             return new RunnableDelayedTask(TaskType.DELAY) {
                 @Override
@@ -435,13 +425,6 @@ public class TaskBuilder extends Metadatable {
                 }
             };
         }
-
-        @Override
-        public Object exec(Object previous) {
-            return previous;
-        }
-
-        public abstract int delay(Object previous);
     }
 
     public static abstract class SplitTask extends RunnableTask {
@@ -503,9 +486,7 @@ public class TaskBuilder extends Metadatable {
                         try {
                             if (!finished) {
                                 synchronized (asyncWaitLock) {
-                                    while (!waitingAsync) {
-                                        asyncWaitLock.wait(1);
-                                    }
+                                    while (!waitingAsync) asyncWaitLock.wait(1);
                                     asyncWaitLock.notifyAll();
                                 }
                                 waitingSync = true;
@@ -530,9 +511,7 @@ public class TaskBuilder extends Metadatable {
             if (now - start > allocation) {
                 try {
                     synchronized (syncWaitLock) {
-                        while (!waitingSync) {
-                            syncWaitLock.wait(1);
-                        }
+                        while (!waitingSync) syncWaitLock.wait(1);
                         syncWaitLock.notifyAll();
                     }
                     waitingAsync = true;
@@ -547,4 +526,14 @@ public class TaskBuilder extends Metadatable {
             }
         }
     }
+
+    private enum TaskType {
+        SYNC,
+        ASYNC,
+        SYNC_PARALLEL,
+        ASYNC_PARALLEL,
+        SYNC_WHEN_FREE,
+        DELAY,
+        ABORT
+    }
 }

worldedit-core/src/main/java/com/boydti/fawe/util/terrain/Erosion.java

@@ -2,6 +2,7 @@ package com.boydti.fawe.util.terrain;
 
 import java.util.Arrays;
 
+
 import static com.boydti.fawe.util.MathMan.pairInt;
 
 public final class Erosion {
@@ -30,4 +31,5 @@ public final class Erosion {
     }
 
 
+
 }