ff586011

worldedit-core/src/main/java/com/boydti/fawe/Fawe.java

@@ -1,6 +1,7 @@
 package com.boydti.fawe;
 
 import com.boydti.fawe.beta.implementation.QueueHandler;
+import com.boydti.fawe.command.CFICommand;
 import com.boydti.fawe.config.BBC;
 import com.boydti.fawe.config.Settings;
 import com.boydti.fawe.object.FawePlayer;
@@ -18,6 +19,7 @@ import com.boydti.fawe.util.WEManager;
 import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.extension.factory.DefaultTransformParser;
 import com.sk89q.worldedit.extension.platform.Actor;
+import com.sk89q.worldedit.extension.platform.PlatformCommandManager;
 import com.sk89q.worldedit.session.request.Request;
 import java.io.BufferedReader;
 import java.io.File;

worldedit-core/src/main/java/com/boydti/fawe/command/CFICommands.java

@@ -71,13 +71,14 @@ import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.IntStream;
 import javax.imageio.ImageIO;
-import org.checkerframework.checker.nullness.qual.NonNull;
+
 import org.enginehub.piston.annotation.Command;
 import org.enginehub.piston.annotation.CommandContainer;
 import org.enginehub.piston.annotation.param.Arg;
 import org.enginehub.piston.annotation.param.Switch;
 import org.enginehub.piston.exception.StopExecutionException;
 import org.enginehub.piston.inject.InjectedValueAccess;
+import org.jetbrains.annotations.NotNull;
 
 @CommandContainer(superTypes = CommandPermissionsConditionGenerator.Registration.class)
 public class CFICommands {
@@ -154,7 +155,7 @@ public class CFICommands {
     public void brush(FawePlayer fp) {
         CFISettings settings = assertSettings(fp);
         settings.popMessages(fp);
-        @NonNull Builder msg;
+        @NotNull Builder msg;
         if (settings.getGenerator().getImageViewer() != null) {
             msg = TextComponent.builder("CFI supports using brushes during creation").append(newline())
                     .append(" - Place the map on a wall of item frames").append(newline())
@@ -811,7 +812,7 @@ public class CFICommands {
         int biomePriority = gen.getBiomePriority();
 
         //TODO fix this so it can execute commands and show tooltips.
-        @NonNull Builder builder = TextComponent.builder(">> Current Settings <<").append(newline())
+        @NotNull Builder builder = TextComponent.builder(">> Current Settings <<").append(newline())
                 .append("Randomization ").append("[" + Boolean.toString(rand).toUpperCase() + "]")//.cmdTip("/cfi randomization " + (!rand))
                 .append(newline())
                 .append("Mask ").append("[" + mask + "]")//.cmdTip("/cfi mask")
@@ -1020,7 +1021,7 @@ public class CFICommands {
         String snow = "/cfi snow";
 
         //TODO
-        @NonNull Builder msg = TextComponent.builder(">> Current Settings <<").append(newline())
+        @NotNull Builder msg = TextComponent.builder(">> Current Settings <<").append(newline())
                 .append("Mask ").append(TextComponent.of("[" + mask + "]")
                 .hoverEvent(HoverEvent.showText(TextComponent.of("/cfi mask")))
                 .clickEvent(ClickEvent.runCommand("/cfi mask")))

worldedit-core/src/main/java/com/boydti/fawe/command/FaweParser.java

@@ -5,7 +5,6 @@ import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.extension.input.InputParseException;
 import com.sk89q.worldedit.extension.input.ParserContext;
 import com.sk89q.worldedit.internal.registry.InputParser;
-import com.sk89q.worldedit.util.command.Dispatcher;
 
 import java.util.*;
 
@@ -23,8 +22,6 @@ public abstract class FaweParser<T> extends InputParser<T> {
         }
     }
 
-    public abstract Dispatcher getDispatcher();
-
     protected static class ParseEntry {
         public boolean and;
         public String input;

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

@@ -41,7 +41,6 @@ public class SplatterBrush extends ScatterBrush {
         }
         final int size2 = (int) (size * size);
         SurfaceMask surface = new SurfaceMask(editSession);
-        final SolidBlockMask solid = new SolidBlockMask(editSession);
 
         RecursiveVisitor visitor = new RecursiveVisitor(vector -> {
             double dist = vector.distanceSq(position);
@@ -51,6 +50,7 @@ public class SplatterBrush extends ScatterBrush {
             }
             return false;
         }, vector -> editSession.setBlock(vector, finalPattern), recursion);
+        visitor.setMaxBranch(2);
         visitor.setDirections(Arrays.asList(BreadthFirstSearch.DIAGONAL_DIRECTIONS));
         visitor.visit(position);
         Operations.completeBlindly(visitor);

worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/VisualQueue.java

@@ -16,7 +16,7 @@ public class VisualQueue extends SingleThreadIntervalQueue<FawePlayer> {
 
     @Override
     public void operate(FawePlayer fp) {
-        LocalSession session = WorldEdit.getInstance().getSessionManager().get(fp.toWorldEditPlayer());
+        LocalSession session = fp.getSession();
         Player player = fp.getPlayer();
         Tool tool = session.getTool(player);
         if (tool instanceof BrushTool) {

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

@@ -168,15 +168,17 @@ public class Schematic {
         return editSession;
     }
 
-    public void paste(Extent extent, BlockVector3 to, boolean pasteAir, Transform transform) {
-        checkNotNull(transform);
-        Extent source = new BlockTransformExtent(clipboard, transform);
-        ForwardExtentCopy copy = new ForwardExtentCopy(source, clipboard.getRegion(),
-            clipboard.getOrigin(), extent, to);
-        copy.setTransform(transform);
-        copy.setCopyingBiomes(
-            !(clipboard instanceof BlockArrayClipboard) || ((BlockArrayClipboard) clipboard).IMP
-                .hasBiomes());
+    public void paste(Extent extent, BlockVector3 to, boolean pasteAir, @Nullable Transform transform) {
+        Extent source = clipboard;
+        if (transform != null && !transform.isIdentity()) {
+            source = new BlockTransformExtent(clipboard, transform);
+        }
+        ForwardExtentCopy copy = new ForwardExtentCopy(source, clipboard.getRegion(), clipboard.getOrigin(), extent, to);
+        if (transform != null) {
+            copy.setTransform(transform);
+        }
+        copy.setCopyingBiomes(!(clipboard instanceof BlockArrayClipboard) || ((BlockArrayClipboard) clipboard).IMP
+                        .hasBiomes());
         if (extent instanceof EditSession) {
             EditSession editSession = (EditSession) extent;
             Mask sourceMask = editSession.getSourceMask();

worldedit-core/src/main/java/com/sk89q/worldedit/command/ListFilters.java

@@ -48,8 +48,8 @@ public class ListFilters {
     }
 
     @Command(
-            name = "private",
-            aliases = {"me", "mine", "local"},
+            name = "local",
+            aliases = {"me", "mine", "private"},
             desc = "List your personal schematics"
     )
     public Filter local() {
@@ -57,8 +57,8 @@ public class ListFilters {
     }
 
     @Command(
-            name = "public",
-            aliases = {"global"},
+            name = "global",
+            aliases = {"public"},
             desc = "List public schematics"
     )
     public Filter global() {
@@ -76,7 +76,7 @@ public class ListFilters {
     }
 
     @Command(
-            name = "*", //TODO originally this was left blank but doing so causes a major compilation error
+            name = "*", //TODO NOT IMPLEMENTED originally this was left blank but doing so causes a major compilation error
             desc = "wildcard"
     )
     public Filter wildcard(Actor actor, File root, String arg) {

worldedit-core/src/main/java/com/sk89q/worldedit/command/MaskCommands.java

@@ -88,8 +88,8 @@ public class MaskCommands {
     }
 
     @Command(
-            name = "false",
-            aliases = {"#false"},
+            name = "#false",
+            aliases = {"false"},
             desc = "Always false"
     )
     public Mask falseMask(Extent extent) {
@@ -97,8 +97,8 @@ public class MaskCommands {
     }
 
     @Command(
-            name = "true",
-            aliases = {"#true"},
+            name = "#true",
+            aliases = {"true"},
             desc = "Always true"
     )
     public Mask trueMask(Extent extent) {

worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/AbstractPlayerActor.java

@@ -428,7 +428,10 @@ public abstract class AbstractPlayerActor implements Actor, Player, Cloneable {
         if (typeId.hasBlockType()) {
             return typeId.getBlockType().getDefaultState().toBaseBlock();
         } else {
+            return BlockTypes.AIR.getDefaultState().toBaseBlock(); // FAWE returns air here
+            /*
             throw new NotABlockException();
+            */
         }
     }
 

worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformCommandManager.java

@@ -81,6 +81,7 @@ import com.sk89q.worldedit.command.ToolCommandsRegistration;
 import com.sk89q.worldedit.command.ToolUtilCommands;
 import com.sk89q.worldedit.command.ToolUtilCommandsRegistration;
 import com.sk89q.worldedit.command.TransformCommands;
+import com.sk89q.worldedit.command.TransformCommandsRegistration;
 import com.sk89q.worldedit.command.UtilityCommands;
 import com.sk89q.worldedit.command.UtilityCommandsRegistration;
 import com.sk89q.worldedit.command.WorldEditCommands;
@@ -690,7 +691,7 @@ public final class PlatformCommandManager {
             // exceptions without writing a hook into every dispatcher, we need to unwrap these
             // exceptions and rethrow their converted form, if their is one.
             try {
-                task.get();
+                Object result = task.get();
             } catch (Throwable t) {
                 // Use the exception converter to convert the exception if any of its causes
                 // can be converted, otherwise throw the original exception

worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/BuiltInClipboardFormat.java

@@ -72,27 +72,13 @@ public enum BuiltInClipboardFormat implements ClipboardFormat {
 
         @Override
         public ClipboardWriter getWriter(OutputStream outputStream) throws IOException {
-            throw new IOException("This format does not support saving");
+            throw new IOException("This format does not support saving, use `schem` or `sponge` as format"); // Is more helpful
         }
 
         @Override
         public boolean isFormat(File file) {
-            try (NBTInputStream str = new NBTInputStream(new GZIPInputStream(new FileInputStream(file)))) {
-                NamedTag rootTag = str.readNamedTag();
-                if (!rootTag.getName().equals("Schematic")) {
-                    return false;
-                }
-                CompoundTag schematicTag = (CompoundTag) rootTag.getTag();
-
-                // Check
-                Map<String, Tag> schematic = schematicTag.getValue();
-                if (!schematic.containsKey("Materials")) {
-                    return false;
-                }
-            } catch (Exception e) {
-                return false;
-            }
-            return true;
+            String name = file.getName().toLowerCase();
+            return name.endsWith(".schematic") || name.endsWith(".mcedit") || name.endsWith(".mce");
         }
     },
     SPONGE_SCHEMATIC("sponge", "schem") {
@@ -127,23 +113,8 @@ public enum BuiltInClipboardFormat implements ClipboardFormat {
 
         @Override
         public boolean isFormat(File file) {
-            try (NBTInputStream str = new NBTInputStream(new GZIPInputStream(new FileInputStream(file)))) {
-                NamedTag rootTag = str.readNamedTag();
-                if (!rootTag.getName().equals("Schematic")) {
-                    return false;
-                }
-                CompoundTag schematicTag = (CompoundTag) rootTag.getTag();
-
-                // Check
-                Map<String, Tag> schematic = schematicTag.getValue();
-                if (!schematic.containsKey("Version")) {
-                    return false;
-                }
-            } catch (Exception e) {
-                return false;
-            }
-
-            return true;
+            String name = file.getName().toLowerCase();
+            return name.endsWith(".schem") || name.endsWith(".sponge");
         }
 
     },
@@ -175,20 +146,8 @@ public enum BuiltInClipboardFormat implements ClipboardFormat {
 
         @Override
         public boolean isFormat(File file) {
-            try (NBTInputStream str = new NBTInputStream(new GZIPInputStream(new FileInputStream(file)))) {
-                NamedTag rootTag = str.readNamedTag();
-                CompoundTag structureTag = (CompoundTag) rootTag.getTag();
-
-                // Check
-                Map<String, Tag> structure = structureTag.getValue();
-                if (!structure.containsKey("DataVersion")) {
-                    return false;
-                }
-            } catch (Exception e) {
-                return false;
-            }
-
-            return true;
+            String name = file.getName().toLowerCase();
+            return name.endsWith(".nbt");
         }
     },
 

worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/SpongeSchematicReader.java

@@ -280,6 +280,7 @@ public class SpongeSchematicReader extends NBTSchematicReader {
         return clipboard;
     }
 
+    /*
     private Clipboard readVersion2(BlockArrayClipboard version1, CompoundTag schematicTag) throws IOException {
         Map<String, Tag> schematic = schematicTag.getValue();
         if (schematic.containsKey("BiomeData")) {
@@ -290,6 +291,7 @@ public class SpongeSchematicReader extends NBTSchematicReader {
         }
         return version1;
     }
+    */
 
     private void readBiomes(BlockArrayClipboard clipboard, Map<String, Tag> schematic) throws IOException {
         ByteArrayTag dataTag = requireTag(schematic, "BiomeData", ByteArrayTag.class);
@@ -349,6 +351,7 @@ public class SpongeSchematicReader extends NBTSchematicReader {
         }
     }
 
+    /*
     private void readEntities(BlockArrayClipboard clipboard, Map<String, Tag> schematic) throws IOException {
         List<Tag> entList = requireTag(schematic, "Entities", ListTag.class).getValue();
         if (entList.isEmpty()) {
@@ -379,6 +382,7 @@ public class SpongeSchematicReader extends NBTSchematicReader {
             }
         }
     }
+    */
     @Override
     public void close() throws IOException {
         inputStream.close();

worldedit-core/src/main/java/com/sk89q/worldedit/function/block/BlockReplace.java

@@ -50,7 +50,7 @@ public class BlockReplace implements RegionFunction {
 
     @Override
     public boolean apply(BlockVector3 position) throws WorldEditException {
-        return extent.setBlock(position, pattern.apply(position));
+        return pattern.apply(extent, position, position);
     }
 
 }

worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/ExistingBlockMask.java

@@ -40,7 +40,7 @@ public class ExistingBlockMask extends AbstractExtentMask {
 
     @Override
     public boolean test(BlockVector3 vector) {
-        return !getExtent().getBlock(vector).getBlockType().getMaterial().isAir();
+        return !vector.getBlock(getExtent()).getMaterial().isAir();
     }
 
     @Nullable

worldedit-core/src/main/java/com/sk89q/worldedit/function/mask/SolidBlockMask.java

@@ -31,13 +31,6 @@ public class SolidBlockMask extends BlockMask {
         add(state -> state.getMaterial().isMovementBlocker());
     }
 
-    @Override
-    public boolean test(BlockVector3 vector) {
-        Extent extent = getExtent();
-        BlockState block = extent.getBlock(vector);
-        return block.getBlockType().getMaterial().isMovementBlocker();
-    }
-
     @Nullable
     @Override
     public Mask2D toMask2D() {

worldedit-core/src/main/java/com/sk89q/worldedit/function/operation/ChangeSetExecutor.java

@@ -66,11 +66,13 @@ public class ChangeSetExecutor implements Operation {
 
     @Override
     public Operation resume(RunContext run) throws WorldEditException {
-        while (iterator.hasNext()) {
-            Change change = iterator.next();
+        Change change = iterator.next();
         if (type == Type.UNDO) {
+            while (iterator.hasNext()) {
                 change.undo(context);
+            }
         } else {
+            while (iterator.hasNext()) {
                 change.redo(context);
             }
         }

worldedit-core/src/main/java/com/sk89q/worldedit/math/BlockVector2.java

@@ -54,6 +54,7 @@ public class BlockVector2 {
     }
 
     public static BlockVector2 at(int x, int z) {
+        /* unnecessary
         switch (x) {
             case 0:
                 if (z == 0) {
@@ -66,11 +67,14 @@ public class BlockVector2 {
                 }
                 break;
         }
+        */
         return new BlockVector2(x, z);
     }
 
     protected int x, z;
 
+    protected BlockVector2(){}
+
     /**
      * Construct an instance.
      *

worldedit-core/src/main/java/com/sk89q/worldedit/math/BlockVector3.java

@@ -48,6 +48,7 @@ public abstract class BlockVector3 {
     }
 
     public static BlockVector3 at(int x, int y, int z) {
+        /* unnecessary
         // switch for efficiency on typical cases
         // in MC y is rarely 0/1 on selections
         switch (y) {
@@ -62,6 +63,7 @@ public abstract class BlockVector3 {
                 }
                 break;
         }
+        */
         return new BlockVector3Imp(x, y, z);
     }
 

worldedit-core/src/main/java/com/sk89q/worldedit/math/Vector2.java

@@ -33,6 +33,7 @@ public class Vector2 {
     public static final Vector2 ONE = new Vector2(1, 1);
 
     public static Vector2 at(double x, double z) {
+        /* Unnecessary
         int xTrunc = (int) x;
         switch (xTrunc) {
             case 0:
@@ -46,6 +47,7 @@ public class Vector2 {
                 }
                 break;
         }
+        */
         return new Vector2(x, z);
     }
 

worldedit-core/src/main/java/com/sk89q/worldedit/math/Vector3.java

@@ -39,6 +39,7 @@ public abstract class Vector3 {
     public static final Vector3 ONE = Vector3.at(1, 1, 1);
 
     public static Vector3 at(double x, double y, double z) {
+        /* Unnecessary
         // switch for efficiency on typical cases
         // in MC y is rarely 0/1 on selections
         int yTrunc = (int) y;
@@ -54,6 +55,7 @@ public abstract class Vector3 {
                 }
                 break;
         }
+        */
         return new Vector3Impl(x, y, z);
     }
 

worldedit-core/src/main/java/com/sk89q/worldedit/regions/CuboidRegion.java

@@ -392,6 +392,7 @@ public class CuboidRegion extends AbstractRegion implements FlatRegion {
         return chunks;
     }
 
+    /* Slow and unnecessary
     @Override
     public boolean contains(BlockVector3 position) {
         BlockVector3 min = getMinimumPoint();
@@ -399,6 +400,7 @@ public class CuboidRegion extends AbstractRegion implements FlatRegion {
 
         return position.containedWithin(min, max);
     }
+    */
 
     @Override
     public boolean contains(int x, int y, int z) {

worldedit-core/src/main/java/com/sk89q/worldedit/regions/CylinderRegion.java

@@ -296,6 +296,7 @@ public class CylinderRegion extends AbstractRegion implements FlatRegion {
     /**
      * Checks to see if a point is inside this region.
      */
+    /* Slow and unnecessary
     @Override
     public boolean contains(BlockVector3 position) {
         final int blockY = position.getBlockY();
@@ -305,6 +306,7 @@ public class CylinderRegion extends AbstractRegion implements FlatRegion {
 
         return position.toBlockVector2().subtract(center).toVector2().divide(radius).lengthSq() <= 1;
     }
+    */
 
     /**
      * Checks to see if a point is inside this region.

worldedit-core/src/main/java/com/sk89q/worldedit/registry/state/EnumProperty.java

@@ -26,7 +26,7 @@ import javax.annotation.Nullable;
 
 public class EnumProperty extends AbstractProperty<String> {
 
-    private Map<String, Integer> offsets = new HashMap<>();
+    private Map<CharSequence, Integer> offsets = new HashMap<>();
 
     public EnumProperty(final String name, final List<String> values) {
         this(name, values, 0);
@@ -48,7 +48,7 @@ public class EnumProperty extends AbstractProperty<String> {
 
     @Override
     public int getIndexFor(CharSequence string) throws IllegalArgumentException {
-        Integer value = offsets.get(string.toString());
+        Integer value = offsets.get(string);
         return value == null ? -1 : value;
     }
 

worldedit-core/src/main/java/com/sk89q/worldedit/registry/state/IntegerProperty.java

@@ -67,10 +67,16 @@ public class IntegerProperty extends AbstractProperty<Integer> {
     public Integer getValueFor(String string) {
         try {
             int val = Integer.parseInt(string);
+            /*
             //It shouldn't matter if this check is slow. It's an important check
             if (!getValues().contains(val)) {
                 throw new IllegalArgumentException("Invalid int value: " + string + ". Must be in " + getValues().toString());
             }
+            */
+            // An exception will get thrown anyway if the property doesn't exist, so it's not really that important. Anyway, we can check the array instead of the string list
+            if (val > 0 && val >= map.length) {
+                throw new IllegalArgumentException("Invalid int value: " + string + ". Must be in " + getValues().toString());
+            }
             return val;
         } catch (NumberFormatException e) {
             throw new IllegalArgumentException("Invalid int value: " + string + ". Not an int.");

worldedit-core/src/main/java/com/sk89q/worldedit/session/PasteBuilder.java

@@ -151,7 +151,7 @@ public class PasteBuilder {
             copy.setFilterFunction(this.canApply);
         }
         if (ignoreAirBlocks) {
-            sourceMask = new MaskIntersection(sourceMask, new ExistingBlockMask(clipboard));
+            sourceMask = MaskIntersection.of(sourceMask, new ExistingBlockMask(clipboard));
         }
         if (targetExtent instanceof EditSession) {
             Mask esSourceMask = ((EditSession) targetExtent).getSourceMask();