Merge branch 'master' of https://github.com/runelite/runelite into upstream-03012022

Conflicts: README.md cache-client/pom.xml cache-updater/pom.xml cache/pom.xml cache/src/test/java/net/runelite/cache/SpritePixelsManagerTest.java config/checkstyle/checkstyle.xml config/checkstyle/suppressions.xml deobfuscator/src/main/java/net/runelite/asm/attributes/code/instructions/BALoad.java deobfuscator/src/main/java/net/runelite/asm/pool/Class.java deobfuscator/src/main/java/net/runelite/deob/DeobProperties.java deobfuscator/src/main/java/net/runelite/deob/deobfuscators/lvt/LVTType.java deobfuscator/src/test/java/net/runelite/asm/annotations/MyAnnotation.java deobfuscator/src/test/java/net/runelite/asm/execution/mapper/StaticStepTest.java deobfuscator/src/test/java/net/runelite/deob/deobfuscators/UnusedParametersTest.java deobfuscator/src/test/java/net/runelite/deob/deobfuscators/transformers/buffer/BufferFinderTest.java deobfuscator/src/test/java/net/runelite/deob/deobfuscators/unusedclass/ClassA.java deobfuscator/src/test/java/net/runelite/deob/deobfuscators/unusedclass/EmptyClass.java http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java http-api/src/main/java/net/runelite/http/api/item/ItemStats.java http-api/src/main/resources/runelite.properties injection-annotations/src/main/java/net/runelite/api/mixins/Mixins.java pom.xml runelite-api/pom.xml runelite-api/src/main/java/net/runelite/api/Frames.java runelite-api/src/main/java/net/runelite/api/events/NpcActionChanged.java runelite-api/src/main/java/net/runelite/api/events/PlayerSkullChanged.java runelite-api/src/main/java/net/runelite/api/events/WidgetPressed.java runelite-api/src/main/java/net/runelite/api/queries/InventoryItemQuery.java runelite-api/src/main/java/net/runelite/api/util/JagexPrintableCharMatcher.java runelite-client/pom.xml runelite-client/src/main/java/com/openosrs/client/events/OPRSPluginChanged.java runelite-client/src/main/java/com/openosrs/client/events/OPRSRepositoryChanged.java runelite-client/src/main/java/com/openosrs/client/game/AttackStyle.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/SessionClient.java runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java runelite-client/src/main/java/net/runelite/client/game/ItemClient.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/plugins/xptracker/XpData.java runelite-client/src/main/java/net/runelite/client/plugins/xtea/XteaClient.java runelite-client/src/main/java/net/runelite/client/util/PvPUtil.java runelite-client/src/main/resources/net/runelite/client/runelite.properties runelite-client/src/test/java/net/runelite/client/config/ConfigManagerTest.java runelite-client/src/test/java/net/runelite/client/plugins/raids/RaidsPluginTest.java runelite-client/src/test/java/net/runelite/client/plugins/xptracker/XpTrackerPluginTest.java runelite-jshell/pom.xml runelite-mixins/src/main/java/net/runelite/mixins/ProcessClientErrorMixin.java runelite-mixins/src/main/java/net/runelite/mixins/RSTextureMixin.java runelite-script-assembler-plugin/pom.xml runescape-api/src/main/java/net/runelite/rs/api/RSAbstractRasterProvider.java runescape-api/src/main/java/net/runelite/rs/api/RSDecimator.java runescape-api/src/main/java/net/runelite/rs/api/RSFrames.java runescape-api/src/main/java/net/runelite/rs/api/RSProjectile.java runescape-api/src/main/java/net/runelite/rs/api/RSRasterProvider.java runescape-api/src/main/java/net/runelite/rs/api/RSScriptEvent.java runescape-api/src/main/java/net/runelite/rs/api/RSUsername.java runescape-client/src/test/java/ISAACCipherTest.java
2022-01-03 02:04:47 +11:00
parent e466a689f8 0da504769d
commit 2f9e0d2787
93 changed files with 583 additions and 2040 deletions
--- a/runelite-client/src/test/java/net/runelite/client/OkHttpCacheSanityTest.java
+++ b/runelite-client/src/test/java/net/runelite/client/OkHttpCacheSanityTest.java
@@ -30,7 +30,6 @@ import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;
-import net.runelite.http.api.RuneLiteAPI;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
@@ -38,11 +37,12 @@ import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
 import okhttp3.mockwebserver.RecordedRequest;
 import org.junit.Assert;
+import static org.junit.Assert.assertTrue;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;

-public class OkHttpCacheSanityTest
+public class OkHttpTest
 {
 	@Rule
 	public TemporaryFolder cacheFolder = new TemporaryFolder();
@@ -71,9 +71,7 @@ public class OkHttpCacheSanityTest
 	@Test
 	public void testCacheSanity() throws IOException, InterruptedException
 	{
-		OkHttpClient.Builder builder = RuneLiteAPI.CLIENT.newBuilder();
-		RuneLite.setupCache(builder, cacheFolder.getRoot());
-		OkHttpClient client = builder.build();
+		OkHttpClient client = RuneLite.buildHttpClient(false);

 		Instant lastModified = Instant.now().minusSeconds(20);

@@ -122,4 +120,19 @@ public class OkHttpCacheSanityTest
 		Assert.assertNotNull("cache did not make a conditional request", req);
 		Assert.assertNotNull(req.getHeader("If-Modified-Since"));
 	}
+
+	@Test
+	public void testUserAgent() throws IOException, InterruptedException
+	{
+		server.enqueue(new MockResponse().setBody("OK"));
+
+		Request request = new Request.Builder()
+			.url(server.url("/"))
+			.build();
+		RuneLite.buildHttpClient(false)
+			.newCall(request).execute().close();
+
+		// rest of UA depends on if git is found
+		assertTrue(server.takeRequest().getHeader("User-Agent").startsWith("RuneLite/" + RuneLiteProperties.getVersion()));
+	}
 }
--- a/runelite-client/src/test/java/net/runelite/client/hiscore/HiscoreClientTest.java
+++ b/runelite-client/src/test/java/net/runelite/client/hiscore/HiscoreClientTest.java
@@ -25,7 +25,7 @@
 package net.runelite.client.hiscore;

 import java.io.IOException;
-import net.runelite.http.api.RuneLiteAPI;
+import okhttp3.OkHttpClient;
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
 import static org.junit.Assert.assertEquals;
@@ -132,7 +132,7 @@ public class HiscoreClientTest
 	@Test
 	public void testNormalLookup() throws Exception
 	{
-		HiscoreClient hiscoreClient = new HiscoreClient(RuneLiteAPI.CLIENT);
+		HiscoreClient hiscoreClient = new HiscoreClient(new OkHttpClient());

 		HiscoreResult result = hiscoreClient.lookup("zezima", server.url("/"));

--- a/runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java
+++ b/runelite-client/src/test/java/net/runelite/client/plugins/chatcommands/ChatCommandsPluginTest.java
@@ -49,17 +49,18 @@ import net.runelite.api.widgets.Widget;
 import static net.runelite.api.widgets.WidgetID.ADVENTURE_LOG_ID;
 import static net.runelite.api.widgets.WidgetID.DIARY_QUEST_GROUP_ID;
 import net.runelite.api.widgets.WidgetInfo;
+import net.runelite.client.chat.ChatClient;
 import net.runelite.client.chat.ChatCommandManager;
 import net.runelite.client.chat.ChatMessageManager;
 import net.runelite.client.config.ChatColorConfig;
 import net.runelite.client.config.ConfigManager;
 import net.runelite.client.config.RuneLiteConfig;
+import net.runelite.client.game.ItemManager;
 import net.runelite.client.hiscore.HiscoreClient;
 import net.runelite.client.hiscore.HiscoreEndpoint;
 import net.runelite.client.hiscore.HiscoreResult;
 import net.runelite.client.hiscore.Skill;
 import net.runelite.http.api.RuneLiteAPI;
-import net.runelite.http.api.chat.ChatClient;
 import static org.junit.Assert.assertEquals;
 import org.junit.Before;
 import org.junit.Test;
@@ -116,6 +117,10 @@ public class ChatCommandsPluginTest
 	@Bind
 	RuneLiteConfig runeLiteConfig;

+	@Mock
+	@Bind
+	ItemManager itemManager;
+
 	@Mock
 	@Bind
 	ChatCommandsConfig chatCommandsConfig;
--- a/runelite-client/src/test/java/net/runelite/client/plugins/grandexchange/GrandExchangePluginTest.java
+++ b/runelite-client/src/test/java/net/runelite/client/plugins/grandexchange/GrandExchangePluginTest.java
@@ -51,7 +51,6 @@ import net.runelite.client.input.KeyManager;
 import net.runelite.client.input.MouseManager;
 import static net.runelite.client.plugins.grandexchange.GrandExchangePlugin.findFuzzyIndices;
 import static net.runelite.http.api.RuneLiteAPI.GSON;
-import net.runelite.http.api.ge.GrandExchangeClient;
 import net.runelite.http.api.ge.GrandExchangeTrade;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
--- a/runelite-client/src/test/java/net/runelite/client/plugins/loottracker/LootTrackerPluginTest.java
+++ b/runelite-client/src/test/java/net/runelite/client/plugins/loottracker/LootTrackerPluginTest.java
@@ -61,7 +61,6 @@ import net.runelite.client.game.SpriteManager;
 import net.runelite.client.ui.overlay.infobox.InfoBoxManager;
 import net.runelite.http.api.item.ItemPrice;
 import net.runelite.http.api.loottracker.LootRecordType;
-import net.runelite.http.api.loottracker.LootTrackerClient;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import org.junit.Before;
--- a/runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java
+++ b/runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java
@@ -52,6 +52,7 @@ import net.runelite.api.events.StatChanged;
 import net.runelite.api.widgets.Widget;
 import net.runelite.api.widgets.WidgetInfo;
 import net.runelite.client.Notifier;
+import net.runelite.client.chat.ChatClient;
 import net.runelite.client.chat.ChatCommandManager;
 import net.runelite.client.chat.ChatMessageManager;
 import net.runelite.client.config.ConfigManager;
@@ -59,7 +60,6 @@ import net.runelite.client.game.ItemManager;
 import net.runelite.client.game.npcoverlay.NpcOverlayService;
 import net.runelite.client.ui.overlay.OverlayManager;
 import net.runelite.client.ui.overlay.infobox.InfoBoxManager;
-import net.runelite.http.api.chat.ChatClient;
 import static org.junit.Assert.assertEquals;
 import org.junit.Before;
 import org.junit.Test;
@@ -142,6 +142,10 @@ public class SlayerPluginTest
 	@Bind
 	SlayerOverlay overlay;

+	@Mock
+	@Bind
+	TargetWeaknessOverlay targetWeaknessOverlay;
+
 	@Mock
 	@Bind
 	InfoBoxManager infoBoxManager;
--- a/runelite-client/src/test/java/net/runelite/client/plugins/specialcounter/SpecialCounterPluginTest.java
+++ b/runelite-client/src/test/java/net/runelite/client/plugins/specialcounter/SpecialCounterPluginTest.java
@@ -46,6 +46,7 @@ import net.runelite.client.Notifier;
 import net.runelite.client.game.ItemManager;
 import net.runelite.client.ui.overlay.infobox.InfoBoxManager;
 import net.runelite.client.ws.PartyService;
+import net.runelite.client.ws.WSClient;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -81,6 +82,10 @@ public class SpecialCounterPluginTest
 	@Bind
 	private Notifier notifier;

+	@Mock
+	@Bind
+	private WSClient wsClient;
+
 	@Mock
 	@Bind
 	private SpecialCounterConfig specialCounterConfig;