Skip to content

Commit ec9c83f

Browse files
authored
Adventure 4.24.0 (#12908)
1 parent a4da45e commit ec9c83f

File tree

4 files changed

+15
-2
lines changed

4 files changed

+15
-2
lines changed

paper-api/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ java {
1111

1212
val annotationsVersion = "26.0.2"
1313
// Keep in sync with paper-server adventure-text-serializer-ansi dep
14-
val adventureVersion = "4.23.0"
14+
val adventureVersion = "4.24.0"
1515
val bungeeCordChatVersion = "1.21-R0.2-deprecated+build.21"
1616
val slf4jVersion = "2.0.16"
1717
val log4jVersion = "2.24.1"

paper-server/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ dependencies {
134134
implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
135135
implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21
136136
implementation("net.minecrell:terminalconsoleappender:1.3.0")
137-
implementation("net.kyori:adventure-text-serializer-ansi:4.23.0") // Keep in sync with adventureVersion from Paper-API build file
137+
implementation("net.kyori:adventure-text-serializer-ansi:4.24.0") // Keep in sync with adventureVersion from Paper-API build file
138138
runtimeConfiguration(sourceSets.main.map { it.runtimeClasspath })
139139

140140
/*

paper-server/src/main/java/io/papermc/paper/connection/PaperPlayerConfigurationConnection.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import net.kyori.adventure.resource.ResourcePackInfo;
2020
import net.kyori.adventure.resource.ResourcePackRequest;
2121
import net.minecraft.network.chat.Component;
22+
import net.minecraft.network.protocol.common.ClientboundClearDialogPacket;
2223
import net.minecraft.network.protocol.common.ClientboundResourcePackPopPacket;
2324
import net.minecraft.network.protocol.common.ClientboundResourcePackPushPacket;
2425
import net.minecraft.network.protocol.common.ClientboundShowDialogPacket;
@@ -73,6 +74,11 @@ public void showDialog(final DialogLike dialog) {
7374
this.handle.send(new ClientboundShowDialogPacket(PaperDialog.bukkitToMinecraftHolder((Dialog) dialog)));
7475
}
7576

77+
@Override
78+
public void closeDialog() {
79+
this.handle.send(ClientboundClearDialogPacket.INSTANCE);
80+
}
81+
7682
@Override
7783
public Pointers pointers() {
7884
if (this.adventurePointers == null) {

paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
import net.minecraft.core.SectionPos;
5858
import net.minecraft.network.chat.Component;
5959
import net.minecraft.network.chat.PlayerChatMessage;
60+
import net.minecraft.network.protocol.common.ClientboundClearDialogPacket;
6061
import net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket;
6162
import net.minecraft.network.protocol.common.ClientboundResourcePackPopPacket;
6263
import net.minecraft.network.protocol.common.ClientboundResourcePackPushPacket;
@@ -2497,6 +2498,12 @@ public void showDialog(final DialogLike dialog) {
24972498
this.getHandle().openDialog(PaperDialog.bukkitToMinecraftHolder((Dialog) dialog));
24982499
}
24992500

2501+
@Override
2502+
public void closeDialog() {
2503+
if (this.getHandle().connection == null) return;
2504+
this.getHandle().connection.send(ClientboundClearDialogPacket.INSTANCE);
2505+
}
2506+
25002507
// Paper start - more resource pack API
25012508
@Override
25022509
public org.bukkit.event.player.PlayerResourcePackStatusEvent.Status getResourcePackStatus() {

0 commit comments

Comments
 (0)