diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java index 1a2e05aaa9..7cfef3985c 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java @@ -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 diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClanMemberManager.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClanMemberManager.java index 1247b940d5..2f2cd6781a 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSClanMemberManager.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSClanMemberManager.java @@ -24,7 +24,7 @@ */ package net.runelite.rs.api; -public interface RSClanMemberManager extends RSNameableContainer +public interface RSClanMemberManager extends RSNameableContainer { } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSFriendContainer.java b/runescape-api/src/main/java/net/runelite/rs/api/RSFriendContainer.java index 165730c323..2b3793f478 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSFriendContainer.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSFriendContainer.java @@ -24,6 +24,6 @@ */ package net.runelite.rs.api; -public interface RSFriendContainer extends RSNameableContainer +public interface RSFriendContainer extends RSNameableContainer { } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSIgnoreContainer.java b/runescape-api/src/main/java/net/runelite/rs/api/RSIgnoreContainer.java index 350a3b083e..74fb4d5f37 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSIgnoreContainer.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSIgnoreContainer.java @@ -24,6 +24,6 @@ */ package net.runelite.rs.api; -public interface RSIgnoreContainer extends RSNameableContainer +public interface RSIgnoreContainer extends RSNameableContainer { } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSNameableContainer.java b/runescape-api/src/main/java/net/runelite/rs/api/RSNameableContainer.java index 4c0fe5c77a..18494e5a79 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSNameableContainer.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSNameableContainer.java @@ -26,13 +26,13 @@ package net.runelite.rs.api; import net.runelite.mapping.Import; -public interface RSNameableContainer +public interface RSNameableContainer { @Import("count") int getCount(); @Import("nameables") - RSNameable[] getNameables(); + T[] getNameables(); @Import("isMember") boolean isMember(RSName var1);