diff --git a/bukkit/src/main/java/net/william278/husksync/data/BukkitInventoryMap.java b/bukkit/src/main/java/net/william278/husksync/data/BukkitInventoryMap.java index b336b563..6233339b 100644 --- a/bukkit/src/main/java/net/william278/husksync/data/BukkitInventoryMap.java +++ b/bukkit/src/main/java/net/william278/husksync/data/BukkitInventoryMap.java @@ -8,6 +8,7 @@ import java.util.Optional; /** * A mapped player inventory, providing methods to easily access a player's inventory. */ +@SuppressWarnings("unused") public class BukkitInventoryMap { private ItemStack[] contents; diff --git a/bukkit/src/main/java/net/william278/husksync/event/BukkitEvent.java b/bukkit/src/main/java/net/william278/husksync/event/BukkitEvent.java index a4be0305..6a1c4565 100644 --- a/bukkit/src/main/java/net/william278/husksync/event/BukkitEvent.java +++ b/bukkit/src/main/java/net/william278/husksync/event/BukkitEvent.java @@ -1,13 +1,8 @@ package net.william278.husksync.event; import net.william278.husksync.BukkitHuskSync; -import net.william278.husksync.player.BukkitPlayer; -import net.william278.husksync.player.OnlineUser; import org.bukkit.Bukkit; -import org.bukkit.entity.Player; import org.bukkit.event.Event; -import org.bukkit.event.player.PlayerEvent; -import org.jetbrains.annotations.NotNull; import java.util.concurrent.CompletableFuture; diff --git a/bukkit/src/main/java/net/william278/husksync/event/BukkitPreSyncEvent.java b/bukkit/src/main/java/net/william278/husksync/event/BukkitPreSyncEvent.java index b54fed9b..5320621c 100644 --- a/bukkit/src/main/java/net/william278/husksync/event/BukkitPreSyncEvent.java +++ b/bukkit/src/main/java/net/william278/husksync/event/BukkitPreSyncEvent.java @@ -1,8 +1,6 @@ package net.william278.husksync.event; import net.william278.husksync.data.UserData; -import net.william278.husksync.player.BukkitPlayer; -import net.william278.husksync.player.OnlineUser; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; diff --git a/bukkit/src/main/java/net/william278/husksync/event/BukkitSyncCompleteEvent.java b/bukkit/src/main/java/net/william278/husksync/event/BukkitSyncCompleteEvent.java index c15bd0f1..eb54f905 100644 --- a/bukkit/src/main/java/net/william278/husksync/event/BukkitSyncCompleteEvent.java +++ b/bukkit/src/main/java/net/william278/husksync/event/BukkitSyncCompleteEvent.java @@ -1,7 +1,5 @@ package net.william278.husksync.event; -import net.william278.husksync.player.BukkitPlayer; -import net.william278.husksync.player.OnlineUser; import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; import org.jetbrains.annotations.NotNull; diff --git a/bukkit/src/main/java/net/william278/husksync/util/BukkitLogger.java b/bukkit/src/main/java/net/william278/husksync/util/BukkitLogger.java index 068f0990..c6941e92 100644 --- a/bukkit/src/main/java/net/william278/husksync/util/BukkitLogger.java +++ b/bukkit/src/main/java/net/william278/husksync/util/BukkitLogger.java @@ -1,11 +1,9 @@ package net.william278.husksync.util; import de.themoep.minedown.MineDown; -import net.md_5.bungee.api.chat.ComponentBuilder; import net.md_5.bungee.api.chat.TextComponent; import org.jetbrains.annotations.NotNull; -import java.util.Arrays; import java.util.logging.Level; public class BukkitLogger extends Logger { diff --git a/common/src/main/java/net/william278/husksync/command/EnderChestCommand.java b/common/src/main/java/net/william278/husksync/command/EnderChestCommand.java index b071c44d..2550da66 100644 --- a/common/src/main/java/net/william278/husksync/command/EnderChestCommand.java +++ b/common/src/main/java/net/william278/husksync/command/EnderChestCommand.java @@ -2,7 +2,6 @@ package net.william278.husksync.command; import net.william278.husksync.HuskSync; import net.william278.husksync.data.DataSaveCause; -import net.william278.husksync.data.ItemData; import net.william278.husksync.data.UserData; import net.william278.husksync.data.UserDataSnapshot; import net.william278.husksync.editor.ItemEditorMenu; diff --git a/common/src/main/java/net/william278/husksync/command/HuskSyncCommand.java b/common/src/main/java/net/william278/husksync/command/HuskSyncCommand.java index 59817690..3aceda24 100644 --- a/common/src/main/java/net/william278/husksync/command/HuskSyncCommand.java +++ b/common/src/main/java/net/william278/husksync/command/HuskSyncCommand.java @@ -71,8 +71,9 @@ public class HuskSyncCommand extends CommandBase implements TabCompletable, Cons switch (args[0].toLowerCase()) { case "update", "version" -> new UpdateChecker(plugin.getPluginVersion(), plugin.getLoggingAdapter()).logToConsole(); - case "info", "about" -> plugin.getLoggingAdapter().log(Level.INFO, new MineDown(plugin.getLocales().stripMineDown( - Locales.PLUGIN_INFORMATION.replace("%version%", plugin.getPluginVersion().toString())))); + case "info", "about" -> + plugin.getLoggingAdapter().log(Level.INFO, new MineDown(plugin.getLocales().stripMineDown( + Locales.PLUGIN_INFORMATION.replace("%version%", plugin.getPluginVersion().toString())))); case "reload" -> { plugin.reload(); plugin.getLoggingAdapter().log(Level.INFO, "Reloaded config & message files."); @@ -92,7 +93,13 @@ public class HuskSyncCommand extends CommandBase implements TabCompletable, Cons return; } switch (args[2]) { - case "start" -> migrator.start(); + case "start" -> migrator.start().thenAccept(succeeded -> { + if (succeeded) { + plugin.getLoggingAdapter().log(Level.INFO, "Migration completed successfully!"); + } else { + plugin.getLoggingAdapter().log(Level.WARNING, "Migration failed!"); + } + }); case "set" -> migrator.handleConfigurationCommand(Arrays.copyOfRange(args, 3, args.length)); default -> plugin.getLoggingAdapter().log(Level.INFO, "Invalid syntax. Console usage: \"husksync migrate " + args[1] + " "); diff --git a/common/src/main/java/net/william278/husksync/command/InventoryCommand.java b/common/src/main/java/net/william278/husksync/command/InventoryCommand.java index e294fa28..131b5e7f 100644 --- a/common/src/main/java/net/william278/husksync/command/InventoryCommand.java +++ b/common/src/main/java/net/william278/husksync/command/InventoryCommand.java @@ -2,7 +2,6 @@ package net.william278.husksync.command; import net.william278.husksync.HuskSync; import net.william278.husksync.data.DataSaveCause; -import net.william278.husksync.data.ItemData; import net.william278.husksync.data.UserData; import net.william278.husksync.data.UserDataSnapshot; import net.william278.husksync.editor.ItemEditorMenu; diff --git a/common/src/main/java/net/william278/husksync/command/TabCompletable.java b/common/src/main/java/net/william278/husksync/command/TabCompletable.java index 66519ba3..a1cea50c 100644 --- a/common/src/main/java/net/william278/husksync/command/TabCompletable.java +++ b/common/src/main/java/net/william278/husksync/command/TabCompletable.java @@ -12,7 +12,7 @@ public interface TabCompletable { /** * What should be returned when the player or console attempts to TAB-complete a command * - * @param args Current command argumentsrf + * @param args Current command arguments * @return List of String arguments to offer TAB suggestions */ List onTabComplete(@NotNull String[] args); diff --git a/common/src/main/java/net/william278/husksync/database/Database.java b/common/src/main/java/net/william278/husksync/database/Database.java index 59857130..8c7c4f11 100644 --- a/common/src/main/java/net/william278/husksync/database/Database.java +++ b/common/src/main/java/net/william278/husksync/database/Database.java @@ -106,6 +106,7 @@ public abstract class Database { * @return Array of string-formatted table creation schema statements * @throws IOException if the resource could not be read */ + @SuppressWarnings("SameParameterValue") protected final String[] getSchemaStatements(@NotNull String schemaFileName) throws IOException { return formatStatementTables(new String(resourceReader.getResource(schemaFileName) .readAllBytes(), StandardCharsets.UTF_8)).split(";"); diff --git a/common/src/main/java/net/william278/husksync/editor/ItemEditorMenu.java b/common/src/main/java/net/william278/husksync/editor/ItemEditorMenu.java index b1c08de7..7accc80f 100644 --- a/common/src/main/java/net/william278/husksync/editor/ItemEditorMenu.java +++ b/common/src/main/java/net/william278/husksync/editor/ItemEditorMenu.java @@ -15,7 +15,7 @@ public class ItemEditorMenu { public final ItemData itemData; public final ItemEditorMenuType itemEditorMenuType; public final MineDown menuTitle; - public boolean canEdit; + public final boolean canEdit; private CompletableFuture inventoryDataCompletableFuture; diff --git a/common/src/main/java/net/william278/husksync/event/CancellableEvent.java b/common/src/main/java/net/william278/husksync/event/CancellableEvent.java index c8f0cba5..c7339391 100644 --- a/common/src/main/java/net/william278/husksync/event/CancellableEvent.java +++ b/common/src/main/java/net/william278/husksync/event/CancellableEvent.java @@ -2,7 +2,10 @@ package net.william278.husksync.event; public interface CancellableEvent extends Event { - boolean isCancelled(); + @SuppressWarnings("BooleanMethodIsAlwaysInverted") + default boolean isCancelled() { + return false; + } void setCancelled(boolean cancelled); diff --git a/common/src/main/java/net/william278/husksync/player/OnlineUser.java b/common/src/main/java/net/william278/husksync/player/OnlineUser.java index 4daed578..7805065d 100644 --- a/common/src/main/java/net/william278/husksync/player/OnlineUser.java +++ b/common/src/main/java/net/william278/husksync/player/OnlineUser.java @@ -11,7 +11,6 @@ import net.william278.husksync.util.Version; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.UUID; import java.util.concurrent.CompletableFuture; diff --git a/common/src/main/java/net/william278/husksync/player/User.java b/common/src/main/java/net/william278/husksync/player/User.java index 501056b7..b22fdc7a 100644 --- a/common/src/main/java/net/william278/husksync/player/User.java +++ b/common/src/main/java/net/william278/husksync/player/User.java @@ -12,12 +12,12 @@ public class User { /** * The user's unique account ID */ - public UUID uuid; + public final UUID uuid; /** * The user's username */ - public String username; + public final String username; public User(@NotNull UUID uuid, @NotNull String username) { this.username = username; diff --git a/common/src/test/java/net/william278/husksync/player/DummyPlayer.java b/common/src/test/java/net/william278/husksync/player/DummyPlayer.java index 5ba1eba8..fdd17d46 100644 --- a/common/src/test/java/net/william278/husksync/player/DummyPlayer.java +++ b/common/src/test/java/net/william278/husksync/player/DummyPlayer.java @@ -14,13 +14,13 @@ import java.util.concurrent.CompletableFuture; public class DummyPlayer extends OnlineUser { - private DummyPlayer(@NotNull UUID uuid, @NotNull String username) { - super(uuid, username); + private DummyPlayer() { + super(UUID.fromString("00000000-0000-0000-0000-000000000000"), + "DummyPlayer"); } public static DummyPlayer create() { - return new DummyPlayer(UUID.fromString("00000000-0000-0000-0000-000000000000"), - "DummyPlayer"); + return new DummyPlayer(); } @Override