From 8e0339cfaade90ff67b72958e94b21d89e85deb6 Mon Sep 17 00:00:00 2001 From: alisolarflare Date: Wed, 3 Jan 2018 13:49:23 -0500 Subject: [PATCH] Multiple changes --- plugin.yml | 2 +- .../{Main.java => ButtonPresents.java} | 6 ++- .../dictionary/DictionaryComponent.java | 51 ------------------ .../dictionary/copy/DictionaryComponent.java | 51 ------------------ .../components/dungeon/DungeonConfig.java | 30 +++++++++++ .../components/dungeon/DungeonCreate.java | 35 ++++++------ .../research/ResearchComponent.java | 2 +- .../dictionary/DictionaryComponent.java | 51 ++++++++++++++++++ .../dictionary/commands/SendJSON.java | 2 +- .../dictionary/commands/SendMessage.java | 2 +- .../dictionary/config/LoadConfig.java | 2 +- .../dictionary/config/SaveConfig.java | 2 +- .../dictionary/config/TimePersistence.java | 2 +- .../dictionary/effects/Bedsplode.java | 2 +- .../dictionary/pages/DataPage.java | 2 +- .../dictionary/pages/HelloPage.java | 2 +- .../dictionary/pages/JSONPage.java | 2 +- .../dictionary/pages/LocationPage.java | 2 +- .../dictionary/pages/POSTPage.java | 2 +- .../dictionary/pages/PlayersOnlinePage.java | 2 +- .../dictionary/spawning/PlaySound.java | 2 +- .../dictionary/spawning/SetBlock.java | 2 +- .../dictionary/spawning/SpawnCow.java | 2 +- .../dictionary/spawning/SpawnItem.java | 2 +- .../dictionary/spawning/SpawnMagicPotato.java | 2 +- .../dictionary/spawning/SpawnParticle.java | 2 +- .../research/questions/OverflowCrash.java | 2 +- .../research/questions/OverwhelmCrash.java | 2 +- .../research/questions/PluginConfigInfo.java | 53 ++++++++++++++----- .../components/spawn/ChooseColor.java | 43 +++++++-------- .../components/spawn/SpawnComponent.java | 2 +- target/classes/plugin.yml | 2 +- 32 files changed, 188 insertions(+), 180 deletions(-) rename src/main/java/buttondevteam/presents/{Main.java => ButtonPresents.java} (85%) delete mode 100644 src/main/java/buttondevteam/presents/components/dictionary/DictionaryComponent.java delete mode 100644 src/main/java/buttondevteam/presents/components/dictionary/copy/DictionaryComponent.java create mode 100644 src/main/java/buttondevteam/presents/components/dungeon/DungeonConfig.java create mode 100644 src/main/java/buttondevteam/presents/components/research/dictionary/DictionaryComponent.java rename src/main/java/buttondevteam/presents/components/{ => research}/dictionary/commands/SendJSON.java (90%) rename src/main/java/buttondevteam/presents/components/{ => research}/dictionary/commands/SendMessage.java (85%) rename src/main/java/buttondevteam/presents/components/{ => research}/dictionary/config/LoadConfig.java (90%) rename src/main/java/buttondevteam/presents/components/{ => research}/dictionary/config/SaveConfig.java (91%) rename src/main/java/buttondevteam/presents/components/{ => research}/dictionary/config/TimePersistence.java (94%) rename src/main/java/buttondevteam/presents/components/{ => research}/dictionary/effects/Bedsplode.java (91%) rename src/main/java/buttondevteam/presents/components/{ => research}/dictionary/pages/DataPage.java (86%) rename src/main/java/buttondevteam/presents/components/{ => research}/dictionary/pages/HelloPage.java (84%) rename src/main/java/buttondevteam/presents/components/{ => research}/dictionary/pages/JSONPage.java (91%) rename src/main/java/buttondevteam/presents/components/{ => research}/dictionary/pages/LocationPage.java (94%) rename src/main/java/buttondevteam/presents/components/{ => research}/dictionary/pages/POSTPage.java (93%) rename src/main/java/buttondevteam/presents/components/{ => research}/dictionary/pages/PlayersOnlinePage.java (92%) rename src/main/java/buttondevteam/presents/components/{ => research}/dictionary/spawning/PlaySound.java (93%) rename src/main/java/buttondevteam/presents/components/{ => research}/dictionary/spawning/SetBlock.java (88%) rename src/main/java/buttondevteam/presents/components/{ => research}/dictionary/spawning/SpawnCow.java (86%) rename src/main/java/buttondevteam/presents/components/{ => research}/dictionary/spawning/SpawnItem.java (87%) rename src/main/java/buttondevteam/presents/components/{ => research}/dictionary/spawning/SpawnMagicPotato.java (94%) rename src/main/java/buttondevteam/presents/components/{ => research}/dictionary/spawning/SpawnParticle.java (86%) diff --git a/plugin.yml b/plugin.yml index 106b62a..77ab901 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,4 +1,4 @@ -main: buttondevteam.presents.Main +main: buttondevteam.presents.ButtonPresents name: ButtonPresents version: 0.0.1 diff --git a/src/main/java/buttondevteam/presents/Main.java b/src/main/java/buttondevteam/presents/ButtonPresents.java similarity index 85% rename from src/main/java/buttondevteam/presents/Main.java rename to src/main/java/buttondevteam/presents/ButtonPresents.java index 8d31216..9c533ed 100644 --- a/src/main/java/buttondevteam/presents/Main.java +++ b/src/main/java/buttondevteam/presents/ButtonPresents.java @@ -5,18 +5,20 @@ import java.util.logging.Logger; import org.bukkit.plugin.PluginDescriptionFile; import org.bukkit.plugin.java.JavaPlugin; -import buttondevteam.presents.components.dictionary.DictionaryComponent; import buttondevteam.presents.components.magic.MagicComponent; import buttondevteam.presents.components.research.ResearchComponent; +import buttondevteam.presents.components.research.dictionary.DictionaryComponent; import buttondevteam.presents.components.spawn.SpawnComponent; -public class Main extends JavaPlugin{ +public class ButtonPresents extends JavaPlugin{ + public void onEnable(){ PluginDescriptionFile pdfFile = getDescription(); Logger logger = getLogger(); logger.info(pdfFile.getName() + " has been started (V." + pdfFile.getVersion()+ ")."); + new DictionaryComponent().register(this); new SpawnComponent().register(this); new MagicComponent().register(this); diff --git a/src/main/java/buttondevteam/presents/components/dictionary/DictionaryComponent.java b/src/main/java/buttondevteam/presents/components/dictionary/DictionaryComponent.java deleted file mode 100644 index 1d986db..0000000 --- a/src/main/java/buttondevteam/presents/components/dictionary/DictionaryComponent.java +++ /dev/null @@ -1,51 +0,0 @@ -package buttondevteam.presents.components.dictionary; - -import org.bukkit.plugin.java.JavaPlugin; - -import buttondevteam.presents.architecture.Component; -import buttondevteam.presents.components.dictionary.commands.SendJSON; -import buttondevteam.presents.components.dictionary.commands.SendMessage; -import buttondevteam.presents.components.dictionary.config.LoadConfig; -import buttondevteam.presents.components.dictionary.config.SaveConfig; -import buttondevteam.presents.components.dictionary.config.TimePersistence; -import buttondevteam.presents.components.dictionary.effects.Bedsplode; -import buttondevteam.presents.components.dictionary.pages.DataPage; -import buttondevteam.presents.components.dictionary.pages.HelloPage; -import buttondevteam.presents.components.dictionary.pages.JSONPage; -import buttondevteam.presents.components.dictionary.pages.LocationPage; -import buttondevteam.presents.components.dictionary.pages.POSTPage; -import buttondevteam.presents.components.dictionary.pages.PlayersOnlinePage; -import buttondevteam.presents.components.dictionary.spawning.PlaySound; -import buttondevteam.presents.components.dictionary.spawning.SetBlock; -import buttondevteam.presents.components.dictionary.spawning.SpawnCow; -import buttondevteam.presents.components.dictionary.spawning.SpawnItem; -import buttondevteam.presents.components.dictionary.spawning.SpawnMagicPotato; -import buttondevteam.presents.components.dictionary.spawning.SpawnParticle; - -public class DictionaryComponent extends Component{ - - @Override - public void register(JavaPlugin plugin) { - - this.registerCommand(plugin, new SendMessage()); - this.registerCommand(plugin, new SendJSON()); - this.registerCommand(plugin, new SaveConfig()); - this.registerCommand(plugin, new LoadConfig()); - this.registerCommand(plugin, new TimePersistence()); - - this.registerListener(plugin, new Bedsplode()); - this.registerCommand(plugin, new SpawnCow()); - this.registerCommand(plugin, new SpawnItem()); - this.registerCommand(plugin, new SpawnMagicPotato()); - this.registerCommand(plugin, new SetBlock()); - this.registerCommand(plugin, new SpawnParticle()); - this.registerCommand(plugin, new PlaySound()); - - this.addPage(plugin, new HelloPage()); - this.addPage(plugin, new DataPage()); - this.addPage(plugin, new PlayersOnlinePage(plugin)); - this.addPage(plugin, new LocationPage(plugin)); - this.addPage(plugin, new POSTPage(plugin)); - this.addPage(plugin, new JSONPage()); - } -} diff --git a/src/main/java/buttondevteam/presents/components/dictionary/copy/DictionaryComponent.java b/src/main/java/buttondevteam/presents/components/dictionary/copy/DictionaryComponent.java deleted file mode 100644 index f6b04c3..0000000 --- a/src/main/java/buttondevteam/presents/components/dictionary/copy/DictionaryComponent.java +++ /dev/null @@ -1,51 +0,0 @@ -package buttondevteam.presents.components.dictionary.copy; - -import org.bukkit.plugin.java.JavaPlugin; - -import buttondevteam.presents.architecture.Component; -import buttondevteam.presents.components.dictionary.commands.SendJSON; -import buttondevteam.presents.components.dictionary.commands.SendMessage; -import buttondevteam.presents.components.dictionary.config.LoadConfig; -import buttondevteam.presents.components.dictionary.config.SaveConfig; -import buttondevteam.presents.components.dictionary.config.TimePersistence; -import buttondevteam.presents.components.dictionary.effects.Bedsplode; -import buttondevteam.presents.components.dictionary.pages.DataPage; -import buttondevteam.presents.components.dictionary.pages.HelloPage; -import buttondevteam.presents.components.dictionary.pages.JSONPage; -import buttondevteam.presents.components.dictionary.pages.LocationPage; -import buttondevteam.presents.components.dictionary.pages.POSTPage; -import buttondevteam.presents.components.dictionary.pages.PlayersOnlinePage; -import buttondevteam.presents.components.dictionary.spawning.PlaySound; -import buttondevteam.presents.components.dictionary.spawning.SetBlock; -import buttondevteam.presents.components.dictionary.spawning.SpawnCow; -import buttondevteam.presents.components.dictionary.spawning.SpawnItem; -import buttondevteam.presents.components.dictionary.spawning.SpawnMagicPotato; -import buttondevteam.presents.components.dictionary.spawning.SpawnParticle; - -public class DictionaryComponent extends Component{ - - @Override - public void register(JavaPlugin plugin) { - - this.registerCommand(plugin, new SendMessage()); - this.registerCommand(plugin, new SendJSON()); - this.registerCommand(plugin, new SaveConfig()); - this.registerCommand(plugin, new LoadConfig()); - this.registerCommand(plugin, new TimePersistence()); - - this.registerListener(plugin, new Bedsplode()); - this.registerCommand(plugin, new SpawnCow()); - this.registerCommand(plugin, new SpawnItem()); - this.registerCommand(plugin, new SpawnMagicPotato()); - this.registerCommand(plugin, new SetBlock()); - this.registerCommand(plugin, new SpawnParticle()); - this.registerCommand(plugin, new PlaySound()); - - this.addPage(plugin, new HelloPage()); - this.addPage(plugin, new DataPage()); - this.addPage(plugin, new PlayersOnlinePage(plugin)); - this.addPage(plugin, new LocationPage(plugin)); - this.addPage(plugin, new POSTPage(plugin)); - this.addPage(plugin, new JSONPage()); - } -} diff --git a/src/main/java/buttondevteam/presents/components/dungeon/DungeonConfig.java b/src/main/java/buttondevteam/presents/components/dungeon/DungeonConfig.java new file mode 100644 index 0000000..1a2e8ab --- /dev/null +++ b/src/main/java/buttondevteam/presents/components/dungeon/DungeonConfig.java @@ -0,0 +1,30 @@ +package buttondevteam.presents.components.dungeon; + +import org.bukkit.configuration.file.FileConfiguration; + +public class DungeonConfig { + private FileConfiguration config; + + public enum SETTING { + NAME ("dungeon.name"), + OWNER ("dungeon.owner"), + SPAWN ("dungeon.spawn"), + STATE ("dungeon.state"), + CREATED("dungeon.created"); //creation date in miliseconds + + public String path; + private SETTING(String path){ + this.path = path; + } + } + public enum dungeonState { + INVALID, //something is wrong with the file + VALID + } + public DungeonConfig(FileConfiguration config){ + this.config = config; + } + public void set(SETTING setting, Object value){ + this.config.set(setting.path, value); + } +} diff --git a/src/main/java/buttondevteam/presents/components/dungeon/DungeonCreate.java b/src/main/java/buttondevteam/presents/components/dungeon/DungeonCreate.java index 34ec170..6d91c48 100644 --- a/src/main/java/buttondevteam/presents/components/dungeon/DungeonCreate.java +++ b/src/main/java/buttondevteam/presents/components/dungeon/DungeonCreate.java @@ -5,35 +5,40 @@ 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") public class DungeonCreate extends ModCommand{ @Override public boolean OnCommand(Player player, String alias, String[] args) { + //Creates a new dungeon if(args.length < 1) return false; String dungeonName = args[0]; - FileConfiguration config = this.getPlugin().getConfig(); + FileConfiguration plugin_config = this.getPlugin().getConfig(); - if (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; } - else{ - config.set("dungeon." + dungeonName, true); - config.set("dungeon." + dungeonName + ".owner", player.getName()); - config.set("dungeon." + dungeonName + ".spawn", player.getLocation().toString()); - config.set("dungeon." + dungeonName + ".created", System.currentTimeMillis()); - this.getPlugin().saveConfig(); - - assert(dungeonName == - this.getPlugin() - .getConfig() - .getString("dungeon." + dungeonName)); - - player.sendMessage("New dungeon named " + dungeonName + " created."); + + DungeonConfig config = new DungeonConfig(plugin_config); + + config.set(SETTING.NAME, true); + config.set(SETTING.OWNER, player.getName()); + config.set(SETTING.SPAWN, player.getLocation().toString()); + config.set(SETTING.CREATED, System.currentTimeMillis()); + + this.getPlugin().saveConfig(); + + if (this.getPlugin().getConfig().contains("dungeon." + dungeonName)){ + player.sendMessage("New dungeon named " + dungeonName + " saved."); + }else{ + player.sendMessage("Error in saving the dungeon " + dungeonName); + player.sendMessage("Current Config does not contain a path named dungeon." + dungeonName ); } return true; } diff --git a/src/main/java/buttondevteam/presents/components/research/ResearchComponent.java b/src/main/java/buttondevteam/presents/components/research/ResearchComponent.java index cf2202f..08a1d28 100644 --- a/src/main/java/buttondevteam/presents/components/research/ResearchComponent.java +++ b/src/main/java/buttondevteam/presents/components/research/ResearchComponent.java @@ -5,8 +5,8 @@ import org.bukkit.plugin.java.JavaPlugin; import buttondevteam.presents.architecture.Component; import buttondevteam.presents.components.research.questions.OverflowCrash; import buttondevteam.presents.components.research.questions.OverwhelmCrash; -import buttondevteam.presents.components.research.questions.PluginDataFolderInfo; import buttondevteam.presents.components.research.questions.PluginConfigInfo; +import buttondevteam.presents.components.research.questions.PluginDataFolderInfo; public class ResearchComponent extends Component { diff --git a/src/main/java/buttondevteam/presents/components/research/dictionary/DictionaryComponent.java b/src/main/java/buttondevteam/presents/components/research/dictionary/DictionaryComponent.java new file mode 100644 index 0000000..0fb7a16 --- /dev/null +++ b/src/main/java/buttondevteam/presents/components/research/dictionary/DictionaryComponent.java @@ -0,0 +1,51 @@ +package buttondevteam.presents.components.research.dictionary; + +import org.bukkit.plugin.java.JavaPlugin; + +import buttondevteam.presents.architecture.Component; +import buttondevteam.presents.components.research.dictionary.commands.SendJSON; +import buttondevteam.presents.components.research.dictionary.commands.SendMessage; +import buttondevteam.presents.components.research.dictionary.config.LoadConfig; +import buttondevteam.presents.components.research.dictionary.config.SaveConfig; +import buttondevteam.presents.components.research.dictionary.config.TimePersistence; +import buttondevteam.presents.components.research.dictionary.effects.Bedsplode; +import buttondevteam.presents.components.research.dictionary.pages.DataPage; +import buttondevteam.presents.components.research.dictionary.pages.HelloPage; +import buttondevteam.presents.components.research.dictionary.pages.JSONPage; +import buttondevteam.presents.components.research.dictionary.pages.LocationPage; +import buttondevteam.presents.components.research.dictionary.pages.POSTPage; +import buttondevteam.presents.components.research.dictionary.pages.PlayersOnlinePage; +import buttondevteam.presents.components.research.dictionary.spawning.PlaySound; +import buttondevteam.presents.components.research.dictionary.spawning.SetBlock; +import buttondevteam.presents.components.research.dictionary.spawning.SpawnCow; +import buttondevteam.presents.components.research.dictionary.spawning.SpawnItem; +import buttondevteam.presents.components.research.dictionary.spawning.SpawnMagicPotato; +import buttondevteam.presents.components.research.dictionary.spawning.SpawnParticle; + +public class DictionaryComponent extends Component{ + + @Override + public void register(JavaPlugin plugin) { + + this.registerCommand(plugin, new SendMessage()); + this.registerCommand(plugin, new SendJSON()); + this.registerCommand(plugin, new SaveConfig()); + this.registerCommand(plugin, new LoadConfig()); + this.registerCommand(plugin, new TimePersistence()); + + this.registerListener(plugin, new Bedsplode()); + this.registerCommand(plugin, new SpawnCow()); + this.registerCommand(plugin, new SpawnItem()); + this.registerCommand(plugin, new SpawnMagicPotato()); + this.registerCommand(plugin, new SetBlock()); + this.registerCommand(plugin, new SpawnParticle()); + this.registerCommand(plugin, new PlaySound()); + + this.addPage(plugin, new HelloPage()); + this.addPage(plugin, new DataPage()); + this.addPage(plugin, new PlayersOnlinePage(plugin)); + this.addPage(plugin, new LocationPage(plugin)); + this.addPage(plugin, new POSTPage(plugin)); + this.addPage(plugin, new JSONPage()); + } +} diff --git a/src/main/java/buttondevteam/presents/components/dictionary/commands/SendJSON.java b/src/main/java/buttondevteam/presents/components/research/dictionary/commands/SendJSON.java similarity index 90% rename from src/main/java/buttondevteam/presents/components/dictionary/commands/SendJSON.java rename to src/main/java/buttondevteam/presents/components/research/dictionary/commands/SendJSON.java index 75e71f8..8f19e34 100644 --- a/src/main/java/buttondevteam/presents/components/dictionary/commands/SendJSON.java +++ b/src/main/java/buttondevteam/presents/components/research/dictionary/commands/SendJSON.java @@ -1,4 +1,4 @@ -package buttondevteam.presents.components.dictionary.commands; +package buttondevteam.presents.components.research.dictionary.commands; import org.bukkit.entity.Player; diff --git a/src/main/java/buttondevteam/presents/components/dictionary/commands/SendMessage.java b/src/main/java/buttondevteam/presents/components/research/dictionary/commands/SendMessage.java similarity index 85% rename from src/main/java/buttondevteam/presents/components/dictionary/commands/SendMessage.java rename to src/main/java/buttondevteam/presents/components/research/dictionary/commands/SendMessage.java index b552de5..4be28e6 100644 --- a/src/main/java/buttondevteam/presents/components/dictionary/commands/SendMessage.java +++ b/src/main/java/buttondevteam/presents/components/research/dictionary/commands/SendMessage.java @@ -1,4 +1,4 @@ -package buttondevteam.presents.components.dictionary.commands; +package buttondevteam.presents.components.research.dictionary.commands; import org.bukkit.command.CommandSender; diff --git a/src/main/java/buttondevteam/presents/components/dictionary/config/LoadConfig.java b/src/main/java/buttondevteam/presents/components/research/dictionary/config/LoadConfig.java similarity index 90% rename from src/main/java/buttondevteam/presents/components/dictionary/config/LoadConfig.java rename to src/main/java/buttondevteam/presents/components/research/dictionary/config/LoadConfig.java index e168e51..7011c43 100644 --- a/src/main/java/buttondevteam/presents/components/dictionary/config/LoadConfig.java +++ b/src/main/java/buttondevteam/presents/components/research/dictionary/config/LoadConfig.java @@ -1,4 +1,4 @@ -package buttondevteam.presents.components.dictionary.config; +package buttondevteam.presents.components.research.dictionary.config; diff --git a/src/main/java/buttondevteam/presents/components/dictionary/config/SaveConfig.java b/src/main/java/buttondevteam/presents/components/research/dictionary/config/SaveConfig.java similarity index 91% rename from src/main/java/buttondevteam/presents/components/dictionary/config/SaveConfig.java rename to src/main/java/buttondevteam/presents/components/research/dictionary/config/SaveConfig.java index 00a9ef0..6dd4401 100644 --- a/src/main/java/buttondevteam/presents/components/dictionary/config/SaveConfig.java +++ b/src/main/java/buttondevteam/presents/components/research/dictionary/config/SaveConfig.java @@ -1,4 +1,4 @@ -package buttondevteam.presents.components.dictionary.config; +package buttondevteam.presents.components.research.dictionary.config; import java.util.Arrays; diff --git a/src/main/java/buttondevteam/presents/components/dictionary/config/TimePersistence.java b/src/main/java/buttondevteam/presents/components/research/dictionary/config/TimePersistence.java similarity index 94% rename from src/main/java/buttondevteam/presents/components/dictionary/config/TimePersistence.java rename to src/main/java/buttondevteam/presents/components/research/dictionary/config/TimePersistence.java index 99064ee..81a1603 100644 --- a/src/main/java/buttondevteam/presents/components/dictionary/config/TimePersistence.java +++ b/src/main/java/buttondevteam/presents/components/research/dictionary/config/TimePersistence.java @@ -1,4 +1,4 @@ -package buttondevteam.presents.components.dictionary.config; +package buttondevteam.presents.components.research.dictionary.config; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/src/main/java/buttondevteam/presents/components/dictionary/effects/Bedsplode.java b/src/main/java/buttondevteam/presents/components/research/dictionary/effects/Bedsplode.java similarity index 91% rename from src/main/java/buttondevteam/presents/components/dictionary/effects/Bedsplode.java rename to src/main/java/buttondevteam/presents/components/research/dictionary/effects/Bedsplode.java index 34a85ec..8b5a301 100644 --- a/src/main/java/buttondevteam/presents/components/dictionary/effects/Bedsplode.java +++ b/src/main/java/buttondevteam/presents/components/research/dictionary/effects/Bedsplode.java @@ -1,4 +1,4 @@ -package buttondevteam.presents.components.dictionary.effects; +package buttondevteam.presents.components.research.dictionary.effects; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/src/main/java/buttondevteam/presents/components/dictionary/pages/DataPage.java b/src/main/java/buttondevteam/presents/components/research/dictionary/pages/DataPage.java similarity index 86% rename from src/main/java/buttondevteam/presents/components/dictionary/pages/DataPage.java rename to src/main/java/buttondevteam/presents/components/research/dictionary/pages/DataPage.java index 2925b07..3fa50e0 100644 --- a/src/main/java/buttondevteam/presents/components/dictionary/pages/DataPage.java +++ b/src/main/java/buttondevteam/presents/components/research/dictionary/pages/DataPage.java @@ -1,4 +1,4 @@ -package buttondevteam.presents.components.dictionary.pages; +package buttondevteam.presents.components.research.dictionary.pages; import com.sun.net.httpserver.HttpExchange; diff --git a/src/main/java/buttondevteam/presents/components/dictionary/pages/HelloPage.java b/src/main/java/buttondevteam/presents/components/research/dictionary/pages/HelloPage.java similarity index 84% rename from src/main/java/buttondevteam/presents/components/dictionary/pages/HelloPage.java rename to src/main/java/buttondevteam/presents/components/research/dictionary/pages/HelloPage.java index f4bf12f..cc6cbdc 100644 --- a/src/main/java/buttondevteam/presents/components/dictionary/pages/HelloPage.java +++ b/src/main/java/buttondevteam/presents/components/research/dictionary/pages/HelloPage.java @@ -1,4 +1,4 @@ -package buttondevteam.presents.components.dictionary.pages; +package buttondevteam.presents.components.research.dictionary.pages; import com.sun.net.httpserver.HttpExchange; diff --git a/src/main/java/buttondevteam/presents/components/dictionary/pages/JSONPage.java b/src/main/java/buttondevteam/presents/components/research/dictionary/pages/JSONPage.java similarity index 91% rename from src/main/java/buttondevteam/presents/components/dictionary/pages/JSONPage.java rename to src/main/java/buttondevteam/presents/components/research/dictionary/pages/JSONPage.java index 71e220e..ccbc6f2 100644 --- a/src/main/java/buttondevteam/presents/components/dictionary/pages/JSONPage.java +++ b/src/main/java/buttondevteam/presents/components/research/dictionary/pages/JSONPage.java @@ -1,4 +1,4 @@ -package buttondevteam.presents.components.dictionary.pages; +package buttondevteam.presents.components.research.dictionary.pages; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/src/main/java/buttondevteam/presents/components/dictionary/pages/LocationPage.java b/src/main/java/buttondevteam/presents/components/research/dictionary/pages/LocationPage.java similarity index 94% rename from src/main/java/buttondevteam/presents/components/dictionary/pages/LocationPage.java rename to src/main/java/buttondevteam/presents/components/research/dictionary/pages/LocationPage.java index 38c229c..21b1a18 100644 --- a/src/main/java/buttondevteam/presents/components/dictionary/pages/LocationPage.java +++ b/src/main/java/buttondevteam/presents/components/research/dictionary/pages/LocationPage.java @@ -1,4 +1,4 @@ -package buttondevteam.presents.components.dictionary.pages; +package buttondevteam.presents.components.research.dictionary.pages; import org.bukkit.Location; import org.bukkit.entity.Player; diff --git a/src/main/java/buttondevteam/presents/components/dictionary/pages/POSTPage.java b/src/main/java/buttondevteam/presents/components/research/dictionary/pages/POSTPage.java similarity index 93% rename from src/main/java/buttondevteam/presents/components/dictionary/pages/POSTPage.java rename to src/main/java/buttondevteam/presents/components/research/dictionary/pages/POSTPage.java index f07e262..868f031 100644 --- a/src/main/java/buttondevteam/presents/components/dictionary/pages/POSTPage.java +++ b/src/main/java/buttondevteam/presents/components/research/dictionary/pages/POSTPage.java @@ -1,4 +1,4 @@ -package buttondevteam.presents.components.dictionary.pages; +package buttondevteam.presents.components.research.dictionary.pages; import java.io.IOException; diff --git a/src/main/java/buttondevteam/presents/components/dictionary/pages/PlayersOnlinePage.java b/src/main/java/buttondevteam/presents/components/research/dictionary/pages/PlayersOnlinePage.java similarity index 92% rename from src/main/java/buttondevteam/presents/components/dictionary/pages/PlayersOnlinePage.java rename to src/main/java/buttondevteam/presents/components/research/dictionary/pages/PlayersOnlinePage.java index ac4cecf..68e51db 100644 --- a/src/main/java/buttondevteam/presents/components/dictionary/pages/PlayersOnlinePage.java +++ b/src/main/java/buttondevteam/presents/components/research/dictionary/pages/PlayersOnlinePage.java @@ -1,4 +1,4 @@ -package buttondevteam.presents.components.dictionary.pages; +package buttondevteam.presents.components.research.dictionary.pages; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; diff --git a/src/main/java/buttondevteam/presents/components/dictionary/spawning/PlaySound.java b/src/main/java/buttondevteam/presents/components/research/dictionary/spawning/PlaySound.java similarity index 93% rename from src/main/java/buttondevteam/presents/components/dictionary/spawning/PlaySound.java rename to src/main/java/buttondevteam/presents/components/research/dictionary/spawning/PlaySound.java index 2fa28fe..bbcd661 100644 --- a/src/main/java/buttondevteam/presents/components/dictionary/spawning/PlaySound.java +++ b/src/main/java/buttondevteam/presents/components/research/dictionary/spawning/PlaySound.java @@ -1,4 +1,4 @@ -package buttondevteam.presents.components.dictionary.spawning; +package buttondevteam.presents.components.research.dictionary.spawning; import org.bukkit.Sound; import org.bukkit.entity.Player; diff --git a/src/main/java/buttondevteam/presents/components/dictionary/spawning/SetBlock.java b/src/main/java/buttondevteam/presents/components/research/dictionary/spawning/SetBlock.java similarity index 88% rename from src/main/java/buttondevteam/presents/components/dictionary/spawning/SetBlock.java rename to src/main/java/buttondevteam/presents/components/research/dictionary/spawning/SetBlock.java index 5aa1999..9491740 100644 --- a/src/main/java/buttondevteam/presents/components/dictionary/spawning/SetBlock.java +++ b/src/main/java/buttondevteam/presents/components/research/dictionary/spawning/SetBlock.java @@ -1,4 +1,4 @@ -package buttondevteam.presents.components.dictionary.spawning; +package buttondevteam.presents.components.research.dictionary.spawning; import org.bukkit.Material; import org.bukkit.block.Block; diff --git a/src/main/java/buttondevteam/presents/components/dictionary/spawning/SpawnCow.java b/src/main/java/buttondevteam/presents/components/research/dictionary/spawning/SpawnCow.java similarity index 86% rename from src/main/java/buttondevteam/presents/components/dictionary/spawning/SpawnCow.java rename to src/main/java/buttondevteam/presents/components/research/dictionary/spawning/SpawnCow.java index 0e01fb7..11b9487 100644 --- a/src/main/java/buttondevteam/presents/components/dictionary/spawning/SpawnCow.java +++ b/src/main/java/buttondevteam/presents/components/research/dictionary/spawning/SpawnCow.java @@ -1,4 +1,4 @@ -package buttondevteam.presents.components.dictionary.spawning; +package buttondevteam.presents.components.research.dictionary.spawning; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; diff --git a/src/main/java/buttondevteam/presents/components/dictionary/spawning/SpawnItem.java b/src/main/java/buttondevteam/presents/components/research/dictionary/spawning/SpawnItem.java similarity index 87% rename from src/main/java/buttondevteam/presents/components/dictionary/spawning/SpawnItem.java rename to src/main/java/buttondevteam/presents/components/research/dictionary/spawning/SpawnItem.java index 8a19ac8..c99fd9d 100644 --- a/src/main/java/buttondevteam/presents/components/dictionary/spawning/SpawnItem.java +++ b/src/main/java/buttondevteam/presents/components/research/dictionary/spawning/SpawnItem.java @@ -1,4 +1,4 @@ -package buttondevteam.presents.components.dictionary.spawning; +package buttondevteam.presents.components.research.dictionary.spawning; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/buttondevteam/presents/components/dictionary/spawning/SpawnMagicPotato.java b/src/main/java/buttondevteam/presents/components/research/dictionary/spawning/SpawnMagicPotato.java similarity index 94% rename from src/main/java/buttondevteam/presents/components/dictionary/spawning/SpawnMagicPotato.java rename to src/main/java/buttondevteam/presents/components/research/dictionary/spawning/SpawnMagicPotato.java index 470336f..1ba8727 100644 --- a/src/main/java/buttondevteam/presents/components/dictionary/spawning/SpawnMagicPotato.java +++ b/src/main/java/buttondevteam/presents/components/research/dictionary/spawning/SpawnMagicPotato.java @@ -1,4 +1,4 @@ -package buttondevteam.presents.components.dictionary.spawning; +package buttondevteam.presents.components.research.dictionary.spawning; import java.util.ArrayList; diff --git a/src/main/java/buttondevteam/presents/components/dictionary/spawning/SpawnParticle.java b/src/main/java/buttondevteam/presents/components/research/dictionary/spawning/SpawnParticle.java similarity index 86% rename from src/main/java/buttondevteam/presents/components/dictionary/spawning/SpawnParticle.java rename to src/main/java/buttondevteam/presents/components/research/dictionary/spawning/SpawnParticle.java index e27030c..e0fd25b 100644 --- a/src/main/java/buttondevteam/presents/components/dictionary/spawning/SpawnParticle.java +++ b/src/main/java/buttondevteam/presents/components/research/dictionary/spawning/SpawnParticle.java @@ -1,4 +1,4 @@ -package buttondevteam.presents.components.dictionary.spawning; +package buttondevteam.presents.components.research.dictionary.spawning; import org.bukkit.Particle; import org.bukkit.entity.Player; 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 732ef3f..790ea66 100644 --- a/src/main/java/buttondevteam/presents/components/research/questions/OverflowCrash.java +++ b/src/main/java/buttondevteam/presents/components/research/questions/OverflowCrash.java @@ -23,12 +23,12 @@ public class OverflowCrash extends Question { @Override public boolean OnCommand(Player player, String alias, String[] args) { // TODO Auto-generated method stub - player.sendMessage(question()); String overflowMessage = ""; 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); + player.sendMessage(question()); player.sendMessage(answer()); return false; } 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 3534926..323be59 100644 --- a/src/main/java/buttondevteam/presents/components/research/questions/OverwhelmCrash.java +++ b/src/main/java/buttondevteam/presents/components/research/questions/OverwhelmCrash.java @@ -23,10 +23,10 @@ public class OverwhelmCrash extends Question { @Override public boolean OnCommand(Player player, String alias, String[] args) { // TODO Auto-generated method stub - player.sendMessage(question()); for (int x = 0; x < 500; x++){ player.sendMessage("Hello World Motherfucker!"); } + player.sendMessage(question()); player.sendMessage(answer()); return false; } 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 4b57f94..5d28188 100644 --- a/src/main/java/buttondevteam/presents/components/research/questions/PluginConfigInfo.java +++ b/src/main/java/buttondevteam/presents/components/research/questions/PluginConfigInfo.java @@ -27,22 +27,47 @@ public class PluginConfigInfo extends Question { player.sendMessage("---Plugin's Config Information---"); FileConfiguration config = this.getPlugin().getConfig(); - player.sendMessage("Name:"); - player.sendMessage(" - " + config.getName()); + if (args.length >= 1){ + switch(args[0].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; - player.sendMessage("Current Path:"); - player.sendMessage(" - " + config.getCurrentPath()); + 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"); + } - player.sendMessage("Name of Root:"); - player.sendMessage(" - " + config.getRoot().getName()); - - //player.sendMessage("Path of Root:"); - //player.sendMessage(" - " + config.getRoot().getCurrentPath()); - - //player.sendMessage("Keys of Root (Deep = true)"); - //player.sendMessage(" - " + config.getRoot().getKeys(true).toString()); - - player.sendMessage("[A]:" + this.answer()); return false; } diff --git a/src/main/java/buttondevteam/presents/components/spawn/ChooseColor.java b/src/main/java/buttondevteam/presents/components/spawn/ChooseColor.java index 9fc2d2f..0512322 100644 --- a/src/main/java/buttondevteam/presents/components/spawn/ChooseColor.java +++ b/src/main/java/buttondevteam/presents/components/spawn/ChooseColor.java @@ -1,37 +1,34 @@ package buttondevteam.presents.components.spawn; -import org.bukkit.Server; -import org.bukkit.command.BlockCommandSender; -import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import buttondevteam.lib.chat.CommandClass; -import buttondevteam.presents.architecture.commands.UniversalCommand; +import buttondevteam.presents.architecture.commands.PlayerCommand; -@CommandClass(modOnly = false, path="spawn choosecolor") -public class ChooseColor extends UniversalCommand { +@CommandClass(modOnly = true, path="spawn choosecolor") +public class ChooseColor extends PlayerCommand { @Override - public boolean OnCommand(CommandSender sender, String alias, String[] args) { - if (!(sender instanceof BlockCommandSender)){ - sender.sendMessage("You must be a command block to use this command!"); - return false; - } + public boolean OnCommand(Player player, String alias, String[] args) { +// //Code to make it so that command blocks can fire this command +// +// if (!(sender instanceof BlockCommandSender)){ +// sender.sendMessage("You must be a command block to use this command!"); +// return false; +// } +// +// Server server = sender.getServer(); +// server.broadcastMessage("Arg 0:" + args[0]); +// server.broadcastMessage("Arg 1:" + args[1]); - Server server = sender.getServer(); - server.broadcastMessage("Arg 0:" + args[0]); - server.broadcastMessage("Arg 1:" + args[1]); - Player player = server.getPlayer(args[0]); - if (player != null){ - player.sendMessage("Attempting to change your name "+player.getName()+" to the color..."); - player.sendMessage(args[1]); - player.sendMessage("Your new name: " +player.getName()); - }else{ - server.broadcastMessage("Error: Player is null"); - } + player.sendMessage("Attempting to change your name "+player.getName()+" to the color..."+args[1]); + + //TODO:INSERT NAME CHANGING CODE HERE + + + player.sendMessage("Your new name: " +player.getName()); - server.broadcastMessage("ENDOFCOMMAND"); return true; } diff --git a/src/main/java/buttondevteam/presents/components/spawn/SpawnComponent.java b/src/main/java/buttondevteam/presents/components/spawn/SpawnComponent.java index 6533739..69793bd 100644 --- a/src/main/java/buttondevteam/presents/components/spawn/SpawnComponent.java +++ b/src/main/java/buttondevteam/presents/components/spawn/SpawnComponent.java @@ -5,7 +5,7 @@ import org.bukkit.plugin.java.JavaPlugin; import buttondevteam.presents.architecture.Component; public class SpawnComponent extends Component{ - + @Override public void register(JavaPlugin plugin) { this.registerCommand(plugin, new ChooseColor()); diff --git a/target/classes/plugin.yml b/target/classes/plugin.yml index 106b62a..77ab901 100644 --- a/target/classes/plugin.yml +++ b/target/classes/plugin.yml @@ -1,4 +1,4 @@ -main: buttondevteam.presents.Main +main: buttondevteam.presents.ButtonPresents name: ButtonPresents version: 0.0.1