remove Key from custom callback

Author: Machine-Maker

paper-api/src/main/java/io/papermc/paper/event/player/PlayerCustomClickEvent.java

@@ -16,7 +16,7 @@
 /**
  * This event is fired for any custom click events.
  * @see net.kyori.adventure.text.event.ClickEvent#custom(Key, BinaryTagHolder)
- * @see io.papermc.paper.registry.data.dialog.action.DialogAction#customClick(Key, DialogActionCallback, ClickCallback.Options)
+ * @see io.papermc.paper.registry.data.dialog.action.DialogAction#customClick(DialogActionCallback, ClickCallback.Options)
  */
 @ApiStatus.Experimental
 @ApiStatus.NonExtendable

paper-api/src/main/java/io/papermc/paper/registry/data/dialog/action/DialogAction.java

@@ -45,20 +45,21 @@ static StaticAction staticAction(final ClickEvent value) {
      * @param additions additional data to be sent with the action, or null if not needed
      * @return a new custom all action instance
      */
+    @Contract(pure = true, value = "_, _ -> new")
     static CustomClickAction customClick(final Key id, final @Nullable BinaryTagHolder additions) {
         return new CustomClickActionImpl(id, additions);
     }
 
     /**
      * Creates a new custom click action that executes a custom action.
      *
-     * @param id the identifier of the custom action
      * @param callback the custom action to execute
      * @param options the options for the custom action
      * @return a new custom all action instance
      */
-    static CustomClickAction customClick(final Key id, final DialogActionCallback callback, final ClickCallback.Options options) {
-        return DialogActionProvider.INSTANCE.orElseThrow().register(id, callback, options);
+    @Contract(pure = true, value = "_, _ -> new")
+    static CustomClickAction customClick(final DialogActionCallback callback, final ClickCallback.Options options) {
+        return DialogActionProvider.INSTANCE.orElseThrow().register(callback, options);
     }
 
     /**

paper-api/src/main/java/io/papermc/paper/registry/data/dialog/action/DialogActionProvider.java

@@ -2,12 +2,11 @@
 
 import java.util.Optional;
 import java.util.ServiceLoader;
-import net.kyori.adventure.key.Key;
 import net.kyori.adventure.text.event.ClickCallback;
 
 interface DialogActionProvider {
 
     Optional<DialogActionProvider> INSTANCE = ServiceLoader.load(DialogActionProvider.class).findFirst();
 
-    DialogAction.CustomClickAction register(Key key, DialogActionCallback callback, ClickCallback.Options options);
+    DialogAction.CustomClickAction register(DialogActionCallback callback, ClickCallback.Options options);
 }

paper-server/src/main/java/io/papermc/paper/adventure/providers/ClickCallbackProviderImpl.java

@@ -25,6 +25,7 @@
 @SuppressWarnings("UnstableApiUsage") // permitted provider
 public class ClickCallbackProviderImpl implements ClickCallback.Provider {
     private static final Key ADVENTURE_CLICK_CALLBACK_KEY = Key.key("paper", "click_callback");
+    public static final Key DIALOG_CLICK_CALLBACK_KEY = Key.key("paper", "dialog_click_callback");
     public static final String ID_KEY = "id";
 
     public static final AdventureClick ADVENTURE_CLICK_MANAGER = new AdventureClick();
@@ -61,9 +62,11 @@ void doRunCallback(final @NotNull Audience audience, final Key key, final Tag ta
         }
     }
 
-    public record DialogClickKey(Key key, UUID uuid) {}
+    public static final class DialogClickManager extends CallbackManager<DialogActionCallback, UUID> {
 
-    public static final class DialogClickManager extends CallbackManager<DialogActionCallback, DialogClickKey> {
+        public DialogClickManager() {
+            super(PaperAdventure.asVanilla(DIALOG_CLICK_CALLBACK_KEY)::equals);
+        }
 
         @Override
         void doRunCallback(final @NotNull Audience audience, final Key key, final Tag tag) {
@@ -72,7 +75,7 @@ void doRunCallback(final @NotNull Audience audience, final Key key, final Tag ta
                 if (id.isEmpty()) {
                     return;
                 }
-                this.tryConsumeCallback(new DialogClickKey(key, id.get()), callback -> {
+                this.tryConsumeCallback(id.get(), callback -> {
                     callback.accept(PaperDialogResponseView.createUnvalidatedResponse(t), audience);
                 });
             });

paper-server/src/main/java/io/papermc/paper/registry/data/dialog/action/PaperDialogActionProvider.java

@@ -3,7 +3,6 @@
 import io.papermc.paper.adventure.PaperAdventure;
 import io.papermc.paper.adventure.providers.ClickCallbackProviderImpl;
 import java.util.UUID;
-import net.kyori.adventure.key.Key;
 import net.kyori.adventure.nbt.api.BinaryTagHolder;
 import net.kyori.adventure.text.event.ClickCallback;
 import net.minecraft.core.UUIDUtil;
@@ -12,11 +11,10 @@
 public class PaperDialogActionProvider implements DialogActionProvider {
 
     @Override
-    public DialogAction.CustomClickAction register(final Key key, final DialogActionCallback callback, final ClickCallback.Options options) {
-        final ClickCallbackProviderImpl.DialogClickKey callbackKey = new ClickCallbackProviderImpl.DialogClickKey(key, UUID.randomUUID());
-        ClickCallbackProviderImpl.DIALOG_CLICK_MANAGER.addCallback(callbackKey, callback, options);
+    public DialogAction.CustomClickAction register(final DialogActionCallback callback, final ClickCallback.Options options) {
+        final UUID id = ClickCallbackProviderImpl.DIALOG_CLICK_MANAGER.addCallback(UUID.randomUUID(), callback, options);
         final CompoundTag tag = new CompoundTag();
-        tag.store(ClickCallbackProviderImpl.ID_KEY, UUIDUtil.CODEC, callbackKey.uuid());
-        return DialogAction.customClick(key, BinaryTagHolder.encode(tag, PaperAdventure.NBT_CODEC));
+        tag.store(ClickCallbackProviderImpl.ID_KEY, UUIDUtil.CODEC, id);
+        return DialogAction.customClick(ClickCallbackProviderImpl.DIALOG_CLICK_CALLBACK_KEY, BinaryTagHolder.encode(tag, PaperAdventure.NBT_CODEC));
     }
 }

test-plugin/src/main/java/io/papermc/testplugin/TestPlugin.java

@@ -42,7 +42,7 @@ public void onChat(ChatEvent event) {
                     .afterAction(DialogBase.DialogAfterAction.CLOSE)
                     .build()
             ).dialogSpecialty(DialogSpecialty.confirmation(
-                ActionButton.builder(text("yes")).action(DialogAction.customClick(Key.key("hello:there"), callback, ClickCallback.Options.builder().uses(1).build())).build(),
+                ActionButton.builder(text("yes")).action(DialogAction.customClick(callback, ClickCallback.Options.builder().uses(1).build())).build(),
                 ActionButton.builder(text("no")).build()
             ))
         );