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

Make sprite and widget sprite overrides more flexible

Browse Source 
- Expose NodeCache interface in RuneLite
- Expose Client.getWidgetSpriteCache and reset method on it
- Change setters for sprite and widget overrides to be getters

This allows for more than 1 plugin to use the widget/sprite override API
in future.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
This commit is contained in:
Tomas Slusny
2018-09-04 18:05:41 +02:00
parent 0fe6d4be3a
commit ac5ef045b7
7 changed files with 69 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
runelite-mixins/src/main/java/net/runelite/mixins/SpriteMixin.java
View File

@@ -25,6 +25,7 @@
*/
package net.runelite.mixins;
import java.util.HashMap;
import java.util.Map;
import net.runelite.api.SpritePixels;
import net.runelite.api.mixins.Copy;
@@ -39,24 +40,23 @@ import net.runelite.rs.api.RSSpritePixels;
public abstract class SpriteMixin implements RSClient
{
@Inject
private static Map<Integer, SpritePixels> spriteOverrides;
private static final Map<Integer, SpritePixels> spriteOverrides = new HashMap<Integer, SpritePixels>();
@Inject
private static Map<Integer, SpritePixels> widgetSpriteOverrides;
private static final Map<Integer, SpritePixels> widgetSpriteOverrides = new HashMap<Integer, SpritePixels>();
@Inject
@Override
public void setSpriteOverrides(Map<Integer, SpritePixels> overrides)
public Map<Integer, SpritePixels> getSpriteOverrides()
{
getWidgetSpriteCache().reset();
spriteOverrides = overrides;
return spriteOverrides;
}
@Inject
@Override
public void setWidgetSpriteOverrides(Map<Integer, SpritePixels> overrides)
public Map<Integer, SpritePixels> getWidgetSpriteOverrides()
{
widgetSpriteOverrides = overrides;
return widgetSpriteOverrides;
}
@Copy("getSpriteAsSpritePixels")
@@ -68,14 +68,11 @@ public abstract class SpriteMixin implements RSClient
@Replace("getSpriteAsSpritePixels")
public static RSSpritePixels rl$loadSprite(RSIndexDataBase var0, int var1, int var2)
{
if (spriteOverrides != null)
{
SpritePixels sprite = spriteOverrides.get(var1);
SpritePixels sprite = spriteOverrides.get(var1);
if (sprite != null)
{
return (RSSpritePixels) sprite;
}
if (sprite != null)
{
return (RSSpritePixels) sprite;
}
return rs$loadSprite(var0, var1, var2);

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

@@ -49,7 +49,7 @@ public abstract class WidgetSpriteMixin implements RSWidget
@Replace("getWidgetSprite")
public RSSpritePixels rl$getWidgetSprite(boolean var1)
{
if (getSpriteId() != -1 && widgetSpriteOverrides != null)
if (getSpriteId() != -1)
{
SpritePixels sprite = widgetSpriteOverrides.get(getId());