While poking at these two conditions during the 1.9 update, it came to my attention that they are needlessly restrictive and confusing.

I am proposing that they be replaced by a single conditional "Rider".

The syntax would be defined as follows. All strings are case insensitive unless you are using Regular Expressions. Non-custom Entity names will match against the String used to register them rather than the translated name, this String is usually in English.

Wildcard Keywords

• Match Any Rider: "Rider=any"
• Match No Rider: "Rider=none"
• Match Any Player Rider: "Rider=player"
• Match Any Mob Rider: "Rider=mob"
• Match Any Animal Rider: "Rider=animal"
• Match Unnamed Animals: "Rider=unnamed"

Player Names

• Match a Player: "Rider=player:CovertJaguar"
• Regex match a Player: "Rider?=player:Covert.*"

Entities

• Match Cows: "Rider=entity:cow"
• Mod Entity Matching: "Rider=entity:railcraft.creature.sasquatch"

Entities with Custom Names

• Match a Named Entity: "Rider=named:CowNamedDaisy"
• Match a Named Entity: "Rider=named:Daisy"
• Regex Matching: "Rider?=named:Cow.*" <- will match CowNamedDaisy, but not Daisy