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

upstream: merge

Browse Source
This commit is contained in:
Justin
2022-01-03 04:00:10 +11:00
parent 88af9303a6
commit 81969602f7
2 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cache/src/main/java/net/runelite/cache/region/RegionLoader.java vendored
View File

@@ -97,9 +97,10 @@ public class RegionLoader
Region region = new Region(i); Region region = new Region(i);
region.loadTerrain(mapDef); region.loadTerrain(mapDef);
int[] keys = keyManager.getKeys(i); Integer[] keysTmp = keyManager.getKeys(i);
if (keys != null) if (keysTmp != null)
{ {
int[] keys = {keysTmp[0], keysTmp[1], keysTmp[2], keysTmp[3]};
try try
{ {
data = land.decompress(storage.loadArchive(land), keys); data = land.decompress(storage.loadArchive(land), keys);

25
cache/src/main/java/net/runelite/cache/util/XteaKeyManager.java vendored
View File

@@ -24,15 +24,10 @@
*/ */
package net.runelite.cache.util; package net.runelite.cache.util;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
import net.runelite.http.api.xtea.XteaKey; import net.runelite.http.api.RuneLiteAPI;
import net.runelite.http.api.xtea.XteaClient;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -40,24 +35,16 @@ public class XteaKeyManager
{ {
private static final Logger logger = LoggerFactory.getLogger(XteaKeyManager.class); private static final Logger logger = LoggerFactory.getLogger(XteaKeyManager.class);
private final Map<Integer, int[]> keys = new HashMap<>(); private Map<Integer, Integer[]> keys = new HashMap<>();
public void loadKeys(InputStream in) public void loadKeys()
{ {
// CHECKSTYLE:OFF keys = null;
List<XteaKey> k = new Gson()
.fromJson(new InputStreamReader(in, StandardCharsets.UTF_8), new TypeToken<List<XteaKey>>() { }.getType());
// CHECKSTYLE:ON
for (XteaKey key : k)
{
keys.put(key.getRegion(), key.getKeys());
}
logger.info("Loaded {} keys", keys.size()); logger.info("Loaded {} keys", keys.size());
} }
public int[] getKeys(int region) public Integer[] getKeys(int region)
{ {
return keys.get(region); return keys.get(region);
} }