Rx3/MassiveCore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved AREntityType

Browse Source
This commit is contained in:
Olof Larsson 2014-04-07 02:04:41 +02:00
parent 1de1a7184a
commit cfaaa9f421
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/com/massivecraft/mcore/cmd/arg/AREntityType.java
View File

@ -26,23 +26,38 @@ public class AREntityType extends ARAbstractSelect<EntityType>
return "entity type"; return "entity type";
} }
@SuppressWarnings("deprecation")
@Override @Override
public EntityType select(String arg, CommandSender sender) public EntityType select(String arg, CommandSender sender)
{ {
return EntityType.fromName(arg); arg = getComparable(arg);
// Custom Detection
if (arg.contains("pig") && (arg.contains("man") || arg.contains("zombie"))) return EntityType.PIG_ZOMBIE;
// Algorithmic General Detection
for (EntityType entityType : EntityType.values())
{
if (getComparable(entityType.toString()).equals(arg)) return entityType;
}
// Nothing found
return null;
} }
@SuppressWarnings("deprecation")
@Override @Override
public Collection<String> altNames(CommandSender sender) public Collection<String> altNames(CommandSender sender)
{ {
List<String> ret = new ArrayList<String>(); List<String> ret = new ArrayList<String>();
for (EntityType entityType : EntityType.values()) for (EntityType entityType : EntityType.values())
{ {
ret.add(entityType.getName()); ret.add(getComparable(entityType.toString()));
} }
return ret; return ret;
} }
public static String getComparable(String string)
{
return string.toLowerCase().replaceAll("[_-\\s]+", "");
}
} }