Merge pull request #1366 from Dans-Plugins/organizing-imports

Organized imports.
Dans-Plugins · Feb 27, 2022 · c4f7098 · c4f7098
2 parents d686bf7 + 30f5c67
commit c4f7098
Show file tree

Hide file tree

Showing 110 changed files with 674 additions and 423 deletions.
diff --git a/src/main/java/dansplugins/factionsystem/MedievalFactions.java b/src/main/java/dansplugins/factionsystem/MedievalFactions.java
@@ -4,28 +4,37 @@
  */
 package dansplugins.factionsystem;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import org.bukkit.Bukkit;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.event.Listener;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
+
 import dansplugins.factionsystem.bstats.Metrics;
 import dansplugins.factionsystem.data.PersistentData;
-import dansplugins.factionsystem.eventhandlers.*;
+import dansplugins.factionsystem.eventhandlers.ChatHandler;
+import dansplugins.factionsystem.eventhandlers.DamageHandler;
+import dansplugins.factionsystem.eventhandlers.DeathHandler;
+import dansplugins.factionsystem.eventhandlers.EffectHandler;
+import dansplugins.factionsystem.eventhandlers.InteractionHandler;
+import dansplugins.factionsystem.eventhandlers.JoinHandler;
+import dansplugins.factionsystem.eventhandlers.MoveHandler;
+import dansplugins.factionsystem.eventhandlers.QuitHandler;
+import dansplugins.factionsystem.eventhandlers.SpawnHandler;
 import dansplugins.factionsystem.externalapi.MedievalFactionsAPI;
 import dansplugins.factionsystem.integrators.DynmapIntegrator;
 import dansplugins.factionsystem.placeholders.PlaceholderAPI;
 import dansplugins.factionsystem.services.LocalCommandService;
 import dansplugins.factionsystem.services.LocalConfigService;
 import dansplugins.factionsystem.services.LocalLocaleService;
 import dansplugins.factionsystem.utils.extended.Scheduler;
-import org.bukkit.Bukkit;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandSender;
-import org.bukkit.event.Listener;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.jetbrains.annotations.NotNull;
 import preponderous.ponder.minecraft.bukkit.tools.EventHandlerRegistry;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-
 /**
  * @author Daniel McCoy Stephenson
  * @since May 30th, 2020

diff --git a/src/main/java/dansplugins/factionsystem/commands/AddLawCommand.java b/src/main/java/dansplugins/factionsystem/commands/AddLawCommand.java
@@ -4,10 +4,11 @@
  */
 package dansplugins.factionsystem.commands;
 
-import dansplugins.factionsystem.commands.abs.SubCommand;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import dansplugins.factionsystem.commands.abs.SubCommand;
+
 /**
  * @author Callum Johnson
  */

diff --git a/src/main/java/dansplugins/factionsystem/commands/AllyCommand.java b/src/main/java/dansplugins/factionsystem/commands/AllyCommand.java
@@ -4,12 +4,13 @@
  */
 package dansplugins.factionsystem.commands;
 
-import dansplugins.factionsystem.commands.abs.SubCommand;
-import dansplugins.factionsystem.objects.domain.Faction;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import dansplugins.factionsystem.commands.abs.SubCommand;
+import dansplugins.factionsystem.objects.domain.Faction;
+
 /**
  * @author Callum Johnson
  */

diff --git a/src/main/java/dansplugins/factionsystem/commands/AutoClaimCommand.java b/src/main/java/dansplugins/factionsystem/commands/AutoClaimCommand.java
@@ -4,10 +4,11 @@
  */
 package dansplugins.factionsystem.commands;
 
-import dansplugins.factionsystem.commands.abs.SubCommand;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import dansplugins.factionsystem.commands.abs.SubCommand;
+
 /**
  * @author Callum Johnson
  */

diff --git a/src/main/java/dansplugins/factionsystem/commands/BreakAllianceCommand.java b/src/main/java/dansplugins/factionsystem/commands/BreakAllianceCommand.java
@@ -4,11 +4,12 @@
  */
 package dansplugins.factionsystem.commands;
 
-import dansplugins.factionsystem.commands.abs.SubCommand;
-import dansplugins.factionsystem.objects.domain.Faction;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import dansplugins.factionsystem.commands.abs.SubCommand;
+import dansplugins.factionsystem.objects.domain.Faction;
+
 /**
  * @author Callum Johnson
  */

diff --git a/src/main/java/dansplugins/factionsystem/commands/BypassCommand.java b/src/main/java/dansplugins/factionsystem/commands/BypassCommand.java
@@ -4,10 +4,11 @@
  */
 package dansplugins.factionsystem.commands;
 
-import dansplugins.factionsystem.commands.abs.SubCommand;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import dansplugins.factionsystem.commands.abs.SubCommand;
+
 /**
  * @author Callum Johnson
  */

diff --git a/src/main/java/dansplugins/factionsystem/commands/ChatCommand.java b/src/main/java/dansplugins/factionsystem/commands/ChatCommand.java
@@ -4,10 +4,11 @@
  */
 package dansplugins.factionsystem.commands;
 
-import dansplugins.factionsystem.commands.abs.SubCommand;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import dansplugins.factionsystem.commands.abs.SubCommand;
+
 /**
  * @author Callum Johnson
  */

diff --git a/src/main/java/dansplugins/factionsystem/commands/CheckAccessCommand.java b/src/main/java/dansplugins/factionsystem/commands/CheckAccessCommand.java
@@ -4,10 +4,11 @@
  */
 package dansplugins.factionsystem.commands;
 
-import dansplugins.factionsystem.commands.abs.SubCommand;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import dansplugins.factionsystem.commands.abs.SubCommand;
+
 /**
  * @author Callum Johnson
  */

diff --git a/src/main/java/dansplugins/factionsystem/commands/CheckClaimCommand.java b/src/main/java/dansplugins/factionsystem/commands/CheckClaimCommand.java
@@ -4,10 +4,11 @@
  */
 package dansplugins.factionsystem.commands;
 
-import dansplugins.factionsystem.commands.abs.SubCommand;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import dansplugins.factionsystem.commands.abs.SubCommand;
+
 /**
  * @author Callum Johnson
  */

diff --git a/src/main/java/dansplugins/factionsystem/commands/ClaimCommand.java b/src/main/java/dansplugins/factionsystem/commands/ClaimCommand.java
@@ -4,10 +4,11 @@
  */
 package dansplugins.factionsystem.commands;
 
-import dansplugins.factionsystem.commands.abs.SubCommand;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import dansplugins.factionsystem.commands.abs.SubCommand;
+
 /**
  * @author Callum Johnson
  */

diff --git a/src/main/java/dansplugins/factionsystem/commands/ConfigCommand.java b/src/main/java/dansplugins/factionsystem/commands/ConfigCommand.java
@@ -4,12 +4,13 @@
  */
 package dansplugins.factionsystem.commands;
 
-import dansplugins.factionsystem.MedievalFactions;
-import dansplugins.factionsystem.commands.abs.SubCommand;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import dansplugins.factionsystem.MedievalFactions;
+import dansplugins.factionsystem.commands.abs.SubCommand;
+
 /**
  * @author Callum Johnson
  */

diff --git a/src/main/java/dansplugins/factionsystem/commands/CreateCommand.java b/src/main/java/dansplugins/factionsystem/commands/CreateCommand.java
@@ -4,15 +4,16 @@
  */
 package dansplugins.factionsystem.commands;
 
-import dansplugins.factionsystem.MedievalFactions;
-import dansplugins.factionsystem.commands.abs.SubCommand;
-import dansplugins.factionsystem.events.FactionCreateEvent;
-import dansplugins.factionsystem.objects.domain.Faction;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
 
+import dansplugins.factionsystem.MedievalFactions;
+import dansplugins.factionsystem.commands.abs.SubCommand;
+import dansplugins.factionsystem.events.FactionCreateEvent;
+import dansplugins.factionsystem.objects.domain.Faction;
+
 /**
  * @author Callum Johnson
  */

diff --git a/src/main/java/dansplugins/factionsystem/commands/DeclareIndependenceCommand.java b/src/main/java/dansplugins/factionsystem/commands/DeclareIndependenceCommand.java
@@ -4,13 +4,14 @@
  */
 package dansplugins.factionsystem.commands;
 
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import dansplugins.factionsystem.MedievalFactions;
 import dansplugins.factionsystem.commands.abs.SubCommand;
 import dansplugins.factionsystem.events.FactionWarStartEvent;
 import dansplugins.factionsystem.objects.domain.Faction;
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 /**
  * @author Callum Johnson

diff --git a/src/main/java/dansplugins/factionsystem/commands/DeclareWarCommand.java b/src/main/java/dansplugins/factionsystem/commands/DeclareWarCommand.java
@@ -4,19 +4,20 @@
  */
 package dansplugins.factionsystem.commands;
 
+import java.util.ArrayList;
+
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import dansplugins.factionsystem.MedievalFactions;
 import dansplugins.factionsystem.commands.abs.SubCommand;
 import dansplugins.factionsystem.events.FactionWarStartEvent;
 import dansplugins.factionsystem.factories.WarFactory;
 import dansplugins.factionsystem.objects.domain.Faction;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 import preponderous.ponder.misc.ArgumentParser;
 
-import java.util.ArrayList;
-
 /**
  * @author Callum Johnson
  */

diff --git a/src/main/java/dansplugins/factionsystem/commands/DemoteCommand.java b/src/main/java/dansplugins/factionsystem/commands/DemoteCommand.java
@@ -4,13 +4,14 @@
  */
 package dansplugins.factionsystem.commands;
 
-import dansplugins.factionsystem.commands.abs.SubCommand;
+import java.util.UUID;
+
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import java.util.UUID;
+import dansplugins.factionsystem.commands.abs.SubCommand;
 
 /**
  * @author Callum Johnson

diff --git a/src/main/java/dansplugins/factionsystem/commands/DescCommand.java b/src/main/java/dansplugins/factionsystem/commands/DescCommand.java
@@ -4,10 +4,11 @@
  */
 package dansplugins.factionsystem.commands;
 
-import dansplugins.factionsystem.commands.abs.SubCommand;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import dansplugins.factionsystem.commands.abs.SubCommand;
+
 /**
  * @author Callum Johnson
  */

diff --git a/src/main/java/dansplugins/factionsystem/commands/DisbandCommand.java b/src/main/java/dansplugins/factionsystem/commands/DisbandCommand.java
@@ -4,16 +4,17 @@
  */
 package dansplugins.factionsystem.commands;
 
+import org.bukkit.Bukkit;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
 import dansplugins.factionsystem.commands.abs.SubCommand;
 import dansplugins.factionsystem.data.PersistentData;
 import dansplugins.factionsystem.events.FactionDisbandEvent;
 import dansplugins.factionsystem.integrators.DynmapIntegrator;
 import dansplugins.factionsystem.objects.domain.Faction;
 import dansplugins.factionsystem.utils.Logger;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
 
 /**
  * @author Callum Johnson

diff --git a/src/main/java/dansplugins/factionsystem/commands/DuelCommand.java b/src/main/java/dansplugins/factionsystem/commands/DuelCommand.java
@@ -4,13 +4,13 @@
  */
 package dansplugins.factionsystem.commands;
 
-import dansplugins.factionsystem.commands.abs.SubCommand;
-import dansplugins.factionsystem.objects.domain.Duel;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import static dansplugins.factionsystem.objects.domain.Duel.DuelState;
+import dansplugins.factionsystem.commands.abs.SubCommand;
+import dansplugins.factionsystem.objects.domain.Duel;
+import dansplugins.factionsystem.objects.domain.Duel.DuelState;
 
 /**
  * @author Callum Johnson

diff --git a/src/main/java/dansplugins/factionsystem/commands/EditLawCommand.java b/src/main/java/dansplugins/factionsystem/commands/EditLawCommand.java
@@ -4,10 +4,11 @@
  */
 package dansplugins.factionsystem.commands;
 
-import dansplugins.factionsystem.commands.abs.SubCommand;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import dansplugins.factionsystem.commands.abs.SubCommand;
+
 /**
  * @author Callum Johnson
  */

diff --git a/src/main/java/dansplugins/factionsystem/commands/FlagsCommand.java b/src/main/java/dansplugins/factionsystem/commands/FlagsCommand.java
@@ -4,11 +4,12 @@
  */
 package dansplugins.factionsystem.commands;
 
-import dansplugins.factionsystem.commands.abs.SubCommand;
-import dansplugins.factionsystem.objects.domain.Faction;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+import dansplugins.factionsystem.commands.abs.SubCommand;
+import dansplugins.factionsystem.objects.domain.Faction;
+
 /**
  * @author Callum Johnson
  */