Skip to content

Commit 97dbd5a

Browse files
committed
Merge api-8 into 9 for updates
Signed-off-by: Gabriel Harris-Rouquette <[email protected]>
2 parents 8c432ab + fff10f8 commit 97dbd5a

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ projectDescription=A plugin API for Minecraft: Java Edition
66

77
org.gradle.parallel=true
88

9-
adventureVersion=4.7.0
9+
adventureVersion=4.8.0
1010
caffeineVersion=3.0.2
1111
configurateVersion=4.1.1
1212
errorproneVersion=2.7.1

src/main/java/org/spongepowered/api/entity/Entity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
*/
2525
package org.spongepowered.api.entity;
2626

27+
import net.kyori.adventure.sound.Sound;
2728
import net.kyori.adventure.text.Component;
2829
import net.kyori.adventure.text.event.HoverEvent;
2930
import net.kyori.adventure.text.event.HoverEventSource;
@@ -74,7 +75,7 @@
7475
* <p>Blocks and items (when they are in inventories) are not entities.</p>
7576
*/
7677
@DoNotStore
77-
public interface Entity extends Identifiable, HoverEventSource<HoverEvent.ShowEntity>, Locatable, EntityProjectileSource,
78+
public interface Entity extends Identifiable, HoverEventSource<HoverEvent.ShowEntity>, Locatable, EntityProjectileSource, Sound.Emitter,
7879
SerializableDataHolder.Mutable, RandomProvider {
7980

8081
/**

src/main/java/org/spongepowered/api/util/ComponentMessageException.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
package org.spongepowered.api.util;
2626

2727
import net.kyori.adventure.text.Component;
28-
import net.kyori.adventure.text.serializer.plain.PlainComponentSerializer;
28+
import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
2929
import net.kyori.adventure.util.ComponentMessageThrowable;
3030
import org.checkerframework.checker.nullness.qual.Nullable;
3131

@@ -81,7 +81,7 @@ public ComponentMessageException(final Throwable throwable) {
8181
@Override
8282
public @Nullable String getMessage() {
8383
final /* @Nullable */ Component message = this.componentMessage();
84-
return message == null ? null : PlainComponentSerializer.plain().serialize(message);
84+
return message == null ? null : PlainTextComponentSerializer.plainText().serialize(message);
8585
}
8686

8787
/**

0 commit comments

Comments
 (0)