From bab3fa2052e6379ee3a4905c399c058b3f5a708e Mon Sep 17 00:00:00 2001
From: Oliver <oschi1303@gmail.com>
Date: Tue, 17 Jun 2025 21:16:14 +0200
Subject: [PATCH] fancydialogs: Fix dialog type parser

---
 .../fancydialogs/FancyDialogsPlugin.java      |  2 ++
 .../commands/types/DialogCommandType.java     | 21 ++++++++++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/plugins/fancydialogs/src/main/java/com/fancyinnovations/fancydialogs/FancyDialogsPlugin.java b/plugins/fancydialogs/src/main/java/com/fancyinnovations/fancydialogs/FancyDialogsPlugin.java
index 62606511..ae1aeff0 100644
--- a/plugins/fancydialogs/src/main/java/com/fancyinnovations/fancydialogs/FancyDialogsPlugin.java
+++ b/plugins/fancydialogs/src/main/java/com/fancyinnovations/fancydialogs/FancyDialogsPlugin.java
@@ -169,6 +169,8 @@ public class FancyDialogsPlugin extends JavaPlugin implements FancyDialogs {
             builder.addParameterType(Dialog.class, DialogCommandType.INSTANCE);
         });
 
+        lampBuilder.exceptionHandler(DialogCommandType.INSTANCE);
+
         Lamp<BukkitCommandActor> lamp = lampBuilder.build();
 
         lamp.register(FancyDialogsCMD.INSTANCE);
diff --git a/plugins/fancydialogs/src/main/java/com/fancyinnovations/fancydialogs/commands/types/DialogCommandType.java b/plugins/fancydialogs/src/main/java/com/fancyinnovations/fancydialogs/commands/types/DialogCommandType.java
index 59f7c76f..bd784a9b 100644
--- a/plugins/fancydialogs/src/main/java/com/fancyinnovations/fancydialogs/commands/types/DialogCommandType.java
+++ b/plugins/fancydialogs/src/main/java/com/fancyinnovations/fancydialogs/commands/types/DialogCommandType.java
@@ -6,11 +6,13 @@ import com.fancyinnovations.fancydialogs.registry.DialogRegistry;
 import org.jetbrains.annotations.NotNull;
 import revxrsal.commands.autocomplete.SuggestionProvider;
 import revxrsal.commands.bukkit.actor.BukkitCommandActor;
+import revxrsal.commands.bukkit.exception.BukkitExceptionHandler;
+import revxrsal.commands.exception.InvalidValueException;
 import revxrsal.commands.node.ExecutionContext;
 import revxrsal.commands.parameter.ParameterType;
 import revxrsal.commands.stream.MutableStringStream;
 
-public class DialogCommandType implements ParameterType<BukkitCommandActor, Dialog> {
+public class DialogCommandType extends BukkitExceptionHandler implements ParameterType<BukkitCommandActor, Dialog> {
 
     public static final DialogCommandType INSTANCE = new DialogCommandType();
     private static final DialogRegistry REGISTRY = FancyDialogsPlugin.get().getDialogRegistry();
@@ -28,12 +30,15 @@ public class DialogCommandType implements ParameterType<BukkitCommandActor, Dial
             return dialog;
         }
 
+        throw new InvalidDialogException(id);
+    }
+
+    @HandleException
+    public void onInvalidDialog(InvalidDialogException e, BukkitCommandActor actor) {
         FancyDialogsPlugin.get().getTranslator()
                 .translate("dialog.not_found")
-                .replace("id", id)
-                .send(context.actor().sender());
-
-        return null;
+                .replace("id", e.input())
+                .send(actor.sender());
     }
 
     @Override
@@ -42,4 +47,10 @@ public class DialogCommandType implements ParameterType<BukkitCommandActor, Dial
                 .map(Dialog::getId)
                 .toList();
     }
+
+    static class InvalidDialogException extends InvalidValueException {
+        public InvalidDialogException(@NotNull String input) {
+            super(input);
+        }
+    }
 }