FancyInnovations/FancyPlugins
1
0
Fork 0
mirror of https://github.com/FancyInnovations/FancyPlugins.git synced 2025-12-06 07:43:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fancydialogs: Add expectedUserInput field to ConfirmationDialog

Browse Source
This commit is contained in:
Oliver
2025-11-05 12:26:24 +01:00
parent 232f041df0
commit 9774f57ea6
8 changed files with 58 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/fancydialogs/VERSION
View File

@@ -1 +1 @@
0.0.28
0.0.29

28
plugins/fancydialogs/fd-api/src/main/java/com/fancyinnovations/fancydialogs/api/ConfirmationDialog.java → plugins/fancydialogs/fd-api/src/main/java/com/fancyinnovations/fancydialogs/api/dialogs/ConfirmationDialog.java
View File

@@ -1,9 +1,12 @@
package com.fancyinnovations.fancydialogs.api;
package com.fancyinnovations.fancydialogs.api.dialogs;
import com.fancyinnovations.fancydialogs.api.Dialog;
import com.fancyinnovations.fancydialogs.api.FancyDialogs;
import com.fancyinnovations.fancydialogs.api.data.DialogBodyData;
import com.fancyinnovations.fancydialogs.api.data.DialogButton;
import com.fancyinnovations.fancydialogs.api.data.DialogData;
import com.fancyinnovations.fancydialogs.api.data.inputs.DialogInputs;
import com.fancyinnovations.fancydialogs.api.data.inputs.DialogTextField;
import org.bukkit.entity.Player;
import java.util.List;
@@ -19,6 +22,7 @@ public class ConfirmationDialog {
private String title = "Confirmation";
private String confirmText = "Yes";
private String cancelText = "No";
private String expectedUserInput = "";
private Dialog dialog;
private String confirmButtonId;
@@ -28,7 +32,7 @@ public class ConfirmationDialog {
private Runnable onCancel = () -> {
};
public ConfirmationDialog(String title, String question, String confirmText, String cancelText, Runnable onConfirm, Runnable onCancel) {
public ConfirmationDialog(String title, String question, String confirmText, String cancelText, String expectedUserInput, Runnable onConfirm, Runnable onCancel) {
this.title = title;
this.question = question;
this.confirmText = confirmText;
@@ -56,6 +60,11 @@ public class ConfirmationDialog {
return this;
}
public ConfirmationDialog withExpectedUserInput(String expectedUserInput) {
this.expectedUserInput = expectedUserInput;
return this;
}
public ConfirmationDialog withOnConfirm(Runnable onConfirm) {
this.onConfirm = onConfirm;
return this;
@@ -103,18 +112,31 @@ public class ConfirmationDialog {
);
this.cancelButtonId = cancelBtn.id();
List<DialogTextField> textFields = null;
if (expectedUserInput != null && !expectedUserInput.isEmpty()) {
textFields = List.of(
new DialogTextField("confirmation_user_input", "Type '" + expectedUserInput + "' to confirm", 0, "", expectedUserInput.length(), 1)
);
}
DialogInputs inputs = new DialogInputs(textFields, null, null);
DialogData dialogData = new DialogData(
"confirmation_dialog_" + UUID.randomUUID(),
title,
false,
List.of(new DialogBodyData(question)),
DialogInputs.EMPTY, // TODO add support for confirmation phrases
inputs,
List.of(confirmBtn, cancelBtn)
);
this.dialog = FancyDialogs.get().createDialog(dialogData);
}
public String getExpectedUserInput() {
return expectedUserInput;
}
public String getConfirmButtonId() {
return confirmButtonId;
}

3
plugins/fancydialogs/fd-api/src/main/java/com/fancyinnovations/fancydialogs/api/NoticeDialog.java → plugins/fancydialogs/fd-api/src/main/java/com/fancyinnovations/fancydialogs/api/dialogs/NoticeDialog.java
View File

@@ -1,5 +1,6 @@
package com.fancyinnovations.fancydialogs.api;
package com.fancyinnovations.fancydialogs.api.dialogs;
import com.fancyinnovations.fancydialogs.api.FancyDialogs;
import com.fancyinnovations.fancydialogs.api.data.DialogBodyData;
import com.fancyinnovations.fancydialogs.api.data.DialogData;
import com.fancyinnovations.fancydialogs.api.data.inputs.DialogInputs;

10
plugins/fancydialogs/fd-api/src/main/java/com/fancyinnovations/fancydialogs/api/events/DialogButtonClickedEvent.java
View File

@@ -6,6 +6,8 @@ import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull;
import java.util.Map;
public class DialogButtonClickedEvent extends Event {
private static final HandlerList handlerList = new HandlerList();
@@ -13,12 +15,14 @@ public class DialogButtonClickedEvent extends Event {
private final Player player;
private final String dialogId;
private final String buttonId;
private final Map<String, String> payload;
public DialogButtonClickedEvent(@NotNull Player player, @NotNull String dialogId, @NotNull String buttonId) {
public DialogButtonClickedEvent(@NotNull Player player, @NotNull String dialogId, @NotNull String buttonId, @NotNull Map<String, String> payload) {
super(!Bukkit.isPrimaryThread());
this.player = player;
this.dialogId = dialogId;
this.buttonId = buttonId;
this.payload = payload;
}
public static HandlerList getHandlerList() {
@@ -37,6 +41,10 @@ public class DialogButtonClickedEvent extends Event {
return buttonId;
}
public Map<String, String> getPayload() {
return payload;
}
@Override
public @NotNull HandlerList getHandlers() {
return handlerList;

2
plugins/fancydialogs/src/main/java/com/fancyinnovations/fancydialogs/commands/FancyDialogsCMD.java
View File

@@ -1,9 +1,9 @@
package com.fancyinnovations.fancydialogs.commands;
import com.fancyinnovations.fancydialogs.FancyDialogsPlugin;
import com.fancyinnovations.fancydialogs.api.ConfirmationDialog;
import com.fancyinnovations.fancydialogs.api.Dialog;
import com.fancyinnovations.fancydialogs.api.data.DialogData;
import com.fancyinnovations.fancydialogs.api.dialogs.ConfirmationDialog;
import com.fancyinnovations.fancydialogs.config.FancyDialogsConfig;
import com.fancyinnovations.fancydialogs.dialog.DialogImpl;
import de.oliver.fancyanalytics.logger.LogLevel;

2
plugins/fancydialogs/src/main/java/com/fancyinnovations/fancydialogs/listener/CustomClickActionPacketListener.java
View File

@@ -46,7 +46,7 @@ public class CustomClickActionPacketListener {
String dialogId = packet.getPayload().get("dialog_id");
String buttonId = packet.getPayload().get("button_id");
new DialogButtonClickedEvent(event.player(), dialogId, buttonId).callEvent();
new DialogButtonClickedEvent(event.player(), dialogId, buttonId, packet.getPayload()).callEvent();
if (dialogId.startsWith("confirmation_dialog_")) {
return; // Ignore confirmation dialog actions, handled separately

18
plugins/fancydialogs/src/main/java/com/fancyinnovations/fancydialogs/listener/DialogButtonClickedListener.java
View File

@@ -1,6 +1,7 @@
package com.fancyinnovations.fancydialogs.listener;
import com.fancyinnovations.fancydialogs.api.ConfirmationDialog;
import com.fancyinnovations.fancydialogs.FancyDialogsPlugin;
import com.fancyinnovations.fancydialogs.api.dialogs.ConfirmationDialog;
import com.fancyinnovations.fancydialogs.api.events.DialogButtonClickedEvent;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
@@ -16,6 +17,21 @@ public class DialogButtonClickedListener implements Listener {
}
if (event.getButtonId().equals(dialog.getConfirmButtonId())) {
if (dialog.getExpectedUserInput() != null && !dialog.getExpectedUserInput().isEmpty()) {
if (!event.getPayload().containsKey("confirmation_user_input")) {
FancyDialogsPlugin.get().getFancyLogger().warn("Confirmation dialog expected user input but none was provided.");
return;
}
String userInput = event.getPayload().get("confirmation_user_input");
if (!userInput.equals(dialog.getExpectedUserInput())) {
FancyDialogsPlugin.get().getTranslator()
.translate("confirmation_dialog.input_mismatch")
.send(event.getPlayer());
return;
}
}
dialog.getOnConfirm().run();
ConfirmationDialog.CACHE.remove(event.getDialogId());
} else if (event.getButtonId().equals(dialog.getCancelButtonId())) {

2
plugins/fancydialogs/src/main/resources/languages/default.yml
View File

@@ -2,6 +2,8 @@ language_name: default
messages:
dialog:
not_found: "<dark_gray>› <gray>Dialog {warningColor}{id}<gray> is not registered."
confirmation_dialog:
input_mismatch: "<dark_gray>› <gray>Your input does not match the expected phrase."
commands:
dialog:
open: