ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into master

Browse Source
This commit is contained in:
ThatGamerBlue
2021-05-21 16:06:44 +01:00
parent 20244e393c ab2454ca75
commit eaf0b6b060
40 changed files with 1111 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
View File

@@ -600,7 +600,7 @@ public abstract class RSClientMixin implements RSClient
@Override
public Widget[] getWidgetRoots()
{
int topGroup = getWidgetRoot();
int topGroup = getTopLevelInterfaceId();
if (topGroup == -1)
{
return new Widget[]{};

4
runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java
View File

@@ -164,7 +164,7 @@ public abstract class RSWidgetMixin implements RSWidget
}
final int id = getId();
if (TO_GROUP(id) == client.getWidgetRoot())
if (TO_GROUP(id) == client.getTopLevelInterfaceId())
{
// this is a root widget
return -1;
@@ -261,7 +261,7 @@ public abstract class RSWidgetMixin implements RSWidget
// If the parent is hidden, this widget is also hidden.
// Widget has no parent and is not the root widget (which is always visible),
// so it's not visible.
return parent == null ? TO_GROUP(getId()) != client.getWidgetRoot() : parent.isHidden();
return parent == null ? TO_GROUP(getId()) != client.getTopLevelInterfaceId() : parent.isHidden();
}
@Inject