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

Merge remote-tracking branch 'runelite/master'

Browse Source
This commit is contained in:
Owain van Brakel
2020-06-18 11:01:33 +02:00
parent 3dab4ee601 1fbb9058c0
commit 757130215f
92 changed files with 555 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-mixins/src/main/java/net/runelite/mixins/EntityHiderBridgeMixin.java
View File

@@ -118,7 +118,7 @@ public abstract class EntityHiderBridgeMixin implements RSClient
@Inject
@Override
public void setClanMatesHidden(boolean state)
public void setFriendsChatMembersHidden(boolean state)
{
hideClanMates = state;
}

2
runelite-mixins/src/main/java/net/runelite/mixins/EntityHiderMixin.java
View File

@@ -180,7 +180,7 @@ public abstract class EntityHiderMixin implements RSScene
}
return (!hideFriends && player.isFriend()) ||
(!isLocalPlayer && !hideClanMates && player.isClanMember());
(!isLocalPlayer && !hideClanMates && player.isFriendsChatMember());
}
}
else if (entity instanceof RSNPC)

18
runelite-mixins/src/main/java/net/runelite/mixins/RSClanChatMixin.java
View File

@@ -1,8 +1,8 @@
package net.runelite.mixins;
import net.runelite.api.ClanMember;
import net.runelite.api.events.ClanMemberJoined;
import net.runelite.api.events.ClanMemberLeft;
import net.runelite.api.FriendsChatMember;
import net.runelite.api.events.FriendsChatMemberJoined;
import net.runelite.api.events.FriendsChatMemberLeft;
import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.Mixin;
import net.runelite.api.mixins.Shadow;
@@ -21,27 +21,27 @@ public abstract class RSClanChatMixin implements RSClanChat
@Override
public void rl$add(RSUsername name, RSUsername prevName)
{
ClanMember member = findByName(name);
FriendsChatMember member = findByName(name);
if (member == null)
{
return;
}
ClanMemberJoined event = new ClanMemberJoined(member);
client.getCallbacks().postDeferred(ClanMemberJoined.class, event);
FriendsChatMemberJoined event = new FriendsChatMemberJoined(member);
client.getCallbacks().postDeferred(FriendsChatMemberJoined.class, event);
}
@Inject
@Override
public void rl$remove(RSUser nameable)
{
ClanMember member = findByName(nameable.getRsName());
FriendsChatMember member = findByName(nameable.getRsName());
if (member == null)
{
return;
}
ClanMemberLeft event = new ClanMemberLeft(member);
client.getCallbacks().postDeferred(ClanMemberLeft.class, event);
FriendsChatMemberLeft event = new FriendsChatMemberLeft(member);
client.getCallbacks().postDeferred(FriendsChatMemberLeft.class, event);
}
}

6
runelite-mixins/src/main/java/net/runelite/mixins/RSClanMateMixin.java
View File

@@ -1,6 +1,6 @@
package net.runelite.mixins;
import net.runelite.api.ClanMemberRank;
import net.runelite.api.FriendsChatRank;
import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.Mixin;
import net.runelite.rs.api.RSClanMate;
@@ -10,8 +10,8 @@ public abstract class RSClanMateMixin implements RSClanMate
{
@Override
@Inject
public ClanMemberRank getRank()
public FriendsChatRank getRank()
{
return ClanMemberRank.valueOf(getRSRank());
return FriendsChatRank.valueOf(getRSRank());
}
}

8
runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
View File

@@ -76,9 +76,9 @@ import net.runelite.api.coords.LocalPoint;
import net.runelite.api.coords.WorldPoint;
import net.runelite.api.events.CanvasSizeChanged;
import net.runelite.api.events.ChatMessage;
import net.runelite.api.events.ClanChanged;
import net.runelite.api.events.ClientTick;
import net.runelite.api.events.DraggingWidgetChanged;
import net.runelite.api.events.FriendsChatChanged;
import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.GrandExchangeOfferChanged;
import net.runelite.api.events.GrandExchangeSearched;
@@ -1179,7 +1179,7 @@ public abstract class RSClientMixin implements RSClient
@Inject
public static void clanMemberManagerChanged(int idx)
{
client.getCallbacks().post(ClanChanged.class, new ClanChanged(client.getClanMemberManager() != null));
client.getCallbacks().post(FriendsChatChanged.class, new FriendsChatChanged(client.getClanMemberManager() != null));
}
@FieldHook("canvasWidth")
@@ -1713,11 +1713,11 @@ public abstract class RSClientMixin implements RSClient
{
if (client.isSpellSelected())
{
return ((hideFriendCastOptions && p.isFriended()) || (hideClanmateCastOptions && p.isClanMember()))
return ((hideFriendCastOptions && p.isFriended()) || (hideClanmateCastOptions && p.isFriendsChatMember()))
&& !unhiddenCasts.contains(client.getSelectedSpellName().replaceAll("<[^>]*>", "").toLowerCase());
}
return ((hideFriendAttackOptions && p.isFriended()) || (hideClanmateAttackOptions && p.isClanMember()));
return ((hideFriendAttackOptions && p.isFriended()) || (hideClanmateAttackOptions && p.isFriendsChatMember()));
}
@Inject