From 46ae5883a17146be04554c3d3a76289901ef6141 Mon Sep 17 00:00:00 2001 From: tastybento Date: Fri, 10 Aug 2018 14:57:18 +0900 Subject: [PATCH] Revert "Commented out the default description and parameter help for now." This reverts commit f3442a32ab36fc154fe86e45ec6d1724bc958453. --- .../bentobox/bentobox/api/commands/CompositeCommand.java | 8 ++++---- .../bentobox/api/commands/DefaultHelpCommand.java | 2 ++ .../bentobox/database/mongodb/MongoDBDatabase.java | 2 +- .../database/mongodb/MongoDBDatabaseConnector.java | 2 +- .../bentobox/bentobox/database/mysql/MySQLDatabase.java | 2 +- .../bentobox/database/mysql/MySQLDatabaseConnector.java | 2 +- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/world/bentobox/bentobox/api/commands/CompositeCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/CompositeCommand.java index 59fc3e330..00e5f8c4f 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/CompositeCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/CompositeCommand.java @@ -128,8 +128,8 @@ public abstract class CompositeCommand extends Command implements PluginIdentifi plugin.getCommandsManager().registerCommand(this); } // Default references to description and parameters - //setDescription("commands." + label + ".description"); - //setParametersHelp("commands." + label + ".parameters"); + setDescription("commands." + label + ".description"); + setParametersHelp("commands." + label + ".parameters"); setup(); if (!getSubCommand("help").isPresent() && !label.equals("help")) { new DefaultHelpCommand(this); @@ -172,7 +172,7 @@ public abstract class CompositeCommand extends Command implements PluginIdentifi // Inherit world this.world = parent.getWorld(); // Default references to description and parameters - /* + StringBuilder reference = new StringBuilder(); reference.append("commands"); CompositeCommand p = this; @@ -184,7 +184,7 @@ public abstract class CompositeCommand extends Command implements PluginIdentifi } setDescription(reference.toString() + ".description"); setParametersHelp(reference.toString() + ".parameters"); - */ + setup(); // If this command does not define its own help class, then use the default help command if (!getSubCommand("help").isPresent() && !label.equals("help")) { diff --git a/src/main/java/world/bentobox/bentobox/api/commands/DefaultHelpCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/DefaultHelpCommand.java index 51ec21e80..a3c66b5ca 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/DefaultHelpCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/DefaultHelpCommand.java @@ -58,6 +58,8 @@ public class DefaultHelpCommand extends CompositeCommand { } if (depth < MAX_DEPTH) { if (!parent.getLabel().equals(HELP)) { + + // Get elements String usage = user.getTranslationOrNothing(parent.getUsage()); String params = user.getTranslationOrNothing(getParameters()); diff --git a/src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabase.java b/src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabase.java index 283af09c4..aae5b3ddc 100644 --- a/src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabase.java +++ b/src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabase.java @@ -2,8 +2,8 @@ package world.bentobox.bentobox.database.mongodb; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.database.AbstractDatabaseHandler; -import world.bentobox.bentobox.database.DatabaseConnectionSettingsImpl; import world.bentobox.bentobox.database.DatabaseSetup; +import world.bentobox.bentobox.database.DatabaseConnectionSettingsImpl; public class MongoDBDatabase extends DatabaseSetup { diff --git a/src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabaseConnector.java b/src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabaseConnector.java index 4062d75a1..f984f85c2 100644 --- a/src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabaseConnector.java +++ b/src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabaseConnector.java @@ -10,8 +10,8 @@ import com.mongodb.MongoCredential; import com.mongodb.ServerAddress; import com.mongodb.client.MongoDatabase; -import world.bentobox.bentobox.database.DatabaseConnectionSettingsImpl; import world.bentobox.bentobox.database.DatabaseConnector; +import world.bentobox.bentobox.database.DatabaseConnectionSettingsImpl; public class MongoDBDatabaseConnector implements DatabaseConnector { diff --git a/src/main/java/world/bentobox/bentobox/database/mysql/MySQLDatabase.java b/src/main/java/world/bentobox/bentobox/database/mysql/MySQLDatabase.java index 923254f6a..da029409b 100644 --- a/src/main/java/world/bentobox/bentobox/database/mysql/MySQLDatabase.java +++ b/src/main/java/world/bentobox/bentobox/database/mysql/MySQLDatabase.java @@ -2,8 +2,8 @@ package world.bentobox.bentobox.database.mysql; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.database.AbstractDatabaseHandler; -import world.bentobox.bentobox.database.DatabaseConnectionSettingsImpl; import world.bentobox.bentobox.database.DatabaseSetup; +import world.bentobox.bentobox.database.DatabaseConnectionSettingsImpl; public class MySQLDatabase extends DatabaseSetup { diff --git a/src/main/java/world/bentobox/bentobox/database/mysql/MySQLDatabaseConnector.java b/src/main/java/world/bentobox/bentobox/database/mysql/MySQLDatabaseConnector.java index 45a7a0aa7..be961adca 100644 --- a/src/main/java/world/bentobox/bentobox/database/mysql/MySQLDatabaseConnector.java +++ b/src/main/java/world/bentobox/bentobox/database/mysql/MySQLDatabaseConnector.java @@ -8,8 +8,8 @@ import java.util.Map; import org.bukkit.Bukkit; import org.bukkit.configuration.file.YamlConfiguration; -import world.bentobox.bentobox.database.DatabaseConnectionSettingsImpl; import world.bentobox.bentobox.database.DatabaseConnector; +import world.bentobox.bentobox.database.DatabaseConnectionSettingsImpl; public class MySQLDatabaseConnector implements DatabaseConnector {