xteakeymanager: load keys from api
This commit is contained in:
@@ -22,41 +22,29 @@
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
package net.runelite.cache.util;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Properties;
|
||||
import java.util.stream.Stream;
|
||||
import net.runelite.http.api.xtea.XteaClient;
|
||||
import net.runelite.http.api.xtea.XteaKey;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
public class XteaKeyManager
|
||||
{
|
||||
private static final Logger logger = LoggerFactory.getLogger(XteaKeyManager.class);
|
||||
|
||||
private final Map<Integer, Integer[]> keys = new HashMap<>();
|
||||
|
||||
private final Map<Integer, int[]> keys = new HashMap<>();
|
||||
|
||||
public void loadKeys() throws IOException
|
||||
{
|
||||
Properties properties = new Properties();
|
||||
properties.load(XteaKeyManager.class.getResourceAsStream("/keys.properties"));
|
||||
XteaClient xteaClient = new XteaClient();
|
||||
|
||||
for (Object key : properties.keySet())
|
||||
for (XteaKey key : xteaClient.get())
|
||||
{
|
||||
int region = Integer.parseInt((String) key);
|
||||
|
||||
String[] values = properties.getProperty((String) key).split(",");
|
||||
|
||||
assert values.length == 4;
|
||||
|
||||
Integer[] k = (Integer[]) Stream.of(values)
|
||||
.map(i -> Integer.parseInt(i))
|
||||
.toArray(Integer[]::new);
|
||||
|
||||
keys.put(region, k);
|
||||
keys.put(key.getRegion(), key.getKeys());
|
||||
}
|
||||
|
||||
logger.info("Loaded {} keys", keys.size());
|
||||
@@ -64,12 +52,6 @@ public class XteaKeyManager
|
||||
|
||||
public int[] getKeys(int region)
|
||||
{
|
||||
Integer[] k = keys.get(region);
|
||||
if (k == null)
|
||||
return null;
|
||||
|
||||
return Stream.of(k)
|
||||
.mapToInt(Integer::intValue)
|
||||
.toArray();
|
||||
return keys.get(region);
|
||||
}
|
||||
}
|
||||
|
||||
1724
cache/src/main/resources/keys.properties
vendored
1724
cache/src/main/resources/keys.properties
vendored
File diff suppressed because it is too large
Load Diff
@@ -1,47 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2016-2017, Adam <Adam@sigterm.info>
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions are met:
|
||||
*
|
||||
* 1. Redistributions of source code must retain the above copyright notice, this
|
||||
* list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||
* this list of conditions and the following disclaimer in the documentation
|
||||
* and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
||||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
package net.runelite.cache.util;
|
||||
|
||||
import java.io.IOException;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
|
||||
public class XteaKeyManagerTest
|
||||
{
|
||||
@Test
|
||||
public void test() throws IOException
|
||||
{
|
||||
XteaKeyManager xt = new XteaKeyManager();
|
||||
xt.loadKeys();
|
||||
|
||||
int[] keys = xt.getKeys(4883);
|
||||
int[] expected = new int[]
|
||||
{
|
||||
-1864222358, -1285174877, -498143812, -1324275067
|
||||
};
|
||||
|
||||
Assert.assertArrayEquals(expected, keys);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user