Skip to content

Commit c5464c6

Browse files
ShrBoxShrBox
committed
refactor: replace return Local<Value>(); with return {}; 
1 parent 98d74fa commit c5464c6

18 files changed

+373
-370
lines changed

‎src/legacy/api/APIHelp.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ Local<Value> BigInteger_Helper(ordered_json const& i) {
202202
}
203203
return Number::newNumber(i.get<int64_t>());
204204
}
205-
return Local<Value>();
205+
return {};
206206
}
207207

208208
void JsonToValue_Helper(Local<Array> const& res, ordered_json& j);

‎src/legacy/api/BlockAPI.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ Local<Value> BlockClass::setNbt(Arguments const& args) {
299299

300300
try {
301301
auto nbt = NbtCompoundClass::extract(args[0]);
302-
if (!nbt) return Local<Value>(); // Null
302+
if (!nbt) return {}; // Null
303303

304304
// update Pre Data
305305
auto result = BlockSerializationUtils::tryGetBlockFromNBT(*nbt, nullptr);

‎src/legacy/api/BlockEntityAPI.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Local<Value> BlockEntityClass::setNbt(Arguments const& args) const {
8383
try {
8484
auto nbt = NbtCompoundClass::extract(args[0]);
8585
if (!nbt) {
86-
return Local<Value>();
86+
return {};
8787
}
8888
blockEntity->load(*ll::service::getLevel(), *nbt, MoreGlobal::defaultDataLoadHelper());
8989
return Boolean::newBoolean(true);

‎src/legacy/api/CommandAPI.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ Local<Value> CommandClass::setEnum(Arguments const& args) {
329329
try {
330330
auto enumName = args[0].asString().toString();
331331
auto enumArr = args[1].asArray();
332-
if (enumArr.size() == 0 || !enumArr.get(0).isString()) return Local<Value>();
332+
if (enumArr.size() == 0 || !enumArr.get(0).isString()) return {};
333333
std::vector<std::pair<std::string, uint64>> enumValues;
334334
for (int i = 0; i < enumArr.size(); ++i) {
335335
enumValues.push_back({enumArr.get(i).asString().toString(), i});

‎src/legacy/api/CommandOriginAPI.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ Local<Value> CommandOriginClass::getPosition() {
7676
Local<Value> CommandOriginClass::getEntity() {
7777
try {
7878
auto entity = get()->getEntity();
79-
if (!entity) return Local<Value>();
79+
if (!entity) return {};
8080
return EntityClass::newEntity(entity);
8181
}
8282
CATCH_AND_THROW
@@ -85,7 +85,7 @@ Local<Value> CommandOriginClass::getEntity() {
8585
Local<Value> CommandOriginClass::getPlayer() {
8686
try {
8787
Actor* player = get()->getEntity();
88-
if (!player) return Local<Value>();
88+
if (!player) return {};
8989
return PlayerClass::newPlayer(static_cast<Player*>(player));
9090
}
9191
CATCH_AND_THROW

‎src/legacy/api/DataAPI.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ Local<Value> ConfBaseClass::getPath(Arguments const&) const {
105105
Local<Value> ConfBaseClass::read(Arguments const&) const {
106106
try {
107107
auto content = ll::file_utils::readFile(ll::string_utils::str2u8str(confPath));
108-
if (!content) return Local<Value>();
108+
if (!content) return {};
109109
else return String::newString(*content);
110110
}
111111
CATCH_AND_THROW
@@ -317,7 +317,7 @@ Local<Value> ConfIniClass::init(Arguments const& args) {
317317
CHECK_ARG_TYPE(args[1], ValueKind::kString);
318318

319319
try {
320-
if (!isValid()) return Local<Value>();
320+
if (!isValid()) return {};
321321

322322
string section = args[0].asString().toString();
323323
string key = args[1].asString().toString();
@@ -380,7 +380,7 @@ Local<Value> ConfIniClass::set(Arguments const& args) {
380380
CHECK_ARG_TYPE(args[1], ValueKind::kString);
381381

382382
try {
383-
if (!isValid()) return Local<Value>();
383+
if (!isValid()) return {};
384384

385385
string section = args[0].asString().toString();
386386
string key = args[1].asString().toString();
@@ -411,7 +411,7 @@ Local<Value> ConfIniClass::getStr(Arguments const& args) const {
411411
if (args.size() >= 3) CHECK_ARG_TYPE(args[2], ValueKind::kString)
412412

413413
try {
414-
if (!isValid()) return Local<Value>();
414+
if (!isValid()) return {};
415415

416416
return String::newString(iniConf->getString(
417417
args[0].asString().toString(),
@@ -429,7 +429,7 @@ Local<Value> ConfIniClass::getInt(Arguments const& args) const {
429429
if (args.size() >= 3) CHECK_ARG_TYPE(args[2], ValueKind::kNumber)
430430

431431
try {
432-
if (!isValid()) return Local<Value>();
432+
if (!isValid()) return {};
433433

434434
return Number::newNumber(iniConf->getInt(
435435
args[0].asString().toString(),
@@ -447,7 +447,7 @@ Local<Value> ConfIniClass::getFloat(Arguments const& args) const {
447447
if (args.size() >= 3) CHECK_ARG_TYPE(args[2], ValueKind::kNumber);
448448

449449
try {
450-
if (!isValid()) return Local<Value>();
450+
if (!isValid()) return {};
451451

452452
return Number::newNumber(iniConf->getFloat(
453453
args[0].asString().toString(),
@@ -465,7 +465,7 @@ Local<Value> ConfIniClass::getBool(Arguments const& args) const {
465465
if (args.size() >= 3) CHECK_ARG_TYPE(args[2], ValueKind::kBoolean);
466466

467467
try {
468-
if (!isValid()) return Local<Value>();
468+
if (!isValid()) return {};
469469

470470
return Boolean::newBoolean(iniConf->getBool(
471471
args[0].asString().toString(),
@@ -482,7 +482,7 @@ Local<Value> ConfIniClass::del(Arguments const& args) {
482482
CHECK_ARG_TYPE(args[1], ValueKind::kString);
483483

484484
try {
485-
if (!isValid()) return Local<Value>();
485+
if (!isValid()) return {};
486486

487487
bool res = iniConf->deleteKey(args[0].asString().toString(), args[1].asString().toString());
488488
flush();
@@ -663,11 +663,11 @@ Local<Value> MoneyClass::getHistory(Arguments const& args) {
663663
} catch (std::invalid_argument const& e) {
664664
lse::LegacyScriptEngine::getLogger().error("Bad argument in MoneyGetHistory!");
665665
ll::error_utils::printException(e, lse::LegacyScriptEngine::getLogger());
666-
return Local<Value>();
666+
return {};
667667
} catch (std::out_of_range const& e) {
668668
lse::LegacyScriptEngine::getLogger().error("Bad argument in MoneyGetHistory!");
669669
ll::error_utils::printException(e, lse::LegacyScriptEngine::getLogger());
670-
return Local<Value>();
670+
return {};
671671
}
672672
CATCH_AND_THROW
673673
}
@@ -920,7 +920,7 @@ Local<Value> KVDBClass::newDb(string const& dir) {
920920
if (newp->isValid()) return newp->getScriptObject();
921921
else {
922922
delete newp;
923-
return Local<Value>();
923+
return {};
924924
}
925925
}
926926

@@ -931,7 +931,7 @@ Local<Value> ConfJsonClass::newConf(string const& path, string const& defContent
931931

932932
Local<Value> ConfIniClass::newConf(string const& path, string const& defContent) {
933933
if (auto newp = new ConfIniClass(path, defContent)) return newp->getScriptObject();
934-
else return Local<Value>();
934+
else return {};
935935
}
936936

937937
Local<Value> DataClass::openConfig(Arguments const& args) {

‎src/legacy/api/DatabaseAPI.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ template <>
7676
Local<Value> any_to(Any const& val) {
7777
switch (val.type) {
7878
case Any::Type::Null:
79-
return Local<Value>();
79+
return {};
8080
case Any::Type::Boolean:
8181
return Boolean::newBoolean(std::get<bool>(val.value));
8282
case Any::Type::Integer:
@@ -118,12 +118,12 @@ Local<Value> any_to(Any const& val) {
118118
default:
119119
break;
120120
}
121-
return Local<Value>();
121+
return {};
122122
}
123123

124124
Local<Value> RowSetToLocalValue(RowSet const& rows) {
125125
if (rows.empty() || !rows.header) {
126-
return Local<Value>();
126+
return {};
127127
}
128128
Local<Array> arr = Array::newArray();
129129
Local<Array> header = Array::newArray();
@@ -187,10 +187,10 @@ Local<Value> KVDBClass::get(Arguments const& args) {
187187
CHECK_ARG_TYPE(args[0], ValueKind::kString);
188188

189189
try {
190-
if (!isValid()) return Local<Value>();
190+
if (!isValid()) return {};
191191

192192
auto res = kvdb->get(args[0].asString().toString());
193-
if (!res) return Local<Value>();
193+
if (!res) return {};
194194

195195
return JsonToValue(*res);
196196
}
@@ -202,7 +202,7 @@ Local<Value> KVDBClass::set(Arguments const& args) {
202202
CHECK_ARG_TYPE(args[0], ValueKind::kString);
203203

204204
try {
205-
if (!isValid()) return Local<Value>();
205+
if (!isValid()) return {};
206206

207207
kvdb->set(args[0].asString().toString(), ValueToJson(args[1]));
208208
return Boolean::newBoolean(true);
@@ -215,7 +215,7 @@ Local<Value> KVDBClass::del(Arguments const& args) {
215215
CHECK_ARG_TYPE(args[0], ValueKind::kString);
216216

217217
try {
218-
if (!isValid()) return Local<Value>();
218+
if (!isValid()) return {};
219219

220220
return Boolean::newBoolean(kvdb->del(args[0].asString().toString()));
221221
}
@@ -234,7 +234,7 @@ Local<Value> KVDBClass::close(Arguments const&) {
234234

235235
Local<Value> KVDBClass::listKey(Arguments const&) {
236236
try {
237-
if (!isValid()) return Local<Value>();
237+
if (!isValid()) return {};
238238

239239
Local<Array> array = Array::newArray();
240240
for (auto const& [key, _] : kvdb->iter()) {

‎src/legacy/api/DeviceAPI.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Player* DeviceClass::getPlayer() const {
5959
Local<Value> DeviceClass::getIP() const {
6060
try {
6161
Player* player = getPlayer();
62-
if (!player) return Local<Value>();
62+
if (!player) return {};
6363

6464
return String::newString(player->getNetworkIdentifier().getIPAndPort());
6565
}
@@ -69,7 +69,7 @@ Local<Value> DeviceClass::getIP() const {
6969
Local<Value> DeviceClass::getAvgPing() const {
7070
try {
7171
Player* player = getPlayer();
72-
if (!player) return Local<Value>();
72+
if (!player) return {};
7373

7474
return Number::newNumber(player->getNetworkStatus()->mAveragePing);
7575
}
@@ -79,7 +79,7 @@ Local<Value> DeviceClass::getAvgPing() const {
7979
Local<Value> DeviceClass::getAvgPacketLoss() const {
8080
try {
8181
Player* player = getPlayer();
82-
if (!player) return Local<Value>();
82+
if (!player) return {};
8383

8484
return Number::newNumber(player->getNetworkStatus()->mAveragePacketLoss);
8585
}
@@ -89,7 +89,7 @@ Local<Value> DeviceClass::getAvgPacketLoss() const {
8989
Local<Value> DeviceClass::getLastPing() const {
9090
try {
9191
Player* player = getPlayer();
92-
if (!player) return Local<Value>();
92+
if (!player) return {};
9393

9494
return Number::newNumber(player->getNetworkStatus()->mCurrentPing);
9595
}
@@ -99,7 +99,7 @@ Local<Value> DeviceClass::getLastPing() const {
9999
Local<Value> DeviceClass::getLastPacketLoss() const {
100100
try {
101101
Player* player = getPlayer();
102-
if (!player) return Local<Value>();
102+
if (!player) return {};
103103

104104
return Number::newNumber(player->getNetworkStatus()->mCurrentPacketLoss);
105105
}
@@ -109,7 +109,7 @@ Local<Value> DeviceClass::getLastPacketLoss() const {
109109
Local<Value> DeviceClass::getOs() const {
110110
try {
111111
Player* player = getPlayer();
112-
if (!player) return Local<Value>();
112+
if (!player) return {};
113113

114114
return String::newString(magic_enum::enum_name(player->mBuildPlatform));
115115
}
@@ -119,7 +119,7 @@ Local<Value> DeviceClass::getOs() const {
119119
Local<Value> DeviceClass::getServerAddress() const {
120120
try {
121121
Player* player = getPlayer();
122-
if (!player) return Local<Value>();
122+
if (!player) return {};
123123

124124
if (player->isSimulatedPlayer()) String::newString("unknown");
125125
Json::Value& requestJson = player->getConnectionRequest()->mRawToken->mDataInfo;
@@ -131,7 +131,7 @@ Local<Value> DeviceClass::getServerAddress() const {
131131
Local<Value> DeviceClass::getClientId() const {
132132
try {
133133
Player* player = getPlayer();
134-
if (!player) return Local<Value>();
134+
if (!player) return {};
135135

136136
return String::newString(player->getConnectionRequest()->getDeviceId());
137137
}
@@ -141,7 +141,7 @@ Local<Value> DeviceClass::getClientId() const {
141141
Local<Value> DeviceClass::getInputMode() const {
142142
try {
143143
Player* player = getPlayer();
144-
if (!player) return Local<Value>();
144+
if (!player) return {};
145145

146146
Json::Value& requestJson = player->getConnectionRequest()->mRawToken->mDataInfo;
147147
return Number::newNumber(requestJson["CurrentInputMode"].asInt(0));
@@ -152,7 +152,7 @@ Local<Value> DeviceClass::getInputMode() const {
152152
// Local<Value> DeviceClass::getPlayMode() {
153153
// try {
154154
// Player* player = getPlayer();
155-
// if (!player) return Local<Value>();
155+
// if (!player) return {};
156156

157157
// return Number::newNumber(0);
158158
// }

0 commit comments

Comments
 (0)