Change version numbers.

This commit is contained in:
NovaFox161
2018-01-05 14:58:59 -06:00
parent 6ffa56e2b8
commit e0065f2550
4 changed files with 21 additions and 29 deletions

View File

@@ -6,7 +6,7 @@
<groupId>com.cloudcraftgaming</groupId>
<artifactId>DisCal</artifactId>
<version>1.1.0</version>
<version>1.2.0</version>
<properties>
<maven.compiler.target>1.8</maven.compiler.target>

View File

@@ -27,7 +27,7 @@ import java.util.Properties;
*/
@SuppressWarnings("ThrowableNotThrown")
public class Main {
public static String version = "1.1.0";
public static String version = "1.2.0";
public static IDiscordClient client;
public static void main(String[] args) throws IOException {

View File

@@ -1266,29 +1266,25 @@ public class AnnouncementCommand implements ICommand {
}
private void moduleEnable(String[] args, MessageReceivedEvent event, GuildSettings settings) {
if (settings.isDevGuild()) {
long guildId = event.getGuild().getLongID();
if (args.length == 2) {
if (AnnouncementCreator.getCreator().hasAnnouncement(guildId)) {
Message.sendMessage(MessageManager.getMessage("Announcement.Enable.Creator", settings), event);
} else {
String value = args[1];
if (!AnnouncementUtils.announcementExists(value, event)) {
Message.sendMessage(MessageManager.getMessage("Creator.Announcement.CannotFind.Announcement", settings), event);
} else {
Announcement a = DatabaseManager.getManager().getAnnouncement(UUID.fromString(value), guildId);
a.setEnabled(!a.isEnabled());
DatabaseManager.getManager().updateAnnouncement(a);
Message.sendMessage(MessageManager.getMessage("Announcement.Enable.Success", "%value%", a.isEnabled() + "", settings), event);
}
}
long guildId = event.getGuild().getLongID();
if (args.length == 2) {
if (AnnouncementCreator.getCreator().hasAnnouncement(guildId)) {
Message.sendMessage(MessageManager.getMessage("Announcement.Enable.Creator", settings), event);
} else {
Message.sendMessage(MessageManager.getMessage("Announcement.Enable.Specify", settings), event);
String value = args[1];
if (!AnnouncementUtils.announcementExists(value, event)) {
Message.sendMessage(MessageManager.getMessage("Creator.Announcement.CannotFind.Announcement", settings), event);
} else {
Announcement a = DatabaseManager.getManager().getAnnouncement(UUID.fromString(value), guildId);
a.setEnabled(!a.isEnabled());
DatabaseManager.getManager().updateAnnouncement(a);
Message.sendMessage(MessageManager.getMessage("Announcement.Enable.Success", "%value%", a.isEnabled() + "", settings), event);
}
}
} else {
Message.sendMessage(MessageManager.getMessage("Notification.Disabled", settings), event);
Message.sendMessage(MessageManager.getMessage("Announcement.Enable.Specify", settings), event);
}
}

View File

@@ -139,14 +139,10 @@ public class EventCommand implements ICommand {
}
break;
case "restart":
if (settings.isDevGuild()) {
if (PermissionChecker.hasSufficientRole(event)) {
moduleRestart(args, event, calendarData, settings);
} else {
Message.sendMessage(MessageManager.getMessage("Notification.Perm.CONTROL_ROLE", settings), event);
}
if (PermissionChecker.hasSufficientRole(event)) {
moduleRestart(args, event, calendarData, settings);
} else {
Message.sendMessage(MessageManager.getMessage("Notification.Disabled", settings), event);
Message.sendMessage(MessageManager.getMessage("Notification.Perm.CONTROL_ROLE", settings), event);
}
break;
case "cancel":