From c49ab63e2595308f76cc5be6f1df344d8f8f73f0 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Sat, 7 Mar 2020 18:46:10 +0100 Subject: [PATCH] Changed every command to the new system Started on feb 16 --- .gitignore | 26 ++-- .idea/.gitignore | 2 - .idea/ButtonPresents.iml | 22 ---- .idea/compiler.xml | 16 --- .idea/encodings.xml | 6 - .idea/inspectionProfiles/Project_Default.xml | 11 -- .idea/misc.xml | 16 --- .idea/modules.xml | 8 -- .idea/uiDesigner.xml | 124 ------------------ .idea/vcs.xml | 6 - pom.xml | 9 +- .../architecture/commands/BaseCommand.java | 24 ---- .../architecture/commands/ModCommand.java | 15 --- .../architecture/commands/PlayerCommand.java | 23 ---- .../commands/UniversalCommand.java | 19 ++- .../chunkarchive/ChunkArchiveComponent.java | 2 + .../components/dungeon/DungeonCreate.java | 40 +++--- .../components/dungeon/DungeonDelete.java | 28 ++-- .../components/magic/tricks/BoomBowRule.java | 120 +++++++++-------- .../magic/tricks/CannonBowSettings.java | 83 ++++++------ .../components/research/Question.java | 9 +- .../dictionary/commands/SendJSON.java | 30 ++--- .../dictionary/commands/SendMessage.java | 10 +- .../dictionary/config/LoadConfig.java | 21 ++- .../dictionary/config/SaveConfig.java | 24 ++-- .../dictionary/config/TimePersistence.java | 27 ++-- .../dictionary/spawning/PlaySound.java | 39 ++---- .../dictionary/spawning/SetBlock.java | 18 +-- .../dictionary/spawning/SpawnCow.java | 15 ++- .../dictionary/spawning/SpawnItem.java | 17 +-- .../dictionary/spawning/SpawnMagicPotato.java | 20 +-- .../dictionary/spawning/SpawnParticle.java | 14 +- .../research/questions/OverflowCrash.java | 12 +- .../research/questions/OverwhelmCrash.java | 12 +- .../research/questions/PluginConfigInfo.java | 51 ++++--- .../questions/PluginDataFolderInfo.java | 28 ++-- .../components/spawn/ChooseColor.java | 30 ++--- 37 files changed, 332 insertions(+), 645 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/ButtonPresents.iml delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/inspectionProfiles/Project_Default.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/uiDesigner.xml delete mode 100644 .idea/vcs.xml delete mode 100644 src/main/java/buttondevteam/presents/architecture/commands/BaseCommand.java delete mode 100644 src/main/java/buttondevteam/presents/architecture/commands/ModCommand.java delete mode 100644 src/main/java/buttondevteam/presents/architecture/commands/PlayerCommand.java diff --git a/.gitignore b/.gitignore index a5315bc..0979e3d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,15 @@ -*.class - -# Mobile Tools for Java (J2ME) -.mtj.tmp/ - -# Package Files # -*.jar -*.war -*.ear - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* +*.class + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.ear + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* /target/ + +.idea diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 5c98b42..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# Default ignored files -/workspace.xml \ No newline at end of file diff --git a/.idea/ButtonPresents.iml b/.idea/ButtonPresents.iml deleted file mode 100644 index 8b9a7fb..0000000 --- a/.idea/ButtonPresents.iml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 4b65c14..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index b26911b..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 4f1aeda..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 37b940b..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 31b4c8f..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml deleted file mode 100644 index e96534f..0000000 --- a/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index be9aa1f..1c83329 100644 --- a/pom.xml +++ b/pom.xml @@ -71,8 +71,8 @@ 1.12.2-R0.1-SNAPSHOT - com.github.TBMCPlugins.ButtonCore - ButtonCore + com.github.TBMCPlugins.ChromaCore + Chroma-Core master-SNAPSHOT @@ -91,9 +91,10 @@ 3.2.2 - com.github.TBMCPlugins.ButtonCore + com.palmergames.bukkit.towny Towny - master-SNAPSHOT + 0.95.2.0 + provided junit diff --git a/src/main/java/buttondevteam/presents/architecture/commands/BaseCommand.java b/src/main/java/buttondevteam/presents/architecture/commands/BaseCommand.java deleted file mode 100644 index c6bcd42..0000000 --- a/src/main/java/buttondevteam/presents/architecture/commands/BaseCommand.java +++ /dev/null @@ -1,24 +0,0 @@ -package buttondevteam.presents.architecture.commands; - -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; - -import buttondevteam.lib.chat.CommandClass; -import buttondevteam.lib.chat.TBMCCommandBase; - -@CommandClass(excludeFromPath=true) -public abstract class BaseCommand extends TBMCCommandBase implements CommandExecutor{ - - /**replaces CommandExecutor functionality**/ - public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - return OnCommand(sender, label, args); - } - @Override - public String[] GetHelpText(String alias){ - return new String[] { - "This command doesn't have help text ask a dev to write one", - "If you're a dev, write the help text you lazy bastard. -Ali" - }; - } -} diff --git a/src/main/java/buttondevteam/presents/architecture/commands/ModCommand.java b/src/main/java/buttondevteam/presents/architecture/commands/ModCommand.java deleted file mode 100644 index 2f3e7cd..0000000 --- a/src/main/java/buttondevteam/presents/architecture/commands/ModCommand.java +++ /dev/null @@ -1,15 +0,0 @@ -package buttondevteam.presents.architecture.commands; - -import buttondevteam.lib.chat.CommandClass; - -@CommandClass(modOnly = true, excludeFromPath=true) -public abstract class ModCommand extends PlayerCommand{ - - @Override - public String[] GetHelpText(String alias){ - return new String[] { - "This command doesn't have help text, ask a dev to add one", - "If you're a dev, write the help text you lazy bastard. -Ali" - }; - } -} diff --git a/src/main/java/buttondevteam/presents/architecture/commands/PlayerCommand.java b/src/main/java/buttondevteam/presents/architecture/commands/PlayerCommand.java deleted file mode 100644 index bc93dd9..0000000 --- a/src/main/java/buttondevteam/presents/architecture/commands/PlayerCommand.java +++ /dev/null @@ -1,23 +0,0 @@ -package buttondevteam.presents.architecture.commands; - -import org.bukkit.entity.Player; - -import buttondevteam.lib.chat.CommandClass; -import buttondevteam.lib.chat.PlayerCommandBase; - -@CommandClass(modOnly = false, excludeFromPath=true) -public abstract class PlayerCommand extends PlayerCommandBase{ - - public abstract boolean OnCommand(Player player, String alias, String[] args); - - @Override - public String[] GetHelpText(String alias){ - return new String[] { - "This command doesn't have help text. ", - "If you're a player, ask a mod to write one", - "If you're a mod, ask a dev to write one", - "If you're a dev, write the help text you lazy bastard. -Ali" - }; - } - -} diff --git a/src/main/java/buttondevteam/presents/architecture/commands/UniversalCommand.java b/src/main/java/buttondevteam/presents/architecture/commands/UniversalCommand.java index 0d006d6..50668fd 100644 --- a/src/main/java/buttondevteam/presents/architecture/commands/UniversalCommand.java +++ b/src/main/java/buttondevteam/presents/architecture/commands/UniversalCommand.java @@ -1,16 +1,13 @@ package buttondevteam.presents.architecture.commands; import buttondevteam.lib.chat.CommandClass; +import buttondevteam.lib.chat.ICommand2MC; -@CommandClass(modOnly = false, excludeFromPath=true) -public abstract class UniversalCommand extends BaseCommand{ - @Override - public String[] GetHelpText(String alias){ - return new String[] { - "This command doesn't have help text. ", - "If you're a player, ask a mod to write one", - "If you're a mod, ask a dev to write one", - "If you're a dev, write the help text you lazy bastard. -Ali" - }; - } +@CommandClass(modOnly = false, excludeFromPath = true, helpText = { + "This command doesn't have help text. ", + "If you're a player, ask a mod to write one", + "If you're a mod, ask a dev to write one", + "If you're a dev, write the help text you lazy bastard. -Ali" +}) +public abstract class UniversalCommand extends ICommand2MC { } diff --git a/src/main/java/buttondevteam/presents/components/chunkarchive/ChunkArchiveComponent.java b/src/main/java/buttondevteam/presents/components/chunkarchive/ChunkArchiveComponent.java index 63fcd63..8755edd 100644 --- a/src/main/java/buttondevteam/presents/components/chunkarchive/ChunkArchiveComponent.java +++ b/src/main/java/buttondevteam/presents/components/chunkarchive/ChunkArchiveComponent.java @@ -2,6 +2,7 @@ package buttondevteam.presents.components.chunkarchive; import buttondevteam.lib.TBMCCoreAPI; import buttondevteam.lib.architecture.Component; +import buttondevteam.lib.architecture.ComponentMetadata; import buttondevteam.presents.ButtonPresents; import net.minecraft.server.v1_12_R1.ChunkRegionLoader; import net.minecraft.server.v1_12_R1.ExceptionWorldConflict; @@ -18,6 +19,7 @@ import java.io.IOException; import java.util.logging.Logger; // @formatter:off +@ComponentMetadata(enabledByDefault = false) public class ChunkArchiveComponent extends Component implements Listener { private final File dataFolder = new File("plugins", "ChunkArchive"); @Override diff --git a/src/main/java/buttondevteam/presents/components/dungeon/DungeonCreate.java b/src/main/java/buttondevteam/presents/components/dungeon/DungeonCreate.java index 6d91c48..8cf7465 100644 --- a/src/main/java/buttondevteam/presents/components/dungeon/DungeonCreate.java +++ b/src/main/java/buttondevteam/presents/components/dungeon/DungeonCreate.java @@ -1,32 +1,31 @@ package buttondevteam.presents.components.dungeon; +import buttondevteam.lib.chat.Command2; +import buttondevteam.lib.chat.CommandClass; +import buttondevteam.presents.architecture.commands.UniversalCommand; +import buttondevteam.presents.components.dungeon.DungeonConfig.SETTING; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.entity.Player; -import buttondevteam.lib.chat.CommandClass; -import buttondevteam.presents.architecture.commands.ModCommand; -import buttondevteam.presents.components.dungeon.DungeonConfig.SETTING; +@CommandClass(path = "dungeon create", modOnly = true, helpText = { + "instantiates a new dungeon, setting the dungeon spawn to the player location" +}) +public class DungeonCreate extends UniversalCommand { -@CommandClass(path="dungeon create") -public class DungeonCreate extends ModCommand{ - - @Override - public boolean OnCommand(Player player, String alias, String[] args) { + @Command2.Subcommand + public boolean def(Player player, String dungeonName) { //Creates a new dungeon - - if(args.length < 1) return false; - - String dungeonName = args[0]; + FileConfiguration plugin_config = this.getPlugin().getConfig(); - - if (plugin_config.contains("dungeons." + dungeonName)){ + + if (plugin_config.contains("dungeons." + dungeonName)) { player.sendMessage("There already exists a dungeon named " + dungeonName); player.sendMessage("Type /dungeon info [dungeonname] to get more information"); return true; } - + DungeonConfig config = new DungeonConfig(plugin_config); - + config.set(SETTING.NAME, true); config.set(SETTING.OWNER, player.getName()); config.set(SETTING.SPAWN, player.getLocation().toString()); @@ -42,13 +41,4 @@ public class DungeonCreate extends ModCommand{ } return true; } - - - @Override - public String[] GetHelpText(String alias){ - return new String[] { - "/dungeon create [dungeonName]", - "instantiates a new dungeon, setting the dungeon spawn to the player location" - }; - } } diff --git a/src/main/java/buttondevteam/presents/components/dungeon/DungeonDelete.java b/src/main/java/buttondevteam/presents/components/dungeon/DungeonDelete.java index 2c2e9f8..199adaf 100644 --- a/src/main/java/buttondevteam/presents/components/dungeon/DungeonDelete.java +++ b/src/main/java/buttondevteam/presents/components/dungeon/DungeonDelete.java @@ -1,32 +1,29 @@ package buttondevteam.presents.components.dungeon; +import buttondevteam.lib.chat.Command2; +import buttondevteam.lib.chat.CommandClass; +import buttondevteam.presents.architecture.commands.UniversalCommand; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.entity.Player; -import buttondevteam.lib.chat.CommandClass; -import buttondevteam.presents.architecture.commands.ModCommand; +@CommandClass(path = "dungeon delete") +public class DungeonDelete extends UniversalCommand { -@CommandClass(path="dungeon delete") -public class DungeonDelete extends ModCommand{ + @Command2.Subcommand + public boolean def(Player player, String dungeonName) { - @Override - public boolean OnCommand(Player player, String alias, String[] args) { - - if (args.length < 1) return false; - - String dungeonName = args[0]; FileConfiguration config = this.getPlugin().getConfig(); - - if(!config.contains("dungeon." + dungeonName)){ + + if (!config.contains("dungeon." + dungeonName)) { player.sendMessage("This dungeon does not exist!"); String output = "Valid dungeons are:"; - for(String key : config.getConfigurationSection("dungeon").getKeys(false)){ + for (String key : config.getConfigurationSection("dungeon").getKeys(false)) { output += key; output += ", "; } player.sendMessage(output); - }else{ - for(String key : config.getConfigurationSection("dungeon." + dungeonName).getKeys(true)){ + } else { + for (String key : config.getConfigurationSection("dungeon." + dungeonName).getKeys(true)) { config.set("dungeon." + dungeonName + "." + key, null); } player.sendMessage("Dungeon " + dungeonName + " deleted."); @@ -35,5 +32,4 @@ public class DungeonDelete extends ModCommand{ return true; } - } diff --git a/src/main/java/buttondevteam/presents/components/magic/tricks/BoomBowRule.java b/src/main/java/buttondevteam/presents/components/magic/tricks/BoomBowRule.java index d7bc014..dde1998 100644 --- a/src/main/java/buttondevteam/presents/components/magic/tricks/BoomBowRule.java +++ b/src/main/java/buttondevteam/presents/components/magic/tricks/BoomBowRule.java @@ -1,61 +1,59 @@ -package buttondevteam.presents.components.magic.tricks; - -import org.bukkit.entity.Player; - -import buttondevteam.presents.architecture.commands.ModCommand; - -//HEHEHHEHEH EAASSSTER EGGS -public class BoomBowRule extends ModCommand{ - public static boolean boomDecay; - public static boolean healthReduction; - public static boolean endCrystal; - public static boolean localized;; - @Override - public boolean OnCommand(Player player, String label, String[] args) { - if (player.getName().equals("alisolarflare") == false){ - player.sendMessage("You must be alisolarflare to use this command"); - return false; - } - if (args.length < 2){ - player.sendMessage("Rules:"); - player.sendMessage("boomDecay" + boomDecay); - player.sendMessage("healthReduction" + healthReduction); - player.sendMessage("endCrystal" + endCrystal); - player.sendMessage("localized" + localized); - return false; - } - if(!(args[1].startsWith("t")|| args[1].startsWith("f"))){ - return false; - } - boolean gameRule = false; - if(args[1].startsWith("t") || args[1].startsWith("T")){ - gameRule = true; - } - switch(args[0]){ - case "boomDecay": - boomDecay = gameRule; - break; - case "healthReduction": - healthReduction = gameRule; - break; - case "endCrystal": - endCrystal = gameRule; - break; - case "localized": - localized = gameRule; - break; - default: - player.sendMessage("Error: "+args[0]+" not defined as a rule"); - return false; - } - - return true; - } - @Override - public String[] GetHelpText(String alias) { - return new String[]{ - "Usage: /boomBowRule [rulename] [true/false]", - "Rule settings: boomDecay, healthReduction, endCrystal, localized" - }; - } -} +package buttondevteam.presents.components.magic.tricks; + +import buttondevteam.lib.chat.Command2; +import buttondevteam.lib.chat.CommandClass; +import buttondevteam.presents.architecture.commands.UniversalCommand; +import org.bukkit.entity.Player; + +//HEHEHHEHEH EAASSSTER EGGS +@CommandClass(helpText = { + "Rule settings: boomDecay, healthReduction, endCrystal, localized" +}) +public class BoomBowRule extends UniversalCommand { + public static boolean boomDecay; + public static boolean healthReduction; + public static boolean endCrystal; + public static boolean localized; + + @Command2.Subcommand + public boolean def(Player player, @Command2.OptionalArg String name, @Command2.OptionalArg Boolean value) { + if (!player.getName().equals("alisolarflare")) { + player.sendMessage("You must be alisolarflare to use this command"); + return false; + } + if (name == null || value == null) { + player.sendMessage("Rules:"); + player.sendMessage("boomDecay" + boomDecay); + player.sendMessage("healthReduction" + healthReduction); + player.sendMessage("endCrystal" + endCrystal); + player.sendMessage("localized" + localized); + return false; + } + /*if(!(args[1].startsWith("t")|| args[1].startsWith("f"))){ + return false; + } + boolean gameRule = false; + if(args[1].startsWith("t") || args[1].startsWith("T")){ + gameRule = true; + }*/ + switch (name) { + case "boomDecay": + boomDecay = value; + break; + case "healthReduction": + healthReduction = value; + break; + case "endCrystal": + endCrystal = value; + break; + case "localized": + localized = value; + break; + default: + player.sendMessage("Error: " + name + " not defined as a rule"); + return false; + } + + return true; + } +} diff --git a/src/main/java/buttondevteam/presents/components/magic/tricks/CannonBowSettings.java b/src/main/java/buttondevteam/presents/components/magic/tricks/CannonBowSettings.java index 37b9448..4b6b7d5 100644 --- a/src/main/java/buttondevteam/presents/components/magic/tricks/CannonBowSettings.java +++ b/src/main/java/buttondevteam/presents/components/magic/tricks/CannonBowSettings.java @@ -1,50 +1,51 @@ package buttondevteam.presents.components.magic.tricks; +import buttondevteam.lib.chat.Command2; +import buttondevteam.lib.chat.CommandClass; +import buttondevteam.presents.architecture.commands.UniversalCommand; import org.apache.commons.lang3.math.NumberUtils; import org.bukkit.entity.Player; -import buttondevteam.lib.chat.CommandClass; -import buttondevteam.presents.architecture.commands.ModCommand; +@CommandClass(path = "magic cannonbow settings") +public class CannonBowSettings extends UniversalCommand { -@CommandClass(path="magic cannonbow settings") -public class CannonBowSettings extends ModCommand { - - @Override - public boolean OnCommand(Player player, String alias, String[] args) { - if (args.length > 1 && args[0] == "display"){ - switch(args[0].toLowerCase()){ - case "force": - case "speedmultiplier": - CannonBowListener.setSpeedMultiplier(NumberUtils.toDouble(args[1], CannonBowListener.getSpeedMultiplier())); - break; - case "minimumforce": - case "minforce": - case "minimumdraw": - case "mindraw": - CannonBowListener.setMinforce(NumberUtils.toDouble(args[1], CannonBowListener.getMinforce())); - break; - case "fuse": - case "fusetick": - case "fuseticks": - CannonBowListener.setFuseticks(NumberUtils.toInt(args[1], CannonBowListener.getFuseticks())); - break; - case "recoil": - CannonBowListener.setRecoil(NumberUtils.toDouble((args[1]), CannonBowListener.getRecoil())); - break; - case "isDestructive": - CannonBowListener.setIsDestructive(args[1]); - case "display": - player.sendMessage("Speed Multiplier: "+CannonBowListener.getSpeedMultiplier()); - player.sendMessage("Minimum Force: "+CannonBowListener.getMinforce()); - player.sendMessage("Fuseticks: " + CannonBowListener.getFuseticks()); - player.sendMessage("Recoil: " + CannonBowListener.getRecoil()); - player.sendMessage("isDestructive: " + CannonBowListener.getIsDestructive()); - break; - default: - player.sendMessage("That isn't a valid setting!"); - player.sendMessage("Valid Settings are: speedmultiplier, minforce, fuseticks, recoil"); - player.sendMessage("Use argument 'display' to disply current settings"); - return false; + @Command2.Subcommand + public boolean def(Player player, String setting, @Command2.OptionalArg String value) { + if (value != null || setting.equalsIgnoreCase("display")) { + switch (setting.toLowerCase()) { + case "force": + case "speedmultiplier": + CannonBowListener.setSpeedMultiplier(NumberUtils.toDouble(value, CannonBowListener.getSpeedMultiplier())); + break; + case "minimumforce": + case "minforce": + case "minimumdraw": + case "mindraw": + CannonBowListener.setMinforce(NumberUtils.toDouble(value, CannonBowListener.getMinforce())); + break; + case "fuse": + case "fusetick": + case "fuseticks": + CannonBowListener.setFuseticks(NumberUtils.toInt(value, CannonBowListener.getFuseticks())); + break; + case "recoil": + CannonBowListener.setRecoil(NumberUtils.toDouble((value), CannonBowListener.getRecoil())); + break; + case "isDestructive": + CannonBowListener.setIsDestructive(value); + break; + case "display": + player.sendMessage("Speed Multiplier: " + CannonBowListener.getSpeedMultiplier()); + player.sendMessage("Minimum Force: " + CannonBowListener.getMinforce()); + player.sendMessage("Fuseticks: " + CannonBowListener.getFuseticks()); + player.sendMessage("Recoil: " + CannonBowListener.getRecoil()); + player.sendMessage("isDestructive: " + CannonBowListener.getIsDestructive()); + break; + default: + player.sendMessage("That isn't a valid setting!"); + player.sendMessage("Valid Settings are: speedmultiplier, minforce, fuseticks, recoil"); + player.sendMessage("Use argument 'display' to disply current settings"); + return false; } } return true; diff --git a/src/main/java/buttondevteam/presents/components/research/Question.java b/src/main/java/buttondevteam/presents/components/research/Question.java index 40ccca3..d5592d9 100644 --- a/src/main/java/buttondevteam/presents/components/research/Question.java +++ b/src/main/java/buttondevteam/presents/components/research/Question.java @@ -1,10 +1,11 @@ package buttondevteam.presents.components.research; -import buttondevteam.presents.architecture.commands.ModCommand; +import buttondevteam.presents.architecture.commands.UniversalCommand; -public abstract class Question extends ModCommand { +public abstract class Question extends UniversalCommand { public abstract String question(); - public abstract String answer(); - protected String answer = "Undetermined"; + public abstract String answer(); + + protected String answer = "Undetermined"; } diff --git a/src/main/java/buttondevteam/presents/components/research/dictionary/commands/SendJSON.java b/src/main/java/buttondevteam/presents/components/research/dictionary/commands/SendJSON.java index 8f19e34..c9bfa38 100644 --- a/src/main/java/buttondevteam/presents/components/research/dictionary/commands/SendJSON.java +++ b/src/main/java/buttondevteam/presents/components/research/dictionary/commands/SendJSON.java @@ -1,29 +1,29 @@ package buttondevteam.presents.components.research.dictionary.commands; -import org.bukkit.entity.Player; - +import buttondevteam.lib.chat.Command2; +import buttondevteam.lib.chat.CommandClass; +import buttondevteam.presents.architecture.commands.UniversalCommand; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import org.bukkit.entity.Player; -import buttondevteam.lib.chat.CommandClass; -import buttondevteam.presents.architecture.commands.ModCommand; +@CommandClass(modOnly = true, path = "dictionary json") +public class SendJSON extends UniversalCommand { -@CommandClass(modOnly = true, path="dictionary json") -public class SendJSON extends ModCommand{ + @Command2.Subcommand + public boolean def(Player player) { + GsonBuilder builder = new GsonBuilder(); + Gson gson = builder.create(); - @Override - public boolean OnCommand(Player player, String alias, String[] args) { - GsonBuilder builder = new GsonBuilder(); - Gson gson = builder.create(); - player.sendMessage(gson.toJson(new output())); return true; } - class output{ + + class output { String ali = "pls"; - String iie = "whaddap"; - String norbipeti = "¯\\_(ツ)_/¯"; - } + String iie = "whaddap"; + String norbipeti = "¯\\_(ツ)_/¯"; + } } diff --git a/src/main/java/buttondevteam/presents/components/research/dictionary/commands/SendMessage.java b/src/main/java/buttondevteam/presents/components/research/dictionary/commands/SendMessage.java index 4be28e6..dfb8523 100644 --- a/src/main/java/buttondevteam/presents/components/research/dictionary/commands/SendMessage.java +++ b/src/main/java/buttondevteam/presents/components/research/dictionary/commands/SendMessage.java @@ -1,15 +1,15 @@ package buttondevteam.presents.components.research.dictionary.commands; -import org.bukkit.command.CommandSender; - +import buttondevteam.lib.chat.Command2; import buttondevteam.lib.chat.CommandClass; import buttondevteam.presents.architecture.commands.UniversalCommand; +import org.bukkit.command.CommandSender; -@CommandClass(modOnly = false, path="dictionary command") +@CommandClass(modOnly = false, path = "dictionary command") public class SendMessage extends UniversalCommand { - @Override - public boolean OnCommand(CommandSender sender, String alias, String[] args) { + @Command2.Subcommand + public boolean def(CommandSender sender) { sender.sendMessage("Hello World!"); return true; } diff --git a/src/main/java/buttondevteam/presents/components/research/dictionary/config/LoadConfig.java b/src/main/java/buttondevteam/presents/components/research/dictionary/config/LoadConfig.java index 7011c43..6583518 100644 --- a/src/main/java/buttondevteam/presents/components/research/dictionary/config/LoadConfig.java +++ b/src/main/java/buttondevteam/presents/components/research/dictionary/config/LoadConfig.java @@ -1,24 +1,23 @@ package buttondevteam.presents.components.research.dictionary.config; +import buttondevteam.lib.chat.Command2; +import buttondevteam.lib.chat.CommandClass; +import buttondevteam.presents.architecture.commands.UniversalCommand; +import org.bukkit.entity.Player; import java.util.List; -import org.bukkit.entity.Player; +@CommandClass(modOnly = true, path = "dictionary load") +public class LoadConfig extends UniversalCommand { -import buttondevteam.lib.chat.CommandClass; -import buttondevteam.presents.architecture.commands.ModCommand; - -@CommandClass(modOnly=true, path = "dictionary load") -public class LoadConfig extends ModCommand { - - @Override - public boolean OnCommand(Player player, String alias, String[] args) { - if (args.length > 1 && args[0].toLowerCase().contains("debug")){ + @Command2.Subcommand + public boolean OnCommand(Player player, @Command2.OptionalArg String debug) { + if (debug != null && debug.toLowerCase().contains("debug")) { player.sendMessage("Data Type: " + this.getPlugin().getConfig().get("hellosave").getClass().toString()); } List mylist = this.getPlugin().getConfig().getStringList("hellosave"); - for(String string : mylist){ + for (String string : mylist) { player.sendMessage(string); } return true; diff --git a/src/main/java/buttondevteam/presents/components/research/dictionary/config/SaveConfig.java b/src/main/java/buttondevteam/presents/components/research/dictionary/config/SaveConfig.java index 6dd4401..acd242e 100644 --- a/src/main/java/buttondevteam/presents/components/research/dictionary/config/SaveConfig.java +++ b/src/main/java/buttondevteam/presents/components/research/dictionary/config/SaveConfig.java @@ -1,24 +1,24 @@ package buttondevteam.presents.components.research.dictionary.config; +import buttondevteam.lib.chat.Command2; +import buttondevteam.lib.chat.CommandClass; +import buttondevteam.presents.architecture.commands.UniversalCommand; +import org.bukkit.command.CommandSender; + import java.util.Arrays; -import org.bukkit.command.CommandSender; - -import buttondevteam.lib.chat.CommandClass; -import buttondevteam.presents.architecture.commands.UniversalCommand; - @CommandClass(path = "dictionary save") public class SaveConfig extends UniversalCommand { - @Override - public boolean OnCommand(CommandSender sender, String alias, String[] args) { - if (args.length < 1){ + @Command2.Subcommand + public boolean def(CommandSender sender, String... message) { + if (message.length < 1) { sender.sendMessage("Can't save an empty string, Type /hellosave "); - }else{ - try{ - this.getPlugin().getConfig().set("hellosave", Arrays.asList(args)); + } else { + try { + this.getPlugin().getConfig().set("hellosave", Arrays.asList(message)); this.getPlugin().saveConfig(); sender.sendMessage("Message saved!"); - }catch (Exception e){ + } catch (Exception e) { sender.sendMessage("Error when saving message:"); sender.sendMessage(e.toString()); } diff --git a/src/main/java/buttondevteam/presents/components/research/dictionary/config/TimePersistence.java b/src/main/java/buttondevteam/presents/components/research/dictionary/config/TimePersistence.java index 81a1603..c6499cd 100644 --- a/src/main/java/buttondevteam/presents/components/research/dictionary/config/TimePersistence.java +++ b/src/main/java/buttondevteam/presents/components/research/dictionary/config/TimePersistence.java @@ -1,31 +1,32 @@ package buttondevteam.presents.components.research.dictionary.config; +import buttondevteam.lib.chat.Command2; +import buttondevteam.lib.chat.CommandClass; +import buttondevteam.presents.architecture.commands.UniversalCommand; +import org.bukkit.command.CommandSender; +import org.bukkit.configuration.file.FileConfiguration; + import java.text.SimpleDateFormat; import java.util.Date; -import org.bukkit.command.CommandSender; -import org.bukkit.configuration.file.FileConfiguration; - -import buttondevteam.lib.chat.CommandClass; -import buttondevteam.presents.architecture.commands.UniversalCommand; @CommandClass(path = "dictionary time") public class TimePersistence extends UniversalCommand { final String path = "hellotime.lastincident"; - @Override - public boolean OnCommand(CommandSender sender, String alias, String[] args) { - + @Command2.Subcommand + public boolean def(CommandSender sender) { + FileConfiguration config = this.getPlugin().getConfig(); - - if(config.contains(path) && config.isLong(path)){ + + if (config.contains(path) && config.isLong(path)) { sender.sendMessage("Last Time Incident: " + MillisToString(config.getLong(path))); - }else{ + } else { sender.sendMessage("Time Incident Occoured!"); sender.sendMessage("Setting..."); - + long time = System.currentTimeMillis(); config.set(path, time); - + sender.sendMessage("Time set to" + MillisToString(time)); } return true; diff --git a/src/main/java/buttondevteam/presents/components/research/dictionary/spawning/PlaySound.java b/src/main/java/buttondevteam/presents/components/research/dictionary/spawning/PlaySound.java index bbcd661..3ced655 100644 --- a/src/main/java/buttondevteam/presents/components/research/dictionary/spawning/PlaySound.java +++ b/src/main/java/buttondevteam/presents/components/research/dictionary/spawning/PlaySound.java @@ -1,46 +1,25 @@ package buttondevteam.presents.components.research.dictionary.spawning; +import buttondevteam.lib.chat.Command2; +import buttondevteam.lib.chat.CommandClass; +import buttondevteam.presents.architecture.commands.UniversalCommand; import org.bukkit.Sound; import org.bukkit.entity.Player; -import buttondevteam.lib.chat.CommandClass; -import buttondevteam.presents.architecture.commands.PlayerCommand; - @CommandClass(path = "dictionary sound") -public class PlaySound extends PlayerCommand{ +public class PlaySound extends UniversalCommand { + + @Command2.Subcommand + public boolean def(Player player, int volume, int pitch) { - @Override - public boolean OnCommand(Player player, String alias, String[] args) { - int volume = 0; - int pitch = 0; - - //parse arguments - if (args.length >= 2){ - try{ - volume = Integer.parseInt(args[0]); - pitch = Integer.parseInt(args[1]); - }catch(NumberFormatException e){ - - volume = pitch = 0; - - player.sendMessage("Incorrect input:"); - player.sendMessage(args[0] + " must be an int."); - player.sendMessage(args[1] + " must be an int."); - }catch(Exception e){ - player.sendMessage("Incorrect Input"); - player.sendMessage(e.toString()); - } - - } - player.playSound( player.getLocation(), Sound.ENTITY_BLAZE_DEATH, volume, //Volume pitch); //Pitch - + return true; - + } } diff --git a/src/main/java/buttondevteam/presents/components/research/dictionary/spawning/SetBlock.java b/src/main/java/buttondevteam/presents/components/research/dictionary/spawning/SetBlock.java index 9491740..f788f60 100644 --- a/src/main/java/buttondevteam/presents/components/research/dictionary/spawning/SetBlock.java +++ b/src/main/java/buttondevteam/presents/components/research/dictionary/spawning/SetBlock.java @@ -1,21 +1,21 @@ package buttondevteam.presents.components.research.dictionary.spawning; +import buttondevteam.lib.chat.Command2; +import buttondevteam.lib.chat.CommandClass; +import buttondevteam.presents.architecture.commands.UniversalCommand; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.entity.Player; -import buttondevteam.lib.chat.CommandClass; -import buttondevteam.presents.architecture.commands.PlayerCommand; +@CommandClass(path = "dictionary block", modOnly = true) +public class SetBlock extends UniversalCommand { -@CommandClass(path = "dictionary block", modOnly=true) -public class SetBlock extends PlayerCommand { - - @Override - public boolean OnCommand(Player player, String alias, String[] args) { + @Command2.Subcommand + public boolean def(Player player) { Block blockAtPlayer = player.getWorld().getBlockAt(player.getLocation()); - + blockAtPlayer.setType(Material.CAKE_BLOCK); - + return true; } diff --git a/src/main/java/buttondevteam/presents/components/research/dictionary/spawning/SpawnCow.java b/src/main/java/buttondevteam/presents/components/research/dictionary/spawning/SpawnCow.java index 11b9487..ec98fbd 100644 --- a/src/main/java/buttondevteam/presents/components/research/dictionary/spawning/SpawnCow.java +++ b/src/main/java/buttondevteam/presents/components/research/dictionary/spawning/SpawnCow.java @@ -1,19 +1,20 @@ package buttondevteam.presents.components.research.dictionary.spawning; +import buttondevteam.lib.chat.Command2; +import buttondevteam.lib.chat.CommandClass; +import buttondevteam.presents.architecture.commands.UniversalCommand; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; -import buttondevteam.lib.chat.CommandClass; -import buttondevteam.presents.architecture.commands.PlayerCommand; -@CommandClass(path = "dictionary cow", modOnly=true) -public class SpawnCow extends PlayerCommand { +@CommandClass(path = "dictionary cow", modOnly = true) +public class SpawnCow extends UniversalCommand { - @Override - public boolean OnCommand(Player player, String alias, String[] args) { + @Command2.Subcommand + public boolean def(Player player) { player.getWorld().spawnEntity( player.getLocation(), EntityType.COW - ); + ); return true; } } diff --git a/src/main/java/buttondevteam/presents/components/research/dictionary/spawning/SpawnItem.java b/src/main/java/buttondevteam/presents/components/research/dictionary/spawning/SpawnItem.java index c99fd9d..3f13b69 100644 --- a/src/main/java/buttondevteam/presents/components/research/dictionary/spawning/SpawnItem.java +++ b/src/main/java/buttondevteam/presents/components/research/dictionary/spawning/SpawnItem.java @@ -1,22 +1,19 @@ package buttondevteam.presents.components.research.dictionary.spawning; +import buttondevteam.lib.chat.Command2; +import buttondevteam.lib.chat.CommandClass; +import buttondevteam.presents.architecture.commands.UniversalCommand; import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import buttondevteam.lib.chat.CommandClass; -import buttondevteam.presents.architecture.commands.ModCommand; +@CommandClass(path = "dictionary item", modOnly = true) +public class SpawnItem extends UniversalCommand { -@CommandClass(path = "dictionary item", modOnly=true) -public class SpawnItem extends ModCommand { - - @Override - public boolean OnCommand(Player player, String alias, String[] args) { + @Command2.Subcommand + public boolean def(Player player) { ItemStack potato = new ItemStack(Material.BAKED_POTATO); player.getInventory().addItem(potato); return true; } - - - } diff --git a/src/main/java/buttondevteam/presents/components/research/dictionary/spawning/SpawnMagicPotato.java b/src/main/java/buttondevteam/presents/components/research/dictionary/spawning/SpawnMagicPotato.java index 1ba8727..359caed 100644 --- a/src/main/java/buttondevteam/presents/components/research/dictionary/spawning/SpawnMagicPotato.java +++ b/src/main/java/buttondevteam/presents/components/research/dictionary/spawning/SpawnMagicPotato.java @@ -1,26 +1,26 @@ package buttondevteam.presents.components.research.dictionary.spawning; -import java.util.ArrayList; - +import buttondevteam.lib.chat.Command2; +import buttondevteam.lib.chat.CommandClass; +import buttondevteam.presents.architecture.commands.UniversalCommand; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; -import buttondevteam.lib.chat.CommandClass; -import buttondevteam.presents.architecture.commands.ModCommand; +import java.util.ArrayList; -@CommandClass(path = "dictionary magicpotato", modOnly=true) -public class SpawnMagicPotato extends ModCommand { +@CommandClass(path = "dictionary magicpotato", modOnly = true) +public class SpawnMagicPotato extends UniversalCommand { - @Override - public boolean OnCommand(Player player, String alias, String[] args) { + @Command2.Subcommand + public boolean def(Player player) { ItemStack potato = new ItemStack(Material.BAKED_POTATO); ItemMeta meta = potato.getItemMeta(); - + meta.addEnchant(Enchantment.DURABILITY, 10, true); - + ArrayList lore = new ArrayList(); lore.add("Once upon a time"); lore.add("There was a beautiful potato"); diff --git a/src/main/java/buttondevteam/presents/components/research/dictionary/spawning/SpawnParticle.java b/src/main/java/buttondevteam/presents/components/research/dictionary/spawning/SpawnParticle.java index e0fd25b..6542ca7 100644 --- a/src/main/java/buttondevteam/presents/components/research/dictionary/spawning/SpawnParticle.java +++ b/src/main/java/buttondevteam/presents/components/research/dictionary/spawning/SpawnParticle.java @@ -1,16 +1,16 @@ package buttondevteam.presents.components.research.dictionary.spawning; +import buttondevteam.lib.chat.Command2; +import buttondevteam.lib.chat.CommandClass; +import buttondevteam.presents.architecture.commands.UniversalCommand; import org.bukkit.Particle; import org.bukkit.entity.Player; -import buttondevteam.lib.chat.CommandClass; -import buttondevteam.presents.architecture.commands.PlayerCommand; +@CommandClass(path = "dictionary particle", modOnly = true) +public class SpawnParticle extends UniversalCommand { -@CommandClass(path = "dictionary particle", modOnly=true) -public class SpawnParticle extends PlayerCommand { - - @Override - public boolean OnCommand(Player player, String alias, String[] args) { + @Command2.Subcommand + public boolean def(Player player) { player.getWorld().spawnParticle(Particle.CLOUD, player.getLocation(), 10); return true; } diff --git a/src/main/java/buttondevteam/presents/components/research/questions/OverflowCrash.java b/src/main/java/buttondevteam/presents/components/research/questions/OverflowCrash.java index 790ea66..4dabd8d 100644 --- a/src/main/java/buttondevteam/presents/components/research/questions/OverflowCrash.java +++ b/src/main/java/buttondevteam/presents/components/research/questions/OverflowCrash.java @@ -1,11 +1,11 @@ package buttondevteam.presents.components.research.questions; -import org.bukkit.entity.Player; - +import buttondevteam.lib.chat.Command2; import buttondevteam.lib.chat.CommandClass; import buttondevteam.presents.components.research.Question; +import org.bukkit.entity.Player; -@CommandClass(path="research crash overflow") +@CommandClass(path = "research crash overflow", modOnly = true) public class OverflowCrash extends Question { @Override @@ -20,11 +20,11 @@ public class OverflowCrash extends Question { return "No."; } - @Override - public boolean OnCommand(Player player, String alias, String[] args) { + @Command2.Subcommand + public boolean def(Player player) { // TODO Auto-generated method stub String overflowMessage = ""; - for (int i = 0; i < 100; i++){ + for (int i = 0; i < 100; i++) { overflowMessage += "Did you ever hear the tragedy of Darth Plagueis The Wise? I thought not. It’s not a story the Jedi would tell you. It’s a Sith legend. Darth Plagueis was a Dark Lord of the Sith, so powerful and so wise he could use the Force to influence the midichlorians to create life… He had such a knowledge of the dark side that he could even keep the ones he cared about from dying. The dark side of the Force is a pathway to many abilities some consider to be unnatural. He became so powerful… the only thing he was afraid of was losing his power, which eventually, of course, he did. Unfortunately, he taught his apprentice everything he knew, then his apprentice killed him in his sleep. Ironic. He could save others from death, but not himself."; } player.sendMessage(overflowMessage); diff --git a/src/main/java/buttondevteam/presents/components/research/questions/OverwhelmCrash.java b/src/main/java/buttondevteam/presents/components/research/questions/OverwhelmCrash.java index 323be59..329299d 100644 --- a/src/main/java/buttondevteam/presents/components/research/questions/OverwhelmCrash.java +++ b/src/main/java/buttondevteam/presents/components/research/questions/OverwhelmCrash.java @@ -1,11 +1,11 @@ package buttondevteam.presents.components.research.questions; -import org.bukkit.entity.Player; - +import buttondevteam.lib.chat.Command2; import buttondevteam.lib.chat.CommandClass; import buttondevteam.presents.components.research.Question; +import org.bukkit.entity.Player; -@CommandClass(path="research crash overwhelm") +@CommandClass(path = "research crash overwhelm", modOnly = true) public class OverwhelmCrash extends Question { @Override @@ -20,10 +20,10 @@ public class OverwhelmCrash extends Question { return "No."; } - @Override - public boolean OnCommand(Player player, String alias, String[] args) { + @Command2.Subcommand + public boolean def(Player player) { // TODO Auto-generated method stub - for (int x = 0; x < 500; x++){ + for (int x = 0; x < 500; x++) { player.sendMessage("Hello World Motherfucker!"); } player.sendMessage(question()); diff --git a/src/main/java/buttondevteam/presents/components/research/questions/PluginConfigInfo.java b/src/main/java/buttondevteam/presents/components/research/questions/PluginConfigInfo.java index 5d28188..5e53858 100644 --- a/src/main/java/buttondevteam/presents/components/research/questions/PluginConfigInfo.java +++ b/src/main/java/buttondevteam/presents/components/research/questions/PluginConfigInfo.java @@ -1,75 +1,70 @@ package buttondevteam.presents.components.research.questions; +import buttondevteam.lib.chat.Command2; +import buttondevteam.lib.chat.CommandClass; +import buttondevteam.presents.components.research.Question; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.entity.Player; -import buttondevteam.lib.chat.CommandClass; -import buttondevteam.presents.components.research.Question; - -@CommandClass(path="research info pluginconfig") +@CommandClass(path = "research info pluginconfig", modOnly = true, helpText = { + "Subcommands = name, path, root_name, root_path, root_keys, answer" +}) public class PluginConfigInfo extends Question { @Override public String question() { return "What is the filepath for the plugin " + this.getPlugin().getName() + "?"; } - + public String answer() { return this.answer; } - - - - @Override - public boolean OnCommand(Player player, String alias, String[] args) { + + + @Command2.Subcommand + public boolean def(Player player, String subcommand) { player.sendMessage("[Q]:" + question()); - + player.sendMessage("---Plugin's Config Information---"); FileConfiguration config = this.getPlugin().getConfig(); - - if (args.length >= 1){ - switch(args[0].toLowerCase()){ + + switch (subcommand.toLowerCase()) { case "name": player.sendMessage("Name:"); player.sendMessage(" - " + config.getName()); break; - + case "path": player.sendMessage("Current Path:"); player.sendMessage(" - " + config.getCurrentPath()); break; - + case "root_name": player.sendMessage("Name of Root:"); player.sendMessage(" - " + config.getRoot().getName()); break; - + case "root_path": player.sendMessage("Path of Root:"); player.sendMessage(" - " + config.getRoot().getCurrentPath()); break; - + case "root_key": case "root_keys": player.sendMessage("Keys of Root (Deep = true)"); player.sendMessage(" - " + config.getRoot().getKeys(true).toString()); break; - + case "answer": player.sendMessage("[A]:" + this.answer()); break; - + default: - player.sendMessage("Usage: " + this.GetCommandPath() + ""); - player.sendMessage("Subcommands = name, path, root_name, root_path, root_keys, answer"); - } - }else{ //args.length <= 0 - player.sendMessage("Usage: " + this.GetCommandPath() + ""); - player.sendMessage("Subcommands = name, path, root_name, root_path, root_keys, answer"); + return false; } - + return false; } - + } diff --git a/src/main/java/buttondevteam/presents/components/research/questions/PluginDataFolderInfo.java b/src/main/java/buttondevteam/presents/components/research/questions/PluginDataFolderInfo.java index f3089e2..eebdc88 100644 --- a/src/main/java/buttondevteam/presents/components/research/questions/PluginDataFolderInfo.java +++ b/src/main/java/buttondevteam/presents/components/research/questions/PluginDataFolderInfo.java @@ -1,14 +1,14 @@ package buttondevteam.presents.components.research.questions; +import buttondevteam.lib.chat.Command2; +import buttondevteam.lib.chat.CommandClass; +import buttondevteam.presents.components.research.Question; +import org.bukkit.entity.Player; + import java.io.File; import java.io.IOException; -import org.bukkit.entity.Player; - -import buttondevteam.lib.chat.CommandClass; -import buttondevteam.presents.components.research.Question; - -@CommandClass(path="research info datafolder") +@CommandClass(path = "research info datafolder", modOnly = true) public class PluginDataFolderInfo extends Question { @Override @@ -23,19 +23,19 @@ public class PluginDataFolderInfo extends Question { return this.answer; } - @Override - public boolean OnCommand(Player player, String alias, String[] args) { + @Command2.Subcommand + public boolean def(Player player) { player.sendMessage("[Q]:" + this.question()); - + player.sendMessage("---Plugin's Data Folder Information---"); File dataFolder = this.getPlugin().getDataFolder(); - - if (dataFolder == null) player.sendMessage("Data Folder is null"); - else if (!dataFolder.exists()) player.sendMessage("Data Folder does not exist"); - else{ + + if (dataFolder == null) player.sendMessage("Data Folder is null"); + else if (!dataFolder.exists()) player.sendMessage("Data Folder does not exist"); + else { player.sendMessage("Absolute path: "); player.sendMessage(dataFolder.getAbsolutePath()); - + player.sendMessage("Canonical Path:"); try { player.sendMessage(dataFolder.getCanonicalPath()); diff --git a/src/main/java/buttondevteam/presents/components/spawn/ChooseColor.java b/src/main/java/buttondevteam/presents/components/spawn/ChooseColor.java index 0512322..056fb1a 100644 --- a/src/main/java/buttondevteam/presents/components/spawn/ChooseColor.java +++ b/src/main/java/buttondevteam/presents/components/spawn/ChooseColor.java @@ -1,15 +1,15 @@ package buttondevteam.presents.components.spawn; +import buttondevteam.lib.chat.Command2; +import buttondevteam.lib.chat.CommandClass; +import buttondevteam.presents.architecture.commands.UniversalCommand; import org.bukkit.entity.Player; -import buttondevteam.lib.chat.CommandClass; -import buttondevteam.presents.architecture.commands.PlayerCommand; +@CommandClass(modOnly = true, path = "spawn choosecolor") +public class ChooseColor extends UniversalCommand { -@CommandClass(modOnly = true, path="spawn choosecolor") -public class ChooseColor extends PlayerCommand { - - @Override - public boolean OnCommand(Player player, String alias, String[] args) { + @Command2.Subcommand + public boolean def(Player player, String color) { // //Code to make it so that command blocks can fire this command // // if (!(sender instanceof BlockCommandSender)){ @@ -20,15 +20,15 @@ public class ChooseColor extends PlayerCommand { // Server server = sender.getServer(); // server.broadcastMessage("Arg 0:" + args[0]); // server.broadcastMessage("Arg 1:" + args[1]); - - - player.sendMessage("Attempting to change your name "+player.getName()+" to the color..."+args[1]); - + + + player.sendMessage("Attempting to change your name " + player.getName() + " to the color..." + color); + //TODO:INSERT NAME CHANGING CODE HERE - - - player.sendMessage("Your new name: " +player.getName()); - + + + player.sendMessage("Your new name: " + player.getName()); + return true; }