From 872e1c8ac7fcb8b338fc19891dfa680f2865e7d6 Mon Sep 17 00:00:00 2001 From: alisolarflare Date: Sat, 17 Dec 2016 00:14:52 -0500 Subject: [PATCH] Adjusted commands to reduce plugin.yml --- plugin.yml | 86 ++++--------------- .../alipresents/AliPresents.java | 4 +- .../bankchest/BankChestComponent.java | 15 ---- .../bankchest/BankChestListener.java | 6 -- .../components/bankchest/CreateBankChest.java | 15 ---- .../creativeboundaries/commands/Cbgm0.java | 4 + .../creativeboundaries/commands/Cbgm1.java | 4 + .../commands/SetForceBoundaries.java | 5 ++ .../letterdyes/GetLetterDye.java | 4 + .../flaircolouring/portals/FlairMe.java | 4 + .../{gpowers => gpower}/GPowerComponent.java | 10 +-- .../{gpowers => gpower}/PoweredPlayer.java | 2 +- .../{gpowers => gpower}/api/GPowerAPI.java | 4 +- .../{gpowers => gpower}/commands/GPower.java | 13 ++- .../enchant/EnchantingLoop.java | 4 +- .../powerstate/PowerAll.java | 4 +- .../powerstate/PowerDown.java | 4 +- .../powerstate/PowerUp.java | 4 +- .../components/insurance/getInsurance.java | 5 ++ .../components/insurance/getInsuranceBar.java | 5 ++ .../insurance/getInsuranceBlock.java | 4 + .../insurance/getInsuranceNugget.java | 4 + .../metrics/output/GetLoginMetrics.java | 5 ++ 23 files changed, 86 insertions(+), 129 deletions(-) delete mode 100644 src/buttondevteam/alipresents/components/bankchest/BankChestComponent.java delete mode 100644 src/buttondevteam/alipresents/components/bankchest/BankChestListener.java delete mode 100644 src/buttondevteam/alipresents/components/bankchest/CreateBankChest.java rename src/buttondevteam/alipresents/components/{gpowers => gpower}/GPowerComponent.java (53%) rename src/buttondevteam/alipresents/components/{gpowers => gpower}/PoweredPlayer.java (88%) rename src/buttondevteam/alipresents/components/{gpowers => gpower}/api/GPowerAPI.java (94%) rename src/buttondevteam/alipresents/components/{gpowers => gpower}/commands/GPower.java (88%) rename src/buttondevteam/alipresents/components/{gpowers => gpower}/enchant/EnchantingLoop.java (79%) rename src/buttondevteam/alipresents/components/{gpowers => gpower}/powerstate/PowerAll.java (76%) rename src/buttondevteam/alipresents/components/{gpowers => gpower}/powerstate/PowerDown.java (73%) rename src/buttondevteam/alipresents/components/{gpowers => gpower}/powerstate/PowerUp.java (74%) diff --git a/plugin.yml b/plugin.yml index f2f172d..33b77f6 100644 --- a/plugin.yml +++ b/plugin.yml @@ -3,71 +3,23 @@ name: AliPresents version: 2.0.2 commands: - flairme: - description: Activates the Flair Me Command. Ask Ali - she was tired when writing this description - gpower: - description: Testing command for ghostie powers - powerup: - description: Official g-power command that activates the ghostie powerups - powerdown: - description: Offical g-power command that deactivates the ghostie powerups alilink: - description: Arguments - press or set - cbgm0: - description: Creative Boundaries Gamemode 0 - allows players to return to survival - cbgm1: - description: Creative Boundaries Gamemode 1 - allows players to access creative within their towns. Creative is removed outside of towns so be careful - setforceboundaries: - description: Should players automatically return to creative when outside town borders? Dickmode says yes. - joinminigame: - description: Join a Button Minigame - leaveminigame: - description: Leave a button minigame - listfighters: - description: List all fighters currently in a button minigame - setcolourspawn: - description: sets the spawn points for each colour in a button minigame - setmatchstate: - description: sets the current state of the ultrahardcore game. - addtouhc: - description: Adds a player to the UltraHardcore match - joinuhc: - description: This command allows you to join an UltraHardcore match - configurematch: - description: Configures an UltraHardcore match - schedulematch: - description: Schedules an UltraHardcore match - startmatch: - description: Starts an UltraHardcore match - spreadplayers: - description: Admin command that spreads players around an ultrahardcore match - teleporttouhc: - description: Teleports you to the ultrahardcore match - setuhclobby: - description: Sets the area where a uhc will take place - activatepowers: - description: Admin command that activates gpowers on a uhc - setworldborders: - description: sets the worldborders to a uhc match - startuhc: - description: starts an ultrahardcore match - starttimer: - description: starts an ultrahardcore timer - powerall: - description: activate every player's power - setproximitylocation: - description: sets one of two proximity blocks to create a space that players can change their flairs with using flairportals. Ask ali XD - getloginmetrics: - description: Gets metrics - getinsurance: - description: Gets insurance - getinsurancenugget: - description: Gets insurance nugget - getinsurancebar: - description: Gets insurance bar - getinsuranceblock: - description: Gets insurance block - createbankchest: - description: Creates a Bank Chest - getletterdye: - description: Creates Letter Dye \ No newline at end of file + description: creates wireless redstone + cashmob: + description: creates mobs + cb: + description: creates creative boundaries + debug: + description: debug commands + flaircolouring: + description: flaaairs + fruit: + description: fruits + gpower: + description: powerssss + insurance: + description: item block insurance + magic: + description: magic + metrics: + description: metrics system \ No newline at end of file diff --git a/src/buttondevteam/alipresents/AliPresents.java b/src/buttondevteam/alipresents/AliPresents.java index a7a7820..6092cf5 100644 --- a/src/buttondevteam/alipresents/AliPresents.java +++ b/src/buttondevteam/alipresents/AliPresents.java @@ -7,12 +7,11 @@ import org.bukkit.plugin.PluginDescriptionFile; import org.bukkit.plugin.java.JavaPlugin; import buttondevteam.alipresents.components.alilinks.AliLinkComponent; -import buttondevteam.alipresents.components.bankchest.BankChestComponent; import buttondevteam.alipresents.components.cashmob.CashMobComponent; import buttondevteam.alipresents.components.creativeboundaries.CreativeBoundariesComponent; import buttondevteam.alipresents.components.flaircolouring.FlairColouringComponent; import buttondevteam.alipresents.components.fruit.FruitComponent; -import buttondevteam.alipresents.components.gpowers.GPowerComponent; +import buttondevteam.alipresents.components.gpower.GPowerComponent; import buttondevteam.alipresents.components.insurance.InsuranceComponent; import buttondevteam.alipresents.components.magic.MagicComponent; import buttondevteam.alipresents.components.spawn.SpawnComponent; @@ -26,7 +25,6 @@ public class AliPresents extends JavaPlugin{ new AliLinkComponent().register(this); - new BankChestComponent().register(this); new CashMobComponent().register(this); new CreativeBoundariesComponent().register(this); new FlairColouringComponent().register(this); diff --git a/src/buttondevteam/alipresents/components/bankchest/BankChestComponent.java b/src/buttondevteam/alipresents/components/bankchest/BankChestComponent.java deleted file mode 100644 index a0fe761..0000000 --- a/src/buttondevteam/alipresents/components/bankchest/BankChestComponent.java +++ /dev/null @@ -1,15 +0,0 @@ -package buttondevteam.alipresents.components.bankchest; - -import org.bukkit.plugin.java.JavaPlugin; - -import buttondevteam.alipresents.architecture.Component; - -public class BankChestComponent extends Component { - - @Override - public void register(JavaPlugin plugin) { - registerCommand(plugin, new CreateBankChest()); - registerListener(plugin, new BankChestListener()); - } - -} diff --git a/src/buttondevteam/alipresents/components/bankchest/BankChestListener.java b/src/buttondevteam/alipresents/components/bankchest/BankChestListener.java deleted file mode 100644 index b13dbba..0000000 --- a/src/buttondevteam/alipresents/components/bankchest/BankChestListener.java +++ /dev/null @@ -1,6 +0,0 @@ -package buttondevteam.alipresents.components.bankchest; - -import org.bukkit.event.Listener; - -public class BankChestListener implements Listener { -} diff --git a/src/buttondevteam/alipresents/components/bankchest/CreateBankChest.java b/src/buttondevteam/alipresents/components/bankchest/CreateBankChest.java deleted file mode 100644 index 6af2665..0000000 --- a/src/buttondevteam/alipresents/components/bankchest/CreateBankChest.java +++ /dev/null @@ -1,15 +0,0 @@ -package buttondevteam.alipresents.components.bankchest; - -import org.bukkit.entity.Player; - -import buttondevteam.alipresents.architecture.commands.ModCommand; - -public class CreateBankChest extends ModCommand { - - @Override - public boolean OnCommand(Player player, String alias, String[] args) { - // TODO Auto-generated method stub - return false; - } - -} diff --git a/src/buttondevteam/alipresents/components/creativeboundaries/commands/Cbgm0.java b/src/buttondevteam/alipresents/components/creativeboundaries/commands/Cbgm0.java index 17d6dda..2d026df 100644 --- a/src/buttondevteam/alipresents/components/creativeboundaries/commands/Cbgm0.java +++ b/src/buttondevteam/alipresents/components/creativeboundaries/commands/Cbgm0.java @@ -6,6 +6,10 @@ import buttondevteam.alipresents.architecture.commands.PlayerCommand; import buttondevteam.alipresents.components.creativeboundaries.CreativeBoundariesAPI; public class Cbgm0 extends PlayerCommand{ + @Override + public String GetCommandPath() { + return "cb gm1"; + } @Override public boolean OnCommand(Player player, String arg2, String[] arg3) { CreativeBoundariesAPI.toSurvival(player); diff --git a/src/buttondevteam/alipresents/components/creativeboundaries/commands/Cbgm1.java b/src/buttondevteam/alipresents/components/creativeboundaries/commands/Cbgm1.java index 9266a52..aa78055 100644 --- a/src/buttondevteam/alipresents/components/creativeboundaries/commands/Cbgm1.java +++ b/src/buttondevteam/alipresents/components/creativeboundaries/commands/Cbgm1.java @@ -6,6 +6,10 @@ import buttondevteam.alipresents.architecture.commands.PlayerCommand; import buttondevteam.alipresents.components.creativeboundaries.CreativeBoundariesAPI; public class Cbgm1 extends PlayerCommand { + @Override + public String GetCommandPath() { + return "cb gm0"; + } @Override public boolean OnCommand(Player player, String arg2, String[] arg3) { return CreativeBoundariesAPI.toCreative(player); diff --git a/src/buttondevteam/alipresents/components/creativeboundaries/commands/SetForceBoundaries.java b/src/buttondevteam/alipresents/components/creativeboundaries/commands/SetForceBoundaries.java index 22d2c98..ebc527f 100644 --- a/src/buttondevteam/alipresents/components/creativeboundaries/commands/SetForceBoundaries.java +++ b/src/buttondevteam/alipresents/components/creativeboundaries/commands/SetForceBoundaries.java @@ -6,6 +6,11 @@ import buttondevteam.alipresents.architecture.commands.ModCommand; import buttondevteam.alipresents.components.creativeboundaries.CreativeBoundariesAPI; public class SetForceBoundaries extends ModCommand{ + + @Override + public String GetCommandPath() { + return "cb set forceboundaries"; + } @Override public boolean OnCommand(Player player, String label, String[] args) { return (CreativeBoundariesAPI.setForceBoundaries(player, args)); diff --git a/src/buttondevteam/alipresents/components/flaircolouring/letterdyes/GetLetterDye.java b/src/buttondevteam/alipresents/components/flaircolouring/letterdyes/GetLetterDye.java index efe7fa5..e88153b 100644 --- a/src/buttondevteam/alipresents/components/flaircolouring/letterdyes/GetLetterDye.java +++ b/src/buttondevteam/alipresents/components/flaircolouring/letterdyes/GetLetterDye.java @@ -5,6 +5,10 @@ import org.bukkit.entity.Player; import buttondevteam.alipresents.architecture.commands.PlayerCommand; public class GetLetterDye extends PlayerCommand{ + @Override + public String GetCommandPath() { + return "flaircolour getletterdye"; + } @Override public boolean OnCommand(Player player, String alias, String[] args) { player.getInventory().addItem(LetterDye.getLetterDye()); diff --git a/src/buttondevteam/alipresents/components/flaircolouring/portals/FlairMe.java b/src/buttondevteam/alipresents/components/flaircolouring/portals/FlairMe.java index 6595949..e14ddb8 100644 --- a/src/buttondevteam/alipresents/components/flaircolouring/portals/FlairMe.java +++ b/src/buttondevteam/alipresents/components/flaircolouring/portals/FlairMe.java @@ -6,6 +6,10 @@ import buttondevteam.alipresents.architecture.commands.PlayerCommand; import buttondevteam.alipresents.components.flaircolouring.FlairColouringComponent; public class FlairMe extends PlayerCommand { + @Override + public String GetCommandPath() { + return "flaircolouring flairme"; + } private FlairColouringComponent component; public FlairMe(FlairColouringComponent flairDoorComponent) { diff --git a/src/buttondevteam/alipresents/components/gpowers/GPowerComponent.java b/src/buttondevteam/alipresents/components/gpower/GPowerComponent.java similarity index 53% rename from src/buttondevteam/alipresents/components/gpowers/GPowerComponent.java rename to src/buttondevteam/alipresents/components/gpower/GPowerComponent.java index 9e9ce33..295cc6b 100644 --- a/src/buttondevteam/alipresents/components/gpowers/GPowerComponent.java +++ b/src/buttondevteam/alipresents/components/gpower/GPowerComponent.java @@ -1,12 +1,12 @@ -package buttondevteam.alipresents.components.gpowers; +package buttondevteam.alipresents.components.gpower; import org.bukkit.plugin.java.JavaPlugin; import buttondevteam.alipresents.architecture.Component; -import buttondevteam.alipresents.components.gpowers.commands.GPower; -import buttondevteam.alipresents.components.gpowers.enchant.EnchantingLoop; -import buttondevteam.alipresents.components.gpowers.powerstate.PowerDown; -import buttondevteam.alipresents.components.gpowers.powerstate.PowerUp; +import buttondevteam.alipresents.components.gpower.commands.GPower; +import buttondevteam.alipresents.components.gpower.enchant.EnchantingLoop; +import buttondevteam.alipresents.components.gpower.powerstate.PowerDown; +import buttondevteam.alipresents.components.gpower.powerstate.PowerUp; public class GPowerComponent extends Component { diff --git a/src/buttondevteam/alipresents/components/gpowers/PoweredPlayer.java b/src/buttondevteam/alipresents/components/gpower/PoweredPlayer.java similarity index 88% rename from src/buttondevteam/alipresents/components/gpowers/PoweredPlayer.java rename to src/buttondevteam/alipresents/components/gpower/PoweredPlayer.java index 7e33220..8915b13 100644 --- a/src/buttondevteam/alipresents/components/gpowers/PoweredPlayer.java +++ b/src/buttondevteam/alipresents/components/gpower/PoweredPlayer.java @@ -1,4 +1,4 @@ -package buttondevteam.alipresents.components.gpowers; +package buttondevteam.alipresents.components.gpower; import java.util.UUID; diff --git a/src/buttondevteam/alipresents/components/gpowers/api/GPowerAPI.java b/src/buttondevteam/alipresents/components/gpower/api/GPowerAPI.java similarity index 94% rename from src/buttondevteam/alipresents/components/gpowers/api/GPowerAPI.java rename to src/buttondevteam/alipresents/components/gpower/api/GPowerAPI.java index 76ccfa9..3596613 100644 --- a/src/buttondevteam/alipresents/components/gpowers/api/GPowerAPI.java +++ b/src/buttondevteam/alipresents/components/gpower/api/GPowerAPI.java @@ -1,4 +1,4 @@ -package buttondevteam.alipresents.components.gpowers.api; +package buttondevteam.alipresents.components.gpower.api; import java.util.HashMap; import java.util.Map; @@ -9,7 +9,7 @@ import org.bukkit.entity.Player; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; -import buttondevteam.alipresents.components.gpowers.PoweredPlayer; +import buttondevteam.alipresents.components.gpower.PoweredPlayer; public class GPowerAPI{ public static final int defaultPowerLength = 300; diff --git a/src/buttondevteam/alipresents/components/gpowers/commands/GPower.java b/src/buttondevteam/alipresents/components/gpower/commands/GPower.java similarity index 88% rename from src/buttondevteam/alipresents/components/gpowers/commands/GPower.java rename to src/buttondevteam/alipresents/components/gpower/commands/GPower.java index 8b9abac..9c95f31 100644 --- a/src/buttondevteam/alipresents/components/gpowers/commands/GPower.java +++ b/src/buttondevteam/alipresents/components/gpower/commands/GPower.java @@ -1,11 +1,15 @@ -package buttondevteam.alipresents.components.gpowers.commands; +package buttondevteam.alipresents.components.gpower.commands; import org.bukkit.entity.Player; import buttondevteam.alipresents.architecture.commands.PlayerCommand; -import buttondevteam.alipresents.components.gpowers.api.GPowerAPI; +import buttondevteam.alipresents.components.gpower.api.GPowerAPI; public class GPower extends PlayerCommand { + @Override + public String GetCommandPath() { + return "gpower"; + } @Override public boolean OnCommand(Player player, String label, String[] args) { if (args.length < 2) { @@ -36,11 +40,6 @@ public class GPower extends PlayerCommand { return true; } - - @Override - public String GetCommandPath() { - return "gpower"; - } public String[] GetHelpText(String alias){ return new String[]{ "Usage: /gpowertest [colour=red,orange,yellow,green,blue,purple,grey] [active=true/false]" diff --git a/src/buttondevteam/alipresents/components/gpowers/enchant/EnchantingLoop.java b/src/buttondevteam/alipresents/components/gpower/enchant/EnchantingLoop.java similarity index 79% rename from src/buttondevteam/alipresents/components/gpowers/enchant/EnchantingLoop.java rename to src/buttondevteam/alipresents/components/gpower/enchant/EnchantingLoop.java index 5cb224e..0cc205b 100644 --- a/src/buttondevteam/alipresents/components/gpowers/enchant/EnchantingLoop.java +++ b/src/buttondevteam/alipresents/components/gpower/enchant/EnchantingLoop.java @@ -1,4 +1,4 @@ -package buttondevteam.alipresents.components.gpowers.enchant; +package buttondevteam.alipresents.components.gpower.enchant; import org.bukkit.Server; import org.bukkit.entity.Player; @@ -6,7 +6,7 @@ import org.bukkit.event.Listener; import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.scheduler.BukkitRunnable; -import buttondevteam.alipresents.components.gpowers.api.GPowerAPI; +import buttondevteam.alipresents.components.gpower.api.GPowerAPI; public class EnchantingLoop extends BukkitRunnable implements Listener{ private Server server; diff --git a/src/buttondevteam/alipresents/components/gpowers/powerstate/PowerAll.java b/src/buttondevteam/alipresents/components/gpower/powerstate/PowerAll.java similarity index 76% rename from src/buttondevteam/alipresents/components/gpowers/powerstate/PowerAll.java rename to src/buttondevteam/alipresents/components/gpower/powerstate/PowerAll.java index 525a728..2da86db 100644 --- a/src/buttondevteam/alipresents/components/gpowers/powerstate/PowerAll.java +++ b/src/buttondevteam/alipresents/components/gpower/powerstate/PowerAll.java @@ -1,9 +1,9 @@ -package buttondevteam.alipresents.components.gpowers.powerstate; +package buttondevteam.alipresents.components.gpower.powerstate; import org.bukkit.entity.Player; import buttondevteam.alipresents.architecture.commands.ModCommand; -import buttondevteam.alipresents.components.gpowers.api.GPowerAPI; +import buttondevteam.alipresents.components.gpower.api.GPowerAPI; public class PowerAll extends ModCommand{ @Override diff --git a/src/buttondevteam/alipresents/components/gpowers/powerstate/PowerDown.java b/src/buttondevteam/alipresents/components/gpower/powerstate/PowerDown.java similarity index 73% rename from src/buttondevteam/alipresents/components/gpowers/powerstate/PowerDown.java rename to src/buttondevteam/alipresents/components/gpower/powerstate/PowerDown.java index 4217219..4f60034 100644 --- a/src/buttondevteam/alipresents/components/gpowers/powerstate/PowerDown.java +++ b/src/buttondevteam/alipresents/components/gpower/powerstate/PowerDown.java @@ -1,9 +1,9 @@ -package buttondevteam.alipresents.components.gpowers.powerstate; +package buttondevteam.alipresents.components.gpower.powerstate; import org.bukkit.entity.Player; import buttondevteam.alipresents.architecture.commands.PlayerCommand; -import buttondevteam.alipresents.components.gpowers.api.GPowerAPI; +import buttondevteam.alipresents.components.gpower.api.GPowerAPI; public class PowerDown extends PlayerCommand { @Override diff --git a/src/buttondevteam/alipresents/components/gpowers/powerstate/PowerUp.java b/src/buttondevteam/alipresents/components/gpower/powerstate/PowerUp.java similarity index 74% rename from src/buttondevteam/alipresents/components/gpowers/powerstate/PowerUp.java rename to src/buttondevteam/alipresents/components/gpower/powerstate/PowerUp.java index 050f08f..b3d7f96 100644 --- a/src/buttondevteam/alipresents/components/gpowers/powerstate/PowerUp.java +++ b/src/buttondevteam/alipresents/components/gpower/powerstate/PowerUp.java @@ -1,9 +1,9 @@ -package buttondevteam.alipresents.components.gpowers.powerstate; +package buttondevteam.alipresents.components.gpower.powerstate; import org.bukkit.entity.Player; import buttondevteam.alipresents.architecture.commands.PlayerCommand; -import buttondevteam.alipresents.components.gpowers.api.GPowerAPI; +import buttondevteam.alipresents.components.gpower.api.GPowerAPI; public class PowerUp extends PlayerCommand { @Override diff --git a/src/buttondevteam/alipresents/components/insurance/getInsurance.java b/src/buttondevteam/alipresents/components/insurance/getInsurance.java index c760f5d..6a687ea 100644 --- a/src/buttondevteam/alipresents/components/insurance/getInsurance.java +++ b/src/buttondevteam/alipresents/components/insurance/getInsurance.java @@ -51,4 +51,9 @@ public class getInsurance extends ModCommand { }; } + @Override + public String GetCommandPath() { + return "insurance get"; + } + } diff --git a/src/buttondevteam/alipresents/components/insurance/getInsuranceBar.java b/src/buttondevteam/alipresents/components/insurance/getInsuranceBar.java index af00805..13f3339 100644 --- a/src/buttondevteam/alipresents/components/insurance/getInsuranceBar.java +++ b/src/buttondevteam/alipresents/components/insurance/getInsuranceBar.java @@ -17,4 +17,9 @@ public class getInsuranceBar extends ModCommand { } return true; } + + @Override + public String GetCommandPath() { + return "insurance getBar"; + } } diff --git a/src/buttondevteam/alipresents/components/insurance/getInsuranceBlock.java b/src/buttondevteam/alipresents/components/insurance/getInsuranceBlock.java index 37b4173..f671c12 100644 --- a/src/buttondevteam/alipresents/components/insurance/getInsuranceBlock.java +++ b/src/buttondevteam/alipresents/components/insurance/getInsuranceBlock.java @@ -18,4 +18,8 @@ public class getInsuranceBlock extends ModCommand { return false; } + @Override + public String GetCommandPath() { + return "insurance getblock"; + } } diff --git a/src/buttondevteam/alipresents/components/insurance/getInsuranceNugget.java b/src/buttondevteam/alipresents/components/insurance/getInsuranceNugget.java index 8363916..5ccaa03 100644 --- a/src/buttondevteam/alipresents/components/insurance/getInsuranceNugget.java +++ b/src/buttondevteam/alipresents/components/insurance/getInsuranceNugget.java @@ -17,5 +17,9 @@ public class getInsuranceNugget extends ModCommand { } return false; } + @Override + public String GetCommandPath() { + return "insurance getnugget"; + } } diff --git a/src/buttondevteam/alipresents/components/metrics/output/GetLoginMetrics.java b/src/buttondevteam/alipresents/components/metrics/output/GetLoginMetrics.java index 3778d0f..628b847 100644 --- a/src/buttondevteam/alipresents/components/metrics/output/GetLoginMetrics.java +++ b/src/buttondevteam/alipresents/components/metrics/output/GetLoginMetrics.java @@ -65,4 +65,9 @@ public class GetLoginMetrics extends ModCommand{ } return true; } + + @Override + public String GetCommandPath() { + return "metrics get logins"; + } }