-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rewrote the entire command system. Added importing and exporting to a…
…nd from YAML into the storage type specified in the config for moving to and from MySQL. Finished adding MySQL.
- Loading branch information
Showing
20 changed files
with
416 additions
and
100 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
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 |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| package me.xemor.superheroes2.commands; | ||
|
|
||
| import de.themoep.minedown.adventure.MineDown; | ||
| import me.xemor.superheroes2.Superheroes2; | ||
| import me.xemor.superheroes2.data.ConfigHandler; | ||
| import me.xemor.superheroes2.data.HeroHandler; | ||
| import net.kyori.adventure.audience.Audience; | ||
| import org.bukkit.ChatColor; | ||
| import org.bukkit.command.CommandSender; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| public class Export implements SubCommand { | ||
|
|
||
| private final String exporting = ChatColor.translateAlternateColorCodes('&', "&aExporting..."); | ||
| private final String done = ChatColor.translateAlternateColorCodes('&', "&aDone!"); | ||
| private HeroHandler heroHandler; | ||
| private ConfigHandler configHandler; | ||
|
|
||
| public Export(HeroHandler heroHandler, ConfigHandler configHandler) { | ||
| this.heroHandler = heroHandler; | ||
| this.configHandler = configHandler; | ||
| } | ||
|
|
||
| @Override | ||
| public void onCommand(CommandSender sender, String[] args) { | ||
| if (sender.hasPermission("superheroes.export")) { | ||
| sender.sendMessage(exporting); | ||
| heroHandler.exportFiles(); | ||
| configHandler.reloadConfig(heroHandler); | ||
| sender.sendMessage(done); | ||
| } | ||
| else { | ||
| Audience audience = Superheroes2.getBukkitAudiences().sender(sender); | ||
| audience.sendMessage(MineDown.parse(configHandler.getNoPermissionMessage())); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public List<String> tabComplete(CommandSender sender, String[] args) { | ||
| return null; | ||
| } | ||
|
|
||
| } |
88 changes: 88 additions & 0 deletions
88
src/main/java/me/xemor/superheroes2/commands/HeroCommand.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 |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| package me.xemor.superheroes2.commands; | ||
|
|
||
| import de.themoep.minedown.adventure.MineDown; | ||
| import me.xemor.superheroes2.Superheroes2; | ||
| import me.xemor.superheroes2.data.ConfigHandler; | ||
| import me.xemor.superheroes2.data.HeroHandler; | ||
| import net.kyori.adventure.audience.Audience; | ||
| import org.bukkit.command.Command; | ||
| import org.bukkit.command.CommandExecutor; | ||
| import org.bukkit.command.CommandSender; | ||
| import org.bukkit.command.TabExecutor; | ||
| import org.jetbrains.annotations.NotNull; | ||
| import org.jetbrains.annotations.Nullable; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| public class HeroCommand implements CommandExecutor, TabExecutor { | ||
|
|
||
| private HeroHandler heroHandler; | ||
| private ConfigHandler configHandler; | ||
| private HeroSelect heroSelectCommand; | ||
| private Reload reloadCommand; | ||
| private Import importCommand; | ||
| private Export exportCommand; | ||
| private Reroll reroll; | ||
|
|
||
| public HeroCommand(HeroHandler heroHandler, Reroll reroll) { | ||
| this.heroHandler = heroHandler; | ||
| this.reroll = reroll; | ||
| configHandler = heroHandler.getPlugin().getConfigHandler(); | ||
| reloadCommand = new Reload(heroHandler, configHandler); | ||
| heroSelectCommand = new HeroSelect(heroHandler, configHandler); | ||
| importCommand = new Import(heroHandler, configHandler); | ||
| exportCommand = new Export(heroHandler, configHandler); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { | ||
| if (args.length >= 1) { | ||
| Audience audience = Superheroes2.getBukkitAudiences().sender(sender); | ||
| SubCommands commandType; | ||
| try { | ||
| commandType = SubCommands.valueOf(args[0].toUpperCase()); | ||
| } catch(IllegalArgumentException e) { | ||
| audience.sendMessage(MineDown.parse(configHandler.getInvalidCommandMessage(), "name", sender.getName())); | ||
| return true; | ||
| } | ||
| switch (commandType) { | ||
| case SELECT: heroSelectCommand.onCommand(sender, args); break; | ||
| case RELOAD: reloadCommand.onCommand(sender, args); break; | ||
| case REROLL: reroll.onCommand(sender, args); break; | ||
| case EXPORT: exportCommand.onCommand(sender, args); break; | ||
| case IMPORT: importCommand.onCommand(sender, args); break; | ||
| } | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
|
|
||
| @Nullable | ||
| @Override | ||
| public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) { | ||
| List<String> tabComplete = new ArrayList<>(); | ||
| if (args.length == 1) { | ||
| for (SubCommands subCommandEnum : SubCommands.values()) { | ||
| String subCommandStr = subCommandEnum.toString().toLowerCase(); | ||
| if (subCommandStr.startsWith(args[0].toLowerCase())) { | ||
| tabComplete.add(subCommandStr); | ||
| } | ||
| } | ||
| } | ||
| else if (args.length > 1) { | ||
| SubCommands subCommand; | ||
| try { | ||
| subCommand = SubCommands.valueOf(args[0].toUpperCase()); | ||
| switch (subCommand) { | ||
| case SELECT: tabComplete = heroSelectCommand.tabComplete(sender, args); break; | ||
| case RELOAD: tabComplete = reloadCommand.tabComplete(sender, args); break; | ||
| case REROLL: tabComplete = reroll.tabComplete(sender, args); break; | ||
| case EXPORT: tabComplete = exportCommand.tabComplete(sender, args); break; | ||
| case IMPORT: tabComplete = importCommand.tabComplete(sender, args); break; | ||
| } | ||
| } catch(IllegalArgumentException ignored) {} | ||
| } | ||
| return tabComplete; | ||
| } | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| package me.xemor.superheroes2.commands; | ||
|
|
||
| import de.themoep.minedown.adventure.MineDown; | ||
| import me.xemor.superheroes2.Superheroes2; | ||
| import me.xemor.superheroes2.data.ConfigHandler; | ||
| import me.xemor.superheroes2.data.HeroHandler; | ||
| import net.kyori.adventure.audience.Audience; | ||
| import org.bukkit.Bukkit; | ||
| import org.bukkit.ChatColor; | ||
| import org.bukkit.command.CommandSender; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| public class Import implements SubCommand { | ||
|
|
||
| private final String importing = ChatColor.translateAlternateColorCodes('&', "&aImporting..."); | ||
| private final String done = ChatColor.translateAlternateColorCodes('&', "&aDone!"); | ||
| private HeroHandler heroHandler; | ||
| private ConfigHandler configHandler; | ||
|
|
||
| public Import(HeroHandler heroHandler, ConfigHandler configHandler) { | ||
| this.heroHandler = heroHandler; | ||
| this.configHandler = configHandler; | ||
| } | ||
|
|
||
| @Override | ||
| public void onCommand(CommandSender sender, String[] args) { | ||
| if (sender.hasPermission("superheroes.import")) { | ||
| sender.sendMessage(importing); | ||
| heroHandler.importFiles().thenAccept((ignored) -> Bukkit.getScheduler().runTask(heroHandler.getPlugin(), () -> configHandler.reloadConfig(heroHandler))); | ||
| sender.sendMessage(done); | ||
| } | ||
| else { | ||
| Audience audience = Superheroes2.getBukkitAudiences().sender(sender); | ||
| audience.sendMessage(MineDown.parse(configHandler.getNoPermissionMessage())); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public List<String> tabComplete(CommandSender sender, String[] args) { | ||
| return null; | ||
| } | ||
| } |
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.