diff --git a/Core/src/main/java/com/craftaro/core/data/DatabaseConnector.java b/Core/src/main/java/com/craftaro/core/data/DatabaseConnector.java index 24c05c70..57b6647a 100644 --- a/Core/src/main/java/com/craftaro/core/data/DatabaseConnector.java +++ b/Core/src/main/java/com/craftaro/core/data/DatabaseConnector.java @@ -2,7 +2,6 @@ package com.craftaro.core.data; import org.jooq.DSLContext; -import java.sql.Connection; import java.sql.SQLException; public interface DatabaseConnector { diff --git a/Core/src/main/java/com/craftaro/core/data/SQLBatch.java b/Core/src/main/java/com/craftaro/core/data/SQLBatch.java index 20bd56cd..1d2935f1 100644 --- a/Core/src/main/java/com/craftaro/core/data/SQLBatch.java +++ b/Core/src/main/java/com/craftaro/core/data/SQLBatch.java @@ -1,8 +1,6 @@ package com.craftaro.core.data; import org.jooq.DSLContext; -import org.jooq.SQLDialect; -import org.jooq.impl.DSL; import java.util.Arrays; import java.util.Collection; diff --git a/Core/src/main/java/com/craftaro/core/data/SQLExecutable.java b/Core/src/main/java/com/craftaro/core/data/SQLExecutable.java index 5fef0bbd..064a4ef5 100644 --- a/Core/src/main/java/com/craftaro/core/data/SQLExecutable.java +++ b/Core/src/main/java/com/craftaro/core/data/SQLExecutable.java @@ -2,11 +2,8 @@ package com.craftaro.core.data; import org.jooq.DSLContext; import org.jooq.Query; -import org.jooq.Record; import org.jooq.Result; import org.jooq.ResultQuery; -import org.jooq.SelectSelectStep; -import org.jooq.UpdateReturningStep; import java.util.List; import java.util.stream.Stream; diff --git a/Core/src/main/java/com/craftaro/core/data/StoredData.java b/Core/src/main/java/com/craftaro/core/data/StoredData.java index 1593f1b7..994ed8ea 100644 --- a/Core/src/main/java/com/craftaro/core/data/StoredData.java +++ b/Core/src/main/java/com/craftaro/core/data/StoredData.java @@ -4,10 +4,6 @@ import com.craftaro.core.utils.ItemSerializer; import org.bukkit.inventory.ItemStack; import java.time.Instant; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.ZoneOffset; -import java.time.format.DateTimeFormatter; import java.util.UUID; public class StoredData { diff --git a/Core/src/main/java/com/craftaro/core/data/connector/H2Connector.java b/Core/src/main/java/com/craftaro/core/data/connector/H2Connector.java index ec37c4bf..9c37513b 100644 --- a/Core/src/main/java/com/craftaro/core/data/connector/H2Connector.java +++ b/Core/src/main/java/com/craftaro/core/data/connector/H2Connector.java @@ -4,7 +4,6 @@ import com.craftaro.core.data.DatabaseConnector; import com.craftaro.core.data.DatabaseManager; import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; -import org.jooq.DSLContext; import org.jooq.SQLDialect; import org.jooq.impl.DSL; diff --git a/Core/src/main/java/com/craftaro/core/database/DataMigration.java b/Core/src/main/java/com/craftaro/core/database/DataMigration.java index 78215c6b..e8436d16 100644 --- a/Core/src/main/java/com/craftaro/core/database/DataMigration.java +++ b/Core/src/main/java/com/craftaro/core/database/DataMigration.java @@ -3,7 +3,6 @@ package com.craftaro.core.database; import com.craftaro.core.SongodaPlugin; import java.io.File; -import java.sql.Blob; import java.sql.Connection; import java.sql.DatabaseMetaData; import java.sql.ResultSet; diff --git a/Core/src/main/java/com/craftaro/core/gui/Gui.java b/Core/src/main/java/com/craftaro/core/gui/Gui.java index bf1b8fb6..a915b7e8 100644 --- a/Core/src/main/java/com/craftaro/core/gui/Gui.java +++ b/Core/src/main/java/com/craftaro/core/gui/Gui.java @@ -1,12 +1,19 @@ package com.craftaro.core.gui; import com.craftaro.core.compatibility.ServerVersion; -import com.craftaro.core.gui.events.*; -import com.craftaro.core.gui.methods.*; +import com.craftaro.core.gui.events.GuiClickEvent; +import com.craftaro.core.gui.events.GuiCloseEvent; +import com.craftaro.core.gui.events.GuiDropItemEvent; +import com.craftaro.core.gui.events.GuiOpenEvent; +import com.craftaro.core.gui.events.GuiPageEvent; +import com.craftaro.core.gui.methods.Clickable; +import com.craftaro.core.gui.methods.Closable; +import com.craftaro.core.gui.methods.Droppable; +import com.craftaro.core.gui.methods.Openable; +import com.craftaro.core.gui.methods.Pagable; import com.craftaro.core.utils.ItemUtils; import com.cryptomorin.xseries.XMaterial; import com.cryptomorin.xseries.XSound; -import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; @@ -17,7 +24,11 @@ import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.*; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** diff --git a/Core/src/main/java/com/craftaro/core/hooks/mcmmo/McMMOHandler.java b/Core/src/main/java/com/craftaro/core/hooks/mcmmo/McMMOHandler.java index cf0374c9..67fa84b7 100644 --- a/Core/src/main/java/com/craftaro/core/hooks/mcmmo/McMMOHandler.java +++ b/Core/src/main/java/com/craftaro/core/hooks/mcmmo/McMMOHandler.java @@ -1,6 +1,7 @@ package com.craftaro.core.hooks.mcmmo; import com.craftaro.core.SongodaPlugin; +import com.craftaro.core.compatibility.ServerVersion; import com.gmail.nossr50.api.AbilityAPI; import com.gmail.nossr50.api.ExperienceAPI; import com.gmail.nossr50.config.experience.ExperienceConfig; @@ -13,7 +14,6 @@ import com.gmail.nossr50.util.player.UserManager; import com.gmail.nossr50.util.random.RandomChanceUtil; import com.gmail.nossr50.util.skills.RankUtils; import com.gmail.nossr50.util.skills.SkillActivationType; -import com.craftaro.core.compatibility.ServerVersion; import org.bukkit.block.Block; import org.bukkit.block.BlockState; import org.bukkit.entity.LivingEntity; diff --git a/Core/src/main/java/com/craftaro/core/lootables/gui/GuiEntityEditor.java b/Core/src/main/java/com/craftaro/core/lootables/gui/GuiEntityEditor.java index 38c44f89..86aa8583 100644 --- a/Core/src/main/java/com/craftaro/core/lootables/gui/GuiEntityEditor.java +++ b/Core/src/main/java/com/craftaro/core/lootables/gui/GuiEntityEditor.java @@ -1,7 +1,7 @@ package com.craftaro.core.lootables.gui; -import com.craftaro.core.lootables.loot.Loot; import com.craftaro.core.gui.Gui; +import com.craftaro.core.lootables.loot.Loot; import org.bukkit.entity.EntityType; import java.util.List; diff --git a/Core/src/main/java/com/craftaro/core/thread/TaskScheduler.java b/Core/src/main/java/com/craftaro/core/thread/TaskScheduler.java index 1beffa30..02df442f 100644 --- a/Core/src/main/java/com/craftaro/core/thread/TaskScheduler.java +++ b/Core/src/main/java/com/craftaro/core/thread/TaskScheduler.java @@ -1,7 +1,6 @@ package com.craftaro.core.thread; import com.craftaro.core.SongodaPlugin; - import org.bukkit.scheduler.BukkitRunnable; import java.util.Iterator; diff --git a/Core/src/main/java/com/craftaro/core/world/SWorldBorder.java b/Core/src/main/java/com/craftaro/core/world/SWorldBorder.java index 850118ba..f06c766f 100644 --- a/Core/src/main/java/com/craftaro/core/world/SWorldBorder.java +++ b/Core/src/main/java/com/craftaro/core/world/SWorldBorder.java @@ -1,11 +1,11 @@ package com.craftaro.core.world; -import com.craftaro.core.nms.world.NmsWorldBorder; -import com.craftaro.core.utils.NMSUtils; import com.craftaro.core.compatibility.ClassMapping; import com.craftaro.core.compatibility.MethodMapping; import com.craftaro.core.compatibility.ServerVersion; import com.craftaro.core.nms.Nms; +import com.craftaro.core.nms.world.NmsWorldBorder; +import com.craftaro.core.utils.NMSUtils; import org.bukkit.Location; import org.bukkit.entity.Player; diff --git a/NMS/NMS-v1_10_R1/src/main/java/com/craftaro/core/nms/v1_10_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_10_R1/src/main/java/com/craftaro/core/nms/v1_10_R1/world/WorldCoreImpl.java index 6952bab7..f84d50d5 100644 --- a/NMS/NMS-v1_10_R1/src/main/java/com/craftaro/core/nms/v1_10_R1/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_10_R1/src/main/java/com/craftaro/core/nms/v1_10_R1/world/WorldCoreImpl.java @@ -1,7 +1,7 @@ package com.craftaro.core.nms.v1_10_R1.world; -import com.craftaro.core.nms.v1_10_R1.world.spawner.BBaseSpawnerImpl; import com.craftaro.core.nms.ReflectionUtils; +import com.craftaro.core.nms.v1_10_R1.world.spawner.BBaseSpawnerImpl; import com.craftaro.core.nms.world.BBaseSpawner; import com.craftaro.core.nms.world.SItemStack; import com.craftaro.core.nms.world.SSpawner; diff --git a/NMS/NMS-v1_11_R1/src/main/java/com/craftaro/core/nms/v1_11_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_11_R1/src/main/java/com/craftaro/core/nms/v1_11_R1/world/WorldCoreImpl.java index e79fe5a5..dd374f19 100644 --- a/NMS/NMS-v1_11_R1/src/main/java/com/craftaro/core/nms/v1_11_R1/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_11_R1/src/main/java/com/craftaro/core/nms/v1_11_R1/world/WorldCoreImpl.java @@ -1,7 +1,7 @@ package com.craftaro.core.nms.v1_11_R1.world; -import com.craftaro.core.nms.v1_11_R1.world.spawner.BBaseSpawnerImpl; import com.craftaro.core.nms.ReflectionUtils; +import com.craftaro.core.nms.v1_11_R1.world.spawner.BBaseSpawnerImpl; import com.craftaro.core.nms.world.BBaseSpawner; import com.craftaro.core.nms.world.SItemStack; import com.craftaro.core.nms.world.SSpawner; diff --git a/NMS/NMS-v1_16_R1/src/main/java/com/craftaro/core/nms/v1_16_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_16_R1/src/main/java/com/craftaro/core/nms/v1_16_R1/world/WorldCoreImpl.java index 74431414..29564f48 100644 --- a/NMS/NMS-v1_16_R1/src/main/java/com/craftaro/core/nms/v1_16_R1/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_16_R1/src/main/java/com/craftaro/core/nms/v1_16_R1/world/WorldCoreImpl.java @@ -1,7 +1,7 @@ package com.craftaro.core.nms.v1_16_R1.world; -import com.craftaro.core.nms.v1_16_R1.world.spawner.BBaseSpawnerImpl; import com.craftaro.core.nms.ReflectionUtils; +import com.craftaro.core.nms.v1_16_R1.world.spawner.BBaseSpawnerImpl; import com.craftaro.core.nms.world.BBaseSpawner; import com.craftaro.core.nms.world.SItemStack; import com.craftaro.core.nms.world.SSpawner; diff --git a/NMS/NMS-v1_16_R2/src/main/java/com/craftaro/core/nms/v1_16_R2/world/WorldCoreImpl.java b/NMS/NMS-v1_16_R2/src/main/java/com/craftaro/core/nms/v1_16_R2/world/WorldCoreImpl.java index daad81c4..c642ced4 100644 --- a/NMS/NMS-v1_16_R2/src/main/java/com/craftaro/core/nms/v1_16_R2/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_16_R2/src/main/java/com/craftaro/core/nms/v1_16_R2/world/WorldCoreImpl.java @@ -1,7 +1,7 @@ package com.craftaro.core.nms.v1_16_R2.world; -import com.craftaro.core.nms.v1_16_R2.world.spawner.BBaseSpawnerImpl; import com.craftaro.core.nms.ReflectionUtils; +import com.craftaro.core.nms.v1_16_R2.world.spawner.BBaseSpawnerImpl; import com.craftaro.core.nms.world.BBaseSpawner; import com.craftaro.core.nms.world.SItemStack; import com.craftaro.core.nms.world.SSpawner; diff --git a/NMS/NMS-v1_16_R3/src/main/java/com/craftaro/core/nms/v1_16_R3/world/spawner/BBaseSpawnerImpl.java b/NMS/NMS-v1_16_R3/src/main/java/com/craftaro/core/nms/v1_16_R3/world/spawner/BBaseSpawnerImpl.java index b2e372b3..4a6e74e7 100644 --- a/NMS/NMS-v1_16_R3/src/main/java/com/craftaro/core/nms/v1_16_R3/world/spawner/BBaseSpawnerImpl.java +++ b/NMS/NMS-v1_16_R3/src/main/java/com/craftaro/core/nms/v1_16_R3/world/spawner/BBaseSpawnerImpl.java @@ -1,7 +1,7 @@ package com.craftaro.core.nms.v1_16_R3.world.spawner; -import com.craftaro.core.nms.world.BBaseSpawner; import com.craftaro.core.nms.ReflectionUtils; +import com.craftaro.core.nms.world.BBaseSpawner; import net.minecraft.server.v1_16_R3.AxisAlignedBB; import net.minecraft.server.v1_16_R3.BlockPosition; import net.minecraft.server.v1_16_R3.Entity; diff --git a/NMS/NMS-v1_17_R1/src/main/java/com/craftaro/core/nms/v1_17_R1/NmsImplementationsImpl.java b/NMS/NMS-v1_17_R1/src/main/java/com/craftaro/core/nms/v1_17_R1/NmsImplementationsImpl.java index e2bf4e0c..58f0eb9d 100644 --- a/NMS/NMS-v1_17_R1/src/main/java/com/craftaro/core/nms/v1_17_R1/NmsImplementationsImpl.java +++ b/NMS/NMS-v1_17_R1/src/main/java/com/craftaro/core/nms/v1_17_R1/NmsImplementationsImpl.java @@ -1,11 +1,11 @@ package com.craftaro.core.nms.v1_17_R1; -import com.craftaro.core.nms.entity.NmsEntity; -import com.craftaro.core.nms.v1_17_R1.anvil.AnvilCore; -import com.craftaro.core.nms.v1_17_R1.entity.NMSPlayerImpl; import com.craftaro.core.nms.NmsImplementations; import com.craftaro.core.nms.entity.NMSPlayer; +import com.craftaro.core.nms.entity.NmsEntity; import com.craftaro.core.nms.nbt.NBTCore; +import com.craftaro.core.nms.v1_17_R1.anvil.AnvilCore; +import com.craftaro.core.nms.v1_17_R1.entity.NMSPlayerImpl; import com.craftaro.core.nms.v1_17_R1.entity.NmsEntityImpl; import com.craftaro.core.nms.v1_17_R1.nbt.NBTCoreImpl; import com.craftaro.core.nms.v1_17_R1.world.NmsWorldBorderImpl; diff --git a/NMS/NMS-v1_17_R1/src/main/java/com/craftaro/core/nms/v1_17_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_17_R1/src/main/java/com/craftaro/core/nms/v1_17_R1/world/WorldCoreImpl.java index 26c04c70..53f28bb6 100644 --- a/NMS/NMS-v1_17_R1/src/main/java/com/craftaro/core/nms/v1_17_R1/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_17_R1/src/main/java/com/craftaro/core/nms/v1_17_R1/world/WorldCoreImpl.java @@ -1,7 +1,7 @@ package com.craftaro.core.nms.v1_17_R1.world; -import com.craftaro.core.nms.v1_17_R1.world.spawner.BBaseSpawnerImpl; import com.craftaro.core.nms.ReflectionUtils; +import com.craftaro.core.nms.v1_17_R1.world.spawner.BBaseSpawnerImpl; import com.craftaro.core.nms.world.BBaseSpawner; import com.craftaro.core.nms.world.SItemStack; import com.craftaro.core.nms.world.SSpawner; diff --git a/NMS/NMS-v1_19_R1/src/main/java/com/craftaro/core/nms/v1_19_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_19_R1/src/main/java/com/craftaro/core/nms/v1_19_R1/world/WorldCoreImpl.java index 25396cd2..0ec36fba 100644 --- a/NMS/NMS-v1_19_R1/src/main/java/com/craftaro/core/nms/v1_19_R1/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_19_R1/src/main/java/com/craftaro/core/nms/v1_19_R1/world/WorldCoreImpl.java @@ -1,7 +1,7 @@ package com.craftaro.core.nms.v1_19_R1.world; -import com.craftaro.core.nms.v1_19_R1.world.spawner.BBaseSpawnerImpl; import com.craftaro.core.nms.ReflectionUtils; +import com.craftaro.core.nms.v1_19_R1.world.spawner.BBaseSpawnerImpl; import com.craftaro.core.nms.world.BBaseSpawner; import com.craftaro.core.nms.world.SItemStack; import com.craftaro.core.nms.world.SSpawner; diff --git a/NMS/NMS-v1_19_R3/src/main/java/com/craftaro/core/nms/v1_19_R3/world/WorldCoreImpl.java b/NMS/NMS-v1_19_R3/src/main/java/com/craftaro/core/nms/v1_19_R3/world/WorldCoreImpl.java index a32287e7..c1e885c1 100644 --- a/NMS/NMS-v1_19_R3/src/main/java/com/craftaro/core/nms/v1_19_R3/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_19_R3/src/main/java/com/craftaro/core/nms/v1_19_R3/world/WorldCoreImpl.java @@ -1,7 +1,7 @@ package com.craftaro.core.nms.v1_19_R3.world; -import com.craftaro.core.nms.v1_19_R3.world.spawner.BBaseSpawnerImpl; import com.craftaro.core.nms.ReflectionUtils; +import com.craftaro.core.nms.v1_19_R3.world.spawner.BBaseSpawnerImpl; import com.craftaro.core.nms.world.BBaseSpawner; import com.craftaro.core.nms.world.SItemStack; import com.craftaro.core.nms.world.SSpawner; diff --git a/NMS/NMS-v1_8_R3/src/main/java/com/craftaro/core/nms/v1_8_R3/world/WorldCoreImpl.java b/NMS/NMS-v1_8_R3/src/main/java/com/craftaro/core/nms/v1_8_R3/world/WorldCoreImpl.java index ed5fd712..fe3c52a9 100644 --- a/NMS/NMS-v1_8_R3/src/main/java/com/craftaro/core/nms/v1_8_R3/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_8_R3/src/main/java/com/craftaro/core/nms/v1_8_R3/world/WorldCoreImpl.java @@ -1,7 +1,7 @@ package com.craftaro.core.nms.v1_8_R3.world; -import com.craftaro.core.nms.v1_8_R3.world.spawner.BBaseSpawnerImpl; import com.craftaro.core.nms.ReflectionUtils; +import com.craftaro.core.nms.v1_8_R3.world.spawner.BBaseSpawnerImpl; import com.craftaro.core.nms.world.BBaseSpawner; import com.craftaro.core.nms.world.SItemStack; import com.craftaro.core.nms.world.SSpawner; diff --git a/NMS/NMS-v1_9_R2/src/main/java/com/craftaro/core/nms/v1_9_R2/world/WorldCoreImpl.java b/NMS/NMS-v1_9_R2/src/main/java/com/craftaro/core/nms/v1_9_R2/world/WorldCoreImpl.java index ec841f04..4e68752b 100644 --- a/NMS/NMS-v1_9_R2/src/main/java/com/craftaro/core/nms/v1_9_R2/world/WorldCoreImpl.java +++ b/NMS/NMS-v1_9_R2/src/main/java/com/craftaro/core/nms/v1_9_R2/world/WorldCoreImpl.java @@ -1,7 +1,7 @@ package com.craftaro.core.nms.v1_9_R2.world; -import com.craftaro.core.nms.v1_9_R2.world.spawner.BBaseSpawnerImpl; import com.craftaro.core.nms.ReflectionUtils; +import com.craftaro.core.nms.v1_9_R2.world.spawner.BBaseSpawnerImpl; import com.craftaro.core.nms.world.BBaseSpawner; import com.craftaro.core.nms.world.SItemStack; import com.craftaro.core.nms.world.SSpawner;