diff --git a/Include/Core/Classes/MenuContainer.hpp b/Include/Core/Classes/MenuContainer.hpp new file mode 100644 index 0000000..3d1e101 --- /dev/null +++ b/Include/Core/Classes/MenuContainer.hpp @@ -0,0 +1,38 @@ +#ifndef MENUCONTAINER_HPP_INCLUDED +#define MENUCONTAINER_HPP_INCLUDED + +#include "../JavaClass/Object.hpp" +#include "../JavaClass/Class.hpp" +#include +#include +#include + +namespace Internal +{ + class MenuContainer : public Object + { + public: + MenuContainer(const void* Obj); + + MenuContainer() = default; + MenuContainer(MenuContainer&& Obj) = default; + MenuContainer(const MenuContainer& Obj) = default; + MenuContainer& operator=(MenuContainer&& Obj) = default; + MenuContainer& operator=(const MenuContainer& Obj) = default; + + static Class GetClass(); + + std::vector GetActions() const; + std::vector GetChildren() const; + MenuContainer GetChildren(std::int32_t I) const; + std::int32_t GetCount() const; + std::int32_t GetHeight() const; + std::vector GetTargets() const; + std::int32_t GetWidth() const; + std::int32_t GetX() const; + std::int32_t GetY() const; + + }; +} + +#endif // MENUCONTAINER_HPP_INCLUDED diff --git a/Include/Core/Internal.hpp b/Include/Core/Internal.hpp index 59bbb79..3e03e74 100644 --- a/Include/Core/Internal.hpp +++ b/Include/Core/Internal.hpp @@ -83,6 +83,7 @@ #include "Classes/KeyListen.hpp" #include "Classes/LinkedList.hpp" #include "Classes/Matrix.hpp" +#include "Classes/MenuContainer.hpp" #include "Classes/MessageNode.hpp" #include "Classes/Model.hpp" #include "Classes/ModelInfo.hpp" @@ -190,14 +191,8 @@ namespace Internal std::int32_t GetLoginWindow(); std::int32_t GetMapAngle(); std::vector GetMapRegions(); - std::vector GetMenuActions(); - std::int32_t GetMenuCount(); - std::int32_t GetMenuHeight(); - std::vector GetMenuTargets(); + MenuContainer GetMenu(); bool GetMenuVisible(); - std::int32_t GetMenuWidth(); - std::int32_t GetMenuX(); - std::int32_t GetMenuY(); std::int64_t GetMouseLastPressed(); std::int32_t GetMouseX(); std::int32_t GetMouseY(); @@ -338,6 +333,14 @@ namespace Internal std::int8_t GetTileSettings(std::int32_t X, std::int32_t Y, std::int32_t Plane); std::int32_t GetCollisionFlags(std::int32_t X, std::int32_t Y, std::int32_t Plane); + std::vector GetMenuActions(); + std::int32_t GetMenuCount(); + std::int32_t GetMenuHeight(); + std::vector GetMenuTargets(); + std::int32_t GetMenuWidth(); + std::int32_t GetMenuX(); + std::int32_t GetMenuY(); + void LockUpdate(); void UnlockUpdate(); diff --git a/Library/libAlpacaLibrary.a b/Library/libAlpacaLibrary.a index fb8ed4e..fd2cc27 100644 Binary files a/Library/libAlpacaLibrary.a and b/Library/libAlpacaLibrary.a differ