Renamed 'world.bentobox.bbox' to 'world.bentobox.bentobox'

src/main/java/world/bentobox/bbox/commands/island/IslandInfoCommand.java

@@ -1,4 +0,0 @@
-package world.bentobox.bbox.commands.island;
-
-public class IslandInfoCommand {
-}

src/main/java/world/bentobox/bbox/commands/island/IslandSpawnCommand.java

@@ -1,4 +0,0 @@
-package world.bentobox.bbox.commands.island;
-
-public class IslandSpawnCommand {
-}

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.bentobox.api.configuration.BSBConfig;
-import world.bentobox.bbox.api.configuration.WorldSettings;
+import world.bentobox.bentobox.api.configuration.WorldSettings;
-import world.bentobox.bbox.api.events.BentoBoxReadyEvent;
+import world.bentobox.bentobox.api.events.BentoBoxReadyEvent;
-import world.bentobox.bbox.api.placeholders.PlaceholderHandler;
+import world.bentobox.bentobox.api.placeholders.PlaceholderHandler;
-import world.bentobox.bbox.api.user.Notifier;
+import world.bentobox.bentobox.api.user.Notifier;
-import world.bentobox.bbox.database.BSBDbSetup;
+import world.bentobox.bentobox.database.BSBDbSetup;
-import world.bentobox.bbox.listeners.BannedVisitorCommands;
+import world.bentobox.bentobox.listeners.BannedVisitorCommands;
-import world.bentobox.bbox.listeners.BlockEndDragon;
+import world.bentobox.bentobox.listeners.BlockEndDragon;
-import world.bentobox.bbox.listeners.JoinLeaveListener;
+import world.bentobox.bentobox.listeners.JoinLeaveListener;
-import world.bentobox.bbox.listeners.NetherPortals;
+import world.bentobox.bentobox.listeners.NetherPortals;
-import world.bentobox.bbox.listeners.ObsidianToLava;
+import world.bentobox.bentobox.listeners.ObsidianToLava;
-import world.bentobox.bbox.listeners.PanelListenerManager;
+import world.bentobox.bentobox.listeners.PanelListenerManager;
-import world.bentobox.bbox.listeners.protection.FlyingMobEvents;
+import world.bentobox.bentobox.listeners.protection.FlyingMobEvents;
-import world.bentobox.bbox.managers.AddonsManager;
+import world.bentobox.bentobox.managers.AddonsManager;
-import world.bentobox.bbox.managers.CommandsManager;
+import world.bentobox.bentobox.managers.CommandsManager;
-import world.bentobox.bbox.managers.FlagsManager;
+import world.bentobox.bentobox.managers.FlagsManager;
-import world.bentobox.bbox.managers.IslandWorldManager;
+import world.bentobox.bentobox.managers.IslandWorldManager;
-import world.bentobox.bbox.managers.IslandsManager;
+import world.bentobox.bentobox.managers.IslandsManager;
-import world.bentobox.bbox.managers.LocalesManager;
+import world.bentobox.bentobox.managers.LocalesManager;
-import world.bentobox.bbox.managers.PlayersManager;
+import world.bentobox.bentobox.managers.PlayersManager;
-import world.bentobox.bbox.managers.RanksManager;
+import world.bentobox.bentobox.managers.RanksManager;
-import world.bentobox.bbox.managers.SchemsManager;
+import world.bentobox.bentobox.managers.SchemsManager;
-import world.bentobox.bbox.util.HeadGetter;
+import world.bentobox.bentobox.util.HeadGetter;
 
 /**
  * Main BentoBox class

src/main/java/world/bentobox/bentobox/Constants.java

@@ -1,4 +1,4 @@
-package world.bentobox.bbox;
+package world.bentobox.bentobox;
 
 /**
  * Contains the plugin constants.

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;

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.bentobox.api.configuration.ConfigComment;
-import world.bentobox.bbox.api.configuration.ConfigEntry;
+import world.bentobox.bentobox.api.configuration.ConfigEntry;
-import world.bentobox.bbox.api.configuration.StoreAt;
+import world.bentobox.bentobox.api.configuration.StoreAt;
-import world.bentobox.bbox.database.BSBDbSetup.DatabaseType;
+import world.bentobox.bentobox.database.BSBDbSetup.DatabaseType;
-import world.bentobox.bbox.database.objects.DataObject;
+import world.bentobox.bentobox.database.objects.DataObject;
 
 /**
  * All the plugin settings are here

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.bentobox.BentoBox;
-import world.bentobox.bbox.managers.IslandsManager;
+import world.bentobox.bentobox.managers.IslandsManager;
-import world.bentobox.bbox.managers.PlayersManager;
+import world.bentobox.bentobox.managers.PlayersManager;
 
 /**
  * Add-on class for BentoBox. Extend this to create an add-on. The operation

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.bentobox.api.addons.AddonDescription.AddonDescriptionBuilder;
-import world.bentobox.bbox.api.addons.exception.InvalidAddonFormatException;
+import world.bentobox.bentobox.api.addons.exception.InvalidAddonFormatException;
-import world.bentobox.bbox.api.addons.exception.InvalidAddonInheritException;
+import world.bentobox.bentobox.api.addons.exception.InvalidAddonInheritException;
-import world.bentobox.bbox.managers.AddonsManager;
+import world.bentobox.bentobox.managers.AddonsManager;
 
 /**
  * Loads addons and sets up permissions

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;

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

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}.

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 {
 

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;
 

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 {
 

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

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.bentobox.BentoBox;
-import world.bentobox.bbox.Settings;
+import world.bentobox.bentobox.Settings;
-import world.bentobox.bbox.api.addons.Addon;
+import world.bentobox.bentobox.api.addons.Addon;
-import world.bentobox.bbox.api.events.command.CommandEvent;
+import world.bentobox.bentobox.api.events.command.CommandEvent;
-import world.bentobox.bbox.api.localization.TextVariables;
+import world.bentobox.bentobox.api.localization.TextVariables;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
-import world.bentobox.bbox.managers.IslandWorldManager;
+import world.bentobox.bentobox.managers.IslandWorldManager;
-import world.bentobox.bbox.managers.IslandsManager;
+import world.bentobox.bentobox.managers.IslandsManager;
-import world.bentobox.bbox.managers.PlayersManager;
+import world.bentobox.bentobox.managers.PlayersManager;
-import world.bentobox.bbox.util.Util;
+import world.bentobox.bentobox.util.Util;
 
 /**
  * BSB composite command

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.bentobox.api.localization.TextVariables;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
 
 /**
  * Adds a default help to every command that will show the usage of the command

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.bentobox.BentoBox;
-import world.bentobox.bbox.api.addons.Addon;
+import world.bentobox.bentobox.api.addons.Addon;
-import world.bentobox.bbox.database.AbstractDatabaseHandler;
+import world.bentobox.bentobox.database.AbstractDatabaseHandler;
-import world.bentobox.bbox.database.flatfile.FlatFileDatabase;
+import world.bentobox.bentobox.database.flatfile.FlatFileDatabase;
 
 /**
  * Handy config class to store and load Java POJOs as YAML configs

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;

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;
 
 /**
  *

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;

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.bentobox.api.addons.Addon;
-import world.bentobox.bbox.api.flags.Flag;
+import world.bentobox.bentobox.api.flags.Flag;
 
 /**
  * Contains world-specific settings. Only getters are required, but you may need setters for your own class.

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

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;
 
 /**
  *

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;

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.bentobox.api.addons.Addon;
-import world.bentobox.bbox.api.events.PremadeEvent;
+import world.bentobox.bentobox.api.events.PremadeEvent;
 
 /**
  * @author Poslovitch

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 {
 

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.

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.bentobox.api.events.IslandBaseEvent;
-import world.bentobox.bbox.api.flags.Flag;
+import world.bentobox.bentobox.api.flags.Flag;
-import world.bentobox.bbox.database.objects.Island;
+import world.bentobox.bentobox.database.objects.Island;
 
 /**
  * This event is fired when a player changes a flag on his island

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.bentobox.api.events.IslandBaseEvent;
-import world.bentobox.bbox.database.objects.Island;
+import world.bentobox.bentobox.database.objects.Island;
 
 /**
  * Fired when a team event happens.

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.bentobox.api.events.IslandBaseEvent;
-import world.bentobox.bbox.database.objects.Island;
+import world.bentobox.bentobox.database.objects.Island;
 
 /**
  * This event is fired before an island is going to be purged.

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.

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.bentobox.api.events.IslandBaseEvent;
-import world.bentobox.bbox.database.objects.Island;
+import world.bentobox.bentobox.database.objects.Island;
 
 /**
  * Fired when a team event happens.

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.bentobox.BentoBox;
-import world.bentobox.bbox.api.localization.TextVariables;
+import world.bentobox.bentobox.api.localization.TextVariables;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
-import world.bentobox.bbox.database.objects.Island;
+import world.bentobox.bentobox.database.objects.Island;
-import world.bentobox.bbox.managers.IslandWorldManager;
+import world.bentobox.bentobox.managers.IslandWorldManager;
-import world.bentobox.bbox.managers.IslandsManager;
+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
      */

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.bentobox.BentoBox;
-import world.bentobox.bbox.api.configuration.WorldSettings;
+import world.bentobox.bentobox.api.configuration.WorldSettings;
-import world.bentobox.bbox.api.localization.TextVariables;
+import world.bentobox.bentobox.api.localization.TextVariables;
-import world.bentobox.bbox.api.panels.PanelItem;
+import world.bentobox.bentobox.api.panels.PanelItem;
-import world.bentobox.bbox.api.panels.builders.PanelItemBuilder;
+import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
-import world.bentobox.bbox.database.objects.Island;
+import world.bentobox.bentobox.database.objects.Island;
-import world.bentobox.bbox.managers.RanksManager;
+import world.bentobox.bentobox.managers.RanksManager;
 
 public class Flag implements Comparable<Flag> {
 

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.bentobox.api.flags.Flag.Type;
-import world.bentobox.bbox.api.flags.clicklisteners.CycleClick;
+import world.bentobox.bentobox.api.flags.clicklisteners.CycleClick;
-import world.bentobox.bbox.api.flags.clicklisteners.IslandToggleClick;
+import world.bentobox.bentobox.api.flags.clicklisteners.IslandToggleClick;
-import world.bentobox.bbox.api.flags.clicklisteners.WorldToggleClick;
+import world.bentobox.bentobox.api.flags.clicklisteners.WorldToggleClick;
-import world.bentobox.bbox.api.panels.PanelItem;
+import world.bentobox.bentobox.api.panels.PanelItem;
-import world.bentobox.bbox.managers.RanksManager;
+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
      */

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.bentobox.BentoBox;
-import world.bentobox.bbox.api.flags.Flag;
+import world.bentobox.bentobox.api.flags.Flag;
-import world.bentobox.bbox.api.panels.Panel;
+import world.bentobox.bentobox.api.panels.Panel;
-import world.bentobox.bbox.api.panels.PanelItem;
+import world.bentobox.bentobox.api.panels.PanelItem;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
-import world.bentobox.bbox.database.objects.Island;
+import world.bentobox.bentobox.database.objects.Island;
-import world.bentobox.bbox.managers.RanksManager;
+import world.bentobox.bentobox.managers.RanksManager;
-import world.bentobox.bbox.util.Util;
+import world.bentobox.bentobox.util.Util;
 
 /**
  * Left Clicks increase rank, right clicks lower rank

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.bentobox.BentoBox;
-import world.bentobox.bbox.api.flags.Flag;
+import world.bentobox.bentobox.api.flags.Flag;
-import world.bentobox.bbox.api.panels.Panel;
+import world.bentobox.bentobox.api.panels.Panel;
-import world.bentobox.bbox.api.panels.PanelItem.ClickHandler;
+import world.bentobox.bentobox.api.panels.PanelItem.ClickHandler;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
-import world.bentobox.bbox.database.objects.Island;
+import world.bentobox.bentobox.database.objects.Island;
-import world.bentobox.bbox.util.Util;
+import world.bentobox.bentobox.util.Util;
 
 /**
  * Toggles a island setting on/off

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.bentobox.BentoBox;
-import world.bentobox.bbox.api.flags.Flag;
+import world.bentobox.bentobox.api.flags.Flag;
-import world.bentobox.bbox.api.panels.Panel;
+import world.bentobox.bentobox.api.panels.Panel;
-import world.bentobox.bbox.api.panels.PanelItem.ClickHandler;
+import world.bentobox.bentobox.api.panels.PanelItem.ClickHandler;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
-import world.bentobox.bbox.util.Util;
+import world.bentobox.bentobox.util.Util;
 
 /**
  * Toggles a worldwide setting on/off

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

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.

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.bentobox.api.user.User;
-import world.bentobox.bbox.listeners.PanelListenerManager;
+import world.bentobox.bentobox.listeners.PanelListenerManager;
-import world.bentobox.bbox.util.HeadGetter;
+import world.bentobox.bentobox.util.HeadGetter;
-import world.bentobox.bbox.util.HeadRequester;
+import world.bentobox.bentobox.util.HeadRequester;
 
 public class Panel implements HeadRequester {
 

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.bentobox.api.panels.builders.PanelItemBuilder;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
 
 public class PanelItem {
 

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 {
 

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.bentobox.api.panels.Panel;
-import world.bentobox.bbox.api.panels.PanelItem;
+import world.bentobox.bentobox.api.panels.PanelItem;
-import world.bentobox.bbox.api.panels.PanelListener;
+import world.bentobox.bentobox.api.panels.PanelListener;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
 
 public class PanelBuilder {
     private String name;

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.bentobox.api.panels.PanelItem;
-import world.bentobox.bbox.api.panels.PanelItem.ClickHandler;
+import world.bentobox.bentobox.api.panels.PanelItem.ClickHandler;
 
 public class PanelItemBuilder {
     private ItemStack icon = new ItemStack(Material.AIR);

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

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.bentobox.BentoBox;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
 
 /**
  * Simple interface for every Placeholder API.

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 {
 

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.bentobox.BentoBox;
-import world.bentobox.bbox.api.user.User;
+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() {}

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.bentobox.BentoBox;
-import world.bentobox.bbox.api.placeholders.Placeholder;
+import world.bentobox.bentobox.api.placeholders.Placeholder;
-import world.bentobox.bbox.api.placeholders.PlaceholderAPIInterface;
+import world.bentobox.bentobox.api.placeholders.PlaceholderAPIInterface;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
-import world.bentobox.bbox.lists.Placeholders;
+import world.bentobox.bentobox.lists.Placeholders;
 
 /**
  * Built-in placeholder API

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;

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.bentobox.BentoBox;
-import world.bentobox.bbox.api.placeholders.PlaceholderHandler;
+import world.bentobox.bentobox.api.placeholders.PlaceholderHandler;
 
 /**
  * BSB's user object. Wraps Player.

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.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
 
 public class AdminClearResetsAllCommand extends CompositeCommand {
 

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.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
-import world.bentobox.bbox.util.Util;
+import world.bentobox.bentobox.util.Util;
 
 public class AdminClearResetsCommand extends CompositeCommand {
 

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.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bbox.api.localization.TextVariables;
+import world.bentobox.bentobox.api.localization.TextVariables;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
-import world.bentobox.bbox.database.objects.Island;
+import world.bentobox.bentobox.database.objects.Island;
-import world.bentobox.bbox.managers.RanksManager;
+import world.bentobox.bentobox.managers.RanksManager;
 
 /**
  * @author tastybento

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.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
 
 public class AdminInfoCommand extends CompositeCommand {
 

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.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
-import world.bentobox.bbox.database.objects.Island;
+import world.bentobox.bentobox.database.objects.Island;
-import world.bentobox.bbox.util.Util;
+import world.bentobox.bentobox.util.Util;
 
 public class AdminRegisterCommand extends CompositeCommand {
 

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.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
 
 /**
  * @author tastybento

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.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
-import world.bentobox.bbox.island.builders.Clipboard;
+import world.bentobox.bentobox.island.builders.Clipboard;
-import world.bentobox.bbox.util.Util;
+import world.bentobox.bentobox.util.Util;
 
 public class AdminSchemCommand extends CompositeCommand {
     private Map<UUID, Clipboard> clipboards;

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.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
-import world.bentobox.bbox.database.objects.Island;
+import world.bentobox.bentobox.database.objects.Island;
-import world.bentobox.bbox.managers.RanksManager;
+import world.bentobox.bentobox.managers.RanksManager;
 
 /**
  * @author tastybento

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.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
-import world.bentobox.bbox.util.Util;
+import world.bentobox.bentobox.util.Util;
-import world.bentobox.bbox.util.teleport.SafeTeleportBuilder;
+import world.bentobox.bentobox.util.teleport.SafeTeleportBuilder;
 
 public class AdminTeleportCommand extends CompositeCommand {
 

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.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
-import world.bentobox.bbox.util.Util;
+import world.bentobox.bentobox.util.Util;
 
 public class AdminUnregisterCommand extends CompositeCommand {
 

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.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
 
 public class AdminVersionCommand extends CompositeCommand {
 

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.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
 
 /**
  * @author Poslovitch

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.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
 
 /**
  * @author Poslovitch

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.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bbox.api.localization.TextVariables;
+import world.bentobox.bentobox.api.localization.TextVariables;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
-import world.bentobox.bbox.database.objects.Island;
+import world.bentobox.bentobox.database.objects.Island;
 
 public class AdminRangeResetCommand extends CompositeCommand {
 

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.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bbox.api.localization.TextVariables;
+import world.bentobox.bentobox.api.localization.TextVariables;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
-import world.bentobox.bbox.database.objects.Island;
+import world.bentobox.bentobox.database.objects.Island;
 
 public class AdminRangeSetCommand extends CompositeCommand {
 

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.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bbox.api.localization.TextVariables;
+import world.bentobox.bentobox.api.localization.TextVariables;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
 
 public class AdminTeamAddCommand extends CompositeCommand {
 

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.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
 
 public class AdminTeamDisbandCommand extends CompositeCommand {
 

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.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
 
 public class AdminTeamKickCommand extends CompositeCommand {
 

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.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
 
 public class AdminTeamMakeLeaderCommand extends CompositeCommand {
 

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.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
-import world.bentobox.bbox.util.Util;
+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.

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.bentobox.BentoBox;
-import world.bentobox.bbox.api.commands.CompositeCommand;
+import world.bentobox.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
 
 public class IslandAboutCommand extends CompositeCommand {
 

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.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bbox.api.localization.TextVariables;
+import world.bentobox.bentobox.api.localization.TextVariables;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
-import world.bentobox.bbox.database.objects.Island;
+import world.bentobox.bentobox.database.objects.Island;
-import world.bentobox.bbox.util.Util;
+import world.bentobox.bentobox.util.Util;
 
 public class IslandBanCommand extends CompositeCommand {
 

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.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
-import world.bentobox.bbox.database.objects.Island;
+import world.bentobox.bentobox.database.objects.Island;
 
 public class IslandBanlistCommand extends CompositeCommand {
 

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.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bbox.api.events.island.IslandEvent.Reason;
+import world.bentobox.bentobox.api.events.island.IslandEvent.Reason;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
-import world.bentobox.bbox.managers.island.NewIsland;
+import world.bentobox.bentobox.managers.island.NewIsland;
 
 /**
  * /island create - Create an island.

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.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bbox.api.localization.TextVariables;
+import world.bentobox.bentobox.api.localization.TextVariables;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
-import world.bentobox.bbox.util.Util;
+import world.bentobox.bentobox.util.Util;
 
 /**
  * @author tastybento

src/main/java/world/bentobox/bentobox/commands/island/IslandInfoCommand.java

@@ -0,0 +1,4 @@
+package world.bentobox.bentobox.commands.island;
+
+public class IslandInfoCommand {
+}

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.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
-import world.bentobox.bbox.panels.LanguagePanel;
+import world.bentobox.bentobox.panels.LanguagePanel;
 
 /**
  * @author Poslovitch

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.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bbox.api.events.island.IslandEvent.Reason;
+import world.bentobox.bentobox.api.events.island.IslandEvent.Reason;
-import world.bentobox.bbox.api.localization.TextVariables;
+import world.bentobox.bentobox.api.localization.TextVariables;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
-import world.bentobox.bbox.database.objects.Island;
+import world.bentobox.bentobox.database.objects.Island;
-import world.bentobox.bbox.managers.island.NewIsland;
+import world.bentobox.bentobox.managers.island.NewIsland;
 
 public class IslandResetCommand extends CompositeCommand {
 

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.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
 
 /**
  * @author tastybento

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.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bbox.api.localization.TextVariables;
+import world.bentobox.bentobox.api.localization.TextVariables;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
-import world.bentobox.bbox.util.Util;
+import world.bentobox.bentobox.util.Util;
 
 public class IslandSethomeCommand extends CompositeCommand {
 

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.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bbox.api.localization.TextVariables;
+import world.bentobox.bentobox.api.localization.TextVariables;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
 
 /**
  * @author tastybento

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.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bbox.api.flags.Flag;
+import world.bentobox.bentobox.api.flags.Flag;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
-import world.bentobox.bbox.panels.SettingsPanel;
+import world.bentobox.bentobox.panels.SettingsPanel;
-import world.bentobox.bbox.util.Util;
+import world.bentobox.bentobox.util.Util;
 
 /**
  * @author Poslovitch

src/main/java/world/bentobox/bentobox/commands/island/IslandSpawnCommand.java

@@ -0,0 +1,4 @@
+package world.bentobox.bentobox.commands.island;
+
+public class IslandSpawnCommand {
+}

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.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bbox.api.localization.TextVariables;
+import world.bentobox.bentobox.api.localization.TextVariables;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
-import world.bentobox.bbox.database.objects.Island;
+import world.bentobox.bentobox.database.objects.Island;
-import world.bentobox.bbox.util.Util;
+import world.bentobox.bentobox.util.Util;
 
 public class IslandUnbanCommand extends CompositeCommand {
 

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.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bbox.api.events.IslandBaseEvent;
+import world.bentobox.bentobox.api.events.IslandBaseEvent;
-import world.bentobox.bbox.api.events.team.TeamEvent;
+import world.bentobox.bentobox.api.events.team.TeamEvent;
-import world.bentobox.bbox.api.localization.TextVariables;
+import world.bentobox.bentobox.api.localization.TextVariables;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
 
 public class IslandTeamCommand extends CompositeCommand {
 

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.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bbox.api.events.IslandBaseEvent;
+import world.bentobox.bentobox.api.events.IslandBaseEvent;
-import world.bentobox.bbox.api.events.team.TeamEvent;
+import world.bentobox.bentobox.api.events.team.TeamEvent;
-import world.bentobox.bbox.api.localization.TextVariables;
+import world.bentobox.bentobox.api.localization.TextVariables;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
-import world.bentobox.bbox.database.objects.Island;
+import world.bentobox.bentobox.database.objects.Island;
 
 public class IslandTeamInviteAcceptCommand extends CompositeCommand {
 

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.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bbox.api.events.IslandBaseEvent;
+import world.bentobox.bentobox.api.events.IslandBaseEvent;
-import world.bentobox.bbox.api.events.team.TeamEvent;
+import world.bentobox.bentobox.api.events.team.TeamEvent;
-import world.bentobox.bbox.api.localization.TextVariables;
+import world.bentobox.bentobox.api.localization.TextVariables;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
-import world.bentobox.bbox.util.Util;
+import world.bentobox.bentobox.util.Util;
 
 public class IslandTeamInviteCommand extends CompositeCommand {
 

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.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bbox.api.events.IslandBaseEvent;
+import world.bentobox.bentobox.api.events.IslandBaseEvent;
-import world.bentobox.bbox.api.events.team.TeamEvent;
+import world.bentobox.bentobox.api.events.team.TeamEvent;
-import world.bentobox.bbox.api.localization.TextVariables;
+import world.bentobox.bentobox.api.localization.TextVariables;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
 
 public class IslandTeamInviteRejectCommand extends CompositeCommand {
     

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.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
 
 public class IslandTeamKickCommand extends CompositeCommand {
 

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.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bbox.api.localization.TextVariables;
+import world.bentobox.bentobox.api.localization.TextVariables;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
 
 public class IslandTeamLeaveCommand extends CompositeCommand {
 

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.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bbox.api.localization.TextVariables;
+import world.bentobox.bentobox.api.localization.TextVariables;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
 
 public class IslandTeamPromoteCommand extends CompositeCommand {
 

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.bentobox.api.commands.CompositeCommand;
-import world.bentobox.bbox.api.events.IslandBaseEvent;
+import world.bentobox.bentobox.api.events.IslandBaseEvent;
-import world.bentobox.bbox.api.events.team.TeamEvent;
+import world.bentobox.bentobox.api.events.team.TeamEvent;
-import world.bentobox.bbox.api.user.User;
+import world.bentobox.bentobox.api.user.User;
-import world.bentobox.bbox.util.Util;
+import world.bentobox.bentobox.util.Util;
 
 public class IslandTeamSetownerCommand extends CompositeCommand {
 

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

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.bentobox.BentoBox;
-import world.bentobox.bbox.api.addons.Addon;
+import world.bentobox.bentobox.api.addons.Addon;
 
 /**
  * Handy class to store and load Java POJOs in the Database

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.bentobox.BentoBox;
-import world.bentobox.bbox.database.flatfile.FlatFileDatabase;
+import world.bentobox.bentobox.database.flatfile.FlatFileDatabase;
-import world.bentobox.bbox.database.mongodb.MongoDBDatabase;
+import world.bentobox.bentobox.database.mongodb.MongoDBDatabase;
-import world.bentobox.bbox.database.mysql.MySQLDatabase;
+import world.bentobox.bentobox.database.mysql.MySQLDatabase;
 
 public abstract class BSBDbSetup {
 

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;
 

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;