Skip to content

Commit

Permalink
Update to PGM v0.12 fixing tab entry
Browse files Browse the repository at this point in the history
  • Loading branch information
Pugzy authored Apr 19, 2021
1 parent b5767d6 commit 616c55d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 21 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<dependency>
<groupId>tc.oc.pgm</groupId>
<artifactId>core</artifactId>
<version>0.11-SNAPSHOT</version>
<version>0.12-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
29 changes: 9 additions & 20 deletions src/main/java/rip/bolt/ingame/utils/RankedTeamTabEntry.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,18 @@

import dev.pgm.events.Tournament;
import dev.pgm.events.team.TournamentTeam;
import java.util.Arrays;
import java.util.Optional;
import javax.annotation.Nullable;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.TextComponent;
import rip.bolt.ingame.api.definitions.Team;
import tc.oc.pgm.lib.net.kyori.adventure.text.Component;
import tc.oc.pgm.lib.net.kyori.adventure.text.format.NamedTextColor;
import tc.oc.pgm.lib.net.kyori.adventure.text.format.TextDecoration;
import tc.oc.pgm.tablist.TeamTabEntry;
import tc.oc.pgm.util.tablist.TabView;

public class RankedTeamTabEntry extends TeamTabEntry {

@Nullable private BaseComponent mmrComponent;
@Nullable private Component mmrComponent;
private tc.oc.pgm.teams.Team team;

public RankedTeamTabEntry(tc.oc.pgm.teams.Team team) {
Expand All @@ -24,33 +23,23 @@ public RankedTeamTabEntry(tc.oc.pgm.teams.Team team) {
}

@Override
public BaseComponent[] getContent(TabView view) {
BaseComponent[] base = super.getContent(view);
public Component getContent(TabView view) {
Component base = super.getContent(view);

if (mmrComponent == null) mmrComponent = getMmrComponent();

if (mmrComponent != null) {
base = Arrays.copyOf(base, base.length + 1);
base[base.length - 1] = mmrComponent;
}
if (mmrComponent != null) return base.append(mmrComponent);

return base;
}

private BaseComponent getMmrComponent() {
private Component getMmrComponent() {
Optional<TournamentTeam> tournamentTeam =
Tournament.get().getTeamManager().tournamentTeam(team);

return tournamentTeam
.filter(t -> t instanceof Team)
.map(t -> (Team) t)
.map(t -> new TextComponent(" " + t.getMmr()))
.map(
c -> {
c.setColor(ChatColor.GRAY);
c.setItalic(true);
return c;
})
.map(t -> Component.text(" " + t.getMmr(), NamedTextColor.GRAY, TextDecoration.ITALIC))
.orElse(null);
}
}

0 comments on commit 616c55d

Please sign in to comment.