Merge pull request #4667 from deathbeam/move-index-to-db

Move isOverlayOutdated to IndexDatabase
This commit is contained in:
Tomas Slusny
2018-08-06 09:31:38 +02:00
committed by GitHub
8 changed files with 28 additions and 31 deletions

View File

@@ -32,8 +32,8 @@ import com.google.common.io.CharStreams;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import net.runelite.api.hooks.Callbacks;
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;
@@ -49,6 +49,16 @@ public abstract class RSIndexDataBaseMixin implements RSIndexDataBase
@Shadow("clientInstance")
private static RSClient client;
@Inject
private boolean overlayOutdated;
@Inject
@Override
public boolean isOverlayOutdated()
{
return overlayOutdated;
}
@Copy("getConfigData")
abstract byte[] rs$getConfigData(int archiveId, int fileId);
@@ -117,9 +127,7 @@ public abstract class RSIndexDataBaseMixin implements RSIndexDataBase
log.warn("Mismatch in overlaid cache archive hash for {}/{}: {} != {}",
indexData.getIndex(), archiveId, replaceHash, rsHash);
Callbacks callbacks = client.getCallbacks();
callbacks.overlayLoadFailed(this, archiveId, fileId);
overlayOutdated = true;
}
catch (IOException ex)
{