diff --git a/.gitignore b/.gitignore index fe1a01b1..aec5fe2e 100644 --- a/.gitignore +++ b/.gitignore @@ -63,4 +63,5 @@ Storage *.json1 *.json2 *.json3 -bot.log \ No newline at end of file +bot.log +*.class \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_austinv11_Discord4j_shaded_5d4c4db.xml b/.idea/libraries/Maven__com_github_austinv11_Discord4j_shaded_5213b02.xml similarity index 59% rename from .idea/libraries/Maven__com_github_austinv11_Discord4j_shaded_5d4c4db.xml rename to .idea/libraries/Maven__com_github_austinv11_Discord4j_shaded_5213b02.xml index 505b2035..061cca02 100644 --- a/.idea/libraries/Maven__com_github_austinv11_Discord4j_shaded_5d4c4db.xml +++ b/.idea/libraries/Maven__com_github_austinv11_Discord4j_shaded_5213b02.xml @@ -1,13 +1,13 @@ - + - + - + - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 5ed242a4..223df485 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,19 +2,34 @@ - + - - - - + + + + + + + + + + + + + - + + - + + + + + + @@ -42,21 +57,31 @@ - - + + - - + + - - + + - - + + + + + + + + + + + + @@ -65,8 +90,8 @@ - - + + @@ -75,71 +100,61 @@ - - - - - - - - - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -168,8 +183,6 @@ - @@ -566,6 +581,36 @@ - - - - - - + + + + @@ -680,9 +753,12 @@ - - - + + + + + + @@ -1057,7 +1133,7 @@ - + @@ -1068,11 +1144,12 @@ - + - + + @@ -1084,7 +1161,6 @@ - @@ -1114,8 +1190,14 @@ - - - - - - - - - - - - - - - @@ -1185,20 +1252,6 @@ - - - - - - - - - - - - - - @@ -1319,17 +1372,6 @@ - - - - - - - - - - - @@ -1560,18 +1602,10 @@ - - - - - - - - - + @@ -1600,37 +1634,85 @@ - + - - - - - - + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + diff --git a/DiscordSAIL.iml b/DiscordSAIL.iml index 64c7beb2..84ee4200 100644 --- a/DiscordSAIL.iml +++ b/DiscordSAIL.iml @@ -13,7 +13,7 @@ - + diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml index 530b84a0..b4b4aebb 100644 --- a/dependency-reduced-pom.xml +++ b/dependency-reduced-pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.github.vaerys DiscordSAIL - 2.4.3 + 2.4.4 diff --git a/genGource.bat b/genGource.bat new file mode 100644 index 00000000..def6cf15 --- /dev/null +++ b/genGource.bat @@ -0,0 +1 @@ +gource -a 0.1 --file-filter .class --file-filter .idea --viewport 1080x720 --file-filter FrenchGirl --user-image-dir E:\Repositories\GitUserAvatars \ No newline at end of file diff --git a/pom.xml b/pom.xml index 764358e0..36ff4dad 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.github.vaerys DiscordSAIL - 2.4.3 + 2.4.4 @@ -93,7 +93,7 @@ com.github.austinv11 Discord4j - 5d4c4db + 5213b02 shaded diff --git a/src/main/java/Commands/CC/EditCC.java b/src/main/java/Commands/CC/EditCC.java index 434b17c2..1d282c0a 100644 --- a/src/main/java/Commands/CC/EditCC.java +++ b/src/main/java/Commands/CC/EditCC.java @@ -145,7 +145,7 @@ public String type() { @Override public String channel() { - return CHANNEL_BOT_COMMANDS; + return null; } @Override diff --git a/src/main/java/Commands/Admin/FinalTally.java b/src/main/java/Commands/Competition/FinalTally.java similarity index 97% rename from src/main/java/Commands/Admin/FinalTally.java rename to src/main/java/Commands/Competition/FinalTally.java index f246bed5..4b73703c 100644 --- a/src/main/java/Commands/Admin/FinalTally.java +++ b/src/main/java/Commands/Competition/FinalTally.java @@ -1,4 +1,4 @@ -package Commands.Admin; +package Commands.Competition; import Commands.Command; import Commands.CommandObject; @@ -57,7 +57,7 @@ public String usage() { @Override public String type() { - return TYPE_ADMIN; + return TYPE_COMPETITION; } @Override diff --git a/src/main/java/Commands/Admin/GetCompEntries.java b/src/main/java/Commands/Competition/GetCompEntries.java similarity index 96% rename from src/main/java/Commands/Admin/GetCompEntries.java rename to src/main/java/Commands/Competition/GetCompEntries.java index 251603d9..3157c21d 100644 --- a/src/main/java/Commands/Admin/GetCompEntries.java +++ b/src/main/java/Commands/Competition/GetCompEntries.java @@ -1,4 +1,4 @@ -package Commands.Admin; +package Commands.Competition; import Commands.Command; import Commands.CommandObject; @@ -43,7 +43,7 @@ public String usage() { @Override public String type() { - return TYPE_ADMIN; + return TYPE_COMPETITION; } @Override diff --git a/src/main/java/Listeners/AnnotationListener.java b/src/main/java/Listeners/AnnotationListener.java index fbafe68a..640f6356 100644 --- a/src/main/java/Listeners/AnnotationListener.java +++ b/src/main/java/Listeners/AnnotationListener.java @@ -93,7 +93,7 @@ public void onReadyEvent(ReadyEvent event) { Utility.updateUsername(Globals.botName); } - + // TODO: 15/02/2017 ---------------PIXEL XP----------------- // TODO: 16/01/2017 add xp system 20 xp per min max, decay of 150 xp per day, level up to be exponential unsure at what rate tho // TODO: 16/01/2017 roles removed when level threshold is no longer high enough, ability to set role to gain on level, // TODO: 16/01/2017 min word limit to gain xp default = 10 words, @@ -245,21 +245,27 @@ public void onMessageDeleteEvent(MessageDeleteEvent event){ String content; IChannel logging = command.client.getChannelByID(command.guildConfig.getChannelTypeID(Command.CHANNEL_SERVER_LOG)); IUser ourUser = command.client.getOurUser(); - if (command.guildConfig.getChannelTypeID(Command.CHANNEL_INFO).equals(command.channelID) && ourUser.getID().equals(command.authorID)){ + String infoID = command.guildConfig.getChannelTypeID(Command.CHANNEL_INFO); + String serverLogID = command.guildConfig.getChannelTypeID(Command.CHANNEL_SERVER_LOG); + String adminLogID = command.guildConfig.getChannelTypeID(Command.CHANNEL_ADMIN_LOG); + if (event.getMessage() == null){ + return; + } + if (serverLogID != null && serverLogID.equals(command.channelID) && ourUser.getID().equals(command.authorID)){ return; } - if (command.guildConfig.getChannelTypeID(Command.CHANNEL_SERVER_LOG).equals(command.channelID) && ourUser.getID().equals(command.authorID)){ + if (infoID != null && serverLogID.equals(command.channelID) && ourUser.getID().equals(command.authorID)){ return; } - if (command.guildConfig.getChannelTypeID(Command.CHANNEL_ADMIN_LOG).equals(command.channelID) && ourUser.getID().equals(command.authorID)){ + if (adminLogID != null && serverLogID.equals(command.channelID) && ourUser.getID().equals(command.authorID)){ return; } if (logging != null && command.guildConfig.doDeleteLogging()){ if (command.message.getContent().isEmpty()){ return; } - int charlimit = 1800; - if (command.message.getContent().length() > charlimit){ + int charLimit = 1800; + if (command.message.getContent().length() > charLimit){ content = command.message.getContent().substring(0,1800); }else { content = command.message.getContent(); diff --git a/src/main/java/Main/Globals.java b/src/main/java/Main/Globals.java index 7dbb013e..b16c7a2c 100644 --- a/src/main/java/Main/Globals.java +++ b/src/main/java/Main/Globals.java @@ -10,6 +10,8 @@ import Commands.Command; import Commands.Competition.EnterComp; import Commands.Competition.EnterVote; +import Commands.Competition.FinalTally; +import Commands.Competition.GetCompEntries; import Commands.DMCommand; import Commands.DMCommands.BlockUser; import Commands.DMCommands.HelpDM; diff --git a/src/main/java/Main/TimedEvents.java b/src/main/java/Main/TimedEvents.java index 5c8d5b0a..b69105b4 100644 --- a/src/main/java/Main/TimedEvents.java +++ b/src/main/java/Main/TimedEvents.java @@ -5,11 +5,14 @@ import Objects.ReminderObject; import Objects.TimedObject; import Objects.WaiterObject; +import POGOs.GlobalData; import POGOs.GuildConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import sx.blah.discord.api.IDiscordClient; import sx.blah.discord.handle.obj.IChannel; +import sx.blah.discord.handle.obj.IUser; +import sx.blah.discord.util.DiscordException; import sx.blah.discord.util.Image; import java.io.File; @@ -80,7 +83,7 @@ private static void dailyTasks() { @Override public void run() { ZonedDateTime timeNow = ZonedDateTime.now(ZoneOffset.UTC); - String dailyFileName = Globals.dailyAvatarName.replace("#day#",timeNow.getDayOfWeek().toString()); + String dailyFileName = Globals.dailyAvatarName.replace("#day#", timeNow.getDayOfWeek().toString()); DayOfWeek day = timeNow.getDayOfWeek(); File avatarFile; @@ -234,8 +237,22 @@ private static void doTaskFiveMin() { timer.schedule(new TimerTask() { @Override public void run() { + //Sending isAlive Check. + try { + Globals.getClient().checkLoggedIn("IsAlive"); + } catch (DiscordException e) { + logger.error(e.getErrorMessage()); + logger.info("Logging back in."); + try { + Globals.getClient().login(); + return; + } catch (IllegalStateException ex) { + //ignore exception + } + } Globals.saveFiles(); } - }, 2* 60 * 1000, 5 * 60 * 1000); + }, 2 * 60 * 1000, 5 * 60 * 1000); } + } diff --git a/target/JavaDiscordSAILv2.jar b/target/JavaDiscordSAILv2.jar index 5822be87..b11380d4 100644 Binary files a/target/JavaDiscordSAILv2.jar and b/target/JavaDiscordSAILv2.jar differ diff --git a/target/classes/Annotations/AliasAnnotation.class b/target/classes/Annotations/AliasAnnotation.class deleted file mode 100644 index 55c7707a..00000000 Binary files a/target/classes/Annotations/AliasAnnotation.class and /dev/null differ diff --git a/target/classes/Annotations/DualCommandAnnotation.class b/target/classes/Annotations/DualCommandAnnotation.class deleted file mode 100644 index 6f068745..00000000 Binary files a/target/classes/Annotations/DualCommandAnnotation.class and /dev/null differ diff --git a/target/classes/Annotations/TagAnnotation.class b/target/classes/Annotations/TagAnnotation.class deleted file mode 100644 index dbd26d25..00000000 Binary files a/target/classes/Annotations/TagAnnotation.class and /dev/null differ diff --git a/target/classes/Annotations/ToggleAnnotation.class b/target/classes/Annotations/ToggleAnnotation.class deleted file mode 100644 index 7bd4c81f..00000000 Binary files a/target/classes/Annotations/ToggleAnnotation.class and /dev/null differ diff --git a/target/classes/BadCode/CustomCommands.class b/target/classes/BadCode/CustomCommands.class deleted file mode 100644 index fdff6e88..00000000 Binary files a/target/classes/BadCode/CustomCommands.class and /dev/null differ diff --git a/target/classes/Commands/Admin/ChannelHere.class b/target/classes/Commands/Admin/ChannelHere.class deleted file mode 100644 index 6a2aeeda..00000000 Binary files a/target/classes/Commands/Admin/ChannelHere.class and /dev/null differ diff --git a/target/classes/Commands/Admin/FinalTally.class b/target/classes/Commands/Admin/FinalTally.class deleted file mode 100644 index 82bcc885..00000000 Binary files a/target/classes/Commands/Admin/FinalTally.class and /dev/null differ diff --git a/target/classes/Commands/Admin/GetCompEntries.class b/target/classes/Commands/Admin/GetCompEntries.class deleted file mode 100644 index adfb401a..00000000 Binary files a/target/classes/Commands/Admin/GetCompEntries.class and /dev/null differ diff --git a/target/classes/Commands/Admin/SetAdminRole.class b/target/classes/Commands/Admin/SetAdminRole.class deleted file mode 100644 index 899f7a5a..00000000 Binary files a/target/classes/Commands/Admin/SetAdminRole.class and /dev/null differ diff --git a/target/classes/Commands/Admin/SetMutedRole.class b/target/classes/Commands/Admin/SetMutedRole.class deleted file mode 100644 index 858a62bc..00000000 Binary files a/target/classes/Commands/Admin/SetMutedRole.class and /dev/null differ diff --git a/target/classes/Commands/Admin/SetTrustedRoles.class b/target/classes/Commands/Admin/SetTrustedRoles.class deleted file mode 100644 index 139ff17b..00000000 Binary files a/target/classes/Commands/Admin/SetTrustedRoles.class and /dev/null differ diff --git a/target/classes/Commands/Admin/Shutdown.class b/target/classes/Commands/Admin/Shutdown.class deleted file mode 100644 index a66beecb..00000000 Binary files a/target/classes/Commands/Admin/Shutdown.class and /dev/null differ diff --git a/target/classes/Commands/Admin/Sudo.class b/target/classes/Commands/Admin/Sudo.class deleted file mode 100644 index 9815c648..00000000 Binary files a/target/classes/Commands/Admin/Sudo.class and /dev/null differ diff --git a/target/classes/Commands/Admin/Toggle.class b/target/classes/Commands/Admin/Toggle.class deleted file mode 100644 index eacc980f..00000000 Binary files a/target/classes/Commands/Admin/Toggle.class and /dev/null differ diff --git a/target/classes/Commands/Admin/UpdateAvatar.class b/target/classes/Commands/Admin/UpdateAvatar.class deleted file mode 100644 index c6ec9d7d..00000000 Binary files a/target/classes/Commands/Admin/UpdateAvatar.class and /dev/null differ diff --git a/target/classes/Commands/Admin/UpdateInfo.class b/target/classes/Commands/Admin/UpdateInfo.class deleted file mode 100644 index fc29162c..00000000 Binary files a/target/classes/Commands/Admin/UpdateInfo.class and /dev/null differ diff --git a/target/classes/Commands/Admin/UpdateRolePerms.class b/target/classes/Commands/Admin/UpdateRolePerms.class deleted file mode 100644 index 9c1754e2..00000000 Binary files a/target/classes/Commands/Admin/UpdateRolePerms.class and /dev/null differ diff --git a/target/classes/Commands/CC/DelCC.class b/target/classes/Commands/CC/DelCC.class deleted file mode 100644 index 20e62f8d..00000000 Binary files a/target/classes/Commands/CC/DelCC.class and /dev/null differ diff --git a/target/classes/Commands/CC/EditCC.class b/target/classes/Commands/CC/EditCC.class deleted file mode 100644 index fe798344..00000000 Binary files a/target/classes/Commands/CC/EditCC.class and /dev/null differ diff --git a/target/classes/Commands/CC/GetCCData.class b/target/classes/Commands/CC/GetCCData.class deleted file mode 100644 index a7868666..00000000 Binary files a/target/classes/Commands/CC/GetCCData.class and /dev/null differ diff --git a/target/classes/Commands/CC/InfoCC.class b/target/classes/Commands/CC/InfoCC.class deleted file mode 100644 index 8e6fa151..00000000 Binary files a/target/classes/Commands/CC/InfoCC.class and /dev/null differ diff --git a/target/classes/Commands/CC/ListCCs.class b/target/classes/Commands/CC/ListCCs.class deleted file mode 100644 index d27b5699..00000000 Binary files a/target/classes/Commands/CC/ListCCs.class and /dev/null differ diff --git a/target/classes/Commands/CC/NewCC.class b/target/classes/Commands/CC/NewCC.class deleted file mode 100644 index 2c53d641..00000000 Binary files a/target/classes/Commands/CC/NewCC.class and /dev/null differ diff --git a/target/classes/Commands/CC/SearchCCs.class b/target/classes/Commands/CC/SearchCCs.class deleted file mode 100644 index 22ee6dbb..00000000 Binary files a/target/classes/Commands/CC/SearchCCs.class and /dev/null differ diff --git a/target/classes/Commands/CC/TransferCC.class b/target/classes/Commands/CC/TransferCC.class deleted file mode 100644 index 845b192b..00000000 Binary files a/target/classes/Commands/CC/TransferCC.class and /dev/null differ diff --git a/target/classes/Commands/Characters/DelChar.class b/target/classes/Commands/Characters/DelChar.class deleted file mode 100644 index 1df53367..00000000 Binary files a/target/classes/Commands/Characters/DelChar.class and /dev/null differ diff --git a/target/classes/Commands/Characters/ListChars.class b/target/classes/Commands/Characters/ListChars.class deleted file mode 100644 index a58c4f7d..00000000 Binary files a/target/classes/Commands/Characters/ListChars.class and /dev/null differ diff --git a/target/classes/Commands/Characters/SelectChar.class b/target/classes/Commands/Characters/SelectChar.class deleted file mode 100644 index 43e846a2..00000000 Binary files a/target/classes/Commands/Characters/SelectChar.class and /dev/null differ diff --git a/target/classes/Commands/Characters/UpdateChar.class b/target/classes/Commands/Characters/UpdateChar.class deleted file mode 100644 index f21fa42e..00000000 Binary files a/target/classes/Commands/Characters/UpdateChar.class and /dev/null differ diff --git a/target/classes/Commands/Command.class b/target/classes/Commands/Command.class deleted file mode 100644 index 48bd62b4..00000000 Binary files a/target/classes/Commands/Command.class and /dev/null differ diff --git a/target/classes/Commands/CommandObject.class b/target/classes/Commands/CommandObject.class deleted file mode 100644 index c9930a5f..00000000 Binary files a/target/classes/Commands/CommandObject.class and /dev/null differ diff --git a/target/classes/Commands/Competition/EnterComp.class b/target/classes/Commands/Competition/EnterComp.class deleted file mode 100644 index 0c4e4b35..00000000 Binary files a/target/classes/Commands/Competition/EnterComp.class and /dev/null differ diff --git a/target/classes/Commands/Competition/EnterVote.class b/target/classes/Commands/Competition/EnterVote.class deleted file mode 100644 index b520b32a..00000000 Binary files a/target/classes/Commands/Competition/EnterVote.class and /dev/null differ diff --git a/target/classes/Commands/DMCommand.class b/target/classes/Commands/DMCommand.class deleted file mode 100644 index 38b1517d..00000000 Binary files a/target/classes/Commands/DMCommand.class and /dev/null differ diff --git a/target/classes/Commands/DMCommandObject.class b/target/classes/Commands/DMCommandObject.class deleted file mode 100644 index 368b83bd..00000000 Binary files a/target/classes/Commands/DMCommandObject.class and /dev/null differ diff --git a/target/classes/Commands/DMCommands/BlockUser.class b/target/classes/Commands/DMCommands/BlockUser.class deleted file mode 100644 index 688ed315..00000000 Binary files a/target/classes/Commands/DMCommands/BlockUser.class and /dev/null differ diff --git a/target/classes/Commands/DMCommands/HelpDM.class b/target/classes/Commands/DMCommands/HelpDM.class deleted file mode 100644 index ee87338a..00000000 Binary files a/target/classes/Commands/DMCommands/HelpDM.class and /dev/null differ diff --git a/target/classes/Commands/DMCommands/InfoDM.class b/target/classes/Commands/DMCommands/InfoDM.class deleted file mode 100644 index 7e80ad85..00000000 Binary files a/target/classes/Commands/DMCommands/InfoDM.class and /dev/null differ diff --git a/target/classes/Commands/DMCommands/Respond.class b/target/classes/Commands/DMCommands/Respond.class deleted file mode 100644 index 96877f20..00000000 Binary files a/target/classes/Commands/DMCommands/Respond.class and /dev/null differ diff --git a/target/classes/Commands/General/GetAvatar.class b/target/classes/Commands/General/GetAvatar.class deleted file mode 100644 index 52978037..00000000 Binary files a/target/classes/Commands/General/GetAvatar.class and /dev/null differ diff --git a/target/classes/Commands/General/Hello.class b/target/classes/Commands/General/Hello.class deleted file mode 100644 index 511b3718..00000000 Binary files a/target/classes/Commands/General/Hello.class and /dev/null differ diff --git a/target/classes/Commands/General/RemindMe.class b/target/classes/Commands/General/RemindMe.class deleted file mode 100644 index 47ed42c3..00000000 Binary files a/target/classes/Commands/General/RemindMe.class and /dev/null differ diff --git a/target/classes/Commands/General/Test.class b/target/classes/Commands/General/Test.class deleted file mode 100644 index 0a929d2e..00000000 Binary files a/target/classes/Commands/General/Test.class and /dev/null differ diff --git a/target/classes/Commands/Help/GetGuildInfo.class b/target/classes/Commands/Help/GetGuildInfo.class deleted file mode 100644 index 7cba5b91..00000000 Binary files a/target/classes/Commands/Help/GetGuildInfo.class and /dev/null differ diff --git a/target/classes/Commands/Help/Help.class b/target/classes/Commands/Help/Help.class deleted file mode 100644 index 23be1347..00000000 Binary files a/target/classes/Commands/Help/Help.class and /dev/null differ diff --git a/target/classes/Commands/Help/HelpTags.class b/target/classes/Commands/Help/HelpTags.class deleted file mode 100644 index e7590fba..00000000 Binary files a/target/classes/Commands/Help/HelpTags.class and /dev/null differ diff --git a/target/classes/Commands/Help/Info.class b/target/classes/Commands/Help/Info.class deleted file mode 100644 index 64f03e66..00000000 Binary files a/target/classes/Commands/Help/Info.class and /dev/null differ diff --git a/target/classes/Commands/Help/Report.class b/target/classes/Commands/Help/Report.class deleted file mode 100644 index 5b914703..00000000 Binary files a/target/classes/Commands/Help/Report.class and /dev/null differ diff --git a/target/classes/Commands/Help/SilentReport.class b/target/classes/Commands/Help/SilentReport.class deleted file mode 100644 index 1cf4bead..00000000 Binary files a/target/classes/Commands/Help/SilentReport.class and /dev/null differ diff --git a/target/classes/Commands/RoleSelect/CosmeticRoles.class b/target/classes/Commands/RoleSelect/CosmeticRoles.class deleted file mode 100644 index 25d2b6df..00000000 Binary files a/target/classes/Commands/RoleSelect/CosmeticRoles.class and /dev/null differ diff --git a/target/classes/Commands/RoleSelect/ListModifs.class b/target/classes/Commands/RoleSelect/ListModifs.class deleted file mode 100644 index 49392728..00000000 Binary files a/target/classes/Commands/RoleSelect/ListModifs.class and /dev/null differ diff --git a/target/classes/Commands/RoleSelect/ListRoles.class b/target/classes/Commands/RoleSelect/ListRoles.class deleted file mode 100644 index 80d822b0..00000000 Binary files a/target/classes/Commands/RoleSelect/ListRoles.class and /dev/null differ diff --git a/target/classes/Commands/RoleSelect/ModifierRoles.class b/target/classes/Commands/RoleSelect/ModifierRoles.class deleted file mode 100644 index 557cfe42..00000000 Binary files a/target/classes/Commands/RoleSelect/ModifierRoles.class and /dev/null differ diff --git a/target/classes/Commands/Servers/AddServer.class b/target/classes/Commands/Servers/AddServer.class deleted file mode 100644 index cabfbde0..00000000 Binary files a/target/classes/Commands/Servers/AddServer.class and /dev/null differ diff --git a/target/classes/Commands/Servers/DelServer.class b/target/classes/Commands/Servers/DelServer.class deleted file mode 100644 index f5f68eef..00000000 Binary files a/target/classes/Commands/Servers/DelServer.class and /dev/null differ diff --git a/target/classes/Commands/Servers/EditServerDesc.class b/target/classes/Commands/Servers/EditServerDesc.class deleted file mode 100644 index 212512f4..00000000 Binary files a/target/classes/Commands/Servers/EditServerDesc.class and /dev/null differ diff --git a/target/classes/Commands/Servers/EditServerIP.class b/target/classes/Commands/Servers/EditServerIP.class deleted file mode 100644 index 49e598b9..00000000 Binary files a/target/classes/Commands/Servers/EditServerIP.class and /dev/null differ diff --git a/target/classes/Commands/Servers/EditServerName.class b/target/classes/Commands/Servers/EditServerName.class deleted file mode 100644 index 0439d2af..00000000 Binary files a/target/classes/Commands/Servers/EditServerName.class and /dev/null differ diff --git a/target/classes/Commands/Servers/ListServers.class b/target/classes/Commands/Servers/ListServers.class deleted file mode 100644 index 16ab0135..00000000 Binary files a/target/classes/Commands/Servers/ListServers.class and /dev/null differ diff --git a/target/classes/Commands/Servers/Server.class b/target/classes/Commands/Servers/Server.class deleted file mode 100644 index e790fa00..00000000 Binary files a/target/classes/Commands/Servers/Server.class and /dev/null differ diff --git a/target/classes/Handlers/CCHandler.class b/target/classes/Handlers/CCHandler.class deleted file mode 100644 index 1eb77e54..00000000 Binary files a/target/classes/Handlers/CCHandler.class and /dev/null differ diff --git a/target/classes/Handlers/DMHandler.class b/target/classes/Handlers/DMHandler.class deleted file mode 100644 index 8c7a3c71..00000000 Binary files a/target/classes/Handlers/DMHandler.class and /dev/null differ diff --git a/target/classes/Handlers/FileHandler.class b/target/classes/Handlers/FileHandler.class deleted file mode 100644 index d5ec8890..00000000 Binary files a/target/classes/Handlers/FileHandler.class and /dev/null differ diff --git a/target/classes/Handlers/InfoHandler.class b/target/classes/Handlers/InfoHandler.class deleted file mode 100644 index 849172b3..00000000 Binary files a/target/classes/Handlers/InfoHandler.class and /dev/null differ diff --git a/target/classes/Handlers/MessageHandler.class b/target/classes/Handlers/MessageHandler.class deleted file mode 100644 index f3ce4603..00000000 Binary files a/target/classes/Handlers/MessageHandler.class and /dev/null differ diff --git a/target/classes/Listeners/AnnotationListener.class b/target/classes/Listeners/AnnotationListener.class deleted file mode 100644 index 56766c32..00000000 Binary files a/target/classes/Listeners/AnnotationListener.class and /dev/null differ diff --git a/target/classes/Main/Client.class b/target/classes/Main/Client.class deleted file mode 100644 index ac55e330..00000000 Binary files a/target/classes/Main/Client.class and /dev/null differ diff --git a/target/classes/Main/Constants.class b/target/classes/Main/Constants.class deleted file mode 100644 index 7b651aec..00000000 Binary files a/target/classes/Main/Constants.class and /dev/null differ diff --git a/target/classes/Main/Globals.class b/target/classes/Main/Globals.class deleted file mode 100644 index 5a9206c2..00000000 Binary files a/target/classes/Main/Globals.class and /dev/null differ diff --git a/target/classes/Main/Main$1.class b/target/classes/Main/Main$1.class deleted file mode 100644 index d9b89094..00000000 Binary files a/target/classes/Main/Main$1.class and /dev/null differ diff --git a/target/classes/Main/Main.class b/target/classes/Main/Main.class deleted file mode 100644 index 7327506d..00000000 Binary files a/target/classes/Main/Main.class and /dev/null differ diff --git a/target/classes/Main/TagSystem.class b/target/classes/Main/TagSystem.class deleted file mode 100644 index d0f8b9e7..00000000 Binary files a/target/classes/Main/TagSystem.class and /dev/null differ diff --git a/target/classes/Main/TimedEvents$1.class b/target/classes/Main/TimedEvents$1.class deleted file mode 100644 index f548dd28..00000000 Binary files a/target/classes/Main/TimedEvents$1.class and /dev/null differ diff --git a/target/classes/Main/TimedEvents$2.class b/target/classes/Main/TimedEvents$2.class deleted file mode 100644 index 3aecb56c..00000000 Binary files a/target/classes/Main/TimedEvents$2.class and /dev/null differ diff --git a/target/classes/Main/TimedEvents$3.class b/target/classes/Main/TimedEvents$3.class deleted file mode 100644 index 450249f8..00000000 Binary files a/target/classes/Main/TimedEvents$3.class and /dev/null differ diff --git a/target/classes/Main/TimedEvents$4.class b/target/classes/Main/TimedEvents$4.class deleted file mode 100644 index 0b5fd763..00000000 Binary files a/target/classes/Main/TimedEvents$4.class and /dev/null differ diff --git a/target/classes/Main/TimedEvents$5.class b/target/classes/Main/TimedEvents$5.class deleted file mode 100644 index bc74e40c..00000000 Binary files a/target/classes/Main/TimedEvents$5.class and /dev/null differ diff --git a/target/classes/Main/TimedEvents.class b/target/classes/Main/TimedEvents.class deleted file mode 100644 index 073cfefb..00000000 Binary files a/target/classes/Main/TimedEvents.class and /dev/null differ diff --git a/target/classes/Main/Utility$1.class b/target/classes/Main/Utility$1.class deleted file mode 100644 index 8765351c..00000000 Binary files a/target/classes/Main/Utility$1.class and /dev/null differ diff --git a/target/classes/Main/Utility$2.class b/target/classes/Main/Utility$2.class deleted file mode 100644 index 56026da6..00000000 Binary files a/target/classes/Main/Utility$2.class and /dev/null differ diff --git a/target/classes/Main/Utility.class b/target/classes/Main/Utility.class deleted file mode 100644 index e990b7d1..00000000 Binary files a/target/classes/Main/Utility.class and /dev/null differ diff --git a/target/classes/Objects/BlackListObject.class b/target/classes/Objects/BlackListObject.class deleted file mode 100644 index 0f761bf2..00000000 Binary files a/target/classes/Objects/BlackListObject.class and /dev/null differ diff --git a/target/classes/Objects/CCommandObject.class b/target/classes/Objects/CCommandObject.class deleted file mode 100644 index bfadc34a..00000000 Binary files a/target/classes/Objects/CCommandObject.class and /dev/null differ diff --git a/target/classes/Objects/ChannelTypeObject.class b/target/classes/Objects/ChannelTypeObject.class deleted file mode 100644 index fd71289d..00000000 Binary files a/target/classes/Objects/ChannelTypeObject.class and /dev/null differ diff --git a/target/classes/Objects/CharacterObject.class b/target/classes/Objects/CharacterObject.class deleted file mode 100644 index d82383c4..00000000 Binary files a/target/classes/Objects/CharacterObject.class and /dev/null differ diff --git a/target/classes/Objects/DailyMessageObject.class b/target/classes/Objects/DailyMessageObject.class deleted file mode 100644 index fef5e59e..00000000 Binary files a/target/classes/Objects/DailyMessageObject.class and /dev/null differ diff --git a/target/classes/Objects/GuildContentObject.class b/target/classes/Objects/GuildContentObject.class deleted file mode 100644 index 4e9068fa..00000000 Binary files a/target/classes/Objects/GuildContentObject.class and /dev/null differ diff --git a/target/classes/Objects/MessageErrorObject.class b/target/classes/Objects/MessageErrorObject.class deleted file mode 100644 index 5c890b2a..00000000 Binary files a/target/classes/Objects/MessageErrorObject.class and /dev/null differ diff --git a/target/classes/Objects/OffenderObject.class b/target/classes/Objects/OffenderObject.class deleted file mode 100644 index 562fb080..00000000 Binary files a/target/classes/Objects/OffenderObject.class and /dev/null differ diff --git a/target/classes/Objects/PollObject.class b/target/classes/Objects/PollObject.class deleted file mode 100644 index 2eb7c5f0..00000000 Binary files a/target/classes/Objects/PollObject.class and /dev/null differ diff --git a/target/classes/Objects/ReminderObject.class b/target/classes/Objects/ReminderObject.class deleted file mode 100644 index 15f2f19b..00000000 Binary files a/target/classes/Objects/ReminderObject.class and /dev/null differ diff --git a/target/classes/Objects/ReplaceObject.class b/target/classes/Objects/ReplaceObject.class deleted file mode 100644 index c8bcf700..00000000 Binary files a/target/classes/Objects/ReplaceObject.class and /dev/null differ diff --git a/target/classes/Objects/RoleStatsObject.class b/target/classes/Objects/RoleStatsObject.class deleted file mode 100644 index deede880..00000000 Binary files a/target/classes/Objects/RoleStatsObject.class and /dev/null differ diff --git a/target/classes/Objects/RoleTypeObject.class b/target/classes/Objects/RoleTypeObject.class deleted file mode 100644 index c9f92413..00000000 Binary files a/target/classes/Objects/RoleTypeObject.class and /dev/null differ diff --git a/target/classes/Objects/ServerObject.class b/target/classes/Objects/ServerObject.class deleted file mode 100644 index 11abac3b..00000000 Binary files a/target/classes/Objects/ServerObject.class and /dev/null differ diff --git a/target/classes/Objects/SplitFirstObject.class b/target/classes/Objects/SplitFirstObject.class deleted file mode 100644 index b087e75b..00000000 Binary files a/target/classes/Objects/SplitFirstObject.class and /dev/null differ diff --git a/target/classes/Objects/TimedObject.class b/target/classes/Objects/TimedObject.class deleted file mode 100644 index 077b23d0..00000000 Binary files a/target/classes/Objects/TimedObject.class and /dev/null differ diff --git a/target/classes/Objects/UserTypeObject.class b/target/classes/Objects/UserTypeObject.class deleted file mode 100644 index 4d199a23..00000000 Binary files a/target/classes/Objects/UserTypeObject.class and /dev/null differ diff --git a/target/classes/Objects/WaiterObject.class b/target/classes/Objects/WaiterObject.class deleted file mode 100644 index 081a7fdc..00000000 Binary files a/target/classes/Objects/WaiterObject.class and /dev/null differ diff --git a/target/classes/POGOs/Characters.class b/target/classes/POGOs/Characters.class deleted file mode 100644 index dd2bc18b..00000000 Binary files a/target/classes/POGOs/Characters.class and /dev/null differ diff --git a/target/classes/POGOs/Competition.class b/target/classes/POGOs/Competition.class deleted file mode 100644 index d36fb0b4..00000000 Binary files a/target/classes/POGOs/Competition.class and /dev/null differ diff --git a/target/classes/POGOs/Config$1.class b/target/classes/POGOs/Config$1.class deleted file mode 100644 index ab29c4ed..00000000 Binary files a/target/classes/POGOs/Config$1.class and /dev/null differ diff --git a/target/classes/POGOs/Config.class b/target/classes/POGOs/Config.class deleted file mode 100644 index bdefc6eb..00000000 Binary files a/target/classes/POGOs/Config.class and /dev/null differ diff --git a/target/classes/POGOs/CustomCommands.class b/target/classes/POGOs/CustomCommands.class deleted file mode 100644 index 85b6527d..00000000 Binary files a/target/classes/POGOs/CustomCommands.class and /dev/null differ diff --git a/target/classes/POGOs/GlobalData.class b/target/classes/POGOs/GlobalData.class deleted file mode 100644 index 628dca43..00000000 Binary files a/target/classes/POGOs/GlobalData.class and /dev/null differ diff --git a/target/classes/POGOs/GuildConfig.class b/target/classes/POGOs/GuildConfig.class deleted file mode 100644 index 9ca478bf..00000000 Binary files a/target/classes/POGOs/GuildConfig.class and /dev/null differ diff --git a/target/classes/POGOs/GuildUsers.class b/target/classes/POGOs/GuildUsers.class deleted file mode 100644 index 1270e50f..00000000 Binary files a/target/classes/POGOs/GuildUsers.class and /dev/null differ diff --git a/target/classes/POGOs/Servers.class b/target/classes/POGOs/Servers.class deleted file mode 100644 index ccb162a3..00000000 Binary files a/target/classes/POGOs/Servers.class and /dev/null differ diff --git a/target/classes/project.properties b/target/classes/project.properties index 5f9d94f3..426cbbd1 100644 --- a/target/classes/project.properties +++ b/target/classes/project.properties @@ -1 +1 @@ -version=2.4.3 \ No newline at end of file +version=2.4.4 \ No newline at end of file diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties index 11e474fc..b229f5d3 100644 --- a/target/maven-archiver/pom.properties +++ b/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Mon Feb 13 18:55:32 AEDT 2017 -version=2.4.3 +#Thu Feb 16 17:43:19 AEDT 2017 +version=2.4.4 groupId=com.github.vaerys artifactId=DiscordSAIL diff --git a/target/original-JavaDiscordSAILv2.jar b/target/original-JavaDiscordSAILv2.jar index 32a3805b..c94d935e 100644 Binary files a/target/original-JavaDiscordSAILv2.jar and b/target/original-JavaDiscordSAILv2.jar differ