From 6257338ceb71a278e81ef6443cf11a2322bb153c Mon Sep 17 00:00:00 2001 From: engsr6982 <109733049+engsr6982@users.noreply.github.com> Date: Mon, 29 Apr 2024 13:35:25 +0800 Subject: [PATCH] fixed warning --- src/Command/ChunkCommand.cpp | 74 +++++++++++++++------------------ src/Command/Command.cpp | 54 +++++++++++------------- src/Command/GamemodeCommand.cpp | 15 +++---- src/Command/TeleportCommand.cpp | 8 ++-- 4 files changed, 68 insertions(+), 83 deletions(-) diff --git a/src/Command/ChunkCommand.cpp b/src/Command/ChunkCommand.cpp index 873876d..674c932 100644 --- a/src/Command/ChunkCommand.cpp +++ b/src/Command/ChunkCommand.cpp @@ -129,7 +129,7 @@ void registerChunkCommand() { ); // tools chunk debug - cmd.overload().text("chunk").text("debug").execute<[&](CommandOrigin const& origin, CommandOutput& output) { + cmd.overload().text("chunk").text("debug").execute([&](CommandOrigin const& origin, CommandOutput& output) { CHECK_COMMAND_TYPE(output, origin.getOriginType(), CommandOriginType::Player); CHECK_ChunkOperation_Permission(output, origin); try { @@ -155,7 +155,7 @@ void registerChunkCommand() { } catch (...) { output.error("[Chunk] unknown error!"_tr()); } - }>(); + }); // tools chunk backup [Vec3] cmd.overload() @@ -163,7 +163,7 @@ void registerChunkCommand() { .text("backup") .optional("pos") .required("dimentionId") - .execute<[&](CommandOrigin const& origin, CommandOutput& output, ArgPosAndDimid const& param) { + .execute([&](CommandOrigin const& origin, CommandOutput& output, ArgPosAndDimid const& param) { CHECK_COMMAND_TYPE( output, origin.getOriginType(), @@ -205,7 +205,7 @@ void registerChunkCommand() { } else { output.error("[Chunk] Failed to backup chunk!"_tr()); } - }>(); + }); // tools chunk restore [Vec3] cmd.overload() @@ -213,7 +213,7 @@ void registerChunkCommand() { .text("restore") .optional("pos") .required("dimentionId") - .execute<[&](CommandOrigin const& origin, CommandOutput& output, ArgPosAndDimid const& param) { + .execute([&](CommandOrigin const& origin, CommandOutput& output, ArgPosAndDimid const& param) { CHECK_COMMAND_TYPE( output, origin.getOriginType(), @@ -255,7 +255,7 @@ void registerChunkCommand() { } else { output.error("[Chunk] Failed to restore chunk!"_tr()); } - }>(); + }); // 选区相关命令 @@ -267,7 +267,7 @@ void registerChunkCommand() { .required("pos1") .required("pos2") .required("dimentionId") - .execute<[&](CommandOrigin const& origin, CommandOutput& output, ArgSelectPos const& param) { + .execute([&](CommandOrigin const& origin, CommandOutput& output, ArgSelectPos const& param) { CHECK_COMMAND_TYPE( output, origin.getOriginType(), @@ -287,7 +287,7 @@ void registerChunkCommand() { return; } output.success("[Chunk] Your id for this operation {}"_tr(id)); - }>(); + }); // tools chunk select backup cmd.overload() @@ -296,7 +296,7 @@ void registerChunkCommand() { .text("backup") .required("id") .required("fileName") - .execute<[&](CommandOrigin const& origin, CommandOutput& output, ArgSelectBackup const& param) { + .execute([&](CommandOrigin const& origin, CommandOutput& output, ArgSelectBackup const& param) { CHECK_COMMAND_TYPE( output, origin.getOriginType(), @@ -318,7 +318,7 @@ void registerChunkCommand() { } else { output.error("[Chunk] Invalid action id '{}', no access to bound data"_tr(param.id)); } - }>(); + }); // tools chunk select restore cmd.overload() @@ -326,7 +326,7 @@ void registerChunkCommand() { .text("select") .text("restore") .required("fileName") - .execute<[&](CommandOrigin const& origin, CommandOutput& output, ArgFileName const& param) { + .execute([&](CommandOrigin const& origin, CommandOutput& output, ArgFileName const& param) { CHECK_COMMAND_TYPE( output, origin.getOriginType(), @@ -341,16 +341,11 @@ void registerChunkCommand() { } else { output.error("[Chunk] Restore failed, please check and retry!"_tr()); } - }>(); + }); // tools chunk select copy - cmd.overload() - .text("chunk") - .text("select") - .text("copy") - .required("id") - .required("pos") - .execute<[&](CommandOrigin const& origin, CommandOutput& output, ArgChunkSelsctCopy const& param) { + cmd.overload().text("chunk").text("select").text("copy").required("id").required("pos").execute( + [&](CommandOrigin const& origin, CommandOutput& output, ArgChunkSelsctCopy const& param) { CHECK_COMMAND_TYPE( output, origin.getOriginType(), @@ -371,7 +366,8 @@ void registerChunkCommand() { } else { output.error("[Chunk] Invalid action id '{}', no access to bound data"_tr(param.id)); } - }>(); + } + ); // tools chunk select copy confirm [ignoreEntities] [dimentionId] cmd.overload() @@ -382,7 +378,7 @@ void registerChunkCommand() { .required("id") .optional("ignoreEntities") .optional("dimentionId") - .execute<[&](CommandOrigin const& origin, CommandOutput& output, ArgCopyConfirm const& param) { + .execute([&](CommandOrigin const& origin, CommandOutput& output, ArgCopyConfirm const& param) { CHECK_COMMAND_TYPE( output, origin.getOriginType(), @@ -413,7 +409,7 @@ void registerChunkCommand() { } else { output.error("[Chunk] Invalid action id '{}', no access to bound data"_tr(param.id)); } - }>(); + }); // McStructure @@ -424,7 +420,7 @@ void registerChunkCommand() { .text("structure") .text("load") .required("fileName") - .execute<[&](CommandOrigin const& origin, CommandOutput& output, ArgFileName const& param) { + .execute([&](CommandOrigin const& origin, CommandOutput& output, ArgFileName const& param) { CHECK_COMMAND_TYPE( output, origin.getOriginType(), @@ -444,7 +440,7 @@ void registerChunkCommand() { } else { output.error("[Chunk] Failed to load structure from file!"_tr()); } - }>(); + }); // tools chunk structure save [ignoreBlocks] [ignoreEntities] cmd.overload() @@ -455,7 +451,7 @@ void registerChunkCommand() { .required("fileName") .optional("ignoreBlocks") .optional("ignoreEntities") - .execute<[&](CommandOrigin const& origin, CommandOutput& output, SaveStructure const& param) { + .execute([&](CommandOrigin const& origin, CommandOutput& output, SaveStructure const& param) { CHECK_COMMAND_TYPE( output, origin.getOriginType(), @@ -493,7 +489,7 @@ void registerChunkCommand() { } else { output.error("[Chunk] Invalid action id '{}', no access to bound data"_tr(param.id)); } - }>(); + }); // tools chunk structure place [ignoreEntities] cmd.overload() @@ -504,7 +500,7 @@ void registerChunkCommand() { .required("pos") .required("dimentionId") .optional("ignoreEntities") - .execute<[&](CommandOrigin const& origin, CommandOutput& output, PlaceStructure const& param) { + .execute([&](CommandOrigin const& origin, CommandOutput& output, PlaceStructure const& param) { CHECK_COMMAND_TYPE( output, origin.getOriginType(), @@ -543,7 +539,7 @@ void registerChunkCommand() { } else { output.error("[Chunk] Invalid action id '{}', no access to bound data"_tr(param.id)); } - }>(); + }); // StructureTransform @@ -554,7 +550,7 @@ void registerChunkCommand() { .text("mirror") .required("id") .required("direction") - .execute<[&](CommandOrigin const& origin, CommandOutput& output, TransFormMirror const& param) { + .execute([&](CommandOrigin const& origin, CommandOutput& output, TransFormMirror const& param) { CHECK_COMMAND_TYPE( output, origin.getOriginType(), @@ -571,7 +567,7 @@ void registerChunkCommand() { } else { output.error("[Chunk] Invalid action id '{}', no access to bound data"_tr(param.id)); } - }>(); + }); // tools chunk transform rotate cmd.overload() @@ -580,7 +576,7 @@ void registerChunkCommand() { .text("rotate") .required("id") .required("angle") - .execute<[&](CommandOrigin const& origin, CommandOutput& output, TransFormRotate const& param) { + .execute([&](CommandOrigin const& origin, CommandOutput& output, TransFormRotate const& param) { CHECK_COMMAND_TYPE( output, origin.getOriginType(), @@ -597,14 +593,11 @@ void registerChunkCommand() { } else { output.error("[Chunk] Invalid action id '{}', no access to bound data"_tr(param.id)); } - }>(); + }); // tools chunk cancel - cmd.overload() - .text("chunk") - .text("cancel") - .required("id") - .execute<[&](CommandOrigin const& origin, CommandOutput& output, OnlyID const& param) { + cmd.overload().text("chunk").text("cancel").required("id").execute( + [&](CommandOrigin const& origin, CommandOutput& output, OnlyID const& param) { CHECK_COMMAND_TYPE( output, origin.getOriginType(), @@ -620,14 +613,15 @@ void registerChunkCommand() { } else { output.error("[Chunk] Invalid action id '{}', no access to bound data"_tr(param.id)); } - }>(); + } + ); // tools chunk operateid [id] cmd.overload() .text("chunk") .text("operateid") .optional("id") - .execute<[&](CommandOrigin const& origin, CommandOutput& output, OnlyID const& param) { + .execute([&](CommandOrigin const& origin, CommandOutput& output, OnlyID const& param) { CHECK_COMMAND_TYPE( output, origin.getOriginType(), @@ -659,7 +653,7 @@ void registerChunkCommand() { output.error("[Chunk] Invalid action id '{}', no access to bound data"_tr(param.id)); } } - }>(); + }); } } // namespace tls::command \ No newline at end of file diff --git a/src/Command/Command.cpp b/src/Command/Command.cpp index 2cca854..3e20c83 100644 --- a/src/Command/Command.cpp +++ b/src/Command/Command.cpp @@ -14,7 +14,7 @@ void registerCommand() { ); // tools - cmd.overload().execute<[&](CommandOrigin const& origin, CommandOutput& output) { + cmd.overload().execute([&](CommandOrigin const& origin, CommandOutput& output) { CHECK_COMMAND_TYPE(output, origin.getOriginType(), CommandOriginType::Player); if (!checkPlayerPermission(origin, output, tls::perms::indexForm)) { output.error("You don't have permission to use this command!"_tr()); @@ -23,20 +23,18 @@ void registerCommand() { Actor* entity = origin.getEntity(); auto& player = *static_cast(entity); // entity* => Player& tls::form::index(player); - }>(); + }); // tools reload - cmd.overload().text("reload").execute<[&](CommandOrigin const& origin, CommandOutput& output) { + cmd.overload().text("reload").execute([&](CommandOrigin const& origin, CommandOutput& output) { CHECK_COMMAND_TYPE(output, origin.getOriginType(), CommandOriginType::DedicatedServer); tls::config::loadConfig(); output.success("Config reloaded!"_tr()); - }>(); + }); // tools kill - cmd.overload() - .text("kill") - .required("player") - .execute<[&](CommandOrigin const& origin, CommandOutput& output, Arg_Player const& param) { + cmd.overload().text("kill").required("player").execute( + [&](CommandOrigin const& origin, CommandOutput& output, Arg_Player const& param) { CHECK_COMMAND_TYPE(output, origin.getOriginType(), CommandOriginType::Player); if (!checkPlayerPermission(origin, output, tls::perms::KillPlayer)) { output.error("You don't have permission to use this command!"_tr()); @@ -52,14 +50,12 @@ void registerCommand() { tls::utils::sendMsg(player, "try kill player: {}"_tr(target->getRealName())); } } - }>(); + } + ); // tools kick [Msg] - cmd.overload() - .text("kick") - .required("player") - .optional("message") - .execute<[&](CommandOrigin const& origin, CommandOutput& output, Args_Player_Msg const& param) { + cmd.overload().text("kick").required("player").optional("message").execute( + [&](CommandOrigin const& origin, CommandOutput& output, Args_Player_Msg const& param) { CHECK_COMMAND_TYPE(output, origin.getOriginType(), CommandOriginType::Player); if (!checkPlayerPermission(origin, output, tls::perms::KickPlayer)) { output.error("You don't have permission to use this command!"_tr()); @@ -75,13 +71,12 @@ void registerCommand() { tls::utils::sendMsg(player, "try kick player: {}"_tr(target->getRealName())); } } - }>(); + } + ); // tools crash - cmd.overload() - .text("crash") - .required("player") - .execute<[&](CommandOrigin const& origin, CommandOutput& output, Arg_Player const& param) { + cmd.overload().text("crash").required("player").execute( + [&](CommandOrigin const& origin, CommandOutput& output, Arg_Player const& param) { CHECK_COMMAND_TYPE(output, origin.getOriginType(), CommandOriginType::Player); if (!checkPlayerPermission(origin, output, tls::perms::CrashPlayerClient)) { output.error("You don't have permission to use this command!"_tr()); @@ -100,14 +95,12 @@ void registerCommand() { tls::utils::sendMsg(player, "try crash player: {}"_tr(name)); } } - }>(); + } + ); // tools talkas - cmd.overload() - .text("talkas") - .required("player") - .required("message") - .execute<[&](CommandOrigin const& origin, CommandOutput& output, Args_Player_Msg const& param) { + cmd.overload().text("talkas").required("player").required("message").execute( + [&](CommandOrigin const& origin, CommandOutput& output, Args_Player_Msg const& param) { CHECK_COMMAND_TYPE(output, origin.getOriginType(), CommandOriginType::Player); if (!checkPlayerPermission(origin, output, tls::perms::UsePlayerIdentitySay)) { output.error("You don't have permission to use this command!"_tr()); @@ -134,13 +127,14 @@ void registerCommand() { tls::utils::sendMsg(player, "try talkas player: {}"_tr(target->getRealName())); } } - }>(); + } + ); // tools broadcast cmd.overload() .text("broadcast") .required("message") - .execute<[&](CommandOrigin const& origin, CommandOutput& output, Arg_Msg const& param) { + .execute([&](CommandOrigin const& origin, CommandOutput& output, Arg_Msg const& param) { CHECK_COMMAND_TYPE(output, origin.getOriginType(), CommandOriginType::Player); if (!checkPlayerPermission(origin, output, tls::perms::BroadCastMessage)) { output.error("You don't have permission to use this command!"_tr()); @@ -157,13 +151,13 @@ void registerCommand() { }); } tls::utils::sendMsg(player, "try broadcast message: {}"_tr(param.message)); - }>(); + }); // tools setmaxplayers cmd.overload() .text("setmaxplayers") .required("maxPlayers") - .execute<[&](CommandOrigin const& origin, CommandOutput& output, SetServerMaxPlayers const& param) { + .execute([&](CommandOrigin const& origin, CommandOutput& output, SetServerMaxPlayers const& param) { CHECK_COMMAND_TYPE(output, origin.getOriginType(), CommandOriginType::Player); if (!checkPlayerPermission(origin, output, tls::perms::SetServerMaxPlayer)) { output.error("You don't have permission to use this command!"_tr()); @@ -173,7 +167,7 @@ void registerCommand() { int back = ll::service::getServerNetworkHandler()->setMaxNumPlayers(param.maxPlayers); ll::service::getServerNetworkHandler()->updateServerAnnouncement(); output.success("Max players set to {}, previous value is {}"_tr(param.maxPlayers, back)); - }>(); + }); } } // namespace tls::command diff --git a/src/Command/GamemodeCommand.cpp b/src/Command/GamemodeCommand.cpp index 71cb5b0..6498730 100644 --- a/src/Command/GamemodeCommand.cpp +++ b/src/Command/GamemodeCommand.cpp @@ -83,21 +83,21 @@ void registerGamemodeCommand() { config::cfg.command.tools.commandDescription ); // tools gm [player] - tools.overload().text("gm").required("gameType").optional("player").execute(); + tools.overload().text("gm").required("gameType").optional("player").execute(Gm_Int_CallBack); // tools gm [player] tools.overload() .text("gm") .required("gameType") .optional("player") - .execute(); + .execute(Gm_String_Brief_CallBack); // tools gm [player] tools.overload() .text("gm") .required("gameType") .optional("player") - .execute(); + .execute(Gm_String_Full_CallBack); if (config::cfg.command.gm.enable) { auto& gm = ll::command::CommandRegistrar::getInstance().getOrCreateCommand( @@ -105,16 +105,13 @@ void registerGamemodeCommand() { config::cfg.command.gm.commandDescription ); // gm [player] - gm.overload().required("gameType").optional("player").execute(); + gm.overload().required("gameType").optional("player").execute(Gm_Int_CallBack); // gm [player] - gm.overload() - .required("gameType") - .optional("player") - .execute(); + gm.overload().required("gameType").optional("player").execute(Gm_String_Brief_CallBack); // gm [player] - gm.overload().required("gameType").optional("player").execute(); + gm.overload().required("gameType").optional("player").execute(Gm_String_Full_CallBack); } } diff --git a/src/Command/TeleportCommand.cpp b/src/Command/TeleportCommand.cpp index 024bbc5..91510d6 100644 --- a/src/Command/TeleportCommand.cpp +++ b/src/Command/TeleportCommand.cpp @@ -35,7 +35,7 @@ void registerTeleportCommand() { .text("teleport") .required("player") .optional("target") - .execute<[&](CommandOrigin const& origin, CommandOutput& output, TeleportToPlayer const& param) { + .execute([&](CommandOrigin const& origin, CommandOutput& output, TeleportToPlayer const& param) { CHECK_COMMAND_TYPE( output, origin.getOriginType(), @@ -73,7 +73,7 @@ void registerTeleportCommand() { output.error("You have to choose a target player!"_tr()); } } - }>(); + }); // tools teleport [dimension] tools.overload() @@ -81,7 +81,7 @@ void registerTeleportCommand() { .required("player") .required("pos") .optional("dimension") - .execute<[&](CommandOrigin const& origin, CommandOutput& output, TeleportToPosition const& param) { + .execute([&](CommandOrigin const& origin, CommandOutput& output, TeleportToPosition const& param) { CHECK_COMMAND_TYPE( output, origin.getOriginType(), @@ -107,7 +107,7 @@ void registerTeleportCommand() { ); output.success("Teleported {} to {}!"_tr(p->getRealName(), pos.toString())); } - }>(); + }); } } // namespace tls::command \ No newline at end of file