diff --git a/Include/Core/Classes/Animation.hpp b/Include/Core/Classes/Animation.hpp index 1f74974..93afe69 100644 --- a/Include/Core/Classes/Animation.hpp +++ b/Include/Core/Classes/Animation.hpp @@ -6,19 +6,22 @@ #include #include -class Animation : public CacheableNode +namespace Internal { - public: - Animation(); - Animation(const void* Obj); - Animation(const Animation& A); - static Class GetClass(); + class Animation : public CacheableNode + { + public: + Animation(); + Animation(const void* Obj); + Animation(const Animation& A); + static Class GetClass(); - std::vector GetFrameIDs() const; - std::vector GetInterleave() const; - std::int32_t GetLeftHandItem() const; - std::int32_t GetRightHandItem() const; + std::vector GetFrameIDs() const; + std::vector GetInterleave() const; + std::int32_t GetLeftHandItem() const; + std::int32_t GetRightHandItem() const; -}; + }; +} #endif // ANIMATION_HPP_INCLUDED diff --git a/Include/Core/Classes/AttackOption.hpp b/Include/Core/Classes/AttackOption.hpp index 8c9208e..a48a80d 100644 --- a/Include/Core/Classes/AttackOption.hpp +++ b/Include/Core/Classes/AttackOption.hpp @@ -5,16 +5,19 @@ #include "../JavaClass/Class.hpp" #include -class AttackOption : public Object +namespace Internal { - public: - AttackOption(); - AttackOption(const void* Obj); - AttackOption(const AttackOption& A); - static Class GetClass(); + class AttackOption : public Object + { + public: + AttackOption(); + AttackOption(const void* Obj); + AttackOption(const AttackOption& A); + static Class GetClass(); - std::int32_t GetType() const; + std::int32_t GetType() const; -}; + }; +} #endif // ATTACKOPTION_HPP_INCLUDED diff --git a/Include/Core/Classes/Cache.hpp b/Include/Core/Classes/Cache.hpp index c0c7597..e66e0e0 100644 --- a/Include/Core/Classes/Cache.hpp +++ b/Include/Core/Classes/Cache.hpp @@ -6,17 +6,20 @@ #include "HashTable.hpp" #include "Queue.hpp" -class Cache : public Object +namespace Internal { - public: - Cache(); - Cache(const void* Obj); - Cache(const Cache& C); - static Class GetClass(); + class Cache : public Object + { + public: + Cache(); + Cache(const void* Obj); + Cache(const Cache& C); + static Class GetClass(); - HashTable GetHashTable() const; - Queue GetQueue() const; + HashTable GetHashTable() const; + Queue GetQueue() const; -}; + }; +} #endif // CACHE_HPP_INCLUDED diff --git a/Include/Core/Classes/CacheableNode.hpp b/Include/Core/Classes/CacheableNode.hpp index 4dcb2b6..249bdd8 100644 --- a/Include/Core/Classes/CacheableNode.hpp +++ b/Include/Core/Classes/CacheableNode.hpp @@ -4,17 +4,20 @@ #include "Node.hpp" #include "../JavaClass/Class.hpp" -class CacheableNode : public Node +namespace Internal { - public: - CacheableNode(); - CacheableNode(const void* Obj); - CacheableNode(const CacheableNode& C); - static Class GetClass(); + class CacheableNode : public Node + { + public: + CacheableNode(); + CacheableNode(const void* Obj); + CacheableNode(const CacheableNode& C); + static Class GetClass(); - CacheableNode GetNext() const; - CacheableNode GetPrev() const; + CacheableNode GetNext() const; + CacheableNode GetPrev() const; -}; + }; +} #endif // CACHEABLENODE_HPP_INCLUDED diff --git a/Include/Core/Classes/Character.hpp b/Include/Core/Classes/Character.hpp index 5a040b2..406eb26 100644 --- a/Include/Core/Classes/Character.hpp +++ b/Include/Core/Classes/Character.hpp @@ -8,31 +8,34 @@ #include #include -class Character : public Renderable +namespace Internal { - public: - Character(); - Character(const void* Obj); - Character(const Character& C); - static Class GetClass(); + class Character : public Renderable + { + public: + Character(); + Character(const void* Obj); + Character(const Character& C); + static Class GetClass(); - std::int32_t GetAngle() const; - std::int32_t GetAnimationDelay() const; - std::int32_t GetAnimationFrame() const; - std::int32_t GetAnimationID() const; - LinkedList GetCombatInfo() const; - std::int32_t GetGraphicsFrame() const; - std::int32_t GetGraphicsID() const; - std::int32_t GetInteractIndex() const; - std::string GetOverhead() const; - std::vector GetPathX() const; - std::vector GetPathY() const; - std::int32_t GetPoseAnimationFrame() const; - std::int32_t GetPoseAnimationID() const; - std::int32_t GetSubPoseAnimationID() const; - std::int32_t GetX() const; - std::int32_t GetY() const; + std::int32_t GetAngle() const; + std::int32_t GetAnimationDelay() const; + std::int32_t GetAnimationFrame() const; + std::int32_t GetAnimationID() const; + LinkedList GetCombatInfo() const; + std::int32_t GetGraphicsFrame() const; + std::int32_t GetGraphicsID() const; + std::int32_t GetInteractIndex() const; + std::string GetOverhead() const; + std::vector GetPathX() const; + std::vector GetPathY() const; + std::int32_t GetPoseAnimationFrame() const; + std::int32_t GetPoseAnimationID() const; + std::int32_t GetSubPoseAnimationID() const; + std::int32_t GetX() const; + std::int32_t GetY() const; -}; + }; +} #endif // CHARACTER_HPP_INCLUDED diff --git a/Include/Core/Classes/ChatLineBuffer.hpp b/Include/Core/Classes/ChatLineBuffer.hpp index 1bfc312..60f0435 100644 --- a/Include/Core/Classes/ChatLineBuffer.hpp +++ b/Include/Core/Classes/ChatLineBuffer.hpp @@ -7,17 +7,20 @@ #include #include "MessageNode.hpp" -class ChatLineBuffer : public Object +namespace Internal { - public: - ChatLineBuffer(); - ChatLineBuffer(const void* Obj); - ChatLineBuffer(const ChatLineBuffer& C); - static Class GetClass(); + class ChatLineBuffer : public Object + { + public: + ChatLineBuffer(); + ChatLineBuffer(const void* Obj); + ChatLineBuffer(const ChatLineBuffer& C); + static Class GetClass(); - std::int32_t GetLength() const; - std::vector GetLines() const; + std::int32_t GetLength() const; + std::vector GetLines() const; -}; + }; +} #endif // CHATLINEBUFFER_HPP_INCLUDED diff --git a/Include/Core/Classes/ClanMember.hpp b/Include/Core/Classes/ClanMember.hpp index 25fe3b0..b1ea698 100644 --- a/Include/Core/Classes/ClanMember.hpp +++ b/Include/Core/Classes/ClanMember.hpp @@ -5,14 +5,17 @@ #include "../JavaClass/Class.hpp" #include -class ClanMember : public Talkable +namespace Internal { - public: - ClanMember(); - ClanMember(const void* Obj); - ClanMember(const ClanMember& C); - static Class GetClass(); + class ClanMember : public Talkable + { + public: + ClanMember(); + ClanMember(const void* Obj); + ClanMember(const ClanMember& C); + static Class GetClass(); -}; + }; +} #endif // CLANMEMBER_HPP_INCLUDED diff --git a/Include/Core/Classes/ClanMemberList.hpp b/Include/Core/Classes/ClanMemberList.hpp index d72a052..69378b5 100644 --- a/Include/Core/Classes/ClanMemberList.hpp +++ b/Include/Core/Classes/ClanMemberList.hpp @@ -4,14 +4,17 @@ #include "NameableContainer.hpp" #include "../JavaClass/Class.hpp" -class ClanMemberList : public NameableContainer +namespace Internal { - public: - ClanMemberList(); - ClanMemberList(const void* Obj); - ClanMemberList(const ClanMemberList& C); - static Class GetClass(); + class ClanMemberList : public NameableContainer + { + public: + ClanMemberList(); + ClanMemberList(const void* Obj); + ClanMemberList(const ClanMemberList& C); + static Class GetClass(); -}; + }; +} #endif // CLANMEMBERLIST_HPP_INCLUDED diff --git a/Include/Core/Classes/DecorativeObject.hpp b/Include/Core/Classes/DecorativeObject.hpp index 71d6268..fdd3258 100644 --- a/Include/Core/Classes/DecorativeObject.hpp +++ b/Include/Core/Classes/DecorativeObject.hpp @@ -6,25 +6,28 @@ #include #include "Renderable.hpp" -class DecorativeObject : public Object +namespace Internal { - public: - DecorativeObject(); - DecorativeObject(const void* Obj); - DecorativeObject(const DecorativeObject& D); - static Class GetClass(); + class DecorativeObject : public Object + { + public: + DecorativeObject(); + DecorativeObject(const void* Obj); + DecorativeObject(const DecorativeObject& D); + static Class GetClass(); - std::int32_t GetAngle() const; - std::int32_t GetFlags() const; - std::int32_t GetHash() const; - std::int32_t GetOffsetX() const; - std::int32_t GetOffsetY() const; - std::int32_t GetPlane() const; - std::int32_t GetRenderInfo() const; - Renderable GetRenderable() const; - std::int32_t GetX() const; - std::int32_t GetY() const; + std::int32_t GetAngle() const; + std::int32_t GetFlags() const; + std::int32_t GetHash() const; + std::int32_t GetOffsetX() const; + std::int32_t GetOffsetY() const; + std::int32_t GetPlane() const; + std::int32_t GetRenderInfo() const; + Renderable GetRenderable() const; + std::int32_t GetX() const; + std::int32_t GetY() const; -}; + }; +} #endif // DECORATIVEOBJECT_HPP_INCLUDED diff --git a/Include/Core/Classes/Deque.hpp b/Include/Core/Classes/Deque.hpp index 8ed2e41..22fd634 100644 --- a/Include/Core/Classes/Deque.hpp +++ b/Include/Core/Classes/Deque.hpp @@ -5,17 +5,20 @@ #include "../JavaClass/Class.hpp" #include "Node.hpp" -class Deque : public Object +namespace Internal { - public: - Deque(); - Deque(const void* Obj); - Deque(const Deque& D); - static Class GetClass(); + class Deque : public Object + { + public: + Deque(); + Deque(const void* Obj); + Deque(const Deque& D); + static Class GetClass(); - Node GetHead() const; - Node GetTail() const; + Node GetHead() const; + Node GetTail() const; -}; + }; +} #endif // DEQUE_HPP_INCLUDED diff --git a/Include/Core/Classes/DynamicObject.hpp b/Include/Core/Classes/DynamicObject.hpp index caf753f..530d1ae 100644 --- a/Include/Core/Classes/DynamicObject.hpp +++ b/Include/Core/Classes/DynamicObject.hpp @@ -5,17 +5,20 @@ #include "../JavaClass/Class.hpp" #include -class DynamicObject : public Renderable +namespace Internal { - public: - DynamicObject(); - DynamicObject(const void* Obj); - DynamicObject(const DynamicObject& D); - static Class GetClass(); + class DynamicObject : public Renderable + { + public: + DynamicObject(); + DynamicObject(const void* Obj); + DynamicObject(const DynamicObject& D); + static Class GetClass(); - std::int32_t GetID() const; - std::int32_t GetOrientation() const; - std::int32_t GetType() const; -}; + std::int32_t GetID() const; + std::int32_t GetOrientation() const; + std::int32_t GetType() const; + }; +} #endif // DYNAMICOBJECT_HPP_INCLUDED diff --git a/Include/Core/Classes/ExchangeOffer.hpp b/Include/Core/Classes/ExchangeOffer.hpp index bfd9912..0e02d21 100644 --- a/Include/Core/Classes/ExchangeOffer.hpp +++ b/Include/Core/Classes/ExchangeOffer.hpp @@ -5,19 +5,22 @@ #include "../JavaClass/Class.hpp" #include -class ExchangeOffer : public Object +namespace Internal { - public: - ExchangeOffer(); - ExchangeOffer(const void* Obj); - ExchangeOffer(const ExchangeOffer& E); - static Class GetClass(); + class ExchangeOffer : public Object + { + public: + ExchangeOffer(); + ExchangeOffer(const void* Obj); + ExchangeOffer(const ExchangeOffer& E); + static Class GetClass(); - std::int32_t GetAmountTraded() const; - std::int32_t GetItemID() const; - std::int8_t GetProgress() const; - std::int32_t GetTotalAmount() const; + std::int32_t GetAmountTraded() const; + std::int32_t GetItemID() const; + std::int8_t GetProgress() const; + std::int32_t GetTotalAmount() const; -}; + }; +} #endif // EXCHANGEOFFER_HPP_INCLUDED diff --git a/Include/Core/Classes/Frame.hpp b/Include/Core/Classes/Frame.hpp index 6463b1a..b32db32 100644 --- a/Include/Core/Classes/Frame.hpp +++ b/Include/Core/Classes/Frame.hpp @@ -7,22 +7,25 @@ #include #include "FrameMap.hpp" -class Frame : public Object +namespace Internal { - public: - Frame(); - Frame(const void* Obj); - Frame(const Frame& F); - static Class GetClass(); + class Frame : public Object + { + public: + Frame(); + Frame(const void* Obj); + Frame(const Frame& F); + static Class GetClass(); - std::vector GetIndices() const; - bool GetShowing() const; - FrameMap GetSkin() const; - std::vector GetTranslatorX() const; - std::vector GetTranslatorY() const; - std::vector GetTranslatorZ() const; - std::int32_t GetTranslatorsLength() const; + std::vector GetIndices() const; + bool GetShowing() const; + FrameMap GetSkin() const; + std::vector GetTranslatorX() const; + std::vector GetTranslatorY() const; + std::vector GetTranslatorZ() const; + std::int32_t GetTranslatorsLength() const; -}; + }; +} #endif // FRAME_HPP_INCLUDED diff --git a/Include/Core/Classes/FrameMap.hpp b/Include/Core/Classes/FrameMap.hpp index b9e81a5..db9f6a8 100644 --- a/Include/Core/Classes/FrameMap.hpp +++ b/Include/Core/Classes/FrameMap.hpp @@ -6,17 +6,20 @@ #include #include -class FrameMap : public Node +namespace Internal { - public: - FrameMap(); - FrameMap(const void* Obj); - FrameMap(const FrameMap& F); - static Class GetClass(); + class FrameMap : public Node + { + public: + FrameMap(); + FrameMap(const void* Obj); + FrameMap(const FrameMap& F); + static Class GetClass(); - std::vector> GetList() const; - std::vector GetTypes() const; + std::vector> GetList() const; + std::vector GetTypes() const; -}; + }; +} #endif // FRAMEMAP_HPP_INCLUDED diff --git a/Include/Core/Classes/Frames.hpp b/Include/Core/Classes/Frames.hpp index 1d50977..8bcd286 100644 --- a/Include/Core/Classes/Frames.hpp +++ b/Include/Core/Classes/Frames.hpp @@ -6,16 +6,19 @@ #include #include "Frame.hpp" -class Frames : public CacheableNode +namespace Internal { - public: - Frames(); - Frames(const void* Obj); - Frames(const Frames& F); - static Class GetClass(); + class Frames : public CacheableNode + { + public: + Frames(); + Frames(const void* Obj); + Frames(const Frames& F); + static Class GetClass(); - std::vector GetSkeletons() const; + std::vector GetSkeletons() const; -}; + }; +} #endif // FRAMES_HPP_INCLUDED diff --git a/Include/Core/Classes/Friend.hpp b/Include/Core/Classes/Friend.hpp index 2c55aef..2a75904 100644 --- a/Include/Core/Classes/Friend.hpp +++ b/Include/Core/Classes/Friend.hpp @@ -5,14 +5,17 @@ #include "../JavaClass/Class.hpp" #include -class Friend : public Talkable +namespace Internal { - public: - Friend(); - Friend(const void* Obj); - Friend(const Friend& F); - static Class GetClass(); + class Friend : public Talkable + { + public: + Friend(); + Friend(const void* Obj); + Friend(const Friend& F); + static Class GetClass(); -}; + }; +} #endif // FRIEND_HPP_INCLUDED diff --git a/Include/Core/Classes/FriendList.hpp b/Include/Core/Classes/FriendList.hpp index 0066570..9c92683 100644 --- a/Include/Core/Classes/FriendList.hpp +++ b/Include/Core/Classes/FriendList.hpp @@ -4,14 +4,17 @@ #include "NameableContainer.hpp" #include "../JavaClass/Class.hpp" -class FriendList : public NameableContainer +namespace Internal { - public: - FriendList(); - FriendList(const void* Obj); - FriendList(const FriendList& F); - static Class GetClass(); + class FriendList : public NameableContainer + { + public: + FriendList(); + FriendList(const void* Obj); + FriendList(const FriendList& F); + static Class GetClass(); -}; + }; +} #endif // FRIENDLIST_HPP_INCLUDED diff --git a/Include/Core/Classes/GameObject.hpp b/Include/Core/Classes/GameObject.hpp index 32d5cf6..5486492 100644 --- a/Include/Core/Classes/GameObject.hpp +++ b/Include/Core/Classes/GameObject.hpp @@ -6,27 +6,30 @@ #include #include "Renderable.hpp" -class GameObject : public Object +namespace Internal { - public: - GameObject(); - GameObject(const void* Obj); - GameObject(const GameObject& G); - static Class GetClass(); + class GameObject : public Object + { + public: + GameObject(); + GameObject(const void* Obj); + GameObject(const GameObject& G); + static Class GetClass(); - std::int32_t GetAngle() const; - std::int32_t GetFlags() const; - std::int32_t GetHash() const; - std::int32_t GetHeight() const; - std::int32_t GetOffsetX() const; - std::int32_t GetOffsetY() const; - std::int32_t GetPlane() const; - std::int32_t GetRelativeX() const; - std::int32_t GetRelativeY() const; - Renderable GetRenderable() const; - std::int32_t GetX() const; - std::int32_t GetY() const; + std::int32_t GetAngle() const; + std::int32_t GetFlags() const; + std::int32_t GetHash() const; + std::int32_t GetHeight() const; + std::int32_t GetOffsetX() const; + std::int32_t GetOffsetY() const; + std::int32_t GetPlane() const; + std::int32_t GetRelativeX() const; + std::int32_t GetRelativeY() const; + Renderable GetRenderable() const; + std::int32_t GetX() const; + std::int32_t GetY() const; -}; + }; +} #endif // GAMEOBJECT_HPP_INCLUDED diff --git a/Include/Core/Classes/GameShell.hpp b/Include/Core/Classes/GameShell.hpp index 305d42b..5826be4 100644 --- a/Include/Core/Classes/GameShell.hpp +++ b/Include/Core/Classes/GameShell.hpp @@ -5,16 +5,19 @@ #include "../JavaClass/Class.hpp" #include "../JavaClass/Canvas.hpp" -class GameShell : public Object +namespace Internal { - public: - GameShell(); - GameShell(const void* Obj); - GameShell(const GameShell& G); - static Class GetClass(); + class GameShell : public Object + { + public: + GameShell(); + GameShell(const void* Obj); + GameShell(const GameShell& G); + static Class GetClass(); - Canvas GetCanvas() const; + Canvas GetCanvas() const; -}; + }; +} #endif // GAMESHELL_HPP_INCLUDED diff --git a/Include/Core/Classes/GraphicsObject.hpp b/Include/Core/Classes/GraphicsObject.hpp index 3065f38..788300b 100644 --- a/Include/Core/Classes/GraphicsObject.hpp +++ b/Include/Core/Classes/GraphicsObject.hpp @@ -6,23 +6,26 @@ #include "Animation.hpp" #include -class GraphicsObject : public Renderable +namespace Internal { - public: - GraphicsObject(); - GraphicsObject(const void* Obj); - GraphicsObject(const GraphicsObject& G); - static Class GetClass(); + class GraphicsObject : public Renderable + { + public: + GraphicsObject(); + GraphicsObject(const void* Obj); + GraphicsObject(const GraphicsObject& G); + static Class GetClass(); - Animation GetAnimation() const; - std::int32_t GetAnimationFrame() const; - bool GetFinished() const; - std::int32_t GetHeight() const; - std::int32_t GetID() const; - std::int32_t GetPlane() const; - std::int32_t GetX() const; - std::int32_t GetY() const; + Animation GetAnimation() const; + std::int32_t GetAnimationFrame() const; + bool GetFinished() const; + std::int32_t GetHeight() const; + std::int32_t GetID() const; + std::int32_t GetPlane() const; + std::int32_t GetX() const; + std::int32_t GetY() const; -}; + }; +} #endif // GRAPHICSOBJECT_HPP_INCLUDED diff --git a/Include/Core/Classes/GroundItem.hpp b/Include/Core/Classes/GroundItem.hpp index 7624deb..766f266 100644 --- a/Include/Core/Classes/GroundItem.hpp +++ b/Include/Core/Classes/GroundItem.hpp @@ -5,17 +5,20 @@ #include "../JavaClass/Class.hpp" #include -class GroundItem : public Renderable +namespace Internal { - public: - GroundItem(); - GroundItem(const void* Obj); - GroundItem(const GroundItem& G); - static Class GetClass(); + class GroundItem : public Renderable + { + public: + GroundItem(); + GroundItem(const void* Obj); + GroundItem(const GroundItem& G); + static Class GetClass(); - std::int32_t GetAmount() const; - std::int32_t GetID() const; + std::int32_t GetAmount() const; + std::int32_t GetID() const; -}; + }; +} #endif // GROUNDITEM_HPP_INCLUDED diff --git a/Include/Core/Classes/GroundObject.hpp b/Include/Core/Classes/GroundObject.hpp index 7c8e07a..74fe7c6 100644 --- a/Include/Core/Classes/GroundObject.hpp +++ b/Include/Core/Classes/GroundObject.hpp @@ -6,21 +6,24 @@ #include #include "Renderable.hpp" -class GroundObject : public Object +namespace Internal { - public: - GroundObject(); - GroundObject(const void* Obj); - GroundObject(const GroundObject& G); - static Class GetClass(); + class GroundObject : public Object + { + public: + GroundObject(); + GroundObject(const void* Obj); + GroundObject(const GroundObject& G); + static Class GetClass(); - std::int32_t GetHash() const; - std::int32_t GetPlane() const; - std::int32_t GetRenderInfo() const; - Renderable GetRenderable() const; - std::int32_t GetX() const; - std::int32_t GetY() const; + std::int32_t GetHash() const; + std::int32_t GetPlane() const; + std::int32_t GetRenderInfo() const; + Renderable GetRenderable() const; + std::int32_t GetX() const; + std::int32_t GetY() const; -}; + }; +} #endif // GROUNDOBJECT_HPP_INCLUDED diff --git a/Include/Core/Classes/HashTable.hpp b/Include/Core/Classes/HashTable.hpp index 6c1e00d..1dd874f 100644 --- a/Include/Core/Classes/HashTable.hpp +++ b/Include/Core/Classes/HashTable.hpp @@ -7,18 +7,21 @@ #include "Node.hpp" #include -class HashTable : public Object +namespace Internal { - public: - HashTable(); - HashTable(const void* Obj); - HashTable(const HashTable& H); - static Class GetClass(); + class HashTable : public Object + { + public: + HashTable(); + HashTable(const void* Obj); + HashTable(const HashTable& H); + static Class GetClass(); - std::vector GetBuckets() const; - std::int32_t GetIndex() const; - std::int32_t GetSize() const; + std::vector GetBuckets() const; + std::int32_t GetIndex() const; + std::int32_t GetSize() const; -}; + }; +} #endif // HASHTABLE_HPP_INCLUDED diff --git a/Include/Core/Classes/Ignore.hpp b/Include/Core/Classes/Ignore.hpp index c78af71..10c4d17 100644 --- a/Include/Core/Classes/Ignore.hpp +++ b/Include/Core/Classes/Ignore.hpp @@ -4,14 +4,17 @@ #include "Nameable.hpp" #include "../JavaClass/Class.hpp" -class Ignore : public Nameable +namespace Internal { - public: - Ignore(); - Ignore(const void* Obj); - Ignore(const Ignore& I); - static Class GetClass(); + class Ignore : public Nameable + { + public: + Ignore(); + Ignore(const void* Obj); + Ignore(const Ignore& I); + static Class GetClass(); -}; + }; +} #endif // IGNORE_HPP_INCLUDED diff --git a/Include/Core/Classes/IgnoreList.hpp b/Include/Core/Classes/IgnoreList.hpp index bbe5a47..b66a28c 100644 --- a/Include/Core/Classes/IgnoreList.hpp +++ b/Include/Core/Classes/IgnoreList.hpp @@ -4,14 +4,17 @@ #include "NameableContainer.hpp" #include "../JavaClass/Class.hpp" -class IgnoreList : public NameableContainer +namespace Internal { - public: - IgnoreList(); - IgnoreList(const void* Obj); - IgnoreList(const IgnoreList& I); - static Class GetClass(); + class IgnoreList : public NameableContainer + { + public: + IgnoreList(); + IgnoreList(const void* Obj); + IgnoreList(const IgnoreList& I); + static Class GetClass(); -}; + }; +} #endif // IGNORELIST_HPP_INCLUDED diff --git a/Include/Core/Classes/ItemContainer.hpp b/Include/Core/Classes/ItemContainer.hpp index 9a0acc9..bd2a211 100644 --- a/Include/Core/Classes/ItemContainer.hpp +++ b/Include/Core/Classes/ItemContainer.hpp @@ -6,17 +6,20 @@ #include #include -class ItemContainer : public Node +namespace Internal { - public: - ItemContainer(); - ItemContainer(const void* Obj); - ItemContainer(const ItemContainer& I); - static Class GetClass(); + class ItemContainer : public Node + { + public: + ItemContainer(); + ItemContainer(const void* Obj); + ItemContainer(const ItemContainer& I); + static Class GetClass(); - std::vector GetItemAmounts() const; - std::vector GetItemIDs() const; + std::vector GetItemAmounts() const; + std::vector GetItemIDs() const; -}; + }; +} #endif // ITEMCONTAINER_HPP_INCLUDED diff --git a/Include/Core/Classes/ItemInfo.hpp b/Include/Core/Classes/ItemInfo.hpp index 84daff4..b34405b 100644 --- a/Include/Core/Classes/ItemInfo.hpp +++ b/Include/Core/Classes/ItemInfo.hpp @@ -7,26 +7,29 @@ #include #include -class ItemInfo : public CacheableNode +namespace Internal { - public: - ItemInfo(); - ItemInfo(const void* Obj); - ItemInfo(const ItemInfo& I); - static Class GetClass(); + class ItemInfo : public CacheableNode + { + public: + ItemInfo(); + ItemInfo(const void* Obj); + ItemInfo(const ItemInfo& I); + static Class GetClass(); - std::vector GetGroundActions() const; - std::int32_t GetID() const; - std::vector GetInventoryActions() const; - bool GetMembers() const; - std::string GetName() const; - std::int32_t GetNoteID() const; - std::int32_t GetPrice() const; - std::int32_t GetSpriteID() const; - std::vector GetStackAmounts() const; - std::vector GetStackModelIDs() const; - std::int32_t GetStackable() const; + std::vector GetGroundActions() const; + std::int32_t GetID() const; + std::vector GetInventoryActions() const; + bool GetMembers() const; + std::string GetName() const; + std::int32_t GetNoteID() const; + std::int32_t GetPrice() const; + std::int32_t GetSpriteID() const; + std::vector GetStackAmounts() const; + std::vector GetStackModelIDs() const; + std::int32_t GetStackable() const; -}; + }; +} #endif // ITEMINFO_HPP_INCLUDED diff --git a/Include/Core/Classes/LinkedList.hpp b/Include/Core/Classes/LinkedList.hpp index d927b28..d3c7a42 100644 --- a/Include/Core/Classes/LinkedList.hpp +++ b/Include/Core/Classes/LinkedList.hpp @@ -5,17 +5,20 @@ #include "../JavaClass/Class.hpp" #include "Node.hpp" -class LinkedList : public Object +namespace Internal { - public: - LinkedList(); - LinkedList(const void* Obj); - LinkedList(const LinkedList& L); - static Class GetClass(); + class LinkedList : public Object + { + public: + LinkedList(); + LinkedList(const void* Obj); + LinkedList(const LinkedList& L); + static Class GetClass(); - Node GetHead() const; - Node GetTail() const; + Node GetHead() const; + Node GetTail() const; -}; + }; +} #endif // LINKEDLIST_HPP_INCLUDED diff --git a/Include/Core/Classes/MessageNode.hpp b/Include/Core/Classes/MessageNode.hpp index 7d0f49b..692ef4e 100644 --- a/Include/Core/Classes/MessageNode.hpp +++ b/Include/Core/Classes/MessageNode.hpp @@ -6,21 +6,24 @@ #include #include -class MessageNode : public CacheableNode +namespace Internal { - public: - MessageNode(); - MessageNode(const void* Obj); - MessageNode(const MessageNode& M); - static Class GetClass(); + class MessageNode : public CacheableNode + { + public: + MessageNode(); + MessageNode(const void* Obj); + MessageNode(const MessageNode& M); + static Class GetClass(); - std::int32_t GetID() const; - std::string GetName() const; - std::string GetSender() const; - std::string GetText() const; - std::int32_t GetTick() const; - std::int32_t GetType() const; + std::int32_t GetID() const; + std::string GetName() const; + std::string GetSender() const; + std::string GetText() const; + std::int32_t GetTick() const; + std::int32_t GetType() const; -}; + }; +} #endif // MESSAGENODE_HPP_INCLUDED diff --git a/Include/Core/Classes/Model.hpp b/Include/Core/Classes/Model.hpp index 934c3db..95441cd 100644 --- a/Include/Core/Classes/Model.hpp +++ b/Include/Core/Classes/Model.hpp @@ -6,24 +6,27 @@ #include #include -class Model : public Renderable +namespace Internal { - public: - Model(); - Model(const void* Obj); - Model(const Model& M); - static Class GetClass(); + class Model : public Renderable + { + public: + Model(); + Model(const void* Obj); + Model(const Model& M); + static Class GetClass(); - std::vector> GetFrameMapIndices() const; - std::vector GetIndicesA() const; - std::vector GetIndicesB() const; - std::vector GetIndicesC() const; - std::int32_t GetIndicesLength() const; - std::int32_t GetVerticesLength() const; - std::vector GetVerticesX() const; - std::vector GetVerticesY() const; - std::vector GetVerticesZ() const; + std::vector> GetFrameMapIndices() const; + std::vector GetIndicesA() const; + std::vector GetIndicesB() const; + std::vector GetIndicesC() const; + std::int32_t GetIndicesLength() const; + std::int32_t GetVerticesLength() const; + std::vector GetVerticesX() const; + std::vector GetVerticesY() const; + std::vector GetVerticesZ() const; -}; + }; +} #endif // MODEL_HPP_INCLUDED diff --git a/Include/Core/Classes/NPC.hpp b/Include/Core/Classes/NPC.hpp index 6b7bf60..983a87d 100644 --- a/Include/Core/Classes/NPC.hpp +++ b/Include/Core/Classes/NPC.hpp @@ -5,16 +5,19 @@ #include "../JavaClass/Class.hpp" #include "NPCInfo.hpp" -class NPC : public Character +namespace Internal { - public: - NPC(); - NPC(const void* Obj); - NPC(const NPC& N); - static Class GetClass(); + class NPC : public Character + { + public: + NPC(); + NPC(const void* Obj); + NPC(const NPC& N); + static Class GetClass(); - NPCInfo GetInfo() const; + NPCInfo GetInfo() const; -}; + }; +} #endif // NPC_HPP_INCLUDED diff --git a/Include/Core/Classes/NPCInfo.hpp b/Include/Core/Classes/NPCInfo.hpp index 8b840c5..82bf12a 100644 --- a/Include/Core/Classes/NPCInfo.hpp +++ b/Include/Core/Classes/NPCInfo.hpp @@ -7,27 +7,30 @@ #include #include -class NPCInfo : public CacheableNode +namespace Internal { - public: - NPCInfo(); - NPCInfo(const void* Obj); - NPCInfo(const NPCInfo& N); - static Class GetClass(); + class NPCInfo : public CacheableNode + { + public: + NPCInfo(); + NPCInfo(const void* Obj); + NPCInfo(const NPCInfo& N); + static Class GetClass(); - std::vector GetActions() const; - std::int32_t GetCombatLevel() const; - std::int32_t GetID() const; - std::vector GetImposterIDs() const; - bool GetMinimapVisible() const; - std::vector GetModelIDs() const; - std::string GetName() const; - std::int32_t GetScaleX() const; - std::int32_t GetScaleY() const; - std::int32_t GetSettingID() const; - std::int32_t GetVarbitID() const; - bool GetVisible() const; + std::vector GetActions() const; + std::int32_t GetCombatLevel() const; + std::int32_t GetID() const; + std::vector GetImposterIDs() const; + bool GetMinimapVisible() const; + std::vector GetModelIDs() const; + std::string GetName() const; + std::int32_t GetScaleX() const; + std::int32_t GetScaleY() const; + std::int32_t GetSettingID() const; + std::int32_t GetVarbitID() const; + bool GetVisible() const; -}; + }; +} #endif // NPCINFO_HPP_INCLUDED diff --git a/Include/Core/Classes/NamePair.hpp b/Include/Core/Classes/NamePair.hpp index 02efb9b..468b31d 100644 --- a/Include/Core/Classes/NamePair.hpp +++ b/Include/Core/Classes/NamePair.hpp @@ -5,17 +5,20 @@ #include "../JavaClass/Class.hpp" #include -class NamePair : public Object +namespace Internal { - public: - NamePair(); - NamePair(const void* Obj); - NamePair(const NamePair& N); - static Class GetClass(); + class NamePair : public Object + { + public: + NamePair(); + NamePair(const void* Obj); + NamePair(const NamePair& N); + static Class GetClass(); - std::string GetCleanName() const; - std::string GetName() const; + std::string GetCleanName() const; + std::string GetName() const; -}; + }; +} #endif // NAMEPAIR_HPP_INCLUDED diff --git a/Include/Core/Classes/Nameable.hpp b/Include/Core/Classes/Nameable.hpp index 95b4eba..9445a42 100644 --- a/Include/Core/Classes/Nameable.hpp +++ b/Include/Core/Classes/Nameable.hpp @@ -5,17 +5,19 @@ #include "../JavaClass/Class.hpp" #include "NamePair.hpp" -class Nameable : public Object +namespace Internal { - public: - Nameable(); - Nameable(const void* Obj); - Nameable(const Nameable& N); - static Class GetClass(); + class Nameable : public Object + { + public: + Nameable(); + Nameable(const void* Obj); + Nameable(const Nameable& N); + static Class GetClass(); - NamePair GetNamePair() const; - -}; + NamePair GetNamePair() const; + }; +} #endif // NAMEABLE_HPP_INCLUDED diff --git a/Include/Core/Classes/NameableContainer.hpp b/Include/Core/Classes/NameableContainer.hpp index 1ba75b3..9db5727 100644 --- a/Include/Core/Classes/NameableContainer.hpp +++ b/Include/Core/Classes/NameableContainer.hpp @@ -6,17 +6,20 @@ #include #include "Nameable.hpp" -class NameableContainer : public Object +namespace Internal { - public: - NameableContainer(); - NameableContainer(const void* Obj); - NameableContainer(const NameableContainer& N); - static Class GetClass(); + class NameableContainer : public Object + { + public: + NameableContainer(); + NameableContainer(const void* Obj); + NameableContainer(const NameableContainer& N); + static Class GetClass(); - std::vector GetNameables() const; - std::int32_t GetSize() const; + std::vector GetNameables() const; + std::int32_t GetSize() const; -}; + }; +} #endif // NAMEABLECONTAINER_HPP_INCLUDED diff --git a/Include/Core/Classes/Node.hpp b/Include/Core/Classes/Node.hpp index fe07117..ffc7995 100644 --- a/Include/Core/Classes/Node.hpp +++ b/Include/Core/Classes/Node.hpp @@ -5,18 +5,21 @@ #include "../JavaClass/Class.hpp" #include -class Node : public Object +namespace Internal { - public: - Node(); - Node(const void* Obj); - Node(const Node& N); - static Class GetClass(); + class Node : public Object + { + public: + Node(); + Node(const void* Obj); + Node(const Node& N); + static Class GetClass(); - Node GetNext() const; - Node GetPrev() const; - std::int64_t GetUID() const; + Node GetNext() const; + Node GetPrev() const; + std::int64_t GetUID() const; -}; + }; +} #endif // NODE_HPP_INCLUDED diff --git a/Include/Core/Classes/ObjectInfo.hpp b/Include/Core/Classes/ObjectInfo.hpp index cd59642..42139f8 100644 --- a/Include/Core/Classes/ObjectInfo.hpp +++ b/Include/Core/Classes/ObjectInfo.hpp @@ -7,23 +7,26 @@ #include #include -class ObjectInfo : public CacheableNode +namespace Internal { - public: - ObjectInfo(); - ObjectInfo(const void* Obj); - ObjectInfo(const ObjectInfo& O); - static Class GetClass(); + class ObjectInfo : public CacheableNode + { + public: + ObjectInfo(); + ObjectInfo(const void* Obj); + ObjectInfo(const ObjectInfo& O); + static Class GetClass(); - std::vector GetActions() const; - std::int32_t GetID() const; - std::vector GetImposterIDs() const; - std::vector GetModelIDs() const; - std::string GetName() const; - std::vector GetObjectTypes() const; - std::int32_t GetSettingID() const; - std::int32_t GetVarbitID() const; + std::vector GetActions() const; + std::int32_t GetID() const; + std::vector GetImposterIDs() const; + std::vector GetModelIDs() const; + std::string GetName() const; + std::vector GetObjectTypes() const; + std::int32_t GetSettingID() const; + std::int32_t GetVarbitID() const; -}; + }; +} #endif // OBJECTINFO_HPP_INCLUDED diff --git a/Include/Core/Classes/Player.hpp b/Include/Core/Classes/Player.hpp index f34200a..697257f 100644 --- a/Include/Core/Classes/Player.hpp +++ b/Include/Core/Classes/Player.hpp @@ -9,24 +9,27 @@ #include "PlayerInfo.hpp" #include "NamePair.hpp" -class Player : public Character +namespace Internal { - public: - Player(); - Player(const void* Obj); - Player(const Player& P); - static Class GetClass(); + class Player : public Character + { + public: + Player(); + Player(const void* Obj); + Player(const Player& P); + static Class GetClass(); - std::vector GetActions() const; - std::int32_t GetCombatLevel() const; - bool GetHidden() const; - PlayerInfo GetInfo() const; - NamePair GetNamePair() const; - std::int32_t GetOverheadIcon() const; - std::int32_t GetSkullIcon() const; - std::int32_t GetTeam() const; - std::int32_t GetTotalLevel() const; + std::vector GetActions() const; + std::int32_t GetCombatLevel() const; + bool GetHidden() const; + PlayerInfo GetInfo() const; + NamePair GetNamePair() const; + std::int32_t GetOverheadIcon() const; + std::int32_t GetSkullIcon() const; + std::int32_t GetTeam() const; + std::int32_t GetTotalLevel() const; -}; + }; +} #endif // PLAYER_HPP_INCLUDED diff --git a/Include/Core/Classes/PlayerInfo.hpp b/Include/Core/Classes/PlayerInfo.hpp index 8ed353f..a8f6317 100644 --- a/Include/Core/Classes/PlayerInfo.hpp +++ b/Include/Core/Classes/PlayerInfo.hpp @@ -6,20 +6,23 @@ #include #include -class PlayerInfo : public Object +namespace Internal { - public: - PlayerInfo(); - PlayerInfo(const void* Obj); - PlayerInfo(const PlayerInfo& P); - static Class GetClass(); + class PlayerInfo : public Object + { + public: + PlayerInfo(); + PlayerInfo(const void* Obj); + PlayerInfo(const PlayerInfo& P); + static Class GetClass(); - std::vector GetEquipment() const; - bool GetGender() const; - std::int64_t GetHash() const; - std::int64_t GetModelID() const; - std::int32_t GetNPCModelID() const; + std::vector GetEquipment() const; + bool GetGender() const; + std::int64_t GetHash() const; + std::int64_t GetModelID() const; + std::int32_t GetNPCModelID() const; -}; + }; +} #endif // PLAYERINFO_HPP_INCLUDED diff --git a/Include/Core/Classes/PlayerManager.hpp b/Include/Core/Classes/PlayerManager.hpp index f706797..6a00dce 100644 --- a/Include/Core/Classes/PlayerManager.hpp +++ b/Include/Core/Classes/PlayerManager.hpp @@ -6,17 +6,20 @@ #include "FriendList.hpp" #include "IgnoreList.hpp" -class PlayerManager : public Object +namespace Internal { - public: - PlayerManager(); - PlayerManager(const void* Obj); - PlayerManager(const PlayerManager& P); - static Class GetClass(); + class PlayerManager : public Object + { + public: + PlayerManager(); + PlayerManager(const void* Obj); + PlayerManager(const PlayerManager& P); + static Class GetClass(); - FriendList GetFriendList() const; - IgnoreList GetIgnoreList() const; + FriendList GetFriendList() const; + IgnoreList GetIgnoreList() const; -}; + }; +} #endif // PLAYERMANAGER_HPP_INCLUDED diff --git a/Include/Core/Classes/Preferences.hpp b/Include/Core/Classes/Preferences.hpp index 9d8c012..ed161ee 100644 --- a/Include/Core/Classes/Preferences.hpp +++ b/Include/Core/Classes/Preferences.hpp @@ -7,21 +7,24 @@ #include #include -class Preferences : public Object +namespace Internal { - public: - Preferences(); - Preferences(const void* Obj); - Preferences(const Preferences& P); - static Class GetClass(); + class Preferences : public Object + { + public: + Preferences(); + Preferences(const void* Obj); + Preferences(const Preferences& P); + static Class GetClass(); - bool GetHideRoofs() const; - bool GetMuted() const; - LinkedHashMap GetPreferences() const; - std::int32_t GetScreenType() const; - std::string GetUsernameCached() const; - bool GetUsernameHidden() const; + bool GetHideRoofs() const; + bool GetMuted() const; + LinkedHashMap GetPreferences() const; + std::int32_t GetScreenType() const; + std::string GetUsernameCached() const; + bool GetUsernameHidden() const; -}; + }; +} #endif // PREFERENCES_HPP_INCLUDED diff --git a/Include/Core/Classes/Queue.hpp b/Include/Core/Classes/Queue.hpp index 27e05ca..e765e48 100644 --- a/Include/Core/Classes/Queue.hpp +++ b/Include/Core/Classes/Queue.hpp @@ -5,16 +5,19 @@ #include "../JavaClass/Class.hpp" #include "CacheableNode.hpp" -class Queue : public Object +namespace Internal { - public: - Queue(); - Queue(const void* Obj); - Queue(const Queue& Q); - static Class GetClass(); + class Queue : public Object + { + public: + Queue(); + Queue(const void* Obj); + Queue(const Queue& Q); + static Class GetClass(); - CacheableNode GetHead() const; + CacheableNode GetHead() const; -}; + }; +} #endif // QUEUE_HPP_INCLUDED diff --git a/Include/Core/Classes/Region.hpp b/Include/Core/Classes/Region.hpp index c071af0..040fbe4 100644 --- a/Include/Core/Classes/Region.hpp +++ b/Include/Core/Classes/Region.hpp @@ -7,17 +7,20 @@ #include "GameObject.hpp" #include "SceneTile.hpp" -class Region : public Object +namespace Internal { - public: - Region(); - Region(const void* Obj); - Region(const Region& R); - static Class GetClass(); + class Region : public Object + { + public: + Region(); + Region(const void* Obj); + Region(const Region& R); + static Class GetClass(); - std::vector GetGameObjects() const; - std::vector>> GetSceneTiles() const; + std::vector GetGameObjects() const; + std::vector>> GetSceneTiles() const; -}; + }; +} #endif // REGION_HPP_INCLUDED diff --git a/Include/Core/Classes/Renderable.hpp b/Include/Core/Classes/Renderable.hpp index 39c1fd9..97147c4 100644 --- a/Include/Core/Classes/Renderable.hpp +++ b/Include/Core/Classes/Renderable.hpp @@ -5,16 +5,19 @@ #include "../JavaClass/Class.hpp" #include -class Renderable : public CacheableNode +namespace Internal { - public: - Renderable(); - Renderable(const void* Obj); - Renderable(const Renderable& R); - static Class GetClass(); + class Renderable : public CacheableNode + { + public: + Renderable(); + Renderable(const void* Obj); + Renderable(const Renderable& R); + static Class GetClass(); - std::int32_t GetModelHeight() const; + std::int32_t GetModelHeight() const; -}; + }; +} #endif // RENDERABLE_HPP_INCLUDED diff --git a/Include/Core/Classes/SceneTile.hpp b/Include/Core/Classes/SceneTile.hpp index dc66883..52f8adc 100644 --- a/Include/Core/Classes/SceneTile.hpp +++ b/Include/Core/Classes/SceneTile.hpp @@ -10,22 +10,25 @@ #include #include "WallObject.hpp" -class SceneTile : public Node +namespace Internal { - public: - SceneTile(); - SceneTile(const void* Obj); - SceneTile(const SceneTile& G); - static Class GetClass(); + class SceneTile : public Node + { + public: + SceneTile(); + SceneTile(const void* Obj); + SceneTile(const SceneTile& G); + static Class GetClass(); - DecorativeObject GetDecorativeObject() const; - std::vector GetGameObjects() const; - GroundObject GetGroundObject() const; - std::int32_t GetPlane() const; - WallObject GetWallObject() const; - std::int32_t GetX() const; - std::int32_t GetY() const; + DecorativeObject GetDecorativeObject() const; + std::vector GetGameObjects() const; + GroundObject GetGroundObject() const; + std::int32_t GetPlane() const; + WallObject GetWallObject() const; + std::int32_t GetX() const; + std::int32_t GetY() const; -}; + }; +} #endif // SCENETILE_HPP_INCLUDED diff --git a/Include/Core/Classes/SpotAnimation.hpp b/Include/Core/Classes/SpotAnimation.hpp index 2aa9829..6d97012 100644 --- a/Include/Core/Classes/SpotAnimation.hpp +++ b/Include/Core/Classes/SpotAnimation.hpp @@ -5,20 +5,23 @@ #include "../JavaClass/Class.hpp" #include -class SpotAnimation : public CacheableNode +namespace Internal { - public: - SpotAnimation(); - SpotAnimation(const void* Obj); - SpotAnimation(const SpotAnimation& S); - static Class GetClass(); + class SpotAnimation : public CacheableNode + { + public: + SpotAnimation(); + SpotAnimation(const void* Obj); + SpotAnimation(const SpotAnimation& S); + static Class GetClass(); - std::int32_t GetAngle() const; - std::int32_t GetAnimationID() const; - std::int32_t GetID() const; - std::int32_t GetScaleX() const; - std::int32_t GetScaleY() const; + std::int32_t GetAngle() const; + std::int32_t GetAnimationID() const; + std::int32_t GetID() const; + std::int32_t GetScaleX() const; + std::int32_t GetScaleY() const; -}; + }; +} #endif // SPOTANIMATION_HPP_INCLUDED diff --git a/Include/Core/Classes/Sprite.hpp b/Include/Core/Classes/Sprite.hpp index fcd19a2..7fa0903 100644 --- a/Include/Core/Classes/Sprite.hpp +++ b/Include/Core/Classes/Sprite.hpp @@ -6,18 +6,21 @@ #include #include -class Sprite : public Object +namespace Internal { - public: - Sprite(); - Sprite(const void* Obj); - Sprite(const Sprite& S); - static Class GetClass(); + class Sprite : public Object + { + public: + Sprite(); + Sprite(const void* Obj); + Sprite(const Sprite& S); + static Class GetClass(); - std::int32_t GetHeight() const; - std::vector GetPixels() const; - std::int32_t GetWidth() const; + std::int32_t GetHeight() const; + std::vector GetPixels() const; + std::int32_t GetWidth() const; -}; + }; +} #endif // SPRITE_HPP_INCLUDED diff --git a/Include/Core/Classes/Talkable.hpp b/Include/Core/Classes/Talkable.hpp index a0a4999..64fdabb 100644 --- a/Include/Core/Classes/Talkable.hpp +++ b/Include/Core/Classes/Talkable.hpp @@ -5,17 +5,20 @@ #include "../JavaClass/Class.hpp" #include -class Talkable : public Nameable +namespace Internal { - public: - Talkable(); - Talkable(const void* Obj); - Talkable(const Talkable& T); - static Class GetClass(); + class Talkable : public Nameable + { + public: + Talkable(); + Talkable(const void* Obj); + Talkable(const Talkable& T); + static Class GetClass(); - std::int32_t GetRank() const; - std::int32_t GetWorld() const; + std::int32_t GetRank() const; + std::int32_t GetWorld() const; -}; + }; +} #endif // TALKABLE_HPP_INCLUDED diff --git a/Include/Core/Classes/Varbit.hpp b/Include/Core/Classes/Varbit.hpp index 8d624b2..f76fb79 100644 --- a/Include/Core/Classes/Varbit.hpp +++ b/Include/Core/Classes/Varbit.hpp @@ -5,18 +5,21 @@ #include "../JavaClass/Class.hpp" #include -class Varbit : public CacheableNode +namespace Internal { - public: - Varbit(); - Varbit(const void* Obj); - Varbit(const Varbit& V); - static Class GetClass(); + class Varbit : public CacheableNode + { + public: + Varbit(); + Varbit(const void* Obj); + Varbit(const Varbit& V); + static Class GetClass(); - std::int32_t GetLSB() const; - std::int32_t GetMSB() const; - std::int32_t GetSettingID() const; + std::int32_t GetLSB() const; + std::int32_t GetMSB() const; + std::int32_t GetSettingID() const; -}; + }; +} #endif // VARBIT_HPP_INCLUDED diff --git a/Include/Core/Classes/WallObject.hpp b/Include/Core/Classes/WallObject.hpp index 093fa6e..6e71475 100644 --- a/Include/Core/Classes/WallObject.hpp +++ b/Include/Core/Classes/WallObject.hpp @@ -6,23 +6,26 @@ #include #include "Renderable.hpp" -class WallObject : public Object +namespace Internal { - public: - WallObject(); - WallObject(const void* Obj); - WallObject(const WallObject& W); - static Class GetClass(); + class WallObject : public Object + { + public: + WallObject(); + WallObject(const void* Obj); + WallObject(const WallObject& W); + static Class GetClass(); - std::int32_t GetAngle() const; - std::int32_t GetFlags() const; - std::int32_t GetHash() const; - std::int32_t GetHeight() const; - std::int32_t GetPlane() const; - Renderable GetRenderable() const; - std::int32_t GetX() const; - std::int32_t GetY() const; + std::int32_t GetAngle() const; + std::int32_t GetFlags() const; + std::int32_t GetHash() const; + std::int32_t GetHeight() const; + std::int32_t GetPlane() const; + Renderable GetRenderable() const; + std::int32_t GetX() const; + std::int32_t GetY() const; -}; + }; +} #endif // WALLOBJECT_HPP_INCLUDED diff --git a/Include/Core/Classes/Widget.hpp b/Include/Core/Classes/Widget.hpp index 2655d8e..c9a5032 100644 --- a/Include/Core/Classes/Widget.hpp +++ b/Include/Core/Classes/Widget.hpp @@ -7,38 +7,41 @@ #include #include -class Widget : public Node +namespace Internal { - public: - Widget(); - Widget(const void* Obj); - Widget(const Widget& W); - static Class GetClass(); + class Widget : public Node + { + public: + Widget(); + Widget(const void* Obj); + Widget(const Widget& W); + static Class GetClass(); - std::vector GetActions() const; - std::int32_t GetBorderThickness() const; - std::int32_t GetBoxIndex() const; - std::vector GetChildren() const; - std::int32_t GetHeight() const; - bool GetHidden() const; - std::int32_t GetID() const; - std::int32_t GetItemAmount() const; - std::vector GetItemAmounts() const; - std::int32_t GetItemID() const; - std::vector GetItemIDs() const; - std::string GetName() const; - Widget GetParent() const; - std::int32_t GetParentID() const; - std::int32_t GetRelativeX() const; - std::int32_t GetRelativeY() const; - std::int32_t GetScrollX() const; - std::int32_t GetScrollY() const; - std::int32_t GetShadowColor() const; - std::int32_t GetSpriteID() const; - std::int32_t GetStackType() const; - std::string GetText() const; - std::int32_t GetWidth() const; + std::vector GetActions() const; + std::int32_t GetBorderThickness() const; + std::int32_t GetBoxIndex() const; + std::vector GetChildren() const; + std::int32_t GetHeight() const; + bool GetHidden() const; + std::int32_t GetID() const; + std::int32_t GetItemAmount() const; + std::vector GetItemAmounts() const; + std::int32_t GetItemID() const; + std::vector GetItemIDs() const; + std::string GetName() const; + Widget GetParent() const; + std::int32_t GetParentID() const; + std::int32_t GetRelativeX() const; + std::int32_t GetRelativeY() const; + std::int32_t GetScrollX() const; + std::int32_t GetScrollY() const; + std::int32_t GetShadowColor() const; + std::int32_t GetSpriteID() const; + std::int32_t GetStackType() const; + std::string GetText() const; + std::int32_t GetWidth() const; -}; + }; +} #endif // WIDGET_HPP_INCLUDED diff --git a/Include/Core/Classes/WidgetNode.hpp b/Include/Core/Classes/WidgetNode.hpp index f260852..56212ce 100644 --- a/Include/Core/Classes/WidgetNode.hpp +++ b/Include/Core/Classes/WidgetNode.hpp @@ -5,15 +5,18 @@ #include "../JavaClass/Class.hpp" #include -class WidgetNode : public Node +namespace Internal { - public: - WidgetNode(); - WidgetNode(const void* Obj); - WidgetNode(const WidgetNode& W); - static Class GetClass(); + class WidgetNode : public Node + { + public: + WidgetNode(); + WidgetNode(const void* Obj); + WidgetNode(const WidgetNode& W); + static Class GetClass(); - std::int32_t GetID() const; -}; + std::int32_t GetID() const; + }; +} #endif // WIDGETNODE_HPP_INCLUDED diff --git a/Include/Core/Classes/World.hpp b/Include/Core/Classes/World.hpp index 56c3f2b..a9427fb 100644 --- a/Include/Core/Classes/World.hpp +++ b/Include/Core/Classes/World.hpp @@ -6,22 +6,25 @@ #include #include -class World : public Object +namespace Internal { - public: - World(); - World(const void* Obj); - World(const World& W); - static Class GetClass(); + class World : public Object + { + public: + World(); + World(const void* Obj); + World(const World& W); + static Class GetClass(); - std::string GetActivity() const; - std::string GetAddress() const; - std::int32_t GetID() const; - std::int32_t GetIndex() const; - std::int32_t GetLocation() const; - std::int32_t GetMask() const; - std::int32_t GetPlayerCount() const; + std::string GetActivity() const; + std::string GetAddress() const; + std::int32_t GetID() const; + std::int32_t GetIndex() const; + std::int32_t GetLocation() const; + std::int32_t GetMask() const; + std::int32_t GetPlayerCount() const; -}; + }; +} #endif // WORLD_HPP_INCLUDED diff --git a/Include/Core/Internal.hpp b/Include/Core/Internal.hpp index 1a45b6e..c96c497 100644 --- a/Include/Core/Internal.hpp +++ b/Include/Core/Internal.hpp @@ -82,143 +82,150 @@ #include "Classes/WidgetNode.hpp" #include "Classes/World.hpp" -extern GameShell Client; -Cache GetAnimationCache(); -std::int32_t GetCameraPitch(); -std::int32_t GetCameraX(); -std::int32_t GetCameraY(); -std::int32_t GetCameraYaw(); -std::int32_t GetCameraZ(); -Map GetChatLineCache(); -std::int32_t GetClientPlane(); -Preferences GetClientPreferences(); -std::int32_t GetClientX(); -std::int32_t GetClientY(); -std::int32_t GetCrosshairState(); -std::vector GetCurrentLevels(); -std::int32_t GetCurrentWorld(); -bool GetDraggingItem(); -Cache GetDynamicObjectCache(); -std::vector GetExchangeOffers(); -std::vector GetExperiences(); -bool GetFocused(); -Cache GetFramesCache(); -std::int32_t GetGameState(); -std::int32_t GetGameTick(); -Deque GetGraphicsObjects(); -std::vector>> GetGroundItems(); -HashTable GetItemContainers(); -Cache GetItemModelCache(); -std::int32_t GetItemSelected(); -std::int32_t GetItemSelectedIndex(); -Cache GetItemSpriteCache(); -std::vector GetLevels(); -ClanMemberList GetLocalClanMemberList(); -std::int32_t GetLocalDestinationX(); -std::int32_t GetLocalDestinationY(); -Player GetLocalPlayer(); -PlayerManager GetLocalPlayerManager(); -Region GetLocalRegion(); -std::int32_t GetLoginCaret(); -std::string GetLoginMessage0(); -std::string GetLoginMessage1(); -std::string GetLoginMessage2(); -std::int32_t GetLoginScreenX(); -std::int32_t GetLoginState(); -std::int32_t GetLoginWindow(); -std::int32_t GetMapAngle(); -std::vector GetMenuActions(); -std::int32_t GetMenuCount(); -std::int32_t GetMenuHeight(); -std::vector GetMenuTargets(); -bool GetMenuVisible(); -std::int32_t GetMenuWidth(); -std::int32_t GetMenuX(); -std::int32_t GetMenuY(); -std::int32_t GetMouseX(); -std::int32_t GetMouseY(); -AttackOption GetNPCAttackOption(); -std::vector GetNPCIndices(); -Cache GetNPCModelCache(); -std::vector GetNPCs(); -std::string GetPassword(); -AttackOption GetPlayerAttackOption(); -Cache GetPlayerModelCache(); -std::vector GetPlayers(); -std::int32_t GetPressedItemIndex(); -std::int32_t GetRunEnergy(); -std::string GetSelectedItemName(); -std::string GetSelectedSpellName(); -std::vector GetSettings(); -bool GetSpellSelected(); -Cache GetSpotAnimationCache(); -Cache GetSpotAnimationModelCache(); -std::vector>> GetTileHeights(); -std::vector>> GetTileSettings(); -std::string GetUsername(); -Cache GetVarbitCache(); -std::vector GetVarbitSettings(); -std::int32_t GetViewportHeight(); -std::int32_t GetViewportScale(); -std::int32_t GetViewportWidth(); -std::int32_t GetWeight(); -HashTable GetWidgetNodeCache(); -std::vector> GetWidgets(); -std::vector GetWidgetsHeight(); -std::vector GetWidgetsWidth(); -std::vector GetWidgetsX(); -std::vector GetWidgetsY(); -bool GetWorldSelectOpen(); -std::vector GetWorlds(); -ItemInfo GetItemInfo(std::int32_t ID); -NPCInfo GetNPCInfo(std::int32_t ID); -ObjectInfo GetObjectInfo(std::int32_t ID); -bool LoadWorlds(); -void SetWorld(const World& W); +namespace Internal +{ + extern GameShell Client; -Widget GetWidget(std::int32_t Container, std::int32_t Component); -Widget GetWidgetParent(const Widget& W); -std::int32_t GetWidgetX(const Widget& W); -std::int32_t GetWidgetY(const Widget& W); -bool GetWidgetHidden(const Widget& W); -Box GetWidgetBox(const Widget& W); -ItemContainer GetItemContainer(std::int32_t ID); -NPC GetNPC(std::int32_t Index); -std::vector ProjectModel(const Model& M, std::int32_t LocalX, std::int32_t LocalY, - std::int32_t LocalZ, std::int32_t Angle); -Model GetPlayerModel(std::int64_t ID); -Model GetNPCModel(std::int32_t ID); -Varbit GetVarbit(std::int32_t ID); -Animation GetAnimation(std::int32_t ID); -Frames GetFrames(std::int32_t ID); -Model GetItemModel(std::int32_t ID); -Model GetItemModel(std::int32_t ID, std::int32_t Amount); -SpotAnimation GetSpotAnimation(std::int32_t ID); -Model GetSpotAnimationModel(std::int32_t ID); -Model GetGameObjectModel(const GameObject& O); -Model GetWallObjectModel(const WallObject& O); -Model GetDecorativeObjectModel(const DecorativeObject& O); -Model GetGroundObjectModel(const GroundObject& O); -Model GetDynamicObjectModel(std::int32_t ID); -std::vector> GetGroundItems(std::int32_t Plane); -Deque GetGroundItems(std::int32_t X, std::int32_t Y); -Deque GetGroundItems(std::int32_t X, std::int32_t Y, std::int32_t Plane); -std::vector GetPlayerModel(const Player& P); -std::vector GetNPCModel(const NPC& N); -std::vector GetGraphicsObjectModel(const GraphicsObject& O); -SceneTile GetSceneTile(std::int32_t X, std::int32_t Y, std::int32_t Plane); -std::vector> GetSceneTiles(std::int32_t Plane); -Point TileToMinimap(const Tile& T); -std::int32_t GetTileItemHeight(std::int32_t X, std::int32_t Y, std::int32_t Plane); -Sprite GetItemSprite(std::int32_t ID, std::int32_t Amount, std::int32_t BorderThickness, - std::int32_t ShadowColor, std::int32_t StackType); -Convex GetItemSpriteConvex(const Sprite& S); - -std::int32_t GetSettings(std::int32_t ID); -std::int32_t GetVarbitSettings(std::int32_t VarbitSettingIndex); -Point TileToMainscreen(const Tile& T, std::int32_t X, std::int32_t Y, std::int32_t Z); + Cache GetAnimationCache(); + std::int32_t GetCameraPitch(); + std::int32_t GetCameraX(); + std::int32_t GetCameraY(); + std::int32_t GetCameraYaw(); + std::int32_t GetCameraZ(); + Map GetChatLineCache(); + std::int32_t GetClientPlane(); + Preferences GetClientPreferences(); + std::int32_t GetClientX(); + std::int32_t GetClientY(); + std::int32_t GetCrosshairState(); + std::vector GetCurrentLevels(); + std::int32_t GetCurrentWorld(); + bool GetDraggingItem(); + Cache GetDynamicObjectCache(); + std::vector GetExchangeOffers(); + std::vector GetExperiences(); + bool GetFocused(); + Cache GetFramesCache(); + std::int32_t GetGameState(); + std::int32_t GetGameTick(); + Deque GetGraphicsObjects(); + std::vector>> GetGroundItems(); + HashTable GetItemContainers(); + Cache GetItemInfoCache(); + Cache GetItemModelCache(); + std::int32_t GetItemSelected(); + std::int32_t GetItemSelectedIndex(); + Cache GetItemSpriteCache(); + std::vector GetLevels(); + ClanMemberList GetLocalClanMemberList(); + std::int32_t GetLocalDestinationX(); + std::int32_t GetLocalDestinationY(); + Player GetLocalPlayer(); + PlayerManager GetLocalPlayerManager(); + Region GetLocalRegion(); + std::int32_t GetLoginCaret(); + std::string GetLoginMessage0(); + std::string GetLoginMessage1(); + std::string GetLoginMessage2(); + std::int32_t GetLoginScreenX(); + std::int32_t GetLoginState(); + std::int32_t GetLoginWindow(); + std::int32_t GetMapAngle(); + std::vector GetMenuActions(); + std::int32_t GetMenuCount(); + std::int32_t GetMenuHeight(); + std::vector GetMenuTargets(); + bool GetMenuVisible(); + std::int32_t GetMenuWidth(); + std::int32_t GetMenuX(); + std::int32_t GetMenuY(); + std::int32_t GetMouseX(); + std::int32_t GetMouseY(); + AttackOption GetNPCAttackOption(); + std::vector GetNPCIndices(); + Cache GetNPCModelCache(); + std::vector GetNPCs(); + Cache GetObjectInfoCache(); + std::string GetPassword(); + AttackOption GetPlayerAttackOption(); + Cache GetPlayerModelCache(); + std::vector GetPlayers(); + std::int32_t GetPressedItemIndex(); + std::int32_t GetRunEnergy(); + std::string GetSelectedItemName(); + std::string GetSelectedSpellName(); + std::vector GetSettings(); + bool GetSpellSelected(); + Cache GetSpotAnimationCache(); + Cache GetSpotAnimationModelCache(); + std::vector>> GetTileHeights(); + std::vector>> GetTileSettings(); + std::string GetUsername(); + Cache GetVarbitCache(); + std::vector GetVarbitSettings(); + std::int32_t GetViewportHeight(); + std::int32_t GetViewportScale(); + std::int32_t GetViewportWidth(); + std::int32_t GetWeight(); + HashTable GetWidgetNodeCache(); + std::vector> GetWidgets(); + std::vector GetWidgetsHeight(); + std::vector GetWidgetsWidth(); + std::vector GetWidgetsX(); + std::vector GetWidgetsY(); + bool GetWorldSelectOpen(); + std::vector GetWorlds(); + ItemInfo LoadItemInfo(std::int32_t ID); + NPCInfo LoadNPCInfo(std::int32_t ID); + ObjectInfo LoadObjectInfo(std::int32_t ID); + bool LoadWorlds(); + void SetWorld(const World& W); + ItemInfo GetItemInfo(std::int32_t ID); + NPCInfo GetNPCInfo(std::int32_t ID); + ObjectInfo GetObjectInfo(std::int32_t ID); + Widget GetWidget(std::int32_t Container, std::int32_t Component); + Widget GetWidgetParent(const Widget& W); + std::int32_t GetWidgetX(const Widget& W); + std::int32_t GetWidgetY(const Widget& W); + bool GetWidgetHidden(const Widget& W); + Box GetWidgetBox(const Widget& W); + ItemContainer GetItemContainer(std::int32_t ID); + NPC GetNPC(std::int32_t Index); + std::vector ProjectModel(const Model& M, std::int32_t LocalX, std::int32_t LocalY, + std::int32_t LocalZ, std::int32_t Angle); + Model GetPlayerModel(std::int64_t ID); + Model GetNPCModel(std::int32_t ID); + Varbit GetVarbit(std::int32_t ID); + Animation GetAnimation(std::int32_t ID); + Frames GetFrames(std::int32_t ID); + Model GetItemModel(std::int32_t ID); + Model GetItemModel(std::int32_t ID, std::int32_t Amount); + SpotAnimation GetSpotAnimation(std::int32_t ID); + Model GetSpotAnimationModel(std::int32_t ID); + Model GetGameObjectModel(const GameObject& O); + Model GetWallObjectModel(const WallObject& O); + Model GetDecorativeObjectModel(const DecorativeObject& O); + Model GetGroundObjectModel(const GroundObject& O); + Model GetDynamicObjectModel(std::int32_t ID); + std::vector> GetGroundItems(std::int32_t Plane); + Deque GetGroundItems(std::int32_t X, std::int32_t Y); + Deque GetGroundItems(std::int32_t X, std::int32_t Y, std::int32_t Plane); + std::vector GetPlayerModel(const Player& P); + std::vector GetNPCModel(const NPC& N); + std::vector GetGraphicsObjectModel(const GraphicsObject& O); + SceneTile GetSceneTile(std::int32_t X, std::int32_t Y, std::int32_t Plane); + std::vector> GetSceneTiles(std::int32_t Plane); + Point TileToMinimap(const Tile& T); + std::int32_t GetTileItemHeight(std::int32_t X, std::int32_t Y, std::int32_t Plane); + Sprite GetItemSprite(std::int32_t ID, std::int32_t Amount, std::int32_t BorderThickness, + std::int32_t ShadowColor, std::int32_t StackType); + Convex GetItemSpriteConvex(const Sprite& S); + std::int32_t GetSettings(std::int32_t ID); + std::int32_t GetVarbitSettings(std::int32_t VarbitSettingIndex); + Point TileToMainscreen(const Tile& T, std::int32_t X, std::int32_t Y, std::int32_t Z); +} #endif // INTERNAL_HPP_INCLUDED diff --git a/Include/Game/Core.hpp b/Include/Game/Core.hpp index 3942adb..cd2bb52 100644 --- a/Include/Game/Core.hpp +++ b/Include/Game/Core.hpp @@ -37,6 +37,8 @@ #include "Models/NPCs.hpp" #include "Models/Players.hpp" +#include "Interactable/GameObject.hpp" + // // DoxyGen //======================================================= diff --git a/Include/Game/Interactable/GameObject.hpp b/Include/Game/Interactable/GameObject.hpp new file mode 100644 index 0000000..48c47d4 --- /dev/null +++ b/Include/Game/Interactable/GameObject.hpp @@ -0,0 +1,29 @@ +#ifndef INTERACTABLEGAMEOBJECT_HPP_INCLUDED +#define INTERACTABLEGAMEOBJECT_HPP_INCLUDED + +#include "../../Core/Classes/GameObject.hpp" +#include "../../Core/Classes/ObjectInfo.hpp" +#include "../../Core/Types/Tile.hpp" +#include "../../Core/Types/Point.hpp" +#include "../../Core/Types/Convex.hpp" +#include + +namespace Interactable +{ + class GameObject : public Internal::GameObject + { + public: + GameObject(const Internal::GameObject& G); + GameObject(const GameObject& G); + + std::int32_t GetID() const; + std::string GetName() const; + Tile GetTile() const; + Internal::ObjectInfo GetInfo() const; + std::vector GetModel() const; + Convex GetConvex() const; + + }; +} + +#endif // INTERACTABLEGAMEOBJECT_HPP_INCLUDED diff --git a/Include/Game/Interfaces/Chat.hpp b/Include/Game/Interfaces/Chat.hpp index 95f3193..bf0674a 100644 --- a/Include/Game/Interfaces/Chat.hpp +++ b/Include/Game/Interfaces/Chat.hpp @@ -46,9 +46,9 @@ class Chat } CHAT_TYPE; - static std::vector GetMessages(CHAT_TYPE Type); - static std::vector GetMessages(CHAT_TYPE Type, bool Sort); - static MessageNode GetLastMessage(CHAT_TYPE Type); + static std::vector GetMessages(CHAT_TYPE Type); + static std::vector GetMessages(CHAT_TYPE Type, bool Sort); + static Internal::MessageNode GetLastMessage(CHAT_TYPE Type); static DIALOGUE_STATE GetDialogueState(); static std::vector GetDialogueOptions(); diff --git a/Include/Game/Interfaces/GameTabs/Clan.hpp b/Include/Game/Interfaces/GameTabs/Clan.hpp index 3aaac56..20585f8 100644 --- a/Include/Game/Interfaces/GameTabs/Clan.hpp +++ b/Include/Game/Interfaces/GameTabs/Clan.hpp @@ -12,8 +12,8 @@ class Clan public: static bool IsOpen(); static bool Open(); - static std::vector GetAll(); - static std::vector GetAll(const std::function& Filter); + static std::vector GetAll(); + static std::vector GetAll(const std::function& Filter); }; /** @} */ diff --git a/Include/Game/Interfaces/GameTabs/Friends.hpp b/Include/Game/Interfaces/GameTabs/Friends.hpp index 1385621..9542a2d 100644 --- a/Include/Game/Interfaces/GameTabs/Friends.hpp +++ b/Include/Game/Interfaces/GameTabs/Friends.hpp @@ -12,8 +12,8 @@ class Friends public: static bool IsOpen(); static bool Open(); - static std::vector GetAll(); - static std::vector GetAll(const std::function& Filter); + static std::vector GetAll(); + static std::vector GetAll(const std::function& Filter); }; /** @} */ diff --git a/Include/Game/Interfaces/GameTabs/Ignores.hpp b/Include/Game/Interfaces/GameTabs/Ignores.hpp index 22ef5ca..9faad25 100644 --- a/Include/Game/Interfaces/GameTabs/Ignores.hpp +++ b/Include/Game/Interfaces/GameTabs/Ignores.hpp @@ -12,8 +12,8 @@ class Ignores public: static bool IsOpen(); static bool Open(); - static std::vector GetAll(); - static std::vector GetAll(const std::function& Filter); + static std::vector GetAll(); + static std::vector GetAll(const std::function& Filter); }; /** @} */ diff --git a/Include/Game/Interfaces/GameTabs/Logout.hpp b/Include/Game/Interfaces/GameTabs/Logout.hpp index 3b4d7dd..ca4e497 100644 --- a/Include/Game/Interfaces/GameTabs/Logout.hpp +++ b/Include/Game/Interfaces/GameTabs/Logout.hpp @@ -21,16 +21,16 @@ class Logout static bool OpenWorldSwitcher(); static bool OpenWorldSwitcher(bool OpenInventory); - static bool WorldSwitcherScrollTo(World World); + static bool WorldSwitcherScrollTo(Internal::World World); static bool WorldSwitcherScrollTo(std::int32_t WorldID); - static bool SwitchWorld(World World); + static bool SwitchWorld(Internal::World World); static bool SwitchWorld(std::int32_t WorldID); static std::vector GetFavoriteWorlds(); - static Widget GetWorldWidget(World World); - static Widget GetWorldWidget(std::int32_t WorldID); + static Internal::Widget GetWorldWidget(Internal::World World); + static Internal::Widget GetWorldWidget(std::int32_t WorldID); }; /** @} */ diff --git a/Include/Game/Interfaces/Login.hpp b/Include/Game/Interfaces/Login.hpp index 86749c9..70bfcc4 100644 --- a/Include/Game/Interfaces/Login.hpp +++ b/Include/Game/Interfaces/Login.hpp @@ -41,7 +41,7 @@ class Login static bool EnterCredentials(); static bool SelectWorld(); - static bool SelectWorld(World World); + static bool SelectWorld(Internal::World World); static bool SelectWorld(std::int32_t WorldID); static bool OpenWorldSelect(); static bool OpenWorldSelect(bool Close); diff --git a/Include/Game/Interfaces/Mainscreen.hpp b/Include/Game/Interfaces/Mainscreen.hpp index c8b2c39..e103286 100644 --- a/Include/Game/Interfaces/Mainscreen.hpp +++ b/Include/Game/Interfaces/Mainscreen.hpp @@ -35,11 +35,11 @@ class Mainscreen static bool WaitIsUpText(std::uint32_t Duration, std::uint32_t Step, const std::string& UpText); static bool WaitUpTextContains(std::uint32_t Duration, std::uint32_t Step, const std::string& UpText); - static Character GetInteractingByIndex(std::uint32_t Index); - static Character GetInteracting(); //Returns the Character interacting with the Local Player - static Character GetInteractingWith(const Character& C); //Returns the Character interactinng with the Character + static Internal::Character GetInteractingByIndex(std::uint32_t Index); + static Internal::Character GetInteracting(); //Returns the Character interacting with the Local Player + static Internal::Character GetInteractingWith(const Internal::Character& C); //Returns the Character interactinng with the Character - static bool IsInteracting(const Character& A, const Character& B); // True if A is interacting with B + static bool IsInteracting(const Internal::Character& A, const Internal::Character& B); // True if A is interacting with B static std::int32_t CameraX(); static std::int32_t CameraY(); diff --git a/Include/Game/Models/GroundItems.hpp b/Include/Game/Models/GroundItems.hpp index cdb7e9d..853c9a6 100644 --- a/Include/Game/Models/GroundItems.hpp +++ b/Include/Game/Models/GroundItems.hpp @@ -14,23 +14,23 @@ class GroundItems { public: - static std::vector GetAll(); - static std::vector GetAll(Tile T); - static std::vector GetAll(std::int32_t ID); - static std::vector GetAll(const std::string& Name); - static std::vector GetAll(const std::vector& IDs); - static std::vector GetAll(const std::vector& Names); - static std::vector GetAll(const std::function& Filter); + static std::vector GetAll(); + static std::vector GetAll(Tile T); + static std::vector GetAll(std::int32_t ID); + static std::vector GetAll(const std::string& Name); + static std::vector GetAll(const std::vector& IDs); + static std::vector GetAll(const std::vector& Names); + static std::vector GetAll(const std::function& Filter); - static GroundItem Get(Tile T); - static GroundItem Get(std::int32_t ID); - static GroundItem Get(const std::string& Name); - static GroundItem Get(const std::vector& IDs); - static GroundItem Get(const std::vector& Names); + static Internal::GroundItem Get(Tile T); + static Internal::GroundItem Get(std::int32_t ID); + static Internal::GroundItem Get(const std::string& Name); + static Internal::GroundItem Get(const std::vector& IDs); + static Internal::GroundItem Get(const std::vector& Names); - static Tile GetTileOf(GroundItem G); + static Tile GetTileOf(Internal::GroundItem G); - static Convex GetConvexOf(GroundItem G); + static Convex GetConvexOf(Internal::GroundItem G); }; /** @} */ diff --git a/Include/Game/Models/NPCs.hpp b/Include/Game/Models/NPCs.hpp index 9ae6f43..85db23b 100644 --- a/Include/Game/Models/NPCs.hpp +++ b/Include/Game/Models/NPCs.hpp @@ -15,25 +15,25 @@ class NPCs { public: - static std::vector GetAll(); - static std::vector GetAll(const Tile& Tile); - static std::vector GetAll(std::int32_t ID); - static std::vector GetAll(const std::string& Name); - static std::vector GetAll(const std::vector& IDs); - static std::vector GetAll(const std::vector& Names); - static std::vector GetAll(const std::function& Filter); + static std::vector GetAll(); + static std::vector GetAll(const Tile& Tile); + static std::vector GetAll(std::int32_t ID); + static std::vector GetAll(const std::string& Name); + static std::vector GetAll(const std::vector& IDs); + static std::vector GetAll(const std::vector& Names); + static std::vector GetAll(const std::function& Filter); - static NPC Get(); - static NPC Get(const Tile& Tile); - static NPC Get(std::int32_t ID); - static NPC Get(const std::string& Name); - static NPC Get(const std::vector& IDs); - static NPC Get(const std::vector& Names); - static NPC Get(const std::function& Filter); + static Internal::NPC Get(); + static Internal::NPC Get(const Tile& Tile); + static Internal::NPC Get(std::int32_t ID); + static Internal::NPC Get(const std::string& Name); + static Internal::NPC Get(const std::vector& IDs); + static Internal::NPC Get(const std::vector& Names); + static Internal::NPC Get(const std::function& Filter); - static Tile GetTileOf(const NPC& NPC); + static Tile GetTileOf(const Internal::NPC& NPC); - static Convex GetConvexOf(const NPC& NPC); + static Convex GetConvexOf(const Internal::NPC& NPC); }; /** @} */ diff --git a/Include/Game/Models/Players.hpp b/Include/Game/Models/Players.hpp index b91efef..1b8d8c5 100644 --- a/Include/Game/Models/Players.hpp +++ b/Include/Game/Models/Players.hpp @@ -14,22 +14,22 @@ class Players { public: - static Player GetLocal(); - static std::vector GetAll(); - static std::vector GetAll(const Tile& Tile); - static std::vector GetAll(const std::string& Name); - static std::vector GetAll(const std::vector& Names); - static std::vector GetAll(const std::function& Filter); + static Internal::Player GetLocal(); + static std::vector GetAll(); + static std::vector GetAll(const Tile& Tile); + static std::vector GetAll(const std::string& Name); + static std::vector GetAll(const std::vector& Names); + static std::vector GetAll(const std::function& Filter); - static Player Get(); - static Player Get(const Tile& Tile); - static Player Get(const std::string& Name); - static Player Get(const std::vector& Names); - static Player Get(const std::function& Filter); + static Internal::Player Get(); + static Internal::Player Get(const Tile& Tile); + static Internal::Player Get(const std::string& Name); + static Internal::Player Get(const std::vector& Names); + static Internal::Player Get(const std::function& Filter); - static Tile GetTileOf(const Player& P); + static Tile GetTileOf(const Internal::Player& P); - static Convex GetConvexOf(const Player& P); + static Convex GetConvexOf(const Internal::Player& P); }; /** @} */ diff --git a/Include/Game/Models/SceneObjects.hpp b/Include/Game/Models/SceneObjects.hpp index f5e2870..042b4f6 100644 --- a/Include/Game/Models/SceneObjects.hpp +++ b/Include/Game/Models/SceneObjects.hpp @@ -36,10 +36,10 @@ class SceneObjects static std::vector GetAll(const std::vector& PossibleIDs, OBJECT_TYPE ObjectTypes = ALL); static std::vector GetAll(const std::vector& PossibleNames, OBJECT_TYPE ObjectTypes = ALL); - static std::vector GetAll(const std::function& Filter); - static std::vector GetAll(const std::function& Filter); - static std::vector GetAll(const std::function& Filter); - static std::vector GetAll(const std::function& Filter); + static std::vector GetAll(const std::function& Filter); + static std::vector GetAll(const std::function& Filter); + static std::vector GetAll(const std::function& Filter); + static std::vector GetAll(const std::function& Filter); static Object Get(const Tile& T, OBJECT_TYPE ObjectTypes = ALL); static Object Get(std::int32_t ID, OBJECT_TYPE ObjectTypes = ALL); @@ -47,26 +47,26 @@ class SceneObjects static Object Get(const std::vector& PossibleIDs, OBJECT_TYPE ObjectTypes = ALL); static Object Get(const std::vector& PossibleNames, OBJECT_TYPE ObjectTypes = ALL); - static GameObject Get(const std::function& Filter); - static DecorativeObject Get(const std::function& Filter); - static GroundObject Get(const std::function& Filter); - static WallObject Get(const std::function& Filter); + static Internal::GameObject Get(const std::function& Filter); + static Internal::DecorativeObject Get(const std::function& Filter); + static Internal::GroundObject Get(const std::function& Filter); + static Internal::WallObject Get(const std::function& Filter); - static ObjectInfo GetInfoOf(const Object& O); - static ObjectInfo GetInfoOf(const GameObject& G); - static ObjectInfo GetInfoOf(const DecorativeObject& D); - static ObjectInfo GetInfoOf(const GroundObject& G); - static ObjectInfo GetInfoOf(const WallObject& W); + static Internal::ObjectInfo GetInfoOf(const Object& O); + static Internal::ObjectInfo GetInfoOf(const Internal::GameObject& G); + static Internal::ObjectInfo GetInfoOf(const Internal::DecorativeObject& D); + static Internal::ObjectInfo GetInfoOf(const Internal::GroundObject& G); + static Internal::ObjectInfo GetInfoOf(const Internal::WallObject& W); - static Tile GetTileOf(const GameObject& G); - static Tile GetTileOf(const DecorativeObject& D); - static Tile GetTileOf(const GroundObject& G); - static Tile GetTileOf(const WallObject& W); + static Tile GetTileOf(const Internal::GameObject& G); + static Tile GetTileOf(const Internal::DecorativeObject& D); + static Tile GetTileOf(const Internal::GroundObject& G); + static Tile GetTileOf(const Internal::WallObject& W); - static Convex GetConvexOf(const GameObject& G); - static Convex GetConvexOf(const DecorativeObject& D); - static Convex GetConvexOf(const GroundObject& G); - static Convex GetConvexOf(const WallObject& W); + static Convex GetConvexOf(const Internal::GameObject& G); + static Convex GetConvexOf(const Internal::DecorativeObject& D); + static Convex GetConvexOf(const Internal::GroundObject& G); + static Convex GetConvexOf(const Internal::WallObject& W); }; /** @} */ diff --git a/Include/Game/Tools/Interact.hpp b/Include/Game/Tools/Interact.hpp index 0aaa411..f2e3aa8 100644 --- a/Include/Game/Tools/Interact.hpp +++ b/Include/Game/Tools/Interact.hpp @@ -30,37 +30,37 @@ class Interact static bool Click(Box B, const std::string& Action, const std::string& Target = ""); static bool Click(Box B, const std::vector& PossibleActions, const std::vector& PossibleTargets = {""}); - static bool Click(Widget W, Button Button = BUTTON_LEFT); - static bool Click(Widget W, const std::string& Action, const std::string& Target = ""); - static bool Click(Widget W, const std::vector& PossibleActions, const std::vector& PossibleTargets = {""}); + static bool Click(Internal::Widget W, Button Button = BUTTON_LEFT); + static bool Click(Internal::Widget W, const std::string& Action, const std::string& Target = ""); + static bool Click(Internal::Widget W, const std::vector& PossibleActions, const std::vector& PossibleTargets = {""}); static bool Click(Convex C, Button Button = BUTTON_LEFT); static bool Click(Convex C, const std::string& Action, const std::string& Target = ""); static bool Click(Convex C, const std::vector& PossibleActions, const std::vector& PossibleTargets = {""}); - static bool Click(GroundItem G, Button Button = BUTTON_LEFT); - static bool Click(GroundItem G, const std::string& Action); - static bool Click(GroundItem G, const std::vector& PossibleActions); + static bool Click(Internal::GroundItem G, Button Button = BUTTON_LEFT); + static bool Click(Internal::GroundItem G, const std::string& Action); + static bool Click(Internal::GroundItem G, const std::vector& PossibleActions); - static bool Click(NPC N, Button Button = BUTTON_LEFT); - static bool Click(NPC N, const std::string& Action); - static bool Click(NPC N, const std::vector& PossibleActions); + static bool Click(Internal::NPC N, Button Button = BUTTON_LEFT); + static bool Click(Internal::NPC N, const std::string& Action); + static bool Click(Internal::NPC N, const std::vector& PossibleActions); - static bool Click(Player P, Button Button = BUTTON_LEFT); - static bool Click(Player P, const std::string& Action); - static bool Click(Player P, const std::vector& PossibleActions); + static bool Click(Internal::Player P, Button Button = BUTTON_LEFT); + static bool Click(Internal::Player P, const std::string& Action); + static bool Click(Internal::Player P, const std::vector& PossibleActions); - static bool Click(GameObject G, Button Button = BUTTON_LEFT); - static bool Click(GameObject G, const std::string& Action); - static bool Click(GameObject G, const std::vector& PossibleActions); + static bool Click(Internal::GameObject G, Button Button = BUTTON_LEFT); + static bool Click(Internal::GameObject G, const std::string& Action); + static bool Click(Internal::GameObject G, const std::vector& PossibleActions); - static bool Click(GroundObject G, Button Button = BUTTON_LEFT); - static bool Click(GroundObject G, const std::string& Action); - static bool Click(GroundObject G, const std::vector& PossibleActions); + static bool Click(Internal::GroundObject G, Button Button = BUTTON_LEFT); + static bool Click(Internal::GroundObject G, const std::string& Action); + static bool Click(Internal::GroundObject G, const std::vector& PossibleActions); - static bool Click(WallObject W, Button Button = BUTTON_LEFT); - static bool Click(WallObject W, const std::string& Action); - static bool Click(WallObject W, const std::vector& PossibleActions); + static bool Click(Internal::WallObject W, Button Button = BUTTON_LEFT); + static bool Click(Internal::WallObject W, const std::string& Action); + static bool Click(Internal::WallObject W, const std::vector& PossibleActions); static bool UpKey(std::int32_t Key); static bool DownKey(std::int32_t Key); diff --git a/Include/Game/Tools/Widgets.hpp b/Include/Game/Tools/Widgets.hpp index 375c693..6dec661 100644 --- a/Include/Game/Tools/Widgets.hpp +++ b/Include/Game/Tools/Widgets.hpp @@ -19,7 +19,7 @@ class Widgets * bool InventoryHidden = Widgets::IsHidden(Inventory); * @endcode */ - static bool IsHidden(const Widget& W); + static bool IsHidden(const Internal::Widget& W); /** * @brief Returns the Box of the passed Widget * @code @@ -27,7 +27,7 @@ class Widgets * Box BankInventoryBox = Widgets::GetBox(BankInventory); * @endcode */ - static Box GetBox(const Widget& W); + static Box GetBox(const Internal::Widget& W); /** * @brief Returns the absolute X of the passed Widget * @code @@ -35,7 +35,7 @@ class Widgets * std::int32_t BankInventoryX = Widgets::GetX(BankInventory); * @endcode */ - static std::int32_t GetX(const Widget& W); + static std::int32_t GetX(const Internal::Widget& W); /** * @brief Returns the absolute Y of the passed Widget * @code @@ -43,34 +43,34 @@ class Widgets * std::int32_t BankInventoryY = Widgets::GetX(BankInventory); * @endcode */ - static std::int32_t GetY(const Widget& W); + static std::int32_t GetY(const Internal::Widget& W); /** * @brief (Temp) Returns the ItemIDs of the passed Widget * @note Temporary function, this should be used over Widget.GetItemIDs() */ - static std::vector GetItemIDs(const Widget& W); + static std::vector GetItemIDs(const Internal::Widget& W); /** * @brief Returns a vector of All Loaded Widgets * @code std::vector Widgets = Widgets::GetAll(); @endcode */ - static std::vector GetAll(); + static std::vector GetAll(); /** * @brief Returns the specified Widget by Parent ID * @code Widget BankParent = Widgets::Get(15); @endcode */ - static Widget Get(std::int32_t Parent); + static Internal::Widget Get(std::int32_t Parent); /** * @brief Returns the specified Widget by Parent, and Child ID * @code Widget BankInventory = Widgets::Get(15, 3); @endcode */ - static Widget Get(std::int32_t Parent, std::int32_t Child); + static Internal::Widget Get(std::int32_t Parent, std::int32_t Child); /** * @brief Returns the specified Widget by Parent, and Child, and Grandchild ID * @code Widget BankCloseButton = Widgets::Get(12, 3, 11); @endcode */ - static Widget Get(std::int32_t Parent, std::int32_t Child, std::int32_t Grandchild); + static Internal::Widget Get(std::int32_t Parent, std::int32_t Child, std::int32_t Grandchild); /** * @brief Returns a vector of all Widgets that pass the specified Filter @see LibraryFilterLambdas * @code @@ -78,7 +78,7 @@ class Widgets * std::vector Widgets = Widgets::Get(WTextEquals); @endcode * Will return all Widgets whose Text equals Enter Amount */ - static std::vector Get(const std::function& Filter); + static std::vector Get(const std::function& Filter); }; diff --git a/Include/Game/Tools/Worlds.hpp b/Include/Game/Tools/Worlds.hpp index 69c441c..f95e45e 100644 --- a/Include/Game/Tools/Worlds.hpp +++ b/Include/Game/Tools/Worlds.hpp @@ -15,23 +15,23 @@ class Worlds static bool Refresh(); static bool Refresh(bool ExitWorldSelection); - static bool SwitchWorld(World World); + static bool SwitchWorld(Internal::World World); static bool SwitchWorld(std::int32_t WorldID); static std::int32_t GetCurrent(); - static std::vector GetAll(); + static std::vector GetAll(); - static std::int32_t GetIndexOf(World World); + static std::int32_t GetIndexOf(Internal::World World); static std::int32_t GetIndexOf(std::int32_t WorldID); - static std::vector GetF2P(); - static std::vector GetP2P(); + static std::vector GetF2P(); + static std::vector GetP2P(); - static bool IsP2P(World World); + static bool IsP2P(Internal::World World); static bool IsP2P(std::int32_t WorldID); - static World GetBy(std::int32_t WorldID); - static std::vector GetBy(const std::function& Filter); + static Internal::World GetBy(std::int32_t WorldID); + static std::vector GetBy(const std::function& Filter); }; /** @} */ diff --git a/Library/libAlpacaLibrary.a b/Library/libAlpacaLibrary.a index 00b4946..fe165d3 100644 Binary files a/Library/libAlpacaLibrary.a and b/Library/libAlpacaLibrary.a differ