Revert "start reimplementing entities"

This reverts commit aac02ceea1.

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitEntity.java

@@ -89,7 +89,7 @@ public class BukkitEntity implements Entity {
 
     @Override
     public com.sk89q.worldedit.world.entity.EntityType getType() {
-        return EntityTypes.get(type.getName().toLowerCase(Locale.ROOT));
+        return EntityTypes.get(type.getName().toUpperCase(Locale.ROOT));
     }
 
     @Override

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java

@@ -99,6 +99,7 @@ public class BukkitWorld extends AbstractWorld {
     @Override
     public List<com.sk89q.worldedit.entity.Entity> getEntities(Region region) {
         World world = getWorld();
+
         List<Entity> ents = world.getEntities();
         List<com.sk89q.worldedit.entity.Entity> entities = new ArrayList<>();
         for (Entity ent : ents) {

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

@@ -63,9 +63,4 @@ public class WorldCopyClipboard extends ReadOnlyClipboard {
         return hasBiomes;
     }
 
-    @Override
-    public List<? extends Entity> getEntities(Region region) {
-        return getExtent().getEntities(region);
-    }
-
 }

worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java

@@ -46,8 +46,6 @@ import com.boydti.fawe.util.ExtentTraverser;
 import com.boydti.fawe.util.MaskTraverser;
 import com.boydti.fawe.util.MathMan;
 import com.boydti.fawe.util.TaskManager;
-import com.sk89q.worldedit.entity.BaseEntity;
-import com.sk89q.worldedit.entity.Entity;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.event.extent.EditSessionEvent;
 import com.sk89q.worldedit.extent.AbstractDelegateExtent;
@@ -3056,20 +3054,4 @@ public class EditSession extends PassthroughExtent implements AutoCloseable {
         }
         return false;
     }
-
-    @Override
-    public List<? extends Entity> getEntities(Region region) {
-        return world.getEntities(region);
-    }
-
-    @Override
-    public List<? extends Entity> getEntities() {
-        System.out.println("editsession");
-        return world.getEntities();
-    }
-
-    @Override
-    public Entity createEntity(Location location, BaseEntity entity) {
-        return world.createEntity(location, entity);
-    } 
 }

worldedit-core/src/main/java/com/sk89q/worldedit/extent/Extent.java

@@ -132,7 +132,6 @@ public interface Extent extends InputExtent, OutputExtent {
      * @return a list of entities
      */
     default List<? extends Entity> getEntities() {
-        System.out.println("el");
         return Collections.emptyList();
     }
 

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

@@ -195,19 +195,11 @@ public class BlockArrayClipboard implements Clipboard {
 
     @Override
     public List<? extends Entity> getEntities(Region region) {
-        System.out.println("blockarrayclipboard");
         region = region.clone();
         region.shift(BlockVector3.ZERO.subtract(origin));
         return getParent().getEntities(region);
     }
 
-    @Override
-    public List<? extends Entity> getEntities() {
-        System.out.println("blockarrayall");
-        return getParent().getEntities();
-    }
-    
-    
     @Override
     @Nullable
     public Entity createEntity(Location location, BaseEntity entity) {

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

@@ -397,7 +397,7 @@ public class ForwardExtentCopy implements Operation {
             Operations.completeBlindly(blockCopy);
 
             if (!entities.isEmpty()) {
-                ExtentEntityCopy entityCopy = new ExtentEntityCopy(from.toVector3(), finalDest, to.toVector3(), currentTransform);
+                ExtentEntityCopy entityCopy = new ExtentEntityCopy(from.toVector3(), destination, to.toVector3(), currentTransform);
                 entityCopy.setRemoving(removingEntities);
                 List<? extends Entity> entities2 = Lists.newArrayList(source.getEntities(region));
                 entities2.removeIf(entity -> {
@@ -406,7 +406,6 @@ public class ForwardExtentCopy implements Operation {
                 });
                 EntityVisitor entityVisitor = new EntityVisitor(entities.iterator(), entityCopy);
                 Operations.completeBlindly(entityVisitor);
-                affectedEntities += entityVisitor.getAffected();
             }
 
             if (transExt != null) {
@@ -428,8 +427,8 @@ public class ForwardExtentCopy implements Operation {
         return ImmutableList.of(
                 TranslatableComponent.of("worldedit.operation.affected.block",
                         TextComponent.of(affectedBlocks)).color(TextColor.LIGHT_PURPLE),
-                //TranslatableComponent.of("worldedit.operation.affected.biome",
+                TranslatableComponent.of("worldedit.operation.affected.biome",
-                //        TextComponent.of(affectedBiomeCols)).color(TextColor.LIGHT_PURPLE),
+                        TextComponent.of(affectedBiomeCols)).color(TextColor.LIGHT_PURPLE),
                 TranslatableComponent.of("worldedit.operation.affected.entity",
                         TextComponent.of(affectedEntities)).color(TextColor.LIGHT_PURPLE)
         );

worldedit-core/src/main/java/com/sk89q/worldedit/util/io/file/ArchiveDir.java

@@ -18,16 +18,16 @@
  */
 
 package com.sk89q.worldedit.util.io.file;
-
+
-import java.io.Closeable;
+import java.io.Closeable;
-import java.nio.file.Path;
+import java.nio.file.Path;
-
+
-/**
+/**
- * Represents an archive opened as a directory. This must be closed after work on the Path is
+ * Represents an archive opened as a directory. This must be closed after work on the Path is
- * done.
+ * done.
- */
+ */
-public interface ArchiveDir extends Closeable {
+public interface ArchiveDir extends Closeable {
-
+
-    Path getPath();
+    Path getPath();
-
+
-}
+}

worldedit-core/src/main/java/com/sk89q/worldedit/util/io/file/SafeFiles.java

@@ -18,52 +18,52 @@
  */
 
 package com.sk89q.worldedit.util.io.file;
-
+
-import java.io.IOException;
+import java.io.IOException;
-import java.nio.file.Files;
+import java.nio.file.Files;
-import java.nio.file.Path;
+import java.nio.file.Path;
-import java.util.List;
+import java.util.List;
-import java.util.stream.Collectors;
+import java.util.stream.Collectors;
-import java.util.stream.Stream;
+import java.util.stream.Stream;
-
+
-public class SafeFiles {
+public class SafeFiles {
-
+
-    /**
+    /**
-     * A version of {@link Files#list(Path)} that won't leak resources.
+     * A version of {@link Files#list(Path)} that won't leak resources.
-     *
+     *
-     * <p>
+     * <p>
-     * Instead, it immediately consumes the entire listing into a {@link List} and
+     * Instead, it immediately consumes the entire listing into a {@link List} and
-     * calls {@link List#stream()}.
+     * calls {@link List#stream()}.
-     * </p>
+     * </p>
-     *
+     *
-     * @param dir the directory to list
+     * @param dir the directory to list
-     * @return an I/O-resource-free stream of the files in the directory
+     * @return an I/O-resource-free stream of the files in the directory
-     * @throws IOException if an I/O error occurs
+     * @throws IOException if an I/O error occurs
-     */
+     */
-    public static Stream<Path> noLeakFileList(Path dir) throws IOException {
+    public static Stream<Path> noLeakFileList(Path dir) throws IOException {
-        try (Stream<Path> stream = Files.list(dir)) {
+        try (Stream<Path> stream = Files.list(dir)) {
-            return stream.collect(Collectors.toList()).stream();
+            return stream.collect(Collectors.toList()).stream();
-        }
+        }
-    }
+    }
-
+
-    /**
+    /**
-     * {@link Path#getFileName()} includes a slash sometimes for some reason.
+     * {@link Path#getFileName()} includes a slash sometimes for some reason.
-     * This will get rid of it.
+     * This will get rid of it.
-     *
+     *
-     * @param path the path to get the file name for
+     * @param path the path to get the file name for
-     * @return the file name of the given path
+     * @return the file name of the given path
-     */
+     */
-    public static String canonicalFileName(Path path) {
+    public static String canonicalFileName(Path path) {
-        return dropSlash(path.getFileName().toString());
+        return dropSlash(path.getFileName().toString());
-    }
+    }
-
+
-    private static String dropSlash(String name) {
+    private static String dropSlash(String name) {
-        if (name.isEmpty() || name.codePointBefore(name.length()) != '/') {
+        if (name.isEmpty() || name.codePointBefore(name.length()) != '/') {
-            return name;
+            return name;
-        }
+        }
-        return name.substring(0, name.length() - 1);
+        return name.substring(0, name.length() - 1);
-    }
+    }
-
+
-    private SafeFiles() {
+    private SafeFiles() {
-    }
+    }
-}
+}

worldedit-core/src/main/java/com/sk89q/worldedit/world/NullWorld.java

@@ -192,7 +192,6 @@ public class NullWorld extends AbstractWorld {
 
     @Override
     public List<Entity> getEntities(Region region) {
-        System.out.println("nullworld");
         return Collections.emptyList();
     }