Minor performance tweaks #31

Author: koca2000

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.xxmicloxx</groupId>
 	<artifactId>NoteBlockAPI</artifactId>
-	<version>1.4-SNAPSHOT</version>
+	<version>1.4</version>
 	<name>NoteBlockAPI</name>
 
 	<properties>

src/main/java/com/xxmicloxx/NoteBlockAPI/NoteBlockAPI.java

@@ -8,6 +8,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.bstats.bukkit.Metrics;
 import org.bukkit.Bukkit;
@@ -28,9 +29,8 @@ public class NoteBlockAPI extends JavaPlugin {
 
 	private static NoteBlockAPI plugin;
 
-	private Map<UUID, ArrayList<SongPlayer>> playingSongs = 
-			Collections.synchronizedMap(new HashMap<UUID, ArrayList<SongPlayer>>());
-	private Map<UUID, Byte> playerVolume = Collections.synchronizedMap(new HashMap<UUID, Byte>());
+	private Map<UUID, ArrayList<SongPlayer>> playingSongs = new ConcurrentHashMap<UUID, ArrayList<SongPlayer>>();
+	private Map<UUID, Byte> playerVolume = new ConcurrentHashMap<UUID, Byte>();
 
 	private boolean disabling = false;
 
@@ -42,19 +42,20 @@ public class NoteBlockAPI extends JavaPlugin {
 	 * @return is receiving a song
 	 */
 	public static boolean isReceivingSong(Player player) {
-		return ((plugin.playingSongs.get(player.getUniqueId()) != null) 
-				&& (!plugin.playingSongs.get(player.getUniqueId()).isEmpty()));
+		ArrayList<SongPlayer> songs = plugin.playingSongs.get(player.getUniqueId());
+		return (songs != null && !songs.isEmpty());
 	}
 
 	/**
 	 * Stops the song for a Player
 	 * @param player
 	 */
 	public static void stopPlaying(Player player) {
-		if (plugin.playingSongs.get(player.getUniqueId()) == null) {
+		ArrayList<SongPlayer> songs = plugin.playingSongs.get(player.getUniqueId());
+		if (songs == null) {
 			return;
 		}
-		for (SongPlayer songPlayer : plugin.playingSongs.get(player.getUniqueId())) {
+		for (SongPlayer songPlayer : songs) {
 			songPlayer.removePlayer(player);
 		}
 	}
@@ -74,10 +75,11 @@ public static void setPlayerVolume(Player player, byte volume) {
 	 * @return volume (byte)
 	 */
 	public static byte getPlayerVolume(Player player) {
-		Byte byteObj = plugin.playerVolume.get(player.getUniqueId());
+		UUID uuid = player.getUniqueId();
+		Byte byteObj = plugin.playerVolume.get(uuid);
 		if (byteObj == null) {
 			byteObj = 100;
-			plugin.playerVolume.put(player.getUniqueId(), byteObj);
+			plugin.playerVolume.put(uuid, byteObj);
 		}
 		return byteObj;
 	}

src/main/java/com/xxmicloxx/NoteBlockAPI/model/NotePitch.java

@@ -1,5 +1,6 @@
 package com.xxmicloxx.NoteBlockAPI.model;
 
+import com.xxmicloxx.NoteBlockAPI.utils.CompatibilityUtils;
 import org.bukkit.Bukkit;
 
 /**
@@ -45,7 +46,7 @@ public enum NotePitch {
 	}
 
 	public static float getPitch(int note) {
-		boolean pre1_9 = Bukkit.getVersion().contains("1.8") || Bukkit.getVersion().contains("1.7");
+		boolean pre1_9 = CompatibilityUtils.getServerVersion() < 0.0109f;
 		for (NotePitch notePitch : values()) {
 			if (notePitch.note == note) {
 				return pre1_9 ? notePitch.pitchPre1_9 : notePitch.pitchPost1_9;

src/main/java/com/xxmicloxx/NoteBlockAPI/model/Playlist.java

@@ -12,7 +12,7 @@ public Playlist(Song ...songs){
 		if (songs.length == 0){
 			throw new IllegalArgumentException("Cannot create empty playlist");
 		}
-		checkNull(songs);		
+		checkNull(songs);
 		this.songs.addAll(Arrays.asList(songs));
 	}
 

src/main/java/com/xxmicloxx/NoteBlockAPI/songplayer/NoteBlockSongPlayer.java

@@ -148,7 +148,4 @@ public boolean isInRange(Player player) {
 			return true;
 		}
 	}
-
-	
-
-}
+}

src/main/java/com/xxmicloxx/NoteBlockAPI/songplayer/SongPlayer.java

@@ -4,6 +4,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
@@ -31,7 +32,7 @@ public abstract class SongPlayer {
 
 	protected boolean playing = false;
 	protected short tick = -1;
-	protected Map<UUID, Boolean> playerList = Collections.synchronizedMap(new HashMap<UUID, Boolean>());
+	protected Map<UUID, Boolean> playerList = new ConcurrentHashMap<UUID, Boolean>();
 
 	protected boolean autoDestroy = false;
 	protected boolean destroyed = false;
@@ -42,7 +43,7 @@ public abstract class SongPlayer {
 	protected RepeatMode repeat = RepeatMode.NO;
 	protected boolean random = false;
 
-	protected Map<Song, Boolean> songQueue = Collections.synchronizedMap(new HashMap<Song, Boolean>()); //True if already played
+	protected Map<Song, Boolean> songQueue = new ConcurrentHashMap<Song, Boolean>(); //True if already played
 
 	private final Lock lock = new ReentrantLock();
 	private Random rng = new Random();