fix: fix BinaryStreamClass::writeItem

ShrBox · ShrBox · commit 27d2f2f85a63 · 2025-02-28T12:24:39.000+08:00
diff --git a/src/legacy/api/BlockAPI.cpp b/src/legacy/api/BlockAPI.cpp
@@ -9,7 +9,7 @@
 #include "api/McAPI.h"
 #include "api/NbtAPI.h"
 #include "ll/api/service/Bedrock.h"
-#include "lse/api/BlockHelper.h"
+#include "lse/api/helper/BlockHelper.h"
 #include "mc/deps/core/utility/optional_ref.h"
 #include "mc/world/level/BlockSource.h"
 #include "mc/world/level/ChunkBlockPos.h"
diff --git a/src/legacy/api/EntityAPI.cpp b/src/legacy/api/EntityAPI.cpp
@@ -10,8 +10,8 @@
 #include "api/PlayerAPI.h"
 #include "ll/api/memory/Memory.h"
 #include "ll/api/service/Bedrock.h"
-#include "lse/api/AttributeHelper.h"
 #include "lse/api/MoreGlobal.h"
+#include "lse/api/helper/AttributeHelper.h"
 #include "mc/deps/core/math/Vec2.h"
 #include "mc/deps/shared_types/legacy/actor/ActorDamageCause.h"
 #include "mc/deps/vanilla_components/StateVectorComponent.h"
diff --git a/src/legacy/api/ItemAPI.cpp b/src/legacy/api/ItemAPI.cpp
@@ -6,7 +6,7 @@
 #include "api/McAPI.h"
 #include "api/NbtAPI.h"
 #include "ll/api/service/Bedrock.h"
-#include "lse/api/ItemHelper.h"
+#include "lse/api/helper/ItemHelper.h"
 #include "mc/safety/RedactableString.h"
 #include "mc/world/actor/item/ItemActor.h"
 #include "mc/world/item/Item.h"
diff --git a/src/legacy/api/PacketAPI.cpp b/src/legacy/api/PacketAPI.cpp
@@ -5,6 +5,7 @@
 #include "api/EntityAPI.h"
 #include "api/ItemAPI.h"
 #include "api/NbtAPI.h"
+#include "lse/api/helper/ItemStackSerializerHelpers.h"
 #include "mc/deps/core/utility/BinaryStream.h"
 #include "mc/network/MinecraftPackets.h"
 #include "mc/network/packet/Packet.h"
@@ -455,7 +456,7 @@ Local<Value> BinaryStreamClass::writeItem(const Arguments& args) {
             LOG_WRONG_ARG_TYPE(__FUNCTION__);
             return Local<Value>();
         }
-        pkt->writeType(NetworkItemStackDescriptor(*item));
+        ItemStackSerializerHelpers::write(NetworkItemStackDescriptor(*item), *pkt);
         return Boolean::newBoolean(true);
     }
     CATCH("Fail in BinaryStream writeCompoundTag!");
diff --git a/src/legacy/api/PlayerAPI.cpp b/src/legacy/api/PlayerAPI.cpp
@@ -24,11 +24,11 @@
 #include "ll/api/service/PlayerInfo.h"
 #include "ll/api/service/ServerInfo.h"
 #include "ll/api/thread/ServerThreadExecutor.h"
-#include "lse/api/AttributeHelper.h"
 #include "lse/api/MoreGlobal.h"
 #include "lse/api/NetworkPacket.h"
-#include "lse/api/PlayerHelper.h"
-#include "lse/api/ScoreboardHelper.h"
+#include "lse/api/helper/AttributeHelper.h"
+#include "lse/api/helper/PlayerHelper.h"
+#include "lse/api/helper/ScoreboardHelper.h"
 #include "main/EconomicSystem.h"
 #include "main/SafeGuardRecord.h"
 #include "mc/certificates/WebToken.h"
diff --git a/src/legacy/api/SimulatedPlayerAPI.cpp b/src/legacy/api/SimulatedPlayerAPI.cpp
@@ -8,7 +8,7 @@
 #include "engine/EngineOwnData.h"
 #include "engine/GlobalShareData.h"
 #include "ll/api/service/Bedrock.h"
-#include "lse/api/SimulatedPlayerHelper.h"
+#include "lse/api/helper/SimulatedPlayerHelper.h"
 #include "mc/nbt/CompoundTag.h"
 #include "mc/network/ServerNetworkHandler.h"
 #include "mc/scripting/modules/gametest/ScriptNavigationResult.h"
diff --git a/src/lse/api/helper/AttributeHelper.cpp b/src/lse/api/helper/AttributeHelper.cpp
@@ -1,4 +1,4 @@
-#include "lse/api/AttributeHelper.h"
+#include "AttributeHelper.h"
 
 #include "mc/world/attribute/AttributeInstance.h"
 #include "mc/world/attribute/AttributeModificationContext.h"
diff --git a/src/lse/api/helper/AttributeHelper.h b/src/lse/api/helper/AttributeHelper.h
diff --git a/src/lse/api/helper/BlockHelper.cpp b/src/lse/api/helper/BlockHelper.cpp
@@ -1,4 +1,4 @@
-#include "lse/api/BlockHelper.h"
+#include "BlockHelper.h"
 
 #include "mc/world/level/dimension/DimensionHeightRange.h"
 
diff --git a/src/lse/api/helper/BlockHelper.h b/src/lse/api/helper/BlockHelper.h
diff --git a/src/lse/api/helper/ItemHelper.cpp b/src/lse/api/helper/ItemHelper.cpp
@@ -1,4 +1,4 @@
-#include "lse/api/ItemHelper.h"
+#include "ItemHelper.h"
 
 #include "mc/nbt/CompoundTag.h"
 #include "mc/world/item/Item.h"
diff --git a/src/lse/api/helper/ItemHelper.h b/src/lse/api/helper/ItemHelper.h
diff --git a/src/lse/api/helper/ItemStackSerializerHelpers.h b/src/lse/api/helper/ItemStackSerializerHelpers.h
@@ -0,0 +1,9 @@
+#include "mc/deps/core/utility/BinaryStream.h"
+#include "mc/platform/Result.h"
+
+namespace ItemStackSerializerHelpers {
+template <typename T>
+MCAPI void write(const T& item, BinaryStream& stream);
+template <typename T>
+MCAPI Bedrock::Result<T> read(ReadOnlyBinaryStream& stream);
+} // namespace ItemStackSerializerHelpers
diff --git a/src/lse/api/helper/PlayerHelper.cpp b/src/lse/api/helper/PlayerHelper.cpp
@@ -1,4 +1,4 @@
-#include "lse/api/PlayerHelper.h"
+#include "PlayerHelper.h"
 
 #include "mc/world/actor/player/Player.h"
 #include "mc/world/attribute/AttributeInstance.h"
diff --git a/src/lse/api/helper/PlayerHelper.h b/src/lse/api/helper/PlayerHelper.h
diff --git a/src/lse/api/helper/ScoreboardHelper.cpp b/src/lse/api/helper/ScoreboardHelper.cpp
@@ -1,4 +1,4 @@
-#include "lse/api/ScoreboardHelper.h"
+#include "ScoreboardHelper.h"
 
 #include "mc/world/scores/IdentityDictionary.h"
 
diff --git a/src/lse/api/helper/ScoreboardHelper.h b/src/lse/api/helper/ScoreboardHelper.h
diff --git a/src/lse/api/helper/SimulatedPlayerHelper.cpp b/src/lse/api/helper/SimulatedPlayerHelper.cpp
@@ -1,4 +1,4 @@
-#include "lse/api/SimulatedPlayerHelper.h"
+#include "SimulatedPlayerHelper.h"
 
 #include "mc/deps/ecs/gamerefs_entity/EntityContext.h"
 #include "mc/entity/components_json_legacy/NavigationComponent.h"
diff --git a/src/lse/api/helper/SimulatedPlayerHelper.h b/src/lse/api/helper/SimulatedPlayerHelper.h

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "lse/api/AttributeHelper.h"`
	`1`	`+#include "AttributeHelper.h"`
`2`	`2`
`3`	`3`	`#include "mc/world/attribute/AttributeInstance.h"`
`4`	`4`	`#include "mc/world/attribute/AttributeModificationContext.h"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "lse/api/BlockHelper.h"`
	`1`	`+#include "BlockHelper.h"`
`2`	`2`
`3`	`3`	`#include "mc/world/level/dimension/DimensionHeightRange.h"`
`4`	`4`