Merge pull request #470 from melxin/rl-upstream-051024

rl upstream

buildSrc/src/main/kotlin/Dependencies.kt

@@ -25,7 +25,7 @@
 
 object ProjectVersions {
     const val launcherVersion = "1.0.0"
-    const val rlVersion = "1.10.38"
+    const val rlVersion = "1.10.40"
 
     const val openosrsVersion = "4.31.2"
 

runelite-api/src/main/interfaces/interfaces.toml

@@ -69,12 +69,13 @@ deposit_equipment=46
 potion_store=48
 incinerator=49
 incinerator_confirm=50
-equipment_parent=74
-equipment_set_bonus=115
-settings_button=119
-equipment_button=120
-popup=122
-equipment_stat_bonus=127
+potionstore_content=52
+equipment_parent=77
+equipment_set_bonus=118
+settings_button=122
+equipment_button=123
+popup=125
+equipment_stat_bonus=131
 
 [bank_inventory]
 id=15
@@ -626,6 +627,7 @@ container=0
 
 [prayer]
 id=541
+parent=0
 
 [private_chat]
 id=163

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

@@ -235,6 +235,10 @@ public final class AnimationID
 	public static final int DENSE_ESSENCE_CHIPPING = 7201;
 	public static final int DENSE_ESSENCE_CHISELING = 7202;
 	public static final int HERBLORE_POTIONMAKING = 363; //used for both herb and secondary
+	public static final int HERBLORE_MIXOLOGY_CONCENTRATE = 11644;
+	public static final int HERBLORE_MIXOLOGY_CRYSTALIZE = 11639;
+	public static final int HERBLORE_MIXOLOGY_HOMOGENIZE = 11634;
+	public static final int HERBLORE_MIXOLOGY_REFINER = 11604;
 	public static final int MAGIC_CHARGING_ORBS = 726;
 	public static final int MAGIC_MAKE_TABLET = 4068;
 	public static final int MAGIC_ENCHANTING_JEWELRY = 931;
@@ -300,6 +304,7 @@ public final class AnimationID
 	// NPC animations
 	public static final int TZTOK_JAD_MAGIC_ATTACK = 2656;
 	public static final int TZTOK_JAD_RANGE_ATTACK = 2652;
+	public static final int CYCLOPS_ATTACK = 4652;
 	public static final int HELLHOUND_DEFENCE = 6566;
 
 	// Farming

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

@@ -93,4 +93,10 @@ public final class EnumID
 
 	public static final int SPELLBOOKS = 1981;
 	public static final int SPELLBOOKS_SUB = 5280;
+
+	/**
+	 * key: int id
+	 * val: enum potion
+	 */
+	public static final int POTIONSTORE_POTIONS = 4826;
 }

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

@@ -11601,8 +11601,7 @@ public final class NpcID
 	public static final int ICE_BLOCK_13790 = 13790;
 	public static final int FROST_CRAB_13791 = 13791;
 	public static final int ICE_BLOCK_13792 = 13792;
-	public static final int BLUE_DRAGON_13793 = 13793;
-	public static final int BABY_BLUE_DRAGON_13794 = 13794;
+	public static final int BREWMA = 13793;
 	public static final int BRUTAL_BLUE_DRAGON_13795 = 13795;
 	public static final int ICE_GIANT_13796 = 13796;
 	public static final int ICE_GIANT_13797 = 13797;
@@ -11836,5 +11835,9 @@ public final class NpcID
 	public static final int HUBERTE_14045 = 14045;
 	public static final int MOXI_14046 = 14046;
 	public static final int GULL_14047 = 14047;
+	public static final int BLUE_DRAGON_14103 = 14103;
+	public static final int BLUE_DRAGON_14104 = 14104;
+	public static final int BABY_BLUE_DRAGON_14105 = 14105;
+	public static final int BABY_BLUE_DRAGON_14106 = 14106;
 	/* This file is automatically generated. Do not edit. */
 }

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

@@ -28811,5 +28811,9 @@ public final class NullObjectID
 	public static final int NULL_55403 = 55403;
 	public static final int NULL_55404 = 55404;
 	public static final int NULL_55405 = 55405;
+	public static final int NULL_55420 = 55420;
+	public static final int NULL_55421 = 55421;
+	public static final int NULL_55422 = 55422;
+	public static final int NULL_55423 = 55423;
 	/* This file is automatically generated. Do not edit. */
 }

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

@@ -26582,5 +26582,18 @@ public final class ObjectID
 	public static final int SHELVES_55407 = 55407;
 	public static final int SHELVES_55408 = 55408;
 	public static final int SHELVES_55409 = 55409;
+	public static final int CAULDRON_55410 = 55410;
+	public static final int REWARD_CART = 55411;
+	public static final int REWARD_CART_55412 = 55412;
+	public static final int REWARD_CART_55413 = 55413;
+	public static final int REWARD_CART_55414 = 55414;
+	public static final int REWARD_CART_55415 = 55415;
+	public static final int REWARD_CART_55416 = 55416;
+	public static final int ROCKSLIDE_55417 = 55417;
+	public static final int ROCKSLIDE_55418 = 55418;
+	public static final int ROCKSLIDE_55419 = 55419;
+	public static final int GRAPE_STORAGE_55424 = 55424;
+	public static final int GRAPE_STORAGE_55425 = 55425;
+	public static final int GRAPE_STORAGE_55426 = 55426;
 	/* This file is automatically generated. Do not edit. */
 }

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

@@ -505,4 +505,10 @@ public final class ScriptID
 
 	@ScriptArguments(integer = 2)
 	public static final int MOTHERLODE_HUD_UPDATE = 1634;
+
+	@ScriptArguments(integer = 1)
+	public static final int POTIONSTORE_DOSES = 3750;
+
+	@ScriptArguments(integer = 1)
+	public static final int POTIONSTORE_WITHDRAW_DOSES = 4818;
 }

runelite-api/src/main/java/net/runelite/api/hooks/DrawCallbacks.java

@@ -127,19 +127,19 @@ default void prepareSceneDraw(
 	{
 	}
 
-	default void drawPass(Projection projection, Scene scene, int pass)
+	default void drawPass(Projection entityProjection, Scene scene, int pass)
 	{
 	}
 
-	default void drawZone(Projection projection, Scene scene, int pass, int zx, int zz)
+	default void drawZone(Projection entityProjection, Scene scene, int pass, int zx, int zz)
 	{
 	}
 
-	default void drawDynamic(Scene scene, TileObject tileObject, Renderable r, Model m, int orient, int x, int y, int z)
+	default void drawDynamic(Projection worldProjection, Scene scene, TileObject tileObject, Renderable r, Model m, int orient, int x, int y, int z)
 	{
 	}
 
-	default void drawTemp(Scene scene, GameObject gameObject, Model m)
+	default void drawTemp(Projection worldProjection, Scene scene, GameObject gameObject, Model m)
 	{
 	}
 

runelite-api/src/main/java/net/runelite/api/widgets/Widget.java

@@ -1020,6 +1020,11 @@ Widget setSize(int width, int height,
 	 */
 	void setNoScrollThrough(boolean noScrollThrough);
 
+	/**
+	 * {@link net.runelite.api.VarPlayer}s that triggers this widgets varTransmitListener
+	 */
+	int[] getVarTransmitTrigger();
+
 	/**
 	 * {@link net.runelite.api.VarPlayer}s that triggers this widgets varTransmitListener
 	 */

runelite-client/src/main/java/net/runelite/client/game/ItemManager.java

@@ -172,6 +172,12 @@ private static class OutlineKey
 		put(GRACEFUL_LEGS_27455, GRACEFUL_LEGS_27453).
 		put(GRACEFUL_GLOVES_27458, GRACEFUL_GLOVES_27456).
 		put(GRACEFUL_BOOTS_27461, GRACEFUL_BOOTS_27459).
+		put(GRACEFUL_HOOD_30047, GRACEFUL_HOOD_30045).
+		put(GRACEFUL_CAPE_30050, GRACEFUL_CAPE_30048).
+		put(GRACEFUL_TOP_30053, GRACEFUL_TOP_30051).
+		put(GRACEFUL_LEGS_30056, GRACEFUL_LEGS_30054).
+		put(GRACEFUL_GLOVES_30059, GRACEFUL_GLOVES_30057).
+		put(GRACEFUL_BOOTS_30062, GRACEFUL_BOOTS_30060).
 
 		put(MAX_CAPE_13342, MAX_CAPE).
 

runelite-client/src/main/java/net/runelite/client/plugins/agility/Courses.java

@@ -44,7 +44,7 @@ enum Courses
 	SHAYZIEN_ADVANCED(507.5, 5944, new WorldPoint(1522, 3625, 0)),
 	FALADOR(586, 12084, new WorldPoint(3029, 3332, 0), new WorldPoint(3029, 3333, 0), new WorldPoint(3029, 3334, 0), new WorldPoint(3029, 3335, 0)),
 	COLOSSAL_WYRM_BASIC(504),
-	WILDERNESS(571.4, 11837, new WorldPoint(2994, 3933, 0)),
+	WILDERNESS(571.4, 11837, new WorldPoint(2993, 3933, 0), new WorldPoint(2994, 3933, 0), new WorldPoint(2995, 3933, 0)),
 	WEREWOLF(730.0, 14234, new WorldPoint(3528, 9873, 0)),
 	SEERS(570.0, 10806, new WorldPoint(2704, 3464, 0)),
 	COLOSSAL_WYRM_ADVANCED(685),

runelite-client/src/main/java/net/runelite/client/plugins/animsmoothing/AnimationSmoothingPlugin.java

@@ -69,6 +69,8 @@ private static boolean isAnimationInterpolatable(int animId)
 			case AnimationID.WYRM_ATTACK_MELEE:
 			case AnimationID.WYRM_ATTACK_MAGE:
 
+			case AnimationID.CYCLOPS_ATTACK:
+
 			case AnimationID.TREE_SPIRIT_IDLE:
 			case AnimationID.TREE_SPIRIT_WALK:
 

runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java

@@ -58,6 +58,7 @@
 import net.runelite.client.events.ConfigChanged;
 import net.runelite.client.plugins.Plugin;
 import net.runelite.client.plugins.PluginDescriptor;
+import static net.runelite.client.plugins.attackstyles.AttackStyle.CASTING;
 import static net.runelite.client.plugins.attackstyles.AttackStyle.DEFENSIVE;
 import static net.runelite.client.plugins.attackstyles.AttackStyle.DEFENSIVE_CASTING;
 import static net.runelite.client.plugins.attackstyles.AttackStyle.OTHER;
@@ -296,6 +297,14 @@ private AttackStyle[] getWeaponTypeStyles(int weaponType)
 		int weaponStyleEnum = client.getEnum(EnumID.WEAPON_STYLES).getIntValue(weaponType);
 		if (weaponStyleEnum == -1)
 		{
+			// Blue moon spear
+			if (weaponType == 22)
+			{
+				return new AttackStyle[]{
+					AttackStyle.ACCURATE, AttackStyle.AGGRESSIVE, null, DEFENSIVE, CASTING, DEFENSIVE_CASTING
+				};
+			}
+
 			if (weaponType == 30)
 			{
 				// Partisan

runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java

@@ -187,15 +187,15 @@ public void startUp()
 		cleanConfig();
 		spriteManager.addSpriteOverrides(TabSprites.values());
 		eventBus.register(tabInterface);
-		eventBus.register(layoutManager);
+		layoutManager.register();
 		clientThread.invokeLater(this::reinitBank);
 	}
 
 	@Override
 	public void shutDown()
 	{
 		eventBus.unregister(tabInterface);
-		eventBus.unregister(layoutManager);
+		layoutManager.unregister();
 		clientThread.invokeLater(() ->
 		{
 			// since the tab interface is unregistered from the eventbus, manually deinit it