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

mixins: refactor to use NameableContainer

Browse Source
This commit is contained in:
Owain van Brakel
2020-05-23 03:21:20 +02:00
parent 952fe24a03
commit ad1b7b8a0c
20 changed files with 135 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,12 +1,12 @@
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.mixins.Inject;
import net.runelite.api.mixins.Mixin;
import net.runelite.api.mixins.Shadow;
import net.runelite.rs.api.RSClanChat;
import net.runelite.rs.api.RSClanMate;
import net.runelite.rs.api.RSClient;
import net.runelite.rs.api.RSUser;
import net.runelite.rs.api.RSUsername;
@@ -21,7 +21,7 @@ public abstract class RSClanChatMixin implements RSClanChat
@Override
public void rl$add(RSUsername name, RSUsername prevName)
{
RSClanMate member = findByName(name);
ClanMember member = findByName(name);
if (member == null)
{
return;
@@ -35,7 +35,7 @@ public abstract class RSClanChatMixin implements RSClanChat
@Override
public void rl$remove(RSUser nameable)
{
RSClanMate member = findByName(nameable.getRsName());
ClanMember member = findByName(nameable.getRsName());
if (member == null)
{
return;

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

@@ -8,13 +8,6 @@ import net.runelite.rs.api.RSClanMate;
@Mixin(RSClanMate.class)
public abstract class RSClanMateMixin implements RSClanMate
{
@Override
@Inject
public String getUsername()
{
return getRsName().getName();
}
@Override
@Inject
public ClanMemberRank getRank()

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

@@ -28,7 +28,6 @@ import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.EnumSet;
import java.util.HashSet;
@@ -39,7 +38,6 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.inject.Named;
import net.runelite.api.ChatMessageType;
import net.runelite.api.ClanMember;
import net.runelite.api.EnumDefinition;
import net.runelite.api.Friend;
import net.runelite.api.GameState;
@@ -58,6 +56,7 @@ import net.runelite.api.MenuOpcode;
import net.runelite.api.MessageNode;
import net.runelite.api.NPC;
import net.runelite.api.NPCDefinition;
import net.runelite.api.NameableContainer;
import net.runelite.api.Node;
import net.runelite.api.ObjectDefinition;
import net.runelite.api.Player;
@@ -113,12 +112,9 @@ import net.runelite.api.widgets.WidgetItem;
import net.runelite.api.widgets.WidgetType;
import net.runelite.rs.api.RSAbstractArchive;
import net.runelite.rs.api.RSChatChannel;
import net.runelite.rs.api.RSClanChat;
import net.runelite.rs.api.RSClient;
import net.runelite.rs.api.RSEnumDefinition;
import net.runelite.rs.api.RSFriendSystem;
import net.runelite.rs.api.RSFriendsList;
import net.runelite.rs.api.RSIgnoreList;
import net.runelite.rs.api.RSIndexedSprite;
import net.runelite.rs.api.RSItemContainer;
import net.runelite.rs.api.RSNPC;
@@ -905,124 +901,16 @@ public abstract class RSClientMixin implements RSClient
@Inject
@Override
public int getClanChatCount()
public NameableContainer<Friend> getFriendContainer()
{
final RSClanChat clanMemberManager = getClanMemberManager();
return clanMemberManager != null ? clanMemberManager.getCount() : 0;
return getFriendManager().getFriendContainer();
}
@Inject
@Override
public ClanMember[] getClanMembers()
public NameableContainer<Ignore> getIgnoreContainer()
{
final RSClanChat clanMemberManager = getClanMemberManager();
if (clanMemberManager == null)
{
return null;
}
final int count = clanMemberManager.getCount();
return Arrays.copyOf(clanMemberManager.getNameables(), count);
}
@Inject
@Override
public String getClanOwner()
{
return getClanMemberManager().getClanOwner();
}
@Inject
@Override
public String getClanChatName()
{
return getClanMemberManager().getClanChatName();
}
@Inject
@Override
public Friend[] getFriends()
{
final RSFriendSystem friendManager = getFriendManager();
if (friendManager == null)
{
return null;
}
final RSFriendsList friendContainer = friendManager.getFriendContainer();
if (friendContainer == null)
{
return null;
}
final int count = friendContainer.getCount();
return Arrays.copyOf(friendContainer.getNameables(), count);
}
@Inject
@Override
public int getFriendsCount()
{
final RSFriendSystem friendManager = getFriendManager();
if (friendManager == null)
{
return -1;
}
final RSFriendsList friendContainer = friendManager.getFriendContainer();
if (friendContainer == null)
{
return -1;
}
return friendContainer.getCount();
}
@Inject
@Override
public Ignore[] getIgnores()
{
final RSFriendSystem friendManager = getFriendManager();
if (friendManager == null)
{
return null;
}
final RSIgnoreList ignoreContainer = friendManager.getIgnoreContainer();
if (ignoreContainer == null)
{
return null;
}
final int count = ignoreContainer.getCount();
return Arrays.copyOf(ignoreContainer.getNameables(), count);
}
@Inject
@Override
public int getIgnoreCount()
{
final RSFriendSystem friendManager = getFriendManager();
if (friendManager == null)
{
return -1;
}
final RSIgnoreList ignoreContainer = friendManager.getIgnoreContainer();
if (ignoreContainer == null)
{
return -1;
}
return ignoreContainer.getCount();
}
@Inject
@Override
public boolean isClanMember(String name)
{
final RSClanChat clanMemberManager = getClanMemberManager();
return clanMemberManager != null && clanMemberManager.isMember(createName(name, getLoginType()));
return getFriendManager().getIgnoreContainer();
}
@FieldHook("isDraggingWidget")

49
runelite-mixins/src/main/java/net/runelite/mixins/RSFriendMixin.java
View File

@@ -1,49 +0,0 @@
/*
* Copyright (c) 2018, Adam <Adam@sigterm.info>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.mixins;
import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.Mixin;
import net.runelite.rs.api.RSFriend;
import net.runelite.rs.api.RSUsername;
@Mixin(RSFriend.class)
public abstract class RSFriendMixin implements RSFriend
{
@Override
@Inject
public String getName()
{
return getRsName().getName();
}
@Override
@Inject
public String getPrevName()
{
RSUsername prevName = getRsPrevName();
return prevName == null ? null : prevName.getName();
}
}

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

@@ -78,6 +78,6 @@ public abstract class RSMessageMixin implements RSMessage
{
RSClanChat cc = client.getClanMemberManager();
return cc != null && cc.isMember(this.getSenderUsername());
return cc != null && cc.findByName(this.getSenderUsername()) != null;
}
}

23
runelite-mixins/src/main/java/net/runelite/mixins/RSUserListMixin.java
View File

@@ -1,8 +1,12 @@
package net.runelite.mixins;
import java.util.Arrays;
import net.runelite.api.Nameable;
import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.MethodHook;
import net.runelite.api.mixins.Mixin;
import net.runelite.api.mixins.Shadow;
import net.runelite.rs.api.RSClient;
import net.runelite.rs.api.RSUser;
import net.runelite.rs.api.RSUserList;
import net.runelite.rs.api.RSUsername;
@@ -10,6 +14,9 @@ import net.runelite.rs.api.RSUsername;
@Mixin(RSUserList.class)
public abstract class RSUserListMixin implements RSUserList
{
@Shadow("client")
private static RSClient client;
/**
* Default implementation of rl$add
*
@@ -46,4 +53,20 @@ public abstract class RSUserListMixin implements RSUserList
{
rl$remove(nameable);
}
@Inject
@Override
public Nameable[] getMembers()
{
Nameable[] nameables = this.getNameables();
int count = this.getCount();
return Arrays.copyOf(nameables, count);
}
@Inject
@Override
public Nameable findByName(String name)
{
return findByName(client.createName(name, client.getLoginType()));
}
}

6
runelite-mixins/src/main/java/net/runelite/mixins/RSIgnoredMixin.java → runelite-mixins/src/main/java/net/runelite/mixins/RSUserMixin.java
View File

@@ -2,11 +2,11 @@ package net.runelite.mixins;
import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.Mixin;
import net.runelite.rs.api.RSIgnored;
import net.runelite.rs.api.RSUser;
import net.runelite.rs.api.RSUsername;
@Mixin(RSIgnored.class)
public abstract class RSIgnoredMixin implements RSIgnored
@Mixin(RSUser.class)
public abstract class RSUserMixin implements RSUser
{
@Override
@Inject