Skip to content

Commit e34fb51

Browse files
xiaoqchxiaoqch
committed
feat: try to adapt to BDS 1.21.93
1 parent 16c4b14 commit e34fb51

File tree

6 files changed

+38
-38
lines changed

6 files changed

+38
-38
lines changed

‎src/legacy/api/CommandAPI.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
#include "magic_enum.hpp"
2222
#include "mc/_HeaderOutputPredefine.h"
2323
#include "mc/deps/core/utility/MCRESULT.h"
24+
#include "mc/deps/json/Value.h"
25+
#include "mc/deps/json/FastWriter.h"
2426
#include "mc/locale/I18n.h"
2527
#include "mc/locale/Localization.h"
2628
#include "mc/server/commands/CommandBlockName.h"
@@ -135,7 +137,7 @@ Local<Value> convertResult(ParamStorageType const& result, CommandOrigin const&
135137
} else if (result.hold(ParamKind::Kind::RawText)) {
136138
return String::newString(std::get<CommandRawText>(result.value()).mText);
137139
} else if (result.hold(ParamKind::Kind::JsonValue)) {
138-
return String::newString(JsonHelpers::serialize(std::get<Json::Value>(result.value())));
140+
return String::newString(Json::FastWriter().write(std::get<Json::Value>(result.value())));
139141
} else if (result.hold(ParamKind::Kind::Effect)) {
140142
return String::newString(std::get<MobEffect const*>(result.value())->mResourceName);
141143
} else if (result.hold(ParamKind::Kind::Command)) {

‎src/legacy/api/PacketAPI.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "lse/api/helper/ItemStackSerializerHelpers.h"
99
#include "mc/deps/core/utility/BinaryStream.h"
1010
#include "mc/network/MinecraftPackets.h"
11-
#include "mc/network/packet/Packet.h"
11+
#include "mc/client/renderer/rendergraph/Packet.h"
1212
#include "mc/world/item/NetworkItemStackDescriptor.h"
1313

1414
//////////////////// Class Definition ////////////////////

‎src/legacy/api/PlayerAPI.cpp‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@
106106
#include "mc/world/scores/ScoreInfo.h"
107107
#include "mc/world/scores/Scoreboard.h"
108108
#include "mc/world/scores/ScoreboardId.h"
109+
#include "mc/world/scores/ScoreboardOperationResult.h"
109110

110111
SetScorePacket::SetScorePacket() = default;
111112

@@ -546,10 +547,10 @@ Local<Value> McClass::setPlayerScore(const Arguments& args) {
546547
if (sid.mRawID == ScoreboardId::INVALID().mRawID) {
547548
return Boolean::newBoolean(false);
548549
}
549-
bool isSuccess = false;
550+
ScoreboardOperationResult isSuccess;
550551
scoreboard
551552
.modifyPlayerScore(isSuccess, sid, *objective, args[2].asNumber().toInt32(), PlayerScoreSetFunction::Set);
552-
return Boolean::newBoolean(isSuccess);
553+
return Boolean::newBoolean(isSuccess == ScoreboardOperationResult::Success);
553554
}
554555
CATCH("Fail in setPlayerScore!")
555556
}
@@ -584,10 +585,10 @@ Local<Value> McClass::addPlayerScore(const Arguments& args) {
584585
if (sid.mRawID == ScoreboardId::INVALID().mRawID) {
585586
return Boolean::newBoolean(false);
586587
}
587-
bool isSuccess = false;
588+
ScoreboardOperationResult isSuccess;
588589
scoreboard
589590
.modifyPlayerScore(isSuccess, sid, *objective, args[2].asNumber().toInt32(), PlayerScoreSetFunction::Add);
590-
return Boolean::newBoolean(isSuccess);
591+
return Boolean::newBoolean(isSuccess == ScoreboardOperationResult::Success);
591592
}
592593
CATCH("Fail in addPlayerScore!")
593594
}
@@ -622,15 +623,15 @@ Local<Value> McClass::reducePlayerScore(const Arguments& args) {
622623
if (sid.mRawID == ScoreboardId::INVALID().mRawID) {
623624
return Boolean::newBoolean(false);
624625
}
625-
bool isSuccess = false;
626+
ScoreboardOperationResult isSuccess;
626627
scoreboard.modifyPlayerScore(
627628
isSuccess,
628629
sid,
629630
*objective,
630631
args[2].asNumber().toInt32(),
631632
PlayerScoreSetFunction::Subtract
632633
);
633-
return Boolean::newBoolean(isSuccess);
634+
return Boolean::newBoolean(isSuccess == ScoreboardOperationResult::Success);
634635
}
635636
CATCH("Fail in reducePlayerScore!")
636637
}
@@ -1430,8 +1431,7 @@ Local<Value> PlayerClass::isMoving() {
14301431
return Local<Value>();
14311432
}
14321433

1433-
return Boolean::newBoolean(
1434-
SynchedActorDataAccess::getActorFlag(player->getEntityContext(), ActorFlags::Moving)
1434+
return Boolean::newBoolean(SynchedActorDataAccess::getActorFlag(player->getEntityContext(), ActorFlags::Moving)
14351435
);
14361436
}
14371437
CATCH("Fail in isMoving!")
@@ -2161,9 +2161,9 @@ Local<Value> PlayerClass::setScore(const Arguments& args) {
21612161
if (id.mRawID == ScoreboardId::INVALID().mRawID) {
21622162
scoreboard.createScoreboardId(*player);
21632163
}
2164-
bool isSuccess = false;
2164+
ScoreboardOperationResult isSuccess;
21652165
scoreboard.modifyPlayerScore(isSuccess, id, *obj, args[1].asNumber().toInt32(), PlayerScoreSetFunction::Set);
2166-
return Boolean::newBoolean(isSuccess);
2166+
return Boolean::newBoolean(isSuccess == ScoreboardOperationResult::Success);
21672167
}
21682168
CATCH("Fail in setScore!");
21692169
}
@@ -2186,9 +2186,9 @@ Local<Value> PlayerClass::addScore(const Arguments& args) {
21862186
if (id.mRawID == ScoreboardId::INVALID().mRawID) {
21872187
scoreboard.createScoreboardId(*player);
21882188
}
2189-
bool isSuccess = false;
2189+
ScoreboardOperationResult isSuccess;
21902190
scoreboard.modifyPlayerScore(isSuccess, id, *obj, args[1].asNumber().toInt32(), PlayerScoreSetFunction::Add);
2191-
return Boolean::newBoolean(isSuccess);
2191+
return Boolean::newBoolean(isSuccess == ScoreboardOperationResult::Success);
21922192
}
21932193
CATCH("Fail in addScore!");
21942194
}
@@ -2211,10 +2211,10 @@ Local<Value> PlayerClass::reduceScore(const Arguments& args) {
22112211
if (id.mRawID == ScoreboardId::INVALID().mRawID) {
22122212
scoreboard.createScoreboardId(*player);
22132213
}
2214-
bool isSuccess = false;
2214+
ScoreboardOperationResult isSuccess;
22152215
scoreboard
22162216
.modifyPlayerScore(isSuccess, id, *obj, args[1].asNumber().toInt32(), PlayerScoreSetFunction::Subtract);
2217-
return Boolean::newBoolean(isSuccess);
2217+
return Boolean::newBoolean(isSuccess == ScoreboardOperationResult::Success);
22182218
}
22192219
CATCH("Fail in reduceScore!");
22202220
}
@@ -2454,8 +2454,7 @@ Local<Value> PlayerClass::sendSimpleForm(const Arguments& args) {
24542454
}
24552455
}
24562456
auto formCallback = [engine{EngineScope::currentEngine()},
2457-
callback{
2458-
script::Global(args[4].asFunction())
2457+
callback{script::Global(args[4].asFunction())
24592458
}](Player& pl, int chosen, ll::form::FormCancelReason reason) {
24602459
if ((ll::getGamingStatus() != ll::GamingStatus::Running)) return;
24612460
if (!EngineManager::isValid(engine)) return;
@@ -2499,10 +2498,9 @@ Local<Value> PlayerClass::sendModalForm(const Arguments& args) {
24992498
args[2].asString().toString(),
25002499
args[3].asString().toString()
25012500
);
2502-
auto formCallback = [engine{EngineScope::currentEngine()}, callback{script::Global(args[4].asFunction())}](
2503-
Player& pl,
2504-
ll::form::ModalFormResult const& chosen,
2505-
ll::form::FormCancelReason reason
2501+
auto formCallback = [engine{EngineScope::currentEngine()},
2502+
callback{script::Global(args[4].asFunction())
2503+
}](Player& pl, ll::form::ModalFormResult const& chosen, ll::form::FormCancelReason reason
25062504
) {
25072505
if ((ll::getGamingStatus() != ll::GamingStatus::Running)) return;
25082506
if (!EngineManager::isValid(engine)) return;

‎src/legacy/api/ScoreboardAPI.cpp‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include "mc/world/scores/ScoreInfo.h"
1111
#include "mc/world/scores/Scoreboard.h"
1212
#include "mc/world/scores/ScoreboardId.h"
13+
#include "mc/world/scores/ScoreboardOperationResult.h"
1314

1415
#include <optional>
1516

@@ -103,9 +104,9 @@ Local<Value> ObjectiveClass::setScore(const Arguments& args) {
103104
if (id.mRawID == ScoreboardId::INVALID().mRawID) {
104105
scoreboard.createScoreboardId(name);
105106
}
106-
bool isSuccess = false;
107+
ScoreboardOperationResult isSuccess;
107108
scoreboard.modifyPlayerScore(isSuccess, id, *obj, score, PlayerScoreSetFunction::Set);
108-
if (isSuccess) return Number::newNumber(score);
109+
if (isSuccess == ScoreboardOperationResult::Success) return Number::newNumber(score);
109110
} else if (IsInstanceOf<PlayerClass>(args[0])) {
110111
Player* player = PlayerClass::extract(args[0]);
111112
Scoreboard& scoreboard = ll::service::getLevel()->getScoreboard();
@@ -117,10 +118,10 @@ Local<Value> ObjectiveClass::setScore(const Arguments& args) {
117118
if (id.mRawID == ScoreboardId::INVALID().mRawID) {
118119
scoreboard.createScoreboardId(*player);
119120
}
120-
bool isSuccess = false;
121+
ScoreboardOperationResult isSuccess;
121122
scoreboard
122123
.modifyPlayerScore(isSuccess, id, *obj, args[1].asNumber().toInt32(), PlayerScoreSetFunction::Set);
123-
if (isSuccess) return Number::newNumber(score);
124+
if (isSuccess == ScoreboardOperationResult::Success) return Number::newNumber(score);
124125
} else {
125126
LOG_WRONG_ARG_TYPE(__FUNCTION__);
126127
}
@@ -147,10 +148,10 @@ Local<Value> ObjectiveClass::addScore(const Arguments& args) {
147148
if (id.mRawID == ScoreboardId::INVALID().mRawID) {
148149
scoreboard.createScoreboardId(name);
149150
}
150-
bool isSuccess = false;
151+
ScoreboardOperationResult isSuccess;
151152
scoreboard
152153
.modifyPlayerScore(isSuccess, id, *obj, args[1].asNumber().toInt32(), PlayerScoreSetFunction::Add);
153-
if (isSuccess) return Number::newNumber(score);
154+
if (isSuccess == ScoreboardOperationResult::Success) return Number::newNumber(score);
154155
} else if (IsInstanceOf<PlayerClass>(args[0])) {
155156
Player* player = PlayerClass::extract(args[0]);
156157
Scoreboard& scoreboard = ll::service::getLevel()->getScoreboard();
@@ -162,10 +163,10 @@ Local<Value> ObjectiveClass::addScore(const Arguments& args) {
162163
if (id.mRawID == ScoreboardId::INVALID().mRawID) {
163164
scoreboard.createScoreboardId(*player);
164165
}
165-
bool isSuccess = false;
166+
ScoreboardOperationResult isSuccess;
166167
scoreboard
167168
.modifyPlayerScore(isSuccess, id, *obj, args[1].asNumber().toInt32(), PlayerScoreSetFunction::Add);
168-
if (isSuccess) return Number::newNumber(score);
169+
if (isSuccess == ScoreboardOperationResult::Success) return Number::newNumber(score);
169170
} else {
170171
LOG_WRONG_ARG_TYPE(__FUNCTION__);
171172
}
@@ -192,10 +193,10 @@ Local<Value> ObjectiveClass::reduceScore(const Arguments& args) {
192193
if (id.mRawID == ScoreboardId::INVALID().mRawID) {
193194
scoreboard.createScoreboardId(name);
194195
}
195-
bool isSuccess = false;
196+
ScoreboardOperationResult isSuccess;
196197
scoreboard
197198
.modifyPlayerScore(isSuccess, id, *obj, args[1].asNumber().toInt32(), PlayerScoreSetFunction::Subtract);
198-
if (isSuccess) return Number::newNumber(score);
199+
if (isSuccess == ScoreboardOperationResult::Success) return Number::newNumber(score);
199200
} else if (IsInstanceOf<PlayerClass>(args[0])) {
200201
Player* player = PlayerClass::extract(args[0]);
201202
Scoreboard& scoreboard = ll::service::getLevel()->getScoreboard();
@@ -207,10 +208,10 @@ Local<Value> ObjectiveClass::reduceScore(const Arguments& args) {
207208
if (id.mRawID == ScoreboardId::INVALID().mRawID) {
208209
scoreboard.createScoreboardId(*player);
209210
}
210-
bool isSuccess = false;
211+
ScoreboardOperationResult isSuccess;
211212
scoreboard
212213
.modifyPlayerScore(isSuccess, id, *obj, args[1].asNumber().toInt32(), PlayerScoreSetFunction::Subtract);
213-
if (isSuccess) return Number::newNumber(score);
214+
if (isSuccess == ScoreboardOperationResult::Success) return Number::newNumber(score);
214215
} else {
215216
LOG_WRONG_ARG_TYPE(__FUNCTION__);
216217
}

‎src/lse/api/NetworkPacket.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@
44
#include "mc/deps/core/platform/Result.h"
55
#include "mc/deps/core/utility/BinaryStream.h"
66
#include "mc/network/MinecraftPacketIds.h"
7-
#include "mc/network/packet/Packet.h"
7+
#include "mc/client/renderer/rendergraph/Packet.h"
88

99
#include <string>
10-
#include <string_view>
1110

1211
namespace lse::api {
1312

‎xmake.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ add_rules("mode.debug", "mode.release")
33
add_repositories("levimc-repo https://github.com/LiteLDev/xmake-repo.git")
44

55
if is_config("target_type", "server") then
6-
add_requires("levilamina 1.3.4", {configs = {target_type = "server"}})
6+
add_requires("levilamina bbdb7c536c11f8f432cc1578110b9bb0b9cdea08", {configs = {target_type = "server"}})
77
else
8-
add_requires("levilamina 1.3.4", {configs = {target_type = "client"}})
8+
add_requires("levilamina bbdb7c536c11f8f432cc1578110b9bb0b9cdea08", {configs = {target_type = "client"}})
99
end
1010

1111
add_requires("levibuildscript")

0 commit comments

Comments
 (0)