From 99683b1f6be2f6ab57401c6f9ef2fa6d301833d5 Mon Sep 17 00:00:00 2001
From: Austin Mayes <austin@avicus.net>
Date: Tue, 14 Jul 2020 00:45:32 -0500
Subject: [PATCH] Cleanup

---
 core/src/main/java/net/avicus/atlas/core/Atlas.java |  4 ++--
 .../java/net/avicus/atlas/core/AtlasConfig.java     |  7 +++----
 .../atlas/core/announce/AnnounceCommands.java       |  8 ++++----
 .../java/net/avicus/atlas/core/channel/Channel.java |  1 -
 .../atlas/core/channel/premium/PremiumChannel.java  |  4 ----
 .../atlas/core/channel/report/ReportChannel.java    |  2 +-
 .../atlas/core/channel/staff/StaffChannel.java      |  4 ----
 .../net/avicus/atlas/core/chat/MessageCommands.java | 13 ++++++-------
 .../avicus/atlas/core/command/GenericCommands.java  |  2 +-
 .../core/event/player/PlayerSpawnBeginEvent.java    |  4 ++--
 .../core/event/player/PlayerSpawnCompleteEvent.java |  4 ++--
 .../net/avicus/atlas/core/module/shop/ShopItem.java |  3 +--
 .../net/avicus/atlas/core/module/vote/VoteMenu.java |  2 +-
 .../net/avicus/atlas/core/util/Translations.java    |  1 -
 .../atlas/core/util/properties/ToolUtils.java       |  5 +++--
 .../net/avicus/atlas/sets/arcade/ArcadeMain.java    |  2 +-
 .../atlas/sets/competitve/objectives/Main.java      |  2 +-
 17 files changed, 28 insertions(+), 40 deletions(-)

diff --git a/core/src/main/java/net/avicus/atlas/core/Atlas.java b/core/src/main/java/net/avicus/atlas/core/Atlas.java
index 2d78457..a16fcdf 100755
--- a/core/src/main/java/net/avicus/atlas/core/Atlas.java
+++ b/core/src/main/java/net/avicus/atlas/core/Atlas.java
@@ -67,7 +67,6 @@
 import net.avicus.atlas.core.util.AtlasTask;
 import net.avicus.atlas.core.util.Events;
 import net.avicus.atlas.core.util.Messages;
-import net.avicus.compendium.locale.TranslationProvider;
 import net.avicus.atlas.core.util.Translations;
 import net.avicus.atlas.core.util.properties.BlockPropStore;
 import net.avicus.compendium.AvicusBukkitCommandManager;
@@ -75,6 +74,7 @@
 import net.avicus.compendium.commands.AvicusCommandsRegistration;
 import net.avicus.compendium.commands.exception.AbstractTranslatableCommandException;
 import net.avicus.compendium.config.Config;
+import net.avicus.compendium.locale.TranslationProvider;
 import net.avicus.compendium.locale.text.UnlocalizedText;
 import net.avicus.compendium.settings.PlayerSettings;
 import org.bukkit.Bukkit;
@@ -89,8 +89,8 @@
 
 public class Atlas extends JavaPlugin {
 
-  private AtomicBoolean ready = new AtomicBoolean(false);
   private static Atlas instance;
+  private AtomicBoolean ready = new AtomicBoolean(false);
   private AvicusCommandsManager commandManager;
   @Getter
   @Setter
diff --git a/core/src/main/java/net/avicus/atlas/core/AtlasConfig.java b/core/src/main/java/net/avicus/atlas/core/AtlasConfig.java
index 9aa5e20..47f77c3 100644
--- a/core/src/main/java/net/avicus/atlas/core/AtlasConfig.java
+++ b/core/src/main/java/net/avicus/atlas/core/AtlasConfig.java
@@ -63,6 +63,9 @@ public class AtlasConfig {
   @ConfigPath("github")
   @ConfigKey(key = "token")
   private static String githubToken;
+  @Getter
+  @ConfigKey(key = "send-deprecation-warnings")
+  private static boolean sendDeprecationWarnings;
 
   @ConfigPath("website")
   public static class Website {
@@ -80,10 +83,6 @@ public static String resolvePath(String slug) {
     }
   }
 
-  @Getter
-  @ConfigKey(key = "send-deprecation-warnings")
-  private static boolean sendDeprecationWarnings;
-
   @ConfigPath("chat")
   public static class Chat {
 
diff --git a/core/src/main/java/net/avicus/atlas/core/announce/AnnounceCommands.java b/core/src/main/java/net/avicus/atlas/core/announce/AnnounceCommands.java
index b1e4fe1..0312549 100644
--- a/core/src/main/java/net/avicus/atlas/core/announce/AnnounceCommands.java
+++ b/core/src/main/java/net/avicus/atlas/core/announce/AnnounceCommands.java
@@ -40,10 +40,6 @@ public static void critical(CommandContext cmd, CommandSender sender) throws Com
     sender.sendMessage("Message sent!");
   }
 
-  public enum AnnounceType {
-    NO_PREFIX, MESSAGE, CRITICAL
-  }
-
   private static void send(String message, AnnounceType type) {
     TextComponent prefix;
     if (type == AnnounceType.NO_PREFIX) {
@@ -59,6 +55,10 @@ private static void send(String message, AnnounceType type) {
     Bukkit.broadcast(send);
   }
 
+  public enum AnnounceType {
+    NO_PREFIX, MESSAGE, CRITICAL
+  }
+
   public static class Parent {
 
     @CommandPermissions("hook.announce")
diff --git a/core/src/main/java/net/avicus/atlas/core/channel/Channel.java b/core/src/main/java/net/avicus/atlas/core/channel/Channel.java
index 13c8a53..38704b7 100644
--- a/core/src/main/java/net/avicus/atlas/core/channel/Channel.java
+++ b/core/src/main/java/net/avicus/atlas/core/channel/Channel.java
@@ -2,7 +2,6 @@
 
 import java.util.regex.Pattern;
 import javax.annotation.Nullable;
-import net.avicus.atlas.core.component.Component;
 import net.md_5.bungee.api.chat.BaseComponent;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.ChatColor;
diff --git a/core/src/main/java/net/avicus/atlas/core/channel/premium/PremiumChannel.java b/core/src/main/java/net/avicus/atlas/core/channel/premium/PremiumChannel.java
index 3ec3a4f..5204cec 100644
--- a/core/src/main/java/net/avicus/atlas/core/channel/premium/PremiumChannel.java
+++ b/core/src/main/java/net/avicus/atlas/core/channel/premium/PremiumChannel.java
@@ -1,11 +1,7 @@
 package net.avicus.atlas.core.channel.premium;
 
 import net.avicus.atlas.core.channel.PrefixedChannel;
-import net.avicus.atlas.core.text.Components;
-import net.md_5.bungee.api.chat.BaseComponent;
-import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
 
 public final class PremiumChannel extends PrefixedChannel {
 
diff --git a/core/src/main/java/net/avicus/atlas/core/channel/report/ReportChannel.java b/core/src/main/java/net/avicus/atlas/core/channel/report/ReportChannel.java
index d8fb3cc..3e90ffe 100644
--- a/core/src/main/java/net/avicus/atlas/core/channel/report/ReportChannel.java
+++ b/core/src/main/java/net/avicus/atlas/core/channel/report/ReportChannel.java
@@ -5,8 +5,8 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import net.avicus.atlas.core.AtlasConfig;
 import net.avicus.atlas.core.channel.PrefixedChannel;
-import net.avicus.atlas.core.util.Translations;
 import net.avicus.atlas.core.text.Components;
+import net.avicus.atlas.core.util.Translations;
 import net.avicus.compendium.commands.exception.TranslatableCommandErrorException;
 import net.avicus.compendium.locale.text.LocalizedNumber;
 import net.avicus.compendium.settings.PlayerSettings;
diff --git a/core/src/main/java/net/avicus/atlas/core/channel/staff/StaffChannel.java b/core/src/main/java/net/avicus/atlas/core/channel/staff/StaffChannel.java
index 7213d36..4a49a31 100644
--- a/core/src/main/java/net/avicus/atlas/core/channel/staff/StaffChannel.java
+++ b/core/src/main/java/net/avicus/atlas/core/channel/staff/StaffChannel.java
@@ -1,11 +1,7 @@
 package net.avicus.atlas.core.channel.staff;
 
 import net.avicus.atlas.core.channel.PrefixedChannel;
-import net.avicus.atlas.core.text.Components;
 import net.md_5.bungee.api.chat.BaseComponent;
-import net.md_5.bungee.api.chat.TextComponent;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
 
 public final class StaffChannel extends PrefixedChannel {
 
diff --git a/core/src/main/java/net/avicus/atlas/core/chat/MessageCommands.java b/core/src/main/java/net/avicus/atlas/core/chat/MessageCommands.java
index a3bb17c..e019329 100644
--- a/core/src/main/java/net/avicus/atlas/core/chat/MessageCommands.java
+++ b/core/src/main/java/net/avicus/atlas/core/chat/MessageCommands.java
@@ -34,13 +34,6 @@ public class MessageCommands implements CommandComponent {
       Messages.PRIVATE_MESSAGES,
       Messages.PRIVATE_MESSAGES_SUMMARY
   );
-
-  public enum PrivateMessageScope {
-    ALL,
-    FRIENDS,
-    OFF
-  }
-
   private final static Map<UUID, UUID> lastMessages = new HashMap<>();
 
   private static boolean shouldDeliver(Player from, Player to) {
@@ -140,4 +133,10 @@ public void enable() {
   public void registerCommands(CommandsManagerRegistration registrar) {
     registrar.register(MessageCommands.class);
   }
+
+  public enum PrivateMessageScope {
+    ALL,
+    FRIENDS,
+    OFF
+  }
 }
diff --git a/core/src/main/java/net/avicus/atlas/core/command/GenericCommands.java b/core/src/main/java/net/avicus/atlas/core/command/GenericCommands.java
index 644c5f6..1bde281 100644
--- a/core/src/main/java/net/avicus/atlas/core/command/GenericCommands.java
+++ b/core/src/main/java/net/avicus/atlas/core/command/GenericCommands.java
@@ -7,8 +7,8 @@
 import com.sk89q.minecraft.util.commands.CommandPermissionsException;
 import java.util.Iterator;
 import java.util.List;
-import net.avicus.atlas.core.util.Translations;
 import net.avicus.atlas.core.text.Components;
+import net.avicus.atlas.core.util.Translations;
 import net.avicus.compendium.commands.exception.TranslatableCommandErrorException;
 import net.avicus.compendium.locale.text.LocalizedNumber;
 import net.avicus.compendium.locale.text.UnlocalizedText;
diff --git a/core/src/main/java/net/avicus/atlas/core/event/player/PlayerSpawnBeginEvent.java b/core/src/main/java/net/avicus/atlas/core/event/player/PlayerSpawnBeginEvent.java
index 7363c23..197f857 100755
--- a/core/src/main/java/net/avicus/atlas/core/event/player/PlayerSpawnBeginEvent.java
+++ b/core/src/main/java/net/avicus/atlas/core/event/player/PlayerSpawnBeginEvent.java
@@ -9,8 +9,8 @@
 import org.bukkit.event.player.PlayerEvent;
 
 /**
- * An event that is fired when a player spawns into a {@link Match}. Event is
- * called before they are teleported or given a loadout.
+ * An event that is fired when a player spawns into a {@link Match}. Event is called before they are
+ * teleported or given a loadout.
  */
 public class PlayerSpawnBeginEvent extends PlayerEvent {
 
diff --git a/core/src/main/java/net/avicus/atlas/core/event/player/PlayerSpawnCompleteEvent.java b/core/src/main/java/net/avicus/atlas/core/event/player/PlayerSpawnCompleteEvent.java
index 35d8fef..8560821 100755
--- a/core/src/main/java/net/avicus/atlas/core/event/player/PlayerSpawnCompleteEvent.java
+++ b/core/src/main/java/net/avicus/atlas/core/event/player/PlayerSpawnCompleteEvent.java
@@ -8,8 +8,8 @@
 import org.bukkit.event.player.PlayerEvent;
 
 /**
- * An event that is fired when a player spawns into a {@link Match}. Event is
- * called after they are teleported and/or given a loadout.
+ * An event that is fired when a player spawns into a {@link Match}. Event is called after they are
+ * teleported and/or given a loadout.
  */
 public class PlayerSpawnCompleteEvent extends PlayerEvent {
 
diff --git a/core/src/main/java/net/avicus/atlas/core/module/shop/ShopItem.java b/core/src/main/java/net/avicus/atlas/core/module/shop/ShopItem.java
index 57a2b28..04ffdf4 100644
--- a/core/src/main/java/net/avicus/atlas/core/module/shop/ShopItem.java
+++ b/core/src/main/java/net/avicus/atlas/core/module/shop/ShopItem.java
@@ -46,8 +46,7 @@ public abstract class ShopItem {
    * @param name The name of the item.
    * @param description List of description lines for the item. This will never be null, but can be
    * empty.
-   * @param icon The icon which should be used for the corresponding {@link
-   * ShopMenuItem}.
+   * @param icon The icon which should be used for the corresponding {@link ShopMenuItem}.
    * @param purchaseCheck The check that should be ran before this item can be purchased.
    */
   public ShopItem(int price,
diff --git a/core/src/main/java/net/avicus/atlas/core/module/vote/VoteMenu.java b/core/src/main/java/net/avicus/atlas/core/module/vote/VoteMenu.java
index 98dafd1..aa7a229 100644
--- a/core/src/main/java/net/avicus/atlas/core/module/vote/VoteMenu.java
+++ b/core/src/main/java/net/avicus/atlas/core/module/vote/VoteMenu.java
@@ -10,10 +10,10 @@
 import net.avicus.atlas.core.GameType;
 import net.avicus.atlas.core.map.AtlasMap;
 import net.avicus.atlas.core.match.Match;
+import net.avicus.atlas.core.profile.Skins;
 import net.avicus.atlas.core.util.Inventories;
 import net.avicus.atlas.core.util.Messages;
 import net.avicus.atlas.core.util.Translations;
-import net.avicus.atlas.core.profile.Skins;
 import net.avicus.compendium.locale.text.LocalizedNumber;
 import net.avicus.compendium.locale.text.UnlocalizedFormat;
 import net.avicus.compendium.menu.inventory.ClickableInventoryMenuItem;
diff --git a/core/src/main/java/net/avicus/atlas/core/util/Translations.java b/core/src/main/java/net/avicus/atlas/core/util/Translations.java
index 91d4cc2..5344469 100644
--- a/core/src/main/java/net/avicus/atlas/core/util/Translations.java
+++ b/core/src/main/java/net/avicus/atlas/core/util/Translations.java
@@ -2,7 +2,6 @@
 
 import static net.avicus.compendium.locale.TranslationProvider.$NULL$;
 
-import net.avicus.atlas.core.Atlas;
 import net.avicus.atlas.core.AtlasConfig;
 import net.avicus.compendium.locale.LocaleBundle;
 import net.avicus.compendium.locale.TranslationProvider;
diff --git a/core/src/main/java/net/avicus/atlas/core/util/properties/ToolUtils.java b/core/src/main/java/net/avicus/atlas/core/util/properties/ToolUtils.java
index 7a767ae..771e132 100644
--- a/core/src/main/java/net/avicus/atlas/core/util/properties/ToolUtils.java
+++ b/core/src/main/java/net/avicus/atlas/core/util/properties/ToolUtils.java
@@ -220,8 +220,9 @@ else if (blockId == Material.VINE.getId() && toolProps.toolType == Props.ToolTyp
         // More Workarounds:
         // TODO: Consider checking a generic workaround (based on duration, assuming some dig packets lost, proportional to duration etc.).
         if (toolProps.materialBase == Props.MaterialBase.WOOD) {
-          if (toolProps.toolType == Props.ToolType.PICKAXE && (blockProps == BlockPropStore.ironDoorType
-              || blockProps == BlockPropStore.dispenserType)) {
+          if (toolProps.toolType == Props.ToolType.PICKAXE && (
+              blockProps == BlockPropStore.ironDoorType
+                  || blockProps == BlockPropStore.dispenserType)) {
             // Special correction.
             // TODO: Uncomfortable: hide this in the blocks by some flags / other type of workarounds !
             if (blockProps == BlockPropStore.dispenserType) {
diff --git a/sets/arcade/src/main/java/net/avicus/atlas/sets/arcade/ArcadeMain.java b/sets/arcade/src/main/java/net/avicus/atlas/sets/arcade/ArcadeMain.java
index 18c602f..7c2e2d5 100644
--- a/sets/arcade/src/main/java/net/avicus/atlas/sets/arcade/ArcadeMain.java
+++ b/sets/arcade/src/main/java/net/avicus/atlas/sets/arcade/ArcadeMain.java
@@ -3,9 +3,9 @@
 import java.util.logging.Logger;
 import lombok.Getter;
 import lombok.Setter;
+import net.avicus.atlas.core.Atlas;
 import net.avicus.atlas.core.component.ComponentManager;
 import net.avicus.atlas.core.component.visual.SidebarComponent;
-import net.avicus.atlas.core.Atlas;
 import net.avicus.atlas.core.countdown.CyclingCountdown;
 import net.avicus.atlas.core.countdown.StartingCountdown;
 import net.avicus.atlas.core.external.ModuleSet;
diff --git a/sets/competitve-objectives/src/main/java/net/avicus/atlas/sets/competitve/objectives/Main.java b/sets/competitve-objectives/src/main/java/net/avicus/atlas/sets/competitve/objectives/Main.java
index 54b0f82..f661e3f 100644
--- a/sets/competitve-objectives/src/main/java/net/avicus/atlas/sets/competitve/objectives/Main.java
+++ b/sets/competitve-objectives/src/main/java/net/avicus/atlas/sets/competitve/objectives/Main.java
@@ -3,10 +3,10 @@
 import com.google.common.collect.Lists;
 import java.util.logging.Logger;
 import lombok.Setter;
+import net.avicus.atlas.core.Atlas;
 import net.avicus.atlas.core.component.ComponentManager;
 import net.avicus.atlas.core.component.visual.SidebarComponent;
 import net.avicus.atlas.core.component.visual.SoundComponent;
-import net.avicus.atlas.core.Atlas;
 import net.avicus.atlas.core.external.ModuleSet;
 import net.avicus.atlas.core.map.AtlasMapFactory;
 import net.avicus.atlas.core.match.MatchFactory;