PandacubeFr/PandaLib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Internal fixes / optimizations in Chat API

Browse Source
This commit is contained in:
Marc Baloup 2021-07-25 20:12:51 +02:00
parent ce4f756446
commit a62b990dbe
Signed by: marcbal
GPG Key ID: BBC0FE3ABC30B893
2 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Core/src/main/java/fr/pandacube/lib/core/chat/Chat.java
View File

@ -317,6 +317,10 @@ public abstract class Chat extends ChatStatic implements HoverEventSource<Compon
return getAdv().hashCode(); return getAdv().hashCode();
} }
@Override
public String toString() {
return getPlainText();
}
@ -339,9 +343,7 @@ public abstract class Chat extends ChatStatic implements HoverEventSource<Compon
ComponentLike[] ret = new ComponentLike[values.length]; ComponentLike[] ret = new ComponentLike[values.length];
for (int i = 0; i < values.length; i++) { for (int i = 0; i < values.length; i++) {
Object v = values[i]; Object v = values[i];
if (v instanceof Chat) if (v instanceof BaseComponent[])
ret[i] = ((Chat) v).getAdv();
else if (v instanceof BaseComponent[])
ret[i] = toAdventure((BaseComponent[]) v); ret[i] = toAdventure((BaseComponent[]) v);
else if (v instanceof BaseComponent) else if (v instanceof BaseComponent)
ret[i] = toAdventure((BaseComponent) v); ret[i] = toAdventure((BaseComponent) v);

36
Core/src/main/java/fr/pandacube/lib/core/chat/ChatStatic.java
View File

@ -3,6 +3,7 @@ package fr.pandacube.lib.core.chat;
import java.util.Objects; import java.util.Objects;
import fr.pandacube.lib.core.chat.Chat.FormatableChat; import fr.pandacube.lib.core.chat.Chat.FormatableChat;
import fr.pandacube.lib.core.util.Log;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.chat.BaseComponent;
@ -20,7 +21,7 @@ public abstract class ChatStatic {
} }
public static FormatableChat chat() { public static FormatableChat chat() {
return chatComponent(Component.empty()); return new FormatableChat(Component.text());
} }
public static FormatableChat chatComponent(BaseComponent[] c) { public static FormatableChat chatComponent(BaseComponent[] c) {
@ -28,10 +29,26 @@ public abstract class ChatStatic {
} }
public static FormatableChat text(Object plainText) { public static FormatableChat text(Object plainText) {
return chatComponent(Component.text(Objects.toString(plainText))); if (plainText instanceof Chat) {
Log.warning("Using Chat instance as plain text. Please use proper API method. I’ll properly use your Chat instance this time...", new Throwable());
return (FormatableChat) plainText;
}
if (plainText instanceof Component) {
Log.warning("Using Component instance as plain text. Please use proper API method. I’ll properly use your Component this time...", new Throwable());
return chatComponent((Component) plainText);
}
return new FormatableChat(Component.text().content(Objects.toString(plainText)));
} }
public static FormatableChat legacyText(Object legacyText) { public static FormatableChat legacyText(Object legacyText) {
if (legacyText instanceof Chat) {
Log.warning("Using Chat instance as legacy text. Please use proper API method. I’ll properly use your Chat instance this time...", new Throwable());
return (FormatableChat) legacyText;
}
if (legacyText instanceof Component) {
Log.warning("Using Component instance as legacy text. Please use proper API method. I’ll properly use your Component this time...", new Throwable());
return chatComponent((Component) legacyText);
}
return chatComponent(LegacyComponentSerializer.legacySection().deserialize(Objects.toString(legacyText))); return chatComponent(LegacyComponentSerializer.legacySection().deserialize(Objects.toString(legacyText)));
} }
@ -67,16 +84,23 @@ public abstract class ChatStatic {
} }
public static FormatableChat translation(String key, Object... with) { public static FormatableChat translation(String key, Object... with) {
return chatComponent(Component.translatable(key, Chat.filterObjToComponentLike(with))); return new FormatableChat(Component.translatable()
.key(key)
.args(Chat.filterObjToComponentLike(with))
);
} }
/** @param key one of the values in {@link net.md_5.bungee.api.chat.Keybinds} */
public static FormatableChat keybind(String key) { public static FormatableChat keybind(String key) {
return chatComponent(Component.keybind(key)); return new FormatableChat(Component.keybind()
.keybind(key)
);
} }
public static FormatableChat score(String name, String objective) { public static FormatableChat score(String name, String objective) {
return chatComponent(Component.score(name, objective)); return new FormatableChat(Component.score()
.name(name)
.objective(objective)
);
} }