Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-11-28 13:45:14 +01:00
Code Issues Projects Releases Wiki Activity

Revert "Commented out the default description and parameter help for now."

Browse Source 
This reverts commit f3442a32ab.
This commit is contained in:
tastybento 2018-08-10 14:57:18 +09:00
parent f3442a32ab
commit 46ae5883a1
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/world/bentobox/bentobox/api/commands/CompositeCommand.java
View File

@ -128,8 +128,8 @@ public abstract class CompositeCommand extends Command implements PluginIdentifi
plugin.getCommandsManager().registerCommand(this); plugin.getCommandsManager().registerCommand(this);
} }
// Default references to description and parameters // Default references to description and parameters
//setDescription("commands." + label + ".description"); setDescription("commands." + label + ".description");
//setParametersHelp("commands." + label + ".parameters"); setParametersHelp("commands." + label + ".parameters");
setup(); setup();
if (!getSubCommand("help").isPresent() && !label.equals("help")) { if (!getSubCommand("help").isPresent() && !label.equals("help")) {
new DefaultHelpCommand(this); new DefaultHelpCommand(this);
@ -172,7 +172,7 @@ public abstract class CompositeCommand extends Command implements PluginIdentifi
// Inherit world // Inherit world
this.world = parent.getWorld(); this.world = parent.getWorld();
// Default references to description and parameters // Default references to description and parameters
/*
StringBuilder reference = new StringBuilder(); StringBuilder reference = new StringBuilder();
reference.append("commands"); reference.append("commands");
CompositeCommand p = this; CompositeCommand p = this;
@ -184,7 +184,7 @@ public abstract class CompositeCommand extends Command implements PluginIdentifi
} }
setDescription(reference.toString() + ".description"); setDescription(reference.toString() + ".description");
setParametersHelp(reference.toString() + ".parameters"); setParametersHelp(reference.toString() + ".parameters");
*/
setup(); setup();
// If this command does not define its own help class, then use the default help command // If this command does not define its own help class, then use the default help command
if (!getSubCommand("help").isPresent() && !label.equals("help")) { if (!getSubCommand("help").isPresent() && !label.equals("help")) {

2
src/main/java/world/bentobox/bentobox/api/commands/DefaultHelpCommand.java
View File

@ -58,6 +58,8 @@ public class DefaultHelpCommand extends CompositeCommand {
} }
if (depth < MAX_DEPTH) { if (depth < MAX_DEPTH) {
if (!parent.getLabel().equals(HELP)) { if (!parent.getLabel().equals(HELP)) {
// Get elements // Get elements
String usage = user.getTranslationOrNothing(parent.getUsage()); String usage = user.getTranslationOrNothing(parent.getUsage());
String params = user.getTranslationOrNothing(getParameters()); String params = user.getTranslationOrNothing(getParameters());

2
src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabase.java
View File

@ -2,8 +2,8 @@ package world.bentobox.bentobox.database.mongodb;
import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.BentoBox;
import world.bentobox.bentobox.database.AbstractDatabaseHandler; import world.bentobox.bentobox.database.AbstractDatabaseHandler;
import world.bentobox.bentobox.database.DatabaseConnectionSettingsImpl;
import world.bentobox.bentobox.database.DatabaseSetup; import world.bentobox.bentobox.database.DatabaseSetup;
import world.bentobox.bentobox.database.DatabaseConnectionSettingsImpl;
public class MongoDBDatabase extends DatabaseSetup { public class MongoDBDatabase extends DatabaseSetup {

2
src/main/java/world/bentobox/bentobox/database/mongodb/MongoDBDatabaseConnector.java
View File

@ -10,8 +10,8 @@ import com.mongodb.MongoCredential;
import com.mongodb.ServerAddress; import com.mongodb.ServerAddress;
import com.mongodb.client.MongoDatabase; import com.mongodb.client.MongoDatabase;
import world.bentobox.bentobox.database.DatabaseConnectionSettingsImpl;
import world.bentobox.bentobox.database.DatabaseConnector; import world.bentobox.bentobox.database.DatabaseConnector;
import world.bentobox.bentobox.database.DatabaseConnectionSettingsImpl;
public class MongoDBDatabaseConnector implements DatabaseConnector { public class MongoDBDatabaseConnector implements DatabaseConnector {

2
src/main/java/world/bentobox/bentobox/database/mysql/MySQLDatabase.java
View File

@ -2,8 +2,8 @@ package world.bentobox.bentobox.database.mysql;
import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.BentoBox;
import world.bentobox.bentobox.database.AbstractDatabaseHandler; import world.bentobox.bentobox.database.AbstractDatabaseHandler;
import world.bentobox.bentobox.database.DatabaseConnectionSettingsImpl;
import world.bentobox.bentobox.database.DatabaseSetup; import world.bentobox.bentobox.database.DatabaseSetup;
import world.bentobox.bentobox.database.DatabaseConnectionSettingsImpl;
public class MySQLDatabase extends DatabaseSetup { public class MySQLDatabase extends DatabaseSetup {

2
src/main/java/world/bentobox/bentobox/database/mysql/MySQLDatabaseConnector.java
View File

@ -8,8 +8,8 @@ import java.util.Map;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.YamlConfiguration;
import world.bentobox.bentobox.database.DatabaseConnectionSettingsImpl;
import world.bentobox.bentobox.database.DatabaseConnector; import world.bentobox.bentobox.database.DatabaseConnector;
import world.bentobox.bentobox.database.DatabaseConnectionSettingsImpl;
public class MySQLDatabaseConnector implements DatabaseConnector { public class MySQLDatabaseConnector implements DatabaseConnector {