1
0
mirror of https://github.com/GeyserMC/Geyser.git synced 2026-01-04 15:31:36 +00:00

Multi action dialog

This commit is contained in:
Eclipse
2025-06-02 17:34:23 +00:00
parent c40fca6fae
commit b3d945dbf8
4 changed files with 112 additions and 0 deletions

View File

@@ -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) {

View File

@@ -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<DialogAction> action) {
public static List<DialogButton> readList(GeyserSession session, List<NbtMap> tag, Dialog.IdGetter idGetter) {
if (tag == null) {
return List.of();
}
List<DialogButton> buttons = new ArrayList<>();
for (NbtMap map : tag) {
buttons.add(read(session, map, idGetter).orElseThrow()); // Should never throw
}
return buttons;
}
public static Optional<DialogButton> read(GeyserSession session, Object tag, Dialog.IdGetter idGetter) {
if (!(tag instanceof NbtMap map)) {
return Optional.empty();

View File

@@ -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<DialogButton> 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<DialogAction> onCancel() {
return exit.flatMap(DialogButton::action);
}
}

View File

@@ -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<DialogButton> buttons) {
super(session, map, buttons);
}
@Override
protected Optional<DialogAction> onCancel() {
return Optional.empty();
}
}