Browse Source

Optimized imports (getting close to release)

master
MagicBot 2 years ago
parent
commit
f21e51f74a
  1. 1
      src/discord/MagicBot.java
  2. 2
      src/discord/handlers/ChatChannelHandler.java
  3. 3
      src/discord/handlers/DevRequestHandler.java
  4. 5
      src/engine/Enum.java
  5. 8
      src/engine/ai/MobileFSM.java
  6. 11
      src/engine/ai/utilities/CombatUtilities.java
  7. 1
      src/engine/db/handlers/dbGuildHandler.java
  8. 1
      src/engine/db/handlers/dbItemBaseHandler.java
  9. 1
      src/engine/db/handlers/dbMineHandler.java
  10. 4
      src/engine/db/handlers/dbMobHandler.java
  11. 3
      src/engine/db/handlers/dbRunegateHandler.java
  12. 4
      src/engine/devcmd/cmds/HotzoneCmd.java
  13. 3
      src/engine/gameManager/MaintenanceManager.java
  14. 5
      src/engine/net/client/handlers/ArcLoginNotifyMsgHandler.java
  15. 1
      src/engine/net/client/handlers/ArcMineWindowAvailableTimeHandler.java
  16. 5
      src/engine/net/client/handlers/GuildCreationFinalizeHandler.java
  17. 1
      src/engine/net/client/handlers/PlaceAssetMsgHandler.java
  18. 3
      src/engine/net/client/msg/RefineMsg.java
  19. 8
      src/engine/objects/AbstractCharacter.java
  20. 2
      src/engine/objects/Experience.java
  21. 2
      src/engine/objects/Resists.java
  22. 1
      src/engine/objects/Runegate.java
  23. 7
      src/engine/powers/effectmodifiers/DurabilityEffectModifier.java
  24. 1
      src/engine/powers/poweractions/RunegateTeleportPowerAction.java
  25. 1
      src/engine/server/world/WorldServer.java
  26. 1
      src/engine/util/MapLoader.java

1
src/discord/MagicBot.java

@ -35,7 +35,6 @@ import java.util.concurrent.TimeUnit; @@ -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...

2
src/discord/handlers/ChatChannelHandler.java

@ -14,8 +14,6 @@ import discord.RobotSpeak; @@ -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) {

3
src/discord/handlers/DevRequestHandler.java

@ -12,10 +12,7 @@ import discord.MagicBot; @@ -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;

5
src/engine/Enum.java

@ -13,7 +13,10 @@ import engine.gameManager.PowersManager; @@ -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;

8
src/engine/ai/MobileFSM.java

@ -16,7 +16,10 @@ import engine.Enum.GameObjectType; @@ -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; @@ -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;

11
src/engine/ai/utilities/CombatUtilities.java

@ -10,31 +10,20 @@ @@ -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 {

1
src/engine/db/handlers/dbGuildHandler.java

@ -19,7 +19,6 @@ import org.pmw.tinylog.Logger; @@ -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 {

1
src/engine/db/handlers/dbItemBaseHandler.java

@ -9,7 +9,6 @@ @@ -9,7 +9,6 @@
package engine.db.handlers;
import engine.gameManager.NPCManager;
import engine.objects.BootySetEntry;
import engine.objects.EquipmentSetEntry;
import engine.objects.ItemBase;

1
src/engine/db/handlers/dbMineHandler.java

@ -14,7 +14,6 @@ import engine.objects.Mine; @@ -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 {

4
src/engine/db/handlers/dbMobHandler.java

@ -11,19 +11,15 @@ package engine.db.handlers; @@ -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 {

3
src/engine/db/handlers/dbRunegateHandler.java

@ -13,13 +13,10 @@ import engine.Enum; @@ -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 {

4
src/engine/devcmd/cmds/HotzoneCmd.java

@ -12,12 +12,8 @@ package engine.devcmd.cmds; @@ -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

3
src/engine/gameManager/MaintenanceManager.java

@ -13,12 +13,9 @@ package engine.gameManager; @@ -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 {

5
src/engine/net/client/handlers/ArcLoginNotifyMsgHandler.java

@ -12,7 +12,10 @@ import engine.net.client.msg.ArcLoginNotifyMsg; @@ -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;

1
src/engine/net/client/handlers/ArcMineWindowAvailableTimeHandler.java

@ -9,7 +9,6 @@ import engine.net.DispatchMessage; @@ -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;

5
src/engine/net/client/handlers/GuildCreationFinalizeHandler.java

@ -38,7 +38,10 @@ import engine.net.client.msg.ClientNetMsg; @@ -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 {

1
src/engine/net/client/handlers/PlaceAssetMsgHandler.java

@ -23,6 +23,7 @@ import engine.objects.*; @@ -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;

3
src/engine/net/client/msg/RefineMsg.java

@ -10,17 +10,14 @@ @@ -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 {

8
src/engine/objects/AbstractCharacter.java

@ -14,7 +14,10 @@ import engine.Enum.*; @@ -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; @@ -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;

2
src/engine/objects/Experience.java

@ -9,13 +9,11 @@ @@ -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;

2
src/engine/objects/Resists.java

@ -16,13 +16,11 @@ import engine.Enum.SourceType; @@ -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;

1
src/engine/objects/Runegate.java

@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
package engine.objects;
import engine.Enum;
import engine.Enum.PortalType;
import engine.gameManager.DbManager;
import engine.net.ByteBufferWriter;

7
src/engine/powers/effectmodifiers/DurabilityEffectModifier.java

@ -9,13 +9,14 @@ @@ -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 {

1
src/engine/powers/poweractions/RunegateTeleportPowerAction.java

@ -10,7 +10,6 @@ @@ -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;

1
src/engine/server/world/WorldServer.java

@ -60,7 +60,6 @@ import java.nio.file.Files; @@ -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;

1
src/engine/util/MapLoader.java

@ -6,7 +6,6 @@ package engine.util; @@ -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;

Loading…
Cancel
Save