Update upstream 4/9/2020

runelite-client/src/main/java/net/runelite/client/RuneLite.java

@@ -197,9 +197,6 @@ public class RuneLite
 	@Inject
 	private Provider<ChatboxPanelManager> chatboxPanelManager;
 
-	@Inject
-	private Provider<PartyService> partyService;
-
 	@Inject
 	private Groups groups;
 
@@ -428,15 +425,6 @@ public class RuneLite
 		// Initialize Discord service
 		discordService.init();
 
-		// Register event listeners
-		eventBus.register(clientUI);
-		eventBus.register(pluginManager);
-		eventBus.register(externalPluginManager);
-		eventBus.register(overlayManager);
-		eventBus.register(drawManager);
-		eventBus.register(infoBoxManager);
-		eventBus.register(tooltipManager);
-
 		if (!isOutdated)
 		{
 			// Initialize chat colors

runelite-client/src/main/java/net/runelite/client/util/WeaponMap.java

@@ -83,6 +83,8 @@ public class WeaponMap
 		StyleMap.put(ItemID.BLACK_SWORD, WeaponStyle.MELEE);
 		StyleMap.put(ItemID.BLACK_WARHAMMER, WeaponStyle.MELEE);
 		StyleMap.put(ItemID.BLADE_OF_SAELDOR, WeaponStyle.MELEE);
+		StyleMap.put(ItemID.BLADE_OF_SAELDOR_I, WeaponStyle.MELEE);
+		StyleMap.put(ItemID.BLADE_OF_SAELDOR_INACTIVE, WeaponStyle.MELEE);
 		StyleMap.put(ItemID.BLESSED_AXE, WeaponStyle.MELEE);
 		StyleMap.put(ItemID.BLUE_FLOWERS, WeaponStyle.MELEE);
 		StyleMap.put(ItemID.BLUE_FLOWERS_8936, WeaponStyle.MELEE);
@@ -453,7 +455,6 @@ public class WeaponMap
 		StyleMap.put(ItemID.ZAMORAK_GODSWORD_OR, WeaponStyle.MELEE);
 		StyleMap.put(ItemID.ZOMBIE_HEAD, WeaponStyle.MELEE);
 
-
 	//Ranged
 		StyleMap.put(ItemID._3RD_AGE_BOW, WeaponStyle.RANGE);
 		StyleMap.put(ItemID.ADAMANT_CROSSBOW, WeaponStyle.RANGE);

runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java

@@ -178,6 +178,12 @@ public abstract class RSClientMixin implements RSClient
 	@Inject
 	private static RSTileItem lastItemDespawn;
 
+	@Inject
+	private static boolean invertPitch;
+
+	@Inject
+	private static boolean invertYaw;
+
 	@Inject
 	private boolean gpu;
 
@@ -1888,4 +1894,38 @@ public abstract class RSClientMixin implements RSClient
 
 		return widgetClickMask;
 	}
+
+	@Inject
+	@FieldHook("camAngleDX")
+	private static void onCamAngleDXChange(int index)
+	{
+		if(invertPitch && client.getMouseCurrentButton() == 4 && client.isMouseCam())
+		{
+			client.setCamAngleDX(-client.getCamAngleDX());
+		}
+	}
+
+	@Inject
+	@FieldHook("camAngleDY")
+	private static void onCamAngleDYChange(int index)
+	{
+		if(invertYaw && client.getMouseCurrentButton() == 4 && client.isMouseCam())
+		{
+			client.setCamAngleDY(-client.getCamAngleDY());
+		}
+	}
+
+	@Inject
+	@Override
+	public void setInvertPitch(boolean state)
+	{
+		invertPitch = state;
+	}
+
+	@Inject
+	@Override
+	public void setInvertYaw(boolean state)
+	{
+		invertYaw = state;
+	}
 }

runescape-api/src/main/java/net/runelite/rs/api/RSClient.java

@@ -381,6 +381,23 @@ public interface RSClient extends RSGameShell, Client
 	@Override
 	int[] getWidgetPositionsY();
 
+	@Import("mouseCam")
+	boolean isMouseCam();
+
+
+
+	@Import("camAngleDX")
+	int getCamAngleDX();
+
+	@Import("camAngleDX")
+	void setCamAngleDX(int angle);
+
+	@Import("camAngleDY")
+	int getCamAngleDY();
+
+	@Import("camAngleDY")
+	void setCamAngleDY(int angle);
+
 	@Import("itemContainers")
 	RSNodeHashTable getItemContainers();