summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authort00thpick1 <t00thpick1dirko@gmail.com>2014-01-16 00:34:20 -0500
committerWesley Wolfe <weswolf@aol.com>2014-01-16 00:50:49 -0600
commit520168827ce49953ca73ac83faa6af95d9d40ee6 (patch)
tree2a0a9a4050ba0c23beff08c3e662392c7aa86ee6
parent74fc9d0778d204e22dd9736cc524b038b5cf85db (diff)
downloadbukkit-520168827ce49953ca73ac83faa6af95d9d40ee6.tar
bukkit-520168827ce49953ca73ac83faa6af95d9d40ee6.tar.gz
bukkit-520168827ce49953ca73ac83faa6af95d9d40ee6.tar.lz
bukkit-520168827ce49953ca73ac83faa6af95d9d40ee6.tar.xz
bukkit-520168827ce49953ca73ac83faa6af95d9d40ee6.zip
[Bleeding] Add /achievement command. Addresses BUKKIT-4932
-rw-r--r--src/main/java/org/bukkit/UnsafeValues.java6
-rw-r--r--src/main/java/org/bukkit/command/SimpleCommandMap.java1
-rw-r--r--src/main/java/org/bukkit/command/defaults/AchievementCommand.java187
3 files changed, 194 insertions, 0 deletions
diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
index a6c7a6ba..fc8a179c 100644
--- a/src/main/java/org/bukkit/UnsafeValues.java
+++ b/src/main/java/org/bukkit/UnsafeValues.java
@@ -24,4 +24,10 @@ public interface UnsafeValues {
List<String> tabCompleteInternalMaterialName(String token, List<String> completions);
ItemStack modifyItemStack(ItemStack stack, String arguments);
+
+ Statistic getStatisticFromInternalName(String name);
+
+ Achievement getAchievementFromInternalName(String name);
+
+ List<String> tabCompleteInternalStatisticOrAchievementName(String token, List<String> completions);
}
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index d178ad0f..9ae0bce1 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -63,6 +63,7 @@ public class SimpleCommandMap implements CommandMap {
fallbackCommands.add(new SpreadPlayersCommand());
fallbackCommands.add(new SetWorldSpawnCommand());
fallbackCommands.add(new SetIdleTimeoutCommand());
+ fallbackCommands.add(new AchievementCommand());
}
public SimpleCommandMap(final Server server) {
diff --git a/src/main/java/org/bukkit/command/defaults/AchievementCommand.java b/src/main/java/org/bukkit/command/defaults/AchievementCommand.java
new file mode 100644
index 00000000..d490732c
--- /dev/null
+++ b/src/main/java/org/bukkit/command/defaults/AchievementCommand.java
@@ -0,0 +1,187 @@
+package org.bukkit.command.defaults;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.commons.lang.Validate;
+import org.bukkit.Achievement;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.Statistic;
+import org.bukkit.Material;
+import org.bukkit.Statistic.Type;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerAchievementAwardedEvent;
+import org.bukkit.event.player.PlayerStatisticIncrementEvent;
+
+import com.google.common.collect.ImmutableList;
+
+public class AchievementCommand extends VanillaCommand {
+ public AchievementCommand() {
+ super("achievement");
+ this.description = "Gives the specified player an achievement or changes a statistic value. Use '*' to give all achievements.";
+ this.usageMessage = "/achievement give <stat_name> [player]";
+ this.setPermission("bukkit.command.achievement");
+ }
+
+ @Override
+ public boolean execute(CommandSender sender, String currentAlias, String[] args) {
+ if (!testPermission(sender)) return true;
+
+ if (args.length < 2) {
+ sender.sendMessage(ChatColor.RED + "Usage: " + usageMessage);
+ return false;
+ }
+
+ if (!args[0].equalsIgnoreCase("give")) {
+ sender.sendMessage(ChatColor.RED + "Usage: " + usageMessage);
+ return false;
+ }
+
+ String statisticString = args[1];
+ Player player = null;
+
+ if (args.length > 2) {
+ player = Bukkit.getPlayer(args[1]);
+ } else if (sender instanceof Player) {
+ player = (Player) sender;
+ }
+
+ if (player == null) {
+ sender.sendMessage("You must specify which player you wish to perform this action on.");
+ return true;
+ }
+
+ if (statisticString.equals("*")) {
+ for (Achievement achievement : Achievement.values()) {
+ if (player.hasAchievement(achievement)) {
+ continue;
+ }
+ PlayerAchievementAwardedEvent event = new PlayerAchievementAwardedEvent(player, achievement);
+ Bukkit.getServer().getPluginManager().callEvent(event);
+ if (!event.isCancelled()) {
+ player.awardAchievement(achievement);
+ }
+ }
+ Command.broadcastCommandMessage(sender, String.format("Successfully given all achievements to %s", player.getName()));
+ return true;
+ }
+
+ Achievement achievement = Bukkit.getUnsafe().getAchievementFromInternalName(statisticString);
+ Statistic statistic = Bukkit.getUnsafe().getStatisticFromInternalName(statisticString);
+
+ if (achievement != null) {
+ if (player.hasAchievement(achievement)) {
+ sender.sendMessage(String.format("%s already has achievement %s", player.getName(), statisticString));
+ return true;
+ }
+
+ PlayerAchievementAwardedEvent event = new PlayerAchievementAwardedEvent(player, achievement);
+ Bukkit.getServer().getPluginManager().callEvent(event);
+ if (event.isCancelled()) {
+ sender.sendMessage(String.format("Unable to award %s the achievement %s", player.getName(), statisticString));
+ return true;
+ }
+ player.awardAchievement(achievement);
+
+ Command.broadcastCommandMessage(sender, String.format("Successfully given %s the stat %s", player.getName(), statisticString));
+ return true;
+ }
+
+ if (statistic == null) {
+ sender.sendMessage(String.format("Unknown achievement or statistic '%s'", statisticString));
+ return true;
+ }
+
+ if (statistic.getType() == Type.UNTYPED) {
+ PlayerStatisticIncrementEvent event = new PlayerStatisticIncrementEvent(player, statistic, player.getStatistic(statistic), player.getStatistic(statistic) + 1);
+ Bukkit.getServer().getPluginManager().callEvent(event);
+ if (event.isCancelled()) {
+ sender.sendMessage(String.format("Unable to increment %s for %s", statisticString, player.getName()));
+ return true;
+ }
+ player.incrementStatistic(statistic);
+ Command.broadcastCommandMessage(sender, String.format("Successfully given %s the stat %s", player.getName(), statisticString));
+ return true;
+ }
+
+ if (statistic.getType() == Type.ENTITY) {
+ EntityType entityType = EntityType.fromName(statisticString.substring(statisticString.lastIndexOf(".") + 1));
+
+ if (entityType == null) {
+ sender.sendMessage(String.format("Unknown achievement or statistic '%s'", statisticString));
+ return true;
+ }
+
+ PlayerStatisticIncrementEvent event = new PlayerStatisticIncrementEvent(player, statistic, player.getStatistic(statistic), player.getStatistic(statistic) + 1, entityType);
+ Bukkit.getServer().getPluginManager().callEvent(event);
+ if (event.isCancelled()) {
+ sender.sendMessage(String.format("Unable to increment %s for %s", statisticString, player.getName()));
+ return true;
+ }
+
+ try {
+ player.incrementStatistic(statistic, entityType);
+ } catch (IllegalArgumentException e) {
+ sender.sendMessage(String.format("Unknown achievement or statistic '%s'", statisticString));
+ return true;
+ }
+ } else {
+ int id;
+ try {
+ id = getInteger(sender, statisticString.substring(statisticString.lastIndexOf(".") + 1), 0, Integer.MAX_VALUE, true);
+ } catch (NumberFormatException e) {
+ sender.sendMessage(e.getMessage());
+ return true;
+ }
+
+ Material material = Material.getMaterial(id);
+
+ if (material == null) {
+ sender.sendMessage(String.format("Unknown achievement or statistic '%s'", statisticString));
+ return true;
+ }
+
+ PlayerStatisticIncrementEvent event = new PlayerStatisticIncrementEvent(player, statistic, player.getStatistic(statistic), player.getStatistic(statistic) + 1, material);
+ Bukkit.getServer().getPluginManager().callEvent(event);
+ if (event.isCancelled()) {
+ sender.sendMessage(String.format("Unable to increment %s for %s", statisticString, player.getName()));
+ return true;
+ }
+
+ try {
+ player.incrementStatistic(statistic, material);
+ } catch (IllegalArgumentException e) {
+ sender.sendMessage(String.format("Unknown achievement or statistic '%s'", statisticString));
+ return true;
+ }
+ }
+
+ Command.broadcastCommandMessage(sender, String.format("Successfully given %s the stat %s", player.getName(), statisticString));
+ return true;
+ }
+
+ @Override
+ public List<String> tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException {
+ Validate.notNull(sender, "Sender cannot be null");
+ Validate.notNull(args, "Arguments cannot be null");
+ Validate.notNull(alias, "Alias cannot be null");
+
+ if (args.length == 1) {
+ return Arrays.asList("give");
+ }
+
+ if (args.length == 2) {
+ return Bukkit.getUnsafe().tabCompleteInternalStatisticOrAchievementName(args[1], new ArrayList<String>());
+ }
+
+ if (args.length == 3) {
+ return super.tabComplete(sender, alias, args);
+ }
+ return ImmutableList.of();
+ }
+}