Add boat "type" to entity_spec()

Author: PseudoKnight

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

@@ -1,6 +1,8 @@
 package com.laytonsmith.abstraction.bukkit.entities;
 
 import com.laytonsmith.abstraction.entities.MCBoat;
+import com.laytonsmith.abstraction.enums.MCTreeSpecies;
+import com.laytonsmith.abstraction.enums.bukkit.BukkitMCTreeSpecies;
 import org.bukkit.entity.Boat;
 import org.bukkit.entity.Entity;
 
@@ -22,4 +24,19 @@ public double getMaxSpeed() {
 	public void setMaxSpeed(double speed) {
 		b.setMaxSpeed(speed);
 	}
+
+	@Override
+	public MCTreeSpecies getWoodType() {
+		return BukkitMCTreeSpecies.getConvertor().getAbstractedEnum(b.getWoodType());
+	}
+
+	@Override
+	public void setWoodType(MCTreeSpecies type) {
+		try {
+			b.setWoodType(BukkitMCTreeSpecies.getConvertor().getConcreteEnum(type));
+		} catch(NoSuchMethodError ex) {
+			// probably prior to 1.9
+		}
+	}
+
 }

src/main/java/com/laytonsmith/abstraction/entities/MCBoat.java

@@ -1,10 +1,11 @@
 package com.laytonsmith.abstraction.entities;
 
 import com.laytonsmith.abstraction.MCVehicle;
+import com.laytonsmith.abstraction.enums.MCTreeSpecies;
 
 public interface MCBoat extends MCVehicle {
-
 	double getMaxSpeed();
-
 	void setMaxSpeed(double speed);
+	MCTreeSpecies getWoodType();
+	void setWoodType(MCTreeSpecies type);
 }

src/main/java/com/laytonsmith/abstraction/enums/MCTreeSpecies.java

@@ -0,0 +1,13 @@
+package com.laytonsmith.abstraction.enums;
+
+import com.laytonsmith.annotations.MEnum;
+
+@MEnum("WoodType")
+public enum MCTreeSpecies {
+	ACACIA,
+	BIRCH,
+	DARK_OAK,
+	JUNGLE,
+	OAK,
+	SPRUCE
+}

src/main/java/com/laytonsmith/abstraction/enums/bukkit/BukkitMCTreeSpecies.java

@@ -0,0 +1,46 @@
+package com.laytonsmith.abstraction.enums.bukkit;
+
+import com.laytonsmith.abstraction.Implementation;
+import com.laytonsmith.abstraction.enums.EnumConvertor;
+import com.laytonsmith.abstraction.enums.MCTreeSpecies;
+import com.laytonsmith.annotations.abstractionenum;
+import org.bukkit.TreeSpecies;
+
+@abstractionenum(
+		implementation = Implementation.Type.BUKKIT,
+		forAbstractEnum = MCTreeSpecies.class,
+		forConcreteEnum = TreeSpecies.class
+)
+public class BukkitMCTreeSpecies extends EnumConvertor<MCTreeSpecies, TreeSpecies> {
+
+	private static BukkitMCTreeSpecies instance;
+
+	public static BukkitMCTreeSpecies getConvertor() {
+		if(instance == null) {
+			instance = new BukkitMCTreeSpecies();
+		}
+		return instance;
+	}
+
+	@Override
+	protected MCTreeSpecies getAbstractedEnumCustom(TreeSpecies concrete) {
+		switch(concrete) {
+			case GENERIC:
+				return MCTreeSpecies.OAK;
+			case REDWOOD:
+				return MCTreeSpecies.SPRUCE;
+		}
+		return super.getAbstractedEnumCustom(concrete);
+	}
+
+	@Override
+	protected TreeSpecies getConcreteEnumCustom(MCTreeSpecies abstracted) {
+		switch(abstracted) {
+			case OAK:
+				return TreeSpecies.GENERIC;
+			case SPRUCE:
+				return TreeSpecies.REDWOOD;
+		}
+		return super.getConcreteEnumCustom(abstracted);
+	}
+}

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

@@ -87,6 +87,7 @@
 import com.laytonsmith.abstraction.enums.MCRabbitType;
 import com.laytonsmith.abstraction.enums.MCRotation;
 import com.laytonsmith.abstraction.enums.MCSkeletonType;
+import com.laytonsmith.abstraction.enums.MCTreeSpecies;
 import com.laytonsmith.abstraction.enums.MCVersion;
 import com.laytonsmith.annotations.api;
 import com.laytonsmith.annotations.hide;
@@ -1738,6 +1739,7 @@ public String docs() {
 			docs = docs.replace("%RABBIT_TYPE%", StringUtils.Join(MCRabbitType.values(), ", ", ", or ", " or "));
 			docs = docs.replace("%PARTICLE%", StringUtils.Join(MCParticle.values(), ", ", ", or ", " or "));
 			docs = docs.replace("%ENDERDRAGON_PHASE%", StringUtils.Join(MCEnderDragonPhase.values(), ", ", ", or ", " or "));
+			docs = docs.replace("%TREE_SPECIES%", StringUtils.Join(MCTreeSpecies.values(), ", ", ", or ", " or "));
 			for(Field field : entity_spec.class.getDeclaredFields()) {
 				try {
 					String name = field.getName();
@@ -1807,6 +1809,12 @@ public Construct exec(Target t, Environment environment, Construct... args) thro
 					}
 					specArray.set(entity_spec.KEY_ARMORSTAND_POSES, poses, t);
 					break;
+				case BOAT:
+					MCBoat boat = (MCBoat) entity;
+					if(Static.getServer().getMinecraftVersion().gte(MCVersion.MC1_9)) {
+						specArray.set(entity_spec.KEY_BOAT_TYPE, new CString(boat.getWoodType().name(), t), t);
+					}
+					break;
 				case CREEPER:
 					MCCreeper creeper = (MCCreeper) entity;
 					specArray.set(entity_spec.KEY_CREEPER_POWERED, CBoolean.get(creeper.isPowered()), t);
@@ -2090,6 +2098,7 @@ public CHVersion since() {
 		private static final String KEY_ARMORSTAND_POSES = "poses";
 		private static final String KEY_ARMORSTAND_SMALLSIZE = "small";
 		private static final String KEY_ARMORSTAND_VISIBLE = "visible";
+		private static final String KEY_BOAT_TYPE = "type";
 		private static final String KEY_CREEPER_POWERED = "powered";
 		private static final String KEY_CREEPER_MAXFUSETICKS = "maxfuseticks";
 		private static final String KEY_CREEPER_EXPLOSIONRADIUS = "explosionradius";
@@ -2337,6 +2346,22 @@ public Construct exec(Target t, Environment environment, Construct... args) thro
 						}
 					}
 					break;
+				case BOAT:
+					MCBoat boat = (MCBoat) entity;
+					for(String index : specArray.stringKeySet()) {
+						switch(index.toLowerCase()) {
+							case entity_spec.KEY_BOAT_TYPE:
+								try {
+									boat.setWoodType(MCTreeSpecies.valueOf(specArray.get(index, t).val().toUpperCase()));
+								} catch(IllegalArgumentException ex) {
+									throw new CREFormatException("Invalid boat type: " + specArray.get(index, t).val(), t);
+								}
+								break;
+							default:
+								throwException(index, t);
+						}
+					}
+					break;
 				case CREEPER:
 					MCCreeper creeper = (MCCreeper) entity;
 					for(String index : specArray.stringKeySet()) {
@@ -2439,7 +2464,11 @@ public Construct exec(Target t, Environment environment, Construct... args) thro
 					for(String index : specArray.stringKeySet()) {
 						switch(index.toLowerCase()) {
 							case entity_spec.KEY_ENDERDRAGON_PHASE:
-								enderdragon.setPhase(MCEnderDragonPhase.valueOf(specArray.get(index, t).val().toUpperCase()));
+								try {
+									enderdragon.setPhase(MCEnderDragonPhase.valueOf(specArray.get(index, t).val().toUpperCase()));
+								} catch(IllegalArgumentException ex) {
+									throw new CREFormatException("Invalid EnderDragon phase: " + specArray.get(index, t).val(), t);
+								}
 								break;
 							default:
 								throwException(index, t);

src/main/resources/functionDocs/entity_spec

@@ -38,6 +38,10 @@ relative to the default position (where all angles are 0). Setting these values
 where only values specified will be changed. This allows you to rotate a single body part around a single axis
 without knowing the rotations on the other axis or of other body parts beforehand.
 |-
+| BOAT
+|
+* %KEY_BOAT_TYPE%: Which tree species the boat is composed of. (can be %TREE_SPECIES%)
+|-
 | CREEPER
 | 
 * %KEY_CREEPER_POWERED%: If the Creeper is powered or not.