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

Compare commits

base: PandacubeFr:36eb1227cf747ec06efda1d9855f98b171e17609
Branches Tags
PandacubeFr:master
..
compare: PandacubeFr:3e6cf96040ccf017a15f93ca821fbe043108f371
Branches Tags
PandacubeFr:master

No commits in common. "36eb1227cf747ec06efda1d9855f98b171e17609" and "3e6cf96040ccf017a15f93ca821fbe043108f371" have entirely different histories.
36eb1227cf ... 3e6cf96040

31 changed files with 320 additions and 438 deletions
Show Stats Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,5 +1,3 @@
/.idea /.idea
/*/target /*/target
dependency-reduced-pom.xml dependency-reduced-pom.xml
*.iml

1
pandalib-bungee-chat/.gitignore vendored
View File

@ -1 +0,0 @@
/target/

49
pandalib-bungee-chat/pom.xml
View File

@ -1,49 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>pandalib-parent</artifactId>
<groupId>fr.pandacube.lib</groupId>
<version>1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pandalib-bungee-chat</artifactId>
<packaging>jar</packaging>
<repositories>
<repository>
<id>bungeecord-repo</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>fr.pandacube.lib</groupId>
<artifactId>pandalib-util</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>fr.pandacube.lib</groupId>
<artifactId>pandalib-chat</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>net.md-5</groupId>
<artifactId>bungeecord-chat</artifactId>
<version>${bungeecord.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-platform-bungeecord</artifactId>
<version>4.3.0</version>
</dependency>
</dependencies>
</project>

71
pandalib-bungee-chat/src/main/java/fr/pandacube/lib/bungee/chat/ChatBungee.java
View File

@ -1,71 +0,0 @@
package fr.pandacube.lib.bungee.chat;
import fr.pandacube.lib.chat.Chat;
import fr.pandacube.lib.chat.Chat.FormatableChat;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.ComponentLike;
import net.kyori.adventure.text.serializer.bungeecord.BungeeComponentSerializer;
import net.md_5.bungee.api.chat.BaseComponent;
public class ChatBungee {
/**
* Creates a {@link FormatableChat} from the provided Bungee {@link BaseComponent}.
* @param c the {@link BaseComponent}.
* @return a new {@link FormatableChat}.
*/
public static FormatableChat chatComponent(BaseComponent c) {
return Chat.chatComponent(toAdventure(c));
}
/**
* Creates a {@link FormatableChat} from the provided Bungee {@link BaseComponent BaseComponent[]}.
* @param c the array of {@link BaseComponent}.
* @return a new {@link FormatableChat}.
*/
public static FormatableChat chatComponent(BaseComponent[] c) {
return Chat.chatComponent(toAdventure(c));
}
/**
* Converts the Bungee {@link BaseComponent} array into Adventure {@link Component}.
* @param components the Bungee {@link BaseComponent} array.
* @return a {@link Component}.
*/
public static Component toAdventure(BaseComponent[] components) {
return BungeeComponentSerializer.get().deserialize(components);
}
/**
* Converts the Bungee {@link BaseComponent} into Adventure {@link Component}.
* @param component the Bungee {@link BaseComponent}.
* @return a {@link Component}.
*/
public static Component toAdventure(BaseComponent component) {
return toAdventure(new BaseComponent[] { component });
}
/**
* Converts the Adventure {@link Component} into Bungee {@link BaseComponent} array.
* @param component the Adventure {@link Component}.
* @return a {@link BaseComponent} array.
*/
public static BaseComponent[] toBungeeArray(ComponentLike component) {
return BungeeComponentSerializer.get().serialize(component.asComponent());
}
/**
* Converts the Adventure {@link Component} into Bungee {@link BaseComponent}.
* @param component the Adventure {@link Component}.
* @return a {@link BaseComponent}.
*/
public static BaseComponent toBungee(ComponentLike component) {
BaseComponent[] arr = toBungeeArray(component);
return arr.length == 1 ? arr[0] : new net.md_5.bungee.api.chat.TextComponent(arr);
}
}

2
pandalib-bungee/pom.xml
View File

@ -33,7 +33,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>fr.pandacube.lib</groupId> <groupId>fr.pandacube.lib</groupId>
<artifactId>pandalib-bungee-chat</artifactId> <artifactId>pandalib-chat</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>

4
pandalib-bungee/src/main/java/fr/pandacube/lib/bungee/commands/BungeeBrigadierDispatcher.java
View File

@ -1,6 +1,6 @@
package fr.pandacube.lib.bungee.commands; package fr.pandacube.lib.bungee.commands;
import fr.pandacube.lib.bungee.chat.ChatBungee; import fr.pandacube.lib.chat.Chat;
import fr.pandacube.lib.commands.BrigadierDispatcher; import fr.pandacube.lib.commands.BrigadierDispatcher;
import net.kyori.adventure.text.ComponentLike; import net.kyori.adventure.text.ComponentLike;
import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.CommandSender;
@ -71,6 +71,6 @@ public class BungeeBrigadierDispatcher extends BrigadierDispatcher<CommandSender
@Override @Override
protected void sendSenderMessage(CommandSender sender, ComponentLike message) { protected void sendSenderMessage(CommandSender sender, ComponentLike message) {
sender.sendMessage(ChatBungee.toBungee(message.asComponent())); sender.sendMessage(Chat.toBungee(message.asComponent()));
} }
} }

6
pandalib-bungee/src/main/java/fr/pandacube/lib/bungee/players/BungeeOnlinePlayer.java
View File

@ -1,6 +1,6 @@
package fr.pandacube.lib.bungee.players; package fr.pandacube.lib.bungee.players;
import fr.pandacube.lib.bungee.chat.ChatBungee; import fr.pandacube.lib.chat.Chat;
import fr.pandacube.lib.core.mc_version.ProtocolVersion; import fr.pandacube.lib.core.mc_version.ProtocolVersion;
import fr.pandacube.lib.players.standalone.AbstractOnlinePlayer; import fr.pandacube.lib.players.standalone.AbstractOnlinePlayer;
import fr.pandacube.lib.reflect.Reflect; import fr.pandacube.lib.reflect.Reflect;
@ -84,13 +84,13 @@ public interface BungeeOnlinePlayer extends BungeeOffPlayer, AbstractOnlinePlaye
@Override @Override
default void sendMessage(Component message) { default void sendMessage(Component message) {
getBungeeProxiedPlayer().sendMessage(ChatBungee.toBungee(message)); getBungeeProxiedPlayer().sendMessage(Chat.toBungee(message));
} }
@Override @Override
default void sendTitle(Component title, Component subtitle, int fadeIn, int stay, int fadeOut) { default void sendTitle(Component title, Component subtitle, int fadeIn, int stay, int fadeOut) {
ProxyServer.getInstance().createTitle() ProxyServer.getInstance().createTitle()
.title(ChatBungee.toBungee(title)).subTitle(ChatBungee.toBungee(subtitle)) .title(Chat.toBungee(title)).subTitle(Chat.toBungee(subtitle))
.fadeIn(fadeIn).stay(stay).fadeOut(fadeOut) .fadeIn(fadeIn).stay(stay).fadeOut(fadeOut)
.send(getBungeeProxiedPlayer()); .send(getBungeeProxiedPlayer());
} }

16
pandalib-chat/pom.xml
View File

@ -30,13 +30,8 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.kyori</groupId> <groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-gson</artifactId> <artifactId>adventure-platform-bungeecord</artifactId>
<version>4.13.0</version> <version>4.3.0</version>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-legacy</artifactId>
<version>4.13.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.kyori</groupId> <groupId>net.kyori</groupId>
@ -51,6 +46,13 @@
<dependency>
<groupId>net.md-5</groupId>
<artifactId>bungeecord-chat</artifactId>
<version>${bungeecord.version}</version>
<scope>compile</scope>
</dependency>
<dependency> <dependency>
<groupId>com.google.code.gson</groupId> <groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId> <artifactId>gson</artifactId>

154
pandalib-chat/src/main/java/fr/pandacube/lib/chat/Chat.java
View File

@ -16,13 +16,15 @@ import net.kyori.adventure.text.format.TextColor;
import net.kyori.adventure.text.format.TextDecoration; import net.kyori.adventure.text.format.TextDecoration;
import net.kyori.adventure.text.format.TextDecoration.State; import net.kyori.adventure.text.format.TextDecoration.State;
import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.serializer.bungeecord.BungeeComponentSerializer;
import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.chat.BaseComponent;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.awt.*; import java.awt.*;
import java.util.Locale;
import java.util.Objects; import java.util.Objects;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.UnaryOperator; import java.util.function.UnaryOperator;
@ -65,10 +67,26 @@ public abstract sealed class Chat extends ChatStatic implements HoverEventSource
* Builds the component into Adventure Component instance. * Builds the component into Adventure Component instance.
* @return the {@link Component} built from this {@link Chat} component. * @return the {@link Component} built from this {@link Chat} component.
*/ */
public Component get() { public Component getAdv() {
return builder.build(); return builder.build();
} }
/**
* Builds the component into BungeeCord {@link BaseComponent} instance.
* @return the {@link BaseComponent} built from this {@link Chat} component.
*/
public BaseComponent get() {
return toBungee(getAdv());
}
/**
* Builds the component into BungeeCord {@link BaseComponent} array.
* @return the {@link BaseComponent} array built from this {@link Chat} component.
*/
public BaseComponent[] getAsArray() {
return toBungeeArray(getAdv());
}
private static final LegacyComponentSerializer LEGACY_SERIALIZER_BUNGEE_FRIENDLY = LegacyComponentSerializer.builder() private static final LegacyComponentSerializer LEGACY_SERIALIZER_BUNGEE_FRIENDLY = LegacyComponentSerializer.builder()
.hexColors() .hexColors()
.useUnusualXRepeatedCharacterHexFormat() .useUnusualXRepeatedCharacterHexFormat()
@ -79,7 +97,7 @@ public abstract sealed class Chat extends ChatStatic implements HoverEventSource
* @return the legacy text. RGB colors are in BungeeCord format. * @return the legacy text. RGB colors are in BungeeCord format.
*/ */
public String getLegacyText() { public String getLegacyText() {
return LEGACY_SERIALIZER_BUNGEE_FRIENDLY.serialize(get()); return LEGACY_SERIALIZER_BUNGEE_FRIENDLY.serialize(getAdv());
} }
/** /**
@ -87,12 +105,12 @@ public abstract sealed class Chat extends ChatStatic implements HoverEventSource
* @return the plain text of this component. * @return the plain text of this component.
*/ */
public String getPlainText() { public String getPlainText() {
return PlainTextComponentSerializer.plainText().serializeOr(get(), ""); return PlainTextComponentSerializer.plainText().serializeOr(getAdv(), "");
} }
@Override @Override
public @NotNull HoverEvent<Component> asHoverEvent(@NotNull UnaryOperator<Component> op) { public @NotNull HoverEvent<Component> asHoverEvent(@NotNull UnaryOperator<Component> op) {
return HoverEvent.showText(op.apply(get())); return HoverEvent.showText(op.apply(getAdv()));
} }
/** /**
@ -101,7 +119,7 @@ public abstract sealed class Chat extends ChatStatic implements HoverEventSource
*/ */
@Override @Override
public @NotNull Component asComponent() { public @NotNull Component asComponent() {
return get(); return getAdv();
} }
/** /**
@ -109,7 +127,7 @@ public abstract sealed class Chat extends ChatStatic implements HoverEventSource
* @return the {@link Component} built from this {@link Chat} component, with down-sampled colors. * @return the {@link Component} built from this {@link Chat} component, with down-sampled colors.
*/ */
public Component getAsDownSampledColorsComponent() { public Component getAsDownSampledColorsComponent() {
String json = GsonComponentSerializer.colorDownsamplingGson().serialize(get()); String json = GsonComponentSerializer.colorDownsamplingGson().serialize(getAdv());
return GsonComponentSerializer.gson().deserialize(json); return GsonComponentSerializer.gson().deserialize(json);
} }
@ -126,7 +144,7 @@ public abstract sealed class Chat extends ChatStatic implements HoverEventSource
* @return the MiniMessage representation if this {@link Chat} component. * @return the MiniMessage representation if this {@link Chat} component.
*/ */
public String getMiniMessage() { public String getMiniMessage() {
return MiniMessage.miniMessage().serialize(get()); return MiniMessage.miniMessage().serialize(getAdv());
} }
@ -166,6 +184,15 @@ public abstract sealed class Chat extends ChatStatic implements HoverEventSource
return this; return this;
} }
/**
* Appends a BungeeCord {@link BaseComponent} to this component.
* @param comp the component to append.
* @return this.
*/
public Chat then(BaseComponent comp) {
return then(toAdventure(comp));
}
/** /**
* Appends a component to this component. * Appends a component to this component.
* @param comp the component to append. * @param comp the component to append.
@ -180,6 +207,15 @@ public abstract sealed class Chat extends ChatStatic implements HoverEventSource
return then(comp.asComponent()); return then(comp.asComponent());
} }
/**
* Appends a BungeeCord {@link BaseComponent} array to this component.
* @param comp the components to append.
* @return this.
*/
public Chat then(BaseComponent[] comp) {
return then(toAdventure(comp));
}
@ -459,6 +495,17 @@ public abstract sealed class Chat extends ChatStatic implements HoverEventSource
*/ */
public Chat thenLeftText(ComponentLike leftText) { return then(leftText(leftText, console)); } public Chat thenLeftText(ComponentLike leftText) { return then(leftText(leftText, console)); }
/**
* Appends a component filling a chat line with the configured decoration character and
* color and a left-aligned text.
* @param leftText the text aligned to the left.
* @return a new {@link FormatableChat} filling a chat line with the configured decoration character
* and color and a left-aligned text.
* @deprecated uses Bungeecord chat API.
*/
@Deprecated
public Chat thenLeftText(BaseComponent leftText) { return thenLeftText(chatComponent(leftText)); }
/** /**
* Appends a component filling a chat line with the configured decoration character and * Appends a component filling a chat line with the configured decoration character and
* color and a right-aligned text. * color and a right-aligned text.
@ -468,6 +515,17 @@ public abstract sealed class Chat extends ChatStatic implements HoverEventSource
*/ */
public Chat thenRightText(ComponentLike rightText) { return then(rightText(rightText, console)); } public Chat thenRightText(ComponentLike rightText) { return then(rightText(rightText, console)); }
/**
* Appends a component filling a chat line with the configured decoration character and
* color and a right-aligned text.
* @param rightText the text aligned to the right.
* @return a new {@link FormatableChat} filling a chat line with the configured decoration character
* and color and a right-aligned text.
* @deprecated uses Bungeecord chat API.
*/
@Deprecated
public Chat thenRightText(BaseComponent rightText) { return thenRightText(chatComponent(rightText)); }
/** /**
* Appends a component filling a chat line with the configured decoration character and * Appends a component filling a chat line with the configured decoration character and
* color and a centered text. * color and a centered text.
@ -479,6 +537,19 @@ public abstract sealed class Chat extends ChatStatic implements HoverEventSource
return then(centerText(centerText, console)); return then(centerText(centerText, console));
} }
/**
* Appends a component filling a chat line with the configured decoration character and
* color and a centered text.
* @param centerText the text aligned to the center.
* @return a new {@link FormatableChat} filling a chat line with the configured decoration character
* and color and a centered text.
* @deprecated uses Bungeecord chat API.
*/
@Deprecated
public Chat thenCenterText(BaseComponent centerText) {
return thenCenterText(chatComponent(centerText));
}
/** /**
* Appends a component filling a chat line with the configured decoration character and color. * Appends a component filling a chat line with the configured decoration character and color.
* @return a new {@link FormatableChat} filling a chat line with a decoration character and color. * @return a new {@link FormatableChat} filling a chat line with a decoration character and color.
@ -558,6 +629,12 @@ public abstract sealed class Chat extends ChatStatic implements HoverEventSource
* @return this. * @return this.
*/ */
public FormatableChat color(TextColor c) { builder.color(c); return this; } public FormatableChat color(TextColor c) { builder.color(c); return this; }
/**
* Sets the color of this component.
* @param c the color.
* @return this.
*/
public FormatableChat color(ChatColor c) { return color(c == null ? null : TextColor.color(c.getColor().getRGB())); }
/** /**
* Sets the color of this component. * Sets the color of this component.
* @param c the color. * @param c the color.
@ -569,16 +646,7 @@ public abstract sealed class Chat extends ChatStatic implements HoverEventSource
* @param c the color. * @param c the color.
* @return this. * @return this.
*/ */
public FormatableChat color(String c) { public FormatableChat color(String c) { return color(c == null ? null : ChatColor.of(c)); }
if (c == null)
return color((TextColor) null);
TextColor tc = c.startsWith("#")
? TextColor.fromCSSHexString(c)
: NamedTextColor.NAMES.value(c.toLowerCase(Locale.ROOT));
if (tc == null)
throw new IllegalArgumentException("Invalid color string '" + c + "'.");
return color(tc);
}
/** /**
@ -856,6 +924,18 @@ public abstract sealed class Chat extends ChatStatic implements HoverEventSource
* @return this. * @return this.
*/ */
public FormatableChat hover(ComponentLike v) { return hover(v.asComponent()); } public FormatableChat hover(ComponentLike v) { return hover(v.asComponent()); }
/**
* Configure this component to show the provided component when hovered.
* @param v the component to show.
* @return this.
*/
public FormatableChat hover(BaseComponent v) { return hover(toAdventure(v)); }
/**
* Configure this component to show the provided component when hovered.
* @param v the component to show.
* @return this.
*/
public FormatableChat hover(BaseComponent[] v) { return hover(toAdventure(v)); }
/** /**
* Configure this component to show the provided legacy text when hovered. * Configure this component to show the provided legacy text when hovered.
* @param legacyText the legacy text to show. * @param legacyText the legacy text to show.
@ -883,7 +963,7 @@ public abstract sealed class Chat extends ChatStatic implements HoverEventSource
@Override @Override
public int hashCode() { public int hashCode() {
return get().hashCode(); return getAdv().hashCode();
} }
@Override @Override
@ -896,6 +976,8 @@ public abstract sealed class Chat extends ChatStatic implements HoverEventSource
/* package */ static ComponentLike filterObjToComponentLike(Object v) { /* package */ static ComponentLike filterObjToComponentLike(Object v) {
return switch (v) { return switch (v) {
case BaseComponent[] baseComponents -> toAdventure(baseComponents);
case BaseComponent baseComponent -> toAdventure(baseComponent);
case ComponentLike componentLike -> componentLike; case ComponentLike componentLike -> componentLike;
case null, default -> Component.text(Objects.toString(v)); case null, default -> Component.text(Objects.toString(v));
}; };
@ -929,6 +1011,40 @@ public abstract sealed class Chat extends ChatStatic implements HoverEventSource
} }
/**
* Converts the Bungee {@link BaseComponent} array into Adventure {@link Component}.
* @param components the Bungee {@link BaseComponent} array.
* @return a {@link Component}.
*/
public static Component toAdventure(BaseComponent[] components) {
return BungeeComponentSerializer.get().deserialize(components);
}
/**
* Converts the Bungee {@link BaseComponent} into Adventure {@link Component}.
* @param component the Bungee {@link BaseComponent}.
* @return a {@link Component}.
*/
public static Component toAdventure(BaseComponent component) {
return toAdventure(new BaseComponent[] { component });
}
/**
* Converts the Adventure {@link Component} into Bungee {@link BaseComponent} array.
* @param component the Adventure {@link Component}.
* @return a {@link BaseComponent} array.
*/
public static BaseComponent[] toBungeeArray(Component component) {
return BungeeComponentSerializer.get().serialize(component);
}
/**
* Converts the Adventure {@link Component} into Bungee {@link BaseComponent}.
* @param component the Adventure {@link Component}.
* @return a {@link BaseComponent}.
*/
public static BaseComponent toBungee(Component component) {
BaseComponent[] arr = toBungeeArray(component);
return arr.length == 1 ? arr[0] : new net.md_5.bungee.api.chat.TextComponent(arr);
}
/** /**
* Force the italic formatting to be set to false if it is not explicitly set in the component. * Force the italic formatting to be set to false if it is not explicitly set in the component.

78
pandalib-chat/src/main/java/fr/pandacube/lib/chat/ChatColorUtil.java
View File

@ -1,14 +1,14 @@
package fr.pandacube.lib.chat; package fr.pandacube.lib.chat;
import net.kyori.adventure.text.format.TextColor;
import net.kyori.adventure.text.format.TextDecoration;
import net.kyori.adventure.text.format.TextFormat;
import net.kyori.adventure.util.RGBLike;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import net.kyori.adventure.text.format.NamedTextColor;
import net.kyori.adventure.text.format.TextColor;
import net.kyori.adventure.util.RGBLike;
import net.md_5.bungee.api.ChatColor;
/** /**
* Provides methods to manipulate legacy colors. * Provides methods to manipulate legacy colors and {@link ChatColor} class.
*/ */
public class ChatColorUtil { public class ChatColorUtil {
@ -38,12 +38,12 @@ public class ChatColorUtil {
int length = legacyText.length(); int length = legacyText.length();
for (int index = length - 2; index >= 0; index--) { for (int index = length - 2; index >= 0; index--) {
if (legacyText.charAt(index) == LegacyChatFormat.COLOR_CHAR) { if (legacyText.charAt(index) == ChatColor.COLOR_CHAR) {
// detection of rgb color §x§0§1§2§3§4§5 // detection of rgb color §x§0§1§2§3§4§5
String rgb; String rgb;
if (index > 11 if (index > 11
&& legacyText.charAt(index - 12) == LegacyChatFormat.COLOR_CHAR && legacyText.charAt(index - 12) == ChatColor.COLOR_CHAR
&& (legacyText.charAt(index - 11) == 'x' && (legacyText.charAt(index - 11) == 'x'
|| legacyText.charAt(index - 11) == 'X') || legacyText.charAt(index - 11) == 'X')
&& HEX_COLOR_PATTERN.matcher(rgb = legacyText.substring(index - 12, index + 2)).matches()) { && HEX_COLOR_PATTERN.matcher(rgb = legacyText.substring(index - 12, index + 2)).matches()) {
@ -64,7 +64,7 @@ public class ChatColorUtil {
// try detect non-rgb format // try detect non-rgb format
char colorChar = legacyText.charAt(index + 1); char colorChar = legacyText.charAt(index + 1);
LegacyChatFormat legacyColor = LegacyChatFormat.of(colorChar); ChatColor legacyColor = getChatColorByChar(colorChar);
if (legacyColor != null) { if (legacyColor != null) {
result.insert(0, legacyColor); result.insert(0, legacyColor);
@ -83,6 +83,15 @@ public class ChatColorUtil {
return result.toString(); return result.toString();
} }
/**
* Returns the {@link ChatColor} associated with the provided char, case-insensitive.
* @param code the case-insensitive char code.
* @return the corresponding {@link ChatColor}.
*/
public static ChatColor getChatColorByChar(char code) {
return ChatColor.getByChar(Character.toLowerCase(code));
}
@ -90,7 +99,7 @@ public class ChatColorUtil {
* Translate the color code of the provided string, that uses the alt color char, to the {@code §} color code * Translate the color code of the provided string, that uses the alt color char, to the {@code §} color code
* format. * format.
* <p> * <p>
* This method is the improved version of Bukkit’s {@code ChatColor.translateAlternateColorCodes(char, String)}, * This method is the improved version of {@link ChatColor#translateAlternateColorCodes(char, String)},
* because it takes into account essentials RGB color code, and {@code altColorChar} escaping (by doubling it). * because it takes into account essentials RGB color code, and {@code altColorChar} escaping (by doubling it).
* Essentials RGB color code are converted to Bungee chat RGB format, so the returned string can be converted * Essentials RGB color code are converted to Bungee chat RGB format, so the returned string can be converted
* to component (see {@link Chat#legacyText(Object)}). * to component (see {@link Chat#legacyText(Object)}).
@ -103,7 +112,7 @@ public class ChatColorUtil {
*/ */
public static String translateAlternateColorCodes(char altColorChar, String textToTranslate) public static String translateAlternateColorCodes(char altColorChar, String textToTranslate)
{ {
char colorChar = LegacyChatFormat.COLOR_CHAR; char colorChar = ChatColor.COLOR_CHAR;
StringBuilder acc = new StringBuilder(); StringBuilder acc = new StringBuilder();
char[] b = textToTranslate.toCharArray(); char[] b = textToTranslate.toCharArray();
for ( int i = 0; i < b.length; i++ ) for ( int i = 0; i < b.length; i++ )
@ -171,7 +180,7 @@ public class ChatColorUtil {
* @return the text fully italic. * @return the text fully italic.
*/ */
public static String forceItalic(String legacyText) { public static String forceItalic(String legacyText) {
return forceFormat(legacyText, TextDecoration.ITALIC); return forceFormat(legacyText, ChatColor.ITALIC);
} }
/** /**
@ -181,7 +190,7 @@ public class ChatColorUtil {
* @return the text fully bold. * @return the text fully bold.
*/ */
public static String forceBold(String legacyText) { public static String forceBold(String legacyText) {
return forceFormat(legacyText, TextDecoration.BOLD); return forceFormat(legacyText, ChatColor.BOLD);
} }
/** /**
@ -191,7 +200,7 @@ public class ChatColorUtil {
* @return the text fully underlined. * @return the text fully underlined.
*/ */
public static String forceUnderline(String legacyText) { public static String forceUnderline(String legacyText) {
return forceFormat(legacyText, TextDecoration.UNDERLINED); return forceFormat(legacyText, ChatColor.UNDERLINE);
} }
/** /**
@ -201,7 +210,7 @@ public class ChatColorUtil {
* @return the text fully stroked through. * @return the text fully stroked through.
*/ */
public static String forceStrikethrough(String legacyText) { public static String forceStrikethrough(String legacyText) {
return forceFormat(legacyText, TextDecoration.STRIKETHROUGH); return forceFormat(legacyText, ChatColor.STRIKETHROUGH);
} }
/** /**
@ -211,16 +220,15 @@ public class ChatColorUtil {
* @return the text fully obfuscated. * @return the text fully obfuscated.
*/ */
public static String forceObfuscated(String legacyText) { public static String forceObfuscated(String legacyText) {
return forceFormat(legacyText, TextDecoration.OBFUSCATED); return forceFormat(legacyText, ChatColor.MAGIC);
} }
private static String forceFormat(String legacyText, TextFormat format) { private static String forceFormat(String legacyText, ChatColor format) {
String formatStr = LegacyChatFormat.of(format).toString();
return format + legacyText return format + legacyText
.replace(formatStr, "") // remove previous tag to make the result cleaner .replace(format.toString(), "") // remove previous tag to make the result cleaner
.replaceAll("§([a-frA-FR\\d])", "§$1" + formatStr); .replaceAll("§([a-frA-FR\\d])", "§$1" + format);
} }
@ -235,12 +243,40 @@ public class ChatColorUtil {
* @return the resulting text. * @return the resulting text.
*/ */
public static String resetToColor(String legacyText, String color) { public static String resetToColor(String legacyText, String color) {
return legacyText.replace(LegacyChatFormat.RESET.toString(), color); return legacyText.replace(ChatColor.RESET.toString(), color);
} }
/**
* Converts the provided {@link ChatColor} to its Adventure counterpart.
* @param bungee a BungeeCord {@link ChatColor} instance.
* @return the {@link TextColor} equivalent to the provided {@link ChatColor}.
*/
public static TextColor toAdventure(ChatColor bungee) {
if (bungee == null)
return null;
if (bungee.getColor() == null)
throw new IllegalArgumentException("The provided Bungee ChatColor must be an actual color (not format nor reset).");
return TextColor.color(bungee.getColor().getRGB());
}
/**
* Converts the provided {@link TextColor} to its BungeeCord counterpart.
* @param col a Adventure {@link TextColor} instance.
* @return the {@link ChatColor} equivalent to the provided {@link TextColor}.
*/
public static ChatColor toBungee(TextColor col) {
if (col == null)
return null;
if (col instanceof NamedTextColor) {
return ChatColor.of(((NamedTextColor) col).toString());
}
return ChatColor.of(col.asHexString());
}
/** /**
* Create a color, interpolating between 2 colors. * Create a color, interpolating between 2 colors.
* @param v0 the value corresponding to color {@code cc0}. * @param v0 the value corresponding to color {@code cc0}.

2
pandalib-chat/src/main/java/fr/pandacube/lib/chat/ChatConfig.java
View File

@ -87,7 +87,7 @@ public class ChatConfig {
*/ */
public static int getPrefixWidth(boolean console) { public static int getPrefixWidth(boolean console) {
Chat c; Chat c;
return prefix == null ? 0 : (c = prefix.get()) == null ? 0 : ChatUtil.componentWidth(c.get(), console); return prefix == null ? 0 : (c = prefix.get()) == null ? 0 : ChatUtil.componentWidth(c.getAdv(), console);
} }

24
pandalib-chat/src/main/java/fr/pandacube/lib/chat/ChatStatic.java
View File

@ -1,6 +1,7 @@
package fr.pandacube.lib.chat; package fr.pandacube.lib.chat;
import fr.pandacube.lib.chat.Chat.FormatableChat; import java.util.Objects;
import net.kyori.adventure.text.BlockNBTComponent; import net.kyori.adventure.text.BlockNBTComponent;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.ComponentBuilder; import net.kyori.adventure.text.ComponentBuilder;
@ -17,8 +18,9 @@ import net.kyori.adventure.text.format.NamedTextColor;
import net.kyori.adventure.text.format.TextColor; import net.kyori.adventure.text.format.TextColor;
import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.MiniMessage;
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 java.util.Objects; import fr.pandacube.lib.chat.Chat.FormatableChat;
/** /**
* Abstract class holding the publicly accessible methods to create an instance of {@link Chat} component. * Abstract class holding the publicly accessible methods to create an instance of {@link Chat} component.
@ -31,6 +33,15 @@ public abstract class ChatStatic {
return new FormatableChat(componentToBuilder(c)); return new FormatableChat(componentToBuilder(c));
} }
/**
* Creates a {@link FormatableChat} from the provided Bungee {@link BaseComponent}.
* @param c the {@link BaseComponent}.
* @return a new {@link FormatableChat}.
*/
public static FormatableChat chatComponent(BaseComponent c) {
return new FormatableChat(componentToBuilder(Chat.toAdventure(c)));
}
/** /**
* Creates a {@link FormatableChat} from the provided {@link ComponentLike}. * Creates a {@link FormatableChat} from the provided {@link ComponentLike}.
* If the provided component is an instance of {@link Chat}, its content will be duplicated, and the provided one * If the provided component is an instance of {@link Chat}, its content will be duplicated, and the provided one
@ -50,6 +61,15 @@ public abstract class ChatStatic {
return new FormatableChat(Component.text()); return new FormatableChat(Component.text());
} }
/**
* Creates a {@link FormatableChat} from the provided Bungee {@link BaseComponent BaseComponent[]}.
* @param c the array of {@link BaseComponent}.
* @return a new {@link FormatableChat}.
*/
public static FormatableChat chatComponent(BaseComponent[] c) {
return chatComponent(Chat.toAdventure(c));
}

47
pandalib-chat/src/main/java/fr/pandacube/lib/chat/ChatUtil.java
View File

@ -1,17 +1,5 @@
package fr.pandacube.lib.chat; package fr.pandacube.lib.chat;
import fr.pandacube.lib.chat.Chat.FormatableChat;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.ComponentLike;
import net.kyori.adventure.text.TextComponent;
import net.kyori.adventure.text.TranslatableComponent;
import net.kyori.adventure.text.TranslationArgument;
import net.kyori.adventure.text.format.NamedTextColor;
import net.kyori.adventure.text.format.TextColor;
import net.kyori.adventure.text.format.TextDecoration;
import net.kyori.adventure.text.format.TextDecoration.State;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
@ -22,6 +10,19 @@ import java.util.Set;
import java.util.TreeSet; import java.util.TreeSet;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.ComponentLike;
import net.kyori.adventure.text.TextComponent;
import net.kyori.adventure.text.TranslatableComponent;
import net.kyori.adventure.text.TranslationArgument;
import net.kyori.adventure.text.format.NamedTextColor;
import net.kyori.adventure.text.format.TextColor;
import net.kyori.adventure.text.format.TextDecoration;
import net.kyori.adventure.text.format.TextDecoration.State;
import net.md_5.bungee.api.ChatColor;
import fr.pandacube.lib.chat.Chat.FormatableChat;
import static fr.pandacube.lib.chat.ChatStatic.chat; import static fr.pandacube.lib.chat.ChatStatic.chat;
/** /**
@ -350,7 +351,7 @@ public class ChatUtil {
do { do {
char c = legacyText.charAt(index); char c = legacyText.charAt(index);
if (c == LegacyComponentSerializer.SECTION_CHAR && index < legacyText.length() - 1) { if (c == ChatColor.COLOR_CHAR && index < legacyText.length() - 1) {
currentWord.append(c); currentWord.append(c);
c = legacyText.charAt(++index); c = legacyText.charAt(++index);
currentWord.append(c); currentWord.append(c);
@ -481,7 +482,7 @@ public class ChatUtil {
} }
if (!row.isEmpty()) if (!row.isEmpty())
spacedRow.then(row.getLast()); spacedRow.then(row.getLast());
spacedRows.add(spacedRow.get()); spacedRows.add(spacedRow.getAdv());
} }
return spacedRows; return spacedRows;
@ -503,14 +504,14 @@ public class ChatUtil {
*/ */
public static Component customWidthSpace(int width, boolean console) { public static Component customWidthSpace(int width, boolean console) {
if (console) if (console)
return Chat.text(" ".repeat(width)).get(); return Chat.text(" ".repeat(width)).getAdv();
return switch (width) { return switch (width) {
case 0, 1 -> Component.empty(); case 0, 1 -> Component.empty();
case 2 -> Chat.text(".").black().get(); case 2 -> Chat.text(".").black().getAdv();
case 3 -> Chat.text("`").black().get(); case 3 -> Chat.text("`").black().getAdv();
case 6 -> Chat.text(". ").black().get(); case 6 -> Chat.text(". ").black().getAdv();
case 7 -> Chat.text("` ").black().get(); case 7 -> Chat.text("` ").black().getAdv();
case 11 -> Chat.text("` ").black().get(); case 11 -> Chat.text("` ").black().getAdv();
default -> { default -> {
int nbSpace = width / 4; int nbSpace = width / 4;
int nbBold = width % 4; int nbBold = width % 4;
@ -519,13 +520,13 @@ public class ChatUtil {
if (nbBold > 0) { if (nbBold > 0) {
yield Chat.text(" ".repeat(nbNotBold)).bold(false) yield Chat.text(" ".repeat(nbNotBold)).bold(false)
.then(Chat.text(" ".repeat(nbBold)).bold(true)) .then(Chat.text(" ".repeat(nbBold)).bold(true))
.get(); .getAdv();
} }
else else
yield Chat.text(" ".repeat(nbNotBold)).bold(false).get(); yield Chat.text(" ".repeat(nbNotBold)).bold(false).getAdv();
} }
else if (nbBold > 0) { else if (nbBold > 0) {
yield Chat.text(" ".repeat(nbBold)).bold(true).get(); yield Chat.text(" ".repeat(nbBold)).bold(true).getAdv();
} }
throw new IllegalStateException("Should not be here (width=" + width + "; nbSpace=" + nbSpace + "; nbBold=" + nbBold + "; nbNotBold=" + nbNotBold + ")"); throw new IllegalStateException("Should not be here (width=" + width + "; nbSpace=" + nbSpace + "; nbBold=" + nbBold + "; nbNotBold=" + nbNotBold + ")");
} }

122
pandalib-chat/src/main/java/fr/pandacube/lib/chat/LegacyChatFormat.java
View File

@ -1,122 +0,0 @@
package fr.pandacube.lib.chat;
import net.kyori.adventure.text.format.TextColor;
import net.kyori.adventure.text.format.TextDecoration;
import net.kyori.adventure.text.format.TextFormat;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import net.kyori.adventure.text.serializer.legacy.LegacyFormat;
import java.util.Arrays;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.stream.Collectors;
public enum LegacyChatFormat {
BLACK('0'),
DARK_BLUE('1'),
DARK_GREEN('2'),
DARK_AQUA('3'),
DARK_RED('4'),
DARK_PURPLE('5'),
GOLD('6'),
GRAY('7'),
DARK_GRAY('8'),
BLUE('9'),
GREEN('a'),
AQUA('b'),
RED('c'),
LIGHT_PURPLE('d'),
YELLOW('e'),
WHITE('f'),
MAGIC('k'),
BOLD('l'),
STRIKETHROUGH('m'),
UNDERLINED('n'),
ITALIC('o'),
RESET('r');
public static final char COLOR_CHAR = LegacyComponentSerializer.SECTION_CHAR;
public static final String COLOR_STR_PREFIX = Character.toString(COLOR_CHAR);
private static final Map<Character, LegacyChatFormat> BY_CHAR;
private static final Map<TextFormat, LegacyChatFormat> BY_FORMAT;
private static final Map<LegacyFormat, LegacyChatFormat> BY_LEGACY;
public static LegacyChatFormat of(char code) {
return BY_CHAR.get(Character.toLowerCase(code));
}
public static LegacyChatFormat of(TextFormat format) {
LegacyChatFormat colorOrDecoration = BY_FORMAT.get(format);
if (colorOrDecoration != null)
return colorOrDecoration;
if (format.getClass().getSimpleName().equals("Reset")) // an internal class of legacy serializer library
return RESET;
throw new IllegalArgumentException("Unsupported format of type " + format.getClass());
}
public static LegacyChatFormat of(LegacyFormat advLegacy) {
return BY_LEGACY.get(advLegacy);
}
public final char code;
public final LegacyFormat advLegacyFormat;
LegacyChatFormat(char code) {
this.code = code;
advLegacyFormat = LegacyComponentSerializer.parseChar(code);
}
public TextColor getTextColor() {
return advLegacyFormat.color();
}
public boolean isColor() {
return getTextColor() != null;
}
public TextDecoration getTextDecoration() {
return advLegacyFormat.decoration();
}
public boolean isDecoration() {
return getTextDecoration() != null;
}
public boolean isReset() {
return this == RESET;
}
@Override
public String toString() {
return COLOR_STR_PREFIX + code;
}
static {
BY_CHAR = Arrays.stream(values()).sequential().collect(Collectors.toMap(e -> e.code, e -> e, (e1, e2) -> e1, LinkedHashMap::new));
BY_FORMAT = Arrays.stream(values()).sequential()
.filter(e -> e.isColor() || e.isDecoration())
.collect(Collectors.toMap(e -> {
if (e.isColor())
return e.getTextColor();
return e.getTextDecoration();
}, e -> e, (e1, e2) -> e1, LinkedHashMap::new));
BY_LEGACY = Arrays.stream(values()).sequential().collect(Collectors.toMap(e -> e.advLegacyFormat, e -> e, (e1, e2) -> e1, LinkedHashMap::new));
}
}

4
pandalib-cli/src/main/java/fr/pandacube/lib/cli/commands/CommandAdmin.java
View File

@ -18,7 +18,7 @@ import fr.pandacube.lib.chat.Chat.FormatableChat;
import fr.pandacube.lib.chat.ChatTreeNode; import fr.pandacube.lib.chat.ChatTreeNode;
import fr.pandacube.lib.cli.CLIApplication; import fr.pandacube.lib.cli.CLIApplication;
import fr.pandacube.lib.util.log.Log; import fr.pandacube.lib.util.log.Log;
import net.kyori.adventure.text.Component; import net.md_5.bungee.api.chat.BaseComponent;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@ -192,7 +192,7 @@ public class CommandAdmin extends CLIBrigadierCommand {
private Component displayCurrentNode(CommandNode<CLICommandSender> node, boolean redirectTarget, CLICommandSender sender) { private BaseComponent displayCurrentNode(CommandNode<CLICommandSender> node, boolean redirectTarget, CLICommandSender sender) {
if (node == null) if (node == null)
throw new IllegalArgumentException("node must not be null"); throw new IllegalArgumentException("node must not be null");
FormatableChat d; FormatableChat d;

6
pandalib-core/pom.xml
View File

@ -37,12 +37,6 @@
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<!-- Cron expression interpreter --> <!-- Cron expression interpreter -->
<dependency> <dependency>
<groupId>ch.eitchnet</groupId> <groupId>ch.eitchnet</groupId>

10
pandalib-core/src/main/java/fr/pandacube/lib/core/backup/BackupCleaner.java
View File

@ -1,8 +1,8 @@
package fr.pandacube.lib.core.backup; package fr.pandacube.lib.core.backup;
import fr.pandacube.lib.chat.Chat; import fr.pandacube.lib.chat.Chat;
import fr.pandacube.lib.chat.LegacyChatFormat;
import fr.pandacube.lib.util.log.Log; import fr.pandacube.lib.util.log.Log;
import net.md_5.bungee.api.ChatColor;
import java.io.File; import java.io.File;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@ -107,14 +107,14 @@ public abstract class BackupCleaner implements UnaryOperator<TreeSet<LocalDateTi
if (files == null) if (files == null)
return; return;
Log.info("[Backup] Cleaning up backup directory " + LegacyChatFormat.GRAY + compressDisplayName + LegacyChatFormat.RESET + "..."); Log.info("[Backup] Cleaning up backup directory " + ChatColor.GRAY + compressDisplayName + ChatColor.RESET + "...");
TreeMap<LocalDateTime, File> datedFiles = new TreeMap<>(); TreeMap<LocalDateTime, File> datedFiles = new TreeMap<>();
for (String filename : files) { for (String filename : files) {
File file = new File(archiveDir, filename); File file = new File(archiveDir, filename);
if (!filename.matches("\\d{8}-\\d{6}\\.zip")) { if (!filename.matches("\\d{8}-\\d{6}\\.zip")) {
Log.warning("[Backup] " + LegacyChatFormat.GRAY + compressDisplayName + LegacyChatFormat.RESET + " Invalid file in backup directory: " + filename); Log.warning("[Backup] " + ChatColor.GRAY + compressDisplayName + ChatColor.RESET + " Invalid file in backup directory: " + filename);
continue; continue;
} }
@ -123,7 +123,7 @@ public abstract class BackupCleaner implements UnaryOperator<TreeSet<LocalDateTi
try { try {
ldt = LocalDateTime.parse(dateTimeStr, BackupProcess.dateFileNameFormatter); ldt = LocalDateTime.parse(dateTimeStr, BackupProcess.dateFileNameFormatter);
} catch (DateTimeParseException e) { } catch (DateTimeParseException e) {
Log.warning("[Backup] " + LegacyChatFormat.GRAY + compressDisplayName + LegacyChatFormat.RESET + " Unable to parse file name to a date-time: " + filename, e); Log.warning("[Backup] " + ChatColor.GRAY + compressDisplayName + ChatColor.RESET + " Unable to parse file name to a date-time: " + filename, e);
continue; continue;
} }
@ -156,7 +156,7 @@ public abstract class BackupCleaner implements UnaryOperator<TreeSet<LocalDateTi
if (testOnly || oneDeleted) if (testOnly || oneDeleted)
Log.warning(c.getLegacyText()); Log.warning(c.getLegacyText());
Log.info("[Backup] Backup directory " + LegacyChatFormat.GRAY + compressDisplayName + LegacyChatFormat.RESET + " cleaned."); Log.info("[Backup] Backup directory " + ChatColor.GRAY + compressDisplayName + ChatColor.RESET + " cleaned.");
} }

12
pandalib-core/src/main/java/fr/pandacube/lib/core/backup/BackupProcess.java
View File

@ -1,10 +1,10 @@
package fr.pandacube.lib.core.backup; package fr.pandacube.lib.core.backup;
import fc.cron.CronExpression; import fc.cron.CronExpression;
import fr.pandacube.lib.chat.LegacyChatFormat;
import fr.pandacube.lib.core.cron.CronScheduler; import fr.pandacube.lib.core.cron.CronScheduler;
import fr.pandacube.lib.util.FileUtils; import fr.pandacube.lib.util.FileUtils;
import fr.pandacube.lib.util.log.Log; import fr.pandacube.lib.util.log.Log;
import net.md_5.bungee.api.ChatColor;
import java.io.File; import java.io.File;
import java.text.DateFormat; import java.text.DateFormat;
@ -209,7 +209,7 @@ public abstract class BackupProcess implements Comparable<BackupProcess>, Runnab
File sourceDir = getSourceDir(); File sourceDir = getSourceDir();
if (!sourceDir.exists()) { if (!sourceDir.exists()) {
Log.warning("[Backup] Unable to compress " + LegacyChatFormat.GRAY + getDisplayName() + LegacyChatFormat.RESET + ": source directory " + sourceDir + " doesn't exist"); Log.warning("[Backup] Unable to compress " + ChatColor.GRAY + getDisplayName() + ChatColor.RESET + ": source directory " + sourceDir + " doesn't exist");
return; return;
} }
@ -219,7 +219,7 @@ public abstract class BackupProcess implements Comparable<BackupProcess>, Runnab
onBackupStart(); onBackupStart();
new Thread(() -> { new Thread(() -> {
Log.info("[Backup] Starting for " + LegacyChatFormat.GRAY + getDisplayName() + LegacyChatFormat.RESET + " ..."); Log.info("[Backup] Starting for " + ChatColor.GRAY + getDisplayName() + ChatColor.RESET + " ...");
compressor = new ZipCompressor(sourceDir, target, 9, filter); compressor = new ZipCompressor(sourceDir, target, 9, filter);
@ -229,7 +229,7 @@ public abstract class BackupProcess implements Comparable<BackupProcess>, Runnab
success = true; success = true;
Log.info("[Backup] Finished for " + LegacyChatFormat.GRAY + getDisplayName() + LegacyChatFormat.RESET); Log.info("[Backup] Finished for " + ChatColor.GRAY + getDisplayName() + ChatColor.RESET);
try { try {
BackupCleaner cleaner = getBackupCleaner(); BackupCleaner cleaner = getBackupCleaner();
@ -267,7 +267,7 @@ public abstract class BackupProcess implements Comparable<BackupProcess>, Runnab
* Logs the scheduling status of this backup process. * Logs the scheduling status of this backup process.
*/ */
public void displayNextSchedule() { public void displayNextSchedule() {
Log.info("[Backup] " + LegacyChatFormat.GRAY + getDisplayName() + LegacyChatFormat.RESET + " next backup on " Log.info("[Backup] " + ChatColor.GRAY + getDisplayName() + ChatColor.RESET + " next backup on "
+ DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.LONG).format(new Date(getNext()))); + DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.LONG).format(new Date(getNext())));
} }
@ -297,7 +297,7 @@ public abstract class BackupProcess implements Comparable<BackupProcess>, Runnab
public void logProgress() { public void logProgress() {
if (compressor == null) if (compressor == null)
return; return;
Log.info("[Backup] " + LegacyChatFormat.GRAY + getDisplayName() + LegacyChatFormat.RESET + ": " + compressor.getState().getLegacyText()); Log.info("[Backup] " + ChatColor.GRAY + getDisplayName() + ChatColor.RESET + ": " + compressor.getState().getLegacyText());
} }

8
pandalib-core/src/main/java/fr/pandacube/lib/core/backup/RotatedLogsBackupProcess.java
View File

@ -1,8 +1,8 @@
package fr.pandacube.lib.core.backup; package fr.pandacube.lib.core.backup;
import com.google.common.io.Files; import com.google.common.io.Files;
import fr.pandacube.lib.chat.LegacyChatFormat;
import fr.pandacube.lib.util.log.Log; import fr.pandacube.lib.util.log.Log;
import net.md_5.bungee.api.ChatColor;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@ -53,7 +53,7 @@ public class RotatedLogsBackupProcess extends BackupProcess {
if (!getSourceDir().isDirectory()) if (!getSourceDir().isDirectory())
return; return;
Log.info("[Backup] Starting for " + LegacyChatFormat.GRAY + getDisplayName() + LegacyChatFormat.RESET + " ..."); Log.info("[Backup] Starting for " + ChatColor.GRAY + getDisplayName() + ChatColor.RESET + " ...");
try { try {
// wait a little after the log message above, in case the log file rotation has to be performed. // wait a little after the log message above, in case the log file rotation has to be performed.
@ -82,9 +82,9 @@ public class RotatedLogsBackupProcess extends BackupProcess {
success = true; success = true;
Log.info("[Backup] Finished for " + LegacyChatFormat.GRAY + getDisplayName() + LegacyChatFormat.RESET); Log.info("[Backup] Finished for " + ChatColor.GRAY + getDisplayName() + ChatColor.RESET);
} catch (Exception e) { } catch (Exception e) {
Log.severe("[Backup] Failed for : " + LegacyChatFormat.GRAY + getDisplayName() + LegacyChatFormat.RESET, e); Log.severe("[Backup] Failed for : " + ChatColor.GRAY + getDisplayName() + ChatColor.RESET, e);
} finally { } finally {
onBackupEnd(success); onBackupEnd(success);

6
pandalib-paper/pom.xml
View File

@ -71,12 +71,6 @@
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>fr.pandacube.lib</groupId>
<artifactId>pandalib-bungee-chat</artifactId>
<version>${project.version}</version>
</dependency>
<dependency> <dependency>
<groupId>fr.pandacube.lib</groupId> <groupId>fr.pandacube.lib</groupId>
<artifactId>pandalib-paper-permissions</artifactId> <artifactId>pandalib-paper-permissions</artifactId>

2
pandalib-paper/src/main/java/fr/pandacube/lib/paper/gui/GUIInventory.java
View File

@ -38,7 +38,7 @@ public class GUIInventory implements Listener {
if (title == null) if (title == null)
inv = Bukkit.createInventory(null, nbLines * 9); inv = Bukkit.createInventory(null, nbLines * 9);
else else
inv = Bukkit.createInventory(null, nbLines * 9, title.get()); inv = Bukkit.createInventory(null, nbLines * 9, title.getAdv());
setCloseEvent(closeEventAction); setCloseEvent(closeEventAction);

15
pandalib-paper/src/main/java/fr/pandacube/lib/paper/modules/PerformanceAnalysisManager.java
View File

@ -4,6 +4,7 @@ import com.destroystokyo.paper.event.server.ServerTickEndEvent;
import com.destroystokyo.paper.event.server.ServerTickStartEvent; import com.destroystokyo.paper.event.server.ServerTickStartEvent;
import fr.pandacube.lib.chat.Chat; import fr.pandacube.lib.chat.Chat;
import fr.pandacube.lib.chat.ChatColorGradient; import fr.pandacube.lib.chat.ChatColorGradient;
import fr.pandacube.lib.chat.ChatColorUtil;
import fr.pandacube.lib.chat.ChatConfig.PandaTheme; import fr.pandacube.lib.chat.ChatConfig.PandaTheme;
import fr.pandacube.lib.paper.PandaLibPaper; import fr.pandacube.lib.paper.PandaLibPaper;
import fr.pandacube.lib.paper.players.PaperOffPlayer; import fr.pandacube.lib.paper.players.PaperOffPlayer;
@ -12,16 +13,16 @@ import fr.pandacube.lib.paper.scheduler.SchedulerUtil;
import fr.pandacube.lib.paper.util.AutoUpdatedBossBar; import fr.pandacube.lib.paper.util.AutoUpdatedBossBar;
import fr.pandacube.lib.paper.util.AutoUpdatedBossBar.BarUpdater; import fr.pandacube.lib.paper.util.AutoUpdatedBossBar.BarUpdater;
import fr.pandacube.lib.players.standalone.AbstractPlayerManager; import fr.pandacube.lib.players.standalone.AbstractPlayerManager;
import fr.pandacube.lib.util.log.Log;
import fr.pandacube.lib.util.MemoryUtil; import fr.pandacube.lib.util.MemoryUtil;
import fr.pandacube.lib.util.MemoryUtil.MemoryUnit; import fr.pandacube.lib.util.MemoryUtil.MemoryUnit;
import fr.pandacube.lib.util.TimeUtil; import fr.pandacube.lib.util.TimeUtil;
import fr.pandacube.lib.util.log.Log;
import net.kyori.adventure.bossbar.BossBar; import net.kyori.adventure.bossbar.BossBar;
import net.kyori.adventure.bossbar.BossBar.Color; import net.kyori.adventure.bossbar.BossBar.Color;
import net.kyori.adventure.bossbar.BossBar.Overlay; import net.kyori.adventure.bossbar.BossBar.Overlay;
import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.NamedTextColor;
import net.kyori.adventure.text.format.TextColor; import net.kyori.adventure.text.format.TextColor;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import net.md_5.bungee.api.ChatColor;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.ConsoleCommandSender;
@ -298,17 +299,15 @@ public class PerformanceAnalysisManager implements Listener {
// keep the legacy text when generating the bar to save space when converting to component // keep the legacy text when generating the bar to save space when converting to component
StringBuilder s = new StringBuilder(); StringBuilder s = new StringBuilder();
TextColor prevC = null; ChatColor prevC = ChatColor.RESET;
for (int i = 58; i >= 0; i--) { for (int i = 58; i >= 0; i--) {
int t = tpsHistory[i]; int t = tpsHistory[i];
TextColor newC = tps1sGradient.pickColorAt(t); ChatColor newC = ChatColorUtil.toBungee(tps1sGradient.pickColorAt(t));
if (!newC.equals(prevC)) { if (!newC.equals(prevC)) {
s.append(text("|").color(newC).getLegacyText()); s.append(newC);
prevC = newC; prevC = newC;
} }
else { s.append("|");
s.append("|");
}
} }

4
pandalib-paper/src/main/java/fr/pandacube/lib/paper/util/ItemStackBuilder.java
View File

@ -113,7 +113,7 @@ public class ItemStackBuilder {
public ItemStackBuilder lore(List<? extends ComponentLike> lore) { public ItemStackBuilder lore(List<? extends ComponentLike> lore) {
if (lore != null) { if (lore != null) {
return rawLore(lore.stream() return rawLore(lore.stream()
.map(line -> Chat.italicFalseIfNotSet(chatComponent(line)).get()) .map(line -> Chat.italicFalseIfNotSet(chatComponent(line)).getAdv())
.toList()); .toList());
} }
else else
@ -128,7 +128,7 @@ public class ItemStackBuilder {
Streams.concat( Streams.concat(
baseLore.stream(), baseLore.stream(),
lores.stream() lores.stream()
.map(line -> Chat.italicFalseIfNotSet(chatComponent(line)).get()) .map(line -> Chat.italicFalseIfNotSet(chatComponent(line)).getAdv())
) )
.toList()); .toList());
} }

8
pandalib-paper/src/main/java/fr/pandacube/lib/paper/util/ScoreboardUtil.java
View File

@ -116,9 +116,9 @@ public class ScoreboardUtil {
public static void updateScoreboardSidebar(Scoreboard scBrd, Chat title, Chat[] lines) { public static void updateScoreboardSidebar(Scoreboard scBrd, Chat title, Chat[] lines) {
Component[] cmpLines = new Component[lines.length]; Component[] cmpLines = new Component[lines.length];
for (int i = 0; i < lines.length; i++) { for (int i = 0; i < lines.length; i++) {
cmpLines[i] = lines[i].get(); cmpLines[i] = lines[i].getAdv();
} }
updateScoreboardSidebar(scBrd, title.get(), cmpLines); updateScoreboardSidebar(scBrd, title.getAdv(), cmpLines);
} }
@ -135,9 +135,9 @@ public class ScoreboardUtil {
public static void updateScoreboardSidebar(Scoreboard scBrd, Chat title, List<Chat> lines) { public static void updateScoreboardSidebar(Scoreboard scBrd, Chat title, List<Chat> lines) {
Component[] cmpLines = new Component[lines.size()]; Component[] cmpLines = new Component[lines.size()];
for (int i = 0; i < cmpLines.length; i++) { for (int i = 0; i < cmpLines.length; i++) {
cmpLines[i] = lines.get(i).get(); cmpLines[i] = lines.get(i).getAdv();
} }
updateScoreboardSidebar(scBrd, title.get(), cmpLines); updateScoreboardSidebar(scBrd, title.getAdv(), cmpLines);
} }

8
pandalib-paper/src/main/java/fr/pandacube/lib/paper/util/Skull.java
View File

@ -99,10 +99,10 @@ public enum Skull {
boolean b = meta.setOwner(name); boolean b = meta.setOwner(name);
if (displayName != null) if (displayName != null)
meta.displayName(displayName.get()); meta.displayName(displayName.getAdv());
if (lore != null) if (lore != null)
meta.lore(lore.stream().map(Chat::get).collect(Collectors.toList())); meta.lore(lore.stream().map(Chat::getAdv).collect(Collectors.toList()));
itemStack.setItemMeta(meta); itemStack.setItemMeta(meta);
return itemStack; return itemStack;
@ -172,10 +172,10 @@ public enum Skull {
headMeta.setPlayerProfile(profile); headMeta.setPlayerProfile(profile);
if (displayName != null) if (displayName != null)
headMeta.displayName(displayName.get()); headMeta.displayName(displayName.getAdv());
if (lore != null) if (lore != null)
headMeta.lore(lore.stream().map(Chat::get).collect(Collectors.toList())); headMeta.lore(lore.stream().map(Chat::getAdv).collect(Collectors.toList()));
head.setItemMeta(headMeta); head.setItemMeta(headMeta);

6
pandalib-permissions/pom.xml
View File

@ -37,12 +37,6 @@
<artifactId>javaluator</artifactId> <artifactId>javaluator</artifactId>
<version>3.0.3</version> <version>3.0.3</version>
</dependency> </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
</dependencies> </dependencies>
<build> <build>

36
pandalib-permissions/src/main/java/fr/pandacube/lib/permissions/PermissionsResolver.java
View File

@ -1,18 +1,5 @@
package fr.pandacube.lib.permissions; package fr.pandacube.lib.permissions;
import com.google.common.base.Preconditions;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import fr.pandacube.lib.chat.Chat;
import fr.pandacube.lib.chat.ChatTreeNode;
import fr.pandacube.lib.chat.LegacyChatFormat;
import fr.pandacube.lib.permissions.PermissionsCachedBackendReader.CachedEntity;
import fr.pandacube.lib.permissions.PermissionsCachedBackendReader.CachedGroup;
import fr.pandacube.lib.permissions.PermissionsCachedBackendReader.CachedPlayer;
import fr.pandacube.lib.permissions.SQLPermissions.EntityType;
import fr.pandacube.lib.util.log.Log;
import net.kyori.adventure.text.format.NamedTextColor;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
@ -25,6 +12,19 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.google.common.base.Preconditions;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import net.md_5.bungee.api.ChatColor;
import fr.pandacube.lib.chat.Chat;
import fr.pandacube.lib.chat.ChatTreeNode;
import fr.pandacube.lib.permissions.PermissionsCachedBackendReader.CachedEntity;
import fr.pandacube.lib.permissions.PermissionsCachedBackendReader.CachedGroup;
import fr.pandacube.lib.permissions.PermissionsCachedBackendReader.CachedPlayer;
import fr.pandacube.lib.permissions.SQLPermissions.EntityType;
import fr.pandacube.lib.util.log.Log;
/* package */ class PermissionsResolver { /* package */ class PermissionsResolver {
private final PermissionsCachedBackendReader backendReader; private final PermissionsCachedBackendReader backendReader;
@ -105,7 +105,7 @@ import java.util.stream.Collectors;
Log.warning("For data " + dataType + ":\n" Log.warning("For data " + dataType + ":\n"
+ resolutionResult.toDisplayTreeNode().render(true).stream() + resolutionResult.toDisplayTreeNode().render(true).stream()
.map(Chat::getLegacyText) .map(Chat::getLegacyText)
.collect(Collectors.joining(LegacyChatFormat.RESET + "\n"))); .collect(Collectors.joining(ChatColor.RESET + "\n")));
} }
return resolutionResult.result != null ? resolutionResult.result : ""; return resolutionResult.result != null ? resolutionResult.result : "";
@ -167,7 +167,7 @@ import java.util.stream.Collectors;
if (result == null) if (result == null)
c.then(Chat.text(" (non défini)").gray()); c.then(Chat.text(" (non défini)").gray());
else else
c.thenLegacyText(" \"" + LegacyChatFormat.RESET + result + LegacyChatFormat.RESET + "\""); c.thenLegacyText(" \"" + ChatColor.RESET + result + ChatColor.RESET + "\"");
if (conflictMessage != null) if (conflictMessage != null)
c.thenFailure(" " + conflictMessage); c.thenFailure(" " + conflictMessage);
ChatTreeNode node = new ChatTreeNode(c); ChatTreeNode node = new ChatTreeNode(c);
@ -307,7 +307,7 @@ import java.util.stream.Collectors;
Log.warning("For permission " + permission + ":\n" Log.warning("For permission " + permission + ":\n"
+ resolutionResult.toDisplayTreeNode().render(true).stream() + resolutionResult.toDisplayTreeNode().render(true).stream()
.map(Chat::getLegacyText) .map(Chat::getLegacyText)
.collect(Collectors.joining(LegacyChatFormat.RESET + "\n"))); .collect(Collectors.joining(ChatColor.RESET + "\n")));
} }
return resolutionResult.result; return resolutionResult.result;
@ -487,7 +487,7 @@ import java.util.stream.Collectors;
Chat c = Chat.chat() Chat c = Chat.chat()
.then(result == PermState.UNDEFINED ? Chat.dataText("■") : result == PermState.GRANTED ? Chat.successText("✔") : Chat.failureText("✘")) .then(result == PermState.UNDEFINED ? Chat.dataText("■") : result == PermState.GRANTED ? Chat.successText("✔") : Chat.failureText("✘"))
.then(Chat.text(entity instanceof CachedPlayer cp ? Permissions.playerNameGetter.apply(cp.playerId) : entity.name) .then(Chat.text(entity instanceof CachedPlayer cp ? Permissions.playerNameGetter.apply(cp.playerId) : entity.name)
.color(entity instanceof CachedPlayer ? NamedTextColor.GOLD : NamedTextColor.DARK_AQUA) .color(entity instanceof CachedPlayer ? ChatColor.GOLD : ChatColor.DARK_AQUA)
); );
if (server != null) if (server != null)
c.thenData(" s=" + server); c.thenData(" s=" + server);
@ -523,7 +523,7 @@ import java.util.stream.Collectors;
public ChatTreeNode toDisplayTreeNode() { public ChatTreeNode toDisplayTreeNode() {
return new ChatTreeNode(Chat.chat() return new ChatTreeNode(Chat.chat()
.then(result ? Chat.successText("✔") : Chat.failureText("✘")) .then(result ? Chat.successText("✔") : Chat.failureText("✘"))
.then(Chat.text(permission).color(type == PermType.WILDCARD ? NamedTextColor.YELLOW : type == PermType.SPECIAL ? NamedTextColor.LIGHT_PURPLE : NamedTextColor.WHITE))); .then(Chat.text(permission).color(type == PermType.WILDCARD ? ChatColor.YELLOW : type == PermType.SPECIAL ? ChatColor.LIGHT_PURPLE : ChatColor.WHITE)));
} }
} }

11
pandalib-players/pom.xml
View File

@ -21,11 +21,12 @@
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <!-- <dependency>
<groupId>com.google.guava</groupId> <groupId>fr.pandacube.lib</groupId>
<artifactId>guava</artifactId> <artifactId>pandalib-util</artifactId>
<version>${guava.version}</version> <version>${project.version}</version>
</dependency> <scope>provided</scope>
</dependency> -->
</dependencies> </dependencies>

31
pandalib-reflect/pom.xml
View File

@ -25,9 +25,9 @@
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.plumelib</groupId> <groupId>com.google.guava</groupId>
<artifactId>hashmap-util</artifactId> <artifactId>guava</artifactId>
<version>0.0.1</version> <version>32.1.2-jre</version> <!-- Match the version imported by Paper API/BungeeCord API if possible -->
</dependency> </dependency>
</dependencies> </dependencies>
@ -47,7 +47,6 @@
<artifactSet> <artifactSet>
<includes> <includes>
<include>io.github.classgraph:classgraph</include> <include>io.github.classgraph:classgraph</include>
<include>org.plumelib:*</include>
</includes> </includes>
</artifactSet> </artifactSet>
<filters> <filters>
@ -61,26 +60,6 @@
<exclude>META-INF/MANIFEST.MF</exclude> <exclude>META-INF/MANIFEST.MF</exclude>
</excludes> </excludes>
</filter> </filter>
<filter>
<artifact>org.plumelib:hashmap-util</artifact>
<excludes>
<exclude>module-info.class</exclude>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
<exclude>META-INF/MANIFEST.MF</exclude>
</excludes>
</filter>
<filter>
<artifact>org.plumelib:reflection-util</artifact>
<excludes>
<exclude>module-info.class</exclude>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
<exclude>META-INF/MANIFEST.MF</exclude>
</excludes>
</filter>
</filters> </filters>
<relocations> <relocations>
<relocation> <relocation>
@ -91,10 +70,6 @@
<pattern>nonapi.io.github.classgraph</pattern> <pattern>nonapi.io.github.classgraph</pattern>
<shadedPattern>fr.pandacube.lib.reflect.shaded.classgraph.nonapi</shadedPattern> <shadedPattern>fr.pandacube.lib.reflect.shaded.classgraph.nonapi</shadedPattern>
</relocation> </relocation>
<relocation>
<pattern>org.plumelib</pattern>
<shadedPattern>fr.pandacube.lib.reflect.shaded.plumelib</shadedPattern>
</relocation>
</relocations> </relocations>
</configuration> </configuration>
</execution> </execution>

8
pandalib-reflect/src/main/java/fr/pandacube/lib/reflect/wrapper/ReflectWrapper.java
View File

@ -1,7 +1,8 @@
package fr.pandacube.lib.reflect.wrapper; package fr.pandacube.lib.reflect.wrapper;
import com.google.common.collect.MapMaker;
import fr.pandacube.lib.reflect.ReflectConstructor; import fr.pandacube.lib.reflect.ReflectConstructor;
import org.plumelib.util.WeakIdentityHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -16,10 +17,7 @@ import static fr.pandacube.lib.util.ThrowableUtil.wrapEx;
public abstract class ReflectWrapper implements ReflectWrapperI { public abstract class ReflectWrapper implements ReflectWrapperI {
private static final Map<Object, ReflectWrapperI> objectWrapperCache = new WeakIdentityHashMap<>(); private static final Map<Object, ReflectWrapperI> objectWrapperCache = new MapMaker().weakKeys().makeMap();
/*
* WeakHashMap is not suitable because we want the keys to be compared by reference (==) and not by the .equals() method.
*/
/** /**
* Unwraps the object from the provided reflect wrapper. * Unwraps the object from the provided reflect wrapper.

3
pom.xml
View File

@ -58,13 +58,10 @@
<bungeecord.version>1.21-R0.1-SNAPSHOT</bungeecord.version> <bungeecord.version>1.21-R0.1-SNAPSHOT</bungeecord.version>
<paper.version>1.20.6-R0.1</paper.version> <paper.version>1.20.6-R0.1</paper.version>
<mc.version>1.20.6</mc.version> <mc.version>1.20.6</mc.version>
<guava.version>32.1.2-jre</guava.version> <!-- Match the version imported by Paper API/BungeeCord API if possible -->
</properties> </properties>
<modules> <modules>
<module>pandalib-bungee</module> <module>pandalib-bungee</module>
<module>pandalib-bungee-chat</module>
<module>pandalib-bungee-permissions</module> <module>pandalib-bungee-permissions</module>
<module>pandalib-chat</module> <module>pandalib-chat</module>
<module>pandalib-cli</module> <module>pandalib-cli</module>