Cleanup

src/main/java/electroblob/wizardry/entity/living/EntityAIAttackSpell.java

@@ -108,6 +108,7 @@ public class EntityAIAttackSpell<T extends EntityLiving & ISpellCaster> extends
 				new PacketNPCCastSpell.Message(attacker.getEntityId(), target == null ? -1 : target.getEntityId(),
 						EnumHand.MAIN_HAND, spell.id(), modifiers),
 				// Particles are usually only visible from 16 blocks away, so 128 is more than far enough.
+				// TODO: Why is this one a 128 block radius, whilst the other one is all in dimension?
 				new TargetPoint(attacker.dimension, attacker.posX, attacker.posY, attacker.posZ, 128));
 	}
 

src/main/java/electroblob/wizardry/entity/living/EntityWizard.java

@@ -146,29 +146,26 @@ public class EntityWizard extends EntityCreature implements INpc, IMerchant, ISp
 		this.tasks.addTask(7, new EntityAIWander(this, 0.6D));
 		this.tasks.addTask(8, new EntityAIWatchClosest(this, EntityLiving.class, 8.0F));
 
-		this.targetSelector = new Predicate<Entity>(){
+		this.targetSelector = entity -> {
 
-			public boolean apply(Entity entity){
+			// If the target is valid and not invisible...
+			if(entity != null && !entity.isInvisible()
+					&& WizardryUtilities.isValidTarget(EntityWizard.this, entity)){
 
-				// If the target is valid and not invisible...
-				if(entity != null && !entity.isInvisible()
-						&& WizardryUtilities.isValidTarget(EntityWizard.this, entity)){
-
-					// ... and is a mob, a summoned creature ...
-					if((entity instanceof IMob || entity instanceof ISummonedCreature
-							// ... or in the whitelist ...
-							|| Arrays.asList(Wizardry.settings.summonedCreatureTargetsWhitelist)
-									.contains(EntityList.getKey(entity.getClass())))
-							// ... and isn't in the blacklist ...
-							&& !Arrays.asList(Wizardry.settings.summonedCreatureTargetsBlacklist)
-									.contains(EntityList.getKey(entity.getClass()))){
-						// ... it can be attacked.
-						return true;
-					}
+				// ... and is a mob, a summoned creature ...
+				if((entity instanceof IMob || entity instanceof ISummonedCreature
+						// ... or in the whitelist ...
+						|| Arrays.asList(Wizardry.settings.summonedCreatureTargetsWhitelist)
+								.contains(EntityList.getKey(entity.getClass())))
+						// ... and isn't in the blacklist ...
+						&& !Arrays.asList(Wizardry.settings.summonedCreatureTargetsBlacklist)
+								.contains(EntityList.getKey(entity.getClass()))){
+					// ... it can be attacked.
+					return true;
 				}
-
-				return false;
 			}
+
+			return false;
 		};
 
 		this.targetTasks.addTask(1, new EntityAIHurtByTarget(this, true));

src/main/java/electroblob/wizardry/entity/living/ISummonedCreature.java

@@ -157,7 +157,7 @@ public interface ISummonedCreature extends IEntityAdditionalSpawnData {
 	 * Called by the client when it receives a Entity spawn packet. Data should be read out of the stream in the same
 	 * way as it was written. <b>Implementors must call super when overriding.</b>
 	 *
-	 * @param additionalData The packet data stream
+	 * @param buffer The packet data stream
 	 */
 	@Override
 	default void readSpawnData(ByteBuf buffer){
@@ -241,11 +241,11 @@ public interface ISummonedCreature extends IEntityAdditionalSpawnData {
 	 * to do something when a successful attack is made. This was added because the event-based damage source system can
 	 * cause parts of attackEntityAsMob not to fire, since attackEntityFrom is intercepted and canceled.
 	 * <p>
-	 * Usage examples: {@link EntitySliverfishMinion} uses this to summon more silverfish if the target is killed,
+	 * Usage examples: {@link EntitySilverfishMinion} uses this to summon more silverfish if the target is killed,
 	 * {@link EntitySkeletonMinion} and {@link EntitySpiderMinion} use this to add potion effects to the target.
 	 */
 	default void onSuccessfulAttack(EntityLivingBase target){
-	};
+	}
 
 	// Delegates