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

openrune: Sprite -> SpritePixels

Browse Source
This commit is contained in:
therealunull
2020-12-13 12:44:10 -05:00
parent 98d2a16798
commit c300358468
20 changed files with 84 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
runelite-mixins/src/main/java/net/runelite/mixins/LoginScreenMixin.java
View File

@@ -25,7 +25,7 @@
package net.runelite.mixins;
import net.runelite.api.GameState;
import net.runelite.api.Sprite;
import net.runelite.api.SpritePixels;
import net.runelite.api.mixins.FieldHook;
import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.Mixin;
@@ -42,7 +42,7 @@ public abstract class LoginScreenMixin implements RSClient
private static boolean shouldRenderLoginScreenFire = true;
@Inject
private static Sprite loginScreenBackground;
private static SpritePixels loginScreenBackground;
@Inject
public void setShouldRenderLoginScreenFire(boolean shouldRender)
@@ -57,7 +57,7 @@ public abstract class LoginScreenMixin implements RSClient
}
@Inject
public void setLoginScreen(Sprite background)
public void setLoginScreen(SpritePixels background)
{
assert client.isClientThread() : "setLoginScreen must be called on client thread";
@@ -80,7 +80,7 @@ public abstract class LoginScreenMixin implements RSClient
@FieldHook("leftTitleSprite")
static void setLeftTitleSprite(int idx)
{
Sprite loginscreen = loginScreenBackground;
SpritePixels loginscreen = loginScreenBackground;
if (loginscreen != null)
{
@@ -92,7 +92,7 @@ public abstract class LoginScreenMixin implements RSClient
@FieldHook("rightTitleSprite")
static void setRightTitleSprite(int idx)
{
Sprite loginscreen = loginScreenBackground;
SpritePixels loginscreen = loginScreenBackground;
if (loginscreen != null && loginscreen.getWidth() > 383)
{

8
runelite-mixins/src/main/java/net/runelite/mixins/MinimapMixin.java
View File

@@ -29,17 +29,17 @@ import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.Mixin;
import net.runelite.rs.api.RSClient;
import net.runelite.rs.api.RSScene;
import net.runelite.rs.api.RSSprite;
import net.runelite.rs.api.RSSpritePixels;
@Mixin(RSClient.class)
public abstract class MinimapMixin implements RSClient
{
@Inject
@Override
public RSSprite drawInstanceMap(int z)
public RSSpritePixels drawInstanceMap(int z)
{
RSSprite ourSprite = createSprite(new int[512 * 512], 512, 512);
RSSprite theirSprite = getMinimapSprite();
RSSpritePixels ourSprite = createSprite(new int[512 * 512], 512, 512);
RSSpritePixels theirSprite = getMinimapSprite();
RSScene scene = getScene();
int[] pixels = ourSprite.getPixels();

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

@@ -31,7 +31,7 @@ import net.runelite.api.NPCDefinition;
import net.runelite.api.Perspective;
import net.runelite.api.Player;
import net.runelite.api.Point;
import net.runelite.api.Sprite;
import net.runelite.api.SpritePixels;
import net.runelite.api.coords.LocalPoint;
import net.runelite.api.coords.WorldArea;
import net.runelite.api.coords.WorldPoint;
@@ -172,9 +172,9 @@ public abstract class RSActorMixin implements RSActor
@Inject
@Override
public Point getCanvasSpriteLocation(Sprite sprite, int zOffset)
public Point getCanvasSpriteLocation(SpritePixels spritePixels, int zOffset)
{
return Perspective.getCanvasSpriteLocation(client, getLocalLocation(), sprite, zOffset);
return Perspective.getCanvasSpriteLocation(client, getLocalLocation(), spritePixels, zOffset);
}
@Inject

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

@@ -74,7 +74,7 @@ import net.runelite.api.Point;
import net.runelite.api.Prayer;
import net.runelite.api.Projectile;
import net.runelite.api.Skill;
import net.runelite.api.Sprite;
import net.runelite.api.SpritePixels;
import net.runelite.api.Tile;
import net.runelite.api.VarPlayer;
import net.runelite.api.Varbits;
@@ -135,7 +135,7 @@ import net.runelite.rs.api.RSNodeHashTable;
import net.runelite.rs.api.RSPacketBuffer;
import net.runelite.rs.api.RSPlayer;
import net.runelite.rs.api.RSScene;
import net.runelite.rs.api.RSSprite;
import net.runelite.rs.api.RSSpritePixels;
import net.runelite.rs.api.RSTile;
import net.runelite.rs.api.RSTileItem;
import net.runelite.rs.api.RSUsername;
@@ -946,7 +946,7 @@ public abstract class RSClientMixin implements RSClient
}
@Inject
public RSSprite createItemSprite(int itemId, int quantity, int border, int shadowColor, int stackable, boolean noted)
public RSSpritePixels createItemSprite(int itemId, int quantity, int border, int shadowColor, int stackable, boolean noted)
{
assert isClientThread() : "createItemSprite must be called on client thread";
return createRSItemSprite(itemId, quantity, border, shadowColor, stackable, noted);
@@ -955,7 +955,7 @@ public abstract class RSClientMixin implements RSClient
@Inject
@Override
public Sprite createItemSprite(int itemId, int quantity, int border, int shadowColor, int stackable, boolean noted, int scale)
public SpritePixels createItemSprite(int itemId, int quantity, int border, int shadowColor, int stackable, boolean noted, int scale)
{
assert isClientThread();
int zoom = get3dZoom();
@@ -1622,7 +1622,7 @@ public abstract class RSClientMixin implements RSClient
@Inject
@Override
public RSSprite[] getSprites(IndexDataBase source, int archiveId, int fileId)
public RSSpritePixels[] getSprites(IndexDataBase source, int archiveId, int fileId)
{
RSAbstractArchive rsSource = (RSAbstractArchive) source;
byte[] configData = rsSource.getConfigData(archiveId, fileId);
@@ -1643,7 +1643,7 @@ public abstract class RSClientMixin implements RSClient
byte[][] spritePixelsArray = getSpritePixels();
int[] indexedSpritePalette = getIndexedSpritePalette();
RSSprite[] array = new RSSprite[indexedSpriteCount];
RSSpritePixels[] array = new RSSpritePixels[indexedSpriteCount];
for (int i = 0; i < indexedSpriteCount; ++i)
{
@@ -1653,7 +1653,7 @@ public abstract class RSClientMixin implements RSClient
byte[] pixelArray = spritePixelsArray[i];
int[] pixels = new int[width * height];
RSSprite spritePixels = createSprite(pixels, width, height);
RSSpritePixels spritePixels = createSprite(pixels, width, height);
spritePixels.setMaxHeight(maxHeight);
spritePixels.setMaxWidth(maxWidth);
spritePixels.setOffsetX(offsetX[i]);

6
runelite-mixins/src/main/java/net/runelite/mixins/RSSpriteMixin.java → runelite-mixins/src/main/java/net/runelite/mixins/RSSpritePixelsMixin.java
View File

@@ -32,10 +32,10 @@ import net.runelite.api.mixins.Mixin;
import net.runelite.api.mixins.Replace;
import net.runelite.api.mixins.Shadow;
import net.runelite.rs.api.RSClient;
import net.runelite.rs.api.RSSprite;
import net.runelite.rs.api.RSSpritePixels;
@Mixin(RSSprite.class)
public abstract class RSSpriteMixin implements RSSprite
@Mixin(RSSpritePixels.class)
public abstract class RSSpritePixelsMixin implements RSSpritePixels
{
private static final int ALPHA = 0xFF000000;

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

@@ -2,47 +2,47 @@ package net.runelite.mixins;
import java.util.HashMap;
import java.util.Map;
import net.runelite.api.Sprite;
import net.runelite.api.SpritePixels;
import net.runelite.api.mixins.Copy;
import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.Mixin;
import net.runelite.api.mixins.Replace;
import net.runelite.rs.api.RSAbstractArchive;
import net.runelite.rs.api.RSClient;
import net.runelite.rs.api.RSSprite;
import net.runelite.rs.api.RSSpritePixels;
@Mixin(RSClient.class)
public abstract class SpriteMixin implements RSClient
{
@Inject
private static final Map<Integer, Sprite> spriteOverrides = new HashMap<Integer, Sprite>();
private static final Map<Integer, SpritePixels> spriteOverrides = new HashMap<Integer, SpritePixels>();
@Inject
private static final Map<Integer, Sprite> widgetSpriteOverrides = new HashMap<Integer, Sprite>();
private static final Map<Integer, SpritePixels> widgetSpriteOverrides = new HashMap<Integer, SpritePixels>();
@Inject
@Override
public Map<Integer, Sprite> getSpriteOverrides()
public Map<Integer, SpritePixels> getSpriteOverrides()
{
return spriteOverrides;
}
@Inject
@Override
public Map<Integer, Sprite> getWidgetSpriteOverrides()
public Map<Integer, SpritePixels> getWidgetSpriteOverrides()
{
return widgetSpriteOverrides;
}
@Copy("SpriteBuffer_getSprite")
@Replace("SpriteBuffer_getSprite")
public static RSSprite copy$loadSprite(RSAbstractArchive var0, int var1, int var2)
public static RSSpritePixels copy$loadSprite(RSAbstractArchive var0, int var1, int var2)
{
Sprite sprite = spriteOverrides.get(var1);
SpritePixels spritePixels = spriteOverrides.get(var1);
if (sprite != null)
if (spritePixels != null)
{
return (RSSprite) sprite;
return (RSSpritePixels) spritePixels;
}
return copy$loadSprite(var0, var1, var2);

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

@@ -1,32 +1,32 @@
package net.runelite.mixins;
import net.runelite.api.Sprite;
import net.runelite.api.SpritePixels;
import java.util.Map;
import net.runelite.api.mixins.Copy;
import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.Mixin;
import net.runelite.api.mixins.Replace;
import net.runelite.api.mixins.Shadow;
import net.runelite.rs.api.RSSprite;
import net.runelite.rs.api.RSSpritePixels;
import net.runelite.rs.api.RSWidget;
@Mixin(RSWidget.class)
public abstract class WidgetSpriteMixin implements RSWidget
{
@Shadow("widgetSpriteOverrides")
private static Map<Integer, Sprite> widgetSpriteOverrides;
private static Map<Integer, SpritePixels> widgetSpriteOverrides;
@Copy("getSprite")
@Replace("getSprite")
public RSSprite copy$getWidgetSprite(boolean var1)
public RSSpritePixels copy$getWidgetSprite(boolean var1)
{
if (getSpriteId() != -1)
{
Sprite sprite = widgetSpriteOverrides.get(getId());
SpritePixels spritePixels = widgetSpriteOverrides.get(getId());
if (sprite != null)
if (spritePixels != null)
{
return (RSSprite) sprite;
return (RSSpritePixels) spritePixels;
}
}
@@ -35,7 +35,7 @@ public abstract class WidgetSpriteMixin implements RSWidget
@Inject
@Override
public Sprite getSprite()
public SpritePixels getSprite()
{
return getSprite(false);
}