Initial annotation usage cleanup + EditorConfig

Bukkit/src/main/java/com/plotsquared/bukkit/generator/BlockStatePopulator.java

@@ -36,8 +36,8 @@ import com.sk89q.worldedit.bukkit.BukkitWorld;
 import org.bukkit.Chunk;
 import org.bukkit.World;
 import org.bukkit.generator.BlockPopulator;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
-import javax.annotation.Nonnull;
 import java.util.Random;
 
 final class BlockStatePopulator extends BlockPopulator {
@@ -47,12 +47,16 @@ final class BlockStatePopulator extends BlockPopulator {
 
     private QueueCoordinator queue;
 
-    public BlockStatePopulator(@Nonnull final IndependentPlotGenerator plotGenerator, @Nonnull final PlotAreaManager plotAreaManager) {
+    public BlockStatePopulator(
+            final @NonNull IndependentPlotGenerator plotGenerator,
+            final @NonNull PlotAreaManager plotAreaManager
+    ) {
         this.plotGenerator = plotGenerator;
         this.plotAreaManager = plotAreaManager;
     }
 
-    @Override public void populate(@Nonnull final World world, @Nonnull final Random random, @Nonnull final Chunk source) {
+    @Override
+    public void populate(final @NonNull World world, final @NonNull Random random, final @NonNull Chunk source) {
         if (this.queue == null) {
             this.queue = PlotSquared.platform().globalBlockQueue().getNewQueue(new BukkitWorld(world));
         }

Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitAugmentedGenerator.java

@@ -29,8 +29,8 @@ import com.plotsquared.core.generator.AugmentedUtils;
 import org.bukkit.Chunk;
 import org.bukkit.World;
 import org.bukkit.generator.BlockPopulator;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
-import javax.annotation.Nonnull;
 import java.util.Random;
 
 public class BukkitAugmentedGenerator extends BlockPopulator {
@@ -51,7 +51,8 @@ public class BukkitAugmentedGenerator extends BlockPopulator {
     }
 
     @Override
-    public void populate(@Nonnull World world, @Nonnull Random random, @Nonnull Chunk source) {
+    public void populate(@NonNull World world, @NonNull Random random, @NonNull Chunk source) {
         AugmentedUtils.generate(source, world.getName(), source.getX(), source.getZ(), null);
     }
+
 }

Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java

@@ -41,30 +41,32 @@ import org.bukkit.World;
 import org.bukkit.block.Biome;
 import org.bukkit.generator.BlockPopulator;
 import org.bukkit.generator.ChunkGenerator;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
-import javax.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 import java.util.Set;
 
 public class BukkitPlotGenerator extends ChunkGenerator
-    implements GeneratorWrapper<ChunkGenerator> {
+        implements GeneratorWrapper<ChunkGenerator> {
 
-    @SuppressWarnings("unused") public final boolean PAPER_ASYNC_SAFE = true;
+    @SuppressWarnings("unused")
+    public final boolean PAPER_ASYNC_SAFE = true;
 
     private final PlotAreaManager plotAreaManager;
     private final IndependentPlotGenerator plotGenerator;
     private final ChunkGenerator platformGenerator;
     private final boolean full;
+    private final String levelName;
     private List<BlockPopulator> populators;
     private boolean loaded = false;
 
-    private final String levelName;
-
-    public BukkitPlotGenerator(@Nonnull final String name,
-                               @Nonnull final IndependentPlotGenerator generator,
-                               @Nonnull final PlotAreaManager plotAreaManager) {
+    public BukkitPlotGenerator(
+            final @NonNull String name,
+            final @NonNull IndependentPlotGenerator generator,
+            final @NonNull PlotAreaManager plotAreaManager
+    ) {
         this.plotAreaManager = plotAreaManager;
         this.levelName = name;
         this.plotGenerator = generator;
@@ -74,10 +76,10 @@ public class BukkitPlotGenerator extends ChunkGenerator
         this.full = true;
     }
 
-    public BukkitPlotGenerator(final String world, final ChunkGenerator cg, @Nonnull final PlotAreaManager plotAreaManager) {
+    public BukkitPlotGenerator(final String world, final ChunkGenerator cg, final @NonNull PlotAreaManager plotAreaManager) {
         if (cg instanceof BukkitPlotGenerator) {
             throw new IllegalArgumentException("ChunkGenerator: " + cg.getClass().getName()
-                + " is already a BukkitPlotGenerator!");
+                    + " is already a BukkitPlotGenerator!");
         }
         this.plotAreaManager = plotAreaManager;
         this.levelName = world;
@@ -86,23 +88,28 @@ public class BukkitPlotGenerator extends ChunkGenerator
         this.plotGenerator = new DelegatePlotGenerator(cg, world);
     }
 
-    @Override public void augment(PlotArea area) {
+    @Override
+    public void augment(PlotArea area) {
         BukkitAugmentedGenerator.get(BukkitUtil.getWorld(area.getWorldName()));
     }
 
-    @Override public boolean isFull() {
+    @Override
+    public boolean isFull() {
         return this.full;
     }
 
-    @Override public IndependentPlotGenerator getPlotGenerator() {
+    @Override
+    public IndependentPlotGenerator getPlotGenerator() {
         return this.plotGenerator;
     }
 
-    @Override public ChunkGenerator getPlatformGenerator() {
+    @Override
+    public ChunkGenerator getPlatformGenerator() {
         return this.platformGenerator;
     }
 
-    @Override @Nonnull public List<BlockPopulator> getDefaultPopulators(@Nonnull World world) {
+    @Override
+    public @NonNull List<BlockPopulator> getDefaultPopulators(@NonNull World world) {
         try {
             if (!this.loaded) {
                 String name = world.getName();
@@ -146,9 +153,11 @@ public class BukkitPlotGenerator extends ChunkGenerator
         return toAdd;
     }
 
-    @Override @Nonnull
-    public ChunkData generateChunkData(@Nonnull World world, @Nonnull Random random, int x, int z,
-        @Nonnull BiomeGrid biome) {
+    @Override
+    public @NonNull ChunkData generateChunkData(
+            @NonNull World world, @NonNull Random random, int x, int z,
+            @NonNull BiomeGrid biome
+    ) {
 
         GenChunk result = new GenChunk();
         if (this.getPlotGenerator() instanceof SingleWorldGenerator) {
@@ -200,8 +209,8 @@ public class BukkitPlotGenerator extends ChunkGenerator
         PlotArea area = this.plotAreaManager.getPlotArea(world.getName(), null);
         if (area == null && (area = this.plotAreaManager.getPlotArea(this.levelName, null)) == null) {
             throw new IllegalStateException(
-                "Cannot regenerate chunk that does not belong to a plot area." + " Location: " + loc
-                    + ", world: " + world);
+                    "Cannot regenerate chunk that does not belong to a plot area." + " Location: " + loc
+                            + ", world: " + world);
         }
         try {
             this.plotGenerator.generateChunk(result, area);
@@ -212,7 +221,8 @@ public class BukkitPlotGenerator extends ChunkGenerator
         ChunkManager.postProcessChunk(loc, result);
     }
 
-    @Override public boolean canSpawn(@Nonnull final World world, final int x, final int z) {
+    @Override
+    public boolean canSpawn(final @NonNull World world, final int x, final int z) {
         return true;
     }
 
@@ -236,7 +246,8 @@ public class BukkitPlotGenerator extends ChunkGenerator
         return true;
     }
 
-    @Override public String toString() {
+    @Override
+    public String toString() {
         if (this.platformGenerator == this) {
             return this.plotGenerator.getName();
         }
@@ -247,7 +258,8 @@ public class BukkitPlotGenerator extends ChunkGenerator
         }
     }
 
-    @Override public boolean equals(final Object obj) {
+    @Override
+    public boolean equals(final Object obj) {
         if (obj == null) {
             return false;
         }
@@ -257,4 +269,5 @@ public class BukkitPlotGenerator extends ChunkGenerator
     public String getLevelName() {
         return this.levelName;
     }
+
 }

Bukkit/src/main/java/com/plotsquared/bukkit/generator/DelegatePlotGenerator.java

@@ -38,8 +38,8 @@ import org.bukkit.World;
 import org.bukkit.block.Biome;
 import org.bukkit.generator.BlockPopulator;
 import org.bukkit.generator.ChunkGenerator;
+import org.checkerframework.checker.nullness.qual.NonNull;
 
-import javax.annotation.Nonnull;
 import java.util.Random;
 
 final class DelegatePlotGenerator extends IndependentPlotGenerator {
@@ -52,18 +52,22 @@ final class DelegatePlotGenerator extends IndependentPlotGenerator {
         this.world = world;
     }
 
-    @Override public void initialize(PlotArea area) {
+    @Override
+    public void initialize(PlotArea area) {
     }
 
-    @Override public String getName() {
+    @Override
+    public String getName() {
         return this.chunkGenerator.getClass().getName();
     }
 
-    @Override public PlotArea getNewPlotArea(String world, String id, PlotId min, PlotId max) {
+    @Override
+    public PlotArea getNewPlotArea(String world, String id, PlotId min, PlotId max) {
         return PlotSquared.platform().defaultGenerator().getNewPlotArea(world, id, min, max);
     }
 
-    @Override public void generateChunk(final ScopedQueueCoordinator result, PlotArea settings) {
+    @Override
+    public void generateChunk(final ScopedQueueCoordinator result, PlotArea settings) {
         World world = BukkitUtil.getWorld(this.world);
         Location min = result.getMin();
         int chunkX = min.getX() >> 4;
@@ -71,21 +75,24 @@ final class DelegatePlotGenerator extends IndependentPlotGenerator {
         Random random = new Random(MathMan.pair((short) chunkX, (short) chunkZ));
         try {
             ChunkGenerator.BiomeGrid grid = new ChunkGenerator.BiomeGrid() {
-                @Override public void setBiome(int x, int z, @Nonnull Biome biome) {
+                @Override
+                public void setBiome(int x, int z, @NonNull Biome biome) {
                     result.setBiome(x, z, BukkitAdapter.adapt(biome));
                 }
 
                 //do not annotate with Override until we discontinue support for 1.4.4
-                public void setBiome(int x, int y, int z, @Nonnull Biome biome) {
+                public void setBiome(int x, int y, int z, @NonNull Biome biome) {
                     result.setBiome(x, z, BukkitAdapter.adapt(biome));
 
                 }
 
-                @Override @Nonnull public Biome getBiome(int x, int z) {
+                @Override
+                public @NonNull Biome getBiome(int x, int z) {
                     return Biome.FOREST;
                 }
 
-                @Override public @Nonnull Biome getBiome(int x, int y, int z) {
+                @Override
+                public @NonNull Biome getBiome(int x, int y, int z) {
                     return Biome.FOREST;
                 }
             };