Finish removal of PlayerDirection, and partially added diagonal support back to commands. (Other minor changes to WorldEdit-Sponge and FAVS)

worldedit-sponge/build.gradle

@@ -8,29 +8,55 @@ buildscript {
 }
 
 plugins {
-    id 'signing'
-    id 'org.spongepowered.plugin' version '0.8.1'
+    id 'org.spongepowered.plugin' version '0.9.0'
+}
+
+repositories {
+    maven { url "https://repo.codemc.org/repository/maven-public" }
 }
 
 dependencies {
     compile project(':worldedit-core')
-    compile 'org.spongepowered:spongeapi:7.0.0-SNAPSHOT'
+    compile 'org.spongepowered:spongeapi:7.1.0'
+    compile 'org.bstats:bstats-sponge:1.4'
     testCompile group: 'org.mockito', name: 'mockito-core', version:'1.9.0-rc1'
 }
 
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 
-sponge {
-    plugin {
-        id = 'worldedit'
+jar.archiveName="fawe-sponge-${project.parent.version}.jar"
+jar.destinationDir = file '../mvn/com/boydti/fawe-sponge/' + project.parent.version
+task createPom << {
+    pom {
+        project {
+            groupId 'com.boydti'
+            artifactId 'fawe-sponge'
+            version project.parent.version
+        }
     }
+    .getEffectivePom()
+            .setDependencies(new ArrayList<>())
+            .writeTo("../mvn/com/boydti/fawe-sponge/${project.parent.version}/fawe-sponge-${project.parent.version}.pom")
+    pom {
+        project {
+            groupId 'com.boydti'
+            artifactId 'fawe-sponge'
+            version 'latest'
+        }
+    }
+    .getEffectivePom()
+            .setDependencies(new ArrayList<>())
+            .writeTo("../mvn/com/boydti/fawe-sponge/latest/fawe-sponge-latest.pom")
 }
-
-jar {
-    manifest {
-        attributes("Class-Path": "truezip.jar WorldEdit/truezip.jar js.jar WorldEdit/js.jar",
-                "WorldEdit-Version": version)
+task copyFiles {
+    doLast {
+        copy {
+            from "../mvn/com/boydti/fawe-sponge/${project.parent.version}/"
+            into '../mvn/com/boydti/fawe-sponge/latest/'
+            include('*.jar')
+            rename ("fawe-sponge-${project.parent.version}.jar", 'fawe-sponge-latest.jar')
+        }
     }
 }
 
@@ -38,13 +64,10 @@ shadowJar {
     dependencies {
         include(dependency(':worldedit-core'))
     }
+    archiveName = "${parent.name}-${project.name.replaceAll("worldedit-", "")}-${parent.version}.jar"
+    destinationDir = file '../target'
 }
 
-artifacts {
-    archives shadowJar
-}
-
-signing {
-    required false
-    sign shadowJar
-}
+build.dependsOn(shadowJar)
+build.finalizedBy(copyFiles)
+copyFiles.dependsOn(createPom)

worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongePlayer.java

@@ -31,6 +31,7 @@ import com.sk89q.worldedit.math.Vector3;
 import com.sk89q.worldedit.session.SessionKey;
 import com.sk89q.worldedit.util.HandSide;
 import com.sk89q.worldedit.util.Location;
+import com.sk89q.worldedit.world.block.BlockStateHolder;
 import com.sk89q.worldedit.world.gamemode.GameMode;
 import com.sk89q.worldedit.world.gamemode.GameModes;
 import com.sk89q.worldedit.world.item.ItemTypes;
@@ -186,8 +187,6 @@ public class SpongePlayer extends AbstractPlayerActor {
     }
 
     @Override
-<<<<<<< HEAD
-=======
     public void sendFakeBlock(BlockVector3 pos, BlockStateHolder block) {
         org.spongepowered.api.world.Location<World> loc = player.getWorld().getLocation(pos.getX(), pos.getY(), pos.getZ());
         if (block == null) {
@@ -205,7 +204,6 @@ public class SpongePlayer extends AbstractPlayerActor {
     }
 
     @Override
->>>>>>> 399e0ad5... Refactor vector system to be cleaner
     public SessionKey getSessionKey() {
         return new SessionKeyImpl(player.getUniqueId(), player.getName());
     }

worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorld.java

@@ -25,10 +25,7 @@ import com.flowpowered.math.vector.Vector3d;
 import com.flowpowered.math.vector.Vector3i;
 import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.WorldEditException;
-<<<<<<< HEAD
-=======
 import com.sk89q.worldedit.world.block.BaseBlock;
->>>>>>> f54d6afb... Make BaseBlock more memory efficient, and make it clear in the API that it's not intended to be used for every single block.
 import com.sk89q.worldedit.blocks.BaseItemStack;
 import com.sk89q.worldedit.entity.BaseEntity;
 import com.sk89q.worldedit.entity.Entity;

worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorldEdit.java

@@ -211,7 +211,7 @@ public class SpongeWorldEdit {
 
         BlockType interactedType = targetBlock.getState().getType();
         if (event instanceof InteractBlockEvent.Primary) {
-            if (!interactedType.getMaterial().isAir()) {
+            if (interactedType != BlockTypes.AIR) {
                 if (!optLoc.isPresent()) {
                     return;
                 }
@@ -233,7 +233,7 @@ public class SpongeWorldEdit {
                 }
             }
         } else if (event instanceof InteractBlockEvent.Secondary) {
-        if (!interactedType.getMaterial().isAir()) {
+        if (interactedType != BlockTypes.AIR) {
                 if (!optLoc.isPresent()) {
                     return;
                 }