Skip to content

Fix sidebar #547

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.

Sign up for GitHub

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

Merged
Nandi0813 merged 23 commits into from
May 19, 2026
Merged

Fix sidebar #547

Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
da1639f
fix: fix profile worldtime default value and handle offline players i…
lokspel May 18, 2026
8f035e8
Merge branch 'ZoneDevelopement:dev' into dev
lokspel May 18, 2026
6dcf467
fix: resolve party chat permission error caused by missing break
lokspel May 18, 2026
0490640
Merge remote-tracking branch 'origin/dev' into dev
lokspel May 18, 2026
8711fed
Merge branch 'ZoneDevelopement:dev' into dev
lokspel May 18, 2026
1fa95c3
fix: not-won round symbols rendering as filled on scoreboard
lokspel May 18, 2026
2ccbd30
Prevent throwing ender peal if cooldown is 0.0 in the start of the match
lokspel May 18, 2026
5c61583
Merge branch 'ZoneDevelopement:dev' into dev
lokspel May 18, 2026
4dfc461
Merge branch 'ZoneDevelopement:dev' into dev
lokspel May 18, 2026
4c179ff
fix: shade MariaDB driver to prevent classpath conflict with other pl…
lokspel May 18, 2026
7bfda7e
fix: remove players from live match on rejoin if they disconnected du…
lokspel May 18, 2026
f8a1a8a
Refactor Profile
lokspel May 18, 2026
defbc9e
Merge branch 'ZoneDevelopement:dev' into dev
lokspel May 18, 2026
9fe5265
Refactor Profile
lokspel May 18, 2026
bc4b1db
Merge remote-tracking branch 'origin/dev' into dev
lokspel May 18, 2026
8c9bcd0
Fix for https://github.com/ZoneDevelopement/ZonePractice-Pro/issues/536
lokspel May 18, 2026
14a0504
Merge branch 'ZoneDevelopement:dev' into dev
lokspel May 19, 2026
06eff90
Full MiniMessage support
lokspel May 19, 2026
b7e11c5
hex/legacy color code support
lokspel May 19, 2026
0d4b72e
add missing ladder
lokspel May 19, 2026
e984f2f
Merge branch 'ZoneDevelopement:dev' into dev
lokspel May 19, 2026
5fe759e
Fix sidebar
lokspel May 19, 2026
3469e7b
Merge branch 'ZoneDevelopement:dev' into dev
lokspel May 19, 2026
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
15 changes: 8 additions & 7 deletions core/src/main/java/dev/nandi0813/practice/manager/sidebar/adapter/AdapterUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import dev.nandi0813.practice.manager.profile.Profile;
import dev.nandi0813.practice.manager.profile.ProfileManager;
import dev.nandi0813.practice.manager.sidebar.SidebarManager;
import dev.nandi0813.practice.util.Common;
import dev.nandi0813.practice.util.NameFormatUtil;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.TextReplacementConfig;
Expand Down Expand Up @@ -79,8 +80,8 @@ private static Component replaceCommonMatchPlaceholders(Component line, Match ma
.replaceText(replace("%roundDuration%", roundDuration))
.replaceText(replace("%matchDuration%", match.getFormattedTime()))
.replaceText(replace("%ping%", String.valueOf(PlayerUtil.getPing(player))))
.replaceText(replace("%arena%", match.getArena().getDisplayName()))
.replaceText(replace("%ladder%", match.getLadder().getDisplayName()));
.replaceText(replace("%arena%", Common.deserializeMiniMessage(match.getArena().getDisplayName())))
.replaceText(replace("%ladder%", Common.deserializeMiniMessage(match.getLadder().getDisplayName())));
}

/**
Expand Down Expand Up @@ -258,8 +259,8 @@ public static Component replaceFFAPlaceholders(Player player, Component line, FF
.replaceText(replace("%spectators%", String.valueOf(ffa.getSpectators().size())))
.replaceText(replace("%nextReset%", ffa.getBuildRollback() != null ? ffa.getBuildRollback().getFormattedTime() : "N/A"))
.replaceText(replace("%ping%", String.valueOf(PlayerUtil.getPing(player))))
.replaceText(replace("%ladder%", ffa.getPlayers().get(player).getDisplayName()))
.replaceText(replace("%arena%", ffa.getArena().getDisplayName()))
.replaceText(replace("%ladder%", Common.deserializeMiniMessage(ffa.getPlayers().get(player).getDisplayName())))
.replaceText(replace("%arena%", Common.deserializeMiniMessage(ffa.getArena().getDisplayName())))
.replaceText(replace("%kills%", String.valueOf(statistic.getKills())))
.replaceText(replace("%deaths%", String.valueOf(statistic.getDeaths())));
}
Expand All @@ -269,7 +270,7 @@ public static Component replaceFFASpecPlaceholders(Component line, FFA ffa) {
.replaceText(replace("%players%", String.valueOf(ffa.getPlayers().size())))
.replaceText(replace("%spectators%", String.valueOf(ffa.getSpectators().size())))
.replaceText(replace("%nextReset%", ffa.getBuildRollback() != null ? ffa.getBuildRollback().getFormattedTime() : "N/A"))
.replaceText(replace("%arena%", ffa.getArena().getDisplayName()));
.replaceText(replace("%arena%", Common.deserializeMiniMessage(ffa.getArena().getDisplayName())));
}

public static Component replaceMatchSpectatePlaceholders(Component line, Match match) {
Expand All @@ -280,8 +281,8 @@ public static Component replaceMatchSpectatePlaceholders(Component line, Match m
.replaceText(replace("%totalRounds%", String.valueOf(match.getLadder().getRounds())))
.replaceText(replace("%roundDuration%", roundDuration))
.replaceText(replace("%matchDuration%", match.getFormattedTime()))
.replaceText(replace("%arena%", match.getArena().getDisplayName()))
.replaceText(replace("%ladder%", match.getLadder().getDisplayName()));
.replaceText(replace("%arena%", Common.deserializeMiniMessage(match.getArena().getDisplayName())))
.replaceText(replace("%ladder%", Common.deserializeMiniMessage(match.getLadder().getDisplayName())));

// Replace team colors for non-FFA matches
if (!match.getType().equals(MatchType.PARTY_FFA)) {
Expand Down