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.

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 world aliases for Chat #3912

Merged
merged 2 commits into from
Feb 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ public interface ISettings extends IConf {

String getChatFormat(String group);

String getWorldAlias(String world);

int getChatRadius();

int getNearRadius();
Expand Down
16 changes: 16 additions & 0 deletions Essentials/src/main/java/com/earth2me/essentials/Settings.java
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ public class Settings implements net.ess3.api.ISettings {
private Set<Predicate<String>> nickBlacklist;
private double maxProjectileSpeed;
private boolean removeEffectsOnHeal;
private Map<String, String> worldAliases;

public Settings(final IEssentials ess) {
this.ess = ess;
Expand Down Expand Up @@ -542,6 +543,20 @@ public String getChatFormat(final String group) {
return mFormat;
}

@Override
public String getWorldAlias(String world) {
return worldAliases.getOrDefault(world.toLowerCase(), world);
}

private Map<String, String> _getWorldAliases() {
final Map<String, String> map = new HashMap<>();
final ConfigurationSection section = config.getConfigurationSection("");
for (String world : section.getKeys(false)) {
map.put(world.toLowerCase(), FormatUtil.replaceFormat(section.getString(world)));
}
return map;
}

@Override
public boolean getAnnounceNewPlayers() {
return !config.getString("newbies.announce-format", "-").isEmpty();
Expand Down Expand Up @@ -656,6 +671,7 @@ public void reloadConfig() {
vanishingItemPolicy = _getVanishingItemsPolicy();
bindingItemPolicy = _getBindingItemsPolicy();
currencySymbol = _getCurrencySymbol();
worldAliases = _getWorldAliases();
}

void _lateLoadItemSpawnBlacklist() {
Expand Down
6 changes: 6 additions & 0 deletions Essentials/src/main/resources/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -828,6 +828,12 @@ chat:
# You can use permissions to control whether players can use formatting codes in their chat messages.
# See https://essentialsx.net/wiki/Color-Permissions.html for more information.

# World aliases allow you to replace the world name with something different in the chat format.
# If you are using world aliases, make sure to remove the '#' at the start to allow the setting to be read.
world-aliases:
# plots: "&dP&r"
# creative: "&eC&r"

############################################################
# +------------------------------------------------------+ #
# | EssentialsX Protect | #
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public void onPlayerChat(final AsyncPlayerChatEvent event) {

String format = ess.getSettings().getChatFormat(group);
format = format.replace("{0}", group);
format = format.replace("{1}", world);
format = format.replace("{1}", ess.getSettings().getWorldAlias(world));
format = format.replace("{2}", world.substring(0, 1).toUpperCase(Locale.ENGLISH));
format = format.replace("{3}", team == null ? "" : team.getPrefix());
format = format.replace("{4}", team == null ? "" : team.getSuffix());
Expand Down