ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

project: Mixins

Browse Source
This commit is contained in:
Owain van Brakel
2022-04-14 03:37:37 +02:00
parent 004bc5c0f8
commit 1b3edac34c
3 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
runelite-mixins/src/main/java/net/runelite/mixins/RSFriendsChatMixin.java
View File

@@ -1,6 +1,7 @@
package net.runelite.mixins; package net.runelite.mixins;
import net.runelite.api.FriendsChatMember; import net.runelite.api.FriendsChatMember;
import net.runelite.api.FriendsChatRank;
import net.runelite.api.events.FriendsChatMemberJoined; import net.runelite.api.events.FriendsChatMemberJoined;
import net.runelite.api.events.FriendsChatMemberLeft; import net.runelite.api.events.FriendsChatMemberLeft;
import net.runelite.api.mixins.Inject; import net.runelite.api.mixins.Inject;
@@ -44,4 +45,18 @@ public abstract class RSFriendsChatMixin implements RSFriendsChat
FriendsChatMemberLeft event = new FriendsChatMemberLeft(member); FriendsChatMemberLeft event = new FriendsChatMemberLeft(member);
client.getCallbacks().postDeferred(event); client.getCallbacks().postDeferred(event);
} }
@Inject
@Override
public FriendsChatRank getMyRank()
{
return FriendsChatRank.valueOf(this.getRank());
}
@Inject
@Override
public FriendsChatRank getKickRank()
{
return FriendsChatRank.valueOf(this.getMinKickRank());
}
} }

11
runelite-mixins/src/main/java/net/runelite/mixins/VarbitMixin.java
View File

@@ -3,7 +3,6 @@ package net.runelite.mixins;
import net.runelite.api.VarClientInt; import net.runelite.api.VarClientInt;
import net.runelite.api.VarClientStr; import net.runelite.api.VarClientStr;
import net.runelite.api.VarbitComposition; import net.runelite.api.VarbitComposition;
import net.runelite.api.Varbits;
import com.google.common.cache.Cache; import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheBuilder;
import java.util.Map; import java.util.Map;
@@ -33,10 +32,9 @@ public abstract class VarbitMixin implements RSClient
@Inject @Inject
@Override @Override
public int getVar(Varbits varbit) public int getVar(int varbit)
{ {
int varbitId = varbit.getId(); return getVarbitValue(getVarps(), varbit);
return getVarbitValue(getVarps(), varbitId);
} }
@Inject @Inject
@@ -48,10 +46,9 @@ public abstract class VarbitMixin implements RSClient
@Inject @Inject
@Override @Override
public void setVarbit(Varbits varbit, int value) public void setVarbit(int varbit, int value)
{ {
int varbitId = varbit.getId(); setVarbitValue(getVarps(), varbit, value);
setVarbitValue(getVarps(), varbitId, value);
} }
@Inject @Inject

6
runescape-api/src/main/java/net/runelite/rs/api/RSFriendsChat.java
View File

@@ -11,4 +11,10 @@ public interface RSFriendsChat extends RSUserList<FriendsChatMember>, FriendsCha
@Import("name") @Import("name")
String getName(); String getName();
@Import("rank")
int getRank();
@Import("minKick")
byte getMinKickRank();
} }