Set version to 2.8.6 for Spigot release

pom.xml

@@ -4,7 +4,7 @@
     <groupId>me.clip</groupId>
     <artifactId>placeholderapi</artifactId>
 
-    <version>2.8.5</version>
+    <version>2.8.6</version>
     <name>PlaceholderAPI</name>
     <description>An awesome placeholder provider!</description>
     <url>http://extendedclip.com</url>
@@ -22,6 +22,10 @@
             <id>bstats-repo</id>
             <url>http://repo.bstats.org/content/repositories/releases/</url>
         </repository>
+        <repository>
+            <id>rayzr-repo</id>
+            <url>https://cdn.rawgit.com/Rayzr522/maven-repo/master/</url>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -37,6 +41,12 @@
             <version>1.2</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>me.rayzr522</groupId>
+            <artifactId>jsonmessage</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -71,13 +81,17 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
-                            <minimizeJar>true</minimizeJar>
+                            <minimizeJar>false</minimizeJar>
                             <createDependencyReducedPom>false</createDependencyReducedPom>
                             <relocations>
                                 <relocation>
                                     <pattern>org.bstats</pattern>
                                     <shadedPattern>me.clip.placeholderapi.metrics</shadedPattern>
                                 </relocation>
+                                <relocation>
+                                    <pattern>me.rayzr522</pattern>
+                                    <shadedPattern>me.clip.placeholderapi.util</shadedPattern>
+                                </relocation>
                             </relocations>
                         </configuration>
                     </execution>

src/main/java/me/clip/placeholderapi/PlaceholderAPI.java

@@ -200,7 +200,7 @@ public class PlaceholderAPI {
 			if (hooks.containsKey(identifier)) {
 				String value = hooks.get(identifier).onPlaceholderRequest(player, params);
 				if (value != null) {
-					text = text.replaceAll(m.group(), Matcher.quoteReplacement(value));
+					text = text.replaceAll(Pattern.quote(m.group()), Matcher.quoteReplacement(value));
 				}
 			}
 		}
@@ -250,7 +250,7 @@ public class PlaceholderAPI {
 		    	Relational rel = (Relational) hooks.get(identifier);
 		    	String value = rel.onPlaceholderRequest(one, two, params);
 				if (value != null) {
-					text = text.replaceAll(m.group(), Matcher.quoteReplacement(value));
+					text = text.replaceAll(Pattern.quote(m.group()), Matcher.quoteReplacement(value));
 				}
 		    }
 		}

src/main/java/me/clip/placeholderapi/PlaceholderAPIPlugin.java

@@ -79,7 +79,7 @@ public class PlaceholderAPIPlugin extends JavaPlugin {
 	public void onEnable() {
 		config.loadDefConfig();
 		setupOptions();
-		setupCommands();
+		getCommand("placeholderapi").setExecutor(new PlaceholderAPICommands(this));
 		new PlaceholderListener(this);
 		getLogger().info("Placeholder expansion registration initializing...");
 		expansionManager.registerAllExpansions();
@@ -118,10 +118,6 @@ public class PlaceholderAPIPlugin extends JavaPlugin {
 		s.sendMessage(ChatColor.translateAlternateColorCodes('&', PlaceholderAPI.getRegisteredIdentifiers().size() + " &aplaceholder hooks successfully registered!"));
 	}
 
-	private void setupCommands() {
-		getCommand("placeholderapi").setExecutor(new PlaceholderAPICommands(this, (serverVersion != null && serverVersion.isSpigot())));
-	}
-
 	private void setupOptions() {
 		booleanTrue = config.booleanTrue();
 		if (booleanTrue == null) {

src/main/java/me/clip/placeholderapi/commands/ExpansionCloudCommands.java

@@ -0,0 +1,402 @@
+/*
+ *
+ * PlaceholderAPI
+ * Copyright (C) 2018 Ryan McCarthy
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ */
+package me.clip.placeholderapi.commands;
+
+import me.clip.placeholderapi.PlaceholderAPI;
+import me.clip.placeholderapi.PlaceholderAPIPlugin;
+import me.clip.placeholderapi.expansion.PlaceholderExpansion;
+import me.clip.placeholderapi.expansion.cloud.CloudExpansion;
+import me.clip.placeholderapi.util.Msg;
+import me.rayzr522.jsonmessage.JSONMessage;
+import net.md_5.bungee.api.chat.ClickEvent;
+import net.md_5.bungee.api.chat.ComponentBuilder;
+import net.md_5.bungee.api.chat.HoverEvent;
+import net.md_5.bungee.api.chat.TextComponent;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import static me.clip.placeholderapi.util.Msg.color;
+import static me.clip.placeholderapi.util.Msg.msg;
+
+public class ExpansionCloudCommands implements CommandExecutor {
+
+	private PlaceholderAPIPlugin plugin;
+	
+	public ExpansionCloudCommands(PlaceholderAPIPlugin instance) {
+		plugin = instance;
+	}
+
+	@Override
+	public boolean onCommand(CommandSender s, Command c, String label, String[] args) {
+		
+		if (args.length == 1) {
+			msg(s, "&bExpansion cloud commands",
+			" ",
+			"&b/papi ecloud status",
+			"&fView status of the ecloud",
+			"&b/papi ecloud list <all/author> (page)",
+			"&fList all/author specific available expansions",
+			"&b/papi ecloud info <expansion name>",
+			"&fView information about a specific expansion available on the cloud",
+            "&b/papi ecloud versioninfo <expansion name> <version>",
+            "&fView information about a specific version of an expansion",
+            "&b/papi ecloud placeholders <expansion name>",
+            "&fView placeholders for an expansion",
+			"&b/papi ecloud download <expansion name> (version)",
+			"&fDownload an expansion from the ecloud",
+			"&b/papi ecloud refresh",
+			"&fFetch the most up to date list of expansions available.",
+			"&b/papi ecloud clear",
+			"&fClear the expansion cloud cache.");
+			return true;
+		}
+
+		if (args[1].equalsIgnoreCase("refresh") || args[1].equalsIgnoreCase("update") || args[1].equalsIgnoreCase("fetch")) {
+			msg(s, "&aRefresh task started. Use &f/papi ecloud list all &ain a few!!");
+			plugin.getExpansionCloud().clean();
+			plugin.getExpansionCloud().fetch();
+			return true;
+		}
+
+		if (plugin.getExpansionCloud().getCloudExpansions().isEmpty()) {
+			msg(s, "&7No cloud expansions are available at this time.");
+			return true;
+		}
+
+		if (args[1].equalsIgnoreCase("clear")) {
+			plugin.getExpansionCloud().clean();
+			msg(s, "&aThe cache has been cleared!!");
+			return true;
+		}
+
+		if (args[1].equalsIgnoreCase("status")) {
+			
+			msg(s, "&bThere are &f" + plugin.getExpansionCloud().getCloudExpansions().size() + " &bexpansions available on the cloud.",
+			"&7A total of &f" + plugin.getExpansionCloud().getCloudAuthorCount() + " &7authors have contributed to the expansion cloud.");
+			if (plugin.getExpansionCloud().getToUpdateCount() > 0) {
+				msg(s, "&eYou have &f" + plugin.getExpansionCloud().getToUpdateCount()
+						+ " &eexpansions installed that have updates available.");
+			}
+			
+			return true;
+		}
+
+		if (args[1].equalsIgnoreCase("info")) {
+			
+			if (args.length < 3) {
+				msg(s, "&cAn expansion name must be specified!");
+				return true;
+			}
+			
+			CloudExpansion expansion = plugin.getExpansionCloud().getCloudExpansion(args[2]);
+			
+			if (expansion == null) {
+				msg(s, "&cNo expansion found by the name: &f" + args[2]);
+				return true;
+			}
+			
+			if (!(s instanceof Player)) {
+				msg(s, (expansion.shouldUpdate() ? "&e" : "") + expansion.getName() + " &8&m-- &r" + expansion.getVersion().getUrl());
+				return true;
+			}
+			
+			Player p = (Player) s;
+			
+			msg(s, "&bExpansion&7: &f" + expansion.getName(),
+					"&bAuthor: &f" + expansion.getAuthor(),
+					"&bVerified: &f" + expansion.isVerified()
+			);
+
+			// latest version
+            JSONMessage latestVersion = JSONMessage.create(color("&bLatest version: &f" + expansion.getLatestVersion()));
+            latestVersion.tooltip(color("&bReleased: &f" + expansion.getTimeSinceLastUpdate()
+                    + "\n&bUpdate information: &f" + expansion.getVersion().getReleaseNotes()
+            ));
+            latestVersion.send(p);
+
+			// versions
+            JSONMessage versions = JSONMessage.create(color("&bVersions available: &f" + expansion.getVersions().size()));
+            versions.tooltip(color(String.join("&b, &f", expansion.getAvailableVersions())));
+            versions.suggestCommand("/papi ecloud versioninfo " + expansion.getName() + " " + expansion.getLatestVersion());
+            versions.send(p);
+
+            // placeholders
+            if (expansion.getPlaceholders() != null) {
+                JSONMessage placeholders = JSONMessage.create(color("&bPlaceholders: &f" + expansion.getPlaceholders().size()));
+                placeholders.tooltip(color(String.join("&b, &f", expansion.getPlaceholders())));
+                placeholders.suggestCommand("/papi ecloud placeholders " + expansion.getName());
+                placeholders.send(p);
+            }
+			return true;
+		}
+
+        if (args[1].equalsIgnoreCase("versioninfo")) {
+
+            if (args.length < 4) {
+                msg(s, "&cAn expansion name and version must be specified!");
+                return true;
+            }
+
+            CloudExpansion expansion = plugin.getExpansionCloud().getCloudExpansion(args[2]);
+
+            if (expansion == null) {
+                msg(s, "&cNo expansion found by the name: &f" + args[2]);
+                return true;
+            }
+
+            CloudExpansion.Version version = expansion.getVersion(args[3]);
+
+            if (version == null) {
+                msg(s, "&cThe version specified does not exist for expansion: &f" + expansion.getName());
+                return true;
+            }
+
+            msg(s, "&bExpansion: " + (expansion.shouldUpdate() ? "&e" : "&f") + expansion.getName(),
+                    "&bVersion: &f" + version.getVersion(),
+                    "&bVersion info: &f" + version.getReleaseNotes());
+
+            if (!(s instanceof Player)) {
+                msg(s, "&bDownload url: " + version.getUrl());
+                return true;
+            }
+
+            Player p = (Player) s;
+
+            JSONMessage download = JSONMessage.create(color("&7Click to download this version"));
+            download.suggestCommand("/papi ecloud download " + expansion.getName() + " " + version.getVersion());
+            download.send(p);
+            return true;
+        }
+
+        if (args[1].equalsIgnoreCase("placeholders")) {
+
+            if (args.length < 3) {
+                msg(s, "&cAn expansion name must be specified!");
+                return true;
+            }
+
+            CloudExpansion expansion = plugin.getExpansionCloud().getCloudExpansion(args[2]);
+
+            if (expansion == null) {
+                msg(s, "&cNo expansion found by the name: &f" + args[2]);
+                return true;
+            }
+
+            List<String> placeholders = expansion.getPlaceholders();
+
+            if (placeholders == null) {
+                msg(s, "&cThe expansion: &f" + expansion.getName() + " &cdoes not have any placeholders listed.",
+                        "&7You should contact &f" + expansion.getAuthor() + " &7and ask for them to be added.");
+                return true;
+            }
+
+            if (!(s instanceof Player) || plugin.getExpansionManager().getRegisteredExpansion(expansion.getName()) == null) {
+                msg(s, "&bPlaceholders: &f" + placeholders.size(),
+                        String.join("&a, &f"));
+                return true;
+            }
+
+            Player p = (Player) s;
+            JSONMessage message = JSONMessage.create(color("&bPlaceholders: &f" + placeholders.size()));
+            message.then("\n");
+
+            for (int i = 0 ; i < placeholders.size() ; i++) {
+                if (i == placeholders.size()-1) {
+                    message.then(placeholders.get(i));
+                } else {
+                    message.then(color(placeholders.get(i) + "&b, &f"));
+                }
+                message.tooltip(PlaceholderAPI.setPlaceholders(p, placeholders.get(i)));
+            }
+
+            message.send(p);
+            return true;
+        }
+
+        if (args[1].equalsIgnoreCase("list")) {
+			
+			int page = 1;
+			
+			String author;
+			boolean installed = false;
+			
+			if (args.length < 3) {
+				msg(s, "&cIncorrect usage! &7/papi ecloud list <all/author/installed> (page)");
+				return true;
+			}
+			
+			author = args[2];
+			
+			if (author.equalsIgnoreCase("all")) {
+				author = null;
+			} else if (author.equalsIgnoreCase("installed")) {
+				author = null;
+				installed = true;
+			}
+			
+			if (args.length >= 4) {
+				try {
+					page = Integer.parseInt(args[3]);
+				} catch (NumberFormatException ex) {
+					msg(s, "&cPage number must be an integer!");
+					return true;
+				}
+			}
+			
+			if (page < 1) {
+				msg(s, "&cPage must be greater than or equal to 1!");
+				return true;
+			}
+			
+			int avail;
+			
+			Map<Integer, CloudExpansion> ex;
+			
+			if (installed) {
+				ex = plugin.getExpansionCloud().getAllInstalled();
+			} else if (author == null) {
+				ex = plugin.getExpansionCloud().getCloudExpansions();
+			} else {
+				ex = plugin.getExpansionCloud().getAllByAuthor(author);
+			}
+			
+			if (ex == null || ex.isEmpty()) {
+				msg(s, "&cNo expansions available" + (author != null ? " for author &f" + author : ""));
+				return true;
+			}
+			
+			avail = plugin.getExpansionCloud().getPagesAvailable(ex, 10);
+			
+			if (page > avail) {
+				msg(s, "&cThere " + ((avail == 1) ? " is only &f" + avail + " &cpage available!" : "are only &f" + avail + " &cpages available!"));
+				return true;
+			}			
+			
+			msg(s, "&bShowing expansions for&7: &f" + (author != null ? author : (installed ? "all installed" : "all available"))+ " &8&m--&r &bamount&7: &f" + ex.size() + " &bpage&7: &f" + page + "&7/&f" + avail);
+			
+			ex = plugin.getExpansionCloud().getPage(ex, page, 10);
+			
+			if (ex == null) {
+				msg(s, "&cThere was a problem getting the requested page...");
+				return true;
+			}
+			
+			msg(s, "&aGreen = Expansions you have");
+			msg(s, "&6Gold = Expansions which need updated");
+			
+			if (!(s instanceof Player)) {
+				
+				for (Entry<Integer, CloudExpansion> expansion : ex.entrySet()) {
+					if (expansion == null || expansion.getValue() == null) continue;
+					msg(s, "&b" + (expansion.getKey()+1) + "&7: " + (expansion.getValue().shouldUpdate() ? "&6" : (expansion.getValue().hasExpansion() ? "&a" : "&7")) + expansion.getValue().getName() + " &8&m-- &r" + expansion.getValue().getVersion().getUrl());
+				}
+				
+				return true;
+			}  
+			
+			Player p = (Player) s;
+			
+			for (Entry<Integer, CloudExpansion> expansion : ex.entrySet()) {
+				
+				if (expansion == null || expansion.getValue() == null) {
+					continue;
+				}
+
+                StringBuilder sb = new StringBuilder();
+                if (expansion.getValue().shouldUpdate()) {
+                    sb.append("&6Click to update to the latest version of this expansion\n\n");
+                } else if (!expansion.getValue().hasExpansion()) {
+                    sb.append("&bClick to download this expansion\n\n");
+                } else {
+                    sb.append("&aYou have the latest version of this expansion\n\n");
+                }
+                sb.append("&bAuthor&7: &f" + expansion.getValue().getAuthor() + "\n");
+                sb.append("&bVerified&7: &f" + expansion.getValue().isVerified() + "\n");
+                sb.append("&bLatest version&7: &f" + expansion.getValue().getVersion().getVersion() + "\n");
+                sb.append("&bLast updated&7: &f" + expansion.getValue().getTimeSinceLastUpdate() + " ago\n");
+                sb.append("\n" + expansion.getValue().getDescription());
+
+                String msg = color("&b" + (expansion.getKey()+1) + "&7: " + (expansion.getValue().shouldUpdate() ? "&6" : (expansion.getValue().hasExpansion() ? "&a" : "")) + expansion.getValue().getName());
+
+                String hover = color(sb.toString());
+
+                JSONMessage line = JSONMessage.create(msg);
+                line.tooltip(hover);
+                line.suggestCommand("/papi ecloud info " + expansion.getValue().getName());
+                line.send(p);
+			}
+			
+			return true;
+		}
+		
+		
+		if (args[1].equalsIgnoreCase("download")) {
+			
+			if (args.length < 3) {
+				msg(s, "&cAn expansion name must be specified!");
+				return true;
+			}
+			
+			CloudExpansion expansion = plugin.getExpansionCloud().getCloudExpansion(args[2]);
+			
+			if (expansion == null) {
+				msg(s, "&cNo expansion found with the name: &f" + args[2]);
+				return true;
+			}
+			
+			PlaceholderExpansion loaded = plugin.getExpansionManager().getRegisteredExpansion(args[2]);
+			
+			if (loaded != null && loaded.isRegistered()) {
+				PlaceholderAPI.unregisterPlaceholderHook(loaded.getIdentifier());
+			}
+
+			String version = expansion.getLatestVersion();
+
+			if (args.length == 4) {
+				version = args[3];
+				if (expansion.getVersion(version) == null) {
+					msg(s, "&cThe version you specified does not exist for &f" + expansion.getName());
+					msg(s, "&7Available versions: &f" + expansion.getVersions().size());
+					msg(s, String.join("&a, &f", expansion.getAvailableVersions()));
+					return true;
+				}
+			}
+
+			msg(s, "&aDownload starting for expansion: &f" + expansion.getName() + " &aversion: &f" + version);
+			String player = ((s instanceof Player) ? s.getName() : null);
+			plugin.getExpansionCloud().downloadExpansion(player, expansion, version);
+			return true;
+		}
+		
+		msg(s, "&cIncorrect usage! &b/papi ecloud");
+		return true;
+	}
+	
+
+	
+}

src/main/java/me/clip/placeholderapi/commands/PlaceholderAPICommands.java

@@ -22,7 +22,6 @@ package me.clip.placeholderapi.commands;
 
 import me.clip.placeholderapi.PlaceholderAPI;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
-import me.clip.placeholderapi.commands.spigot.ExpansionCloudCommands;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import me.clip.placeholderapi.util.Msg;
 import org.apache.commons.lang.StringUtils;
@@ -40,13 +39,9 @@ public class PlaceholderAPICommands implements CommandExecutor {
 	
 	private CommandExecutor eCloud;
 	
-	public PlaceholderAPICommands(PlaceholderAPIPlugin i, boolean spigot) {
+	public PlaceholderAPICommands(PlaceholderAPIPlugin i) {
 		plugin = i;
-		if (spigot) {
-			eCloud = new me.clip.placeholderapi.commands.spigot.ExpansionCloudCommands(i);
-		} else {
-			eCloud = new me.clip.placeholderapi.commands.bukkit.ExpansionCloudCommands(i);
-		}
+		eCloud = new ExpansionCloudCommands(i);
 	}
 	
 	@Override
@@ -74,7 +69,7 @@ public class PlaceholderAPICommands implements CommandExecutor {
 				"&b/papi reload",
 				"&fReload the config settings");
 
-				if (s.isOp()) {
+				if (s.hasPermission("placeholderapi.ecloud")) {
 					if (plugin.getExpansionCloud() == null) {
 						Msg.msg(s, "&b/papi enablecloud",
 						"&fEnable the expansion cloud");
@@ -82,22 +77,14 @@ public class PlaceholderAPICommands implements CommandExecutor {
 						Msg.msg(s, "&b/papi disablecloud",
 						"&fDisable the expansion cloud",
 						"&b/papi ecloud",
-						"&fView information about the PlaceholderAPI expansion cloud",
-						"&b/papi ecloud status",
-						"&fView status of the PlaceholderAPI expansion cloud",
-						"&b/papi ecloud list <all/author> <page>",
-						"&fList all available expansions",
-						"&b/papi ecloud info <expansion name>",
-						"&fView information about a specific expansion on the cloud",
-						"&b/papi ecloud download <expansion name>",
-						"&fDownload a specific expansion from the cloud");
+						"&fView ecloud command usage");
 					}	
 				}
 				
 				return true;
 				
 			} else if (args[0].equalsIgnoreCase("ecloud")) {
-				if (!s.isOp()) {
+				if (!s.hasPermission("placeholderapi.ecloud")) {
 					Msg.msg(s, "&cYou don't have permission to do that!");
 					return true;
 				}
@@ -110,7 +97,7 @@ public class PlaceholderAPICommands implements CommandExecutor {
 				return eCloud.onCommand(s, c, label, args);
 				
 			} else if (args[0].equalsIgnoreCase("enablecloud")) {
-				if (!s.isOp()) {
+				if (!s.hasPermission("placeholderapi.ecloud")) {
 					Msg.msg(s, "&cYou don't have permission to do that!");
 					return true;
 				}
@@ -127,7 +114,7 @@ public class PlaceholderAPICommands implements CommandExecutor {
 				
 			} else if (args[0].equalsIgnoreCase("disablecloud")) {
 				
-				if (!s.isOp()) {
+				if (!s.hasPermission("placeholderapi.ecloud")) {
 					Msg.msg(s, "&cYou don't have permission to do that!");
 					return true;
 				}
@@ -156,7 +143,7 @@ public class PlaceholderAPICommands implements CommandExecutor {
 					return true;
 				}
 				
-				Msg.msg(s, "&7Placeholder expansion info for: &f%" + ex.getIdentifier() + "_<identifier>%");
+				Msg.msg(s, "&7Placeholder expansion info for: &f" + ex.getName());
 				
 				Msg.msg(s, "&7Status: " + (ex.isRegistered() ? "&aRegistered" : "&cNot registered"));
 

src/main/java/me/clip/placeholderapi/commands/bukkit/ExpansionCloudCommands.java

@@ -1,232 +0,0 @@
-/*
- *
- * PlaceholderAPI
- * Copyright (C) 2018 Ryan McCarthy
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- *
- */
-package me.clip.placeholderapi.commands.bukkit;
-
-import me.clip.placeholderapi.PlaceholderAPI;
-import me.clip.placeholderapi.PlaceholderAPIPlugin;
-import me.clip.placeholderapi.expansion.PlaceholderExpansion;
-import me.clip.placeholderapi.expansion.cloud.CloudExpansion;
-import me.clip.placeholderapi.util.Msg;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import java.util.Map;
-import java.util.Map.Entry;
-
-public class ExpansionCloudCommands implements CommandExecutor {
-
-	private PlaceholderAPIPlugin plugin;
-	
-	public ExpansionCloudCommands(PlaceholderAPIPlugin instance) {
-		plugin = instance;
-	}
-
-	@Override
-	public boolean onCommand(CommandSender s, Command c, String label, String[] args) {
-		
-		if (args.length == 1) {
-			Msg.msg(s, "&bExpansion cloud commands",
-			" ",
-			"&b/papi ecloud status",
-			"&fView status of the cloud",
-			"&b/papi ecloud list <all/author> (page)",
-			"&fList all/author specific available expansions",
-			"&b/papi ecloud info <expansion name>",
-			"&fView information about a specific expansion available on the cloud",
-			"&b/papi ecloud download <expansion name>",
-			"&fDownload a specific expansion from the cloud",
-			"&b/papi ecloud refresh",
-			"&fFetch the most up to date list of expansions available.",
-			"&b/papi ecloud clear",
-			"&fClear the expansion cloud cache.");
-			return true;
-		}
-		
-		if (args[1].equalsIgnoreCase("refresh")) {
-			Msg.msg(s, "&aRefresh task started. Use &7/papi ecloud list all &fin a few!!");
-			plugin.getExpansionCloud().clean();
-			plugin.getExpansionCloud().fetch();
-			return true;
-		}
-		
-		if (plugin.getExpansionCloud().getCloudExpansions().isEmpty()) {
-			Msg.msg(s, "&7No cloud expansions are available at this time.");
-			return true;
-		}
-		
-		if (args[1].equalsIgnoreCase("clear")) {
-			plugin.getExpansionCloud().clean();
-			Msg.msg(s, "&aThe cloud cache has been cleared!!");
-			return true;
-		}
-		
-		if (args[1].equalsIgnoreCase("download")) {
-			
-			if (args.length < 3) {
-				Msg.msg(s, "&cAn expansion name must be specified!");
-				return true;
-			}
-			
-			CloudExpansion expansion = plugin.getExpansionCloud().getCloudExpansion(args[2]);
-			
-			if (expansion == null) {
-				Msg.msg(s, "&cNo expansion found with the name: &f" + args[2]);
-				return true;
-			}
-			
-			PlaceholderExpansion loaded = plugin.getExpansionManager().getRegisteredExpansion(args[2]);
-			
-			if (loaded != null && loaded.isRegistered()) {
-				PlaceholderAPI.unregisterPlaceholderHook(loaded.getIdentifier());
-			}
-			
-			Msg.msg(s, "&aAttempting download of expansion &f" + expansion.getName());
-			
-			String player = ((s instanceof Player) ? s.getName() : null);
-			
-			plugin.getExpansionCloud().downloadExpansion(player, expansion);
-			
-			return true;
-		}
-		
-		if (args[1].equalsIgnoreCase("status")) {
-			
-			Msg.msg(s, "&bThere are &f" + plugin.getExpansionCloud().getCloudExpansions().size() + " &bcloud expansions available to download",
-			"&bA total of &f" + plugin.getExpansionCloud().getCloudAuthorCount() + " &bauthors have contributed.");
-			
-			return true;
-		} else if (args[1].equalsIgnoreCase("info")) {
-			
-			if (args.length < 3) {
-				Msg.msg(s, "&cAn expansion name must be specified!");
-				return true;
-			}
-			
-			CloudExpansion expansion = plugin.getExpansionCloud().getCloudExpansion(args[2]);
-			
-			if (expansion == null) {
-				Msg.msg(s, "&cNo expansion found with the name: &f" + args[2]);
-				return true;
-			}
-			
-			PlaceholderExpansion exp = plugin.getExpansionManager().getRegisteredExpansion(args[2]);
-			
-			boolean enabled = false;
-			String version = null;
-			
-			if (exp != null) {
-				enabled = exp.isRegistered();
-				version = exp.getVersion();
-			}
-			
-			Msg.msg(s, "&aExpansion: &f" + expansion.getName());
-			if (enabled) {
-				Msg.msg(s, "&aThis expansion is currently enabled!",
-				"&bYour version&7: &f" + version);
-			}
-			
-			Msg.msg(s, "&bCloud version&7: &f" + expansion.getVersion(),
-			"&bAuthor&7: &f" + expansion.getAuthor());
-			
-			String desc = expansion.getVersion();
-			
-			if (desc.indexOf("\n") > 0) {
-				for (String line : desc.split("\n")) {
-					Msg.msg(s, line);
-				}
-			} else {
-				Msg.msg(s, desc);
-			}
-			
-			Msg.msg(s, "&bDownload with &7/papi ecloud download " + expansion.getName());
-			return true;
-			
-		} else if (args[1].equalsIgnoreCase("list")) {
-			
-			int page = 1;
-			
-			String author;
-			
-			if (args.length < 3) {
-				Msg.msg(s, "&cIncorrect usage! &7/papi ecloud list <all/author> (page)");
-				return true;
-			}
-			
-			author = args[2];
-			
-			if (author.equalsIgnoreCase("all")) {
-				author = null;
-			}
-			
-			if (args.length >= 4) {
-				try {
-					page = Integer.parseInt(args[3]);
-				} catch (NumberFormatException ex) {
-					Msg.msg(s, "&cPage number must be an integer!");
-					return true;
-				}
-			}
-			
-			if (page < 1) {
-				Msg.msg(s, "&cPage must be greater than or equal to 1!");
-				return true;
-			}
-			
-			int avail;
-			
-			Map<Integer, CloudExpansion> ex;
-			
-			if (author == null) {
-				ex = plugin.getExpansionCloud().getCloudExpansions();
-			} else {
-				ex = plugin.getExpansionCloud().getAllByAuthor(author);
-			}
-			
-			if (ex == null) {
-				Msg.msg(s, "&cNo expansions available" + (author != null ? " for author &f" + author : ""));
-				return true;
-			}
-			
-			avail = plugin.getExpansionCloud().getPagesAvailable(ex, 10);
-			
-			if (page > avail) {
-				Msg.msg(s, "&cThere " + ((avail == 1) ? " is only &f" + avail + " &cpage available!" : "are only &f" + avail + " &cpages available!"));
-				return true;
-			}			
-			
-			Msg.msg(s, "&bExpansion cloud for &f" + (author != null ? author : "all available")+ " &8&m-- &r&bamount&7: &f" + ex.size() + " &bpage&7: &f" + page + "&7/&f" + avail);
-			
-			ex = plugin.getExpansionCloud().getPage(ex, page, 10);
-			
-			for (Entry<Integer, CloudExpansion> expansion : ex.entrySet()) {
-				Msg.msg(s, "&b" + (expansion.getKey()+1) + "&7: &f" + expansion.getValue().getName() + " &8&m-- &r" + expansion.getValue().getLink());
-			}
-			Msg.msg(s, "&bDownload an expansion with &7/papi ecloud download <name>",
-			"&bView more info on an expansion with &7/papi ecloud info <expansion>");
-			return true;
-		}
-		
-		return true;
-	}
-	
-}

src/main/java/me/clip/placeholderapi/commands/spigot/ExpansionCloudCommands.java

@@ -1,319 +0,0 @@
-/*
- *
- * PlaceholderAPI
- * Copyright (C) 2018 Ryan McCarthy
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- *
- */
-package me.clip.placeholderapi.commands.spigot;
-
-import me.clip.placeholderapi.PlaceholderAPI;
-import me.clip.placeholderapi.PlaceholderAPIPlugin;
-import me.clip.placeholderapi.expansion.PlaceholderExpansion;
-import me.clip.placeholderapi.expansion.cloud.CloudExpansion;
-import me.clip.placeholderapi.util.Msg;
-import net.md_5.bungee.api.chat.ClickEvent;
-import net.md_5.bungee.api.chat.ComponentBuilder;
-import net.md_5.bungee.api.chat.HoverEvent;
-import net.md_5.bungee.api.chat.TextComponent;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import java.util.Map;
-import java.util.Map.Entry;
-
-public class ExpansionCloudCommands implements CommandExecutor {
-
-	private PlaceholderAPIPlugin plugin;
-	
-	public ExpansionCloudCommands(PlaceholderAPIPlugin instance) {
-		plugin = instance;
-	}
-
-	@Override
-	public boolean onCommand(CommandSender s, Command c, String label, String[] args) {
-		
-		if (args.length == 1) {
-			Msg.msg(s, "&bExpansion cloud commands",
-			" ",
-			"&b/papi ecloud status",
-			"&fView status of the cloud",
-			"&b/papi ecloud list <all/author> (page)",
-			"&fList all/author specific available expansions",
-			"&b/papi ecloud info <expansion name>",
-			"&fView information about a specific expansion available on the cloud",
-			"&b/papi ecloud download <expansion name>",
-			"&fDownload a specific expansion from the cloud",
-			"&b/papi ecloud refresh",
-			"&fFetch the most up to date list of expansions available.",
-			"&b/papi ecloud clear",
-			"&fClear the expansion cloud cache.");
-			return true;
-		}
-		
-		if (args[1].equalsIgnoreCase("refresh") || args[1].equalsIgnoreCase("update") || args[1].equalsIgnoreCase("fetch")) {
-			Msg.msg(s, "&aRefresh task started. Use &f/papi ecloud list all &ain a few!!");
-			plugin.getExpansionCloud().clean();
-			plugin.getExpansionCloud().fetch();
-			return true;
-		}
-		
-		if (plugin.getExpansionCloud().getCloudExpansions().isEmpty()) {
-			Msg.msg(s, "&7No cloud expansions are available at this time.");
-			return true;
-		}
-		
-		if (args[1].equalsIgnoreCase("clear")) {
-			plugin.getExpansionCloud().clean();
-			Msg.msg(s, "&aThe cloud cache has been cleared!!");
-			return true;
-		}
-		
-		if (args[1].equalsIgnoreCase("status")) {
-			
-			Msg.msg(s, "&bThere are &f" + plugin.getExpansionCloud().getCloudExpansions().size() + " &bexpansions available on the cloud.",
-			"&7A total of &f" + plugin.getExpansionCloud().getCloudAuthorCount() + " &7authors have contributed to the expansion cloud.");
-			if (plugin.getExpansionCloud().getToUpdateCount() > 0) {
-				Msg.msg(s, "&eYou have &f" + plugin.getExpansionCloud().getToUpdateCount() 
-						+ " &eexpansions installed that have updates available.");
-			}
-			
-			return true;
-		} 
-		
-		if (args[1].equalsIgnoreCase("info")) {
-			
-			if (args.length < 3) {
-				Msg.msg(s, "&cAn expansion name must be specified!");
-				return true;
-			}
-			
-			CloudExpansion expansion = plugin.getExpansionCloud().getCloudExpansion(args[2]);
-			
-			if (expansion == null) {
-				Msg.msg(s, "&cNo expansion found with the name: &f" + args[2]);
-				return true;
-			}
-			
-			if (!(s instanceof Player)) {
-				Msg.msg(s, (expansion.shouldUpdate() ? "&e" : "") + expansion.getName() + " &8&m-- &r" + expansion.getLink());
-				return true;
-			}
-			
-			Player p = (Player) s;
-			
-			Msg.msg(s, "&bCloud expansion info for&7:" + (expansion.shouldUpdate() ? "&6" : (expansion.hasExpansion() ? "&e" : "")) + expansion.getName());
-			
-			StringBuilder sb = new StringBuilder();
-			
-			sb.append(expansion.getDescription());
-			
-			if (expansion.getReleaseNotes() != null) {
-				sb.append("\n\n" + expansion.getReleaseNotes());
-			}
-			
-			String hover = ChatColor.translateAlternateColorCodes('&', sb.toString());
-			
-			if (expansion.hasExpansion()) {
-				if (expansion.shouldUpdate()) {
-					Msg.msg(s, "&6You have this expansion but there is a newer version available.");
-				} else {
-					Msg.msg(s, "&aYou have the latest version of this expansion!");
-				}
-			} else {
-				Msg.msg(s, "&7You do not have this expansion installed");
-			}
-			
-			sms(p, "&bAuthor&7: &f" + expansion.getAuthor(), hover, null);
-			sms(p, "&bVersion&7: &f" + expansion.getVersion(), hover, null);
-			if (expansion.getLastUpdate() > 1) {
-				sb.append("&bLast updated&7: &f" + expansion.getTimeSinceLastUpdate() + " ago");
-			}
-			sms(p, "&aClick here to download!", hover, expansion.getName());
-			return true;
-		} 
-		
-		if (args[1].equalsIgnoreCase("list")) {
-			
-			int page = 1;
-			
-			String author;
-			boolean installed = false;
-			
-			if (args.length < 3) {
-				Msg.msg(s, "&cIncorrect usage! &7/papi ecloud list <all/author/installed> (page)");
-				return true;
-			}
-			
-			author = args[2];
-			
-			if (author.equalsIgnoreCase("all")) {
-				author = null;
-			} else if (author.equalsIgnoreCase("installed")) {
-				author = null;
-				installed = true;
-			}
-			
-			if (args.length >= 4) {
-				try {
-					page = Integer.parseInt(args[3]);
-				} catch (NumberFormatException ex) {
-					Msg.msg(s, "&cPage number must be an integer!");
-					return true;
-				}
-			}
-			
-			if (page < 1) {
-				Msg.msg(s, "&cPage must be greater than or equal to 1!");
-				return true;
-			}
-			
-			int avail;
-			
-			Map<Integer, CloudExpansion> ex;
-			
-			if (installed) {
-				ex = plugin.getExpansionCloud().getAllInstalled();
-			} else if (author == null) {
-				ex = plugin.getExpansionCloud().getCloudExpansions();
-			} else {
-				ex = plugin.getExpansionCloud().getAllByAuthor(author);
-			}
-			
-			if (ex == null || ex.isEmpty()) {
-				Msg.msg(s, "&cNo expansions available" + (author != null ? " for author &f" + author : ""));
-				return true;
-			}
-			
-			avail = plugin.getExpansionCloud().getPagesAvailable(ex, 10);
-			
-			if (page > avail) {
-				Msg.msg(s, "&cThere " + ((avail == 1) ? " is only &f" + avail + " &cpage available!" : "are only &f" + avail + " &cpages available!"));
-				return true;
-			}			
-			
-			Msg.msg(s, "&bShowing expansions for&7: &f" + (author != null ? author : (installed ? "all installed" : "all available"))+ " &8&m--&r &bamount&7: &f" + ex.size() + " &bpage&7: &f" + page + "&7/&f" + avail);
-			
-			ex = plugin.getExpansionCloud().getPage(ex, page, 10);
-			
-			if (ex == null) {
-				Msg.msg(s, "&cThere was a problem getting the requested page...");
-				return true;
-			}
-			
-			Msg.msg(s, "&aGreen = Expansions you have");
-			Msg.msg(s, "&6Gold = Expansions which need updated");
-			
-			if (!(s instanceof Player)) {
-				
-				for (Entry<Integer, CloudExpansion> expansion : ex.entrySet()) {
-					if (expansion == null || expansion.getKey() == null || expansion.getValue() == null) continue;
-					Msg.msg(s, "&b" + (expansion.getKey()+1) + "&7: " + (expansion.getValue().shouldUpdate() ? "&6" : (expansion.getValue().hasExpansion() ? "&a" : "&7")) + expansion.getValue().getName() + " &8&m-- &r" + expansion.getValue().getLink());
-				}
-				
-				return true;
-			}  
-			
-			Player p = (Player) s;
-			
-			for (Entry<Integer, CloudExpansion> expansion : ex.entrySet()) {
-				
-				if (expansion == null || expansion.getValue() == null) {
-					continue;
-				}
-				
-				StringBuilder sb = new StringBuilder();
-				if (expansion.getValue().shouldUpdate()) {
-					sb.append("&6Click to update to the latest version of this expansion\n\n");
-				} else if (!expansion.getValue().hasExpansion()) {
-					sb.append("&bClick to download this expansion\n\n");
-				} else {
-					sb.append("&aYou have the latest version of this expansion\n\n");
-				}
-				sb.append("&bAuthor&7: &f" + expansion.getValue().getAuthor() + "\n");
-				sb.append("&bVersion&7: &f" + expansion.getValue().getVersion() + "\n");
-				if (expansion.getValue().getLastUpdate() > 1) {
-					sb.append("&bLast updated&7: &f" + expansion.getValue().getTimeSinceLastUpdate() + " ago\n");
-				}
-				if (expansion.getValue().getReleaseNotes() != null) {
-					sb.append("&bRelease Notes&7: &f" + expansion.getValue().getReleaseNotes() + "\n");
-				}
-				sb.append("\n" + expansion.getValue().getDescription());
-
-				String msg = ChatColor.translateAlternateColorCodes('&', "&b" + (expansion.getKey()+1) + "&7: " + (expansion.getValue().shouldUpdate() ? "&6" : (expansion.getValue().hasExpansion() ? "&a" : "")) + expansion.getValue().getName());
-				
-				String hover = ChatColor.translateAlternateColorCodes('&', sb.toString());
-				
-				sms(p, msg, hover, expansion.getValue().getName());
-			}
-			
-			return true;
-		}
-		
-		
-		if (args[1].equalsIgnoreCase("download")) {
-			
-			if (args.length < 3) {
-				Msg.msg(s, "&cAn expansion name must be specified!");
-				return true;
-			}
-			
-			CloudExpansion expansion = plugin.getExpansionCloud().getCloudExpansion(args[2]);
-			
-			if (expansion == null) {
-				Msg.msg(s, "&cNo expansion found with the name: &f" + args[2]);
-				return true;
-			}
-			
-			if (expansion.hasExpansion() && !expansion.shouldUpdate()) {
-				Msg.msg(s, "&aYou already have this expansion installed and your version is up to date!");
-				return true;
-			}
-			
-			PlaceholderExpansion loaded = plugin.getExpansionManager().getRegisteredExpansion(args[2]);
-			
-			if (loaded != null && loaded.isRegistered()) {
-				PlaceholderAPI.unregisterPlaceholderHook(loaded.getIdentifier());
-			}
-			
-			Msg.msg(s, "&aAttempting download of expansion &f" + expansion.getName());
-			
-			String player = ((s instanceof Player) ? s.getName() : null);
-			
-			plugin.getExpansionCloud().downloadExpansion(player, expansion);
-			
-			return true;
-		}
-		
-		Msg.msg(s, "&cIncorrect usage! &b/papi ecloud");
-		return true;
-	}
-	
-	private void sms(Player p, String text, String hover, String name) {
-		TextComponent message = new TextComponent( ChatColor.translateAlternateColorCodes('&', text) );
-		if (hover != null) {
-			message.setHoverEvent( new HoverEvent( HoverEvent.Action.SHOW_TEXT, new ComponentBuilder(ChatColor.translateAlternateColorCodes('&', hover)).create() ) );
-		}
-		if (name != null) {
-			message.setClickEvent( new ClickEvent( ClickEvent.Action.SUGGEST_COMMAND, "/papi ecloud download " + name) );
-		}
-		p.spigot().sendMessage( message );
-	}
-	
-}

src/main/java/me/clip/placeholderapi/expansion/PlaceholderExpansion.java

@@ -39,15 +39,6 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
 		return getIdentifier();
 	}
 
-	/**
-	 * Expansions that do not use the ecloud and instead register from the dependency should set this to true
-	 * to ensure that your placeholder expansion is not unregistered when the papi reload command is used
-	 * @return if the expansion should persist through reloads
-	 */
-	public boolean persist() {
-		return false;
-	}
-
 	/**
 	 * Get the identifier that this placeholder expansion uses to be passed placeholder requests
 	 * @return placeholder identifier that is associated with this class
@@ -75,6 +66,23 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
 	 * @return current version of this expansion
 	 */
 	public abstract String getVersion();
+
+	public String getDescription() { return null; }
+
+	public String getLink() { return null; }
+
+	public List<String> getPlaceholders() {
+		return null;
+	}
+
+	/**
+	 * Expansions that do not use the ecloud and instead register from the dependency should set this to true
+	 * to ensure that your placeholder expansion is not unregistered when the papi reload command is used
+	 * @return if the expansion should persist through reloads
+	 */
+	public boolean persist() {
+		return false;
+	}
 	
 	/**
 	 * Check if a placeholder has already been registered with this identifier
@@ -110,30 +118,6 @@ public abstract class PlaceholderExpansion extends PlaceholderHook {
 		return PlaceholderAPIPlugin.getInstance();
 	}
 	
-	/**
-	 * A short description of this expansion
-	 * @return null if no description
-	 */
-	public String getDescription() {
-		return null;
-	}
-	
-	/**
-	 * The url link to this expansion page
-	 * @return null if no link
-	 */
-	public String getLink() {
-		return null;
-	}
-	
-	/**
-	 * A list of all valid placeholders
-	 * @return null if you dont care
-	 */
-	public List<String> getPlaceholders() {
-		return null;
-	}
-	
 	public String getString(String path, String def) {
 		return getPlaceholderAPI().getConfig().getString("expansions." + getIdentifier() + "." + path, def);
 	}

src/main/java/me/clip/placeholderapi/expansion/cloud/CloudExpansion.java

@@ -22,79 +22,183 @@ package me.clip.placeholderapi.expansion.cloud;
 
 import me.clip.placeholderapi.util.TimeUtil;
 
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 
 public class CloudExpansion {
 
-	private String name, author, version, description, link, releaseNotes;
-	
-	private boolean hasExpansion, shouldUpdate;
-	
-	private long lastUpdate;
+	private String name,
+            author,
+            latest_version,
+            description,
+            source_url,
+            dependency_url;
 
-	public CloudExpansion(String name, String author, String version, String description, String link) {
-		this.name = name;
-		this.author = author;
-		this.version = version;
-		this.description = description;
-		this.link = link;
-	}
-	
-	public String getName() {
-		return name;
+	private boolean hasExpansion,
+            shouldUpdate,
+            verified;
+
+	private long last_update,
+            ratings_count;
+
+	private double average_rating;
+
+	private List<String> placeholders;
+
+	private List<Version> versions;
+
+	public CloudExpansion() {
 	}
 
-	public String getAuthor() {
-		return author;
-	}
-
-	public String getVersion() {
-		return version;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public String getLink() {
-		return link;
-	}
-
-	public boolean hasExpansion() {
-		return hasExpansion;
-	}
-
-	public void setHasExpansion(boolean hasExpansion) {
-		this.hasExpansion = hasExpansion;
-	}
-
-	public boolean shouldUpdate() {
-		return shouldUpdate;
-	}
-
-	public void setShouldUpdate(boolean shouldUpdate) {
-		this.shouldUpdate = shouldUpdate;
-	}
-
-	public long getLastUpdate() {
-		return lastUpdate;
-	}
-
-	public void setLastUpdate(long lastUpdate) {
-		this.lastUpdate = lastUpdate;
-	}
-
-	public String getReleaseNotes() {
-		return releaseNotes;
-	}
-
-	public void setReleaseNotes(String releaseNotes) {
-		this.releaseNotes = releaseNotes;
-	}
-	
 	public String getTimeSinceLastUpdate() {
 		int time = (int) TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis() - getLastUpdate());
 		return TimeUtil.getTime(time);
 	}
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getAuthor() {
+        return author;
+    }
+
+    public void setAuthor(String author) {
+        this.author = author;
+    }
+
+    public Version getVersion() {
+	    return getLatestVersion() == null ? null : getVersion(getLatestVersion());
+    }
+
+    public Version getVersion(String version) {
+        return versions == null ? null : versions.stream()
+                .filter(v -> v.getVersion().equals(version))
+                .findFirst()
+                .orElse(null);
+    }
+
+    public List<String> getAvailableVersions() {
+        return versions.stream().map(Version::getVersion).collect(Collectors.toList());
+    }
+
+    public String getLatestVersion() {
+        return latest_version;
+    }
+
+    public void setLatestVersion(String latest_version) {
+        this.latest_version = latest_version;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getSourceUrl() {
+        return source_url;
+    }
+
+    public void setSourceUrl(String source_url) {
+        this.source_url = source_url;
+    }
+
+    public String getDependencyUrl() {
+        return dependency_url;
+    }
+
+    public void setDependencyUrl(String dependency_url) {
+        this.dependency_url = dependency_url;
+    }
+
+    public boolean hasExpansion() {
+        return hasExpansion;
+    }
+
+    public void setHasExpansion(boolean hasExpansion) {
+        this.hasExpansion = hasExpansion;
+    }
+
+    public boolean shouldUpdate() {
+        return shouldUpdate;
+    }
+
+    public void setShouldUpdate(boolean shouldUpdate) {
+        this.shouldUpdate = shouldUpdate;
+    }
+
+    public boolean isVerified() {
+        return verified;
+    }
+
+    public long getLastUpdate() {
+        return last_update;
+    }
+
+    public void setLastUpdate(long last_update) {
+        this.last_update = last_update;
+    }
+
+    public long getRatingsCount() {
+        return ratings_count;
+    }
+
+    public double getAverage_rating() {
+        return average_rating;
+    }
+
+    public List<String> getPlaceholders() {
+        return placeholders;
+    }
+
+    public void setPlaceholders(List<String> placeholders) {
+        this.placeholders = placeholders;
+    }
+
+    public List<Version> getVersions() {
+        return versions;
+    }
+
+    public void setVersions(List<Version> versions) {
+        this.versions = versions;
+    }
+
+    public class Version {
+	    private String url, version, release_notes;
+
+        public String getUrl() {
+            return url;
+        }
+
+        public void setUrl(String url) {
+            this.url = url;
+        }
+
+        public String getVersion() {
+            return version;
+        }
+
+        public void setVersion(String version) {
+            this.version = version;
+        }
+
+        public String getReleaseNotes() {
+            return release_notes;
+        }
+
+        public void setReleaseNotes(String release_notes) {
+            this.release_notes = release_notes;
+        }
+    }
 }

src/main/java/me/clip/placeholderapi/expansion/cloud/ExpansionCloudManager.java

@@ -20,6 +20,7 @@
  */
 package me.clip.placeholderapi.expansion.cloud;
 
+import com.google.gson.Gson;
 import me.clip.placeholderapi.PlaceholderAPI;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
@@ -42,13 +43,15 @@ import java.util.stream.IntStream;
 public class ExpansionCloudManager {
 
 	private PlaceholderAPIPlugin plugin;
-	private final String API = "http://api.extendedclip.com/";
+	private final String API = "http://api.extendedclip.com/v2/";
 	private final File dir;
 	private final TreeMap<Integer, CloudExpansion> remote = new TreeMap<>();
 	private final List<String> downloading = new ArrayList<>();
+	private Gson gson;
 
 	public ExpansionCloudManager(PlaceholderAPIPlugin instance) {
 		plugin = instance;
+		gson = new Gson();
 		dir = new File(instance.getDataFolder() + File.separator + "expansions");
 		if (!dir.exists()) {
 			try {
@@ -62,6 +65,7 @@ public class ExpansionCloudManager {
 	public void clean() {
 		remote.clear();
 		downloading.clear();
+		gson = null;
 	}
 	
 	public boolean isDownloading(String expansion) {
@@ -157,7 +161,7 @@ public class ExpansionCloudManager {
         IntStream.range(start, end).forEach(n -> ex.put(n, map.get(n)));
 		return ex;
 	}
-	
+
 	public void fetch() {
 		
 		plugin.getLogger().info("Fetching available expansion information...");
@@ -218,39 +222,21 @@ public class ExpansionCloudManager {
 
                         for (Object o : jo.keySet()) {
 
-                            JSONObject sub = (JSONObject) jo.get(o);
-                            String name = o.toString();
-                            String author = (String) sub.get("author");
-                            String version = (String) sub.get("version");
-                            String link = (String) sub.get("link");
-                            String description = (String) sub.get("description");
-                            String notes = "";
-                            long update = -1;
+							JSONObject sub = (JSONObject) jo.get(o);
 
-                            if (sub.get("release_notes") != null) {
-                                notes = (String) sub.get("release_notes");
+                        	CloudExpansion ce = gson.fromJson(sub.toJSONString(), CloudExpansion.class);
+
+                        	if (ce.getLatestVersion() == null || ce.getVersion(ce.getLatestVersion()) == null) {
+                        	    continue;
                             }
 
-                            if (sub.get("last_update") != null) {
+                        	ce.setName(o.toString());
 
-                                Object u = sub.get("last_update");
-
-                                if (u instanceof Long) {
-                                    update = (long) sub.get("last_update");
-                                }
-                            }
-
-                            CloudExpansion ce = new CloudExpansion(name, author, version, description, link);
-
-                            ce.setReleaseNotes(notes);
-
-                            ce.setLastUpdate(update);
-
-                            PlaceholderExpansion ex = plugin.getExpansionManager().getRegisteredExpansion(name);
+                            PlaceholderExpansion ex = plugin.getExpansionManager().getRegisteredExpansion(ce.getName());
 
                             if (ex != null && ex.isRegistered()) {
                                 ce.setHasExpansion(true);
-                                if (!ex.getVersion().equals(version)) {
+                                if (!ex.getVersion().equals(ce.getLatestVersion())) {
                                     ce.setShouldUpdate(true);
                                 }
                             }
@@ -312,32 +298,43 @@ public class ExpansionCloudManager {
 	        }
 	    }
 	}
-	
+
 	public void downloadExpansion(final String player, final CloudExpansion ex) {
+	    downloadExpansion(player, ex, ex.getLatestVersion());
+    }
+	
+	public void downloadExpansion(final String player, final CloudExpansion ex, final String version) {
 		
 		if (downloading.contains(ex.getName())) {
 			return;
 		}
+
+		final CloudExpansion.Version ver = ex.getVersions()
+				.stream()
+				.filter(v -> v.getVersion().equals(version))
+				.findFirst()
+				.orElse(null);
+
 		
-		if (ex.getLink() == null) {
+		if (ver == null) {
 			return;
 		}
 		
 		downloading.add(ex.getName());
 		
-		plugin.getLogger().info("Attempting download of expansion: " + ex.getName() + (player != null ? " by user: " + player : "") + " from url: " + ex.getLink());
+		plugin.getLogger().info("Attempting download of expansion: " + ex.getName() + (player != null ? " by user: " + player : "") + " from url: " + ver.getUrl());
 
 		Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
 
             try {
 
-                download(new URL(ex.getLink()), ex.getName());
+                download(new URL(ver.getUrl()), ex.getName());
 
                 plugin.getLogger().info("Download of expansion: " + ex.getName() + " complete!");
 
             } catch (Exception e) {
 
-                plugin.getLogger().warning("Failed to download expansion: " + ex.getName() + " from: " + ex.getLink());
+                plugin.getLogger().warning("Failed to download expansion: " + ex.getName() + " from: " + ver.getUrl());
 
                 Bukkit.getScheduler().runTask(plugin, () -> {
 

src/main/java/me/clip/placeholderapi/updatechecker/UpdateChecker.java

@@ -46,7 +46,7 @@ public class UpdateChecker implements Listener {
     
     @EventHandler(priority = EventPriority.MONITOR)
     public void onJoin(PlayerJoinEvent e) {
-    	if (e.getPlayer().isOp()) {
+    	if (e.getPlayer().hasPermission("placeholderapi.updatenotify")) {
     		e.getPlayer().sendMessage(ChatColor.translateAlternateColorCodes('&', "&bAn update for &fPlaceholder&7API &e(&fPlaceholder&7API &fv" + getLatestVersion() + "&e)"));
     		e.getPlayer().sendMessage(ChatColor.translateAlternateColorCodes('&', "&bis available at &ehttps://www.spigotmc.org/resources/placeholderapi." + resourceId + "/"));
     	}

src/main/java/me/clip/placeholderapi/util/Msg.java

@@ -28,8 +28,10 @@ import java.util.Arrays;
 public class Msg {
 
 	public static void msg(CommandSender s, String... msg) {
-		Arrays.stream(msg).forEach(text  ->
-		s.sendMessage(ChatColor.translateAlternateColorCodes('&', text)));
+		Arrays.stream(msg).forEach(text  -> s.sendMessage(color(text)));
 	}
 
+	public static String color(String text) {
+		return ChatColor.translateAlternateColorCodes('&', text);
+	}
 }

src/main/resources/plugin.yml

@@ -13,10 +13,12 @@ permissions:
         children:
             placeholderapi.list: true
             placeholderapi.reload: true
+            placeholderapi.ecloud: true
             placeholderapi.parse: true
             placeholderapi.injector.chat.bypass: true
             placeholderapi.injector.signs.bypass: true
             placeholderapi.injector.anvil.bypass: true
+            placeholderapi.updatenotify: true
     placeholderapi.list:
         description: ability to use the list command
         default: op
@@ -26,6 +28,12 @@ permissions:
     placeholderapi.parse:
         description: ability to use parse command
         default: op
+    placeholderapi.ecloud:
+        description: allows the usage of ecloud commands
+        default: op
+    placeholderapi.updatenotify:
+        description: notifies you when there is a PAPI update
+        default: op
 commands:
    placeholderapi:
      description: PlaceholderAPI command