mirror of
https://github.com/TotalFreedomMC/TF-EssentialsX.git
synced 2024-09-12 05:08:48 +00:00
Searchable help.
Toggle commands with no permissions.
This commit is contained in:
parent
d50d8bfee0
commit
209a9a2f95
|
@ -196,6 +196,11 @@ public class Settings implements IConf
|
|||
return config.getBoolean("non-ess-in-help", true);
|
||||
}
|
||||
|
||||
public boolean hidePermissionlessHelp()
|
||||
{
|
||||
return config.getBoolean("hide-permissionless-help", true);
|
||||
}
|
||||
|
||||
public int getProtectCreeperMaxHeight()
|
||||
{
|
||||
return config.getInt("protect.creeper.max-height", -1);
|
||||
|
|
|
@ -30,17 +30,25 @@ public class Commandhelp extends EssentialsCommand
|
|||
@Override
|
||||
protected void run(Server server, User user, String commandLabel, String[] args) throws Exception
|
||||
{
|
||||
int page;
|
||||
int page = 1;
|
||||
String match = args[0].toLowerCase();
|
||||
try
|
||||
{
|
||||
page = args.length > 0 ? Integer.parseInt(args[0]) : 1;
|
||||
if (args.length > 0)
|
||||
{
|
||||
page = Integer.parseInt(args[args.length - 1]);
|
||||
if (args.length == 1)
|
||||
{
|
||||
match = "";
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
page = 1;
|
||||
}
|
||||
|
||||
List<String> lines = getHelpLines(user);
|
||||
List<String> lines = getHelpLines(user, match);
|
||||
int start = (page - 1) * 9;
|
||||
int pages = lines.size() / 9 + (lines.size() % 9 > 0 ? 1 : 0);
|
||||
|
||||
|
@ -58,7 +66,7 @@ public class Commandhelp extends EssentialsCommand
|
|||
}
|
||||
|
||||
@SuppressWarnings("CallToThreadDumpStack")
|
||||
private List<String> getHelpLines(User user) throws Exception
|
||||
private List<String> getHelpLines(User user, String match) throws Exception
|
||||
{
|
||||
List<String> retval = new ArrayList<String>();
|
||||
File helpFile = new File(ess.getDataFolder(), "help_"+Util.sanitizeFileName(user.getName()) +".txt");
|
||||
|
@ -98,6 +106,12 @@ public class Commandhelp extends EssentialsCommand
|
|||
final HashMap<String, HashMap<String, String>> cmds = (HashMap<String, HashMap<String, String>>)desc.getCommands();
|
||||
for (Entry<String, HashMap<String, String>> k : cmds.entrySet())
|
||||
{
|
||||
if ((!match.equalsIgnoreCase("")) && (!p.getDescription().getName().toLowerCase().contains(match))
|
||||
&& (!p.getDescription().getDescription().toLowerCase().contains(match)))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if (p.getDescription().getName().toLowerCase().contains("essentials"))
|
||||
{
|
||||
final String node = "essentials." + k.getKey();
|
||||
|
@ -120,10 +134,13 @@ public class Commandhelp extends EssentialsCommand
|
|||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!ess.getSettings().hidePermissionlessHelp())
|
||||
{
|
||||
retval.add("§c" + k.getKey() + "§7: " + value.get("description"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -88,7 +88,6 @@ motd:
|
|||
- '&cWelcome, {PLAYER}&c!'
|
||||
- '&fType &c/help&f for a list of commands.'
|
||||
- 'Currently online: {PLAYERLIST}'
|
||||
- 'You have {MAILS} mail messages'
|
||||
|
||||
# The server rules, available by typing /rules
|
||||
rules:
|
||||
|
@ -239,6 +238,9 @@ currency-symbol: '$'
|
|||
#Show other plugins commands in help
|
||||
non-ess-in-help: true
|
||||
|
||||
#Hide plugins which dont give a permission
|
||||
hide-permissionless-help: true
|
||||
|
||||
############################################################
|
||||
# +------------------------------------------------------+ #
|
||||
# | EssentialsChat | #
|
||||
|
|
Loading…
Reference in a new issue