merge

buildSrc/src/main/kotlin/CommonConfig.kt

@@ -16,7 +16,7 @@ fun Project.applyCommonConfiguration() {
         maven { url = uri("https://ci.athion.net/job/FAWE-Piston/ws/") }
         ivy { url = uri("https://ci.athion.net/job")
             patternLayout {
-                artifact("/[organisation]/[revision]/artifact/[module].[ext]")
+                artifact("/[organisation]/[module]/artifact/[revision].[ext]")
             }}
     }
     configurations.all {

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

@@ -88,7 +88,6 @@ 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.TransformCommandsRegistration;
 import com.sk89q.worldedit.command.UtilityCommands;
 import com.sk89q.worldedit.command.UtilityCommandsRegistration;
 import com.sk89q.worldedit.command.WorldEditCommands;
@@ -419,17 +418,17 @@ public final class PlatformCommandManager {
                 AnvilCommandsRegistration.builder(),
                 new AnvilCommands(worldEdit)
             );
-            registerSubCommands(
+//            registerSubCommands(
-                "transforms",
+//                "transforms",
-                ImmutableList.of(),
+//                ImmutableList.of(),
-                "Transforms modify how a block is placed\n" +
+//                "Transforms modify how a block is placed\n" +
-                    " - Use [brackets] for arguments\n" +
+//                    " - Use [brackets] for arguments\n" +
-                    " - Use , to OR multiple\n" +
+//                    " - Use , to OR multiple\n" +
-                    " - Use & to AND multiple\n" +
+//                    " - Use & to AND multiple\n" +
-                    "More Info: https://git.io/v9KHO",
+//                    "More Info: https://git.io/v9KHO",
-                TransformCommandsRegistration.builder(),
+//                TransformCommandsRegistration.builder(),
-                new TransformCommands()
+//                new TransformCommands()
-            );
+//            );
             this.registration.register(
                 commandManager,
                 BiomeCommandsRegistration.builder(),

worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java

@@ -42,6 +42,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import javax.annotation.Nullable;