Reformat it all.

2025-07-17 12:54:43 +02:00 · 2020-04-30 11:01:52 +01:00
parent 4a16f9c1a7
commit 0091580ae0
101 changed files with 635 additions and 543 deletions
--- 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;

--- 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;
--- 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()) {
--- 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<BiomeType> 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<String[]> result) {
+    @Override
+    public void getSign(@NonNull final Location location, final Consumer<String[]> 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<BlockState> result) {
+    @Override
+    public void getBlock(@NonNull final Location location, final Consumer<BlockState> 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<com.sk89q.worldedit.world.entity.EntityType> getTypesInCategory(final String category) {
+    public Set<com.sk89q.worldedit.world.entity.EntityType> getTypesInCategory(
+        final String category) {
        final Collection<Class<?>> 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<com.sk89q.worldedit.world.entity.EntityType> types = new HashSet<>();
-        outer: for (final EntityType bukkitType : EntityType.values()) {
+        outer:
+        for (final EntityType bukkitType : EntityType.values()) {
            final Class<? extends Entity> 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<Chunk> 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<Chunk> chunkConsumer) {
+        PaperLib.getChunkAtAsync(getWorld(world), x >> 4, z >> 4, true)
+            .thenAccept(chunk -> ensureMainThread(chunkConsumer, chunk));
    }

    private static void ensureLoaded(final Location location, final Consumer<Chunk> chunkConsumer) {
-        PaperLib.getChunkAtAsync(getLocation(location), true).thenAccept(chunk ->
-            ensureMainThread(chunkConsumer, chunk));
+        PaperLib.getChunkAtAsync(getLocation(location), true)
+            .thenAccept(chunk -> ensureMainThread(chunkConsumer, chunk));
    }

    private static <T> void ensureMainThread(final Consumer<T> 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));
        }
    }

--- 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);
    }

--- 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;
--- 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;
--- 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) {
--- 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) {
--- 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;