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

runescape-api: make RSNameableContainer a generic type

Browse Source
This commit is contained in:
Adam
2019-03-02 18:25:29 -05:00
parent cbd36ff379
commit 9b0bb2b732
5 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,9 +77,9 @@ import net.runelite.api.events.BoostedLevelChanged;
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.ExperienceChanged;
import net.runelite.api.events.ClientTick;
import net.runelite.api.events.GameStateChanged;
import net.runelite.api.events.GrandExchangeOfferChanged;
import net.runelite.api.events.MenuEntryAdded;
@@ -120,7 +120,6 @@ import net.runelite.rs.api.RSItem;
import net.runelite.rs.api.RSItemContainer;
import net.runelite.rs.api.RSNPC;
import net.runelite.rs.api.RSName;
import net.runelite.rs.api.RSNameable;
import net.runelite.rs.api.RSPlayer;
import net.runelite.rs.api.RSSpritePixels;
import net.runelite.rs.api.RSWidget;
@@ -725,7 +724,7 @@ public abstract class RSClientMixin implements RSClient
public ClanMember[] getClanMembers()
{
final RSClanMemberManager clanMemberManager = getClanMemberManager();
return clanMemberManager != null ? (ClanMember[]) getClanMemberManager().getNameables() : null;
return clanMemberManager != null ? getClanMemberManager().getNameables() : null;
}
@Inject
@@ -744,8 +743,7 @@ public abstract class RSClientMixin implements RSClient
return null;
}
RSNameable[] nameables = friendContainer.getNameables();
return (Friend[]) nameables;
return friendContainer.getNameables();
}
@Inject
@@ -783,8 +781,7 @@ public abstract class RSClientMixin implements RSClient
return null;
}
RSNameable[] nameables = ignoreContainer.getNameables();
return (Ignore[]) nameables;
return ignoreContainer.getNameables();
}
@Inject

2
runescape-api/src/main/java/net/runelite/rs/api/RSClanMemberManager.java
View File

@@ -24,7 +24,7 @@
*/
package net.runelite.rs.api;
public interface RSClanMemberManager extends RSNameableContainer
public interface RSClanMemberManager extends RSNameableContainer<RSClanMember>
{
}

2
runescape-api/src/main/java/net/runelite/rs/api/RSFriendContainer.java
View File

@@ -24,6 +24,6 @@
*/
package net.runelite.rs.api;
public interface RSFriendContainer extends RSNameableContainer
public interface RSFriendContainer extends RSNameableContainer<RSFriend>
{
}

2
runescape-api/src/main/java/net/runelite/rs/api/RSIgnoreContainer.java
View File

@@ -24,6 +24,6 @@
*/
package net.runelite.rs.api;
public interface RSIgnoreContainer extends RSNameableContainer
public interface RSIgnoreContainer extends RSNameableContainer<RSIgnore>
{
}

4
runescape-api/src/main/java/net/runelite/rs/api/RSNameableContainer.java
View File

@@ -26,13 +26,13 @@ package net.runelite.rs.api;
import net.runelite.mapping.Import;
public interface RSNameableContainer
public interface RSNameableContainer<T extends RSNameable>
{
@Import("count")
int getCount();
@Import("nameables")
RSNameable[] getNameables();
T[] getNameables();
@Import("isMember")
boolean isMember(RSName var1);