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

Merge pull request #3220 from SRLJustin/1606-upstream

Browse Source 
project: upstream merge
This commit is contained in:
Justin
2022-06-16 21:38:57 +10:00
committed by GitHub
parent 8e6516f520 3be4a5ad84
commit 76f77ee46b
3 changed files with 5 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java
View File

@@ -52,7 +52,6 @@ import net.runelite.http.api.worlds.WorldResult;
class RaidsOverlay extends OverlayPanel class RaidsOverlay extends OverlayPanel
{ {
private static final int OLM_PLANE = 0; private static final int OLM_PLANE = 0;
static final String BROADCAST_ACTION = "Broadcast layout";
static final String SCREENSHOT_ACTION = "Screenshot"; static final String SCREENSHOT_ACTION = "Screenshot";
private final Client client; private final Client client;
@@ -74,7 +73,6 @@ class RaidsOverlay extends OverlayPanel
this.config = config; this.config = config;
this.worldService = worldService; this.worldService = worldService;
getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Raids overlay")); getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY_CONFIG, OPTION_CONFIGURE, "Raids overlay"));
getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY, BROADCAST_ACTION, "Raids overlay"));
getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY, SCREENSHOT_ACTION, "Raids overlay")); getMenuEntries().add(new OverlayMenuEntry(RUNELITE_OVERLAY, SCREENSHOT_ACTION, "Raids overlay"));
} }

30
runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java
View File

@@ -82,9 +82,6 @@ import net.runelite.client.events.ConfigChanged;
import net.runelite.client.events.OverlayMenuClicked; import net.runelite.client.events.OverlayMenuClicked;
import net.runelite.client.game.SpriteManager; import net.runelite.client.game.SpriteManager;
import net.runelite.client.input.KeyManager; import net.runelite.client.input.KeyManager;
import net.runelite.client.party.PartyMember;
import net.runelite.client.party.PartyService;
import net.runelite.client.party.messages.PartyChatMessage;
import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.plugins.raids.events.RaidReset; import net.runelite.client.plugins.raids.events.RaidReset;
@@ -152,9 +149,6 @@ public class RaidsPlugin extends Plugin
@Inject @Inject
private ClientThread clientThread; private ClientThread clientThread;
@Inject
private PartyService party;
@Inject @Inject
private ChatCommandManager chatCommandManager; private ChatCommandManager chatCommandManager;
@@ -357,11 +351,7 @@ public class RaidsPlugin extends Plugin
return; return;
} }
if (event.getEntry().getOption().equals(RaidsOverlay.BROADCAST_ACTION)) if (event.getEntry().getOption().equals(RaidsOverlay.SCREENSHOT_ACTION))
{
sendRaidLayoutMessage();
}
else if (event.getEntry().getOption().equals(RaidsOverlay.SCREENSHOT_ACTION))
{ {
screenshotScoutOverlay(); screenshotScoutOverlay();
} }
@@ -477,21 +467,11 @@ public class RaidsPlugin extends Plugin
.append(raidData) .append(raidData)
.build(); .build();
final PartyMember localMember = party.getLocalMember(); chatMessageManager.queue(QueuedMessage.builder()
.type(ChatMessageType.FRIENDSCHATNOTIFICATION)
.runeLiteFormattedMessage(layoutMessage)
.build());
if (party.getMembers().isEmpty() || localMember == null)
{
chatMessageManager.queue(QueuedMessage.builder()
.type(ChatMessageType.FRIENDSCHATNOTIFICATION)
.runeLiteFormattedMessage(layoutMessage)
.build());
}
else
{
final PartyChatMessage message = new PartyChatMessage(layoutMessage);
message.setMemberId(localMember.getMemberId());
party.send(message);
}
} }
private void updateInfoBoxState() private void updateInfoBoxState()

5
runelite-client/src/test/java/net/runelite/client/plugins/raids/RaidsPluginTest.java
View File

@@ -34,7 +34,6 @@ import net.runelite.client.Notifier;
import net.runelite.client.chat.ChatClient; import net.runelite.client.chat.ChatClient;
import net.runelite.client.config.ChatColorConfig; import net.runelite.client.config.ChatColorConfig;
import net.runelite.client.config.RuneLiteConfig; import net.runelite.client.config.RuneLiteConfig;
import net.runelite.client.party.PartyService;
import net.runelite.client.ui.overlay.OverlayManager; import net.runelite.client.ui.overlay.OverlayManager;
import net.runelite.client.ui.overlay.infobox.InfoBoxManager; import net.runelite.client.ui.overlay.infobox.InfoBoxManager;
import net.runelite.client.util.ImageCapture; import net.runelite.client.util.ImageCapture;
@@ -83,10 +82,6 @@ public class RaidsPluginTest
@Bind @Bind
InfoBoxManager infoBoxManager; InfoBoxManager infoBoxManager;
@Mock
@Bind
PartyService partyService;
@Mock @Mock
@Bind @Bind
OverlayManager overlayManager; OverlayManager overlayManager;