diff --git a/pom.xml b/pom.xml index e96246d..b0d634c 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,6 @@ 4.0.0 - Level Level 0.0.1-SNAPSHOT jar @@ -60,4 +59,5 @@ https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + bskyblock.addon \ No newline at end of file diff --git a/src/bskyblock/addin/level/ChunkScanner.java b/src/bskyblock/addon/level/ChunkScanner.java similarity index 99% rename from src/bskyblock/addin/level/ChunkScanner.java rename to src/bskyblock/addon/level/ChunkScanner.java index b4fcd2d..8c549ca 100644 --- a/src/bskyblock/addin/level/ChunkScanner.java +++ b/src/bskyblock/addon/level/ChunkScanner.java @@ -1,4 +1,4 @@ -package bskyblock.addin.level; +package bskyblock.addon.level; import java.util.ArrayList; import java.util.HashMap; @@ -16,9 +16,11 @@ import org.bukkit.material.MaterialData; import com.google.common.collect.HashMultiset; import com.google.common.collect.Multiset; import com.google.common.collect.Multiset.Entry; + +import bskyblock.addon.level.config.Settings; + import com.google.common.collect.Multisets; -import bskyblock.addin.level.config.Settings; import us.tastybento.bskyblock.BSkyBlock; import us.tastybento.bskyblock.api.commands.User; import us.tastybento.bskyblock.database.objects.Island; diff --git a/src/bskyblock/addin/level/Level.java b/src/bskyblock/addon/level/Level.java similarity index 95% rename from src/bskyblock/addin/level/Level.java rename to src/bskyblock/addon/level/Level.java index fbe8cb0..815c03d 100644 --- a/src/bskyblock/addin/level/Level.java +++ b/src/bskyblock/addon/level/Level.java @@ -1,4 +1,4 @@ -package bskyblock.addin.level; +package bskyblock.addon.level; import java.beans.IntrospectionException; import java.lang.reflect.InvocationTargetException; @@ -9,12 +9,12 @@ import java.util.UUID; import org.bukkit.scheduler.BukkitTask; -import bskyblock.addin.level.commands.AdminLevel; -import bskyblock.addin.level.commands.AdminTop; -import bskyblock.addin.level.commands.IslandLevel; -import bskyblock.addin.level.commands.IslandTop; -import bskyblock.addin.level.config.PluginConfig; -import bskyblock.addin.level.database.object.Levels; +import bskyblock.addon.level.commands.AdminLevel; +import bskyblock.addon.level.commands.AdminTop; +import bskyblock.addon.level.commands.IslandLevel; +import bskyblock.addon.level.commands.IslandTop; +import bskyblock.addon.level.config.PluginConfig; +import bskyblock.addon.level.database.object.Levels; import us.tastybento.bskyblock.BSkyBlock; import us.tastybento.bskyblock.api.addons.Addon; import us.tastybento.bskyblock.api.commands.CompositeCommand; diff --git a/src/bskyblock/addin/level/LevelPlugin.java b/src/bskyblock/addon/level/LevelPlugin.java similarity index 93% rename from src/bskyblock/addin/level/LevelPlugin.java rename to src/bskyblock/addon/level/LevelPlugin.java index fe8e622..5846826 100644 --- a/src/bskyblock/addin/level/LevelPlugin.java +++ b/src/bskyblock/addon/level/LevelPlugin.java @@ -1,4 +1,4 @@ -package bskyblock.addin.level; +package bskyblock.addon.level; import java.util.logging.Logger; diff --git a/src/bskyblock/addin/level/LevelPresenter.java b/src/bskyblock/addon/level/LevelPresenter.java similarity index 99% rename from src/bskyblock/addin/level/LevelPresenter.java rename to src/bskyblock/addon/level/LevelPresenter.java index 0ee0481..ef428bd 100644 --- a/src/bskyblock/addin/level/LevelPresenter.java +++ b/src/bskyblock/addon/level/LevelPresenter.java @@ -1,4 +1,4 @@ -package bskyblock.addin.level; +package bskyblock.addon.level; import java.util.Calendar; import java.util.HashMap; diff --git a/src/bskyblock/addin/level/TopTen.java b/src/bskyblock/addon/level/TopTen.java similarity index 98% rename from src/bskyblock/addin/level/TopTen.java rename to src/bskyblock/addon/level/TopTen.java index a272278..9932d0b 100644 --- a/src/bskyblock/addin/level/TopTen.java +++ b/src/bskyblock/addon/level/TopTen.java @@ -15,7 +15,7 @@ * along with ASkyBlock. If not, see . *******************************************************************************/ -package bskyblock.addin.level; +package bskyblock.addon.level; import java.beans.IntrospectionException; import java.lang.reflect.InvocationTargetException; @@ -41,9 +41,9 @@ import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.SkullMeta; -import bskyblock.addin.level.database.object.Levels; -import bskyblock.addin.level.database.object.TopTenList; -import bskyblock.addin.level.event.TopTenClick; +import bskyblock.addon.level.database.object.Levels; +import bskyblock.addon.level.database.object.TopTenList; +import bskyblock.addon.level.event.TopTenClick; import us.tastybento.bskyblock.BSkyBlock; import us.tastybento.bskyblock.config.Settings; import us.tastybento.bskyblock.database.BSBDatabase; diff --git a/src/bskyblock/addin/level/commands/AdminLevel.java b/src/bskyblock/addon/level/commands/AdminLevel.java similarity index 95% rename from src/bskyblock/addin/level/commands/AdminLevel.java rename to src/bskyblock/addon/level/commands/AdminLevel.java index 35f7329..de7f86b 100644 --- a/src/bskyblock/addin/level/commands/AdminLevel.java +++ b/src/bskyblock/addon/level/commands/AdminLevel.java @@ -1,9 +1,9 @@ -package bskyblock.addin.level.commands; +package bskyblock.addon.level.commands; import java.util.List; import java.util.UUID; -import bskyblock.addin.level.Level; +import bskyblock.addon.level.Level; import us.tastybento.bskyblock.api.commands.CompositeCommand; import us.tastybento.bskyblock.api.commands.User; import us.tastybento.bskyblock.config.Settings; diff --git a/src/bskyblock/addin/level/commands/AdminTop.java b/src/bskyblock/addon/level/commands/AdminTop.java similarity index 94% rename from src/bskyblock/addin/level/commands/AdminTop.java rename to src/bskyblock/addon/level/commands/AdminTop.java index 1ab4ed7..6f48520 100644 --- a/src/bskyblock/addin/level/commands/AdminTop.java +++ b/src/bskyblock/addon/level/commands/AdminTop.java @@ -1,10 +1,12 @@ -package bskyblock.addin.level.commands; +package bskyblock.addon.level.commands; import java.util.List; import java.util.Map.Entry; + +import bskyblock.addon.level.Level; + import java.util.UUID; -import bskyblock.addin.level.Level; import us.tastybento.bskyblock.BSkyBlock; import us.tastybento.bskyblock.api.commands.CompositeCommand; import us.tastybento.bskyblock.api.commands.User; diff --git a/src/bskyblock/addin/level/commands/IslandLevel.java b/src/bskyblock/addon/level/commands/IslandLevel.java similarity index 96% rename from src/bskyblock/addin/level/commands/IslandLevel.java rename to src/bskyblock/addon/level/commands/IslandLevel.java index 050e3d3..f5b3fa6 100644 --- a/src/bskyblock/addin/level/commands/IslandLevel.java +++ b/src/bskyblock/addon/level/commands/IslandLevel.java @@ -1,9 +1,9 @@ -package bskyblock.addin.level.commands; +package bskyblock.addon.level.commands; import java.util.List; import java.util.UUID; -import bskyblock.addin.level.Level; +import bskyblock.addon.level.Level; import us.tastybento.bskyblock.api.commands.CompositeCommand; import us.tastybento.bskyblock.api.commands.User; import us.tastybento.bskyblock.config.Settings; diff --git a/src/bskyblock/addin/level/commands/IslandTop.java b/src/bskyblock/addon/level/commands/IslandTop.java similarity index 90% rename from src/bskyblock/addin/level/commands/IslandTop.java rename to src/bskyblock/addon/level/commands/IslandTop.java index 1aa75a6..3916867 100644 --- a/src/bskyblock/addin/level/commands/IslandTop.java +++ b/src/bskyblock/addon/level/commands/IslandTop.java @@ -1,8 +1,8 @@ -package bskyblock.addin.level.commands; +package bskyblock.addon.level.commands; import java.util.List; -import bskyblock.addin.level.Level; +import bskyblock.addon.level.Level; import us.tastybento.bskyblock.api.commands.CompositeCommand; import us.tastybento.bskyblock.api.commands.User; import us.tastybento.bskyblock.config.Settings; diff --git a/src/bskyblock/addin/level/config/PluginConfig.java b/src/bskyblock/addon/level/config/PluginConfig.java similarity index 98% rename from src/bskyblock/addin/level/config/PluginConfig.java rename to src/bskyblock/addon/level/config/PluginConfig.java index ae70d30..065fd69 100644 --- a/src/bskyblock/addin/level/config/PluginConfig.java +++ b/src/bskyblock/addon/level/config/PluginConfig.java @@ -1,4 +1,4 @@ -package bskyblock.addin.level.config; +package bskyblock.addon.level.config; import java.util.HashMap; @@ -6,7 +6,7 @@ import org.apache.commons.lang.StringUtils; import org.bukkit.Material; import org.bukkit.material.MaterialData; -import bskyblock.addin.level.Level; +import bskyblock.addon.level.Level; public class PluginConfig { private static final boolean DEBUG = false; diff --git a/src/bskyblock/addin/level/config/Settings.java b/src/bskyblock/addon/level/config/Settings.java similarity index 94% rename from src/bskyblock/addin/level/config/Settings.java rename to src/bskyblock/addon/level/config/Settings.java index d01dfea..66b046f 100644 --- a/src/bskyblock/addin/level/config/Settings.java +++ b/src/bskyblock/addon/level/config/Settings.java @@ -1,4 +1,4 @@ -package bskyblock.addin.level.config; +package bskyblock.addon.level.config; import java.util.HashMap; diff --git a/src/bskyblock/addin/level/database/object/Levels.java b/src/bskyblock/addon/level/database/object/Levels.java similarity index 91% rename from src/bskyblock/addin/level/database/object/Levels.java rename to src/bskyblock/addon/level/database/object/Levels.java index 08d969c..9b4e211 100644 --- a/src/bskyblock/addin/level/database/object/Levels.java +++ b/src/bskyblock/addon/level/database/object/Levels.java @@ -1,4 +1,4 @@ -package bskyblock.addin.level.database.object; +package bskyblock.addon.level.database.object; import us.tastybento.bskyblock.database.objects.DataObject; diff --git a/src/bskyblock/addin/level/database/object/TopTenList.java b/src/bskyblock/addon/level/database/object/TopTenList.java similarity index 97% rename from src/bskyblock/addin/level/database/object/TopTenList.java rename to src/bskyblock/addon/level/database/object/TopTenList.java index f2a22f8..b9ca079 100644 --- a/src/bskyblock/addin/level/database/object/TopTenList.java +++ b/src/bskyblock/addon/level/database/object/TopTenList.java @@ -1,4 +1,4 @@ -package bskyblock.addin.level.database.object; +package bskyblock.addon.level.database.object; import java.util.Comparator; import java.util.HashMap; diff --git a/src/bskyblock/addin/level/event/IslandPostLevelEvent.java b/src/bskyblock/addon/level/event/IslandPostLevelEvent.java similarity index 97% rename from src/bskyblock/addin/level/event/IslandPostLevelEvent.java rename to src/bskyblock/addon/level/event/IslandPostLevelEvent.java index 478bd5b..c35e377 100644 --- a/src/bskyblock/addin/level/event/IslandPostLevelEvent.java +++ b/src/bskyblock/addon/level/event/IslandPostLevelEvent.java @@ -1,4 +1,4 @@ -package bskyblock.addin.level.event; +package bskyblock.addon.level.event; import java.util.UUID; diff --git a/src/bskyblock/addin/level/event/IslandPreLevelEvent.java b/src/bskyblock/addon/level/event/IslandPreLevelEvent.java similarity index 96% rename from src/bskyblock/addin/level/event/IslandPreLevelEvent.java rename to src/bskyblock/addon/level/event/IslandPreLevelEvent.java index f3d8bd0..41fce47 100644 --- a/src/bskyblock/addin/level/event/IslandPreLevelEvent.java +++ b/src/bskyblock/addon/level/event/IslandPreLevelEvent.java @@ -1,4 +1,4 @@ -package bskyblock.addin.level.event; +package bskyblock.addon.level.event; import java.util.UUID; diff --git a/src/bskyblock/addin/level/event/TopTenClick.java b/src/bskyblock/addon/level/event/TopTenClick.java similarity index 96% rename from src/bskyblock/addin/level/event/TopTenClick.java rename to src/bskyblock/addon/level/event/TopTenClick.java index e7672b8..8159fc4 100644 --- a/src/bskyblock/addin/level/event/TopTenClick.java +++ b/src/bskyblock/addon/level/event/TopTenClick.java @@ -1,4 +1,4 @@ -package bskyblock.addin.level.event; +package bskyblock.addon.level.event; import org.bukkit.event.Cancellable; import org.bukkit.event.Event;