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

Merge remote-tracking branch 'runelite/master' into rl-upstream-16072020

Browse Source 
# Conflicts:
#	cache/src/main/java/net/runelite/cache/util/XteaKeyManager.java
#	http-api/pom.xml
#	http-api/src/main/java/net/runelite/http/api/account/AccountClient.java
#	http-api/src/main/java/net/runelite/http/api/chat/ChatClient.java
#	http-api/src/main/java/net/runelite/http/api/item/ItemClient.java
#	http-api/src/main/java/net/runelite/http/api/osbuddy/OSBGrandExchangeClient.java
#	http-api/src/main/java/net/runelite/http/api/xtea/XteaClient.java
#	http-service/src/main/java/net/runelite/http/service/hiscore/HiscoreService.java
#	runelite-api/src/main/java/net/runelite/api/Client.java
#	runelite-api/src/main/java/net/runelite/api/EnumID.java
#	runelite-api/src/main/java/net/runelite/api/IndexDataBase.java
#	runelite-api/src/main/java/net/runelite/api/ItemComposition.java
#	runelite-api/src/main/java/net/runelite/api/PlayerComposition.java
#	runelite-api/src/main/java/net/runelite/api/ScriptID.java
#	runelite-api/src/main/java/net/runelite/api/VarbitComposition.java
#	runelite-api/src/main/java/net/runelite/api/events/ActorDeath.java
#	runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
#	runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java
#	runelite-client/src/main/java/net/runelite/client/ClientSessionManager.java
#	runelite-client/src/main/java/net/runelite/client/RuneLite.java
#	runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java
#	runelite-client/src/main/java/net/runelite/client/RuneLiteProperties.java
#	runelite-client/src/main/java/net/runelite/client/SessionClient.java
#	runelite-client/src/main/java/net/runelite/client/account/SessionManager.java
#	runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java
#	runelite-client/src/main/java/net/runelite/client/externalplugins/ExternalPluginManager.java
#	runelite-client/src/main/java/net/runelite/client/game/ItemManager.java
#	runelite-client/src/main/java/net/runelite/client/game/WorldService.java
#	runelite-client/src/main/java/net/runelite/client/input/KeyListener.java
#	runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityOverlay.java
#	runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/agility/Obstacles.java
#	runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java
#	runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java
#	runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/SkillChallengeClue.java
#	runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java
#	runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListPanel.java
#	runelite-client/src/main/java/net/runelite/client/plugins/devtools/VarInspector.java
#	runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordGameEventType.java
#	runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPanel.java
#	runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeItemPanel.java
#	runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOfferSlot.java
#	runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java
#	runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargeConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java
#	runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingListener.java
#	runelite-client/src/main/java/net/runelite/client/plugins/loginscreen/LoginScreenPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/raids/Raid.java
#	runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidRoom.java
#	runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/raids/RoomType.java
#	runelite-client/src/main/java/net/runelite/client/plugins/randomevents/RandomEventConfig.java
#	runelite-client/src/main/java/net/runelite/client/plugins/randomevents/RandomEventPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiSearchChatboxTextInput.java
#	runelite-client/src/main/java/net/runelite/client/plugins/worldmap/MinigameLocation.java
#	runelite-client/src/main/java/net/runelite/client/plugins/worldmap/MiningSiteLocation.java
#	runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TeleportLocationData.java
#	runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TransportationPointLocation.java
#	runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/xpupdater/XpUpdaterPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/xtea/XteaPlugin.java
#	runelite-client/src/main/java/net/runelite/client/rs/ClientConfigLoader.java
#	runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java
#	runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_fletching.json
#	runelite-client/src/test/java/net/runelite/client/plugins/PluginManagerTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/bank/BankPluginTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/examine/ExaminePluginTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/grandexchange/GrandExchangePluginTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/hiscore/HiscorePanelTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/keyremapping/KeyRemappingListenerTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/loottracker/LootTrackerPluginTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPluginTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/raids/RaidsPluginTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java
#	runelite-client/src/test/java/net/runelite/client/plugins/xptracker/XpTrackerPluginTest.java
#	runelite-client/src/test/java/net/runelite/client/rs/ClientConfigLoaderTest.java
#	runelite-client/src/test/java/net/runelite/client/ui/overlay/infobox/InfoBoxManagerTest.java
This commit is contained in:
ThatGamerBlue
2020-07-16 17:50:30 +01:00
parent b407e4b567 8702b6d068
commit ea056d0604
65 changed files with 549 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cache/src/main/java/net/runelite/cache/definitions/HealthBarDefinition.java vendored
View File

@@ -31,13 +31,13 @@ public class HealthBarDefinition
{
public int id;
public int field3276;
public int field3277;
public int field3278;
public int field3283;
public int field3272;
public int field3275;
public int healthBarFrontSpriteId;
public int healthBarBackSpriteId;
public int healthScale;
public int healthBarPadding;
public int field3277 = 255;
public int field3278 = 255;
public int field3283 = -1;
public int field3272 = 1;
public int field3275 = 70;
public int healthBarFrontSpriteId = -1;
public int healthBarBackSpriteId = -1;
public int healthScale = 30;
public int healthBarPadding = 0;
}

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

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

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

@@ -24,8 +24,11 @@
*/
package net.runelite.cache.util;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import net.runelite.http.api.RuneLiteAPI;
import net.runelite.http.api.xtea.XteaClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -33,14 +36,25 @@ public class XteaKeyManager
{
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()
{
XteaClient xteaClient = new XteaClient(RuneLiteAPI.CLIENT);
try
{
keys = xteaClient.get();
}
catch (IOException e)
{
e.printStackTrace();
}
logger.info("Loaded {} keys", keys.size());
}
public int[] getKeys(int region)
public Integer[] getKeys(int region)
{
return keys.get(region);
}

10
cache/src/test/java/net/runelite/cache/MapDumperTest.java vendored
View File

@@ -76,7 +76,7 @@ public class MapDumperTest
for (int i = 0; i < MAX_REGIONS; i++)
{
int[] keys = keyManager.getKeys(i);
Integer[] keysTmp = keyManager.getKeys(i);
int x = i >> 8;
int y = i & 0xFF;
@@ -95,8 +95,9 @@ public class MapDumperTest
Files.write(data, new File(outDir, "m" + x + "_" + y + ".dat"));
if (keys != null)
if (keysTmp != null)
{
int[] keys = {keysTmp[0], keysTmp[1], keysTmp[2], keysTmp[3]};
try
{
data = land.decompress(storage.loadArchive(land), keys);
@@ -142,9 +143,10 @@ public class MapDumperTest
MapDefinition mapDef = new MapLoader().load(x, y, data);
LocationsDefinition locDef = null;
int[] keys = keyManager.getKeys(i);
if (keys != null)
Integer[] keysTmp = keyManager.getKeys(i);
if (keysTmp != null)
{
int[] keys = {keysTmp[0], keysTmp[1], keysTmp[2], keysTmp[3]};
try
{
data = land.decompress(storage.loadArchive(land), keys);