Skip to content

Commit 6460162

Browse files
AustinLMayesmattarnold98
authored andcommitted
Update to latest PGM
Signed-off-by: Austin L Mayes <me@austinlm.me>
1 parent bdb9ddd commit 6460162

File tree

4 files changed

+21
-16
lines changed

4 files changed

+21
-16
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
<dependency>
2424
<groupId>tc.oc.pgm</groupId>
2525
<artifactId>core</artifactId>
26-
<version>0.10-SNAPSHOT</version>
26+
<version>0.11-SNAPSHOT</version>
2727
<scope>provided</scope>
2828
</dependency>
2929
<dependency>
3030
<groupId>tc.oc.pgm</groupId>
3131
<artifactId>util</artifactId>
32-
<version>0.10-SNAPSHOT</version>
32+
<version>0.11-SNAPSHOT</version>
3333
<scope>provided</scope>
3434
</dependency>
3535
<dependency>

src/main/java/dev/pgm/events/format/rounds/veto/VetoCountdown.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package dev.pgm.events.format.rounds.veto;
22

3+
import static tc.oc.pgm.lib.net.kyori.adventure.text.Component.text;
4+
35
import dev.pgm.events.team.TournamentTeam;
46
import java.time.Duration;
57
import java.util.Optional;
68
import net.md_5.bungee.api.chat.BaseComponent;
79
import tc.oc.pgm.api.match.Match;
810
import tc.oc.pgm.countdowns.MatchCountdown;
9-
import tc.oc.pgm.lib.net.kyori.text.Component;
10-
import tc.oc.pgm.lib.net.kyori.text.TextComponent;
11+
import tc.oc.pgm.lib.net.kyori.adventure.text.Component;
1112

1213
public class VetoCountdown extends MatchCountdown {
1314

@@ -25,7 +26,7 @@ public VetoCountdown(
2526

2627
@Override
2728
protected Component formatText() {
28-
return TextComponent.of(message);
29+
return text(message);
2930
}
3031

3132
@Override

src/main/java/dev/pgm/events/format/shutdown/ShutdownCountdown.java

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
11
package dev.pgm.events.format.shutdown;
22

3+
import static tc.oc.pgm.lib.net.kyori.adventure.key.Key.key;
4+
import static tc.oc.pgm.lib.net.kyori.adventure.text.Component.text;
5+
36
import dev.pgm.events.utils.TimeFormatter;
47
import java.time.Duration;
58
import org.bukkit.Bukkit;
69
import tc.oc.pgm.api.match.Match;
710
import tc.oc.pgm.countdowns.MatchCountdown;
8-
import tc.oc.pgm.lib.net.kyori.text.Component;
9-
import tc.oc.pgm.lib.net.kyori.text.TextComponent;
10-
import tc.oc.pgm.lib.net.kyori.text.format.TextColor;
11-
import tc.oc.pgm.util.chat.Sound;
11+
import tc.oc.pgm.lib.net.kyori.adventure.sound.Sound;
12+
import tc.oc.pgm.lib.net.kyori.adventure.text.Component;
13+
import tc.oc.pgm.lib.net.kyori.adventure.text.format.NamedTextColor;
1214

1315
public class ShutdownCountdown extends MatchCountdown {
1416

15-
protected static final Sound COUNT_SOUND = new Sound("note.pling", 1f, 1.19f);
17+
protected static final Sound COUNT_SOUND =
18+
Sound.sound(key("note.pling"), Sound.Source.MASTER, 1f, 1.19f);
1619

1720
public ShutdownCountdown(Match match) {
1821
super(match);
@@ -32,8 +35,8 @@ protected boolean showTitle() {
3235

3336
@Override
3437
protected Component formatText() {
35-
return TextComponent.of(
36-
"Server will shut down in " + TimeFormatter.seconds(remaining), TextColor.AQUA);
38+
return text(
39+
"Server will shut down in " + TimeFormatter.seconds(remaining), NamedTextColor.AQUA);
3740
}
3841

3942
@Override

src/main/java/dev/pgm/events/listeners/PlayerJoinListen.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package dev.pgm.events.listeners;
22

3+
import static tc.oc.pgm.lib.net.kyori.adventure.text.Component.text;
4+
35
import dev.pgm.events.team.TournamentTeamManager;
46
import java.util.Optional;
57
import org.bukkit.Bukkit;
@@ -13,8 +15,7 @@
1315
import tc.oc.pgm.blitz.BlitzMatchModule;
1416
import tc.oc.pgm.events.PlayerParticipationStartEvent;
1517
import tc.oc.pgm.events.PlayerParticipationStopEvent;
16-
import tc.oc.pgm.lib.net.kyori.text.TextComponent;
17-
import tc.oc.pgm.lib.net.kyori.text.format.TextColor;
18+
import tc.oc.pgm.lib.net.kyori.adventure.text.format.NamedTextColor;
1819
import tc.oc.pgm.teams.Team;
1920

2021
public class PlayerJoinListen implements Listener {
@@ -86,15 +87,15 @@ public void onParticipate(PlayerParticipationStartEvent event) {
8687
if (!isFull(team)) return;
8788
}
8889

89-
event.cancel(TextComponent.of("You may not join in a tournament setting!", TextColor.RED));
90+
event.cancel(text("You may not join in a tournament setting!", NamedTextColor.RED));
9091
}
9192

9293
@EventHandler
9394
public void onLeaveParticipate(PlayerParticipationStopEvent event) {
9495
Optional<Team> playerTeam = manager.playerTeam(event.getPlayer().getId());
9596
// check if the player is on one of the teams
9697
if (playerTeam.isPresent())
97-
event.cancel(TextComponent.of("You may not leave in a tournament setting!", TextColor.RED));
98+
event.cancel(text("You may not leave in a tournament setting!", NamedTextColor.RED));
9899

99100
BlitzMatchModule blitz = event.getMatch().getModule(BlitzMatchModule.class);
100101
if (blitz != null) {

0 commit comments

Comments
 (0)