MiniDay/hamster-core
1
0
Fork 0
Code Issues Pull Requests Actions Releases 8 Activity

fix: Message 设置时出错

Browse Source
This commit is contained in:
叁只仓鼠
2022-10-29 18:26:20 +08:00
parent ed914414d2
commit 40623f269b
1 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/data/DisplayMessage.java
View File

@@ -36,19 +36,19 @@ public class DisplayMessage {
return new DisplayMessage().setMessage(message); return new DisplayMessage().setMessage(message);
} }
public static DisplayMessage actionbar(@NotNull String message) { public static DisplayMessage actionbar(@NotNull String actionbar) {
return new DisplayMessage().setActionBar(message); return new DisplayMessage().setActionBar(actionbar);
} }
public static DisplayMessage actionbar(@NotNull Component message) { public static DisplayMessage actionbar(@NotNull Component actionbar) {
return new DisplayMessage().setActionBar(message); return new DisplayMessage().setActionBar(actionbar);
} }
public static DisplayMessage title(@NotNull String title, @NotNull String subtitle) { public static DisplayMessage title(@Nullable String title, @Nullable String subtitle) {
return new DisplayMessage().setTitle(title, subtitle); return new DisplayMessage().setTitle(title, subtitle);
} }
public static DisplayMessage title(@NotNull String title, @NotNull String subtitle, int fadeIn, int stay, int fadeOut) { public static DisplayMessage title(@Nullable String title, @Nullable String subtitle, int fadeIn, int stay, int fadeOut) {
return new DisplayMessage().setTitle(title, subtitle, fadeIn, stay, fadeOut); return new DisplayMessage().setTitle(title, subtitle, fadeIn, stay, fadeOut);
} }
@@ -146,40 +146,43 @@ public class DisplayMessage {
} }
@NotNull @NotNull
public DisplayMessage setMessage(@NotNull String message) { public DisplayMessage setMessage(@Nullable String message) {
this.message = Component.text(message); this.message = message == null ? null : Component.text(message);
return this; return this;
} }
@NotNull @NotNull
public DisplayMessage setMessage(@NotNull Component message) { public DisplayMessage setMessage(@Nullable Component message) {
this.message = message.compact(); this.message = message == null ? null : message.compact();
return this; return this;
} }
@NotNull @NotNull
public DisplayMessage setActionBar(@NotNull String message) { public DisplayMessage setActionBar(@Nullable String actionbar) {
this.actionbar = Component.text(message); this.actionbar = actionbar == null ? null : Component.text(actionbar);
return this; return this;
} }
@NotNull @NotNull
public DisplayMessage setActionBar(@NotNull Component message) { public DisplayMessage setActionBar(@Nullable Component actionbar) {
this.actionbar = message.compact(); this.actionbar = actionbar == null ? null : actionbar.compact();
return this; return this;
} }
@NotNull @NotNull
public DisplayMessage setTitle(@NotNull String title, @NotNull String subtitle) { public DisplayMessage setTitle(@Nullable String title, @Nullable String subtitle) {
this.title = Title.title(Component.text(title), Component.text(subtitle));
return this;
}
@NotNull
public DisplayMessage setTitle(@NotNull String title, @NotNull String subtitle, int fadeIn, int stay, int fadeOut) {
this.title = Title.title( this.title = Title.title(
Component.text(title), title == null ? Component.empty() : Component.text(title),
Component.text(subtitle), subtitle == null ? Component.empty() : Component.text(subtitle)
);
return this;
}
@NotNull
public DisplayMessage setTitle(@Nullable String title, @Nullable String subtitle, int fadeIn, int stay, int fadeOut) {
this.title = Title.title(
title == null ? Component.empty() : Component.text(title),
subtitle == null ? Component.empty() : Component.text(subtitle),
Title.Times.times( Title.Times.times(
Ticks.duration(fadeIn), Ticks.duration(fadeIn),
Ticks.duration(stay), Ticks.duration(stay),
@@ -190,16 +193,19 @@ public class DisplayMessage {
} }
@NotNull @NotNull
public DisplayMessage setTitle(@NotNull Component title, @NotNull Component subtitle) { public DisplayMessage setTitle(@Nullable Component title, @Nullable Component subtitle) {
this.title = Title.title(title.compact(), subtitle.compact()); this.title = Title.title(
title == null ? Component.empty() : title.compact(),
subtitle == null ? Component.empty() : subtitle.compact()
);
return this; return this;
} }
@NotNull @NotNull
public DisplayMessage setTitle(@NotNull Component title, @NotNull Component subtitle, int fadeIn, int stay, int fadeOut) { public DisplayMessage setTitle(@Nullable Component title, @Nullable Component subtitle, int fadeIn, int stay, int fadeOut) {
this.title = Title.title( this.title = Title.title(
title.compact(), title == null ? Component.empty() : title.compact(),
subtitle.compact(), subtitle == null ? Component.empty() : subtitle.compact(),
Title.Times.times( Title.Times.times(
Ticks.duration(fadeIn), Ticks.duration(fadeIn),
Ticks.duration(stay), Ticks.duration(stay),
@@ -217,8 +223,8 @@ public class DisplayMessage {
@NotNull @NotNull
@SuppressWarnings("PatternValidation") @SuppressWarnings("PatternValidation")
public DisplayMessage setSound(@NotNull String sound) { public DisplayMessage setSound(@Nullable String sound) {
this.sound = Sound.sound(Key.key(sound), Sound.Source.MASTER, 1, 1); this.sound = sound == null ? null : Sound.sound(Key.key(sound), Sound.Source.MASTER, 1, 1);
return this; return this;
} }