Initial annotation usage cleanup + EditorConfig

Bukkit/src/main/java/com/plotsquared/bukkit/util/task/BukkitPlotSquaredTask.java

@@ -27,21 +27,22 @@ package com.plotsquared.bukkit.util.task;
 
 import com.plotsquared.core.util.task.PlotSquaredTask;
 import org.bukkit.scheduler.BukkitRunnable;
-
-import javax.annotation.Nonnull;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
  * Bukkit implementation of {@link PlotSquaredTask}
  */
 public final class BukkitPlotSquaredTask extends BukkitRunnable implements PlotSquaredTask {
 
-    @Nonnull private final Runnable runnable;
+    @NonNull
+    private final Runnable runnable;
 
-    public BukkitPlotSquaredTask(@Nonnull final Runnable runnable) {
+    public BukkitPlotSquaredTask(final @NonNull Runnable runnable) {
         this.runnable = runnable;
     }
 
-    @Override public void runTask() {
+    @Override
+    public void runTask() {
         this.runnable.run();
     }
 

Bukkit/src/main/java/com/plotsquared/bukkit/util/task/BukkitTaskManager.java

@@ -33,8 +33,8 @@ import com.plotsquared.core.util.task.PlotSquaredTask;
 import com.plotsquared.core.util.task.TaskManager;
 import com.plotsquared.core.util.task.TaskTime;
 import org.bukkit.Bukkit;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
-import javax.annotation.Nonnull;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
@@ -43,20 +43,26 @@ import java.util.concurrent.TimeUnit;
  * Bukkit implementation of {@link TaskManager} using
  * by {@link org.bukkit.scheduler.BukkitScheduler} and {@link BukkitPlotSquaredTask}
  */
-@Singleton public class BukkitTaskManager extends TaskManager {
+@Singleton
+public class BukkitTaskManager extends TaskManager {
 
     private final BukkitPlatform bukkitMain;
     private final TaskTime.TimeConverter timeConverter;
 
-    @Inject public BukkitTaskManager(@Nonnull final BukkitPlatform bukkitMain,
-                                     @Nonnull final TaskTime.TimeConverter timeConverter) {
+    @Inject
+    public BukkitTaskManager(
+            final @NonNull BukkitPlatform bukkitMain,
+            final TaskTime.@NonNull TimeConverter timeConverter
+    ) {
         this.bukkitMain = bukkitMain;
         this.timeConverter = timeConverter;
     }
 
     @Override
-    public PlotSquaredTask taskRepeat(@Nonnull final Runnable runnable,
-                                      @Nonnull final TaskTime taskTime) {
+    public PlotSquaredTask taskRepeat(
+            final @NonNull Runnable runnable,
+            final @NonNull TaskTime taskTime
+    ) {
         final long ticks = this.timeConverter.toTicks(taskTime);
         final BukkitPlotSquaredTask bukkitPlotSquaredTask = new BukkitPlotSquaredTask(runnable);
         bukkitPlotSquaredTask.runTaskTimer(this.bukkitMain, ticks, ticks);
@@ -64,15 +70,18 @@ import java.util.concurrent.TimeUnit;
     }
 
     @Override
-    public PlotSquaredTask taskRepeatAsync(@Nonnull final Runnable runnable,
-                                           @Nonnull final TaskTime taskTime) {
+    public PlotSquaredTask taskRepeatAsync(
+            final @NonNull Runnable runnable,
+            final @NonNull TaskTime taskTime
+    ) {
         final long ticks = this.timeConverter.toTicks(taskTime);
         final BukkitPlotSquaredTask bukkitPlotSquaredTask = new BukkitPlotSquaredTask(runnable);
         bukkitPlotSquaredTask.runTaskTimerAsynchronously(this.bukkitMain, ticks, ticks);
         return bukkitPlotSquaredTask;
     }
 
-    @Override public void taskAsync(@Nonnull final Runnable runnable) {
+    @Override
+    public void taskAsync(final @NonNull Runnable runnable) {
         if (this.bukkitMain.isEnabled()) {
             new BukkitPlotSquaredTask(runnable).runTaskAsynchronously(this.bukkitMain);
         } else {
@@ -80,29 +89,38 @@ import java.util.concurrent.TimeUnit;
         }
     }
 
-    @Override public <T> T sync(@Nonnull final Callable<T> function, final int timeout) throws Exception {
+    @Override
+    public <T> T sync(final @NonNull Callable<T> function, final int timeout) throws Exception {
         if (PlotSquared.get().isMainThread(Thread.currentThread())) {
             return function.call();
         }
         return this.callMethodSync(function).get(timeout, TimeUnit.MILLISECONDS);
     }
 
-    @Override public <T> Future<T> callMethodSync(@Nonnull final Callable<T> method) {
+    @Override
+    public <T> Future<T> callMethodSync(final @NonNull Callable<T> method) {
         return Bukkit.getScheduler().callSyncMethod(this.bukkitMain, method);
     }
 
-    @Override public void task(@Nonnull final Runnable runnable) {
+    @Override
+    public void task(final @NonNull Runnable runnable) {
         new BukkitPlotSquaredTask(runnable).runTask(this.bukkitMain);
     }
 
-    @Override public void taskLater(@Nonnull final Runnable runnable,
-                                    @Nonnull final TaskTime taskTime) {
+    @Override
+    public void taskLater(
+            final @NonNull Runnable runnable,
+            final @NonNull TaskTime taskTime
+    ) {
         final long delay = this.timeConverter.toTicks(taskTime);
         new BukkitPlotSquaredTask(runnable).runTaskLater(this.bukkitMain, delay);
     }
 
-    @Override public void taskLaterAsync(@Nonnull final Runnable runnable,
-                                         @Nonnull final TaskTime taskTime) {
+    @Override
+    public void taskLaterAsync(
+            final @NonNull Runnable runnable,
+            final @NonNull TaskTime taskTime
+    ) {
         final long delay = this.timeConverter.toTicks(taskTime);
         new BukkitPlotSquaredTask(runnable).runTaskLaterAsynchronously(this.bukkitMain, delay);
     }

Bukkit/src/main/java/com/plotsquared/bukkit/util/task/PaperTimeConverter.java

@@ -27,8 +27,7 @@ package com.plotsquared.bukkit.util.task;
 
 import com.plotsquared.core.util.task.TaskTime;
 import org.bukkit.Bukkit;
-
-import javax.annotation.Nonnegative;
+import org.checkerframework.checker.index.qual.NonNegative;
 
 /**
  * Time converter that uses the server MSPT count to convert between
@@ -38,11 +37,13 @@ public final class PaperTimeConverter implements TaskTime.TimeConverter {
 
     private static final long MIN_MS_PER_TICKS = 50L;
 
-    @Override public long msToTicks(@Nonnegative final long ms) {
+    @Override
+    public long msToTicks(@NonNegative final long ms) {
         return Math.max(1L, (long) (ms / Math.max(MIN_MS_PER_TICKS, Bukkit.getAverageTickTime())));
     }
 
-    @Override public long ticksToMs(@Nonnegative final long ticks) {
+    @Override
+    public long ticksToMs(@NonNegative final long ticks) {
         return Math.max(1L, (long) (ticks * Math.max(MIN_MS_PER_TICKS, Bukkit.getAverageTickTime())));
     }
 

Bukkit/src/main/java/com/plotsquared/bukkit/util/task/SpigotTimeConverter.java

@@ -26,8 +26,7 @@
 package com.plotsquared.bukkit.util.task;
 
 import com.plotsquared.core.util.task.TaskTime;
-
-import javax.annotation.Nonnegative;
+import org.checkerframework.checker.index.qual.NonNegative;
 
 /**
  * Naive time converter that assumes that all ticks are 50 milliseconds
@@ -36,11 +35,13 @@ public final class SpigotTimeConverter implements TaskTime.TimeConverter {
 
     private static final long MS_PER_TICKS = 50L;
 
-    @Override public long msToTicks(@Nonnegative final long ms) {
+    @Override
+    public long msToTicks(@NonNegative final long ms) {
         return Math.max(1L, ms / MS_PER_TICKS);
     }
 
-    @Override public long ticksToMs(@Nonnegative final long ticks) {
+    @Override
+    public long ticksToMs(@NonNegative final long ticks) {
         return Math.max(1L, ticks * MS_PER_TICKS);
     }