Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add option for tab complete to use displaynames #4432

Merged
merged 8 commits into from
Aug 19, 2021
+15 −5
Merged

Add option for tab complete to use displaynames #4432

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6af6945
Add setting to use a player's display name to ISettings and Settings
cyberkitsune Aug 2, 2021
20ab9c6
Use display name when configured on tab complete
cyberkitsune Aug 2, 2021
a6408e2
Strip color codes from display names for better compatibility.
cyberkitsune Aug 2, 2021
40695d2
Use `FormatUtil.stripFormat` where possible
cyberkitsune Aug 2, 2021
fa5e7d9
Send empty list instead of vanilla tab complete in certain situations.
cyberkitsune Aug 2, 2021
58bf1c7
this can be simplified now
cyberkitsune Aug 2, 2021
c2b0473
Update Essentials/src/main/resources/config.yml
mdcfe Aug 19, 2021
83bf0f4
Merge branch '2.x' into tabcomplete-displayname
mdcfe Aug 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Essentials/src/main/java/com/earth2me/essentials/ISettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,8 @@ public interface ISettings extends IConf {

boolean changePlayerListName();

boolean changeTabCompleteName();

boolean isPlayerCommand(String string);

boolean useBukkitPermissions();
Expand Down
5 changes: 5 additions & 0 deletions Essentials/src/main/java/com/earth2me/essentials/Settings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1013,6 +1013,11 @@ public boolean changePlayerListName() {
return changePlayerListName;
}

@Override
public boolean changeTabCompleteName() {
return config.getBoolean("change-tab-complete-name", false);
}

@Override
public boolean useBukkitPermissions() {
return config.getBoolean("use-bukkit-permissions", false);
Expand Down
2 changes: 0 additions & 2 deletions Essentials/src/main/java/com/earth2me/essentials/commands/Commandmail.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,8 +294,6 @@ protected List<String> getTabCompleteOptions(final Server server, final CommandS
return getPlayers(server, sender);
} else if (args.length == 3 && args[0].equalsIgnoreCase("sendtemp")) {
return COMMON_DATE_DIFFS;
} else if ((args.length > 2 && args[0].equalsIgnoreCase("send")) || (args.length > 1 && args[0].equalsIgnoreCase("sendall"))) {
return null; // Use vanilla handler
} else {
return Collections.emptyList();
}
Expand Down
3 changes: 2 additions & 1 deletion Essentials/src/main/java/com/earth2me/essentials/commands/Commandmsg.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import com.earth2me.essentials.utils.FormatUtil;
import org.bukkit.Server;

import java.util.Collections;
import java.util.List;

import static com.earth2me.essentials.I18n.tl;
Expand Down Expand Up @@ -60,7 +61,7 @@ protected List<String> getTabCompleteOptions(final Server server, final CommandS
if (args.length == 1) {
return getPlayers(server, sender);
} else {
return null; // It's a chat message, use the default chat handler
return Collections.emptyList(); // It's a chat message, send an empty list.
}
}
}
5 changes: 3 additions & 2 deletions Essentials/src/main/java/com/earth2me/essentials/commands/EssentialsCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.earth2me.essentials.IEssentialsModule;
import com.earth2me.essentials.Trade;
import com.earth2me.essentials.User;
import com.earth2me.essentials.utils.FormatUtil;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
Expand Down Expand Up @@ -226,7 +227,7 @@ protected List<String> getPlayers(final Server server, final CommandSource inter
final List<String> players = Lists.newArrayList();
for (final User user : ess.getOnlineUsers()) {
if (canInteractWith(interactor, user)) {
players.add(user.getName());
players.add(ess.getSettings().changeTabCompleteName() ? FormatUtil.stripFormat(user.getDisplayName()) : user.getName());
}
}
return players;
Expand All @@ -240,7 +241,7 @@ protected List<String> getPlayers(final Server server, final User interactor) {
final List<String> players = Lists.newArrayList();
for (final User user : ess.getOnlineUsers()) {
if (canInteractWith(interactor, user)) {
players.add(user.getName());
players.add(ess.getSettings().changeTabCompleteName() ? FormatUtil.stripFormat(user.getDisplayName()) : user.getName());
}
}
return players;
Expand Down
3 changes: 3 additions & 0 deletions Essentials/src/main/resources/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ hide-displayname-in-vanish: true
# Disable this if you have any other plugin, that modifies the displayname of a user.
change-displayname: true

# This option will cause Essentials to display a player's displayname instead of username when tab completing Essentials commands.
change-tab-complete-name: false

# When this option is enabled, the (tab) player list will be updated with the displayname.
# The value of change-displayname (above) has to be true.
#change-playerlist: true
Expand Down