This improves the feedback given when prism fails to start correctly.

Signed-off-by: Narimm <benjicharlton@gmail.com>
(cherry picked from commit e5cfa0b)

Author: Narimm

src/main/java/me/botsko/prism/Prism.java

@@ -142,7 +142,6 @@ public static String getPasteKey() {
      *
      * @return String
      */
-    @SuppressWarnings("WeakerAccess")
     public static String getPrismName() {
         return pluginName;
     }
@@ -310,6 +309,7 @@ public void onEnable() {
 
         pluginName = this.getDescription().getName();
         pluginVersion = this.getDescription().getVersion();
+        messenger = new Messenger(pluginName);
         log("Initializing Prism " + pluginVersion + ". Originally by Viveleroi; maintained by the AddstarMC Network");
         loadConfig();        // Load configuration, or install if new
         if (!getConfig().getBoolean("prism.suppress-paper-message", false)) {
@@ -343,7 +343,7 @@ public void onEnable() {
                 testConnection = prismDataSource.getConnection();
                 if (testConnection == null) {
                     notifyDisabled();
-                    Bukkit.getScheduler().runTask(instance, () -> instance.onDisable());
+                    Bukkit.getScheduler().runTask(instance, () -> instance.enableFailedDatabase());
                     updating.cancel();
                     return;
                 }
@@ -354,7 +354,7 @@ public void onEnable() {
                 }
             } else {
                 notifyDisabled();
-                Bukkit.getScheduler().runTask(instance, () -> instance.onDisable());
+                Bukkit.getScheduler().runTask(instance, () -> instance.enableFailedDatabase());
                 updating.cancel();
                 return;
             }
@@ -386,10 +386,25 @@ public void onEnable() {
 
     private void notifyDisabled() {
         final String[] dbDisabled = new String[3];
-        dbDisabled[0] = "Prism will disable itself because it couldn't connect to a database.";
+        dbDisabled[0] = "Prism will disable most commands because it couldn't connect to a database.";
         dbDisabled[1] = "If you're using MySQL, check your config. Be sure MySQL is running.";
         dbDisabled[2] = "For help - try our Discord Channel or the Wiki on Github.";
         logSection(dbDisabled);
+
+    }
+
+    private void enableFailedDatabase() {
+        if (isEnabled()) {
+            PluginCommand command = getCommand("prism");
+            if (command != null) {
+                PrismCommands commands = new PrismCommands(this,true);
+                command.setExecutor(commands);
+                command.setTabCompleter(commands);
+            } else {
+                warn("Command Executor Error: Check plugin.yml");
+                Bukkit.getPluginManager().disablePlugin(instance);
+            }
+        }
     }
 
     private void enabled() {
@@ -423,7 +438,7 @@ private void enabled() {
             // Add commands
             PluginCommand command = getCommand("prism");
             if (command != null) {
-                PrismCommands commands = new PrismCommands(this);
+                PrismCommands commands = new PrismCommands(this,false);
                 command.setExecutor(commands);
                 command.setTabCompleter(commands);
             } else {
@@ -451,7 +466,6 @@ private void enabled() {
             registerParameter(new WorldParameter());
 
             // Init re-used classes
-            messenger = new Messenger(pluginName);
             oreMonitor = new OreMonitor(instance);
             useMonitor = new UseMonitor(instance);
 
@@ -562,7 +576,6 @@ public PurgeManager getPurgeManager() {
     /**
      * Clears the Query Cache.
      */
-    @SuppressWarnings("WeakerAccess")
     public void endExpiredQueryCaches() {
         getServer().getScheduler().scheduleSyncRepeatingTask(this, () -> {
             final java.util.Date date = new java.util.Date();
@@ -602,7 +615,6 @@ public void endExpiredPreviews() {
     /**
      * Remove expired locations.
      */
-    @SuppressWarnings("WeakerAccess")
     public void removeExpiredLocations() {
         getServer().getScheduler().scheduleSyncRepeatingTask(this, () -> {
             final java.util.Date date = new java.util.Date();

src/main/java/me/botsko/prism/commands/HelpCommand.java

@@ -10,6 +10,12 @@
 
 public class HelpCommand implements SubHandler {
 
+    private final boolean failed;
+
+    public HelpCommand(boolean failed) {
+        this.failed = failed;
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -29,7 +35,19 @@ public List<String> handleComplete(CallInfo call) {
      * @param sender CommandSender
      */
     protected void help(CommandSender sender) {
-
+        if (failed) {
+            sender.sendMessage(Prism.messenger.playerHeaderMsg(ChatColor.GOLD + "--- Prism Disabled ---"));
+            sender.sendMessage(Prism.messenger.playerMsg("Prism is running in a disabled mode because the"
+                    + " database could not be connected. \n Please seek help by running /prism debug and perusing"
+                    + " the contents to help with errors.  "));
+            sender.sendMessage(
+                    Prism.messenger.playerSubduedHeaderMsg("Discord: " + ChatColor.WHITE
+                            + "https://discord.gg/Y9Qx3V"));
+            sender.sendMessage(
+                    Prism.messenger.playerSubduedHeaderMsg("Wiki: " + ChatColor.WHITE
+                            + "https://github.com/AddstarMC/Prism-Bukkit/wiki\n"));
+            return;
+        }
         sender.sendMessage(Prism.messenger.playerHeaderMsg(ChatColor.GOLD + "--- Basic Usage ---"));
 
         sender.sendMessage(Prism.messenger.playerHelp("i", "Toggle the inspector wand."));

src/main/java/me/botsko/prism/commands/PrismCommands.java

@@ -14,19 +14,39 @@ public class PrismCommands extends Executor {
      * Constructor.
      * @param prism Plugin.
      */
-    public PrismCommands(Plugin prism) {
+    public PrismCommands(Plugin prism,boolean failed) {
         super(prism, "subcommand", "prism");
-        setupCommands();
+        setupCommands(failed);
     }
 
-    private void setupCommands() {
-
+    private void setupCommands(boolean failed) {
         final Prism prism = (Prism) plugin;
         addSub(new String[]{"about", "default"}, "prism.help").allowConsole().setHandler(new AboutCommand(prism));
+        addSub("debug", "prism.debug").allowConsole().setHandler(new DebugCommand());
+        addSub(new String[]{"help", "?"}, "prism.help").allowConsole().setHandler(new HelpCommand(failed));
+        addSub("flags", "prism.help").allowConsole().setHandler(new FlagsCommand());
+        addSub("params", "prism.help").allowConsole().setHandler(new ParamsCommand());
+        addSub("actions", "prism.help").allowConsole().setHandler(new ActionsCommand());
+        addSub("reload", "prism.reload").allowConsole().setHandler(new SubHandler() {
+
+            @Override
+            public void handle(CallInfo call) {
+                prism.reloadConfig();
+                prism.loadConfig();
+                call.getSender().sendMessage(Prism.messenger.playerHeaderMsg("Configuration reloaded successfully."));
+            }
+
+            @Override
+            public List<String> handleComplete(CallInfo call) {
+                return null;
+            }
+        });
+        if (failed) {
+            return;
+        }
         addSub(new String[]{"lookup", "l"}, "prism.lookup").allowConsole().setMinArgs(1)
                 .setHandler(new LookupCommand(prism));
         addSub("near", "prism.lookup").setHandler(new NearCommand(prism));
-
         addSub(new String[]{"page", "pg"}, new String[]{"prism.lookup.paginate", "prism.lookup"}).allowConsole()
                 .setMinArgs(1).setHandler(new PageCommand(prism));
         addSub(new String[]{"wand", "w", "i", "inspect"},
@@ -48,24 +68,6 @@ private void setupCommands() {
         addSub("recorder", "prism.recorder").allowConsole().setHandler(new RecorderCommand(prism));
         addSub("undo", "prism.rollback").setHandler(new UndoCommand(prism));
         addSub(new String[]{"view", "v"}, "prism.view").setMinArgs(1).setHandler(new ViewCommand(prism));
-        addSub(new String[]{"help", "?"}, "prism.help").allowConsole().setHandler(new HelpCommand());
-        addSub("params", "prism.help").allowConsole().setHandler(new ParamsCommand());
-        addSub("actions", "prism.help").allowConsole().setHandler(new ActionsCommand());
-        addSub("flags", "prism.help").allowConsole().setHandler(new FlagsCommand());
-        addSub("debug","prism.debug").allowConsole().setHandler(new DebugCommand());
-        addSub("reload", "prism.reload").allowConsole().setHandler(new SubHandler() {
-            @Override
-            public void handle(CallInfo call) {
-                prism.reloadConfig();
-                prism.loadConfig();
-                call.getSender().sendMessage(Prism.messenger.playerHeaderMsg("Configuration reloaded successfully."));
-            }
-
-            @Override
-            public List<String> handleComplete(CallInfo call) {
-                return null;
-            }
-        });
     }
 
 }