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

upstream

Browse Source
This commit is contained in:
TheRealNull
2020-12-19 17:52:08 -05:00
parent b6f47eb581
commit 473fe2fa43
93 changed files with 1600 additions and 1296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -594,7 +594,7 @@ public abstract class RSClientMixin implements RSClient
@Override
public Widget getWidget(int id)
{
return getWidget(WidgetInfo.TO_GROUP(id), WidgetInfo.getChildFromID(id));
return getWidget(WidgetInfo.TO_GROUP(id), WidgetInfo.TO_CHILD(id));
}
@Inject
@@ -1552,16 +1552,16 @@ public abstract class RSClientMixin implements RSClient
if (renderX >= minX && renderX <= maxX && renderY >= minY && renderY <= maxY)
{
WidgetItem widgetItem = new WidgetItem(widget.getItemId(), widget.getItemQuantity(), -1, widget.getBounds(), widget, null);
callbacks.drawItem(widget.getItemId(), widgetItem);
//TODO:IMPLEMENT
//callbacks.drawItem(widget.getItemId(), widgetItem);
}
}
else if (widgetType == WidgetType.INVENTORY)
{
Collection<WidgetItem> widgetItems = widget.getWidgetItems();
for (WidgetItem widgetItem : widgetItems)
{
callbacks.drawItem(widgetItem.getId(), widgetItem);
}
List<WidgetItem> widgetItems = widget.getWidgetItems();
//TODO:IMPLEMENT
//callbacks.drawLayer(rlWidget, widgetItems);
}
WidgetNode childNode = componentTable.get(widget.getId());
@@ -1579,6 +1579,10 @@ public abstract class RSClientMixin implements RSClient
}
}
}
else
{
}
}
}

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

@@ -50,7 +50,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import static net.runelite.api.widgets.WidgetInfo.getChildFromID;
import static net.runelite.api.widgets.WidgetInfo.TO_CHILD;
import static net.runelite.api.widgets.WidgetInfo.TO_GROUP;
@Mixin(RSWidget.class)
@@ -107,7 +107,7 @@ public abstract class RSWidgetMixin implements RSWidget
return null;
}
return client.getWidget(TO_GROUP(id), getChildFromID(id));
return client.getWidget(TO_GROUP(id), TO_CHILD(id));
}
@Inject
@@ -240,7 +240,7 @@ public abstract class RSWidgetMixin implements RSWidget
@Inject
@Override
public Collection<WidgetItem> getWidgetItems()
public List<WidgetItem> getWidgetItems()
{
int[] itemIds = getItemIds();