diff --git a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/UltimateStacker.java b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/UltimateStacker.java index 71fb9f6..eacd32d 100644 --- a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/UltimateStacker.java +++ b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/UltimateStacker.java @@ -8,6 +8,7 @@ import com.craftaro.ultimatestacker.api.stack.entity.EntityStackManager; import com.craftaro.ultimatestacker.api.stack.item.StackedItemManager; import com.craftaro.ultimatestacker.api.stack.spawner.SpawnerStack; import com.craftaro.ultimatestacker.api.stack.spawner.SpawnerStackManager; +import com.craftaro.ultimatestacker.api.utils.Hologramable; import com.craftaro.ultimatestacker.commands.CommandConvert; import com.craftaro.ultimatestacker.commands.CommandGiveSpawner; import com.craftaro.ultimatestacker.commands.CommandLootables; @@ -20,20 +21,32 @@ import com.craftaro.ultimatestacker.database.migrations._1_InitialMigration; import com.craftaro.ultimatestacker.database.migrations._2_EntityStacks; import com.craftaro.ultimatestacker.database.migrations._3_BlockStacks; import com.craftaro.ultimatestacker.database.migrations._6_RemoveStackedEntityTable; +import com.craftaro.ultimatestacker.hook.StackerHook; import com.craftaro.ultimatestacker.hook.hooks.JobsHook; +import com.craftaro.ultimatestacker.listeners.BlockListeners; +import com.craftaro.ultimatestacker.listeners.BreedListeners; +import com.craftaro.ultimatestacker.listeners.ClearLagListeners; +import com.craftaro.ultimatestacker.listeners.DeathListeners; +import com.craftaro.ultimatestacker.listeners.InteractListeners; import com.craftaro.ultimatestacker.listeners.ShearListeners; import com.craftaro.ultimatestacker.listeners.SheepDyeListeners; import com.craftaro.ultimatestacker.listeners.SpawnerListeners; import com.craftaro.ultimatestacker.listeners.TameListeners; +import com.craftaro.ultimatestacker.listeners.entity.EntityCurrentListener; +import com.craftaro.ultimatestacker.listeners.entity.EntityListeners; import com.craftaro.ultimatestacker.listeners.item.ItemCurrentListener; import com.craftaro.ultimatestacker.listeners.item.ItemLegacyListener; import com.craftaro.ultimatestacker.listeners.item.ItemListeners; import com.craftaro.ultimatestacker.lootables.LootablesManager; +import com.craftaro.ultimatestacker.settings.Settings; import com.craftaro.ultimatestacker.stackable.block.BlockStackImpl; +import com.craftaro.ultimatestacker.stackable.block.BlockStackManagerImpl; import com.craftaro.ultimatestacker.stackable.entity.EntityStackManagerImpl; import com.craftaro.ultimatestacker.stackable.entity.custom.CustomEntityManager; import com.craftaro.ultimatestacker.stackable.item.StackedItemManagerImpl; import com.craftaro.ultimatestacker.stackable.spawner.SpawnerStackImpl; +import com.craftaro.ultimatestacker.stackable.spawner.SpawnerStackManagerImpl; +import com.craftaro.ultimatestacker.tasks.StackingTask; import com.craftaro.ultimatestacker.utils.Async; import com.songoda.core.SongodaCore; import com.songoda.core.SongodaPlugin; @@ -51,19 +64,6 @@ import com.songoda.core.hooks.HologramManager; import com.songoda.core.hooks.ProtectionManager; import com.songoda.core.hooks.WorldGuardHook; import com.songoda.core.utils.TextUtils; -import com.craftaro.ultimatestacker.hook.StackerHook; -import com.craftaro.ultimatestacker.listeners.BlockListeners; -import com.craftaro.ultimatestacker.listeners.BreedListeners; -import com.craftaro.ultimatestacker.listeners.ClearLagListeners; -import com.craftaro.ultimatestacker.listeners.DeathListeners; -import com.craftaro.ultimatestacker.listeners.InteractListeners; -import com.craftaro.ultimatestacker.listeners.entity.EntityCurrentListener; -import com.craftaro.ultimatestacker.listeners.entity.EntityListeners; -import com.craftaro.ultimatestacker.settings.Settings; -import com.craftaro.ultimatestacker.api.utils.Hologramable; -import com.craftaro.ultimatestacker.stackable.block.BlockStackManagerImpl; -import com.craftaro.ultimatestacker.stackable.spawner.SpawnerStackManagerImpl; -import com.craftaro.ultimatestacker.tasks.StackingTask; import org.apache.commons.lang.WordUtils; import org.bukkit.Bukkit; import org.bukkit.Material; diff --git a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/commands/CommandGiveSpawner.java b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/commands/CommandGiveSpawner.java index 8066ad4..a21d169 100644 --- a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/commands/CommandGiveSpawner.java +++ b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/commands/CommandGiveSpawner.java @@ -1,9 +1,9 @@ package com.craftaro.ultimatestacker.commands; +import com.craftaro.ultimatestacker.UltimateStacker; import com.craftaro.ultimatestacker.utils.Methods; import com.songoda.core.commands.AbstractCommand; import com.songoda.core.utils.TextUtils; -import com.craftaro.ultimatestacker.UltimateStacker; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.EntityType; diff --git a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/commands/CommandLootables.java b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/commands/CommandLootables.java index cea2fed..3210492 100644 --- a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/commands/CommandLootables.java +++ b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/commands/CommandLootables.java @@ -1,8 +1,8 @@ package com.craftaro.ultimatestacker.commands; +import com.craftaro.ultimatestacker.UltimateStacker; import com.songoda.core.commands.AbstractCommand; import com.songoda.core.lootables.gui.GuiEditor; -import com.craftaro.ultimatestacker.UltimateStacker; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/commands/CommandReload.java b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/commands/CommandReload.java index f358631..17b73e5 100644 --- a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/commands/CommandReload.java +++ b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/commands/CommandReload.java @@ -1,7 +1,7 @@ package com.craftaro.ultimatestacker.commands; -import com.songoda.core.commands.AbstractCommand; import com.craftaro.ultimatestacker.UltimateStacker; +import com.songoda.core.commands.AbstractCommand; import org.bukkit.command.CommandSender; import java.util.List; diff --git a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/commands/CommandRemoveAll.java b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/commands/CommandRemoveAll.java index f2a38d8..c6d2355 100644 --- a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/commands/CommandRemoveAll.java +++ b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/commands/CommandRemoveAll.java @@ -1,10 +1,10 @@ package com.craftaro.ultimatestacker.commands; +import com.craftaro.ultimatestacker.UltimateStacker; import com.craftaro.ultimatestacker.api.stack.entity.EntityStack; import com.craftaro.ultimatestacker.api.stack.entity.EntityStackManager; import com.songoda.core.commands.AbstractCommand; import com.songoda.core.utils.TextUtils; -import com.craftaro.ultimatestacker.UltimateStacker; import org.bukkit.Bukkit; import org.bukkit.World; import org.bukkit.command.CommandSender; diff --git a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/commands/CommandSettings.java b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/commands/CommandSettings.java index ae9902a..12f91b1 100644 --- a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/commands/CommandSettings.java +++ b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/commands/CommandSettings.java @@ -1,9 +1,9 @@ package com.craftaro.ultimatestacker.commands; +import com.craftaro.ultimatestacker.UltimateStacker; import com.songoda.core.commands.AbstractCommand; import com.songoda.core.configuration.editor.PluginConfigGui; import com.songoda.core.gui.GuiManager; -import com.craftaro.ultimatestacker.UltimateStacker; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/commands/CommandSpawn.java b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/commands/CommandSpawn.java index 6726647..d978fd4 100644 --- a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/commands/CommandSpawn.java +++ b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/commands/CommandSpawn.java @@ -1,9 +1,9 @@ package com.craftaro.ultimatestacker.commands; +import com.craftaro.ultimatestacker.UltimateStacker; import com.craftaro.ultimatestacker.api.stack.entity.EntityStack; import com.songoda.core.commands.AbstractCommand; import com.songoda.core.utils.TextUtils; -import com.craftaro.ultimatestacker.UltimateStacker; import org.bukkit.command.CommandSender; import org.bukkit.entity.EntityType; import org.bukkit.entity.LivingEntity; diff --git a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/database/migrations/_1_InitialMigration.java b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/database/migrations/_1_InitialMigration.java index 3df7466..b67e762 100644 --- a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/database/migrations/_1_InitialMigration.java +++ b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/database/migrations/_1_InitialMigration.java @@ -1,8 +1,8 @@ package com.craftaro.ultimatestacker.database.migrations; +import com.craftaro.ultimatestacker.UltimateStacker; import com.songoda.core.database.DataMigration; import com.songoda.core.database.MySQLConnector; -import com.craftaro.ultimatestacker.UltimateStacker; import java.sql.Connection; import java.sql.SQLException; diff --git a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/database/migrations/_2_EntityStacks.java b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/database/migrations/_2_EntityStacks.java index 862b292..536a445 100644 --- a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/database/migrations/_2_EntityStacks.java +++ b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/database/migrations/_2_EntityStacks.java @@ -1,8 +1,8 @@ package com.craftaro.ultimatestacker.database.migrations; +import com.craftaro.ultimatestacker.UltimateStacker; import com.songoda.core.database.DataMigration; import com.songoda.core.database.MySQLConnector; -import com.craftaro.ultimatestacker.UltimateStacker; import java.sql.Connection; import java.sql.SQLException; diff --git a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/database/migrations/_3_BlockStacks.java b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/database/migrations/_3_BlockStacks.java index 2ef4541..7bb1937 100644 --- a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/database/migrations/_3_BlockStacks.java +++ b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/database/migrations/_3_BlockStacks.java @@ -1,8 +1,8 @@ package com.craftaro.ultimatestacker.database.migrations; +import com.craftaro.ultimatestacker.UltimateStacker; import com.songoda.core.database.DataMigration; import com.songoda.core.database.MySQLConnector; -import com.craftaro.ultimatestacker.UltimateStacker; import java.sql.Connection; import java.sql.SQLException; diff --git a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/hook/hooks/JobsHook.java b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/hook/hooks/JobsHook.java index 552251e..3893568 100644 --- a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/hook/hooks/JobsHook.java +++ b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/hook/hooks/JobsHook.java @@ -1,9 +1,8 @@ package com.craftaro.ultimatestacker.hook.hooks; -import com.bgsoftware.wildstacker.api.objects.StackedEntity; import com.craftaro.ultimatestacker.api.stack.entity.EntityStack; -import com.songoda.core.hooks.jobs.JobsPlayerHandler; import com.craftaro.ultimatestacker.hook.StackerHook; +import com.songoda.core.hooks.jobs.JobsPlayerHandler; import org.bukkit.GameMode; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; diff --git a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/listeners/BlockListeners.java b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/listeners/BlockListeners.java index a53780a..1c13038 100644 --- a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/listeners/BlockListeners.java +++ b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/listeners/BlockListeners.java @@ -2,10 +2,11 @@ package com.craftaro.ultimatestacker.listeners; import com.craftaro.ultimatestacker.UltimateStacker; import com.craftaro.ultimatestacker.api.UltimateStackerAPI; +import com.craftaro.ultimatestacker.api.events.spawner.SpawnerBreakEvent; +import com.craftaro.ultimatestacker.api.events.spawner.SpawnerPlaceEvent; import com.craftaro.ultimatestacker.api.stack.block.BlockStack; import com.craftaro.ultimatestacker.api.stack.block.BlockStackManager; import com.craftaro.ultimatestacker.api.stack.spawner.SpawnerStack; -import com.craftaro.ultimatestacker.api.events.spawner.SpawnerBreakEvent; import com.craftaro.ultimatestacker.settings.Settings; import com.craftaro.ultimatestacker.stackable.spawner.SpawnerStackImpl; import com.craftaro.ultimatestacker.utils.Methods; @@ -13,7 +14,6 @@ import com.songoda.core.compatibility.CompatibleHand; import com.songoda.core.compatibility.CompatibleMaterial; import com.songoda.core.hooks.ProtectionManager; import com.songoda.core.third_party.de.tr7zw.nbtapi.NBTItem; -import com.craftaro.ultimatestacker.api.events.spawner.SpawnerPlaceEvent; import org.apache.commons.lang.math.NumberUtils; import org.bukkit.Bukkit; import org.bukkit.GameMode; diff --git a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/listeners/ShearListeners.java b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/listeners/ShearListeners.java index ec07e9b..c9155bf 100644 --- a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/listeners/ShearListeners.java +++ b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/listeners/ShearListeners.java @@ -1,13 +1,12 @@ package com.craftaro.ultimatestacker.listeners; +import com.craftaro.ultimatestacker.UltimateStacker; import com.craftaro.ultimatestacker.api.stack.entity.EntityStack; import com.craftaro.ultimatestacker.api.stack.entity.EntityStackManager; +import com.craftaro.ultimatestacker.settings.Settings; +import com.craftaro.ultimatestacker.stackable.entity.Split; import com.songoda.core.compatibility.CompatibleMaterial; import com.songoda.core.compatibility.ServerVersion; -import com.craftaro.ultimatestacker.UltimateStacker; -import com.craftaro.ultimatestacker.settings.Settings; -import com.craftaro.ultimatestacker.stackable.entity.EntityStackManagerImpl; -import com.craftaro.ultimatestacker.stackable.entity.Split; import org.bukkit.Material; import org.bukkit.World; import org.bukkit.entity.Entity; diff --git a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/listeners/SheepDyeListeners.java b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/listeners/SheepDyeListeners.java index 1b6112f..af54600 100644 --- a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/listeners/SheepDyeListeners.java +++ b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/listeners/SheepDyeListeners.java @@ -4,7 +4,6 @@ import com.craftaro.ultimatestacker.UltimateStacker; import com.craftaro.ultimatestacker.api.stack.entity.EntityStack; import com.craftaro.ultimatestacker.api.stack.entity.EntityStackManager; import com.craftaro.ultimatestacker.settings.Settings; -import com.craftaro.ultimatestacker.stackable.entity.EntityStackManagerImpl; import com.craftaro.ultimatestacker.stackable.entity.Split; import org.bukkit.entity.LivingEntity; import org.bukkit.event.EventHandler; diff --git a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/listeners/SpawnerListeners.java b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/listeners/SpawnerListeners.java index 6f65cb4..e904fee 100644 --- a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/listeners/SpawnerListeners.java +++ b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/listeners/SpawnerListeners.java @@ -1,16 +1,16 @@ package com.craftaro.ultimatestacker.listeners; +import com.craftaro.ultimatestacker.UltimateStacker; import com.craftaro.ultimatestacker.api.UltimateStackerAPI; import com.craftaro.ultimatestacker.api.stack.spawner.SpawnerStack; import com.craftaro.ultimatestacker.api.stack.spawner.SpawnerStackManager; +import com.craftaro.ultimatestacker.settings.Settings; +import com.craftaro.ultimatestacker.stackable.spawner.SpawnerStackImpl; import com.songoda.core.compatibility.CompatibleHand; import com.songoda.core.compatibility.ServerVersion; import com.songoda.core.nms.NmsManager; import com.songoda.core.third_party.de.tr7zw.nbtapi.NBTItem; import com.songoda.core.utils.EntityUtils; -import com.craftaro.ultimatestacker.UltimateStacker; -import com.craftaro.ultimatestacker.settings.Settings; -import com.craftaro.ultimatestacker.stackable.spawner.SpawnerStackImpl; import org.bukkit.Bukkit; import org.bukkit.GameMode; import org.bukkit.Location; diff --git a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/listeners/TameListeners.java b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/listeners/TameListeners.java index 19f606f..316df51 100644 --- a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/listeners/TameListeners.java +++ b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/listeners/TameListeners.java @@ -3,7 +3,6 @@ package com.craftaro.ultimatestacker.listeners; import com.craftaro.ultimatestacker.UltimateStacker; import com.craftaro.ultimatestacker.api.stack.entity.EntityStack; import com.craftaro.ultimatestacker.api.stack.entity.EntityStackManager; -import com.craftaro.ultimatestacker.stackable.entity.EntityStackManagerImpl; import org.bukkit.entity.LivingEntity; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/listeners/entity/EntityCurrentListener.java b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/listeners/entity/EntityCurrentListener.java index 4dbf63c..88fe407 100644 --- a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/listeners/entity/EntityCurrentListener.java +++ b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/listeners/entity/EntityCurrentListener.java @@ -3,7 +3,6 @@ package com.craftaro.ultimatestacker.listeners.entity; import com.craftaro.ultimatestacker.UltimateStacker; import com.craftaro.ultimatestacker.api.stack.entity.EntityStack; import com.craftaro.ultimatestacker.api.stack.entity.EntityStackManager; -import com.craftaro.ultimatestacker.stackable.entity.EntityStackManagerImpl; import org.bukkit.entity.LivingEntity; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/listeners/item/ItemCurrentListener.java b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/listeners/item/ItemCurrentListener.java index fed5d1c..d08df92 100644 --- a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/listeners/item/ItemCurrentListener.java +++ b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/listeners/item/ItemCurrentListener.java @@ -2,12 +2,10 @@ package com.craftaro.ultimatestacker.listeners.item; import com.craftaro.ultimatestacker.api.UltimateStackerAPI; import com.craftaro.ultimatestacker.api.stack.item.StackedItem; -import com.songoda.core.compatibility.CompatibleSound; -import com.craftaro.ultimatestacker.UltimateStacker; import com.craftaro.ultimatestacker.settings.Settings; import com.craftaro.ultimatestacker.utils.Methods; +import com.songoda.core.compatibility.CompatibleSound; import org.bukkit.entity.Arrow; -import org.bukkit.entity.Item; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/listeners/item/ItemLegacyListener.java b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/listeners/item/ItemLegacyListener.java index 458302e..5dd644a 100644 --- a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/listeners/item/ItemLegacyListener.java +++ b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/listeners/item/ItemLegacyListener.java @@ -1,10 +1,9 @@ package com.craftaro.ultimatestacker.listeners.item; import com.craftaro.ultimatestacker.api.UltimateStackerAPI; -import com.songoda.core.compatibility.CompatibleSound; -import com.craftaro.ultimatestacker.UltimateStacker; import com.craftaro.ultimatestacker.settings.Settings; import com.craftaro.ultimatestacker.utils.Methods; +import com.songoda.core.compatibility.CompatibleSound; import org.bukkit.entity.Arrow; import org.bukkit.entity.Item; import org.bukkit.event.EventHandler; diff --git a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/listeners/item/ItemListeners.java b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/listeners/item/ItemListeners.java index c1d7f2f..9d5d347 100644 --- a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/listeners/item/ItemListeners.java +++ b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/listeners/item/ItemListeners.java @@ -1,23 +1,16 @@ package com.craftaro.ultimatestacker.listeners.item; -import com.craftaro.ultimatestacker.api.UltimateStackerAPI; -import com.craftaro.ultimatestacker.api.stack.item.StackedItem; -import com.craftaro.ultimatestacker.api.stack.item.StackedItemManager; -import com.songoda.core.nms.NmsManager; import com.craftaro.ultimatestacker.UltimateStacker; +import com.craftaro.ultimatestacker.api.stack.item.StackedItem; import com.craftaro.ultimatestacker.settings.Settings; import com.craftaro.ultimatestacker.utils.Methods; -import org.apache.commons.lang.StringUtils; +import com.songoda.core.nms.NmsManager; import org.bukkit.block.Block; import org.bukkit.block.BlockState; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.entity.ItemMergeEvent; -import org.bukkit.event.entity.ItemSpawnEvent; import org.bukkit.event.inventory.InventoryPickupItemEvent; -import org.bukkit.inventory.ItemStack; - -import java.util.List; public class ItemListeners implements Listener { diff --git a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/lootables/LootablesManager.java b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/lootables/LootablesManager.java index 9984aba..b9a1f87 100644 --- a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/lootables/LootablesManager.java +++ b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/lootables/LootablesManager.java @@ -1,5 +1,7 @@ package com.craftaro.ultimatestacker.lootables; +import com.craftaro.ultimatestacker.UltimateStacker; +import com.craftaro.ultimatestacker.settings.Settings; import com.songoda.core.compatibility.CompatibleMaterial; import com.songoda.core.compatibility.ServerVersion; import com.songoda.core.lootables.Lootables; @@ -9,8 +11,6 @@ import com.songoda.core.lootables.loot.Loot; import com.songoda.core.lootables.loot.LootBuilder; import com.songoda.core.lootables.loot.LootManager; import com.songoda.core.lootables.loot.Lootable; -import com.craftaro.ultimatestacker.UltimateStacker; -import com.craftaro.ultimatestacker.settings.Settings; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Ageable; import org.bukkit.entity.Creeper; diff --git a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/stackable/block/BlockStackImpl.java b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/stackable/block/BlockStackImpl.java index 30536ac..40b9961 100644 --- a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/stackable/block/BlockStackImpl.java +++ b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/stackable/block/BlockStackImpl.java @@ -2,9 +2,9 @@ package com.craftaro.ultimatestacker.stackable.block; import com.craftaro.ultimatestacker.UltimateStacker; import com.craftaro.ultimatestacker.api.stack.block.BlockStack; +import com.craftaro.ultimatestacker.settings.Settings; import com.songoda.core.compatibility.CompatibleMaterial; import com.songoda.core.utils.TextUtils; -import com.craftaro.ultimatestacker.settings.Settings; import org.bukkit.Location; import java.util.UUID; diff --git a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/stackable/block/BlockStackManagerImpl.java b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/stackable/block/BlockStackManagerImpl.java index 82bc0a3..5dbf420 100644 --- a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/stackable/block/BlockStackManagerImpl.java +++ b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/stackable/block/BlockStackManagerImpl.java @@ -4,7 +4,6 @@ import com.craftaro.ultimatestacker.UltimateStacker; import com.craftaro.ultimatestacker.api.stack.block.BlockStack; import com.craftaro.ultimatestacker.api.stack.block.BlockStackManager; import com.songoda.core.compatibility.CompatibleMaterial; -import com.songoda.core.compatibility.ServerVersion; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; diff --git a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/stackable/entity/EntityStackImpl.java b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/stackable/entity/EntityStackImpl.java index 795159a..756defb 100644 --- a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/stackable/entity/EntityStackImpl.java +++ b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/stackable/entity/EntityStackImpl.java @@ -1,11 +1,11 @@ package com.craftaro.ultimatestacker.stackable.entity; -import com.craftaro.ultimatestacker.api.stack.entity.EntityStack; +import com.craftaro.ultimatestacker.UltimateStacker; import com.craftaro.ultimatestacker.api.events.entity.EntityStackKillEvent; +import com.craftaro.ultimatestacker.api.stack.entity.EntityStack; +import com.craftaro.ultimatestacker.settings.Settings; import com.craftaro.ultimatestacker.utils.Async; import com.craftaro.ultimatestacker.utils.Methods; -import com.craftaro.ultimatestacker.UltimateStacker; -import com.craftaro.ultimatestacker.settings.Settings; import com.songoda.core.compatibility.ServerVersion; import com.songoda.core.lootables.loot.Drop; import com.songoda.core.lootables.loot.DropUtils; diff --git a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/stackable/spawner/SpawnerStackImpl.java b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/stackable/spawner/SpawnerStackImpl.java index 7d17a11..2f817a3 100644 --- a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/stackable/spawner/SpawnerStackImpl.java +++ b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/stackable/spawner/SpawnerStackImpl.java @@ -3,11 +3,11 @@ package com.craftaro.ultimatestacker.stackable.spawner; import com.craftaro.ultimatestacker.UltimateStacker; import com.craftaro.ultimatestacker.api.UltimateStackerAPI; import com.craftaro.ultimatestacker.api.stack.spawner.SpawnerStack; +import com.craftaro.ultimatestacker.settings.Settings; import com.craftaro.ultimatestacker.utils.Methods; import com.songoda.core.compatibility.CompatibleMaterial; import com.songoda.core.nms.world.SpawnedEntity; import com.songoda.core.world.SSpawner; -import com.craftaro.ultimatestacker.settings.Settings; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.block.CreatureSpawner; diff --git a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/tasks/StackingTask.java b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/tasks/StackingTask.java index 5134333..dcad1d6 100644 --- a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/tasks/StackingTask.java +++ b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/tasks/StackingTask.java @@ -5,7 +5,6 @@ import com.craftaro.ultimatestacker.api.stack.entity.EntityStack; import com.craftaro.ultimatestacker.api.stack.entity.EntityStackManager; import com.craftaro.ultimatestacker.settings.Settings; import com.craftaro.ultimatestacker.stackable.entity.Check; -import com.craftaro.ultimatestacker.stackable.entity.EntityStackManagerImpl; import com.craftaro.ultimatestacker.stackable.entity.custom.CustomEntity; import com.craftaro.ultimatestacker.utils.CachedChunk; import com.songoda.core.compatibility.CompatibleMaterial; @@ -62,7 +61,7 @@ import java.util.concurrent.Future; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import static com.craftaro.ultimatestacker.stackable.entity.Check.*; +import static com.craftaro.ultimatestacker.stackable.entity.Check.getChecks; public class StackingTask extends TimerTask { diff --git a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/utils/Methods.java b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/utils/Methods.java index 05e4b9c..77420cd 100644 --- a/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/utils/Methods.java +++ b/UltimateStacker/src/main/java/com.craftaro.ultimatestacker/utils/Methods.java @@ -1,15 +1,14 @@ package com.craftaro.ultimatestacker.utils; +import com.craftaro.ultimatestacker.UltimateStacker; import com.craftaro.ultimatestacker.api.UltimateStackerAPI; import com.craftaro.ultimatestacker.api.stack.item.StackedItem; +import com.craftaro.ultimatestacker.settings.Settings; +import com.craftaro.ultimatestacker.stackable.entity.custom.CustomEntity; import com.songoda.core.compatibility.CompatibleMaterial; import com.songoda.core.third_party.de.tr7zw.nbtapi.NBTItem; import com.songoda.core.utils.TextUtils; -import com.craftaro.ultimatestacker.UltimateStacker; -import com.craftaro.ultimatestacker.settings.Settings; -import com.craftaro.ultimatestacker.stackable.entity.custom.CustomEntity; import org.bukkit.ChatColor; -import org.bukkit.Material; import org.bukkit.block.CreatureSpawner; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; diff --git a/UltimateStackerAPI/src/main/java/com/craftaro/ultimatestacker/api/stack/block/BlockStack.java b/UltimateStackerAPI/src/main/java/com/craftaro/ultimatestacker/api/stack/block/BlockStack.java index 40a1cd2..3e998c3 100644 --- a/UltimateStackerAPI/src/main/java/com/craftaro/ultimatestacker/api/stack/block/BlockStack.java +++ b/UltimateStackerAPI/src/main/java/com/craftaro/ultimatestacker/api/stack/block/BlockStack.java @@ -3,10 +3,6 @@ package com.craftaro.ultimatestacker.api.stack.block; import com.craftaro.ultimatestacker.api.utils.Hologramable; import com.craftaro.ultimatestacker.api.utils.Stackable; import com.songoda.core.compatibility.CompatibleMaterial; -import com.songoda.core.hooks.stackers.UltimateStacker; -import com.songoda.core.utils.TextUtils; -import org.bukkit.Location; -import org.bukkit.World; public interface BlockStack extends Stackable, Hologramable { diff --git a/UltimateStackerAPI/src/main/java/com/craftaro/ultimatestacker/api/stack/block/BlockStackManager.java b/UltimateStackerAPI/src/main/java/com/craftaro/ultimatestacker/api/stack/block/BlockStackManager.java index 1648a38..9a012bb 100644 --- a/UltimateStackerAPI/src/main/java/com/craftaro/ultimatestacker/api/stack/block/BlockStackManager.java +++ b/UltimateStackerAPI/src/main/java/com/craftaro/ultimatestacker/api/stack/block/BlockStackManager.java @@ -1,7 +1,6 @@ package com.craftaro.ultimatestacker.api.stack.block; import com.songoda.core.compatibility.CompatibleMaterial; -import com.songoda.core.compatibility.ServerVersion; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Block; diff --git a/UltimateStackerAPI/src/main/java/com/craftaro/ultimatestacker/api/stack/entity/EntityStack.java b/UltimateStackerAPI/src/main/java/com/craftaro/ultimatestacker/api/stack/entity/EntityStack.java index b79ed7b..2ab041b 100644 --- a/UltimateStackerAPI/src/main/java/com/craftaro/ultimatestacker/api/stack/entity/EntityStack.java +++ b/UltimateStackerAPI/src/main/java/com/craftaro/ultimatestacker/api/stack/entity/EntityStack.java @@ -1,24 +1,10 @@ package com.craftaro.ultimatestacker.api.stack.entity; -import com.craftaro.ultimatestacker.api.events.entity.EntityStackKillEvent; import com.craftaro.ultimatestacker.api.utils.StackableEntity; -import com.songoda.core.compatibility.ServerVersion; -import com.songoda.core.lootables.loot.Drop; -import com.songoda.core.lootables.loot.DropUtils; -import com.songoda.core.utils.EntityUtils; -import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.entity.EntityType; -import org.bukkit.entity.ExperienceOrb; import org.bukkit.entity.LivingEntity; -import org.bukkit.event.entity.EntityDamageEvent; -import org.bukkit.event.entity.EntityDeathEvent; -import org.bukkit.inventory.ItemStack; -import org.bukkit.metadata.FixedMetadataValue; -import org.bukkit.util.Vector; -import java.util.List; -import java.util.Objects; import java.util.UUID; public interface EntityStack extends StackableEntity { diff --git a/UltimateStackerAPI/src/main/java/com/craftaro/ultimatestacker/api/stack/entity/EntityStackManager.java b/UltimateStackerAPI/src/main/java/com/craftaro/ultimatestacker/api/stack/entity/EntityStackManager.java index 54b3633..20a96e7 100644 --- a/UltimateStackerAPI/src/main/java/com/craftaro/ultimatestacker/api/stack/entity/EntityStackManager.java +++ b/UltimateStackerAPI/src/main/java/com/craftaro/ultimatestacker/api/stack/entity/EntityStackManager.java @@ -1,10 +1,8 @@ package com.craftaro.ultimatestacker.api.stack.entity; -import org.bukkit.Bukkit; import org.bukkit.entity.Entity; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; -import org.bukkit.metadata.FixedMetadataValue; import java.util.UUID; diff --git a/UltimateStackerAPI/src/main/java/com/craftaro/ultimatestacker/api/stack/spawner/SpawnerStack.java b/UltimateStackerAPI/src/main/java/com/craftaro/ultimatestacker/api/stack/spawner/SpawnerStack.java index 94ed5bd..c399ce7 100644 --- a/UltimateStackerAPI/src/main/java/com/craftaro/ultimatestacker/api/stack/spawner/SpawnerStack.java +++ b/UltimateStackerAPI/src/main/java/com/craftaro/ultimatestacker/api/stack/spawner/SpawnerStack.java @@ -6,10 +6,8 @@ import com.songoda.core.compatibility.CompatibleMaterial; import com.songoda.core.nms.world.SpawnedEntity; import org.bukkit.Location; import org.bukkit.World; -import org.bukkit.block.CreatureSpawner; import org.bukkit.entity.EntityType; -import java.util.Random; import java.util.Set; public interface SpawnerStack extends Stackable, Hologramable {