Skip to content

Commit fdb921a

Browse files
ShrBoxShrBox
committed
chore: solve some warn
1 parent df874e1 commit fdb921a

1 file changed

Lines changed: 23 additions & 28 deletions

File tree

‎src/legacy/api/CommandAPI.cpp‎

Lines changed: 23 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ std::enable_if_t<std::is_enum_v<T>, T> parseEnum(Local<Value> const& value) {
162162
if (!tmp.has_value()) throw std::runtime_error("Unable to parse Enum value");
163163
return tmp.value();
164164
} else if (value.isNumber()) {
165-
return (T)value.asNumber().toInt32();
165+
return static_cast<T>(value.asNumber().toInt32());
166166
}
167167
throw std::runtime_error("Unable to parse Enum value");
168168
}
@@ -198,7 +198,7 @@ Local<Value> McClass::runcmdEx(const Arguments& args) {
198198
auto command = ll::service::getMinecraft()->mCommands->compileCommand(
199199
args[0].asString().toString(),
200200
origin,
201-
(CurrentCmdVersion)CommandVersion::CurrentVersion(),
201+
static_cast<CurrentCmdVersion>(CommandVersion::CurrentVersion()),
202202
[&](std::string const& err) { outputStr.append(err).append("\n"); }
203203
);
204204
Local<Object> resObj = Object::newObject();
@@ -238,13 +238,13 @@ Local<Value> McClass::newCommand(const Arguments& args) {
238238

239239
auto desc = args[1].asString().toString();
240240
CommandPermissionLevel permission = CommandPermissionLevel::Admin;
241-
CommandFlag flag = {(CommandFlagValue)0x80};
241+
CommandFlag flag = {static_cast<CommandFlagValue>(0x80)};
242242
std::string alias;
243243
if (args.size() > 2) {
244-
permission = (CommandPermissionLevel)parseEnum<OldCommandPermissionLevel>(args[2]);
244+
permission = static_cast<CommandPermissionLevel>(parseEnum<OldCommandPermissionLevel>(args[2]));
245245
if (args.size() > 3) {
246246
CHECK_ARG_TYPE(args[3], ValueKind::kNumber);
247-
flag = {(CommandFlagValue)args[3].asNumber().toInt32()};
247+
flag = {static_cast<CommandFlagValue>(args[3].asNumber().toInt32())};
248248
if (args.size() > 4) {
249249
CHECK_ARG_TYPE(args[4], ValueKind::kString);
250250
alias = args[4].asString().toString();
@@ -256,10 +256,8 @@ Local<Value> McClass::newCommand(const Arguments& args) {
256256
CommandPermissionLevel const& permission,
257257
CommandFlag const& flag,
258258
std::string const& alias) {
259-
auto registry = ll::service::getCommandRegistry();
260-
if (registry) {
261-
auto instance = registry->findCommand(name);
262-
if (instance) {
259+
if (auto registry = ll::service::getCommandRegistry()) {
260+
if (registry->findCommand(name)) {
263261
lse::LegacyScriptEngine::getLogger().warn(
264262
"Runtime command {} already exists, changes will not beapplied except for setOverload!"_tr(name)
265263
);
@@ -308,7 +306,7 @@ Local<Value> CommandClass::setAlias(const Arguments& args) {
308306
std::string alias = args[0].asString().toString();
309307
if (ll::getGamingStatus() == ll::GamingStatus::Starting) {
310308
ll::coro::keepThis([commandName(commandName), alias]() -> ll::coro::CoroTask<> {
311-
ll::command::CommandRegistrar::getInstance(false).getOrCreateCommand(commandName).alias(alias);
309+
CommandRegistrar::getInstance(false).getOrCreateCommand(commandName).alias(alias);
312310
co_return;
313311
}).launch(ll::thread::ServerThreadExecutor::getDefault());
314312
return Boolean::newBoolean(true);
@@ -351,7 +349,7 @@ Local<Value> CommandClass::setEnum(const Arguments& args) {
351349

352350
void onExecute(CommandOrigin const& origin, CommandOutput& output, RuntimeCommand const& runtime) {
353351
std::string commandName = runtime.getCommandName();
354-
if (localShareData->commandCallbacks.find(commandName) == localShareData->commandCallbacks.end()) {
352+
if (!localShareData->commandCallbacks.contains(commandName)) {
355353
lse::LegacyScriptEngine::getLogger().warn(
356354
"Command {} failed to execute, is the plugin unloaded?"_tr(commandName)
357355
);
@@ -365,10 +363,8 @@ void onExecute(CommandOrigin const& origin, CommandOutput& output, RuntimeComman
365363
auto* outp = new CommandOutputClass(std::make_shared<CommandOutput>(output), ori->get());
366364

367365
auto& registeredCommands = getEngineOwnData()->plugin->registeredCommands;
368-
if (registeredCommands.find(commandName) == registeredCommands.end()) {
369-
lse::LegacyScriptEngine::getLogger().warn(
370-
"Could not find {} in registered commands."_tr(commandName)
371-
);
366+
if (!registeredCommands.contains(commandName)) {
367+
lse::LegacyScriptEngine::getLogger().warn("Could not find {} in registered commands."_tr(commandName));
372368
return;
373369
}
374370
for (auto& info : registeredCommands[commandName]) {
@@ -411,7 +407,7 @@ Local<Value> CommandClass::newParameter(const Arguments& args) {
411407
CHECK_ARG_TYPE(args[0], ValueKind::kString);
412408
try {
413409
auto name = args[0].asString().toString();
414-
ParamKind::Kind type = (ParamKind::Kind)parseEnum<OldParameterType>(args[1]);
410+
ParamKind::Kind type = static_cast<ParamKind::Kind>(parseEnum<OldParameterType>(args[1]));
415411
std::string enumName = "";
416412
bool optional = false;
417413
std::string identifier = "";
@@ -421,7 +417,7 @@ Local<Value> CommandClass::newParameter(const Arguments& args) {
421417
if (args.size() > index && args[index].isString()) enumName = args[index++].asString().toString();
422418
if (args.size() > index && args[index].isString()) identifier = args[index++].asString().toString();
423419
if (args.size() > index && args[index].isNumber())
424-
option = (CommandParameterOption)args[index++].asNumber().toInt32();
420+
option = static_cast<CommandParameterOption>(args[index++].asNumber().toInt32());
425421
if (index != args.size()) throw std::runtime_error("Error Argument in newParameter");
426422

427423
getEngineOwnData()->plugin->registeredCommands[commandName].push_back(
@@ -440,15 +436,15 @@ Local<Value> CommandClass::mandatory(const Arguments& args) {
440436
CHECK_ARG_TYPE(args[0], ValueKind::kString);
441437
try {
442438
auto name = args[0].asString().toString();
443-
ParamKind::Kind type = (ParamKind::Kind)parseEnum<OldParameterType>(args[1]);
439+
ParamKind::Kind type = static_cast<ParamKind::Kind>(parseEnum<OldParameterType>(args[1]));
444440
std::string enumName = "";
445441
std::string identifier = "";
446442
size_t index = 2;
447443
CommandParameterOption option = CommandParameterOption::None;
448444
if (args.size() > index && args[index].isString()) enumName = args[index++].asString().toString();
449445
if (args.size() > index && args[index].isString()) identifier = args[index++].asString().toString();
450446
if (args.size() > index && args[index].isNumber())
451-
option = (CommandParameterOption)args[index++].asNumber().toInt32();
447+
option = static_cast<CommandParameterOption>(args[index++].asNumber().toInt32());
452448
if (index != args.size()) throw std::runtime_error("Error Argument in newParameter");
453449

454450
getEngineOwnData()->plugin->registeredCommands[commandName].push_back(
@@ -467,15 +463,15 @@ Local<Value> CommandClass::optional(const Arguments& args) {
467463
CHECK_ARG_TYPE(args[0], ValueKind::kString);
468464
try {
469465
auto name = args[0].asString().toString();
470-
ParamKind::Kind type = (ParamKind::Kind)parseEnum<OldParameterType>(args[1]);
466+
ParamKind::Kind type = static_cast<ParamKind::Kind>(parseEnum<OldParameterType>(args[1]));
471467
std::string enumName = "";
472468
std::string identifier = "";
473469
size_t index = 2;
474470
CommandParameterOption option = CommandParameterOption::None;
475471
if (args.size() > index && args[index].isString()) enumName = args[index++].asString().toString();
476472
if (args.size() > index && args[index].isString()) identifier = args[index++].asString().toString();
477473
if (args.size() > index && args[index].isNumber())
478-
option = (CommandParameterOption)args[index++].asNumber().toInt32();
474+
option = static_cast<CommandParameterOption>(args[index++].asNumber().toInt32());
479475
if (index != args.size()) throw std::runtime_error("Error Argument in newParameter");
480476

481477
getEngineOwnData()->plugin->registeredCommands[commandName].push_back(
@@ -517,7 +513,7 @@ Local<Value> CommandClass::addOverload(const Arguments& args) {
517513
ll::coro::keepThis(
518514
[paramNames, commandName(commandName), overloadFunc, e(EngineScope::currentEngine())]()
519515
-> ll::coro::CoroTask<> {
520-
auto cmd = ll::command::CommandRegistrar::getInstance(false)
516+
auto cmd = CommandRegistrar::getInstance(false)
521517
.getOrCreateCommand(commandName)
522518
.runtimeOverload(getEngineData(e)->plugin);
523519
for (auto& paramName : paramNames) {
@@ -533,7 +529,7 @@ Local<Value> CommandClass::addOverload(const Arguments& args) {
533529
ll::coro::keepThis(
534530
[commandName(commandName), e(EngineScope::currentEngine())]() -> ll::coro::CoroTask<> {
535531
getEngineData(e)->plugin->registeredCommands[commandName].push_back({});
536-
auto cmd = ll::command::CommandRegistrar::getInstance(false)
532+
auto cmd = CommandRegistrar::getInstance(false)
537533
.getOrCreateCommand(commandName)
538534
.runtimeOverload(getEngineData(e)->plugin);
539535
cmd.execute(onExecute);
@@ -591,7 +587,7 @@ Local<Value> CommandClass::addOverload(const Arguments& args) {
591587
ll::coro::keepThis(
592588
[commandName(commandName), e(EngineScope::currentEngine())]() -> ll::coro::CoroTask<> {
593589
getEngineData(e)->plugin->registeredCommands[commandName].push_back({});
594-
auto cmd = ll::command::CommandRegistrar::getInstance(false)
590+
auto cmd = CommandRegistrar::getInstance(false)
595591
.getOrCreateCommand(commandName)
596592
.runtimeOverload(getEngineData(e)->plugin);
597593
cmd.execute(onExecute);
@@ -746,12 +742,11 @@ Local<Value> CommandClass::getSoftEnumValues(const Arguments& args) {
746742
CHECK_ARGS_COUNT(args, 1);
747743
CHECK_ARG_TYPE(args[0], ValueKind::kString);
748744
try {
749-
auto name = args[0].asString().toString();
750-
auto registry = ll::service::getCommandRegistry();
751-
if (registry) {
745+
auto name = args[0].asString().toString();
746+
if (auto registry = ll::service::getCommandRegistry()) {
752747
auto& lookup = registry->mSoftEnumLookup;
753748
auto& softEnums = registry->mSoftEnums;
754-
if (lookup.find(name) != lookup.end()) {
749+
if (lookup.contains(name)) {
755750
return getStringArray(softEnums[lookup[name]].mValues);
756751
}
757752
}

0 commit comments

Comments
 (0)