bStats update, new graph

bStats updated to v1.2
added graph showing which plugins are using deprecated classes

Author: koca2000

pom.xml

@@ -36,7 +36,7 @@
 		<dependency>
 			<groupId>org.bstats</groupId>
 			<artifactId>bstats-bukkit</artifactId>
-			<version>1.1</version>
+			<version>1.2</version>
 		</dependency>
 	</dependencies>
 

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

@@ -4,24 +4,28 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 import java.util.UUID;
 
-import org.bstats.Metrics;
+import org.bstats.bukkit.Metrics;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import com.xxmicloxx.NoteBlockAPI.songplayer.SongPlayer;
 
 public class NoteBlockAPI extends JavaPlugin {
 
-	public static NoteBlockAPI plugin;
+	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 boolean disabling = false;
+	
+	private HashMap<Plugin, Boolean> dependentPlugins = new HashMap<>();
 
 	/**
 	 * Returns true if a Player is currently receiving a song
@@ -80,7 +84,26 @@ public static void setSongPlayersByPlayer(Player player, ArrayList<SongPlayer> s
 	@Override
 	public void onEnable() {
 		plugin = this;
-		new Metrics(this);
+		
+		for (Plugin pl : getServer().getPluginManager().getPlugins()){
+			if (pl.getDescription().getDepend().contains("NoteBlockAPI") || pl.getDescription().getSoftDepend().contains("NoteBlockAPI")){
+				dependentPlugins.put(pl, false);
+			}
+		}
+		
+		Metrics metrics = new Metrics(this);
+		
+		metrics.addCustomChart(new Metrics.DrilldownPie("deprecated", () -> {
+	        Map<String, Map<String, Integer>> map = new HashMap<>();
+	        for (Plugin pl : dependentPlugins.keySet()){
+	        	String deprecated = dependentPlugins.get(pl) ? "yes" : "no";
+	        	Map<String, Integer> entry = new HashMap<>();
+		        entry.put(pl.getDescription().getFullName(), 1);
+		        map.put(deprecated, entry);
+	        }
+	        return map;
+	    }));
+		
 		new NoteBlockPlayerMain().onEnable();
 	}
 
@@ -103,4 +126,46 @@ public boolean isDisabling() {
 		return disabling;
 	}
 
+	public static NoteBlockAPI getAPI(){
+		return plugin;
+	}
+	
+	protected void handleDeprecated(StackTraceElement[] ste){
+		int pom = 1;
+		String clazz = ste[pom].getClassName();
+		while (clazz.startsWith("com.xxmicloxx.NoteBlockAPI")){
+			pom++;
+			clazz = ste[pom].getClassName();
+		}
+		String[] packageParts = clazz.split("\\.");
+		ArrayList<Plugin> plugins = new ArrayList<Plugin>();
+		plugins.addAll(dependentPlugins.keySet());
+		
+		ArrayList<Plugin> notResult = new ArrayList<Plugin>();
+		parts:
+		for (int i = 0; i < packageParts.length - 1; i++){
+			
+			for (Plugin pl : plugins){
+				if (notResult.contains(pl)){ continue;}
+				if (plugins.size() - notResult.size() == 1){
+					break parts;
+				}
+				String[] plParts = pl.getDescription().getMain().split("\\.");
+				if (!packageParts[i].equalsIgnoreCase(plParts[i])){
+					notResult.add(pl);
+					continue;
+				}
+			}
+			plugins.removeAll(notResult);
+			notResult.clear();
+		}
+		
+		plugins.removeAll(notResult);
+		notResult.clear();
+		if (plugins.size() == 1){
+			Bukkit.getLogger().info(plugins.get(0).getName());
+			dependentPlugins.put(plugins.get(0), true);
+		}
+	}
+	
 }

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

@@ -5,10 +5,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.bstats.Metrics;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
-import org.bukkit.plugin.java.JavaPlugin;
 
 /**
  * Main class; contains methods for playing and adjusting songs for players
@@ -81,11 +79,11 @@ public void onDisable() {
 	}
 
 	public void doSync(Runnable runnable) {
-		Bukkit.getServer().getScheduler().runTask(NoteBlockAPI.plugin, runnable);
+		Bukkit.getServer().getScheduler().runTask(NoteBlockAPI.getAPI(), runnable);
 	}
 
 	public void doAsync(Runnable runnable) {
-		Bukkit.getServer().getScheduler().runTaskAsynchronously(NoteBlockAPI.plugin, runnable);
+		Bukkit.getServer().getScheduler().runTaskAsynchronously(NoteBlockAPI.getAPI(), runnable);
 	}
 
 	public boolean isDisabling() {

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

@@ -52,6 +52,8 @@ public SongPlayer(Song song) {
 	}
 
 	public SongPlayer(Song song, SoundCategory soundCategory) {
+		NoteBlockAPI.getAPI().handleDeprecated(Thread.currentThread().getStackTrace());
+		
 		this.song = song;
 		this.soundCategory = soundCategory;
 		plugin = NoteBlockPlayerMain.plugin;
@@ -232,7 +234,7 @@ private void start() {
 				long startTime = System.currentTimeMillis();
 				lock.lock();
 				try {
-					if (destroyed || NoteBlockAPI.plugin.isDisabling()){
+					if (destroyed || NoteBlockAPI.getAPI().isDisabling()){
 						break;
 					}
 

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

@@ -68,7 +68,7 @@ public SongPlayer(Song song) {
 	public SongPlayer(Song song, SoundCategory soundCategory) {
 		this.song = song;
 		this.soundCategory = soundCategory;
-		plugin = NoteBlockAPI.plugin;
+		plugin = NoteBlockAPI.getAPI();
 		start();
 	}
 
@@ -246,7 +246,7 @@ private void start() {
 				long startTime = System.currentTimeMillis();
 				lock.lock();
 				try {
-					if (destroyed || NoteBlockAPI.plugin.isDisabling()){
+					if (destroyed || NoteBlockAPI.getAPI().isDisabling()){
 						break;
 					}
 
@@ -506,7 +506,7 @@ public void setCategory(SoundCategory soundCategory) {
 
 	void CallUpdate(String key, Object value){
 		try {
-			Method m = com.xxmicloxx.NoteBlockAPI.songplayer.SongPlayer.class.getDeclaredMethod("update", String.class, Object.class);
+			Method m = com.xxmicloxx.NoteBlockAPI.SongPlayer.class.getDeclaredMethod("update", String.class, Object.class);
 			m.setAccessible(true);
 			m.invoke(oldSongPlayer, key, value);
 		} catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException