diff --git a/runelite-client/src/main/java/net/runelite/client/account/SessionManager.java b/runelite-client/src/main/java/net/runelite/client/account/SessionManager.java index 32fe52d7f8..b98168b4aa 100644 --- a/runelite-client/src/main/java/net/runelite/client/account/SessionManager.java +++ b/runelite-client/src/main/java/net/runelite/client/account/SessionManager.java @@ -68,7 +68,7 @@ public class SessionManager this.eventBus = eventBus; this.wsClient = wsClient; - this.eventBus.subscribe(LoginResponse.class, this, o -> this.onLoginResponse((LoginResponse) o)); + this.eventBus.subscribe(LoginResponse.class, this, this::onLoginResponse); } public void loadSession() diff --git a/runelite-client/src/main/java/net/runelite/client/chat/ChatCommandManager.java b/runelite-client/src/main/java/net/runelite/client/chat/ChatCommandManager.java index 0454949813..a336008d95 100644 --- a/runelite-client/src/main/java/net/runelite/client/chat/ChatCommandManager.java +++ b/runelite-client/src/main/java/net/runelite/client/chat/ChatCommandManager.java @@ -55,7 +55,7 @@ public class ChatCommandManager implements ChatboxInputListener // eventBus.register(this); commandManager.register(this); - eventBus.subscribe(ChatMessage.class, this, o -> this.onChatMessage((ChatMessage) o)); + eventBus.subscribe(ChatMessage.class, this, this::onChatMessage); } public void registerCommand(String command, BiConsumer execute) diff --git a/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java b/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java index a5f878b749..c47b52126b 100644 --- a/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java +++ b/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java @@ -79,11 +79,11 @@ public class ChatMessageManager this.chatColorConfig = chatColorConfig; this.clientThread = clientThread; - eventbus.subscribe(VarbitChanged.class, this, o -> this.onVarbitChanged((VarbitChanged) o)); - eventbus.subscribe(ResizeableChanged.class, this, o -> this.onResizeableChanged((ResizeableChanged) o)); - eventbus.subscribe(ConfigChanged.class, this, o -> this.onConfigChanged((ConfigChanged) o)); - eventbus.subscribe(ChatMessage.class, this, o -> this.onChatMessage((ChatMessage) o)); - eventbus.subscribe(ScriptCallbackEvent.class, this, o -> this.onScriptCallbackEvent((ScriptCallbackEvent) o)); + eventbus.subscribe(VarbitChanged.class, this, this::onVarbitChanged); + eventbus.subscribe(ResizeableChanged.class, this, this::onResizeableChanged); + eventbus.subscribe(ConfigChanged.class, this, this::onConfigChanged); + eventbus.subscribe(ChatMessage.class, this, this::onChatMessage); + eventbus.subscribe(ScriptCallbackEvent.class, this, this::onScriptCallbackEvent); } private void onVarbitChanged(VarbitChanged event) diff --git a/runelite-client/src/main/java/net/runelite/client/chat/CommandManager.java b/runelite-client/src/main/java/net/runelite/client/chat/CommandManager.java index f5169a80ea..f2871651bc 100644 --- a/runelite-client/src/main/java/net/runelite/client/chat/CommandManager.java +++ b/runelite-client/src/main/java/net/runelite/client/chat/CommandManager.java @@ -67,7 +67,7 @@ public class CommandManager this.eventBus = eventBus; this.clientThread = clientThread; - eventBus.subscribe(ScriptCallbackEvent.class, this, o -> this.onScriptCallbackEvent((ScriptCallbackEvent) o)); + eventBus.subscribe(ScriptCallbackEvent.class, this, this::onScriptCallbackEvent); } public void register(ChatboxInputListener chatboxInputListener) diff --git a/runelite-client/src/main/java/net/runelite/client/game/ClanManager.java b/runelite-client/src/main/java/net/runelite/client/game/ClanManager.java index 307c6ac5b0..2d5bbe832c 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/ClanManager.java +++ b/runelite-client/src/main/java/net/runelite/client/game/ClanManager.java @@ -106,8 +106,8 @@ public class ClanManager this.client = client; this.spriteManager = spriteManager; - eventbus.subscribe(GameStateChanged.class, this, o -> this.onGameStateChanged((GameStateChanged) o)); - eventbus.subscribe(ClanChanged.class, this, o -> this.onClanChanged((ClanChanged) o)); + eventbus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); + eventbus.subscribe(ClanChanged.class, this, this::onClanChanged); } public ClanMemberRank getRank(String playerName) diff --git a/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java b/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java index 8a234dce71..c9b22cf5e8 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java +++ b/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java @@ -316,8 +316,8 @@ public class ItemManager }); - eventbus.subscribe(GameStateChanged.class, this, o -> this.onGameStateChanged((GameStateChanged) o)); - eventbus.subscribe(PostItemDefinition.class, this, o -> this.onPostItemDefinition((PostItemDefinition) o)); + eventbus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); + eventbus.subscribe(PostItemDefinition.class, this, this::onPostItemDefinition); } private void loadPrices() diff --git a/runelite-client/src/main/java/net/runelite/client/game/LootManager.java b/runelite-client/src/main/java/net/runelite/client/game/LootManager.java index 54e26f99c7..2a6ad376de 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/LootManager.java +++ b/runelite-client/src/main/java/net/runelite/client/game/LootManager.java @@ -81,13 +81,13 @@ public class LootManager this.eventBus = eventBus; this.client = client; - eventBus.subscribe(GameTick.class, this, o -> this.onGameTick((GameTick) o)); - eventBus.subscribe(NpcDespawned.class, this, o -> this.onNpcDespawned((NpcDespawned) o)); - eventBus.subscribe(PlayerDespawned.class, this, o -> this.onPlayerDespawned((PlayerDespawned) o)); - eventBus.subscribe(ItemSpawned.class, this, o -> this.onItemSpawned((ItemSpawned) o)); - eventBus.subscribe(ItemDespawned.class, this, o -> this.onItemDespawned((ItemDespawned) o)); - eventBus.subscribe(ItemQuantityChanged.class, this, o -> this.onItemQuantityChanged((ItemQuantityChanged) o)); - eventBus.subscribe(AnimationChanged.class, this, o -> this.onAnimationChanged((AnimationChanged) o)); + eventBus.subscribe(GameTick.class, this, this::onGameTick); + eventBus.subscribe(NpcDespawned.class, this, this::onNpcDespawned); + eventBus.subscribe(PlayerDespawned.class, this, this::onPlayerDespawned); + eventBus.subscribe(ItemSpawned.class, this, this::onItemSpawned); + eventBus.subscribe(ItemDespawned.class, this, this::onItemDespawned); + eventBus.subscribe(ItemQuantityChanged.class, this, this::onItemQuantityChanged); + eventBus.subscribe(AnimationChanged.class, this, this::onAnimationChanged); } private void onNpcDespawned(NpcDespawned npcDespawned) diff --git a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxPanelManager.java b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxPanelManager.java index dfdcf1b4e5..59c6d72a00 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxPanelManager.java +++ b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxPanelManager.java @@ -80,8 +80,8 @@ public class ChatboxPanelManager this.chatboxTextInputProvider = chatboxTextInputProvider; - eventBus.subscribe(ScriptCallbackEvent.class, this, o -> this.onScriptCallbackEvent((ScriptCallbackEvent) o)); - eventBus.subscribe(GameStateChanged.class, this, o -> this.onGameStateChanged((GameStateChanged) o)); + eventBus.subscribe(ScriptCallbackEvent.class, this, this::onScriptCallbackEvent); + eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); } public void close() diff --git a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java index 41e6eba005..242e3df28f 100644 --- a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java +++ b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java @@ -107,13 +107,13 @@ public class MenuManager this.eventBus = eventBus; - eventBus.subscribe(MenuOpened.class, this, o -> this.onMenuOpened((MenuOpened) o)); - eventBus.subscribe(MenuEntryAdded.class, this, o -> this.onMenuEntryAdded((MenuEntryAdded) o)); - eventBus.subscribe(BeforeRender.class, this, o -> this.onBeforeRender((BeforeRender) o)); - eventBus.subscribe(PlayerMenuOptionsChanged.class, this, o -> this.onPlayerMenuOptionsChanged((PlayerMenuOptionsChanged) o)); - eventBus.subscribe(NpcActionChanged.class, this, o -> this.onNpcActionChanged((NpcActionChanged) o)); - eventBus.subscribe(WidgetPressed.class, this, o -> this.onWidgetPressed((WidgetPressed) o)); - eventBus.subscribe(MenuOptionClicked.class, this, o -> this.onMenuOptionClicked((MenuOptionClicked) o)); + eventBus.subscribe(MenuOpened.class, this, this::onMenuOpened); + eventBus.subscribe(MenuEntryAdded.class, this, this::onMenuEntryAdded); + eventBus.subscribe(BeforeRender.class, this, this::onBeforeRender); + eventBus.subscribe(PlayerMenuOptionsChanged.class, this, this::onPlayerMenuOptionsChanged); + eventBus.subscribe(NpcActionChanged.class, this, this::onNpcActionChanged); + eventBus.subscribe(WidgetPressed.class, this, this::onWidgetPressed); + eventBus.subscribe(MenuOptionClicked.class, this, this::onMenuOptionClicked); } /** diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java b/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java index 43620893b5..6cf52036ee 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java @@ -119,8 +119,8 @@ public class PluginManager this.executor = executor; this.sceneTileManager = sceneTileManager; - eventBus.subscribe(SessionOpen.class, this, o -> this.onSessionOpen((SessionOpen) o)); - eventBus.subscribe(SessionClose.class, this, o -> this.onSessionClose((SessionClose) o)); + eventBus.subscribe(SessionOpen.class, this, this::onSessionOpen); + eventBus.subscribe(SessionClose.class, this, this::onSessionClose); } public void watch() diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java index 48bc45c8cf..79628e5377 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/aoewarnings/AoeWarningPlugin.java @@ -191,12 +191,12 @@ public class AoeWarningPlugin extends Plugin private void addSubscriptions() { - eventbus.subscribe(ConfigChanged.class, this, o -> this.onConfigChanged((ConfigChanged) o)); - eventbus.subscribe(ProjectileMoved.class, this, o -> this.onProjectileMoved((ProjectileMoved) o)); - eventbus.subscribe(GameObjectSpawned.class, this, o -> this.onGameObjectSpawned((GameObjectSpawned) o)); - eventbus.subscribe(GameObjectDespawned.class, this, o -> this.onGameObjectDespawned((GameObjectDespawned) o)); - eventbus.subscribe(GameStateChanged.class, this, o -> this.onGameStateChanged((GameStateChanged) o)); - eventbus.subscribe(GameTick.class, this, o -> this.onGameTick((GameTick) o)); + eventbus.subscribe(ConfigChanged.class, this, this::onConfigChanged); + eventbus.subscribe(ProjectileMoved.class, this, this::onProjectileMoved); + eventbus.subscribe(GameObjectSpawned.class, this, this::onGameObjectSpawned); + eventbus.subscribe(GameObjectDespawned.class, this, this::onGameObjectDespawned); + eventbus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); + eventbus.subscribe(GameTick.class, this, this::onGameTick); } private void onConfigChanged(ConfigChanged event) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java index 344dd5b4e6..44a1a3aee1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonPlugin.java @@ -175,12 +175,12 @@ public class CannonPlugin extends Plugin private void addSubscriptions() { - eventbus.subscribe(ConfigChanged.class, this, o -> this.onConfigChanged((ConfigChanged) o)); - eventbus.subscribe(ItemContainerChanged.class, this, o -> this.onItemContainerChanged((ItemContainerChanged) o)); - eventbus.subscribe(GameObjectSpawned.class, this, o -> this.onGameObjectSpawned((GameObjectSpawned) o)); - eventbus.subscribe(ProjectileMoved.class, this, o -> this.onProjectileMoved((ProjectileMoved) o)); - eventbus.subscribe(ChatMessage.class, this, o -> this.onChatMessage((ChatMessage) o)); - eventbus.subscribe(GameTick.class, this, o -> this.onGameTick((GameTick) o)); + eventbus.subscribe(ConfigChanged.class, this, this::onConfigChanged); + eventbus.subscribe(ItemContainerChanged.class, this, this::onItemContainerChanged); + eventbus.subscribe(GameObjectSpawned.class, this, this::onGameObjectSpawned); + eventbus.subscribe(ProjectileMoved.class, this, this::onProjectileMoved); + eventbus.subscribe(ChatMessage.class, this, this::onChatMessage); + eventbus.subscribe(GameTick.class, this, this::onGameTick); } private void onItemContainerChanged(ItemContainerChanged event) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java index 0cb07b7afc..9de83c7580 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java @@ -357,20 +357,14 @@ public class GpuPlugin extends Plugin implements DrawCallbacks log.error("error stopping plugin", ex); } - try - { - shutDown(); - } - catch (Exception ex) - { - } + shutDown(); } }); } @Override - protected void shutDown() throws Exception + protected void shutDown() { super.shutDown(); @@ -445,9 +439,8 @@ public class GpuPlugin extends Plugin implements DrawCallbacks private void addSubscriptions() { - - eventbus.subscribe(ConfigChanged.class, this, o -> this.onConfigChanged((ConfigChanged) o)); - eventbus.subscribe(GameStateChanged.class, this, o -> this.onGameStateChanged((GameStateChanged) o)); + eventbus.subscribe(ConfigChanged.class, this, this::onConfigChanged); + eventbus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); } @Provides diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPlugin.java index 763be3bcf9..79fd350150 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPlugin.java @@ -85,7 +85,7 @@ public class InfoPlugin extends Plugin private void addSubscriptions() { - eventbus.subscribe(SessionOpen.class, this, o -> panel.onSessionOpen((SessionOpen) o)); - eventbus.subscribe(SessionClose.class, this, o -> panel.onSessionClose((SessionClose) o)); + eventbus.subscribe(SessionOpen.class, this, event -> panel.onSessionOpen(event)); + eventbus.subscribe(SessionClose.class, this, event -> panel.onSessionClose(event)); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java index 563cbf25a0..62cf808211 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java @@ -242,16 +242,16 @@ public class NpcIndicatorsPlugin extends Plugin private void addSubscriptions() { - eventbus.subscribe(ConfigChanged.class, this, o -> this.onConfigChanged((ConfigChanged) o)); - eventbus.subscribe(GameStateChanged.class, this, o -> this.onGameStateChanged((GameStateChanged) o)); - eventbus.subscribe(FocusChanged.class, this, o -> this.onFocusChanged((FocusChanged) o)); - eventbus.subscribe(MenuEntryAdded.class, this, o -> this.onMenuEntryAdded((MenuEntryAdded) o)); - eventbus.subscribe(MenuOptionClicked.class, this, o -> this.onMenuOptionClicked((MenuOptionClicked) o)); - eventbus.subscribe(NpcSpawned.class, this, o -> this.onNpcSpawned((NpcSpawned) o)); - eventbus.subscribe(NpcDefinitionChanged.class, this, o -> this.onNpcDefinitionChanged((NpcDefinitionChanged) o)); - eventbus.subscribe(NpcDespawned.class, this, o -> this.onNpcDespawned((NpcDespawned) o)); - eventbus.subscribe(GraphicsObjectCreated.class, this, o -> this.onGraphicsObjectCreated((GraphicsObjectCreated) o)); - eventbus.subscribe(GameTick.class, this, o -> this.onGameTick((GameTick) o)); + eventbus.subscribe(ConfigChanged.class, this, this::onConfigChanged); + eventbus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); + eventbus.subscribe(FocusChanged.class, this, this::onFocusChanged); + eventbus.subscribe(MenuEntryAdded.class, this, this::onMenuEntryAdded); + eventbus.subscribe(MenuOptionClicked.class, this, this::onMenuOptionClicked); + eventbus.subscribe(NpcSpawned.class, this, this::onNpcSpawned); + eventbus.subscribe(NpcDefinitionChanged.class, this, this::onNpcDefinitionChanged); + eventbus.subscribe(NpcDespawned.class, this, this::onNpcDespawned); + eventbus.subscribe(GraphicsObjectCreated.class, this, this::onGraphicsObjectCreated); + eventbus.subscribe(GameTick.class, this, this::onGameTick); } private void onGameStateChanged(GameStateChanged event) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java index d6f820ee45..f8f86cd241 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/objectindicators/ObjectIndicatorsPlugin.java @@ -150,15 +150,15 @@ public class ObjectIndicatorsPlugin extends Plugin implements KeyListener private void addSubscriptions() { - eventbus.subscribe(ConfigChanged.class, this, o -> this.onConfigChanged((ConfigChanged) o)); - eventbus.subscribe(FocusChanged.class, this, o -> this.onFocusChanged((FocusChanged) o)); - eventbus.subscribe(GameObjectSpawned.class, this, o -> this.onGameObjectSpawned((GameObjectSpawned) o)); - eventbus.subscribe(DecorativeObjectSpawned.class, this, o -> this.onDecorativeObjectSpawned((DecorativeObjectSpawned) o)); - eventbus.subscribe(GameObjectDespawned.class, this, o -> this.onGameObjectDespawned((GameObjectDespawned) o)); - eventbus.subscribe(DecorativeObjectDespawned.class, this, o -> this.onDecorativeObjectDespawned((DecorativeObjectDespawned) o)); - eventbus.subscribe(GameStateChanged.class, this, o -> this.onGameStateChanged((GameStateChanged) o)); - eventbus.subscribe(MenuOptionClicked.class, this, o -> this.onMenuOptionClicked((MenuOptionClicked) o)); - eventbus.subscribe(MenuEntryAdded.class, this, o -> this.onMenuEntryAdded((MenuEntryAdded) o)); + eventbus.subscribe(ConfigChanged.class, this, this::onConfigChanged); + eventbus.subscribe(FocusChanged.class, this, this::onFocusChanged); + eventbus.subscribe(GameObjectSpawned.class, this, this::onGameObjectSpawned); + eventbus.subscribe(DecorativeObjectSpawned.class, this, this::onDecorativeObjectSpawned); + eventbus.subscribe(GameObjectDespawned.class, this, this::onGameObjectDespawned); + eventbus.subscribe(DecorativeObjectDespawned.class, this, this::onDecorativeObjectDespawned); + eventbus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); + eventbus.subscribe(MenuOptionClicked.class, this, this::onMenuOptionClicked); + eventbus.subscribe(MenuEntryAdded.class, this, this::onMenuEntryAdded); } @Override diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java index 338c309d84..db86fc540a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runeliteplus/RuneLitePlusPlugin.java @@ -179,8 +179,8 @@ public class RuneLitePlusPlugin extends Plugin private void addSubscriptions() { - eventbus.subscribe(ConfigChanged.class, this, o -> this.onConfigChanged((ConfigChanged) o)); - eventbus.subscribe(ScriptCallbackEvent.class, this, o -> this.onScriptCallbackEvent((ScriptCallbackEvent) o)); + eventbus.subscribe(ConfigChanged.class, this, this::onConfigChanged); + eventbus.subscribe(ScriptCallbackEvent.class, this, this::onScriptCallbackEvent); } private void onScriptCallbackEvent(ScriptCallbackEvent e) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java b/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java index 1a2c088db1..23df405312 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java @@ -169,10 +169,10 @@ public class ClientUI this.configManager = configManager; this.clientThreadProvider = clientThreadProvider; - eventbus.subscribe(ConfigChanged.class, this, o -> this.onConfigChanged((ConfigChanged) o)); - eventbus.subscribe(NavigationButtonAdded.class, this, o -> this.onNavigationButtonAdded((NavigationButtonAdded) o)); - eventbus.subscribe(NavigationButtonRemoved.class, this, o -> this.onNavigationButtonRemoved((NavigationButtonRemoved) o)); - eventbus.subscribe(GameStateChanged.class, this, o -> this.onGameStateChanged((GameStateChanged) o)); + eventbus.subscribe(ConfigChanged.class, this, this::onConfigChanged); + eventbus.subscribe(NavigationButtonAdded.class, this, this::onNavigationButtonAdded); + eventbus.subscribe(NavigationButtonRemoved.class, this, this::onNavigationButtonRemoved); + eventbus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); } private void onConfigChanged(ConfigChanged event) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java index 5bdb5f595f..aafbf0a5d4 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java @@ -111,8 +111,8 @@ public class OverlayManager this.configManager = configManager; this.eventBus = eventBus; - eventBus.subscribe(PluginChanged.class, this, o -> this.onPluginChanged((PluginChanged) o)); - eventBus.subscribe(MenuOptionClicked.class, this, o -> this.onMenuOptionClicked((MenuOptionClicked) o)); + eventBus.subscribe(PluginChanged.class, this, this::onPluginChanged); + eventBus.subscribe(MenuOptionClicked.class, this, this::onMenuOptionClicked); } private void onPluginChanged(final PluginChanged event) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java index c03789dbb2..433f4d26ef 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java @@ -111,10 +111,10 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener keyManager.registerKeyListener(this); mouseManager.registerMouseListener(this); - eventbus.subscribe(ConfigChanged.class, this, o -> this.onConfigChanged((ConfigChanged) o)); - eventbus.subscribe(FocusChanged.class, this, o -> this.onFocusChanged((FocusChanged) o)); - eventbus.subscribe(ClientTick.class, this, o -> this.onClientTick((ClientTick) o)); - eventbus.subscribe(BeforeRender.class, this, o -> this.onBeforeRender((BeforeRender) o)); + eventbus.subscribe(ConfigChanged.class, this, this::onConfigChanged); + eventbus.subscribe(FocusChanged.class, this, this::onFocusChanged); + eventbus.subscribe(ClientTick.class, this, this::onClientTick); + eventbus.subscribe(BeforeRender.class, this, this::onBeforeRender); } private void updateConfig() diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/infobox/InfoBoxManager.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/infobox/InfoBoxManager.java index d554524a46..764cde23e4 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/infobox/InfoBoxManager.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/infobox/InfoBoxManager.java @@ -54,7 +54,7 @@ public class InfoBoxManager { this.runeLiteConfig = runeLiteConfig; - eventbus.subscribe(ConfigChanged.class, this, o -> this.onConfigChanged((ConfigChanged) o)); + eventbus.subscribe(ConfigChanged.class, this, this::onConfigChanged); } private void onConfigChanged(ConfigChanged event) diff --git a/runelite-client/src/main/java/net/runelite/client/ws/PartyService.java b/runelite-client/src/main/java/net/runelite/client/ws/PartyService.java index 02300e7b52..20663f1d38 100644 --- a/runelite-client/src/main/java/net/runelite/client/ws/PartyService.java +++ b/runelite-client/src/main/java/net/runelite/client/ws/PartyService.java @@ -70,8 +70,8 @@ public class PartyService this.sessionManager = sessionManager; this.eventBus = eventBus; - eventBus.subscribe(UserJoin.class, this, o -> this.onUserJoin((UserJoin) o)); - eventBus.subscribe(UserPart.class, this, o -> this.onUserPart((UserPart) o)); + eventBus.subscribe(UserJoin.class, this, this::onUserJoin); + eventBus.subscribe(UserPart.class, this, this::onUserPart); } public void changeParty(UUID newParty)