diff --git a/src/main/java/world/bentobox/bentobox/api/commands/CompositeCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/CompositeCommand.java index 677ca33e5..c3e6245cb 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/CompositeCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/CompositeCommand.java @@ -125,8 +125,6 @@ public abstract class CompositeCommand extends Command implements PluginIdentifi // Register command if it is not already registered if (plugin.getCommand(label) == null) { plugin.getCommandsManager().registerCommand(this); - // register your completions. - //registerCompletions(plugin.getCommodore(), this); } // Default references to description and parameters setDescription("commands." + label + ".description"); diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminDeleteCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminDeleteCommand.java index 1fdf40f6f..ed452e772 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminDeleteCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/AdminDeleteCommand.java @@ -47,7 +47,7 @@ public class AdminDeleteCommand extends ConfirmableCommand { } // Confirm askConfirmation(user, () -> deletePlayer(user, targetUUID)); - return false; + return true; } private void deletePlayer(User user, UUID targetUUID) { diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandResetCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandResetCommand.java index 41a49953c..2105faa99 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandResetCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandResetCommand.java @@ -1,10 +1,7 @@ package world.bentobox.bentobox.api.commands.island; import java.io.IOException; -import java.util.HashMap; import java.util.List; -import java.util.Map; -import java.util.UUID; import org.bukkit.GameMode; import org.bukkit.entity.Player; diff --git a/src/main/java/world/bentobox/bentobox/database/flatfile/FlatFileDatabaseHandler.java b/src/main/java/world/bentobox/bentobox/database/flatfile/FlatFileDatabaseHandler.java index a56448faf..e306fe6ed 100644 --- a/src/main/java/world/bentobox/bentobox/database/flatfile/FlatFileDatabaseHandler.java +++ b/src/main/java/world/bentobox/bentobox/database/flatfile/FlatFileDatabaseHandler.java @@ -154,20 +154,10 @@ public class FlatFileDatabaseHandler extends AbstractDatabaseHandler { */ // Check if there is a ConfigEntry annotation on the field ConfigEntry configEntry = field.getAnnotation(ConfigEntry.class); - boolean overrideOnChange = false; - boolean experimental = false; - boolean needsReset = false; // If there is a config annotation then do something if (configEntry != null && !configEntry.path().isEmpty()) { storageLocation = configEntry.path(); - // TODO: Not sure what to do with this one - overrideOnChange = configEntry.overrideOnChange(); - // TODO: Not sure what to do with this one - experimental = configEntry.experimental(); - // If this value has changed, then the addon will need a full reset - // TODO: Inform addon if this value is different to a value stored in the database? - needsReset = configEntry.needsReset(); } // Some fields need custom handling to serialize or deserialize and the programmer will need to // define them herself. She can add an annotation to do that. diff --git a/src/main/java/world/bentobox/bentobox/lists/Flags.java b/src/main/java/world/bentobox/bentobox/lists/Flags.java index 97785b4bd..ae822afad 100644 --- a/src/main/java/world/bentobox/bentobox/lists/Flags.java +++ b/src/main/java/world/bentobox/bentobox/lists/Flags.java @@ -54,10 +54,6 @@ public class Flags { // Disabled setting 'rank' private static final int DISABLED = -1; - // TODO: add ELYTRA - // TODO: add FISHING - // TODO: add KEEP_INVENTORY - is it needed? - public static final Flag BREAK_BLOCKS = new FlagBuilder().id("BREAK_BLOCKS").icon(Material.STONE).listener(new BreakBlocksListener()).build(); public static final Flag PLACE_BLOCKS = new FlagBuilder().id("PLACE_BLOCKS").icon(Material.GRASS).listener(new PlaceBlocksListener()).build(); diff --git a/src/main/java/world/bentobox/bentobox/managers/CommandsManager.java b/src/main/java/world/bentobox/bentobox/managers/CommandsManager.java index 017c253d1..4ecfb643e 100644 --- a/src/main/java/world/bentobox/bentobox/managers/CommandsManager.java +++ b/src/main/java/world/bentobox/bentobox/managers/CommandsManager.java @@ -2,6 +2,7 @@ package world.bentobox.bentobox.managers; import java.lang.reflect.Field; import java.util.HashMap; +import java.util.Map; import java.util.Set; import org.bukkit.Bukkit; @@ -11,7 +12,7 @@ import world.bentobox.bentobox.api.commands.CompositeCommand; public class CommandsManager { - private HashMap commands = new HashMap<>(); + private Map commands = new HashMap<>(); public void registerCommand(CompositeCommand command) { commands.put(command.getLabel(), command); @@ -36,6 +37,13 @@ public class CommandsManager { return commands.get(command); } + /** + * @return the commands + */ + public Map getCommands() { + return commands; + } + /** * List all commands registered so far * @return set of commands @@ -44,11 +52,4 @@ public class CommandsManager { return commands.keySet(); } - /** - * @return the commands - */ - public HashMap getCommands() { - return commands; - } - } diff --git a/src/main/java/world/bentobox/bentobox/managers/LocalesManager.java b/src/main/java/world/bentobox/bentobox/managers/LocalesManager.java index 0d05ca14b..b00838a12 100644 --- a/src/main/java/world/bentobox/bentobox/managers/LocalesManager.java +++ b/src/main/java/world/bentobox/bentobox/managers/LocalesManager.java @@ -30,8 +30,8 @@ public class LocalesManager { public LocalesManager(BentoBox plugin) { this.plugin = plugin; - copyLocalesFromJar("BentoBox"); - loadLocalesFromFile("BentoBox"); // Default + copyLocalesFromJar(plugin.getName()); + loadLocalesFromFile(plugin.getName()); // Default } /** @@ -157,7 +157,7 @@ public class LocalesManager { */ public void reloadLanguages() { languages.clear(); - loadLocalesFromFile("BentoBox"); + loadLocalesFromFile(plugin.getName()); plugin.getAddonsManager().getAddons().forEach(addon -> loadLocalesFromFile(addon.getDescription().getName())); } } diff --git a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminDeleteCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminDeleteCommandTest.java index 7a513e3a9..9b3ad2a87 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminDeleteCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/admin/AdminDeleteCommandTest.java @@ -1,6 +1,7 @@ package world.bentobox.bentobox.api.commands.admin; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -188,7 +189,7 @@ public class AdminDeleteCommandTest { AdminDeleteCommand itl = new AdminDeleteCommand(ac); // First requires confirmation - assertFalse(itl.execute(user, itl.getLabel(), Arrays.asList(name))); + assertTrue(itl.execute(user, itl.getLabel(), Arrays.asList(name))); Mockito.verify(user).sendMessage("commands.confirmation.confirm", "[seconds]", "0"); // Confirm itl.execute(user, itl.getLabel(), Arrays.asList(name));