Skip to content

Commit 0c0d45e

Browse files
ShrBoxShrBox
committed
refactor: clean numerous shit
1 parent afdc4e7 commit 0c0d45e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+280
-303
lines changed

‎src/legacy/api/BaseAPI.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,14 +233,14 @@ Local<Value> McClass::newFloatPos(const Arguments& args) {
233233
CATCH("Fail in NewFloatPos!")
234234
}
235235

236-
Local<Value> McClass::getBDSVersion(const Arguments& args) {
236+
Local<Value> McClass::getBDSVersion(const Arguments&) {
237237
try {
238238
return String::newString(Common::getGameVersionString());
239239
}
240240
CATCH("Fail in GetBDSVersion!")
241241
}
242242

243-
Local<Value> McClass::getServerProtocolVersion(const Arguments& args) {
243+
Local<Value> McClass::getServerProtocolVersion(const Arguments&) {
244244
try {
245245
return Number::newNumber(SharedConstants::NetworkProtocolVersion);
246246
}

‎src/legacy/api/BaseAPI.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ class IntPos : public IntVec4, public ScriptClass {
2727
Local<Value> getZ() { return Number::newNumber(z); }
2828
Local<Value> getDim();
2929
Local<Value> getDimId() { return Number::newNumber(dim); }
30-
void setX(const Local<Value>& value) { x = value.asNumber().toInt64(); }
31-
void setY(const Local<Value>& value) { y = value.asNumber().toInt64(); }
32-
void setZ(const Local<Value>& value) { z = value.asNumber().toInt64(); }
30+
void setX(const Local<Value>& value) { x = value.asNumber().toInt32(); }
31+
void setY(const Local<Value>& value) { y = value.asNumber().toInt32(); }
32+
void setZ(const Local<Value>& value) { z = value.asNumber().toInt32(); }
3333
void setDimId(const Local<Value>& value) { dim = value.asNumber().toInt32(); }
3434
Local<Value> toString();
3535
};
@@ -52,9 +52,9 @@ class FloatPos : public FloatVec4, public ScriptClass {
5252
Local<Value> getDimId() { return Number::newNumber(dim); }
5353
Local<Value> toString();
5454

55-
void setX(const Local<Value>& value) { x = value.asNumber().toInt64(); }
56-
void setY(const Local<Value>& value) { y = value.asNumber().toInt64(); }
57-
void setZ(const Local<Value>& value) { z = value.asNumber().toInt64(); }
55+
void setX(const Local<Value>& value) { x = value.asNumber().toFloat(); }
56+
void setY(const Local<Value>& value) { y = value.asNumber().toFloat(); }
57+
void setZ(const Local<Value>& value) { z = value.asNumber().toFloat(); }
5858
void setDimId(const Local<Value>& value) { dim = value.asNumber().toInt32(); }
5959
};
6060
extern ClassDefine<FloatPos> FloatPosBuilder;

‎src/legacy/api/BlockAPI.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ Local<Value> BlockClass::isWaterBlockingBlock() {
270270
CATCH("Fail in isWaterBlockingBlock!");
271271
}
272272

273-
Local<Value> BlockClass::asPointer(const Arguments& args) {
273+
Local<Value> BlockClass::asPointer(const Arguments&) {
274274
try {
275275
return NativePointer::newNativePointer(block);
276276
}
@@ -292,7 +292,7 @@ Local<Value> BlockClass::destroyBlock(const Arguments& args) {
292292
CATCH("Fail in destroyBlock!");
293293
}
294294

295-
Local<Value> BlockClass::getNbt(const Arguments& args) {
295+
Local<Value> BlockClass::getNbt(const Arguments&) {
296296
try {
297297
return NbtCompoundClass::pack(std::move(block->getSerializationId().clone()));
298298
}
@@ -323,7 +323,7 @@ Local<Value> BlockClass::setNbt(const Arguments& args) {
323323
CATCH("Fail in setNbt!")
324324
}
325325

326-
Local<Value> BlockClass::getBlockState(const Arguments& args) {
326+
Local<Value> BlockClass::getBlockState(const Arguments&) {
327327
return Local<Value>();
328328
try {
329329
auto list = block->getSerializationId();
@@ -332,13 +332,13 @@ Local<Value> BlockClass::getBlockState(const Arguments& args) {
332332
} catch (...) {
333333
return Array::newArray();
334334
}
335-
} catch (const std::out_of_range& e) {
335+
} catch (const std::out_of_range&) {
336336
return Object::newObject();
337337
}
338338
CATCH("Fail in getBlockState!")
339339
}
340340

341-
Local<Value> BlockClass::hasContainer(const Arguments& args) {
341+
Local<Value> BlockClass::hasContainer(const Arguments&) {
342342
try {
343343
auto& bl = ll::service::getLevel()->getDimension(pos.dim)->getBlockSourceFromMainChunkSource().getBlock(
344344
pos.getBlockPos()
@@ -348,7 +348,7 @@ Local<Value> BlockClass::hasContainer(const Arguments& args) {
348348
CATCH("Fail in hasContainer!");
349349
}
350350

351-
Local<Value> BlockClass::getContainer(const Arguments& args) {
351+
Local<Value> BlockClass::getContainer(const Arguments&) {
352352
try {
353353
Container* container = ll::service::getLevel()
354354
->getDimension(pos.dim)
@@ -360,14 +360,14 @@ Local<Value> BlockClass::getContainer(const Arguments& args) {
360360
CATCH("Fail in getContainer!");
361361
}
362362

363-
Local<Value> BlockClass::hasBlockEntity(const Arguments& args) {
363+
Local<Value> BlockClass::hasBlockEntity(const Arguments&) {
364364
try {
365365
return Boolean::newBoolean(block->hasBlockEntity());
366366
}
367367
CATCH("Fail in hasBlockEntity!");
368368
}
369369

370-
Local<Value> BlockClass::getBlockEntity(const Arguments& args) {
370+
Local<Value> BlockClass::getBlockEntity(const Arguments&) {
371371
try {
372372
BlockActor* be =
373373
ll::service::getLevel()->getDimension(pos.dim)->getBlockSourceFromMainChunkSource().getBlockEntity(
@@ -378,7 +378,7 @@ Local<Value> BlockClass::getBlockEntity(const Arguments& args) {
378378
CATCH("Fail in getBlockEntity!");
379379
}
380380

381-
Local<Value> BlockClass::removeBlockEntity(const Arguments& args) {
381+
Local<Value> BlockClass::removeBlockEntity(const Arguments&) {
382382
try {
383383
ll::service::getLevel()->getDimension(pos.dim)->getBlockSourceFromMainChunkSource().removeBlockEntity(
384384
pos.getBlockPos()

‎src/legacy/api/BlockEntityAPI.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ BlockActor* BlockEntityClass::extract(Local<Value> v) {
5050
}
5151

5252
// 成员函数
53-
Local<Value> BlockEntityClass::asPointer(const Arguments& args) {
53+
Local<Value> BlockEntityClass::asPointer(const Arguments&) {
5454
try {
5555
return NativePointer::newNativePointer(blockEntity);
5656
}
@@ -78,7 +78,7 @@ Local<Value> BlockEntityClass::getType() {
7878
CATCH("Fail in getBlockEntityType!")
7979
}
8080

81-
Local<Value> BlockEntityClass::getNbt(const Arguments& args) {
81+
Local<Value> BlockEntityClass::getNbt(const Arguments&) {
8282
try {
8383
CompoundTag* tag = new CompoundTag();
8484
blockEntity->save(*tag);
@@ -101,7 +101,7 @@ Local<Value> BlockEntityClass::setNbt(const Arguments& args) {
101101
CATCH("Fail in setNbt!")
102102
}
103103

104-
Local<Value> BlockEntityClass::getBlock(const Arguments& args) {
104+
Local<Value> BlockEntityClass::getBlock(const Arguments&) {
105105
try {
106106
BlockPos bp = blockEntity->getPosition();
107107
auto& bl = ll::service::getLevel()->getDimension(dim)->getBlockSourceFromMainChunkSource().getBlock(bp);

‎src/legacy/api/CommandAPI.cpp‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -476,12 +476,7 @@ void onExecute(
476476
}
477477

478478
// not complete
479-
void onExecute2(
480-
DynamicCommand const& command,
481-
CommandOrigin const& origin,
482-
CommandOutput& output,
483-
std::unordered_map<std::string, DynamicCommand::Result>& results
484-
) {
479+
void onExecute2(DynamicCommand const& command, CommandOrigin const&, CommandOutput&, std::unordered_map<std::string, DynamicCommand::Result>&) {
485480
auto instance = command.getInstance();
486481
auto& commandName = instance->getCommandName();
487482
if (localShareData->commandCallbacks.find(commandName) == localShareData->commandCallbacks.end()) {
@@ -546,7 +541,7 @@ Local<Value> CommandClass::setup(const Arguments& args) {
546541

547542
Local<Value> CommandClass::isRegistered() { return Boolean::newBoolean(registered); }
548543

549-
Local<Value> CommandClass::toString(const Arguments& args) {
544+
Local<Value> CommandClass::toString(const Arguments&) {
550545
try {
551546
return String::newString(fmt::format("<Command({})>", get()->getCommandName()));
552547
}
@@ -599,7 +594,7 @@ Local<Value> CommandClass::getSoftEnumValues(const Arguments& args) {
599594
CATCH("Fail in getSoftEnumValues");
600595
}
601596

602-
Local<Value> CommandClass::getSoftEnumNames(const Arguments& args) {
597+
Local<Value> CommandClass::getSoftEnumNames(const Arguments&) {
603598
try {
604599
std::vector<std::string> stringArray;
605600
for (auto& i : get()->softEnums) {

‎src/legacy/api/CommandOriginAPI.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ Local<Value> CommandOriginClass::getPlayer() {
100100
CATCH("Fail in getPlayer!");
101101
}
102102

103-
Local<Value> CommandOriginClass::getNbt(const Arguments& args) {
103+
Local<Value> CommandOriginClass::getNbt(const Arguments&) {
104104
try {
105105
return NbtCompoundClass::pack(std::make_unique<CompoundTag>(get()->serialize()));
106106
}

‎src/legacy/api/CommandOutputAPI.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ClassDefine<CommandOutputClass> CommandOutputClassBuilder =
2222

2323
CommandOutputClass::CommandOutputClass(CommandOutput* p)
2424
: ScriptClass(ScriptClass::ConstructFromCpp<CommandOutputClass>{}),
25-
ptr(p){};
25+
ptr(p) {};
2626

2727
Local<Object> CommandOutputClass::newCommandOutput(CommandOutput* p) {
2828
auto newp = new CommandOutputClass(p);
@@ -129,7 +129,7 @@ Local<Value> CommandOutputClass::error(const Arguments& args) {
129129
CATCH("Fail in error!");
130130
};
131131

132-
Local<Value> CommandOutputClass::toString(const Arguments& args) {
132+
Local<Value> CommandOutputClass::toString(const Arguments&) {
133133
try {
134134
return String::newString("<CommandOutput>");
135135
}

‎src/legacy/api/ContainerAPI.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Local<Value> ContainerClass::getType() {
6363
CATCH("Fail in getType!")
6464
}
6565

66-
Local<Value> ContainerClass::asPointer(const Arguments& args) {
66+
Local<Value> ContainerClass::asPointer(const Arguments&) {
6767
try {
6868
return NativePointer::newNativePointer(container);
6969
}
@@ -164,7 +164,7 @@ Local<Value> ContainerClass::setItem(const Arguments& args) {
164164
CATCH("Fail in getItem!");
165165
}
166166

167-
Local<Value> ContainerClass::getAllItems(const Arguments& args) {
167+
Local<Value> ContainerClass::getAllItems(const Arguments&) {
168168
try {
169169
auto list = container->getSlots();
170170

@@ -177,15 +177,15 @@ Local<Value> ContainerClass::getAllItems(const Arguments& args) {
177177
CATCH("Fail in getAllItems!");
178178
}
179179

180-
Local<Value> ContainerClass::removeAllItems(const Arguments& args) {
180+
Local<Value> ContainerClass::removeAllItems(const Arguments&) {
181181
try {
182182
container->removeAllItems();
183183
return Boolean::newBoolean(true);
184184
}
185185
CATCH("Fail in removeAllItems!");
186186
}
187187

188-
Local<Value> ContainerClass::isEmpty(const Arguments& args) {
188+
Local<Value> ContainerClass::isEmpty(const Arguments&) {
189189
try {
190190
return Boolean::newBoolean(container->isEmpty());
191191
}

‎src/legacy/api/DataAPI.cpp‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,14 @@ ClassDefine<ConfIniClass> ConfIniClassBuilder =
9999

100100
ConfBaseClass::ConfBaseClass(const string& dir) : confPath(dir) {}
101101

102-
Local<Value> ConfBaseClass::getPath(const Arguments& args) {
102+
Local<Value> ConfBaseClass::getPath(const Arguments&) {
103103
try {
104104
return String::newString(confPath);
105105
}
106106
CATCH("Fail in confGetPath!")
107107
}
108108

109-
Local<Value> ConfBaseClass::read(const Arguments& args) {
109+
Local<Value> ConfBaseClass::read(const Arguments&) {
110110
try {
111111
auto content = ll::file_utils::readFile(ll::string_utils::str2u8str(confPath));
112112
if (!content) return Local<Value>();
@@ -153,11 +153,11 @@ Local<Value> ConfJsonClass::init(const Arguments& args) {
153153

154154
try {
155155
return JsonToValue(jsonConf.at(args[0].toStr()));
156-
} catch (const std::out_of_range& e) {
156+
} catch (const std::out_of_range&) {
157157
jsonConf[args[0].toStr()] = ordered_json::parse(ValueToJson(args[1]));
158158
flush();
159159
return args[1];
160-
} catch (const ordered_json::exception& e) {
160+
} catch (const ordered_json::exception&) {
161161
jsonConf[args[0].toStr()] = ordered_json::parse(ValueToJson(args[1]));
162162
flush();
163163
return args[1];
@@ -171,9 +171,9 @@ Local<Value> ConfJsonClass::get(const Arguments& args) {
171171

172172
try {
173173
return JsonToValue(jsonConf.at(args[0].toStr()));
174-
} catch (const std::out_of_range& e) {
174+
} catch (const std::out_of_range&) {
175175
return args.size() >= 2 ? args[1] : Local<Value>();
176-
} catch (const ordered_json::exception& e) {
176+
} catch (const ordered_json::exception&) {
177177
return args.size() >= 2 ? args[1] : Local<Value>();
178178
}
179179
CATCH("Fail in confJsonGet!")
@@ -186,7 +186,7 @@ Local<Value> ConfJsonClass::set(const Arguments& args) {
186186
try {
187187
jsonConf[args[0].toStr()] = ordered_json::parse(ValueToJson(args[1]));
188188
return Boolean::newBoolean(flush());
189-
} catch (const ordered_json::exception& e) {
189+
} catch (const ordered_json::exception&) {
190190
return Boolean::newBoolean(false);
191191
}
192192
CATCH("Fail in confJsonSet!");
@@ -200,13 +200,13 @@ Local<Value> ConfJsonClass::del(const Arguments& args) {
200200
if (jsonConf.erase(args[0].toStr()) <= 0) return Boolean::newBoolean(false);
201201

202202
return Boolean::newBoolean(flush());
203-
} catch (const ordered_json::exception& e) {
203+
} catch (const ordered_json::exception&) {
204204
return Boolean::newBoolean(false);
205205
}
206206
CATCH("Fail in confJsonDelete!");
207207
}
208208

209-
Local<Value> ConfJsonClass::reload(const Arguments& args) {
209+
Local<Value> ConfJsonClass::reload(const Arguments&) {
210210
try {
211211
return Boolean::newBoolean(reload());
212212
} catch (const ordered_json::exception& e) {
@@ -218,7 +218,7 @@ Local<Value> ConfJsonClass::reload(const Arguments& args) {
218218
CATCH("Fail in confJsonReload!");
219219
}
220220

221-
Local<Value> ConfJsonClass::close(const Arguments& args) {
221+
Local<Value> ConfJsonClass::close(const Arguments&) {
222222
try {
223223
return Boolean::newBoolean(close());
224224
}
@@ -453,11 +453,9 @@ Local<Value> ConfIniClass::getFloat(const Arguments& args) {
453453
try {
454454
if (!isValid()) return Local<Value>();
455455

456-
return Number::newNumber(iniConf->getFloat(
457-
args[0].toStr(),
458-
args[1].toStr(),
459-
args.size() >= 3 ? (float)args[2].asNumber().toDouble() : 0.0
460-
));
456+
return Number::newNumber(
457+
iniConf->getFloat(args[0].toStr(), args[1].toStr(), args.size() >= 3 ? args[2].asNumber().toFloat() : 0.0)
458+
);
461459
}
462460
CATCH("Fail in ConfIniGetFloat!");
463461
}
@@ -493,7 +491,7 @@ Local<Value> ConfIniClass::del(const Arguments& args) {
493491
CATCH("Fail in confIniDelete!");
494492
}
495493

496-
Local<Value> ConfIniClass::reload(const Arguments& args) {
494+
Local<Value> ConfIniClass::reload(const Arguments&) {
497495
try {
498496
return Boolean::newBoolean(reload());
499497
}
@@ -512,7 +510,7 @@ Local<Value> ConfIniClass::write(const Arguments& args) {
512510
CATCH("Fail in confIniWrite!");
513511
}
514512

515-
Local<Value> ConfIniClass::close(const Arguments& args) {
513+
Local<Value> ConfIniClass::close(const Arguments&) {
516514
try {
517515
return Boolean::newBoolean(close());
518516
}
@@ -671,7 +669,7 @@ Local<Value> MoneyClass::getHistory(const Arguments& args) {
671669
CHECK_ARG_TYPE(args[1], ValueKind::kNumber);
672670

673671
try {
674-
string res{EconomySystem::getMoneyHist(args[0].toStr(), args[1].asNumber().toInt64())};
672+
string res{EconomySystem::getMoneyHist(args[0].toStr(), args[1].asNumber().toInt32())};
675673
return objectificationMoneyHistory(res);
676674
} catch (const std::invalid_argument& e) {
677675
lse::getSelfPluginInstance().getLogger().error("Bad argument in MoneyGetHintory!");
@@ -692,7 +690,7 @@ Local<Value> MoneyClass::clearHistory(const Arguments& args) {
692690
CHECK_ARG_TYPE(args[0], ValueKind::kNumber);
693691

694692
try {
695-
EconomySystem::clearMoneyHist(args[0].asNumber().toInt64());
693+
EconomySystem::clearMoneyHist(args[0].asNumber().toInt32());
696694
return Boolean::newBoolean(true);
697695
}
698696
CATCH("Fail in MoneyClearHistory!");

0 commit comments

Comments
 (0)