Skip to content

Commit c32f5ea

Browse files
ShrBoxShrBox
committed
refactor: clean some code
1 parent 3b74cb5 commit c32f5ea

28 files changed

+101
-128
lines changed

‎src/legacy/api/BaseAPI.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ FloatPos* FloatPos::extractPos(Local<Value> v) {
125125
}
126126

127127
Local<Value> FloatPos::getDim() {
128-
string name;
128+
std::string name;
129129
switch (dim) {
130130
case 0:
131131
name = "Overworld"_tr();

‎src/legacy/api/CommandAPI.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ Local<Value> CommandClass::setEnum(const Arguments& args) {
314314
auto enumName = args[0].asString().toString();
315315
auto enumArr = args[1].asArray();
316316
if (enumArr.size() == 0 || !enumArr.get(0).isString()) return Local<Value>();
317-
vector<string> enumValues;
317+
std::vector<std::string> enumValues;
318318
for (int i = 0; i < enumArr.size(); ++i) {
319319
enumValues.push_back(enumArr.get(i).asString().toString());
320320
}

‎src/legacy/api/CommandCompatibleAPI.cpp‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#include "engine/GlobalShareData.h"
66
#include "engine/LocalShareData.h"
77
#include "ll/api/service/Bedrock.h"
8-
#include "main/Configs.h"
98
#include "main/Global.h"
109
#include "utils/Utils.h"
1110

@@ -68,9 +67,9 @@ Local<Value> McClass::regPlayerCmd(const Arguments& args) {
6867
if (args.size() >= 4) CHECK_ARG_TYPE(args[3], ValueKind::kNumber);
6968

7069
try {
71-
string cmd = args[0].asString().toString();
72-
string describe = args[1].asString().toString();
73-
int level = 0;
70+
std::string cmd = args[0].asString().toString();
71+
std::string describe = args[1].asString().toString();
72+
int level = 0;
7473

7574
if (args.size() >= 4) {
7675
int newLevel = args[3].asNumber().toInt32();
@@ -90,8 +89,8 @@ Local<Value> McClass::regConsoleCmd(const Arguments& args) {
9089
CHECK_ARG_TYPE(args[2], ValueKind::kFunction);
9190

9291
try {
93-
string cmd = args[0].asString().toString();
94-
string describe = args[1].asString().toString();
92+
std::string cmd = args[0].asString().toString();
93+
std::string describe = args[1].asString().toString();
9594

9695
LLSERegisterNewCmd(false, cmd, describe, 4, args[2].asFunction());
9796
return Boolean::newBoolean(true);
@@ -123,7 +122,12 @@ void ProcessRegCmdQueue() {
123122
toRegCmdQueue.clear();
124123
}
125124

126-
std::string LLSEFindCmdReg(bool isPlayerCmd, const string& cmd, vector<string>& receiveParas, bool* fromOtherEngine) {
125+
std::string LLSEFindCmdReg(
126+
bool isPlayerCmd,
127+
const std::string& cmd,
128+
std::vector<std::string>& receiveParas,
129+
bool* fromOtherEngine
130+
) {
127131
std::unordered_map<std::string, std::string>& registeredMap =
128132
isPlayerCmd ? globalShareData->playerRegisteredCmd : globalShareData->consoleRegisteredCmd;
129133
for (auto& [prefix, fromEngine] : registeredMap) {
@@ -133,7 +137,7 @@ std::string LLSEFindCmdReg(bool isPlayerCmd, const string& cmd, vector<string>&
133137
// Matched
134138
if (fromEngine != LLSE_BACKEND_TYPE) {
135139
*fromOtherEngine = true;
136-
return string();
140+
return {};
137141
}
138142
}
139143
}
@@ -142,23 +146,23 @@ std::string LLSEFindCmdReg(bool isPlayerCmd, const string& cmd, vector<string>&
142146
isPlayerCmd ? localShareData->playerCmdCallbacks : localShareData->consoleCmdCallbacks;
143147

144148
for (auto& cmdData : cmdMap) {
145-
string prefix = cmdData.first;
149+
std::string prefix = cmdData.first;
146150
if (cmd == prefix || (cmd.find(prefix) == 0 && cmd[prefix.size()] == ' '))
147151
// 如果命令与注册前缀全匹配，或者目标前缀后面为空格
148152
{
149153
// Matched
150154
if (cmd.size() > prefix.size()) {
151155
// 除了注册前缀之外还有额外参数
152156
receiveParas = SplitCmdLine(cmd.substr(prefix.size() + 1));
153-
} else receiveParas = vector<string>();
157+
} else receiveParas = std::vector<std::string>();
154158

155159
return prefix;
156160
}
157161
}
158-
return string();
162+
return {};
159163
}
160164

161-
bool CallPlayerCmdCallback(Player* player, const string& cmdPrefix, const vector<string>& paras) {
165+
bool CallPlayerCmdCallback(Player* player, const std::string& cmdPrefix, const std::vector<std::string>& paras) {
162166
EngineScope enter(localShareData->playerCmdCallbacks[cmdPrefix].fromEngine);
163167
auto cmdData = localShareData->playerCmdCallbacks[cmdPrefix];
164168
Local<Value> res{};
@@ -173,7 +177,7 @@ bool CallPlayerCmdCallback(Player* player, const string& cmdPrefix, const vector
173177
return true;
174178
}
175179

176-
bool CallServerCmdCallback(const string& cmdPrefix, const vector<string>& paras) {
180+
bool CallServerCmdCallback(const std::string& cmdPrefix, const std::vector<std::string>& paras) {
177181
EngineScope enter(localShareData->consoleCmdCallbacks[cmdPrefix].fromEngine);
178182
auto cmdData = localShareData->consoleCmdCallbacks[cmdPrefix];
179183
Local<Value> res{};

‎src/legacy/api/DatabaseAPI.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ Local<Value> RowToLocalValue(const Row& row) {
166166
//////////////////// Classes KVDB ////////////////////
167167

168168
// 生成函数
169-
KVDBClass::KVDBClass(const Local<Object>& scriptObj, const string& dir) : ScriptClass(scriptObj) {
169+
KVDBClass::KVDBClass(const Local<Object>& scriptObj, const std::string& dir) : ScriptClass(scriptObj) {
170170
try {
171171
kvdb = std::make_unique<ll::data::KeyValueDB>(dir);
172172
} catch (...) {
@@ -176,7 +176,7 @@ KVDBClass::KVDBClass(const Local<Object>& scriptObj, const string& dir) : Script
176176
unloadCallbackIndex = getEngineOwnData()->addUnloadCallback([&](ScriptEngine*) { kvdb.reset(); });
177177
}
178178

179-
KVDBClass::KVDBClass(const string& dir) : ScriptClass(script::ScriptClass::ConstructFromCpp<KVDBClass>{}) {
179+
KVDBClass::KVDBClass(const std::string& dir) : ScriptClass(script::ScriptClass::ConstructFromCpp<KVDBClass>{}) {
180180
try {
181181
kvdb = std::make_unique<ll::data::KeyValueDB>(dir);
182182
} catch (...) {

‎src/legacy/api/DatabaseAPI.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ class KVDBClass : public ScriptClass {
1212
int unloadCallbackIndex = -1;
1313

1414
public:
15-
explicit KVDBClass(const Local<Object>& scriptObj, const string& dir);
16-
explicit KVDBClass(const string& dir);
15+
explicit KVDBClass(const Local<Object>& scriptObj, const std::string& dir);
16+
explicit KVDBClass(const std::string& dir);
1717
~KVDBClass();
1818
static KVDBClass* constructor(const Arguments& args);
1919

@@ -26,7 +26,7 @@ class KVDBClass : public ScriptClass {
2626
Local<Value> listKey(const Arguments& args);
2727

2828
// For Compatibility
29-
static Local<Value> newDb(const string& dir);
29+
static Local<Value> newDb(const std::string& dir);
3030
};
3131
extern ClassDefine<KVDBClass> KVDBClassBuilder;
3232

‎src/legacy/api/EntityAPI.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1685,8 +1685,8 @@ Local<Value> McClass::spawnMob(const Arguments& args) {
16851685
CHECK_ARG_TYPE(args[0], ValueKind::kString);
16861686

16871687
try {
1688-
string name = args[0].asString().toString();
1689-
FloatVec4 pos;
1688+
std::string name = args[0].asString().toString();
1689+
FloatVec4 pos;
16901690

16911691
if (args.size() == 2) {
16921692
if (IsInstanceOf<IntPos>(args[1])) {

‎src/legacy/api/GuiAPI.cpp‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
#include "engine/EngineOwnData.h"
77
#include "engine/GlobalShareData.h"
88
#include "ll/api/service/GamingStatus.h"
9-
10-
// #include <llapi/SendPacketAPI.h> //todo
119
#include "ll/api/service/ServerInfo.h"
1210

1311
#include <cstdlib>
@@ -100,7 +98,7 @@ Local<Value> SimpleFormClass::addButton(const Arguments& args) {
10098
if (args.size() >= 2) CHECK_ARG_TYPE(args[1], ValueKind::kString);
10199

102100
try {
103-
string image = args.size() >= 2 ? args[1].asString().toString() : "";
101+
std::string image = args.size() >= 2 ? args[1].asString().toString() : "";
104102
form.addButton(args[0].asString().toString(), image);
105103
return this->getScriptObject();
106104
}
@@ -172,8 +170,8 @@ Local<Value> CustomFormClass::addInput(const Arguments& args) {
172170
if (args.size() >= 3) CHECK_ARG_TYPE(args[2], ValueKind::kString);
173171

174172
try {
175-
string placeholder = args.size() >= 2 ? args[1].asString().toString() : "";
176-
string def = args.size() >= 3 ? args[2].asString().toString() : "";
173+
std::string placeholder = args.size() >= 2 ? args[1].asString().toString() : "";
174+
std::string def = args.size() >= 3 ? args[2].asString().toString() : "";
177175

178176
form.addInput(args[0].asString().toString(), args[0].asString().toString(), placeholder, def);
179177
return this->getScriptObject();
@@ -208,8 +206,8 @@ Local<Value> CustomFormClass::addDropdown(const Arguments& args) {
208206
if (args.size() >= 3) CHECK_ARG_TYPE(args[2], ValueKind::kNumber);
209207

210208
try {
211-
auto optionsArr = args[1].asArray();
212-
vector<string> options;
209+
auto optionsArr = args[1].asArray();
210+
std::vector<std::string> options;
213211
for (int i = 0; i < optionsArr.size(); ++i) options.push_back(optionsArr.get(i).asString().toString());
214212

215213
int def = args.size() >= 3 ? args[2].asNumber().toInt32() : 0;
@@ -257,8 +255,8 @@ Local<Value> CustomFormClass::addStepSlider(const Arguments& args) {
257255
if (args.size() >= 3) CHECK_ARG_TYPE(args[2], ValueKind::kNumber);
258256

259257
try {
260-
auto stepsArr = args[1].asArray();
261-
vector<string> steps;
258+
auto stepsArr = args[1].asArray();
259+
std::vector<std::string> steps;
262260
for (int i = 0; i < stepsArr.size(); ++i) steps.push_back(stepsArr.get(i).asString().toString());
263261

264262
int defIndex = args.size() >= 3 ? args[2].asNumber().toInt32() : 0;

‎src/legacy/api/ItemAPI.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -428,8 +428,8 @@ Local<Value> McClass::newItem(const Arguments& args) {
428428
if (args[0].isString()) {
429429
// name & count
430430
if (args.size() >= 2 && args[1].isNumber()) {
431-
string type = args[0].asString().toString();
432-
int cnt = args[1].asNumber().toInt32();
431+
std::string type = args[0].asString().toString();
432+
int cnt = args[1].asNumber().toInt32();
433433

434434
ItemStack* item = new ItemStack{type, cnt, 0, nullptr};
435435
if (!item) return Local<Value>(); // Null

‎src/legacy/api/LoggerAPI.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ ClassDefine<void> LoggerClassBuilder = defineClass("logger")
3737
.build();
3838

3939
////////////////// Helper //////////////////
40-
string inline GetTimeStrHelper() { return Raw_GetDateTimeStr(); }
40+
std::string inline GetTimeStrHelper() { return Raw_GetDateTimeStr(); }
4141

42-
string& StrReplace(string& str, const string& to_replaced, const string& new_str) {
43-
for (string::size_type pos(0); pos != string::npos; pos += new_str.length()) {
42+
std::string& StrReplace(std::string& str, const std::string& to_replaced, const std::string& new_str) {
43+
for (std::string::size_type pos(0); pos != std::string::npos; pos += new_str.length()) {
4444
pos = str.find(to_replaced, pos);
45-
if (pos != string::npos) str.replace(pos, to_replaced.length(), new_str);
45+
if (pos != std::string::npos) str.replace(pos, to_replaced.length(), new_str);
4646
else break;
4747
}
4848
return str;

‎src/legacy/api/ScoreboardAPI.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -302,8 +302,8 @@ Local<Value> McClass::getDisplayObjective(const Arguments& args) {
302302
CHECK_ARG_TYPE(args[0], ValueKind::kString);
303303

304304
try {
305-
string slot = args[0].asString().toString();
306-
auto res = ll::service::getLevel()->getScoreboard().getDisplayObjective(slot);
305+
std::string slot = args[0].asString().toString();
306+
auto res = ll::service::getLevel()->getScoreboard().getDisplayObjective(slot);
307307

308308
if (!res) return Local<Value>();
309309
return ObjectiveClass::newObjective(const_cast<Objective*>(res->mObjective));
@@ -316,8 +316,8 @@ Local<Value> McClass::clearDisplayObjective(const Arguments& args) {
316316
CHECK_ARG_TYPE(args[0], ValueKind::kString);
317317

318318
try {
319-
string slot = args[0].asString().toString();
320-
auto res = ll::service::getLevel()->getScoreboard().clearDisplayObjective(slot);
319+
std::string slot = args[0].asString().toString();
320+
auto res = ll::service::getLevel()->getScoreboard().clearDisplayObjective(slot);
321321

322322
if (!res) return Boolean::newBoolean(false);
323323
return Boolean::newBoolean(true);
@@ -330,7 +330,7 @@ Local<Value> McClass::getScoreObjective(const Arguments& args) {
330330
CHECK_ARG_TYPE(args[0], ValueKind::kString);
331331

332332
try {
333-
string name = args[0].asString().toString();
333+
std::string name = args[0].asString().toString();
334334
if (ll::service::getLevel().has_value()) {
335335
auto res = ll::service::getLevel()->getScoreboard().getObjective(name);
336336
if (!res) {
@@ -366,8 +366,8 @@ Local<Value> McClass::removeScoreObjective(const Arguments& args) {
366366
CHECK_ARG_TYPE(args[0], ValueKind::kString)
367367

368368
try {
369-
string name = args[0].asString().toString();
370-
auto obj = ll::service::getLevel()->getScoreboard().getObjective(name);
369+
std::string name = args[0].asString().toString();
370+
auto obj = ll::service::getLevel()->getScoreboard().getObjective(name);
371371
if (obj) {
372372
ll::service::getLevel()->getScoreboard().removeObjective(obj);
373373
return Boolean::newBoolean(true);

0 commit comments

Comments
 (0)