commented out a *SHIT TON* of code
This commit is contained in:
parent
63a6c775a4
commit
6d0ee4e224
20 changed files with 269 additions and 286 deletions
|
@ -2,7 +2,7 @@ package alisolarflare.components.alilinks.commands;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.plugin.java.JavaPlugin;
|
import org.bukkit.plugin.java.JavaPlugin;
|
||||||
|
|
||||||
import alisolarflare.components.PlayerCommand;
|
import alisolarflare.components.PlayerCommand;
|
||||||
|
@ -18,9 +18,9 @@ public class PressAliLink extends PlayerCommand {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean OnCommand(CommandSender sender, String label, String[] inputFrequencies) {
|
public boolean OnCommand(Player player, String label, String[] inputFrequencies) {
|
||||||
if (inputFrequencies.length < 1) {
|
if (inputFrequencies.length < 1) {
|
||||||
sender.sendMessage("You must specify a link frequency");
|
player.sendMessage("You must specify a link frequency");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -31,7 +31,7 @@ public class PressAliLink extends PlayerCommand {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
sender.sendMessage("Link pressed!");
|
player.sendMessage("Link pressed!");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -5,7 +5,6 @@ import java.util.Map;
|
||||||
|
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.bukkit.World;
|
import org.bukkit.World;
|
||||||
import org.bukkit.command.CommandSender;
|
|
||||||
import org.bukkit.configuration.file.FileConfiguration;
|
import org.bukkit.configuration.file.FileConfiguration;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
|
@ -24,12 +23,10 @@ public class SetAliLink extends PlayerCommand {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean OnCommand(CommandSender sender, String label, String[] args) {
|
public boolean OnCommand(Player player, String label, String[] args) {
|
||||||
Player player = (Player) sender;
|
|
||||||
player.sendMessage("you pressed");
|
|
||||||
if (args == null || args.length < 1) {
|
if (args == null || args.length < 1) {
|
||||||
sender.sendMessage("You must specify a link frequency");
|
player.sendMessage("You must specify a link frequency");
|
||||||
sender.sendMessage("/pressalilink [name]");
|
player.sendMessage("/pressalilink [name]");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
package alisolarflare.components.creativeboundaries.commands;
|
package alisolarflare.components.creativeboundaries.commands;
|
||||||
|
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
import alisolarflare.components.ModCommand;
|
import alisolarflare.components.ModCommand;
|
||||||
import alisolarflare.components.creativeboundaries.CreativeBoundariesComponent;
|
import alisolarflare.components.creativeboundaries.CreativeBoundariesComponent;
|
||||||
|
@ -13,19 +13,19 @@ public class SetDickmode extends ModCommand{
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean OnCommand(CommandSender sender, String label, String[] args) {
|
public boolean OnCommand(Player player, String label, String[] args) {
|
||||||
if(args.length < 1){
|
if(args.length < 1){
|
||||||
sender.sendMessage("You must use True, False, 1, or 0 as arguments!");
|
player.sendMessage("You must use True, False, 1, or 0 as arguments!");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
String firstArgument = args[0];
|
String firstArgument = args[0];
|
||||||
if(firstArgument.startsWith("t") || firstArgument.equals("1")){
|
if(firstArgument.startsWith("t") || firstArgument.equals("1")){
|
||||||
sender.sendMessage("Dickmode has been turned on!");
|
player.sendMessage("Dickmode has been turned on!");
|
||||||
dickMode = true;
|
dickMode = true;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if(firstArgument.startsWith("f") || firstArgument.equals("0")){
|
if(firstArgument.startsWith("f") || firstArgument.equals("0")){
|
||||||
sender.sendMessage("Dickmode has been turned off!");
|
player.sendMessage("Dickmode has been turned off!");
|
||||||
dickMode = false;
|
dickMode = false;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
package alisolarflare.components.easyuhc.commands;
|
package alisolarflare.components.easyuhc.commands;
|
||||||
|
|
||||||
import org.bukkit.command.CommandSender;
|
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
import alisolarflare.components.ModCommand;
|
import alisolarflare.components.ModCommand;
|
||||||
|
@ -13,8 +12,8 @@ public class SetUHCLobby extends ModCommand{
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean OnCommand(CommandSender sender, String alias, String[] args) {
|
public boolean OnCommand(Player player, String alias, String[] args) {
|
||||||
module.lobbyLocation = ((Player) sender).getLocation();
|
module.lobbyLocation = player.getLocation();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
package alisolarflare.components.easyuhc.commands;
|
package alisolarflare.components.easyuhc.commands;
|
||||||
|
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
import alisolarflare.components.ModCommand;
|
import alisolarflare.components.ModCommand;
|
||||||
|
|
||||||
public class SetWorldBorders extends ModCommand {
|
public class SetWorldBorders extends ModCommand {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean OnCommand(CommandSender sender, String alias, String[] args) {
|
public boolean OnCommand(Player player, String alias, String[] args) {
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
package alisolarflare.components.easyuhc.commands;
|
package alisolarflare.components.easyuhc.commands;
|
||||||
|
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
import alisolarflare.components.ModCommand;
|
import alisolarflare.components.ModCommand;
|
||||||
|
|
||||||
public class ShrinkWorldBorders extends ModCommand {
|
public class ShrinkWorldBorders extends ModCommand {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean OnCommand(CommandSender sender, String alias, String[] args) {
|
public boolean OnCommand(Player player, String alias, String[] args) {
|
||||||
// TODO Auto-generated method stub
|
// TODO Auto-generated method stub
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
package alisolarflare.components.easyuhc.commands;
|
package alisolarflare.components.easyuhc.commands;
|
||||||
|
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
import alisolarflare.components.ModCommand;
|
import alisolarflare.components.ModCommand;
|
||||||
|
|
||||||
public class SpreadPlayers extends ModCommand{
|
public class SpreadPlayers extends ModCommand{
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean OnCommand(CommandSender sender, String alias, String[] args) {
|
public boolean OnCommand(Player player, String alias, String[] args) {
|
||||||
// TODO Auto-generated method stub
|
// TODO Auto-generated method stub
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
package alisolarflare.components.easyuhc.commands;
|
package alisolarflare.components.easyuhc.commands;
|
||||||
|
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
import alisolarflare.components.ModCommand;
|
import alisolarflare.components.ModCommand;
|
||||||
|
|
||||||
public class StartTimer extends ModCommand{
|
public class StartTimer extends ModCommand{
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean OnCommand(CommandSender sender, String alias, String[] args) {
|
public boolean OnCommand(Player player, String alias, String[] args) {
|
||||||
// TODO Auto-generated method stub
|
// TODO Auto-generated method stub
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
package alisolarflare.components.easyuhc.commands;
|
package alisolarflare.components.easyuhc.commands;
|
||||||
|
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
import alisolarflare.components.ModCommand;
|
import alisolarflare.components.ModCommand;
|
||||||
|
|
||||||
public class StartUHC extends ModCommand{
|
public class StartUHC extends ModCommand{
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean OnCommand(CommandSender sender, String alias, String[] args) {
|
public boolean OnCommand(Player player, String alias, String[] args) {
|
||||||
// TODO Auto-generated method stub
|
// TODO Auto-generated method stub
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
package alisolarflare.components.easyuhc.commands;
|
package alisolarflare.components.easyuhc.commands;
|
||||||
|
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
import alisolarflare.components.PlayerCommand;
|
import alisolarflare.components.PlayerCommand;
|
||||||
|
|
||||||
public class TeleportToUHC extends PlayerCommand{
|
public class TeleportToUHC extends PlayerCommand{
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean OnCommand(CommandSender sender, String alias, String[] args) {
|
public boolean OnCommand(Player player, String alias, String[] args) {
|
||||||
// TODO Auto-generated method stub
|
// TODO Auto-generated method stub
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
package alisolarflare.components.flairdoor.commands;
|
package alisolarflare.components.flairdoor.commands;
|
||||||
|
|
||||||
import org.bukkit.command.CommandSender;
|
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
import alisolarflare.components.ModCommand;
|
import alisolarflare.components.ModCommand;
|
||||||
|
@ -15,13 +14,11 @@ public class SetProximityLocation extends ModCommand{
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean OnCommand(CommandSender sender, String alias, String[] args) {
|
public boolean OnCommand(Player player, String alias, String[] args) {
|
||||||
if (args.length < 1){
|
if (args.length < 1){
|
||||||
sender.sendMessage("You must enter an argument");
|
player.sendMessage("You must enter an argument");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
Player player = (Player) sender;
|
|
||||||
String firstChar = args[0].substring(0, 1);
|
String firstChar = args[0].substring(0, 1);
|
||||||
|
|
||||||
switch(firstChar){
|
switch(firstChar){
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
package alisolarflare.components.gpowers.commands;
|
package alisolarflare.components.gpowers.commands;
|
||||||
|
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
import alisolarflare.components.ModCommand;
|
import alisolarflare.components.ModCommand;
|
||||||
import alisolarflare.components.gpowers.GPowerMemory;
|
import alisolarflare.components.gpowers.GPowerMemory;
|
||||||
|
@ -13,7 +13,7 @@ public class PowerAll extends ModCommand{
|
||||||
this.gPowerMemory = gPowerMemory;
|
this.gPowerMemory = gPowerMemory;
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public boolean OnCommand(CommandSender sender, String alias, String[] args) {
|
public boolean OnCommand(Player player, String alias, String[] args) {
|
||||||
for (poweredPlayer poweredPlayer : gPowerMemory.poweredPlayerList.values()){
|
for (poweredPlayer poweredPlayer : gPowerMemory.poweredPlayerList.values()){
|
||||||
poweredPlayer.isPowersActive = true;
|
poweredPlayer.isPowersActive = true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
package alisolarflare.components.gpowers.commands;
|
package alisolarflare.components.gpowers.commands;
|
||||||
|
|
||||||
import org.bukkit.command.CommandSender;
|
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
import alisolarflare.components.PlayerCommand;
|
import alisolarflare.components.PlayerCommand;
|
||||||
|
@ -15,8 +14,7 @@ public class PowerDown extends PlayerCommand {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean OnCommand(CommandSender sender, String label, String[] args) {
|
public boolean OnCommand(Player player, String label, String[] args) {
|
||||||
Player player = (Player) sender;
|
|
||||||
gPowerMemory.PowerDownPlayer(player);
|
gPowerMemory.PowerDownPlayer(player);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
package alisolarflare.components.gpowers.commands;
|
package alisolarflare.components.gpowers.commands;
|
||||||
|
|
||||||
import org.bukkit.command.CommandSender;
|
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
import alisolarflare.components.PlayerCommand;
|
import alisolarflare.components.PlayerCommand;
|
||||||
|
@ -15,11 +14,7 @@ public class PowerUp extends PlayerCommand {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean OnCommand(CommandSender sender, String label, String[] args) {
|
public boolean OnCommand(Player player, String label, String[] args) {
|
||||||
if (!(sender instanceof Player))
|
|
||||||
sender.sendMessage("You must be a player to use this command! Contact a dev/ali if you think this is wrong");
|
|
||||||
|
|
||||||
Player player = (Player) sender;
|
|
||||||
gPowerMemory.PowerUpPlayer(player);
|
gPowerMemory.PowerUpPlayer(player);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
package alisolarflare.components.minigames.commands;
|
package alisolarflare.components.minigames.commands;
|
||||||
|
|
||||||
import org.bukkit.command.CommandSender;
|
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
import alisolarflare.components.ModCommand;
|
import alisolarflare.components.ModCommand;
|
||||||
|
@ -13,11 +12,9 @@ public class SetColourSpawn extends ModCommand{
|
||||||
this.spawnSet = spawnSet;
|
this.spawnSet = spawnSet;
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public boolean OnCommand(CommandSender sender, String label, String[] args) {
|
public boolean OnCommand(Player player, String label, String[] args) {
|
||||||
Player player = (Player) sender;
|
|
||||||
|
|
||||||
if(args.length == 0){
|
if(args.length == 0){
|
||||||
sender.sendMessage("ERROR: Arguments required.");
|
player.sendMessage("ERROR: Arguments required.");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -26,34 +23,34 @@ public class SetColourSpawn extends ModCommand{
|
||||||
input.toLowerCase();
|
input.toLowerCase();
|
||||||
switch(input){
|
switch(input){
|
||||||
case ("r"):
|
case ("r"):
|
||||||
sender.sendMessage("Setting Red Spawn...");
|
player.sendMessage("Setting Red Spawn...");
|
||||||
spawnSet.setRSpawn(player.getLocation());
|
spawnSet.setRSpawn(player.getLocation());
|
||||||
sender.sendMessage("Red Spawn Set!");
|
player.sendMessage("Red Spawn Set!");
|
||||||
break;
|
break;
|
||||||
case ("o"):
|
case ("o"):
|
||||||
sender.sendMessage("Setting Orange Spawn...");
|
player.sendMessage("Setting Orange Spawn...");
|
||||||
spawnSet.setRSpawn(player.getLocation());
|
spawnSet.setRSpawn(player.getLocation());
|
||||||
sender.sendMessage("Orange Spawn Set!");
|
player.sendMessage("Orange Spawn Set!");
|
||||||
break;
|
break;
|
||||||
case ("y"):
|
case ("y"):
|
||||||
sender.sendMessage("Setting Yellow Spawn...");
|
player.sendMessage("Setting Yellow Spawn...");
|
||||||
spawnSet.setRSpawn(player.getLocation());
|
spawnSet.setRSpawn(player.getLocation());
|
||||||
sender.sendMessage("Yellow Spawn Set!");
|
player.sendMessage("Yellow Spawn Set!");
|
||||||
break;
|
break;
|
||||||
case ("g"):
|
case ("g"):
|
||||||
sender.sendMessage("Setting Green Spawn...");
|
player.sendMessage("Setting Green Spawn...");
|
||||||
spawnSet.setRSpawn(player.getLocation());
|
spawnSet.setRSpawn(player.getLocation());
|
||||||
sender.sendMessage("Green Spawn Set!");
|
player.sendMessage("Green Spawn Set!");
|
||||||
break;
|
break;
|
||||||
case ("b"):
|
case ("b"):
|
||||||
sender.sendMessage("Setting Blue Spawn...");
|
player.sendMessage("Setting Blue Spawn...");
|
||||||
spawnSet.setRSpawn(player.getLocation());
|
spawnSet.setRSpawn(player.getLocation());
|
||||||
sender.sendMessage("Blue Spawn Set!");
|
player.sendMessage("Blue Spawn Set!");
|
||||||
break;
|
break;
|
||||||
case ("p"):
|
case ("p"):
|
||||||
sender.sendMessage("Setting Purple Spawn...");
|
player.sendMessage("Setting Purple Spawn...");
|
||||||
spawnSet.setRSpawn(player.getLocation());
|
spawnSet.setRSpawn(player.getLocation());
|
||||||
sender.sendMessage("Purple Spawn Set!");
|
player.sendMessage("Purple Spawn Set!");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
|
|
@ -1,30 +1,30 @@
|
||||||
package graveyard.autouhc;
|
//package graveyard.autouhc;
|
||||||
import org.bukkit.plugin.java.JavaPlugin;
|
//import org.bukkit.plugin.java.JavaPlugin;
|
||||||
|
//
|
||||||
import alisolarflare.components.Component;
|
//import alisolarflare.components.Component;
|
||||||
import graveyard.autouhc.memory.MatchState;
|
//import graveyard.autouhc.memory.MatchState;
|
||||||
import graveyard.autouhc.memory.UHCMatch;
|
//import graveyard.autouhc.memory.UHCMatch;
|
||||||
|
//
|
||||||
/**@deprecated*/
|
///**@deprecated*/
|
||||||
public class UHCModule extends Component {
|
//public class UHCModule extends Component {
|
||||||
public UHCMatch match;
|
// public UHCMatch match;
|
||||||
|
//
|
||||||
public void register(JavaPlugin plugin) {
|
// public void register(JavaPlugin plugin) {
|
||||||
|
//
|
||||||
|
//
|
||||||
if (plugin.getConfig().contains("UHCMatchState")){
|
// if (plugin.getConfig().contains("UHCMatchState")){
|
||||||
match = new UHCMatch(plugin.getConfig(), MatchState.valueOf(plugin.getConfig().getString("UHCMatchState")));
|
// match = new UHCMatch(plugin.getConfig(), MatchState.valueOf(plugin.getConfig().getString("UHCMatchState")));
|
||||||
}else{
|
// }else{
|
||||||
match = new UHCMatch(plugin.getConfig(), MatchState.IDLE);
|
// match = new UHCMatch(plugin.getConfig(), MatchState.IDLE);
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
|
//
|
||||||
//registerCommand(plugin, new SetMatchState(match));
|
// //registerCommand(plugin, new SetMatchState(match));
|
||||||
//registerCommand(plugin, new AddToUHC(match));
|
// //registerCommand(plugin, new AddToUHC(match));
|
||||||
//registerCommand(plugin, new JoinUHC(match));
|
// //registerCommand(plugin, new JoinUHC(match));
|
||||||
//registerCommand(plugin, new StartMatch(match));
|
// //registerCommand(plugin, new StartMatch(match));
|
||||||
//registerCommand(plugin, new ConfigureMatch(match));
|
// //registerCommand(plugin, new ConfigureMatch(match));
|
||||||
//registerCommand(plugin, new ScheduleMatch(match));
|
// //registerCommand(plugin, new ScheduleMatch(match));
|
||||||
|
//
|
||||||
}
|
// }
|
||||||
}
|
//}
|
||||||
|
|
|
@ -1,71 +1,71 @@
|
||||||
package graveyard.autouhc.controller;
|
//package graveyard.autouhc.controller;
|
||||||
|
//
|
||||||
import org.bukkit.command.CommandSender;
|
//import org.bukkit.command.CommandSender;
|
||||||
import org.bukkit.entity.Player;
|
//import org.bukkit.entity.Player;
|
||||||
|
//
|
||||||
import alisolarflare.components.ModCommand;
|
//import alisolarflare.components.ModCommand;
|
||||||
import graveyard.autouhc.memory.MatchState;
|
//import graveyard.autouhc.memory.MatchState;
|
||||||
import graveyard.autouhc.memory.UHCMatch;
|
//import graveyard.autouhc.memory.UHCMatch;
|
||||||
/**@deprecated*/
|
///**@deprecated*/
|
||||||
public class SetMatchState extends ModCommand{
|
//public class SetMatchState extends ModCommand{
|
||||||
|
//
|
||||||
UHCMatch match;
|
// UHCMatch match;
|
||||||
public SetMatchState(UHCMatch match) {
|
// public SetMatchState(UHCMatch match) {
|
||||||
this.match = match;
|
// this.match = match;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@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)){
|
||||||
sender.sendMessage("You must be a player to use this command!");
|
// sender.sendMessage("You must be a player to use this command!");
|
||||||
return false;
|
// return false;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
Player player = (Player) sender;
|
// Player player = (Player) sender;
|
||||||
|
//
|
||||||
if (player.getName().equalsIgnoreCase("alisolarflare") && player.getName().equalsIgnoreCase("Arsen_Derby_FTW")){
|
// if (player.getName().equalsIgnoreCase("alisolarflare") && player.getName().equalsIgnoreCase("Arsen_Derby_FTW")){
|
||||||
sender.sendMessage("You must be either Ali or Arsen to use this command!");
|
// sender.sendMessage("You must be either Ali or Arsen to use this command!");
|
||||||
return false;
|
// return false;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
|
//
|
||||||
if(args.length < 1 ){
|
// if(args.length < 1 ){
|
||||||
player.sendMessage("Usage: /setMatchState [stateToBeSet]");
|
// player.sendMessage("Usage: /setMatchState [stateToBeSet]");
|
||||||
player.sendMessage("States: IDLE, WAITING, SETUP, INTRO, PEACE, POWER, TENSION, END");
|
// player.sendMessage("States: IDLE, WAITING, SETUP, INTRO, PEACE, POWER, TENSION, END");
|
||||||
return false;
|
// return false;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
String inputState = args[0];
|
// String inputState = args[0];
|
||||||
boolean inputIsValidState = false;
|
// boolean inputIsValidState = false;
|
||||||
for (MatchState defaultMatchState : MatchState.values()){
|
// for (MatchState defaultMatchState : MatchState.values()){
|
||||||
if(inputState.equalsIgnoreCase(defaultMatchState.toString())){
|
// if(inputState.equalsIgnoreCase(defaultMatchState.toString())){
|
||||||
inputIsValidState = true;
|
// inputIsValidState = true;
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
if (inputIsValidState){
|
// if (inputIsValidState){
|
||||||
match.setMatchState(MatchState.valueOf(inputState));
|
// match.setMatchState(MatchState.valueOf(inputState));
|
||||||
player.sendMessage("Match State set to: " + match.getMatchState().toString() + "!");
|
// player.sendMessage("Match State set to: " + match.getMatchState().toString() + "!");
|
||||||
}else{
|
// }else{
|
||||||
player.sendMessage("Error, could not parse state.");
|
// player.sendMessage("Error, could not parse state.");
|
||||||
player.sendMessage("Valid States: IDLE, WAITING, SETUP, INTRO, PEACE, POWER, TENSION, END");
|
// player.sendMessage("Valid States: IDLE, WAITING, SETUP, INTRO, PEACE, POWER, TENSION, END");
|
||||||
return false;
|
// return false;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
|
//
|
||||||
return false;
|
// return false;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public boolean GetPlayerOnly() {
|
// public boolean GetPlayerOnly() {
|
||||||
// TODO Auto-generated method stub
|
// // TODO Auto-generated method stub
|
||||||
return true;
|
// return true;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public boolean GetModOnly() {
|
// public boolean GetModOnly() {
|
||||||
// TODO Auto-generated method stub
|
// // TODO Auto-generated method stub
|
||||||
return false;
|
// return false;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
}
|
//}
|
||||||
|
|
|
@ -1,19 +1,19 @@
|
||||||
package graveyard.autouhc.intro;
|
//package graveyard.autouhc.intro;
|
||||||
|
//
|
||||||
import org.bukkit.command.CommandSender;
|
//import org.bukkit.command.CommandSender;
|
||||||
|
//
|
||||||
import alisolarflare.components.ModCommand;
|
//import alisolarflare.components.ModCommand;
|
||||||
import graveyard.autouhc.memory.UHCMatch;
|
//import graveyard.autouhc.memory.UHCMatch;
|
||||||
/**@deprecated*/
|
///**@deprecated*/
|
||||||
public class ScheduleMatch extends ModCommand{
|
//public class ScheduleMatch extends ModCommand{
|
||||||
|
//
|
||||||
public ScheduleMatch(UHCMatch match) {
|
// public ScheduleMatch(UHCMatch match) {
|
||||||
// TODO Auto-generated constructor stub
|
// // TODO Auto-generated constructor stub
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public boolean OnCommand(CommandSender sender, String alias, String[] args) {
|
// public boolean OnCommand(CommandSender sender, String alias, String[] args) {
|
||||||
// TODO Auto-generated method stub
|
// // TODO Auto-generated method stub
|
||||||
return false;
|
// return false;
|
||||||
}
|
// }
|
||||||
}
|
//}
|
||||||
|
|
|
@ -1,52 +1,52 @@
|
||||||
package graveyard.autouhc.intro;
|
//package graveyard.autouhc.intro;
|
||||||
|
//
|
||||||
import org.bukkit.command.CommandSender;
|
//import org.bukkit.command.CommandSender;
|
||||||
|
//
|
||||||
import alisolarflare.components.ModCommand;
|
//import alisolarflare.components.ModCommand;
|
||||||
import graveyard.autouhc.memory.MatchState;
|
//import graveyard.autouhc.memory.MatchState;
|
||||||
import graveyard.autouhc.memory.UHCMatch;
|
//import graveyard.autouhc.memory.UHCMatch;
|
||||||
|
//
|
||||||
/**@deprecated*/
|
///**@deprecated*/
|
||||||
public class StartMatch extends ModCommand {
|
//public class StartMatch extends ModCommand {
|
||||||
private UHCMatch match;
|
// private UHCMatch match;
|
||||||
/**@deprecated*/
|
// /**@deprecated*/
|
||||||
public StartMatch(UHCMatch match) {
|
// public StartMatch(UHCMatch match) {
|
||||||
this.match = match;
|
// this.match = match;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public boolean OnCommand(CommandSender sender, String label, String[] args) {
|
// public boolean OnCommand(CommandSender sender, String label, String[] args) {
|
||||||
|
//
|
||||||
if (!sender.hasPermission("moderator") && !(sender.getName() == ""))
|
// if (!sender.hasPermission("moderator") && !(sender.getName() == ""))
|
||||||
sender.sendMessage("You must be a moderator or Arsenalis to use this command! "
|
// sender.sendMessage("You must be a moderator or Arsenalis to use this command! "
|
||||||
+ "Contact a TBMC dev if you think this is wrong");
|
// + "Contact a TBMC dev if you think this is wrong");
|
||||||
|
//
|
||||||
//ACTIVATES MATCH
|
// //ACTIVATES MATCH
|
||||||
switch(match.getMatchState()){
|
// switch(match.getMatchState()){
|
||||||
case IDLE:
|
// case IDLE:
|
||||||
sender.sendMessage("There is currently a match ready... Activating...");
|
// sender.sendMessage("There is currently a match ready... Activating...");
|
||||||
match.setMatchState(MatchState.INTRO);
|
// match.setMatchState(MatchState.INTRO);
|
||||||
break;
|
// break;
|
||||||
|
//
|
||||||
case WAITING:
|
// case WAITING:
|
||||||
sender.sendMessage("There currently a match planned for: TIME:TIME:TIME");
|
// sender.sendMessage("There currently a match planned for: TIME:TIME:TIME");
|
||||||
break;
|
// break;
|
||||||
|
//
|
||||||
case END:
|
// case END:
|
||||||
sender.sendMessage("The match has ended! Would you like to restart using current settings?");
|
// sender.sendMessage("The match has ended! Would you like to restart using current settings?");
|
||||||
break;
|
// break;
|
||||||
|
//
|
||||||
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;
|
||||||
|
//
|
||||||
|
//
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public String GetCommandPath() {
|
// public String GetCommandPath() {
|
||||||
return "startmatch";
|
// return "startmatch";
|
||||||
}
|
// }
|
||||||
}
|
//}
|
||||||
|
|
|
@ -1,51 +1,51 @@
|
||||||
package graveyard.autouhc.memory;
|
//package graveyard.autouhc.memory;
|
||||||
|
//
|
||||||
import java.util.ArrayList;
|
//import java.util.ArrayList;
|
||||||
import java.util.List;
|
//import java.util.List;
|
||||||
|
//
|
||||||
import org.bukkit.Location;
|
//import org.bukkit.Location;
|
||||||
import org.bukkit.configuration.file.FileConfiguration;
|
//import org.bukkit.configuration.file.FileConfiguration;
|
||||||
|
//
|
||||||
/**@deprecated*/
|
///**@deprecated*/
|
||||||
public class UHCMatch {
|
//public class UHCMatch {
|
||||||
private FileConfiguration config;
|
// private FileConfiguration config;
|
||||||
private MatchState matchState = MatchState.IDLE;
|
// private MatchState matchState = MatchState.IDLE;
|
||||||
private List<String> playerList = new ArrayList<String>();
|
// private List<String> playerList = new ArrayList<String>();
|
||||||
|
//
|
||||||
private Location lobbyLocation;
|
// private Location lobbyLocation;
|
||||||
public UHCMatch(FileConfiguration fileConfiguration, MatchState state) {
|
// public UHCMatch(FileConfiguration fileConfiguration, MatchState state) {
|
||||||
this.config = fileConfiguration;
|
// this.config = fileConfiguration;
|
||||||
this.matchState = state;
|
// this.matchState = state;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
public MatchState getMatchState(){
|
// public MatchState getMatchState(){
|
||||||
return matchState;
|
// return matchState;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
public void setMatchState(MatchState newMS){
|
// public void setMatchState(MatchState newMS){
|
||||||
matchState = newMS;
|
// matchState = newMS;
|
||||||
config.set("UHCMatchState", newMS.toString());
|
// config.set("UHCMatchState", newMS.toString());
|
||||||
switch(newMS){
|
// switch(newMS){
|
||||||
default:
|
// default:
|
||||||
break;
|
// break;
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
public List<String> getPlayerList() {
|
// public List<String> getPlayerList() {
|
||||||
return playerList;
|
// return playerList;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
public void setPlayerList(List<String> playerList) {
|
// public void setPlayerList(List<String> playerList) {
|
||||||
this.playerList = playerList;
|
// this.playerList = playerList;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
public Location getLobbyLocation() {
|
// public Location getLobbyLocation() {
|
||||||
|
//
|
||||||
return lobbyLocation;
|
// return lobbyLocation;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
public void setLobbyLocation(Location lobbyLocation) {
|
// public void setLobbyLocation(Location lobbyLocation) {
|
||||||
this.lobbyLocation = lobbyLocation;
|
// this.lobbyLocation = lobbyLocation;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
}
|
//}
|
||||||
|
|
Loading…
Reference in a new issue