diff --git a/core/src/main/java/org/geysermc/geyser/session/dialog/Dialog.java b/core/src/main/java/org/geysermc/geyser/session/dialog/Dialog.java index 9c39c6ae1..4365d7980 100644 --- a/core/src/main/java/org/geysermc/geyser/session/dialog/Dialog.java +++ b/core/src/main/java/org/geysermc/geyser/session/dialog/Dialog.java @@ -135,6 +135,8 @@ public abstract class Dialog { return new NoticeDialog(session, map, idGetter); } else if (type.equals(ConfirmationDialog.TYPE)) { return new ConfirmationDialog(session, map, idGetter); + } else if (type.equals(MultiActionDialog.TYPE)) { + return new MultiActionDialog(session, map, idGetter); } return new Dialog(session, map) { diff --git a/core/src/main/java/org/geysermc/geyser/session/dialog/DialogButton.java b/core/src/main/java/org/geysermc/geyser/session/dialog/DialogButton.java index c2bb4f6f2..ccf5d570a 100644 --- a/core/src/main/java/org/geysermc/geyser/session/dialog/DialogButton.java +++ b/core/src/main/java/org/geysermc/geyser/session/dialog/DialogButton.java @@ -30,10 +30,23 @@ import org.geysermc.geyser.session.GeyserSession; import org.geysermc.geyser.session.dialog.action.DialogAction; import org.geysermc.geyser.translator.text.MessageTranslator; +import java.util.ArrayList; +import java.util.List; import java.util.Optional; public record DialogButton(String label, Optional action) { + public static List readList(GeyserSession session, List tag, Dialog.IdGetter idGetter) { + if (tag == null) { + return List.of(); + } + List buttons = new ArrayList<>(); + for (NbtMap map : tag) { + buttons.add(read(session, map, idGetter).orElseThrow()); // Should never throw + } + return buttons; + } + public static Optional read(GeyserSession session, Object tag, Dialog.IdGetter idGetter) { if (!(tag instanceof NbtMap map)) { return Optional.empty(); diff --git a/core/src/main/java/org/geysermc/geyser/session/dialog/MultiActionDialog.java b/core/src/main/java/org/geysermc/geyser/session/dialog/MultiActionDialog.java new file mode 100644 index 000000000..5e7c36c83 --- /dev/null +++ b/core/src/main/java/org/geysermc/geyser/session/dialog/MultiActionDialog.java @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2025 GeyserMC. http://geysermc.org + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * @author GeyserMC + * @link https://github.com/GeyserMC/Geyser + */ + +package org.geysermc.geyser.session.dialog; + +import net.kyori.adventure.key.Key; +import org.cloudburstmc.nbt.NbtMap; +import org.cloudburstmc.nbt.NbtType; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.session.dialog.action.DialogAction; +import org.geysermc.geyser.util.MinecraftKey; + +import java.util.Optional; + +public class MultiActionDialog extends DialogWithButtons { + + public static final Key TYPE = MinecraftKey.key("multi_action"); + + private final Optional exit; + + protected MultiActionDialog(GeyserSession session, NbtMap map, IdGetter idGetter) { + super(session, map, DialogButton.readList(session, map.getList("actions", NbtType.COMPOUND), idGetter)); + exit = DialogButton.read(session, map.get("exit_action"), idGetter); + } + + @Override + protected Optional onCancel() { + return exit.flatMap(DialogButton::action); + } +} diff --git a/core/src/main/java/org/geysermc/geyser/session/dialog/ServerLinksDialog.java b/core/src/main/java/org/geysermc/geyser/session/dialog/ServerLinksDialog.java new file mode 100644 index 000000000..fc532b048 --- /dev/null +++ b/core/src/main/java/org/geysermc/geyser/session/dialog/ServerLinksDialog.java @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2025 GeyserMC. http://geysermc.org + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * @author GeyserMC + * @link https://github.com/GeyserMC/Geyser + */ + +package org.geysermc.geyser.session.dialog; + +import org.cloudburstmc.nbt.NbtMap; +import org.geysermc.geyser.session.GeyserSession; +import org.geysermc.geyser.session.dialog.action.DialogAction; + +import java.util.List; +import java.util.Optional; + +public class ServerLinksDialog extends DialogWithButtons { + + protected ServerLinksDialog(GeyserSession session, NbtMap map, List buttons) { + super(session, map, buttons); + } + + @Override + protected Optional onCancel() { + return Optional.empty(); + } +}