diff --git a/src/main/java/world/bentobox/bbox/commands/island/IslandInfoCommand.java b/src/main/java/world/bentobox/bbox/commands/island/IslandInfoCommand.java deleted file mode 100644 index 3b01e7853..000000000 --- a/src/main/java/world/bentobox/bbox/commands/island/IslandInfoCommand.java +++ /dev/null @@ -1,4 +0,0 @@ -package world.bentobox.bbox.commands.island; - -public class IslandInfoCommand { -} diff --git a/src/main/java/world/bentobox/bbox/commands/island/IslandSpawnCommand.java b/src/main/java/world/bentobox/bbox/commands/island/IslandSpawnCommand.java deleted file mode 100644 index 88169723f..000000000 --- a/src/main/java/world/bentobox/bbox/commands/island/IslandSpawnCommand.java +++ /dev/null @@ -1,4 +0,0 @@ -package world.bentobox.bbox.commands.island; - -public class IslandSpawnCommand { -} diff --git a/src/main/java/world/bentobox/bbox/BentoBox.java b/src/main/java/world/bentobox/bentobox/BentoBox.java old mode 100755 new mode 100644 similarity index 87% rename from src/main/java/world/bentobox/bbox/BentoBox.java rename to src/main/java/world/bentobox/bentobox/BentoBox.java index 9aa8afb75..7c13b931e --- a/src/main/java/world/bentobox/bbox/BentoBox.java +++ b/src/main/java/world/bentobox/bentobox/BentoBox.java @@ -1,33 +1,33 @@ -package world.bentobox.bbox; +package world.bentobox.bentobox; import org.bukkit.Bukkit; import org.bukkit.World; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; -import world.bentobox.bbox.api.configuration.BSBConfig; -import world.bentobox.bbox.api.configuration.WorldSettings; -import world.bentobox.bbox.api.events.BentoBoxReadyEvent; -import world.bentobox.bbox.api.placeholders.PlaceholderHandler; -import world.bentobox.bbox.api.user.Notifier; -import world.bentobox.bbox.database.BSBDbSetup; -import world.bentobox.bbox.listeners.BannedVisitorCommands; -import world.bentobox.bbox.listeners.BlockEndDragon; -import world.bentobox.bbox.listeners.JoinLeaveListener; -import world.bentobox.bbox.listeners.NetherPortals; -import world.bentobox.bbox.listeners.ObsidianToLava; -import world.bentobox.bbox.listeners.PanelListenerManager; -import world.bentobox.bbox.listeners.protection.FlyingMobEvents; -import world.bentobox.bbox.managers.AddonsManager; -import world.bentobox.bbox.managers.CommandsManager; -import world.bentobox.bbox.managers.FlagsManager; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.LocalesManager; -import world.bentobox.bbox.managers.PlayersManager; -import world.bentobox.bbox.managers.RanksManager; -import world.bentobox.bbox.managers.SchemsManager; -import world.bentobox.bbox.util.HeadGetter; +import world.bentobox.bentobox.api.configuration.BSBConfig; +import world.bentobox.bentobox.api.configuration.WorldSettings; +import world.bentobox.bentobox.api.events.BentoBoxReadyEvent; +import world.bentobox.bentobox.api.placeholders.PlaceholderHandler; +import world.bentobox.bentobox.api.user.Notifier; +import world.bentobox.bentobox.database.BSBDbSetup; +import world.bentobox.bentobox.listeners.BannedVisitorCommands; +import world.bentobox.bentobox.listeners.BlockEndDragon; +import world.bentobox.bentobox.listeners.JoinLeaveListener; +import world.bentobox.bentobox.listeners.NetherPortals; +import world.bentobox.bentobox.listeners.ObsidianToLava; +import world.bentobox.bentobox.listeners.PanelListenerManager; +import world.bentobox.bentobox.listeners.protection.FlyingMobEvents; +import world.bentobox.bentobox.managers.AddonsManager; +import world.bentobox.bentobox.managers.CommandsManager; +import world.bentobox.bentobox.managers.FlagsManager; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.LocalesManager; +import world.bentobox.bentobox.managers.PlayersManager; +import world.bentobox.bentobox.managers.RanksManager; +import world.bentobox.bentobox.managers.SchemsManager; +import world.bentobox.bentobox.util.HeadGetter; /** * Main BentoBox class diff --git a/src/main/java/world/bentobox/bbox/Constants.java b/src/main/java/world/bentobox/bentobox/Constants.java similarity index 92% rename from src/main/java/world/bentobox/bbox/Constants.java rename to src/main/java/world/bentobox/bentobox/Constants.java index 76a04be0b..d5edc379c 100644 --- a/src/main/java/world/bentobox/bbox/Constants.java +++ b/src/main/java/world/bentobox/bentobox/Constants.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox; +package world.bentobox.bentobox; /** * Contains the plugin constants. diff --git a/src/main/java/world/bentobox/bbox/Metrics.java b/src/main/java/world/bentobox/bentobox/Metrics.java old mode 100755 new mode 100644 similarity index 99% rename from src/main/java/world/bentobox/bbox/Metrics.java rename to src/main/java/world/bentobox/bentobox/Metrics.java index 9168c458c..14cc5faff --- a/src/main/java/world/bentobox/bbox/Metrics.java +++ b/src/main/java/world/bentobox/bentobox/Metrics.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox; +package world.bentobox.bentobox; import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; diff --git a/src/main/java/world/bentobox/bbox/Settings.java b/src/main/java/world/bentobox/bentobox/Settings.java similarity index 98% rename from src/main/java/world/bentobox/bbox/Settings.java rename to src/main/java/world/bentobox/bentobox/Settings.java index f88623221..313ae30c8 100644 --- a/src/main/java/world/bentobox/bbox/Settings.java +++ b/src/main/java/world/bentobox/bentobox/Settings.java @@ -1,15 +1,15 @@ -package world.bentobox.bbox; +package world.bentobox.bentobox; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import world.bentobox.bbox.api.configuration.ConfigComment; -import world.bentobox.bbox.api.configuration.ConfigEntry; -import world.bentobox.bbox.api.configuration.StoreAt; -import world.bentobox.bbox.database.BSBDbSetup.DatabaseType; -import world.bentobox.bbox.database.objects.DataObject; +import world.bentobox.bentobox.api.configuration.ConfigComment; +import world.bentobox.bentobox.api.configuration.ConfigEntry; +import world.bentobox.bentobox.api.configuration.StoreAt; +import world.bentobox.bentobox.database.BSBDbSetup.DatabaseType; +import world.bentobox.bentobox.database.objects.DataObject; /** * All the plugin settings are here diff --git a/src/main/java/world/bentobox/bbox/api/addons/Addon.java b/src/main/java/world/bentobox/bentobox/api/addons/Addon.java similarity index 97% rename from src/main/java/world/bentobox/bbox/api/addons/Addon.java rename to src/main/java/world/bentobox/bentobox/api/addons/Addon.java index cd8da2759..03c28542d 100644 --- a/src/main/java/world/bentobox/bbox/api/addons/Addon.java +++ b/src/main/java/world/bentobox/bentobox/api/addons/Addon.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.api.addons; +package world.bentobox.bentobox.api.addons; import java.io.File; import java.io.IOException; @@ -14,9 +14,9 @@ import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.event.Listener; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.PlayersManager; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.PlayersManager; /** * Add-on class for BentoBox. Extend this to create an add-on. The operation diff --git a/src/main/java/world/bentobox/bbox/api/addons/AddonClassLoader.java b/src/main/java/world/bentobox/bentobox/api/addons/AddonClassLoader.java similarity index 92% rename from src/main/java/world/bentobox/bbox/api/addons/AddonClassLoader.java rename to src/main/java/world/bentobox/bentobox/api/addons/AddonClassLoader.java index 7cef1170c..f8696177b 100644 --- a/src/main/java/world/bentobox/bbox/api/addons/AddonClassLoader.java +++ b/src/main/java/world/bentobox/bentobox/api/addons/AddonClassLoader.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.api.addons; +package world.bentobox.bentobox.api.addons; import java.io.File; import java.net.MalformedURLException; @@ -14,10 +14,10 @@ import org.bukkit.permissions.PermissionDefault; import org.bukkit.plugin.InvalidDescriptionException; import org.bukkit.util.permissions.DefaultPermissions; -import world.bentobox.bbox.api.addons.AddonDescription.AddonDescriptionBuilder; -import world.bentobox.bbox.api.addons.exception.InvalidAddonFormatException; -import world.bentobox.bbox.api.addons.exception.InvalidAddonInheritException; -import world.bentobox.bbox.managers.AddonsManager; +import world.bentobox.bentobox.api.addons.AddonDescription.AddonDescriptionBuilder; +import world.bentobox.bentobox.api.addons.exception.InvalidAddonFormatException; +import world.bentobox.bentobox.api.addons.exception.InvalidAddonInheritException; +import world.bentobox.bentobox.managers.AddonsManager; /** * Loads addons and sets up permissions diff --git a/src/main/java/world/bentobox/bbox/api/addons/AddonDescription.java b/src/main/java/world/bentobox/bentobox/api/addons/AddonDescription.java similarity index 98% rename from src/main/java/world/bentobox/bbox/api/addons/AddonDescription.java rename to src/main/java/world/bentobox/bentobox/api/addons/AddonDescription.java index f66294833..de19745e2 100644 --- a/src/main/java/world/bentobox/bbox/api/addons/AddonDescription.java +++ b/src/main/java/world/bentobox/bentobox/api/addons/AddonDescription.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.api.addons; +package world.bentobox.bentobox.api.addons; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/world/bentobox/bbox/api/addons/AddonInterface.java b/src/main/java/world/bentobox/bentobox/api/addons/AddonInterface.java similarity index 71% rename from src/main/java/world/bentobox/bbox/api/addons/AddonInterface.java rename to src/main/java/world/bentobox/bentobox/api/addons/AddonInterface.java index 0ca0b1711..079bdada7 100644 --- a/src/main/java/world/bentobox/bbox/api/addons/AddonInterface.java +++ b/src/main/java/world/bentobox/bentobox/api/addons/AddonInterface.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.api.addons; +package world.bentobox.bentobox.api.addons; public interface AddonInterface { void onEnable(); diff --git a/src/main/java/world/bentobox/bbox/api/addons/AddonState.java b/src/main/java/world/bentobox/bentobox/api/addons/AddonState.java similarity index 93% rename from src/main/java/world/bentobox/bbox/api/addons/AddonState.java rename to src/main/java/world/bentobox/bentobox/api/addons/AddonState.java index a42c2291a..3ef5c68e5 100644 --- a/src/main/java/world/bentobox/bbox/api/addons/AddonState.java +++ b/src/main/java/world/bentobox/bentobox/api/addons/AddonState.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.api.addons; +package world.bentobox.bentobox.api.addons; /** * Represents the current run-time state of a {@link Addon}. diff --git a/src/main/java/world/bentobox/bbox/api/addons/exception/AddonException.java b/src/main/java/world/bentobox/bentobox/api/addons/exception/AddonException.java similarity index 82% rename from src/main/java/world/bentobox/bbox/api/addons/exception/AddonException.java rename to src/main/java/world/bentobox/bentobox/api/addons/exception/AddonException.java index f5a5915d3..ee4fc1377 100644 --- a/src/main/java/world/bentobox/bbox/api/addons/exception/AddonException.java +++ b/src/main/java/world/bentobox/bentobox/api/addons/exception/AddonException.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.api.addons.exception; +package world.bentobox.bentobox.api.addons.exception; public abstract class AddonException extends Exception { diff --git a/src/main/java/world/bentobox/bbox/api/addons/exception/InvalidAddonFormatException.java b/src/main/java/world/bentobox/bentobox/api/addons/exception/InvalidAddonFormatException.java similarity index 93% rename from src/main/java/world/bentobox/bbox/api/addons/exception/InvalidAddonFormatException.java rename to src/main/java/world/bentobox/bentobox/api/addons/exception/InvalidAddonFormatException.java index f09625792..6004af803 100644 --- a/src/main/java/world/bentobox/bbox/api/addons/exception/InvalidAddonFormatException.java +++ b/src/main/java/world/bentobox/bentobox/api/addons/exception/InvalidAddonFormatException.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.api.addons.exception; +package world.bentobox.bentobox.api.addons.exception; import java.util.logging.Level; diff --git a/src/main/java/world/bentobox/bbox/api/addons/exception/InvalidAddonInheritException.java b/src/main/java/world/bentobox/bentobox/api/addons/exception/InvalidAddonInheritException.java similarity index 83% rename from src/main/java/world/bentobox/bbox/api/addons/exception/InvalidAddonInheritException.java rename to src/main/java/world/bentobox/bentobox/api/addons/exception/InvalidAddonInheritException.java index 21c0b2357..fde97857e 100644 --- a/src/main/java/world/bentobox/bbox/api/addons/exception/InvalidAddonInheritException.java +++ b/src/main/java/world/bentobox/bentobox/api/addons/exception/InvalidAddonInheritException.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.api.addons.exception; +package world.bentobox.bentobox.api.addons.exception; public class InvalidAddonInheritException extends AddonException { diff --git a/src/main/java/world/bentobox/bbox/api/commands/BentoBoxCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/BentoBoxCommand.java similarity index 93% rename from src/main/java/world/bentobox/bbox/api/commands/BentoBoxCommand.java rename to src/main/java/world/bentobox/bentobox/api/commands/BentoBoxCommand.java index 7c3bbdf65..6c3b25754 100644 --- a/src/main/java/world/bentobox/bbox/api/commands/BentoBoxCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/BentoBoxCommand.java @@ -1,9 +1,9 @@ -package world.bentobox.bbox.api.commands; +package world.bentobox.bentobox.api.commands; import java.util.List; import java.util.Optional; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.user.User; /** * Interface for BentoBox Commands diff --git a/src/main/java/world/bentobox/bbox/api/commands/CompositeCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/CompositeCommand.java similarity index 97% rename from src/main/java/world/bentobox/bbox/api/commands/CompositeCommand.java rename to src/main/java/world/bentobox/bentobox/api/commands/CompositeCommand.java index 9ef2b141e..3077f1418 100644 --- a/src/main/java/world/bentobox/bbox/api/commands/CompositeCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/CompositeCommand.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.api.commands; +package world.bentobox.bentobox.api.commands; import java.util.ArrayList; import java.util.Arrays; @@ -21,16 +21,16 @@ import org.bukkit.command.PluginIdentifiableCommand; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitTask; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.addons.Addon; -import world.bentobox.bbox.api.events.command.CommandEvent; -import world.bentobox.bbox.api.localization.TextVariables; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.PlayersManager; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.addons.Addon; +import world.bentobox.bentobox.api.events.command.CommandEvent; +import world.bentobox.bentobox.api.localization.TextVariables; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.PlayersManager; +import world.bentobox.bentobox.util.Util; /** * BSB composite command diff --git a/src/main/java/world/bentobox/bbox/api/commands/DefaultHelpCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/DefaultHelpCommand.java similarity index 96% rename from src/main/java/world/bentobox/bbox/api/commands/DefaultHelpCommand.java rename to src/main/java/world/bentobox/bentobox/api/commands/DefaultHelpCommand.java index 2cee7842a..36bf962a1 100644 --- a/src/main/java/world/bentobox/bbox/api/commands/DefaultHelpCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/DefaultHelpCommand.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.api.commands; +package world.bentobox.bentobox.api.commands; import java.util.Collections; import java.util.List; @@ -6,8 +6,8 @@ import java.util.Optional; import org.apache.commons.lang.math.NumberUtils; -import world.bentobox.bbox.api.localization.TextVariables; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.localization.TextVariables; +import world.bentobox.bentobox.api.user.User; /** * Adds a default help to every command that will show the usage of the command diff --git a/src/main/java/world/bentobox/bbox/api/configuration/BSBConfig.java b/src/main/java/world/bentobox/bentobox/api/configuration/BSBConfig.java similarity index 91% rename from src/main/java/world/bentobox/bbox/api/configuration/BSBConfig.java rename to src/main/java/world/bentobox/bentobox/api/configuration/BSBConfig.java index 701597c49..2c2ada88e 100644 --- a/src/main/java/world/bentobox/bbox/api/configuration/BSBConfig.java +++ b/src/main/java/world/bentobox/bentobox/api/configuration/BSBConfig.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.api.configuration; +package world.bentobox.bentobox.api.configuration; import java.beans.IntrospectionException; import java.lang.reflect.InvocationTargetException; @@ -6,10 +6,10 @@ import java.util.ArrayList; import java.util.List; import java.util.logging.Logger; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.addons.Addon; -import world.bentobox.bbox.database.AbstractDatabaseHandler; -import world.bentobox.bbox.database.flatfile.FlatFileDatabase; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.addons.Addon; +import world.bentobox.bentobox.database.AbstractDatabaseHandler; +import world.bentobox.bentobox.database.flatfile.FlatFileDatabase; /** * Handy config class to store and load Java POJOs as YAML configs diff --git a/src/main/java/world/bentobox/bbox/api/configuration/ConfigComment.java b/src/main/java/world/bentobox/bentobox/api/configuration/ConfigComment.java similarity index 92% rename from src/main/java/world/bentobox/bbox/api/configuration/ConfigComment.java rename to src/main/java/world/bentobox/bentobox/api/configuration/ConfigComment.java index e4a5c6af2..e9b363011 100644 --- a/src/main/java/world/bentobox/bbox/api/configuration/ConfigComment.java +++ b/src/main/java/world/bentobox/bentobox/api/configuration/ConfigComment.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.api.configuration; +package world.bentobox.bentobox.api.configuration; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; diff --git a/src/main/java/world/bentobox/bbox/api/configuration/ConfigEntry.java b/src/main/java/world/bentobox/bentobox/api/configuration/ConfigEntry.java similarity index 84% rename from src/main/java/world/bentobox/bbox/api/configuration/ConfigEntry.java rename to src/main/java/world/bentobox/bentobox/api/configuration/ConfigEntry.java index 5b2af5550..b278ca67f 100644 --- a/src/main/java/world/bentobox/bbox/api/configuration/ConfigEntry.java +++ b/src/main/java/world/bentobox/bentobox/api/configuration/ConfigEntry.java @@ -1,11 +1,11 @@ -package world.bentobox.bbox.api.configuration; +package world.bentobox.bentobox.api.configuration; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import world.bentobox.bbox.Constants.GameType; +import world.bentobox.bentobox.Constants.GameType; /** * diff --git a/src/main/java/world/bentobox/bbox/api/configuration/StoreAt.java b/src/main/java/world/bentobox/bentobox/api/configuration/StoreAt.java similarity index 91% rename from src/main/java/world/bentobox/bbox/api/configuration/StoreAt.java rename to src/main/java/world/bentobox/bentobox/api/configuration/StoreAt.java index 406c242d9..e0ca72498 100644 --- a/src/main/java/world/bentobox/bbox/api/configuration/StoreAt.java +++ b/src/main/java/world/bentobox/bentobox/api/configuration/StoreAt.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.api.configuration; +package world.bentobox.bentobox.api.configuration; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/world/bentobox/bbox/api/configuration/WorldSettings.java b/src/main/java/world/bentobox/bentobox/api/configuration/WorldSettings.java similarity index 97% rename from src/main/java/world/bentobox/bbox/api/configuration/WorldSettings.java rename to src/main/java/world/bentobox/bentobox/api/configuration/WorldSettings.java index 060c8b382..de23f3faf 100644 --- a/src/main/java/world/bentobox/bbox/api/configuration/WorldSettings.java +++ b/src/main/java/world/bentobox/bentobox/api/configuration/WorldSettings.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.api.configuration; +package world.bentobox.bentobox.api.configuration; import java.util.List; import java.util.Map; @@ -9,8 +9,8 @@ import org.bukkit.Difficulty; import org.bukkit.GameMode; import org.bukkit.entity.EntityType; -import world.bentobox.bbox.api.addons.Addon; -import world.bentobox.bbox.api.flags.Flag; +import world.bentobox.bentobox.api.addons.Addon; +import world.bentobox.bentobox.api.flags.Flag; /** * Contains world-specific settings. Only getters are required, but you may need setters for your own class. diff --git a/src/main/java/world/bentobox/bbox/api/events/BentoBoxReadyEvent.java b/src/main/java/world/bentobox/bentobox/api/events/BentoBoxReadyEvent.java similarity index 79% rename from src/main/java/world/bentobox/bbox/api/events/BentoBoxReadyEvent.java rename to src/main/java/world/bentobox/bentobox/api/events/BentoBoxReadyEvent.java index 5ad690199..2ef061123 100644 --- a/src/main/java/world/bentobox/bbox/api/events/BentoBoxReadyEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/BentoBoxReadyEvent.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.api.events; +package world.bentobox.bentobox.api.events; /** * Fired when plugin is ready to play and all files are loaded diff --git a/src/main/java/world/bentobox/bbox/api/events/IslandBaseEvent.java b/src/main/java/world/bentobox/bentobox/api/events/IslandBaseEvent.java similarity index 94% rename from src/main/java/world/bentobox/bbox/api/events/IslandBaseEvent.java rename to src/main/java/world/bentobox/bentobox/api/events/IslandBaseEvent.java index 5bb3313e0..55567d90d 100644 --- a/src/main/java/world/bentobox/bbox/api/events/IslandBaseEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/IslandBaseEvent.java @@ -1,11 +1,11 @@ -package world.bentobox.bbox.api.events; +package world.bentobox.bentobox.api.events; import java.util.UUID; import org.bukkit.Location; import org.bukkit.event.Cancellable; -import world.bentobox.bbox.database.objects.Island; +import world.bentobox.bentobox.database.objects.Island; /** * diff --git a/src/main/java/world/bentobox/bbox/api/events/PremadeEvent.java b/src/main/java/world/bentobox/bentobox/api/events/PremadeEvent.java similarity index 89% rename from src/main/java/world/bentobox/bbox/api/events/PremadeEvent.java rename to src/main/java/world/bentobox/bentobox/api/events/PremadeEvent.java index 27d411987..95e99d38e 100644 --- a/src/main/java/world/bentobox/bbox/api/events/PremadeEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/PremadeEvent.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.api.events; +package world.bentobox.bentobox.api.events; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; diff --git a/src/main/java/world/bentobox/bbox/api/events/addon/AddonBaseEvent.java b/src/main/java/world/bentobox/bentobox/api/events/addon/AddonBaseEvent.java similarity index 64% rename from src/main/java/world/bentobox/bbox/api/events/addon/AddonBaseEvent.java rename to src/main/java/world/bentobox/bentobox/api/events/addon/AddonBaseEvent.java index c27bedc80..733191334 100644 --- a/src/main/java/world/bentobox/bbox/api/events/addon/AddonBaseEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/addon/AddonBaseEvent.java @@ -1,7 +1,7 @@ -package world.bentobox.bbox.api.events.addon; +package world.bentobox.bentobox.api.events.addon; -import world.bentobox.bbox.api.addons.Addon; -import world.bentobox.bbox.api.events.PremadeEvent; +import world.bentobox.bentobox.api.addons.Addon; +import world.bentobox.bentobox.api.events.PremadeEvent; /** * @author Poslovitch diff --git a/src/main/java/world/bentobox/bbox/api/events/addon/AddonEvent.java b/src/main/java/world/bentobox/bentobox/api/events/addon/AddonEvent.java similarity index 95% rename from src/main/java/world/bentobox/bbox/api/events/addon/AddonEvent.java rename to src/main/java/world/bentobox/bentobox/api/events/addon/AddonEvent.java index db42b6e6a..69039210d 100644 --- a/src/main/java/world/bentobox/bbox/api/events/addon/AddonEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/addon/AddonEvent.java @@ -1,6 +1,6 @@ -package world.bentobox.bbox.api.events.addon; +package world.bentobox.bentobox.api.events.addon; -import world.bentobox.bbox.api.addons.Addon; +import world.bentobox.bentobox.api.addons.Addon; public class AddonEvent { diff --git a/src/main/java/world/bentobox/bbox/api/events/command/CommandEvent.java b/src/main/java/world/bentobox/bentobox/api/events/command/CommandEvent.java similarity index 95% rename from src/main/java/world/bentobox/bbox/api/events/command/CommandEvent.java rename to src/main/java/world/bentobox/bentobox/api/events/command/CommandEvent.java index 29e781b97..3bc99b1b6 100644 --- a/src/main/java/world/bentobox/bbox/api/events/command/CommandEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/command/CommandEvent.java @@ -1,10 +1,10 @@ -package world.bentobox.bbox.api.events.command; +package world.bentobox.bentobox.api.events.command; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.event.Cancellable; -import world.bentobox.bbox.api.events.PremadeEvent; +import world.bentobox.bentobox.api.events.PremadeEvent; /** * Fired when a team event happens. diff --git a/src/main/java/world/bentobox/bbox/api/events/island/FlagChangeEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/FlagChangeEvent.java similarity index 83% rename from src/main/java/world/bentobox/bbox/api/events/island/FlagChangeEvent.java rename to src/main/java/world/bentobox/bentobox/api/events/island/FlagChangeEvent.java index 95a9cfbee..4d7253616 100644 --- a/src/main/java/world/bentobox/bbox/api/events/island/FlagChangeEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/FlagChangeEvent.java @@ -1,10 +1,10 @@ -package world.bentobox.bbox.api.events.island; +package world.bentobox.bentobox.api.events.island; import java.util.UUID; -import world.bentobox.bbox.api.events.IslandBaseEvent; -import world.bentobox.bbox.api.flags.Flag; -import world.bentobox.bbox.database.objects.Island; +import world.bentobox.bentobox.api.events.IslandBaseEvent; +import world.bentobox.bentobox.api.flags.Flag; +import world.bentobox.bentobox.database.objects.Island; /** * This event is fired when a player changes a flag on his island diff --git a/src/main/java/world/bentobox/bbox/api/events/island/IslandEvent.java b/src/main/java/world/bentobox/bentobox/api/events/island/IslandEvent.java similarity index 98% rename from src/main/java/world/bentobox/bbox/api/events/island/IslandEvent.java rename to src/main/java/world/bentobox/bentobox/api/events/island/IslandEvent.java index 2fc528230..ee724ab71 100644 --- a/src/main/java/world/bentobox/bbox/api/events/island/IslandEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/island/IslandEvent.java @@ -1,12 +1,12 @@ -package world.bentobox.bbox.api.events.island; +package world.bentobox.bentobox.api.events.island; import java.util.UUID; import org.bukkit.Bukkit; import org.bukkit.Location; -import world.bentobox.bbox.api.events.IslandBaseEvent; -import world.bentobox.bbox.database.objects.Island; +import world.bentobox.bentobox.api.events.IslandBaseEvent; +import world.bentobox.bentobox.database.objects.Island; /** * Fired when a team event happens. diff --git a/src/main/java/world/bentobox/bbox/api/events/purge/PurgeDeleteIslandEvent.java b/src/main/java/world/bentobox/bentobox/api/events/purge/PurgeDeleteIslandEvent.java similarity index 72% rename from src/main/java/world/bentobox/bbox/api/events/purge/PurgeDeleteIslandEvent.java rename to src/main/java/world/bentobox/bentobox/api/events/purge/PurgeDeleteIslandEvent.java index 3da9c826e..060b3ab24 100644 --- a/src/main/java/world/bentobox/bbox/api/events/purge/PurgeDeleteIslandEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/purge/PurgeDeleteIslandEvent.java @@ -1,7 +1,7 @@ -package world.bentobox.bbox.api.events.purge; +package world.bentobox.bentobox.api.events.purge; -import world.bentobox.bbox.api.events.IslandBaseEvent; -import world.bentobox.bbox.database.objects.Island; +import world.bentobox.bentobox.api.events.IslandBaseEvent; +import world.bentobox.bentobox.database.objects.Island; /** * This event is fired before an island is going to be purged. diff --git a/src/main/java/world/bentobox/bbox/api/events/purge/PurgeStartEvent.java b/src/main/java/world/bentobox/bentobox/api/events/purge/PurgeStartEvent.java similarity index 95% rename from src/main/java/world/bentobox/bbox/api/events/purge/PurgeStartEvent.java rename to src/main/java/world/bentobox/bentobox/api/events/purge/PurgeStartEvent.java index 206fd6143..e44d7dd33 100644 --- a/src/main/java/world/bentobox/bbox/api/events/purge/PurgeStartEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/purge/PurgeStartEvent.java @@ -1,11 +1,11 @@ -package world.bentobox.bbox.api.events.purge; +package world.bentobox.bentobox.api.events.purge; import java.util.List; import java.util.UUID; import org.bukkit.event.Cancellable; -import world.bentobox.bbox.api.events.PremadeEvent; +import world.bentobox.bentobox.api.events.PremadeEvent; /** * This event is fired when islands to remove have been chosen and before starting to remove them. diff --git a/src/main/java/world/bentobox/bbox/api/events/team/TeamEvent.java b/src/main/java/world/bentobox/bentobox/api/events/team/TeamEvent.java similarity index 97% rename from src/main/java/world/bentobox/bbox/api/events/team/TeamEvent.java rename to src/main/java/world/bentobox/bentobox/api/events/team/TeamEvent.java index f61ceb2c1..de4201d60 100644 --- a/src/main/java/world/bentobox/bbox/api/events/team/TeamEvent.java +++ b/src/main/java/world/bentobox/bentobox/api/events/team/TeamEvent.java @@ -1,11 +1,11 @@ -package world.bentobox.bbox.api.events.team; +package world.bentobox.bentobox.api.events.team; import java.util.UUID; import org.bukkit.Location; -import world.bentobox.bbox.api.events.IslandBaseEvent; -import world.bentobox.bbox.database.objects.Island; +import world.bentobox.bentobox.api.events.IslandBaseEvent; +import world.bentobox.bentobox.database.objects.Island; /** * Fired when a team event happens. diff --git a/src/main/java/world/bentobox/bbox/api/flags/AbstractFlagListener.java b/src/main/java/world/bentobox/bentobox/api/flags/AbstractFlagListener.java similarity index 92% rename from src/main/java/world/bentobox/bbox/api/flags/AbstractFlagListener.java rename to src/main/java/world/bentobox/bentobox/api/flags/AbstractFlagListener.java index 0a63156e7..3175677a5 100644 --- a/src/main/java/world/bentobox/bbox/api/flags/AbstractFlagListener.java +++ b/src/main/java/world/bentobox/bentobox/api/flags/AbstractFlagListener.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.api.flags; +package world.bentobox.bentobox.api.flags; import java.lang.reflect.Method; import java.util.Optional; @@ -9,12 +9,12 @@ import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.Listener; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.localization.TextVariables; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.localization.TextVariables; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; /** * Abstract class for flag listeners. Provides common code. @@ -106,7 +106,7 @@ public abstract class AbstractFlagListener implements Listener { * Check if flag is allowed at location * @param e - event * @param loc - location - * @param flag - flag {@link world.bentobox.bbox.lists.Flags} + * @param flag - flag {@link world.bentobox.bentobox.lists.Flags} * @return true if allowed, false if not */ public boolean checkIsland(Event e, Location loc, Flag flag) { @@ -117,7 +117,7 @@ public abstract class AbstractFlagListener implements Listener { * Check if flag is allowed at location * @param e - event * @param loc - location - * @param flag - flag {@link world.bentobox.bbox.lists.Flags} + * @param flag - flag {@link world.bentobox.bentobox.lists.Flags} * @param silent - if true, no attempt is made to tell the user * @return true if the check is okay, false if it was disallowed */ diff --git a/src/main/java/world/bentobox/bbox/api/flags/Flag.java b/src/main/java/world/bentobox/bentobox/api/flags/Flag.java similarity index 94% rename from src/main/java/world/bentobox/bbox/api/flags/Flag.java rename to src/main/java/world/bentobox/bentobox/api/flags/Flag.java index aa2ae6d8e..37b4bbbef 100644 --- a/src/main/java/world/bentobox/bbox/api/flags/Flag.java +++ b/src/main/java/world/bentobox/bentobox/api/flags/Flag.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.api.flags; +package world.bentobox.bentobox.api.flags; import java.util.Optional; @@ -7,14 +7,14 @@ import org.bukkit.World; import org.bukkit.event.Listener; import org.bukkit.inventory.ItemStack; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.configuration.WorldSettings; -import world.bentobox.bbox.api.localization.TextVariables; -import world.bentobox.bbox.api.panels.PanelItem; -import world.bentobox.bbox.api.panels.builders.PanelItemBuilder; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.managers.RanksManager; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.configuration.WorldSettings; +import world.bentobox.bentobox.api.localization.TextVariables; +import world.bentobox.bentobox.api.panels.PanelItem; +import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.managers.RanksManager; public class Flag implements Comparable { diff --git a/src/main/java/world/bentobox/bbox/api/flags/FlagBuilder.java b/src/main/java/world/bentobox/bentobox/api/flags/FlagBuilder.java similarity index 86% rename from src/main/java/world/bentobox/bbox/api/flags/FlagBuilder.java rename to src/main/java/world/bentobox/bentobox/api/flags/FlagBuilder.java index 741a6789c..b606f98d7 100644 --- a/src/main/java/world/bentobox/bbox/api/flags/FlagBuilder.java +++ b/src/main/java/world/bentobox/bentobox/api/flags/FlagBuilder.java @@ -1,14 +1,14 @@ -package world.bentobox.bbox.api.flags; +package world.bentobox.bentobox.api.flags; import org.bukkit.Material; import org.bukkit.event.Listener; -import world.bentobox.bbox.api.flags.Flag.Type; -import world.bentobox.bbox.api.flags.clicklisteners.CycleClick; -import world.bentobox.bbox.api.flags.clicklisteners.IslandToggleClick; -import world.bentobox.bbox.api.flags.clicklisteners.WorldToggleClick; -import world.bentobox.bbox.api.panels.PanelItem; -import world.bentobox.bbox.managers.RanksManager; +import world.bentobox.bentobox.api.flags.Flag.Type; +import world.bentobox.bentobox.api.flags.clicklisteners.CycleClick; +import world.bentobox.bentobox.api.flags.clicklisteners.IslandToggleClick; +import world.bentobox.bentobox.api.flags.clicklisteners.WorldToggleClick; +import world.bentobox.bentobox.api.panels.PanelItem; +import world.bentobox.bentobox.managers.RanksManager; public class FlagBuilder { @@ -109,7 +109,7 @@ public class FlagBuilder { /** * Adds a listener for clicks on this flag when it is a panel item. Default is - * {@link world.bentobox.bbox.api.flags.clicklisteners.CycleClick} + * {@link world.bentobox.bentobox.api.flags.clicklisteners.CycleClick} * @param onClickListener - the listener for clicks. Must use the ClickOn interface * @return FlagBuilder */ diff --git a/src/main/java/world/bentobox/bbox/api/flags/clicklisteners/CycleClick.java b/src/main/java/world/bentobox/bentobox/api/flags/clicklisteners/CycleClick.java similarity index 86% rename from src/main/java/world/bentobox/bbox/api/flags/clicklisteners/CycleClick.java rename to src/main/java/world/bentobox/bentobox/api/flags/clicklisteners/CycleClick.java index 086386256..be9e7eee8 100644 --- a/src/main/java/world/bentobox/bbox/api/flags/clicklisteners/CycleClick.java +++ b/src/main/java/world/bentobox/bentobox/api/flags/clicklisteners/CycleClick.java @@ -1,16 +1,16 @@ -package world.bentobox.bbox.api.flags.clicklisteners; +package world.bentobox.bentobox.api.flags.clicklisteners; import org.bukkit.Sound; import org.bukkit.event.inventory.ClickType; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.flags.Flag; -import world.bentobox.bbox.api.panels.Panel; -import world.bentobox.bbox.api.panels.PanelItem; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.managers.RanksManager; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.flags.Flag; +import world.bentobox.bentobox.api.panels.Panel; +import world.bentobox.bentobox.api.panels.PanelItem; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.managers.RanksManager; +import world.bentobox.bentobox.util.Util; /** * Left Clicks increase rank, right clicks lower rank diff --git a/src/main/java/world/bentobox/bbox/api/flags/clicklisteners/IslandToggleClick.java b/src/main/java/world/bentobox/bentobox/api/flags/clicklisteners/IslandToggleClick.java similarity index 82% rename from src/main/java/world/bentobox/bbox/api/flags/clicklisteners/IslandToggleClick.java rename to src/main/java/world/bentobox/bentobox/api/flags/clicklisteners/IslandToggleClick.java index 53b60d13f..5d82d422b 100644 --- a/src/main/java/world/bentobox/bbox/api/flags/clicklisteners/IslandToggleClick.java +++ b/src/main/java/world/bentobox/bentobox/api/flags/clicklisteners/IslandToggleClick.java @@ -1,18 +1,18 @@ /* */ -package world.bentobox.bbox.api.flags.clicklisteners; +package world.bentobox.bentobox.api.flags.clicklisteners; import org.bukkit.Sound; import org.bukkit.event.inventory.ClickType; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.flags.Flag; -import world.bentobox.bbox.api.panels.Panel; -import world.bentobox.bbox.api.panels.PanelItem.ClickHandler; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.flags.Flag; +import world.bentobox.bentobox.api.panels.Panel; +import world.bentobox.bentobox.api.panels.PanelItem.ClickHandler; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.util.Util; /** * Toggles a island setting on/off diff --git a/src/main/java/world/bentobox/bbox/api/flags/clicklisteners/WorldToggleClick.java b/src/main/java/world/bentobox/bentobox/api/flags/clicklisteners/WorldToggleClick.java similarity index 82% rename from src/main/java/world/bentobox/bbox/api/flags/clicklisteners/WorldToggleClick.java rename to src/main/java/world/bentobox/bentobox/api/flags/clicklisteners/WorldToggleClick.java index d12067a15..e909f0dc3 100644 --- a/src/main/java/world/bentobox/bbox/api/flags/clicklisteners/WorldToggleClick.java +++ b/src/main/java/world/bentobox/bentobox/api/flags/clicklisteners/WorldToggleClick.java @@ -1,17 +1,17 @@ /* */ -package world.bentobox.bbox.api.flags.clicklisteners; +package world.bentobox.bentobox.api.flags.clicklisteners; import org.bukkit.Sound; import org.bukkit.event.inventory.ClickType; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.flags.Flag; -import world.bentobox.bbox.api.panels.Panel; -import world.bentobox.bbox.api.panels.PanelItem.ClickHandler; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.flags.Flag; +import world.bentobox.bentobox.api.panels.Panel; +import world.bentobox.bentobox.api.panels.PanelItem.ClickHandler; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.util.Util; /** * Toggles a worldwide setting on/off diff --git a/src/main/java/world/bentobox/bbox/api/localization/BentoBoxLocale.java b/src/main/java/world/bentobox/bentobox/api/localization/BentoBoxLocale.java similarity index 95% rename from src/main/java/world/bentobox/bbox/api/localization/BentoBoxLocale.java rename to src/main/java/world/bentobox/bentobox/api/localization/BentoBoxLocale.java index 613bb7fa1..e999b9e75 100644 --- a/src/main/java/world/bentobox/bbox/api/localization/BentoBoxLocale.java +++ b/src/main/java/world/bentobox/bentobox/api/localization/BentoBoxLocale.java @@ -1,11 +1,11 @@ -package world.bentobox.bbox.api.localization; +package world.bentobox.bentobox.api.localization; import java.util.Locale; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.inventory.ItemStack; -import world.bentobox.bbox.util.ItemParser; +import world.bentobox.bentobox.util.ItemParser; /** * @author Poslovitch, tastybento diff --git a/src/main/java/world/bentobox/bbox/api/localization/TextVariables.java b/src/main/java/world/bentobox/bentobox/api/localization/TextVariables.java similarity index 92% rename from src/main/java/world/bentobox/bbox/api/localization/TextVariables.java rename to src/main/java/world/bentobox/bentobox/api/localization/TextVariables.java index fea96d04c..da1535c59 100644 --- a/src/main/java/world/bentobox/bbox/api/localization/TextVariables.java +++ b/src/main/java/world/bentobox/bentobox/api/localization/TextVariables.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.api.localization; +package world.bentobox.bentobox.api.localization; /** * Contains the common variables that can be used in texts. diff --git a/src/main/java/world/bentobox/bbox/api/panels/Panel.java b/src/main/java/world/bentobox/bentobox/api/panels/Panel.java similarity index 94% rename from src/main/java/world/bentobox/bbox/api/panels/Panel.java rename to src/main/java/world/bentobox/bentobox/api/panels/Panel.java index bd1846f7d..266079dbc 100644 --- a/src/main/java/world/bentobox/bbox/api/panels/Panel.java +++ b/src/main/java/world/bentobox/bentobox/api/panels/Panel.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.api.panels; +package world.bentobox.bentobox.api.panels; import java.util.Map; import java.util.Optional; @@ -10,10 +10,10 @@ import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.listeners.PanelListenerManager; -import world.bentobox.bbox.util.HeadGetter; -import world.bentobox.bbox.util.HeadRequester; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.listeners.PanelListenerManager; +import world.bentobox.bentobox.util.HeadGetter; +import world.bentobox.bentobox.util.HeadRequester; public class Panel implements HeadRequester { diff --git a/src/main/java/world/bentobox/bbox/api/panels/PanelItem.java b/src/main/java/world/bentobox/bentobox/api/panels/PanelItem.java similarity index 95% rename from src/main/java/world/bentobox/bbox/api/panels/PanelItem.java rename to src/main/java/world/bentobox/bentobox/api/panels/PanelItem.java index e2bceb543..012d3f18f 100644 --- a/src/main/java/world/bentobox/bbox/api/panels/PanelItem.java +++ b/src/main/java/world/bentobox/bentobox/api/panels/PanelItem.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.api.panels; +package world.bentobox.bentobox.api.panels; import java.util.List; import java.util.Optional; @@ -9,8 +9,8 @@ import org.bukkit.inventory.ItemFlag; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; -import world.bentobox.bbox.api.panels.builders.PanelItemBuilder; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder; +import world.bentobox.bentobox.api.user.User; public class PanelItem { diff --git a/src/main/java/world/bentobox/bbox/api/panels/PanelListener.java b/src/main/java/world/bentobox/bentobox/api/panels/PanelListener.java similarity index 79% rename from src/main/java/world/bentobox/bbox/api/panels/PanelListener.java rename to src/main/java/world/bentobox/bentobox/api/panels/PanelListener.java index b7f4d95e5..b55b9837f 100644 --- a/src/main/java/world/bentobox/bbox/api/panels/PanelListener.java +++ b/src/main/java/world/bentobox/bentobox/api/panels/PanelListener.java @@ -1,9 +1,9 @@ -package world.bentobox.bbox.api.panels; +package world.bentobox.bentobox.api.panels; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.inventory.InventoryCloseEvent; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.user.User; public interface PanelListener { diff --git a/src/main/java/world/bentobox/bbox/api/panels/builders/PanelBuilder.java b/src/main/java/world/bentobox/bentobox/api/panels/builders/PanelBuilder.java similarity index 90% rename from src/main/java/world/bentobox/bbox/api/panels/builders/PanelBuilder.java rename to src/main/java/world/bentobox/bentobox/api/panels/builders/PanelBuilder.java index 49897a262..6234542cb 100644 --- a/src/main/java/world/bentobox/bbox/api/panels/builders/PanelBuilder.java +++ b/src/main/java/world/bentobox/bentobox/api/panels/builders/PanelBuilder.java @@ -1,11 +1,11 @@ -package world.bentobox.bbox.api.panels.builders; +package world.bentobox.bentobox.api.panels.builders; import java.util.TreeMap; -import world.bentobox.bbox.api.panels.Panel; -import world.bentobox.bbox.api.panels.PanelItem; -import world.bentobox.bbox.api.panels.PanelListener; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.panels.Panel; +import world.bentobox.bentobox.api.panels.PanelItem; +import world.bentobox.bentobox.api.panels.PanelListener; +import world.bentobox.bentobox.api.user.User; public class PanelBuilder { private String name; diff --git a/src/main/java/world/bentobox/bbox/api/panels/builders/PanelItemBuilder.java b/src/main/java/world/bentobox/bentobox/api/panels/builders/PanelItemBuilder.java similarity index 93% rename from src/main/java/world/bentobox/bbox/api/panels/builders/PanelItemBuilder.java rename to src/main/java/world/bentobox/bentobox/api/panels/builders/PanelItemBuilder.java index 03630aed0..eae22cad0 100644 --- a/src/main/java/world/bentobox/bbox/api/panels/builders/PanelItemBuilder.java +++ b/src/main/java/world/bentobox/bentobox/api/panels/builders/PanelItemBuilder.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.api.panels.builders; +package world.bentobox.bentobox.api.panels.builders; import java.util.ArrayList; import java.util.Arrays; @@ -8,8 +8,8 @@ import java.util.List; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; -import world.bentobox.bbox.api.panels.PanelItem; -import world.bentobox.bbox.api.panels.PanelItem.ClickHandler; +import world.bentobox.bentobox.api.panels.PanelItem; +import world.bentobox.bentobox.api.panels.PanelItem.ClickHandler; public class PanelItemBuilder { private ItemStack icon = new ItemStack(Material.AIR); diff --git a/src/main/java/world/bentobox/bbox/api/placeholders/Placeholder.java b/src/main/java/world/bentobox/bentobox/api/placeholders/Placeholder.java similarity index 84% rename from src/main/java/world/bentobox/bbox/api/placeholders/Placeholder.java rename to src/main/java/world/bentobox/bentobox/api/placeholders/Placeholder.java index a9ebde73a..d21acf676 100644 --- a/src/main/java/world/bentobox/bbox/api/placeholders/Placeholder.java +++ b/src/main/java/world/bentobox/bentobox/api/placeholders/Placeholder.java @@ -1,6 +1,6 @@ -package world.bentobox.bbox.api.placeholders; +package world.bentobox.bentobox.api.placeholders; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.user.User; /** * @author Poslovitch diff --git a/src/main/java/world/bentobox/bbox/api/placeholders/PlaceholderAPIInterface.java b/src/main/java/world/bentobox/bentobox/api/placeholders/PlaceholderAPIInterface.java similarity index 85% rename from src/main/java/world/bentobox/bbox/api/placeholders/PlaceholderAPIInterface.java rename to src/main/java/world/bentobox/bentobox/api/placeholders/PlaceholderAPIInterface.java index 87a9f0c11..377fad907 100644 --- a/src/main/java/world/bentobox/bbox/api/placeholders/PlaceholderAPIInterface.java +++ b/src/main/java/world/bentobox/bentobox/api/placeholders/PlaceholderAPIInterface.java @@ -1,7 +1,7 @@ -package world.bentobox.bbox.api.placeholders; +package world.bentobox.bentobox.api.placeholders; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.user.User; /** * Simple interface for every Placeholder API. diff --git a/src/main/java/world/bentobox/bbox/api/placeholders/PlaceholderBuilder.java b/src/main/java/world/bentobox/bentobox/api/placeholders/PlaceholderBuilder.java similarity index 92% rename from src/main/java/world/bentobox/bbox/api/placeholders/PlaceholderBuilder.java rename to src/main/java/world/bentobox/bentobox/api/placeholders/PlaceholderBuilder.java index 49cc38a3a..a7f6de9ad 100644 --- a/src/main/java/world/bentobox/bbox/api/placeholders/PlaceholderBuilder.java +++ b/src/main/java/world/bentobox/bentobox/api/placeholders/PlaceholderBuilder.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.api.placeholders; +package world.bentobox.bentobox.api.placeholders; public class PlaceholderBuilder { diff --git a/src/main/java/world/bentobox/bbox/api/placeholders/PlaceholderHandler.java b/src/main/java/world/bentobox/bentobox/api/placeholders/PlaceholderHandler.java similarity index 92% rename from src/main/java/world/bentobox/bbox/api/placeholders/PlaceholderHandler.java rename to src/main/java/world/bentobox/bentobox/api/placeholders/PlaceholderHandler.java index 5b07d2b57..f4b18dd55 100644 --- a/src/main/java/world/bentobox/bbox/api/placeholders/PlaceholderHandler.java +++ b/src/main/java/world/bentobox/bentobox/api/placeholders/PlaceholderHandler.java @@ -1,11 +1,11 @@ -package world.bentobox.bbox.api.placeholders; +package world.bentobox.bentobox.api.placeholders; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.user.User; /** * Handles hooks with other Placeholder APIs. @@ -13,7 +13,7 @@ import world.bentobox.bbox.api.user.User; * @author Poslovitch, Tastybento */ public class PlaceholderHandler { - private static final String PACKAGE = "world.bentobox.bbox.api.placeholders.hooks."; + private static final String PACKAGE = "world.bentobox.bentobox.api.placeholders.hooks."; // This class should never be instantiated (all methods are static) private PlaceholderHandler() {} diff --git a/src/main/java/world/bentobox/bbox/api/placeholders/hooks/InternalPlaceholderImpl.java b/src/main/java/world/bentobox/bentobox/api/placeholders/hooks/InternalPlaceholderImpl.java similarity index 72% rename from src/main/java/world/bentobox/bbox/api/placeholders/hooks/InternalPlaceholderImpl.java rename to src/main/java/world/bentobox/bentobox/api/placeholders/hooks/InternalPlaceholderImpl.java index 32d91828f..448f80ef8 100644 --- a/src/main/java/world/bentobox/bbox/api/placeholders/hooks/InternalPlaceholderImpl.java +++ b/src/main/java/world/bentobox/bentobox/api/placeholders/hooks/InternalPlaceholderImpl.java @@ -1,10 +1,10 @@ -package world.bentobox.bbox.api.placeholders.hooks; +package world.bentobox.bentobox.api.placeholders.hooks; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.placeholders.Placeholder; -import world.bentobox.bbox.api.placeholders.PlaceholderAPIInterface; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.lists.Placeholders; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.placeholders.Placeholder; +import world.bentobox.bentobox.api.placeholders.PlaceholderAPIInterface; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.lists.Placeholders; /** * Built-in placeholder API diff --git a/src/main/java/world/bentobox/bbox/api/user/Notifier.java b/src/main/java/world/bentobox/bentobox/api/user/Notifier.java similarity index 98% rename from src/main/java/world/bentobox/bbox/api/user/Notifier.java rename to src/main/java/world/bentobox/bentobox/api/user/Notifier.java index 20879bb96..b4e9f5fd7 100644 --- a/src/main/java/world/bentobox/bbox/api/user/Notifier.java +++ b/src/main/java/world/bentobox/bentobox/api/user/Notifier.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.api.user; +package world.bentobox.bentobox.api.user; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/world/bentobox/bbox/api/user/User.java b/src/main/java/world/bentobox/bentobox/api/user/User.java similarity index 98% rename from src/main/java/world/bentobox/bbox/api/user/User.java rename to src/main/java/world/bentobox/bentobox/api/user/User.java index eab61d8c8..c4516c025 100644 --- a/src/main/java/world/bentobox/bbox/api/user/User.java +++ b/src/main/java/world/bentobox/bentobox/api/user/User.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.api.user; +package world.bentobox.bentobox.api.user; import java.util.HashMap; import java.util.Locale; @@ -17,8 +17,8 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.PlayerInventory; import org.bukkit.permissions.PermissionAttachmentInfo; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.placeholders.PlaceholderHandler; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.placeholders.PlaceholderHandler; /** * BSB's user object. Wraps Player. diff --git a/src/main/java/world/bentobox/bbox/commands/admin/AdminClearResetsAllCommand.java b/src/main/java/world/bentobox/bentobox/commands/admin/AdminClearResetsAllCommand.java similarity index 87% rename from src/main/java/world/bentobox/bbox/commands/admin/AdminClearResetsAllCommand.java rename to src/main/java/world/bentobox/bentobox/commands/admin/AdminClearResetsAllCommand.java index d59bb20a2..2a39ca7af 100644 --- a/src/main/java/world/bentobox/bbox/commands/admin/AdminClearResetsAllCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/admin/AdminClearResetsAllCommand.java @@ -1,12 +1,12 @@ -package world.bentobox.bbox.commands.admin; +package world.bentobox.bentobox.commands.admin; import java.util.List; import org.bukkit.Bukkit; import org.bukkit.entity.Player; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; public class AdminClearResetsAllCommand extends CompositeCommand { diff --git a/src/main/java/world/bentobox/bbox/commands/admin/AdminClearResetsCommand.java b/src/main/java/world/bentobox/bentobox/commands/admin/AdminClearResetsCommand.java similarity index 90% rename from src/main/java/world/bentobox/bbox/commands/admin/AdminClearResetsCommand.java rename to src/main/java/world/bentobox/bentobox/commands/admin/AdminClearResetsCommand.java index 9bc4cd0c6..093303dcc 100644 --- a/src/main/java/world/bentobox/bbox/commands/admin/AdminClearResetsCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/admin/AdminClearResetsCommand.java @@ -1,13 +1,13 @@ -package world.bentobox.bbox.commands.admin; +package world.bentobox.bentobox.commands.admin; import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.UUID; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.util.Util; public class AdminClearResetsCommand extends CompositeCommand { diff --git a/src/main/java/world/bentobox/bbox/commands/admin/AdminGetRankCommand.java b/src/main/java/world/bentobox/bentobox/commands/admin/AdminGetRankCommand.java similarity index 84% rename from src/main/java/world/bentobox/bbox/commands/admin/AdminGetRankCommand.java rename to src/main/java/world/bentobox/bentobox/commands/admin/AdminGetRankCommand.java index 6af82163a..8e6eedf72 100644 --- a/src/main/java/world/bentobox/bbox/commands/admin/AdminGetRankCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/admin/AdminGetRankCommand.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.commands.admin; +package world.bentobox.bentobox.commands.admin; import java.util.List; import java.util.Optional; @@ -8,11 +8,11 @@ import java.util.stream.Collectors; import org.bukkit.Bukkit; import org.bukkit.entity.Player; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.localization.TextVariables; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.managers.RanksManager; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.localization.TextVariables; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.managers.RanksManager; /** * @author tastybento diff --git a/src/main/java/world/bentobox/bbox/commands/admin/AdminInfoCommand.java b/src/main/java/world/bentobox/bentobox/commands/admin/AdminInfoCommand.java similarity index 91% rename from src/main/java/world/bentobox/bbox/commands/admin/AdminInfoCommand.java rename to src/main/java/world/bentobox/bentobox/commands/admin/AdminInfoCommand.java index da2dc4f82..700955db5 100644 --- a/src/main/java/world/bentobox/bbox/commands/admin/AdminInfoCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/admin/AdminInfoCommand.java @@ -1,10 +1,10 @@ -package world.bentobox.bbox.commands.admin; +package world.bentobox.bentobox.commands.admin; import java.util.List; import java.util.UUID; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; public class AdminInfoCommand extends CompositeCommand { diff --git a/src/main/java/world/bentobox/bbox/commands/admin/AdminRegisterCommand.java b/src/main/java/world/bentobox/bentobox/commands/admin/AdminRegisterCommand.java similarity index 94% rename from src/main/java/world/bentobox/bbox/commands/admin/AdminRegisterCommand.java rename to src/main/java/world/bentobox/bentobox/commands/admin/AdminRegisterCommand.java index cb248f066..0d327da57 100644 --- a/src/main/java/world/bentobox/bbox/commands/admin/AdminRegisterCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/admin/AdminRegisterCommand.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.commands.admin; +package world.bentobox.bentobox.commands.admin; import java.util.ArrayList; import java.util.List; @@ -8,10 +8,10 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.Material; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.util.Util; public class AdminRegisterCommand extends CompositeCommand { diff --git a/src/main/java/world/bentobox/bbox/commands/admin/AdminReloadCommand.java b/src/main/java/world/bentobox/bentobox/commands/admin/AdminReloadCommand.java similarity index 76% rename from src/main/java/world/bentobox/bbox/commands/admin/AdminReloadCommand.java rename to src/main/java/world/bentobox/bentobox/commands/admin/AdminReloadCommand.java index bba63004f..e0662cbae 100644 --- a/src/main/java/world/bentobox/bbox/commands/admin/AdminReloadCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/admin/AdminReloadCommand.java @@ -1,9 +1,9 @@ -package world.bentobox.bbox.commands.admin; +package world.bentobox.bentobox.commands.admin; import java.util.List; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; /** * @author tastybento diff --git a/src/main/java/world/bentobox/bbox/commands/admin/AdminSchemCommand.java b/src/main/java/world/bentobox/bentobox/commands/admin/AdminSchemCommand.java similarity index 95% rename from src/main/java/world/bentobox/bbox/commands/admin/AdminSchemCommand.java rename to src/main/java/world/bentobox/bentobox/commands/admin/AdminSchemCommand.java index b7b8bbd1c..ad38b8655 100644 --- a/src/main/java/world/bentobox/bbox/commands/admin/AdminSchemCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/admin/AdminSchemCommand.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.commands.admin; +package world.bentobox.bentobox.commands.admin; import java.io.File; import java.util.HashMap; @@ -10,10 +10,10 @@ import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.block.Block; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.island.builders.Clipboard; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.island.builders.Clipboard; +import world.bentobox.bentobox.util.Util; public class AdminSchemCommand extends CompositeCommand { private Map clipboards; diff --git a/src/main/java/world/bentobox/bbox/commands/admin/AdminSetRankCommand.java b/src/main/java/world/bentobox/bentobox/commands/admin/AdminSetRankCommand.java similarity index 89% rename from src/main/java/world/bentobox/bbox/commands/admin/AdminSetRankCommand.java rename to src/main/java/world/bentobox/bentobox/commands/admin/AdminSetRankCommand.java index bf7dbbfba..55fa3d0de 100644 --- a/src/main/java/world/bentobox/bbox/commands/admin/AdminSetRankCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/admin/AdminSetRankCommand.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.commands.admin; +package world.bentobox.bentobox.commands.admin; import java.util.List; import java.util.Map; @@ -6,10 +6,10 @@ import java.util.Optional; import java.util.UUID; import java.util.stream.Collectors; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.managers.RanksManager; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.managers.RanksManager; /** * @author tastybento diff --git a/src/main/java/world/bentobox/bbox/commands/admin/AdminTeleportCommand.java b/src/main/java/world/bentobox/bentobox/commands/admin/AdminTeleportCommand.java similarity index 91% rename from src/main/java/world/bentobox/bbox/commands/admin/AdminTeleportCommand.java rename to src/main/java/world/bentobox/bentobox/commands/admin/AdminTeleportCommand.java index 7d619e9b0..be4173ad9 100644 --- a/src/main/java/world/bentobox/bbox/commands/admin/AdminTeleportCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/admin/AdminTeleportCommand.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.commands.admin; +package world.bentobox.bentobox.commands.admin; import java.util.ArrayList; import java.util.List; @@ -7,10 +7,10 @@ import java.util.UUID; import org.bukkit.Location; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.util.Util; -import world.bentobox.bbox.util.teleport.SafeTeleportBuilder; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.util.Util; +import world.bentobox.bentobox.util.teleport.SafeTeleportBuilder; public class AdminTeleportCommand extends CompositeCommand { diff --git a/src/main/java/world/bentobox/bbox/commands/admin/AdminUnregisterCommand.java b/src/main/java/world/bentobox/bentobox/commands/admin/AdminUnregisterCommand.java similarity index 91% rename from src/main/java/world/bentobox/bbox/commands/admin/AdminUnregisterCommand.java rename to src/main/java/world/bentobox/bentobox/commands/admin/AdminUnregisterCommand.java index 619a73e27..48a31f55c 100644 --- a/src/main/java/world/bentobox/bbox/commands/admin/AdminUnregisterCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/admin/AdminUnregisterCommand.java @@ -1,13 +1,13 @@ -package world.bentobox.bbox.commands.admin; +package world.bentobox.bentobox.commands.admin; import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.UUID; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.util.Util; public class AdminUnregisterCommand extends CompositeCommand { diff --git a/src/main/java/world/bentobox/bbox/commands/admin/AdminVersionCommand.java b/src/main/java/world/bentobox/bentobox/commands/admin/AdminVersionCommand.java similarity index 75% rename from src/main/java/world/bentobox/bbox/commands/admin/AdminVersionCommand.java rename to src/main/java/world/bentobox/bentobox/commands/admin/AdminVersionCommand.java index 11b16a088..b675af25f 100644 --- a/src/main/java/world/bentobox/bbox/commands/admin/AdminVersionCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/admin/AdminVersionCommand.java @@ -1,9 +1,9 @@ -package world.bentobox.bbox.commands.admin; +package world.bentobox.bentobox.commands.admin; import java.util.List; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; public class AdminVersionCommand extends CompositeCommand { diff --git a/src/main/java/world/bentobox/bbox/commands/admin/range/AdminRangeCommand.java b/src/main/java/world/bentobox/bentobox/commands/admin/range/AdminRangeCommand.java similarity index 79% rename from src/main/java/world/bentobox/bbox/commands/admin/range/AdminRangeCommand.java rename to src/main/java/world/bentobox/bentobox/commands/admin/range/AdminRangeCommand.java index 1379d3e0e..cb38762fa 100644 --- a/src/main/java/world/bentobox/bbox/commands/admin/range/AdminRangeCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/admin/range/AdminRangeCommand.java @@ -1,9 +1,9 @@ -package world.bentobox.bbox.commands.admin.range; +package world.bentobox.bentobox.commands.admin.range; import java.util.List; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; /** * @author Poslovitch diff --git a/src/main/java/world/bentobox/bbox/commands/admin/range/AdminRangeDisplayCommand.java b/src/main/java/world/bentobox/bentobox/commands/admin/range/AdminRangeDisplayCommand.java similarity index 96% rename from src/main/java/world/bentobox/bbox/commands/admin/range/AdminRangeDisplayCommand.java rename to src/main/java/world/bentobox/bentobox/commands/admin/range/AdminRangeDisplayCommand.java index 64f60ffad..2593366ec 100644 --- a/src/main/java/world/bentobox/bbox/commands/admin/range/AdminRangeDisplayCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/admin/range/AdminRangeDisplayCommand.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.commands.admin.range; +package world.bentobox.bentobox.commands.admin.range; import java.util.HashMap; import java.util.List; @@ -10,8 +10,8 @@ import org.bukkit.Particle; import org.bukkit.entity.Player; import org.bukkit.util.Vector; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; /** * @author Poslovitch diff --git a/src/main/java/world/bentobox/bbox/commands/admin/range/AdminRangeResetCommand.java b/src/main/java/world/bentobox/bentobox/commands/admin/range/AdminRangeResetCommand.java similarity index 83% rename from src/main/java/world/bentobox/bbox/commands/admin/range/AdminRangeResetCommand.java rename to src/main/java/world/bentobox/bentobox/commands/admin/range/AdminRangeResetCommand.java index 24204c0bf..7d4166806 100644 --- a/src/main/java/world/bentobox/bbox/commands/admin/range/AdminRangeResetCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/admin/range/AdminRangeResetCommand.java @@ -1,12 +1,12 @@ -package world.bentobox.bbox.commands.admin.range; +package world.bentobox.bentobox.commands.admin.range; import java.util.List; import java.util.UUID; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.localization.TextVariables; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.localization.TextVariables; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; public class AdminRangeResetCommand extends CompositeCommand { diff --git a/src/main/java/world/bentobox/bbox/commands/admin/range/AdminRangeSetCommand.java b/src/main/java/world/bentobox/bentobox/commands/admin/range/AdminRangeSetCommand.java similarity index 89% rename from src/main/java/world/bentobox/bbox/commands/admin/range/AdminRangeSetCommand.java rename to src/main/java/world/bentobox/bentobox/commands/admin/range/AdminRangeSetCommand.java index 38f0531f0..11aa7139c 100644 --- a/src/main/java/world/bentobox/bbox/commands/admin/range/AdminRangeSetCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/admin/range/AdminRangeSetCommand.java @@ -1,14 +1,14 @@ -package world.bentobox.bbox.commands.admin.range; +package world.bentobox.bentobox.commands.admin.range; import java.util.List; import java.util.UUID; import org.apache.commons.lang.StringUtils; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.localization.TextVariables; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.localization.TextVariables; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; public class AdminRangeSetCommand extends CompositeCommand { diff --git a/src/main/java/world/bentobox/bbox/commands/admin/team/AdminTeamAddCommand.java b/src/main/java/world/bentobox/bentobox/commands/admin/team/AdminTeamAddCommand.java similarity index 92% rename from src/main/java/world/bentobox/bbox/commands/admin/team/AdminTeamAddCommand.java rename to src/main/java/world/bentobox/bentobox/commands/admin/team/AdminTeamAddCommand.java index 7989ad516..ac2bf3653 100644 --- a/src/main/java/world/bentobox/bbox/commands/admin/team/AdminTeamAddCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/admin/team/AdminTeamAddCommand.java @@ -1,11 +1,11 @@ -package world.bentobox.bbox.commands.admin.team; +package world.bentobox.bentobox.commands.admin.team; import java.util.List; import java.util.UUID; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.localization.TextVariables; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.localization.TextVariables; +import world.bentobox.bentobox.api.user.User; public class AdminTeamAddCommand extends CompositeCommand { diff --git a/src/main/java/world/bentobox/bbox/commands/admin/team/AdminTeamDisbandCommand.java b/src/main/java/world/bentobox/bentobox/commands/admin/team/AdminTeamDisbandCommand.java similarity index 92% rename from src/main/java/world/bentobox/bbox/commands/admin/team/AdminTeamDisbandCommand.java rename to src/main/java/world/bentobox/bentobox/commands/admin/team/AdminTeamDisbandCommand.java index 9a35e3895..542aa299d 100644 --- a/src/main/java/world/bentobox/bbox/commands/admin/team/AdminTeamDisbandCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/admin/team/AdminTeamDisbandCommand.java @@ -1,10 +1,10 @@ -package world.bentobox.bbox.commands.admin.team; +package world.bentobox.bentobox.commands.admin.team; import java.util.List; import java.util.UUID; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; public class AdminTeamDisbandCommand extends CompositeCommand { diff --git a/src/main/java/world/bentobox/bbox/commands/admin/team/AdminTeamKickCommand.java b/src/main/java/world/bentobox/bentobox/commands/admin/team/AdminTeamKickCommand.java similarity index 91% rename from src/main/java/world/bentobox/bbox/commands/admin/team/AdminTeamKickCommand.java rename to src/main/java/world/bentobox/bentobox/commands/admin/team/AdminTeamKickCommand.java index 2eabbd9b0..8c50ac9db 100644 --- a/src/main/java/world/bentobox/bbox/commands/admin/team/AdminTeamKickCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/admin/team/AdminTeamKickCommand.java @@ -1,10 +1,10 @@ -package world.bentobox.bbox.commands.admin.team; +package world.bentobox.bentobox.commands.admin.team; import java.util.List; import java.util.UUID; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; public class AdminTeamKickCommand extends CompositeCommand { diff --git a/src/main/java/world/bentobox/bbox/commands/admin/team/AdminTeamMakeLeaderCommand.java b/src/main/java/world/bentobox/bentobox/commands/admin/team/AdminTeamMakeLeaderCommand.java similarity index 90% rename from src/main/java/world/bentobox/bbox/commands/admin/team/AdminTeamMakeLeaderCommand.java rename to src/main/java/world/bentobox/bentobox/commands/admin/team/AdminTeamMakeLeaderCommand.java index 4e743f195..dfb724358 100644 --- a/src/main/java/world/bentobox/bbox/commands/admin/team/AdminTeamMakeLeaderCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/admin/team/AdminTeamMakeLeaderCommand.java @@ -1,10 +1,10 @@ -package world.bentobox.bbox.commands.admin.team; +package world.bentobox.bentobox.commands.admin.team; import java.util.List; import java.util.UUID; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; public class AdminTeamMakeLeaderCommand extends CompositeCommand { diff --git a/src/main/java/world/bentobox/bbox/commands/island/CustomIslandMultiHomeHelp.java b/src/main/java/world/bentobox/bentobox/commands/island/CustomIslandMultiHomeHelp.java similarity index 90% rename from src/main/java/world/bentobox/bbox/commands/island/CustomIslandMultiHomeHelp.java rename to src/main/java/world/bentobox/bentobox/commands/island/CustomIslandMultiHomeHelp.java index 75d3b0985..10beae9a7 100644 --- a/src/main/java/world/bentobox/bbox/commands/island/CustomIslandMultiHomeHelp.java +++ b/src/main/java/world/bentobox/bentobox/commands/island/CustomIslandMultiHomeHelp.java @@ -1,10 +1,10 @@ -package world.bentobox.bbox.commands.island; +package world.bentobox.bentobox.commands.island; import java.util.List; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.util.Util; /** * This is a custom help for the /island go and /island sethome commands. It overrides the default help sub command. diff --git a/src/main/java/world/bentobox/bbox/commands/island/IslandAboutCommand.java b/src/main/java/world/bentobox/bentobox/commands/island/IslandAboutCommand.java similarity index 92% rename from src/main/java/world/bentobox/bbox/commands/island/IslandAboutCommand.java rename to src/main/java/world/bentobox/bentobox/commands/island/IslandAboutCommand.java index d7d5c39be..0d5c6d79c 100644 --- a/src/main/java/world/bentobox/bbox/commands/island/IslandAboutCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/island/IslandAboutCommand.java @@ -1,10 +1,10 @@ -package world.bentobox.bbox.commands.island; +package world.bentobox.bentobox.commands.island; import java.util.List; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; public class IslandAboutCommand extends CompositeCommand { diff --git a/src/main/java/world/bentobox/bbox/commands/island/IslandBanCommand.java b/src/main/java/world/bentobox/bentobox/commands/island/IslandBanCommand.java similarity index 92% rename from src/main/java/world/bentobox/bbox/commands/island/IslandBanCommand.java rename to src/main/java/world/bentobox/bentobox/commands/island/IslandBanCommand.java index 721549c07..e979fa51d 100644 --- a/src/main/java/world/bentobox/bbox/commands/island/IslandBanCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/island/IslandBanCommand.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.commands.island; +package world.bentobox.bentobox.commands.island; import java.util.List; import java.util.Optional; @@ -9,11 +9,11 @@ import org.bukkit.Bukkit; import org.bukkit.Sound; import org.bukkit.entity.Player; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.localization.TextVariables; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.localization.TextVariables; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.util.Util; public class IslandBanCommand extends CompositeCommand { diff --git a/src/main/java/world/bentobox/bbox/commands/island/IslandBanlistCommand.java b/src/main/java/world/bentobox/bentobox/commands/island/IslandBanlistCommand.java similarity index 91% rename from src/main/java/world/bentobox/bbox/commands/island/IslandBanlistCommand.java rename to src/main/java/world/bentobox/bentobox/commands/island/IslandBanlistCommand.java index 656866a74..bf4896589 100644 --- a/src/main/java/world/bentobox/bbox/commands/island/IslandBanlistCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/island/IslandBanlistCommand.java @@ -1,12 +1,12 @@ -package world.bentobox.bbox.commands.island; +package world.bentobox.bentobox.commands.island; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; public class IslandBanlistCommand extends CompositeCommand { diff --git a/src/main/java/world/bentobox/bbox/commands/island/IslandCreateCommand.java b/src/main/java/world/bentobox/bentobox/commands/island/IslandCreateCommand.java similarity index 84% rename from src/main/java/world/bentobox/bbox/commands/island/IslandCreateCommand.java rename to src/main/java/world/bentobox/bentobox/commands/island/IslandCreateCommand.java index 1e08a82a6..c1da9f161 100644 --- a/src/main/java/world/bentobox/bbox/commands/island/IslandCreateCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/island/IslandCreateCommand.java @@ -1,12 +1,12 @@ -package world.bentobox.bbox.commands.island; +package world.bentobox.bentobox.commands.island; import java.io.IOException; import java.util.List; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.events.island.IslandEvent.Reason; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.managers.island.NewIsland; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.events.island.IslandEvent.Reason; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.managers.island.NewIsland; /** * /island create - Create an island. diff --git a/src/main/java/world/bentobox/bbox/commands/island/IslandGoCommand.java b/src/main/java/world/bentobox/bentobox/commands/island/IslandGoCommand.java similarity index 84% rename from src/main/java/world/bentobox/bbox/commands/island/IslandGoCommand.java rename to src/main/java/world/bentobox/bentobox/commands/island/IslandGoCommand.java index 08520a8b6..0bbac4804 100644 --- a/src/main/java/world/bentobox/bbox/commands/island/IslandGoCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/island/IslandGoCommand.java @@ -1,13 +1,13 @@ -package world.bentobox.bbox.commands.island; +package world.bentobox.bentobox.commands.island; import java.util.List; import org.apache.commons.lang.math.NumberUtils; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.localization.TextVariables; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.localization.TextVariables; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.util.Util; /** * @author tastybento diff --git a/src/main/java/world/bentobox/bentobox/commands/island/IslandInfoCommand.java b/src/main/java/world/bentobox/bentobox/commands/island/IslandInfoCommand.java new file mode 100644 index 000000000..b0b8b9631 --- /dev/null +++ b/src/main/java/world/bentobox/bentobox/commands/island/IslandInfoCommand.java @@ -0,0 +1,4 @@ +package world.bentobox.bentobox.commands.island; + +public class IslandInfoCommand { +} diff --git a/src/main/java/world/bentobox/bbox/commands/island/IslandLanguageCommand.java b/src/main/java/world/bentobox/bentobox/commands/island/IslandLanguageCommand.java similarity index 73% rename from src/main/java/world/bentobox/bbox/commands/island/IslandLanguageCommand.java rename to src/main/java/world/bentobox/bentobox/commands/island/IslandLanguageCommand.java index a99164841..bcde683ed 100644 --- a/src/main/java/world/bentobox/bbox/commands/island/IslandLanguageCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/island/IslandLanguageCommand.java @@ -1,10 +1,10 @@ -package world.bentobox.bbox.commands.island; +package world.bentobox.bentobox.commands.island; import java.util.List; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.panels.LanguagePanel; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.panels.LanguagePanel; /** * @author Poslovitch diff --git a/src/main/java/world/bentobox/bbox/commands/island/IslandResetCommand.java b/src/main/java/world/bentobox/bentobox/commands/island/IslandResetCommand.java similarity index 91% rename from src/main/java/world/bentobox/bbox/commands/island/IslandResetCommand.java rename to src/main/java/world/bentobox/bentobox/commands/island/IslandResetCommand.java index ac9ead81c..01e50b590 100644 --- a/src/main/java/world/bentobox/bbox/commands/island/IslandResetCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/island/IslandResetCommand.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.commands.island; +package world.bentobox.bentobox.commands.island; import java.io.IOException; import java.util.HashMap; @@ -9,12 +9,12 @@ import java.util.UUID; import org.bukkit.GameMode; import org.bukkit.entity.Player; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.events.island.IslandEvent.Reason; -import world.bentobox.bbox.api.localization.TextVariables; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.managers.island.NewIsland; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.events.island.IslandEvent.Reason; +import world.bentobox.bentobox.api.localization.TextVariables; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.managers.island.NewIsland; public class IslandResetCommand extends CompositeCommand { diff --git a/src/main/java/world/bentobox/bbox/commands/island/IslandResetnameCommand.java b/src/main/java/world/bentobox/bentobox/commands/island/IslandResetnameCommand.java similarity index 87% rename from src/main/java/world/bentobox/bbox/commands/island/IslandResetnameCommand.java rename to src/main/java/world/bentobox/bentobox/commands/island/IslandResetnameCommand.java index b3ad628ab..4d219dc90 100644 --- a/src/main/java/world/bentobox/bbox/commands/island/IslandResetnameCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/island/IslandResetnameCommand.java @@ -1,10 +1,10 @@ -package world.bentobox.bbox.commands.island; +package world.bentobox.bentobox.commands.island; import java.util.List; import java.util.UUID; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; /** * @author tastybento diff --git a/src/main/java/world/bentobox/bbox/commands/island/IslandSethomeCommand.java b/src/main/java/world/bentobox/bentobox/commands/island/IslandSethomeCommand.java similarity index 90% rename from src/main/java/world/bentobox/bbox/commands/island/IslandSethomeCommand.java rename to src/main/java/world/bentobox/bentobox/commands/island/IslandSethomeCommand.java index ec77db626..3aa2c3773 100644 --- a/src/main/java/world/bentobox/bbox/commands/island/IslandSethomeCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/island/IslandSethomeCommand.java @@ -1,12 +1,12 @@ -package world.bentobox.bbox.commands.island; +package world.bentobox.bentobox.commands.island; import java.util.List; import java.util.UUID; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.localization.TextVariables; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.localization.TextVariables; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.util.Util; public class IslandSethomeCommand extends CompositeCommand { diff --git a/src/main/java/world/bentobox/bbox/commands/island/IslandSetnameCommand.java b/src/main/java/world/bentobox/bentobox/commands/island/IslandSetnameCommand.java similarity index 91% rename from src/main/java/world/bentobox/bbox/commands/island/IslandSetnameCommand.java rename to src/main/java/world/bentobox/bentobox/commands/island/IslandSetnameCommand.java index ad37e2e5c..e557ef5c3 100644 --- a/src/main/java/world/bentobox/bbox/commands/island/IslandSetnameCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/island/IslandSetnameCommand.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.commands.island; +package world.bentobox.bentobox.commands.island; import java.util.List; import java.util.UUID; @@ -6,9 +6,9 @@ import java.util.stream.Collectors; import org.bukkit.ChatColor; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.localization.TextVariables; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.localization.TextVariables; +import world.bentobox.bentobox.api.user.User; /** * @author tastybento diff --git a/src/main/java/world/bentobox/bbox/commands/island/IslandSettingsCommand.java b/src/main/java/world/bentobox/bentobox/commands/island/IslandSettingsCommand.java similarity index 75% rename from src/main/java/world/bentobox/bbox/commands/island/IslandSettingsCommand.java rename to src/main/java/world/bentobox/bentobox/commands/island/IslandSettingsCommand.java index 8e3cd1b60..d546e0d7e 100644 --- a/src/main/java/world/bentobox/bbox/commands/island/IslandSettingsCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/island/IslandSettingsCommand.java @@ -1,12 +1,12 @@ -package world.bentobox.bbox.commands.island; +package world.bentobox.bentobox.commands.island; import java.util.List; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.flags.Flag; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.panels.SettingsPanel; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.flags.Flag; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.panels.SettingsPanel; +import world.bentobox.bentobox.util.Util; /** * @author Poslovitch diff --git a/src/main/java/world/bentobox/bentobox/commands/island/IslandSpawnCommand.java b/src/main/java/world/bentobox/bentobox/commands/island/IslandSpawnCommand.java new file mode 100644 index 000000000..f33a923fe --- /dev/null +++ b/src/main/java/world/bentobox/bentobox/commands/island/IslandSpawnCommand.java @@ -0,0 +1,4 @@ +package world.bentobox.bentobox.commands.island; + +public class IslandSpawnCommand { +} diff --git a/src/main/java/world/bentobox/bbox/commands/island/IslandUnbanCommand.java b/src/main/java/world/bentobox/bentobox/commands/island/IslandUnbanCommand.java similarity index 89% rename from src/main/java/world/bentobox/bbox/commands/island/IslandUnbanCommand.java rename to src/main/java/world/bentobox/bentobox/commands/island/IslandUnbanCommand.java index b7455cea2..f69b08c7a 100644 --- a/src/main/java/world/bentobox/bbox/commands/island/IslandUnbanCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/island/IslandUnbanCommand.java @@ -1,15 +1,15 @@ -package world.bentobox.bbox.commands.island; +package world.bentobox.bentobox.commands.island; import java.util.List; import java.util.Optional; import java.util.UUID; import java.util.stream.Collectors; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.localization.TextVariables; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.localization.TextVariables; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.util.Util; public class IslandUnbanCommand extends CompositeCommand { diff --git a/src/main/java/world/bentobox/bbox/commands/island/team/IslandTeamCommand.java b/src/main/java/world/bentobox/bentobox/commands/island/team/IslandTeamCommand.java similarity index 88% rename from src/main/java/world/bentobox/bbox/commands/island/team/IslandTeamCommand.java rename to src/main/java/world/bentobox/bentobox/commands/island/team/IslandTeamCommand.java index 1dfd0f216..b6e796314 100644 --- a/src/main/java/world/bentobox/bbox/commands/island/team/IslandTeamCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/island/team/IslandTeamCommand.java @@ -1,14 +1,14 @@ -package world.bentobox.bbox.commands.island.team; +package world.bentobox.bentobox.commands.island.team; import java.util.List; import java.util.Set; import java.util.UUID; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.events.IslandBaseEvent; -import world.bentobox.bbox.api.events.team.TeamEvent; -import world.bentobox.bbox.api.localization.TextVariables; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.events.IslandBaseEvent; +import world.bentobox.bentobox.api.events.team.TeamEvent; +import world.bentobox.bentobox.api.localization.TextVariables; +import world.bentobox.bentobox.api.user.User; public class IslandTeamCommand extends CompositeCommand { diff --git a/src/main/java/world/bentobox/bbox/commands/island/team/IslandTeamInviteAcceptCommand.java b/src/main/java/world/bentobox/bentobox/commands/island/team/IslandTeamInviteAcceptCommand.java similarity index 92% rename from src/main/java/world/bentobox/bbox/commands/island/team/IslandTeamInviteAcceptCommand.java rename to src/main/java/world/bentobox/bentobox/commands/island/team/IslandTeamInviteAcceptCommand.java index 8f78ec00d..40095fff3 100644 --- a/src/main/java/world/bentobox/bbox/commands/island/team/IslandTeamInviteAcceptCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/island/team/IslandTeamInviteAcceptCommand.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.commands.island.team; +package world.bentobox.bentobox.commands.island.team; import java.util.List; import java.util.UUID; @@ -6,12 +6,12 @@ import java.util.UUID; import org.bukkit.GameMode; import org.bukkit.Location; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.events.IslandBaseEvent; -import world.bentobox.bbox.api.events.team.TeamEvent; -import world.bentobox.bbox.api.localization.TextVariables; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.events.IslandBaseEvent; +import world.bentobox.bentobox.api.events.team.TeamEvent; +import world.bentobox.bentobox.api.localization.TextVariables; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; public class IslandTeamInviteAcceptCommand extends CompositeCommand { diff --git a/src/main/java/world/bentobox/bbox/commands/island/team/IslandTeamInviteCommand.java b/src/main/java/world/bentobox/bentobox/commands/island/team/IslandTeamInviteCommand.java similarity index 94% rename from src/main/java/world/bentobox/bbox/commands/island/team/IslandTeamInviteCommand.java rename to src/main/java/world/bentobox/bentobox/commands/island/team/IslandTeamInviteCommand.java index 95885a8f2..20328094c 100644 --- a/src/main/java/world/bentobox/bbox/commands/island/team/IslandTeamInviteCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/island/team/IslandTeamInviteCommand.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.commands.island.team; +package world.bentobox.bentobox.commands.island.team; import java.util.ArrayList; import java.util.List; @@ -11,12 +11,12 @@ import org.bukkit.OfflinePlayer; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.events.IslandBaseEvent; -import world.bentobox.bbox.api.events.team.TeamEvent; -import world.bentobox.bbox.api.localization.TextVariables; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.events.IslandBaseEvent; +import world.bentobox.bentobox.api.events.team.TeamEvent; +import world.bentobox.bentobox.api.localization.TextVariables; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.util.Util; public class IslandTeamInviteCommand extends CompositeCommand { diff --git a/src/main/java/world/bentobox/bbox/commands/island/team/IslandTeamInviteRejectCommand.java b/src/main/java/world/bentobox/bentobox/commands/island/team/IslandTeamInviteRejectCommand.java similarity index 85% rename from src/main/java/world/bentobox/bbox/commands/island/team/IslandTeamInviteRejectCommand.java rename to src/main/java/world/bentobox/bentobox/commands/island/team/IslandTeamInviteRejectCommand.java index ec571956c..8595022b1 100644 --- a/src/main/java/world/bentobox/bbox/commands/island/team/IslandTeamInviteRejectCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/island/team/IslandTeamInviteRejectCommand.java @@ -1,13 +1,13 @@ -package world.bentobox.bbox.commands.island.team; +package world.bentobox.bentobox.commands.island.team; import java.util.List; import java.util.UUID; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.events.IslandBaseEvent; -import world.bentobox.bbox.api.events.team.TeamEvent; -import world.bentobox.bbox.api.localization.TextVariables; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.events.IslandBaseEvent; +import world.bentobox.bentobox.api.events.team.TeamEvent; +import world.bentobox.bentobox.api.localization.TextVariables; +import world.bentobox.bentobox.api.user.User; public class IslandTeamInviteRejectCommand extends CompositeCommand { diff --git a/src/main/java/world/bentobox/bbox/commands/island/team/IslandTeamKickCommand.java b/src/main/java/world/bentobox/bentobox/commands/island/team/IslandTeamKickCommand.java similarity index 95% rename from src/main/java/world/bentobox/bbox/commands/island/team/IslandTeamKickCommand.java rename to src/main/java/world/bentobox/bentobox/commands/island/team/IslandTeamKickCommand.java index eea293d3e..049ab6870 100644 --- a/src/main/java/world/bentobox/bbox/commands/island/team/IslandTeamKickCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/island/team/IslandTeamKickCommand.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.commands.island.team; +package world.bentobox.bentobox.commands.island.team; import java.util.HashSet; import java.util.List; @@ -7,8 +7,8 @@ import java.util.UUID; import org.bukkit.scheduler.BukkitRunnable; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; public class IslandTeamKickCommand extends CompositeCommand { diff --git a/src/main/java/world/bentobox/bbox/commands/island/team/IslandTeamLeaveCommand.java b/src/main/java/world/bentobox/bentobox/commands/island/team/IslandTeamLeaveCommand.java similarity index 89% rename from src/main/java/world/bentobox/bbox/commands/island/team/IslandTeamLeaveCommand.java rename to src/main/java/world/bentobox/bentobox/commands/island/team/IslandTeamLeaveCommand.java index 83d376ba4..b36bcc606 100644 --- a/src/main/java/world/bentobox/bbox/commands/island/team/IslandTeamLeaveCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/island/team/IslandTeamLeaveCommand.java @@ -1,11 +1,11 @@ -package world.bentobox.bbox.commands.island.team; +package world.bentobox.bentobox.commands.island.team; import java.util.List; import java.util.UUID; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.localization.TextVariables; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.localization.TextVariables; +import world.bentobox.bentobox.api.user.User; public class IslandTeamLeaveCommand extends CompositeCommand { diff --git a/src/main/java/world/bentobox/bbox/commands/island/team/IslandTeamPromoteCommand.java b/src/main/java/world/bentobox/bentobox/commands/island/team/IslandTeamPromoteCommand.java similarity index 93% rename from src/main/java/world/bentobox/bbox/commands/island/team/IslandTeamPromoteCommand.java rename to src/main/java/world/bentobox/bentobox/commands/island/team/IslandTeamPromoteCommand.java index 0335f20c3..8e08e610f 100644 --- a/src/main/java/world/bentobox/bbox/commands/island/team/IslandTeamPromoteCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/island/team/IslandTeamPromoteCommand.java @@ -1,10 +1,10 @@ -package world.bentobox.bbox.commands.island.team; +package world.bentobox.bentobox.commands.island.team; import java.util.List; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.localization.TextVariables; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.localization.TextVariables; +import world.bentobox.bentobox.api.user.User; public class IslandTeamPromoteCommand extends CompositeCommand { diff --git a/src/main/java/world/bentobox/bbox/commands/island/team/IslandTeamSetownerCommand.java b/src/main/java/world/bentobox/bentobox/commands/island/team/IslandTeamSetownerCommand.java similarity index 90% rename from src/main/java/world/bentobox/bbox/commands/island/team/IslandTeamSetownerCommand.java rename to src/main/java/world/bentobox/bentobox/commands/island/team/IslandTeamSetownerCommand.java index 4628aa961..993dcf179 100644 --- a/src/main/java/world/bentobox/bbox/commands/island/team/IslandTeamSetownerCommand.java +++ b/src/main/java/world/bentobox/bentobox/commands/island/team/IslandTeamSetownerCommand.java @@ -1,15 +1,15 @@ -package world.bentobox.bbox.commands.island.team; +package world.bentobox.bentobox.commands.island.team; import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.UUID; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.events.IslandBaseEvent; -import world.bentobox.bbox.api.events.team.TeamEvent; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.events.IslandBaseEvent; +import world.bentobox.bentobox.api.events.team.TeamEvent; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.util.Util; public class IslandTeamSetownerCommand extends CompositeCommand { diff --git a/src/main/java/world/bentobox/bbox/database/AbstractDatabaseHandler.java b/src/main/java/world/bentobox/bentobox/database/AbstractDatabaseHandler.java similarity index 97% rename from src/main/java/world/bentobox/bbox/database/AbstractDatabaseHandler.java rename to src/main/java/world/bentobox/bentobox/database/AbstractDatabaseHandler.java index 711309bf8..c65a5b03e 100644 --- a/src/main/java/world/bentobox/bbox/database/AbstractDatabaseHandler.java +++ b/src/main/java/world/bentobox/bentobox/database/AbstractDatabaseHandler.java @@ -1,10 +1,10 @@ -package world.bentobox.bbox.database; +package world.bentobox.bentobox.database; import java.beans.IntrospectionException; import java.lang.reflect.InvocationTargetException; import java.util.List; -import world.bentobox.bbox.BentoBox; +import world.bentobox.bentobox.BentoBox; /** * An abstract class that handles insert/select-operations into/from a database diff --git a/src/main/java/world/bentobox/bbox/database/BSBDatabase.java b/src/main/java/world/bentobox/bentobox/database/BSBDatabase.java similarity index 96% rename from src/main/java/world/bentobox/bbox/database/BSBDatabase.java rename to src/main/java/world/bentobox/bentobox/database/BSBDatabase.java index bb85d2b00..0363a38ef 100644 --- a/src/main/java/world/bentobox/bbox/database/BSBDatabase.java +++ b/src/main/java/world/bentobox/bentobox/database/BSBDatabase.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.database; +package world.bentobox.bentobox.database; import java.beans.IntrospectionException; import java.lang.reflect.InvocationTargetException; @@ -6,8 +6,8 @@ import java.util.ArrayList; import java.util.List; import java.util.logging.Logger; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.addons.Addon; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.addons.Addon; /** * Handy class to store and load Java POJOs in the Database diff --git a/src/main/java/world/bentobox/bbox/database/BSBDbSetup.java b/src/main/java/world/bentobox/bentobox/database/BSBDbSetup.java old mode 100755 new mode 100644 similarity index 80% rename from src/main/java/world/bentobox/bbox/database/BSBDbSetup.java rename to src/main/java/world/bentobox/bentobox/database/BSBDbSetup.java index d9940d0ff..6ea1e1009 --- a/src/main/java/world/bentobox/bbox/database/BSBDbSetup.java +++ b/src/main/java/world/bentobox/bentobox/database/BSBDbSetup.java @@ -1,9 +1,9 @@ -package world.bentobox.bbox.database; +package world.bentobox.bentobox.database; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.database.flatfile.FlatFileDatabase; -import world.bentobox.bbox.database.mongodb.MongoDBDatabase; -import world.bentobox.bbox.database.mysql.MySQLDatabase; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.database.flatfile.FlatFileDatabase; +import world.bentobox.bentobox.database.mongodb.MongoDBDatabase; +import world.bentobox.bentobox.database.mysql.MySQLDatabase; public abstract class BSBDbSetup { diff --git a/src/main/java/world/bentobox/bbox/database/DatabaseConnecter.java b/src/main/java/world/bentobox/bentobox/database/DatabaseConnecter.java similarity index 97% rename from src/main/java/world/bentobox/bbox/database/DatabaseConnecter.java rename to src/main/java/world/bentobox/bentobox/database/DatabaseConnecter.java index e2e632ce2..19241815e 100644 --- a/src/main/java/world/bentobox/bbox/database/DatabaseConnecter.java +++ b/src/main/java/world/bentobox/bentobox/database/DatabaseConnecter.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.database; +package world.bentobox.bentobox.database; import java.util.Map; diff --git a/src/main/java/world/bentobox/bbox/database/DatabaseConnectionSettingsImpl.java b/src/main/java/world/bentobox/bentobox/database/DatabaseConnectionSettingsImpl.java similarity index 97% rename from src/main/java/world/bentobox/bbox/database/DatabaseConnectionSettingsImpl.java rename to src/main/java/world/bentobox/bentobox/database/DatabaseConnectionSettingsImpl.java index e27412190..b773ed408 100644 --- a/src/main/java/world/bentobox/bbox/database/DatabaseConnectionSettingsImpl.java +++ b/src/main/java/world/bentobox/bentobox/database/DatabaseConnectionSettingsImpl.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.database; +package world.bentobox.bentobox.database; public class DatabaseConnectionSettingsImpl { private String host; diff --git a/src/main/java/world/bentobox/bbox/database/flatfile/ConfigHandler.java b/src/main/java/world/bentobox/bentobox/database/flatfile/ConfigHandler.java similarity index 87% rename from src/main/java/world/bentobox/bbox/database/flatfile/ConfigHandler.java rename to src/main/java/world/bentobox/bentobox/database/flatfile/ConfigHandler.java index b3f236fdd..d0531326f 100644 --- a/src/main/java/world/bentobox/bbox/database/flatfile/ConfigHandler.java +++ b/src/main/java/world/bentobox/bentobox/database/flatfile/ConfigHandler.java @@ -1,10 +1,10 @@ -package world.bentobox.bbox.database.flatfile; +package world.bentobox.bentobox.database.flatfile; import java.beans.IntrospectionException; import java.lang.reflect.InvocationTargetException; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.database.DatabaseConnecter; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.database.DatabaseConnecter; /** * Class handles config settings saving and loading diff --git a/src/main/java/world/bentobox/bbox/database/flatfile/FlatFileDatabase.java b/src/main/java/world/bentobox/bentobox/database/flatfile/FlatFileDatabase.java old mode 100755 new mode 100644 similarity index 73% rename from src/main/java/world/bentobox/bbox/database/flatfile/FlatFileDatabase.java rename to src/main/java/world/bentobox/bentobox/database/flatfile/FlatFileDatabase.java index 279895c54..00a7cbf4f --- a/src/main/java/world/bentobox/bbox/database/flatfile/FlatFileDatabase.java +++ b/src/main/java/world/bentobox/bentobox/database/flatfile/FlatFileDatabase.java @@ -1,8 +1,8 @@ -package world.bentobox.bbox.database.flatfile; +package world.bentobox.bentobox.database.flatfile; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.database.AbstractDatabaseHandler; -import world.bentobox.bbox.database.BSBDbSetup; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.database.AbstractDatabaseHandler; +import world.bentobox.bentobox.database.BSBDbSetup; public class FlatFileDatabase extends BSBDbSetup{ diff --git a/src/main/java/world/bentobox/bbox/database/flatfile/FlatFileDatabaseConnecter.java b/src/main/java/world/bentobox/bentobox/database/flatfile/FlatFileDatabaseConnecter.java similarity index 97% rename from src/main/java/world/bentobox/bbox/database/flatfile/FlatFileDatabaseConnecter.java rename to src/main/java/world/bentobox/bentobox/database/flatfile/FlatFileDatabaseConnecter.java index 4d2a5e96d..2de19289a 100644 --- a/src/main/java/world/bentobox/bbox/database/flatfile/FlatFileDatabaseConnecter.java +++ b/src/main/java/world/bentobox/bentobox/database/flatfile/FlatFileDatabaseConnecter.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.database.flatfile; +package world.bentobox.bentobox.database.flatfile; import java.io.File; import java.io.IOException; @@ -14,8 +14,8 @@ import java.util.UUID; import org.bukkit.configuration.file.YamlConfiguration; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.database.DatabaseConnecter; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.database.DatabaseConnecter; public class FlatFileDatabaseConnecter implements DatabaseConnecter { diff --git a/src/main/java/world/bentobox/bbox/database/flatfile/FlatFileDatabaseHandler.java b/src/main/java/world/bentobox/bentobox/database/flatfile/FlatFileDatabaseHandler.java similarity index 96% rename from src/main/java/world/bentobox/bbox/database/flatfile/FlatFileDatabaseHandler.java rename to src/main/java/world/bentobox/bentobox/database/flatfile/FlatFileDatabaseHandler.java index 621b9ad41..5f0b028d3 100644 --- a/src/main/java/world/bentobox/bbox/database/flatfile/FlatFileDatabaseHandler.java +++ b/src/main/java/world/bentobox/bentobox/database/flatfile/FlatFileDatabaseHandler.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.database.flatfile; +package world.bentobox.bentobox.database.flatfile; import java.beans.IntrospectionException; import java.beans.PropertyDescriptor; @@ -27,18 +27,18 @@ import org.bukkit.World; import org.bukkit.configuration.MemorySection; import org.bukkit.configuration.file.YamlConfiguration; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Constants; -import world.bentobox.bbox.Constants.GameType; -import world.bentobox.bbox.api.configuration.ConfigComment; -import world.bentobox.bbox.api.configuration.ConfigEntry; -import world.bentobox.bbox.api.configuration.StoreAt; -import world.bentobox.bbox.api.localization.TextVariables; -import world.bentobox.bbox.database.AbstractDatabaseHandler; -import world.bentobox.bbox.database.DatabaseConnecter; -import world.bentobox.bbox.database.objects.adapters.Adapter; -import world.bentobox.bbox.database.objects.adapters.AdapterInterface; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Constants; +import world.bentobox.bentobox.Constants.GameType; +import world.bentobox.bentobox.api.configuration.ConfigComment; +import world.bentobox.bentobox.api.configuration.ConfigEntry; +import world.bentobox.bentobox.api.configuration.StoreAt; +import world.bentobox.bentobox.api.localization.TextVariables; +import world.bentobox.bentobox.database.AbstractDatabaseHandler; +import world.bentobox.bentobox.database.DatabaseConnecter; +import world.bentobox.bentobox.database.objects.adapters.Adapter; +import world.bentobox.bentobox.database.objects.adapters.AdapterInterface; +import world.bentobox.bentobox.util.Util; /** * Class that creates a list of s filled with values from the corresponding diff --git a/src/main/java/world/bentobox/bbox/database/mongodb/MongoDBDatabase.java b/src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabase.java old mode 100755 new mode 100644 similarity index 78% rename from src/main/java/world/bentobox/bbox/database/mongodb/MongoDBDatabase.java rename to src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabase.java index 661bf0130..97a302493 --- a/src/main/java/world/bentobox/bbox/database/mongodb/MongoDBDatabase.java +++ b/src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabase.java @@ -1,9 +1,9 @@ -package world.bentobox.bbox.database.mongodb; +package world.bentobox.bentobox.database.mongodb; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.database.AbstractDatabaseHandler; -import world.bentobox.bbox.database.BSBDbSetup; -import world.bentobox.bbox.database.DatabaseConnectionSettingsImpl; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.database.AbstractDatabaseHandler; +import world.bentobox.bentobox.database.BSBDbSetup; +import world.bentobox.bentobox.database.DatabaseConnectionSettingsImpl; public class MongoDBDatabase extends BSBDbSetup{ diff --git a/src/main/java/world/bentobox/bbox/database/mongodb/MongoDBDatabaseConnecter.java b/src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabaseConnecter.java similarity index 91% rename from src/main/java/world/bentobox/bbox/database/mongodb/MongoDBDatabaseConnecter.java rename to src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabaseConnecter.java index 14e7c8954..1a451021d 100644 --- a/src/main/java/world/bentobox/bbox/database/mongodb/MongoDBDatabaseConnecter.java +++ b/src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabaseConnecter.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.database.mongodb; +package world.bentobox.bentobox.database.mongodb; import java.util.Map; @@ -10,8 +10,8 @@ import com.mongodb.MongoCredential; import com.mongodb.ServerAddress; import com.mongodb.client.MongoDatabase; -import world.bentobox.bbox.database.DatabaseConnecter; -import world.bentobox.bbox.database.DatabaseConnectionSettingsImpl; +import world.bentobox.bentobox.database.DatabaseConnecter; +import world.bentobox.bentobox.database.DatabaseConnectionSettingsImpl; public class MongoDBDatabaseConnecter implements DatabaseConnecter { diff --git a/src/main/java/world/bentobox/bbox/database/mongodb/MongoDBDatabaseHandler.java b/src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabaseHandler.java similarity index 90% rename from src/main/java/world/bentobox/bbox/database/mongodb/MongoDBDatabaseHandler.java rename to src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabaseHandler.java index 2c006681b..077c3d98f 100644 --- a/src/main/java/world/bentobox/bbox/database/mongodb/MongoDBDatabaseHandler.java +++ b/src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabaseHandler.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.database.mongodb; +package world.bentobox.bentobox.database.mongodb; import java.util.ArrayList; import java.util.List; @@ -18,15 +18,15 @@ import com.mongodb.client.model.IndexOptions; import com.mongodb.client.model.Indexes; import com.mongodb.util.JSON; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.flags.Flag; -import world.bentobox.bbox.database.AbstractDatabaseHandler; -import world.bentobox.bbox.database.DatabaseConnecter; -import world.bentobox.bbox.database.mysql.adapters.FlagAdapter; -import world.bentobox.bbox.database.mysql.adapters.LocationAdapter; -import world.bentobox.bbox.database.mysql.adapters.PotionEffectTypeAdapter; -import world.bentobox.bbox.database.mysql.adapters.WorldAdapter; -import world.bentobox.bbox.database.objects.DataObject; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.flags.Flag; +import world.bentobox.bentobox.database.AbstractDatabaseHandler; +import world.bentobox.bentobox.database.DatabaseConnecter; +import world.bentobox.bentobox.database.mysql.adapters.FlagAdapter; +import world.bentobox.bentobox.database.mysql.adapters.LocationAdapter; +import world.bentobox.bentobox.database.mysql.adapters.PotionEffectTypeAdapter; +import world.bentobox.bentobox.database.mysql.adapters.WorldAdapter; +import world.bentobox.bentobox.database.objects.DataObject; /** * diff --git a/src/main/java/world/bentobox/bbox/database/mysql/MySQLDatabase.java b/src/main/java/world/bentobox/bentobox/database/mysql/MySQLDatabase.java old mode 100755 new mode 100644 similarity index 67% rename from src/main/java/world/bentobox/bbox/database/mysql/MySQLDatabase.java rename to src/main/java/world/bentobox/bentobox/database/mysql/MySQLDatabase.java index b39d45690..3134156eb --- a/src/main/java/world/bentobox/bbox/database/mysql/MySQLDatabase.java +++ b/src/main/java/world/bentobox/bentobox/database/mysql/MySQLDatabase.java @@ -1,9 +1,9 @@ -package world.bentobox.bbox.database.mysql; +package world.bentobox.bentobox.database.mysql; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.database.AbstractDatabaseHandler; -import world.bentobox.bbox.database.BSBDbSetup; -import world.bentobox.bbox.database.DatabaseConnectionSettingsImpl; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.database.AbstractDatabaseHandler; +import world.bentobox.bentobox.database.BSBDbSetup; +import world.bentobox.bentobox.database.DatabaseConnectionSettingsImpl; public class MySQLDatabase extends BSBDbSetup{ diff --git a/src/main/java/world/bentobox/bbox/database/mysql/MySQLDatabaseConnecter.java b/src/main/java/world/bentobox/bentobox/database/mysql/MySQLDatabaseConnecter.java similarity index 93% rename from src/main/java/world/bentobox/bbox/database/mysql/MySQLDatabaseConnecter.java rename to src/main/java/world/bentobox/bentobox/database/mysql/MySQLDatabaseConnecter.java index 001d8bb5d..722ae921a 100644 --- a/src/main/java/world/bentobox/bbox/database/mysql/MySQLDatabaseConnecter.java +++ b/src/main/java/world/bentobox/bentobox/database/mysql/MySQLDatabaseConnecter.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.database.mysql; +package world.bentobox.bentobox.database.mysql; import java.sql.Connection; import java.sql.DriverManager; @@ -8,8 +8,8 @@ import java.util.Map; import org.bukkit.Bukkit; import org.bukkit.configuration.file.YamlConfiguration; -import world.bentobox.bbox.database.DatabaseConnecter; -import world.bentobox.bbox.database.DatabaseConnectionSettingsImpl; +import world.bentobox.bentobox.database.DatabaseConnecter; +import world.bentobox.bentobox.database.DatabaseConnectionSettingsImpl; public class MySQLDatabaseConnecter implements DatabaseConnecter { diff --git a/src/main/java/world/bentobox/bbox/database/mysql/MySQLDatabaseHandler.java b/src/main/java/world/bentobox/bentobox/database/mysql/MySQLDatabaseHandler.java similarity index 92% rename from src/main/java/world/bentobox/bbox/database/mysql/MySQLDatabaseHandler.java rename to src/main/java/world/bentobox/bentobox/database/mysql/MySQLDatabaseHandler.java index a58fd4e97..7848a45b0 100644 --- a/src/main/java/world/bentobox/bbox/database/mysql/MySQLDatabaseHandler.java +++ b/src/main/java/world/bentobox/bentobox/database/mysql/MySQLDatabaseHandler.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.database.mysql; +package world.bentobox.bentobox.database.mysql; import java.lang.reflect.Method; import java.sql.Connection; @@ -16,15 +16,15 @@ import org.bukkit.potion.PotionEffectType; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.flags.Flag; -import world.bentobox.bbox.database.AbstractDatabaseHandler; -import world.bentobox.bbox.database.DatabaseConnecter; -import world.bentobox.bbox.database.mysql.adapters.FlagAdapter; -import world.bentobox.bbox.database.mysql.adapters.LocationAdapter; -import world.bentobox.bbox.database.mysql.adapters.PotionEffectTypeAdapter; -import world.bentobox.bbox.database.mysql.adapters.WorldAdapter; -import world.bentobox.bbox.database.objects.DataObject; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.flags.Flag; +import world.bentobox.bentobox.database.AbstractDatabaseHandler; +import world.bentobox.bentobox.database.DatabaseConnecter; +import world.bentobox.bentobox.database.mysql.adapters.FlagAdapter; +import world.bentobox.bentobox.database.mysql.adapters.LocationAdapter; +import world.bentobox.bentobox.database.mysql.adapters.PotionEffectTypeAdapter; +import world.bentobox.bentobox.database.mysql.adapters.WorldAdapter; +import world.bentobox.bentobox.database.objects.DataObject; /** * diff --git a/src/main/java/world/bentobox/bbox/database/mysql/adapters/FlagAdapter.java b/src/main/java/world/bentobox/bentobox/database/mysql/adapters/FlagAdapter.java similarity index 85% rename from src/main/java/world/bentobox/bbox/database/mysql/adapters/FlagAdapter.java rename to src/main/java/world/bentobox/bentobox/database/mysql/adapters/FlagAdapter.java index b89c962ce..f8c8ff7d1 100644 --- a/src/main/java/world/bentobox/bbox/database/mysql/adapters/FlagAdapter.java +++ b/src/main/java/world/bentobox/bentobox/database/mysql/adapters/FlagAdapter.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.database.mysql.adapters; +package world.bentobox.bentobox.database.mysql.adapters; import java.io.IOException; @@ -7,8 +7,8 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonToken; import com.google.gson.stream.JsonWriter; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.flags.Flag; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.flags.Flag; public class FlagAdapter extends TypeAdapter { diff --git a/src/main/java/world/bentobox/bbox/database/mysql/adapters/LocationAdapter.java b/src/main/java/world/bentobox/bentobox/database/mysql/adapters/LocationAdapter.java similarity index 96% rename from src/main/java/world/bentobox/bbox/database/mysql/adapters/LocationAdapter.java rename to src/main/java/world/bentobox/bentobox/database/mysql/adapters/LocationAdapter.java index 7d534216d..6e9a58cac 100644 --- a/src/main/java/world/bentobox/bbox/database/mysql/adapters/LocationAdapter.java +++ b/src/main/java/world/bentobox/bentobox/database/mysql/adapters/LocationAdapter.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.database.mysql.adapters; +package world.bentobox.bentobox.database.mysql.adapters; import java.io.IOException; diff --git a/src/main/java/world/bentobox/bbox/database/mysql/adapters/PotionEffectTypeAdapter.java b/src/main/java/world/bentobox/bentobox/database/mysql/adapters/PotionEffectTypeAdapter.java similarity index 93% rename from src/main/java/world/bentobox/bbox/database/mysql/adapters/PotionEffectTypeAdapter.java rename to src/main/java/world/bentobox/bentobox/database/mysql/adapters/PotionEffectTypeAdapter.java index 7a3bde4c5..4786b1705 100644 --- a/src/main/java/world/bentobox/bbox/database/mysql/adapters/PotionEffectTypeAdapter.java +++ b/src/main/java/world/bentobox/bentobox/database/mysql/adapters/PotionEffectTypeAdapter.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.database.mysql.adapters; +package world.bentobox.bentobox.database.mysql.adapters; import java.io.IOException; diff --git a/src/main/java/world/bentobox/bbox/database/mysql/adapters/WorldAdapter.java b/src/main/java/world/bentobox/bentobox/database/mysql/adapters/WorldAdapter.java similarity index 94% rename from src/main/java/world/bentobox/bbox/database/mysql/adapters/WorldAdapter.java rename to src/main/java/world/bentobox/bentobox/database/mysql/adapters/WorldAdapter.java index e1535ac83..055d45206 100644 --- a/src/main/java/world/bentobox/bbox/database/mysql/adapters/WorldAdapter.java +++ b/src/main/java/world/bentobox/bentobox/database/mysql/adapters/WorldAdapter.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.database.mysql.adapters; +package world.bentobox.bentobox.database.mysql.adapters; import java.io.IOException; diff --git a/src/main/java/world/bentobox/bbox/database/objects/DataObject.java b/src/main/java/world/bentobox/bentobox/database/objects/DataObject.java similarity index 80% rename from src/main/java/world/bentobox/bbox/database/objects/DataObject.java rename to src/main/java/world/bentobox/bentobox/database/objects/DataObject.java index 7ea039305..5385e7347 100644 --- a/src/main/java/world/bentobox/bbox/database/objects/DataObject.java +++ b/src/main/java/world/bentobox/bentobox/database/objects/DataObject.java @@ -1,6 +1,6 @@ -package world.bentobox.bbox.database.objects; +package world.bentobox.bentobox.database.objects; -import world.bentobox.bbox.BentoBox; +import world.bentobox.bentobox.BentoBox; /** * Contains fields that must be in any data object diff --git a/src/main/java/world/bentobox/bbox/database/objects/Island.java b/src/main/java/world/bentobox/bentobox/database/objects/Island.java old mode 100755 new mode 100644 similarity index 96% rename from src/main/java/world/bentobox/bbox/database/objects/Island.java rename to src/main/java/world/bentobox/bentobox/database/objects/Island.java index 299cae441..0b4811c6e --- a/src/main/java/world/bentobox/bbox/database/objects/Island.java +++ b/src/main/java/world/bentobox/bentobox/database/objects/Island.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.database.objects; +package world.bentobox.bentobox.database.objects; import java.util.Date; import java.util.EnumMap; @@ -18,16 +18,16 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet.Builder; import com.google.gson.annotations.Expose; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.flags.Flag; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.adapters.Adapter; -import world.bentobox.bbox.database.objects.adapters.FlagSerializer; -import world.bentobox.bbox.lists.Flags; -import world.bentobox.bbox.managers.RanksManager; -import world.bentobox.bbox.util.Pair; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.flags.Flag; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.adapters.Adapter; +import world.bentobox.bentobox.database.objects.adapters.FlagSerializer; +import world.bentobox.bentobox.lists.Flags; +import world.bentobox.bentobox.managers.RanksManager; +import world.bentobox.bentobox.util.Pair; +import world.bentobox.bentobox.util.Util; /** * Stores all the info about an island @@ -403,7 +403,7 @@ public class Island implements DataObject { /** * Removes a player from the team member map. Do not call this directly. - * Use {@link world.bentobox.bbox.managers.IslandsManager#removePlayer(World, UUID)} + * Use {@link world.bentobox.bentobox.managers.IslandsManager#removePlayer(World, UUID)} * @param playerUUID - uuid of player */ public void removeMember(UUID playerUUID) { diff --git a/src/main/java/world/bentobox/bbox/database/objects/Names.java b/src/main/java/world/bentobox/bentobox/database/objects/Names.java similarity index 94% rename from src/main/java/world/bentobox/bbox/database/objects/Names.java rename to src/main/java/world/bentobox/bentobox/database/objects/Names.java index 96b3277db..01d205d9b 100644 --- a/src/main/java/world/bentobox/bbox/database/objects/Names.java +++ b/src/main/java/world/bentobox/bentobox/database/objects/Names.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.database.objects; +package world.bentobox.bentobox.database.objects; import java.util.UUID; diff --git a/src/main/java/world/bentobox/bbox/database/objects/Players.java b/src/main/java/world/bentobox/bentobox/database/objects/Players.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/world/bentobox/bbox/database/objects/Players.java rename to src/main/java/world/bentobox/bentobox/database/objects/Players.java index 84a393a9c..1dd601c3b --- a/src/main/java/world/bentobox/bbox/database/objects/Players.java +++ b/src/main/java/world/bentobox/bentobox/database/objects/Players.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.database.objects; +package world.bentobox.bentobox.database.objects; import java.util.Calendar; import java.util.Date; @@ -14,8 +14,8 @@ import org.bukkit.entity.Player; import com.google.gson.annotations.Expose; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.util.Util; /** * Tracks the following info on the player diff --git a/src/main/java/world/bentobox/bbox/database/objects/adapters/Adapter.java b/src/main/java/world/bentobox/bentobox/database/objects/adapters/Adapter.java similarity index 86% rename from src/main/java/world/bentobox/bbox/database/objects/adapters/Adapter.java rename to src/main/java/world/bentobox/bentobox/database/objects/adapters/Adapter.java index 5e6087ad4..bf416de19 100644 --- a/src/main/java/world/bentobox/bbox/database/objects/adapters/Adapter.java +++ b/src/main/java/world/bentobox/bentobox/database/objects/adapters/Adapter.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.database.objects.adapters; +package world.bentobox.bentobox.database.objects.adapters; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/world/bentobox/bbox/database/objects/adapters/AdapterInterface.java b/src/main/java/world/bentobox/bentobox/database/objects/adapters/AdapterInterface.java similarity index 88% rename from src/main/java/world/bentobox/bbox/database/objects/adapters/AdapterInterface.java rename to src/main/java/world/bentobox/bentobox/database/objects/adapters/AdapterInterface.java index 75f6a706e..096e59b07 100644 --- a/src/main/java/world/bentobox/bbox/database/objects/adapters/AdapterInterface.java +++ b/src/main/java/world/bentobox/bentobox/database/objects/adapters/AdapterInterface.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.database.objects.adapters; +package world.bentobox.bentobox.database.objects.adapters; /** diff --git a/src/main/java/world/bentobox/bbox/database/objects/adapters/FlagSerializer.java b/src/main/java/world/bentobox/bentobox/database/objects/adapters/FlagSerializer.java similarity index 79% rename from src/main/java/world/bentobox/bbox/database/objects/adapters/FlagSerializer.java rename to src/main/java/world/bentobox/bentobox/database/objects/adapters/FlagSerializer.java index 37eea2489..f3a936b3b 100644 --- a/src/main/java/world/bentobox/bbox/database/objects/adapters/FlagSerializer.java +++ b/src/main/java/world/bentobox/bentobox/database/objects/adapters/FlagSerializer.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.database.objects.adapters; +package world.bentobox.bentobox.database.objects.adapters; import java.util.HashMap; import java.util.Map; @@ -6,13 +6,13 @@ import java.util.Map.Entry; import org.bukkit.configuration.MemorySection; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.flags.Flag; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.flags.Flag; /** - * Serializes the {@link world.bentobox.bbox.database.objects.Island#getFlags() getFlags()} and - * {@link world.bentobox.bbox.database.objects.Island#setFlags(Map)} () setFlags()} - * in {@link world.bentobox.bbox.database.objects.Island} + * Serializes the {@link world.bentobox.bentobox.database.objects.Island#getFlags() getFlags()} and + * {@link world.bentobox.bentobox.database.objects.Island#setFlags(Map)} () setFlags()} + * in {@link world.bentobox.bentobox.database.objects.Island} * @author tastybento * */ diff --git a/src/main/java/world/bentobox/bbox/database/objects/adapters/FlagSerializer2.java b/src/main/java/world/bentobox/bentobox/database/objects/adapters/FlagSerializer2.java similarity index 91% rename from src/main/java/world/bentobox/bbox/database/objects/adapters/FlagSerializer2.java rename to src/main/java/world/bentobox/bentobox/database/objects/adapters/FlagSerializer2.java index a46efe55f..23c5c3caa 100644 --- a/src/main/java/world/bentobox/bbox/database/objects/adapters/FlagSerializer2.java +++ b/src/main/java/world/bentobox/bentobox/database/objects/adapters/FlagSerializer2.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.database.objects.adapters; +package world.bentobox.bentobox.database.objects.adapters; import java.util.HashMap; import java.util.Map; @@ -6,8 +6,8 @@ import java.util.Map.Entry; import org.bukkit.configuration.MemorySection; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.flags.Flag; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.flags.Flag; /** * @author tastybento diff --git a/src/main/java/world/bentobox/bbox/database/objects/adapters/PotionEffectListAdapter.java b/src/main/java/world/bentobox/bentobox/database/objects/adapters/PotionEffectListAdapter.java similarity index 94% rename from src/main/java/world/bentobox/bbox/database/objects/adapters/PotionEffectListAdapter.java rename to src/main/java/world/bentobox/bentobox/database/objects/adapters/PotionEffectListAdapter.java index 6b751ba0f..7ea6a17d8 100644 --- a/src/main/java/world/bentobox/bbox/database/objects/adapters/PotionEffectListAdapter.java +++ b/src/main/java/world/bentobox/bentobox/database/objects/adapters/PotionEffectListAdapter.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.database.objects.adapters; +package world.bentobox.bentobox.database.objects.adapters; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/world/bentobox/bbox/island/builders/Clipboard.java b/src/main/java/world/bentobox/bentobox/island/builders/Clipboard.java similarity index 98% rename from src/main/java/world/bentobox/bbox/island/builders/Clipboard.java rename to src/main/java/world/bentobox/bentobox/island/builders/Clipboard.java index d1828d830..236226127 100644 --- a/src/main/java/world/bentobox/bbox/island/builders/Clipboard.java +++ b/src/main/java/world/bentobox/bentobox/island/builders/Clipboard.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.island.builders; +package world.bentobox.bentobox.island.builders; import java.io.BufferedOutputStream; import java.io.File; @@ -55,11 +55,11 @@ import org.bukkit.material.Redstone; import org.bukkit.material.Stairs; import org.bukkit.util.Vector; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.localization.TextVariables; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.localization.TextVariables; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.util.Util; public class Clipboard { diff --git a/src/main/java/world/bentobox/bbox/listeners/BannedVisitorCommands.java b/src/main/java/world/bentobox/bentobox/listeners/BannedVisitorCommands.java similarity index 89% rename from src/main/java/world/bentobox/bbox/listeners/BannedVisitorCommands.java rename to src/main/java/world/bentobox/bentobox/listeners/BannedVisitorCommands.java index 5f678faad..2410d28d7 100644 --- a/src/main/java/world/bentobox/bbox/listeners/BannedVisitorCommands.java +++ b/src/main/java/world/bentobox/bentobox/listeners/BannedVisitorCommands.java @@ -1,13 +1,13 @@ -package world.bentobox.bbox.listeners; +package world.bentobox.bentobox.listeners; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerCommandPreprocessEvent; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.localization.TextVariables; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.localization.TextVariables; +import world.bentobox.bentobox.api.user.User; /** * Blocks visitors from executing commands that they should not in the island world diff --git a/src/main/java/world/bentobox/bbox/listeners/BlockEndDragon.java b/src/main/java/world/bentobox/bentobox/listeners/BlockEndDragon.java similarity index 91% rename from src/main/java/world/bentobox/bbox/listeners/BlockEndDragon.java rename to src/main/java/world/bentobox/bentobox/listeners/BlockEndDragon.java index 59fb638ab..c29b39d73 100644 --- a/src/main/java/world/bentobox/bbox/listeners/BlockEndDragon.java +++ b/src/main/java/world/bentobox/bentobox/listeners/BlockEndDragon.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.listeners; +package world.bentobox.bentobox.listeners; import org.bukkit.entity.EntityType; import org.bukkit.event.EventHandler; @@ -6,7 +6,7 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.entity.CreatureSpawnEvent; -import world.bentobox.bbox.BentoBox; +import world.bentobox.bentobox.BentoBox; public class BlockEndDragon implements Listener { private BentoBox plugin; diff --git a/src/main/java/world/bentobox/bbox/listeners/JoinLeaveListener.java b/src/main/java/world/bentobox/bentobox/listeners/JoinLeaveListener.java similarity index 90% rename from src/main/java/world/bentobox/bbox/listeners/JoinLeaveListener.java rename to src/main/java/world/bentobox/bentobox/listeners/JoinLeaveListener.java index 0b8cb22df..2d0fa46fc 100644 --- a/src/main/java/world/bentobox/bbox/listeners/JoinLeaveListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/JoinLeaveListener.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.listeners; +package world.bentobox.bentobox.listeners; import java.util.UUID; @@ -8,10 +8,10 @@ import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerQuitEvent; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.lists.Flags; -import world.bentobox.bbox.managers.PlayersManager; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.lists.Flags; +import world.bentobox.bentobox.managers.PlayersManager; public class JoinLeaveListener implements Listener { diff --git a/src/main/java/world/bentobox/bbox/listeners/NetherPortals.java b/src/main/java/world/bentobox/bentobox/listeners/NetherPortals.java similarity index 97% rename from src/main/java/world/bentobox/bbox/listeners/NetherPortals.java rename to src/main/java/world/bentobox/bentobox/listeners/NetherPortals.java index 1c128c51c..4a72416fe 100644 --- a/src/main/java/world/bentobox/bbox/listeners/NetherPortals.java +++ b/src/main/java/world/bentobox/bentobox/listeners/NetherPortals.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.listeners; +package world.bentobox.bentobox.listeners; import org.bukkit.Location; import org.bukkit.Material; @@ -20,10 +20,10 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import org.bukkit.event.world.StructureGrowEvent; import org.bukkit.util.Vector; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.util.Util; -import world.bentobox.bbox.util.teleport.SafeTeleportBuilder; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.util.Util; +import world.bentobox.bentobox.util.teleport.SafeTeleportBuilder; public class NetherPortals implements Listener { private static final String ERROR_NO_PERMISSION = "general.errors.no-permission"; diff --git a/src/main/java/world/bentobox/bbox/listeners/ObsidianToLava.java b/src/main/java/world/bentobox/bentobox/listeners/ObsidianToLava.java similarity index 95% rename from src/main/java/world/bentobox/bbox/listeners/ObsidianToLava.java rename to src/main/java/world/bentobox/bentobox/listeners/ObsidianToLava.java index 699d39f94..9a231124f 100644 --- a/src/main/java/world/bentobox/bbox/listeners/ObsidianToLava.java +++ b/src/main/java/world/bentobox/bentobox/listeners/ObsidianToLava.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.listeners; +package world.bentobox.bentobox.listeners; import java.util.ArrayList; import java.util.List; @@ -13,8 +13,8 @@ import org.bukkit.event.Listener; import org.bukkit.event.block.Action; import org.bukkit.event.player.PlayerInteractEvent; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.user.User; /** * Enables changing of obsidian back into lava diff --git a/src/main/java/world/bentobox/bbox/listeners/PanelListenerManager.java b/src/main/java/world/bentobox/bentobox/listeners/PanelListenerManager.java similarity index 93% rename from src/main/java/world/bentobox/bbox/listeners/PanelListenerManager.java rename to src/main/java/world/bentobox/bentobox/listeners/PanelListenerManager.java index 457af6544..4a48f227c 100644 --- a/src/main/java/world/bentobox/bbox/listeners/PanelListenerManager.java +++ b/src/main/java/world/bentobox/bentobox/listeners/PanelListenerManager.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.listeners; +package world.bentobox.bentobox.listeners; import java.util.HashMap; import java.util.Map; @@ -13,10 +13,10 @@ import org.bukkit.event.inventory.InventoryType.SlotType; import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.inventory.Inventory; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.panels.Panel; -import world.bentobox.bbox.api.panels.PanelItem; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.panels.Panel; +import world.bentobox.bentobox.api.panels.PanelItem; +import world.bentobox.bentobox.api.user.User; public class PanelListenerManager implements Listener { diff --git a/src/main/java/world/bentobox/bbox/listeners/flags/BlockInteractionListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/BlockInteractionListener.java similarity index 97% rename from src/main/java/world/bentobox/bbox/listeners/flags/BlockInteractionListener.java rename to src/main/java/world/bentobox/bentobox/listeners/flags/BlockInteractionListener.java index 3f690d9f8..320225548 100644 --- a/src/main/java/world/bentobox/bbox/listeners/flags/BlockInteractionListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/BlockInteractionListener.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import org.bukkit.Material; import org.bukkit.block.FlowerPot; @@ -7,8 +7,8 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.block.Action; import org.bukkit.event.player.PlayerInteractEvent; -import world.bentobox.bbox.api.flags.AbstractFlagListener; -import world.bentobox.bbox.lists.Flags; +import world.bentobox.bentobox.api.flags.AbstractFlagListener; +import world.bentobox.bentobox.lists.Flags; /** * @author tastybento diff --git a/src/main/java/world/bentobox/bbox/listeners/flags/BreakBlocksListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/BreakBlocksListener.java similarity index 95% rename from src/main/java/world/bentobox/bbox/listeners/flags/BreakBlocksListener.java rename to src/main/java/world/bentobox/bentobox/listeners/flags/BreakBlocksListener.java index df6cb6f54..ce1433cc1 100644 --- a/src/main/java/world/bentobox/bbox/listeners/flags/BreakBlocksListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/BreakBlocksListener.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import org.bukkit.Material; import org.bukkit.World.Environment; @@ -17,9 +17,9 @@ import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.vehicle.VehicleDamageEvent; import org.bukkit.util.BlockIterator; -import world.bentobox.bbox.api.flags.AbstractFlagListener; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.lists.Flags; +import world.bentobox.bentobox.api.flags.AbstractFlagListener; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.lists.Flags; public class BreakBlocksListener extends AbstractFlagListener { diff --git a/src/main/java/world/bentobox/bbox/listeners/flags/BreedingListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/BreedingListener.java similarity index 90% rename from src/main/java/world/bentobox/bbox/listeners/flags/BreedingListener.java rename to src/main/java/world/bentobox/bentobox/listeners/flags/BreedingListener.java index 2e7d03f23..0631f0bd9 100644 --- a/src/main/java/world/bentobox/bbox/listeners/flags/BreedingListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/BreedingListener.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import java.util.Arrays; import java.util.List; @@ -11,8 +11,8 @@ import org.bukkit.event.player.PlayerInteractAtEntityEvent; import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.ItemStack; -import world.bentobox.bbox.api.flags.AbstractFlagListener; -import world.bentobox.bbox.lists.Flags; +import world.bentobox.bentobox.api.flags.AbstractFlagListener; +import world.bentobox.bentobox.lists.Flags; /** * Handles breeding protection diff --git a/src/main/java/world/bentobox/bbox/listeners/flags/BucketListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/BucketListener.java similarity index 92% rename from src/main/java/world/bentobox/bbox/listeners/flags/BucketListener.java rename to src/main/java/world/bentobox/bentobox/listeners/flags/BucketListener.java index bf71c0f86..0cca40121 100644 --- a/src/main/java/world/bentobox/bbox/listeners/flags/BucketListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/BucketListener.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import org.bukkit.Material; import org.bukkit.block.Block; @@ -7,8 +7,8 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.player.PlayerBucketEmptyEvent; import org.bukkit.event.player.PlayerBucketFillEvent; -import world.bentobox.bbox.api.flags.AbstractFlagListener; -import world.bentobox.bbox.lists.Flags; +import world.bentobox.bentobox.api.flags.AbstractFlagListener; +import world.bentobox.bentobox.lists.Flags; /** * Handles interaction with beds diff --git a/src/main/java/world/bentobox/bbox/listeners/flags/ChestDamageListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/ChestDamageListener.java similarity index 82% rename from src/main/java/world/bentobox/bbox/listeners/flags/ChestDamageListener.java rename to src/main/java/world/bentobox/bentobox/listeners/flags/ChestDamageListener.java index 7150c45c3..cb3c16a72 100644 --- a/src/main/java/world/bentobox/bbox/listeners/flags/ChestDamageListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/ChestDamageListener.java @@ -1,15 +1,15 @@ /** * */ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import org.bukkit.Material; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.entity.EntityExplodeEvent; -import world.bentobox.bbox.api.flags.AbstractFlagListener; -import world.bentobox.bbox.lists.Flags; +import world.bentobox.bentobox.api.flags.AbstractFlagListener; +import world.bentobox.bentobox.lists.Flags; /** * @author tastybento diff --git a/src/main/java/world/bentobox/bbox/listeners/flags/CleanSuperFlatListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/CleanSuperFlatListener.java similarity index 87% rename from src/main/java/world/bentobox/bbox/listeners/flags/CleanSuperFlatListener.java rename to src/main/java/world/bentobox/bentobox/listeners/flags/CleanSuperFlatListener.java index c96fc8da5..f76cf081d 100644 --- a/src/main/java/world/bentobox/bbox/listeners/flags/CleanSuperFlatListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/CleanSuperFlatListener.java @@ -1,7 +1,7 @@ /** * */ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import org.bukkit.Material; import org.bukkit.World; @@ -10,9 +10,9 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.world.ChunkLoadEvent; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.flags.AbstractFlagListener; -import world.bentobox.bbox.lists.Flags; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.flags.AbstractFlagListener; +import world.bentobox.bentobox.lists.Flags; /** * Cleans super-flat world chunks or normal nether chunks if they generate accidentally diff --git a/src/main/java/world/bentobox/bbox/listeners/flags/CreeperListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/CreeperListener.java similarity index 80% rename from src/main/java/world/bentobox/bbox/listeners/flags/CreeperListener.java rename to src/main/java/world/bentobox/bentobox/listeners/flags/CreeperListener.java index 0a42969af..dd36a0a8e 100644 --- a/src/main/java/world/bentobox/bbox/listeners/flags/CreeperListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/CreeperListener.java @@ -1,7 +1,7 @@ /** * */ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import org.bukkit.entity.Creeper; import org.bukkit.entity.EntityType; @@ -10,15 +10,15 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.entity.EntityExplodeEvent; -import world.bentobox.bbox.api.flags.AbstractFlagListener; -import world.bentobox.bbox.api.localization.TextVariables; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.lists.Flags; +import world.bentobox.bentobox.api.flags.AbstractFlagListener; +import world.bentobox.bentobox.api.localization.TextVariables; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.lists.Flags; /** * Listens for creepers hsssssssh! - * For the {@link world.bentobox.bbox.lists.Flags#CREEPER_DAMAGE} - * and {@link world.bentobox.bbox.lists.Flags#CREEPER_GRIEFING} flags. + * For the {@link world.bentobox.bentobox.lists.Flags#CREEPER_DAMAGE} + * and {@link world.bentobox.bentobox.lists.Flags#CREEPER_GRIEFING} flags. * @author tastybento * */ diff --git a/src/main/java/world/bentobox/bbox/listeners/flags/EggListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/EggListener.java similarity index 79% rename from src/main/java/world/bentobox/bbox/listeners/flags/EggListener.java rename to src/main/java/world/bentobox/bentobox/listeners/flags/EggListener.java index 4bbc6d40e..38ac9c5d7 100644 --- a/src/main/java/world/bentobox/bbox/listeners/flags/EggListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/EggListener.java @@ -1,11 +1,11 @@ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.PlayerEggThrowEvent; -import world.bentobox.bbox.api.flags.AbstractFlagListener; -import world.bentobox.bbox.lists.Flags; +import world.bentobox.bentobox.api.flags.AbstractFlagListener; +import world.bentobox.bentobox.lists.Flags; /** * Handles throwing regular eggs (not spawn eggs) diff --git a/src/main/java/world/bentobox/bbox/listeners/flags/EnderChestListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/EnderChestListener.java similarity index 87% rename from src/main/java/world/bentobox/bbox/listeners/flags/EnderChestListener.java rename to src/main/java/world/bentobox/bentobox/listeners/flags/EnderChestListener.java index 43ca29f82..f1e6f2ce7 100644 --- a/src/main/java/world/bentobox/bbox/listeners/flags/EnderChestListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/EnderChestListener.java @@ -1,7 +1,7 @@ /* */ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -11,10 +11,10 @@ import org.bukkit.event.block.Action; import org.bukkit.event.inventory.CraftItemEvent; import org.bukkit.event.player.PlayerInteractEvent; -import world.bentobox.bbox.api.flags.AbstractFlagListener; -import world.bentobox.bbox.api.localization.TextVariables; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.lists.Flags; +import world.bentobox.bentobox.api.flags.AbstractFlagListener; +import world.bentobox.bentobox.api.localization.TextVariables; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.lists.Flags; /** * Prevents enderchest use and creation in world if it is not allowed diff --git a/src/main/java/world/bentobox/bbox/listeners/flags/EndermanListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/EndermanListener.java similarity index 84% rename from src/main/java/world/bentobox/bbox/listeners/flags/EndermanListener.java rename to src/main/java/world/bentobox/bentobox/listeners/flags/EndermanListener.java index 539b2d715..4f2ae3417 100644 --- a/src/main/java/world/bentobox/bbox/listeners/flags/EndermanListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/EndermanListener.java @@ -1,7 +1,7 @@ /** * */ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import org.bukkit.Material; import org.bukkit.entity.Enderman; @@ -11,13 +11,13 @@ import org.bukkit.event.entity.EntityChangeBlockEvent; import org.bukkit.event.entity.EntityDeathEvent; import org.bukkit.material.MaterialData; -import world.bentobox.bbox.api.flags.AbstractFlagListener; -import world.bentobox.bbox.lists.Flags; +import world.bentobox.bentobox.api.flags.AbstractFlagListener; +import world.bentobox.bentobox.lists.Flags; /** * Listens for Endermen - * For the {@link world.bentobox.bbox.lists.Flags#ENDERMAN_GRIEFING} - * and {@link world.bentobox.bbox.lists.Flags#CREEPER_GRIEFING} flags. + * For the {@link world.bentobox.bentobox.lists.Flags#ENDERMAN_GRIEFING} + * and {@link world.bentobox.bentobox.lists.Flags#CREEPER_GRIEFING} flags. * @author tastybento * */ diff --git a/src/main/java/world/bentobox/bbox/listeners/flags/EnterExitListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/EnterExitListener.java similarity index 91% rename from src/main/java/world/bentobox/bbox/listeners/flags/EnterExitListener.java rename to src/main/java/world/bentobox/bentobox/listeners/flags/EnterExitListener.java index 6534cb0d0..8564af683 100644 --- a/src/main/java/world/bentobox/bbox/listeners/flags/EnterExitListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/EnterExitListener.java @@ -1,7 +1,7 @@ /* */ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import java.util.Optional; @@ -10,10 +10,10 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.player.PlayerMoveEvent; import org.bukkit.util.Vector; -import world.bentobox.bbox.api.flags.AbstractFlagListener; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.lists.Flags; +import world.bentobox.bentobox.api.flags.AbstractFlagListener; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.lists.Flags; /** * The Enter/Exit messages flag is a global flag and applies everywhere diff --git a/src/main/java/world/bentobox/bbox/listeners/flags/EntityInteractListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/EntityInteractListener.java similarity index 90% rename from src/main/java/world/bentobox/bbox/listeners/flags/EntityInteractListener.java rename to src/main/java/world/bentobox/bentobox/listeners/flags/EntityInteractListener.java index 739c25e4f..d6ae3122c 100644 --- a/src/main/java/world/bentobox/bbox/listeners/flags/EntityInteractListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/EntityInteractListener.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import org.bukkit.entity.Animals; import org.bukkit.entity.ArmorStand; @@ -9,8 +9,8 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.player.PlayerInteractAtEntityEvent; import org.bukkit.event.player.PlayerInteractEntityEvent; -import world.bentobox.bbox.api.flags.AbstractFlagListener; -import world.bentobox.bbox.lists.Flags; +import world.bentobox.bentobox.api.flags.AbstractFlagListener; +import world.bentobox.bentobox.lists.Flags; /** * Handles interaction with entities like armor stands diff --git a/src/main/java/world/bentobox/bbox/listeners/flags/FireListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/FireListener.java similarity index 94% rename from src/main/java/world/bentobox/bbox/listeners/flags/FireListener.java rename to src/main/java/world/bentobox/bentobox/listeners/flags/FireListener.java index 2446b39b5..51f3e8af1 100644 --- a/src/main/java/world/bentobox/bbox/listeners/flags/FireListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/FireListener.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import org.bukkit.Location; import org.bukkit.Material; @@ -13,9 +13,9 @@ import org.bukkit.event.block.BlockSpreadEvent; import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.util.BlockIterator; -import world.bentobox.bbox.api.flags.AbstractFlagListener; -import world.bentobox.bbox.api.flags.Flag; -import world.bentobox.bbox.lists.Flags; +import world.bentobox.bentobox.api.flags.AbstractFlagListener; +import world.bentobox.bentobox.api.flags.Flag; +import world.bentobox.bentobox.lists.Flags; /** * Handles fire diff --git a/src/main/java/world/bentobox/bbox/listeners/flags/GeoLimitClickListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/GeoLimitClickListener.java similarity index 86% rename from src/main/java/world/bentobox/bbox/listeners/flags/GeoLimitClickListener.java rename to src/main/java/world/bentobox/bentobox/listeners/flags/GeoLimitClickListener.java index 7df6daca6..6d766ab19 100644 --- a/src/main/java/world/bentobox/bbox/listeners/flags/GeoLimitClickListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/GeoLimitClickListener.java @@ -1,7 +1,7 @@ /** * */ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import java.util.Arrays; import java.util.Comparator; @@ -13,15 +13,15 @@ import org.bukkit.Sound; import org.bukkit.entity.EntityType; import org.bukkit.event.inventory.ClickType; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.panels.Panel; -import world.bentobox.bbox.api.panels.PanelItem; -import world.bentobox.bbox.api.panels.PanelItem.ClickHandler; -import world.bentobox.bbox.api.panels.builders.PanelBuilder; -import world.bentobox.bbox.api.panels.builders.PanelItemBuilder; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.panels.Panel; +import world.bentobox.bentobox.api.panels.PanelItem; +import world.bentobox.bentobox.api.panels.PanelItem.ClickHandler; +import world.bentobox.bentobox.api.panels.builders.PanelBuilder; +import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.util.Util; /** * Provide geo limiting to mobs - removed them if they go outside island bounds diff --git a/src/main/java/world/bentobox/bbox/listeners/flags/GeoLimitMobsListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/GeoLimitMobsListener.java similarity index 92% rename from src/main/java/world/bentobox/bbox/listeners/flags/GeoLimitMobsListener.java rename to src/main/java/world/bentobox/bentobox/listeners/flags/GeoLimitMobsListener.java index e57b92542..29c34e9d6 100644 --- a/src/main/java/world/bentobox/bbox/listeners/flags/GeoLimitMobsListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/GeoLimitMobsListener.java @@ -1,7 +1,7 @@ /** * */ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import java.util.Map; import java.util.WeakHashMap; @@ -16,9 +16,9 @@ import org.bukkit.event.entity.EntityDeathEvent; import org.bukkit.event.entity.ExplosionPrimeEvent; import org.bukkit.projectiles.ProjectileSource; -import world.bentobox.bbox.api.events.BentoBoxReadyEvent; -import world.bentobox.bbox.api.flags.AbstractFlagListener; -import world.bentobox.bbox.database.objects.Island; +import world.bentobox.bentobox.api.events.BentoBoxReadyEvent; +import world.bentobox.bentobox.api.flags.AbstractFlagListener; +import world.bentobox.bentobox.database.objects.Island; /** * Provide geo limiting to mobs - removed them if they go outside island bounds diff --git a/src/main/java/world/bentobox/bbox/listeners/flags/HurtingListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/HurtingListener.java similarity index 97% rename from src/main/java/world/bentobox/bbox/listeners/flags/HurtingListener.java rename to src/main/java/world/bentobox/bentobox/listeners/flags/HurtingListener.java index c5ae2cdf6..7bb2d5599 100644 --- a/src/main/java/world/bentobox/bbox/listeners/flags/HurtingListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/HurtingListener.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import java.util.HashMap; import java.util.UUID; @@ -27,10 +27,10 @@ import org.bukkit.event.player.PlayerInteractEntityEvent; import org.bukkit.inventory.EquipmentSlot; import org.bukkit.potion.PotionEffect; -import world.bentobox.bbox.api.flags.AbstractFlagListener; -import world.bentobox.bbox.api.flags.Flag; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.lists.Flags; +import world.bentobox.bentobox.api.flags.AbstractFlagListener; +import world.bentobox.bentobox.api.flags.Flag; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.lists.Flags; /** * Handles hurting of monsters and animals directly and indirectly diff --git a/src/main/java/world/bentobox/bbox/listeners/flags/InventoryListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/InventoryListener.java similarity index 91% rename from src/main/java/world/bentobox/bbox/listeners/flags/InventoryListener.java rename to src/main/java/world/bentobox/bentobox/listeners/flags/InventoryListener.java index a2c9c15a7..6fc55f223 100644 --- a/src/main/java/world/bentobox/bbox/listeners/flags/InventoryListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/InventoryListener.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import org.bukkit.block.Beacon; import org.bukkit.block.BrewingStand; @@ -13,9 +13,9 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.inventory.InventoryClickEvent; -import world.bentobox.bbox.api.flags.AbstractFlagListener; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.lists.Flags; +import world.bentobox.bentobox.api.flags.AbstractFlagListener; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.lists.Flags; /** * Handles inventory protection diff --git a/src/main/java/world/bentobox/bbox/listeners/flags/InvincibleVisitorsListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/InvincibleVisitorsListener.java similarity index 88% rename from src/main/java/world/bentobox/bbox/listeners/flags/InvincibleVisitorsListener.java rename to src/main/java/world/bentobox/bentobox/listeners/flags/InvincibleVisitorsListener.java index 3bf01c778..d6a24888e 100644 --- a/src/main/java/world/bentobox/bbox/listeners/flags/InvincibleVisitorsListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/InvincibleVisitorsListener.java @@ -1,7 +1,7 @@ /* */ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import java.util.Arrays; @@ -16,15 +16,15 @@ import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.entity.EntityDamageEvent.DamageCause; import org.bukkit.event.inventory.ClickType; -import world.bentobox.bbox.api.flags.AbstractFlagListener; -import world.bentobox.bbox.api.panels.Panel; -import world.bentobox.bbox.api.panels.PanelItem; -import world.bentobox.bbox.api.panels.PanelItem.ClickHandler; -import world.bentobox.bbox.api.panels.builders.PanelBuilder; -import world.bentobox.bbox.api.panels.builders.PanelItemBuilder; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.util.Util; -import world.bentobox.bbox.util.teleport.SafeTeleportBuilder; +import world.bentobox.bentobox.api.flags.AbstractFlagListener; +import world.bentobox.bentobox.api.panels.Panel; +import world.bentobox.bentobox.api.panels.PanelItem; +import world.bentobox.bentobox.api.panels.PanelItem.ClickHandler; +import world.bentobox.bentobox.api.panels.builders.PanelBuilder; +import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.util.Util; +import world.bentobox.bentobox.util.teleport.SafeTeleportBuilder; /** * Listener for invincible visitor settings. Handles click listening and damage events diff --git a/src/main/java/world/bentobox/bbox/listeners/flags/IslandRespawnListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/IslandRespawnListener.java similarity index 90% rename from src/main/java/world/bentobox/bbox/listeners/flags/IslandRespawnListener.java rename to src/main/java/world/bentobox/bentobox/listeners/flags/IslandRespawnListener.java index 7fce5e5d1..bf067418f 100644 --- a/src/main/java/world/bentobox/bbox/listeners/flags/IslandRespawnListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/IslandRespawnListener.java @@ -1,7 +1,7 @@ /* */ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import java.util.HashMap; import java.util.Map; @@ -14,9 +14,9 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.entity.PlayerDeathEvent; import org.bukkit.event.player.PlayerRespawnEvent; -import world.bentobox.bbox.api.flags.AbstractFlagListener; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.lists.Flags; +import world.bentobox.bentobox.api.flags.AbstractFlagListener; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.lists.Flags; /** * Handles respawning back on island diff --git a/src/main/java/world/bentobox/bbox/listeners/flags/ItemDropPickUpListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/ItemDropPickUpListener.java similarity index 83% rename from src/main/java/world/bentobox/bbox/listeners/flags/ItemDropPickUpListener.java rename to src/main/java/world/bentobox/bentobox/listeners/flags/ItemDropPickUpListener.java index a1b1ca52b..12e161072 100644 --- a/src/main/java/world/bentobox/bbox/listeners/flags/ItemDropPickUpListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/ItemDropPickUpListener.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -6,9 +6,9 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.entity.EntityPickupItemEvent; import org.bukkit.event.player.PlayerDropItemEvent; -import world.bentobox.bbox.api.flags.AbstractFlagListener; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.lists.Flags; +import world.bentobox.bentobox.api.flags.AbstractFlagListener; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.lists.Flags; /** * @author tastybento diff --git a/src/main/java/world/bentobox/bbox/listeners/flags/ItemFrameListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/ItemFrameListener.java similarity index 90% rename from src/main/java/world/bentobox/bbox/listeners/flags/ItemFrameListener.java rename to src/main/java/world/bentobox/bentobox/listeners/flags/ItemFrameListener.java index d4a532e23..be5a160e4 100644 --- a/src/main/java/world/bentobox/bbox/listeners/flags/ItemFrameListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/ItemFrameListener.java @@ -1,7 +1,7 @@ /** * */ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import org.bukkit.entity.Entity; import org.bukkit.entity.ItemFrame; @@ -13,8 +13,8 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.hanging.HangingBreakByEntityEvent; -import world.bentobox.bbox.api.flags.AbstractFlagListener; -import world.bentobox.bbox.lists.Flags; +import world.bentobox.bentobox.api.flags.AbstractFlagListener; +import world.bentobox.bentobox.lists.Flags; /** * Protects item frames from damage by mobs diff --git a/src/main/java/world/bentobox/bbox/listeners/flags/LeashListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/LeashListener.java similarity index 89% rename from src/main/java/world/bentobox/bbox/listeners/flags/LeashListener.java rename to src/main/java/world/bentobox/bentobox/listeners/flags/LeashListener.java index 5037d48aa..5a0b4990a 100644 --- a/src/main/java/world/bentobox/bbox/listeners/flags/LeashListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/LeashListener.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import org.bukkit.entity.EntityType; import org.bukkit.event.EventHandler; @@ -7,8 +7,8 @@ import org.bukkit.event.entity.PlayerLeashEntityEvent; import org.bukkit.event.hanging.HangingPlaceEvent; import org.bukkit.event.player.PlayerUnleashEntityEvent; -import world.bentobox.bbox.api.flags.AbstractFlagListener; -import world.bentobox.bbox.lists.Flags; +import world.bentobox.bentobox.api.flags.AbstractFlagListener; +import world.bentobox.bentobox.lists.Flags; /** * @author tastybento diff --git a/src/main/java/world/bentobox/bbox/listeners/flags/LockAndBanListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/LockAndBanListener.java similarity index 96% rename from src/main/java/world/bentobox/bbox/listeners/flags/LockAndBanListener.java rename to src/main/java/world/bentobox/bentobox/listeners/flags/LockAndBanListener.java index 6d0c8241c..d60c8cd41 100644 --- a/src/main/java/world/bentobox/bbox/listeners/flags/LockAndBanListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/LockAndBanListener.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import org.bukkit.Bukkit; import org.bukkit.GameMode; @@ -14,9 +14,9 @@ import org.bukkit.event.player.PlayerTeleportEvent; import org.bukkit.event.vehicle.VehicleMoveEvent; import org.bukkit.util.Vector; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.lists.Flags; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.lists.Flags; /** * Listener for the lock flag diff --git a/src/main/java/world/bentobox/bbox/listeners/flags/MobSpawnListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/MobSpawnListener.java similarity index 90% rename from src/main/java/world/bentobox/bbox/listeners/flags/MobSpawnListener.java rename to src/main/java/world/bentobox/bentobox/listeners/flags/MobSpawnListener.java index 15ea69849..546523f38 100644 --- a/src/main/java/world/bentobox/bbox/listeners/flags/MobSpawnListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/MobSpawnListener.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import java.util.Optional; @@ -10,9 +10,9 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.entity.CreatureSpawnEvent; import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; -import world.bentobox.bbox.api.flags.AbstractFlagListener; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.lists.Flags; +import world.bentobox.bentobox.api.flags.AbstractFlagListener; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.lists.Flags; /** * Handles natural mob spawning. diff --git a/src/main/java/world/bentobox/bbox/listeners/flags/OfflineRedstoneListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/OfflineRedstoneListener.java similarity index 85% rename from src/main/java/world/bentobox/bbox/listeners/flags/OfflineRedstoneListener.java rename to src/main/java/world/bentobox/bentobox/listeners/flags/OfflineRedstoneListener.java index 7ef51d866..3cf511ccb 100644 --- a/src/main/java/world/bentobox/bbox/listeners/flags/OfflineRedstoneListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/OfflineRedstoneListener.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import java.util.UUID; @@ -7,8 +7,8 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.block.BlockRedstoneEvent; -import world.bentobox.bbox.api.flags.AbstractFlagListener; -import world.bentobox.bbox.lists.Flags; +import world.bentobox.bentobox.api.flags.AbstractFlagListener; +import world.bentobox.bentobox.lists.Flags; public class OfflineRedstoneListener extends AbstractFlagListener { @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true) diff --git a/src/main/java/world/bentobox/bbox/listeners/flags/PVPListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/PVPListener.java similarity index 96% rename from src/main/java/world/bentobox/bbox/listeners/flags/PVPListener.java rename to src/main/java/world/bentobox/bentobox/listeners/flags/PVPListener.java index 6ab3f5164..61a75d1cc 100644 --- a/src/main/java/world/bentobox/bbox/listeners/flags/PVPListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/PVPListener.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import java.util.HashMap; import java.util.UUID; @@ -20,10 +20,10 @@ import org.bukkit.event.entity.LingeringPotionSplashEvent; import org.bukkit.event.entity.PotionSplashEvent; import org.bukkit.event.player.PlayerFishEvent; -import world.bentobox.bbox.api.flags.AbstractFlagListener; -import world.bentobox.bbox.api.flags.Flag; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.lists.Flags; +import world.bentobox.bentobox.api.flags.AbstractFlagListener; +import world.bentobox.bentobox.api.flags.Flag; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.lists.Flags; /** * Handles PVP diff --git a/src/main/java/world/bentobox/bbox/listeners/flags/PhysicalInteractionListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/PhysicalInteractionListener.java similarity index 91% rename from src/main/java/world/bentobox/bbox/listeners/flags/PhysicalInteractionListener.java rename to src/main/java/world/bentobox/bentobox/listeners/flags/PhysicalInteractionListener.java index 7d129ab24..2c801a96b 100644 --- a/src/main/java/world/bentobox/bbox/listeners/flags/PhysicalInteractionListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/PhysicalInteractionListener.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import org.bukkit.entity.Player; import org.bukkit.entity.Projectile; @@ -8,9 +8,9 @@ import org.bukkit.event.block.Action; import org.bukkit.event.entity.EntityInteractEvent; import org.bukkit.event.player.PlayerInteractEvent; -import world.bentobox.bbox.api.flags.AbstractFlagListener; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.lists.Flags; +import world.bentobox.bentobox.api.flags.AbstractFlagListener; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.lists.Flags; /** * @author tastybento diff --git a/src/main/java/world/bentobox/bbox/listeners/flags/PistonPushListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/PistonPushListener.java similarity index 87% rename from src/main/java/world/bentobox/bbox/listeners/flags/PistonPushListener.java rename to src/main/java/world/bentobox/bentobox/listeners/flags/PistonPushListener.java index b2a1533f5..45fa0a9d4 100644 --- a/src/main/java/world/bentobox/bbox/listeners/flags/PistonPushListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/PistonPushListener.java @@ -1,14 +1,14 @@ /* */ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.block.BlockPistonExtendEvent; -import world.bentobox.bbox.api.flags.AbstractFlagListener; -import world.bentobox.bbox.lists.Flags; +import world.bentobox.bentobox.api.flags.AbstractFlagListener; +import world.bentobox.bentobox.lists.Flags; /** * Prevents pistons from pushing blocks outside island protection range diff --git a/src/main/java/world/bentobox/bbox/listeners/flags/PlaceBlocksListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/PlaceBlocksListener.java similarity index 94% rename from src/main/java/world/bentobox/bbox/listeners/flags/PlaceBlocksListener.java rename to src/main/java/world/bentobox/bentobox/listeners/flags/PlaceBlocksListener.java index 030e656e6..743b56cbb 100644 --- a/src/main/java/world/bentobox/bbox/listeners/flags/PlaceBlocksListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/PlaceBlocksListener.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import org.bukkit.Material; import org.bukkit.entity.EntityType; @@ -11,9 +11,9 @@ import org.bukkit.event.block.EntityBlockFormEvent; import org.bukkit.event.player.PlayerInteractEntityEvent; import org.bukkit.event.player.PlayerInteractEvent; -import world.bentobox.bbox.api.flags.AbstractFlagListener; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.lists.Flags; +import world.bentobox.bentobox.api.flags.AbstractFlagListener; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.lists.Flags; /** * @author tastybento diff --git a/src/main/java/world/bentobox/bbox/listeners/flags/PortalListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/PortalListener.java similarity index 84% rename from src/main/java/world/bentobox/bbox/listeners/flags/PortalListener.java rename to src/main/java/world/bentobox/bentobox/listeners/flags/PortalListener.java index b7266772c..a7dad543d 100644 --- a/src/main/java/world/bentobox/bbox/listeners/flags/PortalListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/PortalListener.java @@ -1,12 +1,12 @@ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.PlayerPortalEvent; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; -import world.bentobox.bbox.api.flags.AbstractFlagListener; -import world.bentobox.bbox.lists.Flags; +import world.bentobox.bentobox.api.flags.AbstractFlagListener; +import world.bentobox.bentobox.lists.Flags; /** * Handles portal protection diff --git a/src/main/java/world/bentobox/bbox/listeners/flags/RemoveMobsListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/RemoveMobsListener.java similarity index 80% rename from src/main/java/world/bentobox/bbox/listeners/flags/RemoveMobsListener.java rename to src/main/java/world/bentobox/bentobox/listeners/flags/RemoveMobsListener.java index 0147a004d..6e818a7a0 100644 --- a/src/main/java/world/bentobox/bbox/listeners/flags/RemoveMobsListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/RemoveMobsListener.java @@ -1,14 +1,14 @@ /* */ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.PlayerTeleportEvent; -import world.bentobox.bbox.api.flags.AbstractFlagListener; -import world.bentobox.bbox.lists.Flags; +import world.bentobox.bentobox.api.flags.AbstractFlagListener; +import world.bentobox.bentobox.lists.Flags; /** * Removes mobs when teleporting to an island diff --git a/src/main/java/world/bentobox/bbox/listeners/flags/ShearingListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/ShearingListener.java similarity index 74% rename from src/main/java/world/bentobox/bbox/listeners/flags/ShearingListener.java rename to src/main/java/world/bentobox/bentobox/listeners/flags/ShearingListener.java index 3be804de9..b9db84f24 100644 --- a/src/main/java/world/bentobox/bbox/listeners/flags/ShearingListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/ShearingListener.java @@ -1,11 +1,11 @@ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.PlayerShearEntityEvent; -import world.bentobox.bbox.api.flags.AbstractFlagListener; -import world.bentobox.bbox.lists.Flags; +import world.bentobox.bentobox.api.flags.AbstractFlagListener; +import world.bentobox.bentobox.lists.Flags; /** * Handles shearing diff --git a/src/main/java/world/bentobox/bbox/listeners/flags/TNTListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/TNTListener.java similarity index 93% rename from src/main/java/world/bentobox/bbox/listeners/flags/TNTListener.java rename to src/main/java/world/bentobox/bentobox/listeners/flags/TNTListener.java index f272acd4a..347ca96c3 100644 --- a/src/main/java/world/bentobox/bbox/listeners/flags/TNTListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/TNTListener.java @@ -1,7 +1,7 @@ /** * */ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import org.bukkit.Material; import org.bukkit.entity.EntityType; @@ -14,9 +14,9 @@ import org.bukkit.event.entity.EntityChangeBlockEvent; import org.bukkit.event.entity.EntityExplodeEvent; import org.bukkit.event.player.PlayerInteractEvent; -import world.bentobox.bbox.api.flags.AbstractFlagListener; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.lists.Flags; +import world.bentobox.bentobox.api.flags.AbstractFlagListener; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.lists.Flags; /** * Protects islands from visitors blowing things up diff --git a/src/main/java/world/bentobox/bbox/listeners/flags/TeleportationListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/TeleportationListener.java similarity index 85% rename from src/main/java/world/bentobox/bbox/listeners/flags/TeleportationListener.java rename to src/main/java/world/bentobox/bentobox/listeners/flags/TeleportationListener.java index 101ed1bcf..d4de6da3d 100644 --- a/src/main/java/world/bentobox/bbox/listeners/flags/TeleportationListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/TeleportationListener.java @@ -1,12 +1,12 @@ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.PlayerTeleportEvent; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; -import world.bentobox.bbox.api.flags.AbstractFlagListener; -import world.bentobox.bbox.lists.Flags; +import world.bentobox.bentobox.api.flags.AbstractFlagListener; +import world.bentobox.bentobox.lists.Flags; /** * Handles teleporting due to enderpearl or chorus fruit. diff --git a/src/main/java/world/bentobox/bbox/listeners/protection/FlyingMobEvents.java b/src/main/java/world/bentobox/bentobox/listeners/protection/FlyingMobEvents.java similarity index 97% rename from src/main/java/world/bentobox/bbox/listeners/protection/FlyingMobEvents.java rename to src/main/java/world/bentobox/bentobox/listeners/protection/FlyingMobEvents.java index ed93c83eb..e24fe50c0 100644 --- a/src/main/java/world/bentobox/bbox/listeners/protection/FlyingMobEvents.java +++ b/src/main/java/world/bentobox/bentobox/listeners/protection/FlyingMobEvents.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.listeners.protection; +package world.bentobox.bentobox.listeners.protection; import java.util.Iterator; import java.util.Map.Entry; @@ -19,8 +19,8 @@ import org.bukkit.event.entity.EntityDeathEvent; import org.bukkit.event.entity.EntityExplodeEvent; import org.bukkit.event.entity.ExplosionPrimeEvent; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.database.objects.Island; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.database.objects.Island; /** * This class manages flying mobs. If they exist the spawned island's limits they will be removed. diff --git a/src/main/java/world/bentobox/bbox/listeners/protection/InventorySave.java b/src/main/java/world/bentobox/bentobox/listeners/protection/InventorySave.java similarity index 97% rename from src/main/java/world/bentobox/bbox/listeners/protection/InventorySave.java rename to src/main/java/world/bentobox/bentobox/listeners/protection/InventorySave.java index a0b839ef5..83db45730 100644 --- a/src/main/java/world/bentobox/bbox/listeners/protection/InventorySave.java +++ b/src/main/java/world/bentobox/bentobox/listeners/protection/InventorySave.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.listeners.protection; +package world.bentobox.bentobox.listeners.protection; import java.util.HashMap; import java.util.UUID; diff --git a/src/main/java/world/bentobox/bbox/listeners/protection/InventoryStore.java b/src/main/java/world/bentobox/bentobox/listeners/protection/InventoryStore.java similarity index 94% rename from src/main/java/world/bentobox/bbox/listeners/protection/InventoryStore.java rename to src/main/java/world/bentobox/bentobox/listeners/protection/InventoryStore.java index 4fc0584e2..ca78b7dcf 100644 --- a/src/main/java/world/bentobox/bbox/listeners/protection/InventoryStore.java +++ b/src/main/java/world/bentobox/bentobox/listeners/protection/InventoryStore.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.listeners.protection; +package world.bentobox.bentobox.listeners.protection; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/world/bentobox/bbox/lists/Flags.java b/src/main/java/world/bentobox/bentobox/lists/Flags.java similarity index 83% rename from src/main/java/world/bentobox/bbox/lists/Flags.java rename to src/main/java/world/bentobox/bentobox/lists/Flags.java index 15b5334da..80700d5de 100644 --- a/src/main/java/world/bentobox/bbox/lists/Flags.java +++ b/src/main/java/world/bentobox/bentobox/lists/Flags.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.lists; +package world.bentobox.bentobox.lists; import java.util.Arrays; import java.util.List; @@ -7,44 +7,44 @@ import java.util.stream.Collectors; import org.bukkit.Bukkit; import org.bukkit.Material; -import world.bentobox.bbox.api.flags.Flag; -import world.bentobox.bbox.api.flags.FlagBuilder; -import world.bentobox.bbox.api.flags.Flag.Type; -import world.bentobox.bbox.listeners.flags.BlockInteractionListener; -import world.bentobox.bbox.listeners.flags.BreakBlocksListener; -import world.bentobox.bbox.listeners.flags.BreedingListener; -import world.bentobox.bbox.listeners.flags.BucketListener; -import world.bentobox.bbox.listeners.flags.ChestDamageListener; -import world.bentobox.bbox.listeners.flags.CleanSuperFlatListener; -import world.bentobox.bbox.listeners.flags.CreeperListener; -import world.bentobox.bbox.listeners.flags.EggListener; -import world.bentobox.bbox.listeners.flags.EnderChestListener; -import world.bentobox.bbox.listeners.flags.EndermanListener; -import world.bentobox.bbox.listeners.flags.EnterExitListener; -import world.bentobox.bbox.listeners.flags.EntityInteractListener; -import world.bentobox.bbox.listeners.flags.FireListener; -import world.bentobox.bbox.listeners.flags.GeoLimitClickListener; -import world.bentobox.bbox.listeners.flags.GeoLimitMobsListener; -import world.bentobox.bbox.listeners.flags.HurtingListener; -import world.bentobox.bbox.listeners.flags.InventoryListener; -import world.bentobox.bbox.listeners.flags.InvincibleVisitorsListener; -import world.bentobox.bbox.listeners.flags.IslandRespawnListener; -import world.bentobox.bbox.listeners.flags.ItemDropPickUpListener; -import world.bentobox.bbox.listeners.flags.ItemFrameListener; -import world.bentobox.bbox.listeners.flags.LeashListener; -import world.bentobox.bbox.listeners.flags.LockAndBanListener; -import world.bentobox.bbox.listeners.flags.MobSpawnListener; -import world.bentobox.bbox.listeners.flags.OfflineRedstoneListener; -import world.bentobox.bbox.listeners.flags.PVPListener; -import world.bentobox.bbox.listeners.flags.PhysicalInteractionListener; -import world.bentobox.bbox.listeners.flags.PistonPushListener; -import world.bentobox.bbox.listeners.flags.PlaceBlocksListener; -import world.bentobox.bbox.listeners.flags.PortalListener; -import world.bentobox.bbox.listeners.flags.RemoveMobsListener; -import world.bentobox.bbox.listeners.flags.ShearingListener; -import world.bentobox.bbox.listeners.flags.TNTListener; -import world.bentobox.bbox.listeners.flags.TeleportationListener; -import world.bentobox.bbox.managers.RanksManager; +import world.bentobox.bentobox.api.flags.Flag; +import world.bentobox.bentobox.api.flags.FlagBuilder; +import world.bentobox.bentobox.api.flags.Flag.Type; +import world.bentobox.bentobox.listeners.flags.BlockInteractionListener; +import world.bentobox.bentobox.listeners.flags.BreakBlocksListener; +import world.bentobox.bentobox.listeners.flags.BreedingListener; +import world.bentobox.bentobox.listeners.flags.BucketListener; +import world.bentobox.bentobox.listeners.flags.ChestDamageListener; +import world.bentobox.bentobox.listeners.flags.CleanSuperFlatListener; +import world.bentobox.bentobox.listeners.flags.CreeperListener; +import world.bentobox.bentobox.listeners.flags.EggListener; +import world.bentobox.bentobox.listeners.flags.EnderChestListener; +import world.bentobox.bentobox.listeners.flags.EndermanListener; +import world.bentobox.bentobox.listeners.flags.EnterExitListener; +import world.bentobox.bentobox.listeners.flags.EntityInteractListener; +import world.bentobox.bentobox.listeners.flags.FireListener; +import world.bentobox.bentobox.listeners.flags.GeoLimitClickListener; +import world.bentobox.bentobox.listeners.flags.GeoLimitMobsListener; +import world.bentobox.bentobox.listeners.flags.HurtingListener; +import world.bentobox.bentobox.listeners.flags.InventoryListener; +import world.bentobox.bentobox.listeners.flags.InvincibleVisitorsListener; +import world.bentobox.bentobox.listeners.flags.IslandRespawnListener; +import world.bentobox.bentobox.listeners.flags.ItemDropPickUpListener; +import world.bentobox.bentobox.listeners.flags.ItemFrameListener; +import world.bentobox.bentobox.listeners.flags.LeashListener; +import world.bentobox.bentobox.listeners.flags.LockAndBanListener; +import world.bentobox.bentobox.listeners.flags.MobSpawnListener; +import world.bentobox.bentobox.listeners.flags.OfflineRedstoneListener; +import world.bentobox.bentobox.listeners.flags.PVPListener; +import world.bentobox.bentobox.listeners.flags.PhysicalInteractionListener; +import world.bentobox.bentobox.listeners.flags.PistonPushListener; +import world.bentobox.bentobox.listeners.flags.PlaceBlocksListener; +import world.bentobox.bentobox.listeners.flags.PortalListener; +import world.bentobox.bentobox.listeners.flags.RemoveMobsListener; +import world.bentobox.bentobox.listeners.flags.ShearingListener; +import world.bentobox.bentobox.listeners.flags.TNTListener; +import world.bentobox.bentobox.listeners.flags.TeleportationListener; +import world.bentobox.bentobox.managers.RanksManager; public class Flags { diff --git a/src/main/java/world/bentobox/bbox/lists/Placeholders.java b/src/main/java/world/bentobox/bentobox/lists/Placeholders.java similarity index 82% rename from src/main/java/world/bentobox/bbox/lists/Placeholders.java rename to src/main/java/world/bentobox/bentobox/lists/Placeholders.java index 2ec515c3b..836d8836b 100644 --- a/src/main/java/world/bentobox/bbox/lists/Placeholders.java +++ b/src/main/java/world/bentobox/bentobox/lists/Placeholders.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.lists; +package world.bentobox.bentobox.lists; import java.util.Arrays; import java.util.List; @@ -6,9 +6,9 @@ import java.util.stream.Collectors; import org.bukkit.Bukkit; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.placeholders.Placeholder; -import world.bentobox.bbox.api.placeholders.PlaceholderBuilder; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.placeholders.Placeholder; +import world.bentobox.bentobox.api.placeholders.PlaceholderBuilder; public class Placeholders { diff --git a/src/main/java/world/bentobox/bbox/managers/AddonsManager.java b/src/main/java/world/bentobox/bentobox/managers/AddonsManager.java similarity index 95% rename from src/main/java/world/bentobox/bbox/managers/AddonsManager.java rename to src/main/java/world/bentobox/bentobox/managers/AddonsManager.java index f789c37a0..6fd92e79f 100644 --- a/src/main/java/world/bentobox/bbox/managers/AddonsManager.java +++ b/src/main/java/world/bentobox/bentobox/managers/AddonsManager.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.managers; +package world.bentobox.bentobox.managers; import java.io.BufferedReader; import java.io.File; @@ -18,11 +18,11 @@ import java.util.jar.JarFile; import org.bukkit.Bukkit; import org.bukkit.configuration.file.YamlConfiguration; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.addons.Addon; -import world.bentobox.bbox.api.addons.AddonClassLoader; -import world.bentobox.bbox.api.addons.exception.InvalidAddonFormatException; -import world.bentobox.bbox.api.events.addon.AddonEvent; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.addons.Addon; +import world.bentobox.bentobox.api.addons.AddonClassLoader; +import world.bentobox.bentobox.api.addons.exception.InvalidAddonFormatException; +import world.bentobox.bentobox.api.events.addon.AddonEvent; /** * @author Tastybento, ComminQ diff --git a/src/main/java/world/bentobox/bbox/managers/CommandsManager.java b/src/main/java/world/bentobox/bentobox/managers/CommandsManager.java similarity index 93% rename from src/main/java/world/bentobox/bbox/managers/CommandsManager.java rename to src/main/java/world/bentobox/bentobox/managers/CommandsManager.java index 76fc00507..f9c527613 100644 --- a/src/main/java/world/bentobox/bbox/managers/CommandsManager.java +++ b/src/main/java/world/bentobox/bentobox/managers/CommandsManager.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.managers; +package world.bentobox.bentobox.managers; import java.lang.reflect.Field; import java.util.HashMap; @@ -7,7 +7,7 @@ import java.util.Set; import org.bukkit.Bukkit; import org.bukkit.command.CommandMap; -import world.bentobox.bbox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.commands.CompositeCommand; public class CommandsManager { diff --git a/src/main/java/world/bentobox/bbox/managers/FlagsManager.java b/src/main/java/world/bentobox/bentobox/managers/FlagsManager.java similarity index 93% rename from src/main/java/world/bentobox/bbox/managers/FlagsManager.java rename to src/main/java/world/bentobox/bentobox/managers/FlagsManager.java index e7b4ce411..86fb2ddc0 100644 --- a/src/main/java/world/bentobox/bbox/managers/FlagsManager.java +++ b/src/main/java/world/bentobox/bentobox/managers/FlagsManager.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.managers; +package world.bentobox.bentobox.managers; import java.util.ArrayList; import java.util.HashMap; @@ -8,9 +8,9 @@ import java.util.Map; import org.bukkit.Bukkit; import org.bukkit.event.Listener; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.flags.Flag; -import world.bentobox.bbox.lists.Flags; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.flags.Flag; +import world.bentobox.bentobox.lists.Flags; /** * @author Poslovitch diff --git a/src/main/java/world/bentobox/bbox/managers/IslandWorldManager.java b/src/main/java/world/bentobox/bentobox/managers/IslandWorldManager.java similarity index 98% rename from src/main/java/world/bentobox/bbox/managers/IslandWorldManager.java rename to src/main/java/world/bentobox/bentobox/managers/IslandWorldManager.java index ea7304ce5..7335d1089 100644 --- a/src/main/java/world/bentobox/bbox/managers/IslandWorldManager.java +++ b/src/main/java/world/bentobox/bentobox/managers/IslandWorldManager.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.managers; +package world.bentobox.bentobox.managers; import java.io.File; import java.util.HashMap; @@ -16,13 +16,13 @@ import org.bukkit.World; import org.bukkit.World.Environment; import org.bukkit.entity.EntityType; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.addons.Addon; -import world.bentobox.bbox.api.configuration.WorldSettings; -import world.bentobox.bbox.api.flags.Flag; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.lists.Flags; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.addons.Addon; +import world.bentobox.bentobox.api.configuration.WorldSettings; +import world.bentobox.bentobox.api.flags.Flag; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.lists.Flags; +import world.bentobox.bentobox.util.Util; /** * Handles registration and management of worlds diff --git a/src/main/java/world/bentobox/bbox/managers/IslandsManager.java b/src/main/java/world/bentobox/bentobox/managers/IslandsManager.java similarity index 98% rename from src/main/java/world/bentobox/bbox/managers/IslandsManager.java rename to src/main/java/world/bentobox/bentobox/managers/IslandsManager.java index 85aebf4c4..4dd995b5a 100644 --- a/src/main/java/world/bentobox/bbox/managers/IslandsManager.java +++ b/src/main/java/world/bentobox/bentobox/managers/IslandsManager.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.managers; +package world.bentobox.bentobox.managers; import java.util.Collection; import java.util.HashMap; @@ -24,16 +24,16 @@ import org.bukkit.material.SimpleAttachableMaterialData; import org.bukkit.material.TrapDoor; import org.bukkit.util.Vector; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Constants; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.BSBDatabase; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.lists.Flags; -import world.bentobox.bbox.managers.island.IslandCache; -import world.bentobox.bbox.util.DeleteIslandChunks; -import world.bentobox.bbox.util.Util; -import world.bentobox.bbox.util.teleport.SafeTeleportBuilder; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Constants; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.BSBDatabase; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.lists.Flags; +import world.bentobox.bentobox.managers.island.IslandCache; +import world.bentobox.bentobox.util.DeleteIslandChunks; +import world.bentobox.bentobox.util.Util; +import world.bentobox.bentobox.util.teleport.SafeTeleportBuilder; /** * The job of this class is manage all island related data. diff --git a/src/main/java/world/bentobox/bbox/managers/LocalesManager.java b/src/main/java/world/bentobox/bentobox/managers/LocalesManager.java similarity index 95% rename from src/main/java/world/bentobox/bbox/managers/LocalesManager.java rename to src/main/java/world/bentobox/bentobox/managers/LocalesManager.java index 1d4ae2c37..16086bd3b 100644 --- a/src/main/java/world/bentobox/bbox/managers/LocalesManager.java +++ b/src/main/java/world/bentobox/bentobox/managers/LocalesManager.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.managers; +package world.bentobox.bentobox.managers; import java.io.File; import java.io.FilenameFilter; @@ -14,10 +14,10 @@ import java.util.Objects; import org.bukkit.configuration.file.YamlConfiguration; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.localization.BentoBoxLocale; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.util.FileLister; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.localization.BentoBoxLocale; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.util.FileLister; /** * @author tastybento, Poslovitch diff --git a/src/main/java/world/bentobox/bbox/managers/PlayersManager.java b/src/main/java/world/bentobox/bentobox/managers/PlayersManager.java similarity index 97% rename from src/main/java/world/bentobox/bbox/managers/PlayersManager.java rename to src/main/java/world/bentobox/bentobox/managers/PlayersManager.java index 51b6d047d..fe905d4fc 100644 --- a/src/main/java/world/bentobox/bbox/managers/PlayersManager.java +++ b/src/main/java/world/bentobox/bentobox/managers/PlayersManager.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.managers; +package world.bentobox.bentobox.managers; import java.util.Collection; import java.util.Collections; @@ -12,11 +12,11 @@ import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.World; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.BSBDatabase; -import world.bentobox.bbox.database.objects.Names; -import world.bentobox.bbox.database.objects.Players; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.BSBDatabase; +import world.bentobox.bentobox.database.objects.Names; +import world.bentobox.bentobox.database.objects.Players; public class PlayersManager { diff --git a/src/main/java/world/bentobox/bbox/managers/RanksManager.java b/src/main/java/world/bentobox/bentobox/managers/RanksManager.java similarity index 98% rename from src/main/java/world/bentobox/bbox/managers/RanksManager.java rename to src/main/java/world/bentobox/bentobox/managers/RanksManager.java index 09ed47019..436542e88 100644 --- a/src/main/java/world/bentobox/bbox/managers/RanksManager.java +++ b/src/main/java/world/bentobox/bentobox/managers/RanksManager.java @@ -1,11 +1,11 @@ -package world.bentobox.bbox.managers; +package world.bentobox.bentobox.managers; import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; import java.util.stream.Collectors; -import world.bentobox.bbox.BentoBox; +import world.bentobox.bentobox.BentoBox; public class RanksManager { diff --git a/src/main/java/world/bentobox/bbox/managers/SchemsManager.java b/src/main/java/world/bentobox/bentobox/managers/SchemsManager.java similarity index 93% rename from src/main/java/world/bentobox/bbox/managers/SchemsManager.java rename to src/main/java/world/bentobox/bentobox/managers/SchemsManager.java index f4531601c..3311aa26a 100644 --- a/src/main/java/world/bentobox/bbox/managers/SchemsManager.java +++ b/src/main/java/world/bentobox/bentobox/managers/SchemsManager.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.managers; +package world.bentobox.bentobox.managers; import java.io.File; import java.io.IOException; @@ -9,10 +9,10 @@ import java.util.Optional; import org.bukkit.World; import org.bukkit.configuration.InvalidConfigurationException; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.addons.Addon; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.island.builders.Clipboard; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.addons.Addon; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.island.builders.Clipboard; public class SchemsManager { diff --git a/src/main/java/world/bentobox/bbox/managers/island/IslandCache.java b/src/main/java/world/bentobox/bentobox/managers/island/IslandCache.java similarity index 98% rename from src/main/java/world/bentobox/bbox/managers/island/IslandCache.java rename to src/main/java/world/bentobox/bentobox/managers/island/IslandCache.java index 3dbe54a09..ab7c31863 100644 --- a/src/main/java/world/bentobox/bbox/managers/island/IslandCache.java +++ b/src/main/java/world/bentobox/bentobox/managers/island/IslandCache.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.managers.island; +package world.bentobox.bentobox.managers.island; import java.util.Collection; import java.util.Collections; @@ -11,8 +11,8 @@ import java.util.UUID; import org.bukkit.Location; import org.bukkit.World; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.util.Util; public class IslandCache { private Map islandsByLocation; diff --git a/src/main/java/world/bentobox/bbox/managers/island/IslandGrid.java b/src/main/java/world/bentobox/bentobox/managers/island/IslandGrid.java similarity index 96% rename from src/main/java/world/bentobox/bbox/managers/island/IslandGrid.java rename to src/main/java/world/bentobox/bentobox/managers/island/IslandGrid.java index 153fc116c..103e6b3cb 100644 --- a/src/main/java/world/bentobox/bbox/managers/island/IslandGrid.java +++ b/src/main/java/world/bentobox/bentobox/managers/island/IslandGrid.java @@ -1,8 +1,8 @@ -package world.bentobox.bbox.managers.island; +package world.bentobox.bentobox.managers.island; import java.util.Map.Entry; -import world.bentobox.bbox.database.objects.Island; +import world.bentobox.bentobox.database.objects.Island; import java.util.TreeMap; diff --git a/src/main/java/world/bentobox/bbox/managers/island/NewIsland.java b/src/main/java/world/bentobox/bentobox/managers/island/NewIsland.java similarity index 95% rename from src/main/java/world/bentobox/bbox/managers/island/NewIsland.java rename to src/main/java/world/bentobox/bentobox/managers/island/NewIsland.java index 40dbaf45c..8df58b969 100644 --- a/src/main/java/world/bentobox/bbox/managers/island/NewIsland.java +++ b/src/main/java/world/bentobox/bentobox/managers/island/NewIsland.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.managers.island; +package world.bentobox.bentobox.managers.island; import java.io.IOException; import java.util.EnumMap; @@ -9,13 +9,13 @@ import org.bukkit.Material; import org.bukkit.World; import org.bukkit.World.Environment; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.events.IslandBaseEvent; -import world.bentobox.bbox.api.events.island.IslandEvent; -import world.bentobox.bbox.api.events.island.IslandEvent.Reason; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.events.IslandBaseEvent; +import world.bentobox.bentobox.api.events.island.IslandEvent; +import world.bentobox.bentobox.api.events.island.IslandEvent.Reason; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.util.Util; /** * Create and paste a new island diff --git a/src/main/java/world/bentobox/bbox/panels/LanguagePanel.java b/src/main/java/world/bentobox/bentobox/panels/LanguagePanel.java similarity index 90% rename from src/main/java/world/bentobox/bbox/panels/LanguagePanel.java rename to src/main/java/world/bentobox/bentobox/panels/LanguagePanel.java index 8adb73bb2..cfaee4d69 100644 --- a/src/main/java/world/bentobox/bbox/panels/LanguagePanel.java +++ b/src/main/java/world/bentobox/bentobox/panels/LanguagePanel.java @@ -1,14 +1,14 @@ -package world.bentobox.bbox.panels; +package world.bentobox.bentobox.panels; import java.util.Locale; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.panels.builders.PanelBuilder; -import world.bentobox.bbox.api.panels.builders.PanelItemBuilder; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.panels.builders.PanelBuilder; +import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder; +import world.bentobox.bentobox.api.user.User; /** * @author Poslovitch diff --git a/src/main/java/world/bentobox/bbox/panels/SettingsPanel.java b/src/main/java/world/bentobox/bentobox/panels/SettingsPanel.java similarity index 87% rename from src/main/java/world/bentobox/bbox/panels/SettingsPanel.java rename to src/main/java/world/bentobox/bentobox/panels/SettingsPanel.java index 61a2613c1..d69fc3c6d 100644 --- a/src/main/java/world/bentobox/bbox/panels/SettingsPanel.java +++ b/src/main/java/world/bentobox/bentobox/panels/SettingsPanel.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.panels; +package world.bentobox.bentobox.panels; import java.util.Comparator; @@ -6,12 +6,12 @@ import org.bukkit.Material; import org.bukkit.World; import org.bukkit.inventory.ItemStack; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.flags.Flag; -import world.bentobox.bbox.api.panels.PanelItem; -import world.bentobox.bbox.api.panels.builders.PanelBuilder; -import world.bentobox.bbox.api.panels.builders.PanelItemBuilder; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.flags.Flag; +import world.bentobox.bentobox.api.panels.PanelItem; +import world.bentobox.bentobox.api.panels.builders.PanelBuilder; +import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder; +import world.bentobox.bentobox.api.user.User; /** * Creates settings panels diff --git a/src/main/java/world/bentobox/bbox/util/DeleteIslandChunks.java b/src/main/java/world/bentobox/bentobox/util/DeleteIslandChunks.java similarity index 82% rename from src/main/java/world/bentobox/bbox/util/DeleteIslandChunks.java rename to src/main/java/world/bentobox/bentobox/util/DeleteIslandChunks.java index 53c75d815..77c671f4e 100644 --- a/src/main/java/world/bentobox/bbox/util/DeleteIslandChunks.java +++ b/src/main/java/world/bentobox/bentobox/util/DeleteIslandChunks.java @@ -1,12 +1,12 @@ -package world.bentobox.bbox.util; +package world.bentobox.bentobox.util; import org.bukkit.World; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.events.IslandBaseEvent; -import world.bentobox.bbox.api.events.island.IslandEvent; -import world.bentobox.bbox.api.events.island.IslandEvent.Reason; -import world.bentobox.bbox.database.objects.Island; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.events.IslandBaseEvent; +import world.bentobox.bentobox.api.events.island.IslandEvent; +import world.bentobox.bentobox.api.events.island.IslandEvent.Reason; +import world.bentobox.bentobox.database.objects.Island; /** * Deletes islands fast using chunk regeneration diff --git a/src/main/java/world/bentobox/bbox/util/FileLister.java b/src/main/java/world/bentobox/bentobox/util/FileLister.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/world/bentobox/bbox/util/FileLister.java rename to src/main/java/world/bentobox/bentobox/util/FileLister.java index 28d1fbadd..7f97927c8 --- a/src/main/java/world/bentobox/bbox/util/FileLister.java +++ b/src/main/java/world/bentobox/bentobox/util/FileLister.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.util; +package world.bentobox.bentobox.util; import java.io.File; import java.io.FilenameFilter; diff --git a/src/main/java/world/bentobox/bbox/util/HeadGetter.java b/src/main/java/world/bentobox/bentobox/util/HeadGetter.java similarity index 95% rename from src/main/java/world/bentobox/bbox/util/HeadGetter.java rename to src/main/java/world/bentobox/bentobox/util/HeadGetter.java index 1f491a848..cbb0ee7c1 100644 --- a/src/main/java/world/bentobox/bbox/util/HeadGetter.java +++ b/src/main/java/world/bentobox/bentobox/util/HeadGetter.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.util; +package world.bentobox.bentobox.util; import java.util.HashMap; import java.util.HashSet; @@ -11,8 +11,8 @@ import org.bukkit.Material; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.SkullMeta; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.panels.PanelItem; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.panels.PanelItem; public class HeadGetter { private static Map cachedHeads = new HashMap<>(); diff --git a/src/main/java/world/bentobox/bbox/util/HeadRequester.java b/src/main/java/world/bentobox/bentobox/util/HeadRequester.java similarity index 57% rename from src/main/java/world/bentobox/bbox/util/HeadRequester.java rename to src/main/java/world/bentobox/bentobox/util/HeadRequester.java index e8d07fff5..fccbca39c 100644 --- a/src/main/java/world/bentobox/bbox/util/HeadRequester.java +++ b/src/main/java/world/bentobox/bentobox/util/HeadRequester.java @@ -1,6 +1,6 @@ -package world.bentobox.bbox.util; +package world.bentobox.bentobox.util; -import world.bentobox.bbox.api.panels.PanelItem; +import world.bentobox.bentobox.api.panels.PanelItem; public interface HeadRequester { diff --git a/src/main/java/world/bentobox/bbox/util/ItemParser.java b/src/main/java/world/bentobox/bentobox/util/ItemParser.java similarity index 99% rename from src/main/java/world/bentobox/bbox/util/ItemParser.java rename to src/main/java/world/bentobox/bentobox/util/ItemParser.java index 2f1270db4..229d9d572 100644 --- a/src/main/java/world/bentobox/bbox/util/ItemParser.java +++ b/src/main/java/world/bentobox/bentobox/util/ItemParser.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.util; +package world.bentobox.bentobox.util; import org.apache.commons.lang.StringUtils; import org.bukkit.DyeColor; diff --git a/src/main/java/world/bentobox/bbox/util/Pair.java b/src/main/java/world/bentobox/bentobox/util/Pair.java similarity index 97% rename from src/main/java/world/bentobox/bbox/util/Pair.java rename to src/main/java/world/bentobox/bentobox/util/Pair.java index ce26c4677..aa6e55e6d 100644 --- a/src/main/java/world/bentobox/bbox/util/Pair.java +++ b/src/main/java/world/bentobox/bentobox/util/Pair.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.util; +package world.bentobox.bentobox.util; public class Pair { diff --git a/src/main/java/world/bentobox/bbox/util/Util.java b/src/main/java/world/bentobox/bentobox/util/Util.java old mode 100755 new mode 100644 similarity index 98% rename from src/main/java/world/bentobox/bbox/util/Util.java rename to src/main/java/world/bentobox/bentobox/util/Util.java index 1b4f2da0f..049a1cf95 --- a/src/main/java/world/bentobox/bbox/util/Util.java +++ b/src/main/java/world/bentobox/bentobox/util/Util.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.util; +package world.bentobox.bentobox.util; import java.util.ArrayList; import java.util.List; @@ -14,8 +14,8 @@ import org.bukkit.entity.Player; import org.bukkit.permissions.PermissionAttachmentInfo; import org.bukkit.util.Vector; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.user.User; /** * A set of utility methods diff --git a/src/main/java/world/bentobox/bbox/util/YmlCommentParser.java b/src/main/java/world/bentobox/bentobox/util/YmlCommentParser.java similarity index 99% rename from src/main/java/world/bentobox/bbox/util/YmlCommentParser.java rename to src/main/java/world/bentobox/bentobox/util/YmlCommentParser.java index 172e0b61d..38f8c4504 100644 --- a/src/main/java/world/bentobox/bbox/util/YmlCommentParser.java +++ b/src/main/java/world/bentobox/bentobox/util/YmlCommentParser.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.util; +package world.bentobox.bentobox.util; import java.io.BufferedReader; import java.io.IOException; diff --git a/src/main/java/world/bentobox/bbox/util/YmlConfiguration.java b/src/main/java/world/bentobox/bentobox/util/YmlConfiguration.java similarity index 97% rename from src/main/java/world/bentobox/bbox/util/YmlConfiguration.java rename to src/main/java/world/bentobox/bentobox/util/YmlConfiguration.java index 2e040283c..cb6ee8f10 100644 --- a/src/main/java/world/bentobox/bbox/util/YmlConfiguration.java +++ b/src/main/java/world/bentobox/bentobox/util/YmlConfiguration.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.util; +package world.bentobox.bentobox.util; import java.util.Map; diff --git a/src/main/java/world/bentobox/bbox/util/teleport/SafeSpotTeleport.java b/src/main/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleport.java similarity index 98% rename from src/main/java/world/bentobox/bbox/util/teleport/SafeSpotTeleport.java rename to src/main/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleport.java index 2eb3137b2..00652006a 100644 --- a/src/main/java/world/bentobox/bbox/util/teleport/SafeSpotTeleport.java +++ b/src/main/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleport.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.util.teleport; +package world.bentobox.bentobox.util.teleport; import java.util.ArrayList; import java.util.Iterator; @@ -16,10 +16,10 @@ import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitTask; import org.bukkit.util.Vector; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.util.Pair; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.util.Pair; /** * A class that calculates finds a safe spot asynchronously and then teleports the player there. diff --git a/src/main/java/world/bentobox/bbox/util/teleport/SafeTeleportBuilder.java b/src/main/java/world/bentobox/bentobox/util/teleport/SafeTeleportBuilder.java similarity index 93% rename from src/main/java/world/bentobox/bbox/util/teleport/SafeTeleportBuilder.java rename to src/main/java/world/bentobox/bentobox/util/teleport/SafeTeleportBuilder.java index 9d6eb989f..fce4b102b 100644 --- a/src/main/java/world/bentobox/bbox/util/teleport/SafeTeleportBuilder.java +++ b/src/main/java/world/bentobox/bentobox/util/teleport/SafeTeleportBuilder.java @@ -1,12 +1,12 @@ -package world.bentobox.bbox.util.teleport; +package world.bentobox.bentobox.util.teleport; import org.bukkit.Location; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; public class SafeTeleportBuilder { diff --git a/src/test/java/bskyblock/TestBSkyBlock.java b/src/test/java/bskyblock/TestBSkyBlock.java index 82e7bbdc7..b0e32ce97 100644 --- a/src/test/java/bskyblock/TestBSkyBlock.java +++ b/src/test/java/bskyblock/TestBSkyBlock.java @@ -48,23 +48,23 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.events.IslandBaseEvent; -import world.bentobox.bbox.api.events.team.TeamEvent; -import world.bentobox.bbox.api.flags.AbstractFlagListener; -import world.bentobox.bbox.api.flags.Flag; -import world.bentobox.bbox.api.flags.FlagBuilder; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.lists.Flags; -import world.bentobox.bbox.managers.CommandsManager; -import world.bentobox.bbox.managers.FlagsManager; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.RanksManager; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.events.IslandBaseEvent; +import world.bentobox.bentobox.api.events.team.TeamEvent; +import world.bentobox.bentobox.api.flags.AbstractFlagListener; +import world.bentobox.bentobox.api.flags.Flag; +import world.bentobox.bentobox.api.flags.FlagBuilder; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.lists.Flags; +import world.bentobox.bentobox.managers.CommandsManager; +import world.bentobox.bentobox.managers.FlagsManager; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.RanksManager; +import world.bentobox.bentobox.util.Util; @RunWith(PowerMockRunner.class) @PrepareForTest({ BentoBox.class, Flags.class, Util.class, Bukkit.class}) diff --git a/src/test/java/world/bentobox/bbox/api/addons/AddonTest.java b/src/test/java/world/bentobox/bentobox/api/addons/AddonTest.java similarity index 96% rename from src/test/java/world/bentobox/bbox/api/addons/AddonTest.java rename to src/test/java/world/bentobox/bentobox/api/addons/AddonTest.java index 7b263db40..8095a18ea 100644 --- a/src/test/java/world/bentobox/bbox/api/addons/AddonTest.java +++ b/src/test/java/world/bentobox/bentobox/api/addons/AddonTest.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.api.addons; +package world.bentobox.bentobox.api.addons; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -30,10 +30,10 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.managers.AddonsManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.PlayersManager; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.managers.AddonsManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.PlayersManager; @RunWith(PowerMockRunner.class) @PrepareForTest( { BentoBox.class }) diff --git a/src/test/java/world/bentobox/bbox/api/commands/DefaultHelpCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/DefaultHelpCommandTest.java similarity index 94% rename from src/test/java/world/bentobox/bbox/api/commands/DefaultHelpCommandTest.java rename to src/test/java/world/bentobox/bentobox/api/commands/DefaultHelpCommandTest.java index 0dca11bf2..290a7c8bd 100644 --- a/src/test/java/world/bentobox/bbox/api/commands/DefaultHelpCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/DefaultHelpCommandTest.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.api.commands; +package world.bentobox.bentobox.api.commands; import static org.junit.Assert.assertNotNull; import static org.mockito.Mockito.mock; @@ -21,14 +21,14 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.events.command.CommandEvent; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.managers.CommandsManager; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.PlayersManager; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.events.command.CommandEvent; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.managers.CommandsManager; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.PlayersManager; @RunWith(PowerMockRunner.class) @PrepareForTest({Bukkit.class, BentoBox.class, CommandEvent.class}) diff --git a/src/test/java/world/bentobox/bbox/api/flags/FlagTest.java b/src/test/java/world/bentobox/bentobox/api/flags/FlagTest.java similarity index 93% rename from src/test/java/world/bentobox/bbox/api/flags/FlagTest.java rename to src/test/java/world/bentobox/bentobox/api/flags/FlagTest.java index 40f7f8c99..793a61980 100644 --- a/src/test/java/world/bentobox/bbox/api/flags/FlagTest.java +++ b/src/test/java/world/bentobox/bentobox/api/flags/FlagTest.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.api.flags; +package world.bentobox.bentobox.api.flags; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -33,17 +33,17 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.configuration.WorldSettings; -import world.bentobox.bbox.api.flags.Flag; -import world.bentobox.bbox.api.flags.Flag.Type; -import world.bentobox.bbox.api.panels.PanelItem; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.RanksManager; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.configuration.WorldSettings; +import world.bentobox.bentobox.api.flags.Flag; +import world.bentobox.bentobox.api.flags.Flag.Type; +import world.bentobox.bentobox.api.panels.PanelItem; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.RanksManager; +import world.bentobox.bentobox.util.Util; @RunWith(PowerMockRunner.class) @PrepareForTest({ BentoBox.class, Util.class, Bukkit.class }) diff --git a/src/test/java/world/bentobox/bbox/api/flags/clicklisteners/CycleClickTest.java b/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/CycleClickTest.java similarity index 92% rename from src/test/java/world/bentobox/bbox/api/flags/clicklisteners/CycleClickTest.java rename to src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/CycleClickTest.java index 688f20dda..a43900ddb 100644 --- a/src/test/java/world/bentobox/bbox/api/flags/clicklisteners/CycleClickTest.java +++ b/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/CycleClickTest.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.api.flags.clicklisteners; +package world.bentobox.bentobox.api.flags.clicklisteners; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -28,21 +28,21 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.flags.Flag; -import world.bentobox.bbox.api.panels.Panel; -import world.bentobox.bbox.api.panels.PanelItem; -import world.bentobox.bbox.api.user.Notifier; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.managers.FlagsManager; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.LocalesManager; -import world.bentobox.bbox.managers.PlayersManager; -import world.bentobox.bbox.managers.RanksManager; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.flags.Flag; +import world.bentobox.bentobox.api.panels.Panel; +import world.bentobox.bentobox.api.panels.PanelItem; +import world.bentobox.bentobox.api.user.Notifier; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.managers.FlagsManager; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.LocalesManager; +import world.bentobox.bentobox.managers.PlayersManager; +import world.bentobox.bentobox.managers.RanksManager; +import world.bentobox.bentobox.util.Util; @RunWith(PowerMockRunner.class) @PrepareForTest({Bukkit.class, BentoBox.class, User.class, Util.class }) diff --git a/src/test/java/world/bentobox/bbox/api/flags/clicklisteners/IslandToggleClickTest.java b/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/IslandToggleClickTest.java similarity index 87% rename from src/test/java/world/bentobox/bbox/api/flags/clicklisteners/IslandToggleClickTest.java rename to src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/IslandToggleClickTest.java index 12ce4794e..5c5ac674a 100644 --- a/src/test/java/world/bentobox/bbox/api/flags/clicklisteners/IslandToggleClickTest.java +++ b/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/IslandToggleClickTest.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.api.flags.clicklisteners; +package world.bentobox.bentobox.api.flags.clicklisteners; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -20,17 +20,17 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.flags.Flag; -import world.bentobox.bbox.api.flags.clicklisteners.IslandToggleClick; -import world.bentobox.bbox.api.panels.Panel; -import world.bentobox.bbox.api.panels.PanelItem; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.managers.FlagsManager; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.flags.Flag; +import world.bentobox.bentobox.api.flags.clicklisteners.IslandToggleClick; +import world.bentobox.bentobox.api.panels.Panel; +import world.bentobox.bentobox.api.panels.PanelItem; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.managers.FlagsManager; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.util.Util; @RunWith(PowerMockRunner.class) @PrepareForTest({BentoBox.class, Util.class }) diff --git a/src/test/java/world/bentobox/bbox/api/flags/clicklisteners/WorldToggleClickTest.java b/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/WorldToggleClickTest.java similarity index 86% rename from src/test/java/world/bentobox/bbox/api/flags/clicklisteners/WorldToggleClickTest.java rename to src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/WorldToggleClickTest.java index fe5658fd6..35db0620e 100644 --- a/src/test/java/world/bentobox/bbox/api/flags/clicklisteners/WorldToggleClickTest.java +++ b/src/test/java/world/bentobox/bentobox/api/flags/clicklisteners/WorldToggleClickTest.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.api.flags.clicklisteners; +package world.bentobox.bentobox.api.flags.clicklisteners; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -18,15 +18,15 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.flags.Flag; -import world.bentobox.bbox.api.flags.clicklisteners.WorldToggleClick; -import world.bentobox.bbox.api.panels.Panel; -import world.bentobox.bbox.api.panels.PanelItem; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.managers.FlagsManager; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.flags.Flag; +import world.bentobox.bentobox.api.flags.clicklisteners.WorldToggleClick; +import world.bentobox.bentobox.api.panels.Panel; +import world.bentobox.bentobox.api.panels.PanelItem; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.managers.FlagsManager; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.util.Util; @RunWith(PowerMockRunner.class) @PrepareForTest({BentoBox.class, Util.class }) diff --git a/src/test/java/world/bentobox/bbox/api/panels/builders/PanelItemBuilderTest.java b/src/test/java/world/bentobox/bentobox/api/panels/builders/PanelItemBuilderTest.java similarity index 95% rename from src/test/java/world/bentobox/bbox/api/panels/builders/PanelItemBuilderTest.java rename to src/test/java/world/bentobox/bentobox/api/panels/builders/PanelItemBuilderTest.java index 7199fe690..a0c6fda3c 100644 --- a/src/test/java/world/bentobox/bbox/api/panels/builders/PanelItemBuilderTest.java +++ b/src/test/java/world/bentobox/bentobox/api/panels/builders/PanelItemBuilderTest.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.api.panels.builders; +package world.bentobox.bentobox.api.panels.builders; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -29,10 +29,10 @@ import org.junit.runner.RunWith; import org.mockito.Mockito; import org.powermock.modules.junit4.PowerMockRunner; -import world.bentobox.bbox.api.panels.Panel; -import world.bentobox.bbox.api.panels.PanelItem; -import world.bentobox.bbox.api.panels.builders.PanelItemBuilder; -import world.bentobox.bbox.api.user.User; +import world.bentobox.bentobox.api.panels.Panel; +import world.bentobox.bentobox.api.panels.PanelItem; +import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder; +import world.bentobox.bentobox.api.user.User; @RunWith(PowerMockRunner.class) public class PanelItemBuilderTest { diff --git a/src/test/java/world/bentobox/bbox/api/user/UserTest.java b/src/test/java/world/bentobox/bentobox/api/user/UserTest.java similarity index 97% rename from src/test/java/world/bentobox/bbox/api/user/UserTest.java rename to src/test/java/world/bentobox/bentobox/api/user/UserTest.java index 93ff99af2..5aa3cbb92 100644 --- a/src/test/java/world/bentobox/bbox/api/user/UserTest.java +++ b/src/test/java/world/bentobox/bentobox/api/user/UserTest.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.api.user; +package world.bentobox.bentobox.api.user; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -34,12 +34,12 @@ import org.junit.runner.RunWith; import org.mockito.Mockito; import org.powermock.modules.junit4.PowerMockRunner; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.user.Notifier; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.managers.LocalesManager; -import world.bentobox.bbox.managers.PlayersManager; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.user.Notifier; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.managers.LocalesManager; +import world.bentobox.bentobox.managers.PlayersManager; @RunWith(PowerMockRunner.class) diff --git a/src/test/java/world/bentobox/bbox/commands/admin/AdminClearResetsAllCommandTest.java b/src/test/java/world/bentobox/bentobox/commands/admin/AdminClearResetsAllCommandTest.java similarity index 84% rename from src/test/java/world/bentobox/bbox/commands/admin/AdminClearResetsAllCommandTest.java rename to src/test/java/world/bentobox/bentobox/commands/admin/AdminClearResetsAllCommandTest.java index 890c3f46b..e2239ae37 100644 --- a/src/test/java/world/bentobox/bbox/commands/admin/AdminClearResetsAllCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/commands/admin/AdminClearResetsAllCommandTest.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.commands.admin; +package world.bentobox.bentobox.commands.admin; import static org.junit.Assert.assertFalse; import static org.mockito.Mockito.mock; @@ -20,15 +20,15 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.managers.CommandsManager; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.LocalesManager; -import world.bentobox.bbox.managers.PlayersManager; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.managers.CommandsManager; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.LocalesManager; +import world.bentobox.bentobox.managers.PlayersManager; @RunWith(PowerMockRunner.class) @PrepareForTest({Bukkit.class, BentoBox.class, User.class }) @@ -107,7 +107,7 @@ public class AdminClearResetsAllCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.admin.AdminClearResetsAllCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.admin.AdminClearResetsAllCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecuteCheckConfirm() { diff --git a/src/test/java/world/bentobox/bbox/commands/admin/AdminClearResetsCommandTest.java b/src/test/java/world/bentobox/bentobox/commands/admin/AdminClearResetsCommandTest.java similarity index 83% rename from src/test/java/world/bentobox/bbox/commands/admin/AdminClearResetsCommandTest.java rename to src/test/java/world/bentobox/bentobox/commands/admin/AdminClearResetsCommandTest.java index 07b867a45..2d86a0359 100644 --- a/src/test/java/world/bentobox/bbox/commands/admin/AdminClearResetsCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/commands/admin/AdminClearResetsCommandTest.java @@ -1,7 +1,7 @@ /** * */ -package world.bentobox.bbox.commands.admin; +package world.bentobox.bentobox.commands.admin; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -25,15 +25,15 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.managers.CommandsManager; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.LocalesManager; -import world.bentobox.bbox.managers.PlayersManager; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.managers.CommandsManager; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.LocalesManager; +import world.bentobox.bentobox.managers.PlayersManager; /** * @author ben @@ -116,7 +116,7 @@ public class AdminClearResetsCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.admin.AdminClearResetsCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.admin.AdminClearResetsCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecuteNoTarget() { @@ -127,7 +127,7 @@ public class AdminClearResetsCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.admin.AdminClearResetsCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.admin.AdminClearResetsCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecuteUnknownPlayer() { @@ -139,7 +139,7 @@ public class AdminClearResetsCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.admin.AdminClearResetsCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.admin.AdminClearResetsCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecutePlayerNoIsland() { @@ -152,7 +152,7 @@ public class AdminClearResetsCommandTest { } /** - * Test method for {@link us.AdminClearResetsCommand.tastybento.bskyblock.commands.admin.AdminClearResetCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link us.AdminClearResetsCommand.tastybento.bskyblock.commands.admin.AdminClearResetCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecuteSuccess() { diff --git a/src/test/java/world/bentobox/bbox/commands/admin/AdminInfoCommandTest.java b/src/test/java/world/bentobox/bentobox/commands/admin/AdminInfoCommandTest.java similarity index 85% rename from src/test/java/world/bentobox/bbox/commands/admin/AdminInfoCommandTest.java rename to src/test/java/world/bentobox/bentobox/commands/admin/AdminInfoCommandTest.java index 02cc0dd0c..fc0302954 100644 --- a/src/test/java/world/bentobox/bbox/commands/admin/AdminInfoCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/commands/admin/AdminInfoCommandTest.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.commands.admin; +package world.bentobox.bentobox.commands.admin; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -26,16 +26,16 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.managers.CommandsManager; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.LocalesManager; -import world.bentobox.bbox.managers.PlayersManager; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.managers.CommandsManager; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.LocalesManager; +import world.bentobox.bentobox.managers.PlayersManager; /** * @author tastybento @@ -135,7 +135,7 @@ public class AdminInfoCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.admin.AdminInfoCommand#execute(User, String, List)} . + * Test method for {@link world.bentobox.bentobox.commands.admin.AdminInfoCommand#execute(User, String, List)} . */ @Test public void testExecuteUnknownPlayer() { @@ -147,7 +147,7 @@ public class AdminInfoCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.admin.AdminInfoCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.admin.AdminInfoCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecutePlayerHasNoIsland() { @@ -161,7 +161,7 @@ public class AdminInfoCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.admin.AdminInfoCommand#execute(User, String, List)}. + * Test method for {@link world.bentobox.bentobox.commands.admin.AdminInfoCommand#execute(User, String, List)}. */ @Test public void testExecuteSuccess() { @@ -176,7 +176,7 @@ public class AdminInfoCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.admin.AdminInfoCommand#execute(User, String, List)}. + * Test method for {@link world.bentobox.bentobox.commands.admin.AdminInfoCommand#execute(User, String, List)}. */ @Test public void testExecuteUserNotOnIsland() { @@ -190,7 +190,7 @@ public class AdminInfoCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.admin.AdminInfoCommand#execute(User, String, List)}. + * Test method for {@link world.bentobox.bentobox.commands.admin.AdminInfoCommand#execute(User, String, List)}. */ @Test public void testExecuteSuccessUserOnIsland() { diff --git a/src/test/java/world/bentobox/bbox/commands/admin/AdminRegisterCommandTest.java b/src/test/java/world/bentobox/bentobox/commands/admin/AdminRegisterCommandTest.java similarity index 83% rename from src/test/java/world/bentobox/bbox/commands/admin/AdminRegisterCommandTest.java rename to src/test/java/world/bentobox/bentobox/commands/admin/AdminRegisterCommandTest.java index 0d43fc890..70051879b 100644 --- a/src/test/java/world/bentobox/bbox/commands/admin/AdminRegisterCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/commands/admin/AdminRegisterCommandTest.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.commands.admin; +package world.bentobox.bentobox.commands.admin; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -25,16 +25,16 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.managers.CommandsManager; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.LocalesManager; -import world.bentobox.bbox.managers.PlayersManager; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.managers.CommandsManager; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.LocalesManager; +import world.bentobox.bentobox.managers.PlayersManager; /** @@ -121,7 +121,7 @@ public class AdminRegisterCommandTest { /** - * Test method for {@link world.bentobox.bbox.commands.admin.team.AdminRegisterCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.admin.team.AdminRegisterCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecuteNoTarget() { @@ -131,7 +131,7 @@ public class AdminRegisterCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.admin.team.AdminRegisterCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.admin.team.AdminRegisterCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecuteUnknownPlayer() { @@ -143,7 +143,7 @@ public class AdminRegisterCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.admin.team.AdminRegisterCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.admin.team.AdminRegisterCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecutePlayerHasIsland() { @@ -157,7 +157,7 @@ public class AdminRegisterCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.admin.team.AdminRegisterCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.admin.team.AdminRegisterCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecuteInTeam() { @@ -171,7 +171,7 @@ public class AdminRegisterCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.admin.team.AdminRegisterCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.admin.team.AdminRegisterCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecuteAlreadyOwnedIsland() { @@ -193,7 +193,7 @@ public class AdminRegisterCommandTest { } /** - * Test method for {@link us.world.bentobox.bbox.commands.admin.teams.AdminRegisterCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link us.world.bentobox.bbox.commands.admin.teams.AdminRegisterCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecuteSuccess() { diff --git a/src/test/java/world/bentobox/bbox/commands/admin/AdminUnregisterCommandTest.java b/src/test/java/world/bentobox/bentobox/commands/admin/AdminUnregisterCommandTest.java similarity index 82% rename from src/test/java/world/bentobox/bbox/commands/admin/AdminUnregisterCommandTest.java rename to src/test/java/world/bentobox/bentobox/commands/admin/AdminUnregisterCommandTest.java index e20265eb0..7b1f98b38 100644 --- a/src/test/java/world/bentobox/bbox/commands/admin/AdminUnregisterCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/commands/admin/AdminUnregisterCommandTest.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.commands.admin; +package world.bentobox.bentobox.commands.admin; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -24,16 +24,16 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.managers.CommandsManager; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.LocalesManager; -import world.bentobox.bbox.managers.PlayersManager; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.managers.CommandsManager; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.LocalesManager; +import world.bentobox.bentobox.managers.PlayersManager; /** @@ -119,7 +119,7 @@ public class AdminUnregisterCommandTest { /** - * Test method for {@link world.bentobox.bbox.commands.admin.team.AdminUnregisterCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.admin.team.AdminUnregisterCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecuteNoTarget() { @@ -129,7 +129,7 @@ public class AdminUnregisterCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.admin.team.AdminUnregisterCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.admin.team.AdminUnregisterCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecuteUnknownPlayer() { @@ -141,7 +141,7 @@ public class AdminUnregisterCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.admin.team.AdminUnregisterCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.admin.team.AdminUnregisterCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecutePlayerNoIsland() { @@ -154,7 +154,7 @@ public class AdminUnregisterCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.admin.team.AdminUnregisterCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.admin.team.AdminUnregisterCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecuteInTeam() { @@ -167,7 +167,7 @@ public class AdminUnregisterCommandTest { } /** - * Test method for {@link us.world.bentobox.bbox.commands.admin.teams.AdminUnregisterCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link us.world.bentobox.bbox.commands.admin.teams.AdminUnregisterCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecuteSuccess() { diff --git a/src/test/java/world/bentobox/bbox/commands/admin/range/AdminRangeCommandTest.java b/src/test/java/world/bentobox/bentobox/commands/admin/range/AdminRangeCommandTest.java similarity index 89% rename from src/test/java/world/bentobox/bbox/commands/admin/range/AdminRangeCommandTest.java rename to src/test/java/world/bentobox/bentobox/commands/admin/range/AdminRangeCommandTest.java index 664492dc5..ad7477125 100644 --- a/src/test/java/world/bentobox/bbox/commands/admin/range/AdminRangeCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/commands/admin/range/AdminRangeCommandTest.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.commands.admin.range; +package world.bentobox.bentobox.commands.admin.range; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -22,15 +22,15 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.managers.CommandsManager; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.LocalesManager; -import world.bentobox.bbox.managers.PlayersManager; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.managers.CommandsManager; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.LocalesManager; +import world.bentobox.bentobox.managers.PlayersManager; @RunWith(PowerMockRunner.class) @PrepareForTest({Bukkit.class, BentoBox.class, User.class }) diff --git a/src/test/java/world/bentobox/bbox/commands/admin/range/AdminRangeDisplayCommandTest.java b/src/test/java/world/bentobox/bentobox/commands/admin/range/AdminRangeDisplayCommandTest.java similarity index 83% rename from src/test/java/world/bentobox/bbox/commands/admin/range/AdminRangeDisplayCommandTest.java rename to src/test/java/world/bentobox/bentobox/commands/admin/range/AdminRangeDisplayCommandTest.java index 7e0fc5322..6c4e52439 100644 --- a/src/test/java/world/bentobox/bbox/commands/admin/range/AdminRangeDisplayCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/commands/admin/range/AdminRangeDisplayCommandTest.java @@ -1,7 +1,7 @@ /** * */ -package world.bentobox.bbox.commands.admin.range; +package world.bentobox.bentobox.commands.admin.range; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -24,15 +24,15 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.managers.CommandsManager; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.LocalesManager; -import world.bentobox.bbox.managers.PlayersManager; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.managers.CommandsManager; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.LocalesManager; +import world.bentobox.bentobox.managers.PlayersManager; /** * @author tastybento @@ -126,7 +126,7 @@ public class AdminRangeDisplayCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.admin.range.AdminRangeDisplayCommand#execute(world.bentobox.bbox.api.user.User, java.lang.String, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.admin.range.AdminRangeDisplayCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test public void testExecutePlayerDisplayArgs() { @@ -142,7 +142,7 @@ public class AdminRangeDisplayCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.admin.range.AdminRangeDisplayCommand#execute(world.bentobox.bbox.api.user.User, java.lang.String, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.admin.range.AdminRangeDisplayCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test public void testExecutePlayeShowArgs() { @@ -159,7 +159,7 @@ public class AdminRangeDisplayCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.admin.range.AdminRangeDisplayCommand#execute(world.bentobox.bbox.api.user.User, java.lang.String, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.admin.range.AdminRangeDisplayCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test public void testExecutePlayeHideArgs() { diff --git a/src/test/java/world/bentobox/bbox/commands/admin/range/AdminRangeResetCommandTest.java b/src/test/java/world/bentobox/bentobox/commands/admin/range/AdminRangeResetCommandTest.java similarity index 79% rename from src/test/java/world/bentobox/bbox/commands/admin/range/AdminRangeResetCommandTest.java rename to src/test/java/world/bentobox/bentobox/commands/admin/range/AdminRangeResetCommandTest.java index 61426d420..6f73a3202 100644 --- a/src/test/java/world/bentobox/bbox/commands/admin/range/AdminRangeResetCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/commands/admin/range/AdminRangeResetCommandTest.java @@ -1,7 +1,7 @@ /** * */ -package world.bentobox.bbox.commands.admin.range; +package world.bentobox.bentobox.commands.admin.range; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -26,17 +26,17 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.localization.TextVariables; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.managers.CommandsManager; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.LocalesManager; -import world.bentobox.bbox.managers.PlayersManager; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.localization.TextVariables; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.managers.CommandsManager; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.LocalesManager; +import world.bentobox.bentobox.managers.PlayersManager; /** * @author tastybento @@ -136,7 +136,7 @@ public class AdminRangeResetCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.admin.range.AdminRangeResetCommand#execute(world.bentobox.bbox.api.user.User, java.lang.String, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.admin.range.AdminRangeResetCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test public void testExecuteConsoleNoArgs() { @@ -149,7 +149,7 @@ public class AdminRangeResetCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.admin.range.AdminRangeResetCommand#execute(world.bentobox.bbox.api.user.User, java.lang.String, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.admin.range.AdminRangeResetCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test public void testExecutePlayerNoArgs() { @@ -161,7 +161,7 @@ public class AdminRangeResetCommandTest { /** - * Test method for {@link world.bentobox.bbox.commands.admin.range.AdminRangeResetCommand#execute(world.bentobox.bbox.api.user.User, java.lang.String, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.admin.range.AdminRangeResetCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test public void testExecuteUnknownPlayer() { @@ -173,7 +173,7 @@ public class AdminRangeResetCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.admin.range.AdminRangeResetCommand#execute(world.bentobox.bbox.api.user.User, java.lang.String, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.admin.range.AdminRangeResetCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test public void testExecuteKnownPlayerNoIsland() { @@ -187,7 +187,7 @@ public class AdminRangeResetCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.admin.range.AdminRangeResetCommand#execute(world.bentobox.bbox.api.user.User, java.lang.String, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.admin.range.AdminRangeResetCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test public void testExecuteKnownPlayer() { diff --git a/src/test/java/world/bentobox/bbox/commands/admin/range/AdminRangeSetCommandTest.java b/src/test/java/world/bentobox/bentobox/commands/admin/range/AdminRangeSetCommandTest.java similarity index 77% rename from src/test/java/world/bentobox/bbox/commands/admin/range/AdminRangeSetCommandTest.java rename to src/test/java/world/bentobox/bentobox/commands/admin/range/AdminRangeSetCommandTest.java index 477389815..0a3ee3a8c 100644 --- a/src/test/java/world/bentobox/bbox/commands/admin/range/AdminRangeSetCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/commands/admin/range/AdminRangeSetCommandTest.java @@ -1,7 +1,7 @@ /** * */ -package world.bentobox.bbox.commands.admin.range; +package world.bentobox.bentobox.commands.admin.range; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -26,17 +26,17 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.localization.TextVariables; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.managers.CommandsManager; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.LocalesManager; -import world.bentobox.bbox.managers.PlayersManager; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.localization.TextVariables; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.managers.CommandsManager; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.LocalesManager; +import world.bentobox.bentobox.managers.PlayersManager; /** * @author tastybento @@ -138,7 +138,7 @@ public class AdminRangeSetCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.admin.range.AdminRangeSetCommand#execute(world.bentobox.bbox.api.user.User, java.lang.String, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.admin.range.AdminRangeSetCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test public void testExecuteConsoleNoArgs() { @@ -151,7 +151,7 @@ public class AdminRangeSetCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.admin.range.AdminRangeSetCommand#execute(world.bentobox.bbox.api.user.User, java.lang.String, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.admin.range.AdminRangeSetCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test public void testExecutePlayerNoArgs() { @@ -163,7 +163,7 @@ public class AdminRangeSetCommandTest { /** - * Test method for {@link world.bentobox.bbox.commands.admin.range.AdminRangeSetCommand#execute(world.bentobox.bbox.api.user.User, java.lang.String, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.admin.range.AdminRangeSetCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test public void testExecuteUnknownPlayer() { @@ -176,7 +176,7 @@ public class AdminRangeSetCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.admin.range.AdminRangeSetCommand#execute(world.bentobox.bbox.api.user.User, java.lang.String, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.admin.range.AdminRangeSetCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test public void testExecuteKnownPlayerNoIsland() { @@ -191,7 +191,7 @@ public class AdminRangeSetCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.admin.range.AdminRangeSetCommand#execute(world.bentobox.bbox.api.user.User, java.lang.String, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.admin.range.AdminRangeSetCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test public void testExecuteTooHigh() { @@ -205,7 +205,7 @@ public class AdminRangeSetCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.admin.range.AdminRangeSetCommand#execute(world.bentobox.bbox.api.user.User, java.lang.String, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.admin.range.AdminRangeSetCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test public void testExecuteNotANumber() { @@ -219,7 +219,7 @@ public class AdminRangeSetCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.admin.range.AdminRangeSetCommand#execute(world.bentobox.bbox.api.user.User, java.lang.String, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.admin.range.AdminRangeSetCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test public void testExecuteDoubleNumber() { @@ -233,7 +233,7 @@ public class AdminRangeSetCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.admin.range.AdminRangeSetCommand#execute(world.bentobox.bbox.api.user.User, java.lang.String, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.admin.range.AdminRangeSetCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test public void testExecuteZero() { @@ -247,7 +247,7 @@ public class AdminRangeSetCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.admin.range.AdminRangeSetCommand#execute(world.bentobox.bbox.api.user.User, java.lang.String, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.admin.range.AdminRangeSetCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test public void testExecuteNegNumber() { @@ -261,7 +261,7 @@ public class AdminRangeSetCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.admin.range.AdminRangeSetCommand#execute(world.bentobox.bbox.api.user.User, java.lang.String, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.admin.range.AdminRangeSetCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test public void testExecuteSame() { @@ -275,7 +275,7 @@ public class AdminRangeSetCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.admin.range.AdminRangeSetCommand#execute(world.bentobox.bbox.api.user.User, java.lang.String, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.admin.range.AdminRangeSetCommand#execute(world.bentobox.bentobox.api.user.User, java.lang.String, java.util.List)}. */ @Test public void testExecute() { diff --git a/src/test/java/world/bentobox/bbox/commands/admin/team/AdminTeamAddCommandTest.java b/src/test/java/world/bentobox/bentobox/commands/admin/team/AdminTeamAddCommandTest.java similarity index 93% rename from src/test/java/world/bentobox/bbox/commands/admin/team/AdminTeamAddCommandTest.java rename to src/test/java/world/bentobox/bentobox/commands/admin/team/AdminTeamAddCommandTest.java index 437ba08f3..991fcaa31 100644 --- a/src/test/java/world/bentobox/bbox/commands/admin/team/AdminTeamAddCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/commands/admin/team/AdminTeamAddCommandTest.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.commands.admin.team; +package world.bentobox.bentobox.commands.admin.team; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -23,16 +23,16 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.managers.CommandsManager; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.LocalesManager; -import world.bentobox.bbox.managers.PlayersManager; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.managers.CommandsManager; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.LocalesManager; +import world.bentobox.bentobox.managers.PlayersManager; /** * @author tastybento @@ -268,7 +268,7 @@ public class AdminTeamAddCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.admin.team.AdminTeamAddCommand#execute(User, String, List)}. + * Test method for {@link world.bentobox.bentobox.commands.admin.team.AdminTeamAddCommand#execute(User, String, List)}. */ @Test public void testExecuteSuccess() { diff --git a/src/test/java/world/bentobox/bbox/commands/admin/team/AdminTeamDisbandCommandTest.java b/src/test/java/world/bentobox/bentobox/commands/admin/team/AdminTeamDisbandCommandTest.java similarity index 90% rename from src/test/java/world/bentobox/bbox/commands/admin/team/AdminTeamDisbandCommandTest.java rename to src/test/java/world/bentobox/bentobox/commands/admin/team/AdminTeamDisbandCommandTest.java index ba61c8a47..ab7b88a2d 100644 --- a/src/test/java/world/bentobox/bbox/commands/admin/team/AdminTeamDisbandCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/commands/admin/team/AdminTeamDisbandCommandTest.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.commands.admin.team; +package world.bentobox.bentobox.commands.admin.team; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -25,16 +25,16 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.managers.CommandsManager; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.LocalesManager; -import world.bentobox.bbox.managers.PlayersManager; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.managers.CommandsManager; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.LocalesManager; +import world.bentobox.bentobox.managers.PlayersManager; /** * @author tastybento @@ -173,7 +173,7 @@ public class AdminTeamDisbandCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.admin.team.AdminTeamDisbandCommand#execute(User, String, List)}. + * Test method for {@link world.bentobox.bentobox.commands.admin.team.AdminTeamDisbandCommand#execute(User, String, List)}. */ @Test public void testExecuteSuccess() { diff --git a/src/test/java/world/bentobox/bbox/commands/admin/team/AdminTeamKickCommandTest.java b/src/test/java/world/bentobox/bentobox/commands/admin/team/AdminTeamKickCommandTest.java similarity index 90% rename from src/test/java/world/bentobox/bbox/commands/admin/team/AdminTeamKickCommandTest.java rename to src/test/java/world/bentobox/bentobox/commands/admin/team/AdminTeamKickCommandTest.java index 5277cfcc7..aed7ee8ad 100644 --- a/src/test/java/world/bentobox/bbox/commands/admin/team/AdminTeamKickCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/commands/admin/team/AdminTeamKickCommandTest.java @@ -1,7 +1,7 @@ /** * */ -package world.bentobox.bbox.commands.admin.team; +package world.bentobox.bentobox.commands.admin.team; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -27,16 +27,16 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.managers.CommandsManager; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.LocalesManager; -import world.bentobox.bbox.managers.PlayersManager; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.managers.CommandsManager; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.LocalesManager; +import world.bentobox.bentobox.managers.PlayersManager; /** * @author tastybento @@ -177,7 +177,7 @@ public class AdminTeamKickCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.admin.team.AdminTeamKickCommand#execute(User, String, List)}. + * Test method for {@link world.bentobox.bentobox.commands.admin.team.AdminTeamKickCommand#execute(User, String, List)}. */ @Test public void testExecute() { diff --git a/src/test/java/world/bentobox/bbox/commands/admin/team/AdminTeamMakeLeaderCommandTest.java b/src/test/java/world/bentobox/bentobox/commands/admin/team/AdminTeamMakeLeaderCommandTest.java similarity index 90% rename from src/test/java/world/bentobox/bbox/commands/admin/team/AdminTeamMakeLeaderCommandTest.java rename to src/test/java/world/bentobox/bentobox/commands/admin/team/AdminTeamMakeLeaderCommandTest.java index 260b957e3..576cb0716 100644 --- a/src/test/java/world/bentobox/bbox/commands/admin/team/AdminTeamMakeLeaderCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/commands/admin/team/AdminTeamMakeLeaderCommandTest.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.commands.admin.team; +package world.bentobox.bentobox.commands.admin.team; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -25,16 +25,16 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.managers.CommandsManager; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.LocalesManager; -import world.bentobox.bbox.managers.PlayersManager; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.managers.CommandsManager; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.LocalesManager; +import world.bentobox.bentobox.managers.PlayersManager; /** * @author tastybento @@ -173,7 +173,7 @@ public class AdminTeamMakeLeaderCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.admin.team.AdminTeamMakeLeaderCommand#execute(User, String, List)}. + * Test method for {@link world.bentobox.bentobox.commands.admin.team.AdminTeamMakeLeaderCommand#execute(User, String, List)}. */ @Test public void testExecuteSuccess() { diff --git a/src/test/java/world/bentobox/bbox/commands/island/IslandBanCommandTest.java b/src/test/java/world/bentobox/bentobox/commands/island/IslandBanCommandTest.java similarity index 95% rename from src/test/java/world/bentobox/bbox/commands/island/IslandBanCommandTest.java rename to src/test/java/world/bentobox/bentobox/commands/island/IslandBanCommandTest.java index e7a329978..1720f56d5 100644 --- a/src/test/java/world/bentobox/bbox/commands/island/IslandBanCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/commands/island/IslandBanCommandTest.java @@ -1,7 +1,7 @@ /** * */ -package world.bentobox.bbox.commands.island; +package world.bentobox.bentobox.commands.island; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -34,16 +34,16 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.localization.TextVariables; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.managers.CommandsManager; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.PlayersManager; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.localization.TextVariables; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.managers.CommandsManager; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.PlayersManager; /** * @author tastybento @@ -122,7 +122,7 @@ public class IslandBanCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.island.IslandBanCommand#execute(User, String, List)}. + * Test method for {@link world.bentobox.bentobox.commands.island.IslandBanCommand#execute(User, String, List)}. */ // Island ban command by itself diff --git a/src/test/java/world/bentobox/bbox/commands/island/IslandBanlistCommandTest.java b/src/test/java/world/bentobox/bentobox/commands/island/IslandBanlistCommandTest.java similarity index 89% rename from src/test/java/world/bentobox/bbox/commands/island/IslandBanlistCommandTest.java rename to src/test/java/world/bentobox/bentobox/commands/island/IslandBanlistCommandTest.java index 255b46a91..cf30aa52a 100644 --- a/src/test/java/world/bentobox/bbox/commands/island/IslandBanlistCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/commands/island/IslandBanlistCommandTest.java @@ -1,7 +1,7 @@ /** * */ -package world.bentobox.bbox.commands.island; +package world.bentobox.bentobox.commands.island; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -30,15 +30,15 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.managers.CommandsManager; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.PlayersManager; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.managers.CommandsManager; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.PlayersManager; /** * @author tastybento @@ -119,7 +119,7 @@ public class IslandBanlistCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.island.IslandBanlistCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.island.IslandBanlistCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testWithArgs() { diff --git a/src/test/java/world/bentobox/bbox/commands/island/IslandGoCommandTest.java b/src/test/java/world/bentobox/bentobox/commands/island/IslandGoCommandTest.java similarity index 80% rename from src/test/java/world/bentobox/bbox/commands/island/IslandGoCommandTest.java rename to src/test/java/world/bentobox/bentobox/commands/island/IslandGoCommandTest.java index 9baf1890a..0aa118572 100644 --- a/src/test/java/world/bentobox/bbox/commands/island/IslandGoCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/commands/island/IslandGoCommandTest.java @@ -1,7 +1,7 @@ /** * */ -package world.bentobox.bbox.commands.island; +package world.bentobox.bentobox.commands.island; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -26,17 +26,17 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.localization.TextVariables; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.managers.CommandsManager; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.PlayersManager; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.localization.TextVariables; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.managers.CommandsManager; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.PlayersManager; +import world.bentobox.bentobox.util.Util; /** * Test for island go command @@ -123,7 +123,7 @@ public class IslandGoCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.island.IslandGoCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.island.IslandGoCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecuteNoArgsNoIsland() { @@ -135,7 +135,7 @@ public class IslandGoCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.island.IslandGoCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.island.IslandGoCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecuteNoArgs() { @@ -145,7 +145,7 @@ public class IslandGoCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.island.IslandGoCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.island.IslandGoCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecuteNoArgsMultipleHomes() { @@ -156,7 +156,7 @@ public class IslandGoCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.island.IslandGoCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.island.IslandGoCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecuteArgs1MultipleHomes() { @@ -169,7 +169,7 @@ public class IslandGoCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.island.IslandGoCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.island.IslandGoCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecuteArgs2MultipleHomes() { @@ -184,7 +184,7 @@ public class IslandGoCommandTest { /** - * Test method for {@link world.bentobox.bbox.commands.island.IslandGoCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.island.IslandGoCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecuteArgsJunkMultipleHomes() { diff --git a/src/test/java/world/bentobox/bbox/commands/island/IslandResetCommandTest.java b/src/test/java/world/bentobox/bentobox/commands/island/IslandResetCommandTest.java similarity index 94% rename from src/test/java/world/bentobox/bbox/commands/island/IslandResetCommandTest.java rename to src/test/java/world/bentobox/bentobox/commands/island/IslandResetCommandTest.java index ec2666c72..d56aacb85 100644 --- a/src/test/java/world/bentobox/bbox/commands/island/IslandResetCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/commands/island/IslandResetCommandTest.java @@ -1,7 +1,7 @@ /** * */ -package world.bentobox.bbox.commands.island; +package world.bentobox.bentobox.commands.island; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -27,16 +27,16 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.managers.CommandsManager; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.PlayersManager; -import world.bentobox.bbox.managers.island.NewIsland; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.managers.CommandsManager; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.PlayersManager; +import world.bentobox.bentobox.managers.island.NewIsland; /** * @author tastybento @@ -122,7 +122,7 @@ public class IslandResetCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.island.IslandResetCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.island.IslandResetCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. * @throws IOException */ @Test diff --git a/src/test/java/world/bentobox/bbox/commands/island/IslandUnbanCommandTest.java b/src/test/java/world/bentobox/bentobox/commands/island/IslandUnbanCommandTest.java similarity index 92% rename from src/test/java/world/bentobox/bbox/commands/island/IslandUnbanCommandTest.java rename to src/test/java/world/bentobox/bentobox/commands/island/IslandUnbanCommandTest.java index c924cc8aa..4783ae583 100644 --- a/src/test/java/world/bentobox/bbox/commands/island/IslandUnbanCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/commands/island/IslandUnbanCommandTest.java @@ -1,7 +1,7 @@ /** * */ -package world.bentobox.bbox.commands.island; +package world.bentobox.bentobox.commands.island; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -30,16 +30,16 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.localization.TextVariables; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.managers.CommandsManager; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.PlayersManager; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.localization.TextVariables; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.managers.CommandsManager; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.PlayersManager; /** * @author tastybento @@ -118,7 +118,7 @@ public class IslandUnbanCommandTest { } /** - * Test method for {@link world.bentobox.bbox.commands.island.IslandUnbanCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link world.bentobox.bentobox.commands.island.IslandUnbanCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ // Island ban command by itself diff --git a/src/test/java/world/bentobox/bbox/commands/island/team/IslandTeamInviteCommandTest.java b/src/test/java/world/bentobox/bentobox/commands/island/team/IslandTeamInviteCommandTest.java similarity index 88% rename from src/test/java/world/bentobox/bbox/commands/island/team/IslandTeamInviteCommandTest.java rename to src/test/java/world/bentobox/bentobox/commands/island/team/IslandTeamInviteCommandTest.java index 49cff7381..cc503a650 100644 --- a/src/test/java/world/bentobox/bbox/commands/island/team/IslandTeamInviteCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/commands/island/team/IslandTeamInviteCommandTest.java @@ -1,7 +1,7 @@ /** * */ -package world.bentobox.bbox.commands.island.team; +package world.bentobox.bentobox.commands.island.team; import static org.junit.Assert.assertFalse; import static org.mockito.Mockito.mock; @@ -24,15 +24,15 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.managers.CommandsManager; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.LocalesManager; -import world.bentobox.bbox.managers.PlayersManager; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.managers.CommandsManager; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.LocalesManager; +import world.bentobox.bentobox.managers.PlayersManager; /** * @author tastybento @@ -119,7 +119,7 @@ public class IslandTeamInviteCommandTest { } /** - * Test method for {@link IslandTeamInviteCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamInviteCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecuteNoIsland() { @@ -130,7 +130,7 @@ public class IslandTeamInviteCommandTest { } /** - * Test method for {@link IslandTeamInviteCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamInviteCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecuteNotTeamLeader() { @@ -141,7 +141,7 @@ public class IslandTeamInviteCommandTest { } /** - * Test method for {@link IslandTeamInviteCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamInviteCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecuteNoTarget() { @@ -151,7 +151,7 @@ public class IslandTeamInviteCommandTest { } /** - * Test method for {@link IslandTeamInviteCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamInviteCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecuteUnknownPlayer() { @@ -164,7 +164,7 @@ public class IslandTeamInviteCommandTest { /** - * Test method for {@link IslandTeamInviteCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamInviteCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecuteOfflinePlayer() { @@ -179,7 +179,7 @@ public class IslandTeamInviteCommandTest { } /** - * Test method for {@link IslandTeamInviteCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamInviteCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecuteSamePlayer() { @@ -195,7 +195,7 @@ public class IslandTeamInviteCommandTest { /** - * Test method for {@link IslandTeamInviteCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamInviteCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecuteDifferentPlayerInTeam() { diff --git a/src/test/java/world/bentobox/bbox/commands/island/team/IslandTeamKickCommandTest.java b/src/test/java/world/bentobox/bentobox/commands/island/team/IslandTeamKickCommandTest.java similarity index 90% rename from src/test/java/world/bentobox/bbox/commands/island/team/IslandTeamKickCommandTest.java rename to src/test/java/world/bentobox/bentobox/commands/island/team/IslandTeamKickCommandTest.java index 405d036ca..fdc4fba66 100644 --- a/src/test/java/world/bentobox/bbox/commands/island/team/IslandTeamKickCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/commands/island/team/IslandTeamKickCommandTest.java @@ -1,7 +1,7 @@ /** * */ -package world.bentobox.bbox.commands.island.team; +package world.bentobox.bentobox.commands.island.team; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -29,15 +29,15 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.managers.CommandsManager; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.LocalesManager; -import world.bentobox.bbox.managers.PlayersManager; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.managers.CommandsManager; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.LocalesManager; +import world.bentobox.bentobox.managers.PlayersManager; /** * @author tastybento @@ -125,7 +125,7 @@ public class IslandTeamKickCommandTest { } /** - * Test method for {@link IslandTeamKickCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamKickCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecuteNoTeam() { @@ -136,7 +136,7 @@ public class IslandTeamKickCommandTest { } /** - * Test method for {@link IslandTeamKickCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamKickCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecuteNotTeamLeader() { @@ -147,7 +147,7 @@ public class IslandTeamKickCommandTest { } /** - * Test method for {@link IslandTeamKickCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamKickCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecuteNoTarget() { @@ -157,7 +157,7 @@ public class IslandTeamKickCommandTest { } /** - * Test method for {@link IslandTeamKickCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamKickCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecuteUnknownPlayer() { @@ -169,7 +169,7 @@ public class IslandTeamKickCommandTest { } /** - * Test method for {@link IslandTeamKickCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamKickCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecuteSamePlayer() { @@ -182,7 +182,7 @@ public class IslandTeamKickCommandTest { /** - * Test method for {@link IslandTeamKickCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamKickCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecuteDifferentPlayerNotInTeam() { @@ -195,7 +195,7 @@ public class IslandTeamKickCommandTest { } /** - * Test method for {@link IslandTeamKickCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamKickCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecuteNoConfirmation() { @@ -215,7 +215,7 @@ public class IslandTeamKickCommandTest { } /** - * Test method for {@link IslandTeamKickCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamKickCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecuteWithConfirmation() { @@ -235,7 +235,7 @@ public class IslandTeamKickCommandTest { } /** - * Test method for {@link IslandTeamKickCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamKickCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecuteTestResets() { diff --git a/src/test/java/world/bentobox/bbox/commands/island/team/IslandTeamLeaveCommandTest.java b/src/test/java/world/bentobox/bentobox/commands/island/team/IslandTeamLeaveCommandTest.java similarity index 90% rename from src/test/java/world/bentobox/bbox/commands/island/team/IslandTeamLeaveCommandTest.java rename to src/test/java/world/bentobox/bentobox/commands/island/team/IslandTeamLeaveCommandTest.java index ae4435702..dbfdc7baf 100644 --- a/src/test/java/world/bentobox/bbox/commands/island/team/IslandTeamLeaveCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/commands/island/team/IslandTeamLeaveCommandTest.java @@ -1,7 +1,7 @@ /** * */ -package world.bentobox.bbox.commands.island.team; +package world.bentobox.bentobox.commands.island.team; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -26,14 +26,14 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.managers.CommandsManager; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.PlayersManager; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.managers.CommandsManager; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.PlayersManager; /** * @author tastybento @@ -106,7 +106,7 @@ public class IslandTeamLeaveCommandTest { } /** - * Test method for {@link IslandTeamLeaveCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamLeaveCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecuteNoTeam() { @@ -117,7 +117,7 @@ public class IslandTeamLeaveCommandTest { } /** - * Test method for {@link IslandTeamLeaveCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamLeaveCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecuteInTeamLeader() { @@ -127,7 +127,7 @@ public class IslandTeamLeaveCommandTest { } /** - * Test method for {@link IslandTeamLeaveCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamLeaveCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecuteNoConfirmation() { @@ -144,7 +144,7 @@ public class IslandTeamLeaveCommandTest { } /** - * Test method for {@link IslandTeamLeaveCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamLeaveCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecuteWithConfirmation() { @@ -163,7 +163,7 @@ public class IslandTeamLeaveCommandTest { } /** - * Test method for {@link IslandTeamLeaveCommand#execute(world.bentobox.bbox.api.user.User, java.util.List)}. + * Test method for {@link IslandTeamLeaveCommand#execute(world.bentobox.bentobox.api.user.User, java.util.List)}. */ @Test public void testExecuteTestResets() { diff --git a/src/test/java/world/bentobox/bbox/database/mysql/MySQLDatabaseHandlerTest.java b/src/test/java/world/bentobox/bentobox/database/mysql/MySQLDatabaseHandlerTest.java similarity index 92% rename from src/test/java/world/bentobox/bbox/database/mysql/MySQLDatabaseHandlerTest.java rename to src/test/java/world/bentobox/bentobox/database/mysql/MySQLDatabaseHandlerTest.java index b0c86b004..85edee29f 100644 --- a/src/test/java/world/bentobox/bbox/database/mysql/MySQLDatabaseHandlerTest.java +++ b/src/test/java/world/bentobox/bentobox/database/mysql/MySQLDatabaseHandlerTest.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.database.mysql; +package world.bentobox.bentobox.database.mysql; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -29,14 +29,14 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.flags.Flag; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.database.objects.Players; -import world.bentobox.bbox.lists.Flags; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.flags.Flag; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.database.objects.Players; +import world.bentobox.bentobox.lists.Flags; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.util.Util; @RunWith(PowerMockRunner.class) @PrepareForTest( { BentoBox.class, Util.class }) diff --git a/src/test/java/world/bentobox/bbox/database/objects/NamesTest.java b/src/test/java/world/bentobox/bentobox/database/objects/NamesTest.java similarity index 67% rename from src/test/java/world/bentobox/bbox/database/objects/NamesTest.java rename to src/test/java/world/bentobox/bentobox/database/objects/NamesTest.java index fedb8a5a8..5476a41f8 100644 --- a/src/test/java/world/bentobox/bbox/database/objects/NamesTest.java +++ b/src/test/java/world/bentobox/bentobox/database/objects/NamesTest.java @@ -1,7 +1,7 @@ /** * */ -package world.bentobox.bbox.database.objects; +package world.bentobox.bentobox.database.objects; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -11,7 +11,7 @@ import java.util.UUID; import org.junit.Test; -import world.bentobox.bbox.database.objects.Names; +import world.bentobox.bentobox.database.objects.Names; /** * @author tastybento @@ -20,7 +20,7 @@ import world.bentobox.bbox.database.objects.Names; public class NamesTest { /** - * Test method for {@link world.bentobox.bbox.database.objects.Names#Names()}. + * Test method for {@link world.bentobox.bentobox.database.objects.Names#Names()}. */ @Test public void testNames() { @@ -28,7 +28,7 @@ public class NamesTest { } /** - * Test method for {@link world.bentobox.bbox.database.objects.Names#Names(java.lang.String, java.util.UUID)}. + * Test method for {@link world.bentobox.bentobox.database.objects.Names#Names(java.lang.String, java.util.UUID)}. */ @Test public void testNamesStringUUID() { @@ -36,7 +36,7 @@ public class NamesTest { } /** - * Test method for {@link world.bentobox.bbox.database.objects.Names#getUniqueId()}. + * Test method for {@link world.bentobox.bentobox.database.objects.Names#getUniqueId()}. */ @Test public void testGetUniqueId() { @@ -46,7 +46,7 @@ public class NamesTest { assertEquals("random", name.getUniqueId()); } /** - * Test method for {@link world.bentobox.bbox.database.objects.Names#getUuid()}. + * Test method for {@link world.bentobox.bentobox.database.objects.Names#getUuid()}. */ @Test public void testGetUuid() { diff --git a/src/test/java/world/bentobox/bbox/database/objects/PlayersTest.java b/src/test/java/world/bentobox/bentobox/database/objects/PlayersTest.java similarity index 95% rename from src/test/java/world/bentobox/bbox/database/objects/PlayersTest.java rename to src/test/java/world/bentobox/bentobox/database/objects/PlayersTest.java index 5dab2f748..e91403032 100644 --- a/src/test/java/world/bentobox/bbox/database/objects/PlayersTest.java +++ b/src/test/java/world/bentobox/bentobox/database/objects/PlayersTest.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.database.objects; +package world.bentobox.bentobox.database.objects; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; @@ -23,9 +23,9 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.managers.IslandWorldManager; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.managers.IslandWorldManager; @RunWith(PowerMockRunner.class) @PrepareForTest({Bukkit.class, BentoBox.class}) diff --git a/src/test/java/world/bentobox/bbox/listeners/BannedVisitorCommandsTest.java b/src/test/java/world/bentobox/bentobox/listeners/BannedVisitorCommandsTest.java similarity index 94% rename from src/test/java/world/bentobox/bbox/listeners/BannedVisitorCommandsTest.java rename to src/test/java/world/bentobox/bentobox/listeners/BannedVisitorCommandsTest.java index 4588a2ce3..4e04dd307 100644 --- a/src/test/java/world/bentobox/bbox/listeners/BannedVisitorCommandsTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/BannedVisitorCommandsTest.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.listeners; +package world.bentobox.bentobox.listeners; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -29,14 +29,14 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.user.Notifier; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.listeners.BannedVisitorCommands; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.LocalesManager; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.user.Notifier; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.listeners.BannedVisitorCommands; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.LocalesManager; +import world.bentobox.bentobox.util.Util; @RunWith(PowerMockRunner.class) @PrepareForTest({BentoBox.class, Util.class, Bukkit.class }) diff --git a/src/test/java/world/bentobox/bbox/listeners/BlockEndDragonTest.java b/src/test/java/world/bentobox/bentobox/listeners/BlockEndDragonTest.java similarity index 92% rename from src/test/java/world/bentobox/bbox/listeners/BlockEndDragonTest.java rename to src/test/java/world/bentobox/bentobox/listeners/BlockEndDragonTest.java index 70c489f27..65b16f0a3 100644 --- a/src/test/java/world/bentobox/bbox/listeners/BlockEndDragonTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/BlockEndDragonTest.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.listeners; +package world.bentobox.bentobox.listeners; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -16,11 +16,11 @@ import org.mockito.Mockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.listeners.BlockEndDragon; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.listeners.BlockEndDragon; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.util.Util; @RunWith(PowerMockRunner.class) @PrepareForTest({Bukkit.class, BentoBox.class, User.class, Util.class }) diff --git a/src/test/java/world/bentobox/bbox/listeners/NetherPortalsTest.java b/src/test/java/world/bentobox/bentobox/listeners/NetherPortalsTest.java similarity index 89% rename from src/test/java/world/bentobox/bbox/listeners/NetherPortalsTest.java rename to src/test/java/world/bentobox/bentobox/listeners/NetherPortalsTest.java index 7d7d8b5dc..45adc970f 100644 --- a/src/test/java/world/bentobox/bbox/listeners/NetherPortalsTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/NetherPortalsTest.java @@ -1,7 +1,7 @@ /** * */ -package world.bentobox.bbox.listeners; +package world.bentobox.bentobox.listeners; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -44,15 +44,15 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.LocalesManager; -import world.bentobox.bbox.managers.PlayersManager; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.LocalesManager; +import world.bentobox.bentobox.managers.PlayersManager; +import world.bentobox.bentobox.util.Util; /** * @author tastybento @@ -148,7 +148,7 @@ public class NetherPortalsTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.NetherPortals#NetherPortals(world.bentobox.bbox.BentoBox)}. + * Test method for {@link world.bentobox.bentobox.listeners.NetherPortals#NetherPortals(world.bentobox.bentobox.BentoBox)}. */ @Test public void testNetherPortals() { @@ -156,7 +156,7 @@ public class NetherPortalsTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.NetherPortals#onBlockBreak(org.bukkit.event.block.BlockBreakEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.NetherPortals#onBlockBreak(org.bukkit.event.block.BlockBreakEvent)}. */ @Test public void testOnBlockBreakNoAction() { @@ -192,7 +192,7 @@ public class NetherPortalsTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.NetherPortals#onBlockBreak(org.bukkit.event.block.BlockBreakEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.NetherPortals#onBlockBreak(org.bukkit.event.block.BlockBreakEvent)}. */ @Test public void testOnBlockBreakActionAwayFromSpawn() { @@ -213,7 +213,7 @@ public class NetherPortalsTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.NetherPortals#onBlockBreak(org.bukkit.event.block.BlockBreakEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.NetherPortals#onBlockBreak(org.bukkit.event.block.BlockBreakEvent)}. */ @Test public void testOnBlockBreakActionAtSpawn() { @@ -235,7 +235,7 @@ public class NetherPortalsTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.NetherPortals#onBucketEmpty(org.bukkit.event.player.PlayerBucketEmptyEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.NetherPortals#onBucketEmpty(org.bukkit.event.player.PlayerBucketEmptyEvent)}. */ @Test public void testOnBucketEmpty() { @@ -257,7 +257,7 @@ public class NetherPortalsTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.NetherPortals#onEndIslandPortal(org.bukkit.event.player.PlayerPortalEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.NetherPortals#onEndIslandPortal(org.bukkit.event.player.PlayerPortalEvent)}. */ @Test public void testOnEndIslandPortalNotEnd() { @@ -269,7 +269,7 @@ public class NetherPortalsTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.NetherPortals#onEndIslandPortal(org.bukkit.event.player.PlayerPortalEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.NetherPortals#onEndIslandPortal(org.bukkit.event.player.PlayerPortalEvent)}. */ @Test public void testOnEndIslandPortalWrongWorld() { @@ -286,7 +286,7 @@ public class NetherPortalsTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.NetherPortals#onEndIslandPortal(org.bukkit.event.player.PlayerPortalEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.NetherPortals#onEndIslandPortal(org.bukkit.event.player.PlayerPortalEvent)}. */ @Test public void testOnEndIslandPortalHome() { @@ -312,7 +312,7 @@ public class NetherPortalsTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.NetherPortals#onEntityPortal(org.bukkit.event.entity.EntityPortalEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.NetherPortals#onEntityPortal(org.bukkit.event.entity.EntityPortalEvent)}. */ @Test public void testOnEntityPortal() { @@ -333,7 +333,7 @@ public class NetherPortalsTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.NetherPortals#onExplosion(org.bukkit.event.entity.EntityExplodeEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.NetherPortals#onExplosion(org.bukkit.event.entity.EntityExplodeEvent)}. */ @Test public void testOnExplosionNotInWorld() { @@ -497,7 +497,7 @@ public class NetherPortalsTest { /** - * Test method for {@link world.bentobox.bbox.listeners.NetherPortals#onNetherPortal(org.bukkit.event.player.PlayerPortalEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.NetherPortals#onNetherPortal(org.bukkit.event.player.PlayerPortalEvent)}. */ @Test public void testOnNetherPortalNotPortal() { @@ -507,7 +507,7 @@ public class NetherPortalsTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.NetherPortals#onNetherPortal(org.bukkit.event.player.PlayerPortalEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.NetherPortals#onNetherPortal(org.bukkit.event.player.PlayerPortalEvent)}. */ @Test public void testOnNetherPortalWrongWorld() { @@ -520,7 +520,7 @@ public class NetherPortalsTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.NetherPortals#onNetherPortal(org.bukkit.event.player.PlayerPortalEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.NetherPortals#onNetherPortal(org.bukkit.event.player.PlayerPortalEvent)}. */ @Test public void testOnNetherPortalFromWorldToNetherIsland() { @@ -543,7 +543,7 @@ public class NetherPortalsTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.NetherPortals#onNetherPortal(org.bukkit.event.player.PlayerPortalEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.NetherPortals#onNetherPortal(org.bukkit.event.player.PlayerPortalEvent)}. */ @Test public void testOnNetherPortalFromWorldToNetherIslandWithSpawnDefined() { @@ -575,7 +575,7 @@ public class NetherPortalsTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.NetherPortals#onNetherPortal(org.bukkit.event.player.PlayerPortalEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.NetherPortals#onNetherPortal(org.bukkit.event.player.PlayerPortalEvent)}. */ @Test public void testOnNetherPortalFromWorldToNetherIslandWithNoSpawnDefined() { @@ -606,7 +606,7 @@ public class NetherPortalsTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.NetherPortals#onNetherPortal(org.bukkit.event.player.PlayerPortalEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.NetherPortals#onNetherPortal(org.bukkit.event.player.PlayerPortalEvent)}. */ @Test public void testOnNetherPortalFromWorldToNetherStandard() { @@ -628,7 +628,7 @@ public class NetherPortalsTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.NetherPortals#onNetherPortal(org.bukkit.event.player.PlayerPortalEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.NetherPortals#onNetherPortal(org.bukkit.event.player.PlayerPortalEvent)}. * @throws Exception */ @Test @@ -656,7 +656,7 @@ public class NetherPortalsTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.NetherPortals#onNetherPortal(org.bukkit.event.player.PlayerPortalEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.NetherPortals#onNetherPortal(org.bukkit.event.player.PlayerPortalEvent)}. */ @Test public void testOnNetherPortalFromNetherIsland() { @@ -678,7 +678,7 @@ public class NetherPortalsTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.NetherPortals#onPlayerBlockPlace(org.bukkit.event.block.BlockPlaceEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.NetherPortals#onPlayerBlockPlace(org.bukkit.event.block.BlockPlaceEvent)}. */ @Test public void testOnPlayerBlockPlace() { @@ -700,7 +700,7 @@ public class NetherPortalsTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.NetherPortals#onTreeGrow(org.bukkit.event.world.StructureGrowEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.NetherPortals#onTreeGrow(org.bukkit.event.world.StructureGrowEvent)}. */ @Test public void testOnTreeGrow() { diff --git a/src/test/java/world/bentobox/bbox/listeners/ObsidianToLavaTest.java b/src/test/java/world/bentobox/bentobox/listeners/ObsidianToLavaTest.java similarity index 95% rename from src/test/java/world/bentobox/bbox/listeners/ObsidianToLavaTest.java rename to src/test/java/world/bentobox/bentobox/listeners/ObsidianToLavaTest.java index ce8a98cdc..2c547327a 100644 --- a/src/test/java/world/bentobox/bbox/listeners/ObsidianToLavaTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/ObsidianToLavaTest.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.listeners; +package world.bentobox.bentobox.listeners; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -30,12 +30,12 @@ import org.mockito.Mockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.LocalesManager; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.LocalesManager; @RunWith(PowerMockRunner.class) @PrepareForTest({PlayerEvent.class, PlayerInteractEvent.class}) diff --git a/src/test/java/world/bentobox/bbox/listeners/PanelListenerManagerTest.java b/src/test/java/world/bentobox/bentobox/listeners/PanelListenerManagerTest.java similarity index 80% rename from src/test/java/world/bentobox/bbox/listeners/PanelListenerManagerTest.java rename to src/test/java/world/bentobox/bentobox/listeners/PanelListenerManagerTest.java index cbb429e39..5c95dbf3b 100644 --- a/src/test/java/world/bentobox/bbox/listeners/PanelListenerManagerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/PanelListenerManagerTest.java @@ -1,7 +1,7 @@ /** * */ -package world.bentobox.bbox.listeners; +package world.bentobox.bentobox.listeners; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -32,15 +32,15 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.panels.Panel; -import world.bentobox.bbox.api.panels.PanelItem; -import world.bentobox.bbox.api.panels.PanelListener; -import world.bentobox.bbox.api.panels.PanelItem.ClickHandler; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.listeners.PanelListenerManager; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.panels.Panel; +import world.bentobox.bentobox.api.panels.PanelItem; +import world.bentobox.bentobox.api.panels.PanelListener; +import world.bentobox.bentobox.api.panels.PanelItem.ClickHandler; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.listeners.PanelListenerManager; +import world.bentobox.bentobox.util.Util; /** * Test class for PanelListenerManager.java @@ -121,7 +121,7 @@ public class PanelListenerManagerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.PanelListenerManager#onInventoryClick(org.bukkit.event.inventory.InventoryClickEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.PanelListenerManager#onInventoryClick(org.bukkit.event.inventory.InventoryClickEvent)}. */ @Test public void testOnInventoryClickOutside() { @@ -132,7 +132,7 @@ public class PanelListenerManagerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.PanelListenerManager#onInventoryClick(org.bukkit.event.inventory.InventoryClickEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.PanelListenerManager#onInventoryClick(org.bukkit.event.inventory.InventoryClickEvent)}. */ @Test public void testOnInventoryClickNoOpenPanels() { @@ -143,7 +143,7 @@ public class PanelListenerManagerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.PanelListenerManager#onInventoryClick(org.bukkit.event.inventory.InventoryClickEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.PanelListenerManager#onInventoryClick(org.bukkit.event.inventory.InventoryClickEvent)}. */ @Test public void testOnInventoryClickOpenPanelsWrongPanel() { @@ -156,7 +156,7 @@ public class PanelListenerManagerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.PanelListenerManager#onInventoryClick(org.bukkit.event.inventory.InventoryClickEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.PanelListenerManager#onInventoryClick(org.bukkit.event.inventory.InventoryClickEvent)}. */ @Test public void testOnInventoryClickOpenPanelsRightPanelWrongSlot() { @@ -169,7 +169,7 @@ public class PanelListenerManagerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.PanelListenerManager#onInventoryClick(org.bukkit.event.inventory.InventoryClickEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.PanelListenerManager#onInventoryClick(org.bukkit.event.inventory.InventoryClickEvent)}. */ @Test public void testOnInventoryClickOpenPanelsRightPanelRightSlot() { @@ -183,7 +183,7 @@ public class PanelListenerManagerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.PanelListenerManager#onInventoryClose(org.bukkit.event.inventory.InventoryCloseEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.PanelListenerManager#onInventoryClose(org.bukkit.event.inventory.InventoryCloseEvent)}. */ @Test public void testOnInventoryCloseNoPanels() { @@ -196,7 +196,7 @@ public class PanelListenerManagerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.PanelListenerManager#onInventoryClose(org.bukkit.event.inventory.InventoryCloseEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.PanelListenerManager#onInventoryClose(org.bukkit.event.inventory.InventoryCloseEvent)}. */ @Test public void testOnInventoryClosePanels() { @@ -210,7 +210,7 @@ public class PanelListenerManagerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.PanelListenerManager#onLogOut(org.bukkit.event.player.PlayerQuitEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.PanelListenerManager#onLogOut(org.bukkit.event.player.PlayerQuitEvent)}. */ @Test public void testOnLogOut() { @@ -231,7 +231,7 @@ public class PanelListenerManagerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.PanelListenerManager#getOpenPanels()}. + * Test method for {@link world.bentobox.bentobox.listeners.PanelListenerManager#getOpenPanels()}. */ @Test public void testGetOpenPanels() { diff --git a/src/test/java/world/bentobox/bbox/listeners/flags/ChestDamageListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/ChestDamageListenerTest.java similarity index 89% rename from src/test/java/world/bentobox/bbox/listeners/flags/ChestDamageListenerTest.java rename to src/test/java/world/bentobox/bentobox/listeners/flags/ChestDamageListenerTest.java index 39a1e6c37..9c751eb84 100644 --- a/src/test/java/world/bentobox/bbox/listeners/flags/ChestDamageListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/ChestDamageListenerTest.java @@ -1,7 +1,7 @@ /** * */ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -46,18 +46,18 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.configuration.WorldSettings; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.lists.Flags; -import world.bentobox.bbox.managers.FlagsManager; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.LocalesManager; -import world.bentobox.bbox.managers.PlayersManager; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.configuration.WorldSettings; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.lists.Flags; +import world.bentobox.bentobox.managers.FlagsManager; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.LocalesManager; +import world.bentobox.bentobox.managers.PlayersManager; +import world.bentobox.bentobox.util.Util; /** * @author tastybento @@ -173,7 +173,7 @@ public class ChestDamageListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.ChestDamageListener#onExplosion(org.bukkit.event.entity.EntityExplodeEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.ChestDamageListener#onExplosion(org.bukkit.event.entity.EntityExplodeEvent)}. */ @Test public void testOnExplosionChestDamageNotAllowed() { @@ -205,7 +205,7 @@ public class ChestDamageListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.ChestDamageListener#onExplosion(org.bukkit.event.entity.EntityExplodeEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.ChestDamageListener#onExplosion(org.bukkit.event.entity.EntityExplodeEvent)}. */ @Test public void testOnExplosionChestDamageAllowed() { diff --git a/src/test/java/world/bentobox/bbox/listeners/flags/CleanSuperFlatListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/CleanSuperFlatListenerTest.java similarity index 83% rename from src/test/java/world/bentobox/bbox/listeners/flags/CleanSuperFlatListenerTest.java rename to src/test/java/world/bentobox/bentobox/listeners/flags/CleanSuperFlatListenerTest.java index 800659d3a..245890365 100644 --- a/src/test/java/world/bentobox/bbox/listeners/flags/CleanSuperFlatListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/CleanSuperFlatListenerTest.java @@ -1,7 +1,7 @@ /** * */ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -26,12 +26,12 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.configuration.WorldSettings; -import world.bentobox.bbox.listeners.flags.CleanSuperFlatListener; -import world.bentobox.bbox.lists.Flags; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.configuration.WorldSettings; +import world.bentobox.bentobox.listeners.flags.CleanSuperFlatListener; +import world.bentobox.bentobox.lists.Flags; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.util.Util; /** * @author tastybento @@ -96,7 +96,7 @@ public class CleanSuperFlatListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.CleanSuperFlatListener#onChunkLoad(org.bukkit.event.world.ChunkLoadEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.CleanSuperFlatListener#onChunkLoad(org.bukkit.event.world.ChunkLoadEvent)}. */ @Test public void testOnChunkLoadNotBedrockNoFlsg() { @@ -109,7 +109,7 @@ public class CleanSuperFlatListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.CleanSuperFlatListener#onChunkLoad(org.bukkit.event.world.ChunkLoadEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.CleanSuperFlatListener#onChunkLoad(org.bukkit.event.world.ChunkLoadEvent)}. */ @Test public void testOnChunkLoadBedrock() { @@ -119,7 +119,7 @@ public class CleanSuperFlatListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.CleanSuperFlatListener#onChunkLoad(org.bukkit.event.world.ChunkLoadEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.CleanSuperFlatListener#onChunkLoad(org.bukkit.event.world.ChunkLoadEvent)}. */ @Test public void testOnChunkLoadBedrockNoClean() { @@ -131,7 +131,7 @@ public class CleanSuperFlatListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.CleanSuperFlatListener#onChunkLoad(org.bukkit.event.world.ChunkLoadEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.CleanSuperFlatListener#onChunkLoad(org.bukkit.event.world.ChunkLoadEvent)}. */ @Test public void testOnChunkLoadBedrockNether() { @@ -150,7 +150,7 @@ public class CleanSuperFlatListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.CleanSuperFlatListener#onChunkLoad(org.bukkit.event.world.ChunkLoadEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.CleanSuperFlatListener#onChunkLoad(org.bukkit.event.world.ChunkLoadEvent)}. */ @Test public void testOnChunkLoadBedrockEnd() { diff --git a/src/test/java/world/bentobox/bbox/listeners/flags/EnderChestListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/EnderChestListenerTest.java similarity index 94% rename from src/test/java/world/bentobox/bbox/listeners/flags/EnderChestListenerTest.java rename to src/test/java/world/bentobox/bentobox/listeners/flags/EnderChestListenerTest.java index 95dcca9d6..d88f4aa17 100644 --- a/src/test/java/world/bentobox/bbox/listeners/flags/EnderChestListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/EnderChestListenerTest.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -38,16 +38,16 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.configuration.WorldSettings; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.listeners.flags.EnderChestListener; -import world.bentobox.bbox.lists.Flags; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.LocalesManager; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.configuration.WorldSettings; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.listeners.flags.EnderChestListener; +import world.bentobox.bentobox.lists.Flags; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.LocalesManager; +import world.bentobox.bentobox.util.Util; @RunWith(PowerMockRunner.class) @PrepareForTest({BentoBox.class, Util.class, User.class }) diff --git a/src/test/java/world/bentobox/bbox/listeners/flags/EndermanListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/EndermanListenerTest.java similarity index 82% rename from src/test/java/world/bentobox/bbox/listeners/flags/EndermanListenerTest.java rename to src/test/java/world/bentobox/bentobox/listeners/flags/EndermanListenerTest.java index e6711966d..a4be9d1da 100644 --- a/src/test/java/world/bentobox/bbox/listeners/flags/EndermanListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/EndermanListenerTest.java @@ -1,7 +1,7 @@ /** * */ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -40,15 +40,15 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.configuration.WorldSettings; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.lists.Flags; -import world.bentobox.bbox.managers.FlagsManager; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.configuration.WorldSettings; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.lists.Flags; +import world.bentobox.bentobox.managers.FlagsManager; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.util.Util; /** * Tests enderman related listeners @@ -145,7 +145,7 @@ public class EndermanListenerTest { /** - * Test method for {@link world.bentobox.bbox.listeners.flags.EndermanListener#onEndermanGrief(org.bukkit.event.entity.EntityChangeBlockEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.EndermanListener#onEndermanGrief(org.bukkit.event.entity.EntityChangeBlockEvent)}. */ @Test public void testNotEnderman() { @@ -160,7 +160,7 @@ public class EndermanListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.EndermanListener#onEndermanGrief(org.bukkit.event.entity.EntityChangeBlockEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.EndermanListener#onEndermanGrief(org.bukkit.event.entity.EntityChangeBlockEvent)}. */ @Test public void testOnEndermanGriefWrongWorld() { @@ -176,7 +176,7 @@ public class EndermanListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.EndermanListener#onEndermanGrief(org.bukkit.event.entity.EntityChangeBlockEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.EndermanListener#onEndermanGrief(org.bukkit.event.entity.EntityChangeBlockEvent)}. */ @Test public void testOnEndermanGriefAllowed() { @@ -192,7 +192,7 @@ public class EndermanListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.EndermanListener#onEndermanGrief(org.bukkit.event.entity.EntityChangeBlockEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.EndermanListener#onEndermanGrief(org.bukkit.event.entity.EntityChangeBlockEvent)}. */ @Test public void testOnEndermanGrief() { @@ -207,7 +207,7 @@ public class EndermanListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.EndermanListener#onEndermanDeath(org.bukkit.event.entity.EntityDeathEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.EndermanListener#onEndermanDeath(org.bukkit.event.entity.EntityDeathEvent)}. */ @Test public void testOnNotEndermanDeath() { @@ -219,7 +219,7 @@ public class EndermanListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.EndermanListener#onEndermanDeath(org.bukkit.event.entity.EntityDeathEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.EndermanListener#onEndermanDeath(org.bukkit.event.entity.EntityDeathEvent)}. */ @Test public void testOnEndermanDeathCarryAir() { @@ -231,7 +231,7 @@ public class EndermanListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.EndermanListener#onEndermanDeath(org.bukkit.event.entity.EntityDeathEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.EndermanListener#onEndermanDeath(org.bukkit.event.entity.EntityDeathEvent)}. */ @Test public void testOnEndermanDeathNotInWorld() { @@ -244,7 +244,7 @@ public class EndermanListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.EndermanListener#onEndermanDeath(org.bukkit.event.entity.EntityDeathEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.EndermanListener#onEndermanDeath(org.bukkit.event.entity.EntityDeathEvent)}. */ @Test public void testOnEndermanDeathNoFlag() { @@ -257,7 +257,7 @@ public class EndermanListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.EndermanListener#onEndermanDeath(org.bukkit.event.entity.EntityDeathEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.EndermanListener#onEndermanDeath(org.bukkit.event.entity.EntityDeathEvent)}. */ @Test public void testOnEndermanDeath() { diff --git a/src/test/java/world/bentobox/bbox/listeners/flags/EnterExitListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/EnterExitListenerTest.java similarity index 84% rename from src/test/java/world/bentobox/bbox/listeners/flags/EnterExitListenerTest.java rename to src/test/java/world/bentobox/bentobox/listeners/flags/EnterExitListenerTest.java index 595bf94ec..2ee3502ce 100644 --- a/src/test/java/world/bentobox/bbox/listeners/flags/EnterExitListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/EnterExitListenerTest.java @@ -1,7 +1,7 @@ /** * */ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; @@ -27,18 +27,18 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.configuration.WorldSettings; -import world.bentobox.bbox.api.user.Notifier; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.listeners.flags.EnterExitListener; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.LocalesManager; -import world.bentobox.bbox.managers.PlayersManager; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.configuration.WorldSettings; +import world.bentobox.bentobox.api.user.Notifier; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.listeners.flags.EnterExitListener; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.LocalesManager; +import world.bentobox.bentobox.managers.PlayersManager; +import world.bentobox.bentobox.util.Util; /** * @author tastybento @@ -168,7 +168,7 @@ public class EnterExitListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.EnterExitListener#onMove(org.bukkit.event.player.PlayerMoveEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.EnterExitListener#onMove(org.bukkit.event.player.PlayerMoveEvent)}. */ @Test public void testOnMoveInsideIsland() { @@ -179,7 +179,7 @@ public class EnterExitListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.EnterExitListener#onMove(org.bukkit.event.player.PlayerMoveEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.EnterExitListener#onMove(org.bukkit.event.player.PlayerMoveEvent)}. */ @Test public void testOnMoveOutsideIsland() { @@ -190,7 +190,7 @@ public class EnterExitListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.EnterExitListener#onMove(org.bukkit.event.player.PlayerMoveEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.EnterExitListener#onMove(org.bukkit.event.player.PlayerMoveEvent)}. */ @Test public void testOnGoingIntoIslandEmptyIslandName() { @@ -204,7 +204,7 @@ public class EnterExitListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.EnterExitListener#onMove(org.bukkit.event.player.PlayerMoveEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.EnterExitListener#onMove(org.bukkit.event.player.PlayerMoveEvent)}. */ @Test public void testOnGoingIntoIslandWithIslandName() { @@ -219,7 +219,7 @@ public class EnterExitListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.EnterExitListener#onMove(org.bukkit.event.player.PlayerMoveEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.EnterExitListener#onMove(org.bukkit.event.player.PlayerMoveEvent)}. */ @Test public void testExitingIslandEmptyIslandName() { @@ -233,7 +233,7 @@ public class EnterExitListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.EnterExitListener#onMove(org.bukkit.event.player.PlayerMoveEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.EnterExitListener#onMove(org.bukkit.event.player.PlayerMoveEvent)}. */ @Test public void testExitingIslandWithIslandName() { diff --git a/src/test/java/world/bentobox/bbox/listeners/flags/FireListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/FireListenerTest.java similarity index 94% rename from src/test/java/world/bentobox/bbox/listeners/flags/FireListenerTest.java rename to src/test/java/world/bentobox/bentobox/listeners/flags/FireListenerTest.java index 6e9013a9e..375bd6d71 100644 --- a/src/test/java/world/bentobox/bbox/listeners/flags/FireListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/FireListenerTest.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -38,18 +38,18 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.configuration.WorldSettings; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.lists.Flags; -import world.bentobox.bbox.managers.FlagsManager; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.LocalesManager; -import world.bentobox.bbox.managers.PlayersManager; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.configuration.WorldSettings; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.lists.Flags; +import world.bentobox.bentobox.managers.FlagsManager; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.LocalesManager; +import world.bentobox.bentobox.managers.PlayersManager; +import world.bentobox.bentobox.util.Util; @RunWith(PowerMockRunner.class) @PrepareForTest( {BentoBox.class, Flags.class, Util.class} ) diff --git a/src/test/java/world/bentobox/bbox/listeners/flags/InvincibleVisitorsListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/InvincibleVisitorsListenerTest.java similarity index 93% rename from src/test/java/world/bentobox/bbox/listeners/flags/InvincibleVisitorsListenerTest.java rename to src/test/java/world/bentobox/bentobox/listeners/flags/InvincibleVisitorsListenerTest.java index f192ad9be..52e06e77f 100644 --- a/src/test/java/world/bentobox/bbox/listeners/flags/InvincibleVisitorsListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/InvincibleVisitorsListenerTest.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -31,17 +31,17 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.flags.Flag; -import world.bentobox.bbox.api.panels.Panel; -import world.bentobox.bbox.api.panels.PanelItem; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.listeners.flags.InvincibleVisitorsListener; -import world.bentobox.bbox.managers.FlagsManager; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.flags.Flag; +import world.bentobox.bentobox.api.panels.Panel; +import world.bentobox.bentobox.api.panels.PanelItem; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.listeners.flags.InvincibleVisitorsListener; +import world.bentobox.bentobox.managers.FlagsManager; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.util.Util; @RunWith(PowerMockRunner.class) @PrepareForTest({BentoBox.class, Util.class, Bukkit.class }) diff --git a/src/test/java/world/bentobox/bbox/listeners/flags/IslandRespawnListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/IslandRespawnListenerTest.java similarity index 82% rename from src/test/java/world/bentobox/bbox/listeners/flags/IslandRespawnListenerTest.java rename to src/test/java/world/bentobox/bentobox/listeners/flags/IslandRespawnListenerTest.java index 952e57768..39c7916cb 100644 --- a/src/test/java/world/bentobox/bbox/listeners/flags/IslandRespawnListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/IslandRespawnListenerTest.java @@ -1,7 +1,7 @@ /** * */ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; @@ -28,15 +28,15 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.configuration.WorldSettings; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.listeners.flags.IslandRespawnListener; -import world.bentobox.bbox.lists.Flags; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.configuration.WorldSettings; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.listeners.flags.IslandRespawnListener; +import world.bentobox.bentobox.lists.Flags; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.util.Util; /** * @author tastybento @@ -102,7 +102,7 @@ public class IslandRespawnListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.IslandRespawnListener#onPlayerDeath(org.bukkit.event.entity.PlayerDeathEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.IslandRespawnListener#onPlayerDeath(org.bukkit.event.entity.PlayerDeathEvent)}. */ @Test public void testOnPlayerDeath() { @@ -112,7 +112,7 @@ public class IslandRespawnListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.IslandRespawnListener#onPlayerRespawn(org.bukkit.event.player.PlayerRespawnEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.IslandRespawnListener#onPlayerRespawn(org.bukkit.event.player.PlayerRespawnEvent)}. */ @Test public void testOnPlayerRespawn() { @@ -132,7 +132,7 @@ public class IslandRespawnListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.IslandRespawnListener#onPlayerRespawn(org.bukkit.event.player.PlayerRespawnEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.IslandRespawnListener#onPlayerRespawn(org.bukkit.event.player.PlayerRespawnEvent)}. */ @Test public void testOnPlayerRespawnWithoutDeath() { @@ -149,7 +149,7 @@ public class IslandRespawnListenerTest { /** - * Test method for {@link world.bentobox.bbox.listeners.flags.IslandRespawnListener#onPlayerRespawn(org.bukkit.event.player.PlayerRespawnEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.IslandRespawnListener#onPlayerRespawn(org.bukkit.event.player.PlayerRespawnEvent)}. */ @Test public void testOnPlayerRespawnWrongWorld() { @@ -170,7 +170,7 @@ public class IslandRespawnListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.IslandRespawnListener#onPlayerRespawn(org.bukkit.event.player.PlayerRespawnEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.IslandRespawnListener#onPlayerRespawn(org.bukkit.event.player.PlayerRespawnEvent)}. */ @Test public void testOnPlayerRespawnFlagNotSet() { diff --git a/src/test/java/world/bentobox/bbox/listeners/flags/ItemFrameListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/ItemFrameListenerTest.java similarity index 84% rename from src/test/java/world/bentobox/bbox/listeners/flags/ItemFrameListenerTest.java rename to src/test/java/world/bentobox/bentobox/listeners/flags/ItemFrameListenerTest.java index 200e17c4f..9f1954592 100644 --- a/src/test/java/world/bentobox/bbox/listeners/flags/ItemFrameListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/ItemFrameListenerTest.java @@ -1,7 +1,7 @@ /** * */ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -44,15 +44,15 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.configuration.WorldSettings; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.lists.Flags; -import world.bentobox.bbox.managers.FlagsManager; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.configuration.WorldSettings; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.lists.Flags; +import world.bentobox.bentobox.managers.FlagsManager; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.util.Util; /** * @author tastybento @@ -145,7 +145,7 @@ public class ItemFrameListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.ItemFrameListener#onItemFrameDamage(org.bukkit.event.entity.EntityDamageByEntityEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.ItemFrameListener#onItemFrameDamage(org.bukkit.event.entity.EntityDamageByEntityEvent)}. */ @Test public void testOnItemFrameDamageEntityDamageByEntityEvent() { @@ -159,7 +159,7 @@ public class ItemFrameListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.ItemFrameListener#onItemFrameDamage(org.bukkit.event.entity.EntityDamageByEntityEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.ItemFrameListener#onItemFrameDamage(org.bukkit.event.entity.EntityDamageByEntityEvent)}. */ @Test public void testNotItemFrame() { @@ -173,7 +173,7 @@ public class ItemFrameListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.ItemFrameListener#onItemFrameDamage(org.bukkit.event.entity.EntityDamageByEntityEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.ItemFrameListener#onItemFrameDamage(org.bukkit.event.entity.EntityDamageByEntityEvent)}. */ @Test public void testProjectile() { @@ -189,7 +189,7 @@ public class ItemFrameListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.ItemFrameListener#onItemFrameDamage(org.bukkit.event.entity.EntityDamageByEntityEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.ItemFrameListener#onItemFrameDamage(org.bukkit.event.entity.EntityDamageByEntityEvent)}. */ @Test public void testPlayerProjectile() { @@ -206,7 +206,7 @@ public class ItemFrameListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.ItemFrameListener#onItemFrameDamage(org.bukkit.event.hanging.HangingBreakByEntityEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.ItemFrameListener#onItemFrameDamage(org.bukkit.event.hanging.HangingBreakByEntityEvent)}. */ @Test public void testOnItemFrameDamageHangingBreakByEntityEvent() { diff --git a/src/test/java/world/bentobox/bbox/listeners/flags/LockAndBanListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/LockAndBanListenerTest.java similarity index 97% rename from src/test/java/world/bentobox/bbox/listeners/flags/LockAndBanListenerTest.java rename to src/test/java/world/bentobox/bentobox/listeners/flags/LockAndBanListenerTest.java index 07181cb6e..a3fdd9b81 100644 --- a/src/test/java/world/bentobox/bbox/listeners/flags/LockAndBanListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/LockAndBanListenerTest.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -34,17 +34,17 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.user.Notifier; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.listeners.flags.LockAndBanListener; -import world.bentobox.bbox.lists.Flags; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.LocalesManager; -import world.bentobox.bbox.managers.PlayersManager; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.user.Notifier; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.listeners.flags.LockAndBanListener; +import world.bentobox.bentobox.lists.Flags; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.LocalesManager; +import world.bentobox.bentobox.managers.PlayersManager; @RunWith(PowerMockRunner.class) @PrepareForTest({Bukkit.class, BentoBox.class, User.class }) diff --git a/src/test/java/world/bentobox/bbox/listeners/flags/MobSpawnListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/MobSpawnListenerTest.java similarity index 95% rename from src/test/java/world/bentobox/bbox/listeners/flags/MobSpawnListenerTest.java rename to src/test/java/world/bentobox/bentobox/listeners/flags/MobSpawnListenerTest.java index d835c2dc5..b9b89c4e1 100644 --- a/src/test/java/world/bentobox/bbox/listeners/flags/MobSpawnListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/MobSpawnListenerTest.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -35,14 +35,14 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.configuration.WorldSettings; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.lists.Flags; -import world.bentobox.bbox.managers.FlagsManager; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.configuration.WorldSettings; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.lists.Flags; +import world.bentobox.bentobox.managers.FlagsManager; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.util.Util; @RunWith(PowerMockRunner.class) @PrepareForTest( {BentoBox.class, Flags.class, Util.class }) diff --git a/src/test/java/world/bentobox/bbox/listeners/flags/OfflineRedstoneListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/OfflineRedstoneListenerTest.java similarity index 91% rename from src/test/java/world/bentobox/bbox/listeners/flags/OfflineRedstoneListenerTest.java rename to src/test/java/world/bentobox/bentobox/listeners/flags/OfflineRedstoneListenerTest.java index a7e0f369e..b76064144 100644 --- a/src/test/java/world/bentobox/bbox/listeners/flags/OfflineRedstoneListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/OfflineRedstoneListenerTest.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; @@ -27,14 +27,14 @@ import org.powermock.reflect.Whitebox; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet.Builder; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.configuration.WorldSettings; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.listeners.flags.OfflineRedstoneListener; -import world.bentobox.bbox.lists.Flags; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.configuration.WorldSettings; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.listeners.flags.OfflineRedstoneListener; +import world.bentobox.bentobox.lists.Flags; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.util.Util; @RunWith(PowerMockRunner.class) @PrepareForTest({BentoBox.class, Util.class, Bukkit.class }) public class OfflineRedstoneListenerTest { diff --git a/src/test/java/world/bentobox/bbox/listeners/flags/PVPListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/PVPListenerTest.java similarity index 88% rename from src/test/java/world/bentobox/bbox/listeners/flags/PVPListenerTest.java rename to src/test/java/world/bentobox/bentobox/listeners/flags/PVPListenerTest.java index 476a76a16..c5b1c83cd 100644 --- a/src/test/java/world/bentobox/bbox/listeners/flags/PVPListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/PVPListenerTest.java @@ -1,7 +1,7 @@ /** * */ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -59,21 +59,21 @@ import com.google.common.base.Function; import com.google.common.base.Functions; import com.google.common.collect.ImmutableMap; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.configuration.WorldSettings; -import world.bentobox.bbox.api.flags.Flag; -import world.bentobox.bbox.api.panels.Panel; -import world.bentobox.bbox.api.panels.PanelItem; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.listeners.flags.PVPListener; -import world.bentobox.bbox.lists.Flags; -import world.bentobox.bbox.managers.FlagsManager; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.LocalesManager; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.configuration.WorldSettings; +import world.bentobox.bentobox.api.flags.Flag; +import world.bentobox.bentobox.api.panels.Panel; +import world.bentobox.bentobox.api.panels.PanelItem; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.listeners.flags.PVPListener; +import world.bentobox.bentobox.lists.Flags; +import world.bentobox.bentobox.managers.FlagsManager; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.LocalesManager; +import world.bentobox.bentobox.util.Util; /** * @author tastybento @@ -197,7 +197,7 @@ public class PVPListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.PVPListener#onEntityDamage(org.bukkit.event.entity.EntityDamageByEntityEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.PVPListener#onEntityDamage(org.bukkit.event.entity.EntityDamageByEntityEvent)}. */ @Test public void testOnEntityDamageNotPlayer() { @@ -211,7 +211,7 @@ public class PVPListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.PVPListener#onEntityDamage(org.bukkit.event.entity.EntityDamageByEntityEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.PVPListener#onEntityDamage(org.bukkit.event.entity.EntityDamageByEntityEvent)}. */ @Test public void testOnEntityDamageSelfDamage() { @@ -224,7 +224,7 @@ public class PVPListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.PVPListener#onEntityDamage(org.bukkit.event.entity.EntityDamageByEntityEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.PVPListener#onEntityDamage(org.bukkit.event.entity.EntityDamageByEntityEvent)}. */ @Test public void testOnEntityDamageOnPlayerByZombie() { @@ -258,7 +258,7 @@ public class PVPListenerTest { /** - * Test method for {@link world.bentobox.bbox.listeners.flags.PVPListener#onEntityDamage(org.bukkit.event.entity.EntityDamageByEntityEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.PVPListener#onEntityDamage(org.bukkit.event.entity.EntityDamageByEntityEvent)}. */ @Test public void testOnEntityDamageOnPlayerByZombieVisitorProtected() { @@ -290,7 +290,7 @@ public class PVPListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.PVPListener#onEntityDamage(org.bukkit.event.entity.EntityDamageByEntityEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.PVPListener#onEntityDamage(org.bukkit.event.entity.EntityDamageByEntityEvent)}. */ @Test public void testOnEntityDamageOnVisitorByZombieVisitorProtected() { @@ -323,7 +323,7 @@ public class PVPListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.PVPListener#onEntityDamage(org.bukkit.event.entity.EntityDamageByEntityEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.PVPListener#onEntityDamage(org.bukkit.event.entity.EntityDamageByEntityEvent)}. */ @Test public void testOnEntityDamageOnVisitorByZombieVisitorProtectedWrongDamage() { @@ -353,7 +353,7 @@ public class PVPListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.PVPListener#onEntityDamage(org.bukkit.event.entity.EntityDamageByEntityEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.PVPListener#onEntityDamage(org.bukkit.event.entity.EntityDamageByEntityEvent)}. */ @Test public void testOnEntityDamageOnVisitorByZombieVisitorNotProtected() { @@ -393,7 +393,7 @@ public class PVPListenerTest { /** - * Test method for {@link world.bentobox.bbox.listeners.flags.PVPListener#onEntityDamage(org.bukkit.event.entity.EntityDamageByEntityEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.PVPListener#onEntityDamage(org.bukkit.event.entity.EntityDamageByEntityEvent)}. */ @Test public void testOnEntityDamagePVPNotAllowed() { @@ -418,7 +418,7 @@ public class PVPListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.PVPListener#onEntityDamage(org.bukkit.event.entity.EntityDamageByEntityEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.PVPListener#onEntityDamage(org.bukkit.event.entity.EntityDamageByEntityEvent)}. */ @Test public void testOnEntityDamageOnPVPAllowed() { @@ -444,7 +444,7 @@ public class PVPListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.PVPListener#onEntityDamage(org.bukkit.event.entity.EntityDamageByEntityEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.PVPListener#onEntityDamage(org.bukkit.event.entity.EntityDamageByEntityEvent)}. */ @Test public void testOnEntityDamageOnPVPNotAllowedProjectile() { @@ -472,7 +472,7 @@ public class PVPListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.PVPListener#onEntityDamage(org.bukkit.event.entity.EntityDamageByEntityEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.PVPListener#onEntityDamage(org.bukkit.event.entity.EntityDamageByEntityEvent)}. */ @Test public void testOnEntityDamageSelfDamageProjectile() { @@ -488,7 +488,7 @@ public class PVPListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.PVPListener#onEntityDamage(org.bukkit.event.entity.EntityDamageByEntityEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.PVPListener#onEntityDamage(org.bukkit.event.entity.EntityDamageByEntityEvent)}. */ @Test public void testOnEntityDamagePVPAllowedProjectile() { @@ -518,7 +518,7 @@ public class PVPListenerTest { /** - * Test method for {@link world.bentobox.bbox.listeners.flags.PVPListener#onFishing(org.bukkit.event.player.PlayerFishEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.PVPListener#onFishing(org.bukkit.event.player.PlayerFishEvent)}. */ @Test public void testOnFishing() { @@ -563,7 +563,7 @@ public class PVPListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.PVPListener#onFishing(org.bukkit.event.player.PlayerFishEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.PVPListener#onFishing(org.bukkit.event.player.PlayerFishEvent)}. */ @Test public void testOnFishingProtectVisitors() { @@ -586,7 +586,7 @@ public class PVPListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.PVPListener#onFishing(org.bukkit.event.player.PlayerFishEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.PVPListener#onFishing(org.bukkit.event.player.PlayerFishEvent)}. */ @Test public void testOnFishingSelfDamage() { @@ -599,7 +599,7 @@ public class PVPListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.PVPListener#onFishing(org.bukkit.event.player.PlayerFishEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.PVPListener#onFishing(org.bukkit.event.player.PlayerFishEvent)}. */ @Test public void testOnFishingNoPVPProtectVisitors() { @@ -622,7 +622,7 @@ public class PVPListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.PVPListener#onSplashPotionSplash(org.bukkit.event.entity.PotionSplashEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.PVPListener#onSplashPotionSplash(org.bukkit.event.entity.PotionSplashEvent)}. */ @Test public void testOnSplashPotionSplashWitch() { @@ -635,7 +635,7 @@ public class PVPListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.PVPListener#onSplashPotionSplash(org.bukkit.event.entity.PotionSplashEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.PVPListener#onSplashPotionSplash(org.bukkit.event.entity.PotionSplashEvent)}. */ @Test public void testOnSplashPotionSplashNoPlayers() { @@ -652,7 +652,7 @@ public class PVPListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.PVPListener#onSplashPotionSplash(org.bukkit.event.entity.PotionSplashEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.PVPListener#onSplashPotionSplash(org.bukkit.event.entity.PotionSplashEvent)}. */ @Test public void testOnSplashPotionSplash() { @@ -680,7 +680,7 @@ public class PVPListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.PVPListener#onSplashPotionSplash(org.bukkit.event.entity.PotionSplashEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.PVPListener#onSplashPotionSplash(org.bukkit.event.entity.PotionSplashEvent)}. */ @Test public void testOnSplashPotionSplashSelfInflicted() { @@ -707,7 +707,7 @@ public class PVPListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.PVPListener#onSplashPotionSplash(org.bukkit.event.entity.PotionSplashEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.PVPListener#onSplashPotionSplash(org.bukkit.event.entity.PotionSplashEvent)}. */ @Test public void testOnSplashPotionSplashAllowPVP() { @@ -730,7 +730,7 @@ public class PVPListenerTest { /** - * Test method for {@link world.bentobox.bbox.listeners.flags.PVPListener#onSplashPotionSplash(org.bukkit.event.entity.PotionSplashEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.PVPListener#onSplashPotionSplash(org.bukkit.event.entity.PotionSplashEvent)}. */ @Test public void testOnSplashPotionSplashAllowPVPProtectVisitors() { @@ -764,7 +764,7 @@ public class PVPListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.PVPListener#onLingeringPotionSplash(org.bukkit.event.entity.LingeringPotionSplashEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.PVPListener#onLingeringPotionSplash(org.bukkit.event.entity.LingeringPotionSplashEvent)}. */ @Test public void testOnLingeringPotionSplash() { @@ -782,7 +782,7 @@ public class PVPListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.PVPListener#onLingeringPotionSplash(org.bukkit.event.entity.LingeringPotionSplashEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.PVPListener#onLingeringPotionSplash(org.bukkit.event.entity.LingeringPotionSplashEvent)}. */ @Test public void testOnLingeringPotionSplashNonHuman() { @@ -799,7 +799,7 @@ public class PVPListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.PVPListener#onLingeringPotionDamage(org.bukkit.event.entity.AreaEffectCloudApplyEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.PVPListener#onLingeringPotionDamage(org.bukkit.event.entity.AreaEffectCloudApplyEvent)}. */ @Test public void testOnLingeringPotionDamageNoPVP() { @@ -835,7 +835,7 @@ public class PVPListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.PVPListener#onLingeringPotionDamage(org.bukkit.event.entity.AreaEffectCloudApplyEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.PVPListener#onLingeringPotionDamage(org.bukkit.event.entity.AreaEffectCloudApplyEvent)}. */ @Test public void testOnLingeringPotionDamagePVP() { @@ -869,7 +869,7 @@ public class PVPListenerTest { /** - * Test method for {@link world.bentobox.bbox.listeners.flags.PVPListener#onLingeringPotionDamage(org.bukkit.event.entity.AreaEffectCloudApplyEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.PVPListener#onLingeringPotionDamage(org.bukkit.event.entity.AreaEffectCloudApplyEvent)}. */ @Test public void testOnLingeringPotionDamageNoPVPVisitor() { @@ -909,7 +909,7 @@ public class PVPListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.PVPListener#onLingeringPotionDamage(org.bukkit.event.entity.AreaEffectCloudApplyEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.PVPListener#onLingeringPotionDamage(org.bukkit.event.entity.AreaEffectCloudApplyEvent)}. */ @Test public void testOnLingeringPotionDamagePVPVisitor() { diff --git a/src/test/java/world/bentobox/bbox/listeners/flags/PistonPushListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/PistonPushListenerTest.java similarity index 90% rename from src/test/java/world/bentobox/bbox/listeners/flags/PistonPushListenerTest.java rename to src/test/java/world/bentobox/bentobox/listeners/flags/PistonPushListenerTest.java index 1cec71093..bfec323c0 100644 --- a/src/test/java/world/bentobox/bbox/listeners/flags/PistonPushListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/PistonPushListenerTest.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -26,14 +26,14 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.configuration.WorldSettings; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.listeners.flags.PistonPushListener; -import world.bentobox.bbox.lists.Flags; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.configuration.WorldSettings; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.listeners.flags.PistonPushListener; +import world.bentobox.bentobox.lists.Flags; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.util.Util; @RunWith(PowerMockRunner.class) @PrepareForTest({BentoBox.class, Util.class }) diff --git a/src/test/java/world/bentobox/bbox/listeners/flags/RemoveMobsListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/RemoveMobsListenerTest.java similarity index 80% rename from src/test/java/world/bentobox/bbox/listeners/flags/RemoveMobsListenerTest.java rename to src/test/java/world/bentobox/bentobox/listeners/flags/RemoveMobsListenerTest.java index bdffb219a..8568ff4f3 100644 --- a/src/test/java/world/bentobox/bbox/listeners/flags/RemoveMobsListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/RemoveMobsListenerTest.java @@ -1,7 +1,7 @@ /** * */ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -24,14 +24,14 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.configuration.WorldSettings; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.listeners.flags.RemoveMobsListener; -import world.bentobox.bbox.lists.Flags; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.configuration.WorldSettings; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.listeners.flags.RemoveMobsListener; +import world.bentobox.bentobox.lists.Flags; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.util.Util; /** * @author tastybento @@ -99,7 +99,7 @@ public class RemoveMobsListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.RemoveMobsListener#onUserTeleport(org.bukkit.event.player.PlayerTeleportEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.RemoveMobsListener#onUserTeleport(org.bukkit.event.player.PlayerTeleportEvent)}. */ @Test public void testOnUserTeleport() { @@ -109,7 +109,7 @@ public class RemoveMobsListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.RemoveMobsListener#onUserTeleport(org.bukkit.event.player.PlayerTeleportEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.RemoveMobsListener#onUserTeleport(org.bukkit.event.player.PlayerTeleportEvent)}. */ @Test public void testOnUserTeleportDoNotRemove() { @@ -120,7 +120,7 @@ public class RemoveMobsListenerTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.flags.RemoveMobsListener#onUserTeleport(org.bukkit.event.player.PlayerTeleportEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.flags.RemoveMobsListener#onUserTeleport(org.bukkit.event.player.PlayerTeleportEvent)}. */ @Test public void testOnUserTeleportToNotIsland() { diff --git a/src/test/java/world/bentobox/bbox/listeners/flags/TNTListenerTest.java b/src/test/java/world/bentobox/bentobox/listeners/flags/TNTListenerTest.java similarity index 93% rename from src/test/java/world/bentobox/bbox/listeners/flags/TNTListenerTest.java rename to src/test/java/world/bentobox/bentobox/listeners/flags/TNTListenerTest.java index 2e8fa19b6..08429b9aa 100644 --- a/src/test/java/world/bentobox/bbox/listeners/flags/TNTListenerTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/flags/TNTListenerTest.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.listeners.flags; +package world.bentobox.bentobox.listeners.flags; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -50,19 +50,19 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.configuration.WorldSettings; -import world.bentobox.bbox.api.user.Notifier; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.lists.Flags; -import world.bentobox.bbox.managers.FlagsManager; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.LocalesManager; -import world.bentobox.bbox.managers.PlayersManager; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.configuration.WorldSettings; +import world.bentobox.bentobox.api.user.Notifier; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.lists.Flags; +import world.bentobox.bentobox.managers.FlagsManager; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.LocalesManager; +import world.bentobox.bentobox.managers.PlayersManager; +import world.bentobox.bentobox.util.Util; @RunWith(PowerMockRunner.class) @PrepareForTest( {BentoBox.class, Flags.class, Util.class, Bukkit.class} ) diff --git a/src/test/java/world/bentobox/bbox/listeners/protection/FlyingMobEventsTest.java b/src/test/java/world/bentobox/bentobox/listeners/protection/FlyingMobEventsTest.java similarity index 85% rename from src/test/java/world/bentobox/bbox/listeners/protection/FlyingMobEventsTest.java rename to src/test/java/world/bentobox/bentobox/listeners/protection/FlyingMobEventsTest.java index 43d15ab08..ccf419ad3 100644 --- a/src/test/java/world/bentobox/bbox/listeners/protection/FlyingMobEventsTest.java +++ b/src/test/java/world/bentobox/bentobox/listeners/protection/FlyingMobEventsTest.java @@ -1,7 +1,7 @@ /** * */ -package world.bentobox.bbox.listeners.protection; +package world.bentobox.bentobox.listeners.protection; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -41,16 +41,16 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.listeners.protection.FlyingMobEvents; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.LocalesManager; -import world.bentobox.bbox.managers.PlayersManager; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.listeners.protection.FlyingMobEvents; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.LocalesManager; +import world.bentobox.bentobox.managers.PlayersManager; +import world.bentobox.bentobox.util.Util; /** * @author tastybento @@ -123,7 +123,7 @@ public class FlyingMobEventsTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.protection.FlyingMobEvents#FlyingMobEvents(world.bentobox.bbox.BentoBox)}. + * Test method for {@link world.bentobox.bentobox.listeners.protection.FlyingMobEvents#FlyingMobEvents(world.bentobox.bentobox.BentoBox)}. */ @Test public void testFlyingMobEvents() { @@ -133,7 +133,7 @@ public class FlyingMobEventsTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.protection.FlyingMobEvents#onMobSpawn(org.bukkit.event.entity.CreatureSpawnEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.protection.FlyingMobEvents#onMobSpawn(org.bukkit.event.entity.CreatureSpawnEvent)}. */ @Test public void testOnMobSpawnNotInWorld() { @@ -147,7 +147,7 @@ public class FlyingMobEventsTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.protection.FlyingMobEvents#onMobSpawn(org.bukkit.event.entity.CreatureSpawnEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.protection.FlyingMobEvents#onMobSpawn(org.bukkit.event.entity.CreatureSpawnEvent)}. */ @Test public void testOnMobSpawnInWorldWrongType() { @@ -160,7 +160,7 @@ public class FlyingMobEventsTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.protection.FlyingMobEvents#onMobSpawn(org.bukkit.event.entity.CreatureSpawnEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.protection.FlyingMobEvents#onMobSpawn(org.bukkit.event.entity.CreatureSpawnEvent)}. */ @Test public void testOnMobSpawnInWorldCorrectType() { @@ -187,7 +187,7 @@ public class FlyingMobEventsTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.protection.FlyingMobEvents#onMobExplosion(org.bukkit.event.entity.EntityExplodeEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.protection.FlyingMobEvents#onMobExplosion(org.bukkit.event.entity.EntityExplodeEvent)}. */ @Test public void testOnMobExplosionFail() { @@ -209,7 +209,7 @@ public class FlyingMobEventsTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.protection.FlyingMobEvents#onMobExplosion(org.bukkit.event.entity.EntityExplodeEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.protection.FlyingMobEvents#onMobExplosion(org.bukkit.event.entity.EntityExplodeEvent)}. */ @Test public void testOnMobExplosionOnIsland() { @@ -241,7 +241,7 @@ public class FlyingMobEventsTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.protection.FlyingMobEvents#onMobExplosion(org.bukkit.event.entity.EntityExplodeEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.protection.FlyingMobEvents#onMobExplosion(org.bukkit.event.entity.EntityExplodeEvent)}. */ @Test public void testOnMobExplosionOffIsland() { @@ -273,7 +273,7 @@ public class FlyingMobEventsTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.protection.FlyingMobEvents#onWitherExplode(org.bukkit.event.entity.ExplosionPrimeEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.protection.FlyingMobEvents#onWitherExplode(org.bukkit.event.entity.ExplosionPrimeEvent)}. */ @Test public void testOnWitherExplode() { @@ -299,7 +299,7 @@ public class FlyingMobEventsTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.protection.FlyingMobEvents#onWitherExplode(org.bukkit.event.entity.ExplosionPrimeEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.protection.FlyingMobEvents#onWitherExplode(org.bukkit.event.entity.ExplosionPrimeEvent)}. */ @Test public void testOnWitherSkullExplode() { @@ -329,7 +329,7 @@ public class FlyingMobEventsTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.protection.FlyingMobEvents#onWitherChangeBlocks(org.bukkit.event.entity.EntityChangeBlockEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.protection.FlyingMobEvents#onWitherChangeBlocks(org.bukkit.event.entity.EntityChangeBlockEvent)}. */ @Test public void testOnWitherChangeBlocks() { @@ -363,7 +363,7 @@ public class FlyingMobEventsTest { } /** - * Test method for {@link world.bentobox.bbox.listeners.protection.FlyingMobEvents#onMobDeath(org.bukkit.event.entity.EntityDeathEvent)}. + * Test method for {@link world.bentobox.bentobox.listeners.protection.FlyingMobEvents#onMobDeath(org.bukkit.event.entity.EntityDeathEvent)}. */ @Test public void testOnMobDeath() { diff --git a/src/test/java/world/bentobox/bbox/managers/FlagsManagerTest.java b/src/test/java/world/bentobox/bentobox/managers/FlagsManagerTest.java similarity index 93% rename from src/test/java/world/bentobox/bbox/managers/FlagsManagerTest.java rename to src/test/java/world/bentobox/bentobox/managers/FlagsManagerTest.java index 8f20a204f..edefc353f 100644 --- a/src/test/java/world/bentobox/bbox/managers/FlagsManagerTest.java +++ b/src/test/java/world/bentobox/bentobox/managers/FlagsManagerTest.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.managers; +package world.bentobox.bentobox.managers; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertEquals; @@ -31,13 +31,13 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.flags.Flag; -import world.bentobox.bbox.api.flags.FlagBuilder; -import world.bentobox.bbox.listeners.flags.BreakBlocksListener; -import world.bentobox.bbox.lists.Flags; -import world.bentobox.bbox.managers.FlagsManager; -import world.bentobox.bbox.managers.IslandsManager; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.flags.Flag; +import world.bentobox.bentobox.api.flags.FlagBuilder; +import world.bentobox.bentobox.listeners.flags.BreakBlocksListener; +import world.bentobox.bentobox.lists.Flags; +import world.bentobox.bentobox.managers.FlagsManager; +import world.bentobox.bentobox.managers.IslandsManager; @RunWith(PowerMockRunner.class) @PrepareForTest( {BentoBox.class, Flags.class, Bukkit.class} ) diff --git a/src/test/java/world/bentobox/bbox/managers/IslandsManagerTest.java b/src/test/java/world/bentobox/bentobox/managers/IslandsManagerTest.java similarity index 85% rename from src/test/java/world/bentobox/bbox/managers/IslandsManagerTest.java rename to src/test/java/world/bentobox/bentobox/managers/IslandsManagerTest.java index db6ab5e47..d1933da20 100644 --- a/src/test/java/world/bentobox/bbox/managers/IslandsManagerTest.java +++ b/src/test/java/world/bentobox/bentobox/managers/IslandsManagerTest.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.managers; +package world.bentobox.bentobox.managers; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -52,14 +52,14 @@ import org.powermock.reflect.Whitebox; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet.Builder; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.configuration.WorldSettings; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.lists.Flags; -import world.bentobox.bbox.managers.island.IslandCache; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.configuration.WorldSettings; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.lists.Flags; +import world.bentobox.bentobox.managers.island.IslandCache; +import world.bentobox.bentobox.util.Util; @RunWith(PowerMockRunner.class) @PrepareForTest( { Bukkit.class, BentoBox.class, IslandsManager.class, Util.class, Location.class }) @@ -176,7 +176,7 @@ public class IslandsManagerTest { /** - * Test method for {@link world.bentobox.bbox.managers.IslandsManager#isSafeLocation(org.bukkit.Location)}. + * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#isSafeLocation(org.bukkit.Location)}. */ @Test public void testIsSafeLocationSafe() { @@ -185,7 +185,7 @@ public class IslandsManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.IslandsManager#isSafeLocation(org.bukkit.Location)}. + * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#isSafeLocation(org.bukkit.Location)}. */ @Test public void testIsSafeLocationNull() { @@ -194,7 +194,7 @@ public class IslandsManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.IslandsManager#isSafeLocation(org.bukkit.Location)}. + * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#isSafeLocation(org.bukkit.Location)}. */ @Test public void testIsSafeLocationNonSolidGround() { @@ -203,7 +203,7 @@ public class IslandsManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.IslandsManager#isSafeLocation(org.bukkit.Location)}. + * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#isSafeLocation(org.bukkit.Location)}. */ @Test public void testIsSafeLocationSubmerged() { @@ -214,7 +214,7 @@ public class IslandsManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.IslandsManager#isSafeLocation(org.bukkit.Location)}. + * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#isSafeLocation(org.bukkit.Location)}. */ @Test public void testIsSafeLocationPortals() { @@ -245,7 +245,7 @@ public class IslandsManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.IslandsManager#isSafeLocation(org.bukkit.Location)}. + * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#isSafeLocation(org.bukkit.Location)}. */ @Test public void testIsSafeLocationLava() { @@ -276,7 +276,7 @@ public class IslandsManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.IslandsManager#isSafeLocation(org.bukkit.Location)}. + * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#isSafeLocation(org.bukkit.Location)}. */ @Test public void testTrapDoor() { @@ -299,7 +299,7 @@ public class IslandsManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.IslandsManager#isSafeLocation(org.bukkit.Location)}. + * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#isSafeLocation(org.bukkit.Location)}. */ @Test public void testBadBlocks() { @@ -323,7 +323,7 @@ public class IslandsManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.IslandsManager#isSafeLocation(org.bukkit.Location)}. + * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#isSafeLocation(org.bukkit.Location)}. */ @Test public void testSolidBlocks() { @@ -352,7 +352,7 @@ public class IslandsManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.IslandsManager#IslandsManager(world.bentobox.bbox.BentoBox)}. + * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#IslandsManager(world.bentobox.bentobox.BentoBox)}. */ @Test public void testIslandsManager() { @@ -360,7 +360,7 @@ public class IslandsManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.IslandsManager#bigScan(org.bukkit.Location, int)}. + * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#bigScan(org.bukkit.Location, int)}. */ @Test public void testBigScan() throws Exception { @@ -405,7 +405,7 @@ public class IslandsManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.IslandsManager#createIsland(org.bukkit.Location)}. + * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#createIsland(org.bukkit.Location)}. */ @Test public void testCreateIslandLocation() { @@ -416,7 +416,7 @@ public class IslandsManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.IslandsManager#createIsland(org.bukkit.Location, java.util.UUID)}. + * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#createIsland(org.bukkit.Location, java.util.UUID)}. */ @Test public void testCreateIslandLocationUUID() { @@ -429,7 +429,7 @@ public class IslandsManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.IslandsManager#deleteIsland(world.bentobox.bbox.database.objects.Island, boolean)}. + * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#deleteIsland(world.bentobox.bentobox.database.objects.Island, boolean)}. */ @Test public void testDeleteIslandIslandBoolean() { @@ -445,7 +445,7 @@ public class IslandsManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.IslandsManager#getCount()}. + * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#getCount()}. */ @Test public void testGetCount() { @@ -456,7 +456,7 @@ public class IslandsManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.IslandsManager#getIsland(java.util.UUID)}. + * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#getIsland(java.util.UUID)}. */ @Test public void testGetIsland() { @@ -468,7 +468,7 @@ public class IslandsManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.IslandsManager#getIslandAt(org.bukkit.Location)}. + * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#getIslandAt(org.bukkit.Location)}. * @throws Exception */ @Test @@ -497,7 +497,7 @@ public class IslandsManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.IslandsManager#getIslandLocation(java.util.UUID)}. + * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#getIslandLocation(java.util.UUID)}. */ @Test public void testGetIslandLocation() { @@ -508,7 +508,7 @@ public class IslandsManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.IslandsManager#getLast()}. + * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#getLast()}. */ @Test public void testGetLast() { @@ -519,7 +519,7 @@ public class IslandsManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.IslandsManager#getMembers(java.util.UUID)}. + * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#getMembers(java.util.UUID)}. * @throws Exception */ @Test @@ -537,7 +537,7 @@ public class IslandsManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.IslandsManager#getProtectedIslandAt(org.bukkit.Location)}. + * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#getProtectedIslandAt(org.bukkit.Location)}. * @throws Exception */ @Test @@ -572,7 +572,7 @@ public class IslandsManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.IslandsManager#getSafeHomeLocation(java.util.UUID, int)}. + * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#getSafeHomeLocation(java.util.UUID, int)}. */ @Test public void testGetSafeHomeLocation() { @@ -585,7 +585,7 @@ public class IslandsManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.IslandsManager#getSpawnPoint()}. + * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#getSpawnPoint()}. */ @Test public void testGetSpawnPoint() { @@ -602,7 +602,7 @@ public class IslandsManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.IslandsManager#homeTeleport(org.bukkit.entity.Player, int)}. + * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#homeTeleport(org.bukkit.entity.Player, int)}. */ @Test public void testHomeTeleportPlayerInt() { @@ -618,7 +618,7 @@ public class IslandsManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.IslandsManager#homeTeleport(org.bukkit.entity.Player, int)}. + * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#homeTeleport(org.bukkit.entity.Player, int)}. */ @Test public void testHomeTeleportPlayerIntDifferentGameMode() { @@ -634,7 +634,7 @@ public class IslandsManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.IslandsManager#isAtSpawn(org.bukkit.Location)}. + * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#isAtSpawn(org.bukkit.Location)}. */ @Test public void testIsAtSpawn() { @@ -648,7 +648,7 @@ public class IslandsManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.IslandsManager#isOwner(java.util.UUID)}. + * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#isOwner(java.util.UUID)}. * @throws Exception */ @Test @@ -680,7 +680,7 @@ public class IslandsManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.IslandsManager#load()}. + * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#load()}. */ @Test public void testLoad() { @@ -690,7 +690,7 @@ public class IslandsManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.IslandsManager#locationIsOnIsland(org.bukkit.entity.Player, org.bukkit.Location)}. + * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#locationIsOnIsland(org.bukkit.entity.Player, org.bukkit.Location)}. * @throws Exception */ @Test @@ -729,7 +729,7 @@ public class IslandsManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.IslandsManager#userIsOnIsland(world.bentobox.bbox.api.user.User)}. + * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#userIsOnIsland(world.bentobox.bentobox.api.user.User)}. * @throws Exception */ @Test @@ -753,7 +753,7 @@ public class IslandsManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.IslandsManager#removePlayer(java.util.UUID)}. + * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#removePlayer(java.util.UUID)}. */ @Test public void testRemovePlayer() { @@ -762,7 +762,7 @@ public class IslandsManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.IslandsManager#removePlayersFromIsland(world.bentobox.bbox.database.objects.Island)}. + * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#removePlayersFromIsland(world.bentobox.bentobox.database.objects.Island)}. */ @Test public void testRemovePlayersFromIsland() { @@ -772,7 +772,7 @@ public class IslandsManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.IslandsManager#save(boolean)}. + * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#save(boolean)}. */ @Test public void testSave() { @@ -780,7 +780,7 @@ public class IslandsManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.IslandsManager#setIslandName(java.util.UUID, java.lang.String)}. + * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#setIslandName(java.util.UUID, java.lang.String)}. */ @Test public void testSetIslandName() { @@ -788,7 +788,7 @@ public class IslandsManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.IslandsManager#setJoinTeam(world.bentobox.bbox.database.objects.Island, java.util.UUID)}. + * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#setJoinTeam(world.bentobox.bentobox.database.objects.Island, java.util.UUID)}. */ @Test public void testSetJoinTeam() { @@ -796,7 +796,7 @@ public class IslandsManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.IslandsManager#setLast(org.bukkit.Location)}. + * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#setLast(org.bukkit.Location)}. */ @Test public void testSetLast() { @@ -804,7 +804,7 @@ public class IslandsManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.IslandsManager#setLeaveTeam(java.util.UUID)}. + * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#setLeaveTeam(java.util.UUID)}. */ @Test public void testSetLeaveTeam() { @@ -812,7 +812,7 @@ public class IslandsManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.IslandsManager#shutdown()}. + * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#shutdown()}. */ @Test public void testShutdown() { @@ -820,7 +820,7 @@ public class IslandsManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.IslandsManager#clearArea(Location)}. + * Test method for {@link world.bentobox.bentobox.managers.IslandsManager#clearArea(Location)}. */ @Test public void testClearArea() { diff --git a/src/test/java/world/bentobox/bbox/managers/PlayersManagerTest.java b/src/test/java/world/bentobox/bentobox/managers/PlayersManagerTest.java similarity index 86% rename from src/test/java/world/bentobox/bbox/managers/PlayersManagerTest.java rename to src/test/java/world/bentobox/bentobox/managers/PlayersManagerTest.java index 1ee0aabd4..8ca6d62a5 100644 --- a/src/test/java/world/bentobox/bbox/managers/PlayersManagerTest.java +++ b/src/test/java/world/bentobox/bentobox/managers/PlayersManagerTest.java @@ -1,7 +1,7 @@ /** * */ -package world.bentobox.bbox.managers; +package world.bentobox.bentobox.managers; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -33,13 +33,13 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.BSBDatabase; -import world.bentobox.bbox.database.objects.Names; -import world.bentobox.bbox.database.objects.Players; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.BSBDatabase; +import world.bentobox.bentobox.database.objects.Names; +import world.bentobox.bentobox.database.objects.Players; +import world.bentobox.bentobox.util.Util; /** * @author tastybento @@ -130,7 +130,7 @@ public class PlayersManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.PlayersManager#PlayersManager(world.bentobox.bbox.BentoBox)}. + * Test method for {@link world.bentobox.bentobox.managers.PlayersManager#PlayersManager(world.bentobox.bentobox.BentoBox)}. */ @Test public void testPlayersManager() { @@ -139,7 +139,7 @@ public class PlayersManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.PlayersManager#load()}. + * Test method for {@link world.bentobox.bentobox.managers.PlayersManager#load()}. */ @Test public void testLoad() { @@ -148,7 +148,7 @@ public class PlayersManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.PlayersManager#save(boolean)}. + * Test method for {@link world.bentobox.bentobox.managers.PlayersManager#save(boolean)}. */ @Test public void testSaveBoolean() { @@ -158,7 +158,7 @@ public class PlayersManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.PlayersManager#shutdown()}. + * Test method for {@link world.bentobox.bentobox.managers.PlayersManager#shutdown()}. */ @Test public void testShutdown() { @@ -167,7 +167,7 @@ public class PlayersManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.PlayersManager#getPlayer(java.util.UUID)}. + * Test method for {@link world.bentobox.bentobox.managers.PlayersManager#getPlayer(java.util.UUID)}. */ @Test public void testGetPlayer() { @@ -183,7 +183,7 @@ public class PlayersManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.PlayersManager#addPlayer(java.util.UUID)}. + * Test method for {@link world.bentobox.bentobox.managers.PlayersManager#addPlayer(java.util.UUID)}. */ @Test public void testAddPlayer() { @@ -203,7 +203,7 @@ public class PlayersManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.PlayersManager#removeOnlinePlayer(java.util.UUID)}. + * Test method for {@link world.bentobox.bentobox.managers.PlayersManager#removeOnlinePlayer(java.util.UUID)}. */ @Test public void testRemoveOnlinePlayer() { @@ -223,7 +223,7 @@ public class PlayersManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.PlayersManager#removeAllPlayers()}. + * Test method for {@link world.bentobox.bentobox.managers.PlayersManager#removeAllPlayers()}. */ @Test public void testRemoveAllPlayers() { @@ -241,7 +241,7 @@ public class PlayersManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.PlayersManager#isKnown(java.util.UUID)}. + * Test method for {@link world.bentobox.bentobox.managers.PlayersManager#isKnown(java.util.UUID)}. */ @Test public void testIsKnown() { @@ -261,7 +261,7 @@ public class PlayersManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.PlayersManager#setHomeLocation(User, org.bukkit.Location, int)}. + * Test method for {@link world.bentobox.bentobox.managers.PlayersManager#setHomeLocation(User, org.bukkit.Location, int)}. */ @Test public void testSetAndGetHomeLocationUserLocationInt() { @@ -289,7 +289,7 @@ public class PlayersManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.PlayersManager#clearHomeLocations(java.util.UUID)}. + * Test method for {@link world.bentobox.bentobox.managers.PlayersManager#clearHomeLocations(java.util.UUID)}. */ @Test public void testClearHomeLocations() { @@ -315,7 +315,7 @@ public class PlayersManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.PlayersManager#getUUID(java.lang.String)}. + * Test method for {@link world.bentobox.bentobox.managers.PlayersManager#getUUID(java.lang.String)}. */ @Test public void testGetUUID() { @@ -346,7 +346,7 @@ public class PlayersManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.PlayersManager#setPlayerName(world.bentobox.bbox.api.user.User)}. + * Test method for {@link world.bentobox.bentobox.managers.PlayersManager#setPlayerName(world.bentobox.bentobox.api.user.User)}. */ @Test public void testSetandGetPlayerName() { @@ -365,7 +365,7 @@ public class PlayersManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.PlayersManager#getResets(java.util.UUID)}. + * Test method for {@link world.bentobox.bentobox.managers.PlayersManager#getResets(java.util.UUID)}. */ @Test public void testGetSetResetsLeft() { @@ -384,7 +384,7 @@ public class PlayersManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.PlayersManager#save(java.util.UUID)}. + * Test method for {@link world.bentobox.bentobox.managers.PlayersManager#save(java.util.UUID)}. */ @Test public void testSaveUUID() { diff --git a/src/test/java/world/bentobox/bbox/managers/RanksManagerTest.java b/src/test/java/world/bentobox/bentobox/managers/RanksManagerTest.java similarity index 80% rename from src/test/java/world/bentobox/bbox/managers/RanksManagerTest.java rename to src/test/java/world/bentobox/bentobox/managers/RanksManagerTest.java index e85a904f6..20e0ff3e0 100644 --- a/src/test/java/world/bentobox/bbox/managers/RanksManagerTest.java +++ b/src/test/java/world/bentobox/bentobox/managers/RanksManagerTest.java @@ -1,7 +1,7 @@ /** * */ -package world.bentobox.bbox.managers; +package world.bentobox.bentobox.managers; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -15,9 +15,9 @@ import java.util.Map; import org.junit.Before; import org.junit.Test; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.Settings; -import world.bentobox.bbox.managers.RanksManager; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.Settings; +import world.bentobox.bentobox.managers.RanksManager; /** * @author tastybento @@ -44,7 +44,7 @@ public class RanksManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.RanksManager#addRank(java.lang.String, int)}. + * Test method for {@link world.bentobox.bentobox.managers.RanksManager#addRank(java.lang.String, int)}. */ @Test public void testAddRank() { @@ -52,7 +52,7 @@ public class RanksManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.RanksManager#removeRank(java.lang.String)}. + * Test method for {@link world.bentobox.bentobox.managers.RanksManager#removeRank(java.lang.String)}. */ @Test public void testRemoveRank() { @@ -63,7 +63,7 @@ public class RanksManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.RanksManager#getRankValue(java.lang.String)}. + * Test method for {@link world.bentobox.bentobox.managers.RanksManager#getRankValue(java.lang.String)}. */ @Test public void testGetRankValue() { @@ -72,7 +72,7 @@ public class RanksManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.RanksManager#getRanks()}. + * Test method for {@link world.bentobox.bentobox.managers.RanksManager#getRanks()}. */ @Test public void testGetRanks() { @@ -84,7 +84,7 @@ public class RanksManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.RanksManager#getRankUpValue(int)}. + * Test method for {@link world.bentobox.bentobox.managers.RanksManager#getRankUpValue(int)}. */ @Test public void testGetNextRankValue() { @@ -97,7 +97,7 @@ public class RanksManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.RanksManager#getRankDownValue(int)}. + * Test method for {@link world.bentobox.bentobox.managers.RanksManager#getRankDownValue(int)}. */ @Test public void testGetPreviousRankValue() { @@ -109,7 +109,7 @@ public class RanksManagerTest { } /** - * Test method for {@link world.bentobox.bbox.managers.RanksManager#getRank(int)}. + * Test method for {@link world.bentobox.bentobox.managers.RanksManager#getRank(int)}. */ @Test public void testGetRank() { diff --git a/src/test/java/world/bentobox/bbox/managers/island/IslandCacheTest.java b/src/test/java/world/bentobox/bentobox/managers/island/IslandCacheTest.java similarity index 96% rename from src/test/java/world/bentobox/bbox/managers/island/IslandCacheTest.java rename to src/test/java/world/bentobox/bentobox/managers/island/IslandCacheTest.java index e187d7b69..a0bdee374 100644 --- a/src/test/java/world/bentobox/bbox/managers/island/IslandCacheTest.java +++ b/src/test/java/world/bentobox/bentobox/managers/island/IslandCacheTest.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.managers.island; +package world.bentobox.bentobox.managers.island; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -25,11 +25,11 @@ import org.powermock.modules.junit4.PowerMockRunner; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet.Builder; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.util.Util; @RunWith(PowerMockRunner.class) @PrepareForTest(Util.class) diff --git a/src/test/java/world/bentobox/bbox/util/ItemParserTest.java b/src/test/java/world/bentobox/bentobox/util/ItemParserTest.java similarity index 99% rename from src/test/java/world/bentobox/bbox/util/ItemParserTest.java rename to src/test/java/world/bentobox/bentobox/util/ItemParserTest.java index ef6e9d769..d3b394bb5 100644 --- a/src/test/java/world/bentobox/bbox/util/ItemParserTest.java +++ b/src/test/java/world/bentobox/bentobox/util/ItemParserTest.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.util; +package world.bentobox.bentobox.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -28,7 +28,7 @@ import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import world.bentobox.bbox.util.ItemParser; +import world.bentobox.bentobox.util.ItemParser; @RunWith(PowerMockRunner.class) @PrepareForTest({Bukkit.class}) diff --git a/src/test/java/world/bentobox/bbox/util/PairTest.java b/src/test/java/world/bentobox/bentobox/util/PairTest.java similarity index 94% rename from src/test/java/world/bentobox/bbox/util/PairTest.java rename to src/test/java/world/bentobox/bentobox/util/PairTest.java index 0234d0864..26c10cf38 100644 --- a/src/test/java/world/bentobox/bbox/util/PairTest.java +++ b/src/test/java/world/bentobox/bentobox/util/PairTest.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.util; +package world.bentobox.bentobox.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -7,7 +7,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Before; import org.junit.Test; -import world.bentobox.bbox.util.Pair; +import world.bentobox.bentobox.util.Pair; public class PairTest { diff --git a/src/test/java/world/bentobox/bbox/util/UtilTest.java b/src/test/java/world/bentobox/bentobox/util/UtilTest.java similarity index 77% rename from src/test/java/world/bentobox/bbox/util/UtilTest.java rename to src/test/java/world/bentobox/bentobox/util/UtilTest.java index 90fa97d7b..ab3959dae 100644 --- a/src/test/java/world/bentobox/bbox/util/UtilTest.java +++ b/src/test/java/world/bentobox/bentobox/util/UtilTest.java @@ -1,7 +1,7 @@ /** * */ -package world.bentobox.bbox.util; +package world.bentobox.bentobox.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -21,9 +21,9 @@ import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.util.Util; /** * @author tastybento @@ -71,7 +71,7 @@ public class UtilTest { } /** - * Test method for {@link world.bentobox.bbox.util.Util#getServerVersion()}. + * Test method for {@link world.bentobox.bentobox.util.Util#getServerVersion()}. */ @Test public void testGetServerVersion() { @@ -79,7 +79,7 @@ public class UtilTest { } /** - * Test method for {@link world.bentobox.bbox.util.Util#getClosestIsland(org.bukkit.Location)}. + * Test method for {@link world.bentobox.bentobox.util.Util#getClosestIsland(org.bukkit.Location)}. */ @Test public void testGetClosestIsland() throws Exception { @@ -97,7 +97,7 @@ public class UtilTest { } /** - * Test method for {@link world.bentobox.bbox.util.Util#getLocationString(java.lang.String)}. + * Test method for {@link world.bentobox.bentobox.util.Util#getLocationString(java.lang.String)}. */ @Test public void testGetLocationString() { @@ -114,7 +114,7 @@ public class UtilTest { } /** - * Test method for {@link world.bentobox.bbox.util.Util#getStringLocation(org.bukkit.Location)}. + * Test method for {@link world.bentobox.bentobox.util.Util#getStringLocation(org.bukkit.Location)}. */ @Test public void testGetStringLocation() { @@ -126,7 +126,7 @@ public class UtilTest { } /** - * Test method for {@link world.bentobox.bbox.util.Util#prettifyText(java.lang.String)}. + * Test method for {@link world.bentobox.bentobox.util.Util#prettifyText(java.lang.String)}. */ @Test public void testPrettifyText() { @@ -136,7 +136,7 @@ public class UtilTest { } /** - * Test method for {@link world.bentobox.bbox.util.Util#getOnlinePlayerList(world.bentobox.bbox.api.user.User)}. + * Test method for {@link world.bentobox.bentobox.util.Util#getOnlinePlayerList(world.bentobox.bentobox.api.user.User)}. */ @Test public void testGetOnlinePlayerList() { @@ -144,7 +144,7 @@ public class UtilTest { } /** - * Test method for {@link world.bentobox.bbox.util.Util#tabLimit(java.util.List, java.lang.String)}. + * Test method for {@link world.bentobox.bentobox.util.Util#tabLimit(java.util.List, java.lang.String)}. */ @Test public void testTabLimit() { @@ -152,7 +152,7 @@ public class UtilTest { } /** - * Test method for {@link world.bentobox.bbox.util.Util#getPermValue(org.bukkit.entity.Player, java.lang.String, int)}. + * Test method for {@link world.bentobox.bentobox.util.Util#getPermValue(org.bukkit.entity.Player, java.lang.String, int)}. */ @Test public void testGetPermValue() { @@ -160,7 +160,7 @@ public class UtilTest { } /** - * Test method for {@link world.bentobox.bbox.util.Util#xyz(org.bukkit.util.Vector)}. + * Test method for {@link world.bentobox.bentobox.util.Util#xyz(org.bukkit.util.Vector)}. */ @Test public void testXyz() { @@ -168,7 +168,7 @@ public class UtilTest { } /** - * Test method for {@link world.bentobox.bbox.util.Util#sameWorld(org.bukkit.World, org.bukkit.World)}. + * Test method for {@link world.bentobox.bentobox.util.Util#sameWorld(org.bukkit.World, org.bukkit.World)}. */ @Test public void testSameWorld() { @@ -176,7 +176,7 @@ public class UtilTest { } /** - * Test method for {@link world.bentobox.bbox.util.Util#getWorld(org.bukkit.World)}. + * Test method for {@link world.bentobox.bentobox.util.Util#getWorld(org.bukkit.World)}. */ @Test public void testGetWorld() { @@ -184,7 +184,7 @@ public class UtilTest { } /** - * Test method for {@link world.bentobox.bbox.util.Util#blockFaceToFloat(org.bukkit.block.BlockFace)}. + * Test method for {@link world.bentobox.bentobox.util.Util#blockFaceToFloat(org.bukkit.block.BlockFace)}. */ @Test public void testBlockFaceToFloat() { diff --git a/src/test/java/world/bentobox/bbox/util/teleport/SafeSpotTeleportTest.java b/src/test/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleportTest.java similarity index 85% rename from src/test/java/world/bentobox/bbox/util/teleport/SafeSpotTeleportTest.java rename to src/test/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleportTest.java index eb1ee5a98..25ddb74c6 100644 --- a/src/test/java/world/bentobox/bbox/util/teleport/SafeSpotTeleportTest.java +++ b/src/test/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleportTest.java @@ -1,7 +1,7 @@ /** * */ -package world.bentobox.bbox.util.teleport; +package world.bentobox.bentobox.util.teleport; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; @@ -28,12 +28,12 @@ import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.reflect.Whitebox; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.managers.IslandWorldManager; -import world.bentobox.bbox.managers.IslandsManager; -import world.bentobox.bbox.managers.LocalesManager; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.managers.IslandWorldManager; +import world.bentobox.bentobox.managers.IslandsManager; +import world.bentobox.bentobox.managers.LocalesManager; /** * @author tastybento @@ -98,7 +98,7 @@ public class SafeSpotTeleportTest { } /** - * Test method for {@link world.bentobox.bbox.util.teleport.SafeSpotTeleport#SafeSpotTeleport(world.bentobox.bbox.BentoBox, org.bukkit.entity.Entity, org.bukkit.Location, java.lang.String, boolean, int)}. + * Test method for {@link world.bentobox.bentobox.util.teleport.SafeSpotTeleport#SafeSpotTeleport(world.bentobox.bentobox.BentoBox, org.bukkit.entity.Entity, org.bukkit.Location, java.lang.String, boolean, int)}. */ @Test public void testSafeSpotTeleport() throws Exception { diff --git a/src/test/java/world/bentobox/bbox/util/teleport/SafeTeleportBuilderTest.java b/src/test/java/world/bentobox/bentobox/util/teleport/SafeTeleportBuilderTest.java similarity index 91% rename from src/test/java/world/bentobox/bbox/util/teleport/SafeTeleportBuilderTest.java rename to src/test/java/world/bentobox/bentobox/util/teleport/SafeTeleportBuilderTest.java index e62dea61a..e7efa7ccc 100644 --- a/src/test/java/world/bentobox/bbox/util/teleport/SafeTeleportBuilderTest.java +++ b/src/test/java/world/bentobox/bentobox/util/teleport/SafeTeleportBuilderTest.java @@ -1,4 +1,4 @@ -package world.bentobox.bbox.util.teleport; +package world.bentobox.bentobox.util.teleport; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -17,12 +17,12 @@ import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import world.bentobox.bbox.BentoBox; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.database.objects.Island; -import world.bentobox.bbox.managers.LocalesManager; -import world.bentobox.bbox.util.teleport.SafeSpotTeleport; -import world.bentobox.bbox.util.teleport.SafeTeleportBuilder; +import world.bentobox.bentobox.BentoBox; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.managers.LocalesManager; +import world.bentobox.bentobox.util.teleport.SafeSpotTeleport; +import world.bentobox.bentobox.util.teleport.SafeTeleportBuilder; @RunWith(PowerMockRunner.class) @PrepareForTest(SafeTeleportBuilder.class)