Skip to content

Commit 375f998

Browse files
ShrBoxShrBox
committed
refactor: remove useless else
1 parent c5464c6 commit 375f998

33 files changed

+247
-301
lines changed

‎src-client/lse/PluginManager.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,9 +248,8 @@ ll::Expected<> PluginManager::enable(std::string_view name) {
248248
NodeJsHelper::stopEngine(scriptEngine);
249249
#endif
250250
return error;
251-
} else {
252-
return ll::makeStringError("Failed to enable plugin {0}: {1}"_tr(manifest.name, "ScriptEngine is nullptr"));
253251
}
252+
return ll::makeStringError("Failed to enable plugin {0}: {1}"_tr(manifest.name, "ScriptEngine is nullptr"));
254253
}
255254
}
256255

‎src-server/lse/PluginManager.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,9 +240,8 @@ ll::Expected<> PluginManager::load(ll::mod::Manifest manifest) {
240240
NodeJsHelper::stopEngine(scriptEngine);
241241
#endif
242242
return error;
243-
} else {
244-
return ll::makeStringError("Failed to load plugin {0}: {1}"_tr(manifest.name, "ScriptEngine is nullptr"));
245243
}
244+
return ll::makeStringError("Failed to load plugin {0}: {1}"_tr(manifest.name, "ScriptEngine is nullptr"));
246245
}
247246
}
248247

‎src/legacy/api/BaseAPI.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Local<Object> IntPos::newPos(BlockPos const* b, BlockSource const* bs) {
8484
IntPos* IntPos::extractPos(Local<Value> const& v) {
8585
if (EngineScope::currentEngine()->isInstanceOf<IntPos>(v))
8686
return EngineScope::currentEngine()->getNativeInstance<IntPos>(v);
87-
else return nullptr;
87+
return nullptr;
8888
}
8989

9090
Local<Value> IntPos::getDim() const { return String::newString(DimId2Name(dim)); }
@@ -123,7 +123,7 @@ Local<Object> FloatPos::newPos(FloatVec4 const& v) { return FloatPos::newPos(v.x
123123
FloatPos* FloatPos::extractPos(Local<Value> const& v) {
124124
if (EngineScope::currentEngine()->isInstanceOf<FloatPos>(v))
125125
return EngineScope::currentEngine()->getNativeInstance<FloatPos>(v);
126-
else return nullptr;
126+
return nullptr;
127127
}
128128

129129
Local<Value> FloatPos::getDim() const {
@@ -169,7 +169,7 @@ DirectionAngle* DirectionAngle::create(Arguments const& args) {
169169
DirectionAngle* DirectionAngle::extract(Local<Value> const& v) {
170170
if (EngineScope::currentEngine()->isInstanceOf<DirectionAngle>(v))
171171
return EngineScope::currentEngine()->getNativeInstance<DirectionAngle>(v);
172-
else return nullptr;
172+
return nullptr;
173173
}
174174

175175
Local<Value> DirectionAngle::toString() {

‎src/legacy/api/BlockAPI.cpp‎

Lines changed: 20 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ Local<Object> BlockClass::newBlock(IntVec4 pos) {
131131
Block const* BlockClass::extract(Local<Value> const& v) {
132132
if (EngineScope::currentEngine()->isInstanceOf<BlockClass>(v))
133133
return EngineScope::currentEngine()->getNativeInstance<BlockClass>(v)->get();
134-
else return nullptr;
134+
return nullptr;
135135
}
136136

137137
Local<Value> BlockClass::getName() const {
@@ -417,16 +417,12 @@ Local<Value> McClass::getBlock(Arguments const& args) {
417417
// IntPos
418418
IntPos* posObj = IntPos::extractPos(args[0]);
419419
if (posObj->dim < 0) return {};
420-
else {
421-
pos = static_cast<IntVec4>(*posObj);
422-
}
420+
pos = static_cast<IntVec4>(*posObj);
423421
} else if (IsInstanceOf<FloatPos>(args[0])) {
424422
// FloatPos
425423
FloatPos* posObj = FloatPos::extractPos(args[0]);
426424
if (posObj->dim < 0) return {};
427-
else {
428-
pos = posObj->toIntVec4();
429-
}
425+
pos = posObj->toIntVec4();
430426
} else {
431427
throw WrongArgTypeException(__FUNCTION__);
432428
}
@@ -488,18 +484,14 @@ Local<Value> McClass::setBlock(Arguments const& args) {
488484
// IntPos
489485
IntPos* posObj = IntPos::extractPos(args[0]);
490486
if (posObj->dim < 0) return Boolean::newBoolean(false);
491-
else {
492-
pos = static_cast<IntVec4>(*posObj);
493-
block = args[1];
494-
}
487+
pos = static_cast<IntVec4>(*posObj);
488+
block = args[1];
495489
} else if (IsInstanceOf<FloatPos>(args[0])) {
496490
// FloatPos
497491
FloatPos* posObj = FloatPos::extractPos(args[0]);
498492
if (posObj->dim < 0) return Boolean::newBoolean(false);
499-
else {
500-
pos = posObj->toIntVec4();
501-
block = args[1];
502-
}
493+
pos = posObj->toIntVec4();
494+
block = args[1];
503495
} else {
504496
throw WrongArgTypeException(__FUNCTION__);
505497
}
@@ -536,7 +528,8 @@ Local<Value> McClass::setBlock(Arguments const& args) {
536528
return Boolean::newBoolean(
537529
bs.setBlock(pos.getBlockPos(), bl, 3, nullptr, nullptr, BlockChangeContext(false))
538530
);
539-
} else if (IsInstanceOf<NbtCompoundClass>(block)) {
531+
}
532+
if (IsInstanceOf<NbtCompoundClass>(block)) {
540533
// Nbt
541534
auto nbt = NbtCompoundClass::extract(block);
542535
optional_ref<Block const> bl = Block::tryGetFromRegistry(*nbt);
@@ -548,18 +541,14 @@ Local<Value> McClass::setBlock(Arguments const& args) {
548541
return Boolean::newBoolean(
549542
bs.setBlock(pos.getBlockPos(), bl, 3, nullptr, nullptr, BlockChangeContext(false))
550543
);
551-
} else {
552-
// other block object
553-
Block const* bl = BlockClass::extract(block);
554-
if (!bl) {
555-
throw WrongArgTypeException(__FUNCTION__);
556-
}
557-
BlockSource& bs =
558-
ll::service::getLevel()->getDimension(pos.dim).lock()->getBlockSourceFromMainChunkSource();
559-
return Boolean::newBoolean(
560-
bs.setBlock(pos.getBlockPos(), *bl, 3, nullptr, nullptr, BlockChangeContext(false))
561-
);
562544
}
545+
// other block object
546+
Block const* bl = BlockClass::extract(block);
547+
if (!bl) {
548+
throw WrongArgTypeException(__FUNCTION__);
549+
}
550+
BlockSource& bs = ll::service::getLevel()->getDimension(pos.dim).lock()->getBlockSourceFromMainChunkSource();
551+
return Boolean::newBoolean(bs.setBlock(pos.getBlockPos(), *bl, 3, nullptr, nullptr, BlockChangeContext(false)));
563552
}
564553
CATCH_AND_THROW
565554
}
@@ -579,18 +568,14 @@ Local<Value> McClass::spawnParticle(Arguments const& args) {
579568
// IntPos
580569
IntPos* posObj = IntPos::extractPos(args[0]);
581570
if (posObj->dim < 0) return Boolean::newBoolean(false);
582-
else {
583-
pos = *posObj;
584-
type = args[1];
585-
}
571+
pos = *posObj;
572+
type = args[1];
586573
} else if (IsInstanceOf<FloatPos>(args[0])) {
587574
// FloatPos
588575
FloatPos* posObj = FloatPos::extractPos(args[0]);
589576
if (posObj->dim < 0) return Boolean::newBoolean(false);
590-
else {
591-
pos = static_cast<FloatVec4>(*posObj);
592-
type = args[1];
593-
}
577+
pos = static_cast<FloatVec4>(*posObj);
578+
type = args[1];
594579
} else {
595580
throw WrongArgTypeException(__FUNCTION__);
596581
}

‎src/legacy/api/BlockEntityAPI.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Local<Object> BlockEntityClass::newBlockEntity(BlockActor* be, int dim) {
4242
BlockActor* BlockEntityClass::extract(Local<Value> const& v) {
4343
if (EngineScope::currentEngine()->isInstanceOf<BlockEntityClass>(v))
4444
return EngineScope::currentEngine()->getNativeInstance<BlockEntityClass>(v)->get();
45-
else return nullptr;
45+
return nullptr;
4646
}
4747

4848
// 成员函数

‎src/legacy/api/CommandAPI.cpp‎

Lines changed: 40 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,18 @@ Local<Value> convertResult(ParamStorageType const& result, CommandOrigin const&
8585
if (!result.has_value()) return {};
8686
if (result.hold(ParamKind::Kind::Enum)) {
8787
return String::newString(std::get<RuntimeEnum>(result.value()).name);
88-
} else if (result.hold(ParamKind::Kind::SoftEnum)) {
88+
}
89+
if (result.hold(ParamKind::Kind::SoftEnum)) {
8990
return String::newString(std::get<RuntimeSoftEnum>(result.value()));
90-
} else if (result.hold(ParamKind::Kind::BlockName)) {
91+
}
92+
if (result.hold(ParamKind::Kind::BlockName)) {
9193
return BlockClass::newBlock(
9294
*std::get<CommandBlockName>(result.value()).resolveBlock(0).mBlock,
9395
BlockPos::MIN(),
9496
-1
9597
);
96-
} else if (result.hold(ParamKind::Kind::Item)) {
98+
}
99+
if (result.hold(ParamKind::Kind::Item)) {
97100
auto item = std::make_unique<ItemStack>();
98101
item->reinit(
99102
ll::service::getLevel()->getItemRegistry().getNameFromLegacyID(std::get<CommandItem>(result.value()).mId),
@@ -102,57 +105,71 @@ Local<Value> convertResult(ParamStorageType const& result, CommandOrigin const&
102105
);
103106
return ItemClass::newItem(std::move(item));
104107

105-
} else if (result.hold(ParamKind::Kind::Actor)) {
108+
}
109+
if (result.hold(ParamKind::Kind::Actor)) {
106110
auto arr = Array::newArray();
107111
for (auto i : std::get<CommandSelector<Actor>>(result.value()).results(origin)) {
108112
arr.add(EntityClass::newEntity(i));
109113
}
110114
return arr;
111-
} else if (result.hold(ParamKind::Kind::Player)) {
115+
}
116+
if (result.hold(ParamKind::Kind::Player)) {
112117
auto arr = Array::newArray();
113118
for (auto i : std::get<CommandSelector<Player>>(result.value()).results(origin)) {
114119
arr.add(PlayerClass::newPlayer(i));
115120
}
116121
return arr;
117-
} else if (result.hold(ParamKind::Kind::BlockPos)) {
122+
}
123+
if (result.hold(ParamKind::Kind::BlockPos)) {
118124
auto dim = origin.getDimension();
119125
return IntPos::newPos(
120126
std::get<CommandPosition>(result.value())
121127
.getBlockPos(CommandVersion::CurrentVersion(), origin, Vec3::ZERO()),
122128
dim ? dim->getDimensionId().id : -1
123129
);
124-
} else if (result.hold(ParamKind::Kind::Vec3)) {
130+
}
131+
if (result.hold(ParamKind::Kind::Vec3)) {
125132
auto dim = origin.getDimension();
126133
return FloatPos::newPos(
127134
std::get<CommandPositionFloat>(result.value())
128135
.getPosition(CommandVersion::CurrentVersion(), origin, Vec3::ZERO()),
129136
dim ? dim->getDimensionId().id : -1
130137
);
131-
} else if (result.hold(ParamKind::Kind::Message)) {
138+
}
139+
if (result.hold(ParamKind::Kind::Message)) {
132140
return String::newString(
133141
std::get<CommandMessage>(result.value())
134142
.generateMessage(origin, CommandVersion::CurrentVersion())
135143
.mMessage->c_str()
136144
);
137-
} else if (result.hold(ParamKind::Kind::RawText)) {
145+
}
146+
if (result.hold(ParamKind::Kind::RawText)) {
138147
return String::newString(std::get<CommandRawText>(result.value()).mText);
139-
} else if (result.hold(ParamKind::Kind::JsonValue)) {
148+
}
149+
if (result.hold(ParamKind::Kind::JsonValue)) {
140150
return String::newString(Json::FastWriter().write(std::get<Json::Value>(result.value())));
141-
} else if (result.hold(ParamKind::Kind::Effect)) {
151+
}
152+
if (result.hold(ParamKind::Kind::Effect)) {
142153
return String::newString(std::get<MobEffect const*>(result.value())->mResourceName);
143-
} else if (result.hold(ParamKind::Kind::Command)) {
154+
}
155+
if (result.hold(ParamKind::Kind::Command)) {
144156
return String::newString(std::get<std::unique_ptr<::Command>>(result.value())->getCommandName());
145-
} else if (result.hold(ParamKind::Kind::ActorType)) {
157+
}
158+
if (result.hold(ParamKind::Kind::ActorType)) {
146159
return String::newString(
147160
std::get<ActorDefinitionIdentifier const*>(result.value())->mCanonicalName->getString()
148161
);
149-
} else if (result.hold(ParamKind::Kind::Bool)) {
162+
}
163+
if (result.hold(ParamKind::Kind::Bool)) {
150164
return Boolean::newBoolean(std::get<bool>(result.value()));
151-
} else if (result.hold(ParamKind::Kind::Int)) {
165+
}
166+
if (result.hold(ParamKind::Kind::Int)) {
152167
return Number::newNumber(std::get<int>(result.value()));
153-
} else if (result.hold(ParamKind::Kind::Float)) {
168+
}
169+
if (result.hold(ParamKind::Kind::Float)) {
154170
return Number::newNumber(std::get<float>(result.value()));
155-
} else if (result.hold(ParamKind::Kind::String)) {
171+
}
172+
if (result.hold(ParamKind::Kind::String)) {
156173
return String::newString(std::get<std::string>(result.value()));
157174
}
158175
return {};
@@ -164,7 +181,8 @@ std::enable_if_t<std::is_enum_v<T>, T> parseEnum(Local<Value> const& value) {
164181
auto tmp = magic_enum::enum_cast<T>(value.asString().toString());
165182
if (!tmp.has_value()) throw std::runtime_error("Unable to parse Enum value");
166183
return tmp.value();
167-
} else if (value.isNumber()) {
184+
}
185+
if (value.isNumber()) {
168186
return static_cast<T>(value.asNumber().toInt32());
169187
}
170188
throw std::runtime_error("Unable to parse Enum value");
@@ -313,9 +331,8 @@ Local<Value> CommandClass::setAlias(Arguments const& args) {
313331
co_return;
314332
}).launch(ll::thread::ServerThreadExecutor::getDefault());
315333
return Boolean::newBoolean(true);
316-
} else {
317-
get().alias(alias);
318334
}
335+
get().alias(alias);
319336
return Boolean::newBoolean(true);
320337
}
321338
CATCH_AND_THROW
@@ -340,10 +357,9 @@ Local<Value> CommandClass::setEnum(Arguments const& args) {
340357
co_return;
341358
}).launch(ll::thread::ServerThreadExecutor::getDefault());
342359
return String::newString(enumName);
343-
} else {
344-
if (CommandRegistrar::getInstance(false).tryRegisterRuntimeEnum(enumName, std::move(enumValues))) {
345-
return String::newString(enumName);
346-
}
360+
}
361+
if (CommandRegistrar::getInstance(false).tryRegisterRuntimeEnum(enumName, std::move(enumValues))) {
362+
return String::newString(enumName);
347363
}
348364
return {};
349365
}

‎src/legacy/api/ContainerAPI.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Local<Object> ContainerClass::newContainer(Container* p) {
4141
Container* ContainerClass::extract(Local<Value> const& v) {
4242
if (EngineScope::currentEngine()->isInstanceOf<ContainerClass>(v))
4343
return EngineScope::currentEngine()->getNativeInstance<ContainerClass>(v)->get();
44-
else return nullptr;
44+
return nullptr;
4545
}
4646

4747
// 成员函数

0 commit comments

Comments
 (0)