diff --git a/src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java b/src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java index 7db38dd7..48893d42 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java @@ -256,9 +256,6 @@ public class TotalFreedomMod extends AeroPlugin amp = bridges.registerService(AMP.class); bridges.start(); - // Emotes - // todo - timer.update(); FLog.info("Version " + pluginVersion + " for " + ServerInterface.COMPILE_NMS_VERSION + " enabled in " + timer.getTotal() + "ms"); diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cheat.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cheat.java deleted file mode 100644 index cb1c4d78..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cheat.java +++ /dev/null @@ -1,36 +0,0 @@ -package me.totalfreedom.totalfreedommod.command; - -import me.totalfreedom.totalfreedommod.rank.Rank; -import me.totalfreedom.totalfreedommod.util.FUtil; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -@CommandPermissions(level = Rank.OP, source = SourceType.BOTH, cooldown = 20) -@CommandParameters(description = "Cheat on a block game", usage = "/ [player]") -public class Command_cheat extends FreedomCommand -{ - @Override - public boolean run(final CommandSender sender, final Player playerSender, final Command cmd, final String commandLabel, final String[] args, final boolean senderIsConsole) - { - if (args.length > 1) - { - return false; - } - if (args.length == 1) - { - Player player = Bukkit.getPlayer(args[0]); - if (player == null) - { - sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND); - return true; - } - FUtil.bcastMsg(ChatColor.RED + sender.getName() + ChatColor.AQUA + " just accused " + ChatColor.RED + player.getName() + ChatColor.AQUA + " of cheating! Everyone call them out!"); - return true; - } - FUtil.bcastMsg(ChatColor.RED + sender.getName() + ChatColor.AQUA + " just cheated on a block game!"); - return true; - } -} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_dance.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_dance.java deleted file mode 100644 index 6c0202aa..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_dance.java +++ /dev/null @@ -1,50 +0,0 @@ -package me.totalfreedom.totalfreedommod.command; - -import me.totalfreedom.totalfreedommod.rank.Rank; -import me.totalfreedom.totalfreedommod.util.FUtil; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -@CommandPermissions(level = Rank.OP, source = SourceType.BOTH, cooldown = 20) -@CommandParameters(description = "Dance with one or more people!", usage = "/ [player] [player2]") -public class Command_dance extends FreedomCommand -{ - @Override - public boolean run(final CommandSender sender, final Player playerSender, final Command cmd, final String commandLabel, final String[] args, final boolean senderIsConsole) - { - if (args.length > 2) - { - return false; - } - if (args.length == 2) - { - Player player = Bukkit.getPlayer(args[0]); - Player player2 = Bukkit.getPlayer(args[1]); - if (player == null || player2 == null) - { - sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND); - return true; - } - FUtil.bcastMsg(ChatColor.RED + sender.getName() + ChatColor.AQUA + ", " - + ChatColor.RED + player.getName() + ChatColor.AQUA + " and " - + ChatColor.RED + player2.getName() + ChatColor.AQUA + " dance together as a trio!"); - return true; - } - if (args.length == 1) - { - Player player = Bukkit.getPlayer(args[0]); - if (player == null) - { - sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND); - return true; - } - FUtil.bcastMsg(ChatColor.RED + sender.getName() + ChatColor.AQUA + " takes " + ChatColor.RED + player.getName() + ChatColor.AQUA + " up for a waltz!"); - return true; - } - FUtil.bcastMsg(ChatColor.RED + sender.getName() + ChatColor.AQUA + " spins around!"); - return true; - } -} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_f.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_f.java deleted file mode 100644 index 6d206ecb..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_f.java +++ /dev/null @@ -1,25 +0,0 @@ -package me.totalfreedom.totalfreedommod.command; - -import me.totalfreedom.totalfreedommod.rank.Rank; -import me.totalfreedom.totalfreedommod.util.FUtil; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -@CommandPermissions(level = Rank.OP, source = SourceType.BOTH, cooldown = 20) -@CommandParameters(description = "Pay your respects..", usage = "/") -public class Command_f extends FreedomCommand -{ - @Override - public boolean run(final CommandSender sender, final Player playerSender, final Command cmd, final String commandLabel, final String[] args, final boolean senderIsConsole) - { - if (args.length != 0) - { - return false; - } - FUtil.bcastMsg(ChatColor.RED + sender.getName() + ChatColor.AQUA + " just payed their respects! Type " + ChatColor.RED + "F " + ChatColor.AQUA + "to pay your respects!"); - return true; - } -} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_greet.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_greet.java deleted file mode 100644 index acab50bc..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_greet.java +++ /dev/null @@ -1,46 +0,0 @@ -package me.totalfreedom.totalfreedommod.command; - -import me.totalfreedom.totalfreedommod.rank.Rank; -import me.totalfreedom.totalfreedommod.util.FUtil; -import org.apache.commons.lang.StringUtils; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -@CommandPermissions(level = Rank.OP, source = SourceType.BOTH, cooldown = 20) -@CommandParameters(description = "Greets a user.", usage = "/ [player] [message]") -public class Command_greet extends FreedomCommand -{ - @Override - public boolean run(final CommandSender sender, final Player playerSender, final Command cmd, final String commandLabel, final String[] args, final boolean senderIsConsole) - { - if (args.length >= 2) - { - Player player = Bukkit.getPlayer(args[0]); - if (player == null) - { - sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND); - return true; - } - FUtil.bcastMsg(ChatColor.RED + sender.getName() + ChatColor.AQUA + " greets " - + ChatColor.RED + player.getName() + ChatColor.AQUA + " by saying '" - + ChatColor.RED + StringUtils.join(args, " ", 1, args.length) + ChatColor.AQUA + "'."); - return true; - } - if (args.length == 1) - { - Player player = Bukkit.getPlayer(args[0]); - if (player == null) - { - sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND); - return true; - } - FUtil.bcastMsg(ChatColor.RED + sender.getName() + ChatColor.AQUA + " takes " + ChatColor.RED + player.getName() + ChatColor.AQUA + " up for a waltz!"); - return true; - } - FUtil.bcastMsg(ChatColor.RED + sender.getName() + ChatColor.AQUA + " spins around!"); - return true; - } -} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_highfive.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_highfive.java deleted file mode 100644 index e067b5e6..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_highfive.java +++ /dev/null @@ -1,38 +0,0 @@ -package me.totalfreedom.totalfreedommod.command; - -import me.totalfreedom.totalfreedommod.rank.Rank; -import me.totalfreedom.totalfreedommod.util.FUtil; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -@CommandPermissions(level = Rank.OP, source = SourceType.BOTH, cooldown = 20) -@CommandParameters(description = "Gives someone a high five!", usage = "/ [player]") -public class Command_highfive extends FreedomCommand -{ - @Override - public boolean run(final CommandSender sender, final Player playerSender, final Command cmd, final String commandLabel, final String[] args, final boolean senderIsConsole) - { - if (args.length > 1) - { - return false; - } - if (args.length == 1) - { - Player player = Bukkit.getPlayer(args[0]); - if (player == null) - { - sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND); - return true; - } - FUtil.bcastMsg(ChatColor.RED + sender.getName() + ChatColor.AQUA + " gives a high five to " + ChatColor.RED + player.getName() + ChatColor.AQUA + "!"); - FUtil.bcastMsg(ChatColor.AQUA + "Good job " + ChatColor.RED + sender.getName() + ChatColor.AQUA + "!"); - return true; - } - FUtil.bcastMsg(ChatColor.RED + sender.getName() + ChatColor.AQUA + " raises their palm for a high five"); - FUtil.bcastMsg(ChatColor.AQUA + "but there was noone to answer."); - return true; - } -} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_hug.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_hug.java deleted file mode 100644 index 2b7e8702..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_hug.java +++ /dev/null @@ -1,36 +0,0 @@ -package me.totalfreedom.totalfreedommod.command; - -import me.totalfreedom.totalfreedommod.rank.Rank; -import me.totalfreedom.totalfreedommod.util.FUtil; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -@CommandPermissions(level = Rank.OP, source = SourceType.BOTH, cooldown = 20) -@CommandParameters(description = "Hug someone <3", usage = "/ [player]") -public class Command_hug extends FreedomCommand -{ - @Override - public boolean run(final CommandSender sender, final Player playerSender, final Command cmd, final String commandLabel, final String[] args, final boolean senderIsConsole) - { - if (args.length > 1) - { - return false; - } - if (args.length == 1) - { - Player player = Bukkit.getPlayer(args[0]); - if (player == null) - { - sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND); - return true; - } - FUtil.bcastMsg(ChatColor.RED + sender.getName() + ChatColor.AQUA + " hugs " + ChatColor.RED + player.getName() + ChatColor.AQUA + " " + ChatColor.LIGHT_PURPLE + "<3"); - return true; - } - FUtil.bcastMsg(ChatColor.RED + sender.getName() + ChatColor.AQUA + " looks like they really need a hug."); - return true; - } -} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ragehayes.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ragehayes.java deleted file mode 100644 index 731eb2b5..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ragehayes.java +++ /dev/null @@ -1,39 +0,0 @@ -package me.totalfreedom.totalfreedommod.command; - -import me.totalfreedom.totalfreedommod.rank.Rank; -import me.totalfreedom.totalfreedommod.util.FUtil; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -@CommandPermissions(level = Rank.OP, source = SourceType.BOTH, cooldown = 20) -@CommandParameters(description = "Hmm...", usage = "/ [player]") -public class Command_ragehayes extends FreedomCommand -{ - @Override - public boolean run(final CommandSender sender, final Player playerSender, final Command cmd, final String commandLabel, final String[] args, final boolean senderIsConsole) - { - if (args.length > 1) - { - return false; - } - if (args.length == 1) - { - Player player = Bukkit.getPlayer(args[0]); - if (player == null) - { - sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND); - return true; - } - FUtil.bcastMsg(ChatColor.RED + sender.getName() + ChatColor.AQUA + " just accused " - + ChatColor.RED + player.getName() + ChatColor.AQUA + " of being " + ChatColor.RED + "RageHayes's accomplice!" - + ChatColor.AQUA + "(RageHayes cheats on SMP) Everyone call them out!"); - return true; - } - FUtil.bcastMsg(ChatColor.RED + sender.getName() + ChatColor.AQUA + " is an accomplice of " - + ChatColor.RED + "RageHayes" + ChatColor.AQUA + ", the one who cheated on " + ChatColor.RED + "SMP" + ChatColor.AQUA + "!"); - return true; - } -} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ro.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ro.java index bd612960..f115c52a 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ro.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ro.java @@ -37,11 +37,6 @@ public class Command_ro extends FreedomCommand materials.addAll(Groups.SHULKER_BOXES); names = "shulker boxes"; } - else if (args[0].equalsIgnoreCase("heads")) - { - materials.addAll(Groups.HEADS); - names = "heads"; - } else { for (String materialName : StringUtils.split(args[0], ",")) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_scream.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_scream.java deleted file mode 100644 index 6ffc4538..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_scream.java +++ /dev/null @@ -1,37 +0,0 @@ -package me.totalfreedom.totalfreedommod.command; - -import me.totalfreedom.totalfreedommod.rank.Rank; -import me.totalfreedom.totalfreedommod.util.FUtil; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -@CommandPermissions(level = Rank.OP, source = SourceType.BOTH, cooldown = 20) -@CommandParameters(description = "Blatantly scream towards yourself or someone else", usage = "/ [player]") -public class Command_scream extends FreedomCommand -{ - @Override - public boolean run(final CommandSender sender, final Player playerSender, final Command cmd, final String commandLabel, final String[] args, final boolean senderIsConsole) - { - if (args.length > 1) - { - return false; - } - if (args.length == 1) - { - Player player = Bukkit.getPlayer(args[0]); - if (player == null) - { - sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND); - return true; - } - FUtil.bcastMsg(ChatColor.RED + sender.getName() + ChatColor.AQUA + " is screaming at " - + ChatColor.RED + player.getName() + ChatColor.AQUA + "!"); - return true; - } - FUtil.bcastMsg(ChatColor.RED + sender.getName() + ChatColor.AQUA + " is " + ChatColor.RED + "screaming!"); - return true; - } -} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_smile.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_smile.java deleted file mode 100644 index 664f5abe..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_smile.java +++ /dev/null @@ -1,37 +0,0 @@ -package me.totalfreedom.totalfreedommod.command; - -import me.totalfreedom.totalfreedommod.rank.Rank; -import me.totalfreedom.totalfreedommod.util.FUtil; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -@CommandPermissions(level = Rank.OP, source = SourceType.BOTH, cooldown = 20) -@CommandParameters(description = "Smiles!", usage = "/ [player]") -public class Command_smile extends FreedomCommand -{ - @Override - public boolean run(final CommandSender sender, final Player playerSender, final Command cmd, final String commandLabel, final String[] args, final boolean senderIsConsole) - { - if (args.length > 1) - { - return false; - } - if (args.length == 1) - { - Player player = Bukkit.getPlayer(args[0]); - if (player == null) - { - sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND); - return true; - } - FUtil.bcastMsg(ChatColor.RED + sender.getName() + ChatColor.AQUA + " gives " - + ChatColor.RED + player.getName() + ChatColor.AQUA + " a nice big smile."); - return true; - } - FUtil.bcastMsg(ChatColor.RED + sender.getName() + ChatColor.AQUA + " is smiling!"); - return true; - } -} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_thumbsup.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_thumbsup.java deleted file mode 100644 index 9781bede..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_thumbsup.java +++ /dev/null @@ -1,37 +0,0 @@ -package me.totalfreedom.totalfreedommod.command; - -import me.totalfreedom.totalfreedommod.rank.Rank; -import me.totalfreedom.totalfreedommod.util.FUtil; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -@CommandPermissions(level = Rank.OP, source = SourceType.BOTH, cooldown = 20) -@CommandParameters(description = "Give someone a thumbs up.", usage = "/ [player]") -public class Command_thumbsup extends FreedomCommand -{ - @Override - public boolean run(final CommandSender sender, final Player playerSender, final Command cmd, final String commandLabel, final String[] args, final boolean senderIsConsole) - { - if (args.length > 1) - { - return false; - } - if (args.length == 1) - { - Player player = Bukkit.getPlayer(args[0]); - if (player == null) - { - sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND); - return true; - } - FUtil.bcastMsg(ChatColor.RED + sender.getName() + ChatColor.AQUA + " gives a big thumbs up to " - + ChatColor.RED + player.getName() + ChatColor.AQUA + "!"); - return true; - } - FUtil.bcastMsg(ChatColor.RED + sender.getName() + ChatColor.AQUA + " gives a thumbs up!"); - return true; - } -} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_vore.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_vore.java deleted file mode 100644 index 09df7d9d..00000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_vore.java +++ /dev/null @@ -1,37 +0,0 @@ -package me.totalfreedom.totalfreedommod.command; - -import me.totalfreedom.totalfreedommod.rank.Rank; -import me.totalfreedom.totalfreedommod.util.FUtil; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -@CommandPermissions(level = Rank.OP, source = SourceType.BOTH, cooldown = 20) -@CommandParameters(description = "Vore yourself or someone else..", usage = "/ [player]") -public class Command_vore extends FreedomCommand -{ - @Override - public boolean run(final CommandSender sender, final Player playerSender, final Command cmd, final String commandLabel, final String[] args, final boolean senderIsConsole) - { - if (args.length > 1) - { - return false; - } - if (args.length == 1) - { - Player player = Bukkit.getPlayer(args[0]); - if (player == null) - { - sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND); - return true; - } - FUtil.bcastMsg(ChatColor.RED + sender.getName() + ChatColor.AQUA + " just vored " - + ChatColor.RED + player.getName() + ChatColor.AQUA + "!"); - return true; - } - FUtil.bcastMsg(ChatColor.RED + sender.getName() + ChatColor.AQUA + " just vored themselves. They weren't important anyways."); - return true; - } -} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/util/Groups.java b/src/main/java/me/totalfreedom/totalfreedommod/util/Groups.java index 60052c63..a94dfe70 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/util/Groups.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/util/Groups.java @@ -160,14 +160,4 @@ public class Groups Material.ZOMBIE_HORSE_SPAWN_EGG, Material.ZOMBIE_PIGMAN_SPAWN_EGG, Material.ZOMBIE_VILLAGER_SPAWN_EGG); - - public static final List HEADS = Arrays.asList( - Material.CREEPER_HEAD, - Material.CREEPER_WALL_HEAD, - Material.DRAGON_HEAD, - Material.DRAGON_WALL_HEAD, - Material.PLAYER_HEAD, - Material.PLAYER_WALL_HEAD, - Material.ZOMBIE_HEAD, - Material.ZOMBIE_WALL_HEAD); }