Created ModCommand and PlayerCommand abstract classes

Take note of PlayerCommand.GetHelpText
This commit is contained in:
alisolarflare 2016-11-11 20:00:07 -05:00
parent 15bd516096
commit 3946a0d4c9
61 changed files with 279 additions and 497 deletions

View file

@ -8,10 +8,10 @@ import org.bukkit.plugin.java.JavaPlugin;
import alisolarflare.components.flairdoor.FlairDoorModule; import alisolarflare.components.flairdoor.FlairDoorModule;
import alisolarflare.components.links.AliLinkModule; import alisolarflare.components.links.AliLinkModule;
import alisolarflare.creativeboundaries.CreativeBoundariesModule; import alisolarflare.modules.creativeboundaries.CreativeBoundariesModule;
import alisolarflare.easyuhc.EasyUHCModule; import alisolarflare.modules.easyuhc.EasyUHCModule;
import alisolarflare.magic.MagicModule; import alisolarflare.modules.magic.MagicModule;
import alisolarflare.minigames.MinigameModule; import alisolarflare.modules.minigames.MinigameModule;
public class AliPresents extends JavaPlugin{ public class AliPresents extends JavaPlugin{
public void onEnable(){ public void onEnable(){

View file

@ -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;
}
}

View file

@ -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;
}
}

View file

@ -2,9 +2,9 @@ package alisolarflare.components.flairdoor;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import alisolarflare.Module;
import alisolarflare.components.flairdoor.commands.FlairMe; import alisolarflare.components.flairdoor.commands.FlairMe;
import alisolarflare.components.flairdoor.listeners.PortalListener; import alisolarflare.components.flairdoor.listeners.PortalListener;
import alisolarflare.modules.Module;
public class FlairDoorModule extends Module { public class FlairDoorModule extends Module {
@Override @Override

View file

@ -3,9 +3,9 @@ package alisolarflare.components.flairdoor.commands;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import alisolarflare.components.flairdoor.listeners.PortalListener; 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 @Override
public boolean OnCommand(CommandSender sender, String label, String[] args) { public boolean OnCommand(CommandSender sender, String label, String[] args) {
@ -25,15 +25,4 @@ public class FlairMe extends TBMCCommandBase {
public String GetCommandPath() { public String GetCommandPath() {
return "flairme"; return "flairme";
} }
@Override
public boolean GetPlayerOnly() {
return true;
}
@Override
public boolean GetModOnly() {
return false;
}
} }

View file

@ -4,10 +4,10 @@ import java.util.List;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import alisolarflare.Module;
import alisolarflare.components.links.commands.PressAliLink; import alisolarflare.components.links.commands.PressAliLink;
import alisolarflare.components.links.commands.SetAliLink; import alisolarflare.components.links.commands.SetAliLink;
import alisolarflare.components.links.entities.Link; import alisolarflare.components.links.entities.Link;
import alisolarflare.modules.Module;
public class AliLinkModule extends Module { public class AliLinkModule extends Module {
private SetAliLink setAliLink; private SetAliLink setAliLink;

View file

@ -4,9 +4,9 @@ import org.bukkit.command.CommandSender;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import alisolarflare.components.links.entities.Link; 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 JavaPlugin plugin;
private SetAliLink setAliLink; private SetAliLink setAliLink;
@ -36,25 +36,6 @@ public class PressAliLink extends TBMCCommandBase {
@Override @Override
public String[] GetHelpText(String alias) { public String[] GetHelpText(String alias) {
// TODO Auto-generated method stub
return null; 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;
}
} }

View file

@ -11,7 +11,7 @@ import org.bukkit.plugin.java.JavaPlugin;
import alisolarflare.components.links.AliLinkModule; import alisolarflare.components.links.AliLinkModule;
import alisolarflare.components.links.entities.Link; import alisolarflare.components.links.entities.Link;
import buttondevteam.lib.chat.TBMCCommandBase; import alisolarflare.modules.PlayerCommand;
/** /**
* This class manages the command /SetAliLink <frequency> [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 * This class manages the command /SetAliLink <frequency> [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 * @author Alisolarflare
* *
*/ */
public class SetAliLink extends TBMCCommandBase { public class SetAliLink extends PlayerCommand {
public List<Link> linkList = new ArrayList<Link>(); public List<Link> linkList = new ArrayList<Link>();
AliLinkModule subplugin; AliLinkModule subplugin;
private JavaPlugin plugin; private JavaPlugin plugin;
@ -120,21 +120,4 @@ public class SetAliLink extends TBMCCommandBase {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; 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;
}
} }

View file

@ -1,16 +1,19 @@
package alisolarflare; package alisolarflare.modules;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import buttondevteam.lib.chat.TBMCCommandBase; import buttondevteam.lib.chat.TBMCCommandBase;
public abstract class DevCommand extends TBMCCommandBase{ public abstract class ModCommand extends TBMCCommandBase{
@Override @Override
public abstract boolean OnCommand(CommandSender sender, String alias, String[] args); public abstract boolean OnCommand(CommandSender sender, String alias, String[] args);
@Override @Override
public abstract String[] GetHelpText(String alias); 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 @Override
public boolean GetPlayerOnly() { public boolean GetPlayerOnly() {

View file

@ -1,4 +1,4 @@
package alisolarflare; package alisolarflare.modules;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;

View file

@ -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"};
}
}

View file

@ -1,16 +1,16 @@
package alisolarflare.autouhc; package alisolarflare.modules.autouhc;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import alisolarflare.Module; import alisolarflare.modules.Module;
import alisolarflare.autouhc.controller.SetMatchState; import alisolarflare.modules.autouhc.controller.SetMatchState;
import alisolarflare.autouhc.idle.AddToUHC; import alisolarflare.modules.autouhc.idle.AddToUHC;
import alisolarflare.autouhc.idle.JoinUHC; import alisolarflare.modules.autouhc.idle.JoinUHC;
import alisolarflare.autouhc.intro.ConfigureMatch; import alisolarflare.modules.autouhc.intro.ConfigureMatch;
import alisolarflare.autouhc.intro.ScheduleMatch; import alisolarflare.modules.autouhc.intro.ScheduleMatch;
import alisolarflare.autouhc.intro.StartMatch; import alisolarflare.modules.autouhc.intro.StartMatch;
import alisolarflare.autouhc.memory.MatchState; import alisolarflare.modules.autouhc.memory.MatchState;
import alisolarflare.autouhc.memory.UHCMatch; import alisolarflare.modules.autouhc.memory.UHCMatch;
public class UHCModule extends Module { public class UHCModule extends Module {
public UHCMatch match; public UHCMatch match;

View file

@ -1,24 +1,19 @@
package alisolarflare.autouhc.controller; package alisolarflare.modules.autouhc.controller;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import alisolarflare.autouhc.memory.MatchState; import alisolarflare.modules.ModCommand;
import alisolarflare.autouhc.memory.UHCMatch; import alisolarflare.modules.autouhc.memory.MatchState;
import buttondevteam.lib.chat.TBMCCommandBase; import alisolarflare.modules.autouhc.memory.UHCMatch;
public class SetMatchState extends TBMCCommandBase{ public class SetMatchState extends ModCommand{
UHCMatch match; UHCMatch match;
public SetMatchState(UHCMatch match) { public SetMatchState(UHCMatch match) {
this.match = match; this.match = match;
} }
@Override
public String[] GetHelpText(String alias) {
return null;
}
@Override @Override
public boolean OnCommand(CommandSender sender, String alias, String[] args) { public boolean OnCommand(CommandSender sender, String alias, String[] args) {
if (!(sender instanceof Player)){ if (!(sender instanceof Player)){
@ -73,4 +68,9 @@ public class SetMatchState extends TBMCCommandBase{
return false; return false;
} }
@Override
public String[] GetHelpText(String alias) {
return new String[] { "" };
}
} }

View file

@ -1,17 +1,17 @@
package alisolarflare.autouhc.idle; package alisolarflare.modules.autouhc.idle;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import alisolarflare.autouhc.memory.UHCMatch; import alisolarflare.modules.ModCommand;
import buttondevteam.lib.chat.TBMCCommandBase; 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)} * 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 * @author Alisolarflare
*/ */
public class AddToUHC extends TBMCCommandBase { public class AddToUHC extends ModCommand {
private UHCMatch match; private UHCMatch match;
public AddToUHC(UHCMatch match) { public AddToUHC(UHCMatch match) {
@ -57,21 +57,4 @@ public class AddToUHC extends TBMCCommandBase {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; 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;
}
} }

View file

@ -1,12 +1,12 @@
package alisolarflare.autouhc.idle; package alisolarflare.modules.autouhc.idle;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import alisolarflare.autouhc.memory.UHCMatch; import alisolarflare.modules.ModCommand;
import buttondevteam.lib.chat.TBMCCommandBase; import alisolarflare.modules.autouhc.memory.UHCMatch;
public class JoinUHC extends TBMCCommandBase{ public class JoinUHC extends ModCommand{
private UHCMatch match; private UHCMatch match;
@ -51,17 +51,4 @@ public class JoinUHC extends TBMCCommandBase{
return false; return false;
} }
@Override
public boolean GetPlayerOnly() {
// TODO Auto-generated method stub
return false;
}
@Override
public boolean GetModOnly() {
// TODO Auto-generated method stub
return false;
}
} }

View file

@ -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;
}
}

View file

@ -1,4 +1,4 @@
package alisolarflare.autouhc.intro; package alisolarflare.modules.autouhc.intro;
public class IntroductionCutscene { public class IntroductionCutscene {
//TODO: Teleport all players to the area. //TODO: Teleport all players to the area.

View file

@ -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;
}
}

View file

@ -1,12 +1,12 @@
package alisolarflare.autouhc.intro; package alisolarflare.modules.autouhc.intro;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import alisolarflare.autouhc.memory.MatchState; import alisolarflare.modules.ModCommand;
import alisolarflare.autouhc.memory.UHCMatch; import alisolarflare.modules.autouhc.memory.MatchState;
import buttondevteam.lib.chat.TBMCCommandBase; import alisolarflare.modules.autouhc.memory.UHCMatch;
public class StartMatch extends TBMCCommandBase { public class StartMatch extends ModCommand {
private UHCMatch match; private UHCMatch match;
public StartMatch(UHCMatch match) { public StartMatch(UHCMatch match) {
@ -37,8 +37,6 @@ public class StartMatch extends TBMCCommandBase {
default: default:
sender.sendMessage("You cannot start a match now, one is already in progress!"); sender.sendMessage("You cannot start a match now, one is already in progress!");
} }
return false; return false;
@ -56,15 +54,4 @@ public class StartMatch extends TBMCCommandBase {
public String GetCommandPath() { public String GetCommandPath() {
return "startmatch"; return "startmatch";
} }
@Override
public boolean GetPlayerOnly() {
return true;
}
@Override
public boolean GetModOnly() {
// TODO Auto-generated method stub
return false;
}
} }

View file

@ -1,4 +1,4 @@
package alisolarflare.autouhc.listeners; package alisolarflare.modules.autouhc.listeners;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;

View file

@ -1,4 +1,4 @@
package alisolarflare.autouhc.listeners; package alisolarflare.modules.autouhc.listeners;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;

View file

@ -1,4 +1,4 @@
package alisolarflare.autouhc.memory; package alisolarflare.modules.autouhc.memory;
public enum MatchState { public enum MatchState {
IDLE, //Idle: Configure Match, Wait: Schedule Match, Intro: Start Match IDLE, //Idle: Configure Match, Wait: Schedule Match, Intro: Start Match

View file

@ -1,4 +1,4 @@
package alisolarflare.autouhc.memory; package alisolarflare.modules.autouhc.memory;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

View file

@ -1,4 +1,4 @@
package alisolarflare.creativeboundaries; package alisolarflare.modules.creativeboundaries;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -6,12 +6,12 @@ import java.util.List;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import alisolarflare.Module; import alisolarflare.modules.Module;
import alisolarflare.creativeboundaries.commands.Cbgm0; import alisolarflare.modules.creativeboundaries.commands.Cbgm0;
import alisolarflare.creativeboundaries.commands.Cbgm1; import alisolarflare.modules.creativeboundaries.commands.Cbgm1;
import alisolarflare.creativeboundaries.commands.SetDickmode; import alisolarflare.modules.creativeboundaries.commands.SetDickmode;
import alisolarflare.creativeboundaries.listeners.ItemRestrictionListener; import alisolarflare.modules.creativeboundaries.listeners.ItemRestrictionListener;
import alisolarflare.creativeboundaries.listeners.PlotChangeListener; import alisolarflare.modules.creativeboundaries.listeners.PlotChangeListener;
public class CreativeBoundariesModule extends Module{ public class CreativeBoundariesModule extends Module{

View file

@ -1,13 +1,13 @@
package alisolarflare.creativeboundaries.commands; package alisolarflare.modules.creativeboundaries.commands;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import alisolarflare.creativeboundaries.CreativeBoundariesModule; import alisolarflare.modules.PlayerCommand;
import buttondevteam.lib.chat.TBMCCommandBase; import alisolarflare.modules.creativeboundaries.CreativeBoundariesModule;
public class Cbgm0 extends TBMCCommandBase{ public class Cbgm0 extends PlayerCommand{
private CreativeBoundariesModule module; private CreativeBoundariesModule module;
@ -33,17 +33,4 @@ public class Cbgm0 extends TBMCCommandBase{
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; return null;
} }
@Override
public boolean GetPlayerOnly() {
// TODO Auto-generated method stub
return false;
}
@Override
public boolean GetModOnly() {
// TODO Auto-generated method stub
return false;
}
} }

View file

@ -1,4 +1,4 @@
package alisolarflare.creativeboundaries.commands; package alisolarflare.modules.creativeboundaries.commands;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.command.CommandSender; 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.TownBlock;
import com.palmergames.bukkit.towny.object.TownyUniverse; import com.palmergames.bukkit.towny.object.TownyUniverse;
import alisolarflare.creativeboundaries.CreativeBoundariesModule; import alisolarflare.modules.PlayerCommand;
import buttondevteam.lib.chat.TBMCCommandBase; import alisolarflare.modules.creativeboundaries.CreativeBoundariesModule;
public class Cbgm1 extends TBMCCommandBase { public class Cbgm1 extends PlayerCommand {
private CreativeBoundariesModule module; private CreativeBoundariesModule module;
@ -66,17 +66,4 @@ public class Cbgm1 extends TBMCCommandBase {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; return null;
} }
@Override
public boolean GetPlayerOnly() {
// TODO Auto-generated method stub
return false;
}
@Override
public boolean GetModOnly() {
// TODO Auto-generated method stub
return false;
}
} }

View file

@ -1,11 +1,11 @@
package alisolarflare.creativeboundaries.commands; package alisolarflare.modules.creativeboundaries.commands;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import alisolarflare.creativeboundaries.CreativeBoundariesModule; import alisolarflare.modules.PlayerCommand;
import buttondevteam.lib.chat.TBMCCommandBase; import alisolarflare.modules.creativeboundaries.CreativeBoundariesModule;
public class SetDickmode extends TBMCCommandBase{ public class SetDickmode extends PlayerCommand{
private CreativeBoundariesModule module; private CreativeBoundariesModule module;
public SetDickmode(CreativeBoundariesModule module){ public SetDickmode(CreativeBoundariesModule module){
@ -39,16 +39,4 @@ public class SetDickmode extends TBMCCommandBase{
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; return null;
} }
@Override
public boolean GetPlayerOnly() {
// TODO Auto-generated method stub
return false;
}
@Override
public boolean GetModOnly() {
// TODO Auto-generated method stub
return false;
}
} }

View file

@ -1,4 +1,4 @@
package alisolarflare.creativeboundaries.listeners; package alisolarflare.modules.creativeboundaries.listeners;
import java.util.List; import java.util.List;
@ -7,7 +7,7 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.inventory.InventoryCreativeEvent; import org.bukkit.event.inventory.InventoryCreativeEvent;
import alisolarflare.creativeboundaries.CreativeBoundariesModule; import alisolarflare.modules.creativeboundaries.CreativeBoundariesModule;
public class ItemRestrictionListener implements Listener { public class ItemRestrictionListener implements Listener {

View file

@ -1,4 +1,4 @@
package alisolarflare.creativeboundaries.listeners; package alisolarflare.modules.creativeboundaries.listeners;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.entity.Player; 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.TownBlock;
import com.palmergames.bukkit.towny.object.TownyUniverse; import com.palmergames.bukkit.towny.object.TownyUniverse;
import alisolarflare.creativeboundaries.CreativeBoundariesModule; import alisolarflare.modules.creativeboundaries.CreativeBoundariesModule;
public class PlotChangeListener implements Listener{ public class PlotChangeListener implements Listener{
public CreativeBoundariesModule module; public CreativeBoundariesModule module;

View file

@ -1,21 +1,21 @@
package alisolarflare.easyuhc; package alisolarflare.modules.easyuhc;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import alisolarflare.Module; import alisolarflare.modules.Module;
import alisolarflare.easyuhc.commands.ActivatePowers; import alisolarflare.modules.easyuhc.commands.ActivatePowers;
import alisolarflare.easyuhc.commands.SetUHCLobby; import alisolarflare.modules.easyuhc.commands.SetUHCLobby;
import alisolarflare.easyuhc.commands.SetWorldBorders; import alisolarflare.modules.easyuhc.commands.SetWorldBorders;
import alisolarflare.easyuhc.commands.SpreadPlayers; import alisolarflare.modules.easyuhc.commands.SpreadPlayers;
import alisolarflare.easyuhc.commands.StartTimer; import alisolarflare.modules.easyuhc.commands.StartTimer;
import alisolarflare.easyuhc.commands.StartUHC; import alisolarflare.modules.easyuhc.commands.StartUHC;
import alisolarflare.easyuhc.commands.TeleportToUHC; import alisolarflare.modules.easyuhc.commands.TeleportToUHC;
import alisolarflare.easyuhc.gpowers.GPowerMemory; import alisolarflare.modules.easyuhc.gpowers.GPowerMemory;
import alisolarflare.easyuhc.gpowers.commands.GPower; import alisolarflare.modules.easyuhc.gpowers.commands.GPower;
import alisolarflare.easyuhc.gpowers.commands.PowerDown; import alisolarflare.modules.easyuhc.gpowers.commands.PowerDown;
import alisolarflare.easyuhc.gpowers.commands.PowerUp; import alisolarflare.modules.easyuhc.gpowers.commands.PowerUp;
import alisolarflare.easyuhc.gpowers.listeners.gPowerListener; import alisolarflare.modules.easyuhc.gpowers.listeners.gPowerListener;
public class EasyUHCModule extends Module{ public class EasyUHCModule extends Module{
public Location lobbyLocation; public Location lobbyLocation;

View file

@ -1,10 +1,10 @@
package alisolarflare.easyuhc.commands; package alisolarflare.modules.easyuhc.commands;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import alisolarflare.DevCommand; import alisolarflare.modules.ModCommand;
public class ActivatePowers extends DevCommand{ public class ActivatePowers extends ModCommand{
@Override @Override
public boolean OnCommand(CommandSender sender, String alias, String[] args) { public boolean OnCommand(CommandSender sender, String alias, String[] args) {

View file

@ -1,12 +1,12 @@
package alisolarflare.easyuhc.commands; package alisolarflare.modules.easyuhc.commands;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import alisolarflare.DevCommand; import alisolarflare.modules.ModCommand;
import alisolarflare.easyuhc.EasyUHCModule; import alisolarflare.modules.easyuhc.EasyUHCModule;
public class SetUHCLobby extends DevCommand{ public class SetUHCLobby extends ModCommand{
EasyUHCModule module; EasyUHCModule module;
public SetUHCLobby(EasyUHCModule easyUHCModule) { public SetUHCLobby(EasyUHCModule easyUHCModule) {
this.module = easyUHCModule; this.module = easyUHCModule;

View file

@ -1,10 +1,10 @@
package alisolarflare.easyuhc.commands; package alisolarflare.modules.easyuhc.commands;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import alisolarflare.DevCommand; import alisolarflare.modules.ModCommand;
public class SetWorldBorders extends DevCommand { public class SetWorldBorders extends ModCommand {
@Override @Override
public boolean OnCommand(CommandSender sender, String alias, String[] args) { public boolean OnCommand(CommandSender sender, String alias, String[] args) {

View file

@ -1,10 +1,10 @@
package alisolarflare.easyuhc.commands; package alisolarflare.modules.easyuhc.commands;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import alisolarflare.DevCommand; import alisolarflare.modules.ModCommand;
public class ShrinkWorldBorders extends DevCommand { public class ShrinkWorldBorders extends ModCommand {
@Override @Override
public boolean OnCommand(CommandSender sender, String alias, String[] args) { public boolean OnCommand(CommandSender sender, String alias, String[] args) {

View file

@ -1,10 +1,10 @@
package alisolarflare.easyuhc.commands; package alisolarflare.modules.easyuhc.commands;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import alisolarflare.DevCommand; import alisolarflare.modules.ModCommand;
public class SpreadPlayers extends DevCommand{ public class SpreadPlayers extends ModCommand{
@Override @Override
public boolean OnCommand(CommandSender sender, String alias, String[] args) { public boolean OnCommand(CommandSender sender, String alias, String[] args) {

View file

@ -1,10 +1,10 @@
package alisolarflare.easyuhc.commands; package alisolarflare.modules.easyuhc.commands;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import alisolarflare.DevCommand; import alisolarflare.modules.ModCommand;
public class StartTimer extends DevCommand{ public class StartTimer extends ModCommand{
@Override @Override
public boolean OnCommand(CommandSender sender, String alias, String[] args) { public boolean OnCommand(CommandSender sender, String alias, String[] args) {

View file

@ -1,10 +1,10 @@
package alisolarflare.easyuhc.commands; package alisolarflare.modules.easyuhc.commands;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import alisolarflare.DevCommand; import alisolarflare.modules.ModCommand;
public class StartUHC extends DevCommand{ public class StartUHC extends ModCommand{
@Override @Override
public boolean OnCommand(CommandSender sender, String alias, String[] args) { public boolean OnCommand(CommandSender sender, String alias, String[] args) {

View file

@ -1,10 +1,10 @@
package alisolarflare.easyuhc.commands; package alisolarflare.modules.easyuhc.commands;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import alisolarflare.DevCommand; import alisolarflare.modules.PlayerCommand;
public class TeleportToUHC extends DevCommand{ public class TeleportToUHC extends PlayerCommand{
@Override @Override
public boolean OnCommand(CommandSender sender, String alias, String[] args) { public boolean OnCommand(CommandSender sender, String alias, String[] args) {

View file

@ -1,4 +1,4 @@
package alisolarflare.easyuhc.gpowers; package alisolarflare.modules.easyuhc.gpowers;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;

View file

@ -1,12 +1,12 @@
package alisolarflare.easyuhc.gpowers.commands; package alisolarflare.modules.easyuhc.gpowers.commands;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import alisolarflare.easyuhc.gpowers.GPowerMemory; import alisolarflare.modules.PlayerCommand;
import buttondevteam.lib.chat.TBMCCommandBase; import alisolarflare.modules.easyuhc.gpowers.GPowerMemory;
public class GPower extends TBMCCommandBase { public class GPower extends PlayerCommand {
private GPowerMemory gPowerMemory; private GPowerMemory gPowerMemory;
@ -62,15 +62,4 @@ public class GPower extends TBMCCommandBase {
public String GetCommandPath() { public String GetCommandPath() {
return "gpower"; return "gpower";
} }
@Override
public boolean GetPlayerOnly() {
return true;
}
@Override
public boolean GetModOnly() {
return false;
}
} }

View file

@ -1,12 +1,12 @@
package alisolarflare.easyuhc.gpowers.commands; package alisolarflare.modules.easyuhc.gpowers.commands;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import alisolarflare.DevCommand; import alisolarflare.modules.ModCommand;
import alisolarflare.easyuhc.gpowers.GPowerMemory; import alisolarflare.modules.easyuhc.gpowers.GPowerMemory;
import alisolarflare.easyuhc.gpowers.GPowerMemory.poweredPlayer; import alisolarflare.modules.easyuhc.gpowers.GPowerMemory.poweredPlayer;
public class PowerAll extends DevCommand{ public class PowerAll extends ModCommand{
private GPowerMemory gPowerMemory; private GPowerMemory gPowerMemory;
public PowerAll(GPowerMemory gPowerMemory) { public PowerAll(GPowerMemory gPowerMemory) {

View file

@ -1,12 +1,12 @@
package alisolarflare.easyuhc.gpowers.commands; package alisolarflare.modules.easyuhc.gpowers.commands;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import alisolarflare.easyuhc.gpowers.GPowerMemory; import alisolarflare.modules.PlayerCommand;
import buttondevteam.lib.chat.TBMCCommandBase; import alisolarflare.modules.easyuhc.gpowers.GPowerMemory;
public class PowerDown extends TBMCCommandBase { public class PowerDown extends PlayerCommand {
private GPowerMemory gPowerMemory; private GPowerMemory gPowerMemory;
@ -33,17 +33,4 @@ public class PowerDown extends TBMCCommandBase {
public String GetCommandPath() { public String GetCommandPath() {
return "powerdown"; return "powerdown";
} }
@Override
public boolean GetPlayerOnly() {
// TODO Auto-generated method stub
return false;
}
@Override
public boolean GetModOnly() {
// TODO Auto-generated method stub
return false;
}
} }

View file

@ -1,12 +1,12 @@
package alisolarflare.easyuhc.gpowers.commands; package alisolarflare.modules.easyuhc.gpowers.commands;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import alisolarflare.easyuhc.gpowers.GPowerMemory; import alisolarflare.modules.PlayerCommand;
import buttondevteam.lib.chat.TBMCCommandBase; import alisolarflare.modules.easyuhc.gpowers.GPowerMemory;
public class PowerUp extends TBMCCommandBase { public class PowerUp extends PlayerCommand {
private GPowerMemory gPowerMemory; private GPowerMemory gPowerMemory;
@ -34,16 +34,4 @@ public class PowerUp extends TBMCCommandBase {
public String GetCommandPath() { public String GetCommandPath() {
return "powerup"; return "powerup";
} }
@Override
public boolean GetPlayerOnly() {
return true;
}
@Override
public boolean GetModOnly() {
// TODO Auto-generated method stub
return false;
}
} }

View file

@ -1,4 +1,4 @@
package alisolarflare.easyuhc.gpowers.listeners; package alisolarflare.modules.easyuhc.gpowers.listeners;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
@ -10,7 +10,7 @@ import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType; import org.bukkit.potion.PotionEffectType;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
import alisolarflare.easyuhc.gpowers.GPowerMemory.poweredPlayer; import alisolarflare.modules.easyuhc.gpowers.GPowerMemory.poweredPlayer;
public class gPowerApplyingTask extends BukkitRunnable{ public class gPowerApplyingTask extends BukkitRunnable{
private int powerLength = 300; private int powerLength = 300;

View file

@ -1,9 +1,9 @@
package alisolarflare.easyuhc.gpowers.listeners; package alisolarflare.modules.easyuhc.gpowers.listeners;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import alisolarflare.easyuhc.gpowers.GPowerMemory; import alisolarflare.modules.easyuhc.gpowers.GPowerMemory;
public class gPowerListener implements Listener{ public class gPowerListener implements Listener{

View file

@ -1,11 +1,11 @@
package alisolarflare.magic; package alisolarflare.modules.magic;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import alisolarflare.Module; import alisolarflare.modules.Module;
import alisolarflare.magic.tricks.AliArrowListener; import alisolarflare.modules.magic.tricks.AliArrowListener;
import alisolarflare.magic.tricks.BoomBowDeathListener; import alisolarflare.modules.magic.tricks.BoomBowDeathListener;
import alisolarflare.magic.tricks.BoomBowListener; import alisolarflare.modules.magic.tricks.BoomBowListener;
public class MagicModule extends Module{ public class MagicModule extends Module{

View file

@ -1,4 +1,4 @@
package alisolarflare.magic.tricks; package alisolarflare.modules.magic.tricks;
import org.bukkit.entity.Arrow; import org.bukkit.entity.Arrow;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;

View file

@ -1,4 +1,4 @@
package alisolarflare.magic.tricks; package alisolarflare.modules.magic.tricks;
import org.bukkit.Particle; import org.bukkit.Particle;
import org.bukkit.entity.Arrow; import org.bukkit.entity.Arrow;

View file

@ -1,4 +1,4 @@
package alisolarflare.magic.tricks; package alisolarflare.modules.magic.tricks;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;

View file

@ -1,4 +1,4 @@
package alisolarflare.magic.tricks; package alisolarflare.modules.magic.tricks;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.Location; import org.bukkit.Location;

View file

@ -1,11 +1,11 @@
package alisolarflare.magic.tricks; package alisolarflare.modules.magic.tricks;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import buttondevteam.lib.chat.TBMCCommandBase; import alisolarflare.modules.ModCommand;
//HEHEHHEHEH EAASSSTER EGGS //HEHEHHEHEH EAASSSTER EGGS
public class BoomBowRule extends TBMCCommandBase{ public class BoomBowRule extends ModCommand{
public static boolean boomDecay; public static boolean boomDecay;
public static boolean healthReduction; public static boolean healthReduction;
public static boolean endCrystal; public static boolean endCrystal;
@ -70,15 +70,4 @@ public class BoomBowRule extends TBMCCommandBase{
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; return null;
} }
@Override
public boolean GetModOnly() {
// TODO Auto-generated method stub
return false;
}
@Override
public boolean GetPlayerOnly() {
// TODO Auto-generated method stub
return false;
}
} }

View file

@ -1,4 +1,4 @@
package alisolarflare.magic.tricks; package alisolarflare.modules.magic.tricks;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;

View file

@ -1,4 +1,4 @@
package alisolarflare.minigames; package alisolarflare.modules.minigames;
public enum GameState { public enum GameState {
Idle, FreeForAll, Heroes; Idle, FreeForAll, Heroes;

View file

@ -1,15 +1,15 @@
package alisolarflare.minigames; package alisolarflare.modules.minigames;
import java.util.List; import java.util.List;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import alisolarflare.Module; import alisolarflare.modules.Module;
import alisolarflare.minigames.commands.JoinMinigame; import alisolarflare.modules.minigames.commands.JoinMinigame;
import alisolarflare.minigames.commands.LeaveMinigame; import alisolarflare.modules.minigames.commands.LeaveMinigame;
import alisolarflare.minigames.commands.ListFighters; import alisolarflare.modules.minigames.commands.ListFighters;
import alisolarflare.minigames.commands.SetColourSpawn; import alisolarflare.modules.minigames.commands.SetColourSpawn;
import alisolarflare.minigames.data.SpawnSet; import alisolarflare.modules.minigames.data.SpawnSet;
public class MinigameModule extends Module{ public class MinigameModule extends Module{
public SpawnSet spawnSet; public SpawnSet spawnSet;

View file

@ -1,12 +1,12 @@
package alisolarflare.minigames.commands; package alisolarflare.modules.minigames.commands;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import alisolarflare.minigames.MinigameModule; import alisolarflare.modules.PlayerCommand;
import buttondevteam.lib.chat.TBMCCommandBase; import alisolarflare.modules.minigames.MinigameModule;
public class JoinMinigame extends TBMCCommandBase { public class JoinMinigame extends PlayerCommand {
private MinigameModule module; private MinigameModule module;
public JoinMinigame(MinigameModule module) { public JoinMinigame(MinigameModule module) {
@ -39,15 +39,4 @@ public class JoinMinigame extends TBMCCommandBase {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; return null;
} }
@Override
public boolean GetPlayerOnly() {
return true;
}
@Override
public boolean GetModOnly() {
return false;
}
} }

View file

@ -1,12 +1,12 @@
package alisolarflare.minigames.commands; package alisolarflare.modules.minigames.commands;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import alisolarflare.minigames.MinigameModule; import alisolarflare.modules.PlayerCommand;
import buttondevteam.lib.chat.TBMCCommandBase; import alisolarflare.modules.minigames.MinigameModule;
public class LeaveMinigame extends TBMCCommandBase { public class LeaveMinigame extends PlayerCommand {
private MinigameModule module; private MinigameModule module;
@ -39,15 +39,4 @@ public class LeaveMinigame extends TBMCCommandBase {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; return null;
} }
@Override
public boolean GetPlayerOnly() {
return true;
}
@Override
public boolean GetModOnly() {
return false;
}
} }

View file

@ -1,11 +1,11 @@
package alisolarflare.minigames.commands; package alisolarflare.modules.minigames.commands;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import alisolarflare.minigames.MinigameModule; import alisolarflare.modules.PlayerCommand;
import buttondevteam.lib.chat.TBMCCommandBase; import alisolarflare.modules.minigames.MinigameModule;
public class ListFighters extends TBMCCommandBase { public class ListFighters extends PlayerCommand {
private MinigameModule lobby; private MinigameModule lobby;
public ListFighters(MinigameModule lobby) { public ListFighters(MinigameModule lobby) {
@ -23,15 +23,4 @@ public class ListFighters extends TBMCCommandBase {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; return null;
} }
@Override
public boolean GetPlayerOnly() {
return false;
}
@Override
public boolean GetModOnly() {
return false;
}
} }

View file

@ -1,12 +1,12 @@
package alisolarflare.minigames.commands; package alisolarflare.modules.minigames.commands;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import alisolarflare.minigames.data.SpawnSet; import alisolarflare.modules.PlayerCommand;
import buttondevteam.lib.chat.TBMCCommandBase; import alisolarflare.modules.minigames.data.SpawnSet;
public class SetColourSpawn extends TBMCCommandBase{ public class SetColourSpawn extends PlayerCommand{
private SpawnSet spawnSet; private SpawnSet spawnSet;
public SetColourSpawn(SpawnSet spawnSet){ public SetColourSpawn(SpawnSet spawnSet){
@ -70,15 +70,4 @@ public class SetColourSpawn extends TBMCCommandBase{
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; return null;
} }
@Override
public boolean GetModOnly() {
// TODO Auto-generated method stub
return false;
}
@Override
public boolean GetPlayerOnly() {
// TODO Auto-generated method stub
return false;
}
} }

View file

@ -1,4 +1,4 @@
package alisolarflare.minigames.data; package alisolarflare.modules.minigames.data;
import org.bukkit.Location; import org.bukkit.Location;

View file

@ -1,4 +1,4 @@
package alisolarflare.minigames.entities; package alisolarflare.modules.minigames.entities;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

View file

@ -2,7 +2,7 @@ package graveyard.shulker;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import alisolarflare.Module; import alisolarflare.modules.Module;
import graveyard.shulker.commands.AliShulker; import graveyard.shulker.commands.AliShulker;
/**@deprecated*/ /**@deprecated*/