From 363003d8c796078f6a16a571e99095312fdd129e Mon Sep 17 00:00:00 2001 From: Outfluencer Date: Mon, 26 May 2025 07:06:09 +1000 Subject: [PATCH] #3833: Small fixes/improvements to dialog api --- .../main/java/net/md_5/bungee/api/dialog/DialogBase.java | 9 ++++++--- .../net/md_5/bungee/api/dialog/MultiActionDialog.java | 2 +- .../bungee/api/dialog/MultiActionInputFormDialog.java | 2 +- .../net/md_5/bungee/api/dialog/action/DialogAction.java | 2 +- .../net/md_5/bungee/api/dialog/input/DialogInput.java | 1 + .../md_5/bungee/api/dialog/input/NumberRangeInput.java | 2 +- .../java/net/md_5/bungee/api/dialog/input/TextInput.java | 2 +- 7 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dialog/src/main/java/net/md_5/bungee/api/dialog/DialogBase.java b/dialog/src/main/java/net/md_5/bungee/api/dialog/DialogBase.java index 138ff75e..b261628e 100644 --- a/dialog/src/main/java/net/md_5/bungee/api/dialog/DialogBase.java +++ b/dialog/src/main/java/net/md_5/bungee/api/dialog/DialogBase.java @@ -5,7 +5,6 @@ import java.util.List; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NonNull; -import lombok.RequiredArgsConstructor; import lombok.experimental.Accessors; import net.md_5.bungee.api.chat.BaseComponent; import net.md_5.bungee.api.dialog.body.DialogBody; @@ -15,7 +14,6 @@ import net.md_5.bungee.api.dialog.body.DialogBody; */ @Data @AllArgsConstructor -@RequiredArgsConstructor @Accessors(fluent = true) public final class DialogBase { @@ -24,7 +22,7 @@ public final class DialogBase * The mandatory dialog title. */ @NonNull - private final BaseComponent title; + private BaseComponent title; /** * The name which is used for any buttons leading to this dialog (eg from a * {@link DialogListDialog}). Otherwise defaults to {@link #title}. @@ -40,4 +38,9 @@ public final class DialogBase */ @SerializedName("can_close_with_escape") private Boolean canCloseWithEscape; + + public DialogBase(@NonNull BaseComponent title) + { + this( title, null, null, null ); + } } diff --git a/dialog/src/main/java/net/md_5/bungee/api/dialog/MultiActionDialog.java b/dialog/src/main/java/net/md_5/bungee/api/dialog/MultiActionDialog.java index ec7198e0..3314c6a6 100644 --- a/dialog/src/main/java/net/md_5/bungee/api/dialog/MultiActionDialog.java +++ b/dialog/src/main/java/net/md_5/bungee/api/dialog/MultiActionDialog.java @@ -43,7 +43,7 @@ public final class MultiActionDialog implements Dialog public MultiActionDialog(@NonNull DialogBase base, @NonNull DialogClickAction... actions) { - this( base, Arrays.asList( actions ), 2, null ); + this( base, Arrays.asList( actions ), null, null ); } public MultiActionDialog(@NonNull DialogBase base, @NonNull List actions, Integer columns, ClickEvent onCancel) diff --git a/dialog/src/main/java/net/md_5/bungee/api/dialog/MultiActionInputFormDialog.java b/dialog/src/main/java/net/md_5/bungee/api/dialog/MultiActionInputFormDialog.java index a465497c..0243e5bd 100644 --- a/dialog/src/main/java/net/md_5/bungee/api/dialog/MultiActionInputFormDialog.java +++ b/dialog/src/main/java/net/md_5/bungee/api/dialog/MultiActionInputFormDialog.java @@ -43,7 +43,7 @@ public final class MultiActionInputFormDialog implements Dialog public MultiActionInputFormDialog(@NonNull DialogBase base, @NonNull DialogInput input, @NonNull DialogSubmitAction action) { - this( base, Arrays.asList( input ), Arrays.asList( action ), 2 ); + this( base, Arrays.asList( input ), Arrays.asList( action ), null ); } public MultiActionInputFormDialog(@NonNull DialogBase base, @NonNull DialogInput input, @NonNull DialogSubmitAction action, Integer columns) diff --git a/dialog/src/main/java/net/md_5/bungee/api/dialog/action/DialogAction.java b/dialog/src/main/java/net/md_5/bungee/api/dialog/action/DialogAction.java index 62db55c8..2c43835a 100644 --- a/dialog/src/main/java/net/md_5/bungee/api/dialog/action/DialogAction.java +++ b/dialog/src/main/java/net/md_5/bungee/api/dialog/action/DialogAction.java @@ -35,7 +35,7 @@ public class DialogAction setWidth( width ); } - public DialogAction(BaseComponent label) + public DialogAction(@NonNull BaseComponent label) { this( label, null, null ); } diff --git a/dialog/src/main/java/net/md_5/bungee/api/dialog/input/DialogInput.java b/dialog/src/main/java/net/md_5/bungee/api/dialog/input/DialogInput.java index a635b45e..43e1e30e 100644 --- a/dialog/src/main/java/net/md_5/bungee/api/dialog/input/DialogInput.java +++ b/dialog/src/main/java/net/md_5/bungee/api/dialog/input/DialogInput.java @@ -17,6 +17,7 @@ public class DialogInput /** * The internal input type. */ + @NonNull @ApiStatus.Internal private final String type; /** diff --git a/dialog/src/main/java/net/md_5/bungee/api/dialog/input/NumberRangeInput.java b/dialog/src/main/java/net/md_5/bungee/api/dialog/input/NumberRangeInput.java index 23ca7d66..e406f254 100644 --- a/dialog/src/main/java/net/md_5/bungee/api/dialog/input/NumberRangeInput.java +++ b/dialog/src/main/java/net/md_5/bungee/api/dialog/input/NumberRangeInput.java @@ -96,7 +96,7 @@ public class NumberRangeInput extends DialogInput // we need to calculate if the initial value is between start and end, regardless of the order float min = Math.min( start, end ); float max = Math.max( start, end ); - Preconditions.checkArgument( step == null || ( initial >= min && initial <= max ), "step must be null or between start and end" ); + Preconditions.checkArgument( initial == null || ( initial >= min && initial <= max ), "initial must be null or between start and end" ); this.initial = initial; return this; } diff --git a/dialog/src/main/java/net/md_5/bungee/api/dialog/input/TextInput.java b/dialog/src/main/java/net/md_5/bungee/api/dialog/input/TextInput.java index e58b57ad..da57cce7 100644 --- a/dialog/src/main/java/net/md_5/bungee/api/dialog/input/TextInput.java +++ b/dialog/src/main/java/net/md_5/bungee/api/dialog/input/TextInput.java @@ -50,7 +50,7 @@ public class TextInput extends DialogInput public TextInput(@NonNull String key, @NonNull BaseComponent label) { - this( key, 200, label, null, null, null, null ); + this( key, null, label, null, null, null, null ); } public TextInput(@NonNull String key, Integer width, @NonNull BaseComponent label, Boolean labelVisible, String initial, Integer maxLength)