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

runelite-api/src/main/java/net/runelite/api/Client.java

@@ -1114,7 +1114,9 @@ public interface Client extends GameEngine
 	 * Loads a model from the cache
 	 *
 	 * @param id the ID of the model
+	 * @return the model or null if it is loading or nonexistent
 	 */
+	@Nullable
 	Model loadModel(int id);
 
 	/**
@@ -1123,7 +1125,9 @@ public interface Client extends GameEngine
 	 * @param id the ID of the model
 	 * @param colorToFind array of hsl color values to find in the model to replace
 	 * @param colorToReplace array of hsl color values to replace in the model
+	 * @return the model or null if it is loading or nonexistent
 	 */
+	@Nullable
 	Model loadModel(int id, short[] colorToFind, short[] colorToReplace);
 
 	/**

runelite-api/src/main/java/net/runelite/api/ScriptEvent.java

@@ -53,6 +53,12 @@ public interface ScriptEvent
 	 */
 	ScriptEvent setSource(Widget widget);
 
+	/**
+	 * Arguments passed to the script. Index 0 is the script being run and is not an argument.
+	 * @return
+	 */
+	Object[] getArguments();
+
 	/**
 	 * Gets the menu index of the event
 	 *
@@ -73,6 +79,11 @@ public interface ScriptEvent
 	 */
 	int getMouseX();
 
+	/**
+	 * Parent relative y coordinate for mouse related events
+	 */
+	int getMouseY();
+
 	/**
 	 * Jagex typed keycode
 	 *

runelite-api/src/main/java/net/runelite/api/coords/WorldPoint.java

@@ -199,7 +199,7 @@ public class WorldPoint
 
 			// get the template chunk for the chunk
 			int[][][] instanceTemplateChunks = client.getInstanceTemplateChunks();
-			int templateChunk = instanceTemplateChunks[client.getPlane()][chunkX][chunkY];
+			int templateChunk = instanceTemplateChunks[plane][chunkX][chunkY];
 
 			int rotation = templateChunk >> 1 & 0x3;
 			int templateChunkY = (templateChunk >> 3 & 0x7FF) * CHUNK_SIZE;