v1.4.2 - prepared for Bukkit 1.10

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>dk.lockfuglsang.wolfencraft</groupId>
     <artifactId>holographic-scoreboard</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2</version>
     <name>HolographicScoreboard</name>
 
     <repositories>
@@ -74,7 +74,7 @@
         <dependency>
             <groupId>org.bukkit</groupId>
             <artifactId>bukkit</artifactId>
-            <version>1.9-R0.1-SNAPSHOT</version>
+            <version>1.10-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -91,14 +91,14 @@
         <dependency>
             <groupId>com.gmail.filoghost</groupId>
             <artifactId>holographic-displays-api</artifactId>
-            <version>2.0.2</version>
+            <version>2.1.17</version>
             <scope>system</scope>
             <systemPath>${basedir}/lib/HolographicDisplaysAPI.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>com.sainttx.holograms</groupId>
             <artifactId>holograms</artifactId>
-            <version>1.8.8</version>
+            <version>2.3-SNAPSHOT</version>
             <scope>system</scope>
             <systemPath>${basedir}/lib/Holograms.jar</systemPath>
         </dependency>

src/main/java/dk/lockfuglsang/wolfencraft/HolographicScoreboard.java

@@ -35,12 +35,11 @@ public final class HolographicScoreboard extends JavaPlugin {
 
     @Override
     public void onEnable() {
+        getCommand("holographicscoreboard").setExecutor(new HGSCommand(this));
         if (!isDependenciesFulfilled()) {
             getLogger().severe(rm.format("log.missing.dependencies"));
-            this.setEnabled(false);
             return;
         }
-        getCommand("holographicscoreboard").setExecutor(new HGSCommand(this));
         try {
             metrics = new Metrics(this);
             cmdGraph = metrics.createGraph("Commands");
@@ -79,7 +78,7 @@ private void removeAllBoards() {
         }
     }
 
-    private boolean isDependenciesFulfilled() {
+    public boolean isDependenciesFulfilled() {
         return Bukkit.getPluginManager().isPluginEnabled("HolographicDisplays") || Bukkit.getPluginManager().isPluginEnabled("Holograms");
     }
 

src/main/java/dk/lockfuglsang/wolfencraft/commands/HGSCommand.java

@@ -4,6 +4,8 @@
 import dk.lockfuglsang.minecraft.command.completion.AbstractTabCompleter;
 import dk.lockfuglsang.wolfencraft.HolographicScoreboard;
 import dk.lockfuglsang.wolfencraft.config.Scoreboard;
+import dk.lockfuglsang.wolfencraft.util.ResourceManager;
+import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 
 import java.util.ArrayList;
@@ -15,8 +17,11 @@
  * Commands from the uSkyBlock common bukkit utils
  */
 public class HGSCommand extends AbstractCommandExecutor {
+    private final HolographicScoreboard plugin;
+
     public HGSCommand(final HolographicScoreboard plugin) {
         super("hgs", "holographicscoreboard.admin", "main hgs command");
+        this.plugin = plugin;
         addTab("id", new AbstractTabCompleter() {
             @Override
             protected List<String> getTabList(CommandSender commandSender, String s) {
@@ -50,4 +55,15 @@ protected List<String> getTabList(CommandSender commandSender, String s) {
         add(new ReloadCommand(plugin));
         add(new EditCommand(plugin));
     }
+
+    @Override
+    public boolean onCommand(CommandSender commandSender, Command command, String alias, String[] args) {
+        if (!plugin.isDependenciesFulfilled()) {
+            if (commandSender.hasPermission(getPermission())) {
+                commandSender.sendMessage(ResourceManager.getRM().format("log.missing.dependencies").split("\n"));
+            }
+            return true;
+        }
+        return super.onCommand(commandSender, command, alias, args);
+    }
 }

src/main/java/dk/lockfuglsang/wolfencraft/config/Scoreboard.java

@@ -161,7 +161,6 @@ private BufferedSender createBufferedSender(final Plugin plugin) {
                 nearestPlayer = !Bukkit.getOnlinePlayers().isEmpty() ? Bukkit.getOnlinePlayers().iterator().next() : null;
             }
             if (nearestPlayer != null) {
-                // TODO: This would be "the best" solution currently, but not possible atm (1.7.9).
                 return new BufferedPlayerSender(nearestPlayer);
             }
         }