Merge pull request #2 from heyimblake/dev

Merge #1 and Fixes to master

.gitignore

@@ -3,7 +3,9 @@ target/
 .idea/
 *.iml
 *.class
-
+.classpath
+.project
+.settings/
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
 

dependency-reduced-pom.xml

@@ -4,7 +4,7 @@
   <groupId>me.heyimblake</groupId>
   <artifactId>hiveranks</artifactId>
   <name>HiveRanks</name>
-  <version>1.1.1-MC1.8.8</version>
+  <version>1.1.2-MC1.8.8</version>
   <description>A Bukkit plugin to retrieve a player's HiveMC rank.</description>
   <build>
     <defaultGoal>clean package</defaultGoal>

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>me.heyimblake</groupId>
     <artifactId>hiveranks</artifactId>
-    <version>1.1.1-MC1.8.8</version>
+    <version>1.1.2-MC1.8.8</version>
     <packaging>jar</packaging>
 
     <name>HiveRanks</name>

src/main/java/me/heyimblake/hiveranks/HiveRanks.java

@@ -7,9 +7,12 @@
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import java.util.logging.Level;
+
 public class HiveRanks extends JavaPlugin {
     private static HiveRanks instance;
     private Metrics metrics;
+    private final int SERVER_VERSION = Bukkit.getVersion().contains("1.8") ? 8 : 9;
 
     /**
      * Gets the instance of this class.
@@ -20,15 +23,21 @@ public static HiveRanks getInstance() {
         return instance;
     }
 
+    public int getServerVersion(){
+    	return SERVER_VERSION;
+    }
+
     @Override
     public void onEnable() {
         instance = this;
         PluginManager pluginManager = Bukkit.getPluginManager();
 
         CachedPlayerManager.getInstance().initializeDirectory();
         ScoreboardManager.getInstance().initializeScoreboard();
-
+        
         metrics = new Metrics(this);
+
+        getLogger().log(Level.INFO, "Detected server version: " + Bukkit.getVersion() + ". Features will be adjusted for this version.");
 
         pluginManager.registerEvents(new PlayerJoinListener(), this);
         getCommand("hiveranks").setExecutor(new HiveRanksCommand());

src/main/java/me/heyimblake/hiveranks/commands/HiveRanksCommand.java

@@ -84,12 +84,12 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
      * @param sender  who to send the screen to
      */
     private void showHelpScreen(Command command, CommandSender sender) {
-        sender.sendMessage(ChatColor.YELLOW + "" + ChatColor.BOLD + "/" + command.getName() + " Sub-Commands:");
+        sender.sendMessage(ChatColor.RED + "" + ChatColor.BOLD + "/" + command.getName() + " Sub-Commands:");
         for (Class<? extends AnnotatedHiveRanksSubCommand> clazz : subCommandClasses.values()) {
             HiveRanksSubCommandExecutor executor = getSubCommandClassAnnotation(clazz);
             sender.sendMessage(ChatColor.GRAY + "" + '\u25CF' + " " +
-                    ChatColor.AQUA + executor.subCommand() + " " + ChatColor.DARK_AQUA + executor.syntax() + ChatColor.DARK_GRAY + " - " +
-                    ChatColor.GOLD + executor.description());
+                    ChatColor.GOLD + executor.subCommand() + " " + ChatColor.DARK_GRAY + executor.syntax() + ChatColor.DARK_GRAY + " - " +
+                    ChatColor.GRAY + executor.description());
         }
     }
 

src/main/java/me/heyimblake/hiveranks/util/MessageUtils.java

@@ -22,7 +22,8 @@ public class MessageUtils {
      */
     public static void sendSuccessfulMessage(Player player, String string, boolean playSound) {
         player.sendMessage(PREFIX + ChatColor.GRAY + string);
-        //I really don't feel like supporting 1.8 and 1.9 base servers because of sound. So I'm just going to quietly remove it.
+        if (playSound)
+            player.playSound(player.getEyeLocation(), ServerSound.LEVEL_UP.getSound(), 2, 2);
     }
 
     /**
@@ -35,7 +36,8 @@ public static void sendSuccessfulMessage(Player player, String string, boolean p
      */
     public static void sendVariableSuccessfulMessage(Player player, boolean playSound, String base, String... variables) {
         player.sendMessage(PREFIX + String.format(ChatColor.GRAY + base, variables));
-        //I really don't feel like supporting 1.8 and 1.9 base servers because of sound. So I'm just going to quietly remove it.
+        if (playSound)
+            player.playSound(player.getEyeLocation(), ServerSound.LEVEL_UP.getSound(), 2, 2);
     }
 
     /**
@@ -47,7 +49,8 @@ public static void sendVariableSuccessfulMessage(Player player, boolean playSoun
      */
     public static void sendErrorMessage(Player player, String string, boolean playSound) {
         player.sendMessage(PREFIX + ChatColor.DARK_RED + string);
-        //I really don't feel like supporting 1.8 and 1.9 base servers because of sound. So I'm just going to quietly remove it.
+        if (playSound)
+            player.playSound(player.getEyeLocation(), ServerSound.NOTE_BASS.getSound(), 2, 2);
     }
 
     /**
@@ -60,7 +63,8 @@ public static void sendErrorMessage(Player player, String string, boolean playSo
      */
     public static void sendVariableErrorMessage(Player player, boolean playSound, String base, String... variables) {
         player.sendMessage(PREFIX + String.format(ChatColor.DARK_RED + base, variables));
-        //I really don't feel like supporting 1.8 and 1.9 base servers because of sound. So I'm just going to quietly remove it.
+        if (playSound)
+            player.playSound(player.getEyeLocation(), ServerSound.NOTE_BASS.getSound(), 2, 2);
     }
 
     /**

src/main/java/me/heyimblake/hiveranks/util/ServerSound.java

@@ -0,0 +1,39 @@
+package me.heyimblake.hiveranks.util;
+
+import org.bukkit.Sound;
+
+import me.heyimblake.hiveranks.HiveRanks;
+
+public enum ServerSound {
+	LEVEL_UP("LEVEL_UP", "ENTITY_PLAYER_LEVELUP"),
+	NOTE_BASS("NOTE_BASS", "BLOCK_NOTE_BASS");
+
+	private String name18;
+	private String name19;
+
+	ServerSound(String name18, String name19){
+		this.name18 = name18.toUpperCase();
+		this.name19 = name19.toUpperCase();
+	}
+
+    /**
+     * Gets the name of the current ServerSound based on the server's version.
+     *
+     * @return current sound version name
+     */
+	private String getName() {
+        if (HiveRanks.getInstance().getServerVersion() >= 9) {
+            return this.name19;
+        }
+        return this.name18;
+    }
+
+    /**
+     * Gets the Sound object of the specified ServerSound.
+     *
+     * @return sound
+     */
+	public Sound getSound(){
+		return Sound.valueOf(getName());
+	}
+}