diff --git a/src/alisolarflare/AliPresents.java b/src/alisolarflare/AliPresents.java index 7646d71..c9330d1 100644 --- a/src/alisolarflare/AliPresents.java +++ b/src/alisolarflare/AliPresents.java @@ -8,10 +8,10 @@ import org.bukkit.plugin.java.JavaPlugin; import alisolarflare.components.flairdoor.FlairDoorModule; import alisolarflare.components.links.AliLinkModule; -import alisolarflare.creativeboundaries.CreativeBoundariesModule; -import alisolarflare.easyuhc.EasyUHCModule; -import alisolarflare.magic.MagicModule; -import alisolarflare.minigames.MinigameModule; +import alisolarflare.modules.creativeboundaries.CreativeBoundariesModule; +import alisolarflare.modules.easyuhc.EasyUHCModule; +import alisolarflare.modules.magic.MagicModule; +import alisolarflare.modules.minigames.MinigameModule; public class AliPresents extends JavaPlugin{ public void onEnable(){ diff --git a/src/alisolarflare/autouhc/intro/ConfigureMatch.java b/src/alisolarflare/autouhc/intro/ConfigureMatch.java deleted file mode 100644 index 958e571..0000000 --- a/src/alisolarflare/autouhc/intro/ConfigureMatch.java +++ /dev/null @@ -1,38 +0,0 @@ -package alisolarflare.autouhc.intro; - -import org.bukkit.command.CommandSender; - -import alisolarflare.autouhc.memory.UHCMatch; -import buttondevteam.lib.chat.TBMCCommandBase; - -public class ConfigureMatch extends TBMCCommandBase{ - - public ConfigureMatch(UHCMatch match) { - // TODO Auto-generated constructor stub - } - - @Override - public String[] GetHelpText(String alias) { - // TODO Auto-generated method stub - return null; - } - - @Override - public boolean OnCommand(CommandSender sender, String alias, String[] args) { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean GetPlayerOnly() { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean GetModOnly() { - // TODO Auto-generated method stub - return false; - } - -} diff --git a/src/alisolarflare/autouhc/intro/ScheduleMatch.java b/src/alisolarflare/autouhc/intro/ScheduleMatch.java deleted file mode 100644 index d1d904f..0000000 --- a/src/alisolarflare/autouhc/intro/ScheduleMatch.java +++ /dev/null @@ -1,38 +0,0 @@ -package alisolarflare.autouhc.intro; - -import org.bukkit.command.CommandSender; - -import alisolarflare.autouhc.memory.UHCMatch; -import buttondevteam.lib.chat.TBMCCommandBase; - -public class ScheduleMatch extends TBMCCommandBase{ - - public ScheduleMatch(UHCMatch match) { - // TODO Auto-generated constructor stub - } - - @Override - public String[] GetHelpText(String alias) { - // TODO Auto-generated method stub - return null; - } - - @Override - public boolean OnCommand(CommandSender sender, String alias, String[] args) { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean GetPlayerOnly() { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean GetModOnly() { - // TODO Auto-generated method stub - return false; - } - -} diff --git a/src/alisolarflare/components/flairdoor/FlairDoorModule.java b/src/alisolarflare/components/flairdoor/FlairDoorModule.java index 1c5cddb..290522c 100644 --- a/src/alisolarflare/components/flairdoor/FlairDoorModule.java +++ b/src/alisolarflare/components/flairdoor/FlairDoorModule.java @@ -2,9 +2,9 @@ package alisolarflare.components.flairdoor; import org.bukkit.plugin.java.JavaPlugin; -import alisolarflare.Module; import alisolarflare.components.flairdoor.commands.FlairMe; import alisolarflare.components.flairdoor.listeners.PortalListener; +import alisolarflare.modules.Module; public class FlairDoorModule extends Module { @Override diff --git a/src/alisolarflare/components/flairdoor/commands/FlairMe.java b/src/alisolarflare/components/flairdoor/commands/FlairMe.java index 963da82..fab0112 100644 --- a/src/alisolarflare/components/flairdoor/commands/FlairMe.java +++ b/src/alisolarflare/components/flairdoor/commands/FlairMe.java @@ -3,9 +3,9 @@ package alisolarflare.components.flairdoor.commands; import org.bukkit.command.CommandSender; import alisolarflare.components.flairdoor.listeners.PortalListener; -import buttondevteam.lib.chat.TBMCCommandBase; +import alisolarflare.modules.PlayerCommand; -public class FlairMe extends TBMCCommandBase { +public class FlairMe extends PlayerCommand { @Override public boolean OnCommand(CommandSender sender, String label, String[] args) { @@ -25,15 +25,4 @@ public class FlairMe extends TBMCCommandBase { public String GetCommandPath() { return "flairme"; } - - @Override - public boolean GetPlayerOnly() { - return true; - } - - @Override - public boolean GetModOnly() { - return false; - } - } diff --git a/src/alisolarflare/components/links/AliLinkModule.java b/src/alisolarflare/components/links/AliLinkModule.java index a6d44a9..5a40320 100644 --- a/src/alisolarflare/components/links/AliLinkModule.java +++ b/src/alisolarflare/components/links/AliLinkModule.java @@ -4,10 +4,10 @@ import java.util.List; import org.bukkit.plugin.java.JavaPlugin; -import alisolarflare.Module; import alisolarflare.components.links.commands.PressAliLink; import alisolarflare.components.links.commands.SetAliLink; import alisolarflare.components.links.entities.Link; +import alisolarflare.modules.Module; public class AliLinkModule extends Module { private SetAliLink setAliLink; diff --git a/src/alisolarflare/components/links/commands/PressAliLink.java b/src/alisolarflare/components/links/commands/PressAliLink.java index da21f6d..657c611 100644 --- a/src/alisolarflare/components/links/commands/PressAliLink.java +++ b/src/alisolarflare/components/links/commands/PressAliLink.java @@ -4,9 +4,9 @@ import org.bukkit.command.CommandSender; import org.bukkit.plugin.java.JavaPlugin; import alisolarflare.components.links.entities.Link; -import buttondevteam.lib.chat.TBMCCommandBase; +import alisolarflare.modules.PlayerCommand; -public class PressAliLink extends TBMCCommandBase { +public class PressAliLink extends PlayerCommand { private JavaPlugin plugin; private SetAliLink setAliLink; @@ -36,25 +36,6 @@ public class PressAliLink extends TBMCCommandBase { @Override public String[] GetHelpText(String alias) { - // TODO Auto-generated method stub return null; } - - @Override - public String GetCommandPath() { - return "pressalilink"; - } - - @Override - public boolean GetPlayerOnly() { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean GetModOnly() { - // TODO Auto-generated method stub - return false; - } - } diff --git a/src/alisolarflare/components/links/commands/SetAliLink.java b/src/alisolarflare/components/links/commands/SetAliLink.java index 03c4e57..f25d8f7 100644 --- a/src/alisolarflare/components/links/commands/SetAliLink.java +++ b/src/alisolarflare/components/links/commands/SetAliLink.java @@ -11,7 +11,7 @@ import org.bukkit.plugin.java.JavaPlugin; import alisolarflare.components.links.AliLinkModule; import alisolarflare.components.links.entities.Link; -import buttondevteam.lib.chat.TBMCCommandBase; +import alisolarflare.modules.PlayerCommand; /** * This class manages the command /SetAliLink [x] [y] [z]. This command creates an Ali-Link, a location in a world that when called on by {@link PressAliLink}, creates a temporary redstone @@ -21,7 +21,7 @@ import buttondevteam.lib.chat.TBMCCommandBase; * @author Alisolarflare * */ -public class SetAliLink extends TBMCCommandBase { +public class SetAliLink extends PlayerCommand { public List linkList = new ArrayList(); AliLinkModule subplugin; private JavaPlugin plugin; @@ -120,21 +120,4 @@ public class SetAliLink extends TBMCCommandBase { // TODO Auto-generated method stub return null; } - - @Override - public String GetCommandPath() { - return "setalilink"; - } - - @Override - public boolean GetPlayerOnly() { - return true; - } - - @Override - public boolean GetModOnly() { - // TODO Auto-generated method stub - return false; - } - } diff --git a/src/alisolarflare/DevCommand.java b/src/alisolarflare/modules/ModCommand.java similarity index 53% rename from src/alisolarflare/DevCommand.java rename to src/alisolarflare/modules/ModCommand.java index a4c5091..2a650f0 100644 --- a/src/alisolarflare/DevCommand.java +++ b/src/alisolarflare/modules/ModCommand.java @@ -1,26 +1,29 @@ -package alisolarflare; - -import org.bukkit.command.CommandSender; - -import buttondevteam.lib.chat.TBMCCommandBase; - -public abstract class DevCommand extends TBMCCommandBase{ - - @Override - public abstract boolean OnCommand(CommandSender sender, String alias, String[] args); - - @Override - public abstract String[] GetHelpText(String alias); - - @Override - public boolean GetPlayerOnly() { - // TODO Auto-generated method stub - return true; - } - - @Override - public boolean GetModOnly() { - // TODO Auto-generated method stub - return true; - } -} +package alisolarflare.modules; + +import org.bukkit.command.CommandSender; + +import buttondevteam.lib.chat.TBMCCommandBase; + +public abstract class ModCommand extends TBMCCommandBase{ + + @Override + public abstract boolean OnCommand(CommandSender sender, String alias, String[] args); + + @Override + public String[] GetHelpText(String alias){ + return new String[] {"This command doesn't have help text, ask a dev to add one, using public String[] GetHelpText. " + + "If you're a dev, write the help text you lazy bastard. -Ali"}; + } + + @Override + public boolean GetPlayerOnly() { + // TODO Auto-generated method stub + return true; + } + + @Override + public boolean GetModOnly() { + // TODO Auto-generated method stub + return true; + } +} diff --git a/src/alisolarflare/Module.java b/src/alisolarflare/modules/Module.java similarity index 95% rename from src/alisolarflare/Module.java rename to src/alisolarflare/modules/Module.java index 3fe900b..6446ff0 100644 --- a/src/alisolarflare/Module.java +++ b/src/alisolarflare/modules/Module.java @@ -1,4 +1,4 @@ -package alisolarflare; +package alisolarflare.modules; import org.bukkit.event.Listener; import org.bukkit.plugin.java.JavaPlugin; diff --git a/src/alisolarflare/modules/PlayerCommand.java b/src/alisolarflare/modules/PlayerCommand.java new file mode 100644 index 0000000..51dcad9 --- /dev/null +++ b/src/alisolarflare/modules/PlayerCommand.java @@ -0,0 +1,24 @@ +package alisolarflare.modules; + +import buttondevteam.lib.chat.TBMCCommandBase; + +public abstract class PlayerCommand extends TBMCCommandBase{ + @Override + public boolean GetPlayerOnly() { + // TODO Auto-generated method stub + return true; + } + + @Override + public boolean GetModOnly() { + // TODO Auto-generated method stub + return false; + } + @Override + public String[] GetHelpText(String alias){ + return new String[] {"This command doesn't have help text, ask a mod to ask a dev to add one, using public String[] GetHelpText. " + + "If you're a mod, ask a dev to write the help text." + + "If you're a dev, write the help text you lazy bastard. -Ali"}; + } + +} diff --git a/src/alisolarflare/autouhc/UHCModule.java b/src/alisolarflare/modules/autouhc/UHCModule.java similarity index 56% rename from src/alisolarflare/autouhc/UHCModule.java rename to src/alisolarflare/modules/autouhc/UHCModule.java index 3c0c2d8..cd65d63 100644 --- a/src/alisolarflare/autouhc/UHCModule.java +++ b/src/alisolarflare/modules/autouhc/UHCModule.java @@ -1,16 +1,16 @@ -package alisolarflare.autouhc; +package alisolarflare.modules.autouhc; import org.bukkit.plugin.java.JavaPlugin; -import alisolarflare.Module; -import alisolarflare.autouhc.controller.SetMatchState; -import alisolarflare.autouhc.idle.AddToUHC; -import alisolarflare.autouhc.idle.JoinUHC; -import alisolarflare.autouhc.intro.ConfigureMatch; -import alisolarflare.autouhc.intro.ScheduleMatch; -import alisolarflare.autouhc.intro.StartMatch; -import alisolarflare.autouhc.memory.MatchState; -import alisolarflare.autouhc.memory.UHCMatch; +import alisolarflare.modules.Module; +import alisolarflare.modules.autouhc.controller.SetMatchState; +import alisolarflare.modules.autouhc.idle.AddToUHC; +import alisolarflare.modules.autouhc.idle.JoinUHC; +import alisolarflare.modules.autouhc.intro.ConfigureMatch; +import alisolarflare.modules.autouhc.intro.ScheduleMatch; +import alisolarflare.modules.autouhc.intro.StartMatch; +import alisolarflare.modules.autouhc.memory.MatchState; +import alisolarflare.modules.autouhc.memory.UHCMatch; public class UHCModule extends Module { public UHCMatch match; diff --git a/src/alisolarflare/autouhc/controller/SetMatchState.java b/src/alisolarflare/modules/autouhc/controller/SetMatchState.java similarity index 86% rename from src/alisolarflare/autouhc/controller/SetMatchState.java rename to src/alisolarflare/modules/autouhc/controller/SetMatchState.java index 0945cc7..f6a4aa3 100644 --- a/src/alisolarflare/autouhc/controller/SetMatchState.java +++ b/src/alisolarflare/modules/autouhc/controller/SetMatchState.java @@ -1,24 +1,19 @@ -package alisolarflare.autouhc.controller; +package alisolarflare.modules.autouhc.controller; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import alisolarflare.autouhc.memory.MatchState; -import alisolarflare.autouhc.memory.UHCMatch; -import buttondevteam.lib.chat.TBMCCommandBase; +import alisolarflare.modules.ModCommand; +import alisolarflare.modules.autouhc.memory.MatchState; +import alisolarflare.modules.autouhc.memory.UHCMatch; -public class SetMatchState extends TBMCCommandBase{ +public class SetMatchState extends ModCommand{ UHCMatch match; public SetMatchState(UHCMatch match) { this.match = match; } - @Override - public String[] GetHelpText(String alias) { - return null; - } - @Override public boolean OnCommand(CommandSender sender, String alias, String[] args) { if (!(sender instanceof Player)){ @@ -72,5 +67,10 @@ public class SetMatchState extends TBMCCommandBase{ // TODO Auto-generated method stub return false; } + + @Override + public String[] GetHelpText(String alias) { + return new String[] { "" }; + } } diff --git a/src/alisolarflare/autouhc/idle/AddToUHC.java b/src/alisolarflare/modules/autouhc/idle/AddToUHC.java similarity index 74% rename from src/alisolarflare/autouhc/idle/AddToUHC.java rename to src/alisolarflare/modules/autouhc/idle/AddToUHC.java index b27ace6..8d3abee 100644 --- a/src/alisolarflare/autouhc/idle/AddToUHC.java +++ b/src/alisolarflare/modules/autouhc/idle/AddToUHC.java @@ -1,17 +1,17 @@ -package alisolarflare.autouhc.idle; +package alisolarflare.modules.autouhc.idle; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import alisolarflare.autouhc.memory.UHCMatch; -import buttondevteam.lib.chat.TBMCCommandBase; +import alisolarflare.modules.ModCommand; +import alisolarflare.modules.autouhc.memory.UHCMatch; /** * This class handles the specific command /addToUHC which, in-game, adds a player to a specific UltraHardcore match, that is defined by the constructor: {@linkplain #AddToUHC(UHCMatch)} * * @author Alisolarflare */ -public class AddToUHC extends TBMCCommandBase { +public class AddToUHC extends ModCommand { private UHCMatch match; public AddToUHC(UHCMatch match) { @@ -57,21 +57,4 @@ public class AddToUHC extends TBMCCommandBase { // TODO Auto-generated method stub return null; } - - @Override - public String GetCommandPath() { - return "addtouhc"; - } - - @Override - public boolean GetPlayerOnly() { - return true; - } - - @Override - public boolean GetModOnly() { - // TODO Auto-generated method stub - return false; - } - } diff --git a/src/alisolarflare/autouhc/idle/JoinUHC.java b/src/alisolarflare/modules/autouhc/idle/JoinUHC.java similarity index 71% rename from src/alisolarflare/autouhc/idle/JoinUHC.java rename to src/alisolarflare/modules/autouhc/idle/JoinUHC.java index 764a2da..ba6621d 100644 --- a/src/alisolarflare/autouhc/idle/JoinUHC.java +++ b/src/alisolarflare/modules/autouhc/idle/JoinUHC.java @@ -1,12 +1,12 @@ -package alisolarflare.autouhc.idle; +package alisolarflare.modules.autouhc.idle; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import alisolarflare.autouhc.memory.UHCMatch; -import buttondevteam.lib.chat.TBMCCommandBase; +import alisolarflare.modules.ModCommand; +import alisolarflare.modules.autouhc.memory.UHCMatch; -public class JoinUHC extends TBMCCommandBase{ +public class JoinUHC extends ModCommand{ private UHCMatch match; @@ -50,18 +50,5 @@ public class JoinUHC extends TBMCCommandBase{ } return false; - } - - @Override - public boolean GetPlayerOnly() { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean GetModOnly() { - // TODO Auto-generated method stub - return false; - } - + } } diff --git a/src/alisolarflare/modules/autouhc/intro/ConfigureMatch.java b/src/alisolarflare/modules/autouhc/intro/ConfigureMatch.java new file mode 100644 index 0000000..9ebab8c --- /dev/null +++ b/src/alisolarflare/modules/autouhc/intro/ConfigureMatch.java @@ -0,0 +1,25 @@ +package alisolarflare.modules.autouhc.intro; + +import org.bukkit.command.CommandSender; + +import alisolarflare.modules.ModCommand; +import alisolarflare.modules.autouhc.memory.UHCMatch; + +public class ConfigureMatch extends ModCommand{ + + public ConfigureMatch(UHCMatch match) { + // TODO Auto-generated constructor stub + } + + @Override + public String[] GetHelpText(String alias) { + // TODO Auto-generated method stub + return null; + } + + @Override + public boolean OnCommand(CommandSender sender, String alias, String[] args) { + // TODO Auto-generated method stub + return false; + } +} diff --git a/src/alisolarflare/autouhc/intro/IntroductionCutscene.java b/src/alisolarflare/modules/autouhc/intro/IntroductionCutscene.java similarity index 64% rename from src/alisolarflare/autouhc/intro/IntroductionCutscene.java rename to src/alisolarflare/modules/autouhc/intro/IntroductionCutscene.java index 7921231..6244a5f 100644 --- a/src/alisolarflare/autouhc/intro/IntroductionCutscene.java +++ b/src/alisolarflare/modules/autouhc/intro/IntroductionCutscene.java @@ -1,4 +1,4 @@ -package alisolarflare.autouhc.intro; +package alisolarflare.modules.autouhc.intro; public class IntroductionCutscene { //TODO: Teleport all players to the area. diff --git a/src/alisolarflare/modules/autouhc/intro/ScheduleMatch.java b/src/alisolarflare/modules/autouhc/intro/ScheduleMatch.java new file mode 100644 index 0000000..ae6361b --- /dev/null +++ b/src/alisolarflare/modules/autouhc/intro/ScheduleMatch.java @@ -0,0 +1,25 @@ +package alisolarflare.modules.autouhc.intro; + +import org.bukkit.command.CommandSender; + +import alisolarflare.modules.ModCommand; +import alisolarflare.modules.autouhc.memory.UHCMatch; + +public class ScheduleMatch extends ModCommand{ + + public ScheduleMatch(UHCMatch match) { + // TODO Auto-generated constructor stub + } + + @Override + public String[] GetHelpText(String alias) { + // TODO Auto-generated method stub + return null; + } + + @Override + public boolean OnCommand(CommandSender sender, String alias, String[] args) { + // TODO Auto-generated method stub + return false; + } +} diff --git a/src/alisolarflare/autouhc/intro/StartMatch.java b/src/alisolarflare/modules/autouhc/intro/StartMatch.java similarity index 71% rename from src/alisolarflare/autouhc/intro/StartMatch.java rename to src/alisolarflare/modules/autouhc/intro/StartMatch.java index 08932e8..c39d968 100644 --- a/src/alisolarflare/autouhc/intro/StartMatch.java +++ b/src/alisolarflare/modules/autouhc/intro/StartMatch.java @@ -1,12 +1,12 @@ -package alisolarflare.autouhc.intro; +package alisolarflare.modules.autouhc.intro; import org.bukkit.command.CommandSender; -import alisolarflare.autouhc.memory.MatchState; -import alisolarflare.autouhc.memory.UHCMatch; -import buttondevteam.lib.chat.TBMCCommandBase; +import alisolarflare.modules.ModCommand; +import alisolarflare.modules.autouhc.memory.MatchState; +import alisolarflare.modules.autouhc.memory.UHCMatch; -public class StartMatch extends TBMCCommandBase { +public class StartMatch extends ModCommand { private UHCMatch match; public StartMatch(UHCMatch match) { @@ -37,8 +37,6 @@ public class StartMatch extends TBMCCommandBase { default: sender.sendMessage("You cannot start a match now, one is already in progress!"); - - } return false; @@ -56,15 +54,4 @@ public class StartMatch extends TBMCCommandBase { public String GetCommandPath() { return "startmatch"; } - - @Override - public boolean GetPlayerOnly() { - return true; - } - - @Override - public boolean GetModOnly() { - // TODO Auto-generated method stub - return false; - } } diff --git a/src/alisolarflare/autouhc/listeners/MatchCyclingListener.java b/src/alisolarflare/modules/autouhc/listeners/MatchCyclingListener.java similarity index 88% rename from src/alisolarflare/autouhc/listeners/MatchCyclingListener.java rename to src/alisolarflare/modules/autouhc/listeners/MatchCyclingListener.java index e11fc9b..d8ef831 100644 --- a/src/alisolarflare/autouhc/listeners/MatchCyclingListener.java +++ b/src/alisolarflare/modules/autouhc/listeners/MatchCyclingListener.java @@ -1,4 +1,4 @@ -package alisolarflare.autouhc.listeners; +package alisolarflare.modules.autouhc.listeners; import org.bukkit.event.Listener; import org.bukkit.plugin.java.JavaPlugin; diff --git a/src/alisolarflare/autouhc/listeners/MatchMainLoop.java b/src/alisolarflare/modules/autouhc/listeners/MatchMainLoop.java similarity index 69% rename from src/alisolarflare/autouhc/listeners/MatchMainLoop.java rename to src/alisolarflare/modules/autouhc/listeners/MatchMainLoop.java index 41c3b06..4005028 100644 --- a/src/alisolarflare/autouhc/listeners/MatchMainLoop.java +++ b/src/alisolarflare/modules/autouhc/listeners/MatchMainLoop.java @@ -1,4 +1,4 @@ -package alisolarflare.autouhc.listeners; +package alisolarflare.modules.autouhc.listeners; import org.bukkit.scheduler.BukkitRunnable; diff --git a/src/alisolarflare/autouhc/memory/MatchState.java b/src/alisolarflare/modules/autouhc/memory/MatchState.java similarity index 85% rename from src/alisolarflare/autouhc/memory/MatchState.java rename to src/alisolarflare/modules/autouhc/memory/MatchState.java index f25c350..b4587b5 100644 --- a/src/alisolarflare/autouhc/memory/MatchState.java +++ b/src/alisolarflare/modules/autouhc/memory/MatchState.java @@ -1,4 +1,4 @@ -package alisolarflare.autouhc.memory; +package alisolarflare.modules.autouhc.memory; public enum MatchState { IDLE, //Idle: Configure Match, Wait: Schedule Match, Intro: Start Match diff --git a/src/alisolarflare/autouhc/memory/UHCMatch.java b/src/alisolarflare/modules/autouhc/memory/UHCMatch.java similarity index 92% rename from src/alisolarflare/autouhc/memory/UHCMatch.java rename to src/alisolarflare/modules/autouhc/memory/UHCMatch.java index ee8911d..c0c64b9 100644 --- a/src/alisolarflare/autouhc/memory/UHCMatch.java +++ b/src/alisolarflare/modules/autouhc/memory/UHCMatch.java @@ -1,4 +1,4 @@ -package alisolarflare.autouhc.memory; +package alisolarflare.modules.autouhc.memory; import java.util.ArrayList; import java.util.List; diff --git a/src/alisolarflare/creativeboundaries/CreativeBoundariesModule.java b/src/alisolarflare/modules/creativeboundaries/CreativeBoundariesModule.java similarity index 55% rename from src/alisolarflare/creativeboundaries/CreativeBoundariesModule.java rename to src/alisolarflare/modules/creativeboundaries/CreativeBoundariesModule.java index 39dac19..d9ecdf8 100644 --- a/src/alisolarflare/creativeboundaries/CreativeBoundariesModule.java +++ b/src/alisolarflare/modules/creativeboundaries/CreativeBoundariesModule.java @@ -1,4 +1,4 @@ -package alisolarflare.creativeboundaries; +package alisolarflare.modules.creativeboundaries; import java.util.ArrayList; import java.util.List; @@ -6,12 +6,12 @@ import java.util.List; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; -import alisolarflare.Module; -import alisolarflare.creativeboundaries.commands.Cbgm0; -import alisolarflare.creativeboundaries.commands.Cbgm1; -import alisolarflare.creativeboundaries.commands.SetDickmode; -import alisolarflare.creativeboundaries.listeners.ItemRestrictionListener; -import alisolarflare.creativeboundaries.listeners.PlotChangeListener; +import alisolarflare.modules.Module; +import alisolarflare.modules.creativeboundaries.commands.Cbgm0; +import alisolarflare.modules.creativeboundaries.commands.Cbgm1; +import alisolarflare.modules.creativeboundaries.commands.SetDickmode; +import alisolarflare.modules.creativeboundaries.listeners.ItemRestrictionListener; +import alisolarflare.modules.creativeboundaries.listeners.PlotChangeListener; public class CreativeBoundariesModule extends Module{ diff --git a/src/alisolarflare/creativeboundaries/commands/Cbgm0.java b/src/alisolarflare/modules/creativeboundaries/commands/Cbgm0.java similarity index 60% rename from src/alisolarflare/creativeboundaries/commands/Cbgm0.java rename to src/alisolarflare/modules/creativeboundaries/commands/Cbgm0.java index 6e5fd2a..832cace 100644 --- a/src/alisolarflare/creativeboundaries/commands/Cbgm0.java +++ b/src/alisolarflare/modules/creativeboundaries/commands/Cbgm0.java @@ -1,13 +1,13 @@ -package alisolarflare.creativeboundaries.commands; +package alisolarflare.modules.creativeboundaries.commands; import org.bukkit.GameMode; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import alisolarflare.creativeboundaries.CreativeBoundariesModule; -import buttondevteam.lib.chat.TBMCCommandBase; +import alisolarflare.modules.PlayerCommand; +import alisolarflare.modules.creativeboundaries.CreativeBoundariesModule; -public class Cbgm0 extends TBMCCommandBase{ +public class Cbgm0 extends PlayerCommand{ private CreativeBoundariesModule module; @@ -33,17 +33,4 @@ public class Cbgm0 extends TBMCCommandBase{ // TODO Auto-generated method stub return null; } - - @Override - public boolean GetPlayerOnly() { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean GetModOnly() { - // TODO Auto-generated method stub - return false; - } - } diff --git a/src/alisolarflare/creativeboundaries/commands/Cbgm1.java b/src/alisolarflare/modules/creativeboundaries/commands/Cbgm1.java similarity index 78% rename from src/alisolarflare/creativeboundaries/commands/Cbgm1.java rename to src/alisolarflare/modules/creativeboundaries/commands/Cbgm1.java index 04fba33..e3c7753 100644 --- a/src/alisolarflare/creativeboundaries/commands/Cbgm1.java +++ b/src/alisolarflare/modules/creativeboundaries/commands/Cbgm1.java @@ -1,4 +1,4 @@ -package alisolarflare.creativeboundaries.commands; +package alisolarflare.modules.creativeboundaries.commands; import org.bukkit.GameMode; import org.bukkit.command.CommandSender; @@ -10,10 +10,10 @@ import com.palmergames.bukkit.towny.object.Town; import com.palmergames.bukkit.towny.object.TownBlock; import com.palmergames.bukkit.towny.object.TownyUniverse; -import alisolarflare.creativeboundaries.CreativeBoundariesModule; -import buttondevteam.lib.chat.TBMCCommandBase; +import alisolarflare.modules.PlayerCommand; +import alisolarflare.modules.creativeboundaries.CreativeBoundariesModule; -public class Cbgm1 extends TBMCCommandBase { +public class Cbgm1 extends PlayerCommand { private CreativeBoundariesModule module; @@ -66,17 +66,4 @@ public class Cbgm1 extends TBMCCommandBase { // TODO Auto-generated method stub return null; } - - @Override - public boolean GetPlayerOnly() { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean GetModOnly() { - // TODO Auto-generated method stub - return false; - } - } diff --git a/src/alisolarflare/creativeboundaries/commands/SetDickmode.java b/src/alisolarflare/modules/creativeboundaries/commands/SetDickmode.java similarity index 67% rename from src/alisolarflare/creativeboundaries/commands/SetDickmode.java rename to src/alisolarflare/modules/creativeboundaries/commands/SetDickmode.java index 3b1654b..576844c 100644 --- a/src/alisolarflare/creativeboundaries/commands/SetDickmode.java +++ b/src/alisolarflare/modules/creativeboundaries/commands/SetDickmode.java @@ -1,11 +1,11 @@ -package alisolarflare.creativeboundaries.commands; +package alisolarflare.modules.creativeboundaries.commands; import org.bukkit.command.CommandSender; -import alisolarflare.creativeboundaries.CreativeBoundariesModule; -import buttondevteam.lib.chat.TBMCCommandBase; +import alisolarflare.modules.PlayerCommand; +import alisolarflare.modules.creativeboundaries.CreativeBoundariesModule; -public class SetDickmode extends TBMCCommandBase{ +public class SetDickmode extends PlayerCommand{ private CreativeBoundariesModule module; public SetDickmode(CreativeBoundariesModule module){ @@ -39,16 +39,4 @@ public class SetDickmode extends TBMCCommandBase{ // TODO Auto-generated method stub return null; } - - @Override - public boolean GetPlayerOnly() { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean GetModOnly() { - // TODO Auto-generated method stub - return false; - } } diff --git a/src/alisolarflare/creativeboundaries/listeners/ItemRestrictionListener.java b/src/alisolarflare/modules/creativeboundaries/listeners/ItemRestrictionListener.java similarity index 76% rename from src/alisolarflare/creativeboundaries/listeners/ItemRestrictionListener.java rename to src/alisolarflare/modules/creativeboundaries/listeners/ItemRestrictionListener.java index 9023755..3cb6581 100644 --- a/src/alisolarflare/creativeboundaries/listeners/ItemRestrictionListener.java +++ b/src/alisolarflare/modules/creativeboundaries/listeners/ItemRestrictionListener.java @@ -1,4 +1,4 @@ -package alisolarflare.creativeboundaries.listeners; +package alisolarflare.modules.creativeboundaries.listeners; import java.util.List; @@ -7,7 +7,7 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.inventory.InventoryCreativeEvent; -import alisolarflare.creativeboundaries.CreativeBoundariesModule; +import alisolarflare.modules.creativeboundaries.CreativeBoundariesModule; public class ItemRestrictionListener implements Listener { diff --git a/src/alisolarflare/creativeboundaries/listeners/PlotChangeListener.java b/src/alisolarflare/modules/creativeboundaries/listeners/PlotChangeListener.java similarity index 90% rename from src/alisolarflare/creativeboundaries/listeners/PlotChangeListener.java rename to src/alisolarflare/modules/creativeboundaries/listeners/PlotChangeListener.java index e911b98..a257f89 100644 --- a/src/alisolarflare/creativeboundaries/listeners/PlotChangeListener.java +++ b/src/alisolarflare/modules/creativeboundaries/listeners/PlotChangeListener.java @@ -1,4 +1,4 @@ -package alisolarflare.creativeboundaries.listeners; +package alisolarflare.modules.creativeboundaries.listeners; import org.bukkit.GameMode; import org.bukkit.entity.Player; @@ -12,7 +12,7 @@ import com.palmergames.bukkit.towny.object.Town; import com.palmergames.bukkit.towny.object.TownBlock; import com.palmergames.bukkit.towny.object.TownyUniverse; -import alisolarflare.creativeboundaries.CreativeBoundariesModule; +import alisolarflare.modules.creativeboundaries.CreativeBoundariesModule; public class PlotChangeListener implements Listener{ public CreativeBoundariesModule module; diff --git a/src/alisolarflare/easyuhc/EasyUHCModule.java b/src/alisolarflare/modules/easyuhc/EasyUHCModule.java similarity index 50% rename from src/alisolarflare/easyuhc/EasyUHCModule.java rename to src/alisolarflare/modules/easyuhc/EasyUHCModule.java index 2ca862c..01c4ea0 100644 --- a/src/alisolarflare/easyuhc/EasyUHCModule.java +++ b/src/alisolarflare/modules/easyuhc/EasyUHCModule.java @@ -1,21 +1,21 @@ -package alisolarflare.easyuhc; +package alisolarflare.modules.easyuhc; import org.bukkit.Location; import org.bukkit.plugin.java.JavaPlugin; -import alisolarflare.Module; -import alisolarflare.easyuhc.commands.ActivatePowers; -import alisolarflare.easyuhc.commands.SetUHCLobby; -import alisolarflare.easyuhc.commands.SetWorldBorders; -import alisolarflare.easyuhc.commands.SpreadPlayers; -import alisolarflare.easyuhc.commands.StartTimer; -import alisolarflare.easyuhc.commands.StartUHC; -import alisolarflare.easyuhc.commands.TeleportToUHC; -import alisolarflare.easyuhc.gpowers.GPowerMemory; -import alisolarflare.easyuhc.gpowers.commands.GPower; -import alisolarflare.easyuhc.gpowers.commands.PowerDown; -import alisolarflare.easyuhc.gpowers.commands.PowerUp; -import alisolarflare.easyuhc.gpowers.listeners.gPowerListener; +import alisolarflare.modules.Module; +import alisolarflare.modules.easyuhc.commands.ActivatePowers; +import alisolarflare.modules.easyuhc.commands.SetUHCLobby; +import alisolarflare.modules.easyuhc.commands.SetWorldBorders; +import alisolarflare.modules.easyuhc.commands.SpreadPlayers; +import alisolarflare.modules.easyuhc.commands.StartTimer; +import alisolarflare.modules.easyuhc.commands.StartUHC; +import alisolarflare.modules.easyuhc.commands.TeleportToUHC; +import alisolarflare.modules.easyuhc.gpowers.GPowerMemory; +import alisolarflare.modules.easyuhc.gpowers.commands.GPower; +import alisolarflare.modules.easyuhc.gpowers.commands.PowerDown; +import alisolarflare.modules.easyuhc.gpowers.commands.PowerUp; +import alisolarflare.modules.easyuhc.gpowers.listeners.gPowerListener; public class EasyUHCModule extends Module{ public Location lobbyLocation; diff --git a/src/alisolarflare/easyuhc/commands/ActivatePowers.java b/src/alisolarflare/modules/easyuhc/commands/ActivatePowers.java similarity index 63% rename from src/alisolarflare/easyuhc/commands/ActivatePowers.java rename to src/alisolarflare/modules/easyuhc/commands/ActivatePowers.java index 8f78fa1..3c20dbc 100644 --- a/src/alisolarflare/easyuhc/commands/ActivatePowers.java +++ b/src/alisolarflare/modules/easyuhc/commands/ActivatePowers.java @@ -1,10 +1,10 @@ -package alisolarflare.easyuhc.commands; +package alisolarflare.modules.easyuhc.commands; import org.bukkit.command.CommandSender; -import alisolarflare.DevCommand; +import alisolarflare.modules.ModCommand; -public class ActivatePowers extends DevCommand{ +public class ActivatePowers extends ModCommand{ @Override public boolean OnCommand(CommandSender sender, String alias, String[] args) { diff --git a/src/alisolarflare/easyuhc/commands/SetUHCLobby.java b/src/alisolarflare/modules/easyuhc/commands/SetUHCLobby.java similarity index 71% rename from src/alisolarflare/easyuhc/commands/SetUHCLobby.java rename to src/alisolarflare/modules/easyuhc/commands/SetUHCLobby.java index 72609eb..380acb3 100644 --- a/src/alisolarflare/easyuhc/commands/SetUHCLobby.java +++ b/src/alisolarflare/modules/easyuhc/commands/SetUHCLobby.java @@ -1,12 +1,12 @@ -package alisolarflare.easyuhc.commands; +package alisolarflare.modules.easyuhc.commands; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import alisolarflare.DevCommand; -import alisolarflare.easyuhc.EasyUHCModule; +import alisolarflare.modules.ModCommand; +import alisolarflare.modules.easyuhc.EasyUHCModule; -public class SetUHCLobby extends DevCommand{ +public class SetUHCLobby extends ModCommand{ EasyUHCModule module; public SetUHCLobby(EasyUHCModule easyUHCModule) { this.module = easyUHCModule; diff --git a/src/alisolarflare/easyuhc/commands/SetWorldBorders.java b/src/alisolarflare/modules/easyuhc/commands/SetWorldBorders.java similarity index 63% rename from src/alisolarflare/easyuhc/commands/SetWorldBorders.java rename to src/alisolarflare/modules/easyuhc/commands/SetWorldBorders.java index 0f66241..7dfd016 100644 --- a/src/alisolarflare/easyuhc/commands/SetWorldBorders.java +++ b/src/alisolarflare/modules/easyuhc/commands/SetWorldBorders.java @@ -1,10 +1,10 @@ -package alisolarflare.easyuhc.commands; +package alisolarflare.modules.easyuhc.commands; import org.bukkit.command.CommandSender; -import alisolarflare.DevCommand; +import alisolarflare.modules.ModCommand; -public class SetWorldBorders extends DevCommand { +public class SetWorldBorders extends ModCommand { @Override public boolean OnCommand(CommandSender sender, String alias, String[] args) { diff --git a/src/alisolarflare/easyuhc/commands/ShrinkWorldBorders.java b/src/alisolarflare/modules/easyuhc/commands/ShrinkWorldBorders.java similarity index 65% rename from src/alisolarflare/easyuhc/commands/ShrinkWorldBorders.java rename to src/alisolarflare/modules/easyuhc/commands/ShrinkWorldBorders.java index 76f993b..cacd3d6 100644 --- a/src/alisolarflare/easyuhc/commands/ShrinkWorldBorders.java +++ b/src/alisolarflare/modules/easyuhc/commands/ShrinkWorldBorders.java @@ -1,10 +1,10 @@ -package alisolarflare.easyuhc.commands; +package alisolarflare.modules.easyuhc.commands; import org.bukkit.command.CommandSender; -import alisolarflare.DevCommand; +import alisolarflare.modules.ModCommand; -public class ShrinkWorldBorders extends DevCommand { +public class ShrinkWorldBorders extends ModCommand { @Override public boolean OnCommand(CommandSender sender, String alias, String[] args) { diff --git a/src/alisolarflare/easyuhc/commands/SpreadPlayers.java b/src/alisolarflare/modules/easyuhc/commands/SpreadPlayers.java similarity index 66% rename from src/alisolarflare/easyuhc/commands/SpreadPlayers.java rename to src/alisolarflare/modules/easyuhc/commands/SpreadPlayers.java index 2b3cb12..53faba9 100644 --- a/src/alisolarflare/easyuhc/commands/SpreadPlayers.java +++ b/src/alisolarflare/modules/easyuhc/commands/SpreadPlayers.java @@ -1,10 +1,10 @@ -package alisolarflare.easyuhc.commands; +package alisolarflare.modules.easyuhc.commands; import org.bukkit.command.CommandSender; -import alisolarflare.DevCommand; +import alisolarflare.modules.ModCommand; -public class SpreadPlayers extends DevCommand{ +public class SpreadPlayers extends ModCommand{ @Override public boolean OnCommand(CommandSender sender, String alias, String[] args) { diff --git a/src/alisolarflare/easyuhc/commands/StartTimer.java b/src/alisolarflare/modules/easyuhc/commands/StartTimer.java similarity index 66% rename from src/alisolarflare/easyuhc/commands/StartTimer.java rename to src/alisolarflare/modules/easyuhc/commands/StartTimer.java index c7c613c..b044130 100644 --- a/src/alisolarflare/easyuhc/commands/StartTimer.java +++ b/src/alisolarflare/modules/easyuhc/commands/StartTimer.java @@ -1,10 +1,10 @@ -package alisolarflare.easyuhc.commands; +package alisolarflare.modules.easyuhc.commands; import org.bukkit.command.CommandSender; -import alisolarflare.DevCommand; +import alisolarflare.modules.ModCommand; -public class StartTimer extends DevCommand{ +public class StartTimer extends ModCommand{ @Override public boolean OnCommand(CommandSender sender, String alias, String[] args) { diff --git a/src/alisolarflare/easyuhc/commands/StartUHC.java b/src/alisolarflare/modules/easyuhc/commands/StartUHC.java similarity index 66% rename from src/alisolarflare/easyuhc/commands/StartUHC.java rename to src/alisolarflare/modules/easyuhc/commands/StartUHC.java index 63d9df7..0c8f2d0 100644 --- a/src/alisolarflare/easyuhc/commands/StartUHC.java +++ b/src/alisolarflare/modules/easyuhc/commands/StartUHC.java @@ -1,10 +1,10 @@ -package alisolarflare.easyuhc.commands; +package alisolarflare.modules.easyuhc.commands; import org.bukkit.command.CommandSender; -import alisolarflare.DevCommand; +import alisolarflare.modules.ModCommand; -public class StartUHC extends DevCommand{ +public class StartUHC extends ModCommand{ @Override public boolean OnCommand(CommandSender sender, String alias, String[] args) { diff --git a/src/alisolarflare/easyuhc/commands/TeleportToUHC.java b/src/alisolarflare/modules/easyuhc/commands/TeleportToUHC.java similarity index 65% rename from src/alisolarflare/easyuhc/commands/TeleportToUHC.java rename to src/alisolarflare/modules/easyuhc/commands/TeleportToUHC.java index 463f30a..ee9050e 100644 --- a/src/alisolarflare/easyuhc/commands/TeleportToUHC.java +++ b/src/alisolarflare/modules/easyuhc/commands/TeleportToUHC.java @@ -1,10 +1,10 @@ -package alisolarflare.easyuhc.commands; +package alisolarflare.modules.easyuhc.commands; import org.bukkit.command.CommandSender; -import alisolarflare.DevCommand; +import alisolarflare.modules.PlayerCommand; -public class TeleportToUHC extends DevCommand{ +public class TeleportToUHC extends PlayerCommand{ @Override public boolean OnCommand(CommandSender sender, String alias, String[] args) { diff --git a/src/alisolarflare/easyuhc/gpowers/GPowerMemory.java b/src/alisolarflare/modules/easyuhc/gpowers/GPowerMemory.java similarity index 93% rename from src/alisolarflare/easyuhc/gpowers/GPowerMemory.java rename to src/alisolarflare/modules/easyuhc/gpowers/GPowerMemory.java index ccbab17..83a35be 100644 --- a/src/alisolarflare/easyuhc/gpowers/GPowerMemory.java +++ b/src/alisolarflare/modules/easyuhc/gpowers/GPowerMemory.java @@ -1,4 +1,4 @@ -package alisolarflare.easyuhc.gpowers; +package alisolarflare.modules.easyuhc.gpowers; import java.util.HashMap; import java.util.Map; diff --git a/src/alisolarflare/easyuhc/gpowers/commands/GPower.java b/src/alisolarflare/modules/easyuhc/gpowers/commands/GPower.java similarity index 82% rename from src/alisolarflare/easyuhc/gpowers/commands/GPower.java rename to src/alisolarflare/modules/easyuhc/gpowers/commands/GPower.java index b261519..6469d21 100644 --- a/src/alisolarflare/easyuhc/gpowers/commands/GPower.java +++ b/src/alisolarflare/modules/easyuhc/gpowers/commands/GPower.java @@ -1,12 +1,12 @@ -package alisolarflare.easyuhc.gpowers.commands; +package alisolarflare.modules.easyuhc.gpowers.commands; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import alisolarflare.easyuhc.gpowers.GPowerMemory; -import buttondevteam.lib.chat.TBMCCommandBase; +import alisolarflare.modules.PlayerCommand; +import alisolarflare.modules.easyuhc.gpowers.GPowerMemory; -public class GPower extends TBMCCommandBase { +public class GPower extends PlayerCommand { private GPowerMemory gPowerMemory; @@ -62,15 +62,4 @@ public class GPower extends TBMCCommandBase { public String GetCommandPath() { return "gpower"; } - - @Override - public boolean GetPlayerOnly() { - return true; - } - - @Override - public boolean GetModOnly() { - return false; - } - } diff --git a/src/alisolarflare/easyuhc/gpowers/commands/PowerAll.java b/src/alisolarflare/modules/easyuhc/gpowers/commands/PowerAll.java similarity index 65% rename from src/alisolarflare/easyuhc/gpowers/commands/PowerAll.java rename to src/alisolarflare/modules/easyuhc/gpowers/commands/PowerAll.java index 706d764..fa71fc2 100644 --- a/src/alisolarflare/easyuhc/gpowers/commands/PowerAll.java +++ b/src/alisolarflare/modules/easyuhc/gpowers/commands/PowerAll.java @@ -1,12 +1,12 @@ -package alisolarflare.easyuhc.gpowers.commands; +package alisolarflare.modules.easyuhc.gpowers.commands; import org.bukkit.command.CommandSender; -import alisolarflare.DevCommand; -import alisolarflare.easyuhc.gpowers.GPowerMemory; -import alisolarflare.easyuhc.gpowers.GPowerMemory.poweredPlayer; +import alisolarflare.modules.ModCommand; +import alisolarflare.modules.easyuhc.gpowers.GPowerMemory; +import alisolarflare.modules.easyuhc.gpowers.GPowerMemory.poweredPlayer; -public class PowerAll extends DevCommand{ +public class PowerAll extends ModCommand{ private GPowerMemory gPowerMemory; public PowerAll(GPowerMemory gPowerMemory) { diff --git a/src/alisolarflare/easyuhc/gpowers/commands/PowerDown.java b/src/alisolarflare/modules/easyuhc/gpowers/commands/PowerDown.java similarity index 61% rename from src/alisolarflare/easyuhc/gpowers/commands/PowerDown.java rename to src/alisolarflare/modules/easyuhc/gpowers/commands/PowerDown.java index 46f1717..f5bb5e2 100644 --- a/src/alisolarflare/easyuhc/gpowers/commands/PowerDown.java +++ b/src/alisolarflare/modules/easyuhc/gpowers/commands/PowerDown.java @@ -1,12 +1,12 @@ -package alisolarflare.easyuhc.gpowers.commands; +package alisolarflare.modules.easyuhc.gpowers.commands; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import alisolarflare.easyuhc.gpowers.GPowerMemory; -import buttondevteam.lib.chat.TBMCCommandBase; +import alisolarflare.modules.PlayerCommand; +import alisolarflare.modules.easyuhc.gpowers.GPowerMemory; -public class PowerDown extends TBMCCommandBase { +public class PowerDown extends PlayerCommand { private GPowerMemory gPowerMemory; @@ -33,17 +33,4 @@ public class PowerDown extends TBMCCommandBase { public String GetCommandPath() { return "powerdown"; } - - @Override - public boolean GetPlayerOnly() { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean GetModOnly() { - // TODO Auto-generated method stub - return false; - } - } diff --git a/src/alisolarflare/easyuhc/gpowers/commands/PowerUp.java b/src/alisolarflare/modules/easyuhc/gpowers/commands/PowerUp.java similarity index 63% rename from src/alisolarflare/easyuhc/gpowers/commands/PowerUp.java rename to src/alisolarflare/modules/easyuhc/gpowers/commands/PowerUp.java index 0f5748c..78c5b2b 100644 --- a/src/alisolarflare/easyuhc/gpowers/commands/PowerUp.java +++ b/src/alisolarflare/modules/easyuhc/gpowers/commands/PowerUp.java @@ -1,12 +1,12 @@ -package alisolarflare.easyuhc.gpowers.commands; +package alisolarflare.modules.easyuhc.gpowers.commands; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import alisolarflare.easyuhc.gpowers.GPowerMemory; -import buttondevteam.lib.chat.TBMCCommandBase; +import alisolarflare.modules.PlayerCommand; +import alisolarflare.modules.easyuhc.gpowers.GPowerMemory; -public class PowerUp extends TBMCCommandBase { +public class PowerUp extends PlayerCommand { private GPowerMemory gPowerMemory; @@ -34,16 +34,4 @@ public class PowerUp extends TBMCCommandBase { public String GetCommandPath() { return "powerup"; } - - @Override - public boolean GetPlayerOnly() { - return true; - } - - @Override - public boolean GetModOnly() { - // TODO Auto-generated method stub - return false; - } - } diff --git a/src/alisolarflare/easyuhc/gpowers/listeners/gPowerApplyingTask.java b/src/alisolarflare/modules/easyuhc/gpowers/listeners/gPowerApplyingTask.java similarity index 94% rename from src/alisolarflare/easyuhc/gpowers/listeners/gPowerApplyingTask.java rename to src/alisolarflare/modules/easyuhc/gpowers/listeners/gPowerApplyingTask.java index 35dcec2..e8c05c8 100644 --- a/src/alisolarflare/easyuhc/gpowers/listeners/gPowerApplyingTask.java +++ b/src/alisolarflare/modules/easyuhc/gpowers/listeners/gPowerApplyingTask.java @@ -1,4 +1,4 @@ -package alisolarflare.easyuhc.gpowers.listeners; +package alisolarflare.modules.easyuhc.gpowers.listeners; import java.util.Map; import java.util.UUID; @@ -10,7 +10,7 @@ import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; import org.bukkit.scheduler.BukkitRunnable; -import alisolarflare.easyuhc.gpowers.GPowerMemory.poweredPlayer; +import alisolarflare.modules.easyuhc.gpowers.GPowerMemory.poweredPlayer; public class gPowerApplyingTask extends BukkitRunnable{ private int powerLength = 300; diff --git a/src/alisolarflare/easyuhc/gpowers/listeners/gPowerListener.java b/src/alisolarflare/modules/easyuhc/gpowers/listeners/gPowerListener.java similarity index 70% rename from src/alisolarflare/easyuhc/gpowers/listeners/gPowerListener.java rename to src/alisolarflare/modules/easyuhc/gpowers/listeners/gPowerListener.java index 76bae71..461387e 100644 --- a/src/alisolarflare/easyuhc/gpowers/listeners/gPowerListener.java +++ b/src/alisolarflare/modules/easyuhc/gpowers/listeners/gPowerListener.java @@ -1,9 +1,9 @@ -package alisolarflare.easyuhc.gpowers.listeners; +package alisolarflare.modules.easyuhc.gpowers.listeners; import org.bukkit.event.Listener; import org.bukkit.plugin.java.JavaPlugin; -import alisolarflare.easyuhc.gpowers.GPowerMemory; +import alisolarflare.modules.easyuhc.gpowers.GPowerMemory; public class gPowerListener implements Listener{ diff --git a/src/alisolarflare/magic/MagicModule.java b/src/alisolarflare/modules/magic/MagicModule.java similarity index 53% rename from src/alisolarflare/magic/MagicModule.java rename to src/alisolarflare/modules/magic/MagicModule.java index 616b179..76477c2 100644 --- a/src/alisolarflare/magic/MagicModule.java +++ b/src/alisolarflare/modules/magic/MagicModule.java @@ -1,11 +1,11 @@ -package alisolarflare.magic; +package alisolarflare.modules.magic; import org.bukkit.plugin.java.JavaPlugin; -import alisolarflare.Module; -import alisolarflare.magic.tricks.AliArrowListener; -import alisolarflare.magic.tricks.BoomBowDeathListener; -import alisolarflare.magic.tricks.BoomBowListener; +import alisolarflare.modules.Module; +import alisolarflare.modules.magic.tricks.AliArrowListener; +import alisolarflare.modules.magic.tricks.BoomBowDeathListener; +import alisolarflare.modules.magic.tricks.BoomBowListener; public class MagicModule extends Module{ diff --git a/src/alisolarflare/magic/tricks/AliArrowListener.java b/src/alisolarflare/modules/magic/tricks/AliArrowListener.java similarity index 92% rename from src/alisolarflare/magic/tricks/AliArrowListener.java rename to src/alisolarflare/modules/magic/tricks/AliArrowListener.java index 36b8e12..437fa02 100644 --- a/src/alisolarflare/magic/tricks/AliArrowListener.java +++ b/src/alisolarflare/modules/magic/tricks/AliArrowListener.java @@ -1,4 +1,4 @@ -package alisolarflare.magic.tricks; +package alisolarflare.modules.magic.tricks; import org.bukkit.entity.Arrow; import org.bukkit.entity.EntityType; diff --git a/src/alisolarflare/magic/tricks/AliArrowTask.java b/src/alisolarflare/modules/magic/tricks/AliArrowTask.java similarity index 91% rename from src/alisolarflare/magic/tricks/AliArrowTask.java rename to src/alisolarflare/modules/magic/tricks/AliArrowTask.java index 10252b8..b21f161 100644 --- a/src/alisolarflare/magic/tricks/AliArrowTask.java +++ b/src/alisolarflare/modules/magic/tricks/AliArrowTask.java @@ -1,4 +1,4 @@ -package alisolarflare.magic.tricks; +package alisolarflare.modules.magic.tricks; import org.bukkit.Particle; import org.bukkit.entity.Arrow; diff --git a/src/alisolarflare/magic/tricks/BoomBowDeathListener.java b/src/alisolarflare/modules/magic/tricks/BoomBowDeathListener.java similarity index 89% rename from src/alisolarflare/magic/tricks/BoomBowDeathListener.java rename to src/alisolarflare/modules/magic/tricks/BoomBowDeathListener.java index 427537e..5a7b749 100644 --- a/src/alisolarflare/magic/tricks/BoomBowDeathListener.java +++ b/src/alisolarflare/modules/magic/tricks/BoomBowDeathListener.java @@ -1,4 +1,4 @@ -package alisolarflare.magic.tricks; +package alisolarflare.modules.magic.tricks; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/src/alisolarflare/magic/tricks/BoomBowListener.java b/src/alisolarflare/modules/magic/tricks/BoomBowListener.java similarity index 95% rename from src/alisolarflare/magic/tricks/BoomBowListener.java rename to src/alisolarflare/modules/magic/tricks/BoomBowListener.java index 5e74bd8..d650646 100644 --- a/src/alisolarflare/magic/tricks/BoomBowListener.java +++ b/src/alisolarflare/modules/magic/tricks/BoomBowListener.java @@ -1,4 +1,4 @@ -package alisolarflare.magic.tricks; +package alisolarflare.modules.magic.tricks; import org.bukkit.GameMode; import org.bukkit.Location; diff --git a/src/alisolarflare/magic/tricks/BoomBowRule.java b/src/alisolarflare/modules/magic/tricks/BoomBowRule.java similarity index 82% rename from src/alisolarflare/magic/tricks/BoomBowRule.java rename to src/alisolarflare/modules/magic/tricks/BoomBowRule.java index bbfbf8f..e701070 100644 --- a/src/alisolarflare/magic/tricks/BoomBowRule.java +++ b/src/alisolarflare/modules/magic/tricks/BoomBowRule.java @@ -1,11 +1,11 @@ -package alisolarflare.magic.tricks; +package alisolarflare.modules.magic.tricks; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import buttondevteam.lib.chat.TBMCCommandBase; +import alisolarflare.modules.ModCommand; //HEHEHHEHEH EAASSSTER EGGS -public class BoomBowRule extends TBMCCommandBase{ +public class BoomBowRule extends ModCommand{ public static boolean boomDecay; public static boolean healthReduction; public static boolean endCrystal; @@ -70,15 +70,4 @@ public class BoomBowRule extends TBMCCommandBase{ // TODO Auto-generated method stub return null; } - @Override - public boolean GetModOnly() { - // TODO Auto-generated method stub - return false; - } - @Override - public boolean GetPlayerOnly() { - // TODO Auto-generated method stub - return false; - } - } diff --git a/src/alisolarflare/magic/tricks/BoomDecayTask.java b/src/alisolarflare/modules/magic/tricks/BoomDecayTask.java similarity index 87% rename from src/alisolarflare/magic/tricks/BoomDecayTask.java rename to src/alisolarflare/modules/magic/tricks/BoomDecayTask.java index 5f1875c..5cc0401 100644 --- a/src/alisolarflare/magic/tricks/BoomDecayTask.java +++ b/src/alisolarflare/modules/magic/tricks/BoomDecayTask.java @@ -1,4 +1,4 @@ -package alisolarflare.magic.tricks; +package alisolarflare.modules.magic.tricks; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; diff --git a/src/alisolarflare/minigames/GameState.java b/src/alisolarflare/modules/minigames/GameState.java similarity index 54% rename from src/alisolarflare/minigames/GameState.java rename to src/alisolarflare/modules/minigames/GameState.java index 5c63bf3..c985192 100644 --- a/src/alisolarflare/minigames/GameState.java +++ b/src/alisolarflare/modules/minigames/GameState.java @@ -1,4 +1,4 @@ -package alisolarflare.minigames; +package alisolarflare.modules.minigames; public enum GameState { Idle, FreeForAll, Heroes; diff --git a/src/alisolarflare/minigames/MinigameModule.java b/src/alisolarflare/modules/minigames/MinigameModule.java similarity index 60% rename from src/alisolarflare/minigames/MinigameModule.java rename to src/alisolarflare/modules/minigames/MinigameModule.java index fe8712c..30f832e 100644 --- a/src/alisolarflare/minigames/MinigameModule.java +++ b/src/alisolarflare/modules/minigames/MinigameModule.java @@ -1,15 +1,15 @@ -package alisolarflare.minigames; +package alisolarflare.modules.minigames; import java.util.List; import org.bukkit.plugin.java.JavaPlugin; -import alisolarflare.Module; -import alisolarflare.minigames.commands.JoinMinigame; -import alisolarflare.minigames.commands.LeaveMinigame; -import alisolarflare.minigames.commands.ListFighters; -import alisolarflare.minigames.commands.SetColourSpawn; -import alisolarflare.minigames.data.SpawnSet; +import alisolarflare.modules.Module; +import alisolarflare.modules.minigames.commands.JoinMinigame; +import alisolarflare.modules.minigames.commands.LeaveMinigame; +import alisolarflare.modules.minigames.commands.ListFighters; +import alisolarflare.modules.minigames.commands.SetColourSpawn; +import alisolarflare.modules.minigames.data.SpawnSet; public class MinigameModule extends Module{ public SpawnSet spawnSet; diff --git a/src/alisolarflare/minigames/commands/JoinMinigame.java b/src/alisolarflare/modules/minigames/commands/JoinMinigame.java similarity index 68% rename from src/alisolarflare/minigames/commands/JoinMinigame.java rename to src/alisolarflare/modules/minigames/commands/JoinMinigame.java index fc194cd..5e00593 100644 --- a/src/alisolarflare/minigames/commands/JoinMinigame.java +++ b/src/alisolarflare/modules/minigames/commands/JoinMinigame.java @@ -1,12 +1,12 @@ -package alisolarflare.minigames.commands; +package alisolarflare.modules.minigames.commands; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import alisolarflare.minigames.MinigameModule; -import buttondevteam.lib.chat.TBMCCommandBase; +import alisolarflare.modules.PlayerCommand; +import alisolarflare.modules.minigames.MinigameModule; -public class JoinMinigame extends TBMCCommandBase { +public class JoinMinigame extends PlayerCommand { private MinigameModule module; public JoinMinigame(MinigameModule module) { @@ -39,15 +39,4 @@ public class JoinMinigame extends TBMCCommandBase { // TODO Auto-generated method stub return null; } - - @Override - public boolean GetPlayerOnly() { - return true; - } - - @Override - public boolean GetModOnly() { - return false; - } - } diff --git a/src/alisolarflare/minigames/commands/LeaveMinigame.java b/src/alisolarflare/modules/minigames/commands/LeaveMinigame.java similarity index 68% rename from src/alisolarflare/minigames/commands/LeaveMinigame.java rename to src/alisolarflare/modules/minigames/commands/LeaveMinigame.java index f234a32..555f0f7 100644 --- a/src/alisolarflare/minigames/commands/LeaveMinigame.java +++ b/src/alisolarflare/modules/minigames/commands/LeaveMinigame.java @@ -1,12 +1,12 @@ -package alisolarflare.minigames.commands; +package alisolarflare.modules.minigames.commands; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import alisolarflare.minigames.MinigameModule; -import buttondevteam.lib.chat.TBMCCommandBase; +import alisolarflare.modules.PlayerCommand; +import alisolarflare.modules.minigames.MinigameModule; -public class LeaveMinigame extends TBMCCommandBase { +public class LeaveMinigame extends PlayerCommand { private MinigameModule module; @@ -39,15 +39,4 @@ public class LeaveMinigame extends TBMCCommandBase { // TODO Auto-generated method stub return null; } - - @Override - public boolean GetPlayerOnly() { - return true; - } - - @Override - public boolean GetModOnly() { - return false; - } - } diff --git a/src/alisolarflare/minigames/commands/ListFighters.java b/src/alisolarflare/modules/minigames/commands/ListFighters.java similarity index 54% rename from src/alisolarflare/minigames/commands/ListFighters.java rename to src/alisolarflare/modules/minigames/commands/ListFighters.java index 6dda457..9174358 100644 --- a/src/alisolarflare/minigames/commands/ListFighters.java +++ b/src/alisolarflare/modules/minigames/commands/ListFighters.java @@ -1,11 +1,11 @@ -package alisolarflare.minigames.commands; +package alisolarflare.modules.minigames.commands; import org.bukkit.command.CommandSender; -import alisolarflare.minigames.MinigameModule; -import buttondevteam.lib.chat.TBMCCommandBase; +import alisolarflare.modules.PlayerCommand; +import alisolarflare.modules.minigames.MinigameModule; -public class ListFighters extends TBMCCommandBase { +public class ListFighters extends PlayerCommand { private MinigameModule lobby; public ListFighters(MinigameModule lobby) { @@ -23,15 +23,4 @@ public class ListFighters extends TBMCCommandBase { // TODO Auto-generated method stub return null; } - - @Override - public boolean GetPlayerOnly() { - return false; - } - - @Override - public boolean GetModOnly() { - return false; - } - } diff --git a/src/alisolarflare/minigames/commands/SetColourSpawn.java b/src/alisolarflare/modules/minigames/commands/SetColourSpawn.java similarity index 79% rename from src/alisolarflare/minigames/commands/SetColourSpawn.java rename to src/alisolarflare/modules/minigames/commands/SetColourSpawn.java index ca9501f..d6c14e3 100644 --- a/src/alisolarflare/minigames/commands/SetColourSpawn.java +++ b/src/alisolarflare/modules/minigames/commands/SetColourSpawn.java @@ -1,12 +1,12 @@ -package alisolarflare.minigames.commands; +package alisolarflare.modules.minigames.commands; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import alisolarflare.minigames.data.SpawnSet; -import buttondevteam.lib.chat.TBMCCommandBase; +import alisolarflare.modules.PlayerCommand; +import alisolarflare.modules.minigames.data.SpawnSet; -public class SetColourSpawn extends TBMCCommandBase{ +public class SetColourSpawn extends PlayerCommand{ private SpawnSet spawnSet; public SetColourSpawn(SpawnSet spawnSet){ @@ -70,15 +70,4 @@ public class SetColourSpawn extends TBMCCommandBase{ // TODO Auto-generated method stub return null; } - @Override - public boolean GetModOnly() { - // TODO Auto-generated method stub - return false; - } - @Override - public boolean GetPlayerOnly() { - // TODO Auto-generated method stub - return false; - } - } diff --git a/src/alisolarflare/minigames/data/SpawnSet.java b/src/alisolarflare/modules/minigames/data/SpawnSet.java similarity index 92% rename from src/alisolarflare/minigames/data/SpawnSet.java rename to src/alisolarflare/modules/minigames/data/SpawnSet.java index 40fd0ae..10f519e 100644 --- a/src/alisolarflare/minigames/data/SpawnSet.java +++ b/src/alisolarflare/modules/minigames/data/SpawnSet.java @@ -1,4 +1,4 @@ -package alisolarflare.minigames.data; +package alisolarflare.modules.minigames.data; import org.bukkit.Location; diff --git a/src/alisolarflare/minigames/entities/Fighter.java b/src/alisolarflare/modules/minigames/entities/Fighter.java similarity index 74% rename from src/alisolarflare/minigames/entities/Fighter.java rename to src/alisolarflare/modules/minigames/entities/Fighter.java index 557c1ae..ace6db1 100644 --- a/src/alisolarflare/minigames/entities/Fighter.java +++ b/src/alisolarflare/modules/minigames/entities/Fighter.java @@ -1,4 +1,4 @@ -package alisolarflare.minigames.entities; +package alisolarflare.modules.minigames.entities; import org.bukkit.entity.Player; diff --git a/src/graveyard/shulker/AliShulkerModule.java b/src/graveyard/shulker/AliShulkerModule.java index 3425a02..6b47bdd 100644 --- a/src/graveyard/shulker/AliShulkerModule.java +++ b/src/graveyard/shulker/AliShulkerModule.java @@ -2,7 +2,7 @@ package graveyard.shulker; import org.bukkit.plugin.java.JavaPlugin; -import alisolarflare.Module; +import alisolarflare.modules.Module; import graveyard.shulker.commands.AliShulker; /**@deprecated*/