[feature] add 1.21.130 support

* refactor: remove unused `std::string` parameter from `requestServerShutdown`

* refactor: remove unused methods and members from `ConnectionRequest`

* feat: add `onOutgoingPacket` callback to `NetEventCallback` interface

* refactor: update packet identifiers in `packet.h`

* refactor: replace unused `setInactivityTimeout` with `setDisableTrickleIce` in `RemoteConnector` interface

* refactor: add `PlayerAuthenticationInfo` support and clean up unused members in `ServerNetworkHandler`

* refactor: remove unused members and methods from `SubClientConnectionRequest` and `ConnectionRequest`

* refactor: add `revision_` member to `Pack` and `ResourcePackStack`

* refactor: update `ServerInstance` to replace unused members and improve callback types

* refactor: add `ActorSwingSource` enum and update `swing` method to use it

* refactor: bump version numbers and network protocol constants

* refactor: remove unused members and methods from `minecraft.h` and `game_callbacks.h`

* refactor: rename `SerializedSkin` to `SerializedSkinRef`

* refactor: comment out unused virtual methods in `mob.h`

* refactor: add `LevelTickingAreaFinishedLoadingEvent`, new enchantment values, and `ActorSwingSource` updates

* refactor: comment out unused virtual methods and clean up parameter names in `block_type.h`

* refactor: comment out unused member `base_light_texture_image_builder_` in `dimension.h`

* refactor: comment out unused methods and add new virtual function in `level_interface.h`

* refactor: remove unused member `addon_ids_and_versions` from `resource_pack_stack_packet.h`

* refactor: add actor types to `actor_types.h`

* refactor: add new actor flags `CAN_USE_VERTICAL_MOVEMENT_ACTION` and `ROTATION_LOCKED_TO_VEHICLE` to `actor_flags.h`

* refactor: encapsulate `TextPacket` fields into `TextPacketPayload`

* refactor: encapsulate `AvailableCommandsPacket` fields into `AvailableCommandsPacketPayload`

* refactor: add `Dehydration` damage cause to `actor_damage_cause.h`

* refactor: add fields to `AvailableCommandsPacketPayload`

* refactor: update `EndstonePlayer` methods to use `TextPacketPayload` and adjust iteration for `AvailableCommandsPacketPayload`

* refactor: comment out unused `ADDON` stack-related code in `resource_pack_manager.cpp`

* refactor: update `TextPacket` methods to use `TextPacketPayload` and add new helper methods

* refactor: clean up includes

* refactor: remove unused methods `getAuthenticationInfo`, `isVerified`, and `getData` from connection request classes

* refactor: encapsulate DevTools thread logic in `DevToolsCommand` class

* refactor: update `symobls.toml`

* refactor: add `PlayerAuthenticationInfo` parameter to `trytLoadPlayer` and `_createNewPlayer` methods

* refactor: update `ItemStackBase::setUserData` to use `ItemInstance::fromTag` method

* refactor: update `EndstonePlayer` and `Actor` teleport methods implementation

* refactor: remove `UnverifiedCertificate::fromString` hook

* feat: update symbols for Linux

* feat: add `_getRawRequest` method

* feat: update vtable for `Item` class

* refactor: deprecate `getVisualLiquidHeight` and add `checkBlockDestroyPermissions` to `IBlockSource`

* feat: add container registry-related methods and interfaces in level interface

* refactor: update symbols for Windows

* feat: move IP and player ban checks to `ServerNetworkHandler::_validateLoginPacket`

* feat: re-implement `TextPacket::write`

* fix: resolve a crash caused by incorrect symbols

* refactor: update symbol for `CommandOriginLoader::load`

* refactor: comment out unused block component members and update type alias

* fix: update `Minecraft::requestServerShutdown` implementation

* refactor: update symbol for `ItemRegistry::lookupByName`

* refactor: replace `std::unordered_map` with `brstd::flat_map` in `BaseAttributeMap`

* refactor: implement `iterator_impl` and `iterator_impl_base` in `associative_adapter`

* style: update `.clang-format` to allow inline short functions

* feat: add `associative_adapter::find`

* refactor: use pointers for `AttributeInstance` in `BaseAttributeMap`

* refactor: move DevTools thread management to DedicatedServer startup

* fix: resolve a crash when using `/reload`

* refactor: simplify `DeathInfoPacket` struct

* fix: correct `TextPacket` serialization logic

it works, but it doesn't look right - mojang did you mess it up?

* fix: resolve compilation errors on Linux

* fix: correct symbol address for `Player::completeUsingItem`

Author: wu-vincent

.clang-format

@@ -3,7 +3,7 @@ AccessModifierOffset: -4
 AlignConsecutiveMacros: Consecutive
 AlignEscapedNewlines: Left
 AlignOperands: AlignAfterOperator
-AllowShortFunctionsOnASingleLine: Empty
+AllowShortFunctionsOnASingleLine: Inline
 AllowShortLambdasOnASingleLine: Inline
 AlwaysBreakTemplateDeclarations: Yes
 BreakBeforeBraces: Stroustrup

endstone/__init__.py

@@ -12,7 +12,7 @@
 )
 from endstone._internal.version import __version__
 
-__minecraft_version__ = "1.21.124"
+__minecraft_version__ = "1.21.130"
 
 __all__ = [
     "__version__",

include/endstone/detail/common.h

@@ -19,9 +19,9 @@
 
 #define ENDSTONE_VERSION_MAJOR 0
 #define ENDSTONE_VERSION_MINOR 10
-#define ENDSTONE_VERSION_PATCH 15
+#define ENDSTONE_VERSION_PATCH 16
 
-#define NETWORK_PROTOCOL_VERSION 860
+#define NETWORK_PROTOCOL_VERSION 898
 
 #define ENDSTONE_API_VERSION ENDSTONE_TOSTRING(ENDSTONE_VERSION_MAJOR) "." ENDSTONE_TOSTRING(ENDSTONE_VERSION_MINOR)
 

src/bedrock/certificates/certificate.h

@@ -21,7 +21,7 @@
 
 class UnverifiedCertificate {
 public:
-    ENDSTONE_HOOK static UnverifiedCertificate fromString(const std::string &input);
+    static UnverifiedCertificate fromString(const std::string &input);
     friend class Certificate;
 
 private:

src/bedrock/forward.h

@@ -112,7 +112,9 @@ class HudContainerManagerModel;
 class I18nObserver;
 class IAddActorEntityProxy;
 class IContainerRegistryAccess;
+class IContainerRegistryTracker;
 class IContentTierManager;
+class IDynamicContainerSerialization;
 class IFileAccess;
 class IFoodItemComponent;
 class IGameModuleShared;
@@ -132,6 +134,7 @@ class ItemComponentPacket;
 class ItemData;
 class ItemStackNetManagerBase;
 class ItemStackRequestData {};
+class ITickingSystem;
 class IWorldRegistriesProvider;
 class JigsawStructureRegistry;
 class LevelChunkBuilderData;
@@ -201,6 +204,7 @@ class ScreenSetupCleanupHelper;
 class ScreenshotOptions;
 class SearchQuery;
 class Seasons {};
+class ServerConnectionAuthValidator;
 class ServerInstanceEventHandler;
 class ServerLocator;
 class ServerMetrics;
@@ -249,6 +253,7 @@ enum class DeviceMemoryTier : int;
 enum class FertilizerType;
 enum class InHandUpdateType : std::int8_t;
 enum class ItemColor : std::int8_t;
+enum class ItemCooldownType : unsigned char;
 enum class JsonBetaState;
 enum class LevelChunkFormat : std::int8_t;
 enum class LevelEvent;

src/bedrock/minecraft_app_interface.h

@@ -29,5 +29,5 @@ class IMinecraftApp {
     [[nodiscard]] virtual bool isDedicatedServer() const = 0;
     virtual void onNetworkMaxPlayersChanged(std::uint32_t) = 0;
     [[nodiscard]] virtual IGameModuleShared &getGameModuleShared() const = 0;
-    virtual void requestServerShutdown(std::string const &) = 0;
+    virtual void requestServerShutdown() = 0;
 };

src/bedrock/network/connection_request.cpp

@@ -16,11 +16,6 @@
 
 #include "bedrock/crypto/encoding/base64.h"
 
-const PlayerAuthenticationInfo &ConnectionRequest::getAuthenticationInfo() const
-{
-    return authentication_info_;
-}
-
 std::string ConnectionRequest::getClientThirdPartyName() const
 {
     return getData("ThirdPartyName").asString();
@@ -88,9 +83,9 @@ std::string ConnectionRequest::getDeviceId() const
     return getData("DeviceId").asString();
 }
 
-bool ConnectionRequest::isVerified() const
+const WebToken &ConnectionRequest::_getRawRequest() const
 {
-    return is_verified_ && raw_token_ != nullptr;
+    return *raw_token_;
 }
 
 std::string ConnectionRequest::getLanguageCode() const
@@ -100,8 +95,5 @@ std::string ConnectionRequest::getLanguageCode() const
 
 Json::Value ConnectionRequest::getData(const std::string &key) const
 {
-    if (isVerified()) {
-        return raw_token_->getData().get(key, Json::nullValue);
-    }
-    return Json::nullValue;
+    return raw_token_->getData().get(key, Json::nullValue);
 }

src/bedrock/network/connection_request.h

@@ -31,7 +31,6 @@
 
 class ConnectionRequest {
 public:
-    [[nodiscard]] const PlayerAuthenticationInfo &getAuthenticationInfo() const;
     [[nodiscard]] PlayerAuthenticationType getAuthenticationType() const;
     [[nodiscard]] std::string getSelfSignedId() const;
     [[nodiscard]] std::string getServerAddress() const;
@@ -41,7 +40,6 @@ class ConnectionRequest {
     [[nodiscard]] std::string getClientPlatformOnlineId() const;
     [[nodiscard]] std::string getClientPlatformOfflineId() const;
     [[nodiscard]] std::string getSkinId() const;
-    [[nodiscard]] std::string getPlayFabId() const;
     [[nodiscard]] std::string getCapeId() const;
     [[nodiscard]] std::vector<unsigned char> getSkinData() const;
     [[nodiscard]] std::string getSkinDataAsString() const;
@@ -77,24 +75,21 @@ class ConnectionRequest {
     [[nodiscard]] bool isTrustedSkin() const;
     [[nodiscard]] bool isOverrideSkin() const;
     [[nodiscard]] bool isCapeOnClassicSkin() const;
-    [[nodiscard]] bool isVerified() const;
-    bool verifySelfSigned(bool);
     [[nodiscard]] bool isCompatibleWithClientSideChunkGen() const;
     [[nodiscard]] PlatformType getPlatformType() const;
     [[nodiscard]] SyncedClientOptionsComponent getClientOptions() const;
-    [[nodiscard]] bool isValid() const;
+    [[nodiscard]] bool isWellFormed() const;
+    [[nodiscard]] const UnverifiedCertificate *_getLegacyCertificate() const;
+    [[nodiscard]] const RawGameServerToken &_getGameServerToken() const;
+    [[nodiscard]] const WebToken &_getRawRequest() const;
 
     [[nodiscard]] std::string getLanguageCode() const;  // Endstone
 
 private:
     [[nodiscard]] Json::Value getData(const std::string &key) const;
 
-    bool is_verified_;
     std::unique_ptr<WebToken> raw_token_;
     std::unique_ptr<UnverifiedCertificate> certificate_data_;
-    LegacyMultiplayerToken legacy_multiplayer_token_;
     RawGameServerToken unverified_game_server_token_;
-    GameServerToken verified_game_server_token_;
     PlayerAuthenticationType authentication_type_;
-    PlayerAuthenticationInfo authentication_info_;
 };

src/bedrock/network/net_event_callback.h

@@ -36,6 +36,7 @@ class NetEventCallback : public Bedrock::EnableNonOwnerReferences {
     virtual void onConnect(const NetworkIdentifier &) = 0;
     virtual void onUnableToConnect(Connection::DisconnectFailReason, const std::string &) = 0;
     virtual void onTick() = 0;
+    virtual void onOutgoingPacket(const NetworkIdentifier &, MinecraftPacketIds, SubClientId, SubClientId) = 0;
     virtual void onValidPacketReceived(const NetworkIdentifier &, MinecraftPacketIds, SubClientId, SubClientId) = 0;
     virtual void onStoreOfferReceive(ShowStoreOfferRedirectType, const std::string &) = 0;
     virtual void onDisconnect(const NetworkIdentifier &, Connection::DisconnectFailReason,

src/bedrock/network/packet.h

@@ -255,9 +255,10 @@ enum class MinecraftPacketIds : int {
     ClientboundControlSchemeSetPacket = 327,
     ServerScriptDebugDrawerPacket = 328,
     ServerboundPackSettingChangePacket = 329,
-    DataStoreSyncPacket = 330,
+    ClientboundDataStore = 330,
     GraphicsParameterOverridePacket = 331,
-    EndId = 332,
+    ServerboundDataStore = 332,
+    EndId = 333,
 };
 
 class NetEventCallback;