Renamed message event type "alive" to "idle"

Added event listeners for entity spawn and player entity interaction
Always add new config values to config.yml
Some cleanup

Author: Programie

pom.xml

@@ -41,16 +41,16 @@
 				<directory>src/main/resources</directory>
 			</resource>
 		</resources>
-	 <plugins>
-	  <plugin>
-	   <groupId>org.apache.maven.plugins</groupId>
-	   <artifactId>maven-compiler-plugin</artifactId>
-	   <version>2.3.2</version>
-	   <configuration>
-	    <source>1.7</source>
-	    <target>1.7</target>
-	   </configuration>
-	  </plugin>
-	 </plugins>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+				</configuration>
+			</plugin>
+		</plugins>
 	</build>
 </project>

src/main/java/net/minearea/talkingmobs/EventListener.java

@@ -5,8 +5,10 @@
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
+import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.EntityDeathEvent;
+import org.bukkit.event.player.PlayerInteractEntityEvent;
 
 /**
  * Class providing all event listeners required for the plugin
@@ -27,12 +29,17 @@ public EventListener(TalkingMobs pluginInstance, Message messageInstance)
 		message = messageInstance;
 	}
 
-	// TODO: Prevent spam
-	/*@EventHandler
+	@EventHandler
 	public void onCreatureSpawn(CreatureSpawnEvent event)
 	{
-		message.sendMessage(event.getEntity(), Message.MessageType.spawn);
-	}*/
+		Entity entity = event.getEntity();
+		CreatureSpawnEvent.SpawnReason spawnReason = event.getSpawnReason();
+
+		if (spawnReason == CreatureSpawnEvent.SpawnReason.SPAWNER || spawnReason == CreatureSpawnEvent.SpawnReason.SPAWNER_EGG)
+		{
+			message.sendMessage(entity, Message.EventType.spawned);
+		}
+	}
 
 	@EventHandler
 	public void onEntityAttacked(EntityDamageByEntityEvent event)
@@ -57,4 +64,10 @@ public void onEntityKilled(EntityDeathEvent event)
 			message.sendMessage(entity, (Player) killer, Message.EventType.killed);
 		}
 	}
+
+	@EventHandler
+	public void onPlayerInteractEntity(PlayerInteractEntityEvent event)
+	{
+		message.sendMessage(event.getRightClicked(), event.getPlayer(), Message.EventType.interacted);
+	}
 }

src/main/java/net/minearea/talkingmobs/Message.java

@@ -19,26 +19,26 @@ public class Message
 	 */
 	public enum EventType
 	{
-		/**
-		 * Mob is alive (Currently unused)
-		 */
-		alive,
 		/**
 		 * Mob has been attacked by a player
 		 */
 		attacked,
 		/**
-		 * Player interacted with the mob (Currently unused)
+		 * Mob is idle (Is just standing/walking/running around) -> Unused
+		 */
+		idle,
+		/**
+		 * Player interacted with the mob (Right clicked on mob)
 		 */
 		interacted,
 		/**
 		 * Mob has been killed by a player
 		 */
 		killed,
 		/**
-		 * Mob has been spawned
+		 * Mob has been spawned (Currently only mob spawner or egg)
 		 */
-		spawn
+		spawned
 	}
 
 	/**
@@ -64,19 +64,23 @@ private String getMessage(Entity mob, EventType eventType)
 		{
 			Random randomGenerator = new Random();
 
-			String message = plugin.getConfig().getString("messageformat." + eventType.toString());
+			String message = plugin.getConfig().getString("messageFormat." + eventType.toString());
 
 			if (message == null)
 			{
 				message = "[&a%mobname%&r] %message%";
-				plugin.getLogger().log(Level.WARNING, "Message format for event type '{0}' not defined!", eventType.toString());
+				plugin.getLogger().log(Level.WARNING, "Message format for event type ''{0}'' not defined!", eventType.toString());
 			}
 
 			message = message.replaceAll("%message%", messages.get(randomGenerator.nextInt(messages.size())));
 			message = message.replaceAll("%mobname%", mob.getType().getName());
 
 			return message;
 		}
+		else
+		{
+			plugin.getLogger().log(Level.WARNING, "No messages for event ''{0}'' of mob ''{1}'' defined!", new Object[]{eventType.toString(), mob.getType().getName()});
+		}
 
 		return null;
 	}

src/main/java/net/minearea/talkingmobs/TalkingMobs.java

@@ -17,7 +17,8 @@ public final class TalkingMobs extends JavaPlugin
 	@Override
 	public void onEnable()
 	{
-		this.saveDefaultConfig();
+		getConfig().options().copyDefaults(true);
+		saveConfig();
 
 		PluginManager pluginManager = getServer().getPluginManager();
 		pluginManager.registerEvents(new EventListener(this, message), this);
@@ -33,9 +34,11 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 				switch (args[0])
 				{
 					case "help":// TODO: Messages are in wrong order
+						List<String> lines = new ArrayList<>();
+
 						if (sender.hasPermission("talkingmobs.reload"))
 						{
-							sender.sendMessage("/talkingmobs reload - Reload the configuration");
+							lines.add("/talkingmobs reload - Reload the configuration");
 						}
 
 						List<String> eventTypes = new ArrayList<>();
@@ -44,9 +47,11 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 							eventTypes.add(eventType.toString());
 						}
 
-						sender.sendMessage("/talkingmobs toggle <type> - Toggle messages sent by mobs (Type is optional and can be used to only toggle the specified message type)");
-						sender.sendMessage("");
-						sender.sendMessage("Message types: " + StringUtils.join(eventTypes, ", "));
+						lines.add("/talkingmobs toggle <type> - Toggle messages sent by mobs (Type is optional and can be used to only toggle the specified message type)");
+						lines.add("");
+						lines.add("Message types: " + StringUtils.join(eventTypes, ", "));
+
+						sender.sendMessage(lines.toArray(new String[0]));
 
 						return true;
 					case "reload":