Rewrite metamorphosis to work with husks/strays and skeleton minions

src/main/java/electroblob/wizardry/spell/Metamorphosis.java

@@ -1,23 +1,31 @@
 package electroblob.wizardry.spell;
 
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+
 import electroblob.wizardry.Wizardry;
 import electroblob.wizardry.constants.Element;
 import electroblob.wizardry.constants.SpellType;
 import electroblob.wizardry.constants.Tier;
+import electroblob.wizardry.entity.living.EntitySkeletonMinion;
+import electroblob.wizardry.entity.living.EntityWitherSkeletonMinion;
 import electroblob.wizardry.registry.WizardryItems;
 import electroblob.wizardry.registry.WizardrySounds;
 import electroblob.wizardry.util.SpellModifiers;
 import electroblob.wizardry.util.WizardryParticleType;
 import electroblob.wizardry.util.WizardryUtilities;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.monster.EntityCaveSpider;
+import net.minecraft.entity.monster.EntityHusk;
 import net.minecraft.entity.monster.EntityMagmaCube;
 import net.minecraft.entity.monster.EntityPigZombie;
 import net.minecraft.entity.monster.EntitySkeleton;
 import net.minecraft.entity.monster.EntitySlime;
 import net.minecraft.entity.monster.EntitySpider;
+import net.minecraft.entity.monster.EntityStray;
 import net.minecraft.entity.monster.EntityWitherSkeleton;
+import net.minecraft.entity.monster.EntityZombie;
 import net.minecraft.entity.passive.EntityBat;
 import net.minecraft.entity.passive.EntityChicken;
 import net.minecraft.entity.passive.EntityCow;
@@ -32,8 +40,30 @@ import net.minecraft.world.World;
 
 public class Metamorphosis extends Spell {
 
+	public static final BiMap<Class<? extends EntityLivingBase>, Class<? extends EntityLivingBase>> TRANSFORMATIONS = HashBiMap.create();
+
 	public Metamorphosis(){
 		super(Tier.APPRENTICE, 15, Element.NECROMANCY, "metamorphosis", SpellType.UTILITY, 30, EnumAction.NONE, false);
+
+		addTransformation(EntityPig.class, EntityPigZombie.class);
+		addTransformation(EntityCow.class, EntityMooshroom.class);
+		addTransformation(EntityChicken.class, EntityBat.class);
+		addTransformation(EntityZombie.class, EntityHusk.class);
+		addTransformation(EntitySkeleton.class, EntityWitherSkeleton.class, EntityStray.class);
+		addTransformation(EntitySpider.class, EntityCaveSpider.class);
+		addTransformation(EntitySlime.class, EntityMagmaCube.class);
+		addTransformation(EntitySkeletonMinion.class, EntityWitherSkeletonMinion.class);
+	}
+
+	/** Adds circular mappings between the given entity classes to the transformations map. In other words, given an
+	 * array of entity classes [A, B, C, D], adds mappings A -> B, B -> C, C -> D and D -> A. */
+	@SafeVarargs
+	public static void addTransformation(Class<? extends EntityLivingBase>... entities){
+		Class<? extends EntityLivingBase> previousEntity = entities[entities.length - 1];
+		for(Class<? extends EntityLivingBase> entity : entities){
+			TRANSFORMATIONS.put(previousEntity, entity);
+			previousEntity = entity;
+		}
 	}
 
 	@Override
@@ -51,69 +81,53 @@ public class Metamorphosis extends Spell {
 			double yPos = entityHit.posY;
 			double zPos = entityHit.posZ;
 
-			EntityLiving newEntity = null;
+			// Sneaking allows the entities to be cycled through in the other direction.
+			Class<? extends EntityLivingBase> newEntityClass = caster.isSneaking() ?
+					TRANSFORMATIONS.inverse().get(entityHit.getClass()) : TRANSFORMATIONS.get(entityHit.getClass());
 
-			// IDEA: Interaction with husks/strays?
+			if(newEntityClass == null) return false;
-			// TODO: Replace with a bimap or something.
+
-			if(entityHit instanceof EntityPig){
+			EntityLivingBase newEntity = null;
-				newEntity = new EntityPigZombie(world);
+
-			}else if(entityHit instanceof EntityPigZombie){
+			try {
-				newEntity = new EntityPig(world);
+				newEntity = newEntityClass.getConstructor(World.class).newInstance(world);
-			}else if(entityHit instanceof EntitySkeleton){
+			} catch (Exception e){
-				newEntity = new EntityWitherSkeleton(world);
+				Wizardry.logger.error("Error while attempting to transform entity " + entityHit.getClass() + " to entity " + newEntityClass);
-			}else if(entityHit instanceof EntityWitherSkeleton){
+				e.printStackTrace();
-				newEntity = new EntitySkeleton(world);
+			}
-			}else if(entityHit instanceof EntityCow && !(entityHit instanceof EntityMooshroom)){
+			
-				newEntity = new EntityMooshroom(world);
+			if(newEntity == null) return false;
-			}else if(entityHit instanceof EntityMooshroom){
+
-				newEntity = new EntityCow(world);
+			if(!world.isRemote){
-			}else if(entityHit instanceof EntityChicken){
+				// Transfers attributes from the old entity to the new one.
-				newEntity = new EntityBat(world);
+				newEntity.setHealth(((EntityLivingBase)entityHit).getHealth());
-			}else if(entityHit instanceof EntityBat){
+				newEntity.readFromNBT(entityHit.getEntityData());
-				newEntity = new EntityChicken(world);
+
-			}else if(entityHit instanceof EntitySlime && !(entityHit instanceof EntityMagmaCube)){
+				entityHit.setDead();
-				newEntity = new EntityMagmaCube(world);
+				newEntity.setPosition(xPos, yPos, zPos);
-			}else if(entityHit instanceof EntityMagmaCube){
+				world.spawnEntity(newEntity);
-				newEntity = new EntitySlime(world);
+				
-			}else if(entityHit instanceof EntitySpider && !(entityHit instanceof EntityCaveSpider)){
+			}else{
-				newEntity = new EntityCaveSpider(world);
+				
-			}else if(entityHit instanceof EntityCaveSpider){
+				for(int i = 1; i < (int)(25 * modifiers.get(WizardryItems.range_upgrade)); i += 2){
-				newEntity = new EntitySpider(world);
+					// I figured it out! when on client side, entityplayer.posY is at the eyes, not the feet!
+					double x1 = caster.posX + look.x * i / 2 + world.rand.nextFloat() / 5 - 0.1f;
+					double y1 = WizardryUtilities.getPlayerEyesPos(caster) - 0.4f + look.y * i / 2
+							+ world.rand.nextFloat() / 5 - 0.1f;
+					double z1 = caster.posZ + look.z * i / 2 + world.rand.nextFloat() / 5 - 0.1f;
+					// world.spawnParticle("mobSpell", x1, y1, z1, -1*look.xCoord, -1*look.yCoord, -1*look.zCoord);
+					Wizardry.proxy.spawnParticle(WizardryParticleType.SPARKLE, world, x1, y1, z1, 0.0d, 0.0d, 0.0d,
+							12 + world.rand.nextInt(8), 0.2f, 0.0f, 0.1f);
+				}
+				for(int i = 0; i < 5; i++){
+					Wizardry.proxy.spawnParticle(WizardryParticleType.DARK_MAGIC, world, xPos, yPos, zPos, 0.0d,
+							0.0d, 0.0d, 0, 0.1f, 0.0f, 0.0f);
+				}
 			}
 
-			if(newEntity != null){
+			caster.swingArm(hand);
-
+			WizardryUtilities.playSoundAtPlayer(caster, WizardrySounds.SPELL_DEFLECTION, 0.5F, 0.8f);
-				if(!world.isRemote && newEntity != null){
+			return true;
-					// Transfers attributes from the old entity to the new one.
-					newEntity.setHealth(((EntityLiving)entityHit).getHealth());
-					// newEntity.writeToNBT(entityHit.getEntityData());
-
-					entityHit.setDead();
-					newEntity.setPosition(xPos, yPos, zPos);
-					world.spawnEntity(newEntity);
-				}
-
-				if(world.isRemote){
-					for(int i = 1; i < (int)(25 * modifiers.get(WizardryItems.range_upgrade)); i += 2){
-						// I figured it out! when on client side, entityplayer.posY is at the eyes, not the feet!
-						double x1 = caster.posX + look.x * i / 2 + world.rand.nextFloat() / 5 - 0.1f;
-						double y1 = WizardryUtilities.getPlayerEyesPos(caster) - 0.4f + look.y * i / 2
-								+ world.rand.nextFloat() / 5 - 0.1f;
-						double z1 = caster.posZ + look.z * i / 2 + world.rand.nextFloat() / 5 - 0.1f;
-						// world.spawnParticle("mobSpell", x1, y1, z1, -1*look.xCoord, -1*look.yCoord, -1*look.zCoord);
-						Wizardry.proxy.spawnParticle(WizardryParticleType.SPARKLE, world, x1, y1, z1, 0.0d, 0.0d, 0.0d,
-								12 + world.rand.nextInt(8), 0.2f, 0.0f, 0.1f);
-					}
-					for(int i = 0; i < 5; i++){
-						Wizardry.proxy.spawnParticle(WizardryParticleType.DARK_MAGIC, world, xPos, yPos, zPos, 0.0d,
-								0.0d, 0.0d, 0, 0.1f, 0.0f, 0.0f);
-					}
-				}
-
-				caster.swingArm(hand);
-				WizardryUtilities.playSoundAtPlayer(caster, WizardrySounds.SPELL_DEFLECTION, 0.5F, 0.8f);
-				return true;
-			}
 		}
 		return false;
 	}