SpigotMC/LibsDisguises
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix some messages not being colorized

Browse Source
This commit is contained in:
libraryaddict 2021-08-01 13:23:09 +12:00
parent 8ff92e2760
commit 565a06731b
7 changed files with 31 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDJson.java
View File

@ -96,7 +96,7 @@ public class LDJson implements LDCommand {
int start = 0; int start = 0;
int msg = 1; int msg = 1;
ComponentBuilder builder = new ComponentBuilder("").append(TextComponent.fromLegacyText(prefix.get())); ComponentBuilder builder = new ComponentBuilder("").append(prefix.getBase());
while (start < string.length()) { while (start < string.length()) {
int end = Math.min(256, string.length() - start); int end = Math.min(256, string.length() - start);
@ -106,17 +106,17 @@ public class LDJson implements LDCommand {
builder.append(" "); builder.append(" ");
if (string.length() <= 256) { if (string.length() <= 256) {
builder.append(TextComponent.fromLegacyText(LibsMsg.CLICK_TO_COPY_DATA.get())); builder.append(LibsMsg.CLICK_TO_COPY_DATA.getBase());
} else { } else {
builder.reset(); builder.reset();
builder.append(TextComponent.fromLegacyText(LibsMsg.CLICK_COPY.get(msg))); builder.append(LibsMsg.CLICK_COPY.getBase(msg));
} }
start += end; start += end;
builder.event(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, sub)); builder.event(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, sub));
builder.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, builder.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT,
new ComponentBuilder(LibsMsg.CLICK_TO_COPY_HOVER.get() + (string.length() <= 256 ? "" : " " + msg)) new ComponentBuilder("").append(LibsMsg.CLICK_TO_COPY_HOVER.getBase()).append((string.length() <= 256 ? "" : " " + msg))
.create())); .create()));
msg += 1; msg += 1;
} }

6
src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDMetaInfo.java
View File

@ -48,7 +48,7 @@ public class LDMetaInfo implements LDCommand {
names.sort(String::compareToIgnoreCase); names.sort(String::compareToIgnoreCase);
// if (NmsVersion.v1_13.isSupported()) { // if (NmsVersion.v1_13.isSupported()) {
ComponentBuilder builder = new ComponentBuilder("").append(TextComponent.fromLegacyText(LibsMsg.META_VALUES.get())); ComponentBuilder builder = new ComponentBuilder("").append(LibsMsg.META_VALUES.getBase());
Iterator<String> itel = names.iterator(); Iterator<String> itel = names.iterator();
@ -57,10 +57,10 @@ public class LDMetaInfo implements LDCommand {
builder.append(TextComponent.fromLegacyText(name)); builder.append(TextComponent.fromLegacyText(name));
builder.event(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/libsdisguises metainfo " + name)); builder.event(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/libsdisguises metainfo " + name));
builder.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, TextComponent.fromLegacyText(LibsMsg.META_CLICK_SHOW.get(name)))); builder.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, LibsMsg.META_CLICK_SHOW.getBase(name)));
if (itel.hasNext()) { if (itel.hasNext()) {
builder.append(TextComponent.fromLegacyText(LibsMsg.META_VALUE_SEPERATOR.get())); builder.append(LibsMsg.META_VALUE_SEPERATOR.getBase());
} }
} }

24
src/main/java/me/libraryaddict/disguise/commands/utils/CopyDisguiseCommand.java
View File

@ -33,7 +33,9 @@ public class CopyDisguiseCommand implements CommandExecutor {
public boolean onCommand(CommandSender sender, Command command, String s, String[] args) { public boolean onCommand(CommandSender sender, Command command, String s, String[] args) {
if (sender instanceof Player && !sender.isOp() && if (sender instanceof Player && !sender.isOp() &&
(!LibsPremium.isPremium() || LibsPremium.getPaidInformation() == LibsPremium.getPluginInformation())) { (!LibsPremium.isPremium() || LibsPremium.getPaidInformation() == LibsPremium.getPluginInformation())) {
sender.sendMessage(ChatColor.RED + "This is the free version of Lib's Disguises, player commands are limited to console and Operators only! Purchase the plugin for non-admin usage!"); sender.sendMessage(ChatColor.RED +
"This is the free version of Lib's Disguises, player commands are limited to console and Operators only! Purchase the plugin for " +
"non-admin usage!");
return true; return true;
} }
@ -51,8 +53,7 @@ public class CopyDisguiseCommand implements CommandExecutor {
if (args[0].contains("-")) { if (args[0].contains("-")) {
try { try {
target = Bukkit.getEntity(UUID.fromString(args[0])); target = Bukkit.getEntity(UUID.fromString(args[0]));
} } catch (Exception ignored) {
catch (Exception ignored) {
} }
} }
} }
@ -67,8 +68,7 @@ public class CopyDisguiseCommand implements CommandExecutor {
if (disguise == null) { if (disguise == null) {
LibsDisguises.getInstance().getListener() LibsDisguises.getInstance().getListener()
.addInteraction(sender.getName(), new CopyDisguiseInteraction(this), .addInteraction(sender.getName(), new CopyDisguiseInteraction(this), DisguiseConfig.getDisguiseEntityExpire());
DisguiseConfig.getDisguiseEntityExpire());
LibsMsg.DISGUISECOPY_INTERACT.send(sender, DisguiseConfig.getDisguiseEntityExpire()); LibsMsg.DISGUISECOPY_INTERACT.send(sender, DisguiseConfig.getDisguiseEntityExpire());
return true; return true;
@ -79,8 +79,7 @@ public class CopyDisguiseCommand implements CommandExecutor {
sendMessage(sender, LibsMsg.CLICK_TO_COPY, LibsMsg.COPY_DISGUISE_NO_COPY, disguiseString, false); sendMessage(sender, LibsMsg.CLICK_TO_COPY, LibsMsg.COPY_DISGUISE_NO_COPY, disguiseString, false);
if (disguise instanceof PlayerDisguise) { if (disguise instanceof PlayerDisguise) {
sendMessage(sender, LibsMsg.CLICK_TO_COPY_WITH_SKIN, LibsMsg.CLICK_TO_COPY_WITH_SKIN_NO_COPY, sendMessage(sender, LibsMsg.CLICK_TO_COPY_WITH_SKIN, LibsMsg.CLICK_TO_COPY_WITH_SKIN_NO_COPY, DisguiseParser.parseToString(disguise), true);
DisguiseParser.parseToString(disguise), true);
} }
DisguiseUtilities.setCopyDisguiseCommandUsed(); DisguiseUtilities.setCopyDisguiseCommandUsed();
@ -94,7 +93,7 @@ public class CopyDisguiseCommand implements CommandExecutor {
return; return;
}*/ }*/
ComponentBuilder builder = new ComponentBuilder("").append(TextComponent.fromLegacyText(msg.get())).append(" "); ComponentBuilder builder = new ComponentBuilder("").append(msg.getBase()).append(" ");
if (string.length() > 256 || forceAbbrev) { if (string.length() > 256 || forceAbbrev) {
String[] split = DisguiseUtilities.split(string); String[] split = DisguiseUtilities.split(string);
@ -136,18 +135,17 @@ public class CopyDisguiseCommand implements CommandExecutor {
sections++; sections++;
builder.append(TextComponent.fromLegacyText(LibsMsg.CLICK_COPY.get(sections))); builder.append(LibsMsg.CLICK_COPY.getBase(sections));
builder.event(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, current.toString())); builder.event(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, current.toString()));
builder.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, builder.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT,
new ComponentBuilder(LibsMsg.CLICK_TO_COPY_HOVER.get() + " " + sections).create())); new ComponentBuilder("").append(LibsMsg.CLICK_TO_COPY_HOVER.getBase()).append(" " + sections).create()));
current = new StringBuilder(); current = new StringBuilder();
} }
} else { } else {
builder.append(TextComponent.fromLegacyText(LibsMsg.CLICK_COPY.get(string))); builder.append(LibsMsg.CLICK_COPY.getBase(string));
builder.event(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, string)); builder.event(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, string));
builder.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, builder.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, LibsMsg.CLICK_TO_COPY_HOVER.getBase()));
new ComponentBuilder(LibsMsg.CLICK_TO_COPY_HOVER.get()).create()));
} }
sender.spigot().sendMessage(builder.create()); sender.spigot().sendMessage(builder.create());

9
src/main/java/me/libraryaddict/disguise/commands/utils/GrabSkinCommand.java
View File

@ -123,7 +123,7 @@ public class GrabSkinCommand implements CommandExecutor {
int msg = 1; int msg = 1;
//if (NmsVersion.v1_13.isSupported()) { //if (NmsVersion.v1_13.isSupported()) {
ComponentBuilder builder = new ComponentBuilder("").append(TextComponent.fromLegacyText(LibsMsg.CLICK_TO_COPY.get())); ComponentBuilder builder = new ComponentBuilder("").append(LibsMsg.CLICK_TO_COPY.getBase());
while (start < string.length()) { while (start < string.length()) {
int end = Math.min(256, string.length() - start); int end = Math.min(256, string.length() - start);
@ -133,16 +133,17 @@ public class GrabSkinCommand implements CommandExecutor {
builder.append(" "); builder.append(" ");
if (string.length() <= 256) { if (string.length() <= 256) {
builder.append(TextComponent.fromLegacyText(LibsMsg.CLICK_TO_COPY_DATA.get())); builder.append(LibsMsg.CLICK_TO_COPY_DATA.getBase());
} else { } else {
builder.reset(); builder.reset();
builder.append(TextComponent.fromLegacyText(LibsMsg.CLICK_COPY.get(msg))); builder.append(LibsMsg.CLICK_COPY.getBase(msg));
} }
start += end; start += end;
builder.event(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, sub)); builder.event(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, sub));
builder.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder(LibsMsg.CLICK_TO_COPY_HOVER.get() + " " + msg).create())); builder.event(new HoverEvent(HoverEvent.Action.SHOW_TEXT,
new ComponentBuilder("").append(LibsMsg.CLICK_TO_COPY_HOVER.getBase()).append(" " + msg).create()));
msg += 1; msg += 1;
} }

5
src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java
View File

@ -358,8 +358,7 @@ public abstract class Disguise {
removeBossBar(); removeBossBar();
BossBar bar = Bukkit.createBossBar(getBossBar(), BossBar bar = Bukkit.createBossBar(getBossBar(), BaseComponent.toLegacyText(LibsMsg.ACTION_BAR_MESSAGE.getBase(getDisguiseName())), getBossBarColor(),
BaseComponent.toLegacyText(DisguiseUtilities.getColoredChat(LibsMsg.ACTION_BAR_MESSAGE.get(getDisguiseName()))), getBossBarColor(),
getBossBarStyle()); getBossBarStyle());
bar.setProgress(1); bar.setProgress(1);
bar.addPlayer((Player) getEntity()); bar.addPlayer((Player) getEntity());
@ -378,7 +377,7 @@ public abstract class Disguise {
protected void doActionBar() { protected void doActionBar() {
if (getNotifyBar() == DisguiseConfig.NotifyBar.ACTION_BAR && getEntity() instanceof Player && !getEntity().hasPermission("libsdisguises.noactionbar") && if (getNotifyBar() == DisguiseConfig.NotifyBar.ACTION_BAR && getEntity() instanceof Player && !getEntity().hasPermission("libsdisguises.noactionbar") &&
DisguiseAPI.getDisguise(getEntity()) == Disguise.this) { DisguiseAPI.getDisguise(getEntity()) == Disguise.this) {
((Player) getEntity()).spigot().sendMessage(ChatMessageType.ACTION_BAR, LibsMsg.ACTION_BAR_MESSAGE.getChat(getDisguiseName())); ((Player) getEntity()).spigot().sendMessage(ChatMessageType.ACTION_BAR, LibsMsg.ACTION_BAR_MESSAGE.getBase(getDisguiseName()));
} }
if (isDynamicName()) { if (isDynamicName()) {

2
src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
View File

@ -2496,7 +2496,7 @@ public class DisguiseUtilities {
} }
public static void sendMessage(CommandSender sender, LibsMsg msg, Object... args) { public static void sendMessage(CommandSender sender, LibsMsg msg, Object... args) {
BaseComponent[] components = msg.getChat(args); BaseComponent[] components = msg.getBase(args);
if (components.length > 0) { if (components.length > 0) {
sender.spigot().sendMessage(components); sender.spigot().sendMessage(components);

11
src/main/java/me/libraryaddict/disguise/utilities/translations/LibsMsg.java
View File

@ -316,16 +316,15 @@ public enum LibsMsg {
return string; return string;
} }
public BaseComponent[] getChat(Object... strings) {
String string = get(strings);
return DisguiseUtilities.getColoredChat(string);
}
public void send(CommandSender player, Object... strings) { public void send(CommandSender player, Object... strings) {
DisguiseUtilities.sendMessage(player, this, strings); DisguiseUtilities.sendMessage(player, this, strings);
} }
@Deprecated
public BaseComponent[] getBase(Object... strings) {
return DisguiseUtilities.getColoredChat(get(strings));
}
@Deprecated @Deprecated
public String get(Object... strings) { public String get(Object... strings) {
int matches = StringUtils.countMatches(getRaw(), "%s"); int matches = StringUtils.countMatches(getRaw(), "%s");