1.10 support (polar bears and strays)

Author: bensku

pom.xml

@@ -31,7 +31,7 @@
 		<dependency>
 			<groupId>org.spigotmc</groupId>
 			<artifactId>spigot-api</artifactId>
-			<version>1.9.4-R0.1-SNAPSHOT</version>
+			<version>1.10-R0.1-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 

src/main/java/ch/njol/skript/entity/SimpleEntityData.java

@@ -56,6 +56,7 @@
 import org.bukkit.entity.MushroomCow;
 import org.bukkit.entity.Painting;
 import org.bukkit.entity.PigZombie;
+import org.bukkit.entity.PolarBear;
 import org.bukkit.entity.Projectile;
 import org.bukkit.entity.Shulker;
 import org.bukkit.entity.ShulkerBullet;
@@ -150,7 +151,7 @@ public boolean equals(final @Nullable Object obj) {
 		types.add(new SimpleEntityDataInfo("squid", Squid.class));
 		types.add(new SimpleEntityDataInfo("bottle of enchanting", ThrownExpBottle.class));
 		types.add(new SimpleEntityDataInfo("tnt", TNTPrimed.class));
-		types.add(new SimpleEntityDataInfo("zombie", Zombie.class));
+		types.add(new SimpleEntityDataInfo("zombie", Zombie.class)); // TODO husks and zombie villagers (and test that)
 		types.add(new SimpleEntityDataInfo("golem", Golem.class));
 
 		if (Skript.classExists("org.bukkit.entity.ItemFrame")) {
@@ -165,10 +166,13 @@ public boolean equals(final @Nullable Object obj) {
 		if(Skript.classExists("org.bukkit.entity.ArmorStand")){
 			types.add(new SimpleEntityDataInfo("endermite", Endermite.class));
 			types.add(new SimpleEntityDataInfo("armor stand", ArmorStand.class));
-		} if (Skript.classExists("org.bukkit.entity.Shulker")) {
+		}
+		if (Skript.classExists("org.bukkit.entity.Shulker")) {
 			types.add(new SimpleEntityDataInfo("shulker", Shulker.class));
 			types.add(new SimpleEntityDataInfo("shulker bullet", ShulkerBullet.class));
 		}
+		if (Skript.classExists("org.bukkit.entity.PolarBear"))
+			types.add(new SimpleEntityDataInfo("polar bear", PolarBear.class));
 		// TODO !Update with every version [entities]
 
 		// supertypes

src/main/java/ch/njol/skript/entity/SkeletonData.java

@@ -26,67 +26,103 @@
 import org.eclipse.jdt.annotation.Nullable;
 
 import ch.njol.skript.Skript;
+import ch.njol.skript.SkriptAPIException;
 import ch.njol.skript.lang.Literal;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 
 /**
  * @author Peter Güttinger
  */
 public class SkeletonData extends EntityData<Skeleton> {
+	
 	private final static boolean hasWither = Skript.methodExists(Skeleton.class, "getSkeletonType");
+	private final static boolean hasStray = Skript.isRunningMinecraft(1, 10);
+	
 	static {
-		if (hasWither)
+		if (hasStray)
+			register(SkeletonData.class, "skeleton", Skeleton.class, 0, "skeleton", "wither skeleton", "stray");
+		else if (hasWither)
 			register(SkeletonData.class, "skeleton", Skeleton.class, 0, "skeleton", "wither skeleton");
 		else
 			register(SkeletonData.class, "skeleton", Skeleton.class, "skeleton");
 
 	}
 
-	private boolean wither;
+	private int type;
+	public static final int NORMAL = 0, WITHER = 1, STRAY = 2, LAST_INDEX = STRAY;
 
 	public SkeletonData() {}
 
-	public SkeletonData(final boolean wither) {
-		this.wither = wither;
+	public SkeletonData(final int type) {
+		if (type > LAST_INDEX)
+			throw new SkriptAPIException("Unsupported skeleton type " + type);
+		this.type = type;
 	}
 
 	public boolean isWither() {
-		return wither;
+		return type == WITHER;
+	}
+	
+	public boolean isStray() {
+		return type == STRAY;
 	}
 
 	@Override
 	protected boolean init(final Literal<?>[] exprs, final int matchedPattern, final ParseResult parseResult) {
-		wither = matchedPattern == 1;
+		type = matchedPattern;
 		return true;
 	}
 
 	@Override
 	protected boolean init(final @Nullable Class<? extends Skeleton> c, final @Nullable Skeleton e) {
-		wither = (e == null || !hasWither) ? false : e.getSkeletonType() == SkeletonType.WITHER;
+		if (e == null)
+			return true;
+		
+		if (hasWither && e.getSkeletonType() == SkeletonType.WITHER)
+			type = WITHER;
+		if (hasStray && e.getSkeletonType() == SkeletonType.STRAY)
+			type = STRAY;
 		return true;
 	}
 
 //		return wither ? "1" : "0";
 	@Override
 	protected boolean deserialize(final String s) {
-		if (s.equals("1"))
-			wither = true;
-		else if (s.equals("0"))
-			wither = false;
-		else
-			return false;
+		try {
+			int typeOffer = Integer.parseInt(s);
+			if (typeOffer > LAST_INDEX)
+				throw new SkriptAPIException("Unsupported skeleton type " + s);
+		} catch (NumberFormatException e) {
+			throw new SkriptAPIException("Cannot parse skeleton type " + s);
+		}
+		
 		return true;
 	}
 
 	@Override
-	public void set(final Skeleton entity) {
-		if (hasWither)
-			entity.setSkeletonType(wither ? SkeletonType.WITHER : SkeletonType.NORMAL);
+	public void set(final Skeleton e) {
+		switch (type) {
+			case WITHER:
+				e.setSkeletonType(SkeletonType.WITHER);
+				break;
+			case STRAY:
+				e.setSkeletonType(SkeletonType.STRAY);
+				break;
+			default:
+				e.setSkeletonType(SkeletonType.NORMAL);
+		}
 	}
 
 	@Override
-	protected boolean match(final Skeleton entity) {
-		return hasWither ? (entity.getSkeletonType() == SkeletonType.WITHER) == wither : true;
+	protected boolean match(final Skeleton e) {
+		switch (type) {
+			case WITHER:
+				return e.getSkeletonType() == SkeletonType.WITHER;
+			case STRAY:
+				return e.getSkeletonType() == SkeletonType.STRAY;
+			default:
+				return e.getSkeletonType() == SkeletonType.NORMAL;
+		}
 	}
 
 	@Override
@@ -99,24 +135,24 @@ protected boolean equals_i(final EntityData<?> obj) {
 		if (!(obj instanceof SkeletonData))
 			return false;
 		final SkeletonData other = (SkeletonData) obj;
-		return other.wither == wither;
+		return other.type == type;
 	}
 
 	@Override
 	protected int hashCode_i() {
-		return wither ? 1 : 0;
+		return type;
 	}
 
 	@Override
 	public boolean isSupertypeOf(final EntityData<?> e) {
 		if (e instanceof SkeletonData)
-			return ((SkeletonData) e).wither == wither;
+			return ((SkeletonData) e).type == type;
 		return false;
 	}
 
 	@Override
 	public EntityData getSuperType() {
-		return new SkeletonData(wither);
+		return new SkeletonData(type);
 	}
 
 }

src/main/resources/lang/english.lang

@@ -793,6 +793,12 @@ entities:
 	endermite:
 		name: endermite¦s
 		pattern: endermite(|1¦s)
+	stray:
+		name: stray¦s
+		pattern: stray(|1¦s)
+	polar bear:
+		name: polar bear¦s
+		pattern: polar bears(|1¦s)
 
 # -- Damage Causes --
 damage causes: