From 46dde5a60fb34c4fe817f8b1b8d2ecb3a37c571d Mon Sep 17 00:00:00 2001
From: Tsubasa6848 <komatsu_moho@outlook.com>
Date: Mon, 1 Apr 2024 03:02:13 +0800
Subject: [PATCH] adapt: adapt LeviLamina v0.10.4

---
 manifest.json              |  2 +-
 src/Features/VoteClean.cpp | 52 ++++++++++++++++++++------------------
 tooth.json                 |  4 +--
 3 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/manifest.json b/manifest.json
index 63b0786..ea1debc 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "name": "${pluginName}",
     "entry": "${pluginFile}",
     "type": "native",
-    "version": "0.10.0",
+    "version": "0.10.1",
     "author": "GroupMountain",
     "description": "Clean Entities",
     "dependencies": [
diff --git a/src/Features/VoteClean.cpp b/src/Features/VoteClean.cpp
index 1cb10c6..100c8ca 100644
--- a/src/Features/VoteClean.cpp
+++ b/src/Features/VoteClean.cpp
@@ -30,20 +30,22 @@ void sendVoteForm(Player* pl) {
         tr("cleaner.vote.no")
     );
     ll::service::getLevel()->forEachPlayer([&](Player& pl) -> bool {
-        fm.sendTo(pl, [](Player& player, ll::form::ModalForm::SelectedButton button) {
-            switch (button) {
-            case ll::form::ModalForm::SelectedButton::Upper: {
-                voteList[player.getUuid()] = true;
-                player.sendMessage(tr("cleaner.vote.accept"));
-                return;
-            }
-            case ll::form::ModalForm::SelectedButton::Lower: {
-                voteList[player.getUuid()] = false;
-                player.sendMessage(tr("cleaner.vote.deny"));
-                return;
-            }
-            default:
-                return;
+        fm.sendTo(pl, [](Player& player, ll::form::ModalFormResult result, ll::form::FormCancelReason reason) {
+            if (result.has_value()) {
+                switch (result.value()) {
+                case ll::form::ModalFormSelectedButton::Upper: {
+                    voteList[player.getUuid()] = true;
+                    player.sendMessage(tr("cleaner.vote.accept"));
+                    return;
+                }
+                case ll::form::ModalFormSelectedButton::Lower: {
+                    voteList[player.getUuid()] = false;
+                    player.sendMessage(tr("cleaner.vote.deny"));
+                    return;
+                }
+                default:
+                    return;
+                }
             }
         });
         return true;
@@ -104,16 +106,18 @@ void confirmForm(Player* pl) {
         tr("cleaner.vote.confirmOk"),
         tr("cleaner.vote.confirmNo")
     );
-    fm.sendTo(*pl, [](Player& player, ll::form::ModalForm::SelectedButton button) {
-        switch (button) {
-        case ll::form::ModalForm::SelectedButton::Upper: {
-            return voteClean(&player);
-        }
-        case ll::form::ModalForm::SelectedButton::Lower: {
-            return player.sendMessage(tr("cleaner.vote.cancel"));
-        }
-        default:
-            return;
+    fm.sendTo(*pl, [](Player& player, ll::form::ModalFormResult result, ll::form::FormCancelReason reason) {
+        if (result.has_value()) {
+            switch (result.value()) {
+            case ll::form::ModalFormSelectedButton::Upper: {
+                return voteClean(&player);
+            }
+            case ll::form::ModalFormSelectedButton::Lower: {
+                return player.sendMessage(tr("cleaner.vote.cancel"));
+            }
+            default:
+                return;
+            }
         }
     });
 }
diff --git a/tooth.json b/tooth.json
index 978ae75..5b712ff 100644
--- a/tooth.json
+++ b/tooth.json
@@ -1,7 +1,7 @@
 {
     "format_version": 2,
     "tooth": "github.com/GroupMountain/Cleaner",
-    "version": "0.10.0",
+    "version": "0.10.1",
     "info": {
         "name": "Cleaner",
         "description": "A Powerful Entities Cleaning up Plugin for BDS",
@@ -13,7 +13,7 @@
             "gmlib"
         ]
     },
-    "asset_url": "https://github.com/GroupMountain/Cleaner/releases/download/v0.10.0/Cleaner-windows-x64.zip",
+    "asset_url": "https://github.com/GroupMountain/Cleaner/releases/download/v0.10.1/Cleaner-windows-x64.zip",
     "dependencies": {
         "github.com/GroupMountain/GMLIB": ">=0.10.0"
     },