diff --git a/src/discord/MagicBot.java b/src/discord/MagicBot.java index 0ada6f9e..fe5a6150 100644 --- a/src/discord/MagicBot.java +++ b/src/discord/MagicBot.java @@ -35,7 +35,6 @@ import java.util.concurrent.TimeUnit; import java.util.regex.Pattern; import static discord.ChatChannel.ADMINLOG; -import static discord.ChatChannel.SEPTIC; /* * MagicBot is many things to Magicbane... diff --git a/src/discord/handlers/ChatChannelHandler.java b/src/discord/handlers/ChatChannelHandler.java index 6c59dd28..4f86b184 100644 --- a/src/discord/handlers/ChatChannelHandler.java +++ b/src/discord/handlers/ChatChannelHandler.java @@ -14,8 +14,6 @@ import discord.RobotSpeak; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; import org.pmw.tinylog.Logger; -import static discord.ChatChannel.GENERAL; - public class ChatChannelHandler { public static void handleRequest(ChatChannel chatChannel, MessageReceivedEvent event, String[] args) { diff --git a/src/discord/handlers/DevRequestHandler.java b/src/discord/handlers/DevRequestHandler.java index a9b741d1..c73ea898 100644 --- a/src/discord/handlers/DevRequestHandler.java +++ b/src/discord/handlers/DevRequestHandler.java @@ -12,10 +12,7 @@ import discord.MagicBot; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; import org.pmw.tinylog.Logger; -import java.io.BufferedReader; -import java.io.File; import java.io.IOException; -import java.io.InputStreamReader; import java.nio.file.Files; import java.nio.file.Paths; import java.util.stream.Collectors; diff --git a/src/engine/Enum.java b/src/engine/Enum.java index f9d6821c..0a73b743 100644 --- a/src/engine/Enum.java +++ b/src/engine/Enum.java @@ -13,7 +13,10 @@ import engine.gameManager.PowersManager; import engine.gameManager.ZoneManager; import engine.math.Vector2f; import engine.math.Vector3fImmutable; -import engine.objects.*; +import engine.objects.AbstractCharacter; +import engine.objects.ItemBase; +import engine.objects.Shrine; +import engine.objects.Zone; import engine.powers.EffectsBase; import org.pmw.tinylog.Logger; diff --git a/src/engine/ai/MobileFSM.java b/src/engine/ai/MobileFSM.java index 3d3bde7a..250c0e06 100644 --- a/src/engine/ai/MobileFSM.java +++ b/src/engine/ai/MobileFSM.java @@ -16,7 +16,10 @@ import engine.Enum.GameObjectType; import engine.InterestManagement.WorldGrid; import engine.ai.utilities.CombatUtilities; import engine.ai.utilities.MovementUtilities; -import engine.gameManager.*; +import engine.gameManager.BuildingManager; +import engine.gameManager.CombatManager; +import engine.gameManager.MovementManager; +import engine.gameManager.PowersManager; import engine.math.Vector3fImmutable; import engine.net.DispatchMessage; import engine.net.client.msg.PerformActionMsg; @@ -28,7 +31,8 @@ import engine.powers.PowersBase; import engine.server.MBServerStatics; import org.pmw.tinylog.Logger; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ThreadLocalRandom; diff --git a/src/engine/ai/utilities/CombatUtilities.java b/src/engine/ai/utilities/CombatUtilities.java index 28c8d5b9..9e6ea1f9 100644 --- a/src/engine/ai/utilities/CombatUtilities.java +++ b/src/engine/ai/utilities/CombatUtilities.java @@ -10,31 +10,20 @@ package engine.ai.utilities; -import engine.Enum; import engine.Enum.*; -import engine.ai.MobileFSM.STATE; import engine.gameManager.ChatManager; import engine.gameManager.CombatManager; -import engine.gameManager.PowersManager; -import engine.math.Vector3f; import engine.math.Vector3fImmutable; import engine.net.DispatchMessage; -import engine.net.client.msg.PerformActionMsg; import engine.net.client.msg.TargetedActionMsg; import engine.objects.*; -import engine.powers.ActionsBase; -import engine.powers.PowersBase; import engine.server.MBServerStatics; import org.pmw.tinylog.Logger; -import java.util.Map; -import java.util.Random; -import java.util.Set; import java.util.concurrent.ThreadLocalRandom; import static engine.math.FastMath.sqr; import static java.lang.Math.pow; -import static java.lang.Math.sqrt; public class CombatUtilities { diff --git a/src/engine/db/handlers/dbGuildHandler.java b/src/engine/db/handlers/dbGuildHandler.java index f60f80f4..49dc05f5 100644 --- a/src/engine/db/handlers/dbGuildHandler.java +++ b/src/engine/db/handlers/dbGuildHandler.java @@ -19,7 +19,6 @@ import org.pmw.tinylog.Logger; import java.sql.ResultSet; import java.sql.SQLException; -import java.time.LocalDateTime; import java.util.ArrayList; public class dbGuildHandler extends dbHandlerBase { diff --git a/src/engine/db/handlers/dbItemBaseHandler.java b/src/engine/db/handlers/dbItemBaseHandler.java index 8f7cabec..a54c8185 100644 --- a/src/engine/db/handlers/dbItemBaseHandler.java +++ b/src/engine/db/handlers/dbItemBaseHandler.java @@ -9,7 +9,6 @@ package engine.db.handlers; -import engine.gameManager.NPCManager; import engine.objects.BootySetEntry; import engine.objects.EquipmentSetEntry; import engine.objects.ItemBase; diff --git a/src/engine/db/handlers/dbMineHandler.java b/src/engine/db/handlers/dbMineHandler.java index eb66c44b..eeca535b 100644 --- a/src/engine/db/handlers/dbMineHandler.java +++ b/src/engine/db/handlers/dbMineHandler.java @@ -14,7 +14,6 @@ import engine.objects.Mine; import engine.objects.MineProduction; import engine.objects.Resource; -import java.time.LocalDateTime; import java.util.ArrayList; public class dbMineHandler extends dbHandlerBase { diff --git a/src/engine/db/handlers/dbMobHandler.java b/src/engine/db/handlers/dbMobHandler.java index 579a2552..fb8bccd1 100644 --- a/src/engine/db/handlers/dbMobHandler.java +++ b/src/engine/db/handlers/dbMobHandler.java @@ -11,19 +11,15 @@ package engine.db.handlers; import engine.ai.MobileFSM.STATE; import engine.gameManager.NPCManager; -import engine.math.Vector3fImmutable; import engine.objects.Mob; -import engine.objects.PlayerCharacter; import engine.objects.Zone; import engine.server.MBServerStatics; -import engine.server.world.WorldServer; import org.joda.time.DateTime; import org.pmw.tinylog.Logger; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; -import java.util.HashMap; public class dbMobHandler extends dbHandlerBase { diff --git a/src/engine/db/handlers/dbRunegateHandler.java b/src/engine/db/handlers/dbRunegateHandler.java index 32ec6324..86d1c575 100644 --- a/src/engine/db/handlers/dbRunegateHandler.java +++ b/src/engine/db/handlers/dbRunegateHandler.java @@ -13,13 +13,10 @@ import engine.Enum; import engine.gameManager.DbManager; import engine.objects.Building; import engine.objects.Portal; -import engine.objects.Resists; -import java.sql.Array; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; -import java.util.List; public class dbRunegateHandler extends dbHandlerBase { diff --git a/src/engine/devcmd/cmds/HotzoneCmd.java b/src/engine/devcmd/cmds/HotzoneCmd.java index d3389750..5a8bb7b5 100644 --- a/src/engine/devcmd/cmds/HotzoneCmd.java +++ b/src/engine/devcmd/cmds/HotzoneCmd.java @@ -12,12 +12,8 @@ package engine.devcmd.cmds; import engine.devcmd.AbstractDevCmd; import engine.gameManager.ZoneManager; -import engine.math.FastMath; -import engine.net.client.msg.HotzoneChangeMsg; import engine.objects.AbstractGameObject; import engine.objects.PlayerCharacter; -import engine.objects.Zone; -import engine.server.world.WorldServer; /** * ./hotzone <- display the current hotzone & time remaining diff --git a/src/engine/gameManager/MaintenanceManager.java b/src/engine/gameManager/MaintenanceManager.java index 9fb42d41..2cc15cf7 100644 --- a/src/engine/gameManager/MaintenanceManager.java +++ b/src/engine/gameManager/MaintenanceManager.java @@ -13,12 +13,9 @@ package engine.gameManager; import engine.Enum; import engine.objects.*; -import org.joda.time.DateTime; import org.pmw.tinylog.Logger; -import java.time.DayOfWeek; import java.time.LocalDateTime; -import java.time.temporal.TemporalAdjusters; import java.util.ArrayList; public enum MaintenanceManager { diff --git a/src/engine/net/client/handlers/ArcLoginNotifyMsgHandler.java b/src/engine/net/client/handlers/ArcLoginNotifyMsgHandler.java index c72b5cb8..a7cf9de7 100644 --- a/src/engine/net/client/handlers/ArcLoginNotifyMsgHandler.java +++ b/src/engine/net/client/handlers/ArcLoginNotifyMsgHandler.java @@ -12,7 +12,10 @@ import engine.net.client.msg.ArcLoginNotifyMsg; import engine.net.client.msg.ClientNetMsg; import engine.net.client.msg.HotzoneChangeMsg; import engine.net.client.msg.PetMsg; -import engine.objects.*; +import engine.objects.Account; +import engine.objects.Guild; +import engine.objects.PlayerCharacter; +import engine.objects.PlayerFriends; import engine.server.MBServerStatics; import engine.session.Session; import org.pmw.tinylog.Logger; diff --git a/src/engine/net/client/handlers/ArcMineWindowAvailableTimeHandler.java b/src/engine/net/client/handlers/ArcMineWindowAvailableTimeHandler.java index a201d90b..d02e53d8 100644 --- a/src/engine/net/client/handlers/ArcMineWindowAvailableTimeHandler.java +++ b/src/engine/net/client/handlers/ArcMineWindowAvailableTimeHandler.java @@ -9,7 +9,6 @@ import engine.net.DispatchMessage; import engine.net.client.ClientConnection; import engine.net.client.msg.ArcMineWindowAvailableTimeMsg; import engine.net.client.msg.ClientNetMsg; -import engine.net.client.msg.KeepAliveServerClientMsg; import engine.objects.Building; import engine.objects.Guild; import engine.objects.GuildStatusController; diff --git a/src/engine/net/client/handlers/GuildCreationFinalizeHandler.java b/src/engine/net/client/handlers/GuildCreationFinalizeHandler.java index 29b4e055..1a45f229 100644 --- a/src/engine/net/client/handlers/GuildCreationFinalizeHandler.java +++ b/src/engine/net/client/handlers/GuildCreationFinalizeHandler.java @@ -38,7 +38,10 @@ import engine.net.client.msg.ClientNetMsg; import engine.net.client.msg.ErrorPopupMsg; import engine.net.client.msg.guild.GuildCreationFinalizeMsg; import engine.net.client.msg.guild.GuildInfoMsg; -import engine.objects.*; +import engine.objects.Guild; +import engine.objects.Item; +import engine.objects.ItemBase; +import engine.objects.PlayerCharacter; import engine.util.StringUtils; public class GuildCreationFinalizeHandler extends AbstractClientMsgHandler { diff --git a/src/engine/net/client/handlers/PlaceAssetMsgHandler.java b/src/engine/net/client/handlers/PlaceAssetMsgHandler.java index f9d8ccc4..0b4ee378 100644 --- a/src/engine/net/client/handlers/PlaceAssetMsgHandler.java +++ b/src/engine/net/client/handlers/PlaceAssetMsgHandler.java @@ -23,6 +23,7 @@ import engine.objects.*; import engine.server.MBServerStatics; import org.joda.time.DateTime; import org.pmw.tinylog.Logger; + import java.time.LocalDateTime; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/engine/net/client/msg/RefineMsg.java b/src/engine/net/client/msg/RefineMsg.java index c630ae99..cd0a2a47 100644 --- a/src/engine/net/client/msg/RefineMsg.java +++ b/src/engine/net/client/msg/RefineMsg.java @@ -10,17 +10,14 @@ package engine.net.client.msg; -import engine.gameManager.PowersManager; import engine.gameManager.SessionManager; import engine.net.*; import engine.net.client.ClientConnection; import engine.net.client.Protocol; import engine.objects.*; -import engine.powers.PowersBase; import engine.server.MBServerStatics; import java.util.ArrayList; -import java.util.Map; import java.util.concurrent.ConcurrentHashMap; public class RefineMsg extends ClientNetMsg { diff --git a/src/engine/objects/AbstractCharacter.java b/src/engine/objects/AbstractCharacter.java index 1afc8738..5b1322bc 100644 --- a/src/engine/objects/AbstractCharacter.java +++ b/src/engine/objects/AbstractCharacter.java @@ -14,7 +14,10 @@ import engine.Enum.*; import engine.InterestManagement.InterestManager; import engine.InterestManagement.WorldGrid; import engine.exception.SerializationException; -import engine.gameManager.*; +import engine.gameManager.CombatManager; +import engine.gameManager.ConfigManager; +import engine.gameManager.MovementManager; +import engine.gameManager.PowersManager; import engine.job.AbstractJob; import engine.job.JobContainer; import engine.job.JobScheduler; @@ -25,9 +28,6 @@ import engine.math.AtomicFloat; import engine.math.Bounds; import engine.math.Vector3fImmutable; import engine.net.ByteBufferWriter; -import engine.net.Dispatch; -import engine.net.DispatchMessage; -import engine.net.client.msg.MoveToPointMsg; import engine.powers.EffectsBase; import engine.server.MBServerStatics; import org.pmw.tinylog.Logger; diff --git a/src/engine/objects/Experience.java b/src/engine/objects/Experience.java index 32653186..b153679b 100644 --- a/src/engine/objects/Experience.java +++ b/src/engine/objects/Experience.java @@ -9,13 +9,11 @@ package engine.objects; -import engine.Enum; import engine.Enum.TargetColor; import engine.gameManager.ConfigManager; import engine.gameManager.ZoneManager; import engine.math.Vector3fImmutable; import engine.server.MBServerStatics; -import engine.server.world.WorldServer; import java.util.ArrayList; import java.util.TreeMap; diff --git a/src/engine/objects/Resists.java b/src/engine/objects/Resists.java index c084f5c6..5e5fae0b 100644 --- a/src/engine/objects/Resists.java +++ b/src/engine/objects/Resists.java @@ -16,13 +16,11 @@ import engine.Enum.SourceType; import engine.gameManager.ChatManager; import engine.gameManager.DbManager; import engine.powers.EffectsBase; -import engine.powers.effectmodifiers.ArmorPiercingEffectModifier; import engine.server.MBServerStatics; import org.pmw.tinylog.Logger; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/engine/objects/Runegate.java b/src/engine/objects/Runegate.java index 59da6d10..d3434b70 100644 --- a/src/engine/objects/Runegate.java +++ b/src/engine/objects/Runegate.java @@ -1,7 +1,6 @@ package engine.objects; import engine.Enum; -import engine.Enum.PortalType; import engine.gameManager.DbManager; import engine.net.ByteBufferWriter; diff --git a/src/engine/powers/effectmodifiers/DurabilityEffectModifier.java b/src/engine/powers/effectmodifiers/DurabilityEffectModifier.java index cc50dc66..3baf4e6f 100644 --- a/src/engine/powers/effectmodifiers/DurabilityEffectModifier.java +++ b/src/engine/powers/effectmodifiers/DurabilityEffectModifier.java @@ -9,13 +9,14 @@ package engine.powers.effectmodifiers; -import engine.Enum; import engine.jobs.AbstractEffectJob; -import engine.objects.*; +import engine.objects.AbstractCharacter; +import engine.objects.AbstractWorldObject; +import engine.objects.Building; +import engine.objects.Item; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.concurrent.ConcurrentHashMap; public class DurabilityEffectModifier extends AbstractEffectModifier { diff --git a/src/engine/powers/poweractions/RunegateTeleportPowerAction.java b/src/engine/powers/poweractions/RunegateTeleportPowerAction.java index c41db745..ef728452 100644 --- a/src/engine/powers/poweractions/RunegateTeleportPowerAction.java +++ b/src/engine/powers/poweractions/RunegateTeleportPowerAction.java @@ -10,7 +10,6 @@ package engine.powers.poweractions; import engine.Enum; -import engine.Enum.PortalType; import engine.math.Vector3fImmutable; import engine.net.Dispatch; import engine.net.DispatchMessage; diff --git a/src/engine/server/world/WorldServer.java b/src/engine/server/world/WorldServer.java index f8d5146c..256b14eb 100644 --- a/src/engine/server/world/WorldServer.java +++ b/src/engine/server/world/WorldServer.java @@ -60,7 +60,6 @@ import java.nio.file.Files; import java.nio.file.Paths; import java.time.LocalDateTime; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Timer; diff --git a/src/engine/util/MapLoader.java b/src/engine/util/MapLoader.java index cdc1b503..e13eb553 100644 --- a/src/engine/util/MapLoader.java +++ b/src/engine/util/MapLoader.java @@ -6,7 +6,6 @@ package engine.util; import engine.InterestManagement.RealmMap; import engine.server.MBServerStatics; -import engine.server.world.WorldServer; import org.pmw.tinylog.Logger; import javax.imageio.ImageIO;