From 9a0203d81345d3e9a04aac2ce95a3d4a7226b53f Mon Sep 17 00:00:00 2001 From: BrianSchimert <60760033+BrianSchimert@users.noreply.github.com> Date: Sat, 23 Oct 2021 19:29:36 -0600 Subject: [PATCH 1/3] chat commands: Add shorthand names for Grotesque Guardians (#14305) --- .../client/plugins/chatcommands/ChatCommandsPlugin.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java index ee1e8e2fa5..2a3c541bd1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatcommands/ChatCommandsPlugin.java @@ -1875,6 +1875,8 @@ public class ChatCommandsPlugin extends Plugin case "dusk": case "dawn": case "gargs": + case "ggs": + case "gg": return "Grotesque Guardians"; case "crazy arch": From 2f613fa300ed7698c3466b775b43b66148d52863 Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 24 Oct 2021 15:04:53 -0400 Subject: [PATCH 2/3] api: add clan id to clan channel changed event --- .../java/net/runelite/api/events/ClanChannelChanged.java | 5 +++++ .../java/net/runelite/client/plugins/team/TeamPlugin.java | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/runelite-api/src/main/java/net/runelite/api/events/ClanChannelChanged.java b/runelite-api/src/main/java/net/runelite/api/events/ClanChannelChanged.java index 57abd91dbb..d9e3edbbff 100644 --- a/runelite-api/src/main/java/net/runelite/api/events/ClanChannelChanged.java +++ b/runelite-api/src/main/java/net/runelite/api/events/ClanChannelChanged.java @@ -39,6 +39,11 @@ public class ClanChannelChanged */ @Nullable private final ClanChannel clanChannel; + /** + * The clan id, or -1 for guest clan + * @see net.runelite.api.clan.ClanID + */ + private int clanId; /** * Whether or not this was the guest clan channel */ diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/team/TeamPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/team/TeamPlugin.java index 4d78816524..178454ace0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/team/TeamPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/team/TeamPlugin.java @@ -45,6 +45,7 @@ import net.runelite.api.Player; import net.runelite.api.SpriteID; import net.runelite.api.clan.ClanChannel; import net.runelite.api.clan.ClanChannelMember; +import net.runelite.api.clan.ClanID; import net.runelite.api.events.ClanChannelChanged; import net.runelite.api.events.ClanMemberJoined; import net.runelite.api.events.ClanMemberLeft; @@ -290,7 +291,7 @@ public class TeamPlugin extends Plugin @Subscribe public void onClanChannelChanged(ClanChannelChanged event) { - if (!event.isGuest()) + if (event.getClanId() == ClanID.CLAN) { removeClanChatCounter(); clanChatCount = 0; From 455e75b7bc819e9aa1123051cd4f153ca95fbb55 Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 24 Oct 2021 16:56:48 -0400 Subject: [PATCH 3/3] widget overlay: update gwd kc position --- .../main/java/net/runelite/client/ui/overlay/WidgetOverlay.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java index 6cdd78248c..93f71a5f90 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java @@ -50,7 +50,7 @@ public class WidgetOverlay extends Overlay new WidgetOverlay(client, WidgetInfo.RAIDS_POINTS_INFOBOX, OverlayPosition.TOP_LEFT), new WidgetOverlay(client, WidgetInfo.TOB_PARTY_INTERFACE, OverlayPosition.TOP_LEFT), new WidgetOverlay(client, WidgetInfo.TOB_PARTY_STATS, OverlayPosition.TOP_LEFT), - new WidgetOverlay(client, WidgetInfo.GWD_KC, OverlayPosition.TOP_RIGHT), + new WidgetOverlay(client, WidgetInfo.GWD_KC, OverlayPosition.TOP_LEFT), new WidgetOverlay(client, WidgetInfo.TITHE_FARM, OverlayPosition.TOP_RIGHT), new WidgetOverlay(client, WidgetInfo.PEST_CONTROL_BOAT_INFO, OverlayPosition.TOP_LEFT), new WidgetOverlay(client, WidgetInfo.PEST_CONTROL_KNIGHT_INFO_CONTAINER, OverlayPosition.TOP_LEFT),