From 0091580ae06356a49a27cfd1ae90bfc73774ee4d Mon Sep 17 00:00:00 2001 From: dordsor21 Date: Thu, 30 Apr 2020 11:01:52 +0100 Subject: [PATCH] Reformat it all. --- .../bukkit/BukkitChunkManager.java | 64 ++++++----- .../com/plotsquared/bukkit/BukkitCommand.java | 3 +- .../com/plotsquared/bukkit/BukkitMain.java | 65 ++++++----- .../plotsquared/bukkit/command/DebugUUID.java | 23 ++-- .../bukkit/entity/EntityWrapper.java | 3 +- .../entity/ReplicatingEntityWrapper.java | 2 +- .../bukkit/generator/BlockStatePopulator.java | 9 +- .../bukkit/generator/BukkitPlotGenerator.java | 21 ++-- .../generator/DelegatePlotGenerator.java | 11 +- .../bukkit/listener/ChunkListener.java | 11 +- .../bukkit/listener/EntitySpawnListener.java | 2 +- .../bukkit/listener/ForceFieldListener.java | 9 +- .../bukkit/listener/PlayerEvents.java | 102 +++++++++--------- .../bukkit/listener/SingleWorldListener.java | 3 +- .../bukkit/listener/WorldEvents.java | 36 +++---- .../placeholder/PlaceholderFormatter.java | 2 +- .../bukkit/placeholder/Placeholders.java | 18 ++-- .../bukkit/player/BukkitPlayer.java | 23 ++-- .../bukkit/queue/BukkitLocalQueue.java | 19 ++-- .../plotsquared/bukkit/queue/GenChunk.java | 10 +- .../schematic/BukkitSchematicHandler.java | 36 +++++-- .../bukkit/util/BukkitChatManager.java | 2 +- .../bukkit/util/BukkitInventoryUtil.java | 2 +- .../bukkit/util/BukkitSetupUtils.java | 6 +- .../plotsquared/bukkit/util/BukkitUtil.java | 64 ++++++----- .../bukkit/util/OfflinePlayerUtil.java | 3 +- .../plotsquared/bukkit/util/SendChunk.java | 2 +- .../bukkit/util/UpdateUtility.java | 5 +- .../util/uuid/LowerOfflineUUIDWrapper.java | 8 +- .../bukkit/util/uuid/OfflineUUIDWrapper.java | 7 +- .../bukkit/util/uuid/SQLUUIDHandler.java | 6 +- .../com/plotsquared/core/api/PlotAPI.java | 8 +- .../core/events/PlayerAutoPlotEvent.java | 2 +- .../core/events/PlayerClaimPlotEvent.java | 2 +- .../core/events/PlayerEnterPlotEvent.java | 2 +- .../core/events/PlayerLeavePlotEvent.java | 2 +- .../core/events/PlayerPlotDeniedEvent.java | 2 +- .../core/events/PlayerPlotHelperEvent.java | 2 +- .../core/events/PlayerPlotTrustedEvent.java | 2 +- .../events/PlayerTeleportToPlotEvent.java | 6 +- .../core/events/PlotAutoMergeEvent.java | 7 +- .../core/events/PlotChangeOwnerEvent.java | 2 +- .../core/events/PlotClearEvent.java | 6 +- .../core/events/PlotDeleteEvent.java | 6 +- .../core/events/PlotFlagAddEvent.java | 8 +- .../core/events/PlotFlagEvent.java | 4 +- .../core/events/PlotFlagRemoveEvent.java | 8 +- .../core/events/PlotMergeEvent.java | 2 +- .../core/events/PlotPlayerEvent.java | 2 +- .../core/events/PlotRateEvent.java | 2 +- .../plotsquared/core/plot/BlockBucket.java | 23 ++-- .../java/com/plotsquared/core/plot/Plot.java | 59 +++++----- .../com/plotsquared/core/plot/PlotArea.java | 32 +++--- .../core/plot/PlotAreaTerrainType.java | 5 +- .../plotsquared/core/plot/PlotAreaType.java | 9 +- .../plotsquared/core/plot/PlotCluster.java | 15 +-- .../com/plotsquared/core/plot/PlotId.java | 6 +- .../plotsquared/core/plot/PlotManager.java | 2 +- .../plotsquared/core/plot/PlotSettings.java | 2 +- .../core/plot/comment/CommentInbox.java | 4 +- .../core/plot/comment/CommentManager.java | 4 +- .../core/plot/expiration/ExpireManager.java | 22 ++-- .../core/plot/expiration/ExpiryTask.java | 4 +- .../core/plot/expiration/PlotAnalysis.java | 4 +- .../implementations/DenyTeleportFlag.java | 4 +- .../plot/flag/implementations/DoneFlag.java | 2 +- .../plot/flag/implementations/FlyFlag.java | 4 +- .../plot/flag/implementations/MusicFlag.java | 4 +- .../plot/flag/implementations/TitlesFlag.java | 4 +- .../flag/implementations/WeatherFlag.java | 14 ++- .../plot/flag/types/BlockTypeListFlag.java | 17 +-- .../plot/flag/types/BlockTypeWrapper.java | 5 +- .../core/plot/message/PlotMessage.java | 2 +- .../plot/world/DefaultPlotAreaManager.java | 2 +- .../core/plot/world/PlotAreaManager.java | 2 +- .../core/plot/world/SinglePlot.java | 2 +- .../core/plot/world/SinglePlotArea.java | 19 ++-- .../plot/world/SinglePlotAreaManager.java | 2 +- .../core/queue/LocalBlockQueue.java | 7 +- ...LocationOffsetDelegateLocalBlockQueue.java | 11 +- .../plotsquared/core/util/ChatManager.java | 2 +- .../plotsquared/core/util/ChunkManager.java | 2 +- .../com/plotsquared/core/util/EntityUtil.java | 5 +- .../core/util/EventDispatcher.java | 30 +++--- .../plotsquared/core/util/InventoryUtil.java | 2 +- .../core/util/LegacyConverter.java | 14 +-- .../com/plotsquared/core/util/MainUtil.java | 68 ++++++------ .../plotsquared/core/util/OperationUtil.java | 4 +- .../plotsquared/core/util/PatternUtil.java | 8 +- .../util/RuntimeExceptionRunnableVal.java | 3 +- .../core/util/SchematicHandler.java | 7 +- .../com/plotsquared/core/util/WEManager.java | 6 +- .../com/plotsquared/core/util/WorldUtil.java | 17 ++- .../core/util/entity/EntityCategories.java | 29 ++--- .../core/util/entity/EntityCategory.java | 3 +- .../core/util/net/IncendoPaster.java | 5 +- .../core/util/task/AutoClaimFinishTask.java | 8 +- .../core/util/task/ObjectTaskRunnable.java | 3 +- .../core/util/task/TaskManager.java | 4 +- .../core/util/uuid/UUIDHandler.java | 4 +- .../util/uuid/UUIDHandlerImplementation.java | 10 +- 101 files changed, 635 insertions(+), 543 deletions(-) diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitChunkManager.java b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitChunkManager.java index 3104c47d3..9906a7e9a 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitChunkManager.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitChunkManager.java @@ -82,7 +82,8 @@ import static com.plotsquared.core.util.entity.EntityCategories.CAP_VEHICLE; public class BukkitChunkManager extends ChunkManager { public static boolean isIn(CuboidRegion region, int x, int z) { - return x >= region.getMinimumPoint().getX() && x <= region.getMaximumPoint().getX() && z >= region.getMinimumPoint().getZ() && z <= region.getMaximumPoint().getZ(); + return x >= region.getMinimumPoint().getX() && x <= region.getMaximumPoint().getX() + && z >= region.getMinimumPoint().getZ() && z <= region.getMaximumPoint().getZ(); } public static ContentMap swapChunk(World world1, World world2, Chunk pos1, Chunk pos2, @@ -106,8 +107,10 @@ public class BukkitChunkManager extends ChunkManager { LocalBlockQueue queue1 = GlobalBlockQueue.IMP.getNewQueue(worldName1, false); LocalBlockQueue queue2 = GlobalBlockQueue.IMP.getNewQueue(worldName2, false); - for (int x = Math.max(r1.getMinimumPoint().getX(), sx); x <= Math.min(r1.getMaximumPoint().getX(), sx + 15); x++) { - for (int z = Math.max(r1.getMinimumPoint().getZ(), sz); z <= Math.min(r1.getMaximumPoint().getZ(), sz + 15); z++) { + for (int x = Math.max(r1.getMinimumPoint().getX(), sx); + x <= Math.min(r1.getMaximumPoint().getX(), sx + 15); x++) { + for (int z = Math.max(r1.getMinimumPoint().getZ(), sz); + z <= Math.min(r1.getMaximumPoint().getZ(), sz + 15); z++) { for (int y = 0; y < 256; y++) { Block block1 = world1.getBlockAt(x, y, z); BaseBlock baseBlock1 = bukkitWorld1.getFullBlock(BlockVector3.at(x, y, z)); @@ -159,7 +162,8 @@ public class BukkitChunkManager extends ChunkManager { + " Will halt the calling thread until completed."); semaphore.acquire(); Bukkit.getScheduler().runTask(BukkitMain.getPlugin(BukkitMain.class), () -> { - for (Chunk chunk : Objects.requireNonNull(Bukkit.getWorld(world)).getLoadedChunks()) { + for (Chunk chunk : Objects.requireNonNull(Bukkit.getWorld(world)) + .getLoadedChunks()) { BlockVector2 loc = BlockVector2.at(chunk.getX() >> 5, chunk.getZ() >> 5); chunks.add(loc); } @@ -214,7 +218,7 @@ public class BukkitChunkManager extends ChunkManager { if (doWhole) { for (Entity entity : entities) { org.bukkit.Location location = entity.getLocation(); - PaperLib.getChunkAtAsync(location).thenAccept( chunk -> { + PaperLib.getChunkAtAsync(location).thenAccept(chunk -> { if (chunks.contains(chunk)) { int X = chunk.getX(); int Z = chunk.getZ(); @@ -249,7 +253,8 @@ public class BukkitChunkManager extends ChunkManager { return count; } - @Override public boolean copyRegion(Location pos1, Location pos2, Location newPos, + @Override + public boolean copyRegion(Location pos1, Location pos2, Location newPos, final Runnable whenDone) { final int relX = newPos.getX() - pos1.getX(); final int relZ = newPos.getZ() - pos1.getZ(); @@ -303,7 +308,8 @@ public class BukkitChunkManager extends ChunkManager { return true; } - @Override public boolean regenerateRegion(final Location pos1, final Location pos2, + @Override + public boolean regenerateRegion(final Location pos1, final Location pos2, final boolean ignoreAugment, final Runnable whenDone) { final String world = pos1.getWorld(); @@ -341,7 +347,8 @@ public class BukkitChunkManager extends ChunkManager { if (chunkObj == null) { return; } - final LocalBlockQueue queue = GlobalBlockQueue.IMP.getNewQueue(world, false); + final LocalBlockQueue queue = + GlobalBlockQueue.IMP.getNewQueue(world, false); if (xxb >= p1x && xxt <= p2x && zzb >= p1z && zzt <= p2z) { AugmentedUtils.bypass(ignoreAugment, () -> queue.regenChunkSafe(chunk.getX(), chunk.getZ())); @@ -406,11 +413,11 @@ public class BukkitChunkManager extends ChunkManager { if (checkX2 && checkZ2) { map.saveRegion(bukkitWorldObj, xxt2, xxt, zzt2, zzt); // } - CuboidRegion currentPlotClear = - RegionUtil.createRegion(pos1.getX(), pos2.getX(), pos1.getZ(), pos2.getZ()); + CuboidRegion currentPlotClear = RegionUtil + .createRegion(pos1.getX(), pos2.getX(), pos1.getZ(), pos2.getZ()); map.saveEntitiesOut(chunkObj, currentPlotClear); - AugmentedUtils.bypass(ignoreAugment, - () -> setChunkInPlotArea(null, new RunnableVal() { + AugmentedUtils.bypass(ignoreAugment, () -> setChunkInPlotArea(null, + new RunnableVal() { @Override public void run(ScopedLocalBlockQueue value) { Location min = value.getMin(); int bx = min.getX(); @@ -420,12 +427,14 @@ public class BukkitChunkManager extends ChunkManager { PlotLoc plotLoc = new PlotLoc(bx + x1, bz + z1); BaseBlock[] ids = map.allBlocks.get(plotLoc); if (ids != null) { - for (int y = 0; y < Math.min(128, ids.length); y++) { + for (int y = 0; + y < Math.min(128, ids.length); y++) { BaseBlock id = ids[y]; if (id != null) { value.setBlock(x1, y, z1, id); } else { - value.setBlock(x1, y, z1, BlockTypes.AIR.getDefaultState()); + value.setBlock(x1, y, z1, + BlockTypes.AIR.getDefaultState()); } } for (int y = Math.min(128, ids.length); @@ -454,15 +463,17 @@ public class BukkitChunkManager extends ChunkManager { return true; } - @Override public CompletableFuture loadChunk(String world, BlockVector2 chunkLoc, boolean force) { - return PaperLib.getChunkAtAsync(BukkitUtil.getWorld(world),chunkLoc.getX(), chunkLoc.getZ(), force); + @Override + public CompletableFuture loadChunk(String world, BlockVector2 chunkLoc, boolean force) { + return PaperLib + .getChunkAtAsync(BukkitUtil.getWorld(world), chunkLoc.getX(), chunkLoc.getZ(), force); } @Override public void unloadChunk(final String world, final BlockVector2 chunkLoc, final boolean save) { if (!PlotSquared.get().isMainThread(Thread.currentThread())) { - TaskManager.runTask( - () -> BukkitUtil.getWorld(world).unloadChunk(chunkLoc.getX(), chunkLoc.getZ(), save)); + TaskManager.runTask(() -> BukkitUtil.getWorld(world) + .unloadChunk(chunkLoc.getX(), chunkLoc.getZ(), save)); } else { BukkitUtil.getWorld(world).unloadChunk(chunkLoc.getX(), chunkLoc.getZ(), save); } @@ -489,7 +500,8 @@ public class BukkitChunkManager extends ChunkManager { } } - @Override public void swap(Location bot1, Location top1, Location bot2, Location top2, + @Override + public void swap(Location bot1, Location top1, Location bot2, Location top2, final Runnable whenDone) { CuboidRegion region1 = RegionUtil.createRegion(bot1.getX(), top1.getX(), bot1.getZ(), top1.getZ()); @@ -497,8 +509,8 @@ public class BukkitChunkManager extends ChunkManager { RegionUtil.createRegion(bot2.getX(), top2.getX(), bot2.getZ(), top2.getZ()); final World world1 = Bukkit.getWorld(bot1.getWorld()); final World world2 = Bukkit.getWorld(bot2.getWorld()); - checkNotNull(world1,"Critical error during swap."); - checkNotNull(world2,"Critical error during swap."); + checkNotNull(world1, "Critical error during swap."); + checkNotNull(world2, "Critical error during swap."); int relX = bot2.getX() - bot1.getX(); int relZ = bot2.getZ() - bot1.getZ(); @@ -525,13 +537,11 @@ public class BukkitChunkManager extends ChunkManager { if (EntityCategories.PLAYER.contains(entityType)) { return; - } else if (EntityCategories.PROJECTILE.contains(entityType) || - EntityCategories.OTHER.contains(entityType) || - EntityCategories.HANGING.contains(entityType)) { + } else if (EntityCategories.PROJECTILE.contains(entityType) || EntityCategories.OTHER + .contains(entityType) || EntityCategories.HANGING.contains(entityType)) { count[CAP_MISC]++; - } else if (EntityCategories.ANIMAL.contains(entityType) || - EntityCategories.VILLAGER.contains(entityType) || - EntityCategories.TAMEABLE.contains(entityType)) { + } else if (EntityCategories.ANIMAL.contains(entityType) || EntityCategories.VILLAGER + .contains(entityType) || EntityCategories.TAMEABLE.contains(entityType)) { count[CAP_MOB]++; count[CAP_ANIMAL]++; } else if (EntityCategories.VEHICLE.contains(entityType)) { diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitCommand.java b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitCommand.java index 6f907a620..2d3737ee0 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitCommand.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitCommand.java @@ -74,7 +74,8 @@ public class BukkitCommand implements CommandExecutor, TabCompleter { if (args.length == 0) { return Collections.singletonList("plots"); } - Collection objects = MainCommand.getInstance().tab(player, args, s.endsWith(" ")); + Collection objects = + MainCommand.getInstance().tab(player, args, s.endsWith(" ")); if (objects == null) { return null; } diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java index 0778ba8c2..9acc29415 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java @@ -25,6 +25,7 @@ */ package com.plotsquared.bukkit; +import com.plotsquared.bukkit.generator.BukkitHybridUtils; import com.plotsquared.bukkit.generator.BukkitPlotGenerator; import com.plotsquared.bukkit.listener.ChunkListener; import com.plotsquared.bukkit.listener.EntitySpawnListener; @@ -33,42 +34,46 @@ import com.plotsquared.bukkit.listener.SingleWorldListener; import com.plotsquared.bukkit.listener.WorldEvents; import com.plotsquared.bukkit.placeholder.PlaceholderFormatter; import com.plotsquared.bukkit.placeholder.Placeholders; +import com.plotsquared.bukkit.queue.BukkitLocalQueue; +import com.plotsquared.bukkit.schematic.BukkitSchematicHandler; import com.plotsquared.bukkit.util.BukkitChatManager; import com.plotsquared.bukkit.util.BukkitEconHandler; -import com.plotsquared.bukkit.generator.BukkitHybridUtils; import com.plotsquared.bukkit.util.BukkitInventoryUtil; -import com.plotsquared.bukkit.schematic.BukkitSchematicHandler; import com.plotsquared.bukkit.util.BukkitSetupUtils; import com.plotsquared.bukkit.util.BukkitTaskManager; import com.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.bukkit.util.SetGenCB; import com.plotsquared.bukkit.util.UpdateUtility; -import com.plotsquared.bukkit.queue.BukkitLocalQueue; import com.plotsquared.bukkit.util.uuid.DefaultUUIDWrapper; import com.plotsquared.bukkit.util.uuid.FileUUIDHandler; import com.plotsquared.bukkit.util.uuid.LowerOfflineUUIDWrapper; import com.plotsquared.bukkit.util.uuid.OfflineUUIDWrapper; import com.plotsquared.bukkit.util.uuid.SQLUUIDHandler; -import com.plotsquared.core.configuration.*; import com.plotsquared.core.IPlotMain; import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.ChatFormatter; +import com.plotsquared.core.configuration.ConfigurationNode; +import com.plotsquared.core.configuration.ConfigurationSection; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.generator.GeneratorWrapper; import com.plotsquared.core.generator.HybridGen; import com.plotsquared.core.generator.HybridUtils; import com.plotsquared.core.generator.IndependentPlotGenerator; +import com.plotsquared.core.generator.SingleWorldGenerator; import com.plotsquared.core.listener.PlotListener; +import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.PlotArea; import com.plotsquared.core.plot.PlotAreaTerrainType; import com.plotsquared.core.plot.PlotAreaType; import com.plotsquared.core.plot.PlotId; -import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.plot.SetupObject; import com.plotsquared.core.plot.message.PlainChatManager; import com.plotsquared.core.plot.world.PlotAreaManager; import com.plotsquared.core.plot.world.SinglePlotArea; import com.plotsquared.core.plot.world.SinglePlotAreaManager; -import com.plotsquared.core.generator.SingleWorldGenerator; +import com.plotsquared.core.queue.QueueProvider; import com.plotsquared.core.util.ChatManager; import com.plotsquared.core.util.ChunkManager; import com.plotsquared.core.util.ConsoleColors; @@ -80,11 +85,10 @@ import com.plotsquared.core.util.ReflectionUtils; import com.plotsquared.core.util.SchematicHandler; import com.plotsquared.core.util.SetupUtils; import com.plotsquared.core.util.StringMan; +import com.plotsquared.core.util.WorldUtil; import com.plotsquared.core.util.task.TaskManager; import com.plotsquared.core.util.uuid.UUIDHandler; import com.plotsquared.core.util.uuid.UUIDHandlerImplementation; -import com.plotsquared.core.util.WorldUtil; -import com.plotsquared.core.queue.QueueProvider; import com.plotsquared.core.util.uuid.UUIDWrapper; import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.bukkit.WorldEditPlugin; @@ -123,7 +127,9 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import static com.plotsquared.core.util.PremiumVerification.*; +import static com.plotsquared.core.util.PremiumVerification.getDownloadID; +import static com.plotsquared.core.util.PremiumVerification.getResourceID; +import static com.plotsquared.core.util.PremiumVerification.getUserID; import static com.plotsquared.core.util.ReflectionUtils.getRefClass; public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain { @@ -191,8 +197,10 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain } if (PremiumVerification.isPremium()) { - PlotSquared.log(Captions.PREFIX + "&6PlotSquared version licensed to Spigot user " + getUserID()); - PlotSquared.log(Captions.PREFIX + "&6https://www.spigotmc.org/resources/" + getResourceID()); + PlotSquared.log( + Captions.PREFIX + "&6PlotSquared version licensed to Spigot user " + getUserID()); + PlotSquared + .log(Captions.PREFIX + "&6https://www.spigotmc.org/resources/" + getResourceID()); PlotSquared.log(Captions.PREFIX + "&6Download ID: " + getDownloadID()); PlotSquared.log(Captions.PREFIX + "&6Thanks for supporting us :)"); } else { @@ -206,7 +214,8 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain } PlotSquared.log(Captions.PREFIX + "&6PlotSquared hooked into PlaceholderAPI"); } else { - PlotSquared.debug(Captions.PREFIX + "&6PlaceholderAPI is not in use. Hook deactivated."); + PlotSquared + .debug(Captions.PREFIX + "&6PlaceholderAPI is not in use. Hook deactivated."); } this.startMetrics(); @@ -409,8 +418,8 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain case MINECART_TNT: case BOAT: if (Settings.Enabled_Components.KILL_ROAD_VEHICLES) { - com.plotsquared.core.location.Location - location = BukkitUtil.getLocation(entity.getLocation()); + com.plotsquared.core.location.Location location = + BukkitUtil.getLocation(entity.getLocation()); Plot plot = location.getPlot(); if (plot == null) { if (location.isPlotArea()) { @@ -466,8 +475,8 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain PlotId originalPlotId = (PlotId) meta.get(0).value(); if (originalPlotId != null) { - com.plotsquared.core.location.Location - pLoc = BukkitUtil.getLocation(entity.getLocation()); + com.plotsquared.core.location.Location pLoc = + BukkitUtil.getLocation(entity.getLocation()); PlotArea area = pLoc.getPlotArea(); if (area != null) { PlotId currentPlotId = PlotId.of(area.getPlotAbs(pLoc)); @@ -485,14 +494,15 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain } } else { //This is to apply the metadata to already spawned shulkers (see EntitySpawnListener.java) - com.plotsquared.core.location.Location - pLoc = BukkitUtil.getLocation(entity.getLocation()); + com.plotsquared.core.location.Location pLoc = + BukkitUtil.getLocation(entity.getLocation()); PlotArea area = pLoc.getPlotArea(); if (area != null) { PlotId currentPlotId = PlotId.of(area.getPlotAbs(pLoc)); if (currentPlotId != null) { - entity.setMetadata("shulkerPlot", new FixedMetadataValue( - (Plugin) PlotSquared.get().IMP, currentPlotId)); + entity.setMetadata("shulkerPlot", + new FixedMetadataValue( + (Plugin) PlotSquared.get().IMP, currentPlotId)); } } } @@ -668,7 +678,8 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain return new BukkitUtil(); } - @Override @Nullable public GeneratorWrapper getGenerator(@NonNull final String world, + @Override @Nullable + public GeneratorWrapper getGenerator(@NonNull final String world, @Nullable final String name) { if (name == null) { return null; @@ -709,7 +720,8 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain map.put(plotAreaType.name().toLowerCase(), terrainTypes); } for (final PlotArea plotArea : PlotSquared.get().getPlotAreas()) { - final Map terrainTypeMap = map.get(plotArea.getType().name().toLowerCase()); + final Map terrainTypeMap = + map.get(plotArea.getType().name().toLowerCase()); terrainTypeMap.put(plotArea.getTerrain().name().toLowerCase(), terrainTypeMap.get(plotArea.getTerrain().name().toLowerCase()) + 1); } @@ -847,7 +859,8 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain } } - @Override public GeneratorWrapper wrapPlotGenerator(@Nullable final String world, + @Override + public GeneratorWrapper wrapPlotGenerator(@Nullable final String world, @NonNull final IndependentPlotGenerator generator) { return new BukkitPlotGenerator(world, generator); } @@ -855,7 +868,8 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain @Override public List, Boolean>> getPluginIds() { List, Boolean>> names = new ArrayList<>(); for (final Plugin plugin : Bukkit.getPluginManager().getPlugins()) { - Map.Entry id = new AbstractMap.SimpleEntry<>(plugin.getName(), plugin.getDescription().getVersion()); + Map.Entry id = new AbstractMap.SimpleEntry<>(plugin.getName(), + plugin.getDescription().getVersion()); names.add(new AbstractMap.SimpleEntry<>(id, plugin.isEnabled())); } return names; @@ -863,7 +877,8 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain @Override public Actor getConsole() { @NotNull ConsoleCommandSender console = Bukkit.getServer().getConsoleSender(); - WorldEditPlugin wePlugin = ((WorldEditPlugin) Bukkit.getPluginManager().getPlugin("WorldEdit")); + WorldEditPlugin wePlugin = + ((WorldEditPlugin) Bukkit.getPluginManager().getPlugin("WorldEdit")); return wePlugin.wrapCommandSender(console); } } diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/command/DebugUUID.java b/Bukkit/src/main/java/com/plotsquared/bukkit/command/DebugUUID.java index 94b3e6604..79b411791 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/command/DebugUUID.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/command/DebugUUID.java @@ -25,29 +25,29 @@ */ package com.plotsquared.bukkit.command; +import com.google.common.collect.Sets; import com.plotsquared.bukkit.util.uuid.DatFileFilter; import com.plotsquared.bukkit.util.uuid.DefaultUUIDWrapper; import com.plotsquared.bukkit.util.uuid.LowerOfflineUUIDWrapper; import com.plotsquared.bukkit.util.uuid.OfflineUUIDWrapper; -import com.plotsquared.core.command.Argument; -import com.plotsquared.core.command.CommandDeclaration; import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.command.Argument; import com.plotsquared.core.command.CommandCategory; +import com.plotsquared.core.command.CommandDeclaration; import com.plotsquared.core.command.RequiredType; import com.plotsquared.core.command.SubCommand; import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.database.DBFunc; import com.plotsquared.core.player.OfflinePlotPlayer; -import com.plotsquared.core.plot.Plot; import com.plotsquared.core.player.PlotPlayer; -import com.plotsquared.core.util.StringWrapper; +import com.plotsquared.core.plot.Plot; import com.plotsquared.core.util.MainUtil; import com.plotsquared.core.util.StringMan; +import com.plotsquared.core.util.StringWrapper; +import com.plotsquared.core.util.WorldUtil; import com.plotsquared.core.util.task.TaskManager; import com.plotsquared.core.util.uuid.UUIDHandler; -import com.plotsquared.core.util.WorldUtil; import com.plotsquared.core.util.uuid.UUIDWrapper; -import com.google.common.collect.Sets; import java.io.File; import java.io.IOException; @@ -60,10 +60,13 @@ import java.util.List; import java.util.Map.Entry; import java.util.UUID; -@CommandDeclaration(command = "uuidconvert", permission = "plots.admin", - description = "Debug UUID conversion", usage = "/plot uuidconvert ", - requiredType = RequiredType.CONSOLE, category = CommandCategory.DEBUG) public class DebugUUID - extends SubCommand { +@CommandDeclaration(command = "uuidconvert", + permission = "plots.admin", + description = "Debug UUID conversion", + usage = "/plot uuidconvert ", + requiredType = RequiredType.CONSOLE, + category = CommandCategory.DEBUG) +public class DebugUUID extends SubCommand { public DebugUUID() { super(Argument.String); diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/entity/EntityWrapper.java b/Bukkit/src/main/java/com/plotsquared/bukkit/entity/EntityWrapper.java index b95986a81..6e777f23a 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/entity/EntityWrapper.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/entity/EntityWrapper.java @@ -32,7 +32,8 @@ import org.bukkit.World; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; -@Getter public abstract class EntityWrapper { +@Getter +public abstract class EntityWrapper { protected final float yaw; protected final float pitch; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/entity/ReplicatingEntityWrapper.java b/Bukkit/src/main/java/com/plotsquared/bukkit/entity/ReplicatingEntityWrapper.java index a873ebb8e..f0ef20fba 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/entity/ReplicatingEntityWrapper.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/entity/ReplicatingEntityWrapper.java @@ -329,7 +329,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper { } storeLiving((LivingEntity) entity); return; - // END LIVING // + // END LIVING // default: PlotSquared.debug("&cCOULD NOT IDENTIFY ENTITY: " + entity.getType()); } diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BlockStatePopulator.java b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BlockStatePopulator.java index e41fb8b6e..a89588598 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BlockStatePopulator.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BlockStatePopulator.java @@ -32,12 +32,13 @@ import com.plotsquared.core.plot.PlotArea; import com.plotsquared.core.queue.GlobalBlockQueue; import com.plotsquared.core.queue.LocalBlockQueue; import com.plotsquared.core.queue.ScopedLocalBlockQueue; -import java.util.Random; import org.bukkit.Chunk; import org.bukkit.World; import org.bukkit.generator.BlockPopulator; import org.jetbrains.annotations.NotNull; +import java.util.Random; + final class BlockStatePopulator extends BlockPopulator { private final IndependentPlotGenerator plotGenerator; @@ -47,13 +48,15 @@ final class BlockStatePopulator extends BlockPopulator { this.plotGenerator = plotGenerator; } - @Override public void populate(@NotNull final World world, @NotNull final Random random, + @Override + public void populate(@NotNull final World world, @NotNull final Random random, @NotNull final Chunk source) { if (this.queue == null) { this.queue = GlobalBlockQueue.IMP.getNewQueue(world.getName(), false); } final PlotArea area = PlotSquared.get().getPlotArea(world.getName(), null); - final ChunkWrapper wrap = new ChunkWrapper(area.getWorldName(), source.getX(), source.getZ()); + final ChunkWrapper wrap = + new ChunkWrapper(area.getWorldName(), source.getX(), source.getZ()); final ScopedLocalBlockQueue chunk = this.queue.getForChunk(wrap.x, wrap.z); if (this.plotGenerator.populateChunk(chunk, area)) { this.queue.flush(); diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java index 9caaa37ca..6f886904f 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java @@ -25,17 +25,17 @@ */ package com.plotsquared.bukkit.generator; -import com.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.bukkit.queue.GenChunk; +import com.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.core.PlotSquared; import com.plotsquared.core.generator.GeneratorWrapper; import com.plotsquared.core.generator.IndependentPlotGenerator; +import com.plotsquared.core.generator.SingleWorldGenerator; import com.plotsquared.core.location.ChunkWrapper; import com.plotsquared.core.plot.PlotArea; -import com.plotsquared.core.generator.SingleWorldGenerator; +import com.plotsquared.core.queue.ScopedLocalBlockQueue; import com.plotsquared.core.util.ChunkManager; import com.plotsquared.core.util.MainUtil; -import com.plotsquared.core.queue.ScopedLocalBlockQueue; import com.sk89q.worldedit.math.BlockVector2; import lombok.Getter; import org.bukkit.World; @@ -103,9 +103,7 @@ public class BukkitPlotGenerator extends ChunkGenerator return this.platformGenerator; } - @Override - @NotNull - public List getDefaultPopulators(@NotNull World world) { + @Override @NotNull public List getDefaultPopulators(@NotNull World world) { try { if (!this.loaded) { String name = world.getName(); @@ -149,8 +147,7 @@ public class BukkitPlotGenerator extends ChunkGenerator return toAdd; } - @Override - @NotNull + @Override @NotNull public ChunkData generateChunkData(@NotNull World world, @NotNull Random random, int x, int z, @NotNull BiomeGrid biome) { @@ -203,8 +200,9 @@ public class BukkitPlotGenerator extends ChunkGenerator } PlotArea area = PlotSquared.get().getPlotArea(world.getName(), null); if (area == null && (area = PlotSquared.get().getPlotArea(this.levelName, null)) == null) { - throw new IllegalStateException("Cannot regenerate chunk that does not belong to a plot area." - + " Location: " + loc + ", world: " + world); + throw new IllegalStateException( + "Cannot regenerate chunk that does not belong to a plot area." + " Location: " + loc + + ", world: " + world); } try { this.plotGenerator.generateChunk(result, area); @@ -215,8 +213,7 @@ public class BukkitPlotGenerator extends ChunkGenerator ChunkManager.postProcessChunk(loc, result); } - @Override - public boolean canSpawn(@NotNull final World world, final int x, final int z) { + @Override public boolean canSpawn(@NotNull final World world, final int x, final int z) { return true; } diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/generator/DelegatePlotGenerator.java b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/DelegatePlotGenerator.java index 633fc289f..d5086b06d 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/generator/DelegatePlotGenerator.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/DelegatePlotGenerator.java @@ -31,10 +31,9 @@ import com.plotsquared.core.generator.IndependentPlotGenerator; import com.plotsquared.core.location.Location; import com.plotsquared.core.plot.PlotArea; import com.plotsquared.core.plot.PlotId; -import com.plotsquared.core.util.MathMan; import com.plotsquared.core.queue.ScopedLocalBlockQueue; +import com.plotsquared.core.util.MathMan; import com.sk89q.worldedit.bukkit.BukkitAdapter; -import java.util.Random; import org.bukkit.World; import org.bukkit.block.Biome; import org.bukkit.generator.BlockPopulator; @@ -42,6 +41,8 @@ import org.bukkit.generator.ChunkGenerator; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Range; +import java.util.Random; + final class DelegatePlotGenerator extends IndependentPlotGenerator { private final ChunkGenerator chunkGenerator; @@ -71,7 +72,8 @@ 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(@Range(from = 0, to = 15) int x, + @Override + public void setBiome(@Range(from = 0, to = 15) int x, @Range(from = 0, to = 15) int z, @NotNull Biome biome) { result.setBiome(x, z, BukkitAdapter.adapt(biome)); } @@ -86,8 +88,7 @@ final class DelegatePlotGenerator extends IndependentPlotGenerator { return Biome.FOREST; } - @Override - public @NotNull Biome getBiome(int x, int y, int z) { + @Override public @NotNull Biome getBiome(int x, int y, int z) { return Biome.FOREST; } }; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ChunkListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ChunkListener.java index ab8df40c4..2f84732a7 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ChunkListener.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ChunkListener.java @@ -57,7 +57,8 @@ import java.util.HashSet; import static com.plotsquared.core.util.ReflectionUtils.getRefClass; -@SuppressWarnings("unused") public class ChunkListener implements Listener { +@SuppressWarnings("unused") +public class ChunkListener implements Listener { private RefMethod methodGetHandleChunk; private RefField mustSave; @@ -291,11 +292,15 @@ import static com.plotsquared.core.util.ReflectionUtils.getRefClass; ent.remove(); } } - PlotSquared.debug("PlotSquared detected unsafe chunk and processed: " + (chunk.getX() << 4) + "," + (chunk.getX() << 4)); + PlotSquared.debug( + "PlotSquared detected unsafe chunk and processed: " + (chunk.getX() << 4) + "," + ( + chunk.getX() << 4)); } if (tiles.length > Settings.Chunk_Processor.MAX_TILES) { if (unload) { - PlotSquared.debug("PlotSquared detected unsafe chunk: " + (chunk.getX()<< 4) + "," + (chunk.getX() << 4)); + PlotSquared.debug( + "PlotSquared detected unsafe chunk: " + (chunk.getX() << 4) + "," + ( + chunk.getX() << 4)); cleanChunk(chunk); return true; } diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntitySpawnListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntitySpawnListener.java index 21a30f02a..e094baf9c 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntitySpawnListener.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntitySpawnListener.java @@ -28,10 +28,10 @@ package com.plotsquared.bukkit.listener; import com.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.core.PlotSquared; import com.plotsquared.core.configuration.Settings; -import com.plotsquared.core.plot.flag.implementations.DoneFlag; import com.plotsquared.core.location.Location; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.flag.implementations.DoneFlag; import io.papermc.lib.PaperLib; import org.bukkit.Chunk; import org.bukkit.World; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ForceFieldListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ForceFieldListener.java index 0f96ac45b..7cc0de41d 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ForceFieldListener.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ForceFieldListener.java @@ -25,15 +25,15 @@ */ package com.plotsquared.bukkit.listener; +import com.google.common.collect.Iterables; import com.plotsquared.bukkit.player.BukkitPlayer; import com.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.core.configuration.Captions; -import com.plotsquared.core.plot.flag.implementations.ForcefieldFlag; import com.plotsquared.core.location.Location; -import com.plotsquared.core.plot.Plot; import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.flag.implementations.ForcefieldFlag; import com.plotsquared.core.util.Permissions; -import com.google.common.collect.Iterables; import org.bukkit.entity.Player; import org.bukkit.util.Vector; @@ -41,7 +41,8 @@ import java.util.HashSet; import java.util.Set; import java.util.UUID; -@SuppressWarnings("unused") public class ForceFieldListener { +@SuppressWarnings("unused") +public class ForceFieldListener { private static Set getNearbyPlayers(Player player, Plot plot) { Set players = new HashSet<>(); diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java index 759a6b1f8..3539179ca 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEvents.java @@ -26,9 +26,6 @@ package com.plotsquared.bukkit.listener; import com.destroystokyo.paper.MaterialTags; -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; -import com.google.gson.stream.JsonReader; import com.plotsquared.bukkit.player.BukkitPlayer; import com.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.bukkit.util.UpdateUtility; @@ -36,6 +33,15 @@ import com.plotsquared.core.PlotSquared; import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.database.DBFunc; +import com.plotsquared.core.listener.PlayerBlockEventType; +import com.plotsquared.core.listener.PlotListener; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotHandler; +import com.plotsquared.core.plot.PlotId; +import com.plotsquared.core.plot.PlotInventory; import com.plotsquared.core.plot.flag.implementations.AnimalAttackFlag; import com.plotsquared.core.plot.flag.implementations.AnimalCapFlag; import com.plotsquared.core.plot.flag.implementations.AnimalInteractFlag; @@ -88,23 +94,14 @@ import com.plotsquared.core.plot.flag.implementations.VehicleUseFlag; import com.plotsquared.core.plot.flag.implementations.VillagerInteractFlag; import com.plotsquared.core.plot.flag.implementations.VineGrowFlag; import com.plotsquared.core.plot.flag.types.BlockTypeWrapper; -import com.plotsquared.core.listener.PlayerBlockEventType; -import com.plotsquared.core.listener.PlotListener; -import com.plotsquared.core.location.Location; -import com.plotsquared.core.plot.Plot; -import com.plotsquared.core.plot.PlotArea; -import com.plotsquared.core.plot.PlotHandler; -import com.plotsquared.core.plot.PlotId; -import com.plotsquared.core.plot.PlotInventory; import com.plotsquared.core.plot.message.PlotMessage; -import com.plotsquared.core.player.PlotPlayer; -import com.plotsquared.core.util.PremiumVerification; -import com.plotsquared.core.util.StringWrapper; import com.plotsquared.core.util.EntityUtil; import com.plotsquared.core.util.MainUtil; import com.plotsquared.core.util.MathMan; import com.plotsquared.core.util.Permissions; +import com.plotsquared.core.util.PremiumVerification; import com.plotsquared.core.util.RegExUtil; +import com.plotsquared.core.util.StringWrapper; import com.plotsquared.core.util.entity.EntityCategories; import com.plotsquared.core.util.task.TaskManager; import com.plotsquared.core.util.uuid.UUIDHandler; @@ -209,12 +206,7 @@ import org.bukkit.projectiles.BlockProjectileSource; import org.bukkit.projectiles.ProjectileSource; import org.bukkit.util.Vector; -import javax.net.ssl.HttpsURLConnection; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; import java.lang.reflect.Field; -import java.net.URL; import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; @@ -275,31 +267,32 @@ public class PlayerEvents extends PlotListener implements Listener { return false; } - final com.sk89q.worldedit.world.entity.EntityType entityType = BukkitAdapter.adapt(entity.getType()); + final com.sk89q.worldedit.world.entity.EntityType entityType = + BukkitAdapter.adapt(entity.getType()); if (EntityCategories.PLAYER.contains(entityType)) { return false; } - if (EntityCategories.PROJECTILE.contains(entityType) || - EntityCategories.OTHER.contains(entityType) || - EntityCategories.HANGING.contains(entityType)) { + if (EntityCategories.PROJECTILE.contains(entityType) || EntityCategories.OTHER + .contains(entityType) || EntityCategories.HANGING.contains(entityType)) { return EntityUtil.checkEntity(plot, EntityCapFlag.ENTITY_CAP_UNLIMITED, MiscCapFlag.MISC_CAP_UNLIMITED); } // Has to go go before vehicle as horses are both // animals and vehicles - if (EntityCategories.ANIMAL.contains(entityType) || - EntityCategories.VILLAGER.contains(entityType) || - EntityCategories.TAMEABLE.contains(entityType)) { - return EntityUtil.checkEntity(plot, EntityCapFlag.ENTITY_CAP_UNLIMITED, - MobCapFlag.MOB_CAP_UNLIMITED, AnimalCapFlag.ANIMAL_CAP_UNLIMITED); + if (EntityCategories.ANIMAL.contains(entityType) || EntityCategories.VILLAGER + .contains(entityType) || EntityCategories.TAMEABLE.contains(entityType)) { + return EntityUtil + .checkEntity(plot, EntityCapFlag.ENTITY_CAP_UNLIMITED, MobCapFlag.MOB_CAP_UNLIMITED, + AnimalCapFlag.ANIMAL_CAP_UNLIMITED); } if (EntityCategories.HOSTILE.contains(entityType)) { - return EntityUtil.checkEntity(plot, EntityCapFlag.ENTITY_CAP_UNLIMITED, - MobCapFlag.MOB_CAP_UNLIMITED, HostileCapFlag.HOSTILE_CAP_UNLIMITED); + return EntityUtil + .checkEntity(plot, EntityCapFlag.ENTITY_CAP_UNLIMITED, MobCapFlag.MOB_CAP_UNLIMITED, + HostileCapFlag.HOSTILE_CAP_UNLIMITED); } if (EntityCategories.VEHICLE.contains(entityType)) { @@ -763,10 +756,12 @@ public class PlayerEvents extends PlotListener implements Listener { } } if (Settings.Enabled_Components.KILL_ROAD_VEHICLES) { - final com.sk89q.worldedit.world.entity.EntityType entityType = BukkitAdapter.adapt(vehicle.getType()); + final com.sk89q.worldedit.world.entity.EntityType entityType = + BukkitAdapter.adapt(vehicle.getType()); // Horses etc are vehicles, but they're also animals // so this filters out all living entities - if (EntityCategories.VEHICLE.contains(entityType) && !EntityCategories.ANIMAL.contains(entityType)) { + if (EntityCategories.VEHICLE.contains(entityType) && !EntityCategories.ANIMAL + .contains(entityType)) { List meta = vehicle.getMetadata("plot"); Plot toPlot = BukkitUtil.getLocation(to).getPlot(); if (!meta.isEmpty()) { @@ -930,7 +925,8 @@ public class PlayerEvents extends PlotListener implements Listener { || area.isForcingPlotChat())) { return; } - if (plot.isDenied(plotPlayer.getUUID()) && !Permissions.hasPermission(plotPlayer, Captions.PERMISSION_ADMIN_CHAT_BYPASS)) { + if (plot.isDenied(plotPlayer.getUUID()) && !Permissions + .hasPermission(plotPlayer, Captions.PERMISSION_ADMIN_CHAT_BYPASS)) { return; } event.setCancelled(true); @@ -990,10 +986,9 @@ public class PlayerEvents extends PlotListener implements Listener { event.setCancelled(true); return; } - } else if ( - (location.getY() > area.getMaxBuildHeight() || location.getY() < area.getMinBuildHeight()) - && !Permissions - .hasPermission(plotPlayer, Captions.PERMISSION_ADMIN_BUILD_HEIGHT_LIMIT)) { + } else if ((location.getY() > area.getMaxBuildHeight() || location.getY() < area + .getMinBuildHeight()) && !Permissions + .hasPermission(plotPlayer, Captions.PERMISSION_ADMIN_BUILD_HEIGHT_LIMIT)) { event.setCancelled(true); MainUtil.sendMessage(plotPlayer, Captions.HEIGHT_LIMIT.getTranslated() .replace("{limit}", String.valueOf(area.getMaxBuildHeight()))); @@ -1372,7 +1367,8 @@ public class PlayerEvents extends PlotListener implements Listener { final PlotArea fromArea = fLocation.getPlotArea(); if (fromArea != null) { final Plot plot = fromArea.getOwnedPlot(fLocation); - if (plot != null && !plot.getFlag(LiquidFlowFlag.class) && event.getBlock().isLiquid()) { + if (plot != null && !plot.getFlag(LiquidFlowFlag.class) && event.getBlock() + .isLiquid()) { event.setCancelled(true); return; } @@ -2497,13 +2493,16 @@ public class PlayerEvents extends PlotListener implements Listener { } } else if (!plot.isAdded(pp.getUUID())) { final Entity entity = event.getRightClicked(); - final com.sk89q.worldedit.world.entity.EntityType entityType = BukkitAdapter.adapt(entity.getType()); + final com.sk89q.worldedit.world.entity.EntityType entityType = + BukkitAdapter.adapt(entity.getType()); - if (EntityCategories.HOSTILE.contains(entityType) && plot.getFlag(HostileInteractFlag.class)) { + if (EntityCategories.HOSTILE.contains(entityType) && plot + .getFlag(HostileInteractFlag.class)) { return; } - if (EntityCategories.ANIMAL.contains(entityType) && plot.getFlag(AnimalInteractFlag.class)) { + if (EntityCategories.ANIMAL.contains(entityType) && plot + .getFlag(AnimalInteractFlag.class)) { return; } @@ -2514,20 +2513,23 @@ public class PlayerEvents extends PlotListener implements Listener { return; } - if (EntityCategories.VEHICLE.contains(entityType) && plot.getFlag(VehicleUseFlag.class)) { + if (EntityCategories.VEHICLE.contains(entityType) && plot + .getFlag(VehicleUseFlag.class)) { return; } - if (EntityCategories.PLAYER.contains(entityType) && plot.getFlag(PlayerInteractFlag.class)) { + if (EntityCategories.PLAYER.contains(entityType) && plot + .getFlag(PlayerInteractFlag.class)) { return; } - if (EntityCategories.VILLAGER.contains(entityType) && plot.getFlag(VillagerInteractFlag.class)) { + if (EntityCategories.VILLAGER.contains(entityType) && plot + .getFlag(VillagerInteractFlag.class)) { return; } - if ((EntityCategories.HANGING.contains(entityType) || - EntityCategories.OTHER.contains(entityType)) && plot.getFlag(MiscInteractFlag.class)) { + if ((EntityCategories.HANGING.contains(entityType) || EntityCategories.OTHER + .contains(entityType)) && plot.getFlag(MiscInteractFlag.class)) { return; } @@ -2809,7 +2811,8 @@ public class PlayerEvents extends PlotListener implements Listener { "plots.admin.pve." + stub); return false; } - } else if (EntityCategories.VEHICLE.contains(entityType)) { // Vehicles are managed in vehicle destroy event + } else if (EntityCategories.VEHICLE + .contains(entityType)) { // Vehicles are managed in vehicle destroy event return true; } else { // victim is something else if (plot != null && (plot.getFlag(PveFlag.class) || plot @@ -2880,8 +2883,9 @@ public class PlayerEvents extends PlotListener implements Listener { PlotPlayer pp = BukkitUtil.getPlayer(player); Plot plot = area.getPlot(location); if (plot != null) { - if ((location.getY() > area.getMaxBuildHeight() || location.getY() < area.getMinBuildHeight()) - && !Permissions.hasPermission(pp, Captions.PERMISSION_ADMIN_BUILD_HEIGHT_LIMIT)) { + if ((location.getY() > area.getMaxBuildHeight() || location.getY() < area + .getMinBuildHeight()) && !Permissions + .hasPermission(pp, Captions.PERMISSION_ADMIN_BUILD_HEIGHT_LIMIT)) { event.setCancelled(true); MainUtil.sendMessage(pp, Captions.HEIGHT_LIMIT.getTranslated() .replace("{limit}", String.valueOf(area.getMaxBuildHeight()))); diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/SingleWorldListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/SingleWorldListener.java index 6faed38fe..a5a5ff2f8 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/SingleWorldListener.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/SingleWorldListener.java @@ -44,7 +44,8 @@ import java.lang.reflect.Method; import static com.plotsquared.core.util.ReflectionUtils.getRefClass; -@SuppressWarnings("unused") public class SingleWorldListener implements Listener { +@SuppressWarnings("unused") +public class SingleWorldListener implements Listener { private Method methodGetHandleChunk; private Field mustSave; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/WorldEvents.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/WorldEvents.java index e963f35c9..59e1fb2ec 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/WorldEvents.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/WorldEvents.java @@ -40,23 +40,23 @@ import org.bukkit.generator.ChunkGenerator; @SuppressWarnings("unused") public class WorldEvents implements Listener { - @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) - public void onWorldInit(WorldInitEvent event) { - World world = event.getWorld(); - String name = world.getName(); - PlotAreaManager manager = PlotSquared.get().getPlotAreaManager(); - if (manager instanceof SinglePlotAreaManager) { - SinglePlotAreaManager single = (SinglePlotAreaManager) manager; - if (single.isWorld(name)) { - world.setKeepSpawnInMemory(false); - return; - } + @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) + public void onWorldInit(WorldInitEvent event) { + World world = event.getWorld(); + String name = world.getName(); + PlotAreaManager manager = PlotSquared.get().getPlotAreaManager(); + if (manager instanceof SinglePlotAreaManager) { + SinglePlotAreaManager single = (SinglePlotAreaManager) manager; + if (single.isWorld(name)) { + world.setKeepSpawnInMemory(false); + return; + } + } + ChunkGenerator gen = world.getGenerator(); + if (gen instanceof GeneratorWrapper) { + PlotSquared.get().loadWorld(name, (GeneratorWrapper) gen); + } else { + PlotSquared.get().loadWorld(name, new BukkitPlotGenerator(name, gen)); + } } - ChunkGenerator gen = world.getGenerator(); - if (gen instanceof GeneratorWrapper) { - PlotSquared.get().loadWorld(name, (GeneratorWrapper) gen); - } else { - PlotSquared.get().loadWorld(name, new BukkitPlotGenerator(name, gen)); - } - } } diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/PlaceholderFormatter.java b/Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/PlaceholderFormatter.java index d10268f6a..674d810f2 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/PlaceholderFormatter.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/PlaceholderFormatter.java @@ -42,7 +42,7 @@ public class PlaceholderFormatter implements ChatFormatter { final Player player = ((BukkitPlayer) recipient).player; context.setMessage(PlaceholderAPI.setPlaceholders(player, context.getMessage())); } - } + } } } diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/Placeholders.java b/Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/Placeholders.java index 1cf38cab7..bf2a7a8b9 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/Placeholders.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/Placeholders.java @@ -41,33 +41,27 @@ public class Placeholders extends PlaceholderExpansion { public Placeholders() { } - @Override - public boolean persist() { + @Override public boolean persist() { return true; } - @Override - public boolean canRegister() { + @Override public boolean canRegister() { return true; } - @Override - public String getAuthor() { + @Override public String getAuthor() { return "NotMyFault"; } - @Override - public String getIdentifier() { + @Override public String getIdentifier() { return "plotsquared"; } - @Override - public String getVersion() { + @Override public String getVersion() { return "2.4"; } - @Override - public String onPlaceholderRequest(Player p, String identifier) { + @Override public String onPlaceholderRequest(Player p, String identifier) { final PlotPlayer pl = PlotPlayer.get(p.getName()); if (pl == null) { diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java b/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java index c4b3951e0..854cc6ec0 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java @@ -28,12 +28,12 @@ package com.plotsquared.bukkit.player; import com.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.core.PlotSquared; import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.events.TeleportCause; import com.plotsquared.core.location.Location; import com.plotsquared.core.player.PlotPlayer; -import com.plotsquared.core.events.TeleportCause; +import com.plotsquared.core.plot.PlotWeather; import com.plotsquared.core.util.EconHandler; import com.plotsquared.core.util.MathMan; -import com.plotsquared.core.plot.PlotWeather; import com.plotsquared.core.util.StringMan; import com.plotsquared.core.util.uuid.UUIDHandler; import com.sk89q.worldedit.bukkit.BukkitAdapter; @@ -167,7 +167,7 @@ public class BukkitPlayer extends PlotPlayer { if (CHECK_EFFECTIVE) { boolean hasAny = false; String stubPlus = stub + "."; - final Set effective = player.getEffectivePermissions(); + final Set effective = player.getEffectivePermissions(); if (!effective.isEmpty()) { for (PermissionAttachmentInfo attach : effective) { String permStr = attach.getPermission(); @@ -211,8 +211,7 @@ public class BukkitPlayer extends PlotPlayer { } @Override public void sendMessage(String message) { - message = message.replace('\u2010', '%') - .replace('\u2020', '&').replace('\u2030', '&'); + message = message.replace('\u2010', '%').replace('\u2020', '&').replace('\u2030', '&'); if (!StringMan.isEqual(this.getMeta("lastMessage"), message) || ( System.currentTimeMillis() - this.getMeta("lastMessageTime") > 5000)) { setMeta("lastMessage", message); @@ -221,12 +220,14 @@ public class BukkitPlayer extends PlotPlayer { } } - @Override public void teleport(@NotNull final Location location, @NotNull final TeleportCause cause) { + @Override + public void teleport(@NotNull final Location location, @NotNull final TeleportCause cause) { if (Math.abs(location.getX()) >= 30000000 || Math.abs(location.getZ()) >= 30000000) { return; } - final org.bukkit.Location bukkitLocation = new org.bukkit.Location(BukkitUtil.getWorld(location.getWorld()), location.getX() + 0.5, - location.getY(), location.getZ() + 0.5, location.getYaw(), location.getPitch()); + final org.bukkit.Location bukkitLocation = + new org.bukkit.Location(BukkitUtil.getWorld(location.getWorld()), location.getX() + 0.5, + location.getY(), location.getZ() + 0.5, location.getYaw(), location.getPitch()); PaperLib.teleportAsync(player, bukkitLocation, getTeleportCause(cause)); } @@ -280,7 +281,8 @@ public class BukkitPlayer extends PlotPlayer { } } - @Override public void setGameMode(@NotNull final com.sk89q.worldedit.world.gamemode.GameMode gameMode) { + @Override + public void setGameMode(@NotNull final com.sk89q.worldedit.world.gamemode.GameMode gameMode) { if (ADVENTURE.equals(gameMode)) { this.player.setGameMode(GameMode.ADVENTURE); } else if (CREATIVE.equals(gameMode)) { @@ -344,7 +346,8 @@ public class BukkitPlayer extends PlotPlayer { return PlayerTeleportEvent.TeleportCause.COMMAND; case PLUGIN: return PlayerTeleportEvent.TeleportCause.PLUGIN; - default: return PlayerTeleportEvent.TeleportCause.UNKNOWN; + default: + return PlayerTeleportEvent.TeleportCause.UNKNOWN; } } } diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitLocalQueue.java b/Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitLocalQueue.java index 9c8b38dd9..26b303f69 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitLocalQueue.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitLocalQueue.java @@ -28,9 +28,9 @@ package com.plotsquared.bukkit.queue; import com.plotsquared.bukkit.schematic.StateWrapper; import com.plotsquared.bukkit.util.BukkitBlockUtil; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.util.MainUtil; import com.plotsquared.core.queue.BasicLocalBlockQueue; import com.plotsquared.core.util.BlockUtil; +import com.plotsquared.core.util.MainUtil; import com.sk89q.jnbt.CompoundTag; import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.WorldEdit; @@ -139,7 +139,8 @@ public class BukkitLocalQueue extends BasicLocalBlockQueue { BlockData blockData = BukkitAdapter.adapt(block); Block existing = chunk.getBlock(x, y, z); - final BlockState existingBaseBlock = BukkitAdapter.adapt(existing.getBlockData()); + final BlockState existingBaseBlock = + BukkitAdapter.adapt(existing.getBlockData()); if (BukkitBlockUtil.get(existing).equals(existingBaseBlock) && existing .getBlockData().matches(blockData)) { continue; @@ -151,8 +152,8 @@ public class BukkitLocalQueue extends BasicLocalBlockQueue { CompoundTag tag = block.getNbtData(); StateWrapper sw = new StateWrapper(tag); - sw.restoreTag(worldObj.getName(), existing.getX(), - existing.getY(), existing.getZ()); + sw.restoreTag(worldObj.getName(), existing.getX(), existing.getY(), + existing.getZ()); } } } @@ -162,7 +163,8 @@ public class BukkitLocalQueue extends BasicLocalBlockQueue { if (isForceSync()) { chunkConsumer.accept(getChunk(worldObj, localChunk)); } else { - PaperLib.getChunkAtAsync(worldObj, localChunk.getX(), localChunk.getZ(), true).thenAccept(chunkConsumer); + PaperLib.getChunkAtAsync(worldObj, localChunk.getX(), localChunk.getZ(), true) + .thenAccept(chunkConsumer); } } @@ -206,8 +208,8 @@ public class BukkitLocalQueue extends BasicLocalBlockQueue { BiomeType biomeType = biomeZ[z]; Biome biome = BukkitAdapter.adapt(biomeType); - worldObj.setBiome((chunk.getX() << 4) + x, (chunk.getZ() << 4) + z, - biome); + worldObj + .setBiome((chunk.getX() << 4) + x, (chunk.getZ() << 4) + z, biome); } } } @@ -216,7 +218,8 @@ public class BukkitLocalQueue extends BasicLocalBlockQueue { if (this.isForceSync()) { chunkConsumer.accept(getChunk(worldObj, lc)); } else { - PaperLib.getChunkAtAsync(worldObj, lc.getX(), lc.getZ(), true).thenAccept(chunkConsumer); + PaperLib.getChunkAtAsync(worldObj, lc.getX(), lc.getZ(), true) + .thenAccept(chunkConsumer); } } diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java b/Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java index 77cb4de45..c20815e1e 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java @@ -25,14 +25,14 @@ */ package com.plotsquared.bukkit.queue; +import com.google.common.base.Preconditions; import com.plotsquared.bukkit.util.BukkitBlockUtil; import com.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.core.location.ChunkWrapper; import com.plotsquared.core.location.Location; -import com.plotsquared.core.util.MainUtil; import com.plotsquared.core.queue.ScopedLocalBlockQueue; +import com.plotsquared.core.util.MainUtil; import com.plotsquared.core.util.PatternUtil; -import com.google.common.base.Preconditions; import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.world.biome.BiomeType; @@ -119,7 +119,8 @@ public class GenChunk extends ScopedLocalBlockQueue { int maxX = Math.max(pos1.getX(), pos2.getX()); int maxY = Math.max(pos1.getY(), pos2.getY()); int maxZ = Math.max(pos1.getZ(), pos2.getZ()); - chunkData.setRegion(minX, minY, minZ, maxX + 1, maxY + 1, maxZ + 1, BukkitAdapter.adapt(block)); + chunkData + .setRegion(minX, minY, minZ, maxX + 1, maxY + 1, maxZ + 1, BukkitAdapter.adapt(block)); } @Override public boolean setBiome(int x, int z, BiomeType biomeType) { @@ -135,7 +136,8 @@ public class GenChunk extends ScopedLocalBlockQueue { } @Override public boolean setBlock(int x, int y, int z, @NotNull Pattern pattern) { - return setBlock(x, y, z, PatternUtil.apply(Preconditions.checkNotNull(pattern, "Pattern may not be null"), x, y, z)); + return setBlock(x, y, z, PatternUtil + .apply(Preconditions.checkNotNull(pattern, "Pattern may not be null"), x, y, z)); } @Override public boolean setBlock(int x, int y, int z, BlockState id) { diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/schematic/BukkitSchematicHandler.java b/Bukkit/src/main/java/com/plotsquared/bukkit/schematic/BukkitSchematicHandler.java index 9705b894d..86fbd732e 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/schematic/BukkitSchematicHandler.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/schematic/BukkitSchematicHandler.java @@ -27,12 +27,19 @@ package com.plotsquared.bukkit.schematic; import com.plotsquared.bukkit.util.BukkitUtil; import com.plotsquared.core.location.Location; -import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.queue.LocalBlockQueue; import com.plotsquared.core.util.MainUtil; import com.plotsquared.core.util.SchematicHandler; +import com.plotsquared.core.util.task.RunnableVal; import com.plotsquared.core.util.task.TaskManager; -import com.plotsquared.core.queue.LocalBlockQueue; -import com.sk89q.jnbt.*; +import com.sk89q.jnbt.ByteArrayTag; +import com.sk89q.jnbt.CompoundTag; +import com.sk89q.jnbt.IntArrayTag; +import com.sk89q.jnbt.IntTag; +import com.sk89q.jnbt.ListTag; +import com.sk89q.jnbt.ShortTag; +import com.sk89q.jnbt.StringTag; +import com.sk89q.jnbt.Tag; import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.extension.platform.Capability; import com.sk89q.worldedit.math.BlockVector2; @@ -42,7 +49,13 @@ import com.sk89q.worldedit.world.biome.BiomeType; import com.sk89q.worldedit.world.block.BaseBlock; import java.io.ByteArrayOutputStream; -import java.util.*; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.stream.IntStream; /** @@ -50,7 +63,8 @@ import java.util.stream.IntStream; */ public class BukkitSchematicHandler extends SchematicHandler { - @Override public void getCompoundTag(final String world, final Set regions, + @Override + public void getCompoundTag(final String world, final Set regions, final RunnableVal whenDone) { // async TaskManager.runTaskAsync(new Runnable() { @@ -112,10 +126,12 @@ public class BukkitSchematicHandler extends SchematicHandler { schematic.put("BiomePaletteMax", new IntTag(biomePalette.size())); Map biomePaletteTag = new HashMap<>(); - biomePalette.forEach((key, value) -> biomePaletteTag.put(key, new IntTag(value))); + biomePalette.forEach( + (key, value) -> biomePaletteTag.put(key, new IntTag(value))); schematic.put("BiomePalette", new CompoundTag(biomePaletteTag)); - schematic.put("BiomeData", new ByteArrayTag(biomeBuffer.toByteArray())); + schematic + .put("BiomeData", new ByteArrayTag(biomeBuffer.toByteArray())); whenDone.value = new CompoundTag(schematic); TaskManager.runTask(whenDone); }); @@ -123,8 +139,10 @@ public class BukkitSchematicHandler extends SchematicHandler { } final Runnable regionTask = this; CuboidRegion region = queue.poll(); - Location pos1 = new Location(world, region.getMinimumPoint().getX(), region.getMinimumPoint().getY(), region.getMinimumPoint().getZ()); - Location pos2 = new Location(world, region.getMaximumPoint().getX(), region.getMaximumPoint().getY(), region.getMaximumPoint().getZ()); + Location pos1 = new Location(world, region.getMinimumPoint().getX(), + region.getMinimumPoint().getY(), region.getMinimumPoint().getZ()); + Location pos2 = new Location(world, region.getMaximumPoint().getX(), + region.getMaximumPoint().getY(), region.getMaximumPoint().getZ()); final int p1x = pos1.getX(); final int sy = pos1.getY(); final int p1z = pos1.getZ(); diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitChatManager.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitChatManager.java index 6d8650622..49c4f061b 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitChatManager.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitChatManager.java @@ -30,8 +30,8 @@ import com.plotsquared.bukkit.player.BukkitPlayer; import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.player.ConsolePlayer; -import com.plotsquared.core.plot.message.PlotMessage; import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.plot.message.PlotMessage; import com.plotsquared.core.util.ChatManager; import org.bukkit.ChatColor; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitInventoryUtil.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitInventoryUtil.java index 7c3c8a985..62136379a 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitInventoryUtil.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitInventoryUtil.java @@ -26,9 +26,9 @@ package com.plotsquared.bukkit.util; import com.plotsquared.bukkit.player.BukkitPlayer; +import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.plot.PlotInventory; import com.plotsquared.core.plot.PlotItemStack; -import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.util.InventoryUtil; import com.sk89q.worldedit.bukkit.BukkitAdapter; import org.bukkit.Bukkit; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java index 26f70fc4d..67b32b813 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java @@ -26,10 +26,10 @@ package com.plotsquared.bukkit.util; import com.plotsquared.bukkit.generator.BukkitPlotGenerator; -import com.plotsquared.core.configuration.ConfigurationSection; -import com.plotsquared.core.configuration.file.YamlConfiguration; import com.plotsquared.core.PlotSquared; import com.plotsquared.core.configuration.ConfigurationNode; +import com.plotsquared.core.configuration.ConfigurationSection; +import com.plotsquared.core.configuration.file.YamlConfiguration; import com.plotsquared.core.generator.GeneratorWrapper; import com.plotsquared.core.plot.PlotArea; import com.plotsquared.core.plot.PlotAreaType; @@ -88,7 +88,7 @@ public class BukkitSetupUtils extends SetupUtils { } World dw = Bukkit.getWorlds().get(0); for (Player player : world.getPlayers()) { - PaperLib.teleportAsync(player,dw.getSpawnLocation()); + PaperLib.teleportAsync(player, dw.getSpawnLocation()); } if (save) { for (Chunk chunk : world.getLoadedChunks()) { diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java index d266c4d31..2371fe799 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java @@ -337,15 +337,16 @@ public class BukkitUtil extends WorldUtil { } @Override public void getBiome(String world, int x, int z, final Consumer result) { - ensureLoaded(world, x, z, chunk -> - result.accept(BukkitAdapter.adapt(getWorld(world).getBiome(x, z)))); + ensureLoaded(world, x, z, + chunk -> result.accept(BukkitAdapter.adapt(getWorld(world).getBiome(x, z)))); } @Override public BiomeType getBiomeSynchronous(String world, int x, int z) { return BukkitAdapter.adapt(getWorld(world).getBiome(x, z)); } - @Override public void getHighestBlock(@NonNull final String world, final int x, final int z, + @Override + public void getHighestBlock(@NonNull final String world, final int x, final int z, final IntConsumer result) { ensureLoaded(world, x, z, chunk -> { final World bukkitWorld = getWorld(world); @@ -394,7 +395,8 @@ public class BukkitUtil extends WorldUtil { return bukkitWorld.getMaxHeight() - 1; } - @Override public void getSign(@NonNull final Location location, final Consumer result) { + @Override + public void getSign(@NonNull final Location location, final Consumer result) { ensureLoaded(location, chunk -> { final Block block = chunk.getWorld().getBlockAt(getLocation(location)); if (block.getState() instanceof Sign) { @@ -519,7 +521,8 @@ public class BukkitUtil extends WorldUtil { return new BukkitWorld(Bukkit.getWorld(world)); } - @Override public void getBlock(@NonNull final Location location, final Consumer result) { + @Override + public void getBlock(@NonNull final Location location, final Consumer result) { ensureLoaded(location, chunk -> { final World world = getWorld(location.getWorld()); final Block block = world.getBlockAt(location.getX(), location.getY(), location.getZ()); @@ -554,7 +557,8 @@ public class BukkitUtil extends WorldUtil { } @Override - public Set getTypesInCategory(final String category) { + public Set getTypesInCategory( + final String category) { final Collection> allowedInterfaces = new HashSet<>(); switch (category) { case "animal": { @@ -563,13 +567,16 @@ public class BukkitUtil extends WorldUtil { allowedInterfaces.add(Animals.class); allowedInterfaces.add(WaterMob.class); allowedInterfaces.add(Ambient.class); - } break; + } + break; case "tameable": { allowedInterfaces.add(Tameable.class); - } break; + } + break; case "vehicle": { allowedInterfaces.add(Vehicle.class); - } break; + } + break; case "hostile": { allowedInterfaces.add(Shulker.class); allowedInterfaces.add(Monster.class); @@ -578,16 +585,20 @@ public class BukkitUtil extends WorldUtil { allowedInterfaces.add(Ghast.class); allowedInterfaces.add(Phantom.class); allowedInterfaces.add(EnderCrystal.class); - } break; + } + break; case "hanging": { allowedInterfaces.add(Hanging.class); - } break; + } + break; case "villager": { allowedInterfaces.add(NPC.class); - } break; + } + break; case "projectile": { allowedInterfaces.add(Projectile.class); - } break; + } + break; case "other": { allowedInterfaces.add(ArmorStand.class); allowedInterfaces.add(FallingBlock.class); @@ -599,16 +610,20 @@ public class BukkitUtil extends WorldUtil { allowedInterfaces.add(ExperienceOrb.class); allowedInterfaces.add(EnderSignal.class); allowedInterfaces.add(Firework.class); - } break; + } + break; case "player": { allowedInterfaces.add(Player.class); - } break; + } + break; default: { PlotSquared.log(Captions.PREFIX + "Unknown entity category requested: " + category); - } break; + } + break; } final Set types = new HashSet<>(); - outer: for (final EntityType bukkitType : EntityType.values()) { + outer: + for (final EntityType bukkitType : EntityType.values()) { final Class entityClass = bukkitType.getEntityClass(); if (entityClass == null) { continue; @@ -623,22 +638,23 @@ public class BukkitUtil extends WorldUtil { return types; } - private static void ensureLoaded(final String world, final int x, final int z, final Consumer chunkConsumer) { - PaperLib.getChunkAtAsync(getWorld(world), x >> 4, z >> 4, true).thenAccept(chunk -> - ensureMainThread(chunkConsumer, chunk)); + private static void ensureLoaded(final String world, final int x, final int z, + final Consumer chunkConsumer) { + PaperLib.getChunkAtAsync(getWorld(world), x >> 4, z >> 4, true) + .thenAccept(chunk -> ensureMainThread(chunkConsumer, chunk)); } private static void ensureLoaded(final Location location, final Consumer chunkConsumer) { - PaperLib.getChunkAtAsync(getLocation(location), true).thenAccept(chunk -> - ensureMainThread(chunkConsumer, chunk)); + PaperLib.getChunkAtAsync(getLocation(location), true) + .thenAccept(chunk -> ensureMainThread(chunkConsumer, chunk)); } private static void ensureMainThread(final Consumer consumer, final T value) { if (Bukkit.isPrimaryThread()) { consumer.accept(value); } else { - Bukkit.getScheduler().runTask(BukkitMain.getPlugin(BukkitMain.class), () -> - consumer.accept(value)); + Bukkit.getScheduler() + .runTask(BukkitMain.getPlugin(BukkitMain.class), () -> consumer.accept(value)); } } diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/OfflinePlayerUtil.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/OfflinePlayerUtil.java index 3fd2e99af..dcf5570f2 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/OfflinePlayerUtil.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/OfflinePlayerUtil.java @@ -99,7 +99,8 @@ public class OfflinePlayerUtil { Class minecraftServerClass = getNmsClass("MinecraftServer"); Class dimensionManager = getNmsClass("DimensionManager"); Object overworld = getField(makeField(dimensionManager, "OVERWORLD"), null); - Method getWorldServer = makeMethod(minecraftServerClass, "getWorldServer", dimensionManager); + Method getWorldServer = + makeMethod(minecraftServerClass, "getWorldServer", dimensionManager); return callMethod(getWorldServer, server, overworld); } diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/SendChunk.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/SendChunk.java index 6cc879bc3..7a920fc8b 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/SendChunk.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/SendChunk.java @@ -28,8 +28,8 @@ package com.plotsquared.bukkit.util; import com.plotsquared.bukkit.player.BukkitPlayer; import com.plotsquared.core.PlotSquared; import com.plotsquared.core.location.Location; -import com.plotsquared.core.plot.Plot; import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.plot.Plot; import com.plotsquared.core.util.ReflectionUtils.RefClass; import com.plotsquared.core.util.ReflectionUtils.RefConstructor; import com.plotsquared.core.util.ReflectionUtils.RefField; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/UpdateUtility.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/UpdateUtility.java index c004a9e51..458e3ca58 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/UpdateUtility.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/UpdateUtility.java @@ -75,8 +75,9 @@ public class UpdateUtility implements Listener { if (internalVersion.isLaterVersion(spigotVersion)) { PlotSquared .log(Captions.PREFIX + "&6There appears to be a PlotSquared update available!"); - PlotSquared.log(Captions.PREFIX + "&6You are running version " + internalVersion.versionString() - + ", &6latest version is " + spigotVersion); + PlotSquared.log( + Captions.PREFIX + "&6You are running version " + internalVersion.versionString() + + ", &6latest version is " + spigotVersion); PlotSquared .log(Captions.PREFIX + "&6https://www.spigotmc.org/resources/77506/updates"); hasUpdate = true; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/LowerOfflineUUIDWrapper.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/LowerOfflineUUIDWrapper.java index f300c03eb..ad2be7ce3 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/LowerOfflineUUIDWrapper.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/LowerOfflineUUIDWrapper.java @@ -25,9 +25,9 @@ */ package com.plotsquared.bukkit.util.uuid; +import com.google.common.base.Charsets; import com.plotsquared.core.player.OfflinePlotPlayer; import com.plotsquared.core.player.PlotPlayer; -import com.google.common.base.Charsets; import org.bukkit.OfflinePlayer; import org.jetbrains.annotations.NotNull; @@ -37,7 +37,8 @@ import java.util.UUID; public class LowerOfflineUUIDWrapper extends OfflineUUIDWrapper { @NotNull @Override public UUID getUUID(PlotPlayer player) { - return UUID.nameUUIDFromBytes(("OfflinePlayer:" + player.getName().toLowerCase()).getBytes(Charsets.UTF_8)); + return UUID.nameUUIDFromBytes( + ("OfflinePlayer:" + player.getName().toLowerCase()).getBytes(Charsets.UTF_8)); } @Override public UUID getUUID(OfflinePlotPlayer player) { @@ -47,7 +48,8 @@ public class LowerOfflineUUIDWrapper extends OfflineUUIDWrapper { @Override public UUID getUUID(OfflinePlayer player) { return UUID.nameUUIDFromBytes( - ("OfflinePlayer:" + Objects.requireNonNull(player.getName()).toLowerCase()).getBytes(Charsets.UTF_8)); + ("OfflinePlayer:" + Objects.requireNonNull(player.getName()).toLowerCase()) + .getBytes(Charsets.UTF_8)); } @Override public UUID getUUID(String name) { diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/OfflineUUIDWrapper.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/OfflineUUIDWrapper.java index 421484d3d..66ca52814 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/OfflineUUIDWrapper.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/OfflineUUIDWrapper.java @@ -25,6 +25,8 @@ */ package com.plotsquared.bukkit.util.uuid; +import com.google.common.base.Charsets; +import com.google.common.collect.BiMap; import com.plotsquared.bukkit.player.BukkitOfflinePlayer; import com.plotsquared.core.PlotSquared; import com.plotsquared.core.player.OfflinePlotPlayer; @@ -32,8 +34,6 @@ import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.util.StringWrapper; import com.plotsquared.core.util.uuid.UUIDHandler; import com.plotsquared.core.util.uuid.UUIDWrapper; -import com.google.common.base.Charsets; -import com.google.common.collect.BiMap; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.Server; @@ -60,7 +60,8 @@ public class OfflineUUIDWrapper extends UUIDWrapper { } @NotNull @Override public UUID getUUID(PlotPlayer player) { - return UUID.nameUUIDFromBytes(("OfflinePlayer:" + player.getName()).getBytes(Charsets.UTF_8)); + return UUID + .nameUUIDFromBytes(("OfflinePlayer:" + player.getName()).getBytes(Charsets.UTF_8)); } @Override public UUID getUUID(OfflinePlotPlayer player) { diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/SQLUUIDHandler.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/SQLUUIDHandler.java index 2d8e38f50..a08956369 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/SQLUUIDHandler.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/SQLUUIDHandler.java @@ -25,18 +25,18 @@ */ package com.plotsquared.bukkit.util.uuid; +import com.google.common.collect.HashBiMap; import com.plotsquared.core.PlotSquared; import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.database.SQLite; -import com.plotsquared.core.util.task.RunnableVal; -import com.plotsquared.core.util.StringWrapper; import com.plotsquared.core.util.MainUtil; +import com.plotsquared.core.util.StringWrapper; +import com.plotsquared.core.util.task.RunnableVal; import com.plotsquared.core.util.task.TaskManager; import com.plotsquared.core.util.uuid.UUIDHandler; import com.plotsquared.core.util.uuid.UUIDHandlerImplementation; import com.plotsquared.core.util.uuid.UUIDWrapper; -import com.google.common.collect.HashBiMap; import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; diff --git a/Core/src/main/java/com/plotsquared/core/api/PlotAPI.java b/Core/src/main/java/com/plotsquared/core/api/PlotAPI.java index acf894c54..70bd11673 100644 --- a/Core/src/main/java/com/plotsquared/core/api/PlotAPI.java +++ b/Core/src/main/java/com/plotsquared/core/api/PlotAPI.java @@ -25,14 +25,14 @@ */ package com.plotsquared.core.api; -import com.plotsquared.core.configuration.file.YamlConfiguration; import com.plotsquared.core.PlotSquared; import com.plotsquared.core.configuration.Caption; import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.file.YamlConfiguration; import com.plotsquared.core.location.Location; +import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.PlotArea; -import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.queue.GlobalBlockQueue; import com.plotsquared.core.util.ChunkManager; import com.plotsquared.core.util.EventDispatcher; @@ -60,7 +60,9 @@ import java.util.UUID; * * @version 5 */ -@SuppressWarnings({"unused", "WeakerAccess"}) @NoArgsConstructor public class PlotAPI { +@SuppressWarnings({"unused", "WeakerAccess"}) +@NoArgsConstructor +public class PlotAPI { /** * Gets all plots. diff --git a/Core/src/main/java/com/plotsquared/core/events/PlayerAutoPlotEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlayerAutoPlotEvent.java index 693fc0220..7bb935791 100644 --- a/Core/src/main/java/com/plotsquared/core/events/PlayerAutoPlotEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlayerAutoPlotEvent.java @@ -26,8 +26,8 @@ package com.plotsquared.core.events; import com.plotsquared.core.command.Claim; -import com.plotsquared.core.plot.PlotArea; import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.plot.PlotArea; import lombok.Getter; import lombok.Setter; diff --git a/Core/src/main/java/com/plotsquared/core/events/PlayerClaimPlotEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlayerClaimPlotEvent.java index d9fd19e8a..6901a54ba 100644 --- a/Core/src/main/java/com/plotsquared/core/events/PlayerClaimPlotEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlayerClaimPlotEvent.java @@ -26,8 +26,8 @@ package com.plotsquared.core.events; import com.plotsquared.core.command.Claim; -import com.plotsquared.core.plot.Plot; import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.plot.Plot; import javax.annotation.Nullable; diff --git a/Core/src/main/java/com/plotsquared/core/events/PlayerEnterPlotEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlayerEnterPlotEvent.java index 4ef8191b4..568809513 100644 --- a/Core/src/main/java/com/plotsquared/core/events/PlayerEnterPlotEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlayerEnterPlotEvent.java @@ -25,8 +25,8 @@ */ package com.plotsquared.core.events; -import com.plotsquared.core.plot.Plot; import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.plot.Plot; public class PlayerEnterPlotEvent extends PlotPlayerEvent { diff --git a/Core/src/main/java/com/plotsquared/core/events/PlayerLeavePlotEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlayerLeavePlotEvent.java index 916d08571..9a4366450 100644 --- a/Core/src/main/java/com/plotsquared/core/events/PlayerLeavePlotEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlayerLeavePlotEvent.java @@ -25,8 +25,8 @@ */ package com.plotsquared.core.events; -import com.plotsquared.core.plot.Plot; import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.plot.Plot; /** * diff --git a/Core/src/main/java/com/plotsquared/core/events/PlayerPlotDeniedEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlayerPlotDeniedEvent.java index cdcad5e3e..f3458a615 100644 --- a/Core/src/main/java/com/plotsquared/core/events/PlayerPlotDeniedEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlayerPlotDeniedEvent.java @@ -25,8 +25,8 @@ */ package com.plotsquared.core.events; -import com.plotsquared.core.plot.Plot; import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.plot.Plot; import java.util.UUID; diff --git a/Core/src/main/java/com/plotsquared/core/events/PlayerPlotHelperEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlayerPlotHelperEvent.java index f52957e30..55a606381 100644 --- a/Core/src/main/java/com/plotsquared/core/events/PlayerPlotHelperEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlayerPlotHelperEvent.java @@ -25,8 +25,8 @@ */ package com.plotsquared.core.events; -import com.plotsquared.core.plot.Plot; import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.plot.Plot; import java.util.UUID; diff --git a/Core/src/main/java/com/plotsquared/core/events/PlayerPlotTrustedEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlayerPlotTrustedEvent.java index d8591a5a0..85db4a32d 100644 --- a/Core/src/main/java/com/plotsquared/core/events/PlayerPlotTrustedEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlayerPlotTrustedEvent.java @@ -25,8 +25,8 @@ */ package com.plotsquared.core.events; -import com.plotsquared.core.plot.Plot; import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.plot.Plot; import java.util.UUID; diff --git a/Core/src/main/java/com/plotsquared/core/events/PlayerTeleportToPlotEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlayerTeleportToPlotEvent.java index 38dffe966..99f197c67 100644 --- a/Core/src/main/java/com/plotsquared/core/events/PlayerTeleportToPlotEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlayerTeleportToPlotEvent.java @@ -58,13 +58,11 @@ public class PlayerTeleportToPlotEvent extends PlotPlayerEvent implements Cancel return this.from; } - @Override - public Result getEventResult() { + @Override public Result getEventResult() { return eventResult; } - @Override - public void setEventResult(Result e) { + @Override public void setEventResult(Result e) { this.eventResult = e; } } diff --git a/Core/src/main/java/com/plotsquared/core/events/PlotAutoMergeEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlotAutoMergeEvent.java index 657a34838..a84bc5de0 100644 --- a/Core/src/main/java/com/plotsquared/core/events/PlotAutoMergeEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlotAutoMergeEvent.java @@ -56,6 +56,7 @@ public final class PlotAutoMergeEvent extends PlotEvent implements CancellablePl this.world = world; this.plots = plots; } + /** * Get the plots being added. * @@ -65,13 +66,11 @@ public final class PlotAutoMergeEvent extends PlotEvent implements CancellablePl return Collections.unmodifiableList(this.plots); } - @Override - public Result getEventResult() { + @Override public Result getEventResult() { return eventResult; } - @Override - public void setEventResult(Result e) { + @Override public void setEventResult(Result e) { this.eventResult = e; } } diff --git a/Core/src/main/java/com/plotsquared/core/events/PlotChangeOwnerEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlotChangeOwnerEvent.java index 240f084e5..0e1f5eb48 100644 --- a/Core/src/main/java/com/plotsquared/core/events/PlotChangeOwnerEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlotChangeOwnerEvent.java @@ -25,9 +25,9 @@ */ package com.plotsquared.core.events; +import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.PlotId; -import com.plotsquared.core.player.PlotPlayer; import org.jetbrains.annotations.Nullable; import java.util.UUID; diff --git a/Core/src/main/java/com/plotsquared/core/events/PlotClearEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlotClearEvent.java index d91745d5a..b4fedfab6 100644 --- a/Core/src/main/java/com/plotsquared/core/events/PlotClearEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlotClearEvent.java @@ -57,13 +57,11 @@ public class PlotClearEvent extends PlotEvent implements CancellablePlotEvent { return getPlot().getWorldName(); } - @Override - public Result getEventResult() { + @Override public Result getEventResult() { return eventResult; } - @Override - public void setEventResult(Result e) { + @Override public void setEventResult(Result e) { this.eventResult = e; } } diff --git a/Core/src/main/java/com/plotsquared/core/events/PlotDeleteEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlotDeleteEvent.java index 3f1ebd5a3..f2b7f70a8 100644 --- a/Core/src/main/java/com/plotsquared/core/events/PlotDeleteEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlotDeleteEvent.java @@ -57,13 +57,11 @@ public class PlotDeleteEvent extends PlotEvent implements CancellablePlotEvent { return getPlot().getWorldName(); } - @Override - public Result getEventResult() { + @Override public Result getEventResult() { return eventResult; } - @Override - public void setEventResult(Result e) { + @Override public void setEventResult(Result e) { this.eventResult = e; } } diff --git a/Core/src/main/java/com/plotsquared/core/events/PlotFlagAddEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlotFlagAddEvent.java index e53f5cad5..4dc1e4f86 100644 --- a/Core/src/main/java/com/plotsquared/core/events/PlotFlagAddEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlotFlagAddEvent.java @@ -25,8 +25,8 @@ */ package com.plotsquared.core.events; -import com.plotsquared.core.plot.flag.PlotFlag; import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.flag.PlotFlag; /** * Called when a Flag is added to a plot. @@ -45,13 +45,11 @@ public class PlotFlagAddEvent extends PlotFlagEvent implements CancellablePlotEv super(plot, flag); } - @Override - public Result getEventResult() { + @Override public Result getEventResult() { return eventResult; } - @Override - public void setEventResult(Result e) { + @Override public void setEventResult(Result e) { this.eventResult = e; } } diff --git a/Core/src/main/java/com/plotsquared/core/events/PlotFlagEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlotFlagEvent.java index fb7439d79..54863d15c 100644 --- a/Core/src/main/java/com/plotsquared/core/events/PlotFlagEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlotFlagEvent.java @@ -25,8 +25,8 @@ */ package com.plotsquared.core.events; -import com.plotsquared.core.plot.flag.PlotFlag; import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.flag.PlotFlag; public abstract class PlotFlagEvent extends PlotEvent { private final PlotFlag flag; @@ -39,7 +39,7 @@ public abstract class PlotFlagEvent extends PlotEvent { /** * Get the flag involved * - * @return the flag involved + * @return the flag involved */ public PlotFlag getFlag() { return flag; diff --git a/Core/src/main/java/com/plotsquared/core/events/PlotFlagRemoveEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlotFlagRemoveEvent.java index 1191fe3ce..fbab48326 100644 --- a/Core/src/main/java/com/plotsquared/core/events/PlotFlagRemoveEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlotFlagRemoveEvent.java @@ -25,8 +25,8 @@ */ package com.plotsquared.core.events; -import com.plotsquared.core.plot.flag.PlotFlag; import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.flag.PlotFlag; /** * Called when a flag is removed from a plot @@ -45,13 +45,11 @@ public class PlotFlagRemoveEvent extends PlotFlagEvent implements CancellablePlo super(plot, flag); } - @Override - public Result getEventResult() { + @Override public Result getEventResult() { return eventResult; } - @Override - public void setEventResult(Result e) { + @Override public void setEventResult(Result e) { this.eventResult = e; } } diff --git a/Core/src/main/java/com/plotsquared/core/events/PlotMergeEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlotMergeEvent.java index 63c0acecc..71bc2eaad 100644 --- a/Core/src/main/java/com/plotsquared/core/events/PlotMergeEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlotMergeEvent.java @@ -26,8 +26,8 @@ package com.plotsquared.core.events; import com.plotsquared.core.location.Direction; -import com.plotsquared.core.plot.Plot; import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.plot.Plot; import lombok.Getter; import lombok.Setter; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/events/PlotPlayerEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlotPlayerEvent.java index b331dd32f..5e591fb57 100644 --- a/Core/src/main/java/com/plotsquared/core/events/PlotPlayerEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlotPlayerEvent.java @@ -25,8 +25,8 @@ */ package com.plotsquared.core.events; -import com.plotsquared.core.plot.Plot; import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.plot.Plot; public abstract class PlotPlayerEvent extends PlotEvent { diff --git a/Core/src/main/java/com/plotsquared/core/events/PlotRateEvent.java b/Core/src/main/java/com/plotsquared/core/events/PlotRateEvent.java index 52e7775e7..7bd8ec31e 100644 --- a/Core/src/main/java/com/plotsquared/core/events/PlotRateEvent.java +++ b/Core/src/main/java/com/plotsquared/core/events/PlotRateEvent.java @@ -25,8 +25,8 @@ */ package com.plotsquared.core.events; -import com.plotsquared.core.plot.Plot; import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.Rating; import org.jetbrains.annotations.Nullable; diff --git a/Core/src/main/java/com/plotsquared/core/plot/BlockBucket.java b/Core/src/main/java/com/plotsquared/core/plot/BlockBucket.java index 59a2221ba..b5a6250ab 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/BlockBucket.java +++ b/Core/src/main/java/com/plotsquared/core/plot/BlockBucket.java @@ -25,13 +25,13 @@ */ package com.plotsquared.core.plot; -import com.plotsquared.core.configuration.serialization.ConfigurationSerializable; -import com.plotsquared.core.configuration.ConfigurationUtil; -import com.plotsquared.core.util.MathMan; -import com.plotsquared.core.util.StringMan; -import com.plotsquared.core.util.BlockUtil; -import com.plotsquared.core.util.PatternUtil; import com.google.common.collect.ImmutableMap; +import com.plotsquared.core.configuration.ConfigurationUtil; +import com.plotsquared.core.configuration.serialization.ConfigurationSerializable; +import com.plotsquared.core.util.BlockUtil; +import com.plotsquared.core.util.MathMan; +import com.plotsquared.core.util.PatternUtil; +import com.plotsquared.core.util.StringMan; import com.sk89q.worldedit.function.pattern.BlockPattern; import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.world.block.BlockState; @@ -49,7 +49,8 @@ import java.util.regex.Matcher; * A block bucket is a container of block types, where each block * has a specified chance of being randomly picked */ -@EqualsAndHashCode(of = {"input"}) @SuppressWarnings({"unused", "WeakerAccess"}) +@EqualsAndHashCode(of = {"input"}) +@SuppressWarnings({"unused", "WeakerAccess"}) public final class BlockBucket implements ConfigurationSerializable { private static java.util.regex.Pattern regex = java.util.regex.Pattern.compile( "((?[A-Za-z_]+):)?(?([A-Za-z_]+(\\[?[\\S\\s]+\\])?))(:(?[0-9]{1,3}))?"); @@ -134,7 +135,8 @@ public final class BlockBucket implements ConfigurationSerializable { String chanceStr = matcher.group("chance"); String block = matcher.group("block"); //noinspection PointlessNullCheck - if (chanceStr != null && block != null && !MathMan.isInteger(block) && MathMan.isInteger(chanceStr)) { + if (chanceStr != null && block != null && !MathMan.isInteger(block) && MathMan + .isInteger(chanceStr)) { String namespace = matcher.group("namespace"); string = (namespace == null ? "" : namespace + ":") + block; } @@ -191,7 +193,10 @@ public final class BlockBucket implements ConfigurationSerializable { return ImmutableMap.of("blocks", this.toString()); } - @Getter @EqualsAndHashCode @RequiredArgsConstructor private static final class Range { + @Getter + @EqualsAndHashCode + @RequiredArgsConstructor + private static final class Range { private final int min; private final int max; diff --git a/Core/src/main/java/com/plotsquared/core/plot/Plot.java b/Core/src/main/java/com/plotsquared/core/plot/Plot.java index d029542dd..975c9becf 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/Plot.java +++ b/Core/src/main/java/com/plotsquared/core/plot/Plot.java @@ -25,13 +25,10 @@ */ package com.plotsquared.core.plot; -import com.plotsquared.core.events.TeleportCause; -import com.plotsquared.core.location.BlockLoc; -import com.plotsquared.core.location.Direction; -import com.plotsquared.core.location.Location; +import com.google.common.collect.BiMap; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Sets; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.location.PlotLoc; -import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.configuration.ConfigurationUtil; import com.plotsquared.core.configuration.Settings; @@ -40,32 +37,35 @@ import com.plotsquared.core.events.PlotComponentSetEvent; import com.plotsquared.core.events.PlotMergeEvent; import com.plotsquared.core.events.PlotUnlinkEvent; import com.plotsquared.core.events.Result; +import com.plotsquared.core.events.TeleportCause; +import com.plotsquared.core.generator.SquarePlotWorld; +import com.plotsquared.core.listener.PlotListener; +import com.plotsquared.core.location.BlockLoc; +import com.plotsquared.core.location.Direction; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.location.PlotLoc; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.plot.comment.PlotComment; +import com.plotsquared.core.plot.expiration.ExpireManager; +import com.plotsquared.core.plot.expiration.PlotAnalysis; import com.plotsquared.core.plot.flag.FlagContainer; import com.plotsquared.core.plot.flag.GlobalFlagContainer; import com.plotsquared.core.plot.flag.InternalFlag; import com.plotsquared.core.plot.flag.PlotFlag; import com.plotsquared.core.plot.flag.implementations.KeepFlag; -import com.plotsquared.core.generator.SquarePlotWorld; -import com.plotsquared.core.listener.PlotListener; -import com.plotsquared.core.plot.comment.PlotComment; import com.plotsquared.core.plot.schematic.Schematic; +import com.plotsquared.core.queue.GlobalBlockQueue; +import com.plotsquared.core.queue.LocalBlockQueue; import com.plotsquared.core.util.ChunkManager; import com.plotsquared.core.util.MainUtil; import com.plotsquared.core.util.MathMan; import com.plotsquared.core.util.Permissions; import com.plotsquared.core.util.SchematicHandler; import com.plotsquared.core.util.StringWrapper; +import com.plotsquared.core.util.WorldUtil; +import com.plotsquared.core.util.task.RunnableVal; import com.plotsquared.core.util.task.TaskManager; import com.plotsquared.core.util.uuid.UUIDHandler; -import com.plotsquared.core.util.WorldUtil; -import com.plotsquared.core.queue.GlobalBlockQueue; -import com.plotsquared.core.queue.LocalBlockQueue; -import com.plotsquared.core.plot.expiration.ExpireManager; -import com.plotsquared.core.plot.expiration.PlotAnalysis; -import com.plotsquared.core.util.task.RunnableVal; -import com.google.common.collect.BiMap; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; import com.sk89q.jnbt.CompoundTag; import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.math.BlockVector2; @@ -103,7 +103,12 @@ import java.util.function.Consumer; import java.util.stream.Collectors; import static com.plotsquared.core.command.SubCommand.sendMessage; -import static com.plotsquared.core.util.entity.EntityCategories.*; +import static com.plotsquared.core.util.entity.EntityCategories.CAP_ANIMAL; +import static com.plotsquared.core.util.entity.EntityCategories.CAP_ENTITY; +import static com.plotsquared.core.util.entity.EntityCategories.CAP_MISC; +import static com.plotsquared.core.util.entity.EntityCategories.CAP_MOB; +import static com.plotsquared.core.util.entity.EntityCategories.CAP_MONSTER; +import static com.plotsquared.core.util.entity.EntityCategories.CAP_VEHICLE; /** @@ -1285,12 +1290,12 @@ public class Plot { int[] count = new int[6]; for (Plot current : this.getConnectedPlots()) { int[] result = ChunkManager.manager.countEntities(current); - count[CAP_ENTITY] += result[CAP_ENTITY]; - count[CAP_ANIMAL] += result[CAP_ANIMAL]; - count[CAP_MONSTER] += result[CAP_MONSTER]; - count[CAP_MOB] += result[CAP_MOB]; - count[CAP_VEHICLE] += result[CAP_VEHICLE]; - count[CAP_MISC] += result[CAP_MISC]; + count[CAP_ENTITY] += result[CAP_ENTITY]; + count[CAP_ANIMAL] += result[CAP_ANIMAL]; + count[CAP_MONSTER] += result[CAP_MONSTER]; + count[CAP_MOB] += result[CAP_MOB]; + count[CAP_VEHICLE] += result[CAP_VEHICLE]; + count[CAP_MISC] += result[CAP_MISC]; } return count; } @@ -3058,8 +3063,8 @@ public class Plot { /** * Teleport a player to a plot and send them the teleport message. * - * @param player the player - * @param cause the cause of the teleport + * @param player the player + * @param cause the cause of the teleport * @param resultConsumer Called with the result of the teleportation */ public void teleportPlayer(final PlotPlayer player, TeleportCause cause, diff --git a/Core/src/main/java/com/plotsquared/core/plot/PlotArea.java b/Core/src/main/java/com/plotsquared/core/plot/PlotArea.java index b8e2f7ab2..45749d9e1 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/PlotArea.java +++ b/Core/src/main/java/com/plotsquared/core/plot/PlotArea.java @@ -31,10 +31,10 @@ import com.plotsquared.core.PlotSquared; import com.plotsquared.core.collection.QuadMap; import com.plotsquared.core.configuration.CaptionUtility; import com.plotsquared.core.configuration.Captions; -import com.plotsquared.core.configuration.ConfigurationUtil; import com.plotsquared.core.configuration.ConfigurationNode; -import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.configuration.ConfigurationSection; +import com.plotsquared.core.configuration.ConfigurationUtil; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.generator.GridPlotWorld; import com.plotsquared.core.generator.IndependentPlotGenerator; import com.plotsquared.core.location.Direction; @@ -217,8 +217,8 @@ public abstract class PlotArea { return false; } PlotArea plotarea = (PlotArea) obj; - return this.getWorldHash() == plotarea.getWorldHash() && this.getWorldName().equals(plotarea.getWorldName()) - && StringMan.isEqual(this.getId(), plotarea.getId()); + return this.getWorldHash() == plotarea.getWorldHash() && this.getWorldName() + .equals(plotarea.getWorldName()) && StringMan.isEqual(this.getId(), plotarea.getId()); } public Set getClusters() { @@ -359,8 +359,9 @@ public abstract class PlotArea { String prefix = " "; for (final PlotFlag flag : flagCollection) { Object value = flag.toString(); - flagBuilder.append(prefix).append(CaptionUtility.format(null, Captions.PLOT_FLAG_LIST.getTranslated(), - flag.getName(), CaptionUtility.formatRaw(null, value.toString(), ""))); + flagBuilder.append(prefix).append(CaptionUtility + .format(null, Captions.PLOT_FLAG_LIST.getTranslated(), flag.getName(), + CaptionUtility.formatRaw(null, value.toString(), ""))); prefix = ", "; } } @@ -543,8 +544,8 @@ public abstract class PlotArea { } public boolean contains(@NotNull final Location location) { - return StringMan.isEqual(location.getWorld(), this.getWorldName()) && (getRegionAbs() == null - || this.region.contains(location.getBlockVector3())); + return StringMan.isEqual(location.getWorld(), this.getWorldName()) && ( + getRegionAbs() == null || this.region.contains(location.getBlockVector3())); } @NotNull public Set getPlotsAbs(final UUID uuid) { @@ -599,6 +600,7 @@ public abstract class PlotArea { public int getPlotCount(@Nullable final PlotPlayer player) { return player != null ? getPlotCount(player.getUUID()) : 0; } + @Nullable public Plot getPlotAbs(@NotNull final PlotId id) { Plot plot = getOwnedPlotAbs(id); if (plot == null) { @@ -640,7 +642,8 @@ public abstract class PlotArea { return this.clusters != null ? this.clusters.get(plot.getId().x, plot.getId().y) : null; } - @Nullable public PlotCluster getFirstIntersectingCluster(@NotNull final PlotId pos1, + @Nullable + public PlotCluster getFirstIntersectingCluster(@NotNull final PlotId pos1, @NotNull final PlotId pos2) { if (this.clusters == null) { return null; @@ -1051,15 +1054,16 @@ public abstract class PlotArea { } else { split = key.split(":"); } - final PlotFlag flagInstance = GlobalFlagContainer.getInstance().getFlagFromString(split[0]); + final PlotFlag flagInstance = + GlobalFlagContainer.getInstance().getFlagFromString(split[0]); if (flagInstance != null) { try { flags.add(flagInstance.parse(split[1])); } catch (final FlagParseException e) { - PlotSquared.log(Captions.PREFIX.getTranslated() + - String.format("§cFailed to parse default flag with key §6'%s'§c and value: §6'%s'§c." - + " Reason: %s. This flag will not be added as a default flag.", - e.getFlag().getName(), e.getValue(), e.getErrorMessage())); + PlotSquared.log(Captions.PREFIX.getTranslated() + String.format( + "§cFailed to parse default flag with key §6'%s'§c and value: §6'%s'§c." + + " Reason: %s. This flag will not be added as a default flag.", + e.getFlag().getName(), e.getValue(), e.getErrorMessage())); } } } diff --git a/Core/src/main/java/com/plotsquared/core/plot/PlotAreaTerrainType.java b/Core/src/main/java/com/plotsquared/core/plot/PlotAreaTerrainType.java index e0835c263..1008f0104 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/PlotAreaTerrainType.java +++ b/Core/src/main/java/com/plotsquared/core/plot/PlotAreaTerrainType.java @@ -54,14 +54,13 @@ public enum PlotAreaTerrainType { ALL; private static final Map types = Stream.of(values()) - .collect(Collectors.toMap(e -> e.toString().toLowerCase(), Function.identity())); + .collect(Collectors.toMap(e -> e.toString().toLowerCase(), Function.identity())); public static Optional fromString(String typeString) { return Optional.ofNullable(types.get(typeString.toLowerCase())); } - @Deprecated - public static Optional fromLegacyInt(int typeId) { + @Deprecated public static Optional fromLegacyInt(int typeId) { if (typeId < 0 || typeId >= values().length) { return Optional.empty(); } diff --git a/Core/src/main/java/com/plotsquared/core/plot/PlotAreaType.java b/Core/src/main/java/com/plotsquared/core/plot/PlotAreaType.java index 69108a67e..60c9fc7f0 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/PlotAreaType.java +++ b/Core/src/main/java/com/plotsquared/core/plot/PlotAreaType.java @@ -32,19 +32,16 @@ import java.util.stream.Collectors; import java.util.stream.Stream; public enum PlotAreaType { - NORMAL, - AUGMENTED, - PARTIAL; + NORMAL, AUGMENTED, PARTIAL; private static final Map types = Stream.of(values()) - .collect(Collectors.toMap(e -> e.toString().toLowerCase(), Function.identity())); + .collect(Collectors.toMap(e -> e.toString().toLowerCase(), Function.identity())); public static Optional fromString(String typeName) { return Optional.ofNullable(types.get(typeName.toLowerCase())); } - @Deprecated - public static Optional fromLegacyInt(int typeId) { + @Deprecated public static Optional fromLegacyInt(int typeId) { if (typeId < 0 || typeId >= values().length) { return Optional.empty(); } diff --git a/Core/src/main/java/com/plotsquared/core/plot/PlotCluster.java b/Core/src/main/java/com/plotsquared/core/plot/PlotCluster.java index 51eed1f47..c9de0e90c 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/PlotCluster.java +++ b/Core/src/main/java/com/plotsquared/core/plot/PlotCluster.java @@ -25,9 +25,9 @@ */ package com.plotsquared.core.plot; +import com.plotsquared.core.database.DBFunc; import com.plotsquared.core.location.BlockLoc; import com.plotsquared.core.location.Location; -import com.plotsquared.core.database.DBFunc; import com.plotsquared.core.util.MainUtil; import com.plotsquared.core.util.RegionUtil; import com.sk89q.worldedit.regions.CuboidRegion; @@ -154,12 +154,13 @@ public class PlotCluster { public void getHome(Consumer result) { BlockLoc home = this.settings.getPosition(); Consumer locationConsumer = toReturn -> { - MainUtil.getHighestBlock(this.area.getWorldName(), toReturn.getX(), toReturn.getZ(), max -> { - if (max > toReturn.getY()) { - toReturn.setY(1 + max); - } - result.accept(toReturn); - }); + MainUtil.getHighestBlock(this.area.getWorldName(), toReturn.getX(), toReturn.getZ(), + max -> { + if (max > toReturn.getY()) { + toReturn.setY(1 + max); + } + result.accept(toReturn); + }); }; if (home.getY() == 0) { // default pos diff --git a/Core/src/main/java/com/plotsquared/core/plot/PlotId.java b/Core/src/main/java/com/plotsquared/core/plot/PlotId.java index f7fa1f39d..3421de833 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/PlotId.java +++ b/Core/src/main/java/com/plotsquared/core/plot/PlotId.java @@ -31,10 +31,8 @@ import org.jetbrains.annotations.Nullable; public class PlotId { - @Deprecated - public int x; - @Deprecated - public int y; + @Deprecated public int x; + @Deprecated public int y; private int hash; /** diff --git a/Core/src/main/java/com/plotsquared/core/plot/PlotManager.java b/Core/src/main/java/com/plotsquared/core/plot/PlotManager.java index 836251ddf..236eeee0f 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/PlotManager.java +++ b/Core/src/main/java/com/plotsquared/core/plot/PlotManager.java @@ -25,9 +25,9 @@ */ package com.plotsquared.core.plot; -import com.plotsquared.core.location.Location; import com.plotsquared.core.command.Template; import com.plotsquared.core.configuration.Settings; +import com.plotsquared.core.location.Location; import com.plotsquared.core.util.FileBytes; import com.sk89q.worldedit.function.pattern.Pattern; diff --git a/Core/src/main/java/com/plotsquared/core/plot/PlotSettings.java b/Core/src/main/java/com/plotsquared/core/plot/PlotSettings.java index 39d74083d..d873d6800 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/PlotSettings.java +++ b/Core/src/main/java/com/plotsquared/core/plot/PlotSettings.java @@ -25,10 +25,10 @@ */ package com.plotsquared.core.plot; +import com.google.common.collect.ImmutableList; import com.plotsquared.core.location.BlockLoc; import com.plotsquared.core.location.Direction; import com.plotsquared.core.plot.comment.PlotComment; -import com.google.common.collect.ImmutableList; import lombok.Getter; import lombok.Setter; diff --git a/Core/src/main/java/com/plotsquared/core/plot/comment/CommentInbox.java b/Core/src/main/java/com/plotsquared/core/plot/comment/CommentInbox.java index d707d0686..a1caeec21 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/comment/CommentInbox.java +++ b/Core/src/main/java/com/plotsquared/core/plot/comment/CommentInbox.java @@ -26,10 +26,10 @@ package com.plotsquared.core.plot.comment; import com.plotsquared.core.database.DBFunc; -import com.plotsquared.core.plot.Plot; import com.plotsquared.core.player.PlotPlayer; -import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.plot.Plot; import com.plotsquared.core.util.Permissions; +import com.plotsquared.core.util.task.RunnableVal; import java.util.List; diff --git a/Core/src/main/java/com/plotsquared/core/plot/comment/CommentManager.java b/Core/src/main/java/com/plotsquared/core/plot/comment/CommentManager.java index 17be28d07..6c41b905c 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/comment/CommentManager.java +++ b/Core/src/main/java/com/plotsquared/core/plot/comment/CommentManager.java @@ -25,13 +25,13 @@ */ package com.plotsquared.core.plot.comment; +import com.google.common.annotations.Beta; import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.configuration.Settings; -import com.plotsquared.core.plot.Plot; import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.plot.Plot; import com.plotsquared.core.util.task.RunnableVal; import com.plotsquared.core.util.task.TaskManager; -import com.google.common.annotations.Beta; import java.util.Collection; import java.util.HashMap; diff --git a/Core/src/main/java/com/plotsquared/core/plot/expiration/ExpireManager.java b/Core/src/main/java/com/plotsquared/core/plot/expiration/ExpireManager.java index 27bb96185..84f4139ff 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/expiration/ExpireManager.java +++ b/Core/src/main/java/com/plotsquared/core/plot/expiration/ExpireManager.java @@ -32,21 +32,21 @@ import com.plotsquared.core.database.DBFunc; import com.plotsquared.core.events.PlotFlagAddEvent; import com.plotsquared.core.events.PlotUnlinkEvent; import com.plotsquared.core.events.Result; +import com.plotsquared.core.generator.HybridUtils; +import com.plotsquared.core.player.OfflinePlotPlayer; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotAreaType; import com.plotsquared.core.plot.flag.GlobalFlagContainer; import com.plotsquared.core.plot.flag.PlotFlag; import com.plotsquared.core.plot.flag.implementations.AnalysisFlag; import com.plotsquared.core.plot.flag.implementations.KeepFlag; -import com.plotsquared.core.generator.HybridUtils; -import com.plotsquared.core.player.OfflinePlotPlayer; -import com.plotsquared.core.plot.Plot; -import com.plotsquared.core.plot.PlotArea; -import com.plotsquared.core.plot.PlotAreaType; import com.plotsquared.core.plot.message.PlotMessage; -import com.plotsquared.core.player.PlotPlayer; -import com.plotsquared.core.util.task.RunnableVal; -import com.plotsquared.core.util.task.RunnableVal3; import com.plotsquared.core.util.MainUtil; import com.plotsquared.core.util.StringMan; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.util.task.RunnableVal3; import com.plotsquared.core.util.task.TaskManager; import com.plotsquared.core.util.uuid.UUIDHandler; @@ -337,8 +337,10 @@ public class ExpireManager { } }, () -> { PlotFlag plotFlag = GlobalFlagContainer.getInstance() - .getFlag(AnalysisFlag.class).createFlagInstance(changed.asList()); - PlotFlagAddEvent event = new PlotFlagAddEvent(plotFlag, newPlot); + .getFlag(AnalysisFlag.class) + .createFlagInstance(changed.asList()); + PlotFlagAddEvent event = + new PlotFlagAddEvent(plotFlag, newPlot); if (event.getEventResult() == Result.DENY) { return; } diff --git a/Core/src/main/java/com/plotsquared/core/plot/expiration/ExpiryTask.java b/Core/src/main/java/com/plotsquared/core/plot/expiration/ExpiryTask.java index 53a33100f..a7cd1b86b 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/expiration/ExpiryTask.java +++ b/Core/src/main/java/com/plotsquared/core/plot/expiration/ExpiryTask.java @@ -51,8 +51,8 @@ public class ExpiryTask { } public boolean allowsArea(PlotArea area) { - return settings.WORLDS.contains(area.toString()) || settings.WORLDS.contains(area.getWorldName()) - || settings.WORLDS.contains("*"); + return settings.WORLDS.contains(area.toString()) || settings.WORLDS + .contains(area.getWorldName()) || settings.WORLDS.contains("*"); } public boolean applies(PlotArea area) { diff --git a/Core/src/main/java/com/plotsquared/core/plot/expiration/PlotAnalysis.java b/Core/src/main/java/com/plotsquared/core/plot/expiration/PlotAnalysis.java index dba11d26e..f7d326411 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/expiration/PlotAnalysis.java +++ b/Core/src/main/java/com/plotsquared/core/plot/expiration/PlotAnalysis.java @@ -27,11 +27,11 @@ package com.plotsquared.core.plot.expiration; import com.plotsquared.core.PlotSquared; import com.plotsquared.core.configuration.Settings; -import com.plotsquared.core.plot.flag.implementations.AnalysisFlag; import com.plotsquared.core.generator.HybridUtils; import com.plotsquared.core.plot.Plot; -import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.plot.flag.implementations.AnalysisFlag; import com.plotsquared.core.util.MathMan; +import com.plotsquared.core.util.task.RunnableVal; import com.plotsquared.core.util.task.TaskManager; import java.lang.reflect.Array; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DenyTeleportFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DenyTeleportFlag.java index 446f31348..ba923c396 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DenyTeleportFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DenyTeleportFlag.java @@ -26,10 +26,10 @@ package com.plotsquared.core.plot.flag.implementations; import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.flag.FlagParseException; import com.plotsquared.core.plot.flag.PlotFlag; -import com.plotsquared.core.plot.Plot; -import com.plotsquared.core.player.PlotPlayer; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DoneFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DoneFlag.java index 2cd329f7d..390ae4ba7 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DoneFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/DoneFlag.java @@ -26,9 +26,9 @@ package com.plotsquared.core.plot.flag.implementations; import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.flag.InternalFlag; import com.plotsquared.core.plot.flag.PlotFlag; -import com.plotsquared.core.plot.Plot; import org.jetbrains.annotations.NotNull; public class DoneFlag extends PlotFlag implements InternalFlag { diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/FlyFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/FlyFlag.java index dbd28d360..ffe72a7b4 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/FlyFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/FlyFlag.java @@ -88,9 +88,7 @@ public class FlyFlag extends PlotFlag { } public enum FlyStatus { - ENABLED, - DISABLED, - DEFAULT + ENABLED, DISABLED, DEFAULT } } diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MusicFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MusicFlag.java index 6d50df274..175c22c1e 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MusicFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/MusicFlag.java @@ -51,8 +51,8 @@ public class MusicFlag extends PlotFlag { input = "music_disc_" + input; } final ItemType itemType = ItemUtil.get(input); - if (itemType != null && itemType.getId() != null && - (itemType == ItemTypes.AIR || itemType.getId().contains("music_disc_"))) { + if (itemType != null && itemType.getId() != null && (itemType == ItemTypes.AIR || itemType + .getId().contains("music_disc_"))) { return new MusicFlag(ItemUtil.get(input)); } else { throw new FlagParseException(this, input, Captions.FLAG_ERROR_MUSIC); diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/TitlesFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/TitlesFlag.java index c51ef7b00..0b160dae5 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/TitlesFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/TitlesFlag.java @@ -83,9 +83,7 @@ public class TitlesFlag extends PlotFlag } public enum TitlesFlagValue { - NONE, - TRUE, - FALSE; + NONE, TRUE, FALSE; @Nullable public static TitlesFlagValue fromString(final String value) { if (value.equalsIgnoreCase("true")) { diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/WeatherFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/WeatherFlag.java index 5900eb354..7b7ea495d 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/WeatherFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/implementations/WeatherFlag.java @@ -26,8 +26,8 @@ package com.plotsquared.core.plot.flag.implementations; import com.plotsquared.core.configuration.Captions; -import com.plotsquared.core.plot.flag.PlotFlag; import com.plotsquared.core.plot.PlotWeather; +import com.plotsquared.core.plot.flag.PlotFlag; import org.jetbrains.annotations.NotNull; import java.util.Arrays; @@ -35,12 +35,9 @@ import java.util.Collection; public class WeatherFlag extends PlotFlag { - public static final WeatherFlag PLOT_WEATHER_FLAG_RAIN = - new WeatherFlag(PlotWeather.RAIN); - public static final WeatherFlag PLOT_WEATHER_FLAG_CLEAR = - new WeatherFlag(PlotWeather.CLEAR); - public static final WeatherFlag PLOT_WEATHER_FLAG_OFF = - new WeatherFlag(PlotWeather.RESET); + public static final WeatherFlag PLOT_WEATHER_FLAG_RAIN = new WeatherFlag(PlotWeather.RAIN); + public static final WeatherFlag PLOT_WEATHER_FLAG_CLEAR = new WeatherFlag(PlotWeather.CLEAR); + public static final WeatherFlag PLOT_WEATHER_FLAG_OFF = new WeatherFlag(PlotWeather.RESET); /** * Construct a new flag instance. @@ -92,7 +89,8 @@ public class WeatherFlag extends PlotFlag { } @Override public Collection getTabCompletions() { - return Arrays.asList("rain", "storm", "on", "lightning", "thunder", "clear", "off", "sun", "reset"); + return Arrays + .asList("rain", "storm", "on", "lightning", "thunder", "clear", "off", "sun", "reset"); } } diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/types/BlockTypeListFlag.java b/Core/src/main/java/com/plotsquared/core/plot/flag/types/BlockTypeListFlag.java index 445357ae7..6f30448f3 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/types/BlockTypeListFlag.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/types/BlockTypeListFlag.java @@ -58,8 +58,11 @@ public abstract class BlockTypeListFlag> if (blockState == null) { // If it's not a block state, we assume it's a block category final BlockCategory blockCategory; - if (!blockString.startsWith("#") || (blockCategory = BlockCategory.REGISTRY.get(blockString.substring(1))) == null) { - throw new FlagParseException(this, blockString, Captions.FLAG_ERROR_INVALID_BLOCK); + if (!blockString.startsWith("#") + || (blockCategory = BlockCategory.REGISTRY.get(blockString.substring(1))) + == null) { + throw new FlagParseException(this, blockString, + Captions.FLAG_ERROR_INVALID_BLOCK); } else { blockTypeWrapper = BlockTypeWrapper.get(blockCategory); } @@ -79,10 +82,12 @@ public abstract class BlockTypeListFlag> @Override public Collection getTabCompletions() { final Collection tabCompletions = new ArrayList<>(); - tabCompletions.addAll(BlockType.REGISTRY.keySet().stream().map(val -> val.replace("minecraft:", "")) - .collect(Collectors.toList())); - tabCompletions.addAll(BlockCategory.REGISTRY.keySet().stream().map(val -> "#" + val.replace("minecraft:", "")) - .collect(Collectors.toList())); + tabCompletions.addAll( + BlockType.REGISTRY.keySet().stream().map(val -> val.replace("minecraft:", "")) + .collect(Collectors.toList())); + tabCompletions.addAll( + BlockCategory.REGISTRY.keySet().stream().map(val -> "#" + val.replace("minecraft:", "")) + .collect(Collectors.toList())); return tabCompletions; } diff --git a/Core/src/main/java/com/plotsquared/core/plot/flag/types/BlockTypeWrapper.java b/Core/src/main/java/com/plotsquared/core/plot/flag/types/BlockTypeWrapper.java index db7f8d6f7..30c75e73b 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/flag/types/BlockTypeWrapper.java +++ b/Core/src/main/java/com/plotsquared/core/plot/flag/types/BlockTypeWrapper.java @@ -40,7 +40,8 @@ import java.util.Map; * Container that class either contains a {@link BlockType} * or a {@link BlockCategory} */ -@EqualsAndHashCode public class BlockTypeWrapper { +@EqualsAndHashCode +public class BlockTypeWrapper { @Nullable @Getter private final BlockType blockType; @Nullable @Getter private final BlockCategory blockCategory; @@ -63,7 +64,7 @@ import java.util.Map; } else { return key; } - } else if(this.blockCategory != null) { + } else if (this.blockCategory != null) { final String key = this.blockCategory.toString(); if (key.startsWith("minecraft:")) { return '#' + key.substring(10); diff --git a/Core/src/main/java/com/plotsquared/core/plot/message/PlotMessage.java b/Core/src/main/java/com/plotsquared/core/plot/message/PlotMessage.java index e0e56c4fb..95ae8e953 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/message/PlotMessage.java +++ b/Core/src/main/java/com/plotsquared/core/plot/message/PlotMessage.java @@ -26,8 +26,8 @@ package com.plotsquared.core.plot.message; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.util.ChatManager; public class PlotMessage { diff --git a/Core/src/main/java/com/plotsquared/core/plot/world/DefaultPlotAreaManager.java b/Core/src/main/java/com/plotsquared/core/plot/world/DefaultPlotAreaManager.java index 3769347a4..c4528bb81 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/world/DefaultPlotAreaManager.java +++ b/Core/src/main/java/com/plotsquared/core/plot/world/DefaultPlotAreaManager.java @@ -25,10 +25,10 @@ */ package com.plotsquared.core.plot.world; +import com.plotsquared.core.collection.QuadMap; import com.plotsquared.core.location.Location; import com.plotsquared.core.plot.PlotArea; import com.plotsquared.core.util.StringMan; -import com.plotsquared.core.collection.QuadMap; import com.sk89q.worldedit.regions.CuboidRegion; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/world/PlotAreaManager.java b/Core/src/main/java/com/plotsquared/core/plot/world/PlotAreaManager.java index 953a7cd6f..b6d23b3d4 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/world/PlotAreaManager.java +++ b/Core/src/main/java/com/plotsquared/core/plot/world/PlotAreaManager.java @@ -37,7 +37,7 @@ public interface PlotAreaManager { * method assumes that the caller already knows that * the location belongs to a plot area, in which * case it will return the appropriate plot area. - * + *

* If the location does not belong to a plot area, * it may still return an area. * diff --git a/Core/src/main/java/com/plotsquared/core/plot/world/SinglePlot.java b/Core/src/main/java/com/plotsquared/core/plot/world/SinglePlot.java index 24f3e610f..a57fe7d3d 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/world/SinglePlot.java +++ b/Core/src/main/java/com/plotsquared/core/plot/world/SinglePlot.java @@ -25,12 +25,12 @@ */ package com.plotsquared.core.plot.world; -import com.plotsquared.core.plot.flag.PlotFlag; import com.plotsquared.core.location.BlockLoc; import com.plotsquared.core.location.Location; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.PlotArea; import com.plotsquared.core.plot.PlotId; +import com.plotsquared.core.plot.flag.PlotFlag; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.regions.CuboidRegion; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotArea.java b/Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotArea.java index 39af62076..da1613cee 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotArea.java +++ b/Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotArea.java @@ -25,25 +25,25 @@ */ package com.plotsquared.core.plot.world; -import com.plotsquared.core.configuration.ConfigurationSection; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.configuration.ConfigurationUtil; import com.plotsquared.core.configuration.ConfigurationNode; -import com.plotsquared.core.generator.SingleWorldGenerator; -import com.plotsquared.core.plot.flag.FlagContainer; +import com.plotsquared.core.configuration.ConfigurationSection; +import com.plotsquared.core.configuration.ConfigurationUtil; import com.plotsquared.core.generator.GridPlotWorld; +import com.plotsquared.core.generator.SingleWorldGenerator; import com.plotsquared.core.location.Location; +import com.plotsquared.core.location.PlotLoc; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.PlotAreaType; import com.plotsquared.core.plot.PlotId; -import com.plotsquared.core.location.PlotLoc; import com.plotsquared.core.plot.PlotManager; import com.plotsquared.core.plot.PlotSettings; -import com.plotsquared.core.util.task.RunnableVal; import com.plotsquared.core.plot.SetupObject; +import com.plotsquared.core.plot.flag.FlagContainer; import com.plotsquared.core.util.SetupUtils; -import com.plotsquared.core.util.task.TaskManager; import com.plotsquared.core.util.WorldUtil; +import com.plotsquared.core.util.task.RunnableVal; +import com.plotsquared.core.util.task.TaskManager; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -197,8 +197,9 @@ public class SinglePlotArea extends GridPlotWorld { PlotSettings s = p.getSettings(); final FlagContainer oldContainer = p.getFlagContainer(); - p = new SinglePlot(p.getId(), p.getOwnerAbs(), p.getTrusted(), p.getMembers(), p.getDenied(), - s.getAlias(), s.getPosition(), null, this, s.getMerged(), p.getTimestamp(), p.temp); + p = new SinglePlot(p.getId(), p.getOwnerAbs(), p.getTrusted(), p.getMembers(), + p.getDenied(), s.getAlias(), s.getPosition(), null, this, s.getMerged(), + p.getTimestamp(), p.temp); p.getFlagContainer().addAll(oldContainer); return p; diff --git a/Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotAreaManager.java b/Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotAreaManager.java index 6f13bc7cd..eb512cd50 100644 --- a/Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotAreaManager.java +++ b/Core/src/main/java/com/plotsquared/core/plot/world/SinglePlotAreaManager.java @@ -25,10 +25,10 @@ */ package com.plotsquared.core.plot.world; +import com.plotsquared.core.collection.ArrayUtil; import com.plotsquared.core.generator.SingleWorldGenerator; import com.plotsquared.core.location.Location; import com.plotsquared.core.plot.PlotArea; -import com.plotsquared.core.collection.ArrayUtil; import com.plotsquared.core.util.SetupUtils; import com.sk89q.worldedit.regions.CuboidRegion; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/plotsquared/core/queue/LocalBlockQueue.java b/Core/src/main/java/com/plotsquared/core/queue/LocalBlockQueue.java index 570488307..f979b4e9f 100644 --- a/Core/src/main/java/com/plotsquared/core/queue/LocalBlockQueue.java +++ b/Core/src/main/java/com/plotsquared/core/queue/LocalBlockQueue.java @@ -27,11 +27,11 @@ package com.plotsquared.core.queue; import com.plotsquared.core.location.Location; import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.util.PatternUtil; import com.plotsquared.core.util.SchematicHandler; import com.plotsquared.core.util.StringMan; -import com.plotsquared.core.util.uuid.UUIDHandler; import com.plotsquared.core.util.WorldUtil; -import com.plotsquared.core.util.PatternUtil; +import com.plotsquared.core.util.uuid.UUIDHandler; import com.sk89q.jnbt.CompoundTag; import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.math.BlockVector2; @@ -131,7 +131,8 @@ public abstract class LocalBlockQueue { .equals(loc)) { continue; } - pLoc.setY(WorldUtil.IMP.getHighestBlockSynchronous(getWorld(), pLoc.getX(), pLoc.getZ())); + pLoc.setY( + WorldUtil.IMP.getHighestBlockSynchronous(getWorld(), pLoc.getX(), pLoc.getZ())); pp.teleport(pLoc); } } diff --git a/Core/src/main/java/com/plotsquared/core/queue/LocationOffsetDelegateLocalBlockQueue.java b/Core/src/main/java/com/plotsquared/core/queue/LocationOffsetDelegateLocalBlockQueue.java index 966cb36a6..cea58a95d 100644 --- a/Core/src/main/java/com/plotsquared/core/queue/LocationOffsetDelegateLocalBlockQueue.java +++ b/Core/src/main/java/com/plotsquared/core/queue/LocationOffsetDelegateLocalBlockQueue.java @@ -40,9 +40,8 @@ public class LocationOffsetDelegateLocalBlockQueue extends DelegateLocalBlockQue private final int blockX; private final int blockZ; - public LocationOffsetDelegateLocalBlockQueue(final boolean[][] canPlace, - final int blockX, final int blockZ, - @Nullable LocalBlockQueue parent) { + public LocationOffsetDelegateLocalBlockQueue(final boolean[][] canPlace, final int blockX, + final int blockZ, @Nullable LocalBlockQueue parent) { super(parent); this.canPlace = canPlace; this.blockX = blockX; @@ -62,8 +61,10 @@ public class LocationOffsetDelegateLocalBlockQueue extends DelegateLocalBlockQue return super.setBlock(x, y, z, id); } } catch (final Exception e) { - PlotSquared.debug(String.format("Failed to set block at: %d;%d;%d (to = %s) with offset %d;%d." - + " Translated to: %d;%d", x, y, z, id, blockX, blockZ, x - blockX, z - blockZ)); + PlotSquared.debug(String.format( + "Failed to set block at: %d;%d;%d (to = %s) with offset %d;%d." + + " Translated to: %d;%d", x, y, z, id, blockX, blockZ, x - blockX, + z - blockZ)); throw e; } return false; diff --git a/Core/src/main/java/com/plotsquared/core/util/ChatManager.java b/Core/src/main/java/com/plotsquared/core/util/ChatManager.java index e6f741219..0398f6538 100644 --- a/Core/src/main/java/com/plotsquared/core/util/ChatManager.java +++ b/Core/src/main/java/com/plotsquared/core/util/ChatManager.java @@ -25,8 +25,8 @@ */ package com.plotsquared.core.util; -import com.plotsquared.core.plot.message.PlotMessage; import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.plot.message.PlotMessage; public abstract class ChatManager { public static ChatManager manager; diff --git a/Core/src/main/java/com/plotsquared/core/util/ChunkManager.java b/Core/src/main/java/com/plotsquared/core/util/ChunkManager.java index 6a938b7e6..4a4082d8b 100644 --- a/Core/src/main/java/com/plotsquared/core/util/ChunkManager.java +++ b/Core/src/main/java/com/plotsquared/core/util/ChunkManager.java @@ -28,10 +28,10 @@ package com.plotsquared.core.util; import com.plotsquared.core.PlotSquared; import com.plotsquared.core.location.Location; import com.plotsquared.core.plot.Plot; -import com.plotsquared.core.util.task.RunnableVal; import com.plotsquared.core.queue.GlobalBlockQueue; import com.plotsquared.core.queue.LocalBlockQueue; import com.plotsquared.core.queue.ScopedLocalBlockQueue; +import com.plotsquared.core.util.task.RunnableVal; import com.plotsquared.core.util.task.TaskManager; import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.regions.CuboidRegion; diff --git a/Core/src/main/java/com/plotsquared/core/util/EntityUtil.java b/Core/src/main/java/com/plotsquared/core/util/EntityUtil.java index e0e579171..91eb4e99d 100644 --- a/Core/src/main/java/com/plotsquared/core/util/EntityUtil.java +++ b/Core/src/main/java/com/plotsquared/core/util/EntityUtil.java @@ -26,9 +26,9 @@ package com.plotsquared.core.util; import com.plotsquared.core.configuration.Settings; +import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.flag.PlotFlag; import com.plotsquared.core.plot.flag.implementations.DoneFlag; -import com.plotsquared.core.plot.Plot; import lombok.NonNull; import lombok.experimental.UtilityClass; @@ -42,7 +42,8 @@ import static com.plotsquared.core.util.entity.EntityCategories.CAP_VEHICLE; /** * Entity related general utility methods */ -@UtilityClass public final class EntityUtil { +@UtilityClass +public final class EntityUtil { private static int capNumeral(@NonNull final String flagName) { int i; diff --git a/Core/src/main/java/com/plotsquared/core/util/EventDispatcher.java b/Core/src/main/java/com/plotsquared/core/util/EventDispatcher.java index e64c3b919..cb554b754 100644 --- a/Core/src/main/java/com/plotsquared/core/util/EventDispatcher.java +++ b/Core/src/main/java/com/plotsquared/core/util/EventDispatcher.java @@ -25,7 +25,11 @@ */ package com.plotsquared.core.util; +import com.google.common.eventbus.EventBus; import com.plotsquared.core.PlotSquared; +import com.plotsquared.core.configuration.CaptionUtility; +import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.events.PlayerAutoPlotEvent; import com.plotsquared.core.events.PlayerClaimPlotEvent; import com.plotsquared.core.events.PlayerEnterPlotEvent; @@ -46,10 +50,15 @@ import com.plotsquared.core.events.PlotFlagRemoveEvent; import com.plotsquared.core.events.PlotMergeEvent; import com.plotsquared.core.events.PlotRateEvent; import com.plotsquared.core.events.PlotUnlinkEvent; +import com.plotsquared.core.listener.PlayerBlockEventType; +import com.plotsquared.core.location.Direction; +import com.plotsquared.core.location.Location; import com.plotsquared.core.player.PlotPlayer; -import com.plotsquared.core.configuration.CaptionUtility; -import com.plotsquared.core.configuration.Captions; -import com.plotsquared.core.configuration.Settings; +import com.plotsquared.core.plot.Plot; +import com.plotsquared.core.plot.PlotArea; +import com.plotsquared.core.plot.PlotId; +import com.plotsquared.core.plot.Rating; +import com.plotsquared.core.plot.expiration.ExpireManager; import com.plotsquared.core.plot.flag.PlotFlag; import com.plotsquared.core.plot.flag.implementations.DeviceInteractFlag; import com.plotsquared.core.plot.flag.implementations.MiscPlaceFlag; @@ -58,17 +67,8 @@ import com.plotsquared.core.plot.flag.implementations.PlaceFlag; import com.plotsquared.core.plot.flag.implementations.UseFlag; import com.plotsquared.core.plot.flag.implementations.VehiclePlaceFlag; import com.plotsquared.core.plot.flag.types.BlockTypeWrapper; -import com.plotsquared.core.listener.PlayerBlockEventType; -import com.plotsquared.core.location.Direction; -import com.plotsquared.core.location.Location; -import com.plotsquared.core.plot.Plot; -import com.plotsquared.core.plot.PlotArea; -import com.plotsquared.core.plot.PlotId; -import com.plotsquared.core.plot.Rating; import com.plotsquared.core.plot.world.SinglePlotArea; -import com.plotsquared.core.plot.expiration.ExpireManager; import com.plotsquared.core.util.task.TaskManager; -import com.google.common.eventbus.EventBus; import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.world.block.BlockType; import com.sk89q.worldedit.world.block.BlockTypes; @@ -241,7 +241,8 @@ public class EventDispatcher { final Plot plot = player.getCurrentPlot(); if (Settings.Teleport.ON_LOGIN && plot != null && !(plot .getArea() instanceof SinglePlotArea)) { - TaskManager.runTask(() -> plot.teleportPlayer(player, result -> {})); + TaskManager.runTask(() -> plot.teleportPlayer(player, result -> { + })); MainUtil.sendMessage(player, CaptionUtility.format(player, Captions.TELEPORTED_TO_ROAD.getTranslated()) + " (on-login) " + "(" + plot.getId().x + ";" + plot.getId().y + ")"); @@ -251,7 +252,8 @@ public class EventDispatcher { public void doRespawnTask(final PlotPlayer player) { final Plot plot = player.getCurrentPlot(); if (Settings.Teleport.ON_DEATH && plot != null) { - TaskManager.runTask(() -> plot.teleportPlayer(player, result -> {})); + TaskManager.runTask(() -> plot.teleportPlayer(player, result -> { + })); MainUtil.sendMessage(player, Captions.TELEPORTED_TO_ROAD); } } diff --git a/Core/src/main/java/com/plotsquared/core/util/InventoryUtil.java b/Core/src/main/java/com/plotsquared/core/util/InventoryUtil.java index c203a9656..c2d12ae13 100644 --- a/Core/src/main/java/com/plotsquared/core/util/InventoryUtil.java +++ b/Core/src/main/java/com/plotsquared/core/util/InventoryUtil.java @@ -25,9 +25,9 @@ */ package com.plotsquared.core.util; +import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.plot.PlotInventory; import com.plotsquared.core.plot.PlotItemStack; -import com.plotsquared.core.player.PlotPlayer; /** * This class is only used by internal functions, for most cases use the PlotInventory class diff --git a/Core/src/main/java/com/plotsquared/core/util/LegacyConverter.java b/Core/src/main/java/com/plotsquared/core/util/LegacyConverter.java index e930c6aec..d329a8e23 100644 --- a/Core/src/main/java/com/plotsquared/core/util/LegacyConverter.java +++ b/Core/src/main/java/com/plotsquared/core/util/LegacyConverter.java @@ -25,12 +25,12 @@ */ package com.plotsquared.core.util; -import com.plotsquared.core.configuration.ConfigurationSection; import com.plotsquared.core.PlotSquared; import com.plotsquared.core.configuration.CaptionUtility; import com.plotsquared.core.configuration.Captions; -import com.plotsquared.core.plot.BlockBucket; +import com.plotsquared.core.configuration.ConfigurationSection; import com.plotsquared.core.player.ConsolePlayer; +import com.plotsquared.core.plot.BlockBucket; import com.sk89q.worldedit.world.block.BlockState; import lombok.NonNull; @@ -42,7 +42,8 @@ import java.util.Map; /** * Converts legacy configurations into the new (BlockBucket) format */ -@SuppressWarnings("unused") public final class LegacyConverter { +@SuppressWarnings("unused") +public final class LegacyConverter { public static final String CONFIGURATION_VERSION = "post_flattening"; private static final HashMap TYPE_MAP = new HashMap<>(); @@ -109,7 +110,8 @@ import java.util.Map; final BlockBucket bucket = this.blockToBucket(block); this.setString(section, key, bucket); PlotSquared.log(CaptionUtility - .format(ConsolePlayer.getConsole(), Captions.LEGACY_CONFIG_REPLACED.getTranslated(), block, bucket.toString())); + .format(ConsolePlayer.getConsole(), Captions.LEGACY_CONFIG_REPLACED.getTranslated(), + block, bucket.toString())); } private void convertBlockList(@NonNull final ConfigurationSection section, @@ -118,8 +120,8 @@ import java.util.Map; final BlockBucket bucket = this.blockListToBucket(blocks); this.setString(section, key, bucket); PlotSquared.log(CaptionUtility - .format(ConsolePlayer.getConsole(), Captions.LEGACY_CONFIG_REPLACED.getTranslated(), plotBlockArrayString(blocks), - bucket.toString())); + .format(ConsolePlayer.getConsole(), Captions.LEGACY_CONFIG_REPLACED.getTranslated(), + plotBlockArrayString(blocks), bucket.toString())); } private String plotBlockArrayString(@NonNull final BlockState[] blocks) { diff --git a/Core/src/main/java/com/plotsquared/core/util/MainUtil.java b/Core/src/main/java/com/plotsquared/core/util/MainUtil.java index 0bd6bee3e..93cb7b3e4 100644 --- a/Core/src/main/java/com/plotsquared/core/util/MainUtil.java +++ b/Core/src/main/java/com/plotsquared/core/util/MainUtil.java @@ -26,28 +26,27 @@ package com.plotsquared.core.util; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.util.net.AbstractDelegateOutputStream; -import com.plotsquared.core.configuration.ConfigurationSection; -import com.plotsquared.core.player.ConsolePlayer; -import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.command.Like; import com.plotsquared.core.configuration.Caption; import com.plotsquared.core.configuration.CaptionUtility; import com.plotsquared.core.configuration.Captions; +import com.plotsquared.core.configuration.ConfigurationSection; import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.database.DBFunc; -import com.plotsquared.core.plot.expiration.ExpireManager; -import com.plotsquared.core.plot.flag.PlotFlag; -import com.plotsquared.core.plot.flag.implementations.DescriptionFlag; -import com.plotsquared.core.plot.flag.implementations.ServerPlotFlag; -import com.plotsquared.core.plot.flag.types.DoubleFlag; import com.plotsquared.core.location.Location; +import com.plotsquared.core.player.ConsolePlayer; +import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.PlotArea; import com.plotsquared.core.plot.PlotAreaTerrainType; import com.plotsquared.core.plot.PlotAreaType; import com.plotsquared.core.plot.PlotId; - +import com.plotsquared.core.plot.expiration.ExpireManager; +import com.plotsquared.core.plot.flag.PlotFlag; +import com.plotsquared.core.plot.flag.implementations.DescriptionFlag; +import com.plotsquared.core.plot.flag.implementations.ServerPlotFlag; +import com.plotsquared.core.plot.flag.types.DoubleFlag; +import com.plotsquared.core.util.net.AbstractDelegateOutputStream; import com.plotsquared.core.util.task.RunnableVal; import com.plotsquared.core.util.task.TaskManager; import com.plotsquared.core.util.uuid.UUIDHandler; @@ -59,11 +58,9 @@ import org.jetbrains.annotations.NotNull; import java.io.File; import java.io.IOException; -import java.io.InputStreamReader; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.PrintWriter; -import java.io.Reader; import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URL; @@ -97,6 +94,7 @@ import java.util.stream.IntStream; public class MainUtil { private static final DecimalFormat FLAG_DECIMAL_FORMAT = new DecimalFormat("0"); + static { FLAG_DECIMAL_FORMAT.setMaximumFractionDigits(340); } @@ -252,10 +250,12 @@ public class MainUtil { */ public static boolean resetBiome(PlotArea area, Location pos1, Location pos2) { BiomeType biome = area.getPlotBiome(); - if (!Objects.equals(WorldUtil.IMP.getBiomeSynchronous(area.getWorldName(), (pos1.getX() + pos2.getX()) / 2, - (pos1.getZ() + pos2.getZ()) / 2), biome)) { - MainUtil.setBiome(area.getWorldName(), pos1.getX(), pos1.getZ(), pos2.getX(), pos2.getZ(), - biome); + if (!Objects.equals(WorldUtil.IMP + .getBiomeSynchronous(area.getWorldName(), (pos1.getX() + pos2.getX()) / 2, + (pos1.getZ() + pos2.getZ()) / 2), biome)) { + MainUtil + .setBiome(area.getWorldName(), pos1.getX(), pos1.getZ(), pos2.getX(), pos2.getZ(), + biome); return true; } return false; @@ -656,8 +656,8 @@ public class MainUtil { .format(null, (prefix ? Captions.PREFIX.getTranslated() : "") + msg); PlotSquared.log(message); } else { - player.sendMessage( - CaptionUtility.format(player, (prefix ? Captions.PREFIX.getTranslated() : "") + Captions.color(msg))); + player.sendMessage(CaptionUtility.format(player, + (prefix ? Captions.PREFIX.getTranslated() : "") + Captions.color(msg))); } } return true; @@ -776,8 +776,8 @@ public class MainUtil { * @param full * @param whenDone */ - public static void format(final String iInfo, final Plot plot, PlotPlayer player, final boolean full, - final RunnableVal whenDone) { + public static void format(final String iInfo, final Plot plot, PlotPlayer player, + final boolean full, final RunnableVal whenDone) { int num = plot.getConnectedPlots().size(); String alias = !plot.getAlias().isEmpty() ? plot.getAlias() : Captions.NONE.getTranslated(); Location bot = plot.getCorners()[0]; @@ -820,16 +820,19 @@ public class MainUtil { } else { value = flag.toString(); } - flags.append(prefix).append(CaptionUtility.format(player, Captions.PLOT_FLAG_LIST.getTranslated(), - flag.getName(), CaptionUtility.formatRaw(player, value.toString(), ""))); + flags.append(prefix).append(CaptionUtility + .format(player, Captions.PLOT_FLAG_LIST.getTranslated(), flag.getName(), + CaptionUtility.formatRaw(player, value.toString(), ""))); prefix = ", "; } } boolean build = plot.isAdded(player.getUUID()); String owner = plot.getOwners().isEmpty() ? "unowned" : getPlayerList(plot.getOwners()); if (plot.getArea() != null) { - info = info.replace("%area%", plot.getArea().getWorldName() + - (plot.getArea().getId() == null ? "" : "(" + plot.getArea().getId() + ")")); + info = info.replace("%area%", + plot.getArea().getWorldName() + (plot.getArea().getId() == null ? + "" : + "(" + plot.getArea().getId() + ")")); } else { info = info.replace("%area%", Captions.NONE.getTranslated()); } @@ -941,9 +944,8 @@ public class MainUtil { } private static T getValueFromConfig(ConfigurationSection config, String path, - IntFunction> intParser, - Function> textualParser, - Supplier defaultValue) { + IntFunction> intParser, Function> textualParser, + Supplier defaultValue) { String value = config.getString(path); if (value == null) { return defaultValue.get(); @@ -955,16 +957,12 @@ public class MainUtil { } public static PlotAreaType getType(ConfigurationSection config) { - return getValueFromConfig(config, "generator.type", - PlotAreaType::fromLegacyInt, - PlotAreaType::fromString, - () -> PlotAreaType.NORMAL); + return getValueFromConfig(config, "generator.type", PlotAreaType::fromLegacyInt, + PlotAreaType::fromString, () -> PlotAreaType.NORMAL); } public static PlotAreaTerrainType getTerrain(ConfigurationSection config) { - return getValueFromConfig(config, "generator.terrain", - PlotAreaTerrainType::fromLegacyInt, - PlotAreaTerrainType::fromString, - () -> PlotAreaTerrainType.NONE); + return getValueFromConfig(config, "generator.terrain", PlotAreaTerrainType::fromLegacyInt, + PlotAreaTerrainType::fromString, () -> PlotAreaTerrainType.NONE); } } diff --git a/Core/src/main/java/com/plotsquared/core/util/OperationUtil.java b/Core/src/main/java/com/plotsquared/core/util/OperationUtil.java index af2df598e..37dc11d80 100644 --- a/Core/src/main/java/com/plotsquared/core/util/OperationUtil.java +++ b/Core/src/main/java/com/plotsquared/core/util/OperationUtil.java @@ -25,10 +25,10 @@ */ package com.plotsquared.core.util; -import com.plotsquared.core.location.Location; -import com.plotsquared.core.player.PlotPlayer; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListeningExecutorService; +import com.plotsquared.core.location.Location; +import com.plotsquared.core.player.PlotPlayer; import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.LocalSession; import com.sk89q.worldedit.WorldEdit; diff --git a/Core/src/main/java/com/plotsquared/core/util/PatternUtil.java b/Core/src/main/java/com/plotsquared/core/util/PatternUtil.java index 146215c52..a5a3911cc 100644 --- a/Core/src/main/java/com/plotsquared/core/util/PatternUtil.java +++ b/Core/src/main/java/com/plotsquared/core/util/PatternUtil.java @@ -25,10 +25,10 @@ */ package com.plotsquared.core.util; +import com.google.common.base.Preconditions; import com.plotsquared.core.command.Command; import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.player.PlotPlayer; -import com.google.common.base.Preconditions; import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.entity.Player; import com.sk89q.worldedit.extension.input.InputParseException; @@ -47,10 +47,8 @@ public class PatternUtil { public static BaseBlock apply(@NotNull Pattern pattern, int x, int y, int z) { Preconditions.checkNotNull(pattern, "Pattern may not be null"); - if (pattern instanceof BlockPattern - || pattern instanceof RandomPattern - || pattern instanceof BlockState - || pattern instanceof BlockType + if (pattern instanceof BlockPattern || pattern instanceof RandomPattern + || pattern instanceof BlockState || pattern instanceof BlockType || pattern instanceof BaseBlock) { return pattern.apply(BlockVector3.ZERO); } diff --git a/Core/src/main/java/com/plotsquared/core/util/RuntimeExceptionRunnableVal.java b/Core/src/main/java/com/plotsquared/core/util/RuntimeExceptionRunnableVal.java index 56bb9cc70..f66b384ed 100644 --- a/Core/src/main/java/com/plotsquared/core/util/RuntimeExceptionRunnableVal.java +++ b/Core/src/main/java/com/plotsquared/core/util/RuntimeExceptionRunnableVal.java @@ -30,7 +30,8 @@ import lombok.RequiredArgsConstructor; import java.util.concurrent.atomic.AtomicBoolean; -@RequiredArgsConstructor public class RuntimeExceptionRunnableVal extends RunnableVal { +@RequiredArgsConstructor +public class RuntimeExceptionRunnableVal extends RunnableVal { private final RunnableVal function; private final AtomicBoolean running; diff --git a/Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java b/Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java index d110626f9..3adb8d19e 100644 --- a/Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java +++ b/Core/src/main/java/com/plotsquared/core/util/SchematicHandler.java @@ -31,11 +31,11 @@ import com.plotsquared.core.generator.ClassicPlotWorld; import com.plotsquared.core.location.Location; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.PlotArea; -import com.plotsquared.core.util.uuid.UUIDHandler; -import com.plotsquared.core.util.task.RunnableVal; import com.plotsquared.core.plot.schematic.Schematic; import com.plotsquared.core.queue.LocalBlockQueue; +import com.plotsquared.core.util.task.RunnableVal; import com.plotsquared.core.util.task.TaskManager; +import com.plotsquared.core.util.uuid.UUIDHandler; import com.sk89q.jnbt.CompoundTag; import com.sk89q.jnbt.NBTInputStream; import com.sk89q.jnbt.NBTOutputStream; @@ -205,7 +205,8 @@ public abstract class SchematicHandler { if (pw instanceof ClassicPlotWorld) { y_offset_actual = yOffset + ((ClassicPlotWorld) pw).PLOT_HEIGHT; } else { - y_offset_actual = yOffset + 1 + WorldUtil.IMP.getHighestBlockSynchronous(plot.getWorldName(), + y_offset_actual = yOffset + 1 + WorldUtil.IMP + .getHighestBlockSynchronous(plot.getWorldName(), region.getMinimumPoint().getX() + 1, region.getMinimumPoint().getZ() + 1); } diff --git a/Core/src/main/java/com/plotsquared/core/util/WEManager.java b/Core/src/main/java/com/plotsquared/core/util/WEManager.java index 9734a562a..110c3ec3e 100644 --- a/Core/src/main/java/com/plotsquared/core/util/WEManager.java +++ b/Core/src/main/java/com/plotsquared/core/util/WEManager.java @@ -27,12 +27,12 @@ package com.plotsquared.core.util; import com.plotsquared.core.PlotSquared; import com.plotsquared.core.configuration.Settings; -import com.plotsquared.core.plot.flag.implementations.DoneFlag; -import com.plotsquared.core.plot.flag.implementations.NoWorldeditFlag; import com.plotsquared.core.location.Location; +import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.PlotArea; -import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.plot.flag.implementations.DoneFlag; +import com.plotsquared.core.plot.flag.implementations.NoWorldeditFlag; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.regions.CuboidRegion; diff --git a/Core/src/main/java/com/plotsquared/core/util/WorldUtil.java b/Core/src/main/java/com/plotsquared/core/util/WorldUtil.java index 33ce89694..9c7730703 100644 --- a/Core/src/main/java/com/plotsquared/core/util/WorldUtil.java +++ b/Core/src/main/java/com/plotsquared/core/util/WorldUtil.java @@ -27,8 +27,8 @@ package com.plotsquared.core.util; import com.plotsquared.core.PlotSquared; import com.plotsquared.core.location.Location; -import com.plotsquared.core.plot.Plot; import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.plot.Plot; import com.plotsquared.core.util.task.RunnableVal; import com.sk89q.jnbt.CompoundTag; import com.sk89q.jnbt.IntTag; @@ -70,8 +70,7 @@ public abstract class WorldUtil { /** * @deprecated May result in synchronous chunk loading */ - @Deprecated - public abstract String[] getSignSynchronous(Location location); + @Deprecated public abstract String[] getSignSynchronous(Location location); public abstract Location getSpawn(String world); @@ -90,24 +89,21 @@ public abstract class WorldUtil { /** * @deprecated May result in synchronous chunk loading */ - @Deprecated - public abstract BiomeType getBiomeSynchronous(String world, int x, int z); + @Deprecated public abstract BiomeType getBiomeSynchronous(String world, int x, int z); public abstract void getBlock(Location location, Consumer result); /** * @deprecated May result in synchronous chunk loading */ - @Deprecated - public abstract BlockState getBlockSynchronous(Location location); + @Deprecated public abstract BlockState getBlockSynchronous(Location location); public abstract void getHighestBlock(String world, int x, int z, final IntConsumer result); /** * @deprecated May result in synchronous chunk loading */ - @Deprecated - public abstract int getHighestBlockSynchronous(String world, int x, int z); + @Deprecated public abstract int getHighestBlockSynchronous(String world, int x, int z); public abstract void setSign(String world, int x, int y, int z, String[] lines); @@ -115,7 +111,8 @@ public abstract class WorldUtil { public abstract com.sk89q.worldedit.world.World getWeWorld(String world); - public void upload(@NotNull final Plot plot, UUID uuid, String file, RunnableVal whenDone) { + public void upload(@NotNull final Plot plot, UUID uuid, String file, + RunnableVal whenDone) { plot.getHome(home -> MainUtil.upload(uuid, file, "zip", new RunnableVal() { @Override public void run(OutputStream output) { try (final ZipOutputStream zos = new ZipOutputStream(output)) { diff --git a/Core/src/main/java/com/plotsquared/core/util/entity/EntityCategories.java b/Core/src/main/java/com/plotsquared/core/util/entity/EntityCategories.java index 485db847b..ae1a5c0cd 100644 --- a/Core/src/main/java/com/plotsquared/core/util/entity/EntityCategories.java +++ b/Core/src/main/java/com/plotsquared/core/util/entity/EntityCategories.java @@ -30,22 +30,22 @@ package com.plotsquared.core.util.entity; */ public class EntityCategories { - public static final int CAP_ENTITY = 0; - public static final int CAP_ANIMAL = 1; + public static final int CAP_ENTITY = 0; + public static final int CAP_ANIMAL = 1; public static final int CAP_MONSTER = 2; - public static final int CAP_MOB = 3; + public static final int CAP_MOB = 3; public static final int CAP_VEHICLE = 4; - public static final int CAP_MISC = 5; + public static final int CAP_MISC = 5; - public static final EntityCategory ANIMAL = register("animal"); - public static final EntityCategory TAMEABLE = register("tameable"); - public static final EntityCategory VEHICLE = register("vehicle"); - public static final EntityCategory HOSTILE = register("hostile"); - public static final EntityCategory HANGING = register("hanging"); - public static final EntityCategory VILLAGER = register("villager"); - public static final EntityCategory PROJECTILE = register("projectile"); - public static final EntityCategory OTHER = register("other"); - public static final EntityCategory PLAYER = register("player"); + public static final EntityCategory ANIMAL = register("animal"); + public static final EntityCategory TAMEABLE = register("tameable"); + public static final EntityCategory VEHICLE = register("vehicle"); + public static final EntityCategory HOSTILE = register("hostile"); + public static final EntityCategory HANGING = register("hanging"); + public static final EntityCategory VILLAGER = register("villager"); + public static final EntityCategory PROJECTILE = register("projectile"); + public static final EntityCategory OTHER = register("other"); + public static final EntityCategory PLAYER = register("player"); public static EntityCategory register(final String id) { final EntityCategory entityCategory = new EntityCategory(id); @@ -53,6 +53,7 @@ public class EntityCategories { return entityCategory; } - public static void init() {} + public static void init() { + } } diff --git a/Core/src/main/java/com/plotsquared/core/util/entity/EntityCategory.java b/Core/src/main/java/com/plotsquared/core/util/entity/EntityCategory.java index 60f7190ef..30236ed34 100644 --- a/Core/src/main/java/com/plotsquared/core/util/entity/EntityCategory.java +++ b/Core/src/main/java/com/plotsquared/core/util/entity/EntityCategory.java @@ -38,7 +38,8 @@ import java.util.Set; */ public class EntityCategory extends Category implements Keyed { - public static final NamespacedRegistry REGISTRY = new NamespacedRegistry<>("entity type"); + public static final NamespacedRegistry REGISTRY = + new NamespacedRegistry<>("entity type"); private final String key; diff --git a/Core/src/main/java/com/plotsquared/core/util/net/IncendoPaster.java b/Core/src/main/java/com/plotsquared/core/util/net/IncendoPaster.java index 16b30da39..46ae63f7d 100644 --- a/Core/src/main/java/com/plotsquared/core/util/net/IncendoPaster.java +++ b/Core/src/main/java/com/plotsquared/core/util/net/IncendoPaster.java @@ -25,8 +25,8 @@ */ package com.plotsquared.core.util.net; -import com.plotsquared.core.PlotSquared; import com.google.common.base.Charsets; +import com.plotsquared.core.PlotSquared; import java.io.BufferedReader; import java.io.InputStreamReader; @@ -44,7 +44,8 @@ import java.util.Locale; /** * Single class paster for the Incendo paste service */ -@SuppressWarnings({"unused", "WeakerAccess"}) public final class IncendoPaster { +@SuppressWarnings({"unused", "WeakerAccess"}) +public final class IncendoPaster { /** * Upload service URL diff --git a/Core/src/main/java/com/plotsquared/core/util/task/AutoClaimFinishTask.java b/Core/src/main/java/com/plotsquared/core/util/task/AutoClaimFinishTask.java index 8e7640eda..81d2d2199 100644 --- a/Core/src/main/java/com/plotsquared/core/util/task/AutoClaimFinishTask.java +++ b/Core/src/main/java/com/plotsquared/core/util/task/AutoClaimFinishTask.java @@ -32,14 +32,15 @@ import com.plotsquared.core.database.DBFunc; import com.plotsquared.core.events.PlotMergeEvent; import com.plotsquared.core.events.Result; import com.plotsquared.core.location.Direction; +import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.PlotArea; -import com.plotsquared.core.player.PlotPlayer; import lombok.RequiredArgsConstructor; import static com.plotsquared.core.util.MainUtil.sendMessage; -@RequiredArgsConstructor public final class AutoClaimFinishTask extends RunnableVal { +@RequiredArgsConstructor +public final class AutoClaimFinishTask extends RunnableVal { private final PlotPlayer player; private final Plot plot; @@ -62,8 +63,7 @@ import static com.plotsquared.core.util.MainUtil.sendMessage; if (event.getEventResult() == Result.DENY) { sendMessage(player, Captions.EVENT_DENIED, "Auto merge"); } else { - plot.autoMerge(event.getDir(), event.getMax(), player.getUUID(), - true); + plot.autoMerge(event.getDir(), event.getMax(), player.getUUID(), true); } } } else { diff --git a/Core/src/main/java/com/plotsquared/core/util/task/ObjectTaskRunnable.java b/Core/src/main/java/com/plotsquared/core/util/task/ObjectTaskRunnable.java index 62be029fe..63c0ebc8c 100644 --- a/Core/src/main/java/com/plotsquared/core/util/task/ObjectTaskRunnable.java +++ b/Core/src/main/java/com/plotsquared/core/util/task/ObjectTaskRunnable.java @@ -29,7 +29,8 @@ import lombok.RequiredArgsConstructor; import java.util.Iterator; -@RequiredArgsConstructor public class ObjectTaskRunnable implements Runnable { +@RequiredArgsConstructor +public class ObjectTaskRunnable implements Runnable { private final Iterator iterator; private final RunnableVal task; diff --git a/Core/src/main/java/com/plotsquared/core/util/task/TaskManager.java b/Core/src/main/java/com/plotsquared/core/util/task/TaskManager.java index 0aefe9e08..5878a9247 100644 --- a/Core/src/main/java/com/plotsquared/core/util/task/TaskManager.java +++ b/Core/src/main/java/com/plotsquared/core/util/task/TaskManager.java @@ -131,8 +131,8 @@ public abstract class TaskManager { return function.value; } final AtomicBoolean running = new AtomicBoolean(true); - final RuntimeExceptionRunnableVal - run = new RuntimeExceptionRunnableVal<>(function, running); + final RuntimeExceptionRunnableVal run = + new RuntimeExceptionRunnableVal<>(function, running); TaskManager.IMP.task(run); try { synchronized (function) { diff --git a/Core/src/main/java/com/plotsquared/core/util/uuid/UUIDHandler.java b/Core/src/main/java/com/plotsquared/core/util/uuid/UUIDHandler.java index 8cafdde93..6dd8b1c47 100644 --- a/Core/src/main/java/com/plotsquared/core/util/uuid/UUIDHandler.java +++ b/Core/src/main/java/com/plotsquared/core/util/uuid/UUIDHandler.java @@ -25,14 +25,14 @@ */ package com.plotsquared.core.util.uuid; +import com.google.common.collect.BiMap; import com.plotsquared.core.PlotSquared; import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.database.DBFunc; import com.plotsquared.core.player.OfflinePlotPlayer; import com.plotsquared.core.player.PlotPlayer; -import com.plotsquared.core.util.task.RunnableVal; import com.plotsquared.core.util.StringWrapper; -import com.google.common.collect.BiMap; +import com.plotsquared.core.util.task.RunnableVal; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/Core/src/main/java/com/plotsquared/core/util/uuid/UUIDHandlerImplementation.java b/Core/src/main/java/com/plotsquared/core/util/uuid/UUIDHandlerImplementation.java index f899b640c..687af58e0 100644 --- a/Core/src/main/java/com/plotsquared/core/util/uuid/UUIDHandlerImplementation.java +++ b/Core/src/main/java/com/plotsquared/core/util/uuid/UUIDHandlerImplementation.java @@ -25,20 +25,20 @@ */ package com.plotsquared.core.util.uuid; +import com.google.common.base.Charsets; +import com.google.common.collect.BiMap; +import com.google.common.collect.HashBiMap; import com.plotsquared.core.PlotSquared; import com.plotsquared.core.configuration.Captions; import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.database.DBFunc; import com.plotsquared.core.player.OfflinePlotPlayer; -import com.plotsquared.core.plot.Plot; import com.plotsquared.core.player.PlotPlayer; +import com.plotsquared.core.plot.Plot; import com.plotsquared.core.util.StringMan; -import com.plotsquared.core.util.task.RunnableVal; import com.plotsquared.core.util.StringWrapper; +import com.plotsquared.core.util.task.RunnableVal; import com.plotsquared.core.util.task.TaskManager; -import com.google.common.base.Charsets; -import com.google.common.collect.BiMap; -import com.google.common.collect.HashBiMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable;