From f7f87c16335cf9d7a4b4a6429a645b0ac19482c4 Mon Sep 17 00:00:00 2001 From: RuneLite updater Date: Wed, 15 Jun 2022 10:35:51 +0000 Subject: [PATCH 1/4] Update 206 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c04c87490a..542c083dff 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,7 @@ true - 205 + 206 From 5591ef6cf695ebd2e346ad6b8ecf18d869c75b57 Mon Sep 17 00:00:00 2001 From: RuneLite updater Date: Wed, 15 Jun 2022 10:56:37 +0000 Subject: [PATCH 2/4] Release 1.8.23 --- cache-client/pom.xml | 2 +- cache-updater/pom.xml | 2 +- cache/pom.xml | 2 +- pom.xml | 4 ++-- runelite-api/pom.xml | 2 +- runelite-client/pom.xml | 2 +- runelite-jshell/pom.xml | 2 +- runelite-script-assembler-plugin/pom.xml | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cache-client/pom.xml b/cache-client/pom.xml index 645526da0c..371dcb324c 100644 --- a/cache-client/pom.xml +++ b/cache-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.8.23-SNAPSHOT + 1.8.23 cache-client diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml index 03add8de0e..3abd746aee 100644 --- a/cache-updater/pom.xml +++ b/cache-updater/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.8.23-SNAPSHOT + 1.8.23 Cache Updater diff --git a/cache/pom.xml b/cache/pom.xml index 4361d10310..9bc9f27066 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.8.23-SNAPSHOT + 1.8.23 cache diff --git a/pom.xml b/pom.xml index 542c083dff..665f308f77 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.8.23-SNAPSHOT + 1.8.23 pom RuneLite @@ -63,7 +63,7 @@ https://github.com/runelite/runelite scm:git:git://github.com/runelite/runelite scm:git:git@github.com:runelite/runelite - HEAD + runelite-parent-1.8.23 diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index 37f30a7021..a5300e2475 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.8.23-SNAPSHOT + 1.8.23 runelite-api diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index 29e3fcf44f..c9e29dae69 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.8.23-SNAPSHOT + 1.8.23 client diff --git a/runelite-jshell/pom.xml b/runelite-jshell/pom.xml index 75e508c003..22a0d273e1 100644 --- a/runelite-jshell/pom.xml +++ b/runelite-jshell/pom.xml @@ -30,7 +30,7 @@ net.runelite runelite-parent - 1.8.23-SNAPSHOT + 1.8.23 jshell diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index 7574c24f15..53cb9591a5 100644 --- a/runelite-script-assembler-plugin/pom.xml +++ b/runelite-script-assembler-plugin/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.8.23-SNAPSHOT + 1.8.23 script-assembler-plugin From ebda5542d031ce28158795c60d4fb36f838ab9c5 Mon Sep 17 00:00:00 2001 From: RuneLite updater Date: Wed, 15 Jun 2022 10:56:42 +0000 Subject: [PATCH 3/4] Bump for 1.8.24-SNAPSHOT [ci skip] --- cache-client/pom.xml | 2 +- cache-updater/pom.xml | 2 +- cache/pom.xml | 2 +- pom.xml | 4 ++-- runelite-api/pom.xml | 2 +- runelite-client/pom.xml | 2 +- runelite-jshell/pom.xml | 2 +- runelite-script-assembler-plugin/pom.xml | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cache-client/pom.xml b/cache-client/pom.xml index 371dcb324c..326fea1b33 100644 --- a/cache-client/pom.xml +++ b/cache-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.8.23 + 1.8.24-SNAPSHOT cache-client diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml index 3abd746aee..a2f587ca63 100644 --- a/cache-updater/pom.xml +++ b/cache-updater/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.8.23 + 1.8.24-SNAPSHOT Cache Updater diff --git a/cache/pom.xml b/cache/pom.xml index 9bc9f27066..fdc883e94b 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.8.23 + 1.8.24-SNAPSHOT cache diff --git a/pom.xml b/pom.xml index 665f308f77..ebad708caa 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.8.23 + 1.8.24-SNAPSHOT pom RuneLite @@ -63,7 +63,7 @@ https://github.com/runelite/runelite scm:git:git://github.com/runelite/runelite scm:git:git@github.com:runelite/runelite - runelite-parent-1.8.23 + HEAD diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index a5300e2475..6fd3650528 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.8.23 + 1.8.24-SNAPSHOT runelite-api diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index c9e29dae69..6b35a90611 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.8.23 + 1.8.24-SNAPSHOT client diff --git a/runelite-jshell/pom.xml b/runelite-jshell/pom.xml index 22a0d273e1..5083fe1588 100644 --- a/runelite-jshell/pom.xml +++ b/runelite-jshell/pom.xml @@ -30,7 +30,7 @@ net.runelite runelite-parent - 1.8.23 + 1.8.24-SNAPSHOT jshell diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index 53cb9591a5..eccd0ed7d6 100644 --- a/runelite-script-assembler-plugin/pom.xml +++ b/runelite-script-assembler-plugin/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.8.23 + 1.8.24-SNAPSHOT script-assembler-plugin From 0c4f35560b5c023e97d1d36a094fc3985c4df1a3 Mon Sep 17 00:00:00 2001 From: Adam Date: Tue, 14 Jun 2022 19:34:36 -0400 Subject: [PATCH 4/4] raids: remove party scout message This isn't used much and is superseded by !layout --- .../client/plugins/raids/RaidsOverlay.java | 2 -- .../client/plugins/raids/RaidsPlugin.java | 30 ++++--------------- .../client/plugins/raids/RaidsPluginTest.java | 5 ---- 3 files changed, 5 insertions(+), 32 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java index 4a7031a068..72af261e1b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java @@ -52,7 +52,6 @@ import net.runelite.http.api.worlds.WorldResult; class RaidsOverlay extends OverlayPanel { private static final int OLM_PLANE = 0; - static final String BROADCAST_ACTION = "Broadcast layout"; static final String SCREENSHOT_ACTION = "Screenshot"; private final Client client; @@ -74,7 +73,6 @@ class RaidsOverlay extends OverlayPanel this.config = config; this.worldService = worldService; 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")); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java index 3f47bedc7c..e9a44fa7b4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java @@ -82,9 +82,6 @@ import net.runelite.client.events.ConfigChanged; import net.runelite.client.events.OverlayMenuClicked; import net.runelite.client.game.SpriteManager; 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.PluginDescriptor; import net.runelite.client.plugins.raids.events.RaidReset; @@ -152,9 +149,6 @@ public class RaidsPlugin extends Plugin @Inject private ClientThread clientThread; - @Inject - private PartyService party; - @Inject private ChatCommandManager chatCommandManager; @@ -357,11 +351,7 @@ public class RaidsPlugin extends Plugin return; } - if (event.getEntry().getOption().equals(RaidsOverlay.BROADCAST_ACTION)) - { - sendRaidLayoutMessage(); - } - else if (event.getEntry().getOption().equals(RaidsOverlay.SCREENSHOT_ACTION)) + if (event.getEntry().getOption().equals(RaidsOverlay.SCREENSHOT_ACTION)) { screenshotScoutOverlay(); } @@ -477,21 +467,11 @@ public class RaidsPlugin extends Plugin .append(raidData) .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() diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/raids/RaidsPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/raids/RaidsPluginTest.java index 9bab623f62..27c217cefb 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/raids/RaidsPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/raids/RaidsPluginTest.java @@ -34,7 +34,6 @@ import net.runelite.client.Notifier; import net.runelite.client.chat.ChatClient; import net.runelite.client.config.ChatColorConfig; 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.infobox.InfoBoxManager; import net.runelite.client.util.ImageCapture; @@ -83,10 +82,6 @@ public class RaidsPluginTest @Bind InfoBoxManager infoBoxManager; - @Mock - @Bind - PartyService partyService; - @Mock @Bind OverlayManager overlayManager;