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

Do not use bungeecord-chat as a dependency for pandalib-chat anymore

Browse Source
This commit is contained in:
Marc Baloup
2024-07-27 23:49:40 +02:00
parent 4be37945cb
commit 36eb1227cf
28 changed files with 402 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pandalib-paper/pom.xml
View File

@@ -71,6 +71,12 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>fr.pandacube.lib</groupId>
<artifactId>pandalib-bungee-chat</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>fr.pandacube.lib</groupId>
<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)
inv = Bukkit.createInventory(null, nbLines * 9);
else
inv = Bukkit.createInventory(null, nbLines * 9, title.getAdv());
inv = Bukkit.createInventory(null, nbLines * 9, title.get());
setCloseEvent(closeEventAction);

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

@@ -4,7 +4,6 @@ import com.destroystokyo.paper.event.server.ServerTickEndEvent;
import com.destroystokyo.paper.event.server.ServerTickStartEvent;
import fr.pandacube.lib.chat.Chat;
import fr.pandacube.lib.chat.ChatColorGradient;
import fr.pandacube.lib.chat.ChatColorUtil;
import fr.pandacube.lib.chat.ChatConfig.PandaTheme;
import fr.pandacube.lib.paper.PandaLibPaper;
import fr.pandacube.lib.paper.players.PaperOffPlayer;
@@ -13,16 +12,16 @@ import fr.pandacube.lib.paper.scheduler.SchedulerUtil;
import fr.pandacube.lib.paper.util.AutoUpdatedBossBar;
import fr.pandacube.lib.paper.util.AutoUpdatedBossBar.BarUpdater;
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.MemoryUnit;
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.Color;
import net.kyori.adventure.bossbar.BossBar.Overlay;
import net.kyori.adventure.text.format.NamedTextColor;
import net.kyori.adventure.text.format.TextColor;
import net.md_5.bungee.api.ChatColor;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender;
@@ -299,15 +298,17 @@ public class PerformanceAnalysisManager implements Listener {
// keep the legacy text when generating the bar to save space when converting to component
StringBuilder s = new StringBuilder();
ChatColor prevC = ChatColor.RESET;
TextColor prevC = null;
for (int i = 58; i >= 0; i--) {
int t = tpsHistory[i];
ChatColor newC = ChatColorUtil.toBungee(tps1sGradient.pickColorAt(t));
TextColor newC = tps1sGradient.pickColorAt(t);
if (!newC.equals(prevC)) {
s.append(newC);
s.append(text("|").color(newC).getLegacyText());
prevC = newC;
}
s.append("|");
else {
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) {
if (lore != null) {
return rawLore(lore.stream()
.map(line -> Chat.italicFalseIfNotSet(chatComponent(line)).getAdv())
.map(line -> Chat.italicFalseIfNotSet(chatComponent(line)).get())
.toList());
}
else
@@ -128,7 +128,7 @@ public class ItemStackBuilder {
Streams.concat(
baseLore.stream(),
lores.stream()
.map(line -> Chat.italicFalseIfNotSet(chatComponent(line)).getAdv())
.map(line -> Chat.italicFalseIfNotSet(chatComponent(line)).get())
)
.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) {
Component[] cmpLines = new Component[lines.length];
for (int i = 0; i < lines.length; i++) {
cmpLines[i] = lines[i].getAdv();
cmpLines[i] = lines[i].get();
}
updateScoreboardSidebar(scBrd, title.getAdv(), cmpLines);
updateScoreboardSidebar(scBrd, title.get(), cmpLines);
}
@@ -135,9 +135,9 @@ public class ScoreboardUtil {
public static void updateScoreboardSidebar(Scoreboard scBrd, Chat title, List<Chat> lines) {
Component[] cmpLines = new Component[lines.size()];
for (int i = 0; i < cmpLines.length; i++) {
cmpLines[i] = lines.get(i).getAdv();
cmpLines[i] = lines.get(i).get();
}
updateScoreboardSidebar(scBrd, title.getAdv(), cmpLines);
updateScoreboardSidebar(scBrd, title.get(), 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);
if (displayName != null)
meta.displayName(displayName.getAdv());
meta.displayName(displayName.get());
if (lore != null)
meta.lore(lore.stream().map(Chat::getAdv).collect(Collectors.toList()));
meta.lore(lore.stream().map(Chat::get).collect(Collectors.toList()));
itemStack.setItemMeta(meta);
return itemStack;
@@ -172,10 +172,10 @@ public enum Skull {
headMeta.setPlayerProfile(profile);
if (displayName != null)
headMeta.displayName(displayName.getAdv());
headMeta.displayName(displayName.get());
if (lore != null)
headMeta.lore(lore.stream().map(Chat::getAdv).collect(Collectors.toList()));
headMeta.lore(lore.stream().map(Chat::get).collect(Collectors.toList()));
head.setItemMeta(headMeta);