Merge remote-tracking branch 'github/next'

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

@@ -27,6 +27,7 @@ package net.runelite.mixins;
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.Nullable;
+import net.runelite.api.vars.AccountType;
 import net.runelite.api.ChatMessageType;
 import net.runelite.api.ClanMember;
 import net.runelite.api.GameState;
@@ -160,6 +161,25 @@ public abstract class RSClientMixin implements RSClient
 		interpolateObjectAnimations = interpolate;
 	}
 
+	@Inject
+	@Override
+	public AccountType getAccountType()
+	{
+		int varbit = getVar(Varbits.ACCOUNT_TYPE);
+
+		switch (varbit)
+		{
+			case 1:
+				return AccountType.IRONMAN;
+			case 2:
+				return AccountType.ULTIMATE_IRONMAN;
+			case 3:
+				return AccountType.HARDCORE_IRONMAN;
+		}
+
+		return AccountType.NORMAL;
+	}
+
 	@Inject
 	@Override
 	public Tile getSelectedRegionTile()

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

@@ -28,6 +28,7 @@ import net.runelite.api.HeadIcon;
 import static net.runelite.api.HeadIcon.MAGIC;
 import static net.runelite.api.HeadIcon.MELEE;
 import static net.runelite.api.HeadIcon.RANGED;
+import static net.runelite.api.HeadIcon.RANGE_MAGE;
 import net.runelite.api.events.NpcActionChanged;
 import net.runelite.api.mixins.FieldHook;
 import net.runelite.api.mixins.Inject;
@@ -50,6 +51,8 @@ public abstract class RSNpcCompositionMixin implements RSNPCComposition
 				return RANGED;
 			case 2:
 				return MAGIC;
+			case 6:
+				return RANGE_MAGE;
 			default:
 				return null;
 		}

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

@@ -31,6 +31,9 @@ import net.runelite.api.HeadIcon;
 import static net.runelite.api.HeadIcon.MAGIC;
 import static net.runelite.api.HeadIcon.MELEE;
 import static net.runelite.api.HeadIcon.RANGED;
+import static net.runelite.api.HeadIcon.REDEMPTION;
+import static net.runelite.api.HeadIcon.RETRIBUTION;
+import static net.runelite.api.HeadIcon.SMITE;
 import net.runelite.api.Model;
 import net.runelite.api.Perspective;
 import net.runelite.api.Point;
@@ -88,6 +91,12 @@ public abstract class RSPlayerMixin implements RSPlayer
 				return RANGED;
 			case 2:
 				return MAGIC;
+			case 3:
+				return RETRIBUTION;
+			case 4:
+				return SMITE;
+			case 5:
+				return REDEMPTION;
 			default:
 				return null;
 		}