diff --git a/build.gradle b/build.gradle
index a087c740..daf00dd0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ repositories {
mavenCentral()
}
-def runeLiteVersion = '1.8.9'
+def runeLiteVersion = '1.8.11'
dependencies {
compile group: 'net.runelite', name: 'client', version: runeLiteVersion
@@ -20,7 +20,7 @@ dependencies {
annotationProcessor 'org.projectlombok:lombok:1.18.22'
testImplementation 'junit:junit:4.13.2'
- testImplementation 'org.slf4j:slf4j-simple:1.7.32'
+ testImplementation 'org.slf4j:slf4j-simple:1.7.35'
testImplementation group: 'net.runelite', name: 'client', version: runeLiteVersion, {
exclude group: 'ch.qos.logback', module: 'logback-classic'
}
diff --git a/build/classes/java/main/rsb/botLauncher/RuneLite$1.class b/build/classes/java/main/rsb/botLauncher/RuneLite$1.class
index 600435e4..b698bf2d 100644
Binary files a/build/classes/java/main/rsb/botLauncher/RuneLite$1.class and b/build/classes/java/main/rsb/botLauncher/RuneLite$1.class differ
diff --git a/build/classes/java/main/rsb/botLauncher/RuneLite$2.class b/build/classes/java/main/rsb/botLauncher/RuneLite$2.class
index 5d2dff91..b6c40505 100644
Binary files a/build/classes/java/main/rsb/botLauncher/RuneLite$2.class and b/build/classes/java/main/rsb/botLauncher/RuneLite$2.class differ
diff --git a/build/classes/java/main/rsb/botLauncher/RuneLite$3.class b/build/classes/java/main/rsb/botLauncher/RuneLite$3.class
index d6bf8e02..bf50f3cb 100644
Binary files a/build/classes/java/main/rsb/botLauncher/RuneLite$3.class and b/build/classes/java/main/rsb/botLauncher/RuneLite$3.class differ
diff --git a/build/classes/java/main/rsb/botLauncher/RuneLite$ConfigFileConverter.class b/build/classes/java/main/rsb/botLauncher/RuneLite$ConfigFileConverter.class
index e65eb81c..2e67f66c 100644
Binary files a/build/classes/java/main/rsb/botLauncher/RuneLite$ConfigFileConverter.class and b/build/classes/java/main/rsb/botLauncher/RuneLite$ConfigFileConverter.class differ
diff --git a/build/classes/java/main/rsb/botLauncher/RuneLite.class b/build/classes/java/main/rsb/botLauncher/RuneLite.class
index 949f566c..7a758b0e 100644
Binary files a/build/classes/java/main/rsb/botLauncher/RuneLite.class and b/build/classes/java/main/rsb/botLauncher/RuneLite.class differ
diff --git a/build/classes/java/main/rsb/botLauncher/RuneLiteTestFeatures.class b/build/classes/java/main/rsb/botLauncher/RuneLiteTestFeatures.class
index 0303499e..2dd07a2a 100644
Binary files a/build/classes/java/main/rsb/botLauncher/RuneLiteTestFeatures.class and b/build/classes/java/main/rsb/botLauncher/RuneLiteTestFeatures.class differ
diff --git a/build/classes/java/main/rsb/event/EventMulticaster.class b/build/classes/java/main/rsb/event/EventMulticaster.class
index 40d1e80c..b86f407d 100644
Binary files a/build/classes/java/main/rsb/event/EventMulticaster.class and b/build/classes/java/main/rsb/event/EventMulticaster.class differ
diff --git a/build/classes/java/main/rsb/internal/BotModule.class b/build/classes/java/main/rsb/internal/BotModule.class
index 0984afd0..ed98e029 100644
Binary files a/build/classes/java/main/rsb/internal/BotModule.class and b/build/classes/java/main/rsb/internal/BotModule.class differ
diff --git a/build/classes/java/main/rsb/internal/InputManager.class b/build/classes/java/main/rsb/internal/InputManager.class
index b508d53e..270f721f 100644
Binary files a/build/classes/java/main/rsb/internal/InputManager.class and b/build/classes/java/main/rsb/internal/InputManager.class differ
diff --git a/build/classes/java/main/rsb/internal/wrappers/Filter.class b/build/classes/java/main/rsb/internal/wrappers/Filter.class
index 9e5580df..6381850b 100644
Binary files a/build/classes/java/main/rsb/internal/wrappers/Filter.class and b/build/classes/java/main/rsb/internal/wrappers/Filter.class differ
diff --git a/build/classes/java/main/rsb/methods/Bank$ReachableBankerFilter.class b/build/classes/java/main/rsb/methods/Bank$ReachableBankerFilter.class
index 5cb1aaf4..daed20f6 100644
Binary files a/build/classes/java/main/rsb/methods/Bank$ReachableBankerFilter.class and b/build/classes/java/main/rsb/methods/Bank$ReachableBankerFilter.class differ
diff --git a/build/classes/java/main/rsb/methods/Bank.class b/build/classes/java/main/rsb/methods/Bank.class
index b87f6b77..b243b6eb 100644
Binary files a/build/classes/java/main/rsb/methods/Bank.class and b/build/classes/java/main/rsb/methods/Bank.class differ
diff --git a/build/classes/java/main/rsb/methods/Calculations$Render.class b/build/classes/java/main/rsb/methods/Calculations$Render.class
index e9b8c26e..1eab8709 100644
Binary files a/build/classes/java/main/rsb/methods/Calculations$Render.class and b/build/classes/java/main/rsb/methods/Calculations$Render.class differ
diff --git a/build/classes/java/main/rsb/methods/Calculations$RenderData.class b/build/classes/java/main/rsb/methods/Calculations$RenderData.class
index 1e5d4de3..caf7a8ef 100644
Binary files a/build/classes/java/main/rsb/methods/Calculations$RenderData.class and b/build/classes/java/main/rsb/methods/Calculations$RenderData.class differ
diff --git a/build/classes/java/main/rsb/methods/Calculations.class b/build/classes/java/main/rsb/methods/Calculations.class
index 2d20abd5..f1bd514c 100644
Binary files a/build/classes/java/main/rsb/methods/Calculations.class and b/build/classes/java/main/rsb/methods/Calculations.class differ
diff --git a/build/classes/java/main/rsb/methods/Camera$ROTATION_METHOD.class b/build/classes/java/main/rsb/methods/Camera$ROTATION_METHOD.class
index 9e3c3506..2d613d7e 100644
Binary files a/build/classes/java/main/rsb/methods/Camera$ROTATION_METHOD.class and b/build/classes/java/main/rsb/methods/Camera$ROTATION_METHOD.class differ
diff --git a/build/classes/java/main/rsb/methods/Camera.class b/build/classes/java/main/rsb/methods/Camera.class
index 6ca78481..0c19e20a 100644
Binary files a/build/classes/java/main/rsb/methods/Camera.class and b/build/classes/java/main/rsb/methods/Camera.class differ
diff --git a/build/classes/java/main/rsb/methods/Combat.class b/build/classes/java/main/rsb/methods/Combat.class
index ce9f6fbb..d3d96b89 100644
Binary files a/build/classes/java/main/rsb/methods/Combat.class and b/build/classes/java/main/rsb/methods/Combat.class differ
diff --git a/build/classes/java/main/rsb/methods/Environment.class b/build/classes/java/main/rsb/methods/Environment.class
index cd5fa198..2be037c0 100644
Binary files a/build/classes/java/main/rsb/methods/Environment.class and b/build/classes/java/main/rsb/methods/Environment.class differ
diff --git a/build/classes/java/main/rsb/methods/Game$ChatMode.class b/build/classes/java/main/rsb/methods/Game$ChatMode.class
index a90d17b2..44f7281b 100644
Binary files a/build/classes/java/main/rsb/methods/Game$ChatMode.class and b/build/classes/java/main/rsb/methods/Game$ChatMode.class differ
diff --git a/build/classes/java/main/rsb/methods/Game.class b/build/classes/java/main/rsb/methods/Game.class
index a5208cb5..87f0992f 100644
Binary files a/build/classes/java/main/rsb/methods/Game.class and b/build/classes/java/main/rsb/methods/Game.class differ
diff --git a/build/classes/java/main/rsb/methods/GrandExchange.class b/build/classes/java/main/rsb/methods/GrandExchange.class
index 33f7a47c..e10980ea 100644
Binary files a/build/classes/java/main/rsb/methods/GrandExchange.class and b/build/classes/java/main/rsb/methods/GrandExchange.class differ
diff --git a/build/classes/java/main/rsb/methods/Interfaces.class b/build/classes/java/main/rsb/methods/Interfaces.class
index de09583a..25ac8789 100644
Binary files a/build/classes/java/main/rsb/methods/Interfaces.class and b/build/classes/java/main/rsb/methods/Interfaces.class differ
diff --git a/build/classes/java/main/rsb/methods/Inventory.class b/build/classes/java/main/rsb/methods/Inventory.class
index 1d4072a0..3c7eb31a 100644
Binary files a/build/classes/java/main/rsb/methods/Inventory.class and b/build/classes/java/main/rsb/methods/Inventory.class differ
diff --git a/build/classes/java/main/rsb/methods/Mouse.class b/build/classes/java/main/rsb/methods/Mouse.class
index 3ec064bf..0d5bb5f5 100644
Binary files a/build/classes/java/main/rsb/methods/Mouse.class and b/build/classes/java/main/rsb/methods/Mouse.class differ
diff --git a/build/classes/java/main/rsb/methods/Prayer.class b/build/classes/java/main/rsb/methods/Prayer.class
index 3569f59b..d8ab09d4 100644
Binary files a/build/classes/java/main/rsb/methods/Prayer.class and b/build/classes/java/main/rsb/methods/Prayer.class differ
diff --git a/build/classes/java/main/rsb/methods/Store.class b/build/classes/java/main/rsb/methods/Store.class
index 6731957a..c5a02bbb 100644
Binary files a/build/classes/java/main/rsb/methods/Store.class and b/build/classes/java/main/rsb/methods/Store.class differ
diff --git a/build/classes/java/main/rsb/methods/Walking.class b/build/classes/java/main/rsb/methods/Walking.class
index bed33349..0f1ff622 100644
Binary files a/build/classes/java/main/rsb/methods/Walking.class and b/build/classes/java/main/rsb/methods/Walking.class differ
diff --git a/build/classes/java/main/rsb/script/randoms/LoginBot.class b/build/classes/java/main/rsb/script/randoms/LoginBot.class
index 996974b5..6e58ba32 100644
Binary files a/build/classes/java/main/rsb/script/randoms/LoginBot.class and b/build/classes/java/main/rsb/script/randoms/LoginBot.class differ
diff --git a/build/classes/java/main/rsb/util/Base64.class b/build/classes/java/main/rsb/util/Base64.class
index 37d7c271..f05be92c 100644
Binary files a/build/classes/java/main/rsb/util/Base64.class and b/build/classes/java/main/rsb/util/Base64.class differ
diff --git a/build/classes/java/main/rsb/util/OutputObjectComparer$1.class b/build/classes/java/main/rsb/util/OutputObjectComparer$1.class
index da161a70..f9fe1fe8 100644
Binary files a/build/classes/java/main/rsb/util/OutputObjectComparer$1.class and b/build/classes/java/main/rsb/util/OutputObjectComparer$1.class differ
diff --git a/build/classes/java/main/rsb/util/OutputObjectComparer.class b/build/classes/java/main/rsb/util/OutputObjectComparer.class
index 4f755584..9c33c067 100644
Binary files a/build/classes/java/main/rsb/util/OutputObjectComparer.class and b/build/classes/java/main/rsb/util/OutputObjectComparer.class differ
diff --git a/build/classes/java/main/rsb/util/SkillTracker.class b/build/classes/java/main/rsb/util/SkillTracker.class
index 9669b3f8..da48d4ef 100644
Binary files a/build/classes/java/main/rsb/util/SkillTracker.class and b/build/classes/java/main/rsb/util/SkillTracker.class differ
diff --git a/build/classes/java/main/rsb/wrappers/RSObject$Type.class b/build/classes/java/main/rsb/wrappers/RSObject$Type.class
index 23c258b9..4174467a 100644
Binary files a/build/classes/java/main/rsb/wrappers/RSObject$Type.class and b/build/classes/java/main/rsb/wrappers/RSObject$Type.class differ
diff --git a/build/classes/java/main/rsb/wrappers/RSObject.class b/build/classes/java/main/rsb/wrappers/RSObject.class
index 07409891..37a0e5f0 100644
Binary files a/build/classes/java/main/rsb/wrappers/RSObject.class and b/build/classes/java/main/rsb/wrappers/RSObject.class differ
diff --git a/build/classes/java/main/rsb/wrappers/RSTile$NoPlaneException.class b/build/classes/java/main/rsb/wrappers/RSTile$NoPlaneException.class
index 5c03fe80..323f0449 100644
Binary files a/build/classes/java/main/rsb/wrappers/RSTile$NoPlaneException.class and b/build/classes/java/main/rsb/wrappers/RSTile$NoPlaneException.class differ
diff --git a/build/classes/java/main/rsb/wrappers/RSTile.class b/build/classes/java/main/rsb/wrappers/RSTile.class
index e5d5d75c..e2858f2e 100644
Binary files a/build/classes/java/main/rsb/wrappers/RSTile.class and b/build/classes/java/main/rsb/wrappers/RSTile.class differ
diff --git a/build/classes/java/main/rsb/wrappers/RSWidget.class b/build/classes/java/main/rsb/wrappers/RSWidget.class
index 88f27d88..68af82dd 100644
Binary files a/build/classes/java/main/rsb/wrappers/RSWidget.class and b/build/classes/java/main/rsb/wrappers/RSWidget.class differ
diff --git a/build/generated/sources/annotationProcessor/java/main/META-INF/MANIFEST.MF b/build/generated/sources/annotationProcessor/java/main/META-INF/MANIFEST.MF
new file mode 100644
index 00000000..cde848da
--- /dev/null
+++ b/build/generated/sources/annotationProcessor/java/main/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: rsb.botLauncher.Application
+
diff --git a/docs/allclasses-frame.html b/docs/allclasses-frame.html
index 0f8bc98f..7d8a8196 100644
--- a/docs/allclasses-frame.html
+++ b/docs/allclasses-frame.html
@@ -2,9 +2,9 @@
-
+
All Classes
-All Classes
GlobalSettingValues GlobalWidgetId GlobalWidgetId.EquipmentSlotId GlobalWidgetId.Prayer GlobalWidgetId.PrayerBook GlobalWidgetId.Prayers GlobalWidgetId.Skill GlobalWidgetId.SpellId GlobalWidgetInfo All Classes
RSWidgetItem RuneLite RuneLiteTestFeatures RuntimeConfig RuntimeConfigLoader ScreenshotUtil Script ScriptDefinition All Classes
-All Classes
GlobalSettingValues GlobalWidgetId GlobalWidgetId.EquipmentSlotId GlobalWidgetId.Prayer GlobalWidgetId.PrayerBook GlobalWidgetId.Prayers GlobalWidgetId.Skill GlobalWidgetId.SpellId GlobalWidgetInfo All Classes
RSWidgetItem RuneLite RuneLiteTestFeatures RuntimeConfig RuntimeConfigLoader ScreenshotUtil Script ScriptDefinition Constant Field Values
-rsb.internal.*
12
+
+
+ public static final intINTERFACE_BANK_INVENTORY_ITEMS_CONTAINER 3
+
public static final intINTERFACE_BANK_ITEM_COUNT 5
-
+
public static final intINTERFACE_BANK_ITEM_MAX 8
-
+
public static final intINTERFACE_BANK_SCROLLBAR 13
-
+
public static final intINTERFACE_BANK_TAB 10
-
+
public static final intINTERFACE_BUY_SEARCH_BOX 389
-
+
public static final intINTERFACE_COLLECTION_BOX 402
-
+
public static final intINTERFACE_DEPOSIT_BUTTON_DEPOSIT_CARRIED_ITEMS 4
-
+
public static final intINTERFACE_DEPOSIT_BUTTON_DEPOSIT_LOOT 8
-
+
public static final intINTERFACE_DEPOSIT_BUTTON_DEPOSIT_WORN_ITEMS 6
-
+
public static final intINTERFACE_DEPOSIT_DYNAMIC_COMPONENTS 1
-
+
public static final intINTERFACE_EQUIPMENT_ITEM_SLOTS 11
-
+
public static final intINTERFACE_GRAND_EXCHANGE_COLLECTION_AREA 23
-
+
public static final intINTERFACE_GRAND_EXCHANGE_DESCRIPTION 6
-
+
public static final intINTERFACE_GRAND_EXCHANGE_INTERFACE_LAYOUT 2
-
+
public static final intINTERFACE_GRAND_EXCHANGE_SELL_INVENTORY 0
+
+
+
+ public static final intINTERFACE_LOGIN_SCREEN_MOTW 6
@@ -1030,160 +1044,167 @@ rsb.internal.*
15
+
+
+ public static final intINTERFACE_MINIMAP_QUICK_PRAYER_ORB_SPRITE 2
+
public static final intINTERFACE_MINIMAP_RUN_ORB_TEXT 23
-
+
public static final intINTERFACE_MINIMAP_SPEC_ORB_TEXT 31
-
+
public static final intINTERFACE_NORMAL_PRAYERS 4
-
+
public static final intINTERFACE_SHOW_COMBAT_SPELLS 5
-
+
public static final intINTERFACE_SHOW_LEVEL_UNCASTABLE_SPELLS 11
-
+
public static final intINTERFACE_SHOW_RUNES_UNCASTABLE_SPELLS 13
-
+
public static final intINTERFACE_SHOW_TELEPORT_SPELLS 7
-
+
public static final intINTERFACE_SHOW_UTILITY_SPELLS 9
-
+
public static final intINTERFACE_STATS 320
-
+
public static final intINTERFACE_STORE_DYNAMIC_COMPONENTS 1
-
+
public static final intINTERFACE_TRADE_MAIN 335
-
+
public static final intINTERFACE_TRADE_MAIN_ACCEPT 10
-
+
public static final intINTERFACE_TRADE_MAIN_DECLINE 13
-
+
public static final intINTERFACE_TRADE_MAIN_INV_SLOTS 9
-
+
public static final intINTERFACE_TRADE_MAIN_NAME 31
-
+
public static final intINTERFACE_TRADE_MAIN_PARTNER 28
-
+
public static final intINTERFACE_TRADE_MAIN_PERSONAL 25
-
+
public static final intINTERFACE_TRADE_SECOND 334
-
+
public static final intINTERFACE_TRADE_SECOND_ACCEPT 13
-
+
public static final intINTERFACE_TRADE_SECOND_DECLINE 14
-
+
public static final intINTERFACE_TRADE_SECOND_NAME 30
-
+
public static final intINTERFACE_TRADE_SECOND_PARTNER 29
-
+
public static final intDeprecated List
-API Help
-A-Index
-A
activateCondition() LoginBot
-activatePrayer(GlobalWidgetId.Prayers, boolean) Prayer activatePrayer(GlobalWidgetId.Prayer, boolean) Prayer
Activates/deactivates a prayer via interfaces.
diff --git a/docs/index-files/index-10.html b/docs/index-files/index-10.html
index 189cce0a..92b794b6 100644
--- a/docs/index-files/index-10.html
+++ b/docs/index-files/index-10.html
@@ -2,9 +2,9 @@
-
+
J-Index
-K-Index
-L-Index
-M-Index
-N-Index
-O-Index
-P-Index
-Q-Index
-R-Index
-R
runScript(Script) ScriptHandler
+RuntimeConfig rsb.internal
+RuntimeConfig() RuntimeConfig
+RuntimeConfigLoader rsb.internal
+RuntimeConfigLoader(OkHttpClient) RuntimeConfigLoader
A B C D E F G H I J K L M N O P Q R S T U V W X Y _
diff --git a/docs/index-files/index-19.html b/docs/index-files/index-19.html
index 43034970..85f196c9 100644
--- a/docs/index-files/index-19.html
+++ b/docs/index-files/index-19.html
@@ -2,9 +2,9 @@
-
+
S-Index
-S
Sets the quantity of items in the offer interface randomizing how it goes about doing so too
-setQuickPrayers(boolean, GlobalWidgetId.Prayers...) Prayer setQuickPrayers(boolean, GlobalWidgetId.Prayer...) Prayer
Sets up the quick prayers for the user
diff --git a/docs/index-files/index-2.html b/docs/index-files/index-2.html
index ea1f0d9d..6c923406 100644
--- a/docs/index-files/index-2.html
+++ b/docs/index-files/index-2.html
@@ -2,9 +2,9 @@
-
+
B-Index
-B
BotModule rsb.internal
-BotModule(OkHttpClient, Supplier<Applet>, boolean, boolean, File, File) BotModule BotModule(OkHttpClient, Supplier<Applet>, Supplier<RuntimeConfig>, boolean, boolean, File, File) BotModule
Botplugin rsb.plugin
diff --git a/docs/index-files/index-20.html b/docs/index-files/index-20.html
index 7bc3ca35..73df5cf8 100644
--- a/docs/index-files/index-20.html
+++ b/docs/index-files/index-20.html
@@ -2,9 +2,9 @@
-
+
T-Index
-T
tileOnMap(RSTile) Calculations
-Checks whether or not a given tile is on the minimap.
+Checks whether a given tile is on the minimap.
tileOnScreen(RSTile) Calculations
-Checks whether or not the centroid of a given tile is on the screen.
+Checks whether the centroid of a given tile is on the screen.
tiles MethodContext
diff --git a/docs/index-files/index-21.html b/docs/index-files/index-21.html
index f93bc908..19a6100b 100644
--- a/docs/index-files/index-21.html
+++ b/docs/index-files/index-21.html
@@ -2,9 +2,9 @@
-
+
U-Index
-V-Index
-V
Returns the enum constant of this type with the specified name.
- valueOf(String) GlobalWidgetId.PrayerBook valueOf(String) GlobalWidgetId.Prayer
Returns the enum constant of this type with the specified name.
-valueOf(String) GlobalWidgetId.Prayers valueOf(String) GlobalWidgetId.PrayerBook
Returns the enum constant of this type with the specified name.
@@ -138,12 +138,12 @@ V
Returns an array containing the constants of this enum type, in
the order they are declared.
-values() GlobalWidgetId.PrayerBook values() GlobalWidgetId.Prayer
Returns an array containing the constants of this enum type, in
the order they are declared.
-values() GlobalWidgetId.Prayers values() GlobalWidgetId.PrayerBook
Returns an array containing the constants of this enum type, in
the order they are declared.
diff --git a/docs/index-files/index-23.html b/docs/index-files/index-23.html
index 98138fe1..a33946a3 100644
--- a/docs/index-files/index-23.html
+++ b/docs/index-files/index-23.html
@@ -2,9 +2,9 @@
-
+
W-Index
-X-Index
-Y-Index
-_-Index
-C-Index
-D-Index
-E-Index
-F-Index
-G-Index
-G
GameGUI(MethodContext) GameGUI
GameGUI.Tab rsb.methods
+
+An enumerated type representing the tabs interfaces and their WidgetInfo.
+
gaussian() StdRandom
Returns a random real number from a standard Gaussian distribution.
@@ -121,6 +123,8 @@ G
Returns a random integer from a geometric distribution with success
probability p .
+get() RuntimeConfigLoader
get(int) Interfaces
Gets a widget corresponding to the index
@@ -232,8 +236,6 @@ G
getAnimation() RSCharacter
-getApiBase() BotProperties
getArea() RSObject
Gets the area of tiles covered by this object.
@@ -322,8 +324,6 @@ G
Grabs the graphics visible on the canvas from the main buffer using the associated provider
- getBuildingLink() BotProperties
getBytesUtf8(String) StringUtil
getCacheDirectory() GlobalConfiguration.Paths G
getCombatLevel() RSPlayer
-getCommit() BotProperties
getCompass() GameGUI
getComponent() Mouse G
getDirectionFacing() RSCharacter
-getDiscordInvite() BotProperties
-getDNSChangeLink() BotProperties
getDynamicComponent(int) RSWidget
getElapsed() Timer G
getImage(String) GlobalConfiguration
-getIndex() GlobalWidgetId.Prayers
getIndex(String) Menu
Returns the index in the menu for a given action.
@@ -858,18 +850,12 @@ G
Gets all the items in the store inventory.
- getJavConfig() BotProperties
-getJavConfigBackup() BotProperties
getLastMenuNode() ChooseOption
getLastMessage() Game
Access the last message spoken by a player.
-getLauncherVersion() BotProperties
getLevel() RSCharacter
getLevel() RSNPC G
getPlane() WalkerTile
-getPluginHubBase() BotProperties
getPoint() RSModel
Returns a random screen point.
@@ -1270,6 +1254,8 @@ G
getPosition() ChooseOption
+getPrayerId() GlobalWidgetId.Prayer
getPrayerLeft() Prayer
Gets the remaining prayer points.
@@ -1295,6 +1281,8 @@ G
getPrevSub() NodeSub
+getQuickPrayerId() GlobalWidgetId.Prayer
getRandomPolyPoint(Polygon) Calculations
getRandoms() ScriptHandler G
Returns the number of milliseconds remaining
until the timer is up.
-getRequiredLevel() GlobalWidgetId.Prayers getRequiredLevel() GlobalWidgetId.Prayer
getResizeInfo() GameGUI.Tab
@@ -1553,8 +1541,6 @@ G
Returns an array of triangles containing the screen points of this model.
-getTroubleshootingLink() BotProperties
getType() RSObject
Returns this object's type.
@@ -1585,8 +1571,6 @@ G
Returns the damage we're taking from venom
- getVersion() BotProperties
getVersion() GlobalConfiguration
getVersionCache() GlobalConfiguration.Paths G
GlobalWidgetId.EquipmentSlotId rsb.internal.globval
+GlobalWidgetId.Prayer rsb.internal.globval
GlobalWidgetId.PrayerBook rsb.internal.globval
Provides Prayer Book(s) Information.
-GlobalWidgetId.Prayers rsb.internal.globval
GlobalWidgetId.Skill rsb.internal.globval
GlobalWidgetId.SpellId rsb.internal.globval H-Index
-I-Index
-I
INTERFACE_BANK_INVENTORY GlobalWidgetId
+INTERFACE_BANK_INVENTORY_ITEMS_CONTAINER GlobalWidgetId
INTERFACE_BANK_ITEM_COUNT GlobalWidgetId
INTERFACE_BANK_ITEM_MAX GlobalWidgetId I
INTERFACE_DEPOSIT_DYNAMIC_COMPONENTS GlobalWidgetId
+INTERFACE_DEPOSIT_INVENTORY_ITEMS_CONTAINER GlobalWidgetId
INTERFACE_EQUIPMENT GlobalWidgetId
Equipment ids
@@ -211,14 +215,14 @@ I
INTERFACE_EQUIPMENT_CAPE GlobalWidgetId.EquipmentSlotId
-INTERFACE_EQUIPMENT_COMPONENT GlobalWidgetId
INTERFACE_EQUIPMENT_FEET GlobalWidgetId.EquipmentSlotId
INTERFACE_EQUIPMENT_HANDS GlobalWidgetId.EquipmentSlotId
INTERFACE_EQUIPMENT_HELMET GlobalWidgetId.EquipmentSlotId
+INTERFACE_EQUIPMENT_INVENTORY_ITEMS_CONTAINER GlobalWidgetId
INTERFACE_EQUIPMENT_ITEM_SLOTS GlobalWidgetId
INTERFACE_EQUIPMENT_LEGS GlobalWidgetId.EquipmentSlotId I
GrandExchange ids
+INTERFACE_LOGIN_SCREEN GlobalWidgetId
+Login Screen Widget IDs
+
+INTERFACE_LOGIN_SCREEN_MOTW GlobalWidgetId
INTERFACE_MAGIC_AUTOCAST_SPELL_BOOK GlobalWidgetId
INTERFACE_MAGIC_AUTOCAST_SPELL_LIST GlobalWidgetId I
INTERFACE_MAGIC_SPELL_LIST GlobalWidgetId
+INTERFACE_MINIMAP_HEALTH_ORB GlobalWidgetId
INTERFACE_MINIMAP_HEALTH_ORB_TEXT GlobalWidgetId
+INTERFACE_MINIMAP_ORBS GlobalWidgetId
Minimap ids
+INTERFACE_MINIMAP_PRAYER_ORB GlobalWidgetId
INTERFACE_MINIMAP_PRAYER_ORB_TEXT GlobalWidgetId
+INTERFACE_MINIMAP_QUICK_PRAYER_ORB GlobalWidgetId
+INTERFACE_MINIMAP_QUICK_PRAYER_ORB_SPRITE GlobalWidgetId
+INTERFACE_MINIMAP_RUN_ORB GlobalWidgetId
INTERFACE_MINIMAP_RUN_ORB_TEXT GlobalWidgetId
+INTERFACE_MINIMAP_SPEC_ORB GlobalWidgetId
INTERFACE_MINIMAP_SPEC_ORB_TEXT GlobalWidgetId
INTERFACE_NORMAL_PRAYERS GlobalWidgetId I
INTERFACE_STORE_DYNAMIC_COMPONENTS GlobalWidgetId
-INTERFACE_STORE_ITEMS GlobalWidgetId INTERFACE_STORE_ITEMS_CONTAINER GlobalWidgetId
INTERFACE_TRADE_MAIN GlobalWidgetId
@@ -449,8 +473,6 @@ I
Checks whether or not the deposit box is open.
- isDirty() BotProperties
isDisplayable() Canvas
isEnabled(long) EventMulticaster I
isInScrollableArea() RSWidget
-isInsecureSkipTlsVerification() BotProperties
isInteractingWithLocalPlayer() RSCharacter
isInteractingWithLocalPlayer() RSNPC I
isPoisoned() Combat
-Returns whether or not we're poisoned.
+Returns whether we're poisoned.
-isPrayerOn(GlobalWidgetId.Prayers) Prayer isPrayerOn(GlobalWidgetId.Prayer) Prayer
Returns true if designated prayer is turned on.
@@ -618,7 +638,7 @@ I
isSpecialEnabled() Combat
-Returns whether or not the special-attack option is enabled.
+Returns whether the special-attack option is enabled.
isSpellSelected() Magic
diff --git a/docs/index.html b/docs/index.html
index c429e007..71ab91cd 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -2,7 +2,7 @@
-
+
Generated Documentation (Untitled)
diff --git a/docs/overview-summary.html b/docs/overview-summary.html
index 9e1a6af7..31fa6fdb 100644
--- a/docs/overview-summary.html
+++ b/docs/overview-summary.html
@@ -2,9 +2,9 @@
-
+
Overview
-Class Hierarchy
-Class Hierarchy
rsb.util.AccountStore.Account
rsb.botLauncher.Application
rsb.util.Base64
-rsb.internal.BotProperties
rsb.internal.BreakHandler
rsb.internal.instrumentate.CanvasMousePositionAgent
rsb.event.impl.CharacterMovedLogger CharacterMovedListener )
@@ -344,7 +343,14 @@ Class Hierarchy
rsb.botLauncher.RuneLite
+net.runelite.client.RuneLiteProperties
+
+
rsb.botLauncher.RuneLiteTestFeatures
+rsb.internal.RuntimeConfig
+rsb.internal.RuntimeConfigLoader
rsb.util.ScreenshotUtil
rsb.service.ScriptDefinition
rsb.internal.ScriptHandler
@@ -474,7 +480,7 @@ Enum Hierarchy
rsb.internal.globval.GlobalConfiguration.OperatingSystem
rsb.internal.globval.GlobalWidgetId.Skill
rsb.internal.globval.GlobalWidgetId.PrayerBook
-rsb.internal.globval.GlobalWidgetId.Prayers
+rsb.internal.globval.GlobalWidgetId.Prayer
rsb.util.Parameters
diff --git a/docs/rsb/botLauncher/Application.html b/docs/rsb/botLauncher/Application.html
index ba36c342..4a950bc7 100644
--- a/docs/rsb/botLauncher/Application.html
+++ b/docs/rsb/botLauncher/Application.html
@@ -2,9 +2,9 @@
-
+
Application
-RuneLite
-RuneLiteTestFeatures
-rsb.botLauncher
-rsb.botLauncher
-rsb.botLauncher Class Hierarchy
-EventManager.KillEvent
-EventManager
-EventMulticaster
-CharacterMovedEvent
-MessageEvent
-PaintEvent
-RSEvent
-TextPaintEvent
-rsb.event.events
-rsb.event.events
-rsb.event.events Class Hierarchy
-CharacterMovedLogger
-DrawBoundaries
-DrawGround
-DrawInventory
-DrawItems
-DrawModel
-DrawMouse
-DrawNPCs
-DrawObjects
-DrawPlayers
-DrawSettings
-DrawWeb
-MessageLogger
-TAnimation
-TCamera
-TFPS
-TFloorHeight
-TLoginIndex
-TMenu
-TMenuActions
-TMousePosition
-TPlayerPosition
-TTab
-TUserInputAllowed
-rsb.event.impl
-rsb.event.impl
-rsb.event.impl Class Hierarchy
-CharacterMovedListener
-MessageListener
-PaintListener
-TextPaintListener
-rsb.event.listener
-rsb.event.listener
-rsb.event.listener Class Hierarchy
-rsb.event
-rsb.event
-rsb.event Class Hierarchy
-BotModule
-Constructor Summary
Constructor and Description
-BotModule BotModule Methods inherited from class java.lang.Object
Constructor Detail
-
+
@@ -188,6 +189,7 @@ Constructor Detail
BotModule
public BotModule(okhttp3.OkHttpClient okHttpClient,
java.util.function.Supplier<java.applet.Applet> clientLoader,
+ java.util.function.Supplier<net.runelite.client.RuntimeConfig> configSupplier,
boolean developerMode,
boolean safeMode,
java.io.File sessionfile,
diff --git a/docs/rsb/internal/BotProperties.html b/docs/rsb/internal/BotProperties.html
index 5b8fd2c7..58219c78 100644
--- a/docs/rsb/internal/BotProperties.html
+++ b/docs/rsb/internal/BotProperties.html
@@ -2,9 +2,9 @@
-
+
BotProperties
-
JavaScript is disabled on your browser.
@@ -76,13 +70,13 @@
Nested |
Field |
Constr | Method Method
@@ -99,17 +93,22 @@ Class BotProperties
java.lang.Object
+net.runelite.client.RuneLiteProperties
+
+
rsb.internal.BotProperties
+
+
@@ -139,65 +138,13 @@ Constructor Summary
Method Summary
-
+
+
+
+
+Methods inherited from class net.runelite.client.RuneLiteProperties
+getApiBase, getBuildingLink, getCommit, getDiscordInvite, getDNSChangeLink, getJavConfig, getJavConfigBackup, getLauncherVersion, getPluginHubBase, getRuneLiteConfig, getTroubleshootingLink, getVersion, isDirty, isInsecureSkipTlsVerification
-
-
@@ -409,13 +230,13 @@ getApiBase
Nested |
Field |
Constr | Method Method
diff --git a/docs/rsb/internal/BreakHandler.html b/docs/rsb/internal/BreakHandler.html
index 5a5fc041..611ead63 100644
--- a/docs/rsb/internal/BreakHandler.html
+++ b/docs/rsb/internal/BreakHandler.html
@@ -2,9 +2,9 @@
-
+
BreakHandler
-ClientThread
-InputManager
-LogFormatter
-LogOutputStream
-MouseHandler
-NewHooks
-PassiveScriptHandler
-
Frames stopScript
Frames ScriptHandler
-
@@ -421,7 +421,7 @@ updateInput
diff --git a/docs/rsb/internal/SystemConsoleHandler.html b/docs/rsb/internal/SystemConsoleHandler.html
index 68bba9ad..79744a0d 100644
--- a/docs/rsb/internal/SystemConsoleHandler.html
+++ b/docs/rsb/internal/SystemConsoleHandler.html
@@ -2,9 +2,9 @@
-
+
SystemConsoleHandler
-TextAreaLogHandler
-GlobalConfiguration.OperatingSystem
-GlobalConfiguration.Paths.Resources
-GlobalConfiguration.Paths.URLs
-GlobalConfiguration.Paths
-GlobalConfiguration.Twitter
-GlobalConfiguration
-GlobalSettingValues
-GlobalWidgetId.EquipmentSlotId
-
Frames EquipmentSlotId
Frames GlobalWidgetId.PrayerBook
-
Frames valueOf
Frames GlobalWidgetId.Skill
-
@@ -562,7 +562,7 @@ valueOf
diff --git a/docs/rsb/internal/globval/GlobalWidgetId.SpellId.html b/docs/rsb/internal/globval/GlobalWidgetId.SpellId.html
index 4e70be88..d17f53d5 100644
--- a/docs/rsb/internal/globval/GlobalWidgetId.SpellId.html
+++ b/docs/rsb/internal/globval/GlobalWidgetId.SpellId.html
@@ -2,9 +2,9 @@
-
+
GlobalWidgetId.SpellId
-GlobalWidgetId
-Nested Class Summary
static class GlobalWidgetId.PrayerBook Provides Prayer Book(s) Information.
-GlobalWidgetId.Prayer
static class GlobalWidgetId.Prayers GlobalWidgetId.PrayerBook Provides Prayer Book(s) Information.
+
static class Field Summary
static intINTERFACE_BANK_ITEM_COUNT INTERFACE_BANK_INVENTORY_ITEMS_CONTAINER
static intINTERFACE_BANK_ITEM_MAX INTERFACE_BANK_ITEM_COUNT
static intINTERFACE_BANK_SCROLLBAR INTERFACE_BANK_ITEM_MAX
static intINTERFACE_BANK_TAB INTERFACE_BANK_SCROLLBAR
static intINTERFACE_BUY_SEARCH_BOX INTERFACE_BANK_TAB
static intINTERFACE_BUY_SEARCH_BOX
+
+static intINTERFACE_COLLECTION_BOX Collection box
-
+
static intINTERFACE_COMBAT Combat ids
-
+
static intINTERFACE_COMBAT_AUTO_CAST_SPELL
-
+
static intINTERFACE_COMBAT_AUTO_RETALIATE
-
+
static intINTERFACE_COMBAT_DEFENSIVE_CAST_SPELL
-
+
static intINTERFACE_DEPOSIT_BOX Deposit box ids
-
+
static intINTERFACE_DEPOSIT_BUTTON_DEPOSIT_CARRIED_ITEMS
-
+
static intINTERFACE_DEPOSIT_BUTTON_DEPOSIT_LOOT
-
+
static intINTERFACE_DEPOSIT_BUTTON_DEPOSIT_WORN_ITEMS
-
+
static intINTERFACE_DEPOSIT_DYNAMIC_COMPONENTS
+
+static intINTERFACE_DEPOSIT_INVENTORY_ITEMS_CONTAINER
static intINTERFACE_EQUIPMENT Field Summary
static intINTERFACE_EQUIPMENT_COMPONENT INTERFACE_EQUIPMENT_INVENTORY_ITEMS_CONTAINER
static intField Summary
static intINTERFACE_LOGIN_SCREEN Login Screen Widget IDs
+
+
+static intINTERFACE_LOGIN_SCREEN_MOTW
+
+static intINTERFACE_MAGIC_AUTOCAST_SPELL_BOOK
@@ -402,123 +420,151 @@ Field Summary
static intINTERFACE_MINIMAP_HEALTH_ORB_TEXT INTERFACE_MINIMAP_HEALTH_ORB
+
+static intINTERFACE_MINIMAP_HEALTH_ORB_TEXT
+
+static intINTERFACE_MINIMAP_ORBS Minimap ids
static intINTERFACE_MINIMAP_PRAYER_ORB
+
+static intINTERFACE_MINIMAP_PRAYER_ORB_TEXT
+
+static intINTERFACE_MINIMAP_QUICK_PRAYER_ORB
+
+static intINTERFACE_MINIMAP_QUICK_PRAYER_ORB_SPRITE
+
+static intINTERFACE_MINIMAP_RUN_ORB
static intINTERFACE_MINIMAP_RUN_ORB_TEXT
static intINTERFACE_MINIMAP_SPEC_ORB_TEXT INTERFACE_MINIMAP_SPEC_ORB
static intINTERFACE_NORMAL_PRAYERS INTERFACE_MINIMAP_SPEC_ORB_TEXT
static intINTERFACE_NORMAL_PRAYERS
+
+static intINTERFACE_PRAYER_BOOK Prayer ids
-
+
static intINTERFACE_SHOW_COMBAT_SPELLS
-
+
static intINTERFACE_SHOW_LEVEL_UNCASTABLE_SPELLS
-
+
static intINTERFACE_SHOW_RUNES_UNCASTABLE_SPELLS
-
+
static intINTERFACE_SHOW_TELEPORT_SPELLS
-
+
static intINTERFACE_SHOW_UTILITY_SPELLS
-
+
static intINTERFACE_STATS Skill ids
-
+
static intINTERFACE_STORE Store ids
-
+
static intINTERFACE_STORE_DYNAMIC_COMPONENTS
-
+
static intINTERFACE_STORE_ITEMS INTERFACE_STORE_ITEMS_CONTAINER
-
+
static intINTERFACE_TRADE_MAIN Trade ids
-
+
static intINTERFACE_TRADE_MAIN_ACCEPT
-
+
static intINTERFACE_TRADE_MAIN_DECLINE
-
+
static intINTERFACE_TRADE_MAIN_INV_SLOTS
-
+
static intINTERFACE_TRADE_MAIN_NAME
-
+
static intINTERFACE_TRADE_MAIN_PARTNER
-
+
static intINTERFACE_TRADE_MAIN_PERSONAL
-
+
static intINTERFACE_TRADE_SECOND
-
+
static intINTERFACE_TRADE_SECOND_ACCEPT
-
+
static intINTERFACE_TRADE_SECOND_DECLINE
-
+
static intINTERFACE_TRADE_SECOND_NAME
-
+
static intINTERFACE_TRADE_SECOND_PARTNER
-
+
static intINTERFACE_TRADE_SECOND_PERSONAL
@@ -611,6 +657,29 @@ DYNAMIC_CHAT_BOX_LATEST_MESSAGE
+
+
+
+
+
+
+
+
@@ -634,6 +703,19 @@ INTERFACE_BANK_DYNAMIC_COMPONENTS
+
+
+
+
@@ -819,6 +901,15 @@ INTERFACE_DEPOSIT_DYNAMIC_COMPONENTS
+
+
+
+
@@ -905,13 +996,13 @@ INTERFACE_EQUIPMENT
Equipment ids
-
+
@@ -1120,13 +1211,13 @@ INTERFACE_STORE_DYNAMIC_COMPONENTS
-
+
@@ -1513,6 +1604,61 @@ GRAND_EXCHANGE_COLLECT_BOX_TWO
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1520,7 +1666,6 @@ GRAND_EXCHANGE_COLLECT_BOX_TWO
INTERFACE_MINIMAP_HEALTH_ORB_TEXT
public static final int INTERFACE_MINIMAP_HEALTH_ORB_TEXT
-Minimap ids
See Also: Constant Field Values INTERFACE_MINIMAP_SPEC_ORB_TEXT
+
+
+
+
diff --git a/docs/rsb/internal/globval/GlobalWidgetInfo.html b/docs/rsb/internal/globval/GlobalWidgetInfo.html
index 67c9e163..5f8ca984 100644
--- a/docs/rsb/internal/globval/GlobalWidgetInfo.html
+++ b/docs/rsb/internal/globval/GlobalWidgetInfo.html
@@ -2,9 +2,9 @@
-
+
GlobalWidgetInfo
-Enum Constant Summary
BANK_INVENTORY
-BANK_ITEM_COUNT BANK_INVENTORY_ITEMS_CONTAINER
-BANK_ITEM_MAX BANK_ITEM_COUNT
-BANK_SCROLLBAR BANK_ITEM_MAX
-BANK_SEARCH_INPUT BANK_SCROLLBAR
+BANK_SEARCH_INPUT
+
BANK_TAB
+
+CHATBOX_FULL_INPUT
-COMBAT_AUTO_CAST_SPELL CHATBOX_MESSAGES [CHAT] Widget Info
+
+COMBAT_AUTO_CAST_SPELL
+
COMBAT_AUTO_RETALIATE
+
+COMBAT_DEFENSIVE_CAST_SPELL
-COMBAT_DEFENSIVE_CAST_SPELL COMBAT_STYLE_FOUR
+
+COMBAT_STYLE_ONE [COMBAT] Widget Info
+
+COMBAT_STYLE_THREE
-DEPOSIT_BUTTON_DEPOSIT_CARRIED_ITEMS COMBAT_STYLE_TWO
-DEPOSIT_BUTTON_DEPOSIT_LOOT DEPOSIT_BUTTON_DEPOSIT_CARRIED_ITEMS
-DEPOSIT_BUTTON_DEPOSIT_WORN_ITEMS DEPOSIT_BUTTON_DEPOSIT_LOOT
+DEPOSIT_BUTTON_DEPOSIT_WORN_ITEMS
+
DEPOSIT_DYNAMIC_COMPONENTS [DEPOSIT BOX] Widget Info
+
+DEPOSIT_ITEMS_CONTAINER
-EQUIPMENT_AMMO DIALOG_NPC_TEXT
-EQUIPMENT_BODY EQUIPMENT_AMMO
-EQUIPMENT_CAPE EQUIPMENT_BODY
-EQUIPMENT_FEET EQUIPMENT_CAPE
-EQUIPMENT_HANDS EQUIPMENT_FEET
-EQUIPMENT_HELMET EQUIPMENT_HANDS
-EQUIPMENT_ITEM_SLOTS EQUIPMENT_HELMET
+
+EQUIPMENT_INVENTORY_ITEMS_CONTAINER [EQUIPMENT] Widget Info
+
+EQUIPMENT_ITEM_SLOTS
EQUIPMENT_LEGS
@@ -263,85 +295,149 @@ Enum Constant Summary
GRAND_EXCHANGE_INTERFACE_LAYOUT
-GRAND_EXCHANGE_OFFER_WINDOW GRAND_EXCHANGE_INVENTORY_ITEMS_CONTAINER
+GRAND_EXCHANGE_OFFER_WINDOW
+
GRAND_EXCHANGE_SEARCH_INPUT [GRANDEXCHANGE]
+
+INVENTORY_DESTROY_ITEM
-MAGIC_AUTOCAST_SPELL_LIST INVENTORY_DESTROY_ITEM_YES
+
+INVENTORY_ITEMS_CONTAINER [INVENTORY] Widget Info
+
+
+LOGIN_CLICK_TO_PLAY_SCREEN_MESSAGE_OF_THE_DAY
+
+LOGIN_MOTW [LOGIN] Widget Info
+
+
+LOGOUT_BUTTON
+MAGIC_AUTOCAST_SPELL_LIST
+
MAGIC_SPELL_LIST [MAGIC] Widget Info
-
-MINIMAP_HEALTH_ORB_TEXT
+MINIMAP_HEALTH_ORB [MINIMAP] Widget Info
+
+MINIMAP_HEALTH_ORB_TEXT
-MINIMAP_SPEC_ORB_TEXT MINIMAP_PRAYER_ORB
+
+MINIMAP_PRAYER_ORB_TEXT
+
+MINIMAP_QUICK_PRAYER_ORB
+
+MINIMAP_QUICK_PRAYER_ORB_SPRITE
+
+MINIMAP_RUN_ORB
+
+MINIMAP_RUN_ORB_TEXT
+
+MINIMAP_SPEC_ORB
+MINIMAP_SPEC_ORB_TEXT
+
PRAYER_NORMAL_BOOK [PRAYER] Widget Info
+
+PVP_WILDERNESS_LEVEL [WILDERNESS] Widget Info
+
+QUICK_PRAYER_PRAYERS [QUICKPRAYER]
+
+
SKILL [SKILL] Widget Info
-
+
STORE_DYNAMIC_COMPONENTS [STORE] Widget Info
-
-STORE_INVENTORY
+STORE_INVENTORY_ITEMS_CONTAINER
+
TRADE_MAIN_SCREEN__INVENTORY_ITEMS_CONTAINER [TRADE] Widget Info
-
+
TRADE_MAIN_SCREEN_ACCEPT
-
+
TRADE_MAIN_SCREEN_DECLINE
-
+
TRADE_MAIN_SCREEN_MAIN_NAME
-
+
TRADE_MAIN_SCREEN_PARTNER
-
+
TRADE_MAIN_SCREEN_PARTNER_FREE_SLOTS
-
+
TRADE_MAIN_SCREEN_PERSONAL
-
+
TRADE_SECOND_SCREEN_ACCEPT
-
+
TRADE_SECOND_SCREEN_DECLINE
-
+
TRADE_SECOND_SCREEN_PARTNER
-
+
TRADE_SECOND_SCREEN_PERSONAL
-
+
TRADE_SECOND_SCREEN_SECOND_NAME
+
+WORLD_MAP_VIEW [MISC] Widget Info
+
@@ -444,6 +540,110 @@ Methods inherited from class java.lang.Object
Enum Constant Detail
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -454,6 +654,15 @@ BANK_DYNAMIC_COMPONENTS
[BANK] Widget Info
+
+
+
+
@@ -581,6 +790,15 @@ DEPOSIT_DYNAMIC_COMPONENTS
[DEPOSIT BOX] Widget Info
+
+
+
+
@@ -608,6 +826,43 @@ DEPOSIT_BUTTON_DEPOSIT_LOOT
public static final GlobalWidgetInfo DEPOSIT_BUTTON_DEPOSIT_LOOT
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -615,7 +870,6 @@ DEPOSIT_BUTTON_DEPOSIT_LOOT
COMBAT_DEFENSIVE_CAST_SPELL
public static final GlobalWidgetInfo COMBAT_DEFENSIVE_CAST_SPELL
-[COMBAT] Widget Info
@@ -636,6 +890,16 @@ COMBAT_AUTO_RETALIATE
public static final GlobalWidgetInfo COMBAT_AUTO_RETALIATE
+
+
+
+
@@ -643,7 +907,6 @@ COMBAT_AUTO_RETALIATE
EQUIPMENT_ITEM_SLOTS
public static final GlobalWidgetInfo EQUIPMENT_ITEM_SLOTS
-[EQUIPMENT] Widget Info
@@ -864,13 +1127,13 @@ STORE_DYNAMIC_COMPONENTS
[STORE] Widget Info
-
+
@@ -937,6 +1200,15 @@ GRAND_EXCHANGE_INTERFACE_LAYOUT
public static final GlobalWidgetInfo GRAND_EXCHANGE_INTERFACE_LAYOUT
+
+
+
+
@@ -966,6 +1238,52 @@ MAGIC_AUTOCAST_SPELL_LIST
public static final GlobalWidgetInfo MAGIC_AUTOCAST_SPELL_LIST
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -973,7 +1291,24 @@ MAGIC_AUTOCAST_SPELL_LIST
MINIMAP_HEALTH_ORB_TEXT
public static final GlobalWidgetInfo MINIMAP_HEALTH_ORB_TEXT
-[MINIMAP] Widget Info
+
+
+
+
+
+
+
+
+
+
@@ -985,16 +1320,35 @@ MINIMAP_SPEC_ORB_TEXT
public static final GlobalWidgetInfo MINIMAP_SPEC_ORB_TEXT
+
+
+
+
-
@@ -1094,7 +1448,11 @@ getChildId
getPackedId
public int getPackedId()
-Gets the packed widget ID.
+Gets the packed widget ID.
+ Any usage where regular WidgetInfo is required and an easy conversion is required.
+ This will enable use of the RuneLite WidgetInfo class somewhat indirectly.
+ Method calls using this are for example:
+ client.getWidget()
Returns: the packed ID
diff --git a/docs/rsb/internal/globval/package-frame.html b/docs/rsb/internal/globval/package-frame.html
index 024c9a4c..e3f9b196 100644
--- a/docs/rsb/internal/globval/package-frame.html
+++ b/docs/rsb/internal/globval/package-frame.html
@@ -2,9 +2,9 @@
-
+
rsb.internal.globval
-Classes
Enums
diff --git a/docs/rsb/internal/globval/package-summary.html b/docs/rsb/internal/globval/package-summary.html
index 011c8963..831325e9 100644
--- a/docs/rsb/internal/globval/package-summary.html
+++ b/docs/rsb/internal/globval/package-summary.html
@@ -2,9 +2,9 @@
-
+
rsb.internal.globval
-Package rsb.internal.globval
+GlobalWidgetId.Prayer
+
+
GlobalWidgetId.PrayerBook
Provides Prayer Book(s) Information.
-
-GlobalWidgetId.Prayers
-
GlobalWidgetId.Skill
diff --git a/docs/rsb/internal/globval/package-tree.html b/docs/rsb/internal/globval/package-tree.html
index bd16861d..01dd1ebb 100644
--- a/docs/rsb/internal/globval/package-tree.html
+++ b/docs/rsb/internal/globval/package-tree.html
@@ -2,9 +2,9 @@
-
+
rsb.internal.globval Class Hierarchy
-Enum Hierarchy
java.lang.Enum<E> (implements java.lang.Comparable<T>, java.io.Serializable)
diff --git a/docs/rsb/internal/input/Canvas.html b/docs/rsb/internal/input/Canvas.html
index fe6d506b..056b20f9 100644
--- a/docs/rsb/internal/input/Canvas.html
+++ b/docs/rsb/internal/input/Canvas.html
@@ -2,9 +2,9 @@
-
+
Canvas
-Focus
-Keyboard
-Mouse
-VirtualKeyboard
-VirtualMouse
-rsb.internal.input
-rsb.internal.input
-rsb.internal.input Class Hierarchy
-CanvasMousePositionAgent
-ComponentMousePositionTransformer
-ContainerMousePositionTransformer
-rsb.internal.instrumentate
-rsb.internal.instrumentate
-rsb.internal.instrumentate Class Hierarchy
-PassiveScriptListener
-ScriptListener
-rsb.internal.listener
-rsb.internal.listener
-rsb.internal.listener Class Hierarchy
-RSBSystemCalls
-rsb.internal.naturalmouse
-rsb.internal.naturalmouse
-rsb.internal.naturalmouse Class Hierarchy
-rsb.internal
-Classes
MouseHandler NewHooks PassiveScriptHandler RuntimeConfig RuntimeConfigLoader ScriptHandler SystemConsoleHandler TextAreaLogHandler rsb.internal
-Package rsb.internal
+RuntimeConfig
+
+
+RuntimeConfigLoader
+
+
ScriptHandler
diff --git a/docs/rsb/internal/package-tree.html b/docs/rsb/internal/package-tree.html
index 1621a50b..5a79d73f 100644
--- a/docs/rsb/internal/package-tree.html
+++ b/docs/rsb/internal/package-tree.html
@@ -2,9 +2,9 @@
-
+
rsb.internal Class Hierarchy
-Class Hierarchy
-rsb.internal.BotProperties
rsb.internal.BreakHandler
rsb.internal.ClientThread
java.util.logging.Formatter
@@ -120,6 +119,13 @@ Class Hierarchy
rsb.internal.PassiveScriptHandler
+net.runelite.client.RuneLiteProperties
+
+
+rsb.internal.RuntimeConfig
+rsb.internal.RuntimeConfigLoader
rsb.internal.ScriptHandler
diff --git a/docs/rsb/internal/wrappers/Deque.html b/docs/rsb/internal/wrappers/Deque.html
index 17cbdc7f..c79af195 100644
--- a/docs/rsb/internal/wrappers/Deque.html
+++ b/docs/rsb/internal/wrappers/Deque.html
@@ -2,9 +2,9 @@
-
+
Deque
-Filter
-NodeDeque
-NodeSub
-NodeSubQueue
-Queue
-TileFlags.Flags
-TileFlags.Keys
-TileFlags
-rsb.internal.wrappers
-rsb.internal.wrappers
-rsb.internal.wrappers Class Hierarchy
-Account
-Bank
-Calculations
-Method Summary
booleantileOnMap RSTile t)Checks whether or not a given tile is on the minimap.
+Checks whether a given tile is on the minimap.
booleantileOnScreen RSTile t)Checks whether or not the centroid of a given tile is on the screen.
+Checks whether the centroid of a given tile is on the screen.
@@ -401,7 +401,7 @@ Method Detail
tileOnMap
public boolean tileOnMap(RSTile t)
-Checks whether or not a given tile is on the minimap.
+Checks whether a given tile is on the minimap.
Parameters: t - The Tile to check.tileOnMap
tileOnScreen
public boolean tileOnScreen(RSTile t)
-Checks whether or not the centroid of a given tile is on the screen.
+Checks whether the centroid of a given tile is on the screen.
Parameters: t - The RSTile to check.Camera.ROTATION_METHOD
-Camera
-Combat
-Method Summary
booleanisPoisoned Returns whether or not we're poisoned.
+Returns whether we're poisoned.
booleanisSpecialEnabled Returns whether or not the special-attack option is enabled.
+Returns whether the special-attack option is enabled.
@@ -426,7 +426,7 @@ setFightMode
getWildernessLevel
public int getWildernessLevel()
-Gets the current Wilderness Level. Written by Speed.
+Gets the current Wilderness Level.
Returns: The current wilderness level otherwise, 0.
@@ -454,7 +454,7 @@ getLifePoints
isPoisoned
public boolean isPoisoned()
-Returns whether or not we're poisoned.
+Returns whether we're poisoned.
Returns: true if poisoned; otherwise false .getVenomDamage
isSpecialEnabled
public boolean isSpecialEnabled()
-Returns whether or not the special-attack option is enabled.
+Returns whether the special-attack option is enabled.
Returns: true if special is enabled; otherwise false .Environment
-Equipment
-Game.ChatMode
-Game
-GameGUI.Tab
-Enum GameGUI.Tab
public static enum GameGUI.Tab
extends java.lang.Enum<GameGUI.Tab >
+An enumerated type representing the tabs interfaces and their WidgetInfo.
diff --git a/docs/rsb/methods/GameGUI.html b/docs/rsb/methods/GameGUI.html
index 76c23b8b..e2c04b2f 100644
--- a/docs/rsb/methods/GameGUI.html
+++ b/docs/rsb/methods/GameGUI.html
@@ -2,9 +2,9 @@
-
+
GameGUI
-Nested Class Summary
static class GameGUI.Tab GameGUI.Tab An enumerated type representing the tabs interfaces and their WidgetInfo.
+
diff --git a/docs/rsb/methods/GrandExchange.html b/docs/rsb/methods/GrandExchange.html
index e493127d..8e892945 100644
--- a/docs/rsb/methods/GrandExchange.html
+++ b/docs/rsb/methods/GrandExchange.html
@@ -2,9 +2,9 @@
-
+
GrandExchange
-GroundItems
-Interfaces
-Inventory
-Keyboard
-Magic.MagicBook
-Magic
-Menu
-MethodContext
-MethodProvider
-Methods
-Mouse
-NPCs
-Objects
-Players
-Prayer
-Method Summary
booleanactivatePrayer GlobalWidgetId.Prayers prayer,
+activatePrayer GlobalWidgetId.Prayer prayer,
boolean activate)Activates/deactivates a prayer via interfaces.
Method Summary
booleanisPrayerOn GlobalWidgetId.Prayers prayer)isPrayerOn GlobalWidgetId.Prayer prayer)Returns true if designated prayer is turned on.
@@ -201,8 +201,8 @@ Method Summary
booleansetQuickPrayers GlobalWidgetId.Prayers ... prayers)setQuickPrayers GlobalWidgetId.Prayer ... prayers)Sets up the quick prayers for the user
@@ -235,13 +235,13 @@ Methods inherited from class java.lang.Object
Method Detail
-
+
isPrayerOn
-public boolean isPrayerOn(GlobalWidgetId.Prayers prayer)
+public boolean isPrayerOn(GlobalWidgetId.Prayer prayer)
Returns true if designated prayer is turned on.
Parameters: isQuickPrayerOn
-
+
-
+
setQuickPrayers
public boolean setQuickPrayers(boolean unsetPrevious,
- GlobalWidgetId.Prayers ... prayers)
+ GlobalWidgetId.Prayer ... prayers)
Sets up the quick prayers for the user
Parameters: Settings
-Skills
-Store
-Tiles
-Trade
-Walking
-Web
-WorldHopper
-rsb.methods
-rsb.methods
-Package rsb.methods
GameGUI.Tab
+
+An enumerated type representing the tabs interfaces and their WidgetInfo.
+
Magic.MagicBook rsb.methods Class Hierarchy
-Enum Hierarchy
java.lang.Enum<E> (implements java.lang.Comparable<T>, java.io.Serializable)
diff --git a/docs/rsb/plugin/AccountManager.html b/docs/rsb/plugin/AccountManager.html
index 275ba42b..2ab2288b 100644
--- a/docs/rsb/plugin/AccountManager.html
+++ b/docs/rsb/plugin/AccountManager.html
@@ -2,9 +2,9 @@
-
+
AccountManager
-AccountPanel
-Botplugin
-Method Summary
Methods inherited from class net.runelite.client.plugins.Plugin
-configure, getInjector, getName, resetConfiguration
+configure, equals, getInjector, getName, hashCode, resetConfiguration
Methods inherited from class java.lang.Object
-equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, waitgetClass, notify, notifyAll, toString, wait, wait, wait
diff --git a/docs/rsb/plugin/LogTextArea.html b/docs/rsb/plugin/LogTextArea.html
index 0dabee33..40eb3840 100644
--- a/docs/rsb/plugin/LogTextArea.html
+++ b/docs/rsb/plugin/LogTextArea.html
@@ -2,9 +2,9 @@
-
+
LogTextArea
-ScriptPanel
-ScriptSelector
-rsb.plugin
-rsb.plugin
-rsb.plugin Class Hierarchy
-PassiveScript
-PassiveScriptManifest
-Random
-Script
-ScriptManifest
-rsb.script
-rsb.script
-rsb.script Class Hierarchy
-Class Hierarchy
Annotation Type Hierarchy
diff --git a/docs/rsb/script/randoms/LoginBot.html b/docs/rsb/script/randoms/LoginBot.html
index 3139ebff..fe2730fa 100644
--- a/docs/rsb/script/randoms/LoginBot.html
+++ b/docs/rsb/script/randoms/LoginBot.html
@@ -2,9 +2,9 @@
-
+
LoginBot
-rsb.script.randoms
-rsb.script.randoms
-rsb.script.randoms Class Hierarchy
-FileScriptSource
-Monitoring.Event
-Monitoring
-ScriptDefinition
-ScriptSource
-ServiceException
-rsb.service
-rsb.service
-rsb.service Class Hierarchy
-Test
-rsb.testsScript
-rsb.testsScript
-rsb.testsScript Class Hierarchy
-AccountStore.Account
-AccountStore
-Base64
-Extractor
-OutputObjectComparer
-Pair
-Parameters
-ScreenshotUtil
-SetForegroundWindowUtil.User32.WNDENUMPROC
-SetForegroundWindowUtil.User32
-SetForegroundWindowUtil
-SkillTracker
-StdRandom
-StringUtil
-Timer
-WindowUtil
-rsb.util
-rsb.util
-rsb.util Class Hierarchy
-RSArea
-RSCharacter.DIRECTION
-RSCharacter
-RSCharacterModel
-RSGroundItem
-RSGroundItemModel
-RSGroundObjectModel
-RSItem
-RSLocalPath
-RSModel
-RSNPC
-RSObject.Type
-RSObject
-RSPath.TraversalOption
-RSPath
-RSPlayer
-RSTile
-RSTilePath
-RSWallObjectModel
-RSWidget
-RSWidgetItem
-Clickable
-Clickable07
-Positionable
-rsb.wrappers.common
-rsb.wrappers.common
-rsb.wrappers.common Class Hierarchy
-rsb.wrappers
-rsb.wrappers
-rsb.wrappers Class Hierarchy
-Enum Hierarchy
java.lang.Enum<E> (implements java.lang.Comparable<T>, java.io.Serializable)
diff --git a/docs/rsb/wrappers/subwrap/ChooseOption.html b/docs/rsb/wrappers/subwrap/ChooseOption.html
index 7baff69c..fa8ae734 100644
--- a/docs/rsb/wrappers/subwrap/ChooseOption.html
+++ b/docs/rsb/wrappers/subwrap/ChooseOption.html
@@ -2,9 +2,9 @@
-
+
ChooseOption
-NPCChat
-RSMenuNode
-WalkerTile.TYPES
-WalkerTile
-rsb.wrappers.subwrap
-rsb.wrappers.subwrap
-rsb.wrappers.subwrap Class Hierarchy
-Serialized Form
- sessionfile = parser.accepts("sessionfile", "Use a specified session file")
@@ -487,6 +482,7 @@ public static void initializeClient(ArgumentAcceptingOptionSpec[] optionSpecs
options.valueOf(
optionSpecs[Options.updatemode.getIndex()].ofType(ClientUpdateCheckMode.class)),
(String) options.valueOf("jav_config"));
+ final RuntimeConfigLoader runtimeConfigLoader = new RuntimeConfigLoader(okHttpClient);
new Thread(() ->
{
@@ -502,6 +498,7 @@ public static void initializeClient(ArgumentAcceptingOptionSpec[] optionSpecs
injector = Guice.createInjector(new BotModule(
okHttpClient,
clientLoader,
+ runtimeConfigLoader,
options.has("developer-mode"),
false,
options.valueOf(optionSpecs[Options.sessionfile.getIndex()].ofType(File.class)),
@@ -683,7 +680,7 @@ static OkHttpClient buildHttpClient(boolean insecureSkipTlsVerification)
return res;
});
- if (insecureSkipTlsVerification || RuneLiteProperties.isInsecureSkipTlsVerification())
+ if (insecureSkipTlsVerification || BotProperties.isInsecureSkipTlsVerification())
{
setupInsecureTrustManager(builder);
}
diff --git a/src/main/java/rsb/botLauncher/RuneLiteTestFeatures.java b/src/main/java/rsb/botLauncher/RuneLiteTestFeatures.java
index 3fb6a1e4..834a1934 100644
--- a/src/main/java/rsb/botLauncher/RuneLiteTestFeatures.java
+++ b/src/main/java/rsb/botLauncher/RuneLiteTestFeatures.java
@@ -4,8 +4,9 @@
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Point;
import net.runelite.api.widgets.Widget;
-import net.runelite.api.widgets.WidgetInfo;
import net.runelite.client.callback.ClientThread;
+import rsb.internal.globval.GlobalWidgetId;
+import rsb.internal.globval.GlobalWidgetInfo;
import rsb.methods.Game;
import rsb.methods.GroundItems;
import rsb.methods.MethodContext;
@@ -48,7 +49,7 @@ private static void login(RuneLite bot) throws InterruptedException {
}
}
}
- Widget welcomeScreenMotW = bot.getClient().getWidget(WidgetInfo.LOGIN_CLICK_TO_PLAY_SCREEN.getGroupId(), 6);
+ Widget welcomeScreenMotW = bot.getClient().getWidget(GlobalWidgetInfo.LOGIN_MOTW.getPackedId());
if (welcomeScreenMotW != null) {
if (welcomeScreenMotW.getTextColor() != -1) {
Rectangle clickHereToPlayButton = new Rectangle(270, 295, 225, 80);
diff --git a/src/main/java/rsb/internal/BotModule.java b/src/main/java/rsb/internal/BotModule.java
index 9aef2b19..3eb65506 100644
--- a/src/main/java/rsb/internal/BotModule.java
+++ b/src/main/java/rsb/internal/BotModule.java
@@ -1,10 +1,17 @@
package rsb.internal;
+import com.google.common.math.DoubleMath;
+import com.google.gson.Gson;
+import com.google.inject.binder.ConstantBindingBuilder;
import com.google.inject.name.Names;
+import java.applet.Applet;
+import java.io.File;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.function.Supplier;
import net.runelite.api.hooks.Callbacks;
-import net.runelite.client.RuneLite;
-import net.runelite.client.RuneLiteModule;
-import net.runelite.client.RuneLiteProperties;
import net.runelite.client.account.SessionManager;
import net.runelite.client.chat.ChatMessageManager;
import net.runelite.client.eventbus.EventBus;
@@ -15,32 +22,26 @@
import net.runelite.client.util.DeferredEventBus;
import net.runelite.client.util.ExecutorServiceExceptionLogger;
import net.runelite.http.api.RuneLiteAPI;
-import okhttp3.Cache;
import okhttp3.OkHttpClient;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.applet.Applet;
-import java.io.File;
-import java.util.Properties;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.function.Supplier;
+import net.runelite.client.RuneLiteModule;
+import net.runelite.client.RuntimeConfig;
public class BotModule extends RuneLiteModule {
private final OkHttpClient okHttpClient;
private final Supplier clientLoader;
+ private final Supplier configSupplier;
private final boolean developerMode;
private final boolean safeMode;
private final File sessionfile;
private final File config;
- public BotModule(OkHttpClient okHttpClient, Supplier clientLoader, boolean developerMode, boolean safeMode, File sessionfile, File config) {
- super(okHttpClient, clientLoader, developerMode, safeMode, sessionfile, config);
+ public BotModule(OkHttpClient okHttpClient, Supplier clientLoader, Supplier configSupplier, boolean developerMode, boolean safeMode, File sessionfile, File config) {
+ super(okHttpClient, clientLoader, configSupplier, developerMode, safeMode, sessionfile, config);
this.okHttpClient = okHttpClient;
this.clientLoader = clientLoader;
+ this.configSupplier = configSupplier;
this.developerMode = developerMode;
this.safeMode = safeMode;
this.sessionfile = sessionfile;
@@ -48,6 +49,7 @@ public BotModule(OkHttpClient okHttpClient, Supplier clientLoader, boole
}
@Override
+ @SuppressWarnings("unchecked")
protected void configure()
{
Properties properties = BotProperties.getProperties();
@@ -56,6 +58,31 @@ protected void configure()
String value = properties.getProperty(key);
bindConstant().annotatedWith(Names.named(key)).to(value);
}
+ RuntimeConfig runtimeConfig = configSupplier.get();
+ if (runtimeConfig != null && runtimeConfig.getProps() != null)
+ {
+ for (Map.Entry entry : runtimeConfig.getProps().entrySet())
+ {
+ if (entry.getValue() instanceof String)
+ {
+ ConstantBindingBuilder binder = bindConstant().annotatedWith(Names.named(entry.getKey()));
+ binder.to((String) entry.getValue());
+ }
+ else if (entry.getValue() instanceof Double)
+ {
+ ConstantBindingBuilder binder = bindConstant().annotatedWith(Names.named(entry.getKey()));
+ if (DoubleMath.isMathematicalInteger((Double) entry.getValue()))
+ {
+ binder.to(((Double) entry.getValue()).intValue());
+ }
+ else
+ {
+ binder.to((Double) entry.getValue());
+ }
+ }
+ }
+ }
+
bindConstant().annotatedWith(Names.named("developerMode")).to(developerMode);
bindConstant().annotatedWith(Names.named("safeMode")).to(safeMode);
bind(File.class).annotatedWith(Names.named("sessionfile")).toInstance(sessionfile);
@@ -69,6 +96,8 @@ protected void configure()
bind(PluginManager.class);
bind(SessionManager.class);
+ bind(Gson.class).toInstance(RuneLiteAPI.GSON);
+
bind(Callbacks.class).to(NewHooks.class);
bind(EventBus.class)
@@ -77,9 +106,5 @@ protected void configure()
bind(EventBus.class)
.annotatedWith(Names.named("Deferred EventBus"))
.to(DeferredEventBus.class);
-
- bind(Logger.class)
- .annotatedWith(Names.named("Core Logger"))
- .toInstance(LoggerFactory.getLogger(RuneLite.class));
}
}
diff --git a/src/main/java/rsb/internal/BotProperties.java b/src/main/java/rsb/internal/BotProperties.java
index 240ca9d4..b2503093 100644
--- a/src/main/java/rsb/internal/BotProperties.java
+++ b/src/main/java/rsb/internal/BotProperties.java
@@ -9,24 +9,9 @@
import net.runelite.client.RuneLiteProperties;
import okhttp3.HttpUrl;
-public class BotProperties
+public class BotProperties extends RuneLiteProperties
{
- private static final String RUNELITE_VERSION = "runelite.version";
- private static final String RUNELITE_COMMIT = "runelite.commit";
- private static final String RUNELITE_DIRTY = "runelite.dirty";
- private static final String DISCORD_INVITE = "runelite.discord.invite";
- private static final String LAUNCHER_VERSION_PROPERTY = "runelite.launcher.version";
- private static final String INSECURE_SKIP_TLS_VERIFICATION_PROPERTY = "runelite.insecure-skip-tls-verification";
- private static final String TROUBLESHOOTING_LINK = "runelite.wiki.troubleshooting.link";
- private static final String BUILDING_LINK = "runelite.wiki.building.link";
- private static final String DNS_CHANGE_LINK = "runelite.dnschange.link";
- private static final String JAV_CONFIG = "runelite.jav_config";
- private static final String JAV_CONFIG_BACKUP = "runelite.jav_config_backup";
- private static final String PLUGINHUB_BASE = "runelite.pluginhub.url";
- private static final String PLUGINHUB_VERSION = "runelite.pluginhub.version";
- private static final String API_BASE = "runelite.api.base";
-
- @Getter(AccessLevel.PACKAGE)
+ @Getter(AccessLevel.PUBLIC)
private static final Properties properties = new Properties();
static
@@ -40,71 +25,4 @@ public class BotProperties
throw new RuntimeException(ex);
}
}
-
- public static String getVersion()
- {
- return properties.getProperty(RUNELITE_VERSION);
- }
-
- public static String getCommit()
- {
- return properties.getProperty(RUNELITE_COMMIT);
- }
-
- public static boolean isDirty()
- {
- return Boolean.parseBoolean(properties.getProperty(RUNELITE_DIRTY));
- }
-
- public static String getDiscordInvite()
- {
- return properties.getProperty(DISCORD_INVITE);
- }
-
- @Nullable
- public static String getLauncherVersion()
- {
- return System.getProperty(LAUNCHER_VERSION_PROPERTY);
- }
-
- public static boolean isInsecureSkipTlsVerification()
- {
- return Boolean.getBoolean(INSECURE_SKIP_TLS_VERIFICATION_PROPERTY);
- }
-
- public static String getTroubleshootingLink()
- {
- return properties.getProperty(TROUBLESHOOTING_LINK);
- }
-
- public static String getBuildingLink()
- {
- return properties.getProperty(BUILDING_LINK);
- }
-
- public static String getDNSChangeLink()
- {
- return properties.getProperty(DNS_CHANGE_LINK);
- }
-
- public static String getJavConfig()
- {
- return properties.getProperty(JAV_CONFIG);
- }
-
- public static String getJavConfigBackup()
- {
- return properties.getProperty(JAV_CONFIG_BACKUP);
- }
-
- public static HttpUrl getPluginHubBase()
- {
- String version = System.getProperty(PLUGINHUB_VERSION, properties.getProperty(PLUGINHUB_VERSION));
- return HttpUrl.parse(properties.get(PLUGINHUB_BASE) + "/" + version);
- }
-
- public static String getApiBase()
- {
- return properties.getProperty(API_BASE);
- }
}
\ No newline at end of file
diff --git a/src/main/java/rsb/internal/NewHooks.java b/src/main/java/rsb/internal/NewHooks.java
index 75397b75..65fcdcc4 100644
--- a/src/main/java/rsb/internal/NewHooks.java
+++ b/src/main/java/rsb/internal/NewHooks.java
@@ -30,7 +30,6 @@
import net.runelite.api.events.ScriptCallbackEvent;
import net.runelite.api.hooks.Callbacks;
import net.runelite.api.widgets.Widget;
-import static net.runelite.api.widgets.WidgetInfo.WORLD_MAP_VIEW;
import net.runelite.api.widgets.WidgetItem;
import net.runelite.client.Notifier;
import net.runelite.client.chat.ChatMessageManager;
@@ -47,6 +46,7 @@
import net.runelite.client.util.DeferredEventBus;
import net.runelite.client.util.RSTimeUnit;
import rsb.botLauncher.RuneLite;
+import rsb.internal.globval.GlobalWidgetInfo;
/**
* This class contains field required for mixins and runelite hooks to work.
@@ -92,9 +92,9 @@ public class NewHooks implements Callbacks
/**
* Get the Graphics2D for the MainBufferProvider image
- * This caches the Graphics2D instance so it can be reused
- * @param mainBufferProvider
- * @return
+ * This caches the Graphics2D instance, so it can be reused
+ * @param mainBufferProvider The MainBufferProvider instance
+ * @return The Graphics2D instance
*/
private static Graphics2D getGraphics(MainBufferProvider mainBufferProvider)
{
@@ -217,7 +217,7 @@ public void frame()
*/
private void checkWorldMap()
{
- Widget widget = client.getWidget(WORLD_MAP_VIEW);
+ Widget widget = client.getWidget(GlobalWidgetInfo.WORLD_MAP_VIEW.getPackedId());
if (widget != null)
{
diff --git a/src/main/java/rsb/internal/RuntimeConfig.java b/src/main/java/rsb/internal/RuntimeConfig.java
new file mode 100644
index 00000000..4b67dba7
--- /dev/null
+++ b/src/main/java/rsb/internal/RuntimeConfig.java
@@ -0,0 +1,11 @@
+package rsb.internal;
+
+import java.util.Collections;
+import java.util.Map;
+import lombok.Data;
+
+@Data
+public class RuntimeConfig
+{
+ private Map props = Collections.emptyMap();
+}
diff --git a/src/main/java/rsb/internal/RuntimeConfigLoader.java b/src/main/java/rsb/internal/RuntimeConfigLoader.java
new file mode 100644
index 00000000..ff51d46b
--- /dev/null
+++ b/src/main/java/rsb/internal/RuntimeConfigLoader.java
@@ -0,0 +1,100 @@
+package rsb.internal;
+
+import com.google.common.base.Strings;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.function.Supplier;
+import lombok.extern.slf4j.Slf4j;
+import net.runelite.client.RuntimeConfig;
+import net.runelite.http.api.RuneLiteAPI;
+import okhttp3.Call;
+import okhttp3.Callback;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+
+@Slf4j
+public class RuntimeConfigLoader implements Supplier
+{
+ private final OkHttpClient okHttpClient;
+ private final CompletableFuture configFuture;
+
+ public RuntimeConfigLoader(OkHttpClient okHttpClient)
+ {
+ this.okHttpClient = okHttpClient;
+ configFuture = fetch();
+ }
+
+ @Override
+ public RuntimeConfig get()
+ {
+ try
+ {
+ return configFuture.get();
+ }
+ catch (InterruptedException | ExecutionException e)
+ {
+ log.error("error fetching runtime config", e);
+ return null;
+ }
+ }
+
+ private CompletableFuture fetch()
+ {
+ CompletableFuture future = new CompletableFuture<>();
+
+ String prop = System.getProperty("runelite.rtconf");
+ if (!Strings.isNullOrEmpty(prop))
+ {
+ try
+ {
+ log.info("Using local runtime config");
+
+ String strConf = new String(Files.readAllBytes(Paths.get(prop)), StandardCharsets.UTF_8);
+ RuntimeConfig conf = RuneLiteAPI.GSON.fromJson(strConf, RuntimeConfig.class);
+ future.complete(conf);
+ return future;
+ }
+ catch (IOException e)
+ {
+ throw new RuntimeException("failed to load override runtime config", e);
+ }
+ }
+
+ Request request = new Request.Builder()
+ .url(BotProperties.getRuneLiteConfig())
+ .build();
+
+ okHttpClient.newCall(request).enqueue(new Callback()
+ {
+ @Override
+ public void onFailure(Call call, IOException e)
+ {
+ future.completeExceptionally(e);
+ }
+
+ @Override
+ public void onResponse(Call call, Response response)
+ {
+ try // NOPMD: UseTryWithResources
+ {
+ RuntimeConfig config = RuneLiteAPI.GSON.fromJson(response.body().charStream(), RuntimeConfig.class);
+ future.complete(config);
+ }
+ catch (Throwable ex)
+ {
+ future.completeExceptionally(ex);
+ }
+ finally
+ {
+ response.close();
+ }
+ }
+ });
+ return future;
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/rsb/internal/globval/GlobalWidgetId.java b/src/main/java/rsb/internal/globval/GlobalWidgetId.java
index 5ee70eb5..e5c58fd3 100644
--- a/src/main/java/rsb/internal/globval/GlobalWidgetId.java
+++ b/src/main/java/rsb/internal/globval/GlobalWidgetId.java
@@ -17,6 +17,10 @@ public class GlobalWidgetId {
public static final int DYNAMIC_CHAT_BOX_LATEST_MESSAGE = 1; //TODO: Check these. Not sure what they do.
+ /**Login Screen Widget IDs*/
+ public static final int INTERFACE_LOGIN_SCREEN = WidgetInfo.LOGIN_CLICK_TO_PLAY_SCREEN.getGroupId();
+ public static final int INTERFACE_LOGIN_SCREEN_MOTW = 6;
+
/**
* Bank Widget IDs
*/
@@ -24,6 +28,7 @@ public class GlobalWidgetId {
public static final int INTERFACE_BANK = WidgetInfo.BANK_CONTAINER.getGroupId();
//Child ID
public static final int INTERFACE_BANK_DYNAMIC_COMPONENTS = 2;
+ public static final int INTERFACE_BANK_INVENTORY_ITEMS_CONTAINER = 3;
public static final int INTERFACE_BANK_ITEM_COUNT = 5;
public static final int INTERFACE_BANK_ITEM_MAX = 8;
public static final int INTERFACE_BANK_TAB = 10;
@@ -54,6 +59,7 @@ public class GlobalWidgetId {
public static final int INTERFACE_DEPOSIT_BOX = WidgetInfo.DEPOSIT_BOX_INVENTORY_ITEMS_CONTAINER.getGroupId();
//Child ID
public static final int INTERFACE_DEPOSIT_DYNAMIC_COMPONENTS = 1;
+ public static final int INTERFACE_DEPOSIT_INVENTORY_ITEMS_CONTAINER = WidgetInfo.DEPOSIT_BOX_INVENTORY_ITEMS_CONTAINER.getChildId();
public static final int INTERFACE_DEPOSIT_BUTTON_DEPOSIT_CARRIED_ITEMS = 4;
public static final int INTERFACE_DEPOSIT_BUTTON_DEPOSIT_WORN_ITEMS = 6;
public static final int INTERFACE_DEPOSIT_BUTTON_DEPOSIT_LOOT = 8;
@@ -74,7 +80,7 @@ public class GlobalWidgetId {
//Parent ID
public static final int INTERFACE_EQUIPMENT = WidgetInfo.EQUIPMENT.getGroupId();
//Child ID
- public static final int INTERFACE_EQUIPMENT_COMPONENT = WidgetInfo.EQUIPMENT_INVENTORY_ITEMS_CONTAINER.getChildId();
+ public static final int INTERFACE_EQUIPMENT_INVENTORY_ITEMS_CONTAINER = WidgetInfo.EQUIPMENT_INVENTORY_ITEMS_CONTAINER.getChildId();
public static final int INTERFACE_EQUIPMENT_ITEM_SLOTS = 11;
public static class EquipmentSlotId {
public static final int INTERFACE_EQUIPMENT_HELMET = 14;
@@ -119,7 +125,7 @@ public static class EquipmentSlotId {
public static final int INTERFACE_STORE = WidgetInfo.SHOP_INVENTORY_ITEMS_CONTAINER.getGroupId();
//Child id
public static final int INTERFACE_STORE_DYNAMIC_COMPONENTS = 1;
- public static final int INTERFACE_STORE_ITEMS = WidgetInfo.SHOP_INVENTORY_ITEMS_CONTAINER.getChildId();
+ public static final int INTERFACE_STORE_ITEMS_CONTAINER = WidgetInfo.SHOP_INVENTORY_ITEMS_CONTAINER.getChildId();
/**
* Skill ids
@@ -416,10 +422,17 @@ public static class SpellId {
/**
* Minimap ids
*/
+ public static final int INTERFACE_MINIMAP_ORBS = WidgetInfo.MINIMAP_ORBS.getGroupId();
+ public static final int INTERFACE_MINIMAP_HEALTH_ORB = WidgetInfo.MINIMAP_HEALTH_ORB.getChildId();
+ public static final int INTERFACE_MINIMAP_PRAYER_ORB = WidgetInfo.MINIMAP_PRAYER_ORB.getChildId();
+ public static final int INTERFACE_MINIMAP_QUICK_PRAYER_ORB = WidgetInfo.MINIMAP_QUICK_PRAYER_ORB.getChildId();
+ public static final int INTERFACE_MINIMAP_RUN_ORB = WidgetInfo.MINIMAP_RUN_ORB.getChildId();
+ public static final int INTERFACE_MINIMAP_SPEC_ORB = WidgetInfo.MINIMAP_SPEC_ORB.getChildId();
public static final int INTERFACE_MINIMAP_HEALTH_ORB_TEXT = 5;
public static final int INTERFACE_MINIMAP_PRAYER_ORB_TEXT = 15;
public static final int INTERFACE_MINIMAP_RUN_ORB_TEXT = 23;
public static final int INTERFACE_MINIMAP_SPEC_ORB_TEXT = 31;
+ public static final int INTERFACE_MINIMAP_QUICK_PRAYER_ORB_SPRITE = 2;
/**
@@ -454,34 +467,56 @@ int getIndex() {
}
}
- public enum Prayers {
-
- THICK_SKIN(0, 1), BURST_OF_STRENGTH(1, 4), CLARITY_OF_THOUGHT(2, 7), SHARP_EYE(
- 3, 8), MYSTIC_WILL(4, 9), ROCK_SKIN(5, 10), SUPERHUMAN_STRENGTH(
- 6, 13), IMPROVED_REFLEXES(7, 16), RAPID_RESTORE(8, 19), RAPID_HEAL(
- 9, 22), PROTECT_ITEM(10, 25), HAWK_EYE(11, 26), MYSTIC_LORE(12,
- 27), STEEL_SKIN(13, 28), ULTIMATE_STRENGTH(
- 14, 31), INCREDIBLE_REFLEXES(
- 15, 34), PROTECT_FROM_SUMMONING(16, 35), PROTECT_FROM_MAGIC(17,
- 37), PROTECT_FROM_MISSILES(18,
- 40), PROTECT_FROM_MELEE(
- 19, 43), EAGLE_EYE(
- 20, 44), MYSTIC_MIGHT(21, 45), RETRIBUTION(22, 46), REDEMPTION(
- 23, 49), SMITE(24, 52), CHIVALRY(25, 60), RAPID_RENEWAL(26, 65), PIETY(
- 27, 70), RIGOUR(28, 74), AUGURY(29, 77);
-
- private static final int PRAYER_BOOK_OFFSET = INTERFACE_NORMAL_PRAYERS + 1;
+ public enum Prayer {
+
+ THICK_SKIN(0, 1, 5, 0),
+ BURST_OF_STRENGTH(1, 4, 6, 1),
+ CLARITY_OF_THOUGHT(2, 7, 7, 2),
+ SHARP_EYE(3, 8, 23, 18),
+ MYSTIC_WILL(4, 9, 24, 19),
+ ROCK_SKIN(5, 10, 8, 3),
+ SUPERHUMAN_STRENGTH(6, 13, 9, 4),
+ IMPROVED_REFLEXES(7, 16, 10, 5),
+ RAPID_RESTORE(8, 19, 11, 6),
+ RAPID_HEAL(9, 22, 12, 7),
+ PROTECT_ITEM(10, 25, 13, 8),
+ HAWK_EYE(11, 26, 25, 20),
+ MYSTIC_LORE(12, 27, 26, 21),
+ STEEL_SKIN(13, 28, 14, 9),
+ ULTIMATE_STRENGTH(14, 31, 15, 10),
+ INCREDIBLE_REFLEXES(15, 34, 16, 11),
+ PROTECT_FROM_MAGIC(17, 37, 17, 12),
+ PROTECT_FROM_MISSILES(18, 40, 18, 13),
+ PROTECT_FROM_MELEE(19, 43, 19, 14),
+ EAGLE_EYE(20, 44, 27, 22),
+ MYSTIC_MIGHT(21, 45, 28, 23),
+ RETRIBUTION(22, 46, 20, 15),
+ REDEMPTION(23, 49, 21, 16),
+ SMITE(24, 52, 22, 17),
+ PRESERVE(25, 55, 33, 28),
+ CHIVALRY(26, 60, 29, 25),
+ PIETY(27, 70, 30, 26),
+ RIGOUR(28, 74, 31, 24),
+ AUGURY(29, 77, 32, 27);
private final int index;
private final int level;
+ private final int prayerId;
+ private final int quickPrayerId;
- Prayers(int index, int level) {
+ Prayer(int index, int level, int prayerId, int quickPrayerId) {
this.index = index;
this.level = level;
+ this.prayerId = prayerId;
+ this.quickPrayerId = quickPrayerId;
}
- public int getIndex() {
- return PRAYER_BOOK_OFFSET + index;
+ public int getPrayerId() {
+ return prayerId;
+ }
+
+ public int getQuickPrayerId() {
+ return quickPrayerId;
}
public int getRequiredLevel() {
@@ -490,4 +525,6 @@ public int getRequiredLevel() {
}
+
+
}
diff --git a/src/main/java/rsb/internal/globval/GlobalWidgetInfo.java b/src/main/java/rsb/internal/globval/GlobalWidgetInfo.java
index 882c7e47..4f27b8c8 100644
--- a/src/main/java/rsb/internal/globval/GlobalWidgetInfo.java
+++ b/src/main/java/rsb/internal/globval/GlobalWidgetInfo.java
@@ -2,7 +2,6 @@
import net.runelite.api.widgets.WidgetInfo;
-import static net.runelite.api.widgets.WidgetInfo.*;
import static rsb.internal.globval.GlobalWidgetId.*;
import static rsb.internal.globval.GlobalWidgetId.EquipmentSlotId.*;
@@ -13,10 +12,44 @@
* Rather just for grouping and potentially future updating purposes
*/
public enum GlobalWidgetInfo {
+ /** [LOGIN] Widget Info */
+ LOGIN_MOTW(INTERFACE_LOGIN_SCREEN, INTERFACE_LOGIN_SCREEN_MOTW),
+ //[LOGIN]
+
+ /** [MISC] Widget Info */
+ WORLD_MAP_VIEW(WidgetInfo.WORLD_MAP_VIEW),
+ LOGOUT_BUTTON(WidgetInfo.LOGOUT_BUTTON),
+ LOGIN_CLICK_TO_PLAY_SCREEN_MESSAGE_OF_THE_DAY(WidgetInfo.LOGIN_CLICK_TO_PLAY_SCREEN_MESSAGE_OF_THE_DAY),
+
+ //[MISC]
+
+ /**
+ * [CHAT] Widget Info
+ */
+ CHATBOX_MESSAGES(WidgetInfo.CHATBOX_MESSAGES),
+ CHATBOX_FULL_INPUT(WidgetInfo.CHATBOX_FULL_INPUT),
+ DIALOG_NPC_TEXT(WidgetInfo.DIALOG_NPC_TEXT),
+ //[CHAT
+
+ /**
+ * [WILDERNESS] Widget Info
+ */
+ PVP_WILDERNESS_LEVEL(WidgetInfo.PVP_WILDERNESS_LEVEL),
+ //[WILDERNESS]
+
+ /**
+ * [INVENTORY] Widget Info
+ */
+ INVENTORY_ITEMS_CONTAINER(WidgetInfo.INVENTORY),
+ INVENTORY_DESTROY_ITEM(WidgetInfo.DESTROY_ITEM),
+ INVENTORY_DESTROY_ITEM_YES(WidgetInfo.DESTROY_ITEM_YES),
+ //[INVENTORY]
+
/**
* [BANK] Widget Info
*/
BANK_DYNAMIC_COMPONENTS(INTERFACE_BANK, INTERFACE_BANK_DYNAMIC_COMPONENTS),
+ BANK_INVENTORY_ITEMS_CONTAINER(INTERFACE_BANK, INTERFACE_BANK_INVENTORY_ITEMS_CONTAINER),
BANK_ITEM_COUNT(INTERFACE_BANK, INTERFACE_BANK_ITEM_COUNT),
//6
//7
@@ -43,6 +76,7 @@ public enum GlobalWidgetInfo {
* [DEPOSIT BOX] Widget Info
*/
DEPOSIT_DYNAMIC_COMPONENTS(INTERFACE_DEPOSIT_BOX, INTERFACE_DEPOSIT_DYNAMIC_COMPONENTS),
+ DEPOSIT_ITEMS_CONTAINER(INTERFACE_DEPOSIT_BOX, INTERFACE_DEPOSIT_INVENTORY_ITEMS_CONTAINER),
DEPOSIT_BUTTON_DEPOSIT_WORN_ITEMS(INTERFACE_DEPOSIT_BOX, INTERFACE_DEPOSIT_BUTTON_DEPOSIT_WORN_ITEMS),
DEPOSIT_BUTTON_DEPOSIT_CARRIED_ITEMS(INTERFACE_DEPOSIT_BOX, INTERFACE_DEPOSIT_BUTTON_DEPOSIT_CARRIED_ITEMS),
DEPOSIT_BUTTON_DEPOSIT_LOOT(INTERFACE_DEPOSIT_BOX, INTERFACE_DEPOSIT_BUTTON_DEPOSIT_LOOT),
@@ -51,6 +85,10 @@ public enum GlobalWidgetInfo {
/**
* [COMBAT] Widget Info
*/
+ COMBAT_STYLE_ONE(WidgetInfo.COMBAT_STYLE_ONE),
+ COMBAT_STYLE_TWO(WidgetInfo.COMBAT_STYLE_TWO),
+ COMBAT_STYLE_THREE(WidgetInfo.COMBAT_STYLE_THREE),
+ COMBAT_STYLE_FOUR(WidgetInfo.COMBAT_STYLE_FOUR),
COMBAT_DEFENSIVE_CAST_SPELL(INTERFACE_COMBAT, INTERFACE_COMBAT_DEFENSIVE_CAST_SPELL),
//23
//24
@@ -65,6 +103,7 @@ public enum GlobalWidgetInfo {
/**
* [EQUIPMENT] Widget Info
*/
+ EQUIPMENT_INVENTORY_ITEMS_CONTAINER(INTERFACE_EQUIPMENT, INTERFACE_EQUIPMENT_INVENTORY_ITEMS_CONTAINER),
EQUIPMENT_ITEM_SLOTS(INTERFACE_EQUIPMENT, INTERFACE_EQUIPMENT_ITEM_SLOTS),
//12
//13
@@ -116,7 +155,7 @@ public enum GlobalWidgetInfo {
* [STORE] Widget Info
*/
STORE_DYNAMIC_COMPONENTS(INTERFACE_STORE, INTERFACE_STORE_DYNAMIC_COMPONENTS),
- STORE_INVENTORY(INTERFACE_STORE, INTERFACE_STORE_ITEMS),
+ STORE_INVENTORY_ITEMS_CONTAINER(INTERFACE_STORE, INTERFACE_STORE_ITEMS_CONTAINER),
//[STORE]
/**
@@ -129,6 +168,8 @@ public enum GlobalWidgetInfo {
GRAND_EXCHANGE_COLLECT_AREA_ONE(INTERFACE_GRAND_EXCHANGE_COLLECTION_AREA, GRAND_EXCHANGE_COLLECT_BOX_ONE),
GRAND_EXCHANGE_COLLECT_AREA_TWO(INTERFACE_GRAND_EXCHANGE_COLLECTION_AREA, GRAND_EXCHANGE_COLLECT_BOX_TWO),
GRAND_EXCHANGE_INTERFACE_LAYOUT(INTERFACE_GRAND_EXCHANGE_WINDOW, INTERFACE_GRAND_EXCHANGE_INTERFACE_LAYOUT),
+
+ GRAND_EXCHANGE_INVENTORY_ITEMS_CONTAINER(WidgetInfo.GRAND_EXCHANGE_INVENTORY_ITEMS_CONTAINER),
/**
* [SKILL] Widget Info
*/
@@ -145,33 +186,79 @@ public enum GlobalWidgetInfo {
/**
* [MINIMAP] Widget Info
*/
- MINIMAP_HEALTH_ORB_TEXT(WidgetInfo.MINIMAP_HEALTH_ORB.getGroupId(), INTERFACE_MINIMAP_HEALTH_ORB_TEXT),
- MINIMAP_SPEC_ORB_TEXT(WidgetInfo.MINIMAP_SPEC_ORB.getGroupId(), INTERFACE_MINIMAP_SPEC_ORB_TEXT),
+
+
+ MINIMAP_HEALTH_ORB(INTERFACE_MINIMAP_ORBS, INTERFACE_MINIMAP_HEALTH_ORB),
+ MINIMAP_PRAYER_ORB(INTERFACE_MINIMAP_ORBS, INTERFACE_MINIMAP_PRAYER_ORB),
+ MINIMAP_RUN_ORB(INTERFACE_MINIMAP_ORBS, INTERFACE_MINIMAP_RUN_ORB),
+ MINIMAP_SPEC_ORB(INTERFACE_MINIMAP_ORBS, INTERFACE_MINIMAP_SPEC_ORB),
+ MINIMAP_QUICK_PRAYER_ORB(INTERFACE_MINIMAP_ORBS, INTERFACE_MINIMAP_QUICK_PRAYER_ORB),
+ MINIMAP_HEALTH_ORB_TEXT(INTERFACE_MINIMAP_HEALTH_ORB, INTERFACE_MINIMAP_HEALTH_ORB_TEXT),
+ MINIMAP_PRAYER_ORB_TEXT(INTERFACE_MINIMAP_PRAYER_ORB, INTERFACE_MINIMAP_PRAYER_ORB_TEXT),
+ MINIMAP_RUN_ORB_TEXT(INTERFACE_MINIMAP_RUN_ORB, INTERFACE_MINIMAP_RUN_ORB_TEXT),
+ MINIMAP_SPEC_ORB_TEXT(INTERFACE_MINIMAP_SPEC_ORB, INTERFACE_MINIMAP_SPEC_ORB_TEXT),
+ MINIMAP_QUICK_PRAYER_ORB_SPRITE(INTERFACE_MINIMAP_PRAYER_ORB, INTERFACE_MINIMAP_QUICK_PRAYER_ORB_SPRITE),
//[MINIMAP]
/**
* [PRAYER] Widget Info
*/
- PRAYER_NORMAL_BOOK(INTERFACE_PRAYER_BOOK, INTERFACE_NORMAL_PRAYERS)
-
+ PRAYER_NORMAL_BOOK(INTERFACE_PRAYER_BOOK, INTERFACE_NORMAL_PRAYERS),
+ //[PRAYER]
+ /**
+ * [QUICKPRAYER]
+ */
+ QUICK_PRAYER_PRAYERS(WidgetInfo.QUICK_PRAYER_PRAYERS),
+ //[QUICKPRAYER]
;
private final int groupId;
private final int childId;
+ /**
+ * Creates a new {@link GlobalWidgetInfo} enum value based on the passed child and group ids.
+ * NOTE: Enumerated values can not be constructed. They must be added here or extended
+ * via the extends keyword for your enumerated widget id class.
+ *
+ * @param groupId the group id of the widget
+ * @param childId the child id of the widget
+ */
GlobalWidgetInfo(int groupId, int childId)
{
this.groupId = groupId;
this.childId = childId;
}
+ /**
+ * Creates a new {@link GlobalWidgetInfo} enum value based on the passed {@link WidgetInfo} enum value.
+ * Basically used to re-skin an existing one to assist in contextually calling.
+ * Or in simpler terms, an alias for an existing enum value.
+ * NOTE: Enumerated values can not be constructed. They must be added here or extended
+ * via the extends keyword for your enumerated widget id class.
+ *
+ * @param widgetInfo the widget value to base the new enum value off of.
+ */
GlobalWidgetInfo(WidgetInfo widgetInfo) {
this.groupId = widgetInfo.getGroupId();
this.childId = widgetInfo.getChildId();
}
+ /**
+ * Creates a new {@link GlobalWidgetInfo} enum value based on the passed {@link GlobalWidgetInfo} enum value.
+ * Basically used to re-skin an existing one to assist in contextually calling.
+ * Or in simpler terms, an alias for an existing enum value.
+ * NOTE: Enumerated values can not be constructed. They must be added here or extended
+ * via the extends keyword for your enumerated widget id class.
+ *
+ * @param widgetInfo the widget value to base the new enum value off of.
+ */
+ GlobalWidgetInfo(GlobalWidgetInfo widgetInfo) {
+ this.groupId = widgetInfo.getGroupId();
+ this.childId = widgetInfo.getChildId();
+ }
+
/**
* Gets the ID of the group-child pairing.
*
@@ -204,6 +291,10 @@ public int getChildId()
/**
* Gets the packed widget ID.
+ * Any usage where regular WidgetInfo is required and an easy conversion is required.
+ * This will enable use of the RuneLite WidgetInfo class somewhat indirectly.
+ * Method calls using this are for example:
+ * client.getWidget()
*
* @return the packed ID
*/
diff --git a/src/main/java/rsb/methods/Bank.java b/src/main/java/rsb/methods/Bank.java
index 50321db8..07a0e5c6 100644
--- a/src/main/java/rsb/methods/Bank.java
+++ b/src/main/java/rsb/methods/Bank.java
@@ -2,7 +2,6 @@
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.ObjectID;
-import net.runelite.api.widgets.WidgetInfo;
import rsb.internal.wrappers.Filter;
import rsb.internal.globval.GlobalSettingValues;
import rsb.internal.globval.GlobalWidgetId;
@@ -125,7 +124,7 @@ public boolean deposit(int itemID, int number) {
if (!isOpen()) {
boolean match = false;
for (int i = 0; i < 28; i++) {
- RSWidget comp = methods.interfaces.getComponent(WidgetInfo.DEPOSIT_BOX_INVENTORY_ITEMS_CONTAINER).getDynamicComponent(i);
+ RSWidget comp = methods.interfaces.getComponent(GlobalWidgetInfo.DEPOSIT_ITEMS_CONTAINER).getDynamicComponent(i);
if (comp.getId() == itemID) {
itemCount += comp.getStackSize();
if (!match) {
@@ -196,7 +195,7 @@ public boolean depositAllExcept(int... items) {
outer:
for (int i = 0; i < 28; i++) {
RSWidget item = isOpen() ? methods.inventory.getItemAt(i).getComponent() :
- methods.interfaces.getComponent(WidgetInfo.DEPOSIT_BOX_INVENTORY_ITEMS_CONTAINER).getDynamicComponent(i);
+ methods.interfaces.getComponent(GlobalWidgetInfo.DEPOSIT_ITEMS_CONTAINER).getDynamicComponent(i);
if (item != null && item.getId() != -1) {
for (int id : items) {
if (item.getId() == id) {
@@ -294,7 +293,7 @@ public RSItem getItemAt(final int index) {
final RSItem[] items = getItems();
if (items != null) {
for (final RSItem item : items) {
- if (WidgetInfo.TO_CHILD(item.getComponent().getId()) == index) {
+ if (GlobalWidgetInfo.TO_CHILD(item.getComponent().getId()) == index) {
return item;
}
}
@@ -739,8 +738,8 @@ public int getBoxCount(int... ids) {
int count = 0;
for (int i = 0; i < 28; ++i) {
for (int id : ids) {
- if (methods.interfaces.getComponent(WidgetInfo.DEPOSIT_BOX_INVENTORY_ITEMS_CONTAINER).isValid()
- && methods.interfaces.getComponent(WidgetInfo.DEPOSIT_BOX_INVENTORY_ITEMS_CONTAINER).getComponent(i).getId() == id) {
+ if (methods.interfaces.getComponent(GlobalWidgetInfo.DEPOSIT_ITEMS_CONTAINER).isValid()
+ && methods.interfaces.getComponent(GlobalWidgetInfo.DEPOSIT_ITEMS_CONTAINER).getComponent(i).getId() == id) {
count++;
}
}
@@ -774,10 +773,10 @@ public int getBoxCount() {
* @return All equipment items that are being worn.
*/
public RSItem[] getEquipmentItems() {
- if (methods.interfaces.getComponent(WidgetInfo.EQUIPMENT_INVENTORY_ITEMS_CONTAINER).isValid()) {
+ if (methods.interfaces.getComponent(GlobalWidgetInfo.EQUIPMENT_INVENTORY_ITEMS_CONTAINER).isValid()) {
return new RSItem[0];
}
- RSWidget[] components = methods.interfaces.getComponent(WidgetInfo.EQUIPMENT_INVENTORY_ITEMS_CONTAINER).getComponents();
+ RSWidget[] components = methods.interfaces.getComponent(GlobalWidgetInfo.EQUIPMENT_INVENTORY_ITEMS_CONTAINER).getComponents();
RSItem[] items = new RSItem[components.length];
for (int i = 0; i < items.length; i++) {
items[i] = new RSItem(methods, components[i]);
diff --git a/src/main/java/rsb/methods/Calculations.java b/src/main/java/rsb/methods/Calculations.java
index 8a772025..d65d9b80 100644
--- a/src/main/java/rsb/methods/Calculations.java
+++ b/src/main/java/rsb/methods/Calculations.java
@@ -4,7 +4,6 @@
import net.runelite.api.Perspective;
import net.runelite.api.coords.LocalPoint;
import net.runelite.api.coords.WorldPoint;
-import net.runelite.api.widgets.WidgetInfo;
import net.runelite.api.Point;
import rsb.wrappers.*;
import rsb.wrappers.common.Positionable;
@@ -17,39 +16,20 @@
*/
@Slf4j
public class Calculations extends MethodProvider {
- static class Render {
- float absoluteX1 = 0, absoluteX2 = 0;
- float absoluteY1 = 0, absoluteY2 = 0;
- int xMultiplier = 512, yMultiplier = 512;
- int zNear = 50, zFar = 3500;
- }
-
- static class RenderData {
- float xOff = 0, xX = 32768, xY = 0, xZ = 0;
- float yOff = 0, yX = 0, yY = 32768, yZ = 0;
- float zOff = 0, zX = 0, zY = 0, zZ = 32768;
- }
-
- public static final int[] SIN_TABLE = new int[16384];
- public static final int[] COS_TABLE = new int[16384];
-
- static {
- final double d = 0.00038349519697141029D;
- for (int i = 0; i < 16384; i++) {
- Calculations.SIN_TABLE[i] = (int) (32768D * Math.sin(i * d));
- Calculations.COS_TABLE[i] = (int) (32768D * Math.cos(i * d));
- }
- }
private final Render render = new Render();
private final RenderData renderData = new RenderData();
+ /**
+ * Creates the singleton for calculations
+ * @param ctx The bot context to associate this calculations object with
+ */
Calculations(final MethodContext ctx) {
super(ctx);
}
/**
- * Checks whether or not a given tile is on the minimap.
+ * Checks whether a given tile is on the minimap.
*
* @param t The Tile to check.
* @return true if the RSTile is on the minimap; otherwise
@@ -63,7 +43,7 @@ public boolean tileOnMap(RSTile t) {
}
/**
- * Checks whether or not the centroid of a given tile is on the screen.
+ * Checks whether the centroid of a given tile is on the screen.
*
* @param t The RSTile to check.
* @return true if the RSTile is on the screen; otherwise
@@ -618,4 +598,28 @@ private int dijkstraDist(final int startX, final int startY, final int destX, fi
public static java.awt.Point convertRLPointToAWTPoint(Point point) {
return new java.awt.Point(point.getX(), point.getY());
}
+
+ static class Render {
+ float absoluteX1 = 0, absoluteX2 = 0;
+ float absoluteY1 = 0, absoluteY2 = 0;
+ int xMultiplier = 512, yMultiplier = 512;
+ int zNear = 50, zFar = 3500;
+ }
+
+ static class RenderData {
+ float xOff = 0, xX = 32768, xY = 0, xZ = 0;
+ float yOff = 0, yX = 0, yY = 32768, yZ = 0;
+ float zOff = 0, zX = 0, zY = 0, zZ = 32768;
+ }
+
+ public static final int[] SIN_TABLE = new int[16384];
+ public static final int[] COS_TABLE = new int[16384];
+
+ static {
+ final double d = 0.00038349519697141029D;
+ for (int i = 0; i < 16384; i++) {
+ Calculations.SIN_TABLE[i] = (int) (32768D * Math.sin(i * d));
+ Calculations.COS_TABLE[i] = (int) (32768D * Math.cos(i * d));
+ }
+ }
}
diff --git a/src/main/java/rsb/methods/Combat.java b/src/main/java/rsb/methods/Combat.java
index f0be349d..b3f91011 100644
--- a/src/main/java/rsb/methods/Combat.java
+++ b/src/main/java/rsb/methods/Combat.java
@@ -2,7 +2,6 @@
import net.runelite.api.Actor;
import net.runelite.api.Skill;
-import net.runelite.api.widgets.WidgetInfo;
import rsb.internal.globval.GlobalSettingValues;
import rsb.internal.globval.GlobalWidgetInfo;
import rsb.wrappers.*;
@@ -108,27 +107,26 @@ public boolean setFightMode(int fightMode) {
if (fightMode != getFightMode()) {
methods.game.openTab(GameGUI.Tab.COMBAT);
if (fightMode == 0) {
- return methods.interfaces.getComponent(WidgetInfo.COMBAT_STYLE_ONE).doClick();
+ return methods.interfaces.getComponent(GlobalWidgetInfo.COMBAT_STYLE_ONE).doClick();
} else if (fightMode == 1) {
- return methods.interfaces.getComponent(WidgetInfo.COMBAT_STYLE_TWO).doClick();
+ return methods.interfaces.getComponent(GlobalWidgetInfo.COMBAT_STYLE_TWO).doClick();
} else if (fightMode == 2) {
- return methods.interfaces.getComponent(WidgetInfo.COMBAT_STYLE_THREE).doClick();
+ return methods.interfaces.getComponent(GlobalWidgetInfo.COMBAT_STYLE_THREE).doClick();
} else if (fightMode == 3) {
- return methods.interfaces.getComponent(WidgetInfo.COMBAT_STYLE_FOUR).doClick();
+ return methods.interfaces.getComponent(GlobalWidgetInfo.COMBAT_STYLE_FOUR).doClick();
}
}
return false;
}
/**
- * Gets the current Wilderness Level. Written by Speed.
+ * Gets the current Wilderness Level.
*
* @return The current wilderness level otherwise, 0.
*/
public int getWildernessLevel() {
- RSWidget widget = methods.interfaces.getComponent(WidgetInfo.PVP_WILDERNESS_LEVEL);
+ RSWidget widget = methods.interfaces.getComponent(GlobalWidgetInfo.PVP_WILDERNESS_LEVEL);
return (widget.isValid() && widget.isVisible()) ? Integer.parseInt(widget.getText().replace("Level: ", "").trim()) : 0;
-
}
/**
@@ -153,7 +151,7 @@ public int getLifePoints() {
*/
/**
- * Returns whether or not we're poisoned.
+ * Returns whether we're poisoned.
*
* @return true if poisoned; otherwise false .
*/
@@ -184,7 +182,7 @@ public int getVenomDamage() {
}
/**
- * Returns whether or not the special-attack option is enabled.
+ * Returns whether the special-attack option is enabled.
*
* @return true if special is enabled; otherwise false .
*/
@@ -213,7 +211,7 @@ public int getSpecialBarEnergy() {
*/
public int getPrayerPoints() {
try {
- return Integer.parseInt(methods.interfaces.getComponent(WidgetInfo.MINIMAP_PRAYER_ORB_TEXT).getText()
+ return Integer.parseInt(methods.interfaces.getComponent(GlobalWidgetInfo.MINIMAP_PRAYER_ORB_TEXT).getText()
.trim());
} catch (NumberFormatException ex) {
return 0;
@@ -254,6 +252,7 @@ public boolean isDead(final RSNPC npc) {
// false positives)
// getInteracting() confirms because it will no longer interact if
// dead/dying
+ //TODO: Fix this
return npc == null || !npc.isValid() || (npc.getHPPercent() == 0 && npc.getAnimation() != -1 && npc
.getInteracting() == null);
}
diff --git a/src/main/java/rsb/methods/Game.java b/src/main/java/rsb/methods/Game.java
index b9b813b3..189bb71c 100644
--- a/src/main/java/rsb/methods/Game.java
+++ b/src/main/java/rsb/methods/Game.java
@@ -2,14 +2,13 @@
import net.runelite.api.GameState;
import net.runelite.api.widgets.WidgetID;
-import net.runelite.api.widgets.WidgetInfo;
+import rsb.internal.globval.GlobalWidgetInfo;
import rsb.script.Random;
import rsb.script.randoms.*;
import rsb.internal.globval.GlobalWidgetId;
import rsb.wrappers.*;
import java.awt.*;
-import java.awt.event.KeyEvent;
import java.awt.image.BufferedImage;
@@ -49,7 +48,7 @@ public boolean setChatOption(int chatOption, ChatMode mode) {
* @return The last message spoken by a player or "" if none
*/
public String getLastMessage() {
- RSWidget messages = methods.interfaces.getComponent(WidgetInfo.CHATBOX_MESSAGES);
+ RSWidget messages = methods.interfaces.getComponent(GlobalWidgetInfo.CHATBOX_MESSAGES);
if (!messages.getDynamicComponent(GlobalWidgetId.DYNAMIC_CHAT_BOX_FIRST_MESSAGE).getText().isEmpty()) {
if (messages.getDynamicComponent(GlobalWidgetId.DYNAMIC_CHAT_BOX_LATEST_MESSAGE).isVisible()
&& !messages.getDynamicComponent(GlobalWidgetId.DYNAMIC_CHAT_BOX_LATEST_MESSAGE).getText().isEmpty())
@@ -98,7 +97,7 @@ public boolean openTab(GameGUI.Tab tab, boolean functionKey) {
if (iTab == null) {
return false;
}
- methods.interfaces.getComponent(WidgetInfo.TO_GROUP(iTab.getParent().getId()), WidgetInfo.TO_CHILD(iTab.getId())).doClick();
+ methods.interfaces.getComponent(GlobalWidgetInfo.TO_GROUP(iTab.getParent().getId()), GlobalWidgetInfo.TO_CHILD(iTab.getId())).doClick();
}
sleep(random(400, 600));
@@ -115,7 +114,7 @@ public void closeTab() {
}
net.runelite.api.widgets.Widget iTab = methods.gui.getTab(tab);
if (iTab != null) {
- methods.interfaces.getComponent(WidgetInfo.TO_GROUP(iTab.getParent().getId()), WidgetInfo.TO_CHILD(iTab.getId())).doClick();
+ methods.interfaces.getComponent(GlobalWidgetInfo.TO_GROUP(iTab.getParent().getId()), GlobalWidgetInfo.TO_CHILD(iTab.getId())).doClick();
}
}
@@ -126,7 +125,6 @@ public void closeTab() {
* @param left Left or right button? Left = true. Right = false.
* @return true if it was clicked.
*/
- @SuppressWarnings("JavadocReference")
public boolean mouseChatButton(int button, boolean left) {
RSWidget chatButton = methods.interfaces.get(WidgetID.CHATBOX_GROUP_ID).getComponent(button);
return chatButton.isValid() && chatButton.doClick(left);
@@ -197,7 +195,7 @@ public Boolean inRandom() {
* otherwise null.
*/
public RSWidget getTalkInterface() {
- for (RSWidget component : methods.interfaces.getComponent(WidgetInfo.CHATBOX_FULL_INPUT).getComponents()) {
+ for (RSWidget component : methods.interfaces.getComponent(GlobalWidgetInfo.CHATBOX_FULL_INPUT).getComponents()) {
if (component.isValid() && component.isVisible())
return component;
}
@@ -252,7 +250,7 @@ public boolean logout() {
sleep(random(300, 600));
}
- methods.interfaces.getComponent(WidgetInfo.LOGOUT_BUTTON).doClick();
+ methods.interfaces.getComponent(GlobalWidgetInfo.LOGOUT_BUTTON).doClick();
// Final logout button in the logout tab
sleep(random(1500, 2000));
return !isLoggedIn();
@@ -295,8 +293,8 @@ public boolean isLoginScreen() {
* otherwise false .
*/
public boolean isWelcomeScreen() {
- return methods.interfaces.get(WidgetInfo.LOGIN_CLICK_TO_PLAY_SCREEN.getGroupId())
- .getComponent(WidgetInfo.LOGIN_CLICK_TO_PLAY_SCREEN_MESSAGE_OF_THE_DAY.getChildId()).getAbsoluteY() > 2;
+ return methods.interfaces.getComponent(GlobalWidgetInfo.LOGIN_CLICK_TO_PLAY_SCREEN_MESSAGE_OF_THE_DAY)
+ .getAbsoluteY() > 2;
}
/**
diff --git a/src/main/java/rsb/methods/GameGUI.java b/src/main/java/rsb/methods/GameGUI.java
index f4a762cd..143bd095 100644
--- a/src/main/java/rsb/methods/GameGUI.java
+++ b/src/main/java/rsb/methods/GameGUI.java
@@ -60,6 +60,9 @@ public boolean isFixed() {
return true;//!methods.client.isResized();
}
+ /**
+ * An enumerated type representing the tabs interfaces and their WidgetInfo.
+ */
public enum Tab {
COMBAT("Combat Styles", KeyEvent.VK_F5, WidgetInfo.FIXED_VIEWPORT_COMBAT_TAB, WidgetInfo.RESIZABLE_VIEWPORT_COMBAT_TAB),
STATS("Stats", 0, WidgetInfo.FIXED_VIEWPORT_STATS_TAB, WidgetInfo.RESIZABLE_VIEWPORT_STATS_TAB),
@@ -74,12 +77,14 @@ public enum Tab {
LOGOUT("Exit", 0, WidgetInfo.FIXED_VIEWPORT_LOGOUT_TAB, WidgetInfo.RESIZABLE_VIEWPORT_LOGOUT_TAB);
- private String name;
- private int functionKey;
- private WidgetInfo fixedInfo;
- private WidgetInfo resizeInfo;
+ private final String name;
+ private final int functionKey;
+ private final WidgetInfo fixedInfo;
+ private final WidgetInfo resizeInfo;
Tab(String name, int functionKey, WidgetInfo fixedInfo, WidgetInfo resizeInfo) {
+ this.name = name;
+ this.functionKey = functionKey;
this.fixedInfo = fixedInfo;
this.resizeInfo = resizeInfo;
}
@@ -99,12 +104,10 @@ public WidgetInfo getFixedInfo() {
public WidgetInfo getResizeInfo() {
return resizeInfo;
}
+ }
-
- }
-
}
diff --git a/src/main/java/rsb/methods/Interfaces.java b/src/main/java/rsb/methods/Interfaces.java
index 1497e8a7..425fdc95 100644
--- a/src/main/java/rsb/methods/Interfaces.java
+++ b/src/main/java/rsb/methods/Interfaces.java
@@ -88,10 +88,10 @@ public boolean clickContinue() {
* otherwise null.
*/
public RSWidget getContinueComponent() {
- Widget widget = methods.client.getWidget(WidgetInfo.DIALOG_NPC_TEXT.getGroupId(), WidgetInfo.DIALOG_NPC_TEXT.getChildId());
+ Widget widget = methods.client.getWidget(GlobalWidgetInfo.DIALOG_NPC_TEXT.getPackedId());
if (widget != null && !widget.isHidden())
{
- return new RSWidget(methods, WidgetInfo.DIALOG_NPC_TEXT.getGroupId(), WidgetInfo.DIALOG_NPC_TEXT.getChildId());
+ return new RSWidget(methods, GlobalWidgetInfo.DIALOG_NPC_TEXT.getGroupId(), GlobalWidgetInfo.DIALOG_NPC_TEXT.getChildId());
}
return null;
}
diff --git a/src/main/java/rsb/methods/Inventory.java b/src/main/java/rsb/methods/Inventory.java
index f5910b78..fddb8c62 100644
--- a/src/main/java/rsb/methods/Inventory.java
+++ b/src/main/java/rsb/methods/Inventory.java
@@ -1,7 +1,6 @@
package rsb.methods;
import net.runelite.api.ItemComposition;
-import net.runelite.api.widgets.WidgetInfo;
import rsb.internal.globval.GlobalWidgetId;
import rsb.internal.globval.GlobalWidgetInfo;
import rsb.wrappers.*;
@@ -35,10 +34,10 @@ public class Inventory extends MethodProvider {
public Map.Entry getInterface() {
final String INVENTORY = "inventory", BANK = "bank", STORE = "store", GRAND_EXCHANGE = "grandexchange", TRADE = "trade";
HashMap widgets = new HashMap<>();
- widgets.put(INVENTORY, methods.interfaces.getComponent(WidgetInfo.INVENTORY));
- widgets.put(BANK, methods.interfaces.getComponent(WidgetInfo.BANK_INVENTORY_ITEMS_CONTAINER));
- widgets.put(STORE, methods.interfaces.getComponent(GlobalWidgetInfo.STORE_INVENTORY));
- widgets.put(GRAND_EXCHANGE, methods.interfaces.getComponent(WidgetInfo.GRAND_EXCHANGE_INVENTORY_ITEMS_CONTAINER));
+ widgets.put(INVENTORY, methods.interfaces.getComponent(GlobalWidgetInfo.INVENTORY_ITEMS_CONTAINER));
+ widgets.put(BANK, methods.interfaces.getComponent(GlobalWidgetInfo.BANK_INVENTORY_ITEMS_CONTAINER));
+ widgets.put(STORE, methods.interfaces.getComponent(GlobalWidgetInfo.STORE_INVENTORY_ITEMS_CONTAINER));
+ widgets.put(GRAND_EXCHANGE, methods.interfaces.getComponent(GlobalWidgetInfo.GRAND_EXCHANGE_INVENTORY_ITEMS_CONTAINER));
widgets.put(TRADE, methods.interfaces.getComponent(GlobalWidgetInfo.TRADE_MAIN_SCREEN__INVENTORY_ITEMS_CONTAINER));
for (Map.Entry entry : widgets.entrySet()) {
@@ -71,8 +70,8 @@ public boolean destroyItem(final int itemID) {
return false;
}
while (item != null) {
- if (methods.interfaces.get(WidgetInfo.DESTROY_ITEM.getGroupId()).isValid()) {
- methods.interfaces.getComponent(WidgetInfo.DESTROY_ITEM_YES).doClick();
+ if (methods.interfaces.get(GlobalWidgetInfo.INVENTORY_DESTROY_ITEM.getGroupId()).isValid()) {
+ methods.interfaces.getComponent(GlobalWidgetInfo.INVENTORY_DESTROY_ITEM).doClick();
} else {
item.doAction("Destroy");
}
@@ -367,7 +366,7 @@ public Point randomizeItemPoint(final Point inventoryPoint) {
*/
public String getSelectedItemName() {
RSWidget invIface = getInterface().getValue();
- if (invIface.getGroupIndex() == WidgetInfo.INVENTORY.getGroupId()) {
+ if (invIface.getGroupIndex() == GlobalWidgetInfo.INVENTORY_ITEMS_CONTAINER.getGroupId()) {
int index = getSelectedItemIndex();
if (index == -1)
return null;
@@ -392,7 +391,7 @@ public String getSelectedItemName() {
*/
public int getSelectedItemIndex() {
RSWidget invIface = getInterface().getValue();
- if (invIface.getGroupIndex() == WidgetInfo.INVENTORY.getGroupId()) {
+ if (invIface.getGroupIndex() == GlobalWidgetInfo.INVENTORY_ITEMS_CONTAINER.getGroupId()) {
RSWidgetItem[] comps = invIface.getWidgetItems();
return checkIsSelected(comps);
}
@@ -529,7 +528,7 @@ public boolean clickSelectedItem() {
*/
public RSItem getItemAt(final int index) {
RSWidget invIface = getInterface().getValue();
- if (invIface.getGroupIndex() == WidgetInfo.INVENTORY.getGroupId()) {
+ if (invIface.getGroupIndex() == GlobalWidgetInfo.INVENTORY_ITEMS_CONTAINER.getGroupId()) {
RSWidgetItem comp = invIface.getWidgetItems()[index];
return index < 28 && comp != null ? new RSItem(methods,
comp) : null;
@@ -547,7 +546,7 @@ public RSItem getItemAt(final int index) {
*/
public RSItem[] getItems() {
RSWidget invIface = getInterface().getValue();
- if (invIface.getGroupIndex() == WidgetInfo.INVENTORY.getGroupId()) {
+ if (invIface.getGroupIndex() == GlobalWidgetInfo.INVENTORY_ITEMS_CONTAINER.getGroupId()) {
RSWidgetItem[] invItems = invIface.getWidgetItems();
RSItem[] items = new RSItem[invItems.length];
for (int i = 0; i < invItems.length; i++) {
@@ -592,7 +591,7 @@ public RSItem[] getItems(final int... ids) {
*/
public RSItem[] getCachedItems() {
RSWidget invIface = getInterface().getValue();
- if (invIface.getGroupIndex() == WidgetInfo.INVENTORY.getGroupId()) {
+ if (invIface.getGroupIndex() == GlobalWidgetInfo.INVENTORY_ITEMS_CONTAINER.getGroupId()) {
if (invIface != null) {
RSWidgetItem[] invItems = invIface.getWidgetItems();
RSItem[] items = new RSItem[invItems.length];
diff --git a/src/main/java/rsb/methods/Prayer.java b/src/main/java/rsb/methods/Prayer.java
index 9a920572..77401345 100644
--- a/src/main/java/rsb/methods/Prayer.java
+++ b/src/main/java/rsb/methods/Prayer.java
@@ -1,14 +1,12 @@
package rsb.methods;
import net.runelite.api.Skill;
-import net.runelite.api.widgets.WidgetInfo;
import rsb.internal.globval.GlobalWidgetId;
import rsb.internal.globval.GlobalWidgetInfo;
import rsb.wrappers.RSWidget;
import java.util.ArrayList;
-import static rsb.internal.globval.GlobalWidgetId.Prayers;
/**
* Prayer related operations.
@@ -32,11 +30,11 @@ public class Prayer extends MethodProvider {
* @param prayer The prayer to check.
* @return true if enabled; otherwise false .
*/
- public boolean isPrayerOn(Prayers prayer) {
+ public boolean isPrayerOn(GlobalWidgetId.Prayer prayer) {
RSWidget[] prayers = methods.interfaces.getComponent(GlobalWidgetInfo.PRAYER_NORMAL_BOOK)
.getComponents();
for (RSWidget c : prayers) {
- if (WidgetInfo.TO_CHILD(c.getId()) == prayer.getIndex()) {
+ if (GlobalWidgetInfo.TO_CHILD(c.getId()) == prayer.getPrayerId()) {
return c.getDynamicComponent(GlobalWidgetId.ACTIVE_PRAYER_BORDER).isSelfVisible();
}
}
@@ -53,8 +51,7 @@ public boolean isQuickPrayerOn() {
final int QUICK_PRAYER_SPRITE = 1066;
//Located two items below the one that contains the name "Quick prayer"
//Is likely the active sprite for prayer
- int prayerSprite = WidgetInfo.MINIMAP_QUICK_PRAYER_ORB.getChildId() + 2;
- return methods.interfaces.getComponent(WidgetInfo.MINIMAP_PRAYER_ORB.getGroupId(), prayerSprite)
+ return methods.interfaces.getComponent(GlobalWidgetInfo.MINIMAP_QUICK_PRAYER_ORB_SPRITE)
.getSpriteId() == QUICK_PRAYER_SPRITE;
}
@@ -66,11 +63,11 @@ public boolean isQuickPrayerOn() {
* @return true if the interface was clicked; otherwise
* false .
*/
- public boolean activatePrayer(final Prayers prayer, final boolean activate) {
+ public boolean activatePrayer(final GlobalWidgetId.Prayer prayer, final boolean activate) {
if (isPrayerOn(prayer) == activate) {
return false;
}
- RSWidget pray = methods.interfaces.getComponent(GlobalWidgetId.INTERFACE_PRAYER_BOOK, prayer.getIndex());
+ RSWidget pray = methods.interfaces.getComponent(GlobalWidgetId.INTERFACE_PRAYER_BOOK, prayer.getPrayerId());
if ((pray.getBackgroundColor() != -1) == activate) {
return false;
}
@@ -88,7 +85,7 @@ public boolean activatePrayer(final Prayers prayer, final boolean activate) {
* false .
*/
public boolean activateQuickPrayer(final boolean activate) {
- return methods.interfaces.getComponent(WidgetInfo.MINIMAP_QUICK_PRAYER_ORB.getGroupId(), WidgetInfo.MINIMAP_QUICK_PRAYER_ORB.getChildId()).doAction(
+ return methods.interfaces.getComponent(GlobalWidgetInfo.MINIMAP_QUICK_PRAYER_ORB).doAction(
activate ? "Activate" : "Deactivate");
}
@@ -100,21 +97,22 @@ public boolean activateQuickPrayer(final boolean activate) {
*
* @return True unless unable to access the interface
*/
- public boolean setQuickPrayers(boolean unsetPrevious, Prayers... prayers) {
- RSWidget quickPrayers = methods.interfaces.getComponent(WidgetInfo.QUICK_PRAYER_PRAYERS.getGroupId(), WidgetInfo.QUICK_PRAYER_PRAYERS.getChildId());
- methods.interfaces.getComponent(WidgetInfo.MINIMAP_QUICK_PRAYER_ORB.getGroupId(), WidgetInfo.MINIMAP_QUICK_PRAYER_ORB.getChildId()).doAction("Setup");
+ public boolean setQuickPrayers(boolean unsetPrevious, GlobalWidgetId.Prayer... prayers) {
+ final int SET_PRAYER_SPRITE = 181;
+ RSWidget quickPrayers = methods.interfaces.getComponent(GlobalWidgetInfo.QUICK_PRAYER_PRAYERS);
+ methods.interfaces.getComponent(GlobalWidgetInfo.MINIMAP_QUICK_PRAYER_ORB).doAction("Setup");
sleep(random(400,700));
if (quickPrayers.isValid() && quickPrayers.isVisible()) {
if (unsetPrevious) {
for (RSWidget quickPrayer : quickPrayers.getComponents()) {
- if (quickPrayer.getSpriteId() == 181) {
+ if (quickPrayer.getSpriteId() == SET_PRAYER_SPRITE) {
quickPrayer.doAction("Toggle");
sleep(random(600, 800));
}
}
}
RSWidget[] quickPrayersInterface = quickPrayers.getComponents();
- for (Prayers prayer : prayers) {
+ for (GlobalWidgetId.Prayer prayer : prayers) {
for (RSWidget quickPrayer : quickPrayersInterface) {
if (quickPrayer.getName().contains(prayer.name())) {
quickPrayer.doAction("Toggle");
@@ -136,7 +134,7 @@ public boolean setQuickPrayers(boolean unsetPrevious, Prayers... prayers) {
*/
public RSWidget[] getSelectedPrayers() {
ArrayList selected = new ArrayList();
- RSWidget[] prayers = methods.interfaces.getComponent(WidgetInfo.PRAYER_THICK_SKIN.getGroupId(), 0).getComponents();
+ RSWidget[] prayers = methods.interfaces.getComponent(GlobalWidgetInfo.PRAYER_NORMAL_BOOK).getComponents();
for (RSWidget prayer : prayers) {
if (prayer.getDynamicComponent(GlobalWidgetId.ACTIVE_PRAYER_BORDER).isSelfVisible()) {
selected.add(prayer);
@@ -151,7 +149,7 @@ public RSWidget[] getSelectedPrayers() {
* @return The number of prayer points left.
*/
public int getPrayerLeft() {
- return Integer.parseInt(methods.interfaces.getComponent(WidgetInfo.MINIMAP_PRAYER_ORB_TEXT).getText());
+ return Integer.parseInt(methods.interfaces.getComponent(GlobalWidgetInfo.MINIMAP_PRAYER_ORB_TEXT).getText());
}
/**
diff --git a/src/main/java/rsb/methods/Store.java b/src/main/java/rsb/methods/Store.java
index a9b15d30..0d68b138 100644
--- a/src/main/java/rsb/methods/Store.java
+++ b/src/main/java/rsb/methods/Store.java
@@ -151,13 +151,13 @@ public RSItem getItem(final int id) {
public RSItem[] getItems() {
RSWidget storeInterface = getInterface();
if ((storeInterface == null)
- || (storeInterface.getComponent(GlobalWidgetId.INTERFACE_STORE_ITEMS) == null)) {
+ || (storeInterface.getComponent(GlobalWidgetId.INTERFACE_STORE_ITEMS_CONTAINER) == null)) {
return null;
}
ArrayList items = new ArrayList<>();
RSWidget[] components = storeInterface.getComponent(
- GlobalWidgetId.INTERFACE_STORE_ITEMS).getComponents();
+ GlobalWidgetId.INTERFACE_STORE_ITEMS_CONTAINER).getComponents();
for (RSWidget component : components) {
diff --git a/src/main/java/rsb/methods/Walking.java b/src/main/java/rsb/methods/Walking.java
index 0ee6043e..9518ee8e 100644
--- a/src/main/java/rsb/methods/Walking.java
+++ b/src/main/java/rsb/methods/Walking.java
@@ -2,7 +2,7 @@
import net.runelite.api.*;
import net.runelite.api.Point;
-import net.runelite.api.widgets.WidgetInfo;
+import rsb.internal.globval.GlobalWidgetInfo;
import rsb.wrappers.*;
import java.lang.reflect.Field;
@@ -180,7 +180,7 @@ public boolean walkTileOnScreen(final RSTile tileToWalk) {
*/
public boolean setRun(final boolean enable) {
if (isRunEnabled() != enable) {
- return methods.interfaces.getComponent(WidgetInfo.MINIMAP_RUN_ORB).doClick();
+ return methods.interfaces.getComponent(GlobalWidgetInfo.MINIMAP_RUN_ORB).doClick();
}
return false;
}
diff --git a/src/main/java/rsb/script/randoms/LoginBot.java b/src/main/java/rsb/script/randoms/LoginBot.java
index 941070b6..7808d8ce 100644
--- a/src/main/java/rsb/script/randoms/LoginBot.java
+++ b/src/main/java/rsb/script/randoms/LoginBot.java
@@ -4,7 +4,7 @@
import net.runelite.api.GameState;
import net.runelite.api.Point;
import net.runelite.api.widgets.Widget;
-import net.runelite.api.widgets.WidgetInfo;
+import rsb.internal.globval.GlobalWidgetInfo;
import rsb.script.Random;
import rsb.plugin.AccountManager;
import rsb.wrappers.RSWidget;
@@ -86,9 +86,9 @@ public int loop() {
}
}
if (game.getClientState() == GameState.LOGGED_IN) {
- Widget welcomeScreenMotW = ctx.client.getWidget(WidgetInfo.LOGIN_CLICK_TO_PLAY_SCREEN.getGroupId(), 6);
- if (welcomeScreenMotW != null) {
- if (welcomeScreenMotW.getTextColor() != -1) {
+ Widget welcomeScreenMOTD = ctx.client.getWidget(GlobalWidgetInfo.LOGIN_CLICK_TO_PLAY_SCREEN_MESSAGE_OF_THE_DAY.getPackedId());
+ if (welcomeScreenMOTD != null) {
+ if (welcomeScreenMOTD.getTextColor() != -1) {
ctx.mouse.click(true);
}
}
diff --git a/src/main/java/rsb/wrappers/RSWidget.java b/src/main/java/rsb/wrappers/RSWidget.java
index 9f3a0036..45887b94 100644
--- a/src/main/java/rsb/wrappers/RSWidget.java
+++ b/src/main/java/rsb/wrappers/RSWidget.java
@@ -2,8 +2,8 @@
import lombok.extern.slf4j.Slf4j;
import net.runelite.api.widgets.Widget;
-import net.runelite.api.widgets.WidgetInfo;
import net.runelite.api.widgets.WidgetItem;
+import rsb.internal.globval.GlobalWidgetInfo;
import rsb.methods.MethodContext;
import rsb.methods.MethodProvider;
import rsb.wrappers.common.Clickable07;
@@ -25,7 +25,7 @@ public class RSWidget extends MethodProvider implements Clickable07 {
public RSWidget(final MethodContext ctx, final int parentId, final int id) {
super(ctx);
this.id = id;
- this.widget = ctx.client.getWidget(WidgetInfo.TO_GROUP(parentId), WidgetInfo.TO_CHILD(id));
+ this.widget = ctx.client.getWidget(GlobalWidgetInfo.TO_GROUP(parentId), GlobalWidgetInfo.TO_CHILD(id));
this.parentId = parentId;
this.parentWidget = widget.getParent();
}
@@ -280,17 +280,8 @@ public RSWidget getDynamicComponent(int idx) {
* @param idx The child index
* @return The child component, or null
*/
- /*
public RSWidget getComponent(int idx) {
- RSWidget[] components = getComponents();
- if (idx >= 0 && idx < components.length) {
- return components[idx];
- }
- return null;
- }
- */
- public RSWidget getComponent(int idx) {
- return new RSWidget(methods, methods.client.getWidget(WidgetInfo.TO_GROUP(this.getId()), idx));
+ return new RSWidget(methods, methods.client.getWidget(GlobalWidgetInfo.TO_GROUP(this.getId()), idx));
}
/**
@@ -446,7 +437,7 @@ public RSWidget getParent() {
* @return the group index
*/
public int getGroupIndex() {
- return WidgetInfo.TO_GROUP(widget.getId());
+ return GlobalWidgetInfo.TO_GROUP(widget.getId());
}
/**
@@ -454,7 +445,7 @@ public int getGroupIndex() {
* @return the child index
*/
public int getChildIndex() {
- return WidgetInfo.TO_CHILD(widget.getId());
+ return GlobalWidgetInfo.TO_CHILD(widget.getId());
}