diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSFriendsChatMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSFriendsChatMixin.java index 0eb0808c39..10befdb078 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSFriendsChatMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSFriendsChatMixin.java @@ -1,6 +1,7 @@ package net.runelite.mixins; import net.runelite.api.FriendsChatMember; +import net.runelite.api.FriendsChatRank; import net.runelite.api.events.FriendsChatMemberJoined; import net.runelite.api.events.FriendsChatMemberLeft; import net.runelite.api.mixins.Inject; @@ -44,4 +45,18 @@ public abstract class RSFriendsChatMixin implements RSFriendsChat FriendsChatMemberLeft event = new FriendsChatMemberLeft(member); client.getCallbacks().postDeferred(event); } + + @Inject + @Override + public FriendsChatRank getMyRank() + { + return FriendsChatRank.valueOf(this.getRank()); + } + + @Inject + @Override + public FriendsChatRank getKickRank() + { + return FriendsChatRank.valueOf(this.getMinKickRank()); + } } diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/VarbitMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/VarbitMixin.java index a075dfcaac..0da4187c7e 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/VarbitMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/VarbitMixin.java @@ -3,7 +3,6 @@ package net.runelite.mixins; import net.runelite.api.VarClientInt; import net.runelite.api.VarClientStr; import net.runelite.api.VarbitComposition; -import net.runelite.api.Varbits; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import java.util.Map; @@ -33,10 +32,9 @@ public abstract class VarbitMixin implements RSClient @Inject @Override - public int getVar(Varbits varbit) + public int getVar(int varbit) { - int varbitId = varbit.getId(); - return getVarbitValue(getVarps(), varbitId); + return getVarbitValue(getVarps(), varbit); } @Inject @@ -48,10 +46,9 @@ public abstract class VarbitMixin implements RSClient @Inject @Override - public void setVarbit(Varbits varbit, int value) + public void setVarbit(int varbit, int value) { - int varbitId = varbit.getId(); - setVarbitValue(getVarps(), varbitId, value); + setVarbitValue(getVarps(), varbit, value); } @Inject diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSFriendsChat.java b/runescape-api/src/main/java/net/runelite/rs/api/RSFriendsChat.java index e7ec57dc48..325c8ba0e2 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSFriendsChat.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSFriendsChat.java @@ -11,4 +11,10 @@ public interface RSFriendsChat extends RSUserList, FriendsCha @Import("name") String getName(); + + @Import("rank") + int getRank(); + + @Import("minKick") + byte getMinKickRank(); }