Skip to content
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

Revert "Update dependencies and use non-deprecated methods" #1224

Merged
merged 1 commit into from
Aug 23, 2023
+21 −15
Merged

Revert "Update dependencies and use non-deprecated methods" #1224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion core/src/main/java/tc/oc/pgm/flag/state/Carried.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ public void tickRunning() {
if (!message.equals(this.lastMessage)) {
this.lastMessage = message;
this.carrier.showTitle(
title(empty(), message, Title.Times.times(Duration.ZERO, fromTicks(5), fromTicks(35))));
title(empty(), message, Title.Times.of(Duration.ZERO, fromTicks(5), fromTicks(35))));
}

ScoreMatchModule smm = this.flag.getMatch().getModule(ScoreMatchModule.class);
Expand Down
3 changes: 1 addition & 2 deletions core/src/main/java/tc/oc/pgm/listeners/MatchAnnouncer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,7 @@ public void onMatchBegin(final MatchStartEvent event) {
match.sendMessage(translatable("broadcast.matchStart", NamedTextColor.GREEN));

Component go = translatable("broadcast.go", NamedTextColor.GREEN);
match.showTitle(
title(go, empty(), Title.Times.times(Duration.ZERO, fromTicks(5), fromTicks(15))));
match.showTitle(title(go, empty(), Title.Times.of(Duration.ZERO, fromTicks(5), fromTicks(15))));

match.playSound(SOUND_MATCH_START);
}
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/tc/oc/pgm/spawns/states/Spawning.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ protected long ticksUntilRespawn() {
}

public void updateTitle() {
Title.Times times = Title.Times.times(Duration.ZERO, fromTicks(3), fromTicks(3));
Title.Times times = Title.Times.of(Duration.ZERO, fromTicks(3), fromTicks(3));

player.showTitle(title(getTitle(false), getSubtitle(false), times));

Expand Down
29 changes: 18 additions & 11 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,17 +93,24 @@
<!-- Multi-protocol library for future Minecraft versions -->
<dependency>
<groupId>com.viaversion</groupId>
<artifactId>viaversion-api</artifactId>
<version>4.7.0</version>
<artifactId>viaversion</artifactId>
<version>4.5.1</version>
<scope>provided</scope>
<optional>true</optional>
<!-- Fix transitive dependency breaking builds -->
<exclusions>
<exclusion>
<groupId>net.md-5</groupId>
<artifactId>bungeecord-chat</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Send packets to players -->
<dependency>
<groupId>com.comphenix.protocol</groupId>
<artifactId>ProtocolLib</artifactId>
<version>5.1.0</version>
<version>5.0.0</version>
</dependency>

<!-- XML parsing library used for all "map.xml" configuration loading -->
Expand All @@ -118,19 +125,19 @@
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-api</artifactId>
<version>4.14.0</version>
<version>4.12.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-plain</artifactId>
<version>4.14.0</version>
<version>4.12.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-platform-bukkit</artifactId>
<version>4.3.0</version>
<version>4.2.0</version>
<scope>compile</scope>
<!-- Exclude Spigot APIs since we already provide Bukkit -->
<exclusions>
Expand All @@ -145,25 +152,25 @@
<dependency>
<groupId>cloud.commandframework</groupId>
<artifactId>cloud-core</artifactId>
<version>1.8.3</version>
<version>1.8.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cloud.commandframework</groupId>
<artifactId>cloud-annotations</artifactId>
<version>1.8.3</version>
<version>1.8.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cloud.commandframework</groupId>
<artifactId>cloud-paper</artifactId>
<version>1.8.3</version>
<version>1.8.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>cloud.commandframework</groupId>
<artifactId>cloud-minecraft-extras</artifactId>
<version>1.8.3</version>
<version>1.8.2</version>
<scope>compile</scope>
</dependency>
<!-- Allows registering brigadier mappings -->
Expand All @@ -178,7 +185,7 @@
<dependency>
<groupId>fr.mrmicky</groupId>
<artifactId>FastBoard</artifactId>
<version>2.0.0</version>
<version>1.2.1</version>
<scope>compile</scope>
</dependency>

Expand Down