fix: fix onOpenContainerScreen

Author: ShrBox

src/lse/events/BlockEvents.cpp

@@ -7,7 +7,6 @@
 #include "ll/api/memory/Hook.h"
 #include "ll/api/memory/Memory.h"
 #include "ll/api/service/Bedrock.h"
-#include "mc/legacy/ActorRuntimeID.h"
 #include "mc/legacy/ActorUniqueID.h"
 #include "mc/scripting/modules/minecraft/events/ScriptBlockGlobalEventListener.h"
 #include "mc/server/commands/CommandOrigin.h"

src/lse/events/EntityEvents.cpp

@@ -8,12 +8,10 @@
 #include "ll/api/service/Bedrock.h"
 #include "ll/api/service/GamingStatus.h"
 #include "mc/common/Globals.h"
-#include "mc/deps/core/string/HashedString.h"
 #include "mc/deps/shared_types/legacy/actor/ActorDamageCause.h"
 #include "mc/entity/components_json_legacy/NpcComponent.h"
 #include "mc/entity/components_json_legacy/ProjectileComponent.h"
 #include "mc/entity/components_json_legacy/TransformationComponent.h"
-#include "mc/legacy/ActorRuntimeID.h"
 #include "mc/legacy/ActorUniqueID.h"
 #include "mc/world/actor/ActorDamageSource.h"
 #include "mc/world/actor/ActorDefinitionIdentifier.h"
@@ -29,7 +27,6 @@
 #include "mc/world/effect/EffectDuration.h"
 #include "mc/world/effect/MobEffectInstance.h"
 #include "mc/world/events/ActorEventCoordinator.h"
-#include "mc/world/events/ProjectileHitEvent.h"
 #include "mc/world/item/CrossbowItem.h"
 #include "mc/world/item/ItemInstance.h"
 #include "mc/world/item/ItemStack.h"

src/lse/events/PlayerEvents.cpp

@@ -20,13 +20,13 @@
 #include "mc/world/actor/player/Player.h"
 #include "mc/world/actor/player/PlayerInventory.h"
 #include "mc/world/actor/player/PlayerItemInUse.h"
-#include "mc/world/containers/models/LevelContainerModel.h"
 #include "mc/world/effect/EffectDuration.h"
 #include "mc/world/effect/MobEffectInstance.h"
 #include "mc/world/events/BlockEventCoordinator.h"
 #include "mc/world/events/EventResult.h"
 #include "mc/world/events/PlayerOpenContainerEvent.h"
 #include "mc/world/gamemode/InteractionResult.h"
+#include "mc/world/inventory/network/ItemStackNetManagerBase.h"
 #include "mc/world/inventory/transaction/ComplexInventoryTransaction.h"
 #include "mc/world/inventory/transaction/InventoryAction.h"
 #include "mc/world/inventory/transaction/InventorySource.h"
@@ -357,14 +357,21 @@ LL_TYPE_INSTANCE_HOOK(
     origin(player, std::move(changeRequest));
 }
 
-LL_TYPE_INSTANCE_HOOK(OpenContainerScreenHook, HookPriority::Normal, Player, &Player::canOpenContainerScreen, bool) {
+LL_TYPE_INSTANCE_HOOK(
+    OpenContainerScreenHook,
+    HookPriority::Normal,
+    ItemStackNetManagerBase,
+    &ItemStackNetManagerBase::$onContainerScreenOpen,
+    void,
+    ContainerScreenContext const& screenContext
+) {
     IF_LISTENED(EVENT_TYPES::onOpenContainerScreen) {
-        if (!CallEvent(EVENT_TYPES::onOpenContainerScreen, PlayerClass::newPlayer(this))) {
-            return false;
+        if (!CallEvent(EVENT_TYPES::onOpenContainerScreen, PlayerClass::newPlayer(&mUnkecd0f2.as<Player&>()))) {
+            return;
         }
     }
     IF_LISTENED_END(EVENT_TYPES::onOpenContainerScreen);
-    return origin();
+    return origin(screenContext);
 }
 
 LL_TYPE_STATIC_HOOK(