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

Rename AbstractIndexCache to be more accurate

Browse Source
This commit is contained in:
Lucas
2019-07-07 06:24:17 +02:00
parent bb8dc5b8e4
commit eeeafb93b7
118 changed files with 594 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
runelite-mixins/src/main/java/net/runelite/mixins/RSAbstractIndexCacheMixin.java → runelite-mixins/src/main/java/net/runelite/mixins/RSAbstractArchiveMixin.java
View File

@@ -15,12 +15,12 @@ import net.runelite.api.mixins.Mixin;
import net.runelite.api.mixins.Replace;
import net.runelite.api.mixins.Shadow;
import org.slf4j.Logger;
import net.runelite.rs.api.RSAbstractIndexCache;
import net.runelite.rs.api.RSAbstractArchive;
import net.runelite.rs.api.RSClient;
import net.runelite.rs.api.RSIndexCache;
import net.runelite.rs.api.RSArchive;
@Mixin(RSAbstractIndexCache.class)
public abstract class RSAbstractIndexCacheMixin implements RSAbstractIndexCache
@Mixin(RSAbstractArchive.class)
public abstract class RSAbstractArchiveMixin implements RSAbstractArchive
{
@Shadow("client")
private static RSClient client;
@@ -35,14 +35,14 @@ public abstract class RSAbstractIndexCacheMixin implements RSAbstractIndexCache
return overlayOutdated;
}
@Copy("takeRecord")
@Copy("takeFile")
abstract byte[] rs$getConfigData(int archiveId, int fileId);
@Replace("takeRecord")
@Replace("takeFile")
public byte[] rl$getConfigData(int archiveId, int fileId)
{
byte[] rsData = rs$getConfigData(archiveId, fileId);
RSIndexCache indexData = (RSIndexCache) this;
RSArchive indexData = (RSArchive) this;
if (!OverlayIndex.hasOverlay(indexData.getIndex(), archiveId))
{

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

@@ -112,7 +112,7 @@ import net.runelite.api.mixins.Mixin;
import net.runelite.api.mixins.Replace;
import net.runelite.api.mixins.Shadow;
import org.slf4j.Logger;
import net.runelite.rs.api.RSAbstractIndexCache;
import net.runelite.rs.api.RSAbstractArchive;
import net.runelite.rs.api.RSChatChannel;
import net.runelite.rs.api.RSClanChat;
import net.runelite.rs.api.RSClient;
@@ -1464,7 +1464,7 @@ public abstract class RSClientMixin implements RSClient
@Override
public RSSprite[] getSprites(IndexDataBase source, int archiveId, int fileId)
{
RSAbstractIndexCache rsSource = (RSAbstractIndexCache) source;
RSAbstractArchive rsSource = (RSAbstractArchive) source;
byte[] configData = rsSource.getConfigData(archiveId, fileId);
if (configData == null)
{

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

@@ -7,7 +7,7 @@ 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.RSAbstractIndexCache;
import net.runelite.rs.api.RSAbstractArchive;
import net.runelite.rs.api.RSClient;
import net.runelite.rs.api.RSSprite;
@@ -35,13 +35,13 @@ public abstract class SpriteMixin implements RSClient
}
@Copy("readSprite")
public static RSSprite rs$loadSprite(RSAbstractIndexCache var0, int var1, int var2)
public static RSSprite rs$loadSprite(RSAbstractArchive var0, int var1, int var2)
{
throw new RuntimeException();
}
@Replace("readSprite")
public static RSSprite rl$loadSprite(RSAbstractIndexCache var0, int var1, int var2)
public static RSSprite rl$loadSprite(RSAbstractArchive var0, int var1, int var2)
{
Sprite sprite = spriteOverrides.get(var1);