-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: various changes, preparing for Hibernate and PostgreSQL
- Loading branch information
Showing
29 changed files
with
668 additions
and
670 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
118 changes: 58 additions & 60 deletions
118
...com/lycoon/clashbot/commands/Command.java → ...lycoon/clashbot/commands/CommandData.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,60 +1,58 @@ | ||
| package com.lycoon.clashbot.commands; | ||
|
|
||
| public enum Command | ||
| { | ||
| INVITE(CommandCategory.MISC, "invite", "cmd.invite.desc"), | ||
| LANG(CommandCategory.MISC, "lang", "cmd.lang.desc"), | ||
| INFO(CommandCategory.MISC, "info", "cmd.info.desc"), | ||
| HELP(CommandCategory.MISC, "help", "cmd.help.desc"), | ||
| CLEAR(CommandCategory.SETTINGS, "clear", "cmd.clear.desc"), | ||
| SET_PLAYER(CommandCategory.SETTINGS, "set", "cmd.setplayer.desc", "player <playerTag>"), | ||
| SET_CLAN(CommandCategory.SETTINGS, "set", "cmd.setclan.desc", "clan <clanTag>"), | ||
| SET_LANG(CommandCategory.SETTINGS, "set", "cmd.setlang.desc", "lang <language>"), | ||
| CLAN(CommandCategory.CLAN, "clan", "cmd.clan.desc", "[clanTag]"), | ||
| WARLEAGUE(CommandCategory.CLAN, "warleague", "cmd.warleague.round.desc", "<page> [clanTag]"), | ||
| //WARLEAGUE_ALL (CommandCategory.CLAN, "warleague", "cmd.warleague.all.desc", "all [clanTag]"), | ||
| //WARLEAGUE_CLAN (CommandCategory.CLAN, "warleague", "cmd.warleague.clan.desc", "[clanTag]"), | ||
| WARLOG(CommandCategory.CLAN, "warlog", "cmd.warlog.desc", "<page> [clanTag]"), | ||
| WAR(CommandCategory.CLAN, "war", "cmd.war.desc", "<page> [clanTag]"), | ||
| PLAYER(CommandCategory.PLAYER, "player", "cmd.player.desc", "[playerTag]"); | ||
|
|
||
| final CommandCategory category; | ||
| final String name, desc; | ||
| String usage; | ||
|
|
||
| Command(CommandCategory category, String name, String desc, String usage) | ||
| { | ||
| this.category = category; | ||
| this.name = name; | ||
| this.desc = desc; | ||
| this.usage = usage; | ||
| } | ||
|
|
||
| Command(CommandCategory category, String name, String desc) | ||
| { | ||
| this.category = category; | ||
| this.name = name; | ||
| this.desc = desc; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() | ||
| { | ||
| return name; | ||
| } | ||
|
|
||
| public String getDescription() | ||
| { | ||
| return desc; | ||
| } | ||
|
|
||
| public CommandCategory getCategory() | ||
| { | ||
| return category; | ||
| } | ||
|
|
||
| public String formatCommand() | ||
| { | ||
| return "/" + name + (usage == null ? "" : " " + usage); | ||
| } | ||
| } | ||
| package com.lycoon.clashbot.commands; | ||
|
|
||
| public enum CommandData | ||
| { | ||
| INVITE(CommandCategory.MISC, "invite", "cmd.invite.desc"), | ||
| LANG(CommandCategory.MISC, "lang", "cmd.lang.desc"), | ||
| INFO(CommandCategory.MISC, "info", "cmd.info.desc"), | ||
| HELP(CommandCategory.MISC, "help", "cmd.help.desc"), | ||
| CLEAR(CommandCategory.SETTINGS, "clear", "cmd.clear.desc"), | ||
| SET_PLAYER(CommandCategory.SETTINGS, "set", "cmd.setplayer.desc", "player <playerTag>"), | ||
| SET_CLAN(CommandCategory.SETTINGS, "set", "cmd.setclan.desc", "clan <clanTag>"), | ||
| SET_LANG(CommandCategory.SETTINGS, "set", "cmd.setlang.desc", "lang <language>"), | ||
| CLAN(CommandCategory.CLAN, "clan", "cmd.clan.desc", "[clanTag]"), | ||
| WARLEAGUE(CommandCategory.CLAN, "warleague", "cmd.warleague.round.desc", "<page> [clanTag]"), | ||
| //WARLEAGUE_ALL (CommandCategory.CLAN, "warleague", "cmd.warleague.all.desc", "all [clanTag]"), | ||
| //WARLEAGUE_CLAN (CommandCategory.CLAN, "warleague", "cmd.warleague.clan.desc", "[clanTag]"), | ||
| WARLOG(CommandCategory.CLAN, "warlog", "cmd.warlog.desc", "<page> [clanTag]"), | ||
| WAR(CommandCategory.CLAN, "war", "cmd.war.desc", "<page> [clanTag]"), | ||
| PLAYER(CommandCategory.PLAYER, "player", "cmd.player.desc", "[playerTag]"); | ||
|
|
||
| final CommandCategory category; | ||
| final String name, desc; | ||
| final String usage; | ||
|
|
||
| CommandData(CommandCategory category, String name, String desc, String usage) | ||
| { | ||
| this.category = category; | ||
| this.name = name; | ||
| this.desc = desc; | ||
| this.usage = usage; | ||
| } | ||
|
|
||
| CommandData(CommandCategory category, String name, String desc) | ||
| { | ||
| this(category, name, desc, null); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() | ||
| { | ||
| return name; | ||
| } | ||
|
|
||
| public String getDescription() | ||
| { | ||
| return desc; | ||
| } | ||
|
|
||
| public CommandCategory getCategory() | ||
| { | ||
| return category; | ||
| } | ||
|
|
||
| public String formatCommand() | ||
| { | ||
| return "/" + name + (usage == null ? "" : " " + usage); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.