Add flamecatcher spell, and addItemExtras hook for SpellConjuration

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

@@ -0,0 +1,43 @@
+package electroblob.wizardry.spell;
+
+import electroblob.wizardry.registry.WizardryItems;
+import electroblob.wizardry.util.ParticleBuilder;
+import electroblob.wizardry.util.ParticleBuilder.Type;
+import electroblob.wizardry.util.SpellModifiers;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.world.World;
+
+public class Flamecatcher extends SpellConjuration {
+
+	public static final String SHOT_COUNT = "shot_count";
+	public static final String SHOTS_REMAINING_NBT_KEY = "shotsRemaining";
+
+	public Flamecatcher(){
+		super("flamecatcher", WizardryItems.flamecatcher);
+		addProperties(RANGE, SHOT_COUNT, DAMAGE, BURN_DURATION);
+	}
+
+	@Override
+	protected void addItemExtras(EntityPlayer caster, ItemStack stack, SpellModifiers modifiers){
+		if(stack.getTagCompound() == null) stack.setTagCompound(new NBTTagCompound());
+		stack.getTagCompound().setInteger(SHOTS_REMAINING_NBT_KEY, (int)(getProperty(SHOT_COUNT).intValue() * modifiers.get(SpellModifiers.POTENCY)));
+	}
+
+	@Override
+	protected void spawnParticles(World world, EntityLivingBase caster, SpellModifiers modifiers){
+
+		ParticleBuilder.create(Type.BUFF).entity(caster).clr(0xff6d00).spawn(world);
+
+		for(int i=0; i<10; i++){
+			double x = caster.posX + world.rand.nextDouble() * 2 - 1;
+			double y = caster.posY + caster.getEyeHeight() - 0.5 + world.rand.nextDouble();
+			double z = caster.posZ + world.rand.nextDouble() * 2 - 1;
+			world.spawnParticle(EnumParticleTypes.FLAME, x, y, z, 0, 0, 0);
+		}
+	}
+
+}

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

@@ -83,17 +83,29 @@ public class SpellConjuration extends Spell {
 
 		ItemStack stack = new ItemStack(item);
 
+		if(InventoryUtils.doesPlayerHaveItem(caster, item)) return false;
+
 		IConjuredItem.setDurationMultiplier(stack, modifiers.get(WizardryItems.duration_upgrade));
 		IConjuredItem.setDamageMultiplier(stack, modifiers.get(SpellModifiers.POTENCY));
-		
-		if(InventoryUtils.doesPlayerHaveItem(caster, item)) return false;
-		
+
+		addItemExtras(caster, stack, modifiers);
+
 		if(caster.getHeldItemMainhand().isEmpty()){
 			caster.setHeldItem(EnumHand.MAIN_HAND, stack);
-			return true;
 		}else{
-			return caster.inventory.addItemStackToInventory(stack);
+			if(!caster.inventory.addItemStackToInventory(stack)) return false;
 		}
+
+		return true;
 	}
 
+	/**
+	 * Called directly <i>before</i> the conjured item is added to the inventory to perform additional behaviour (such
+	 * as NBT modification). Does nothing by default.
+	 * @param caster The player that cast this spell
+	 * @param stack The item stack being conjured
+	 * @param modifiers The modifiers this spell was cast with
+	 */
+	protected void addItemExtras(EntityPlayer caster, ItemStack stack, SpellModifiers modifiers){}
+
 }