Merge branch 'v6' into features/v6/services

2025-06-25 02:04:44 +02:00 · 2020-08-21 23:02:52 +02:00
parent 351ae1b2c7 cee0bbb805
commit 45e75cc06e
541 changed files with 3086 additions and 2717 deletions
--- a/Bukkit/build.gradle
+++ b/Bukkit/build.gradle
@ -98,13 +98,24 @@ task copyFiles {
    }
 }

+def adventureVersion = '4.0.0-SNAPSHOT'

 shadowJar {
    dependencies {
        include(dependency(":PlotSquared-Core"))
        include(dependency("io.papermc:paperlib:1.0.4"))
-        include(dependency("net.kyori:adventure-platform-bukkit:4.0.0-SNAPSHOT"))
+        include(dependency("net.kyori:adventure-platform-bukkit:${adventureVersion}"))
        include(dependency("net.kyori:adventure-text-minimessage:3.0.0-SNAPSHOT"))
+        include(dependency("net.kyori:adventure-text-serializer-bungeecord:${adventureVersion}"))
+        include(dependency("net.kyori:adventure-text-serializer-legacy:${adventureVersion}"))
+        include(dependency("net.kyori:adventure-text-serializer-gson:${adventureVersion}"))
+        include(dependency("net.kyori:adventure-api:${adventureVersion}"))
+        include(dependency("net.kyori:adventure-platform-api:${adventureVersion}"))
+        include(dependency("net.kyori:adventure-platform-common:${adventureVersion}"))
+        include(dependency("net.kyori:adventure-platform-viaversion:${adventureVersion}"))
+        include(dependency("net.kyori:adventure-nbt:${adventureVersion}"))
+        include(dependency("net.kyori:examination-api:1.0.0-SNAPSHOT"))
+        include(dependency("net.kyori:examination-string:1.0.0-SNAPSHOT"))
        include(dependency("org.bstats:bstats-bukkit:1.7"))
        include(dependency("org.khelekore:prtree:1.7.0-SNAPSHOT"))
        include(dependency("com.sk89q:squirrelid:1.0.0-SNAPSHOT"))
@ -118,7 +129,7 @@ shadowJar {
        include(dependency('com.intellectualsites:Pipeline:1.4.0-SNAPSHOT'))
    }

-    relocate('net.kyori.text', 'com.plotsquared.formatting.text')
+    relocate('net.kyori.adventure', 'com.plotsquared.core.configuration.adventure')
    relocate("io.papermc.lib", "com.plotsquared.bukkit.paperlib")
    relocate("org.bstats", "com.plotsquared.metrics")
    relocate('com.sk89q.squirrelid', 'com.plotsquared.squirrelid')
@ -126,6 +137,7 @@ shadowJar {
    relocate('org.apache.logging.slf4j', 'com.plotsquared.logging.apache')
    relocate('org.slf4j', 'com.plotsquared.logging.slf4j')
    relocate('com.google.inject', 'com.plotsquared.google')
+    relocate('javax.inject', 'com.plotsquared.core.inject.javax')

    archiveFileName = "${project.name}-${parent.version}.jar"
    destinationDirectory = file "../target"
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitCommand.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitCommand.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit;

@ -29,6 +29,7 @@ import com.google.inject.Guice;
 import com.google.inject.Inject;
 import com.google.inject.Injector;
 import com.google.inject.Key;
+import com.google.inject.Singleton;
 import com.google.inject.Stage;
 import com.google.inject.TypeLiteral;
 import com.plotsquared.bukkit.generator.BukkitPlotGenerator;
@ -161,7 +162,7 @@ import static com.plotsquared.core.util.PremiumVerification.getResourceID;
 import static com.plotsquared.core.util.PremiumVerification.getUserID;
 import static com.plotsquared.core.util.ReflectionUtils.getRefClass;

-@SuppressWarnings("unused")
+@SuppressWarnings("unused") @Singleton
 public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPlatform<Player> {

    private static final Logger logger = LoggerFactory.getLogger("P2/" + BukkitPlatform.class.getSimpleName());
@ -256,12 +257,12 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
        }

        if (PremiumVerification.isPremium()) {
-            logger.info("[P2] PlotSquared version licensed to Spigot user {}", getUserID());
-            logger.info("[P2] https://www.spigotmc.org/resources/{}", getResourceID());
-            logger.info("[P2] Download ID: {}", getDownloadID());
-            logger.info("[P2] Thanks for supporting us :)");
+            logger.info("PlotSquared version licensed to Spigot user {}", getUserID());
+            logger.info("https://www.spigotmc.org/resources/{}", getResourceID());
+            logger.info("Download ID: {}", getDownloadID());
+            logger.info("Thanks for supporting us :)");
        } else {
-            logger.info("[P2] Couldn't verify purchase :(");
+            logger.info("Couldn't verify purchase :(");
        }

        // Database
@ -273,7 +274,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
        if (!plotSquared.getConfigurationVersion().equalsIgnoreCase("v5")) {
            // Perform upgrade
            if (DBFunc.dbManager.convertFlags()) {
-                logger.info("[P2] Flags were converted successfully!");
+                logger.info("Flags were converted successfully!");
                // Update the config version
                try {
                    plotSquared.setConfigurationVersion("v5");
@ -297,13 +298,13 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
        // WorldEdit
        if (Settings.Enabled_Components.WORLDEDIT_RESTRICTIONS) {
            try {
-                logger.info("[P2] {} hooked into WorldEdit", this.getPluginName());
+                logger.info("{} hooked into WorldEdit", this.getPluginName());
                WorldEdit.getInstance().getEventBus().register(this.getInjector().getInstance(WESubscriber.class));
                if (Settings.Enabled_Components.COMMANDS) {
                    new WE_Anywhere();
                }
            } catch (Throwable e) {
-                logger.error("[P2] Incompatible version of WorldEdit, please upgrade: https://builds.enginehub.org/job/worldedit?branch=master");
+                logger.error("Incompatible version of WorldEdit, please upgrade: https://builds.enginehub.org/job/worldedit?branch=master");
            }
        }

@ -346,7 +347,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
            try {
                getInjector().getInstance(ComponentPresetManager.class);
            } catch (final Exception e) {
-                logger.error("[P2] Failed to initialize the preset system", e);
+                logger.error("Failed to initialize the preset system", e);
            }
        }

@ -369,11 +370,11 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                        continue;
                    }
                    if (!worldUtil.isWorld(world) && !world.equals("*")) {
-                        logger.warn("[P2] `{}` was not properly loaded - {} will now try to load it properly", world, this.getPluginName());
+                        logger.warn("`{}` was not properly loaded - {} will now try to load it properly", world, this.getPluginName());
                        logger.warn(
-                            "[P2]  - Are you trying to delete this world? Remember to remove it from the worlds.yml, bukkit.yml and multiverse worlds.yml");
-                        logger.warn("[P2]  - Your world management plugin may be faulty (or non existent)");
-                        logger.warn("[P2]  This message may also be a false positive and could be ignored.");
+                            " - Are you trying to delete this world? Remember to remove it from the worlds.yml, bukkit.yml and multiverse worlds.yml");
+                        logger.warn(" - Your world management plugin may be faulty (or non existent)");
+                        logger.warn(" This message may also be a false positive and could be ignored.");
                        this.setGenerator(world);
                    }
                }
@ -393,7 +394,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
            final OfflineModeUUIDService offlineModeUUIDService = new OfflineModeUUIDService();
            this.impromptuPipeline.registerService(offlineModeUUIDService);
            this.backgroundPipeline.registerService(offlineModeUUIDService);
-            logger.info("[P2] (UUID) Using the offline mode UUID service");
+            logger.info("(UUID) Using the offline mode UUID service");
        }

        if (Settings.UUID.SERVICE_BUKKIT) {
@ -414,7 +415,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
        final LuckPermsUUIDService luckPermsUUIDService;
        if (Settings.UUID.SERVICE_LUCKPERMS && Bukkit.getPluginManager().getPlugin("LuckPerms") != null) {
            luckPermsUUIDService = new LuckPermsUUIDService();
-            logger.info("[P2] (UUID) Using LuckPerms as a complementary UUID service");
+            logger.info("(UUID) Using LuckPerms as a complementary UUID service");
        } else {
            luckPermsUUIDService = null;
        }
@ -422,7 +423,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
        final BungeePermsUUIDService bungeePermsUUIDService;
        if (Settings.UUID.SERVICE_BUNGEE_PERMS && Bukkit.getPluginManager().getPlugin("BungeePerms") != null) {
            bungeePermsUUIDService = new BungeePermsUUIDService();
-            logger.info("[P2] (UUID) Using BungeePerms as a complementary UUID service");
+            logger.info("(UUID) Using BungeePerms as a complementary UUID service");
        } else {
            bungeePermsUUIDService = null;
        }
@ -430,7 +431,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
        final EssentialsUUIDService essentialsUUIDService;
        if (Settings.UUID.SERVICE_ESSENTIALSX && Bukkit.getPluginManager().getPlugin("Essentials") != null) {
            essentialsUUIDService = new EssentialsUUIDService();
-            logger.info("[P2] (UUID) Using EssentialsX as a complementary UUID service");
+            logger.info("(UUID) Using EssentialsX as a complementary UUID service");
        } else {
            essentialsUUIDService = null;
        }
@ -441,7 +442,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                final PaperUUIDService paperUUIDService = new PaperUUIDService();
                this.impromptuPipeline.registerService(paperUUIDService);
                this.backgroundPipeline.registerService(paperUUIDService);
-                logger.info("[P2] (UUID) Using Paper as a complementary UUID service");
+                logger.info("(UUID) Using Paper as a complementary UUID service");
            }

            this.impromptuPipeline.registerService(sqLiteUUIDService);
@ -495,17 +496,12 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
            if (Settings.Enabled_Components.EXTERNAL_PLACEHOLDERS) {
                ChatFormatter.formatters.add(getInjector().getInstance(PlaceholderFormatter.class));
            }
-            logger.info("[P2] PlotSquared hooked into PlaceholderAPI");
+            logger.info("PlotSquared hooked into PlaceholderAPI");
        } else {
-            logger.info("[P2] PlaceholderAPI is not in use. Hook deactivated");
+            logger.info("PlaceholderAPI is not in use. Hook deactivated");
        }

-        if (Settings.Enabled_Components.BSTATS) {
-            this.startMetrics();
-        }
-        else {
-            logger.info("[P2] bStats is disabled. Please enable it in /plugins/PlotSquared/config/settings.yml. It helps the developers to identify the features most used and organize future updates better. Cheers.");
-        }
+        this.startMetrics();

        if (Settings.Enabled_Components.WORLDS) {
            TaskManager.getPlatformImplementation().taskRepeat(this::unload, TaskTime.seconds(1L));
@ -574,7 +570,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                        final Chunk[] chunks = world.getLoadedChunks();
                        if (chunks.length == 0) {
                            if (!Bukkit.unloadWorld(world, true)) {
-                                logger.warn("[P2] Failed to unload {}", world.getName());
+                                logger.warn("Failed to unload {}", world.getName());
                            }
                            return;
                        } else {
@ -623,7 +619,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
            }
        });

-        logger.info("[P2] (UUID) {} UUIDs will be cached", uuidQueue.size());
+        logger.info("(UUID) {} UUIDs will be cached", uuidQueue.size());

        Executors.newSingleThreadScheduledExecutor().schedule(() -> {
            // Begin by reading all the SQLite cache at once
@ -631,7 +627,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
            // Now fetch names for all known UUIDs
            final int totalSize = uuidQueue.size();
            int read = 0;
-            logger.info("[P2] (UUID) PlotSquared will fetch UUIDs in groups of {}", Settings.UUID.BACKGROUND_LIMIT);
+            logger.info("(UUID) PlotSquared will fetch UUIDs in groups of {}", Settings.UUID.BACKGROUND_LIMIT);
            final List<UUID> uuidList = new ArrayList<>(Settings.UUID.BACKGROUND_LIMIT);

            // Used to indicate that the second retrieval has been attempted
@ -639,7 +635,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl

            while (!uuidQueue.isEmpty() || !uuidList.isEmpty()) {
                if (!uuidList.isEmpty() && secondRun) {
-                    logger.warn("[P2] (UUID) Giving up on last batch. Fetching new batch instead");
+                    logger.warn("(UUID) Giving up on last batch. Fetching new batch instead");
                    uuidList.clear();
                }
                if (uuidList.isEmpty()) {
@ -663,13 +659,13 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                    // Print progress
                    final double percentage = ((double) read / (double) totalSize) * 100.0D;
                    if (Settings.DEBUG) {
-                        logger.info("[P2] (UUID) PlotSquared has cached {} of UUIDs", String.format("%.1f%%", percentage));
+                        logger.info("(UUID) PlotSquared has cached {} of UUIDs", String.format("%.1f%%", percentage));
                    }
                } catch (final InterruptedException | ExecutionException e) {
-                    logger.error("[P2] (UUID) Failed to retrieve last batch. Will try again", e);
+                    logger.error("(UUID) Failed to retrieve last batch. Will try again", e);
                }
            }
-            logger.info("[P2] (UUID) PlotSquared has cached all UUIDs");
+            logger.info("(UUID) PlotSquared has cached all UUIDs");
        }, 10, TimeUnit.SECONDS);
    }

@ -701,7 +697,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
    }

    @SuppressWarnings("deprecation") private void runEntityTask() {
-        logger.info("[P2] KillAllEntities started");
+        logger.info("KillAllEntities started");
        TaskManager.runTaskRepeat(() -> this.plotAreaManager.forEachPlotArea(plotArea -> {
            final World world = Bukkit.getWorld(plotArea.getWorldName());
            try {
@ -979,7 +975,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
            return;
        }
        this.metricsStarted = true;
-        Metrics metrics = new Metrics(this, BSTATS_ID);// bstats
+        Metrics metrics = new Metrics(this, BSTATS_ID); // bstats
        metrics.addCustomChart(new Metrics.DrilldownPie("area_types", () -> {
            final Map<String, Map<String, Integer>> map = new HashMap<>();
            for (final PlotAreaType plotAreaType : PlotAreaType.values()) {
@ -1022,7 +1018,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                    SetGenCB.setGenerator(BukkitUtil.getWorld(worldName));
                }
            } catch (final Exception e) {
-                logger.error("[P2] Failed to reload world: {} | {}", world, e.getMessage());
+                logger.error("Failed to reload world: {} | {}", world, e.getMessage());
                Bukkit.getServer().unloadWorld(world, false);
                return;
            }
@ -1093,4 +1089,15 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
        return (PlayerManager<BukkitPlayer, Player>) getInjector().getInstance(PlayerManager.class);
    }

+    @Override public void copyCaptionMaps() {
+        /* Make this prettier at some point */
+        final String[] languages = new String[] { "en" };
+        for (final String language : languages) {
+            if (!new File(new File(this.getDataFolder(), "lang"), String.format("messages_%s.json", language)).exists()) {
+                this.saveResource(String.format("lang/messages_%s.json", language), false);
+                logger.info("Copied language file 'messages_{}.json'", language);
+            }
+        }
+    }
+
 }
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/entity/AgeableStats.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/entity/AgeableStats.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.entity;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/entity/ArmorStandStats.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/entity/ArmorStandStats.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.entity;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/entity/EntityBaseStats.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/entity/EntityBaseStats.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.entity;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/entity/EntityWrapper.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/entity/EntityWrapper.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.entity;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/entity/HorseStats.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/entity/HorseStats.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.entity;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/entity/LivingEntityStats.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/entity/LivingEntityStats.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.entity;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/entity/ReplicatingEntityWrapper.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/entity/ReplicatingEntityWrapper.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.entity;

@ -391,7 +391,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
        try {
            entity.getInventory().setContents(this.inventory);
        } catch (IllegalArgumentException e) {
-            logger.error("[P2] Failed to restore inventory", e);
+            logger.error("Failed to restore inventory", e);
        }
    }

@ -738,7 +738,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                return entity;
            default:
                if (Settings.DEBUG) {
-                    logger.info("[P2] Could not identify entity: {}", entity.getType());
+                    logger.info("Could not identify entity: {}", entity.getType());
                }
                return entity;
            // END LIVING
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/entity/TameableStats.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/entity/TameableStats.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.entity;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/entity/TeleportEntityWrapper.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/entity/TeleportEntityWrapper.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.entity;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BlockStatePopulator.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BlockStatePopulator.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.generator;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitAugmentedGenerator.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitAugmentedGenerator.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.generator;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.generator;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/generator/DelegatePlotGenerator.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/DelegatePlotGenerator.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.generator;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/inject/BackupModule.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/inject/BackupModule.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.inject;

@ -46,8 +46,8 @@ public class BackupModule extends AbstractModule {
                .implement(BackupProfile.class, PlayerBackupProfile.class).build(PlayerBackupProfileFactory.class));
            bind(BackupManager.class).to(SimpleBackupManager.class);
        } catch (final Exception e) {
-            logger.error("[P2] Failed to initialize backup manager", e);
-            logger.error("[P2] Backup features will be disabled");
+            logger.error("Failed to initialize backup manager", e);
+            logger.error("Backup features will be disabled");
            bind(BackupManager.class).to(NullBackupManager.class);
        }
    }
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/inject/BukkitModule.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/inject/BukkitModule.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.inject;

@ -84,6 +84,7 @@ public class BukkitModule extends AbstractModule {
        bind(PlayerManager.class).to(BukkitPlayerManager.class);
        bind(JavaPlugin.class).toInstance(bukkitPlatform);
        bind(PlotPlatform.class).toInstance(bukkitPlatform);
+        bind(BukkitPlatform.class).toInstance(bukkitPlatform);
        bind(IndependentPlotGenerator.class).annotatedWith(DefaultGenerator.class).to(HybridGen.class);
        // Console actor
        @Nonnull ConsoleCommandSender console = Bukkit.getServer().getConsoleSender();
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/inject/PermissionModule.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/inject/PermissionModule.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.inject;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/inject/WorldManagerModule.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/inject/WorldManagerModule.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.inject;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.listener;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ChunkListener.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ChunkListener.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.listener;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntityEventListener.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntityEventListener.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.listener;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntitySpawnListener.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntitySpawnListener.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.listener;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ForceFieldListener.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ForceFieldListener.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.listener;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.listener;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.listener;

@ -126,6 +126,7 @@ import org.bukkit.event.player.PlayerInteractAtEntityEvent;
 import org.bukkit.event.player.PlayerInteractEntityEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerLocaleChangeEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
@ -148,6 +149,7 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.Set;
 import java.util.UUID;
 import java.util.regex.Pattern;
@ -1624,4 +1626,10 @@ public class PlayerEventListener extends PlotListener implements Listener {
            }
        }
    }
+
+    @EventHandler public void onLocaleChange(final PlayerLocaleChangeEvent event) {
+        BukkitPlayer player = BukkitUtil.adapt(event.getPlayer());
+        // we're stripping the country code as we con't want to differ between countries
+        player.setLocale(Locale.forLanguageTag(event.getLocale().substring(0, 2)));
+    }
 }
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ProjectileEventListener.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ProjectileEventListener.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.listener;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ServerListener.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/ServerListener.java
@ -21,10 +21,11 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.listener;

+import com.google.inject.Inject;
 import com.plotsquared.bukkit.BukkitPlatform;
 import com.plotsquared.bukkit.placeholder.MVdWPlaceholders;
 import com.plotsquared.core.PlotSquared;
@ -35,11 +36,13 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.server.ServerLoadEvent;

+import javax.annotation.Nonnull;
+
 public class ServerListener implements Listener {

    private final BukkitPlatform plugin;

-    public ServerListener(BukkitPlatform plugin) {
+    @Inject public ServerListener(@Nonnull final BukkitPlatform plugin) {
        this.plugin = plugin;
    }

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/SingleWorldListener.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/SingleWorldListener.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.listener;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/WorldEvents.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/WorldEvents.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.listener;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/managers/BukkitWorldManager.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/managers/BukkitWorldManager.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.managers;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/managers/HyperverseWorldManager.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/managers/HyperverseWorldManager.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.managers;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/managers/MultiverseWorldManager.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/managers/MultiverseWorldManager.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.managers;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/permissions/BukkitPermissionHandler.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/permissions/BukkitPermissionHandler.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.permissions;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/permissions/VaultPermissionHandler.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/permissions/VaultPermissionHandler.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.permissions;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/MVdWPlaceholders.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/MVdWPlaceholders.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.placeholder;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/PAPIPlaceholders.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/PAPIPlaceholders.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.placeholder;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/PlaceholderFormatter.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/PlaceholderFormatter.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.placeholder;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitOfflinePlayer.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitOfflinePlayer.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.player;

@ -45,6 +45,9 @@ public class BukkitOfflinePlayer implements OfflinePlotPlayer {
    /**
     * Please do not use this method. Instead use BukkitUtil.getPlayer(Player),
     * as it caches player objects.
+     *
+     * @param player Bukkit OfflinePlayer player to convert
+     * @param permissionHandler Permission Profile to be used
     */
    public BukkitOfflinePlayer(@Nonnull final OfflinePlayer player, @Nonnull final
        PermissionHandler permissionHandler) {
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.player;

@ -78,7 +78,11 @@ public class BukkitPlayer extends PlotPlayer<Player> {
     * <p>Please do not use this method. Instead use
     * BukkitUtil.getPlayer(Player), as it caches player objects.</p>
     *
+     * @param plotAreaManager PlotAreaManager instance
+     * @param eventDispatcher EventDispatcher instance
     * @param player Bukkit player instance
+     * @param econHandler EconHandler instance
+     * @param permissionHandler PermissionHandler instance
     */
    public BukkitPlayer(@Nonnull final PlotAreaManager plotAreaManager, @Nonnull final EventDispatcher eventDispatcher,
        @Nonnull final Player player, @Nullable final EconHandler econHandler, @Nonnull final PermissionHandler permissionHandler) {
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayerManager.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayerManager.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.player;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitChunkCoordinator.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitChunkCoordinator.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.queue;

@ -55,7 +55,7 @@ import java.util.function.Consumer;
 * and allows the caller to specify a sink for the loaded chunks. The
 * coordinator will prevent the chunks from being unloaded until the sink
 * has fully consumed the chunk
- * <p>
+ * </p>
 **/
 public final class BukkitChunkCoordinator extends ChunkCoordinator {

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitQueueCoordinator.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitQueueCoordinator.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.queue;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/queue/ChunkCoordinator.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/queue/ChunkCoordinator.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.queue;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/queue/GenChunk.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.queue;

@ -71,6 +71,8 @@ public class GenChunk extends ScopedQueueCoordinator {

    /**
     * Set the internal Bukkit chunk data
+     *
+     * @param chunkData Bukkit ChunkData
     */
    public void setChunkData(@Nonnull ChunkData chunkData) {
        this.chunkData = chunkData;
@ -88,6 +90,8 @@ public class GenChunk extends ScopedQueueCoordinator {

    /**
     * Set the chunk being represented
+     *
+     * @param chunk Bukkit Chunk
     */
    public void setChunk(@Nonnull Chunk chunk) {
        this.chunk = chunk;
@ -96,6 +100,8 @@ public class GenChunk extends ScopedQueueCoordinator {

    /**
     * Set the world and XZ of the chunk being represented via {@link ChunkWrapper}
+     *
+     * @param wrap P2 ChunkWrapper
     */
    public void setChunk(@Nonnull ChunkWrapper wrap) {
        chunk = null;
@ -146,6 +152,12 @@ public class GenChunk extends ScopedQueueCoordinator {

    /**
     * Set the in the whole column of XZ
+     *
+     * @param x Relative x location within the chunk (0 - 15)
+     * @param z Relative z location within the chunk (0 - 15)
+     * @param biome Bukkit biome to set
+     *
+     * @return if successful
     */
    public boolean setBiome(int x, int z, @Nonnull Biome biome) {
        if (this.biomeGrid != null) {
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/schematic/BukkitSchematicHandler.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/schematic/BukkitSchematicHandler.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.schematic;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/schematic/StateWrapper.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/schematic/StateWrapper.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.schematic;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitBlockUtil.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitBlockUtil.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.util;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitChunkManager.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitChunkManager.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.util;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEconHandler.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEconHandler.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.util;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEntityUtil.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEntityUtil.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.util;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitInventoryUtil.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitInventoryUtil.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.util;

@ -32,6 +32,7 @@ import com.plotsquared.core.plot.PlotInventory;
 import com.plotsquared.core.plot.PlotItemStack;
 import com.plotsquared.core.util.InventoryUtil;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
+import net.kyori.adventure.text.Component;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
@ -49,11 +50,11 @@ import java.util.stream.IntStream;
@Singleton public class BukkitInventoryUtil extends InventoryUtil {

    @Override public void open(PlotInventory inv) {
-        BukkitPlayer bp = (BukkitPlayer) inv.player;
-        Inventory inventory = Bukkit.createInventory(null, inv.size * 9,
+        BukkitPlayer bp = (BukkitPlayer) inv.getPlayer();
+        Inventory inventory = Bukkit.createInventory(null, inv.getLines() * 9,
            ChatColor.translateAlternateColorCodes('&', inv.getTitle()));
        PlotItemStack[] items = inv.getItems();
-        for (int i = 0; i < inv.size * 9; i++) {
+        for (int i = 0; i < inv.getLines() * 9; i++) {
            PlotItemStack item = items[i];
            if (item != null) {
                inventory.setItem(i, getItem(item));
@ -66,12 +67,12 @@ import java.util.stream.IntStream;
        if (!inv.isOpen()) {
            return;
        }
-        BukkitPlayer bp = (BukkitPlayer) inv.player;
+        BukkitPlayer bp = (BukkitPlayer) inv.getPlayer();
        bp.player.closeInventory();
    }

    @Override public void setItem(PlotInventory inv, int index, PlotItemStack item) {
-        BukkitPlayer bp = (BukkitPlayer) inv.player;
+        BukkitPlayer bp = (BukkitPlayer) inv.getPlayer();
        InventoryView opened = bp.player.getOpenInventory();
        if (!inv.isOpen()) {
            return;
@ -84,18 +85,19 @@ import java.util.stream.IntStream;
        if (item == null) {
            return null;
        }
-        ItemStack stack = new ItemStack(BukkitAdapter.adapt(item.getType()), item.amount);
+        ItemStack stack = new ItemStack(BukkitAdapter.adapt(item.getType()), item.getAmount());
        ItemMeta meta = null;
-        if (item.name != null) {
+        if (item.getName() != null) {
            meta = stack.getItemMeta();
-            meta.setDisplayName(ChatColor.translateAlternateColorCodes('&', item.name));
+            Component nameComponent = BukkitUtil.MINI_MESSAGE.parse(item.getName());
+            meta.setDisplayName(BukkitUtil.LEGACY_COMPONENT_SERIALIZER.serialize(nameComponent));
        }
-        if (item.lore != null) {
+        if (item.getLore() != null) {
            if (meta == null) {
                meta = stack.getItemMeta();
            }
            List<String> lore = new ArrayList<>();
-            for (String entry : item.lore) {
+            for (String entry : item.getLore()) {
                lore.add(BukkitUtil.LEGACY_COMPONENT_SERIALIZER.serialize(BukkitUtil.MINI_MESSAGE.deserialize(entry)));
            }
            meta.setLore(lore);
@ -141,7 +143,7 @@ import java.util.stream.IntStream;
        if (!plotInventory.isOpen()) {
            return false;
        }
-        BukkitPlayer bp = (BukkitPlayer) plotInventory.player;
+        BukkitPlayer bp = (BukkitPlayer) plotInventory.getPlayer();
        InventoryView opened = bp.player.getOpenInventory();
        if (plotInventory.isOpen()) {
            if (opened.getType() == InventoryType.CRAFTING) {
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitRegionManager.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitRegionManager.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.util;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.util;

@ -37,7 +37,6 @@ import com.plotsquared.core.inject.annotations.WorldConfig;
 import com.plotsquared.core.inject.annotations.WorldFile;
 import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.PlotAreaType;
-import com.plotsquared.core.plot.SetupObject;
 import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.setup.PlotAreaBuilder;
 import com.plotsquared.core.util.SetupUtils;
@ -118,111 +117,6 @@ import java.util.Objects;
        Bukkit.unloadWorld(world, false);
    }

-    @Deprecated @Override public String setupWorld(SetupObject object) {
-        this.updateGenerators();
-        ConfigurationNode[] steps = object.step == null ? new ConfigurationNode[0] : object.step;
-        String world = object.world;
-        PlotAreaType type = object.type;
-        String worldPath = "worlds." + object.world;
-        switch (type) {
-            case PARTIAL: {
-                if (object.id != null) {
-                    if (!this.worldConfiguration.contains(worldPath)) {
-                        this.worldConfiguration.createSection(worldPath);
-                    }
-                    ConfigurationSection worldSection = this.worldConfiguration.getConfigurationSection(worldPath);
-                    String areaName = object.id + "-" + object.min + "-" + object.max;
-                    String areaPath = "areas." + areaName;
-                    if (!worldSection.contains(areaPath)) {
-                        worldSection.createSection(areaPath);
-                    }
-                    ConfigurationSection areaSection =
-                        worldSection.getConfigurationSection(areaPath);
-                    HashMap<String, Object> options = new HashMap<>();
-                    for (ConfigurationNode step : steps) {
-                        options.put(step.getConstant(), step.getValue());
-                    }
-                    options.put("generator.type", object.type.toString());
-                    options.put("generator.terrain", object.terrain.toString());
-                    options.put("generator.plugin", object.plotManager);
-                    if (object.setupGenerator != null && !object.setupGenerator
-                        .equals(object.plotManager)) {
-                        options.put("generator.init", object.setupGenerator);
-                    }
-                    for (Entry<String, Object> entry : options.entrySet()) {
-                        String key = entry.getKey();
-                        Object value = entry.getValue();
-                        if (worldSection.contains(key)) {
-                            Object current = worldSection.get(key);
-                            if (!Objects.equals(value, current)) {
-                                areaSection.set(key, value);
-                            }
-                        } else {
-                            worldSection.set(key, value);
-                        }
-                    }
-                }
-                GeneratorWrapper<?> gen = SetupUtils.generators.get(object.setupGenerator);
-                if (gen != null && gen.isFull()) {
-                    object.setupGenerator = null;
-                }
-                break;
-            }
-            case AUGMENTED: {
-                if (!object.plotManager.endsWith(":single")) {
-                    if (!this.worldConfiguration.contains(worldPath)) {
-                        this.worldConfiguration.createSection(worldPath);
-                    }
-                    if (steps.length != 0) {
-                        ConfigurationSection worldSection = this.worldConfiguration.getConfigurationSection(worldPath);
-                        for (ConfigurationNode step : steps) {
-                            worldSection.set(step.getConstant(), step.getValue());
-                        }
-                    }
-                    this.worldConfiguration.set("worlds." + world + ".generator.type", object.type.toString());
-                    this.worldConfiguration.set("worlds." + world + ".generator.terrain", object.terrain.toString());
-                    this.worldConfiguration.set("worlds." + world + ".generator.plugin", object.plotManager);
-                    if (object.setupGenerator != null && !object.setupGenerator
-                        .equals(object.plotManager)) {
-                        this.worldConfiguration.set("worlds." + world + ".generator.init", object.setupGenerator);
-                    }
-                }
-                GeneratorWrapper<?> gen = SetupUtils.generators.get(object.setupGenerator);
-                if (gen != null && gen.isFull()) {
-                    object.setupGenerator = null;
-                }
-                break;
-            }
-            case NORMAL: {
-                if (steps.length != 0) {
-                    if (!this.worldConfiguration.contains(worldPath)) {
-                        this.worldConfiguration.createSection(worldPath);
-                    }
-                    ConfigurationSection worldSection = this.worldConfiguration.getConfigurationSection(worldPath);
-                    for (ConfigurationNode step : steps) {
-                        worldSection.set(step.getConstant(), step.getValue());
-                    }
-                }
-                break;
-            }
-        }
-
-        try {
-            this.worldConfiguration.save(this.worldFile);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        Objects.requireNonNull(PlotSquared.platform()).getWorldManager()
-            .handleWorldCreation(object.world, object.setupGenerator);
-
-        if (Bukkit.getWorld(world) != null) {
-            return world;
-        }
-
-        return object.world;
-    }
-
    @Override public String setupWorld(PlotAreaBuilder builder) {
        this.updateGenerators();
        ConfigurationNode[] steps = builder.settingsNodesWrapper() == null ?
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.util;

@ -116,7 +116,7 @@ public class BukkitUtil extends WorldUtil {
    private static final Logger logger = LoggerFactory.getLogger("P2/" + BukkitUtil.class.getSimpleName());

    public static final BukkitAudiences BUKKIT_AUDIENCES = BukkitAudiences.create(BukkitPlatform.getPlugin(BukkitPlatform.class));
-    public static final LegacyComponentSerializer LEGACY_COMPONENT_SERIALIZER = LegacyComponentSerializer.legacyAmpersand();
+    public static final LegacyComponentSerializer LEGACY_COMPONENT_SERIALIZER = LegacyComponentSerializer.legacySection();
    public static final MiniMessage MINI_MESSAGE = MiniMessage.builder().build();

    private final Collection<BlockType> tileEntityTypes = new HashSet<>();
@ -334,7 +334,7 @@ public class BukkitUtil extends WorldUtil {
                final Sign sign = (Sign) blockstate;
                for (int i = 0; i < lines.length; i++) {
                    sign.setLine(i, LEGACY_COMPONENT_SERIALIZER
-                        .serialize(MINI_MESSAGE.parse(lines[i].getComponent(LocaleHolder.console()))));
+                        .serialize(MINI_MESSAGE.parse(lines[i].getComponent(LocaleHolder.console()), replacements)));
                }
                sign.update(true);
            }
@ -349,7 +349,7 @@ public class BukkitUtil extends WorldUtil {
    @Override public void setBiomes(@Nonnull final String worldName, @Nonnull final CuboidRegion region, @Nonnull final BiomeType biomeType) {
        final World world = getWorld(worldName);
        if (world == null) {
-            logger.warn("[P2] An error occured while setting the biome because the world was null", new RuntimeException());
+            logger.warn("An error occurred while setting the biome because the world was null", new RuntimeException());
            return;
        }
        final Biome biome = BukkitAdapter.adapt(biomeType);
@ -459,7 +459,7 @@ public class BukkitUtil extends WorldUtil {
            }
            break;
            default: {
-                logger.error("[P2] Unknown entity category requested: {}", category);
+                logger.error("Unknown entity category requested: {}", category);
            }
            break;
        }
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitWorld.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitWorld.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.util;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/ContentMap.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/ContentMap.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.util;

@ -126,7 +126,7 @@ public class ContentMap {
            try {
                entity.spawn(world, xOffset, zOffset);
            } catch (Exception e) {
-                logger.error("[P2] Failed to restore entity", e);
+                logger.error("Failed to restore entity", e);
            }
        }
        this.entities.clear();
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/SetGenCB.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/SetGenCB.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.util;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/UpdateUtility.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/UpdateUtility.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.util;

@ -72,22 +72,22 @@ public class UpdateUtility implements Listener {
                    .getAsJsonObject();
                spigotVersion = result.get("current_version").getAsString();
            } catch (IOException e) {
-                logger.error("[P2] Unable to check for updates. Error: {}", e.getMessage());
+                logger.error("Unable to check for updates. Error: {}", e.getMessage());
                return;
            }

            if (internalVersion.isLaterVersion(spigotVersion)) {
-                logger.info("[P2] There appears to be a PlotSquared update available!");
-                logger.info("[P2] You are running version {}, the latest version is {}",
+                logger.info("There appears to be a PlotSquared update available!");
+                logger.info("You are running version {}, the latest version is {}",
                    internalVersion.versionString(), spigotVersion);
-                logger.info("[P2] https://www.spigotmc.org/resources/77506/updates");
+                logger.info("https://www.spigotmc.org/resources/77506/updates");
                hasUpdate = true;
                if (Settings.UpdateChecker.NOTIFY_ONCE) {
                    cancelTask();
                }
            } else if (notify) {
                notify = false;
-                logger.info("[P2] Congratulations! You are running the latest PlotSquared version");
+                logger.info("Congratulations! You are running the latest PlotSquared version");
            }
        }, 0L, Settings.UpdateChecker.POLL_RATE * 60 * 20);
    }
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/task/BukkitPlotSquaredTask.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/task/BukkitPlotSquaredTask.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.util.task;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/task/BukkitTaskManager.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/task/BukkitTaskManager.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.util.task;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/task/PaperTimeConverter.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/task/PaperTimeConverter.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.util.task;

@ -36,12 +36,14 @@ import javax.annotation.Nonnegative;
 */
 public final class PaperTimeConverter implements TaskTime.TimeConverter {

+    private static final long MIN_MS_PER_TICKS = 50L;
+
    @Override public long msToTicks(@Nonnegative final long ms) {
-        return Math.max(1L, (long) (ms / Bukkit.getAverageTickTime()));
+        return Math.max(1L, (long) (ms / Math.max(MIN_MS_PER_TICKS, Bukkit.getAverageTickTime())));
    }

    @Override public long ticksToMs(@Nonnegative final long ticks) {
-        return Math.max(1L, (long) (ticks * Bukkit.getAverageTickTime()));
+        return Math.max(1L, (long) (ticks * Math.max(MIN_MS_PER_TICKS, Bukkit.getAverageTickTime())));
    }

 }
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/util/task/SpigotTimeConverter.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/task/SpigotTimeConverter.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.util.task;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/BungeePermsUUIDService.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/BungeePermsUUIDService.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.uuid;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/EssentialsUUIDService.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/EssentialsUUIDService.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.uuid;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/LuckPermsUUIDService.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/LuckPermsUUIDService.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.uuid;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/OfflinePlayerUUIDService.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/OfflinePlayerUUIDService.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.uuid;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/PaperUUIDService.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/PaperUUIDService.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.uuid;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/SQLiteUUIDService.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/SQLiteUUIDService.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.uuid;

--- a/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/SquirrelIdUUIDService.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/uuid/SquirrelIdUUIDService.java
@ -21,7 +21,7 @@
 *     GNU General Public License for more details.
 *
 *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 package com.plotsquared.bukkit.uuid;

@ -82,7 +82,7 @@ public class SquirrelIdUUIDService implements UUIDService {
                //
                if (uuids.size() >= 2) {
                    if (Settings.DEBUG) {
-                        logger.info("[P2] (UUID) Found invalid UUID in batch. Will try each UUID individually.");
+                        logger.info("(UUID) Found invalid UUID in batch. Will try each UUID individually.");
                    }
                    for (final UUID uuid : uuids) {
                        final List<UUIDMapping> result = this.getNames(Collections.singletonList(uuid));
@ -92,7 +92,7 @@ public class SquirrelIdUUIDService implements UUIDService {
                        results.add(result.get(0));
                    }
                } else if (uuids.size() == 1 && Settings.DEBUG) {
-                    logger.info("[P2] (UUID) Found invalid UUID: {}", uuids.get(0));
+                    logger.info("(UUID) Found invalid UUID: {}", uuids.get(0));
                }
            }
        } catch (IOException | InterruptedException e) {