From cb02693c0f6a42d12f68eb4ac76b1a9fdd1a293d Mon Sep 17 00:00:00 2001 From: alisolarflare Date: Thu, 3 Nov 2016 17:32:08 -0400 Subject: [PATCH] gpower fix --- plugin.yml | 6 +--- src/alisolarflare/AliPresents.java | 28 +++++++------------ .../commands/SetFlairDoorColour.java | 5 ++++ .../components/gpowers/GPowerModule.java | 4 +-- .../{gPowerCommand.java => GPower.java} | 2 +- .../links/serializer/Deserializer.java | 8 +++++- .../links/serializer/Serializer.java | 7 ++++- .../shulker/AliShulkerModule.java | 5 ++-- .../shulker/commands/AliShulker.java | 4 +-- 9 files changed, 37 insertions(+), 32 deletions(-) rename src/alisolarflare/components/gpowers/commands/{gPowerCommand.java => GPower.java} (93%) rename src/{alisolarflare/components => graveyard}/shulker/AliShulkerModule.java (65%) rename src/{alisolarflare/components => graveyard}/shulker/commands/AliShulker.java (93%) diff --git a/plugin.yml b/plugin.yml index 5609337..fdb2a8d 100644 --- a/plugin.yml +++ b/plugin.yml @@ -3,17 +3,13 @@ name: AliPresents version: 2.0.1 commands: - alishulker: - description: Spawns a shulker at player location Alishulker health withereffect invisibility true experiencedrops pressalilink: description: Presses an Ali Link pressalilink frequency setalilink: description: Creates an Ali Link setalilink frequency - setflairdoorcolour: - description: Sets the flair door colour mode, when lighting portals flairme: description: Activates the Flair Me Command. Ask Ali, she was fucking tired when writing this description - gpowercommand: + gpower: description: Testing command for ghostie powers powerup: description: Official g-power command that activates the ghostie powerups diff --git a/src/alisolarflare/AliPresents.java b/src/alisolarflare/AliPresents.java index cbea14d..ab28777 100644 --- a/src/alisolarflare/AliPresents.java +++ b/src/alisolarflare/AliPresents.java @@ -9,7 +9,6 @@ import org.bukkit.plugin.java.JavaPlugin; import alisolarflare.components.flairdoor.FlairDoorModule; import alisolarflare.components.gpowers.GPowerModule; import alisolarflare.components.links.AliLinkModule; -import alisolarflare.components.shulker.AliShulkerModule; import alisolarflare.events.uhc.UHCModule; import alisolarflare.magic.MagicModule; import alisolarflare.minigames.freeforall.FreeForAllModule; @@ -18,28 +17,21 @@ import alisolarflare.minigames.lobby.LobbyModule; public class AliPresents extends JavaPlugin{ public void onEnable(){ PluginDescriptionFile pdfFile = getDescription(); + + Logger logger = getLogger(); - - logger.info(pdfFile.getName() + " has been started (V." + pdfFile.getVersion()+ ")."); - - registerModules(); + + new FlairDoorModule().register(this); + new GPowerModule().register(this); + new AliLinkModule().register(this); + new UHCModule().register(this); + new MagicModule().register(this); + new FreeForAllModule().register(this); + new LobbyModule().register(this); logger.info(pdfFile.getName() + " has fully registered (V." + pdfFile.getVersion()+ ")."); } - public void registerModules(){ - new FlairDoorModule().register(this); - new GPowerModule().register(this); - new AliLinkModule().register(this); - new AliShulkerModule().register(this); - - new UHCModule().register(this); - - new MagicModule().register(this); - - new FreeForAllModule().register(this); - new LobbyModule().register(this); - } } diff --git a/src/alisolarflare/components/flairdoor/commands/SetFlairDoorColour.java b/src/alisolarflare/components/flairdoor/commands/SetFlairDoorColour.java index 4477fb6..9447abb 100644 --- a/src/alisolarflare/components/flairdoor/commands/SetFlairDoorColour.java +++ b/src/alisolarflare/components/flairdoor/commands/SetFlairDoorColour.java @@ -7,6 +7,11 @@ import org.bukkit.command.CommandSender; import buttondevteam.lib.chat.TBMCCommandBase; +/** + * @deprecated + * @author Alisolarflare + * + */ public class SetFlairDoorColour extends TBMCCommandBase { public static String FlairDoorColorMode = "null"; public static final List COLOURMODES = Arrays.asList("red", "orange", "yellow", "green", "blue", "purple", diff --git a/src/alisolarflare/components/gpowers/GPowerModule.java b/src/alisolarflare/components/gpowers/GPowerModule.java index 91caeb0..b46d651 100644 --- a/src/alisolarflare/components/gpowers/GPowerModule.java +++ b/src/alisolarflare/components/gpowers/GPowerModule.java @@ -3,14 +3,14 @@ package alisolarflare.components.gpowers; import org.bukkit.plugin.java.JavaPlugin; import alisolarflare.Module; -import alisolarflare.components.gpowers.commands.gPowerCommand; +import alisolarflare.components.gpowers.commands.GPower; import alisolarflare.components.gpowers.listeners.gPowerListener; public class GPowerModule extends Module { @Override public void register(JavaPlugin plugin) { - registerCommand(plugin, new gPowerCommand()); + registerCommand(plugin, new GPower()); registerListener(plugin, new gPowerListener(plugin)); } diff --git a/src/alisolarflare/components/gpowers/commands/gPowerCommand.java b/src/alisolarflare/components/gpowers/commands/GPower.java similarity index 93% rename from src/alisolarflare/components/gpowers/commands/gPowerCommand.java rename to src/alisolarflare/components/gpowers/commands/GPower.java index 2683c91..e37d2b7 100644 --- a/src/alisolarflare/components/gpowers/commands/gPowerCommand.java +++ b/src/alisolarflare/components/gpowers/commands/GPower.java @@ -6,7 +6,7 @@ import org.bukkit.entity.Player; import alisolarflare.components.gpowers.gPowerMemory; import buttondevteam.lib.chat.TBMCCommandBase; -public class gPowerCommand extends TBMCCommandBase { +public class GPower extends TBMCCommandBase { @Override public boolean OnCommand(CommandSender sender, String label, String[] args) { diff --git a/src/alisolarflare/components/links/serializer/Deserializer.java b/src/alisolarflare/components/links/serializer/Deserializer.java index ccc161d..cfc1786 100644 --- a/src/alisolarflare/components/links/serializer/Deserializer.java +++ b/src/alisolarflare/components/links/serializer/Deserializer.java @@ -7,6 +7,11 @@ import java.util.List; import alisolarflare.components.links.entities.Link; +/** + * @deprecated + * @author Alisolarflare + * + */ public class Deserializer{ public static void main (String args[]) { @@ -15,7 +20,8 @@ public class Deserializer{ //List aliLink = deserializer.loadLink(aliLink); //System.out.println(aliLink); } - + + /**@deprecated*/ @SuppressWarnings("unchecked") public List loadLinkList(){ List aliLinkList; diff --git a/src/alisolarflare/components/links/serializer/Serializer.java b/src/alisolarflare/components/links/serializer/Serializer.java index eb1024f..fe4efef 100644 --- a/src/alisolarflare/components/links/serializer/Serializer.java +++ b/src/alisolarflare/components/links/serializer/Serializer.java @@ -7,6 +7,11 @@ import java.util.List; import alisolarflare.components.links.entities.Link; +/** + * @deprecated + * @author Alisolarflare + * + */ public class Serializer { public static void main (String args[]) { @@ -14,7 +19,7 @@ public class Serializer { //Serializer serializer = new Serializer(); //serializer.saveLink(plugin, frequency, location) } - + /**@deprecated*/ public void saveLinkList(List aliLinkList){ //saves link diff --git a/src/alisolarflare/components/shulker/AliShulkerModule.java b/src/graveyard/shulker/AliShulkerModule.java similarity index 65% rename from src/alisolarflare/components/shulker/AliShulkerModule.java rename to src/graveyard/shulker/AliShulkerModule.java index 7cfaac3..3425a02 100644 --- a/src/alisolarflare/components/shulker/AliShulkerModule.java +++ b/src/graveyard/shulker/AliShulkerModule.java @@ -1,10 +1,11 @@ -package alisolarflare.components.shulker; +package graveyard.shulker; import org.bukkit.plugin.java.JavaPlugin; import alisolarflare.Module; -import alisolarflare.components.shulker.commands.AliShulker; +import graveyard.shulker.commands.AliShulker; +/**@deprecated*/ public class AliShulkerModule extends Module { @Override diff --git a/src/alisolarflare/components/shulker/commands/AliShulker.java b/src/graveyard/shulker/commands/AliShulker.java similarity index 93% rename from src/alisolarflare/components/shulker/commands/AliShulker.java rename to src/graveyard/shulker/commands/AliShulker.java index 1b4a4da..abf44f3 100644 --- a/src/alisolarflare/components/shulker/commands/AliShulker.java +++ b/src/graveyard/shulker/commands/AliShulker.java @@ -1,4 +1,4 @@ -package alisolarflare.components.shulker.commands; +package graveyard.shulker.commands; import org.bukkit.Location; import org.bukkit.command.CommandSender; @@ -14,7 +14,7 @@ import buttondevteam.lib.chat.TBMCCommandBase; /** * @author Alisolarflare This class is responsible for the command /aliShulker, which in-game spawns a shulker that: Has a health of 10 Has a wither and invisibility effect present Has noAI And is * Glowing - */ + *@deprecated*/ public class AliShulker extends TBMCCommandBase { @Override