diff --git a/Include/Core/Classes/ClientScriptSettings.hpp b/Include/Core/Classes/ClientScriptSettings.hpp new file mode 100644 index 0000000..7ece701 --- /dev/null +++ b/Include/Core/Classes/ClientScriptSettings.hpp @@ -0,0 +1,32 @@ +#ifndef CLIENTSCRIPTSETTINGS_HPP_INCLUDED +#define CLIENTSCRIPTSETTINGS_HPP_INCLUDED + +#include "../JavaClass/Object.hpp" +#include "../JavaClass/Class.hpp" +#include "../JavaClass/Map.hpp" +#include +#include +#include + +namespace Internal +{ + class ClientScriptSettings : public Object + { + public: + ClientScriptSettings(const void* Obj); + + ClientScriptSettings() = default; + ClientScriptSettings(ClientScriptSettings&& Obj) = default; + ClientScriptSettings(const ClientScriptSettings& Obj) = default; + ClientScriptSettings& operator=(ClientScriptSettings&& Obj) = default; + ClientScriptSettings& operator=(const ClientScriptSettings& Obj) = default; + + static Class GetClass(); + + std::vector GetEntryPersists() const; + Internal::Map GetMap() const; + std::vector GetStrings() const; + + }; +} +#endif // CLIENTSCRIPTSETTINGS_HPP_INCLUDED diff --git a/Include/Core/Classes/ObjectInfo.hpp b/Include/Core/Classes/ObjectInfo.hpp index 5ae18aa..8db87fc 100644 --- a/Include/Core/Classes/ObjectInfo.hpp +++ b/Include/Core/Classes/ObjectInfo.hpp @@ -6,6 +6,7 @@ #include #include #include +#include "IterableHashTable.hpp" namespace Internal { @@ -28,6 +29,7 @@ namespace Internal std::vector GetModelIDs() const; std::string GetName() const; std::vector GetObjectTypes() const; + IterableHashTable GetParameters() const; std::int32_t GetSettingID() const; std::int32_t GetVarbitID() const; diff --git a/Include/Core/Internal.hpp b/Include/Core/Internal.hpp index 4d7a9c1..d396c84 100644 --- a/Include/Core/Internal.hpp +++ b/Include/Core/Internal.hpp @@ -22,6 +22,7 @@ #include "JavaClass/ByteBuffer.hpp" #include "JavaClass/Canvas.hpp" +#include "JavaClass/Class.hpp" #include "JavaClass/FocusEvent.hpp" #include "JavaClass/Integer.hpp" #include "JavaClass/KeyEvent.hpp" @@ -30,6 +31,8 @@ #include "JavaClass/MouseEvent.hpp" #include "JavaClass/MouseWheelEvent.hpp" #include "JavaClass/Object.hpp" +#include "JavaClass/Set.hpp" +#include "JavaClass/String.hpp" #include "Classes/AbstractBufferProvider.hpp" #include "Classes/AbstractByteBuffer.hpp" @@ -41,6 +44,7 @@ #include "Classes/ChatLineBuffer.hpp" #include "Classes/ClanMember.hpp" #include "Classes/ClanMemberList.hpp" +#include "Classes/ClientScriptSettings.hpp" #include "Classes/CollisionData.hpp" #include "Classes/CombatInfo.hpp" #include "Classes/DecorativeObject.hpp" @@ -160,6 +164,7 @@ namespace Internal std::vector GetKeysPressed(); std::vector GetLevels(); ClanMemberList GetLocalClanMemberList(); + ClientScriptSettings GetLocalClientScriptSettings(); std::int32_t GetLocalDestinationX(); std::int32_t GetLocalDestinationY(); Player GetLocalPlayer(); diff --git a/Include/Core/JavaClass/Integer.hpp b/Include/Core/JavaClass/Integer.hpp index fa89f1f..0455e61 100644 --- a/Include/Core/JavaClass/Integer.hpp +++ b/Include/Core/JavaClass/Integer.hpp @@ -3,6 +3,7 @@ #include #include "Object.hpp" +#include "Class.hpp" namespace Internal { @@ -18,6 +19,8 @@ namespace Internal Integer& operator=(Integer&& Obj) = default; Integer& operator=(const Integer& Obj) = default; + static Class GetClass(); + std::int32_t GetIntValue() const; }; } diff --git a/Include/Core/JavaClass/String.hpp b/Include/Core/JavaClass/String.hpp new file mode 100644 index 0000000..3745586 --- /dev/null +++ b/Include/Core/JavaClass/String.hpp @@ -0,0 +1,28 @@ +#ifndef STRING_HPP_INCLUDED +#define STRING_HPP_INCLUDED + +#include +#include "Object.hpp" +#include "Class.hpp" + +namespace Internal +{ + class String : public Object + { + public: + String(const void* Obj); + //String(std::int32_t Value); + + String() = default; + String(String&& Obj) = default; + String(const String& Obj) = default; + String& operator=(String&& Obj) = default; + String& operator=(const String& Obj) = default; + + static Class GetClass(); + + std::string GetStringValue() const; + }; +} + +#endif // STRING_HPP_INCLUDED diff --git a/Include/Game/Globals.hpp b/Include/Game/Globals.hpp index 5be30b1..adb737d 100644 --- a/Include/Game/Globals.hpp +++ b/Include/Game/Globals.hpp @@ -68,18 +68,18 @@ namespace Globals const WidgetDef BANK_MAIN = { BANK_PARENT, 2 }; const WidgetDef BANK_CLOSE = { BANK_PARENT, 2, 11 }; - const WidgetDef BANK_TABS_CONTAINER = { BANK_PARENT, 10 }; // Has all Tab children - const WidgetDef BANK_ITEM_CONTAINER_WIDGET = { BANK_PARENT, 12 }; // Used for scrolling, contains all items, middle of the bank interface + const WidgetDef BANK_TABS_CONTAINER = { BANK_PARENT, 11 }; // Has all Tab children + const WidgetDef BANK_ITEM_CONTAINER_WIDGET = { BANK_PARENT, 13 }; // Used for scrolling, contains all items, middle of the bank interface - const WidgetDef BANK_REARRANGE_MODE_SWAP = { BANK_PARENT, 16 }; - const WidgetDef BANK_REARRANGE_MODE_INSERT = { BANK_PARENT, 18 }; - const WidgetDef BANK_WITHDRAW_MODE_ITEM = { BANK_PARENT, 21 }; - const WidgetDef BANK_WITHDRAW_MODE_NOTED = { BANK_PARENT, 23 }; - const std::int32_t BANK_WITHDRAW_QUANTITY_CHILDREN[5] = { 27, 29, 31, 33, 35 }; // 1, 5, 10, x, all, uses BANK_PARENT - const WidgetDef BANK_SET_PLACEHOLDERS = { BANK_PARENT, 38 }; - const WidgetDef BANK_SEARCH = { BANK_PARENT, 40 }; - const WidgetDef BANK_DEPOSIT_ALL = { BANK_PARENT, 42 }; - const WidgetDef BANK_DEPOSIT_EQUIPMENT = { BANK_PARENT, 44 }; + const WidgetDef BANK_REARRANGE_MODE_SWAP = { BANK_PARENT, 17 }; + const WidgetDef BANK_REARRANGE_MODE_INSERT = { BANK_PARENT, 19 }; + const WidgetDef BANK_WITHDRAW_MODE_ITEM = { BANK_PARENT, 22 }; + const WidgetDef BANK_WITHDRAW_MODE_NOTED = { BANK_PARENT, 24 }; + const std::int32_t BANK_WITHDRAW_QUANTITY_CHILDREN[5] = { 28, 30, 32, 34, 36 }; // 1, 5, 10, x, all, uses BANK_PARENT + const WidgetDef BANK_SET_PLACEHOLDERS = { BANK_PARENT, 39 }; + const WidgetDef BANK_SEARCH = { BANK_PARENT, 41 }; + const WidgetDef BANK_DEPOSIT_ALL = { BANK_PARENT, 43 }; + const WidgetDef BANK_DEPOSIT_EQUIPMENT = { BANK_PARENT, 45 }; const WidgetDef BANK_INVENTORY = { 15, 3 }; // When the bank is open, the Inventory has it's own widgets for items diff --git a/Library/libAlpacaLibrary.a b/Library/libAlpacaLibrary.a index d75396c..4c49e94 100644 Binary files a/Library/libAlpacaLibrary.a and b/Library/libAlpacaLibrary.a differ