PositionSongPlayer, NoteBlockSongPlayer edits (1.1.5)

added function isPlayerInRange
added event PlayerRangeStateChangeEvent

Author: koca2000

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.xxmicloxx</groupId>
     <artifactId>NoteBlockAPI</artifactId>
-    <version>1.1.4</version>
+    <version>1.1.5</version>
     <repositories>
         <repository>
             <id>spigot-repo</id>

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

@@ -1,15 +1,10 @@
 package com.xxmicloxx.NoteBlockAPI;
 
+import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 
-/**
- * Created with IntelliJ IDEA.
- * User: ml
- * Date: 07.12.13
- * Time: 12:56
- */
 public class NoteBlockSongPlayer extends SongPlayer {
     private Block noteBlock;
     private int distance = 16;
@@ -48,6 +43,19 @@ public void playTick(Player p, int tick) {
                     Instrument.getInstrument(note.getInstrument()),
                     ((l.getVolume() * (int) volume * (int) playerVolume) / 1000000f) * ((1f/16f) * distance),
                     NotePitch.getPitch(note.getKey() - 33));
+            if (isPlayerInRange(p)){
+            	if (!this.playerList.get(p.getName())){
+            		playerList.put(p.getName(), true);
+            		PlayerRangeStateChangeEvent event = new PlayerRangeStateChangeEvent(this, p, true);
+            		Bukkit.getPluginManager().callEvent(event);
+            	}
+            } else {
+            	if (this.playerList.get(p.getName())){
+            		playerList.put(p.getName(), false);
+            		PlayerRangeStateChangeEvent event = new PlayerRangeStateChangeEvent(this, p, false);
+            		Bukkit.getPluginManager().callEvent(event);
+            	}
+            }
         }
     }
 
@@ -62,4 +70,12 @@ public void setDistance(int distance){
     public int getDistance(){
     	return distance;
     }
+    
+    public boolean isPlayerInRange(Player p){
+    	if (p.getLocation().distance(noteBlock.getLocation()) > distance){
+    		return false;
+    	} else {
+    		return true;
+    	}
+    }
 }

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

@@ -0,0 +1,40 @@
+package com.xxmicloxx.NoteBlockAPI;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+public class PlayerRangeStateChangeEvent extends Event{
+	
+	private static final HandlerList handlers = new HandlerList();
+	private SongPlayer song;
+	private Player p;
+	private Boolean state;
+
+    public PlayerRangeStateChangeEvent(SongPlayer song, Player p, Boolean state) {
+        this.song = song;
+        this.p = p;
+        this.state = state;
+    }
+
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
+
+    public SongPlayer getSongPlayer() {
+        return song;
+    }
+    
+    @Override
+    public HandlerList getHandlers() {
+        return handlers;
+    }
+
+	public Player getPlayer() {
+		return p;
+	}
+	
+	public Boolean isInRange() {
+		return state;
+	}
+}

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

@@ -1,5 +1,6 @@
 package com.xxmicloxx.NoteBlockAPI;
 
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 
@@ -37,6 +38,19 @@ public void playTick(Player p, int tick) {
                     Instrument.getInstrument(note.getInstrument()),
                     ((l.getVolume() * (int) volume * (int) playerVolume) / 1000000f) * ((1f/16f) * distance),
                     NotePitch.getPitch(note.getKey() - 33));
+            if (isPlayerInRange(p)){
+            	if (!this.playerList.get(p.getName())){
+            		playerList.put(p.getName(), true);
+            		PlayerRangeStateChangeEvent event = new PlayerRangeStateChangeEvent(this, p, true);
+            		Bukkit.getPluginManager().callEvent(event);
+            	}
+            } else {
+            	if (this.playerList.get(p.getName())){
+            		playerList.put(p.getName(), false);
+            		PlayerRangeStateChangeEvent event = new PlayerRangeStateChangeEvent(this, p, false);
+            		Bukkit.getPluginManager().callEvent(event);
+            	}
+            }
         }
     }
 
@@ -51,4 +65,12 @@ public void setDistance(int distance){
     public int getDistance(){
     	return distance;
     }
+    
+    public boolean isPlayerInRange(Player p){
+    	if (p.getLocation().distance(targetLocation) > distance){
+    		return false;
+    	} else {
+    		return true;
+    	}
+    }
 }

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

@@ -1,19 +1,21 @@
 package com.xxmicloxx.NoteBlockAPI;
 
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.Callable;
 
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
 public abstract class SongPlayer {
 
     protected Song song;
     protected boolean playing = false;
     protected short tick = -1;
-    protected ArrayList<String> playerList = new ArrayList<String>();
+    //protected ArrayList<String> playerList = new ArrayList<String>();
+    protected HashMap<String, Boolean> playerList = new HashMap<String, Boolean>();
     protected boolean autoDestroy = false;
     protected boolean destroyed = false;
     protected Thread playerThread;
@@ -130,7 +132,7 @@ public Boolean call() {
                                                 return false;
                                             }
                                         }
-                                        for (String s : playerList) {
+                                        for (String s : playerList.keySet()) {
                                             @SuppressWarnings("deprecation")
             								Player p = Bukkit.getPlayerExact(s);
                                             if (p == null) {
@@ -169,13 +171,15 @@ public Boolean call() {
     }
 
     public List<String> getPlayerList() {
-        return Collections.unmodifiableList(playerList);
+    	List<String> list = new ArrayList<String>();
+    	list.addAll(playerList.keySet());
+        return Collections.unmodifiableList(list);
     }
 
     public void addPlayer(Player p) {
         synchronized (this) {
-            if (!playerList.contains(p.getName())) {
-                playerList.add(p.getName());
+            if (!playerList.containsKey(p.getName())) {
+                playerList.put(p.getName(), false);
                 ArrayList<SongPlayer> songs = NoteBlockPlayerMain.plugin.playingSongs
                         .get(p.getName());
                 if (songs == null) {
@@ -187,6 +191,8 @@ public void addPlayer(Player p) {
         }
     }
 
+    
+    
     public boolean getAutoDestroy() {
         synchronized (this) {
             return autoDestroy;

src/main/resources/plugin.yml

@@ -1,7 +1,7 @@
 name: NoteBlockAPI
 
 main: com.xxmicloxx.NoteBlockAPI.NoteBlockPlayerMain
-version: 1.1.4
+version: 1.1.5
 
 description: a developer interface to play nbs-files ingame
 authors: [xxmicloxx, michidk, koca2000]