Merge branch '1.15' of https://github.com/IntellectualSites/FastAsyncWorldEdit-1.13 into 1.15

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

@@ -292,11 +292,11 @@ public class Fawe {
     }
 
     public void setupConfigs() {
-        MainUtil.copyFile(MainUtil.getJarFile(), "lang/strings.json", null);
+        MainUtil.copyFile(MainUtil.getJarFile(), "lang" + File.separator + "strings.json", null);
         // Setting up config.yml
         File file = new File(this.IMP.getDirectory(), "config.yml");
         Settings.IMP.PLATFORM = IMP.getPlatform().replace("\"", "");
-        try (InputStream stream = getClass().getResourceAsStream("/fawe.properties");
+        try (InputStream stream = getClass().getResourceAsStream(File.separator + "fawe.properties");
              BufferedReader br = new BufferedReader(new InputStreamReader(stream))) {
             String versionString = br.readLine();
             String commitString = br.readLine();

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

@@ -17,8 +17,6 @@ public interface IFawe {
 
     File getDirectory();
 
-    Player wrap(final Object obj);
-    
     TaskManager getTaskManager();
 
     Collection<FaweMaskManager> getMaskManagers();

worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/queue/Pool.java

@@ -1,5 +1,6 @@
 package com.boydti.fawe.beta.implementation.queue;
 
+@FunctionalInterface
 public interface Pool<T> {
     T poll();
     default boolean offer(T recycle) {

worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/queue/SingleThreadQueueExtent.java

@@ -188,13 +188,13 @@ public class SingleThreadQueueExtent extends ExtentBatchProcessorHolder implemen
      * Get a new IChunk from either the pool, or create a new one<br> + Initialize it at the
      * coordinates
      *
-     * @param X
-     * @param Z
+     * @param chunkX
+     * @param chunkZ
      * @return IChunk
      */
-    private ChunkHolder poolOrCreate(int X, int Z) {
+    private ChunkHolder poolOrCreate(int chunkX, int chunkZ) {
         ChunkHolder next = create(false);
-        next.init(this, X, Z);
+        next.init(this, chunkX, chunkZ);
         return next;
     }
 

worldedit-core/src/main/java/com/boydti/fawe/config/Settings.java

@@ -93,7 +93,7 @@ public class Settings extends Config {
                 " - Use a shared directory or NFS/Samba"
         })
         public String CLIPBOARD = "clipboard";
-        @Comment("Each player has their own sub directory for schematics")
+        @Comment("Each player has his or her own sub directory for schematics")
         public boolean PER_PLAYER_SCHEMATICS = true;
         public String COMMANDS = "commands";
     }
@@ -288,7 +288,7 @@ public class Settings extends Config {
                 "Increase or decrease queue intensity (ms) [-50,50]:",
                 "    0 = balance of performance / stability",
                 "    -10 = Allocate 10ms less for chunk placement",
-                "Too high will can cause lag spikes (you might be okay with this)",
+                "Too high can cause lag spikes (you might be okay with this)",
                 "Too low will result in slow edits",
         })
         public int EXTRA_TIME_MS = 0;

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

@@ -31,7 +31,7 @@ import java.util.Iterator;
 import java.util.UUID;
 import java.util.function.Supplier;
 
-public class InspectBrush extends BrushTool implements DoubleActionTraceTool {
+public class InspectBrush extends BrushTool {
 
     /**
      * Construct the tool.
@@ -61,13 +61,14 @@ public class InspectBrush extends BrushTool implements DoubleActionTraceTool {
     }
 
     public boolean perform(final Player player, LocalSession session, boolean rightClick) {
-        if (!session.isToolControlEnabled() || !player.hasPermission("worldedit.tool.inspect")) {
+        if (!player.hasPermission("worldedit.tool.inspect")) {
             player.print(Caption.of("", "worldedit.tool.inspect"));
             System.out.println("No tool control");
             return false;
         }
         if (!Settings.IMP.HISTORY.USE_DATABASE) {
-            player.print(Caption.of("fawe.error.setting.disable", ("history.use-database (Import with /history import )")));
+            player.print(Caption.of("fawe.error.setting.disable",
+                "history.use-database (Import with /history import )"));
             System.out.println("No db");
             return false;
         }

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

@@ -1493,9 +1493,7 @@ public class LocalSession implements TextureHolder {
 
     private void prepareEditingExtents(EditSession editSession, Actor actor) {
         editSession.setFastMode(fastMode);
-        /*
         editSession.setReorderMode(reorderMode);
-        */
         if (editSession.getSurvivalExtent() != null) {
             editSession.getSurvivalExtent().setStripNbt(!actor.hasPermission("worldedit.setnbt"));
         }
@@ -1526,7 +1524,6 @@ public class LocalSession implements TextureHolder {
      * @return The reorder mode
      */
     public EditSession.ReorderMode getReorderMode() {
-//        return reorderMode;
         return EditSession.ReorderMode.FAST;
     }
 
@@ -1536,7 +1533,6 @@ public class LocalSession implements TextureHolder {
      * @param reorderMode The reorder mode
      */
     public void setReorderMode(EditSession.ReorderMode reorderMode) {
-//        this.reorderMode = reorderMode;
     }
 
     /**