From 117d87add5f3e10658988248751795d73ad356fe Mon Sep 17 00:00:00 2001 From: Joe Shimell <49585339+JoeShimell@users.noreply.github.com> Date: Sat, 21 Nov 2020 00:43:09 +0000 Subject: [PATCH] refactoring --- .../uk/co/angrybee/joe/DiscordClient.java | 12 ++++---- .../co/angrybee/joe/DiscordWhitelister.java | 28 ++++++++----------- .../{Commands => commands}/CommandAbout.java | 2 +- .../{Commands => commands}/CommandReload.java | 2 +- .../{Commands => commands}/CommandStatus.java | 2 +- .../CustomMessagesConfig.java | 2 +- .../CustomPrefixConfig.java | 2 +- .../joe/{Configs => configs}/MainConfig.java | 2 +- .../OnWhitelistCommandsConfig.java | 3 +- .../PermissionsConfig.java | 2 +- .../{Events => events}/JoinLeaveEvents.java | 2 +- .../joe/{Events => events}/OnBanEvent.java | 12 ++++---- .../{Events => events}/OnWhitelistEvents.java | 8 +++--- .../{Events => events}/ShutdownEvents.java | 3 +- .../{Stores => stores}/InGameRemovedList.java | 2 +- .../joe/{Stores => stores}/RemovedList.java | 2 +- .../joe/{Stores => stores}/UserList.java | 2 +- .../WhitelistedPlayers.java | 4 +-- 18 files changed, 43 insertions(+), 49 deletions(-) rename src/main/java/uk/co/angrybee/joe/{Commands => commands}/CommandAbout.java (94%) rename src/main/java/uk/co/angrybee/joe/{Commands => commands}/CommandReload.java (98%) rename src/main/java/uk/co/angrybee/joe/{Commands => commands}/CommandStatus.java (96%) rename src/main/java/uk/co/angrybee/joe/{Configs => configs}/CustomMessagesConfig.java (99%) rename src/main/java/uk/co/angrybee/joe/{Configs => configs}/CustomPrefixConfig.java (98%) rename src/main/java/uk/co/angrybee/joe/{Configs => configs}/MainConfig.java (99%) rename src/main/java/uk/co/angrybee/joe/{Configs => configs}/OnWhitelistCommandsConfig.java (98%) rename src/main/java/uk/co/angrybee/joe/{Configs => configs}/PermissionsConfig.java (98%) rename src/main/java/uk/co/angrybee/joe/{Events => events}/JoinLeaveEvents.java (98%) rename src/main/java/uk/co/angrybee/joe/{Events => events}/OnBanEvent.java (95%) rename src/main/java/uk/co/angrybee/joe/{Events => events}/OnWhitelistEvents.java (96%) rename src/main/java/uk/co/angrybee/joe/{Events => events}/ShutdownEvents.java (93%) rename src/main/java/uk/co/angrybee/joe/{Stores => stores}/InGameRemovedList.java (98%) rename src/main/java/uk/co/angrybee/joe/{Stores => stores}/RemovedList.java (98%) rename src/main/java/uk/co/angrybee/joe/{Stores => stores}/UserList.java (98%) rename src/main/java/uk/co/angrybee/joe/{Stores => stores}/WhitelistedPlayers.java (97%) diff --git a/src/main/java/uk/co/angrybee/joe/DiscordClient.java b/src/main/java/uk/co/angrybee/joe/DiscordClient.java index 0efff33..0c02c91 100644 --- a/src/main/java/uk/co/angrybee/joe/DiscordClient.java +++ b/src/main/java/uk/co/angrybee/joe/DiscordClient.java @@ -15,12 +15,12 @@ import org.json.simple.JSONObject; import org.json.simple.JSONValue; import org.json.simple.parser.ParseException; import org.yaml.snakeyaml.Yaml; -import uk.co.angrybee.joe.Configs.*; -import uk.co.angrybee.joe.Events.ShutdownEvents; -import uk.co.angrybee.joe.Stores.InGameRemovedList; -import uk.co.angrybee.joe.Stores.RemovedList; -import uk.co.angrybee.joe.Stores.UserList; -import uk.co.angrybee.joe.Stores.WhitelistedPlayers; +import uk.co.angrybee.joe.configs.*; +import uk.co.angrybee.joe.events.ShutdownEvents; +import uk.co.angrybee.joe.stores.InGameRemovedList; +import uk.co.angrybee.joe.stores.RemovedList; +import uk.co.angrybee.joe.stores.UserList; +import uk.co.angrybee.joe.stores.WhitelistedPlayers; import javax.annotation.Nonnull; import javax.security.auth.login.LoginException; diff --git a/src/main/java/uk/co/angrybee/joe/DiscordWhitelister.java b/src/main/java/uk/co/angrybee/joe/DiscordWhitelister.java index c0b17fe..b03151b 100755 --- a/src/main/java/uk/co/angrybee/joe/DiscordWhitelister.java +++ b/src/main/java/uk/co/angrybee/joe/DiscordWhitelister.java @@ -1,26 +1,22 @@ package uk.co.angrybee.joe; import org.bukkit.Server; -import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.FileConfiguration; -import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.plugin.java.JavaPlugin; -import uk.co.angrybee.joe.Commands.CommandAbout; -import uk.co.angrybee.joe.Commands.CommandReload; -import uk.co.angrybee.joe.Commands.CommandStatus; -import uk.co.angrybee.joe.Configs.*; -import uk.co.angrybee.joe.Events.JoinLeaveEvents; -import uk.co.angrybee.joe.Events.OnBanEvent; -import uk.co.angrybee.joe.Events.OnWhitelistEvents; -import uk.co.angrybee.joe.Stores.InGameRemovedList; -import uk.co.angrybee.joe.Stores.RemovedList; -import uk.co.angrybee.joe.Stores.UserList; -import uk.co.angrybee.joe.Stores.WhitelistedPlayers; +import uk.co.angrybee.joe.commands.CommandAbout; +import uk.co.angrybee.joe.commands.CommandReload; +import uk.co.angrybee.joe.commands.CommandStatus; +import uk.co.angrybee.joe.configs.*; +import uk.co.angrybee.joe.events.JoinLeaveEvents; +import uk.co.angrybee.joe.events.OnBanEvent; +import uk.co.angrybee.joe.events.OnWhitelistEvents; +import uk.co.angrybee.joe.stores.InGameRemovedList; +import uk.co.angrybee.joe.stores.RemovedList; +import uk.co.angrybee.joe.stores.UserList; +import uk.co.angrybee.joe.stores.WhitelistedPlayers; -import java.io.File; -import java.io.FileNotFoundException; import java.io.IOException; -import java.util.*; +import java.util.List; import java.util.logging.Logger; public class DiscordWhitelister extends JavaPlugin diff --git a/src/main/java/uk/co/angrybee/joe/Commands/CommandAbout.java b/src/main/java/uk/co/angrybee/joe/commands/CommandAbout.java similarity index 94% rename from src/main/java/uk/co/angrybee/joe/Commands/CommandAbout.java rename to src/main/java/uk/co/angrybee/joe/commands/CommandAbout.java index 6ae9dfb..489e3ce 100644 --- a/src/main/java/uk/co/angrybee/joe/Commands/CommandAbout.java +++ b/src/main/java/uk/co/angrybee/joe/commands/CommandAbout.java @@ -1,4 +1,4 @@ -package uk.co.angrybee.joe.Commands; +package uk.co.angrybee.joe.commands; import org.bukkit.ChatColor; import org.bukkit.command.Command; diff --git a/src/main/java/uk/co/angrybee/joe/Commands/CommandReload.java b/src/main/java/uk/co/angrybee/joe/commands/CommandReload.java similarity index 98% rename from src/main/java/uk/co/angrybee/joe/Commands/CommandReload.java rename to src/main/java/uk/co/angrybee/joe/commands/CommandReload.java index b9bcbbd..ee9a951 100644 --- a/src/main/java/uk/co/angrybee/joe/Commands/CommandReload.java +++ b/src/main/java/uk/co/angrybee/joe/commands/CommandReload.java @@ -1,4 +1,4 @@ -package uk.co.angrybee.joe.Commands; +package uk.co.angrybee.joe.commands; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; diff --git a/src/main/java/uk/co/angrybee/joe/Commands/CommandStatus.java b/src/main/java/uk/co/angrybee/joe/commands/CommandStatus.java similarity index 96% rename from src/main/java/uk/co/angrybee/joe/Commands/CommandStatus.java rename to src/main/java/uk/co/angrybee/joe/commands/CommandStatus.java index 6ae2f03..15365c2 100644 --- a/src/main/java/uk/co/angrybee/joe/Commands/CommandStatus.java +++ b/src/main/java/uk/co/angrybee/joe/commands/CommandStatus.java @@ -1,4 +1,4 @@ -package uk.co.angrybee.joe.Commands; +package uk.co.angrybee.joe.commands; import org.bukkit.ChatColor; import org.bukkit.command.Command; diff --git a/src/main/java/uk/co/angrybee/joe/Configs/CustomMessagesConfig.java b/src/main/java/uk/co/angrybee/joe/configs/CustomMessagesConfig.java similarity index 99% rename from src/main/java/uk/co/angrybee/joe/Configs/CustomMessagesConfig.java rename to src/main/java/uk/co/angrybee/joe/configs/CustomMessagesConfig.java index 9a25dbf..e66e4a2 100644 --- a/src/main/java/uk/co/angrybee/joe/Configs/CustomMessagesConfig.java +++ b/src/main/java/uk/co/angrybee/joe/configs/CustomMessagesConfig.java @@ -1,4 +1,4 @@ -package uk.co.angrybee.joe.Configs; +package uk.co.angrybee.joe.configs; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.FileConfiguration; diff --git a/src/main/java/uk/co/angrybee/joe/Configs/CustomPrefixConfig.java b/src/main/java/uk/co/angrybee/joe/configs/CustomPrefixConfig.java similarity index 98% rename from src/main/java/uk/co/angrybee/joe/Configs/CustomPrefixConfig.java rename to src/main/java/uk/co/angrybee/joe/configs/CustomPrefixConfig.java index 34a3b12..65246c8 100644 --- a/src/main/java/uk/co/angrybee/joe/Configs/CustomPrefixConfig.java +++ b/src/main/java/uk/co/angrybee/joe/configs/CustomPrefixConfig.java @@ -1,4 +1,4 @@ -package uk.co.angrybee.joe.Configs; +package uk.co.angrybee.joe.configs; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.FileConfiguration; diff --git a/src/main/java/uk/co/angrybee/joe/Configs/MainConfig.java b/src/main/java/uk/co/angrybee/joe/configs/MainConfig.java similarity index 99% rename from src/main/java/uk/co/angrybee/joe/Configs/MainConfig.java rename to src/main/java/uk/co/angrybee/joe/configs/MainConfig.java index f9cca7f..8077c6f 100644 --- a/src/main/java/uk/co/angrybee/joe/Configs/MainConfig.java +++ b/src/main/java/uk/co/angrybee/joe/configs/MainConfig.java @@ -1,4 +1,4 @@ -package uk.co.angrybee.joe.Configs; +package uk.co.angrybee.joe.configs; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.FileConfiguration; diff --git a/src/main/java/uk/co/angrybee/joe/Configs/OnWhitelistCommandsConfig.java b/src/main/java/uk/co/angrybee/joe/configs/OnWhitelistCommandsConfig.java similarity index 98% rename from src/main/java/uk/co/angrybee/joe/Configs/OnWhitelistCommandsConfig.java rename to src/main/java/uk/co/angrybee/joe/configs/OnWhitelistCommandsConfig.java index d771efd..1fbe2ed 100644 --- a/src/main/java/uk/co/angrybee/joe/Configs/OnWhitelistCommandsConfig.java +++ b/src/main/java/uk/co/angrybee/joe/configs/OnWhitelistCommandsConfig.java @@ -1,4 +1,4 @@ -package uk.co.angrybee.joe.Configs; +package uk.co.angrybee.joe.configs; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.FileConfiguration; @@ -9,7 +9,6 @@ import java.io.File; import java.io.FileWriter; import java.io.IOException; import java.util.Arrays; -import java.util.Collections; public class OnWhitelistCommandsConfig { diff --git a/src/main/java/uk/co/angrybee/joe/Configs/PermissionsConfig.java b/src/main/java/uk/co/angrybee/joe/configs/PermissionsConfig.java similarity index 98% rename from src/main/java/uk/co/angrybee/joe/Configs/PermissionsConfig.java rename to src/main/java/uk/co/angrybee/joe/configs/PermissionsConfig.java index acd2fe6..a3e6dd6 100644 --- a/src/main/java/uk/co/angrybee/joe/Configs/PermissionsConfig.java +++ b/src/main/java/uk/co/angrybee/joe/configs/PermissionsConfig.java @@ -1,4 +1,4 @@ -package uk.co.angrybee.joe.Configs; +package uk.co.angrybee.joe.configs; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.FileConfiguration; diff --git a/src/main/java/uk/co/angrybee/joe/Events/JoinLeaveEvents.java b/src/main/java/uk/co/angrybee/joe/events/JoinLeaveEvents.java similarity index 98% rename from src/main/java/uk/co/angrybee/joe/Events/JoinLeaveEvents.java rename to src/main/java/uk/co/angrybee/joe/events/JoinLeaveEvents.java index efd2f3a..4c70f3a 100644 --- a/src/main/java/uk/co/angrybee/joe/Events/JoinLeaveEvents.java +++ b/src/main/java/uk/co/angrybee/joe/events/JoinLeaveEvents.java @@ -1,4 +1,4 @@ -package uk.co.angrybee.joe.Events; +package uk.co.angrybee.joe.events; import uk.co.angrybee.joe.DiscordWhitelister; import uk.co.angrybee.joe.DiscordClient; diff --git a/src/main/java/uk/co/angrybee/joe/Events/OnBanEvent.java b/src/main/java/uk/co/angrybee/joe/events/OnBanEvent.java similarity index 95% rename from src/main/java/uk/co/angrybee/joe/Events/OnBanEvent.java rename to src/main/java/uk/co/angrybee/joe/events/OnBanEvent.java index 114eb92..85325af 100644 --- a/src/main/java/uk/co/angrybee/joe/Events/OnBanEvent.java +++ b/src/main/java/uk/co/angrybee/joe/events/OnBanEvent.java @@ -1,4 +1,4 @@ -package uk.co.angrybee.joe.Events; +package uk.co.angrybee.joe.events; import org.bukkit.OfflinePlayer; import org.bukkit.Server; @@ -7,13 +7,13 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerCommandPreprocessEvent; import org.yaml.snakeyaml.Yaml; -import uk.co.angrybee.joe.Configs.MainConfig; -import uk.co.angrybee.joe.Configs.PermissionsConfig; +import uk.co.angrybee.joe.configs.MainConfig; +import uk.co.angrybee.joe.configs.PermissionsConfig; import uk.co.angrybee.joe.DiscordClient; import uk.co.angrybee.joe.DiscordWhitelister; -import uk.co.angrybee.joe.Stores.InGameRemovedList; -import uk.co.angrybee.joe.Stores.UserList; -import uk.co.angrybee.joe.Stores.WhitelistedPlayers; +import uk.co.angrybee.joe.stores.InGameRemovedList; +import uk.co.angrybee.joe.stores.UserList; +import uk.co.angrybee.joe.stores.WhitelistedPlayers; import java.io.FileInputStream; import java.io.IOException; diff --git a/src/main/java/uk/co/angrybee/joe/Events/OnWhitelistEvents.java b/src/main/java/uk/co/angrybee/joe/events/OnWhitelistEvents.java similarity index 96% rename from src/main/java/uk/co/angrybee/joe/Events/OnWhitelistEvents.java rename to src/main/java/uk/co/angrybee/joe/events/OnWhitelistEvents.java index 1024211..e00722a 100644 --- a/src/main/java/uk/co/angrybee/joe/Events/OnWhitelistEvents.java +++ b/src/main/java/uk/co/angrybee/joe/events/OnWhitelistEvents.java @@ -1,13 +1,13 @@ -package uk.co.angrybee.joe.Events; +package uk.co.angrybee.joe.events; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerCommandPreprocessEvent; import uk.co.angrybee.joe.DiscordWhitelister; -import uk.co.angrybee.joe.Stores.InGameRemovedList; -import uk.co.angrybee.joe.Stores.RemovedList; -import uk.co.angrybee.joe.Stores.WhitelistedPlayers; +import uk.co.angrybee.joe.stores.InGameRemovedList; +import uk.co.angrybee.joe.stores.RemovedList; +import uk.co.angrybee.joe.stores.WhitelistedPlayers; import java.io.File; diff --git a/src/main/java/uk/co/angrybee/joe/Events/ShutdownEvents.java b/src/main/java/uk/co/angrybee/joe/events/ShutdownEvents.java similarity index 93% rename from src/main/java/uk/co/angrybee/joe/Events/ShutdownEvents.java rename to src/main/java/uk/co/angrybee/joe/events/ShutdownEvents.java index 836aceb..38dd773 100644 --- a/src/main/java/uk/co/angrybee/joe/Events/ShutdownEvents.java +++ b/src/main/java/uk/co/angrybee/joe/events/ShutdownEvents.java @@ -1,9 +1,8 @@ -package uk.co.angrybee.joe.Events; +package uk.co.angrybee.joe.events; import net.dv8tion.jda.api.events.ShutdownEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; import net.dv8tion.jda.api.requests.CloseCode; -import uk.co.angrybee.joe.DiscordClient; import uk.co.angrybee.joe.DiscordWhitelister; public class ShutdownEvents extends ListenerAdapter diff --git a/src/main/java/uk/co/angrybee/joe/Stores/InGameRemovedList.java b/src/main/java/uk/co/angrybee/joe/stores/InGameRemovedList.java similarity index 98% rename from src/main/java/uk/co/angrybee/joe/Stores/InGameRemovedList.java rename to src/main/java/uk/co/angrybee/joe/stores/InGameRemovedList.java index 799e810..7b1eb0a 100644 --- a/src/main/java/uk/co/angrybee/joe/Stores/InGameRemovedList.java +++ b/src/main/java/uk/co/angrybee/joe/stores/InGameRemovedList.java @@ -1,4 +1,4 @@ -package uk.co.angrybee.joe.Stores; +package uk.co.angrybee.joe.stores; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.FileConfiguration; diff --git a/src/main/java/uk/co/angrybee/joe/Stores/RemovedList.java b/src/main/java/uk/co/angrybee/joe/stores/RemovedList.java similarity index 98% rename from src/main/java/uk/co/angrybee/joe/Stores/RemovedList.java rename to src/main/java/uk/co/angrybee/joe/stores/RemovedList.java index a2ad723..e452f2f 100644 --- a/src/main/java/uk/co/angrybee/joe/Stores/RemovedList.java +++ b/src/main/java/uk/co/angrybee/joe/stores/RemovedList.java @@ -1,4 +1,4 @@ -package uk.co.angrybee.joe.Stores; +package uk.co.angrybee.joe.stores; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.FileConfiguration; diff --git a/src/main/java/uk/co/angrybee/joe/Stores/UserList.java b/src/main/java/uk/co/angrybee/joe/stores/UserList.java similarity index 98% rename from src/main/java/uk/co/angrybee/joe/Stores/UserList.java rename to src/main/java/uk/co/angrybee/joe/stores/UserList.java index ee01d2f..4affc26 100644 --- a/src/main/java/uk/co/angrybee/joe/Stores/UserList.java +++ b/src/main/java/uk/co/angrybee/joe/stores/UserList.java @@ -1,4 +1,4 @@ -package uk.co.angrybee.joe.Stores; +package uk.co.angrybee.joe.stores; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.FileConfiguration; diff --git a/src/main/java/uk/co/angrybee/joe/Stores/WhitelistedPlayers.java b/src/main/java/uk/co/angrybee/joe/stores/WhitelistedPlayers.java similarity index 97% rename from src/main/java/uk/co/angrybee/joe/Stores/WhitelistedPlayers.java rename to src/main/java/uk/co/angrybee/joe/stores/WhitelistedPlayers.java index b1e1323..95fd1d7 100644 --- a/src/main/java/uk/co/angrybee/joe/Stores/WhitelistedPlayers.java +++ b/src/main/java/uk/co/angrybee/joe/stores/WhitelistedPlayers.java @@ -1,4 +1,4 @@ -package uk.co.angrybee.joe.Stores; +package uk.co.angrybee.joe.stores; import org.bukkit.OfflinePlayer; import org.bukkit.Server; @@ -7,7 +7,7 @@ import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.PluginManager; -import uk.co.angrybee.joe.Configs.MainConfig; +import uk.co.angrybee.joe.configs.MainConfig; import uk.co.angrybee.joe.DiscordWhitelister; import java.io.File;