Upstream/DiscordWhitelisterSpigot
1
0
Fork 0
mirror of https://github.com/Shimeo98/DiscordWhitelisterSpigot.git synced 2024-11-28 13:45:18 +01:00
Code Issues Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Joe Shimell 2020-11-21 00:43:09 +00:00
parent dabffb1a1f
commit 117d87add5
18 changed files with 43 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/uk/co/angrybee/joe/DiscordClient.java
View File

@ -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;

28
src/main/java/uk/co/angrybee/joe/DiscordWhitelister.java
View File

@ -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

2
src/main/java/uk/co/angrybee/joe/Commands/CommandAbout.java → src/main/java/uk/co/angrybee/joe/commands/CommandAbout.java
View File

@ -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;

2
src/main/java/uk/co/angrybee/joe/Commands/CommandReload.java → src/main/java/uk/co/angrybee/joe/commands/CommandReload.java
View File

@ -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;

2
src/main/java/uk/co/angrybee/joe/Commands/CommandStatus.java → src/main/java/uk/co/angrybee/joe/commands/CommandStatus.java
View File

@ -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;

2
src/main/java/uk/co/angrybee/joe/Configs/CustomMessagesConfig.java → src/main/java/uk/co/angrybee/joe/configs/CustomMessagesConfig.java
View File

@ -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;

2
src/main/java/uk/co/angrybee/joe/Configs/CustomPrefixConfig.java → src/main/java/uk/co/angrybee/joe/configs/CustomPrefixConfig.java
View File

@ -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;

2
src/main/java/uk/co/angrybee/joe/Configs/MainConfig.java → src/main/java/uk/co/angrybee/joe/configs/MainConfig.java
View File

@ -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;

3
src/main/java/uk/co/angrybee/joe/Configs/OnWhitelistCommandsConfig.java → src/main/java/uk/co/angrybee/joe/configs/OnWhitelistCommandsConfig.java
View File

@ -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
{

2
src/main/java/uk/co/angrybee/joe/Configs/PermissionsConfig.java → src/main/java/uk/co/angrybee/joe/configs/PermissionsConfig.java
View File

@ -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;

2
src/main/java/uk/co/angrybee/joe/Events/JoinLeaveEvents.java → src/main/java/uk/co/angrybee/joe/events/JoinLeaveEvents.java
View File

@ -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;

12
src/main/java/uk/co/angrybee/joe/Events/OnBanEvent.java → src/main/java/uk/co/angrybee/joe/events/OnBanEvent.java
View File

@ -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;

8
src/main/java/uk/co/angrybee/joe/Events/OnWhitelistEvents.java → src/main/java/uk/co/angrybee/joe/events/OnWhitelistEvents.java
View File

@ -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;

3
src/main/java/uk/co/angrybee/joe/Events/ShutdownEvents.java → src/main/java/uk/co/angrybee/joe/events/ShutdownEvents.java
View File

@ -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

2
src/main/java/uk/co/angrybee/joe/Stores/InGameRemovedList.java → src/main/java/uk/co/angrybee/joe/stores/InGameRemovedList.java
View File

@ -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;

2
src/main/java/uk/co/angrybee/joe/Stores/RemovedList.java → src/main/java/uk/co/angrybee/joe/stores/RemovedList.java
View File

@ -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;

2
src/main/java/uk/co/angrybee/joe/Stores/UserList.java → src/main/java/uk/co/angrybee/joe/stores/UserList.java
View File

@ -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;

4
src/main/java/uk/co/angrybee/joe/Stores/WhitelistedPlayers.java → src/main/java/uk/co/angrybee/joe/stores/WhitelistedPlayers.java
View File

@ -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;