Support UUIDs for mob owner functions

Author: PseudoKnight

src/main/java/com/laytonsmith/abstraction/MCAnimalTamer.java

@@ -1,6 +1,10 @@
 package com.laytonsmith.abstraction;
 
+import java.util.UUID;
+
 public interface MCAnimalTamer extends AbstractionObject {
 
 	String getName();
+
+	UUID getUniqueID();
 }

src/main/java/com/laytonsmith/abstraction/bukkit/BukkitMCAnimalTamer.java

@@ -2,12 +2,9 @@
 
 import com.laytonsmith.abstraction.AbstractionObject;
 import com.laytonsmith.abstraction.MCAnimalTamer;
-import com.laytonsmith.abstraction.MCHumanEntity;
-import com.laytonsmith.abstraction.MCOfflinePlayer;
-import com.laytonsmith.abstraction.bukkit.entities.BukkitMCHumanEntity;
-import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.AnimalTamer;
-import org.bukkit.entity.HumanEntity;
+
+import java.util.UUID;
 
 public class BukkitMCAnimalTamer implements MCAnimalTamer {
 
@@ -35,28 +32,6 @@ public AnimalTamer _tamer() {
 		return at;
 	}
 
-	public MCOfflinePlayer getOfflinePlayer() {
-		if(at instanceof OfflinePlayer) {
-			return new BukkitMCOfflinePlayer((OfflinePlayer) at);
-		}
-		return null;
-	}
-
-	public boolean isOfflinePlayer() {
-		return at instanceof OfflinePlayer;
-	}
-
-	public boolean isHumanEntity() {
-		return at instanceof HumanEntity;
-	}
-
-	public MCHumanEntity getHumanEntity() {
-		if(at instanceof HumanEntity) {
-			return new BukkitMCHumanEntity((HumanEntity) at);
-		}
-		return null;
-	}
-
 	@Override
 	public String toString() {
 		return at.toString();
@@ -76,4 +51,9 @@ public int hashCode() {
 	public String getName() {
 		return at.getName();
 	}
+
+	@Override
+	public UUID getUniqueID() {
+		return at.getUniqueId();
+	}
 }

src/main/java/com/laytonsmith/abstraction/bukkit/entities/BukkitMCHumanEntity.java

@@ -20,6 +20,8 @@
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.Merchant;
 
+import java.util.UUID;
+
 public class BukkitMCHumanEntity extends BukkitMCLivingEntity implements MCHumanEntity {
 
 	HumanEntity he;
@@ -38,6 +40,11 @@ public String getName() {
 		return he.getName();
 	}
 
+	@Override
+	public UUID getUniqueID() {
+		return he.getUniqueId();
+	}
+
 	@Override
 	public void closeInventory() {
 		he.closeInventory();

src/main/java/com/laytonsmith/core/functions/MobManagement.java

@@ -67,6 +67,7 @@ public static String docs() {
 	}
 
 	@api(environments = {CommandHelperEnvironment.class})
+	@seealso({get_mob_owner_uuid.class, set_mob_owner.class})
 	public static class get_mob_owner extends AbstractFunction {
 
 		@Override
@@ -82,13 +83,14 @@ public Integer[] numArgs() {
 		@Override
 		public String docs() {
 			return "string {entityUUID} Returns the owner's name, or null if the mob is unowned."
-					+ "An UntameableMobException is thrown if mob isn't tameable to begin with.";
+					+ " Use {{function|get_mob_owner_uuid}} to get the owner's unique id."
+					+ " An UntameableMobException is thrown if mob isn't tameable to begin with.";
 		}
 
 		@Override
 		public Class<? extends CREThrowable>[] thrown() {
 			return new Class[]{CREUntameableMobException.class, CRELengthException.class,
-				CREBadEntityException.class, CREIllegalArgumentException.class};
+					CREBadEntityException.class, CREFormatException.class};
 		}
 
 		@Override
@@ -122,6 +124,63 @@ public Mixed exec(Target t, Environment environment, Mixed... args) throws Confi
 	}
 
 	@api(environments = {CommandHelperEnvironment.class})
+	@seealso({get_mob_owner.class, set_mob_owner.class})
+	public static class get_mob_owner_uuid extends AbstractFunction {
+
+		@Override
+		public String getName() {
+			return "get_mob_owner_uuid";
+		}
+
+		@Override
+		public Integer[] numArgs() {
+			return new Integer[]{1};
+		}
+
+		@Override
+		public String docs() {
+			return "string {entityUUID} Returns the owner's UUID, or null if the mob is unowned."
+					+ "An UntameableMobException is thrown if mob isn't tameable to begin with.";
+		}
+
+		@Override
+		public Class<? extends CREThrowable>[] thrown() {
+			return new Class[]{CREUntameableMobException.class, CRELengthException.class,
+					CREBadEntityException.class, CREFormatException.class};
+		}
+
+		@Override
+		public boolean isRestricted() {
+			return true;
+		}
+
+		@Override
+		public MSVersion since() {
+			return MSVersion.V3_3_5;
+		}
+
+		@Override
+		public Boolean runAsync() {
+			return false;
+		}
+
+		@Override
+		public Mixed exec(Target t, Environment environment, Mixed... args) throws ConfigRuntimeException {
+			MCLivingEntity mob = Static.getLivingEntity(args[0], t);
+			if(!mob.isTameable()) {
+				throw new CREUntameableMobException("The specified entity is not tameable", t);
+			}
+			MCAnimalTamer owner = ((MCTameable) mob).getOwner();
+			if(owner == null) {
+				return CNull.NULL;
+			} else {
+				return new CString(owner.getUniqueID().toString(), t);
+			}
+		}
+	}
+
+	@api(environments = {CommandHelperEnvironment.class})
+	@seealso({get_mob_owner.class, get_mob_owner_uuid.class})
 	public static class set_mob_owner extends AbstractFunction {
 
 		@Override
@@ -136,15 +195,15 @@ public Integer[] numArgs() {
 
 		@Override
 		public String docs() {
-			return "void {entityUUID, player} Sets the tameable mob to the specified player. Offline players are"
-					+ " supported, but this means that partial matches are NOT supported. You must type the player's"
-					+ " name exactly. Setting the player to null will untame the mob.";
+			return "void {entityUUID, player} Sets the tameable mob to the specified player."
+					+ " The player argument supports offline players, so it should be a UUID or an exact player name."
+					+ " Setting the player to null will untame the mob.";
 		}
 
 		@Override
 		public Class<? extends CREThrowable>[] thrown() {
 			return new Class[]{CREUntameableMobException.class, CRELengthException.class,
-				CREBadEntityException.class, CREIllegalArgumentException.class};
+					CREBadEntityException.class, CREFormatException.class};
 		}
 
 		@Override
@@ -173,7 +232,7 @@ public Mixed exec(Target t, Environment environment, Mixed... args) throws Confi
 			if(player instanceof CNull) {
 				mct.setOwner(null);
 			} else {
-				mct.setOwner(Static.getServer().getOfflinePlayer(player.val()));
+				mct.setOwner(Static.GetUser(player, t));
 			}
 			return CVoid.VOID;
 		}