Skip to content

Deprecation fixes #190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Cyborger1 merged 1 commit into from
Feb 18, 2025
Merged

Deprecation fixes #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions src/main/java/com/botdetector/BotDetectorPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@
import net.runelite.api.MessageNode;
import net.runelite.api.Player;
import net.runelite.api.WorldType;
import net.runelite.api.WorldView;
import net.runelite.api.coords.WorldPoint;
import net.runelite.api.events.ChatMessage;
import net.runelite.api.events.CommandExecuted;
Expand Down Expand Up @@ -1002,6 +1003,12 @@ private void onMenuOpened(MenuOpened event)
return;
}

final WorldView wv = client.getTopLevelWorldView();
if (wv == null)
{
return;
}

boolean changeReportOption = config.applyPredictColorsOnReportOption();
// Do this once when the menu opens
// Avoids having to loop the menu entries on every 'added' event
Expand All @@ -1017,7 +1024,7 @@ private void onMenuOpened(MenuOpened event)
if (type == MenuAction.RUNELITE_PLAYER.getId()
&& entry.getOption().equals(PREDICT_OPTION))
{
Player player = client.getCachedPlayers()[entry.getIdentifier()];
Player player = wv.players().byIndex(entry.getIdentifier());
if (player != null)
{
entry.setOption(getPredictOption(player.getName()));
Expand All @@ -1028,7 +1035,7 @@ private void onMenuOpened(MenuOpened event)
if (changeReportOption && entry.getOption().equals(REPORT_OPTION)
&& (PLAYER_MENU_ACTIONS.contains(entry.getType()) || entry.getType() == MenuAction.CC_OP_LOW_PRIORITY))
{
Player player = client.getCachedPlayers()[entry.getIdentifier()];
Player player = wv.players().byIndex(entry.getIdentifier());
if (player != null)
{
entry.setOption(getReportOption(player.getName()));
Expand All @@ -1050,8 +1057,13 @@ private void onMenuOptionClicked(MenuOptionClicked event)
if (event.getMenuAction() == MenuAction.RUNELITE_PLAYER
|| PLAYER_MENU_ACTIONS.contains(event.getMenuAction()))
{
Player player = client.getCachedPlayers()[event.getId()];
WorldView wv = client.getTopLevelWorldView();
if (wv == null)
{
return;
}

Player player = wv.players().byIndex(event.getId());
if (player == null)
{
return;
Expand Down
18 changes: 11 additions & 7 deletions src/main/java/com/botdetector/ui/NameAutocompleter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
import net.runelite.api.Nameable;
import net.runelite.api.NameableContainer;
import net.runelite.api.Player;
import net.runelite.api.WorldView;

@Slf4j
@Singleton
Expand Down Expand Up @@ -241,13 +242,16 @@ private boolean findAutocompleteName(String nameStart)
// Search cached players if a friend wasn't found
if (!autocompleteName.isPresent())
{
final Player[] cachedPlayers = client.getCachedPlayers();
autocompleteName = Arrays.stream(cachedPlayers)
.filter(Objects::nonNull)
.map(Player::getName)
.filter(Objects::nonNull)
.filter(n -> pattern.matcher(n).matches())
.findFirst();
final WorldView wv = client.getTopLevelWorldView();
if (wv != null)
{
autocompleteName = wv.players().stream()
.filter(Objects::nonNull)
.map(Player::getName)
.filter(Objects::nonNull)
.filter(n -> pattern.matcher(n).matches())
.findFirst();
}
}

if (autocompleteName.isPresent())
Expand Down
Loading