Add and apply .editorconfig from P2 (IntellectualSites#1195)

* Consistenty use javax annotations.
 - Unfortunately jetbrains annotations seem to be exposed transitively via core somewhere, but with the correct IDE settings, annotations can be defaulted to javax
 - Cleaning up of import order in IntellectualSites#1195
 - Must be merged before IntellectualSites#1195

* Add and apply .editorconfig from P2
 - Does not rearrange entries

* Address some comments

* add back some javadoc comments

* Address final comments

Co-authored-by: NotMyFault <mc.cache@web.de>

Author: dordsor21

.editorconfig

@@ -1,13 +1,13 @@
 package com.fastasyncworldedit.bukkit;
 
-import javax.annotation.Nullable;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
 import com.sk89q.worldedit.bukkit.WorldEditPlugin;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionAttachment;
 
+import javax.annotation.Nullable;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
 public class BukkitPermissionAttachmentManager {
 
     private final WorldEditPlugin plugin;
@@ -33,4 +33,5 @@ public void removeAttachment(@Nullable final Player p) {
             p.removeAttachment(attach);
         }
     }
+
 }

worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/BukkitPermissionAttachmentManager.java

@@ -1,29 +1,27 @@
 package com.fastasyncworldedit.bukkit;
 
-import com.fastasyncworldedit.bukkit.util.image.BukkitImageViewer;
-import com.fastasyncworldedit.core.FAWEPlatformAdapterImpl;
-import com.fastasyncworldedit.core.Fawe;
-import com.fastasyncworldedit.core.IFawe;
-import com.fastasyncworldedit.core.queue.implementation.preloader.AsyncPreloader;
-import com.fastasyncworldedit.core.queue.implementation.preloader.Preloader;
-import com.fastasyncworldedit.core.queue.implementation.QueueHandler;
 import com.fastasyncworldedit.bukkit.adapter.BukkitQueueHandler;
 import com.fastasyncworldedit.bukkit.adapter.NMSAdapter;
 import com.fastasyncworldedit.bukkit.listener.BrushListener;
 import com.fastasyncworldedit.bukkit.listener.ChunkListener9;
 import com.fastasyncworldedit.bukkit.listener.RenderListener;
-import com.fastasyncworldedit.bukkit.regions.GriefPreventionFeature;
 import com.fastasyncworldedit.bukkit.regions.GriefDefenderFeature;
+import com.fastasyncworldedit.bukkit.regions.GriefPreventionFeature;
 import com.fastasyncworldedit.bukkit.regions.ResidenceFeature;
 import com.fastasyncworldedit.bukkit.regions.TownyFeature;
 import com.fastasyncworldedit.bukkit.regions.WorldGuardFeature;
 import com.fastasyncworldedit.bukkit.util.BukkitTaskManager;
 import com.fastasyncworldedit.bukkit.util.ItemUtil;
 import com.fastasyncworldedit.bukkit.util.MinecraftVersion;
-//import com.fastasyncworldedit.bukkit.util.image.BukkitImageViewer;
+import com.fastasyncworldedit.bukkit.util.image.BukkitImageViewer;
+import com.fastasyncworldedit.core.FAWEPlatformAdapterImpl;
+import com.fastasyncworldedit.core.Fawe;
+import com.fastasyncworldedit.core.IFawe;
 import com.fastasyncworldedit.core.configuration.Settings;
+import com.fastasyncworldedit.core.queue.implementation.QueueHandler;
+import com.fastasyncworldedit.core.queue.implementation.preloader.AsyncPreloader;
+import com.fastasyncworldedit.core.queue.implementation.preloader.Preloader;
 import com.fastasyncworldedit.core.regions.FaweMaskManager;
-import com.fastasyncworldedit.core.util.ThirdPartyManager;
 import com.fastasyncworldedit.core.util.TaskManager;
 import com.fastasyncworldedit.core.util.WEManager;
 import com.fastasyncworldedit.core.util.image.ImageViewer;
@@ -44,7 +42,6 @@
 import org.bukkit.plugin.PluginManager;
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.UUID;
@@ -91,7 +88,7 @@ public FaweBukkit(Plugin plugin) {
         TaskManager.IMP.task(() -> {
             // Fix for ProtocolSupport
             Settings.IMP.PROTOCOL_SUPPORT_FIX =
-                Bukkit.getPluginManager().isPluginEnabled("ProtocolSupport");
+                    Bukkit.getPluginManager().isPluginEnabled("ProtocolSupport");
 
             // This class
             Bukkit.getPluginManager().registerEvents(FaweBukkit.this, FaweBukkit.this.plugin);
@@ -101,7 +98,8 @@ public FaweBukkit(Plugin plugin) {
         });
     }
 
-    @Override public QueueHandler getQueueHandler() {
+    @Override
+    public QueueHandler getQueueHandler() {
         return new BukkitQueueHandler();
     }
 
@@ -112,28 +110,21 @@ public synchronized ImageViewer getImageViewer(com.sk89q.worldedit.entity.Player
             PluginManager manager = Bukkit.getPluginManager();
 
             if (manager.getPlugin("PacketListenerApi") == null) {
-                File output = new File(plugin.getDataFolder().getParentFile(),
-                    "PacketListenerAPI_v3.7.6-SNAPSHOT.jar");
-                byte[] jarData = ThirdPartyManager.PacketListenerAPI.download();
-                try (FileOutputStream fos = new FileOutputStream(output)) {
-                    fos.write(jarData);
-                }
+                LOGGER.error("PacketListener not found! Please install PacketListenerAPI v3.7.6 or above before attempting to " +
+                        "complete image-related edits");
             }
             if (manager.getPlugin("MapManager") == null) {
-                File output = new File(plugin.getDataFolder().getParentFile(),
-                    "MapManager_v1.7.8-SNAPSHOT.jar");
-                byte[] jarData = ThirdPartyManager.MapManager.download();
-                try (FileOutputStream fos = new FileOutputStream(output)) {
-                    fos.write(jarData);
-                }
+                LOGGER.error("MapManager not found! Please install PacketListenerAPI v1.7.8 or above before attempting to " +
+                        "complete image-related edits");
             }
             return new BukkitImageViewer(BukkitAdapter.adapt(player));
         } catch (Throwable ignored) {
         }
         return null;
     }
 
-    @Override public File getDirectory() {
+    @Override
+    public File getDirectory() {
         return plugin.getDataFolder();
     }
 
@@ -151,29 +142,31 @@ public ItemUtil getItemUtil() {
         return tmp;
     }
 
-    @Override public String getDebugInfo() {
+    @Override
+    public String getDebugInfo() {
         StringBuilder msg = new StringBuilder();
         Plugin[] plugins = Bukkit.getServer().getPluginManager().getPlugins();
         msg.append("Server Version: ").append(Bukkit.getVersion()).append("\n");
         msg.append("Plugins (").append(plugins.length).append("): \n");
         for (Plugin p : plugins) {
             msg.append(" - ").append(p.getName()).append(":").append("\n")
-                .append("  • Version: ").append(p.getDescription().getVersion()).append("\n")
-                .append("  • Enabled: ").append(p.isEnabled()).append("\n")
-                .append("  • Main: ").append(p.getDescription().getMain()).append("\n")
-                .append("  • Authors: ").append(p.getDescription().getAuthors()).append("\n")
-                .append("  • Load Before: ").append(p.getDescription().getLoadBefore()).append("\n")
-                .append("  • Dependencies: ").append(p.getDescription().getDepend()).append("\n")
-                .append("  • Soft Dependencies: ").append(p.getDescription().getSoftDepend()).append("\n")
-                .append("  • Provides: ").append(p.getDescription().getProvides()).append("\n");
+                    .append("  • Version: ").append(p.getDescription().getVersion()).append("\n")
+                    .append("  • Enabled: ").append(p.isEnabled()).append("\n")
+                    .append("  • Main: ").append(p.getDescription().getMain()).append("\n")
+                    .append("  • Authors: ").append(p.getDescription().getAuthors()).append("\n")
+                    .append("  • Load Before: ").append(p.getDescription().getLoadBefore()).append("\n")
+                    .append("  • Dependencies: ").append(p.getDescription().getDepend()).append("\n")
+                    .append("  • Soft Dependencies: ").append(p.getDescription().getSoftDepend()).append("\n")
+                    .append("  • Provides: ").append(p.getDescription().getProvides()).append("\n");
         }
         return msg.toString();
     }
 
     /**
      * The task manager handles sync/async tasks.
      */
-    @Override public TaskManager getTaskManager() {
+    @Override
+    public TaskManager getTaskManager() {
         return new BukkitTaskManager(plugin);
     }
 
@@ -184,9 +177,10 @@ public Plugin getPlugin() {
     /**
      * A mask manager handles region restrictions e.g., PlotSquared plots / WorldGuard regions
      */
-    @Override public Collection<FaweMaskManager> getMaskManagers() {
+    @Override
+    public Collection<FaweMaskManager> getMaskManagers() {
         final Plugin worldguardPlugin =
-            Bukkit.getServer().getPluginManager().getPlugin("WorldGuard");
+                Bukkit.getServer().getPluginManager().getPlugin("WorldGuard");
         final ArrayList<FaweMaskManager> managers = new ArrayList<>();
         if (worldguardPlugin != null && worldguardPlugin.isEnabled()) {
             try {
@@ -212,7 +206,7 @@ public Plugin getPlugin() {
             }
         }
         final Plugin griefpreventionPlugin =
-            Bukkit.getServer().getPluginManager().getPlugin("GriefPrevention");
+                Bukkit.getServer().getPluginManager().getPlugin("GriefPrevention");
         if (griefpreventionPlugin != null && griefpreventionPlugin.isEnabled()) {
             try {
                 managers.add(new GriefPreventionFeature(griefpreventionPlugin));
@@ -259,26 +253,31 @@ public void onPlayerQuit(PlayerQuitEvent event) {
         wePlayer.unregister();
     }
 
-    @Override public String getPlatform() {
+    @Override
+    public String getPlatform() {
         return "Bukkit";
     }
 
-    @Override public UUID getUUID(String name) {
+    @Override
+    public UUID getUUID(String name) {
         return Bukkit.getOfflinePlayer(name).getUniqueId();
     }
 
-    @Override public String getName(UUID uuid) {
+    @Override
+    public String getName(UUID uuid) {
         return Bukkit.getOfflinePlayer(uuid).getName();
     }
 
-    @Override public Preloader getPreloader() {
+    @Override
+    public Preloader getPreloader() {
         if (PaperLib.isPaper()) {
             return new AsyncPreloader();
         }
         return null;
     }
 
-    @Override public boolean isChunksStretched() {
+    @Override
+    public boolean isChunksStretched() {
         return chunksStretched;
     }
 
@@ -295,11 +294,12 @@ private void setupPlotSquared() {
         if (plotSquared.getClass().getPackage().toString().contains("intellectualsites")) {
             WEManager.IMP.managers.add(new com.fastasyncworldedit.bukkit.regions.plotsquaredv4.PlotSquaredFeature());
             LOGGER.info("Plugin 'PlotSquared' found. Using it now.");
-        } else if (PlotSquared.get().getVersion().version[0] == 6){
+        } else if (PlotSquared.get().getVersion().version[0] == 6) {
             WEManager.IMP.managers.add(new com.fastasyncworldedit.bukkit.regions.plotsquared.PlotSquaredFeature());
             LOGGER.info("Plugin 'PlotSquared' found. Using it now.");
         } else {
             LOGGER.error("Incompatible version of PlotSquared found. Please use PlotSquared v6.");
         }
     }
+
 }

worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/FaweBukkit.java

@@ -1,8 +1,8 @@
 package com.fastasyncworldedit.bukkit.adapter;
 
 import co.aikar.timings.Timings;
-import com.fastasyncworldedit.core.queue.implementation.QueueHandler;
 import com.fastasyncworldedit.bukkit.listener.ChunkListener;
+import com.fastasyncworldedit.core.queue.implementation.QueueHandler;
 import com.sk89q.worldedit.internal.util.LogManagerCompat;
 import org.apache.logging.log4j.Logger;
 import org.spigotmc.AsyncCatcher;
@@ -17,6 +17,7 @@ public class BukkitQueueHandler extends QueueHandler {
     private static boolean alertTimingsChange = true;
 
     private static Method methodCheck;
+
     static {
         try {
             methodCheck = Class.forName("co.aikar.timings.TimingsManager").getDeclaredMethod("recheckEnabled");
@@ -61,4 +62,5 @@ public void endSet(boolean parallel) {
             }
         }
     }
+
 }

worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/adapter/BukkitQueueHandler.java

@@ -16,6 +16,7 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 public abstract class CachedBukkitAdapter implements IBukkitAdapter {
+
     private int[] itemTypes;
     private int[] blockTypes;
 
@@ -98,4 +99,5 @@ public BlockState adapt(BlockData blockData) {
             throw e;
         }
     }
+
 }

worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/adapter/CachedBukkitAdapter.java

@@ -1,13 +1,14 @@
 package com.fastasyncworldedit.bukkit.adapter;
 
+import javax.annotation.Nonnull;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
-import javax.annotation.Nonnull;
 
 public class DelegateLock extends ReentrantLockWithGetOwner {
+
     private final ReentrantLock parent;
     private volatile boolean modified;
     private final AtomicInteger count;
@@ -106,4 +107,5 @@ public synchronized int getWaitQueueLength(Condition condition) {
     public synchronized String toString() {
         return parent.toString();
     }
+
 }

worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/adapter/DelegateLock.java

@@ -3,6 +3,7 @@
 import java.util.concurrent.Semaphore;
 
 public class DelegateSemaphore extends Semaphore {
+
     private final Semaphore delegate;
 
     public DelegateSemaphore(int permits, Semaphore delegate) {
@@ -30,4 +31,5 @@ public synchronized void acquire() throws InterruptedException {
     public synchronized void release() {
         this.delegate.release();
     }
+
 }