diff --git a/runelite-api/src/main/java/net/runelite/api/Client.java b/runelite-api/src/main/java/net/runelite/api/Client.java index a24d41057d..d12de2454d 100644 --- a/runelite-api/src/main/java/net/runelite/api/Client.java +++ b/runelite-api/src/main/java/net/runelite/api/Client.java @@ -341,11 +341,12 @@ public interface Client extends GameShell * Gets the logged in player instance. * * @return the logged in player - * + *

* (getLocalPlayerIndex returns the local index, useful for menus/interacting) */ @Nullable Player getLocalPlayer(); + int getLocalPlayerIndex(); /** @@ -957,36 +958,42 @@ public interface Client extends GameShell /** * Gets the music volume + * * @return volume 0-255 inclusive */ int getMusicVolume(); /** * Sets the music volume + * * @param volume 0-255 inclusive */ void setMusicVolume(int volume); /** * Gets the sound effect volume + * * @return volume 0-127 inclusive */ int getSoundEffectVolume(); /** * Sets the sound effect volume + * * @param volume 0-127 inclusive */ void setSoundEffectVolume(int volume); /** * Gets the area sound effect volume + * * @return volume 0-127 inclusive */ int getAreaSoundEffectVolume(); /** * Sets the area sound effect volume + * * @param volume 0-127 inclusive */ void setAreaSoundEffectVolume(int volume); @@ -1777,7 +1784,7 @@ public interface Client extends GameShell /** * @param param0 This is SceneX for gameObject, index for items, and 0 for npc. * @param param1 This is SceneY for gameObject, static for items, and 0 for npc. - * @param opcode Menu entry Action opcode. + * @param opcode Menu entry Action opcode. * @param id Targets ID * @param menuEntry Do these actually matter? * @param targetString Do these actually matter? @@ -1865,26 +1872,25 @@ public interface Client extends GameShell /** * Scales values from pixels onto canvas * - * @see net.runelite.client.util.ImageUtil#resizeSprite(Client, Sprite, int, int) - * - * @param canvas the array we're writing to - * @param pixels pixels to draw - * @param color should be 0 - * @param pixelX x index - * @param pixelY y index - * @param canvasIdx index in canvas (canvas[canvasIdx]) + * @param canvas the array we're writing to + * @param pixels pixels to draw + * @param color should be 0 + * @param pixelX x index + * @param pixelY y index + * @param canvasIdx index in canvas (canvas[canvasIdx]) * @param canvasOffset x offset - * @param newWidth new width - * @param newHeight new height - * @param pixelWidth pretty much horizontal scale - * @param pixelHeight pretty much vertical scale - * @param oldWidth old width + * @param newWidth new width + * @param newHeight new height + * @param pixelWidth pretty much horizontal scale + * @param pixelHeight pretty much vertical scale + * @param oldWidth old width + * @see net.runelite.client.util.ImageUtil#resizeSprite(Client, Sprite, int, int) */ void scaleSprite(int[] canvas, int[] pixels, int color, int pixelX, int pixelY, int canvasIdx, int canvasOffset, int newWidth, int newHeight, int pixelWidth, int pixelHeight, int oldWidth); /** * Get the MenuEntry at client.getMenuOptionCount() - 1 - * + *

* This is useful so you don't have to use getMenuEntries, * which will create a big array, when you only want to change * the left click one. @@ -1893,7 +1899,7 @@ public interface Client extends GameShell /** * Set the MenuEntry at client.getMenuOptionCount() - 1 - * + *

* This is useful so you don't have to use setMenuEntries, * which will arraycopy a big array to several smaller arrays lol, * when you only want to change the left click one. diff --git a/runelite-api/src/main/java/net/runelite/api/InventoryID.java b/runelite-api/src/main/java/net/runelite/api/InventoryID.java index 8fb91cc959..a5a077d0fa 100644 --- a/runelite-api/src/main/java/net/runelite/api/InventoryID.java +++ b/runelite-api/src/main/java/net/runelite/api/InventoryID.java @@ -98,13 +98,14 @@ public enum InventoryID public static InventoryID getValue(int value) { - for (InventoryID e: InventoryID.values()) + for (InventoryID e : InventoryID.values()) { if (e.id == value) { return e; } } - return null; + + throw new IllegalArgumentException("No InventoryID with id " + value + " exists"); } } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/account/AccountPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/account/AccountPlugin.java index 04e8cd45ff..95e3dfeaaa 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/account/AccountPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/account/AccountPlugin.java @@ -24,17 +24,15 @@ */ package net.runelite.client.plugins.account; -import java.util.concurrent.ScheduledExecutorService; import javax.inject.Inject; import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; import net.runelite.client.account.AccountSession; import net.runelite.client.account.SessionManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.SessionOpen; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; -import net.runelite.client.ui.ClientToolbar; @PluginDescriptor( name = "Account", @@ -49,33 +47,7 @@ public class AccountPlugin extends Plugin @Inject private SessionManager sessionManager; - @Inject - private ClientToolbar clientToolbar; - - @Inject - private ScheduledExecutorService executor; - - @Inject - private EventBus eventBus; - - - @Override - protected void startUp() throws Exception - { - addSubscriptions(); - } - - @Override - protected void shutDown() throws Exception - { - eventBus.unregister(this); - } - - private void addSubscriptions() - { - eventBus.subscribe(SessionOpen.class, this, this::onSessionOpen); - } - + @Subscribe private void onSessionOpen(SessionOpen sessionOpen) { AccountSession session = sessionManager.getAccountSession(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/DiaryRequirementsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/DiaryRequirementsPlugin.java index b39c1da667..2e98877aaf 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/DiaryRequirementsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/DiaryRequirementsPlugin.java @@ -40,11 +40,12 @@ import net.runelite.api.QuestState; import net.runelite.api.ScriptID; import net.runelite.api.VarPlayer; import net.runelite.api.events.WidgetLoaded; +import net.runelite.api.util.Text; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetID; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.callback.ClientThread; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.achievementdiary.diaries.ArdougneDiaryRequirement; @@ -59,7 +60,6 @@ import net.runelite.client.plugins.achievementdiary.diaries.MorytaniaDiaryRequir import net.runelite.client.plugins.achievementdiary.diaries.VarrockDiaryRequirement; import net.runelite.client.plugins.achievementdiary.diaries.WesternDiaryRequirement; import net.runelite.client.plugins.achievementdiary.diaries.WildernessDiaryRequirement; -import net.runelite.api.util.Text; @Slf4j @PluginDescriptor( @@ -79,21 +79,17 @@ public class DiaryRequirementsPlugin extends Plugin @Inject private ClientThread clientThread; - @Inject - private EventBus eventBus; - @Override protected void startUp() throws Exception { - eventBus.subscribe(WidgetLoaded.class, this, this::onWidgetLoaded); } @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - } + } + @Subscribe private void onWidgetLoaded(final WidgetLoaded event) { if (event.getGroupId() == WidgetID.DIARY_QUEST_GROUP_ID) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java index 0e813f3d4d..aa1812a366 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/AgilityPlugin.java @@ -71,6 +71,7 @@ import net.runelite.api.events.WallObjectSpawned; import net.runelite.client.Notifier; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.AgilityShortcut; import net.runelite.client.game.ItemManager; @@ -170,7 +171,6 @@ public class AgilityPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); if (config.showShortcutLevel()) { @@ -185,7 +185,6 @@ public class AgilityPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); eventBus.unregister(MENU_SUBS); overlayManager.remove(agilityOverlay); @@ -196,34 +195,13 @@ public class AgilityPlugin extends Plugin agilityLevel = 0; } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(StatChanged .class, this, this::onStatChanged); - eventBus.subscribe(ItemSpawned.class, this, this::onItemSpawned); - eventBus.subscribe(ItemDespawned.class, this, this::onItemDespawned); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(GameObjectSpawned.class, this, this::onGameObjectSpawned); - eventBus.subscribe(GameObjectChanged.class, this, this::onGameObjectChanged); - eventBus.subscribe(GameObjectDespawned.class, this, this::onGameObjectDespawned); - eventBus.subscribe(GroundObjectSpawned.class, this, this::onGroundObjectSpawned); - eventBus.subscribe(GroundObjectChanged.class, this, this::onGroundObjectChanged); - eventBus.subscribe(GroundObjectDespawned.class, this, this::onGroundObjectDespawned); - eventBus.subscribe(WallObjectSpawned.class, this, this::onWallObjectSpawned); - eventBus.subscribe(WallObjectChanged.class, this, this::onWallObjectChanged); - eventBus.subscribe(WallObjectDespawned.class, this, this::onWallObjectDespawned); - eventBus.subscribe(DecorativeObjectSpawned.class, this, this::onDecorativeObjectSpawned); - eventBus.subscribe(DecorativeObjectChanged.class, this, this::onDecorativeObjectChanged); - eventBus.subscribe(DecorativeObjectDespawned.class, this, this::onDecorativeObjectDespawned); - } - private void addMenuSubscriptions() { eventBus.subscribe(BeforeRender.class, MENU_SUBS, this::onBeforeRender); eventBus.subscribe(MenuOpened.class, MENU_SUBS, this::onMenuOpened); } + @Subscribe private void onGameStateChanged(GameStateChanged event) { switch (event.getGameState()) @@ -248,6 +226,7 @@ public class AgilityPlugin extends Plugin } } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("agility")) @@ -293,6 +272,7 @@ public class AgilityPlugin extends Plugin this.showAgilityArenaTimer = config.showAgilityArenaTimer(); } + @Subscribe public void onStatChanged(StatChanged statChanged) { if (statChanged.getSkill() != AGILITY) @@ -335,6 +315,7 @@ public class AgilityPlugin extends Plugin } } + @Subscribe private void onItemSpawned(ItemSpawned itemSpawned) { if (obstacles.isEmpty()) @@ -351,12 +332,14 @@ public class AgilityPlugin extends Plugin } } + @Subscribe private void onItemDespawned(ItemDespawned itemDespawned) { final Tile tile = itemDespawned.getTile(); marksOfGrace.remove(tile); } + @Subscribe private void onGameTick(GameTick tick) { if (isInAgilityArena()) @@ -408,61 +391,73 @@ public class AgilityPlugin extends Plugin infoBoxManager.addInfoBox(new AgilityArenaTimer(this, itemManager.getImage(AGILITY_ARENA_TICKET))); } + @Subscribe private void onGameObjectSpawned(GameObjectSpawned event) { onTileObject(event.getTile(), null, event.getGameObject()); } + @Subscribe private void onGameObjectChanged(GameObjectChanged event) { onTileObject(event.getTile(), event.getPrevious(), event.getGameObject()); } + @Subscribe private void onGameObjectDespawned(GameObjectDespawned event) { onTileObject(event.getTile(), event.getGameObject(), null); } + @Subscribe private void onGroundObjectSpawned(GroundObjectSpawned event) { onTileObject(event.getTile(), null, event.getGroundObject()); } + @Subscribe private void onGroundObjectChanged(GroundObjectChanged event) { onTileObject(event.getTile(), event.getPrevious(), event.getGroundObject()); } + @Subscribe private void onGroundObjectDespawned(GroundObjectDespawned event) { onTileObject(event.getTile(), event.getGroundObject(), null); } + @Subscribe private void onWallObjectSpawned(WallObjectSpawned event) { onTileObject(event.getTile(), null, event.getWallObject()); } + @Subscribe private void onWallObjectChanged(WallObjectChanged event) { onTileObject(event.getTile(), event.getPrevious(), event.getWallObject()); } + @Subscribe private void onWallObjectDespawned(WallObjectDespawned event) { onTileObject(event.getTile(), event.getWallObject(), null); } + @Subscribe private void onDecorativeObjectSpawned(DecorativeObjectSpawned event) { onTileObject(event.getTile(), null, event.getDecorativeObject()); } + @Subscribe private void onDecorativeObjectChanged(DecorativeObjectChanged event) { onTileObject(event.getTile(), event.getPrevious(), event.getDecorativeObject()); } + @Subscribe private void onDecorativeObjectDespawned(DecorativeObjectDespawned event) { onTileObject(event.getTile(), event.getDecorativeObject(), null); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraPlugin.java index 2b7bcb2c52..91bc97da84 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/alchemicalhydra/HydraPlugin.java @@ -51,6 +51,7 @@ import net.runelite.api.events.NpcSpawned; import net.runelite.api.events.ProjectileMoved; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -122,9 +123,6 @@ public class HydraPlugin extends Plugin { initConfig(); - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - inHydraInstance = checkArea(); lastAttackTick = -1; poisonProjectiles.clear(); @@ -133,7 +131,6 @@ public class HydraPlugin extends Plugin @Override protected void shutDown() { - eventBus.unregister(this); eventBus.unregister("fight"); eventBus.unregister("npcSpawned"); @@ -165,6 +162,7 @@ public class HydraPlugin extends Plugin eventBus.subscribe(ChatMessage.class, "fight", this::onChatMessage); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("betterHydra")) @@ -207,6 +205,7 @@ public class HydraPlugin extends Plugin } } + @Subscribe private void onGameStateChanged(GameStateChanged state) { if (state.getGameState() != GameState.LOGGED_IN) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoPlugin.java index 9796ef08ba..2eaf1e50ac 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/ammo/AmmoPlugin.java @@ -31,11 +31,11 @@ import net.runelite.api.Client; import net.runelite.api.EquipmentInventorySlot; import net.runelite.api.InventoryID; import net.runelite.api.Item; -import net.runelite.api.ItemDefinition; import net.runelite.api.ItemContainer; +import net.runelite.api.ItemDefinition; import net.runelite.api.events.ItemContainerChanged; import net.runelite.client.callback.ClientThread; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.game.ItemManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -61,15 +61,11 @@ public class AmmoPlugin extends Plugin @Inject private ItemManager itemManager; - @Inject - private EventBus eventBus; - private AmmoCounter counterBox; @Override protected void startUp() throws Exception { - eventBus.subscribe(ItemContainerChanged.class, this, this::onItemContainerChanged); clientThread.invokeLater(() -> { @@ -85,12 +81,11 @@ public class AmmoPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - infoBoxManager.removeInfoBox(counterBox); counterBox = null; } + @Subscribe private void onItemContainerChanged(ItemContainerChanged event) { if (event.getItemContainer() != client.getItemContainer(InventoryID.EQUIPMENT)) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/animsmoothing/AnimationSmoothingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/animsmoothing/AnimationSmoothingPlugin.java index 04fbfb0f23..3d922d2546 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/animsmoothing/AnimationSmoothingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/animsmoothing/AnimationSmoothingPlugin.java @@ -28,9 +28,9 @@ import com.google.inject.Provides; import javax.inject.Inject; import javax.inject.Singleton; import net.runelite.api.Client; -import net.runelite.client.events.ConfigChanged; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -51,9 +51,6 @@ public class AnimationSmoothingPlugin extends Plugin @Inject private AnimationSmoothingConfig config; - @Inject - private EventBus eventBus; - @Provides AnimationSmoothingConfig getConfig(ConfigManager configManager) { @@ -63,22 +60,19 @@ public class AnimationSmoothingPlugin extends Plugin @Override protected void startUp() throws Exception { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - update(); } @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - client.setInterpolatePlayerAnimations(false); client.setInterpolateNpcAnimations(false); client.setInterpolateObjectAnimations(false); client.setInterpolateWidgetAnimations(false); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals(CONFIG_GROUP)) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java index 7ee869cec5..1d98a820d9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/antidrag/AntiDragPlugin.java @@ -34,7 +34,7 @@ import net.runelite.api.events.FocusChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.client.config.ConfigManager; import net.runelite.client.config.Keybind; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.input.KeyManager; import net.runelite.client.plugins.Plugin; @@ -71,15 +71,9 @@ public class AntiDragPlugin extends Plugin @Inject private OverlayManager overlayManager; - @Inject - private ConfigManager configManager; - @Inject private KeyManager keyManager; - @Inject - private EventBus eventBus; - @Provides AntiDragConfig getConfig(ConfigManager configManager) { @@ -96,8 +90,6 @@ public class AntiDragPlugin extends Plugin protected void startUp() throws Exception { overlay.setColor(config.color()); - - addSubscriptions(); updateConfig(); updateKeyListeners(); @@ -110,8 +102,6 @@ public class AntiDragPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - client.setInventoryDragDelay(DEFAULT_DELAY); keyManager.unregisterKeyListener(holdListener); keyManager.unregisterKeyListener(toggleListener); @@ -120,13 +110,7 @@ public class AntiDragPlugin extends Plugin clientUI.resetCursor(); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(FocusChanged.class, this, this::onFocusChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - } - +@Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("antiDrag")) @@ -158,6 +142,7 @@ public class AntiDragPlugin extends Plugin } } + @Subscribe private void onGameStateChanged(GameStateChanged event) { if (event.getGameState() == GameState.LOGIN_SCREEN) @@ -179,6 +164,7 @@ public class AntiDragPlugin extends Plugin this.selectedCursor = config.selectedCursor(); } + @Subscribe private void onFocusChanged(FocusChanged focusChanged) { if (!focusChanged.isFocused() && config.reqFocus() && !config.alwaysOn()) 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 715ad97520..85eac2eec7 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 @@ -54,7 +54,7 @@ import net.runelite.api.events.ProjectileMoved; import net.runelite.api.events.ProjectileSpawned; import net.runelite.client.Notifier; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -84,8 +84,6 @@ public class AoeWarningPlugin extends Plugin private BombOverlay bombOverlay; @Inject private Client client; - @Inject - private EventBus eventbus; @Getter(AccessLevel.PACKAGE) private List lightningTrail = new ArrayList<>(); @Getter(AccessLevel.PACKAGE) @@ -167,7 +165,6 @@ public class AoeWarningPlugin extends Plugin protected void startUp() { updateConfig(); - addSubscriptions(); overlayManager.add(coreOverlay); overlayManager.add(bombOverlay); reset(); @@ -179,20 +176,9 @@ public class AoeWarningPlugin extends Plugin overlayManager.remove(coreOverlay); overlayManager.remove(bombOverlay); reset(); - eventbus.unregister(this); - } - - private void addSubscriptions() - { - 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); - eventbus.subscribe(ProjectileSpawned.class, this, this::onProjectileSpawned); - } + } +@Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("aoe")) @@ -203,6 +189,7 @@ public class AoeWarningPlugin extends Plugin updateConfig(); } + @Subscribe private void onProjectileSpawned(ProjectileSpawned event) { final Projectile projectile = event.getProjectile(); @@ -231,6 +218,7 @@ public class AoeWarningPlugin extends Plugin } } + @Subscribe private void onProjectileMoved(ProjectileMoved event) { if (projectiles.isEmpty()) @@ -249,6 +237,7 @@ public class AoeWarningPlugin extends Plugin }); } + @Subscribe private void onGameObjectSpawned(GameObjectSpawned event) { final GameObject gameObject = event.getGameObject(); @@ -283,6 +272,7 @@ public class AoeWarningPlugin extends Plugin } } + @Subscribe private void onGameObjectDespawned(GameObjectDespawned event) { final GameObject gameObject = event.getGameObject(); @@ -304,6 +294,7 @@ public class AoeWarningPlugin extends Plugin } } + @Subscribe private void onGameStateChanged(GameStateChanged event) { if (event.getGameState() == GameState.LOGGED_IN) @@ -313,6 +304,7 @@ public class AoeWarningPlugin extends Plugin reset(); } + @Subscribe private void onGameTick(GameTick event) { lightningTrail.clear(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java index e9797c5657..f73abf7d6b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/attackstyles/AttackStylesPlugin.java @@ -30,17 +30,16 @@ import com.google.common.collect.Table; import com.google.inject.Provides; import java.util.HashSet; import java.util.Set; +import javax.annotation.Nullable; import javax.inject.Inject; import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; -import javax.annotation.Nullable; import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.Skill; import net.runelite.api.VarPlayer; import net.runelite.api.Varbits; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.VarbitChanged; import net.runelite.api.events.WidgetHiddenChanged; @@ -51,7 +50,8 @@ import net.runelite.api.widgets.WidgetInfo; import static net.runelite.api.widgets.WidgetInfo.TO_GROUP; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import static net.runelite.client.plugins.attackstyles.AttackStyle.CASTING; @@ -90,9 +90,6 @@ public class AttackStylesPlugin extends Plugin @Inject private AttackStylesOverlay overlay; - @Inject - private EventBus eventBus; - @Provides AttackStylesConfig provideConfig(ConfigManager configManager) { @@ -114,7 +111,6 @@ public class AttackStylesPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); overlayManager.add(overlay); @@ -142,24 +138,13 @@ public class AttackStylesPlugin extends Plugin @Override protected void shutDown() { - eventBus.unregister(this); - overlayManager.remove(overlay); hideWarnedStyles(false); processWidgets(); hideWidget(client.getWidget(WidgetInfo.COMBAT_AUTO_RETALIATE), false); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(WidgetHiddenChanged.class, this, this::onWidgetHiddenChanged); - eventBus.subscribe(WidgetLoaded.class, this, this::onWidgetLoaded); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(VarbitChanged.class, this, this::onVarbitChanged); - } - - @Nullable +@Nullable public AttackStyle getAttackStyle() { return attackStyle; @@ -170,6 +155,7 @@ public class AttackStylesPlugin extends Plugin return warnedSkillSelected; } + @Subscribe private void onWidgetHiddenChanged(WidgetHiddenChanged event) { if (event.getWidget().isSelfHidden() || TO_GROUP(event.getWidget().getId()) != COMBAT_GROUP_ID) @@ -180,6 +166,7 @@ public class AttackStylesPlugin extends Plugin processWidgets(); } + @Subscribe private void onWidgetLoaded(WidgetLoaded event) { if (event.getGroupId() != COMBAT_GROUP_ID) @@ -207,6 +194,7 @@ public class AttackStylesPlugin extends Plugin hideWidget(client.getWidget(WidgetInfo.COMBAT_AUTO_RETALIATE), this.hideAutoRetaliate); } + @Subscribe private void onGameStateChanged(GameStateChanged event) { if (event.getGameState() == GameState.LOGGED_IN) @@ -215,6 +203,7 @@ public class AttackStylesPlugin extends Plugin } } + @Subscribe void onVarbitChanged(VarbitChanged event) { int currentAttackStyleVarbit = client.getVar(VarPlayer.ATTACK_STYLE); @@ -240,6 +229,7 @@ public class AttackStylesPlugin extends Plugin } } + @Subscribe void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("attackIndicator")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java index e7547e9c34..77596fcc28 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/bank/BankPlugin.java @@ -66,7 +66,7 @@ import net.runelite.api.widgets.WidgetID; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.ItemManager; import net.runelite.client.plugins.Plugin; @@ -95,16 +95,16 @@ public class BankPlugin extends Plugin ); private static final List BANK_PINS = ImmutableList.of( - WidgetInfo.BANK_PIN_1, - WidgetInfo.BANK_PIN_2, - WidgetInfo.BANK_PIN_3, - WidgetInfo.BANK_PIN_4, - WidgetInfo.BANK_PIN_5, - WidgetInfo.BANK_PIN_6, - WidgetInfo.BANK_PIN_7, - WidgetInfo.BANK_PIN_8, - WidgetInfo.BANK_PIN_9, - WidgetInfo.BANK_PIN_10 + WidgetInfo.BANK_PIN_1, + WidgetInfo.BANK_PIN_2, + WidgetInfo.BANK_PIN_3, + WidgetInfo.BANK_PIN_4, + WidgetInfo.BANK_PIN_5, + WidgetInfo.BANK_PIN_6, + WidgetInfo.BANK_PIN_7, + WidgetInfo.BANK_PIN_8, + WidgetInfo.BANK_PIN_9, + WidgetInfo.BANK_PIN_10 ); private static final String DEPOSIT_WORN = "Deposit worn items"; @@ -133,9 +133,6 @@ public class BankPlugin extends Plugin @Inject private BankSearch bankSearch; - @Inject - private EventBus eventBus; - @Inject private ContainerCalculation bankCalculation; @@ -166,30 +163,18 @@ public class BankPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); + searchString = ""; } @Override protected void shutDown() { - eventBus.unregister(this); clientThread.invokeLater(() -> bankSearch.reset(false)); forceRightClickFlag = false; itemQuantities = null; } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(MenuShouldLeftClick.class, this, this::onMenuShouldLeftClick); - eventBus.subscribe(MenuEntryAdded.class, this, this::onMenuEntryAdded); - eventBus.subscribe(ScriptCallbackEvent.class, this, this::onScriptCallbackEvent); - eventBus.subscribe(WidgetLoaded.class, this, this::onWidgetLoaded); - eventBus.subscribe(ItemContainerChanged.class, this, this::onItemContainerChanged); - eventBus.subscribe(VarClientStrChanged.class, this, this::onVarClientStrChanged); - searchString = ""; - } - +@Subscribe private void onMenuShouldLeftClick(MenuShouldLeftClick event) { if (!forceRightClickFlag) @@ -211,6 +196,7 @@ public class BankPlugin extends Plugin } } + @Subscribe private void onMenuEntryAdded(MenuEntryAdded event) { if ((event.getOption().equals(DEPOSIT_WORN) && this.rightClickBankEquip) @@ -221,6 +207,7 @@ public class BankPlugin extends Plugin } } + @Subscribe private void onScriptCallbackEvent(ScriptCallbackEvent event) { if (event.getEventName().equals("bankPinButtons") && this.largePinNumbers) @@ -265,6 +252,7 @@ public class BankPlugin extends Plugin } } + @Subscribe private void onWidgetLoaded(WidgetLoaded event) { if (event.getGroupId() != WidgetID.SEED_VAULT_GROUP_ID || !config.seedVaultValue()) @@ -275,6 +263,7 @@ public class BankPlugin extends Plugin updateSeedVaultTotal(); } + @Subscribe public void onVarClientStrChanged(VarClientStrChanged event) { String searchVar = client.getVar(VarClientStr.INPUT_TEXT); @@ -302,6 +291,7 @@ public class BankPlugin extends Plugin } } + @Subscribe public void onItemContainerChanged(ItemContainerChanged event) { int containerId = event.getContainerId(); @@ -427,6 +417,7 @@ public class BankPlugin extends Plugin return itemContainer.getItems(); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("bank")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java index 096c248cba..fe94f066c6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java @@ -52,7 +52,6 @@ import net.runelite.api.ItemID; import net.runelite.api.MenuOpcode; import net.runelite.api.VarClientInt; import net.runelite.api.VarClientStr; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.DraggingWidgetChanged; import net.runelite.api.events.FocusChanged; import net.runelite.api.events.GameTick; @@ -68,7 +67,8 @@ import net.runelite.api.widgets.WidgetID; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.ItemManager; import net.runelite.client.game.SpriteManager; import net.runelite.client.game.chatbox.ChatboxPanelManager; @@ -146,9 +146,6 @@ public class BankTagsPlugin extends Plugin implements MouseWheelListener, KeyLis @Inject private SpriteManager spriteManager; - @Inject - private EventBus eventBus; - @Inject private ConfigManager configManager; @@ -166,7 +163,6 @@ public class BankTagsPlugin extends Plugin implements MouseWheelListener, KeyLis @Override public void startUp() { - addSubscriptions(); cleanConfig(); keyManager.registerKeyListener(this); @@ -231,8 +227,6 @@ public class BankTagsPlugin extends Plugin implements MouseWheelListener, KeyLis @Override public void shutDown() { - eventBus.unregister(this); - keyManager.unregisterKeyListener(this); mouseManager.unregisterMouseWheelListener(this); clientThread.invokeLater(tabInterface::destroy); @@ -242,26 +236,14 @@ public class BankTagsPlugin extends Plugin implements MouseWheelListener, KeyLis itemQuantities.clear(); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(ScriptCallbackEvent.class, this, this::onScriptCallbackEvent); - eventBus.subscribe(MenuEntryAdded.class, this, this::onMenuEntryAdded); - eventBus.subscribe(MenuOptionClicked.class, this, this::onMenuOptionClicked); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(DraggingWidgetChanged.class, this, this::onDraggingWidgetChanged); - eventBus.subscribe(WidgetLoaded.class, this, this::onWidgetLoaded); - eventBus.subscribe(FocusChanged.class, this, this::onFocusChanged); - eventBus.subscribe(ItemContainerChanged.class, this, this::onItemContainerChanged); - } - - private boolean isSearching() +private boolean isSearching() { return client.getVar(VarClientInt.INPUT_TYPE) == InputType.SEARCH.getType() || (client.getVar(VarClientInt.INPUT_TYPE) <= 0 && client.getVar(VarClientStr.INPUT_TEXT) != null && client.getVar(VarClientStr.INPUT_TEXT).length() > 0); } + @Subscribe private void onScriptCallbackEvent(ScriptCallbackEvent event) { String eventName = event.getEventName(); @@ -371,6 +353,7 @@ public class BankTagsPlugin extends Plugin implements MouseWheelListener, KeyLis } } + @Subscribe private void onMenuEntryAdded(MenuEntryAdded event) { if (event.getParam1() == WidgetInfo.BANK_ITEM_CONTAINER.getId() @@ -401,6 +384,7 @@ public class BankTagsPlugin extends Plugin implements MouseWheelListener, KeyLis tabInterface.handleAdd(event); } + @Subscribe private void onMenuOptionClicked(MenuOptionClicked event) { if (event.getParam1() == WidgetInfo.BANK_ITEM_CONTAINER.getId() @@ -476,6 +460,7 @@ public class BankTagsPlugin extends Plugin implements MouseWheelListener, KeyLis } } + @Subscribe private void onItemContainerChanged(ItemContainerChanged event) { if (event.getContainerId() == InventoryID.BANK.getId()) @@ -491,6 +476,7 @@ public class BankTagsPlugin extends Plugin implements MouseWheelListener, KeyLis } } + @Subscribe private void onConfigChanged(ConfigChanged configChanged) { if (configChanged.getGroup().equals("banktags") && configChanged.getKey().equals("useTabs")) @@ -506,16 +492,19 @@ public class BankTagsPlugin extends Plugin implements MouseWheelListener, KeyLis } } + @Subscribe private void onGameTick(GameTick event) { tabInterface.update(); } + @Subscribe private void onDraggingWidgetChanged(DraggingWidgetChanged event) { tabInterface.handleDrag(event.isDraggingWidget(), shiftPressed); } + @Subscribe private void onWidgetLoaded(WidgetLoaded event) { if (event.getGroupId() == WidgetID.BANK_GROUP_ID) @@ -524,6 +513,7 @@ public class BankTagsPlugin extends Plugin implements MouseWheelListener, KeyLis } } + @Subscribe private void onFocusChanged(FocusChanged event) { if (!event.isFocused()) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java index e843a87b01..9dce4b408e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/banlist/BanListPlugin.java @@ -51,7 +51,7 @@ import net.runelite.client.chat.ChatMessageBuilder; import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.chat.QueuedMessage; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -92,9 +92,6 @@ public class BanListPlugin extends Plugin @Inject private ChatMessageManager chatMessageManager; - @Inject - private EventBus eventBus; - private String tobNames = ""; private boolean enableWDRScam; private boolean enableWDRToxic; @@ -112,7 +109,6 @@ public class BanListPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); manualBans.addAll(Text.fromCSV(Text.standardize(config.getBannedPlayers()))); @@ -123,22 +119,13 @@ public class BanListPlugin extends Plugin protected void shutDown() throws Exception { - eventBus.unregister(this); wdrScamSet.clear(); wdrToxicSet.clear(); runeWatchSet.clear(); manualBans.clear(); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(WidgetHiddenChanged.class, this, this::onWidgetHiddenChanged); - eventBus.subscribe(ClanMemberJoined.class, this, this::onClanMemberJoined); - eventBus.subscribe(WidgetLoaded.class, this, this::onWidgetLoaded); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - } - +@Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("banlist") && event.getKey().equals("bannedPlayers")) @@ -163,6 +150,7 @@ public class BanListPlugin extends Plugin /** * Event to keep making sure player names are highlighted red in clan chat, since the red name goes away frequently */ + @Subscribe private void onWidgetHiddenChanged(WidgetHiddenChanged widgetHiddenChanged) { if (client.getGameState() != GameState.LOGGED_IN @@ -183,6 +171,7 @@ public class BanListPlugin extends Plugin }); } + @Subscribe private void onClanMemberJoined(ClanMemberJoined event) { ClanMember member = event.getMember(); @@ -213,6 +202,7 @@ public class BanListPlugin extends Plugin /** * If a trade window is opened and the person trading us is on the list, modify "trading with" */ + @Subscribe private void onWidgetLoaded(WidgetLoaded widgetLoaded) { if (this.highlightInTrade && widgetLoaded.getGroupId() == PLAYER_TRADE_SCREEN_GROUP_ID) @@ -234,6 +224,7 @@ public class BanListPlugin extends Plugin } } + @Subscribe private void onGameTick(GameTick event) { final Widget raidingParty = client.getWidget(WidgetInfo.THEATRE_OF_BLOOD_RAIDING_PARTY); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java index e152297c2c..c33c3b7ce9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java @@ -82,7 +82,7 @@ import net.runelite.client.chat.ChatMessageBuilder; import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.chat.QueuedMessage; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.ItemManager; import net.runelite.client.input.KeyListener; @@ -155,9 +155,6 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener @Inject private KeyManager keyManager; - @Inject - private EventBus eventBus; - @Getter private boolean inGame = false; @@ -309,7 +306,6 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); font = FontManager.getRunescapeFont().deriveFont(Font.BOLD, 24); torsoImage = itemManager.getImage(ItemID.FIGHTER_TORSO); @@ -327,8 +323,6 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(widgetsOverlay); overlayManager.remove(sceneOverlay); keyManager.unregisterKeyListener(this); @@ -349,25 +343,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener menu.clearHiddenMenus(); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(WidgetLoaded.class, this, this::onWidgetLoaded); - eventBus.subscribe(ChatMessage.class, this, this::onChatMessage); - eventBus.subscribe(ItemSpawned.class, this, this::onItemSpawned); - eventBus.subscribe(ItemDespawned.class, this, this::onItemDespawned); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(NpcSpawned.class, this, this::onNpcSpawned); - eventBus.subscribe(NpcDespawned.class, this, this::onNpcDespawned); - eventBus.subscribe(BeforeRender.class, this, this::onBeforeRender); - eventBus.subscribe(MenuEntryAdded.class, this, this::onMenuEntryAdded); - eventBus.subscribe(MenuOptionClicked.class, this, this::onMenuOptionClicked); - eventBus.subscribe(InteractingChanged.class, this, this::onInteractingChanged); - eventBus.subscribe(ProjectileSpawned.class, this, this::onProjectileSpawned); - eventBus.subscribe(VarbitChanged.class, this, this::onVarbitChanged); - } - - @Override +@Override public void keyTyped(KeyEvent e) { } @@ -400,6 +376,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener } } + @Subscribe private void onConfigChanged(ConfigChanged configChanged) { //not client thread be careful @@ -510,6 +487,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener this.showEggCountOverlay = config.showEggCountOverlay(); } + @Subscribe private void onWidgetLoaded(WidgetLoaded event) { switch (event.getGroupId()) @@ -580,6 +558,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener } } + @Subscribe private void onChatMessage(ChatMessage chatMessage) { if (!chatMessage.getType().equals(ChatMessageType.GAMEMESSAGE)) @@ -629,7 +608,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener { String[] tokens = message.split(" "); - int time = wave == null ? -1 : (int)wave.getWaveTimer().getElapsedTime(); + int time = wave == null ? -1 : (int) wave.getWaveTimer().getElapsedTime(); switch (tokens[4]) { @@ -663,6 +642,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener } } + @Subscribe private void onItemSpawned(ItemSpawned itemSpawned) { if (!isInGame()) @@ -682,6 +662,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener } } + @Subscribe private void onItemDespawned(ItemDespawned itemDespawned) { if (!isInGame()) @@ -732,6 +713,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener } } + @Subscribe private void onGameTick(GameTick event) { // Keep in mind isInGame is delayed by a tick when a wave ends @@ -763,6 +745,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener } } + @Subscribe private void onNpcSpawned(NpcSpawned event) { if (!isInGame()) @@ -785,6 +768,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener } } + @Subscribe private void onNpcDespawned(NpcDespawned event) { if (!isInGame()) @@ -800,6 +784,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener // This was almost certainly a waste of time to get working, because almost nobody // actually uses the horn of glory. At least now there shouldn't be anyone complaining // about the horn of glory breaking anything and everything that should never break. + @Subscribe private void onBeforeRender(BeforeRender event) { if (!isInGame()) @@ -973,6 +958,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener // onMenuEntryAdded is being used for conditional entry changes that are not // easily achievable using MenuManager, all other changes use MenuManager in // the BarbarianAssaultMenu/Menus classes + @Subscribe private void onMenuEntryAdded(MenuEntryAdded event) { if (!isInGame()) @@ -1163,6 +1149,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener client.setMenuEntries(menu.toArray(new MenuEntry[0])); } + @Subscribe private void onMenuOptionClicked(MenuOptionClicked event) { if (!isInGame() && getRole() != null) @@ -1195,6 +1182,7 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener } // Interacting changed has a slight delay until after the hitsplat is applied + @Subscribe private void onInteractingChanged(InteractingChanged event) { if (!isInGame() || getRole() != Role.HEALER) @@ -1225,11 +1213,12 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener } else if (StringUtils.equals(opponent.getName(), "Penance Healer")) { - lastInteracted = ((NPC)opponent).getIndex(); + lastInteracted = ((NPC) opponent).getIndex(); } } + @Subscribe private void onProjectileSpawned(ProjectileSpawned event) { if (!isInGame()) @@ -1246,10 +1235,11 @@ public class BarbarianAssaultPlugin extends Plugin implements KeyListener String name = target.getName(); if ("Penance Fighter".equals(name) || "Penance Ranger".equals(name)) { - projectiles.put(((NPC)target).getIndex(), event.getProjectile()); + projectiles.put(((NPC) target).getIndex(), event.getProjectile()); } } + @Subscribe private void onVarbitChanged(VarbitChanged event) { int newInGameBit = client.getVar(Varbits.IN_GAME_BA); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java index e4f8e2ddc4..36169a2ddf 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/barrows/BarrowsPlugin.java @@ -54,7 +54,7 @@ import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetID; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.SpriteManager; import net.runelite.client.plugins.Plugin; @@ -125,9 +125,6 @@ public class BarrowsPlugin extends Plugin @Inject private BarrowsConfig config; - @Inject - private EventBus eventBus; - @Provides BarrowsConfig provideConfig(ConfigManager configManager) { @@ -150,7 +147,6 @@ public class BarrowsPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); overlayManager.add(barrowsOverlay); overlayManager.add(brotherOverlay); @@ -159,8 +155,6 @@ public class BarrowsPlugin extends Plugin @Override protected void shutDown() { - eventBus.unregister(this); - overlayManager.remove(barrowsOverlay); overlayManager.remove(brotherOverlay); walls.clear(); @@ -183,19 +177,7 @@ public class BarrowsPlugin extends Plugin } } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(WallObjectSpawned.class, this, this::onWallObjectSpawned); - eventBus.subscribe(WallObjectChanged.class, this, this::onWallObjectChanged); - eventBus.subscribe(WallObjectDespawned.class, this, this::onWallObjectDespawned); - eventBus.subscribe(GameObjectSpawned.class, this, this::onGameObjectSpawned); - eventBus.subscribe(GameObjectChanged.class, this, this::onGameObjectChanged); - eventBus.subscribe(GameObjectDespawned.class, this, this::onGameObjectDespawned); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(WidgetLoaded.class, this, this::onWidgetLoaded); - } - +@Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("barrows")) @@ -219,6 +201,7 @@ public class BarrowsPlugin extends Plugin this.showPrayerDrainTimer = config.showPrayerDrainTimer(); } + @Subscribe private void onWallObjectSpawned(WallObjectSpawned event) { WallObject wallObject = event.getWallObject(); @@ -228,6 +211,7 @@ public class BarrowsPlugin extends Plugin } } + @Subscribe private void onWallObjectChanged(WallObjectChanged event) { WallObject previous = event.getPrevious(); @@ -240,12 +224,14 @@ public class BarrowsPlugin extends Plugin } } + @Subscribe private void onWallObjectDespawned(WallObjectDespawned event) { WallObject wallObject = event.getWallObject(); walls.remove(wallObject); } + @Subscribe private void onGameObjectSpawned(GameObjectSpawned event) { GameObject gameObject = event.getGameObject(); @@ -255,6 +241,7 @@ public class BarrowsPlugin extends Plugin } } + @Subscribe private void onGameObjectChanged(GameObjectChanged event) { GameObject previous = event.getPrevious(); @@ -267,12 +254,14 @@ public class BarrowsPlugin extends Plugin } } + @Subscribe private void onGameObjectDespawned(GameObjectDespawned event) { GameObject gameObject = event.getGameObject(); ladders.remove(gameObject); } + @Subscribe private void onGameStateChanged(GameStateChanged event) { if (event.getGameState() == GameState.LOADING) @@ -297,6 +286,7 @@ public class BarrowsPlugin extends Plugin } } + @Subscribe private void onWidgetLoaded(WidgetLoaded event) { if (event.getGroupId() == WidgetID.BARROWS_PUZZLE_GROUP_ID) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blackjack/BlackjackPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/blackjack/BlackjackPlugin.java index fee3999230..6e81e938fc 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/blackjack/BlackjackPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/blackjack/BlackjackPlugin.java @@ -40,6 +40,7 @@ import net.runelite.api.events.GameTick; import net.runelite.api.util.Text; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.menus.AbstractComparableEntry; import net.runelite.client.menus.MenuManager; @@ -99,8 +100,6 @@ public class BlackjackPlugin extends Plugin @Override protected void startUp() throws Exception { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); menuManager.addPriorityEntry(KNOCKOUT_BANDIT); menuManager.addPriorityEntry(KNOCKOUT_MENAPHITE); this.pickpocketOnAggro = config.pickpocketOnAggro(); @@ -113,10 +112,10 @@ public class BlackjackPlugin extends Plugin menuManager.removePriorityEntry(PICKPOCKET_MENAPHITE); menuManager.removePriorityEntry(KNOCKOUT_BANDIT); menuManager.removePriorityEntry(KNOCKOUT_MENAPHITE); - eventBus.unregister(this); eventBus.unregister("poll"); } + @Subscribe private void onGameStateChanged(GameStateChanged event) { if (event.getGameState() != GameState.LOGGED_IN || !ArrayUtils.contains(client.getMapRegions(), POLLNIVNEACH_REGION)) @@ -129,6 +128,7 @@ public class BlackjackPlugin extends Plugin eventBus.subscribe(ChatMessage.class, "poll", this::onChatMessage); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("blackjack")) @@ -183,7 +183,7 @@ public class BlackjackPlugin extends Plugin { return Text.removeTags(entry.getTarget(), true).equalsIgnoreCase(this.getTarget()) && - entry.getOption().equalsIgnoreCase(this.getOption()); + entry.getOption().equalsIgnoreCase(this.getOption()); } } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnacePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnacePlugin.java index d5ddc80085..1eae30f7a9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnacePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastfurnace/BlastFurnacePlugin.java @@ -46,7 +46,7 @@ import net.runelite.api.util.Text; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.ItemManager; import net.runelite.client.plugins.Plugin; @@ -97,9 +97,6 @@ public class BlastFurnacePlugin extends Plugin @Inject private BlastFurnaceConfig config; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) private boolean showConveyorBelt; @Getter(AccessLevel.PACKAGE) @@ -109,7 +106,6 @@ public class BlastFurnacePlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); overlayManager.add(overlay); overlayManager.add(cofferOverlay); @@ -119,8 +115,6 @@ public class BlastFurnacePlugin extends Plugin @Override protected void shutDown() { - eventBus.unregister(this); - infoBoxManager.removeIf(ForemanTimer.class::isInstance); overlayManager.remove(overlay); overlayManager.remove(cofferOverlay); @@ -130,21 +124,13 @@ public class BlastFurnacePlugin extends Plugin foremanTimer = null; } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - 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); - } - - @Provides +@Provides BlastFurnaceConfig provideConfig(ConfigManager configManager) { return configManager.getConfig(BlastFurnaceConfig.class); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("blastfurnace")) @@ -153,6 +139,7 @@ public class BlastFurnacePlugin extends Plugin } } + @Subscribe private void onGameObjectSpawned(GameObjectSpawned event) { GameObject gameObject = event.getGameObject(); @@ -169,6 +156,7 @@ public class BlastFurnacePlugin extends Plugin } } + @Subscribe private void onGameObjectDespawned(GameObjectDespawned event) { GameObject gameObject = event.getGameObject(); @@ -185,6 +173,7 @@ public class BlastFurnacePlugin extends Plugin } } + @Subscribe private void onGameStateChanged(GameStateChanged event) { if (event.getGameState() == GameState.LOADING) @@ -194,6 +183,7 @@ public class BlastFurnacePlugin extends Plugin } } + @Subscribe private void onGameTick(GameTick event) { Widget npcDialog = client.getWidget(WidgetInfo.DIALOG_NPC_TEXT); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMinePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMinePlugin.java index c4ec42e2dc..42535c6e59 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMinePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/blastmine/BlastMinePlugin.java @@ -42,7 +42,7 @@ import net.runelite.api.events.GameTick; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.ui.overlay.OverlayManager; @@ -73,9 +73,6 @@ public class BlastMinePlugin extends Plugin @Inject private BlastMinePluginConfig config; - @Inject - private EventBus eventBus; - @Provides BlastMinePluginConfig getConfig(ConfigManager configManager) { @@ -99,7 +96,6 @@ public class BlastMinePlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); overlayManager.add(blastMineRockOverlay); overlayManager.add(blastMineOreCountOverlay); @@ -108,8 +104,6 @@ public class BlastMinePlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(blastMineRockOverlay); overlayManager.remove(blastMineOreCountOverlay); final Widget blastMineWidget = client.getWidget(WidgetInfo.BLAST_MINE); @@ -120,13 +114,7 @@ public class BlastMinePlugin extends Plugin } } - private void addSubscriptions() - { - eventBus.subscribe(GameObjectSpawned.class, this, this::onGameObjectSpawned); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - } - +@Subscribe private void onGameObjectSpawned(GameObjectSpawned event) { final GameObject gameObject = event.getGameObject(); @@ -145,6 +133,7 @@ public class BlastMinePlugin extends Plugin } } + @Subscribe private void onGameStateChanged(GameStateChanged event) { if (event.getGameState() == GameState.LOADING) @@ -153,6 +142,7 @@ public class BlastMinePlugin extends Plugin } } + @Subscribe private void onGameTick(GameTick gameTick) { if (rocks.isEmpty()) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java index 845cf954c6..74105ba721 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java @@ -39,13 +39,13 @@ import net.runelite.api.Client; import net.runelite.api.Constants; import net.runelite.api.Prayer; import net.runelite.api.Skill; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.StatChanged; import net.runelite.client.Notifier; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.SkillIconManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -98,8 +98,6 @@ public class BoostsPlugin extends Plugin private SkillIconManager skillIconManager; @Inject private CombatIconsOverlay combatIconsOverlay; - @Inject - private EventBus eventBus; private boolean isChangedDown = false; private boolean isChangedUp = false; @@ -135,7 +133,6 @@ public class BoostsPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); overlayManager.add(boostsOverlay); overlayManager.add(combatIconsOverlay); @@ -159,7 +156,6 @@ public class BoostsPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); overlayManager.remove(boostsOverlay); overlayManager.remove(combatIconsOverlay); infoBoxManager.removeIf(t -> t instanceof BoostIndicator || t instanceof StatChangeIndicator); @@ -170,14 +166,7 @@ public class BoostsPlugin extends Plugin isChangedDown = false; } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(StatChanged.class, this, this::onStatChanged); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - } - +@Subscribe private void onGameStateChanged(GameStateChanged event) { switch (event.getGameState()) @@ -190,6 +179,7 @@ public class BoostsPlugin extends Plugin } } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("boosts")) @@ -211,6 +201,7 @@ public class BoostsPlugin extends Plugin } } + @Subscribe private void onStatChanged(StatChanged statChanged) { Skill skill = statChanged.getSkill(); @@ -260,6 +251,7 @@ public class BoostsPlugin extends Plugin } } + @Subscribe private void onGameTick(GameTick event) { lastTickMillis = System.currentTimeMillis(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/BossTimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/BossTimersPlugin.java index 1fd643cb84..7155cb7f1e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/BossTimersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/bosstimer/BossTimersPlugin.java @@ -30,7 +30,7 @@ import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; import net.runelite.api.NPC; import net.runelite.api.events.NpcDespawned; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.game.ItemManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -51,22 +51,18 @@ public class BossTimersPlugin extends Plugin @Inject private ItemManager itemManager; - @Inject - private EventBus eventBus; - @Override protected void startUp() throws Exception { - eventBus.subscribe(NpcDespawned.class, this, this::onNpcDespawned); } @Override protected void shutDown() throws Exception { - eventBus.unregister(this); infoBoxManager.removeIf(t -> t instanceof RespawnTimer); } + @Subscribe private void onNpcDespawned(NpcDespawned npcDespawned) { NPC npc = npcDespawned.getNpc(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/bosstimetracker/BossTimeTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/bosstimetracker/BossTimeTrackerPlugin.java index db8e7f9653..62e9d741c5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/bosstimetracker/BossTimeTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/bosstimetracker/BossTimeTrackerPlugin.java @@ -39,7 +39,7 @@ import net.runelite.api.events.ChatMessage; import net.runelite.api.events.GameStateChanged; import net.runelite.api.util.Text; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.game.ItemManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -76,9 +76,6 @@ public class BossTimeTrackerPlugin extends Plugin @Inject private ConfigManager configManager; - @Inject - private EventBus eventBus; - @Getter private BossTimeTracker timer; @@ -90,9 +87,9 @@ public class BossTimeTrackerPlugin extends Plugin @Override public void startUp() { - addSubscriptions(); } + @Subscribe public void onGameStateChanged(GameStateChanged event) { switch (event.getGameState()) @@ -125,6 +122,7 @@ public class BossTimeTrackerPlugin extends Plugin } } + @Subscribe public void onChatMessage(ChatMessage event) { if (event.getType() != ChatMessageType.GAMEMESSAGE && event.getType() != ChatMessageType.SPAM) @@ -242,19 +240,12 @@ public class BossTimeTrackerPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); removeTimer(); resetConfig(); resetVars(); } - private void addSubscriptions() - { - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(ChatMessage.class, this, this::onChatMessage); - } - - private void loadConfig() +private void loadConfig() { startTime = configManager.getConfiguration(CONFIG_GROUP, CONFIG_TIME, Instant.class); started = configManager.getConfiguration(CONFIG_GROUP, CONFIG_STARTED, Boolean.class); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/bronzeman/BronzemanPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/bronzeman/BronzemanPlugin.java index d4cee2e647..155cc8a0f6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/bronzeman/BronzemanPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/bronzeman/BronzemanPlugin.java @@ -1,10 +1,18 @@ package net.runelite.client.plugins.bronzeman; +import java.awt.image.BufferedImage; import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import java.io.InputStream; import java.io.PrintWriter; +import java.net.URL; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.List; +import javax.imageio.ImageIO; +import javax.inject.Inject; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; @@ -19,19 +27,11 @@ import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetID; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.RuneLite; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginType; import net.runelite.client.ui.overlay.OverlayManager; -import javax.imageio.ImageIO; -import javax.inject.Inject; -import java.awt.image.BufferedImage; -import java.net.URL; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.List; /** * @author Seth Davis @@ -52,9 +52,6 @@ public class BronzemanPlugin extends Plugin @Inject private Client client; - @Inject - private EventBus eventBus; - @Inject private OverlayManager overlayManager; @@ -74,7 +71,6 @@ public class BronzemanPlugin extends Plugin @Override protected void startUp() throws Exception { - addSubscriptions(); loadUnlockImage(); unlockedItems = new ArrayList<>(); overlayManager.add(bronzemanOverlay); @@ -83,23 +79,14 @@ public class BronzemanPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); unlockedItems = null; overlayManager.remove(bronzemanOverlay); } - private void addSubscriptions() - { - eventBus.subscribe(ItemContainerChanged.class, this, this::onItemContainerChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(WidgetLoaded.class, this, this::onWidgetLoaded); - - } - - /** +/** * Loads players unlocks on login **/ + @Subscribe public void onGameStateChanged(GameStateChanged e) { if (e.getGameState() == GameState.LOGGED_IN) @@ -111,6 +98,7 @@ public class BronzemanPlugin extends Plugin /** * Unlocks all new items that are currently not unlocked **/ + @Subscribe public void onItemContainerChanged(ItemContainerChanged e) { for (Item i : e.getItemContainer().getItems()) @@ -134,6 +122,7 @@ public class BronzemanPlugin extends Plugin } } + @Subscribe public void onWidgetLoaded(WidgetLoaded e) { switch (e.getGroupId()) @@ -151,6 +140,7 @@ public class BronzemanPlugin extends Plugin /** * Handles greying out items in the GrandExchange **/ + @Subscribe public void onGameTick(GameTick e) { if (grandExchangeWindow == null || grandExchangeChatBox == null || grandExchangeWindow.isHidden()) 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 a30083d02d..681a8be881 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 @@ -48,7 +48,6 @@ import static net.runelite.api.ProjectileID.CANNONBALL; import static net.runelite.api.ProjectileID.GRANITE_CANNONBALL; import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.ChatMessage; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.GameObjectSpawned; import net.runelite.api.events.GameTick; import net.runelite.api.events.ItemContainerChanged; @@ -56,7 +55,8 @@ import net.runelite.api.events.ProjectileSpawned; import net.runelite.client.Notifier; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.ItemManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -107,8 +107,6 @@ public class CannonPlugin extends Plugin private Client client; @Inject private ClientThread clientThread; - @Inject - private EventBus eventbus; private boolean lock; private boolean showEmptyCannonNotification; private boolean showInfobox; @@ -131,7 +129,6 @@ public class CannonPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); overlayManager.add(cannonOverlay); overlayManager.add(cannonSpotOverlay); @@ -141,8 +138,6 @@ public class CannonPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventbus.unregister(this); - cannonSpotOverlay.setHidden(true); overlayManager.remove(cannonOverlay); overlayManager.remove(cannonSpotOverlay); @@ -155,16 +150,7 @@ public class CannonPlugin extends Plugin spotPoints.clear(); } - private void addSubscriptions() - { - eventbus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventbus.subscribe(ItemContainerChanged.class, this, this::onItemContainerChanged); - eventbus.subscribe(GameObjectSpawned.class, this, this::onGameObjectSpawned); - eventbus.subscribe(ProjectileSpawned.class, this, this::onProjectileSpawned); - eventbus.subscribe(ChatMessage.class, this, this::onChatMessage); - eventbus.subscribe(GameTick.class, this, this::onGameTick); - } - +@Subscribe private void onItemContainerChanged(ItemContainerChanged event) { if (event.getItemContainer() != client.getItemContainer(InventoryID.INVENTORY)) @@ -175,6 +161,7 @@ public class CannonPlugin extends Plugin cannonSpotOverlay.setHidden(!ItemUtil.containsAllItemIds(event.getItemContainer().getItems(), CANNON_PARTS)); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("cannon")) @@ -196,8 +183,8 @@ public class CannonPlugin extends Plugin } @Schedule( - period = 1, - unit = ChronoUnit.SECONDS + period = 1, + unit = ChronoUnit.SECONDS ) public void checkSpots() { @@ -218,6 +205,7 @@ public class CannonPlugin extends Plugin } } + @Subscribe private void onGameObjectSpawned(GameObjectSpawned event) { final GameObject gameObject = event.getGameObject(); @@ -232,6 +220,7 @@ public class CannonPlugin extends Plugin } } + @Subscribe private void onProjectileSpawned(ProjectileSpawned event) { final Projectile projectile = event.getProjectile(); @@ -247,6 +236,7 @@ public class CannonPlugin extends Plugin } } + @Subscribe private void onChatMessage(ChatMessage event) { if (event.getType() != ChatMessageType.SPAM && event.getType() != ChatMessageType.GAMEMESSAGE) @@ -330,6 +320,7 @@ public class CannonPlugin extends Plugin } } + @Subscribe private void onGameTick(GameTick event) { skipProjectileCheckThisTick = false; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cerberus/CerberusPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/cerberus/CerberusPlugin.java index 073616f72f..9a6aea92e2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cerberus/CerberusPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cerberus/CerberusPlugin.java @@ -37,7 +37,7 @@ import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.NpcDespawned; import net.runelite.api.events.NpcSpawned; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.ui.overlay.OverlayManager; @@ -59,33 +59,20 @@ public class CerberusPlugin extends Plugin @Inject private CerberusOverlay overlay; - @Inject - private EventBus eventBus; - @Override protected void startUp() throws Exception { overlayManager.add(overlay); - addSubscriptions(); } @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(overlay); ghosts.clear(); } - private void addSubscriptions() - { - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(NpcSpawned.class, this, this::onNpcSpawned); - eventBus.subscribe(NpcDespawned.class, this, this::onNpcDespawned); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - } - +@Subscribe private void onGameStateChanged(GameStateChanged event) { GameState gameState = event.getGameState(); @@ -95,17 +82,20 @@ public class CerberusPlugin extends Plugin } } + @Subscribe private void onNpcSpawned(final NpcSpawned event) { final NPC npc = event.getNpc(); CerberusGhost.fromNPC(npc).ifPresent(ghost -> ghosts.add(npc)); } + @Subscribe private void onNpcDespawned(final NpcDespawned event) { ghosts.remove(event.getNpc()); } + @Subscribe void onGameTick(GameTick gameTick) { if (ghosts.isEmpty()) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformancePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformancePlugin.java index 95007434bc..498b57044e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformancePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatboxperformance/ChatboxPerformancePlugin.java @@ -38,7 +38,7 @@ import net.runelite.api.widgets.WidgetSizeMode; import net.runelite.api.widgets.WidgetType; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -55,14 +55,10 @@ public class ChatboxPerformancePlugin extends Plugin @Inject private ClientThread clientThread; - @Inject - private EventBus eventBus; - @Inject private ChatboxPerformanceConfig config; - private boolean transparentChatBox; - + @Subscribe public void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("chatboxperformance")) @@ -80,7 +76,6 @@ public class ChatboxPerformancePlugin extends Plugin @Override public void startUp() { - addSubscriptions(); if (client.getGameState() == GameState.LOGGED_IN) { clientThread.invokeLater(() -> client.runScript(ScriptID.MESSAGE_LAYER_CLOSE, 0, 0)); @@ -94,21 +89,9 @@ public class ChatboxPerformancePlugin extends Plugin { clientThread.invokeLater(() -> client.runScript(ScriptID.MESSAGE_LAYER_CLOSE, 0, 0)); } - eventBus.unregister(this); - } - - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(ScriptCallbackEvent.class, this, this::onScriptCallbackEvent); - - } - - private void updateConfig() - { - this.transparentChatBox = config.transparentChatBox(); - } + } +@Subscribe private void onScriptCallbackEvent(ScriptCallbackEvent ev) { if (!"chatboxBackgroundBuilt".equals(ev.getEventName())) 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 4d3a1e522c..e4b87e0c10 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 @@ -48,6 +48,7 @@ import net.runelite.api.events.ChatMessage; import net.runelite.api.events.GameTick; import net.runelite.api.events.VarbitChanged; import net.runelite.api.events.WidgetLoaded; +import static net.runelite.api.util.Text.sanitize; import net.runelite.api.vars.AccountType; import net.runelite.api.widgets.Widget; import static net.runelite.api.widgets.WidgetID.KILL_LOGS_GROUP_ID; @@ -58,14 +59,13 @@ import net.runelite.client.chat.ChatCommandManager; import net.runelite.client.chat.ChatMessageBuilder; import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ChatInput; import net.runelite.client.game.ItemManager; import net.runelite.client.input.KeyManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.util.QuantityFormatter; -import static net.runelite.api.util.Text.sanitize; import net.runelite.http.api.chat.ChatClient; import net.runelite.http.api.chat.Duels; import net.runelite.http.api.hiscore.HiscoreClient; @@ -145,13 +145,9 @@ public class ChatCommandsPlugin extends Plugin @Inject private ChatKeyboardListener chatKeyboardListener; - @Inject - private EventBus eventBus; - @Override public void startUp() { - addSubscriptions(); keyManager.registerKeyListener(chatKeyboardListener); @@ -170,8 +166,6 @@ public class ChatCommandsPlugin extends Plugin @Override public void shutDown() { - eventBus.unregister(this); - lastBossKill = null; keyManager.unregisterKeyListener(chatKeyboardListener); @@ -188,15 +182,7 @@ public class ChatCommandsPlugin extends Plugin chatCommandManager.unregisterCommand(DUEL_ARENA_COMMAND); } - private void addSubscriptions() - { - eventBus.subscribe(ChatMessage.class, this, this::onChatMessage); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(WidgetLoaded.class, this, this::onWidgetLoaded); - eventBus.subscribe(VarbitChanged.class, this, this::onVarbitChanged); - } - - @Provides +@Provides ChatCommandsConfig provideConfig(ConfigManager configManager) { return configManager.getConfig(ChatCommandsConfig.class); @@ -228,6 +214,7 @@ public class ChatCommandsPlugin extends Plugin return personalBest == null ? 0 : personalBest; } + @Subscribe void onChatMessage(ChatMessage chatMessage) { if (chatMessage.getType() != ChatMessageType.TRADE @@ -361,6 +348,7 @@ public class ChatCommandsPlugin extends Plugin } } + @Subscribe private void onGameTick(GameTick event) { if (!logKills) @@ -397,6 +385,7 @@ public class ChatCommandsPlugin extends Plugin } } + @Subscribe private void onWidgetLoaded(WidgetLoaded widget) { // don't load kc if in an instance, if the player is in another players poh @@ -409,6 +398,7 @@ public class ChatCommandsPlugin extends Plugin logKills = true; } + @Subscribe private void onVarbitChanged(VarbitChanged varbitChanged) { hiscoreEndpoint = getLocalHiscoreEndpointType(); @@ -446,6 +436,7 @@ public class ChatCommandsPlugin extends Plugin return true; } + @Subscribe private void killCountLookup(ChatMessage chatMessage, String message) { if (!config.killcount()) @@ -533,6 +524,7 @@ public class ChatCommandsPlugin extends Plugin return true; } + @Subscribe private void duelArenaLookup(ChatMessage chatMessage, String message) { if (!config.duels()) @@ -590,6 +582,7 @@ public class ChatCommandsPlugin extends Plugin client.refreshChat(); } + @Subscribe private void questPointsLookup(ChatMessage chatMessage, String message) { if (!config.qp()) @@ -658,6 +651,7 @@ public class ChatCommandsPlugin extends Plugin return true; } + @Subscribe private void gambleCountLookup(ChatMessage chatMessage, String message) { if (!config.gc()) @@ -729,6 +723,7 @@ public class ChatCommandsPlugin extends Plugin } + @Subscribe private void personalBestLookup(ChatMessage chatMessage, String message) { if (!config.pb()) @@ -825,6 +820,7 @@ public class ChatCommandsPlugin extends Plugin * @param chatMessage The chat message containing the command. * @param message The chat message */ + @Subscribe private void itemPriceLookup(ChatMessage chatMessage, String message) { if (!config.price()) @@ -896,6 +892,7 @@ public class ChatCommandsPlugin extends Plugin * @param chatMessage The chat message containing the command. * @param message The chat message */ + @Subscribe private void playerSkillLookup(ChatMessage chatMessage, String message) { if (!config.lvl()) @@ -970,6 +967,7 @@ public class ChatCommandsPlugin extends Plugin } } + @Subscribe private void combatLevelLookup(ChatMessage chatMessage, String message) { if (!config.lvl()) @@ -1055,6 +1053,7 @@ public class ChatCommandsPlugin extends Plugin } } + @Subscribe private void clueLookup(ChatMessage chatMessage, String message) { if (!config.clue()) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java index af7e854198..ad9750318b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatfilter/ChatFilterPlugin.java @@ -42,12 +42,12 @@ import net.runelite.api.ChatMessageType; import net.runelite.api.Client; import net.runelite.api.MessageNode; import net.runelite.api.Player; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.OverheadTextChanged; import net.runelite.api.events.ScriptCallbackEvent; import net.runelite.api.util.Text; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import org.apache.commons.lang3.StringUtils; @@ -76,9 +76,6 @@ public class ChatFilterPlugin extends Plugin @Inject private ChatFilterConfig config; - @Inject - private EventBus eventBus; - @Setter(AccessLevel.PACKAGE) private ChatFilterType filterType; @Setter(AccessLevel.PACKAGE) @@ -100,7 +97,6 @@ public class ChatFilterPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); updateFilteredPatterns(); client.refreshChat(); @@ -109,19 +105,11 @@ public class ChatFilterPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - filteredPatterns.clear(); client.refreshChat(); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(ScriptCallbackEvent.class, this, this::onScriptCallbackEvent); - eventBus.subscribe(OverheadTextChanged.class, this, this::onOverheadTextChanged); - } - +@Subscribe private void onScriptCallbackEvent(ScriptCallbackEvent event) { if (!"chatFilterCheck".equals(event.getEventName())) @@ -185,6 +173,7 @@ public class ChatFilterPlugin extends Plugin } } + @Subscribe private void onOverheadTextChanged(OverheadTextChanged event) { if (!(event.getActor() instanceof Player) || event.getActor().getName() == null || !shouldFilterPlayerMessage(event.getActor().getName())) @@ -267,6 +256,7 @@ public class ChatFilterPlugin extends Plugin .forEach(filteredPatterns::add); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!"chatfilter".equals(event.getGroup())) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java index 5eb6009200..ee1d6a652e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chathistory/ChatHistoryPlugin.java @@ -46,7 +46,7 @@ import net.runelite.client.callback.ClientThread; import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.chat.QueuedMessage; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.input.KeyListener; import net.runelite.client.input.KeyManager; @@ -85,9 +85,6 @@ public class ChatHistoryPlugin extends Plugin implements KeyListener @Inject private ChatMessageManager chatMessageManager; - @Inject - private EventBus eventBus; - private boolean retainChatHistory; private boolean pmTargetCycling; @@ -101,7 +98,6 @@ public class ChatHistoryPlugin extends Plugin implements KeyListener protected void startUp() { updateConfig(); - addSubscriptions(); messageQueue = EvictingQueue.create(100); friends = new ArrayDeque<>(FRIENDS_MAX_SIZE + 1); @@ -111,8 +107,6 @@ public class ChatHistoryPlugin extends Plugin implements KeyListener @Override protected void shutDown() { - eventBus.unregister(this); - messageQueue.clear(); messageQueue = null; friends.clear(); @@ -120,13 +114,7 @@ public class ChatHistoryPlugin extends Plugin implements KeyListener keyManager.unregisterKeyListener(this); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(ChatMessage.class, this, this::onChatMessage); - eventBus.subscribe(MenuOptionClicked.class, this, this::onMenuOptionClicked); - } - +@Subscribe private void onChatMessage(ChatMessage chatMessage) { // Start sending old messages right after the welcome message, as that is most reliable source @@ -183,6 +171,7 @@ public class ChatHistoryPlugin extends Plugin implements KeyListener } } + @Subscribe private void onMenuOptionClicked(MenuOptionClicked event) { String menuOption = event.getOption(); @@ -280,6 +269,7 @@ public class ChatHistoryPlugin extends Plugin implements KeyListener return friends.getLast(); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!"chathistory".equals(event.getGroup())) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java index b7f42d4cca..c050b8d019 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPlugin.java @@ -47,7 +47,7 @@ import net.runelite.client.RuneLiteProperties; import net.runelite.client.chat.ChatColorType; import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -73,9 +73,6 @@ public class ChatNotificationsPlugin extends Plugin @Inject private Notifier notifier; - @Inject - private EventBus eventBus; - //Custom Highlights private Pattern usernameMatcher = null; private String usernameReplacer = ""; @@ -102,7 +99,6 @@ public class ChatNotificationsPlugin extends Plugin public void startUp() { updateConfig(); - addSubscriptions(); updateHighlights(); } @@ -110,18 +106,10 @@ public class ChatNotificationsPlugin extends Plugin @Override public void shutDown() { - eventBus.unregister(this); - this.privateMessageHashes.clear(); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(ChatMessage.class, this, this::onChatMessage); - } - +@Subscribe private void onGameStateChanged(GameStateChanged event) { switch (event.getGameState()) @@ -133,6 +121,7 @@ public class ChatNotificationsPlugin extends Plugin } } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("chatnotification")) @@ -159,6 +148,7 @@ public class ChatNotificationsPlugin extends Plugin } } + @Subscribe void onChatMessage(ChatMessage chatMessage) { MessageNode messageNode = chatMessage.getMessageNode(); @@ -280,6 +270,7 @@ public class ChatNotificationsPlugin extends Plugin return (message.getName() + message.getMessage()).hashCode(); } + @Subscribe private void sendNotification(ChatMessage message) { String name = Text.removeTags(message.getName()); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java index cddbb066cf..89d4496a4b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationPlugin.java @@ -26,6 +26,7 @@ import net.runelite.client.callback.ClientThread; import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.input.KeyListener; import net.runelite.client.input.KeyManager; @@ -84,8 +85,6 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener @Override protected void startUp() throws Exception { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - translator.setInLang(config.publicTargetLanguage()); translator.setOutLang(config.playerTargetLanguage()); @@ -115,7 +114,6 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener @Override protected void shutDown() throws Exception { - eventBus.unregister(this); eventBus.unregister(OPTION); eventBus.unregister(PUBLIC); menuManager.removePlayerMenuItem(TRANSLATE); @@ -123,6 +121,7 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener playerNames.clear(); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("chattranslation")) @@ -227,6 +226,7 @@ public class ChatTranslationPlugin extends Plugin implements KeyListener config.playerNames(Text.toCSV(playerNames)); } + @Subscribe private void onChatMessage(ChatMessage chatMessage) { if (client.getGameState() != GameState.LOADING && client.getGameState() != GameState.LOGGED_IN) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java index 0ec05fe398..649dae9cc8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanchat/ClanChatPlugin.java @@ -57,7 +57,6 @@ import net.runelite.api.events.ChatMessage; import net.runelite.api.events.ClanChanged; import net.runelite.api.events.ClanMemberJoined; import net.runelite.api.events.ClanMemberLeft; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.PlayerDespawned; @@ -71,7 +70,8 @@ import net.runelite.api.widgets.WidgetType; import net.runelite.client.callback.ClientThread; import net.runelite.client.chat.ChatMessageBuilder; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.ClanManager; import net.runelite.client.game.SpriteManager; import net.runelite.client.plugins.Plugin; @@ -114,9 +114,6 @@ public class ClanChatPlugin extends Plugin @Inject private ClientThread clientThread; - @Inject - private EventBus eventBus; - private List chats = new ArrayList<>(); @SuppressWarnings("unchecked") @@ -155,7 +152,6 @@ public class ClanChatPlugin extends Plugin public void startUp() { updateConfig(); - addSubscriptions(); chats = new ArrayList<>(Text.fromCSV(this.chatsData)); } @@ -163,28 +159,12 @@ public class ClanChatPlugin extends Plugin @Override public void shutDown() { - eventBus.unregister(this); - clanMembers.clear(); removeClanCounter(); resetClanChats(); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(ClanMemberJoined.class, this, this::onClanMemberJoined); - eventBus.subscribe(ClanMemberLeft.class, this, this::onClanMemberLeft); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(VarClientStrChanged.class, this, this::onVarClientStrChanged); - eventBus.subscribe(ChatMessage.class, this, this::onChatMessage); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(PlayerSpawned.class, this, this::onPlayerSpawned); - eventBus.subscribe(PlayerDespawned.class, this, this::onPlayerDespawned); - eventBus.subscribe(ClanChanged.class, this, this::onClanChanged); - eventBus.subscribe(ScriptCallbackEvent.class, this, this::onScriptCallbackEvent); - } - +@Subscribe private void onConfigChanged(ConfigChanged configChanged) { if (configChanged.getGroup().equals("clanchat")) @@ -207,6 +187,7 @@ public class ClanChatPlugin extends Plugin } } + @Subscribe private void onClanMemberJoined(ClanMemberJoined event) { final ClanMember member = event.getMember(); @@ -252,6 +233,7 @@ public class ClanChatPlugin extends Plugin } } + @Subscribe private void onClanMemberLeft(ClanMemberLeft event) { final ClanMember member = event.getMember(); @@ -295,6 +277,7 @@ public class ClanChatPlugin extends Plugin } } + @Subscribe private void onGameTick(GameTick gameTick) { if (client.getGameState() != GameState.LOGGED_IN) @@ -434,6 +417,7 @@ public class ClanChatPlugin extends Plugin clanJoinMessages.addLast(clanJoinMessage); } + @Subscribe private void onVarClientStrChanged(VarClientStrChanged strChanged) { if (strChanged.getIndex() == VarClientStr.RECENT_CLAN_CHAT.getIndex() && this.recentChats) @@ -442,6 +426,7 @@ public class ClanChatPlugin extends Plugin } } + @Subscribe private void onChatMessage(ChatMessage chatMessage) { if (client.getGameState() != GameState.LOADING && client.getGameState() != GameState.LOGGED_IN) @@ -483,6 +468,7 @@ public class ClanChatPlugin extends Plugin insertClanRankIcon(chatMessage); } + @Subscribe private void onGameStateChanged(GameStateChanged state) { GameState gameState = state.getGameState(); @@ -496,6 +482,7 @@ public class ClanChatPlugin extends Plugin } } + @Subscribe private void onPlayerSpawned(PlayerSpawned event) { final Player local = client.getLocalPlayer(); @@ -508,6 +495,7 @@ public class ClanChatPlugin extends Plugin } } + @Subscribe private void onPlayerDespawned(PlayerDespawned event) { if (clanMembers.remove(event.getPlayer()) && clanMembers.isEmpty()) @@ -516,6 +504,7 @@ public class ClanChatPlugin extends Plugin } } + @Subscribe private void onClanChanged(ClanChanged event) { if (event.isJoined()) @@ -531,6 +520,7 @@ public class ClanChatPlugin extends Plugin activityBuffer.clear(); } + @Subscribe private void onScriptCallbackEvent(ScriptCallbackEvent scriptCallbackEvent) { if (!scriptCallbackEvent.getEventName().equalsIgnoreCase("clanchatInput")) @@ -548,6 +538,7 @@ public class ClanChatPlugin extends Plugin return clanMembers.size(); } + @Subscribe private void insertClanRankIcon(final ChatMessage message) { final ClanMemberRank rank = clanManager.getRank(message.getName()); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModePlugin.java index 4daa72d926..20ada0e6f8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/clanmanmode/ClanManModePlugin.java @@ -17,7 +17,7 @@ import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -52,9 +52,6 @@ public class ClanManModePlugin extends Plugin @Inject private Client client; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) private boolean highlightAttackable; @Getter(AccessLevel.PACKAGE) @@ -103,8 +100,7 @@ public class ClanManModePlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); - + overlayManager.add(ClanManModeOverlay); overlayManager.add(ClanManModeTileOverlay); overlayManager.add(ClanManModeMinimapOverlay); @@ -113,8 +109,6 @@ public class ClanManModePlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(ClanManModeOverlay); overlayManager.remove(ClanManModeTileOverlay); overlayManager.remove(ClanManModeMinimapOverlay); @@ -126,23 +120,18 @@ public class ClanManModePlugin extends Plugin inwildy = 0; } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - } - +@Subscribe private void onConfigChanged(ConfigChanged event) { if (!"clanmanmode".equals(event.getGroup())) { return; } - + updateConfig(); } + @Subscribe private void onGameStateChanged(GameStateChanged gameStateChanged) { if (gameStateChanged.getGameState() == GameState.LOGIN_SCREEN || gameStateChanged.getGameState() == GameState.HOPPING) @@ -151,6 +140,7 @@ public class ClanManModePlugin extends Plugin } } + @Subscribe private void onGameTick(GameTick event) { ticks++; @@ -170,7 +160,7 @@ public class ClanManModePlugin extends Plugin clanmax = Collections.max(clan.values()); } } - + private void updateConfig() { this.highlightAttackable = config.highlightAttackable(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java index 59d6d5acd0..91b8fe001c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java @@ -60,7 +60,6 @@ import net.runelite.api.TileObject; import net.runelite.api.coords.LocalPoint; import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.ChatMessage; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.ItemContainerChanged; @@ -68,11 +67,13 @@ import net.runelite.api.events.MenuOptionClicked; import net.runelite.api.events.NpcDespawned; import net.runelite.api.events.NpcSpawned; import net.runelite.api.events.WidgetLoaded; +import net.runelite.api.util.Text; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetID; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.ItemManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -101,7 +102,6 @@ import net.runelite.client.ui.overlay.components.TextComponent; import net.runelite.client.ui.overlay.worldmap.WorldMapPointManager; import net.runelite.client.util.ImageUtil; import net.runelite.client.util.ItemUtil; -import net.runelite.api.util.Text; @PluginDescriptor( name = "Clue Scroll", @@ -166,9 +166,6 @@ public class ClueScrollPlugin extends Plugin @Inject private WorldMapPointManager worldMapPointManager; - @Inject - private EventBus eventBus; - private BufferedImage emoteImage; private BufferedImage mapArrow; private Integer clueItemId; @@ -193,7 +190,6 @@ public class ClueScrollPlugin extends Plugin @Override protected void startUp() throws Exception { - addSubscriptions(); this.displayHintArrows = config.displayHintArrows(); overlayManager.add(clueScrollOverlay); @@ -205,8 +201,6 @@ public class ClueScrollPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(clueScrollOverlay); overlayManager.remove(clueScrollEmoteOverlay); overlayManager.remove(clueScrollWorldOverlay); @@ -217,19 +211,7 @@ public class ClueScrollPlugin extends Plugin resetClue(true); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(ChatMessage.class, this, this::onChatMessage); - eventBus.subscribe(MenuOptionClicked.class, this, this::onMenuOptionClicked); - eventBus.subscribe(ItemContainerChanged.class, this, this::onItemContainerChanged); - eventBus.subscribe(NpcSpawned.class, this, this::onNpcSpawned); - eventBus.subscribe(NpcDespawned.class, this, this::onNpcDespawned); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(WidgetLoaded.class, this, this::onWidgetLoaded); - } - +@Subscribe private void onChatMessage(ChatMessage event) { if (event.getType() != ChatMessageType.GAMEMESSAGE && event.getType() != ChatMessageType.SPAM) @@ -255,6 +237,7 @@ public class ClueScrollPlugin extends Plugin } } + @Subscribe private void onMenuOptionClicked(final MenuOptionClicked event) { if ("read".equalsIgnoreCase(event.getOption())) @@ -269,6 +252,7 @@ public class ClueScrollPlugin extends Plugin } } + @Subscribe private void onItemContainerChanged(final ItemContainerChanged event) { if (event.getItemContainer() == client.getItemContainer(InventoryID.EQUIPMENT)) @@ -309,12 +293,14 @@ public class ClueScrollPlugin extends Plugin } } + @Subscribe private void onNpcSpawned(final NpcSpawned event) { final NPC npc = event.getNpc(); checkClueNPCs(clue, npc); } + @Subscribe private void onNpcDespawned(final NpcDespawned event) { final boolean removed = npcsToMark.remove(event.getNpc()); @@ -333,6 +319,7 @@ public class ClueScrollPlugin extends Plugin } } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("cluescroll")) @@ -345,6 +332,7 @@ public class ClueScrollPlugin extends Plugin } } + @Subscribe private void onGameStateChanged(final GameStateChanged event) { if (event.getGameState() == GameState.LOGIN_SCREEN) @@ -353,6 +341,7 @@ public class ClueScrollPlugin extends Plugin } } + @Subscribe private void onGameTick(final GameTick event) { objectsToMark.clear(); @@ -431,6 +420,7 @@ public class ClueScrollPlugin extends Plugin updateClue(findClueScroll()); } + @Subscribe private void onWidgetLoaded(WidgetLoaded event) { if (event.getGroupId() < WidgetID.BEGINNER_CLUE_MAP_CHAMPIONS_GUILD diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java index e568487af0..add766632f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatcounter/CombatCounter.java @@ -56,6 +56,7 @@ import net.runelite.api.events.HitsplatApplied; import net.runelite.api.kit.KitType; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -63,15 +64,15 @@ import net.runelite.client.plugins.PluginType; import net.runelite.client.ui.overlay.OverlayManager; @PluginDescriptor( - name = "Tick Counter", - description = "Count the amount of perfect combat ticks performed by each player.", - tags = {"combat", "counter", "tick"}, - type = PluginType.UTILITY, - enabledByDefault = false + name = "Tick Counter", + description = "Count the amount of perfect combat ticks performed by each player.", + tags = {"combat", "counter", "tick"}, + type = PluginType.UTILITY, + enabledByDefault = false ) @Singleton @Slf4j -public class CombatCounter extends Plugin +public class CombatCounter extends Plugin { @Inject @@ -266,7 +267,6 @@ public class CombatCounter extends Plugin private void addSubscriptions() { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); eventBus.subscribe(AnimationChanged.class, this, this::onAnimationChanged); eventBus.subscribe(GameTick.class, this, this::onGameTick); eventBus.subscribe(HitsplatApplied.class, this, this::onHitsplatApplied); @@ -422,7 +422,7 @@ public class CombatCounter extends Plugin { boolean prevInstance = instanced; instanced = client.isInInstancedRegion(); - if (!prevInstance && instanced) + if (!prevInstance && instanced) { this.counter.clear(); this.blowpipe.clear(); @@ -654,6 +654,7 @@ public class CombatCounter extends Plugin return 2 + (int) Math.floor((3d + distance) / 6d); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("combatcounter")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelPlugin.java index b6e0a4626e..f6ffc10326 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/combatlevel/CombatLevelPlugin.java @@ -38,14 +38,14 @@ import net.runelite.api.Experience; import net.runelite.api.GameState; import net.runelite.api.Skill; import net.runelite.api.WorldType; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.ScriptCallbackEvent; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.ui.overlay.OverlayManager; @@ -84,9 +84,6 @@ public class CombatLevelPlugin extends Plugin @Inject private OverlayManager overlayManager; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) private boolean showLevelsUntil; private boolean wildernessAttackLevelRange; @@ -101,7 +98,6 @@ public class CombatLevelPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); overlayManager.add(overlay); @@ -114,8 +110,6 @@ public class CombatLevelPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(overlay); Widget combatLevelWidget = client.getWidget(WidgetInfo.COMBAT_LEVEL); @@ -132,13 +126,7 @@ public class CombatLevelPlugin extends Plugin shutDownAttackLevelRange(); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(ScriptCallbackEvent.class, this, this::onScriptCallbackEvent); - } - +@Subscribe private void onGameTick(GameTick event) { if (client.getGameState() != GameState.LOGGED_IN) @@ -165,6 +153,7 @@ public class CombatLevelPlugin extends Plugin combatLevelWidget.setText("Combat Lvl: " + DECIMAL_FORMAT.format(combatLevelPrecise)); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!CONFIG_GROUP.equals(event.getGroup()) || !ATTACK_RANGE_CONFIG_KEY.equals(event.getKey())) @@ -184,6 +173,7 @@ public class CombatLevelPlugin extends Plugin } } + @Subscribe private void onScriptCallbackEvent(ScriptCallbackEvent event) { if (this.wildernessAttackLevelRange diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java index e68e2b7786..062d8cad42 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java @@ -35,9 +35,9 @@ import net.runelite.client.RuneLite; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ChatColorConfig; import net.runelite.client.config.ConfigManager; -import net.runelite.client.config.RuneLiteConfig; import net.runelite.client.config.OpenOSRSConfig; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.config.RuneLiteConfig; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.OverlayMenuClicked; import net.runelite.client.events.PluginChanged; import net.runelite.client.plugins.Plugin; @@ -84,16 +84,12 @@ public class ConfigPlugin extends Plugin @Inject private ColorPickerManager colorPickerManager; - @Inject - private EventBus eventBus; - private ConfigPanel configPanel; private NavigationButton navButton; @Override protected void startUp() throws Exception { - addSubscriptions(); configPanel = new ConfigPanel(pluginManager, configManager, executorService, runeLiteConfig, OpenOSRSConfig, chatColorConfig, colorPickerManager); @@ -112,8 +108,6 @@ public class ConfigPlugin extends Plugin @Override public void shutDown() throws Exception { - eventBus.unregister(this); - clientToolbar.removeNavigation(navButton); RuneLite.getInjector().getInstance(ClientThread.class).invokeLater(() -> { @@ -133,17 +127,13 @@ public class ConfigPlugin extends Plugin }); } - private void addSubscriptions() - { - eventBus.subscribe(PluginChanged.class, this, this::onPluginChanged); - eventBus.subscribe(OverlayMenuClicked.class, this, this::onOverlayMenuClicked); - } - +@Subscribe private void onPluginChanged(PluginChanged event) { SwingUtilities.invokeLater(configPanel::refreshPluginList); } + @Subscribe private void onOverlayMenuClicked(OverlayMenuClicked overlayMenuClicked) { OverlayMenuEntry overlayMenuEntry = overlayMenuClicked.getEntry(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java index 24e339d09f..6d2249113f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cooking/CookingPlugin.java @@ -44,7 +44,7 @@ import net.runelite.api.events.ChatMessage; import net.runelite.api.events.GameTick; import net.runelite.api.events.SpotAnimationChanged; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.events.OverlayMenuClicked; import net.runelite.client.game.ItemManager; @@ -83,9 +83,6 @@ public class CookingPlugin extends Plugin @Inject private ItemManager itemManager; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) private CookingSession session; @@ -103,7 +100,6 @@ public class CookingPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); session = null; overlayManager.add(overlay); @@ -112,22 +108,12 @@ public class CookingPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - infoBoxManager.removeIf(FermentTimer.class::isInstance); overlayManager.remove(overlay); session = null; } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(SpotAnimationChanged.class, this, this::onSpotAnimationChanged); - eventBus.subscribe(ChatMessage.class, this, this::onChatMessage); - eventBus.subscribe(OverlayMenuClicked.class, this, this::onOverlayMenuClicked); - } - +@Subscribe private void onOverlayMenuClicked(OverlayMenuClicked overlayMenuClicked) { OverlayMenuEntry overlayMenuEntry = overlayMenuClicked.getEntry(); @@ -139,6 +125,7 @@ public class CookingPlugin extends Plugin } } + @Subscribe private void onGameTick(GameTick gameTick) { if (session == null || this.statTimeout == 0) @@ -155,6 +142,7 @@ public class CookingPlugin extends Plugin } } + @Subscribe void onSpotAnimationChanged(SpotAnimationChanged graphicChanged) { Player player = client.getLocalPlayer(); @@ -184,6 +172,7 @@ public class CookingPlugin extends Plugin } } + @Subscribe void onChatMessage(ChatMessage event) { if (event.getType() != ChatMessageType.SPAM) @@ -221,6 +210,7 @@ public class CookingPlugin extends Plugin } } + @Subscribe private void onConfigChanged(ConfigChanged configChanged) { if (configChanged.getGroup().equals("cooking")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java index 38d7db620b..b517d12b99 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/corp/CorpPlugin.java @@ -51,7 +51,7 @@ import net.runelite.client.chat.ChatMessageBuilder; import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.chat.QueuedMessage; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -100,9 +100,6 @@ public class CorpPlugin extends Plugin @Inject private CorpConfig config; - @Inject - private EventBus eventBus; - private boolean leftClickCore; @Getter(AccessLevel.PACKAGE) private boolean showDamage; @@ -117,7 +114,6 @@ public class CorpPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); overlayManager.add(corpOverlay); overlayManager.add(coreOverlay); @@ -126,8 +122,6 @@ public class CorpPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(corpOverlay); overlayManager.remove(coreOverlay); @@ -137,17 +131,7 @@ public class CorpPlugin extends Plugin players.clear(); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(NpcSpawned.class, this, this::onNpcSpawned); - eventBus.subscribe(NpcDespawned.class, this, this::onNpcDespawned); - eventBus.subscribe(HitsplatApplied.class, this, this::onHitsplatApplied); - eventBus.subscribe(InteractingChanged.class, this, this::onInteractingChanged); - eventBus.subscribe(MenuEntryAdded.class, this, this::onMenuEntryAdded); - } - +@Subscribe private void onGameStateChanged(GameStateChanged gameStateChanged) { if (gameStateChanged.getGameState() == GameState.LOADING) @@ -156,6 +140,7 @@ public class CorpPlugin extends Plugin } } + @Subscribe private void onNpcSpawned(NpcSpawned npcSpawned) { NPC npc = npcSpawned.getNpc(); @@ -175,6 +160,7 @@ public class CorpPlugin extends Plugin } } + @Subscribe private void onNpcDespawned(NpcDespawned npcDespawned) { NPC npc = npcDespawned.getNpc(); @@ -211,6 +197,7 @@ public class CorpPlugin extends Plugin } } + @Subscribe private void onHitsplatApplied(HitsplatApplied hitsplatApplied) { Actor actor = hitsplatApplied.getActor(); @@ -229,6 +216,7 @@ public class CorpPlugin extends Plugin totalDamage += hitsplatApplied.getHitsplat().getAmount(); } + @Subscribe private void onInteractingChanged(InteractingChanged interactingChanged) { Actor source = interactingChanged.getSource(); @@ -242,6 +230,7 @@ public class CorpPlugin extends Plugin players.add(source); } + @Subscribe private void onMenuEntryAdded(MenuEntryAdded event) { if (event.getOpcode() != NPC_SECOND_OPTION.getId() @@ -261,6 +250,7 @@ public class CorpPlugin extends Plugin event.setModified(); } + @Subscribe private void onConfigChanged(ConfigChanged configChanged) { if (configChanged.getGroup().equals("corp")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxPlugin.java index 5a983db6f7..00d63efa96 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/coxhelper/CoxPlugin.java @@ -66,6 +66,7 @@ import net.runelite.api.util.Text; import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -162,7 +163,6 @@ public class CoxPlugin extends Plugin protected void startUp() { updateConfig(); - addSubscriptions(); overlayManager.add(coxOverlay); overlayManager.add(coxInfoBox); handCripple = false; @@ -178,22 +178,11 @@ public class CoxPlugin extends Plugin @Override protected void shutDown() { - eventBus.unregister(this); overlayManager.remove(coxOverlay); overlayManager.remove(coxInfoBox); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(ChatMessage.class, this, this::onChatMessage); - eventBus.subscribe(ProjectileSpawned.class, this, this::onProjectileSpawned); - eventBus.subscribe(SpotAnimationChanged.class, this, this::onSpotAnimationChanged); - eventBus.subscribe(NpcSpawned.class, this, this::onNpcSpawned); - eventBus.subscribe(NpcDespawned.class, this, this::onNpcDespawned); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - } - +@Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("Cox")) @@ -202,6 +191,7 @@ public class CoxPlugin extends Plugin } } + @Subscribe private void onChatMessage(ChatMessage event) { if (!inRaid()) @@ -274,6 +264,7 @@ public class CoxPlugin extends Plugin } } + @Subscribe private void onProjectileSpawned(ProjectileSpawned event) { if (!inRaid()) @@ -299,6 +290,7 @@ public class CoxPlugin extends Plugin } } + @Subscribe private void onSpotAnimationChanged(SpotAnimationChanged event) { if (!inRaid()) @@ -332,6 +324,7 @@ public class CoxPlugin extends Plugin } } + @Subscribe private void onNpcSpawned(NpcSpawned event) { if (!inRaid()) @@ -376,6 +369,7 @@ public class CoxPlugin extends Plugin } } + @Subscribe private void onNpcDespawned(NpcDespawned event) { if (!inRaid()) @@ -423,6 +417,7 @@ public class CoxPlugin extends Plugin } } + @Subscribe private void onGameTick(GameTick event) { if (!inRaid()) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursorPlugin.java index 43f950c12b..6f66cef621 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursorPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursorPlugin.java @@ -36,7 +36,7 @@ import javax.sound.sampled.LineUnavailableException; import javax.sound.sampled.UnsupportedAudioFileException; import lombok.extern.slf4j.Slf4j; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -57,9 +57,6 @@ public class CustomCursorPlugin extends Plugin @Inject private CustomCursorConfig config; - @Inject - private EventBus eventBus; - private Clip skillSpecsRage; private int volume = 35; @@ -72,7 +69,6 @@ public class CustomCursorPlugin extends Plugin @Override protected void startUp() { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); updateCursor(); try (AudioInputStream ais = AudioSystem.getAudioInputStream(this.getClass().getResourceAsStream("specs-rage.wav"))) @@ -93,11 +89,10 @@ public class CustomCursorPlugin extends Plugin @Override protected void shutDown() { - eventBus.unregister(this); - clientUI.resetCursor(); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("customcursor") && event.getKey().equals("cursorStyle")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/dailytaskindicators/DailyTasksPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/dailytaskindicators/DailyTasksPlugin.java index fa8c5a3e5e..3fc0f69ea2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/dailytaskindicators/DailyTasksPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/dailytaskindicators/DailyTasksPlugin.java @@ -43,7 +43,7 @@ import net.runelite.client.chat.ChatMessageBuilder; import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.chat.QueuedMessage; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -80,9 +80,6 @@ public class DailyTasksPlugin extends Plugin @Inject private ChatMessageManager chatMessageManager; - @Inject - private EventBus eventBus; - private long lastReset; private boolean loggingIn; @@ -106,7 +103,6 @@ public class DailyTasksPlugin extends Plugin public void startUp() { updateConfig(); - addSubscriptions(); loggingIn = true; } @@ -114,19 +110,10 @@ public class DailyTasksPlugin extends Plugin @Override public void shutDown() { - eventBus.unregister(this); - - eventBus.unregister(this); lastReset = 0L; } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - } - +@Subscribe private void onGameStateChanged(GameStateChanged event) { if (event.getGameState() == GameState.LOGGING_IN) @@ -135,6 +122,7 @@ public class DailyTasksPlugin extends Plugin } } + @Subscribe private void onGameTick(GameTick event) { long currentTime = System.currentTimeMillis(); @@ -186,7 +174,7 @@ public class DailyTasksPlugin extends Plugin { checkArrows(dailyReset); } - + if (this.showDynamite) { checkDynamite(dailyReset); @@ -310,6 +298,7 @@ public class DailyTasksPlugin extends Plugin .build()); } + @Subscribe private void onConfigChanged(ConfigChanged configChanged) { if (configChanged.getGroup().equals("dailytaskindicators")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathIndicatorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathIndicatorPlugin.java index 905cdc03bd..d9ed4a349a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathIndicatorPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathIndicatorPlugin.java @@ -44,7 +44,6 @@ import net.runelite.api.MenuEntry; import net.runelite.api.MenuOpcode; import net.runelite.api.Player; import net.runelite.api.coords.WorldPoint; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.ItemDespawned; @@ -58,6 +57,8 @@ import net.runelite.api.util.Text; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.ItemManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -122,6 +123,7 @@ public class DeathIndicatorPlugin extends Plugin private Instant lastDeathTime; private int lastDeathWorld; private int despawnIdx = 0; + @Provides DeathIndicatorConfig deathIndicatorConfig(ConfigManager configManager) { @@ -131,7 +133,10 @@ public class DeathIndicatorPlugin extends Plugin @Override protected void startUp() { - addSubscriptions(); + if (config.permaBones()) + { + addBoneSubs(); + } if (!hasDied()) { @@ -165,7 +170,6 @@ public class DeathIndicatorPlugin extends Plugin @Override protected void shutDown() { - eventBus.unregister(this); eventBus.unregister(BONES); if (client.hasHintArrow()) @@ -194,18 +198,6 @@ public class DeathIndicatorPlugin extends Plugin bones.clear(client.getScene()); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(LocalPlayerDeath.class, this, this::onLocalPlayerDeath); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - if (config.permaBones()) - { - addBoneSubs(); - } - } - private void addBoneSubs() { eventBus.subscribe(ItemDespawned.class, BONES, this::onItemDespawn); @@ -301,6 +293,7 @@ public class DeathIndicatorPlugin extends Plugin } } + @Subscribe private void onLocalPlayerDeath(LocalPlayerDeath death) { if (client.isInInstancedRegion()) @@ -319,6 +312,7 @@ public class DeathIndicatorPlugin extends Plugin lastDeathTime = Instant.now(); } + @Subscribe private void onGameTick(GameTick event) { // Check if player respawned in a death respawn location @@ -383,6 +377,7 @@ public class DeathIndicatorPlugin extends Plugin } } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("deathIndicator")) @@ -436,6 +431,7 @@ public class DeathIndicatorPlugin extends Plugin } } + @Subscribe private void onGameStateChanged(GameStateChanged event) { switch (event.getGameState()) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/defaultworld/DefaultWorldPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/defaultworld/DefaultWorldPlugin.java index cb5272a491..a115e5f6bf 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/defaultworld/DefaultWorldPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/defaultworld/DefaultWorldPlugin.java @@ -34,7 +34,7 @@ import net.runelite.api.GameState; import net.runelite.api.events.GameStateChanged; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.SessionOpen; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -57,9 +57,6 @@ public class DefaultWorldPlugin extends Plugin @Inject private DefaultWorldConfig config; - @Inject - private EventBus eventBus; - @Inject private ClientThread clientThread; @@ -72,7 +69,6 @@ public class DefaultWorldPlugin extends Plugin @Override protected void startUp() throws Exception { - addSubscriptions(); worldChangeRequired = true; applyWorld(); @@ -81,30 +77,24 @@ public class DefaultWorldPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - worldChangeRequired = true; changeWorld(worldCache); } - private void addSubscriptions() - { - eventBus.subscribe(SessionOpen.class, this, this::onSessionOpen); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - } - - @Provides +@Provides DefaultWorldConfig getConfig(ConfigManager configManager) { return configManager.getConfig(DefaultWorldConfig.class); } + @Subscribe private void onSessionOpen(SessionOpen event) { worldChangeRequired = true; applyWorld(); } + @Subscribe private void onGameStateChanged(GameStateChanged event) { applyWorld(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaPlugin.java index 94a4237d59..b9eeb05b52 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/demonicgorilla/DemonicGorillaPlugin.java @@ -58,7 +58,7 @@ import net.runelite.api.events.PlayerDespawned; import net.runelite.api.events.PlayerSpawned; import net.runelite.api.events.ProjectileSpawned; import net.runelite.client.callback.ClientThread; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.ui.overlay.OverlayManager; @@ -85,9 +85,6 @@ public class DemonicGorillaPlugin extends Plugin @Inject private ClientThread clientThread; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) private Map gorillas; @@ -100,7 +97,6 @@ public class DemonicGorillaPlugin extends Plugin @Override protected void startUp() throws Exception { - addSubscriptions(); overlayManager.add(overlay); gorillas = new HashMap<>(); recentBoulders = new ArrayList<>(); @@ -112,7 +108,6 @@ public class DemonicGorillaPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); overlayManager.remove(overlay); gorillas = null; recentBoulders = null; @@ -120,19 +115,7 @@ public class DemonicGorillaPlugin extends Plugin memorizedPlayers = null; } - private void addSubscriptions() - { - eventBus.subscribe(ProjectileSpawned.class, this, this::onProjectileSpawned); - eventBus.subscribe(HitsplatApplied.class, this, this::onHitsplatApplied); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(PlayerSpawned.class, this, this::onPlayerSpawned); - eventBus.subscribe(PlayerDespawned.class, this, this::onPlayerDespawned); - eventBus.subscribe(NpcSpawned.class, this, this::onNpcSpawned); - eventBus.subscribe(NpcDespawned.class, this, this::onNpcDespawned); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - } - - private void clear() +private void clear() { recentBoulders.clear(); pendingAttacks.clear(); @@ -548,6 +531,7 @@ public class DemonicGorillaPlugin extends Plugin } } + @Subscribe private void onProjectileSpawned(ProjectileSpawned event) { final Projectile projectile = event.getProjectile(); @@ -627,6 +611,7 @@ public class DemonicGorillaPlugin extends Plugin } } + @Subscribe private void onHitsplatApplied(HitsplatApplied event) { if (gorillas.isEmpty()) @@ -655,6 +640,7 @@ public class DemonicGorillaPlugin extends Plugin } } + @Subscribe private void onGameStateChanged(GameStateChanged event) { GameState gs = event.getGameState(); @@ -666,6 +652,7 @@ public class DemonicGorillaPlugin extends Plugin } } + @Subscribe private void onPlayerSpawned(PlayerSpawned event) { if (gorillas.isEmpty()) @@ -677,6 +664,7 @@ public class DemonicGorillaPlugin extends Plugin memorizedPlayers.put(player, new MemorizedPlayer(player)); } + @Subscribe private void onPlayerDespawned(PlayerDespawned event) { if (gorillas.isEmpty()) @@ -687,6 +675,7 @@ public class DemonicGorillaPlugin extends Plugin memorizedPlayers.remove(event.getPlayer()); } + @Subscribe private void onNpcSpawned(NpcSpawned event) { NPC npc = event.getNpc(); @@ -703,6 +692,7 @@ public class DemonicGorillaPlugin extends Plugin } } + @Subscribe private void onNpcDespawned(NpcDespawned event) { if (gorillas.remove(event.getNpc()) != null && gorillas.isEmpty()) @@ -711,6 +701,7 @@ public class DemonicGorillaPlugin extends Plugin } } + @Subscribe private void onGameTick(GameTick event) { checkGorillaAttacks(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPlugin.java index dc39eb00f3..35e9e3a72c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPlugin.java @@ -50,6 +50,7 @@ import net.runelite.api.events.VarbitChanged; import net.runelite.api.kit.KitType; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.ui.ClientToolbar; @@ -142,7 +143,6 @@ public class DevToolsPlugin extends Plugin @Override protected void startUp() throws Exception { - addSubscriptions(); players = new DevToolsButton("Players"); npcs = new DevToolsButton("NPCs"); @@ -206,8 +206,6 @@ public class DevToolsPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(overlay); overlayManager.remove(locationOverlay); overlayManager.remove(sceneOverlay); @@ -218,14 +216,7 @@ public class DevToolsPlugin extends Plugin clientToolbar.removeNavigation(navButton); } - private void addSubscriptions() - { - eventBus.subscribe(CommandExecuted.class, this, this::onCommandExecuted); - eventBus.subscribe(MenuEntryAdded.class, this, this::onMenuEntryAdded); - eventBus.subscribe(AreaSoundEffectPlayed.class, this, this::onAreaSoundEffectPlayed); - eventBus.subscribe(SoundEffectPlayed.class, this, this::onSoundEffectPlayed); - } - +@Subscribe private void onCommandExecuted(CommandExecuted commandExecuted) { String[] args = commandExecuted.getArguments(); @@ -379,6 +370,7 @@ public class DevToolsPlugin extends Plugin } } + @Subscribe private void onMenuEntryAdded(MenuEntryAdded entry) { if (!examine.isActive()) @@ -414,6 +406,7 @@ public class DevToolsPlugin extends Plugin } } + @Subscribe private void onSoundEffectPlayed(SoundEffectPlayed event) { if (!getSoundEffects().isActive() || soundEffectOverlay == null) @@ -424,6 +417,7 @@ public class DevToolsPlugin extends Plugin soundEffectOverlay.onSoundEffectPlayed(event); } + @Subscribe private void onAreaSoundEffectPlayed(AreaSoundEffectPlayed event) { if (!getSoundEffects().isActive() || soundEffectOverlay == null) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java index 3dca3deef2..5b43eb0f41 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java @@ -46,7 +46,6 @@ import net.runelite.api.GameState; import net.runelite.api.Skill; import net.runelite.api.WorldType; import net.runelite.api.coords.WorldPoint; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.StatChanged; import net.runelite.api.events.VarbitChanged; @@ -56,7 +55,8 @@ import net.runelite.client.discord.DiscordService; import net.runelite.client.discord.events.DiscordJoinGame; import net.runelite.client.discord.events.DiscordJoinRequest; import net.runelite.client.discord.events.DiscordReady; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.events.PartyChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -107,9 +107,6 @@ public class DiscordPlugin extends Plugin @Inject private WSClient wsClient; - @Inject - private EventBus eventBus; - private final Map skillExp = new HashMap<>(); private NavigationButton discordButton; private boolean loginFlag; @@ -137,7 +134,6 @@ public class DiscordPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); final BufferedImage icon = ImageUtil.getResourceStreamFromClass(getClass(), "discord.png"); @@ -163,30 +159,13 @@ public class DiscordPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - clientToolbar.removeNavigation(discordButton); discordState.reset(); partyService.changeParty(null); wsClient.unregisterMessage(DiscordUserInfo.class); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(StatChanged.class, this, this::onStatChanged); - eventBus.subscribe(VarbitChanged.class, this, this::onVarbitChanged); - eventBus.subscribe(DiscordReady.class, this, this::onDiscordReady); - eventBus.subscribe(DiscordJoinRequest.class, this, this::onDiscordJoinRequest); - eventBus.subscribe(DiscordJoinGame.class, this, this::onDiscordJoinGame); - eventBus.subscribe(DiscordUserInfo.class, this, this::onDiscordUserInfo); - eventBus.subscribe(UserJoin.class, this, this::onUserJoin); - eventBus.subscribe(UserSync.class, this, this::onUserSync); - eventBus.subscribe(UserPart.class, this, this::onUserPart); - eventBus.subscribe(PartyChanged.class, this, this::onPartyChanged); - } - +@Subscribe private void onGameStateChanged(GameStateChanged event) { switch (event.getGameState()) @@ -210,6 +189,7 @@ public class DiscordPlugin extends Plugin checkForAreaUpdate(); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equalsIgnoreCase("discord")) @@ -222,6 +202,7 @@ public class DiscordPlugin extends Plugin } } + @Subscribe private void onStatChanged(StatChanged statChanged) { final Skill skill = statChanged.getSkill(); @@ -241,6 +222,7 @@ public class DiscordPlugin extends Plugin } } + @Subscribe private void onVarbitChanged(VarbitChanged event) { if (!this.showRaidingActivity) @@ -256,11 +238,13 @@ public class DiscordPlugin extends Plugin } } + @Subscribe private void onDiscordReady(DiscordReady event) { partyService.setUsername(event.getUsername() + "#" + event.getDiscriminator()); } + @Subscribe private void onDiscordJoinRequest(DiscordJoinRequest request) { log.debug("Got discord join request {}", request); @@ -272,6 +256,7 @@ public class DiscordPlugin extends Plugin } } + @Subscribe private void onDiscordJoinGame(DiscordJoinGame joinGame) { log.debug("Got discord join game {}", joinGame); @@ -280,6 +265,7 @@ public class DiscordPlugin extends Plugin updatePresence(); } + @Subscribe private void onDiscordUserInfo(final DiscordUserInfo event) { final PartyMember memberById = partyService.getMemberById(event.getMemberId()); @@ -339,11 +325,13 @@ public class DiscordPlugin extends Plugin }); } + @Subscribe private void onUserJoin(final UserJoin event) { updatePresence(); } + @Subscribe private void onUserSync(final UserSync event) { final PartyMember localMember = partyService.getLocalMember(); @@ -359,11 +347,13 @@ public class DiscordPlugin extends Plugin } } + @Subscribe private void onUserPart(final UserPart event) { updatePresence(); } + @Subscribe private void onPartyChanged(final PartyChanged event) { updatePresence(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/dropparty/DropPartyPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/dropparty/DropPartyPlugin.java index 4ee77399b8..0142c83b0c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/dropparty/DropPartyPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/dropparty/DropPartyPlugin.java @@ -1,210 +1,198 @@ -/* - * Copyright (c) 2017, Adam - * All rights reserved. - * - * - * Modified by farhan1666 - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.client.plugins.dropparty; - -import com.google.inject.Provides; -import java.awt.Color; -import java.util.ArrayList; -import java.util.List; -import javax.inject.Inject; -import javax.inject.Singleton; -import lombok.AccessLevel; -import lombok.Getter; -import net.runelite.api.Client; -import net.runelite.api.Player; -import net.runelite.api.coords.WorldPoint; -import net.runelite.api.events.GameTick; -import net.runelite.api.util.Text; -import net.runelite.client.Notifier; -import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; -import net.runelite.client.events.ConfigChanged; -import net.runelite.client.plugins.Plugin; -import net.runelite.client.plugins.PluginDescriptor; -import net.runelite.client.plugins.PluginType; -import net.runelite.client.ui.overlay.OverlayManager; - - -@PluginDescriptor( - name = "Drop Party", - description = "Marks where a user ran, for drop partys", - tags = {"Drop", "Party", "marker", "player"}, - type = PluginType.UTILITY, - enabledByDefault = false -) -@Singleton -public class DropPartyPlugin extends Plugin -{ - @Inject - private DropPartyConfig config; - @Getter(AccessLevel.PACKAGE) - private List playerPath = new ArrayList<>(); - @Getter(AccessLevel.PACKAGE) - private String playerName = ""; - @Getter(AccessLevel.PACKAGE) - private int showAmmount = 0; - @Getter(AccessLevel.PACKAGE) - private int MAXPATHSIZE = 100; - private Player runningPlayer; - @Getter(AccessLevel.PACKAGE) - private Color overlayColor; - - @Inject - private Notifier notifier; - @Inject - private OverlayManager overlayManager; - @Inject - private DropPartyOverlay coreOverlay; - @Inject - private EventBus eventbus; - @Inject - private Client client; - @Getter(AccessLevel.PACKAGE) - private int fontStyle; - @Getter(AccessLevel.PACKAGE) - private int textSize; - - @Provides - DropPartyConfig getConfig(ConfigManager configManager) - { - return configManager.getConfig(DropPartyConfig.class); - } - - @Override - protected void startUp() - { - updateConfig(); - addSubscriptions(); - overlayManager.add(coreOverlay); - reset(); - } - - @Override - protected void shutDown() - { - overlayManager.remove(coreOverlay); - reset(); - eventbus.unregister(this); - } - - private void addSubscriptions() - { - eventbus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventbus.subscribe(GameTick.class, this, this::onGameTick); - } - - - private void onGameTick(GameTick event) - { - shuffleList(); - if (playerName.equalsIgnoreCase("")) - { - return; - } - - runningPlayer = null; - - for (Player player : client.getPlayers()) - { - if (player.getName() == null) - { - continue; - } - if (Text.standardize(player.getName()).equalsIgnoreCase(playerName)) - { - runningPlayer = player; - break; - } - - } - - if (runningPlayer == null) - { - cordsError(); - return; - } - addCords(); - } - - private void cordsError() - { - playerPath.add(null); - - } - - private void shuffleList() - { - if (playerPath.size() > MAXPATHSIZE - 1) - { - playerPath.remove(0); - } - } - - private void addCords() - { - while (true) - { - if (playerPath.size() >= MAXPATHSIZE) - { - playerPath.add(runningPlayer.getWorldLocation()); - break; - } - playerPath.add(null); - - } - - - } - - private void onConfigChanged(ConfigChanged event) - { - if (!event.getGroup().equals("drop")) - { - return; - } - - updateConfig(); - } - - - private void reset() - { - playerPath.clear(); - - } - - - private void updateConfig() - { - this.playerName = config.playerName(); - this.showAmmount = config.showAmmount(); - this.overlayColor = config.overlayColor(); - this.fontStyle = config.fontStyle().getFont(); - this.textSize = config.textSize(); - } -} +/* + * Copyright (c) 2017, Adam + * All rights reserved. + * + * + * Modified by farhan1666 + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package net.runelite.client.plugins.dropparty; + +import com.google.inject.Provides; +import java.awt.Color; +import java.util.ArrayList; +import java.util.List; +import javax.inject.Inject; +import javax.inject.Singleton; +import lombok.AccessLevel; +import lombok.Getter; +import net.runelite.api.Client; +import net.runelite.api.Player; +import net.runelite.api.coords.WorldPoint; +import net.runelite.api.events.GameTick; +import net.runelite.api.util.Text; +import net.runelite.client.config.ConfigManager; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.ConfigChanged; +import net.runelite.client.plugins.Plugin; +import net.runelite.client.plugins.PluginDescriptor; +import net.runelite.client.plugins.PluginType; +import net.runelite.client.ui.overlay.OverlayManager; + + +@PluginDescriptor( + name = "Drop Party", + description = "Marks where a user ran, for drop partys", + tags = {"Drop", "Party", "marker", "player"}, + type = PluginType.UTILITY, + enabledByDefault = false +) +@Singleton +public class DropPartyPlugin extends Plugin +{ + @Inject + private DropPartyConfig config; + @Getter(AccessLevel.PACKAGE) + private List playerPath = new ArrayList<>(); + @Getter(AccessLevel.PACKAGE) + private String playerName = ""; + @Getter(AccessLevel.PACKAGE) + private int showAmmount = 0; + @Getter(AccessLevel.PACKAGE) + private int MAXPATHSIZE = 100; + private Player runningPlayer; + @Getter(AccessLevel.PACKAGE) + private Color overlayColor; + + @Inject + private OverlayManager overlayManager; + @Inject + private DropPartyOverlay coreOverlay; + @Inject + private Client client; + @Getter(AccessLevel.PACKAGE) + private int fontStyle; + @Getter(AccessLevel.PACKAGE) + private int textSize; + + @Provides + DropPartyConfig getConfig(ConfigManager configManager) + { + return configManager.getConfig(DropPartyConfig.class); + } + + @Override + protected void startUp() + { + updateConfig(); + overlayManager.add(coreOverlay); + reset(); + } + + @Override + protected void shutDown() + { + overlayManager.remove(coreOverlay); + reset(); + } + +@Subscribe + private void onGameTick(GameTick event) + { + shuffleList(); + if (playerName.equalsIgnoreCase("")) + { + return; + } + + runningPlayer = null; + + for (Player player : client.getPlayers()) + { + if (player.getName() == null) + { + continue; + } + if (Text.standardize(player.getName()).equalsIgnoreCase(playerName)) + { + runningPlayer = player; + break; + } + + } + + if (runningPlayer == null) + { + cordsError(); + return; + } + addCords(); + } + + private void cordsError() + { + playerPath.add(null); + + } + + private void shuffleList() + { + if (playerPath.size() > MAXPATHSIZE - 1) + { + playerPath.remove(0); + } + } + + private void addCords() + { + while (true) + { + if (playerPath.size() >= MAXPATHSIZE) + { + playerPath.add(runningPlayer.getWorldLocation()); + break; + } + playerPath.add(null); + + } + + + } + + @Subscribe + private void onConfigChanged(ConfigChanged event) + { + if (!event.getGroup().equals("drop")) + { + return; + } + + updateConfig(); + } + + + private void reset() + { + playerPath.clear(); + + } + + + private void updateConfig() + { + this.playerName = config.playerName(); + this.showAmmount = config.showAmmount(); + this.overlayColor = config.overlayColor(); + this.fontStyle = config.fontStyle().getFont(); + this.textSize = config.textSize(); + } +} diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/dynamicmaxhit/DynamicMaxHit.java b/runelite-client/src/main/java/net/runelite/client/plugins/dynamicmaxhit/DynamicMaxHit.java index b8abfbb60a..afbc6cdaf0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/dynamicmaxhit/DynamicMaxHit.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/dynamicmaxhit/DynamicMaxHit.java @@ -55,6 +55,7 @@ import net.runelite.api.kit.KitType; import net.runelite.api.util.Text; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.ItemManager; import net.runelite.client.menus.MenuManager; @@ -163,9 +164,9 @@ public class DynamicMaxHit extends Plugin eventBus.subscribe(SpotAnimationChanged.class, this, this::onSpotAnimationChanged); eventBus.subscribe(ChatMessage.class, this, this::onChatMessage); eventBus.subscribe(PlayerMenuOptionClicked.class, this, this::onPlayerMenuOptionClicked); - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("dynamicMaxHit")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/emojis/EmojiPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/emojis/EmojiPlugin.java index 24eedb2c63..20de99cd33 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/emojis/EmojiPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/emojis/EmojiPlugin.java @@ -42,7 +42,7 @@ import net.runelite.api.events.ChatMessage; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.OverheadTextChanged; import net.runelite.client.chat.ChatMessageManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.util.ImageUtil; @@ -65,31 +65,20 @@ public class EmojiPlugin extends Plugin @Inject private ChatMessageManager chatMessageManager; - @Inject - private EventBus eventBus; - private int modIconsStart = -1; @Override protected void startUp() { loadEmojiIcons(); - addSubscriptions(); } @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - } - - private void addSubscriptions() - { - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(ChatMessage.class, this, this::onChatMessage); - eventBus.subscribe(OverheadTextChanged.class, this, this::onOverheadTextChanged); - } + } +@Subscribe void onGameStateChanged(GameStateChanged gameStateChanged) { if (gameStateChanged.getGameState() == GameState.LOGGED_IN) @@ -130,6 +119,7 @@ public class EmojiPlugin extends Plugin client.setModIcons(newModIcons); } + @Subscribe void onChatMessage(ChatMessage chatMessage) { if (client.getGameState() != GameState.LOGGED_IN || modIconsStart == -1) @@ -164,6 +154,7 @@ public class EmojiPlugin extends Plugin client.refreshChat(); } + @Subscribe private void onOverheadTextChanged(final OverheadTextChanged event) { if (!(event.getActor() instanceof Player)) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/entityhider/EntityHiderPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/entityhider/EntityHiderPlugin.java index 4817fbc706..46b5e15967 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/entityhider/EntityHiderPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/entityhider/EntityHiderPlugin.java @@ -36,11 +36,11 @@ import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.Player; import net.runelite.api.coords.WorldPoint; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.util.Text; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -59,9 +59,6 @@ public class EntityHiderPlugin extends Plugin @Inject private EntityHiderConfig config; - @Inject - private EventBus eventBus; - @Provides EntityHiderConfig provideConfig(ConfigManager configManager) { @@ -72,18 +69,12 @@ public class EntityHiderPlugin extends Plugin protected void startUp() { updateConfig(); - addSubscriptions(); Text.fromCSV(config.hideNPCsNames()).forEach(client::addHiddenNpcName); Text.fromCSV(config.hideNPCsOnDeath()).forEach(client::addHiddenNpcDeath); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - } - +@Subscribe public void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("entityhider")) @@ -121,6 +112,7 @@ public class EntityHiderPlugin extends Plugin } } + @Subscribe public void onGameStateChanged(GameStateChanged event) { if (event.getGameState() == GameState.LOGGED_IN) @@ -158,8 +150,6 @@ public class EntityHiderPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - client.setIsHidingEntities(false); client.setPlayersHidden(false); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java index 888559d75a..24a77248e8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorPlugin.java @@ -51,7 +51,7 @@ import net.runelite.client.chat.ChatMessageBuilder; import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.chat.QueuedMessage; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.ItemManager; import net.runelite.client.menus.MenuManager; @@ -94,9 +94,6 @@ public class EquipmentInspectorPlugin extends Plugin @Inject private ClientToolbar pluginToolbar; - @Inject - private EventBus eventBus; - private NavigationButton navButton; private EquipmentInspectorPanel equipmentInspectorPanel; private int TotalPrice = 0; @@ -119,7 +116,6 @@ public class EquipmentInspectorPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); equipmentInspectorPanel = injector.getInstance(EquipmentInspectorPanel.class); if (client != null) @@ -143,18 +139,11 @@ public class EquipmentInspectorPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - menuManager.removePlayerMenuItem(INSPECT_EQUIPMENT); pluginToolbar.removeNavigation(navButton); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(PlayerMenuOptionClicked.class, this, this::onPlayerMenuOptionClicked); - } - +@Subscribe private void onPlayerMenuOptionClicked(PlayerMenuOptionClicked event) { if (event.getMenuOption().equals(INSPECT_EQUIPMENT)) @@ -305,6 +294,7 @@ public class EquipmentInspectorPlugin extends Plugin } } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equalsIgnoreCase("equipmentinspector")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java index a86db6b477..2b5dca4e15 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java @@ -54,7 +54,7 @@ import net.runelite.client.chat.ChatColorType; import net.runelite.client.chat.ChatMessageBuilder; import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.chat.QueuedMessage; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.game.ItemManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -102,33 +102,23 @@ public class ExaminePlugin extends Plugin @Inject private ScheduledExecutorService executor; - @Inject - private EventBus eventBus; - @Override protected void startUp() throws Exception { - addSubscriptions(); } @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - } - - private void addSubscriptions() - { - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(MenuOptionClicked.class, this, this::onMenuOptionClicked); - eventBus.subscribe(ChatMessage.class, this, this::onChatMessage); - } + } +@Subscribe private void onGameStateChanged(GameStateChanged event) { pending.clear(); } + @Subscribe void onMenuOptionClicked(MenuOptionClicked event) { if (!event.getOption().equals("Examine")) @@ -190,6 +180,7 @@ public class ExaminePlugin extends Plugin pending.push(pendingExamine); } + @Subscribe void onChatMessage(ChatMessage event) { ExamineType type; @@ -292,7 +283,7 @@ public class ExaminePlugin extends Plugin Widget widgetItem = widget.getChild(1); if (widgetItem != null) { - return new int[]{widgetItem.getItemQuantity(), widgetItem.getItemId()}; + return new int[] {widgetItem.getItemQuantity(), widgetItem.getItemId()}; } } else if (WidgetInfo.SMITHING_INVENTORY_ITEMS_CONTAINER.getGroupId() == widgetGroup) @@ -300,7 +291,7 @@ public class ExaminePlugin extends Plugin Widget widgetItem = widget.getChild(2); if (widgetItem != null) { - return new int[]{widgetItem.getItemQuantity(), widgetItem.getItemId()}; + return new int[] {widgetItem.getItemQuantity(), widgetItem.getItemId()}; } } else if (WidgetInfo.BANK_INVENTORY_ITEMS_CONTAINER.getGroupId() == widgetGroup @@ -309,7 +300,7 @@ public class ExaminePlugin extends Plugin Widget widgetItem = widget.getChild(actionParam); if (widgetItem != null) { - return new int[]{widgetItem.getItemQuantity(), widgetItem.getItemId()}; + return new int[] {widgetItem.getItemQuantity(), widgetItem.getItemId()}; } } else if (WidgetInfo.BANK_ITEM_CONTAINER.getGroupId() == widgetGroup @@ -324,7 +315,7 @@ public class ExaminePlugin extends Plugin if (actionParam < children.length) { Widget widgetItem = children[actionParam]; - return new int[]{widgetItem.getItemQuantity(), widgetItem.getItemId()}; + return new int[] {widgetItem.getItemQuantity(), widgetItem.getItemId()}; } } else if (WidgetInfo.SHOP_ITEMS_CONTAINER.getGroupId() == widgetGroup) @@ -333,7 +324,7 @@ public class ExaminePlugin extends Plugin if (actionParam < children.length) { Widget widgetItem = children[actionParam]; - return new int[]{1, widgetItem.getItemId()}; + return new int[] {1, widgetItem.getItemId()}; } } else if (WidgetInfo.CLUE_SCROLL_REWARD_ITEM_CONTAINER.getGroupId() == widgetGroup) @@ -342,7 +333,7 @@ public class ExaminePlugin extends Plugin if (actionParam < children.length) { Widget widgetItem = children[actionParam]; - return new int[]{widgetItem.getItemQuantity(), widgetItem.getItemId()}; + return new int[] {widgetItem.getItemQuantity(), widgetItem.getItemId()}; } } else if (WidgetInfo.LOOTING_BAG_CONTAINER.getGroupId() == widgetGroup) @@ -351,7 +342,7 @@ public class ExaminePlugin extends Plugin if (actionParam < children.length) { Widget widgetItem = children[actionParam]; - return new int[]{widgetItem.getItemQuantity(), widgetItem.getItemId()}; + return new int[] {widgetItem.getItemQuantity(), widgetItem.getItemId()}; } } else if (WidgetID.SEED_VAULT_GROUP_ID == widgetGroup) @@ -360,7 +351,7 @@ public class ExaminePlugin extends Plugin if (actionParam < children.length) { Widget widgetItem = children[actionParam]; - return new int[]{widgetItem.getItemQuantity(), widgetItem.getItemId()}; + return new int[] {widgetItem.getItemQuantity(), widgetItem.getItemId()}; } } else if (WidgetID.SEED_VAULT_INVENTORY_GROUP_ID == widgetGroup) @@ -369,7 +360,7 @@ public class ExaminePlugin extends Plugin if (actionParam < children.length) { Widget widgetItem = children[actionParam]; - return new int[]{widgetItem.getItemQuantity(), widgetItem.getItemId()}; + return new int[] {widgetItem.getItemQuantity(), widgetItem.getItemId()}; } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java index a987f56242..511897b674 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java @@ -51,7 +51,7 @@ import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetID; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.NPCManager; import net.runelite.client.game.XpDropEvent; @@ -80,8 +80,6 @@ public class XpDropPlugin extends Plugin private OverlayManager overlayManager; @Inject private XpDropOverlay overlay; - @Inject - private EventBus eventBus; @Getter(AccessLevel.PACKAGE) private int damage = 0; @@ -119,7 +117,6 @@ public class XpDropPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); damageMode = config.showdamagedrops(); @@ -132,21 +129,10 @@ public class XpDropPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(overlay); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(WidgetHiddenChanged.class, this, this::onWidgetHiddenChanged); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(XpDropEvent.class, this, this::onXpDropEvent); - eventBus.subscribe(ScriptCallbackEvent.class, this, this::onScriptCallbackEvent); - } - +@Subscribe private void onXpDropEvent(XpDropEvent event) { previousExpGained = event.getExp(); @@ -154,6 +140,7 @@ public class XpDropPlugin extends Plugin hasDropped = true; } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("xpdrop")) @@ -183,12 +170,14 @@ public class XpDropPlugin extends Plugin } } + @Subscribe private void onGameStateChanged(GameStateChanged event) { tickShow = 0; damage = 0; } + @Subscribe private void onWidgetHiddenChanged(WidgetHiddenChanged event) { Widget widget = event.getWidget(); @@ -316,6 +305,7 @@ public class XpDropPlugin extends Plugin return null; } + @Subscribe private void onGameTick(GameTick tick) { lastOpponent = client.getLocalPlayer().getInteracting(); @@ -351,6 +341,7 @@ public class XpDropPlugin extends Plugin client.runScript(XPDROP_DISABLED, lastSkill.ordinal(), previousExpGained); } + @Subscribe private void onScriptCallbackEvent(ScriptCallbackEvent e) { if (this.showdamagedrops == XpDropConfig.DamageMode.NONE) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fairyring/FairyRingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fairyring/FairyRingPlugin.java index 876cf25c49..499a8f5a2a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fairyring/FairyRingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fairyring/FairyRingPlugin.java @@ -55,7 +55,7 @@ import net.runelite.api.widgets.WidgetInfo; import net.runelite.api.widgets.WidgetType; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.chatbox.ChatboxPanelManager; import net.runelite.client.game.chatbox.ChatboxTextInput; @@ -71,9 +71,9 @@ import net.runelite.client.plugins.PluginDescriptor; @Singleton public class FairyRingPlugin extends Plugin { - private static final String[] leftDial = new String[]{"A", "D", "C", "B"}; - private static final String[] middleDial = new String[]{"I", "L", "K", "J"}; - private static final String[] rightDial = new String[]{"P", "S", "R", "Q"}; + private static final String[] leftDial = new String[] {"A", "D", "C", "B"}; + private static final String[] middleDial = new String[] {"I", "L", "K", "J"}; + private static final String[] rightDial = new String[] {"P", "S", "R", "Q"}; private static final int ENTRY_PADDING = 3; @@ -92,9 +92,6 @@ public class FairyRingPlugin extends Plugin @Inject private ClientThread clientThread; - @Inject - private EventBus eventBus; - private ChatboxTextInput searchInput = null; private Widget searchBtn; private Collection codes = null; @@ -118,23 +115,14 @@ public class FairyRingPlugin extends Plugin protected void startUp() throws Exception { this.autoOpen = config.autoOpen(); - addSubscriptions(); } @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - } - - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(VarbitChanged.class, this, this::onVarbitChanged); - eventBus.subscribe(WidgetLoaded.class, this, this::onWidgetLoaded); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - } + } +@Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("fairyrings")) @@ -151,11 +139,13 @@ public class FairyRingPlugin extends Plugin return configManager.getConfig(FairyRingConfig.class); } + @Subscribe private void onVarbitChanged(VarbitChanged event) { setWidgetTextToDestination(); } + @Subscribe private void onWidgetLoaded(WidgetLoaded widgetLoaded) { if (widgetLoaded.getGroupId() == WidgetID.FAIRY_RING_PANEL_GROUP_ID) @@ -242,6 +232,7 @@ public class FairyRingPlugin extends Plugin .build(); } + @Subscribe private void onGameTick(GameTick t) { // This has to happen because the only widget that gets hidden is the tli one diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPlugin.java index fc8823a727..9913e4884e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPlugin.java @@ -35,9 +35,9 @@ import java.util.function.Supplier; import javax.inject.Inject; import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; -import net.runelite.client.events.ConfigChanged; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.task.Schedule; @@ -69,9 +69,6 @@ public class FeedPlugin extends Plugin @Inject private FeedClient feedClient; - @Inject - private EventBus eventBus; - private FeedPanel feedPanel; private NavigationButton navButton; @@ -91,8 +88,6 @@ public class FeedPlugin extends Plugin @Override protected void startUp() throws Exception { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - feedPanel = new FeedPanel(config, feedSupplier); final BufferedImage icon = ImageUtil.getResourceStreamFromClass(getClass(), "icon.png"); @@ -111,7 +106,6 @@ public class FeedPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); clientToolbar.removeNavigation(navButton); } @@ -120,6 +114,7 @@ public class FeedPlugin extends Plugin feedPanel.rebuildFeed(); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("feed")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCavePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCavePlugin.java index d08914b6cf..a1f4f2eb74 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCavePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fightcave/FightCavePlugin.java @@ -51,7 +51,7 @@ import net.runelite.api.events.GameTick; import net.runelite.api.events.NpcDespawned; import net.runelite.api.events.NpcSpawned; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.NPCManager; import net.runelite.client.plugins.Plugin; @@ -130,8 +130,6 @@ public class FightCavePlugin extends Plugin private FightCaveOverlay fightCaveOverlay; @Inject private FightCaveConfig config; - @Inject - private EventBus eventBus; @Getter(AccessLevel.PACKAGE) private Set fightCaveContainer = new HashSet<>(); @Getter(AccessLevel.PACKAGE) @@ -172,7 +170,6 @@ public class FightCavePlugin extends Plugin public void startUp() { updateConfig(); - addSubscriptions(); if (client.getGameState() == GameState.LOGGED_IN && regionCheck()) { @@ -185,23 +182,12 @@ public class FightCavePlugin extends Plugin @Override public void shutDown() { - eventBus.unregister(this); - overlayManager.remove(waveOverlay); overlayManager.remove(fightCaveOverlay); currentWave = -1; } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(ChatMessage.class, this, this::onChatMessage); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(NpcSpawned.class, this, this::onNpcSpawned); - eventBus.subscribe(NpcDespawned.class, this, this::onNpcDespawned); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - } - +@Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("fightcave")) @@ -212,6 +198,7 @@ public class FightCavePlugin extends Plugin updateConfig(); } + @Subscribe private void onChatMessage(ChatMessage event) { if (!validRegion) @@ -229,6 +216,7 @@ public class FightCavePlugin extends Plugin currentWave = Integer.parseInt(waveMatcher.group(1)); } + @Subscribe private void onGameStateChanged(GameStateChanged event) { if (event.getGameState() != GameState.LOGGED_IN) @@ -252,6 +240,7 @@ public class FightCavePlugin extends Plugin fightCaveContainer.clear(); } + @Subscribe private void onNpcSpawned(NpcSpawned event) { if (!validRegion) @@ -276,6 +265,7 @@ public class FightCavePlugin extends Plugin } } + @Subscribe private void onNpcDespawned(NpcDespawned event) { if (!validRegion) @@ -300,6 +290,7 @@ public class FightCavePlugin extends Plugin } } + @Subscribe private void onGameTick(GameTick Event) { if (!validRegion) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java index c2b18af2af..98fae5b2b6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fishing/FishingPlugin.java @@ -65,7 +65,7 @@ import net.runelite.api.widgets.WidgetID; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.Notifier; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.events.OverlayMenuClicked; import net.runelite.client.plugins.Plugin; @@ -135,9 +135,6 @@ public class FishingPlugin extends Plugin @Inject private FishingSpotMinimapOverlay fishingSpotMinimapOverlay; - @Inject - private EventBus eventBus; - private boolean trawlerNotificationSent; @Provides @@ -172,7 +169,6 @@ public class FishingPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); overlayManager.add(overlay); overlayManager.add(spotOverlay); @@ -182,8 +178,6 @@ public class FishingPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - spotOverlay.setHidden(true); fishingSpotMinimapOverlay.setHidden(true); overlayManager.remove(overlay); @@ -196,21 +190,7 @@ public class FishingPlugin extends Plugin trawlerStartTime = null; } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(ItemContainerChanged.class, this, this::onItemContainerChanged); - eventBus.subscribe(ChatMessage.class, this, this::onChatMessage); - eventBus.subscribe(InteractingChanged.class, this, this::onInteractingChanged); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(NpcSpawned.class, this, this::onNpcSpawned); - eventBus.subscribe(NpcDespawned.class, this, this::onNpcDespawned); - eventBus.subscribe(VarbitChanged.class, this, this::onVarbitChanged); - eventBus.subscribe(WidgetLoaded.class, this, this::onWidgetLoaded); - eventBus.subscribe(OverlayMenuClicked.class, this, this::onOverlayMenuClicked); - } - +@Subscribe private void onOverlayMenuClicked(OverlayMenuClicked overlayMenuClicked) { OverlayMenuEntry overlayMenuEntry = overlayMenuClicked.getEntry(); @@ -222,6 +202,7 @@ public class FishingPlugin extends Plugin } } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("fishing")) @@ -232,6 +213,7 @@ public class FishingPlugin extends Plugin updateConfig(); } + @Subscribe private void onGameStateChanged(GameStateChanged gameStateChanged) { GameState gameState = gameStateChanged.getGameState(); @@ -242,6 +224,7 @@ public class FishingPlugin extends Plugin } } + @Subscribe private void onItemContainerChanged(ItemContainerChanged event) { if (event.getItemContainer() != client.getItemContainer(InventoryID.INVENTORY) @@ -263,6 +246,7 @@ public class FishingPlugin extends Plugin fishingSpotMinimapOverlay.setHidden(!showOverlays); } + @Subscribe private void onChatMessage(ChatMessage event) { if (event.getType() != ChatMessageType.SPAM) @@ -279,6 +263,7 @@ public class FishingPlugin extends Plugin } } + @Subscribe private void onInteractingChanged(InteractingChanged event) { if (event.getSource() != client.getLocalPlayer()) @@ -314,6 +299,7 @@ public class FishingPlugin extends Plugin return ItemUtil.containsAnyItemId(itemContainer.getItems(), FISHING_TOOLS); } + @Subscribe private void onGameTick(GameTick event) { // Reset fishing session @@ -354,6 +340,7 @@ public class FishingPlugin extends Plugin } } + @Subscribe private void onNpcSpawned(NpcSpawned event) { final NPC npc = event.getNpc(); @@ -367,6 +354,7 @@ public class FishingPlugin extends Plugin inverseSortSpotDistanceFromPlayer(); } + @Subscribe private void onNpcDespawned(NpcDespawned npcDespawned) { final NPC npc = npcDespawned.getNpc(); @@ -380,6 +368,7 @@ public class FishingPlugin extends Plugin } } + @Subscribe private void onVarbitChanged(VarbitChanged event) { if (!this.trawlerNotification || client.getGameState() != GameState.LOGGED_IN) @@ -404,6 +393,7 @@ public class FishingPlugin extends Plugin } } + @Subscribe private void onWidgetLoaded(WidgetLoaded event) { if (event.getGroupId() == WidgetID.FISHING_TRAWLER_GROUP_ID) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsPlugin.java index a3d6dd829f..d6fbb42d10 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsPlugin.java @@ -31,7 +31,7 @@ import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.events.FocusChanged; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -74,9 +74,6 @@ public class FpsPlugin extends Plugin @Inject private FpsConfig fpsConfig; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) private FpsLimitMode limitMode; @@ -89,6 +86,7 @@ public class FpsPlugin extends Plugin return configManager.getConfig(FpsConfig.class); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals(CONFIG_GROUP_KEY)) @@ -100,6 +98,7 @@ public class FpsPlugin extends Plugin } } + @Subscribe private void onFocusChanged(FocusChanged event) { drawListener.onFocusChanged(event); @@ -109,7 +108,6 @@ public class FpsPlugin extends Plugin @Override protected void startUp() throws Exception { - addSubscriptions(); limitMode = fpsConfig.limitMode(); drawFps = fpsConfig.drawFps(); @@ -121,15 +119,8 @@ public class FpsPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(overlay); drawManager.unregisterEveryFrameListener(drawListener); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(FocusChanged.class, this, this::onFocusChanged); - } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java index a97325d87c..d3486176c0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/freezetimers/FreezeTimersPlugin.java @@ -44,7 +44,7 @@ import net.runelite.api.events.LocalPlayerDeath; import net.runelite.api.events.NpcDespawned; import net.runelite.api.events.SpotAnimationChanged; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -78,8 +78,6 @@ public class FreezeTimersPlugin extends Plugin private FreezeTimersOverlay overlay; @Inject private FreezeTimersConfig config; - @Inject - private EventBus eventBus; @Getter(AccessLevel.PACKAGE) private boolean showPlayers; @@ -103,14 +101,12 @@ public class FreezeTimersPlugin extends Plugin public void startUp() { updateConfig(); - addSubscriptions(); overlayManager.add(overlay); } public void shutDown() { - eventBus.unregister(this); overlayManager.remove(overlay); } @@ -120,16 +116,7 @@ public class FreezeTimersPlugin extends Plugin return configManager.getConfig(FreezeTimersConfig.class); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(SpotAnimationChanged.class, this, this::onSpotAnimationChanged); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(LocalPlayerDeath.class, this, this::onLocalPlayerDeath); - eventBus.subscribe(NpcDespawned.class, this, this::onNpcDespawned); - eventBus.subscribe(ChatMessage.class, this, this::onChatMessage); - } - +@Subscribe public void onSpotAnimationChanged(SpotAnimationChanged graphicChanged) { final int oldGraphic = prayerTracker.getSpotanimLastTick(graphicChanged.getActor()); @@ -162,9 +149,10 @@ public class FreezeTimersPlugin extends Plugin } timers.setTimerEnd(graphicChanged.getActor(), effect.getType(), - currentTime + length); + currentTime + length); } + @Subscribe public void onGameTick(GameTick tickEvent) { prayerTracker.gameTick(); @@ -194,12 +182,12 @@ public class FreezeTimersPlugin extends Plugin timers.setTimerReApply(actor, TimerType.TELEBLOCK, System.currentTimeMillis()); } else if (WorldType.isPvpWorld(worldTypes) && - MapLocations.getPvpSafeZones(actorLoc.getPlane()).contains(actorLoc.getX(), actorLoc.getY())) + MapLocations.getPvpSafeZones(actorLoc.getPlane()).contains(actorLoc.getX(), actorLoc.getY())) { timers.setTimerReApply(actor, TimerType.TELEBLOCK, System.currentTimeMillis()); } else if (WorldType.isDeadmanWorld(worldTypes) && - MapLocations.getDeadmanSafeZones(actorLoc.getPlane()).contains(actorLoc.getX(), actorLoc.getY())) + MapLocations.getDeadmanSafeZones(actorLoc.getPlane()).contains(actorLoc.getX(), actorLoc.getY())) { timers.setTimerReApply(actor, TimerType.TELEBLOCK, System.currentTimeMillis()); } @@ -207,6 +195,7 @@ public class FreezeTimersPlugin extends Plugin } } + @Subscribe private void onLocalPlayerDeath(LocalPlayerDeath event) { final Player localPlayer = client.getLocalPlayer(); @@ -223,6 +212,7 @@ public class FreezeTimersPlugin extends Plugin } } + @Subscribe public void onNpcDespawned(NpcDespawned event) { if (!isAtVorkath()) @@ -240,14 +230,15 @@ public class FreezeTimersPlugin extends Plugin if (npc.getName().equals("Zombified Spawn")) { timers.setTimerReApply(client.getLocalPlayer(), TimerType.FREEZE, - System.currentTimeMillis()); + System.currentTimeMillis()); } } + @Subscribe public void onChatMessage(ChatMessage event) { if (event.getType() != ChatMessageType.GAMEMESSAGE - || !event.getMessage().contains("Your Tele Block has been removed")) + || !event.getMessage().contains("Your Tele Block has been removed")) { return; } @@ -260,6 +251,7 @@ public class FreezeTimersPlugin extends Plugin return ArrayUtils.contains(client.getMapRegions(), VORKATH_REGION); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("freezetimers")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/friendlist/FriendListPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/friendlist/FriendListPlugin.java index 1d71c487bf..62ecadc1e1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/friendlist/FriendListPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/friendlist/FriendListPlugin.java @@ -32,7 +32,7 @@ import net.runelite.api.VarPlayer; import net.runelite.api.events.GameTick; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -52,25 +52,20 @@ public class FriendListPlugin extends Plugin @Inject private Client client; - @Inject - private EventBus eventBus; - @Override protected void startUp() throws Exception { - eventBus.subscribe(GameTick.class, this, this::onGameTick); } @Override protected void shutDown() { - eventBus.unregister(this); - final int world = client.getWorld(); setFriendsListTitle("Friends List - World " + world); setIgnoreListTitle("Ignore List - World " + world); } + @Subscribe private void onGameTick(GameTick tick) { final int world = client.getWorld(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java index 944374279d..dad4d61b39 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java @@ -45,7 +45,7 @@ import net.runelite.api.events.NameableNameChanged; import net.runelite.api.util.Text; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.game.chatbox.ChatboxPanelManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -83,36 +83,22 @@ public class FriendNotesPlugin extends Plugin @Inject private ChatboxPanelManager chatboxPanelManager; - @Inject - private EventBus eventBus; - @Getter private HoveredFriend hoveredFriend = null; @Override protected void startUp() throws Exception { - addSubscriptions(); overlayManager.add(overlay); } @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(overlay); } - private void addSubscriptions() - { - eventBus.subscribe(MenuEntryAdded.class, this, this::onMenuEntryAdded); - eventBus.subscribe(MenuOptionClicked.class, this, this::onMenuOptionClicked); - eventBus.subscribe(NameableNameChanged.class, this, this::onNameableNameChanged); - eventBus.subscribe(FriendRemoved.class, this, this::onFriendRemoved); - } - - /** +/** * Set a friend note, or unset by passing a null/empty note. */ private void setFriendNote(String displayName, String note) @@ -172,6 +158,7 @@ public class FriendNotesPlugin extends Plugin } } + @Subscribe private void onMenuEntryAdded(MenuEntryAdded event) { final int groupId = WidgetInfo.TO_GROUP(event.getParam1()); @@ -200,6 +187,7 @@ public class FriendNotesPlugin extends Plugin } } + @Subscribe private void onMenuOptionClicked(MenuOptionClicked event) { if (WidgetInfo.TO_GROUP(event.getParam1()) == WidgetInfo.FRIENDS_LIST.getGroupId()) @@ -237,6 +225,7 @@ public class FriendNotesPlugin extends Plugin } + @Subscribe private void onNameableNameChanged(NameableNameChanged event) { final Nameable nameable = event.getNameable(); @@ -258,6 +247,7 @@ public class FriendNotesPlugin extends Plugin } } + @Subscribe private void onFriendRemoved(FriendRemoved event) { // Delete a friend's note if they are removed diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/friendtagging/FriendTaggingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/friendtagging/FriendTaggingPlugin.java index d72c80f3f2..a3ba55ac1b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/friendtagging/FriendTaggingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/friendtagging/FriendTaggingPlugin.java @@ -33,7 +33,7 @@ import net.runelite.api.events.WidgetMenuOptionClicked; import net.runelite.api.util.Text; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.game.chatbox.ChatboxPanelManager; import net.runelite.client.game.chatbox.ChatboxTextInput; import net.runelite.client.menus.MenuManager; @@ -82,13 +82,9 @@ public class FriendTaggingPlugin extends Plugin @Inject private ChatboxPanelManager chatboxPanelManager; - @Inject - private EventBus eventBus; - @Override protected void startUp() throws Exception { - addSubscriptions(); menuManager.addManagedCustomMenu(friendsTabMenuOption); menuManager.addManagedCustomMenu(ignoreTabMenuOption); @@ -100,23 +96,13 @@ public class FriendTaggingPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - menuManager.removeManagedCustomMenu(friendsTabMenuOption); menuManager.removeManagedCustomMenu(ignoreTabMenuOption); menuManager.removeManagedCustomMenu(friendTabResizableOption); menuManager.removeManagedCustomMenu(ignoreTabResizableOption); } - private void addSubscriptions() - { - eventBus.subscribe(MenuEntryAdded.class, this, this::onMenuEntryAdded); - eventBus.subscribe(FriendRemoved.class, this, this::onFriendRemoved); - eventBus.subscribe(NameableNameChanged.class, this, this::onNameableNameChanged); - eventBus.subscribe(WidgetMenuOptionClicked.class, this, this::onWidgetMenuOptionClicked); - eventBus.subscribe(MenuOptionClicked.class, this, this::onMenuOptionClicked); - } - +@Subscribe private void onMenuEntryAdded(MenuEntryAdded event) { final int groupId = WidgetInfo.TO_GROUP(event.getParam1()); @@ -141,12 +127,14 @@ public class FriendTaggingPlugin extends Plugin } } + @Subscribe private void onFriendRemoved(FriendRemoved event) { final String displayName = event.getName().trim().toLowerCase(); deleteTag(displayName); } + @Subscribe private void onNameableNameChanged(NameableNameChanged event) { final Nameable nameable = event.getNameable(); @@ -162,6 +150,7 @@ public class FriendTaggingPlugin extends Plugin } } + @Subscribe private void onWidgetMenuOptionClicked(WidgetMenuOptionClicked event) { if (event.getWidget().getId() == WidgetInfo.FIXED_VIEWPORT_FRIENDS_TAB.getId() && @@ -171,6 +160,7 @@ public class FriendTaggingPlugin extends Plugin } } + @Subscribe private void onMenuOptionClicked(MenuOptionClicked event) { if (WidgetInfo.TO_GROUP(event.getParam1()) == WidgetInfo.FRIENDS_LIST.getGroupId()) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gauntlet/GauntletPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/gauntlet/GauntletPlugin.java index dd618a167b..9f281f2328 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/gauntlet/GauntletPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/gauntlet/GauntletPlugin.java @@ -67,6 +67,7 @@ import net.runelite.api.events.VarbitChanged; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.events.NpcLootReceived; import net.runelite.client.game.ItemManager; @@ -201,7 +202,6 @@ public class GauntletPlugin extends Plugin @Override protected void startUp() { - addSubscriptions(); updateConfig(); initializeCounters(); overlayManager.add(overlay); @@ -272,7 +272,6 @@ public class GauntletPlugin extends Plugin @Override protected void shutDown() { - eventBus.unregister(this); timer.resetStates(); if (timerVisible) { @@ -300,23 +299,7 @@ public class GauntletPlugin extends Plugin countersVisible = false; } - private void addSubscriptions() - { - eventBus.subscribe(AnimationChanged.class, this, this::onAnimationChanged); - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameObjectDespawned.class, this, this::onGameObjectDespawned); - eventBus.subscribe(GameObjectSpawned.class, this, this::onGameObjectSpawned); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(NpcDespawned.class, this, this::onNpcDespawned); - eventBus.subscribe(NpcSpawned.class, this, this::onNpcSpawned); - eventBus.subscribe(ProjectileSpawned.class, this, this::onProjectileSpawned); - eventBus.subscribe(VarbitChanged.class, this, this::onVarbitChanged); - eventBus.subscribe(XpDropEvent.class, this, this::onXpDropEvent); - eventBus.subscribe(NpcLootReceived.class, this, this::onNpcLootReceived); - eventBus.subscribe(MenuOptionClicked.class, this, this::onMenuOptionClicked); - } - +@Subscribe private void onMenuOptionClicked(MenuOptionClicked menuOptionClicked) { if (menuOptionClicked.getTarget().toUpperCase().contains("LINUM")) @@ -329,6 +312,7 @@ public class GauntletPlugin extends Plugin } } + @Subscribe private void onNpcLootReceived(NpcLootReceived npcLootReceived) { fishGathered += (int) npcLootReceived.getItems().stream().filter(item -> item.getId() == ItemID.RAW_PADDLEFISH).count(); @@ -336,6 +320,7 @@ public class GauntletPlugin extends Plugin updateCounters(); } + @Subscribe private void onXpDropEvent(XpDropEvent experienceChanged) { if (experienceChanged.getSkill().compareTo(Skill.MINING) == 0) @@ -364,6 +349,7 @@ public class GauntletPlugin extends Plugin updateCounters(); } + @Subscribe private void onAnimationChanged(AnimationChanged event) { if (hunllef == null) @@ -434,6 +420,7 @@ public class GauntletPlugin extends Plugin } } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("Gauntlet")) @@ -470,6 +457,7 @@ public class GauntletPlugin extends Plugin } } + @Subscribe private void onGameObjectDespawned(GameObjectDespawned event) { final GameObject obj = event.getGameObject(); @@ -479,6 +467,7 @@ public class GauntletPlugin extends Plugin } } + @Subscribe private void onGameObjectSpawned(GameObjectSpawned event) { final GameObject obj = event.getGameObject(); @@ -488,6 +477,7 @@ public class GauntletPlugin extends Plugin } } + @Subscribe private void onGameStateChanged(GameStateChanged event) { if (event.getGameState() == GameState.LOADING) @@ -496,6 +486,7 @@ public class GauntletPlugin extends Plugin } } + @Subscribe private void onGameTick(GameTick event) { // This handles the timer based on player health. @@ -516,6 +507,7 @@ public class GauntletPlugin extends Plugin } } + @Subscribe private void onNpcDespawned(NpcDespawned event) { final NPC npc = event.getNpc(); @@ -530,6 +522,7 @@ public class GauntletPlugin extends Plugin } } + @Subscribe private void onNpcSpawned(NpcSpawned event) { final NPC npc = event.getNpc(); @@ -543,6 +536,7 @@ public class GauntletPlugin extends Plugin } } + @Subscribe private void onProjectileSpawned(ProjectileSpawned event) { if (hunllef == null) @@ -574,6 +568,7 @@ public class GauntletPlugin extends Plugin } } + @Subscribe private void onVarbitChanged(VarbitChanged event) { if (this.completeStartup) 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 4aad1d3ee0..bd32780bb6 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 @@ -70,7 +70,7 @@ import net.runelite.api.events.GameStateChanged; import net.runelite.api.hooks.DrawCallbacks; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -121,9 +121,6 @@ public class GpuPlugin extends Plugin implements DrawCallbacks @Inject private PluginManager pluginManager; - @Inject - private EventBus eventbus; - private Canvas canvas; private JAWTWindow jawtWindow; private GL4 gl; @@ -243,6 +240,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks private int fogCircularity; private int fogDensity; + @Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("gpu")) @@ -266,7 +264,6 @@ public class GpuPlugin extends Plugin implements DrawCallbacks protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); clientThread.invoke(() -> { @@ -374,8 +371,6 @@ public class GpuPlugin extends Plugin implements DrawCallbacks @Override protected void shutDown() { - eventbus.unregister(this); - clientThread.invoke(() -> { client.setGpu(false); @@ -445,13 +440,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks }); } - private void addSubscriptions() - { - eventbus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventbus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - } - - @Provides +@Provides GpuPluginConfig provideConfig(ConfigManager configManager) { return configManager.getConfig(GpuPluginConfig.class); @@ -611,7 +600,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks gl.glBindVertexArray(vaoUiHandle); FloatBuffer vboUiBuf = GpuFloatBuffer.allocateDirect(5 * 4); - vboUiBuf.put(new float[]{ + vboUiBuf.put(new float[] { // positions // texture coords 1f, 1f, 0.0f, 1.0f, 0f, // top right 1f, -1f, 0.0f, 1.0f, 1f, // bottom right @@ -738,7 +727,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks gl.glUseProgram(glProgram); - float[] matrix = new float[]{ + float[] matrix = new float[] { 2 / (right - left), 0, 0, 0, 0, 2 / (top - bottom), 0, 0, 0, 0, -2 / (far - near), 0, @@ -763,8 +752,8 @@ public class GpuPlugin extends Plugin implements DrawCallbacks } public void drawScenePaint(int orientation, int pitchSin, int pitchCos, int yawSin, int yawCos, int x, int y, int z, - TilePaint paint, int tileZ, int tileX, int tileY, - int zoom, int centerX, int centerY) + TilePaint paint, int tileZ, int tileX, int tileY, + int zoom, int centerX, int centerY) { if (paint.getBufferLen() > 0) { @@ -789,8 +778,8 @@ public class GpuPlugin extends Plugin implements DrawCallbacks } public void drawSceneModel(int orientation, int pitchSin, int pitchCos, int yawSin, int yawCos, int x, int y, int z, - TileModel model, int tileZ, int tileX, int tileY, - int zoom, int centerX, int centerY) + TileModel model, int tileZ, int tileX, int tileY, + int zoom, int centerX, int centerY) { if (model.getBufferLen() > 0) { @@ -1317,6 +1306,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks textureManager.animate(texture, diff); } + @Subscribe private void onGameStateChanged(GameStateChanged gameStateChanged) { if (gameStateChanged.getGameState() != GameState.LOGGED_IN) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java index 08d685260f..62153aaca1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java @@ -56,7 +56,6 @@ import static net.runelite.api.ItemID.COINS_995; import net.runelite.api.MenuOpcode; import net.runelite.api.Varbits; import net.runelite.api.events.ChatMessage; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.FocusChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GrandExchangeOfferChanged; @@ -72,7 +71,8 @@ import net.runelite.client.account.AccountSession; import net.runelite.client.account.SessionManager; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.events.SessionClose; import net.runelite.client.events.SessionOpen; import net.runelite.client.game.ItemManager; @@ -108,7 +108,9 @@ public class GrandExchangePlugin extends Plugin private static final OSBGrandExchangeClient CLIENT = new OSBGrandExchangeClient(); private static final String OSB_GE_TEXT = "
OSBuddy Actively traded price: "; private static final String BUY_LIMIT_GE_TEXT = "
Buy limit: "; - private static final TypeToken> BUY_LIMIT_TOKEN = new TypeToken>() {}; + private static final TypeToken> BUY_LIMIT_TOKEN = new TypeToken>() + { + }; @Getter(AccessLevel.PACKAGE) private NavigationButton button; @@ -155,9 +157,6 @@ public class GrandExchangePlugin extends Plugin @Inject private ConfigManager configManager; - @Inject - private EventBus eventBus; - private Widget grandExchangeText; private Widget grandExchangeItem; private Widget grandExchangeOfferQuantityHeading; @@ -213,7 +212,6 @@ public class GrandExchangePlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); itemGELimits = loadGELimits(); panel = injector.getInstance(GrandExchangePanel.class); @@ -249,8 +247,6 @@ public class GrandExchangePlugin extends Plugin @Override protected void shutDown() { - eventBus.unregister(this); - clientToolbar.removeNavigation(button); mouseManager.unregisterMouseListener(inputListener); keyManager.unregisterKeyListener(inputListener); @@ -261,20 +257,7 @@ public class GrandExchangePlugin extends Plugin grandExchangeClient = null; } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(ChatMessage.class, this, this::onChatMessage); - eventBus.subscribe(SessionOpen.class, this, this::onSessionOpen); - eventBus.subscribe(SessionClose.class, this, this::onSessionClose); - eventBus.subscribe(GrandExchangeOfferChanged.class, this, this::onGrandExchangeOfferChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(MenuEntryAdded.class, this, this::onMenuEntryAdded); - eventBus.subscribe(FocusChanged.class, this, this::onFocusChanged); - eventBus.subscribe(WidgetLoaded.class, this, this::onWidgetLoaded); - eventBus.subscribe(ScriptCallbackEvent.class, this, this::onScriptCallbackEvent); - } - +@Subscribe private void onSessionOpen(SessionOpen sessionOpen) { AccountSession accountSession = sessionManager.getAccountSession(); @@ -297,11 +280,13 @@ public class GrandExchangePlugin extends Plugin this.enableAfford = config.enableAfford(); } + @Subscribe private void onSessionClose(SessionClose sessionClose) { grandExchangeClient = null; } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("grandexchange")) @@ -323,6 +308,7 @@ public class GrandExchangePlugin extends Plugin } } + @Subscribe private void onGrandExchangeOfferChanged(GrandExchangeOfferChanged offerEvent) { final int slot = offerEvent.getSlot(); @@ -400,6 +386,7 @@ public class GrandExchangePlugin extends Plugin return savedOffer.getState() != grandExchangeOffer.getState(); } + @Subscribe private void onChatMessage(ChatMessage event) { if (!this.enableNotifications || event.getType() != ChatMessageType.GAMEMESSAGE) @@ -415,6 +402,7 @@ public class GrandExchangePlugin extends Plugin } } + @Subscribe private void onGameStateChanged(GameStateChanged gameStateChanged) { if (gameStateChanged.getGameState() == GameState.LOGIN_SCREEN) @@ -423,6 +411,7 @@ public class GrandExchangePlugin extends Plugin } } + @Subscribe private void onMenuEntryAdded(MenuEntryAdded menuEntry) { // At the moment, if the user disables quick lookup, the input listener gets disabled. Thus, isHotKeyPressed() @@ -454,6 +443,7 @@ public class GrandExchangePlugin extends Plugin } } + @Subscribe private void onFocusChanged(FocusChanged focusChanged) { if (!focusChanged.isFocused()) @@ -462,6 +452,7 @@ public class GrandExchangePlugin extends Plugin } } + @Subscribe private void onWidgetLoaded(WidgetLoaded event) { switch (event.getGroupId()) @@ -480,6 +471,7 @@ public class GrandExchangePlugin extends Plugin } } + @Subscribe private void onScriptCallbackEvent(ScriptCallbackEvent event) { if (event.getEventName().equals("geBuilt")) @@ -544,7 +536,6 @@ public class GrandExchangePlugin extends Plugin } - if (this.enableAfford && offerType == OFFER_TYPE_BUY) { final ItemContainer inventory = client.getItemContainer(InventoryID.INVENTORY); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPlugin.java index c8c8116df9..8c508356e9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grotesqueguardians/GrotesqueGuardiansPlugin.java @@ -32,7 +32,7 @@ import net.runelite.api.Client; import net.runelite.api.NPC; import static net.runelite.api.NpcID.DUSK_7888; import net.runelite.api.events.GameTick; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginType; @@ -42,7 +42,7 @@ import net.runelite.client.ui.overlay.OverlayManager; @PluginDescriptor( name = "Grotesque Guardians", description = "Show various helpful utitiles during the Grotesque Gaurdians (Gargoyles) fight", - tags = { "bosses", "combat", "gargs", "overlay", "grotesque", "pve", "pvm" }, + tags = {"bosses", "combat", "gargs", "overlay", "grotesque", "pve", "pvm"}, type = PluginType.PVM, enabledByDefault = false ) @@ -56,8 +56,6 @@ public class GrotesqueGuardiansPlugin extends Plugin private OverlayManager overlayManager; @Inject private GrotesqueGuardiansPrayerOverlay prayerOverlay; - @Inject - private EventBus eventBus; @Nullable private DuskAttack prayAgainst; @Nullable @@ -77,7 +75,6 @@ public class GrotesqueGuardiansPlugin extends Plugin @Override protected void startUp() throws Exception { - eventBus.subscribe(GameTick.class, this, this::onGameTick); overlayManager.add(overlay); overlayManager.add(prayerOverlay); @@ -88,14 +85,13 @@ public class GrotesqueGuardiansPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(overlay); overlayManager.remove(prayerOverlay); dusk = null; prayAgainst = null; } + @Subscribe private void onGameTick(final GameTick event) { final ArrayList regions = new ArrayList<>(); @@ -128,14 +124,14 @@ public class GrotesqueGuardiansPlugin extends Plugin } } else - { + { prayAgainst = null; } needingToRun = dusk.getAnimation() == 7802; } } else - { + { inGargs = false; prayAgainst = null; dusk = null; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java index 926fcb7a3a..536b9dd357 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java @@ -68,7 +68,6 @@ import net.runelite.api.TileItem; import net.runelite.api.TileItemPile; import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.ClientTick; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.FocusChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; @@ -80,7 +79,8 @@ import net.runelite.api.events.MenuOptionClicked; import net.runelite.api.util.Text; import net.runelite.client.Notifier; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.events.NpcLootReceived; import net.runelite.client.events.PlayerLootReceived; import net.runelite.client.game.ItemManager; @@ -421,8 +421,6 @@ public class GroundItemsPlugin extends Plugin private GroundItemsOverlay overlay; @Inject private Notifier notifier; - @Inject - private EventBus eventBus; private LoadingCache highlightedItems; private Color defaultColor; private Color highlightedColor; @@ -487,7 +485,6 @@ public class GroundItemsPlugin extends Plugin protected void startUp() { updateConfig(); - addSubscriptions(); overlayManager.add(overlay); reset(); @@ -498,8 +495,6 @@ public class GroundItemsPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(overlay); mouseManager.unregisterMouseListener(inputListener); keyManager.unregisterKeyListener(inputListener); @@ -512,22 +507,7 @@ public class GroundItemsPlugin extends Plugin collectedGroundItems.clear(); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(ItemSpawned.class, this, this::onItemSpawned); - eventBus.subscribe(ItemDespawned.class, this, this::onItemDespawned); - eventBus.subscribe(ItemQuantityChanged.class, this, this::onItemQuantityChanged); - eventBus.subscribe(NpcLootReceived.class, this, this::onNpcLootReceived); - eventBus.subscribe(PlayerLootReceived.class, this, this::onPlayerLootReceived); - eventBus.subscribe(ClientTick.class, this, this::onClientTick); - eventBus.subscribe(MenuEntryAdded.class, this, this::onMenuEntryAdded); - eventBus.subscribe(FocusChanged.class, this, this::onFocusChanged); - eventBus.subscribe(MenuOptionClicked.class, this, this::onMenuOptionClicked); - } - +@Subscribe private void onGameTick(GameTick event) { for (GroundItem item : collectedGroundItems.values()) @@ -540,6 +520,7 @@ public class GroundItemsPlugin extends Plugin } } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("grounditems")) @@ -549,6 +530,7 @@ public class GroundItemsPlugin extends Plugin } } + @Subscribe private void onGameStateChanged(final GameStateChanged event) { if (event.getGameState() == GameState.LOADING) @@ -557,6 +539,7 @@ public class GroundItemsPlugin extends Plugin } } + @Subscribe private void onItemSpawned(ItemSpawned itemSpawned) { TileItem item = itemSpawned.getItem(); @@ -583,6 +566,7 @@ public class GroundItemsPlugin extends Plugin } } + @Subscribe private void onItemDespawned(ItemDespawned itemDespawned) { TileItem item = itemDespawned.getItem(); @@ -609,6 +593,7 @@ public class GroundItemsPlugin extends Plugin } } + @Subscribe private void onItemQuantityChanged(ItemQuantityChanged itemQuantityChanged) { TileItem item = itemQuantityChanged.getItem(); @@ -625,6 +610,7 @@ public class GroundItemsPlugin extends Plugin } } + @Subscribe private void onNpcLootReceived(NpcLootReceived npcLootReceived) { npcLootReceived.getItems().forEach(item -> @@ -642,6 +628,7 @@ public class GroundItemsPlugin extends Plugin lootNotifier(items); } + @Subscribe private void onPlayerLootReceived(PlayerLootReceived playerLootReceived) { Collection items = playerLootReceived.getItems(); @@ -689,6 +676,7 @@ public class GroundItemsPlugin extends Plugin notifier.notify(notification); } + @Subscribe private void onClientTick(ClientTick event) { final MenuEntry[] menuEntries = client.getMenuEntries(); @@ -931,6 +919,7 @@ public class GroundItemsPlugin extends Plugin } } + @Subscribe private void onMenuEntryAdded(MenuEntryAdded lastEntry) { if (this.itemHighlightMode != OVERLAY) @@ -1174,6 +1163,7 @@ public class GroundItemsPlugin extends Plugin return this.defaultColor; } + @Subscribe private void onFocusChanged(FocusChanged focusChanged) { if (!focusChanged.isFocused()) @@ -1182,6 +1172,7 @@ public class GroundItemsPlugin extends Plugin } } + @Subscribe private void onMenuOptionClicked(MenuOptionClicked menuOptionClicked) { if (menuOptionClicked.getMenuOpcode() == MenuOpcode.ITEM_DROP) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java index 7d1621e535..f6dca821a7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/groundmarkers/GroundMarkerPlugin.java @@ -58,7 +58,7 @@ import net.runelite.api.events.MenuEntryAdded; import net.runelite.api.events.MenuOptionClicked; import net.runelite.api.util.Text; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.input.KeyManager; import net.runelite.client.plugins.Plugin; @@ -112,9 +112,6 @@ public class GroundMarkerPlugin extends Plugin @Inject private GroundMarkerMinimapOverlay minimapOverlay; - @Inject - private EventBus eventBus; - @Inject private KeyManager keyManager; @@ -140,7 +137,9 @@ public class GroundMarkerPlugin extends Plugin return GSON.fromJson(json, new GroundMarkerListTypeToken().getType()); } - private static class GroundMarkerListTypeToken extends TypeToken> {} + private static class GroundMarkerListTypeToken extends TypeToken> + { + } private GroundMarkerConfig.amount amount; @Getter(AccessLevel.PACKAGE) @@ -293,6 +292,7 @@ public class GroundMarkerPlugin extends Plugin return point; } + @Subscribe private void onGameStateChanged(GameStateChanged gameStateChanged) { if (gameStateChanged.getGameState() != GameState.LOGGED_IN) @@ -304,6 +304,7 @@ public class GroundMarkerPlugin extends Plugin loadPoints(); } + @Subscribe private void onFocusChanged(FocusChanged focusChanged) { if (!focusChanged.isFocused()) @@ -312,6 +313,7 @@ public class GroundMarkerPlugin extends Plugin } } + @Subscribe private void onMenuEntryAdded(MenuEntryAdded event) { if (hotKeyPressed && event.getOption().equals(WALK_HERE)) @@ -358,6 +360,7 @@ public class GroundMarkerPlugin extends Plugin } } + @Subscribe private void onMenuOptionClicked(MenuOptionClicked event) { if (!event.getOption().contains(MARK) && !event.getOption().contains(UNMARK)) @@ -385,7 +388,6 @@ public class GroundMarkerPlugin extends Plugin protected void startUp() { updateConfig(); - addSubscriptions(); overlayManager.add(overlay); overlayManager.add(minimapOverlay); @@ -396,23 +398,13 @@ public class GroundMarkerPlugin extends Plugin @Override protected void shutDown() { - eventBus.unregister(this); overlayManager.remove(overlay); overlayManager.remove(minimapOverlay); keyManager.unregisterKeyListener(inputListener); points.clear(); } - private void addSubscriptions() - { - 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); - } - - private void markTile(LocalPoint localPoint, int group) +private void markTile(LocalPoint localPoint, int group) { if (localPoint == null) { @@ -493,6 +485,7 @@ public class GroundMarkerPlugin extends Plugin return color; } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("groundMarker")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarPlugin.java index 9108b83e55..95384f8aca 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/herbiboars/HerbiboarPlugin.java @@ -59,7 +59,7 @@ import net.runelite.api.events.GroundObjectDespawned; import net.runelite.api.events.GroundObjectSpawned; import net.runelite.api.events.VarbitChanged; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -115,9 +115,6 @@ public class HerbiboarPlugin extends Plugin @Inject private HerbiboarConfig config; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) private boolean inHerbiboarArea; @@ -194,7 +191,6 @@ public class HerbiboarPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); overlayManager.add(overlay); overlayManager.add(minimapOverlay); @@ -204,27 +200,11 @@ public class HerbiboarPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(overlay); overlayManager.remove(minimapOverlay); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(VarbitChanged.class, this, this::onVarbitChanged); - eventBus.subscribe(AnimationChanged.class, this, this::onAnimationChanged); - eventBus.subscribe(GameObjectSpawned.class, this, this::onGameObjectSpawned); - eventBus.subscribe(GameObjectChanged.class, this, this::onGameObjectChanged); - eventBus.subscribe(GameObjectDespawned.class, this, this::onGameObjectDespawned); - eventBus.subscribe(GroundObjectSpawned.class, this, this::onGroundObjectSpawned); - eventBus.subscribe(GroundObjectChanged.class, this, this::onGroundObjectChanged); - eventBus.subscribe(GroundObjectDespawned.class, this, this::onGroundObjectDespawned); - } - - private void updateTrailData() +private void updateTrailData() { currentTrail = null; currentPath = -1; @@ -318,6 +298,7 @@ public class HerbiboarPlugin extends Plugin tunnels.clear(); } + @Subscribe private void onGameStateChanged(GameStateChanged event) { switch (event.getGameState()) @@ -335,6 +316,7 @@ public class HerbiboarPlugin extends Plugin } } + @Subscribe private void onVarbitChanged(VarbitChanged event) { if (isInHerbiboarArea()) @@ -343,11 +325,13 @@ public class HerbiboarPlugin extends Plugin } } + @Subscribe private void onGameObjectSpawned(GameObjectSpawned event) { onGameObject(event.getTile(), null, event.getGameObject()); } + @Subscribe public void onAnimationChanged(AnimationChanged event) { if (!(event.getActor() instanceof NPC)) @@ -373,26 +357,31 @@ public class HerbiboarPlugin extends Plugin } } + @Subscribe private void onGameObjectChanged(GameObjectChanged event) { onGameObject(event.getTile(), event.getPrevious(), event.getGameObject()); } + @Subscribe private void onGameObjectDespawned(GameObjectDespawned event) { onGameObject(event.getTile(), event.getGameObject(), null); } + @Subscribe private void onGroundObjectSpawned(GroundObjectSpawned event) { - onGroundObject( null, event.getGroundObject()); + onGroundObject(null, event.getGroundObject()); } + @Subscribe private void onGroundObjectChanged(GroundObjectChanged event) { onGroundObject(event.getPrevious(), event.getGroundObject()); } + @Subscribe private void onGroundObjectDespawned(GroundObjectDespawned event) { onGroundObject(event.getGroundObject(), null); @@ -476,6 +465,7 @@ public class HerbiboarPlugin extends Plugin return END_LOCATIONS; } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("herbiboar")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersPlugin.java index b58470499a..44a2bd54b2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hideprayers/HidePrayersPlugin.java @@ -46,7 +46,7 @@ import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetID; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -72,36 +72,36 @@ import net.runelite.client.plugins.hideprayers.util.Zulrah; public class HidePrayersPlugin extends Plugin { private static final List PRAYER_WIDGET_INFO_LIST = ImmutableList.of( - WidgetInfo.PRAYER_THICK_SKIN, //0 - WidgetInfo.PRAYER_BURST_OF_STRENGTH, //1 - WidgetInfo.PRAYER_CLARITY_OF_THOUGHT, //2 - WidgetInfo.PRAYER_SHARP_EYE, //3 - WidgetInfo.PRAYER_MYSTIC_WILL, //4 - WidgetInfo.PRAYER_ROCK_SKIN, //5 - WidgetInfo.PRAYER_SUPERHUMAN_STRENGTH, //6 - WidgetInfo.PRAYER_IMPROVED_REFLEXES, //7 - WidgetInfo.PRAYER_RAPID_RESTORE, //8 - WidgetInfo.PRAYER_RAPID_HEAL, //9 - WidgetInfo.PRAYER_PROTECT_ITEM, //10 - WidgetInfo.PRAYER_HAWK_EYE, //11 - WidgetInfo.PRAYER_MYSTIC_LORE, //12 - WidgetInfo.PRAYER_STEEL_SKIN, //13 - WidgetInfo.PRAYER_ULTIMATE_STRENGTH, //14 - WidgetInfo.PRAYER_INCREDIBLE_REFLEXES, //15 - WidgetInfo.PRAYER_PROTECT_FROM_MAGIC, //16 - WidgetInfo.PRAYER_PROTECT_FROM_MISSILES, //17 - WidgetInfo.PRAYER_PROTECT_FROM_MELEE, //18 - WidgetInfo.PRAYER_EAGLE_EYE, //19 - WidgetInfo.PRAYER_MYSTIC_MIGHT, //20 - WidgetInfo.PRAYER_RETRIBUTION, //21 - WidgetInfo.PRAYER_REDEMPTION, //22 - WidgetInfo.PRAYER_SMITE, //23 - WidgetInfo.PRAYER_PRESERVE, //24 - WidgetInfo.PRAYER_CHIVALRY, //25 - WidgetInfo.PRAYER_PIETY, //26 - WidgetInfo.PRAYER_RIGOUR, //27 - WidgetInfo.PRAYER_AUGURY //28 - ); + WidgetInfo.PRAYER_THICK_SKIN, //0 + WidgetInfo.PRAYER_BURST_OF_STRENGTH, //1 + WidgetInfo.PRAYER_CLARITY_OF_THOUGHT, //2 + WidgetInfo.PRAYER_SHARP_EYE, //3 + WidgetInfo.PRAYER_MYSTIC_WILL, //4 + WidgetInfo.PRAYER_ROCK_SKIN, //5 + WidgetInfo.PRAYER_SUPERHUMAN_STRENGTH, //6 + WidgetInfo.PRAYER_IMPROVED_REFLEXES, //7 + WidgetInfo.PRAYER_RAPID_RESTORE, //8 + WidgetInfo.PRAYER_RAPID_HEAL, //9 + WidgetInfo.PRAYER_PROTECT_ITEM, //10 + WidgetInfo.PRAYER_HAWK_EYE, //11 + WidgetInfo.PRAYER_MYSTIC_LORE, //12 + WidgetInfo.PRAYER_STEEL_SKIN, //13 + WidgetInfo.PRAYER_ULTIMATE_STRENGTH, //14 + WidgetInfo.PRAYER_INCREDIBLE_REFLEXES, //15 + WidgetInfo.PRAYER_PROTECT_FROM_MAGIC, //16 + WidgetInfo.PRAYER_PROTECT_FROM_MISSILES, //17 + WidgetInfo.PRAYER_PROTECT_FROM_MELEE, //18 + WidgetInfo.PRAYER_EAGLE_EYE, //19 + WidgetInfo.PRAYER_MYSTIC_MIGHT, //20 + WidgetInfo.PRAYER_RETRIBUTION, //21 + WidgetInfo.PRAYER_REDEMPTION, //22 + WidgetInfo.PRAYER_SMITE, //23 + WidgetInfo.PRAYER_PRESERVE, //24 + WidgetInfo.PRAYER_CHIVALRY, //25 + WidgetInfo.PRAYER_PIETY, //26 + WidgetInfo.PRAYER_RIGOUR, //27 + WidgetInfo.PRAYER_AUGURY //28 + ); @Inject private Client client; @@ -109,9 +109,6 @@ public class HidePrayersPlugin extends Plugin @Inject private HidePrayersConfig config; - @Inject - private EventBus eventBus; - private boolean showindividualprayers; private boolean ShowTHICK_SKIN; private boolean ShowBURST_OF_STRENGTH; @@ -172,7 +169,6 @@ public class HidePrayersPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); hidePrayers(); } @@ -180,18 +176,10 @@ public class HidePrayersPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - restorePrayers(); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(WidgetLoaded.class, this, this::onWidgetLoaded); - } - +@Subscribe private void onGameStateChanged(GameStateChanged event) { if (event.getGameState() == GameState.LOGGED_IN) @@ -201,6 +189,7 @@ public class HidePrayersPlugin extends Plugin } } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("hideprayers")) @@ -210,6 +199,7 @@ public class HidePrayersPlugin extends Plugin } } + @Subscribe private void onWidgetLoaded(WidgetLoaded event) { if (event.getGroupId() == WidgetID.PRAYER_GROUP_ID || event.getGroupId() == WidgetID.QUICK_PRAYERS_GROUP_ID) @@ -306,7 +296,7 @@ public class HidePrayersPlugin extends Plugin return; } - if ( !this.showindividualprayers + if (!this.showindividualprayers && !this.getarmadylprayers && !this.getbarrowsprayers && !this.getbandosprayers @@ -325,35 +315,35 @@ public class HidePrayersPlugin extends Plugin if (this.showindividualprayers) { - prayerWidgets.get(0).setHidden(!this.ShowTHICK_SKIN); // Thick Skin - prayerWidgets.get(1).setHidden(!this.ShowBURST_OF_STRENGTH); // Burst of Strength - prayerWidgets.get(2).setHidden(!this.ShowCLARITY_OF_THOUGHT); // Clarity of Thought - prayerWidgets.get(3).setHidden(!this.ShowSHARP_EYE); // Sharp Eye - prayerWidgets.get(4).setHidden(!this.ShowMYSTIC_WILL); // Mystic Will - prayerWidgets.get(5).setHidden(!this.ShowROCK_SKIN); // Rock Skin - prayerWidgets.get(6).setHidden(!this.ShowSUPERHUMAN_STRENGTH); // Super Human Strength - prayerWidgets.get(7).setHidden(!this.ShowIMPROVED_REFLEXES); // Improved_Reflexes - prayerWidgets.get(8).setHidden(!this.ShowRapidRestore); // Rapid Restore - prayerWidgets.get(9).setHidden(!this.ShowRapidHeal); // Rapid Heal - prayerWidgets.get(10).setHidden(!this.ShowProtectItem); // Protect Item - prayerWidgets.get(11).setHidden(!this.ShowHAWK_EYE); // Hawk Eye - prayerWidgets.get(12).setHidden(!this.ShowMYSTIC_LORE); // Mystic Lore - prayerWidgets.get(13).setHidden(!this.ShowSteelSkin); // Steel Skin - prayerWidgets.get(14).setHidden(!this.ShowUltimateStrength); // Ultimate Strength - prayerWidgets.get(15).setHidden(!this.ShowIncredibleReflex); // Incredible Reflexes - prayerWidgets.get(16).setHidden(!this.ShowPTFMagic); // Protect from Magic - prayerWidgets.get(17).setHidden(!this.ShowPTFRange); // Protect from Range - prayerWidgets.get(18).setHidden(!this.ShowPTFMelee); // Protect from Melee - prayerWidgets.get(19).setHidden(!this.ShowEagle); // eagle eye - prayerWidgets.get(20).setHidden(!this.ShowMystic); // Mystic Might - prayerWidgets.get(21).setHidden(!this.ShowRETRIBUTION); // Retribution - prayerWidgets.get(22).setHidden(!this.ShowRedemption); // Redemption - prayerWidgets.get(23).setHidden(!this.ShowSmite); // Smite - prayerWidgets.get(24).setHidden(!this.ShowPreserve); // Preserve - prayerWidgets.get(25).setHidden(!this.ShowChivalry); // Chivalry - prayerWidgets.get(26).setHidden(!this.ShowPiety); // Piety - prayerWidgets.get(27).setHidden(!this.ShowRigour); // Rigour - prayerWidgets.get(28).setHidden(!this.ShowAugury); // Augury + prayerWidgets.get(0).setHidden(!this.ShowTHICK_SKIN); // Thick Skin + prayerWidgets.get(1).setHidden(!this.ShowBURST_OF_STRENGTH); // Burst of Strength + prayerWidgets.get(2).setHidden(!this.ShowCLARITY_OF_THOUGHT); // Clarity of Thought + prayerWidgets.get(3).setHidden(!this.ShowSHARP_EYE); // Sharp Eye + prayerWidgets.get(4).setHidden(!this.ShowMYSTIC_WILL); // Mystic Will + prayerWidgets.get(5).setHidden(!this.ShowROCK_SKIN); // Rock Skin + prayerWidgets.get(6).setHidden(!this.ShowSUPERHUMAN_STRENGTH); // Super Human Strength + prayerWidgets.get(7).setHidden(!this.ShowIMPROVED_REFLEXES); // Improved_Reflexes + prayerWidgets.get(8).setHidden(!this.ShowRapidRestore); // Rapid Restore + prayerWidgets.get(9).setHidden(!this.ShowRapidHeal); // Rapid Heal + prayerWidgets.get(10).setHidden(!this.ShowProtectItem); // Protect Item + prayerWidgets.get(11).setHidden(!this.ShowHAWK_EYE); // Hawk Eye + prayerWidgets.get(12).setHidden(!this.ShowMYSTIC_LORE); // Mystic Lore + prayerWidgets.get(13).setHidden(!this.ShowSteelSkin); // Steel Skin + prayerWidgets.get(14).setHidden(!this.ShowUltimateStrength); // Ultimate Strength + prayerWidgets.get(15).setHidden(!this.ShowIncredibleReflex); // Incredible Reflexes + prayerWidgets.get(16).setHidden(!this.ShowPTFMagic); // Protect from Magic + prayerWidgets.get(17).setHidden(!this.ShowPTFRange); // Protect from Range + prayerWidgets.get(18).setHidden(!this.ShowPTFMelee); // Protect from Melee + prayerWidgets.get(19).setHidden(!this.ShowEagle); // eagle eye + prayerWidgets.get(20).setHidden(!this.ShowMystic); // Mystic Might + prayerWidgets.get(21).setHidden(!this.ShowRETRIBUTION); // Retribution + prayerWidgets.get(22).setHidden(!this.ShowRedemption); // Redemption + prayerWidgets.get(23).setHidden(!this.ShowSmite); // Smite + prayerWidgets.get(24).setHidden(!this.ShowPreserve); // Preserve + prayerWidgets.get(25).setHidden(!this.ShowChivalry); // Chivalry + prayerWidgets.get(26).setHidden(!this.ShowPiety); // Piety + prayerWidgets.get(27).setHidden(!this.ShowRigour); // Rigour + prayerWidgets.get(28).setHidden(!this.ShowAugury); // Augury } else if (this.getarmadylprayers) @@ -518,7 +508,7 @@ public class HidePrayersPlugin extends Plugin break; } } - + else if (this.getzamorakprayers) { switch (this.zamorak) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/highalchemy/HighAlchemyPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/highalchemy/HighAlchemyPlugin.java index fb48147a67..99d9bb17c1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/highalchemy/HighAlchemyPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/highalchemy/HighAlchemyPlugin.java @@ -45,7 +45,7 @@ import static net.runelite.api.widgets.WidgetID.GUIDE_PRICES_INVENTORY_GROUP_ID; import static net.runelite.api.widgets.WidgetID.INVENTORY_GROUP_ID; import static net.runelite.api.widgets.WidgetID.SHOP_INVENTORY_GROUP_ID; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -76,9 +76,6 @@ public class HighAlchemyPlugin extends Plugin @Inject private HighAlchemyOverlay overlay; - @Inject - private EventBus eventBus; - @Provides HighAlchemyConfig getConfig(ConfigManager configManager) { @@ -98,8 +95,6 @@ public class HighAlchemyPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - buildGroupList(); overlayManager.add(overlay); } @@ -110,6 +105,7 @@ public class HighAlchemyPlugin extends Plugin overlayManager.remove(overlay); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals(CONFIG_GROUP)) @@ -131,7 +127,7 @@ public class HighAlchemyPlugin extends Plugin if (this.showInventory) { Arrays.stream( - new int[]{ + new int[] { DEPOSIT_BOX_GROUP_ID, BANK_INVENTORY_GROUP_ID, SHOP_INVENTORY_GROUP_ID, diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java index c46944a721..6afea273ff 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java @@ -44,13 +44,13 @@ import net.runelite.api.Client; import net.runelite.api.MenuEntry; import net.runelite.api.MenuOpcode; import net.runelite.api.events.ChatMessage; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.MenuEntryAdded; import net.runelite.api.events.PlayerMenuOptionClicked; import net.runelite.api.util.Text; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.menus.MenuManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -97,9 +97,6 @@ public class HiscorePlugin extends Plugin @Inject private HiscoreConfig config; - @Inject - private EventBus eventBus; - private NavigationButton navButton; private HiscorePanel hiscorePanel; @@ -115,7 +112,6 @@ public class HiscorePlugin extends Plugin @Override protected void startUp() throws Exception { - addSubscriptions(); updateConfig(); hiscorePanel = injector.getInstance(HiscorePanel.class); @@ -144,8 +140,6 @@ public class HiscorePlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - hiscorePanel.removeInputKeyListener(autocompleter); clientToolbar.removeNavigation(navButton); @@ -155,14 +149,7 @@ public class HiscorePlugin extends Plugin } } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(MenuEntryAdded.class, this, this::onMenuEntryAdded); - eventBus.subscribe(PlayerMenuOptionClicked.class, this, this::onPlayerMenuOptionClicked); - eventBus.subscribe(ChatMessage.class, this, this::onChatMessage); - } - +@Subscribe private void onConfigChanged(ConfigChanged event) { @@ -171,30 +158,31 @@ public class HiscorePlugin extends Plugin return; } updateConfig(); - if (client != null) - { - menuManager.get().removePlayerMenuItem(LOOKUP); + if (client != null) + { + menuManager.get().removePlayerMenuItem(LOOKUP); - if (this.playerOption) - { - menuManager.get().addPlayerMenuItem(LOOKUP); - } - } - - if (event.getKey().equals("autocomplete")) + if (this.playerOption) { - if (this.autocomplete) - { - hiscorePanel.addInputKeyListener(autocompleter); - } - else - { - hiscorePanel.removeInputKeyListener(autocompleter); - } + menuManager.get().addPlayerMenuItem(LOOKUP); } } + if (event.getKey().equals("autocomplete")) + { + if (this.autocomplete) + { + hiscorePanel.addInputKeyListener(autocompleter); + } + else + { + hiscorePanel.removeInputKeyListener(autocompleter); + } + } + } + + @Subscribe private void onMenuEntryAdded(MenuEntryAdded event) { if (!this.menuOption) @@ -229,6 +217,7 @@ public class HiscorePlugin extends Plugin } } + @Subscribe private void onPlayerMenuOptionClicked(PlayerMenuOptionClicked event) { if (event.getMenuOption().equals(LOOKUP)) @@ -237,6 +226,7 @@ public class HiscorePlugin extends Plugin } } + @Subscribe private void onChatMessage(ChatMessage event) { if (!this.bountyLookup || !event.getType().equals(ChatMessageType.GAMEMESSAGE)) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterPlugin.java index c82cf60f4d..1d8fca143a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hunter/HunterPlugin.java @@ -43,12 +43,12 @@ import net.runelite.api.Tile; import net.runelite.api.coords.Direction; import net.runelite.api.coords.LocalPoint; import net.runelite.api.coords.WorldPoint; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.GameObjectSpawned; import net.runelite.api.events.GameTick; import net.runelite.client.Notifier; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.ui.overlay.OverlayManager; @@ -77,9 +77,6 @@ public class HunterPlugin extends Plugin @Inject private HunterConfig config; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) private final Map traps = new HashMap<>(); @@ -108,7 +105,6 @@ public class HunterPlugin extends Plugin protected void startUp() { updateConfig(); - addSubscriptions(); overlayManager.add(overlay); overlay.updateConfig(); @@ -117,20 +113,12 @@ public class HunterPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(overlay); lastActionTime = Instant.ofEpochMilli(0); traps.clear(); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(GameObjectSpawned.class, this, this::onGameObjectSpawned); - } - +@Subscribe private void onGameObjectSpawned(GameObjectSpawned event) { final GameObject gameObject = event.getGameObject(); @@ -262,30 +250,30 @@ public class HunterPlugin extends Plugin // Imp entering box case ObjectID.MAGIC_BOX_19225: - // Black chin shaking box + // Black chin shaking box case ObjectID.BOX_TRAP: case ObjectID.BOX_TRAP_2026: case ObjectID.BOX_TRAP_2028: case ObjectID.BOX_TRAP_2029: - // Red chin shaking box + // Red chin shaking box case ObjectID.BOX_TRAP_9381: case ObjectID.BOX_TRAP_9390: case ObjectID.BOX_TRAP_9391: case ObjectID.BOX_TRAP_9392: case ObjectID.BOX_TRAP_9393: - // Grey chin shaking box + // Grey chin shaking box case ObjectID.BOX_TRAP_9386: case ObjectID.BOX_TRAP_9387: case ObjectID.BOX_TRAP_9388: - // Ferret shaking box + // Ferret shaking box case ObjectID.BOX_TRAP_9394: case ObjectID.BOX_TRAP_9396: case ObjectID.BOX_TRAP_9397: - // Bird traps + // Bird traps case ObjectID.BIRD_SNARE_9346: case ObjectID.BIRD_SNARE_9347: case ObjectID.BIRD_SNARE_9349: @@ -293,7 +281,7 @@ public class HunterPlugin extends Plugin case ObjectID.BIRD_SNARE_9376: case ObjectID.BIRD_SNARE_9378: - // Deadfall trap + // Deadfall trap case ObjectID.DEADFALL_19218: case ObjectID.DEADFALL_19851: case ObjectID.DEADFALL_20128: @@ -301,7 +289,7 @@ public class HunterPlugin extends Plugin case ObjectID.DEADFALL_20130: case ObjectID.DEADFALL_20131: - // Net trap + // Net trap case ObjectID.NET_TRAP_9003: case ObjectID.NET_TRAP_9005: case ObjectID.NET_TRAP_8972: @@ -311,7 +299,7 @@ public class HunterPlugin extends Plugin case ObjectID.NET_TRAP_8993: case ObjectID.NET_TRAP_8997: - // Maniacal monkey boulder trap + // Maniacal monkey boulder trap case ObjectID.MONKEY_TRAP_28828: case ObjectID.MONKEY_TRAP_28829: if (myTrap != null) @@ -327,6 +315,7 @@ public class HunterPlugin extends Plugin * checks if the trap is still there. If the trap is gone, it removes * the trap from the local players trap collection. */ + @Subscribe private void onGameTick(GameTick event) { // Check if all traps are still there, and remove the ones that are not. @@ -404,6 +393,7 @@ public class HunterPlugin extends Plugin lastTickLocalPlayerLocation = client.getLocalPlayer().getWorldLocation(); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("hunterplugin")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPlugin.java index 75959f65ed..542648e2fd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hydra/BabyHydraPlugin.java @@ -38,7 +38,7 @@ import net.runelite.api.events.AnimationChanged; import net.runelite.api.events.NpcDespawned; import net.runelite.api.events.NpcSpawned; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -73,9 +73,6 @@ public class BabyHydraPlugin extends Plugin @Inject private Client client; - @Inject - private EventBus eventBus; - @Provides BabyHydraConfig provideConfig(ConfigManager configManager) { @@ -100,7 +97,6 @@ public class BabyHydraPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); if (this.TextIndicator) { @@ -116,8 +112,6 @@ public class BabyHydraPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(hydraOverlay); overlayManager.remove(hydraPrayOverlay); overlayManager.remove(hydraIndicatorOverlay); @@ -125,14 +119,7 @@ public class BabyHydraPlugin extends Plugin hydraattacks.clear(); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(NpcSpawned.class, this, this::onNpcSpawned); - eventBus.subscribe(NpcDespawned.class, this, this::onNpcDespawned); - eventBus.subscribe(AnimationChanged.class, this, this::onAnimationChanged); - } - +@Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("hydra")) @@ -168,6 +155,7 @@ public class BabyHydraPlugin extends Plugin } } + @Subscribe private void onNpcSpawned(NpcSpawned event) { NPC hydra = event.getNpc(); @@ -177,6 +165,7 @@ public class BabyHydraPlugin extends Plugin } } + @Subscribe private void onNpcDespawned(NpcDespawned event) { NPC hydra = event.getNpc(); @@ -187,6 +176,7 @@ public class BabyHydraPlugin extends Plugin } } + @Subscribe private void onAnimationChanged(AnimationChanged event) { Actor monster = event.getActor(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java index 1d6203b8fa..14d4794785 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/idlenotifier/IdleNotifierPlugin.java @@ -71,7 +71,7 @@ import net.runelite.api.events.SpotAnimationChanged; import net.runelite.api.events.WallObjectSpawned; import net.runelite.client.Notifier; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.Sound; import net.runelite.client.game.SoundManager; @@ -240,9 +240,6 @@ public class IdleNotifierPlugin extends Plugin @Inject private IdleNotifierConfig config; - @Inject - private EventBus eventBus; - private Instant lastAnimating; private int lastAnimation = AnimationID.IDLE; private Instant lastInteracting; @@ -305,6 +302,7 @@ public class IdleNotifierPlugin extends Plugin return configManager.getConfig(IdleNotifierConfig.class); } + @Subscribe void onAnimationChanged(AnimationChanged event) { if (client.getGameState() != GameState.LOGGED_IN) @@ -343,6 +341,7 @@ public class IdleNotifierPlugin extends Plugin } } + @Subscribe private void onPlayerSpawned(PlayerSpawned event) { final Player p = event.getPlayer(); @@ -357,6 +356,7 @@ public class IdleNotifierPlugin extends Plugin } } + @Subscribe private void onWallObjectSpawned(WallObjectSpawned event) { WallObject wall = event.getWallObject(); @@ -370,6 +370,7 @@ public class IdleNotifierPlugin extends Plugin } } + @Subscribe private void onItemContainerChanged(ItemContainerChanged event) { ItemContainer itemContainer = event.getItemContainer(); @@ -447,6 +448,7 @@ public class IdleNotifierPlugin extends Plugin itemQuantitiesPrevious = itemQuantities; } + @Subscribe void onInteractingChanged(InteractingChanged event) { final Actor source = event.getSource(); @@ -497,6 +499,7 @@ public class IdleNotifierPlugin extends Plugin } } + @Subscribe void onGameStateChanged(GameStateChanged gameStateChanged) { lastInteracting = null; @@ -530,6 +533,7 @@ public class IdleNotifierPlugin extends Plugin } } + @Subscribe void onHitsplatApplied(HitsplatApplied event) { if (event.getActor() != client.getLocalPlayer()) @@ -546,6 +550,7 @@ public class IdleNotifierPlugin extends Plugin } } + @Subscribe private void onSpotAnimationChanged(SpotAnimationChanged event) { Actor actor = event.getActor(); @@ -561,6 +566,7 @@ public class IdleNotifierPlugin extends Plugin } } + @Subscribe void onGameTick(GameTick event) { skullNotifier(); @@ -977,7 +983,7 @@ public class IdleNotifierPlugin extends Plugin return ArrayUtils.contains(client.getMapRegions(), RESOURCE_AREA_REGION); } - private void notifyWith(Player local, String message) + private void notifyWith(Player local, String message) { notifier.notify("[" + local.getName() + "] " + message); } @@ -986,29 +992,14 @@ public class IdleNotifierPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); } @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - } - - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(AnimationChanged.class, this, this::onAnimationChanged); - eventBus.subscribe(PlayerSpawned.class, this, this::onPlayerSpawned); - eventBus.subscribe(WallObjectSpawned.class, this, this::onWallObjectSpawned); - eventBus.subscribe(ItemContainerChanged.class, this, this::onItemContainerChanged); - eventBus.subscribe(InteractingChanged.class, this, this::onInteractingChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(HitsplatApplied.class, this, this::onHitsplatApplied); - eventBus.subscribe(SpotAnimationChanged.class, this, this::onSpotAnimationChanged); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - } + } +@Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("idlenotifier")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsPlugin.java index 6aaf4f1b81..04cd284757 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/implings/ImplingsPlugin.java @@ -43,7 +43,7 @@ import net.runelite.api.events.NpcDespawned; import net.runelite.api.events.NpcSpawned; import net.runelite.client.Notifier; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -85,9 +85,6 @@ public class ImplingsPlugin extends Plugin @Inject private ImplingsConfig config; - @Inject - private EventBus eventBus; - @Inject private Notifier notifier; @@ -134,7 +131,6 @@ public class ImplingsPlugin extends Plugin protected void startUp() { updateConfig(); - addSubscriptions(); dynamicSpawns.put(DYNAMIC_SPAWN_NATURE_DRAGON, "T3 Nature-Lucky Dynamic"); dynamicSpawns.put(DYNAMIC_SPAWN_ECLECTIC, "T2 Eclectic Dynamic"); @@ -148,24 +144,13 @@ public class ImplingsPlugin extends Plugin @Override protected void shutDown() { - eventBus.unregister(this); - implings.clear(); overlayManager.remove(overlay); overlayManager.remove(minimapOverlay); overlayManager.remove(implingCounterOverlay); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(NpcSpawned.class, this, this::onNpcSpawned); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(NpcDespawned.class, this, this::onNpcDespawned); - eventBus.subscribe(NpcDefinitionChanged.class, this, this::onNpcDefinitionChanged); - } - +@Subscribe private void onGameTick(GameTick event) { implingCounterMap.clear(); @@ -190,6 +175,7 @@ public class ImplingsPlugin extends Plugin } } + @Subscribe private void onNpcSpawned(NpcSpawned npcSpawned) { NPC npc = npcSpawned.getNpc(); @@ -206,6 +192,7 @@ public class ImplingsPlugin extends Plugin } } + @Subscribe private void onNpcDefinitionChanged(NpcDefinitionChanged npcCompositionChanged) { NPC npc = npcCompositionChanged.getNpc(); @@ -222,6 +209,7 @@ public class ImplingsPlugin extends Plugin } } + @Subscribe private void onGameStateChanged(GameStateChanged event) { if (event.getGameState() == GameState.LOGIN_SCREEN || event.getGameState() == GameState.HOPPING) @@ -231,6 +219,7 @@ public class ImplingsPlugin extends Plugin } } + @Subscribe private void onNpcDespawned(NpcDespawned npcDespawned) { if (implings.isEmpty()) @@ -334,6 +323,7 @@ public class ImplingsPlugin extends Plugin } } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("implings")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java index 4ea9934558..a125d51e58 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inferno/InfernoPlugin.java @@ -48,7 +48,7 @@ import net.runelite.api.events.GameTick; import net.runelite.api.events.NpcDespawned; import net.runelite.api.events.NpcSpawned; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -94,9 +94,6 @@ public class InfernoPlugin extends Plugin @Inject private InfernoConfig config; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) private InfernoConfig.FontStyle fontStyle = InfernoConfig.FontStyle.BOLD; @Getter(AccessLevel.PACKAGE) @@ -243,7 +240,6 @@ public class InfernoPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); waveOverlay.setDisplayMode(this.waveDisplay); waveOverlay.setWaveHeaderColor(this.getWaveOverlayHeaderColor); @@ -267,8 +263,6 @@ public class InfernoPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(infernoOverlay); overlayManager.remove(waveOverlay); overlayManager.remove(jadOverlay); @@ -279,17 +273,7 @@ public class InfernoPlugin extends Plugin showNpcDeaths(); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(NpcSpawned.class, this, this::onNpcSpawned); - eventBus.subscribe(NpcDespawned.class, this, this::onNpcDespawned); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(ChatMessage.class, this, this::onChatMessage); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(AnimationChanged.class, this, this::onAnimationChanged); - } - +@Subscribe private void onConfigChanged(ConfigChanged event) { if (!"inferno".equals(event.getGroup())) @@ -319,6 +303,7 @@ public class InfernoPlugin extends Plugin } } + @Subscribe private void onGameTick(GameTick GameTickEvent) { if (!isInInferno()) @@ -347,6 +332,7 @@ public class InfernoPlugin extends Plugin calculateCentralNibbler(); } + @Subscribe private void onNpcSpawned(NpcSpawned event) { if (!isInInferno()) @@ -392,6 +378,7 @@ public class InfernoPlugin extends Plugin } } + @Subscribe private void onNpcDespawned(NpcDespawned event) { if (!isInInferno()) @@ -407,6 +394,7 @@ public class InfernoPlugin extends Plugin infernoNpcs.removeIf(infernoNPC -> infernoNPC.getNpc() == event.getNpc()); } + @Subscribe private void onAnimationChanged(AnimationChanged event) { if (!isInInferno()) @@ -426,6 +414,7 @@ public class InfernoPlugin extends Plugin } } + @Subscribe private void onGameStateChanged(GameStateChanged event) { if (event.getGameState() != GameState.LOGGED_IN) @@ -461,6 +450,7 @@ public class InfernoPlugin extends Plugin } } + @Subscribe private void onChatMessage(ChatMessage event) { if (!isInInferno() || event.getType() != ChatMessageType.GAMEMESSAGE) 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 26e4bcfbbc..b411ec2d0e 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 @@ -27,7 +27,6 @@ package net.runelite.client.plugins.info; import java.awt.image.BufferedImage; import javax.inject.Inject; import javax.inject.Singleton; -import net.runelite.client.eventbus.EventBus; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.ui.ClientToolbar; @@ -45,9 +44,6 @@ public class InfoPlugin extends Plugin @Inject private ClientToolbar clientToolbar; - @Inject - private EventBus eventbus; - private NavigationButton navButton; @@ -72,8 +68,6 @@ public class InfoPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventbus.unregister(this); - clientToolbar.removeNavigation(navButton); } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapPlugin.java index 8110db2eb3..1a23a18717 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/instancemap/InstanceMapPlugin.java @@ -31,7 +31,7 @@ import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.WidgetMenuOptionClicked; import net.runelite.api.widgets.WidgetInfo; import static net.runelite.api.widgets.WidgetInfo.WORLD_MAP_OPTION; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.input.KeyManager; import net.runelite.client.input.MouseManager; import net.runelite.client.menus.MenuManager; @@ -67,9 +67,6 @@ public class InstanceMapPlugin extends Plugin @Inject private MouseManager mouseManager; - @Inject - private EventBus eventBus; - @Override public void configure(Binder binder) { @@ -89,7 +86,6 @@ public class InstanceMapPlugin extends Plugin @Override protected void startUp() throws Exception { - addSubscriptions(); overlayManager.add(overlay); addCustomOptions(); @@ -101,8 +97,6 @@ public class InstanceMapPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlay.setShowMap(false); overlayManager.remove(overlay); removeCustomOptions(); @@ -111,12 +105,7 @@ public class InstanceMapPlugin extends Plugin mouseManager.unregisterMouseWheelListener(inputListener); } - private void addSubscriptions() - { - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(WidgetMenuOptionClicked.class, this, this::onWidgetMenuOptionClicked); - } - +@Subscribe private void onGameStateChanged(GameStateChanged event) { overlay.onGameStateChange(event); @@ -127,6 +116,7 @@ public class InstanceMapPlugin extends Plugin return event.getMenuOption().equals(widgetMenuOption.getMenuOption()) && event.getMenuTarget().equals(widgetMenuOption.getMenuTarget()); } + @Subscribe private void onWidgetMenuOptionClicked(WidgetMenuOptionClicked event) { if (event.getWidget() != WORLD_MAP_OPTION) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java index 79ca146fa9..8b43d5793d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java @@ -44,7 +44,7 @@ import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.SpriteManager; import net.runelite.client.plugins.Plugin; @@ -73,9 +73,6 @@ public class InterfaceStylesPlugin extends Plugin @Inject private SpriteManager spriteManager; - @Inject - private EventBus eventBus; - private Sprite[] defaultCrossSprites; private Skin skin; @@ -93,15 +90,12 @@ public class InterfaceStylesPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); clientThread.invoke(this::updateAllOverrides); } @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - clientThread.invoke(() -> { restoreWidgetDimensions(); @@ -111,15 +105,7 @@ public class InterfaceStylesPlugin extends Plugin }); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(WidgetPositioned.class, this, this::onWidgetPositioned); - eventBus.subscribe(PostHealthBar.class, this, this::onPostHealthBar); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(BeforeMenuRender.class, this, this::onBeforeMenuRender); - } - +@Subscribe private void onConfigChanged(ConfigChanged config) { if (config.getGroup().equals("interfaceStyles")) @@ -129,11 +115,13 @@ public class InterfaceStylesPlugin extends Plugin } } + @Subscribe private void onWidgetPositioned(WidgetPositioned widgetPositioned) { adjustWidgetDimensions(); } + @Subscribe private void onPostHealthBar(PostHealthBar postHealthBar) { if (!this.hdHealthBars) @@ -152,6 +140,7 @@ public class InterfaceStylesPlugin extends Plugin } } + @Subscribe private void onGameStateChanged(GameStateChanged gameStateChanged) { if (gameStateChanged.getGameState() != GameState.LOGIN_SCREEN) @@ -178,6 +167,7 @@ public class InterfaceStylesPlugin extends Plugin overrideCrossSprites(); } + @Subscribe private void onBeforeMenuRender(BeforeMenuRender event) { if (this.hdMenu) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridPlugin.java index 7ad9236043..2abecac755 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridPlugin.java @@ -32,7 +32,7 @@ import java.awt.Color; import lombok.AccessLevel; import lombok.Getter; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -56,9 +56,6 @@ public class InventoryGridPlugin extends Plugin @Inject private InventoryGridConfig config; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) private boolean showItem; @Getter(AccessLevel.PACKAGE) @@ -76,16 +73,12 @@ public class InventoryGridPlugin extends Plugin public void startUp() { updateConfig(); - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - overlayManager.add(overlay); } @Override public void shutDown() { - eventBus.unregister(this); - overlayManager.remove(overlay); } @@ -95,6 +88,7 @@ public class InventoryGridPlugin extends Plugin return configManager.getConfig(InventoryGridConfig.class); } + @Subscribe private void onConfigChanged(ConfigChanged config) { if (config.getGroup().equals("inventorygrid")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java index 15ca061026..a1e28130b2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorysetups/InventorySetupPlugin.java @@ -53,7 +53,7 @@ import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.ItemContainerChanged; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.ItemManager; import net.runelite.client.game.ItemVariationMapping; @@ -104,9 +104,6 @@ public class InventorySetupPlugin extends Plugin @Inject private ClientThread clientThread; - @Inject - private EventBus eventBus; - @Inject private ConfigManager configManager; @@ -134,7 +131,6 @@ public class InventorySetupPlugin extends Plugin public void startUp() { updateConfigOptions(); - addSubscriptions(); overlayManager.add(overlay); @@ -261,6 +257,7 @@ public class InventorySetupPlugin extends Plugin return configManager.getConfig(InventorySetupConfig.class); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals(CONFIG_GROUP)) @@ -301,7 +298,9 @@ public class InventorySetupPlugin extends Plugin { // TODO add last resort?, serialize exception just make empty map final Gson gson = new Gson(); - Type type = new TypeToken>() {}.getType(); + Type type = new TypeToken>() + { + }.getType(); inventorySetups.clear(); inventorySetups.putAll(gson.fromJson(json, type)); } @@ -313,6 +312,7 @@ public class InventorySetupPlugin extends Plugin } + @Subscribe private void onItemContainerChanged(ItemContainerChanged event) { @@ -346,6 +346,7 @@ public class InventorySetupPlugin extends Plugin } + @Subscribe private void onGameStateChanged(GameStateChanged event) { switch (event.getGameState()) @@ -413,11 +414,6 @@ public class InventorySetupPlugin extends Plugin return newContainer; } - public final InventorySetupConfig getConfig() - { - return config; - } - public boolean getHighlightDifference() { return highlightDifference; @@ -426,19 +422,11 @@ public class InventorySetupPlugin extends Plugin @Override public void shutDown() { - eventBus.unregister(this); overlayManager.remove(overlay); clientToolbar.removeNavigation(navButton); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(ItemContainerChanged.class, this, this::onItemContainerChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - } - - final int[] getCurrentInventorySetupIds() +final int[] getCurrentInventorySetupIds() { InventorySetup setup = inventorySetups.get(panel.getSelectedInventorySetup()); if (setup == null) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsPlugin.java index 8db657806d..fd91efef99 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorytags/InventoryTagsPlugin.java @@ -39,7 +39,7 @@ import net.runelite.api.events.WidgetMenuOptionClicked; import net.runelite.api.util.Text; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.menus.MenuManager; import net.runelite.client.menus.WidgetMenuOption; @@ -106,9 +106,6 @@ public class InventoryTagsPlugin extends Plugin @Inject private OverlayManager overlayManager; - @Inject - private EventBus eventBus; - private boolean editorMode; private InventoryTagsConfig.amount amount; @@ -152,7 +149,6 @@ public class InventoryTagsPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); refreshInventoryMenuOptions(); overlayManager.add(overlay); @@ -161,21 +157,12 @@ public class InventoryTagsPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - removeInventoryMenuOptions(); overlayManager.remove(overlay); editorMode = false; } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(WidgetMenuOptionClicked.class, this, this::onWidgetMenuOptionClicked); - eventBus.subscribe(MenuOptionClicked.class, this, this::onMenuOptionClicked); - eventBus.subscribe(MenuOpened.class, this, this::onMenuOpened); - } - +@Subscribe private void onWidgetMenuOptionClicked(final WidgetMenuOptionClicked event) { if (event.getWidget() == WidgetInfo.FIXED_VIEWPORT_INVENTORY_TAB @@ -187,6 +174,7 @@ public class InventoryTagsPlugin extends Plugin } } + @Subscribe private void onMenuOptionClicked(final MenuOptionClicked event) { if (event.getMenuOpcode() != MenuOpcode.RUNELITE) @@ -206,6 +194,7 @@ public class InventoryTagsPlugin extends Plugin } } + @Subscribe private void onMenuOpened(final MenuOpened event) { final MenuEntry firstEntry = event.getFirstEntry(); @@ -305,6 +294,7 @@ public class InventoryTagsPlugin extends Plugin } } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("inventorytags")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerPlugin.java index a0ec9a957b..9e1b7b6252 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventoryviewer/InventoryViewerPlugin.java @@ -30,7 +30,7 @@ import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -56,9 +56,6 @@ public class InventoryViewerPlugin extends Plugin @Inject private InventoryViewerConfig config; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) private InventoryViewerMode viewerMode; @Getter(AccessLevel.PACKAGE) @@ -76,11 +73,10 @@ public class InventoryViewerPlugin extends Plugin public void startUp() { updateConfig(); - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - overlayManager.add(overlay); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals(CONFIG_GROUP_KEY)) @@ -92,8 +88,6 @@ public class InventoryViewerPlugin extends Plugin @Override public void shutDown() { - eventBus.unregister(this); - overlayManager.remove(overlay); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java index 1d37a29763..060907e172 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemcharges/ItemChargePlugin.java @@ -57,7 +57,7 @@ import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.Notifier; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.ItemManager; import net.runelite.client.plugins.Plugin; @@ -168,9 +168,6 @@ public class ItemChargePlugin extends Plugin @Inject private ItemChargeConfig config; - @Inject - private EventBus eventBus; - // Limits destroy callback to once per tick private int lastCheckTick; @@ -247,7 +244,6 @@ public class ItemChargePlugin extends Plugin protected void startUp() { updateConfig(); - addSubscriptions(); overlayManager.add(overlay); overlayManager.add(recoilOverlay); @@ -257,25 +253,13 @@ public class ItemChargePlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(overlay); overlayManager.remove(recoilOverlay); infoBoxManager.removeIf(ItemChargeInfobox.class::isInstance); lastCheckTick = -1; } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(ChatMessage.class, this, this::onChatMessage); - eventBus.subscribe(ItemContainerChanged.class, this, this::onItemContainerChanged); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(SpotAnimationChanged.class, this, this::onSpotAnimationChanged); - eventBus.subscribe(ScriptCallbackEvent.class, this, this::onScriptCallbackEvent); - eventBus.subscribe(VarbitChanged.class, this, this::onVarbitChanged); - } - +@Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("itemCharge")) @@ -328,6 +312,7 @@ public class ItemChargePlugin extends Plugin } } + @Subscribe void onChatMessage(ChatMessage event) { String message = event.getMessage(); @@ -490,6 +475,7 @@ public class ItemChargePlugin extends Plugin } } + @Subscribe private void onItemContainerChanged(ItemContainerChanged event) { if (event.getItemContainer() != client.getItemContainer(InventoryID.EQUIPMENT) || !this.showInfoboxes) @@ -536,6 +522,7 @@ public class ItemChargePlugin extends Plugin } } + @Subscribe private void onGameTick(GameTick event) { Widget braceletBreakWidget = client.getWidget(WidgetInfo.DIALOG_SPRITE_TEXT); @@ -635,6 +622,7 @@ public class ItemChargePlugin extends Plugin } } + @Subscribe private void onSpotAnimationChanged(SpotAnimationChanged event) { if (event.getActor() == client.getLocalPlayer() && client.getLocalPlayer().getSpotAnimation() == GraphicID.XERIC_TELEPORT) @@ -644,6 +632,7 @@ public class ItemChargePlugin extends Plugin } } + @Subscribe private void onScriptCallbackEvent(ScriptCallbackEvent event) { if (!"destroyOnOpKey".equals(event.getEventName())) @@ -658,6 +647,7 @@ public class ItemChargePlugin extends Plugin } } + @Subscribe private void onVarbitChanged(VarbitChanged event) { int explorerRingCharge = client.getVar(Varbits.EXPLORER_RING_ALCHS); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationPlugin.java index 98e043e30c..a8a246ae4a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentificationPlugin.java @@ -31,7 +31,7 @@ import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -54,9 +54,6 @@ public class ItemIdentificationPlugin extends Plugin @Inject private ItemIdentificationConfig config; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) private ItemIdentificationMode identificationType; @Getter(AccessLevel.PACKAGE) @@ -82,19 +79,16 @@ public class ItemIdentificationPlugin extends Plugin protected void startUp() { updateConfig(); - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - overlayManager.add(overlay); } @Override protected void shutDown() { - eventBus.unregister(this); - overlayManager.remove(overlay); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("itemidentification")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesPlugin.java index a2673d8ad6..23e3fb3524 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesPlugin.java @@ -30,7 +30,7 @@ import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -54,9 +54,6 @@ public class ItemPricesPlugin extends Plugin @Inject private ItemPricesConfig config; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) private boolean showGEPrice; @Getter(AccessLevel.PACKAGE) @@ -80,18 +77,16 @@ public class ItemPricesPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - overlayManager.add(overlay); } @Override protected void shutDown() throws Exception { - eventBus.unregister(this); overlayManager.remove(overlay); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("itemprices")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPlugin.java index 6cbee4b19e..9674bc001b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPlugin.java @@ -59,7 +59,7 @@ import net.runelite.api.vars.AccountType; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.api.widgets.WidgetType; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.game.ItemManager; import net.runelite.client.game.ItemMapping; import net.runelite.client.game.ItemReclaimCost; @@ -116,9 +116,6 @@ public class ItemsKeptOnDeathPlugin extends Plugin @Inject private ItemManager itemManager; - @Inject - private EventBus eventBus; - private WidgetButton deepWildyButton; private WidgetButton lowWildyButton; @@ -132,15 +129,14 @@ public class ItemsKeptOnDeathPlugin extends Plugin @Override protected void startUp() throws Exception { - eventBus.subscribe(ScriptCallbackEvent.class, this, this::onScriptCallbackEvent); } @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - } + } + @Subscribe private void onScriptCallbackEvent(ScriptCallbackEvent event) { if (event.getEventName().equals("itemsKeptOnDeath")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatPlugin.java index 3a26a30d43..b3a8c6e814 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatPlugin.java @@ -47,7 +47,6 @@ import net.runelite.api.ItemID; import net.runelite.api.SpriteID; import net.runelite.api.VarPlayer; import net.runelite.api.Varbits; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.ScriptCallbackEvent; import net.runelite.api.events.VarbitChanged; @@ -58,7 +57,8 @@ import net.runelite.api.widgets.WidgetTextAlignment; import net.runelite.api.widgets.WidgetType; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.ItemManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -98,9 +98,6 @@ public class ItemStatPlugin extends Plugin @Inject private ClientThread clientThread; - @Inject - private EventBus eventBus; - private Widget itemInformationTitle; @Getter(AccessLevel.PACKAGE) @@ -143,27 +140,17 @@ public class ItemStatPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); overlayManager.add(overlay); } @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(overlay); clientThread.invokeLater(this::resetGEInventory); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(VarbitChanged.class, this, this::onVarbitChanged); - eventBus.subscribe(ScriptCallbackEvent.class, this, this::onScriptCallbackEvent); - } - +@Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getKey().equals("geStats")) @@ -173,6 +160,7 @@ public class ItemStatPlugin extends Plugin } } + @Subscribe private void onGameTick(GameTick event) { if (itemInformationTitle != null && this.geStats @@ -184,6 +172,7 @@ public class ItemStatPlugin extends Plugin } + @Subscribe private void onVarbitChanged(VarbitChanged event) { if (client.getVar(VarPlayer.CURRENT_GE_ITEM) == -1 && this.geStats) @@ -192,6 +181,7 @@ public class ItemStatPlugin extends Plugin } } + @Subscribe private void onScriptCallbackEvent(ScriptCallbackEvent event) { if (event.getEventName().equals("geBuilt") && this.geStats) @@ -386,7 +376,7 @@ public class ItemStatPlugin extends Plugin } private static Widget createText(Widget parent, String text, int fontId, int textColor, - int x, int y, int width, int height) + int x, int y, int width, int height) { final Widget widget = parent.createChild(-1, WidgetType.TEXT); widget.setText(text); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java index 43ae6b1e26..3a5af0bb65 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingPlugin.java @@ -44,7 +44,7 @@ import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; import net.runelite.client.config.ModifierlessKeybind; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.input.KeyManager; import net.runelite.client.plugins.Plugin; @@ -80,9 +80,6 @@ public class KeyRemappingPlugin extends Plugin @Inject private KeyRemappingListener inputListener; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) @Setter(AccessLevel.PACKAGE) private boolean typing; @@ -131,7 +128,6 @@ public class KeyRemappingPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); typing = false; keyManager.registerKeyListener(inputListener); @@ -150,8 +146,6 @@ public class KeyRemappingPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - clientThread.invoke(() -> { if (client.getGameState() == GameState.LOGGED_IN) @@ -163,13 +157,7 @@ public class KeyRemappingPlugin extends Plugin keyManager.unregisterKeyListener(inputListener); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(ScriptCallbackEvent.class, this, this::onScriptCallbackEvent); - } - - @Provides +@Provides KeyRemappingConfig getConfig(ConfigManager configManager) { return configManager.getConfig(KeyRemappingConfig.class); @@ -209,6 +197,7 @@ public class KeyRemappingPlugin extends Plugin return w == null || w.isSelfHidden(); } + @Subscribe private void onConfigChanged(ConfigChanged configChanged) { if (!configChanged.getGroup().equals("keyremapping")) @@ -229,6 +218,7 @@ public class KeyRemappingPlugin extends Plugin ); } + @Subscribe private void onScriptCallbackEvent(ScriptCallbackEvent scriptCallbackEvent) { switch (scriptCallbackEvent.getEventName()) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomPlugin.java index 659b997bbf..411de2d1ea 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomPlugin.java @@ -47,7 +47,7 @@ import net.runelite.client.chat.ChatMessageBuilder; import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.chat.QueuedMessage; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.ItemManager; import net.runelite.client.plugins.Plugin; @@ -84,9 +84,6 @@ public class KingdomPlugin extends Plugin @Inject private ItemManager itemManager; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) private int favor = 0, coffer = 0; @@ -105,30 +102,22 @@ public class KingdomPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); } @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - removeKingdomInfobox(); } - private void addSubscriptions() - { - eventBus.subscribe(VarbitChanged.class, this, this::onVarbitChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - } - +@Subscribe private void onVarbitChanged(VarbitChanged event) { updateKingdomVarbits(); processInfobox(); } + @Subscribe public void onGameStateChanged(GameStateChanged event) { @@ -144,6 +133,7 @@ public class KingdomPlugin extends Plugin } } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("kingdomofmiscellania")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java index 0f6e8c0e10..0969d1167c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java @@ -46,14 +46,14 @@ import net.runelite.api.Player; import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.AnimationChanged; import net.runelite.api.events.ChatMessage; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.ItemContainerChanged; import net.runelite.api.events.MenuOptionClicked; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.ItemManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -98,9 +98,6 @@ public class KourendLibraryPlugin extends Plugin @Inject private ItemManager itemManager; - @Inject - private EventBus eventBus; - private KourendLibraryPanel panel; private NavigationButton navButton; private boolean buttonAttached = false; @@ -121,7 +118,6 @@ public class KourendLibraryPlugin extends Plugin @Override protected void startUp() throws Exception { - addSubscriptions(); hideButton = config.hideButton(); hideDuplicateBook = config.hideDuplicateBook(); @@ -153,8 +149,6 @@ public class KourendLibraryPlugin extends Plugin @Override protected void shutDown() { - eventBus.unregister(this); - overlay.setHidden(true); overlayManager.remove(overlay); clientToolbar.removeNavigation(navButton); @@ -164,16 +158,7 @@ public class KourendLibraryPlugin extends Plugin playerBooks = null; } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(MenuOptionClicked.class, this, this::onMenuOptionClicked); - eventBus.subscribe(AnimationChanged.class, this, this::onAnimationChanged); - eventBus.subscribe(ChatMessage.class, this, this::onChatMessage); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(ItemContainerChanged.class, this, this::onItemContainerChanged); - } - +@Subscribe private void onConfigChanged(ConfigChanged ev) { if (!KourendLibraryConfig.GROUP_KEY.equals(ev.getGroup())) @@ -206,6 +191,7 @@ public class KourendLibraryPlugin extends Plugin }); } + @Subscribe private void onMenuOptionClicked(MenuOptionClicked menuOpt) { if (MenuOpcode.GAME_OBJECT_FIRST_OPTION == menuOpt.getMenuOpcode() && menuOpt.getTarget().contains("Bookshelf")) @@ -215,6 +201,7 @@ public class KourendLibraryPlugin extends Plugin } } + @Subscribe private void onAnimationChanged(AnimationChanged anim) { if (anim.getActor() == client.getLocalPlayer() && anim.getActor().getAnimation() == AnimationID.LOOKING_INTO) @@ -223,6 +210,7 @@ public class KourendLibraryPlugin extends Plugin } } + @Subscribe private void onChatMessage(ChatMessage event) { if (lastBookcaseAnimatedOn != null && event.getType() == ChatMessageType.GAMEMESSAGE) @@ -236,6 +224,7 @@ public class KourendLibraryPlugin extends Plugin } } + @Subscribe private void onGameTick(GameTick tick) { boolean inRegion = client.getLocalPlayer().getWorldLocation().getRegionID() == REGION; @@ -307,6 +296,7 @@ public class KourendLibraryPlugin extends Plugin } } + @Subscribe private void onItemContainerChanged(ItemContainerChanged itemContainerChangedEvent) { updatePlayerBooks(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/learntoclick/LearnToClickPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/learntoclick/LearnToClickPlugin.java index 22b9309db6..85f4465fca 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/learntoclick/LearnToClickPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/learntoclick/LearnToClickPlugin.java @@ -23,7 +23,7 @@ import net.runelite.api.events.WidgetLoaded; import net.runelite.api.widgets.WidgetID; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -50,9 +50,6 @@ public class LearnToClickPlugin extends Plugin @Inject private Client client; - @Inject - private EventBus eventBus; - private boolean shouldBlockCompass; private boolean shouldRightClickMap; private boolean shouldRightClickXp; @@ -69,26 +66,16 @@ public class LearnToClickPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); } @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - forceRightClickFlag = false; hideOrbWidgets(false); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(WidgetLoaded.class, this, this::onWidgetLoaded); - eventBus.subscribe(MenuShouldLeftClick.class, this, this::onMenuShouldLeftClick); - eventBus.subscribe(MenuEntryAdded.class, this, this::onMenuEntryAdded); - } - +@Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("learntoclick")) @@ -109,6 +96,7 @@ public class LearnToClickPlugin extends Plugin } + @Subscribe private void onWidgetLoaded(WidgetLoaded event) { if (!this.hideOrbs) @@ -121,6 +109,7 @@ public class LearnToClickPlugin extends Plugin } } + @Subscribe private void onMenuShouldLeftClick(MenuShouldLeftClick event) { if (!forceRightClickFlag) @@ -142,6 +131,7 @@ public class LearnToClickPlugin extends Plugin } } + @Subscribe private void onMenuEntryAdded(MenuEntryAdded event) { if ((event.getOption().equals("Floating") && this.shouldRightClickMap) || (event.getOption().equals("Hide") @@ -167,6 +157,7 @@ public class LearnToClickPlugin extends Plugin /** * Toggles hiding the World map and special attack orb widgets + * * @param hidden - hides the Widgets if true, un-hides them if false */ private void hideOrbWidgets(boolean hidden) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java index e34634e155..93db88bf99 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/lizardmenshaman/LizardmenShamanPlugin.java @@ -39,7 +39,7 @@ import net.runelite.api.events.AnimationChanged; import net.runelite.api.events.ChatMessage; import net.runelite.client.Notifier; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -75,9 +75,6 @@ public class LizardmenShamanPlugin extends Plugin @Inject private Notifier notifier; - @Inject - private EventBus eventBus; - private boolean showTimer; private boolean notifyOnSpawn; @@ -90,7 +87,6 @@ public class LizardmenShamanPlugin extends Plugin @Override protected void startUp() throws Exception { - addSubscriptions(); this.showTimer = config.showTimer(); this.notifyOnSpawn = config.notifyOnSpawn(); @@ -101,19 +97,11 @@ public class LizardmenShamanPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(overlay); spawns.clear(); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(ChatMessage.class, this, this::onChatMessage); - eventBus.subscribe(AnimationChanged.class, this, this::onAnimationChanged); - } - +@Subscribe private void onChatMessage(ChatMessage event) { if (this.notifyOnSpawn && /* event.getType() == ChatMessageType.GAMEMESSAGE && */event.getMessage().contains(MESSAGE)) @@ -123,6 +111,7 @@ public class LizardmenShamanPlugin extends Plugin } } + @Subscribe private void onAnimationChanged(AnimationChanged event) { Actor actor = event.getActor(); @@ -137,6 +126,7 @@ public class LizardmenShamanPlugin extends Plugin } } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("shaman")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loginscreen/LoginScreenPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/loginscreen/LoginScreenPlugin.java index 7268b979c8..11e9132a90 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loginscreen/LoginScreenPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loginscreen/LoginScreenPlugin.java @@ -38,7 +38,7 @@ import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.events.GameStateChanged; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.events.SessionOpen; import net.runelite.client.input.KeyListener; @@ -67,9 +67,6 @@ public class LoginScreenPlugin extends Plugin implements KeyListener @Inject private KeyManager keyManager; - @Inject - private EventBus eventBus; - private String usernameCache; private boolean syncUsername; @@ -80,7 +77,6 @@ public class LoginScreenPlugin extends Plugin implements KeyListener protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); client.setHideDisconnect(config.hideDisconnected()); @@ -91,8 +87,6 @@ public class LoginScreenPlugin extends Plugin implements KeyListener @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - if (this.syncUsername) { client.getPreferences().setRememberedUsername(usernameCache); @@ -103,19 +97,13 @@ public class LoginScreenPlugin extends Plugin implements KeyListener keyManager.unregisterKeyListener(this); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(SessionOpen.class, this, this::onSessionOpen); - } - - @Provides +@Provides LoginScreenConfig getConfig(ConfigManager configManager) { return configManager.getConfig(LoginScreenConfig.class); } + @Subscribe private void onGameStateChanged(GameStateChanged event) { if (!this.syncUsername) @@ -147,6 +135,7 @@ public class LoginScreenPlugin extends Plugin implements KeyListener } } + @Subscribe private void onSessionOpen(SessionOpen event) { // configuation for the account is available now, so update the username @@ -240,6 +229,7 @@ public class LoginScreenPlugin extends Plugin implements KeyListener } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("loginscreen")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistPlugin.java index 4e5215656a..1feba44130 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/lootassist/LootAssistPlugin.java @@ -9,7 +9,7 @@ import net.runelite.api.Player; import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.AnimationChanged; import net.runelite.api.events.GameStateChanged; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginType; @@ -31,15 +31,11 @@ public class LootAssistPlugin extends Plugin @Inject private LootAssistOverlay lootAssistOverlay; - @Inject - private EventBus eventBus; - static final ConcurrentHashMap lootPiles = new ConcurrentHashMap<>(); @Override protected void startUp() throws Exception { - addSubscriptions(); overlayManager.add(lootAssistOverlay); } @@ -47,23 +43,17 @@ public class LootAssistPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - lootPiles.clear(); overlayManager.remove(lootAssistOverlay); } - private void addSubscriptions() - { - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(AnimationChanged.class, this, this::onAnimationChanged); - } - +@Subscribe private void onGameStateChanged(GameStateChanged event) { lootPiles.clear(); } + @Subscribe private void onAnimationChanged(AnimationChanged event) { final Actor actor = event.getActor(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerPlugin.java index 0ede751f08..84af3c94be 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/lootingbagviewer/LootingBagViewerPlugin.java @@ -39,7 +39,7 @@ import net.runelite.api.events.WidgetHiddenChanged; import net.runelite.api.widgets.Widget; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -47,11 +47,11 @@ import net.runelite.client.plugins.PluginType; import net.runelite.client.ui.overlay.OverlayManager; @PluginDescriptor( - name = "PvP Looting Bag Viewer", - description = "Add an overlay showing the contents of your looting bag", - tags = {"alternate", "items", "overlay", "second"}, - type = PluginType.PVP, - enabledByDefault = false + name = "PvP Looting Bag Viewer", + description = "Add an overlay showing the contents of your looting bag", + tags = {"alternate", "items", "overlay", "second"}, + type = PluginType.PVP, + enabledByDefault = false ) /** * TODO: Remember current looting bag value when client restarts @@ -80,9 +80,6 @@ public class LootingBagViewerPlugin extends Plugin @Inject private LootingBagViewerConfig config; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) @Setter(AccessLevel.PACKAGE) private int valueToShow = -1; @@ -96,7 +93,6 @@ public class LootingBagViewerPlugin extends Plugin @Override public void startUp() { - addSubscriptions(); if (config.renderViewer()) { @@ -112,18 +108,11 @@ public class LootingBagViewerPlugin extends Plugin @Override public void shutDown() { - eventBus.unregister(this); - overlayManager.remove(overlay); overlayManager.remove(widgetOverlay); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(WidgetHiddenChanged.class, this, this::onWidgetHiddenChanged); - } - +@Subscribe private void onConfigChanged(ConfigChanged configChanged) { if (configChanged.getKey().equals("renderViewer")) @@ -154,6 +143,7 @@ public class LootingBagViewerPlugin extends Plugin /** * @param widgetHiddenChanged */ + @Subscribe private void onWidgetHiddenChanged(WidgetHiddenChanged widgetHiddenChanged) { Widget widget = widgetHiddenChanged.getWidget(); @@ -166,17 +156,17 @@ public class LootingBagViewerPlugin extends Plugin if (!Strings.isNullOrEmpty(value.getText())) { - if (value.getText().equals("Value: -")) + if (value.getText().equals("Value: -")) { setValueToShow(-1); - } - else + } + else { String str = value.getText(); str = str.replace("Bag value: ", "") - .replace("Value: ", "") - .replace(" coins", "") - .replace(",", ""); + .replace("Value: ", "") + .replace(" coins", "") + .replace(",", ""); int val = Integer.parseInt(str); setValueToShow(Math.round(val) / 1000); @@ -186,4 +176,4 @@ public class LootingBagViewerPlugin extends Plugin } } -} +} diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java index b4e3d9795c..8be1ee7199 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java @@ -79,7 +79,6 @@ import net.runelite.api.Varbits; import net.runelite.api.WorldType; import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.ChatMessage; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.ItemContainerChanged; import net.runelite.api.events.LocalPlayerDeath; @@ -103,7 +102,8 @@ import static net.runelite.client.database.data.Tables.LOOTTRACKEREVENTS; import static net.runelite.client.database.data.Tables.LOOTTRACKERLINK; import static net.runelite.client.database.data.Tables.LOOTTRACKERLOOT; import static net.runelite.client.database.data.Tables.USER; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.events.NpcLootReceived; import net.runelite.client.events.PlayerLootReceived; import net.runelite.client.events.SessionClose; @@ -224,8 +224,6 @@ public class LootTrackerPlugin extends Plugin @Inject private ScheduledExecutorService executor; @Inject - private EventBus eventBus; - @Inject private LootRecordWriter writer; @Inject private DatabaseManager databaseManager; @@ -299,6 +297,7 @@ public class LootTrackerPlugin extends Plugin return configManager.getConfig(LootTrackerConfig.class); } + @Subscribe private void onSessionOpen(SessionOpen sessionOpen) { AccountSession accountSession = sessionManager.getAccountSession(); @@ -312,12 +311,14 @@ public class LootTrackerPlugin extends Plugin } } + @Subscribe private void onSessionClose(SessionClose sessionClose) { submitLoot(); lootTrackerClient = null; } + @Subscribe private void onLocalPlayerDeath(LocalPlayerDeath event) { if (client.getVar(Varbits.IN_WILDERNESS) == 1 || WorldType.isPvpWorld(client.getWorldType())) @@ -327,6 +328,7 @@ public class LootTrackerPlugin extends Plugin } } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("loottracker")) @@ -355,7 +357,6 @@ public class LootTrackerPlugin extends Plugin @Override protected void startUp() throws Exception { - addSubscriptions(); ignoredItems = Text.fromCSV(config.getIgnoredItems()); ignoredNPCs = Text.fromCSV(config.getIgnoredNPCs()); @@ -483,7 +484,6 @@ public class LootTrackerPlugin extends Plugin @Override protected void shutDown() { - eventBus.unregister(this); submitLoot(); clientToolbar.removeNavigation(navButton); @@ -492,22 +492,7 @@ public class LootTrackerPlugin extends Plugin chestLooted = false; } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(SessionOpen.class, this, this::onSessionOpen); - eventBus.subscribe(SessionClose.class, this, this::onSessionClose); - eventBus.subscribe(LocalPlayerDeath.class, this, this::onLocalPlayerDeath); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(NpcLootReceived.class, this, this::onNpcLootReceived); - eventBus.subscribe(PlayerSpawned.class, this, this::onPlayerSpawned); - eventBus.subscribe(PlayerLootReceived.class, this, this::onPlayerLootReceived); - eventBus.subscribe(WidgetLoaded.class, this, this::onWidgetLoaded); - eventBus.subscribe(ChatMessage.class, this, this::onChatMessage); - eventBus.subscribe(ItemContainerChanged.class, this, this::onItemContainerChanged); - eventBus.subscribe(MenuOptionClicked.class, this, this::onMenuOptionClicked); - } - +@Subscribe private void onGameStateChanged(final GameStateChanged event) { if (client.getLocalPlayer() == null) @@ -552,6 +537,7 @@ public class LootTrackerPlugin extends Plugin } } + @Subscribe private void onNpcLootReceived(final NpcLootReceived npcLootReceived) { if (client.getLocalPlayer() == null) @@ -620,6 +606,7 @@ public class LootTrackerPlugin extends Plugin writer.addLootTrackerRecord(record); } + @Subscribe private void onPlayerSpawned(PlayerSpawned event) { if (event.getPlayer().equals(client.getLocalPlayer())) @@ -628,6 +615,7 @@ public class LootTrackerPlugin extends Plugin } } + @Subscribe private void onPlayerLootReceived(final PlayerLootReceived playerLootReceived) { if (client.getLocalPlayer() == null) @@ -680,6 +668,7 @@ public class LootTrackerPlugin extends Plugin writer.addLootTrackerRecord(record); } + @Subscribe private void onWidgetLoaded(WidgetLoaded event) { if (client.getLocalPlayer() == null) @@ -804,6 +793,7 @@ public class LootTrackerPlugin extends Plugin writer.addLootTrackerRecord(record); } + @Subscribe private void onChatMessage(ChatMessage event) { if (client.getLocalPlayer() == null) @@ -950,6 +940,7 @@ public class LootTrackerPlugin extends Plugin } @SuppressWarnings("unchecked") + @Subscribe public void onItemContainerChanged(ItemContainerChanged event) { if (client.getLocalPlayer() == null) @@ -1022,6 +1013,7 @@ public class LootTrackerPlugin extends Plugin } } + @Subscribe private void onMenuOptionClicked(MenuOptionClicked event) { if (event.getParam1() != WidgetInfo.INVENTORY.getId()) @@ -1451,7 +1443,9 @@ public class LootTrackerPlugin extends Plugin try { Collection lootRecords = new ArrayList<>(RuneLiteAPI.GSON.fromJson(new FileReader(LOOT_RECORDS_FILE), - new TypeToken>() {}.getType())); + new TypeToken>() + { + }.getType())); DSLContext dslContext = databaseManager.getDsl(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/lowmemory/LowMemoryPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/lowmemory/LowMemoryPlugin.java index 9129c18ad1..a2051838aa 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/lowmemory/LowMemoryPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/lowmemory/LowMemoryPlugin.java @@ -30,6 +30,7 @@ import net.runelite.api.GameState; import net.runelite.api.events.GameStateChanged; import net.runelite.client.callback.ClientThread; import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -67,6 +68,7 @@ public class LowMemoryPlugin extends Plugin clientThread.invoke(() -> client.changeMemoryMode(false)); } + @Subscribe private void onGameStateChanged(GameStateChanged event) { // When the client starts it initializes the texture size based on the memory mode setting. diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/MaxHitPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/MaxHitPlugin.java index f048217c75..c9f53ed68f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/MaxHitPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/maxhit/MaxHitPlugin.java @@ -34,8 +34,7 @@ import net.runelite.api.events.ItemContainerChanged; import net.runelite.api.events.VarbitChanged; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; -import net.runelite.client.eventbus.EventBus; -import net.runelite.client.events.ConfigChanged; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginType; @@ -56,38 +55,23 @@ public class MaxHitPlugin extends Plugin @Inject private Client client; - @Inject - private EventBus eventBus; - @Override protected void startUp() throws Exception { - addSubscriptions(); } @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - } - - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(ItemContainerChanged.class, this, this::onItemContainerChanged); - eventBus.subscribe(VarbitChanged.class, this, this::onVarbitChanged); - } + } +@Subscribe private void onItemContainerChanged(final ItemContainerChanged event) { this.updateMaxHitWidget(); } - private void onConfigChanged(final ConfigChanged event) - { - this.updateMaxHitWidget(); - } - + @Subscribe private void onVarbitChanged(VarbitChanged event) { this.updateMaxHitWidget(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java index 77739bfe2f..5241ebd98c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java @@ -62,7 +62,6 @@ import static net.runelite.api.Varbits.WITHDRAW_X_AMOUNT; import net.runelite.api.WorldType; import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.ClientTick; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.FocusChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.Menu; @@ -79,6 +78,8 @@ import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; import net.runelite.client.config.Keybind; import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.input.KeyManager; import net.runelite.client.menus.AbstractComparableEntry; import static net.runelite.client.menus.ComparableEntries.newBankComparableEntry; @@ -317,7 +318,10 @@ public class MenuEntrySwapperPlugin extends Plugin migrateConfig(); updateConfig(); - addSubscriptions(); + if (config.lastJewel()) + { + eventBus.subscribe(MenuOptionClicked.class, JEWEL_CLICKED, this::onMenuOptionClicked); + } addSwaps(); loadConstructionItems(); loadCustomSwaps(config.customSwaps(), customSwaps); @@ -341,8 +345,6 @@ public class MenuEntrySwapperPlugin extends Plugin @Override public void shutDown() { - eventBus.unregister(this); - loadCustomSwaps("", customSwaps); // Removes all custom swaps removeSwaps(); removeBuySellEntries(); @@ -358,21 +360,7 @@ public class MenuEntrySwapperPlugin extends Plugin } } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(VarbitChanged.class, this, this::onVarbitChanged); - eventBus.subscribe(MenuOpened.class, this, this::onMenuOpened); - eventBus.subscribe(MenuEntryAdded.class, this, this::onMenuEntryAdded); - eventBus.subscribe(FocusChanged.class, this, this::onFocusChanged); - - if (config.lastJewel()) - { - eventBus.subscribe(MenuOptionClicked.class, JEWEL_CLICKED, this::onMenuOptionClicked); - } - } - +@Subscribe private void onFocusChanged(FocusChanged event) { if (!event.isFocused()) @@ -382,6 +370,7 @@ public class MenuEntrySwapperPlugin extends Plugin } } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!"menuentryswapper".equals(event.getGroup())) @@ -452,6 +441,7 @@ public class MenuEntrySwapperPlugin extends Plugin } } + @Subscribe private void onGameStateChanged(GameStateChanged event) { if (event.getGameState() != GameState.LOGGED_IN) @@ -466,6 +456,7 @@ public class MenuEntrySwapperPlugin extends Plugin keyManager.registerKeyListener(hotkey); } + @Subscribe private void onVarbitChanged(VarbitChanged event) { buildingMode = client.getVar(BUILDING_MODE) == 1; @@ -474,6 +465,7 @@ public class MenuEntrySwapperPlugin extends Plugin setCastOptions(false); } + @Subscribe private void onMenuOpened(MenuOpened event) { Player localPlayer = client.getLocalPlayer(); @@ -581,6 +573,7 @@ public class MenuEntrySwapperPlugin extends Plugin event.setModified(); } + @Subscribe public void onMenuEntryAdded(MenuEntryAdded event) { if (client.getGameState() != GameState.LOGGED_IN) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java index b0eede90ad..e7626397cf 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/metronome/MetronomePlugin.java @@ -42,7 +42,7 @@ import net.runelite.api.SoundEffectID; import net.runelite.api.SoundEffectVolume; import net.runelite.api.events.GameTick; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -63,9 +63,6 @@ public class MetronomePlugin extends Plugin @Inject private MetronomePluginConfiguration config; - @Inject - private EventBus eventBus; - private int tickCounter = 0; private int tockCounter = 0; private Clip tickClip; @@ -114,7 +111,6 @@ public class MetronomePlugin extends Plugin protected void startUp() { updateConfig(); - addSubscriptions(); tickClip = GetAudioClip(this.tickPath); tockClip = GetAudioClip(this.tockPath); @@ -123,8 +119,6 @@ public class MetronomePlugin extends Plugin @Override protected void shutDown() { - eventBus.unregister(this); - if (tickClip != null) { tickClip.close(); @@ -135,12 +129,7 @@ public class MetronomePlugin extends Plugin } } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - } - +@Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("metronome")) @@ -177,6 +166,7 @@ public class MetronomePlugin extends Plugin } } + @Subscribe private void onGameTick(GameTick tick) { if (this.tickCount == 0) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/minimap/MinimapPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/minimap/MinimapPlugin.java index 7631304b51..3238b36388 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/minimap/MinimapPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/minimap/MinimapPlugin.java @@ -37,7 +37,7 @@ import net.runelite.api.events.WidgetHiddenChanged; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -58,9 +58,6 @@ public class MinimapPlugin extends Plugin @Inject private MinimapConfig config; - @Inject - private EventBus eventBus; - private Sprite[] originalDotSprites; private Color itemColor; @@ -81,7 +78,6 @@ public class MinimapPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); updateMinimapWidgetVisibility(this.hideMinimap); storeOriginalDots(); @@ -91,19 +87,11 @@ public class MinimapPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - updateMinimapWidgetVisibility(false); restoreOriginalDots(); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(WidgetHiddenChanged.class, this, this::onWidgetHiddenChanged); - } - +@Subscribe private void onGameStateChanged(GameStateChanged event) { if (event.getGameState() == GameState.LOGIN_SCREEN && originalDotSprites == null) @@ -113,6 +101,7 @@ public class MinimapPlugin extends Plugin } } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("minimap")) @@ -131,6 +120,7 @@ public class MinimapPlugin extends Plugin replaceMapDots(); } + @Subscribe private void onWidgetHiddenChanged(WidgetHiddenChanged event) { updateMinimapWidgetVisibility(this.hideMinimap); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java index d1ce991d0d..53d49d99e6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java @@ -65,7 +65,7 @@ import net.runelite.api.events.MenuOptionClicked; import net.runelite.api.events.WallObjectSpawned; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -108,9 +108,6 @@ public class MiningPlugin extends Plugin @Inject private MiningConfig config; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) private final List respawns = new ArrayList<>(); private boolean recentlyLoggedIn; @@ -123,7 +120,6 @@ public class MiningPlugin extends Plugin @Override protected void startUp() { - addSubscriptions(); this.showCoalBagOverlay = config.showCoalBagOverlay(); this.amountOfCoalInCoalBag = config.amountOfCoalInCoalBag(); @@ -135,30 +131,18 @@ public class MiningPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(miningOverlay); overlayManager.remove(coalBagOverlay); respawns.clear(); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(GameObjectDespawned.class, this, this::onGameObjectDespawned); - eventBus.subscribe(WallObjectSpawned.class, this, this::onWallObjectSpawned); - eventBus.subscribe(MenuOptionClicked.class, this, this::onMenuOptionClicked); - eventBus.subscribe(ChatMessage.class, this, this::onChatMessage); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - } - - @Provides +@Provides MiningConfig provideConfig(ConfigManager configManager) { return configManager.getConfig(MiningConfig.class); } + @Subscribe private void onGameStateChanged(GameStateChanged event) { switch (event.getGameState()) @@ -176,11 +160,13 @@ public class MiningPlugin extends Plugin } } + @Subscribe private void onGameTick(GameTick gameTick) { recentlyLoggedIn = false; } + @Subscribe private void onGameObjectDespawned(GameObjectDespawned event) { if (client.getGameState() != GameState.LOGGED_IN || recentlyLoggedIn) @@ -199,6 +185,7 @@ public class MiningPlugin extends Plugin } } + @Subscribe private void onWallObjectSpawned(WallObjectSpawned event) { if (client.getGameState() != GameState.LOGGED_IN) @@ -241,6 +228,7 @@ public class MiningPlugin extends Plugin } } + @Subscribe private void onMenuOptionClicked(MenuOptionClicked event) { //TODO: should work hopefully @@ -271,6 +259,7 @@ public class MiningPlugin extends Plugin } } + @Subscribe private void onChatMessage(ChatMessage event) { if (event.getType() != ChatMessageType.GAMEMESSAGE) @@ -317,6 +306,7 @@ public class MiningPlugin extends Plugin return client.getLocalPlayer().getWorldLocation().getRegionID() == MINING_GUILD_REGION; } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("mining")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java index 8f88c14f25..b90d110f36 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/motherlode/MotherlodePlugin.java @@ -85,7 +85,7 @@ import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.Notifier; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.events.OverlayMenuClicked; import net.runelite.client.plugins.Plugin; @@ -151,9 +151,6 @@ public class MotherlodePlugin extends Plugin @Inject private Notifier notifier; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) private boolean inMlm; @@ -215,7 +212,6 @@ public class MotherlodePlugin extends Plugin protected void startUp() { updateConfig(); - addSubscriptions(); overlayManager.add(overlay); overlayManager.add(rocksOverlay); @@ -234,8 +230,6 @@ public class MotherlodePlugin extends Plugin @Override protected void shutDown() { - eventBus.unregister(this); - overlayManager.remove(overlay); overlayManager.remove(rocksOverlay); overlayManager.remove(motherlodeGemOverlay); @@ -255,27 +249,7 @@ public class MotherlodePlugin extends Plugin }); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(VarbitChanged.class, this, this::onVarbitChanged); - eventBus.subscribe(ChatMessage.class, this, this::onChatMessage); - eventBus.subscribe(MenuOptionClicked.class, this, this::onMenuOptionClicked); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(AnimationChanged.class, this, this::onAnimationChanged); - eventBus.subscribe(WidgetLoaded.class, this, this::onWidgetLoaded); - eventBus.subscribe(WallObjectSpawned.class, this, this::onWallObjectSpawned); - eventBus.subscribe(WallObjectChanged.class, this, this::onWallObjectChanged); - eventBus.subscribe(WallObjectDespawned.class, this, this::onWallObjectDespawned); - eventBus.subscribe(GameObjectSpawned.class, this, this::onGameObjectSpawned); - eventBus.subscribe(GameObjectChanged.class, this, this::onGameObjectChanged); - eventBus.subscribe(GameObjectDespawned.class, this, this::onGameObjectDespawned); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(ItemContainerChanged.class, this, this::onItemContainerChanged); - eventBus.subscribe(OverheadTextChanged.class, this, this::onOverheadTextChanged); - eventBus.subscribe(OverlayMenuClicked.class, this, this::onOverlayMenuClicked); - } - +@Subscribe private void onOverlayMenuClicked(OverlayMenuClicked overlayMenuClicked) { OverlayMenuEntry overlayMenuEntry = overlayMenuClicked.getEntry(); @@ -287,6 +261,7 @@ public class MotherlodePlugin extends Plugin } } + @Subscribe void onVarbitChanged(VarbitChanged event) { if (inMlm) @@ -309,6 +284,7 @@ public class MotherlodePlugin extends Plugin } } + @Subscribe private void onChatMessage(ChatMessage event) { if (!inMlm || event.getType() != ChatMessageType.SPAM) @@ -372,6 +348,7 @@ public class MotherlodePlugin extends Plugin } } + @Subscribe private void onMenuOptionClicked(MenuOptionClicked menu) { if (!inMlm) @@ -379,7 +356,7 @@ public class MotherlodePlugin extends Plugin return; } - if (MINE_SPOTS.contains(menu.getIdentifier()) && menu.getMenuOpcode() == MenuOpcode.GAME_OBJECT_FIRST_OPTION) + if (MINE_SPOTS.contains(menu.getIdentifier()) && menu.getMenuOpcode() == MenuOpcode.GAME_OBJECT_FIRST_OPTION) { resetIdleChecks(); int veinX = menu.getParam0(); @@ -388,6 +365,7 @@ public class MotherlodePlugin extends Plugin } } + @Subscribe private void onGameTick(GameTick event) { if (!inMlm) @@ -420,7 +398,8 @@ public class MotherlodePlugin extends Plugin } } - private void onAnimationChanged (AnimationChanged event) + @Subscribe + private void onAnimationChanged(AnimationChanged event) { if (!inMlm) { @@ -489,6 +468,7 @@ public class MotherlodePlugin extends Plugin } } + @Subscribe private void onWidgetLoaded(WidgetLoaded event) { if (!inMlm || targetVeinLocation == null) @@ -525,6 +505,7 @@ public class MotherlodePlugin extends Plugin notifier.notify(client.getLocalPlayer().getName() + " has stopped mining!"); } + @Subscribe private void onWallObjectSpawned(WallObjectSpawned event) { if (!inMlm) @@ -546,6 +527,7 @@ public class MotherlodePlugin extends Plugin } } + @Subscribe private void onWallObjectChanged(WallObjectChanged event) { if (!inMlm) @@ -563,6 +545,7 @@ public class MotherlodePlugin extends Plugin } } + @Subscribe private void onWallObjectDespawned(WallObjectDespawned event) { if (!inMlm) @@ -574,6 +557,7 @@ public class MotherlodePlugin extends Plugin veins.remove(wallObject); } + @Subscribe private void onGameObjectSpawned(GameObjectSpawned event) { if (!inMlm) @@ -588,6 +572,7 @@ public class MotherlodePlugin extends Plugin } } + @Subscribe private void onGameObjectChanged(GameObjectChanged event) { if (!inMlm) @@ -606,6 +591,7 @@ public class MotherlodePlugin extends Plugin } + @Subscribe private void onGameObjectDespawned(GameObjectDespawned event) { if (!inMlm) @@ -617,6 +603,7 @@ public class MotherlodePlugin extends Plugin rocks.remove(gameObject); } + @Subscribe void onGameStateChanged(GameStateChanged event) { if (event.getGameState() == GameState.LOADING) @@ -634,6 +621,7 @@ public class MotherlodePlugin extends Plugin } } + @Subscribe void onItemContainerChanged(ItemContainerChanged event) { final ItemContainer container = event.getItemContainer(); @@ -743,6 +731,7 @@ public class MotherlodePlugin extends Plugin return Perspective.getTileHeight(client, localPoint, 0) < UPPER_FLOOR_HEIGHT; } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("motherlode")) @@ -769,6 +758,7 @@ public class MotherlodePlugin extends Plugin this.payDirtMsg = config.payDirtMsg(); } + @Subscribe private void onOverheadTextChanged(OverheadTextChanged event) { if (!payDirtMsg || Strings.isNullOrEmpty(event.getOverheadText()) || !(event.getActor() instanceof NPC)) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightPlugin.java index 2de33a9727..a55e52bff6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightPlugin.java @@ -38,7 +38,7 @@ import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetID; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -63,9 +63,6 @@ public class MouseHighlightPlugin extends Plugin @Inject private MouseHighlightOverlay overlay; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) private boolean mainTooltip; @Getter(AccessLevel.PACKAGE) @@ -87,7 +84,6 @@ public class MouseHighlightPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); adjustTips(); overlayManager.add(overlay); @@ -96,20 +92,11 @@ public class MouseHighlightPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - resetTips(); overlayManager.remove(overlay); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(WidgetLoaded.class, this, this::onWidgetLoaded); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - } - +@Subscribe private void onGameStateChanged(GameStateChanged event) { if (event.getGameState() == GameState.LOGGED_IN) @@ -118,6 +105,7 @@ public class MouseHighlightPlugin extends Plugin } } + @Subscribe private void onWidgetLoaded(WidgetLoaded event) { if (event.getGroupId() == WidgetID.SPELLBOOK_GROUP_ID || event.getGroupId() == WidgetID.COMBAT_GROUP_ID) @@ -126,6 +114,7 @@ public class MouseHighlightPlugin extends Plugin } } + @Subscribe private void onGameTick(GameTick event) { adjustTips(); @@ -179,6 +168,7 @@ public class MouseHighlightPlugin extends Plugin widget.setHidden(hidden); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("motherlode")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsPlugin.java index d4770dd3d7..db0b43e081 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/multiindicators/MultiIndicatorsPlugin.java @@ -49,7 +49,7 @@ import net.runelite.api.events.GameStateChanged; import net.runelite.api.geometry.Geometry; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -84,9 +84,6 @@ public class MultiIndicatorsPlugin extends Plugin @Inject private OverlayManager overlayManager; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) private GeneralPath[] multicombatPathToDisplay; @@ -133,7 +130,6 @@ public class MultiIndicatorsPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); overlayManager.add(overlay); overlayManager.add(minimapOverlay); @@ -152,21 +148,13 @@ public class MultiIndicatorsPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(overlay); overlayManager.remove(minimapOverlay); uninitializePaths(); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - } - - private void initializePaths() +private void initializePaths() { multicombatPathToDisplay = new GeneralPath[Constants.MAX_Z]; pvpPathToDisplay = new GeneralPath[Constants.MAX_Z]; @@ -372,6 +360,7 @@ public class MultiIndicatorsPlugin extends Plugin return false; } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("multiindicators")) @@ -391,6 +380,7 @@ public class MultiIndicatorsPlugin extends Plugin } } + @Subscribe private void onGameStateChanged(GameStateChanged event) { if (event.getGameState() == GameState.LOGGED_IN) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/music/MusicPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/music/MusicPlugin.java index 1429225247..08fe9760c9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/music/MusicPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/music/MusicPlugin.java @@ -47,7 +47,6 @@ import net.runelite.api.SpriteID; import net.runelite.api.VarClientInt; import net.runelite.api.VarPlayer; import net.runelite.api.events.AreaSoundEffectPlayed; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.ScriptCallbackEvent; import net.runelite.api.events.VarClientIntChanged; @@ -62,7 +61,8 @@ import net.runelite.api.widgets.WidgetPositionMode; import net.runelite.api.widgets.WidgetType; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.chatbox.ChatboxPanelManager; import net.runelite.client.game.chatbox.ChatboxTextInput; import net.runelite.client.plugins.Plugin; @@ -87,9 +87,6 @@ public class MusicPlugin extends Plugin @Inject private ChatboxPanelManager chatboxPanelManager; - @Inject - private EventBus eventBus; - private ChatboxTextInput searchInput; private Widget musicSearchButton; @@ -102,7 +99,6 @@ public class MusicPlugin extends Plugin @Override protected void startUp() { - addSubscriptions(); clientThread.invoke(() -> { @@ -132,17 +128,7 @@ public class MusicPlugin extends Plugin return configManager.getConfig(MusicConfig.class); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(WidgetLoaded.class, this, this::onWidgetLoaded); - eventBus.subscribe(VarClientIntChanged.class, this, this::onVarClientIntChanged); - eventBus.subscribe(VolumeChanged.class, this, this::onVolumeChanged); - eventBus.subscribe(ScriptCallbackEvent.class, this, this::onScriptCallbackEvent); - eventBus.subscribe(AreaSoundEffectPlayed.class, this, this::onAreaSoundEffectPlayed); - } - +@Subscribe private void onGameStateChanged(GameStateChanged gameStateChanged) { if (gameStateChanged.getGameState() == GameState.LOGIN_SCREEN) @@ -153,6 +139,7 @@ public class MusicPlugin extends Plugin } } + @Subscribe private void onWidgetLoaded(WidgetLoaded widgetLoaded) { if (widgetLoaded.getGroupId() == WidgetID.MUSIC_GROUP_ID) @@ -208,6 +195,7 @@ public class MusicPlugin extends Plugin musicFilterButton.revalidate(); } + @Subscribe private void onVarClientIntChanged(VarClientIntChanged varClientIntChanged) { if (isChatboxOpen() && !isOnMusicTab()) @@ -217,11 +205,13 @@ public class MusicPlugin extends Plugin } + @Subscribe private void onVolumeChanged(VolumeChanged volumeChanged) { applyMusicVolumeConfig(); } + @Subscribe private void onConfigChanged(ConfigChanged configChanged) { if (configChanged.getGroup().equals("music")) @@ -554,6 +544,7 @@ public class MusicPlugin extends Plugin } } + @Subscribe private void onScriptCallbackEvent(ScriptCallbackEvent ev) { switch (ev.getEventName()) @@ -564,6 +555,7 @@ public class MusicPlugin extends Plugin } } + @Subscribe private void onAreaSoundEffectPlayed(AreaSoundEffectPlayed areaSoundEffectPlayed) { Actor source = areaSoundEffectPlayed.getSource(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/musicindicator/MusicIndicatorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/musicindicator/MusicIndicatorPlugin.java index cac7bd30f0..48c9715541 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/musicindicator/MusicIndicatorPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/musicindicator/MusicIndicatorPlugin.java @@ -45,7 +45,7 @@ import net.runelite.client.chat.ChatColorType; import net.runelite.client.chat.ChatMessageBuilder; import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.chat.QueuedMessage; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginType; @@ -79,9 +79,6 @@ public class MusicIndicatorPlugin extends Plugin @Inject private ChatMessageManager chatMessageManager; - @Inject - private EventBus eventBus; - // Mapping of relevant varps to their values, used to compare against new values private final Map musicTrackVarpValues = new HashMap<>(); @@ -90,24 +87,16 @@ public class MusicIndicatorPlugin extends Plugin @Override public void startUp() { - addSubscriptions(); loggingIn = true; } @Override public void shutDown() { - eventBus.unregister(this); musicTrackVarpValues.clear(); } - private void addSubscriptions() - { - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(VarbitChanged.class, this, this::onVarbitChanged); - } - +@Subscribe private void onGameStateChanged(GameStateChanged event) { switch (event.getGameState()) @@ -120,6 +109,7 @@ public class MusicIndicatorPlugin extends Plugin } } + @Subscribe private void onGameTick(GameTick event) { if (!loggingIn) @@ -136,6 +126,7 @@ public class MusicIndicatorPlugin extends Plugin } } + @Subscribe private void onVarbitChanged(VarbitChanged event) { int idx = event.getIndex(); @@ -182,6 +173,7 @@ public class MusicIndicatorPlugin extends Plugin /** * Get the id for a track identified by the given varp and a bit index + * * @param variableId * @param bit * @return diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZonePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZonePlugin.java index ef427c77ca..d2a63f6b3e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZonePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/nightmarezone/NightmareZonePlugin.java @@ -43,7 +43,7 @@ import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.Notifier; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -75,9 +75,6 @@ public class NightmareZonePlugin extends Plugin @Inject private NightmareZoneOverlay overlay; - @Inject - private EventBus eventBus; - @Getter private int pointsPerHour; @@ -108,7 +105,6 @@ public class NightmareZonePlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); overlayManager.add(overlay); overlay.removeAbsorptionCounter(); @@ -117,8 +113,6 @@ public class NightmareZonePlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(overlay); overlay.removeAbsorptionCounter(); @@ -132,13 +126,7 @@ public class NightmareZonePlugin extends Plugin resetPointsPerHour(); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(ChatMessage.class, this, this::onChatMessage); - } - +@Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("nightmareZone")) @@ -156,6 +144,7 @@ public class NightmareZonePlugin extends Plugin return configManager.getConfig(NightmareZoneConfig.class); } + @Subscribe private void onGameTick(GameTick event) { if (isNotInNightmareZone()) @@ -184,6 +173,7 @@ public class NightmareZonePlugin extends Plugin } } + @Subscribe private void onChatMessage(ChatMessage event) { if (event.getType() != ChatMessageType.GAMEMESSAGE diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesPlugin.java index 7f5a5f4162..b3552cf093 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesPlugin.java @@ -29,7 +29,7 @@ import java.awt.image.BufferedImage; import javax.inject.Inject; import javax.inject.Singleton; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.SessionOpen; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -55,9 +55,6 @@ public class NotesPlugin extends Plugin @Inject private NotesManager notesManager; - @Inject - private EventBus eventBus; - private NotesPanel panel; private NavigationButton navButton; @@ -70,7 +67,6 @@ public class NotesPlugin extends Plugin @Override protected void startUp() throws Exception { - eventBus.subscribe(SessionOpen.class, this, this::onSessionOpen); panel = injector.getInstance(NotesPanel.class); panel.init(config); @@ -93,11 +89,10 @@ public class NotesPlugin extends Plugin @Override protected void shutDown() { - eventBus.unregister(this); - clientToolbar.removeNavigation(navButton); } + @Subscribe private void onSessionOpen(SessionOpen event) { notesManager.loadNotes(); 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 3d5fb0096c..e068ea4b13 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 @@ -52,7 +52,6 @@ import net.runelite.api.MenuOpcode; import static net.runelite.api.MenuOpcode.MENU_ACTION_DEPRIORITIZE_OFFSET; import net.runelite.api.NPC; import net.runelite.api.coords.WorldPoint; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.FocusChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; @@ -65,7 +64,8 @@ import net.runelite.api.events.NpcSpawned; import net.runelite.api.util.Text; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.input.KeyManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -120,9 +120,6 @@ public class NpcIndicatorsPlugin extends Plugin @Inject private ClientThread clientThread; - @Inject - private EventBus eventbus; - @Setter(AccessLevel.PACKAGE) private boolean hotKeyPressed = false; @@ -218,7 +215,6 @@ public class NpcIndicatorsPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); overlayManager.add(npcSceneOverlay); overlayManager.add(npcMinimapOverlay); @@ -234,8 +230,6 @@ public class NpcIndicatorsPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventbus.unregister(this); - overlayManager.remove(npcSceneOverlay); overlayManager.remove(npcMinimapOverlay); deadNpcsToDisplay.clear(); @@ -248,20 +242,7 @@ public class NpcIndicatorsPlugin extends Plugin keyManager.unregisterKeyListener(inputListener); } - private void addSubscriptions() - { - 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); - } - +@Subscribe private void onGameStateChanged(GameStateChanged event) { if (event.getGameState() == GameState.LOGIN_SCREEN || @@ -275,6 +256,7 @@ public class NpcIndicatorsPlugin extends Plugin } } + @Subscribe private void onConfigChanged(ConfigChanged configChanged) { if (!configChanged.getGroup().equals("npcindicators")) @@ -288,6 +270,7 @@ public class NpcIndicatorsPlugin extends Plugin rebuildAllNpcs(); } + @Subscribe private void onFocusChanged(FocusChanged focusChanged) { if (!focusChanged.isFocused()) @@ -296,6 +279,7 @@ public class NpcIndicatorsPlugin extends Plugin } } + @Subscribe private void onMenuEntryAdded(MenuEntryAdded event) { int type = event.getOpcode(); @@ -328,6 +312,7 @@ public class NpcIndicatorsPlugin extends Plugin } } + @Subscribe private void onMenuOptionClicked(MenuOptionClicked click) { if (click.getMenuOpcode() != MenuOpcode.RUNELITE || @@ -364,6 +349,7 @@ public class NpcIndicatorsPlugin extends Plugin click.consume(); } + @Subscribe private void onNpcSpawned(NpcSpawned npcSpawned) { NPC npc = npcSpawned.getNpc(); @@ -375,6 +361,7 @@ public class NpcIndicatorsPlugin extends Plugin } } + @Subscribe private void onNpcDefinitionChanged(NpcDefinitionChanged event) { NPC npc = event.getNpc(); @@ -391,6 +378,7 @@ public class NpcIndicatorsPlugin extends Plugin } } + @Subscribe private void onNpcDespawned(NpcDespawned npcDespawned) { final NPC npc = npcDespawned.getNpc(); @@ -403,6 +391,7 @@ public class NpcIndicatorsPlugin extends Plugin highlightedNpcs.remove(npc); } + @Subscribe private void onGraphicsObjectCreated(GraphicsObjectCreated event) { final GraphicsObject go = event.getGraphicsObject(); @@ -413,6 +402,7 @@ public class NpcIndicatorsPlugin extends Plugin } } + @Subscribe private void onGameTick(GameTick event) { removeOldHighlightedRespawns(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java index 3ef4037d39..848d6a17b8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcstatus/NpcStatusPlugin.java @@ -46,7 +46,7 @@ import net.runelite.api.events.NpcDespawned; import net.runelite.api.events.NpcSpawned; import net.runelite.api.events.SpotAnimationChanged; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.NPCManager; import net.runelite.client.plugins.Plugin; @@ -80,9 +80,6 @@ public class NpcStatusPlugin extends Plugin @Inject private NpcStatusOverlay npcStatusOverlay; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) private final Set memorizedNPCs = new HashSet<>(); @@ -104,7 +101,6 @@ public class NpcStatusPlugin extends Plugin @Override protected void startUp() throws Exception { - addSubscriptions(); this.getRange = config.getRange(); overlayManager.add(npcStatusOverlay); @@ -113,23 +109,11 @@ public class NpcStatusPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(npcStatusOverlay); memorizedNPCs.clear(); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(NpcSpawned.class, this, this::onNpcSpawned); - eventBus.subscribe(NpcDespawned.class, this, this::onNpcDespawned); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(HitsplatApplied.class, this, this::onHitsplatApplied); - eventBus.subscribe(SpotAnimationChanged.class, this, this::onSpotAnimationChanged); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - } - +@Subscribe private void onNpcSpawned(NpcSpawned npcSpawned) { final NPC npc = npcSpawned.getNpc(); @@ -147,12 +131,14 @@ public class NpcStatusPlugin extends Plugin memorizedNPCs.add(new MemorizedNPC(npc, AttackSpeed, npc.getWorldArea())); } + @Subscribe private void onNpcDespawned(NpcDespawned npcDespawned) { final NPC npc = npcDespawned.getNpc(); memorizedNPCs.removeIf(c -> c.getNpc() == npc); } + @Subscribe private void onGameStateChanged(GameStateChanged event) { if (event.getGameState() == GameState.LOGIN_SCREEN || @@ -162,6 +148,7 @@ public class NpcStatusPlugin extends Plugin } } + @Subscribe private void onHitsplatApplied(HitsplatApplied event) { if (event.getActor().getInteracting() != client.getLocalPlayer()) @@ -195,6 +182,7 @@ public class NpcStatusPlugin extends Plugin } + @Subscribe private void onSpotAnimationChanged(SpotAnimationChanged event) { if ((event.getActor().getSpotAnimation() == GraphicID.SPLASH) && event.getActor() instanceof NPC) @@ -285,12 +273,14 @@ public class NpcStatusPlugin extends Plugin } } + @Subscribe private void onGameTick(GameTick event) { checkStatus(); lastPlayerLocation = client.getLocalPlayer().getWorldArea(); } + @Subscribe private void onConfigChanged(ConfigChanged configChanged) { if (!configChanged.getGroup().equals("npcstatus")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java index 39df118ad4..022c324a01 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npcunaggroarea/NpcAggroAreaPlugin.java @@ -51,14 +51,14 @@ import net.runelite.api.Player; import net.runelite.api.coords.LocalPoint; import net.runelite.api.coords.WorldArea; import net.runelite.api.coords.WorldPoint; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.NpcSpawned; import net.runelite.api.geometry.Geometry; import net.runelite.client.Notifier; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.ItemManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -119,9 +119,6 @@ public class NpcAggroAreaPlugin extends Plugin @Inject private Notifier notifier; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) private final WorldPoint[] safeCenters = new WorldPoint[2]; @@ -163,7 +160,6 @@ public class NpcAggroAreaPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); overlayManager.add(overlay); if (this.showNotWorkingOverlay) @@ -179,8 +175,6 @@ public class NpcAggroAreaPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - removeTimer(); overlayManager.remove(overlay); if (notWorkingOverlayShown) @@ -198,15 +192,7 @@ public class NpcAggroAreaPlugin extends Plugin Arrays.fill(linesToDisplay, null); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(NpcSpawned.class, this, this::onNpcSpawned); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - } - - private Area generateSafeArea() +private Area generateSafeArea() { final Area area = new Area(); @@ -357,6 +343,7 @@ public class NpcAggroAreaPlugin extends Plugin checkAreaNpcs(client.getCachedNPCs()); } + @Subscribe private void onNpcSpawned(NpcSpawned event) { if (this.alwaysActive) @@ -367,6 +354,7 @@ public class NpcAggroAreaPlugin extends Plugin checkAreaNpcs(event.getNpc()); } + @Subscribe private void onGameTick(GameTick event) { WorldPoint newLocation = client.getLocalPlayer().getWorldLocation(); @@ -406,6 +394,7 @@ public class NpcAggroAreaPlugin extends Plugin lastPlayerLocation = newLocation; } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("npcUnaggroArea")) @@ -496,6 +485,7 @@ public class NpcAggroAreaPlugin extends Plugin } } + @Subscribe private void onGameStateChanged(GameStateChanged event) { switch (event.getGameState()) 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 0d961f53eb..a6211f6bfa 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 @@ -72,7 +72,7 @@ import net.runelite.api.events.WallObjectChanged; import net.runelite.api.events.WallObjectDespawned; import net.runelite.api.events.WallObjectSpawned; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.input.KeyListener; import net.runelite.client.input.KeyManager; @@ -118,9 +118,6 @@ public class ObjectIndicatorsPlugin extends Plugin implements KeyListener @Inject private KeyManager keyManager; - @Inject - private EventBus eventbus; - @Getter(AccessLevel.PACKAGE) private RenderStyle objectMarkerRenderStyle; @Getter(AccessLevel.PACKAGE) @@ -140,7 +137,6 @@ public class ObjectIndicatorsPlugin extends Plugin implements KeyListener protected void startUp() { updateConfig(); - addSubscriptions(); overlayManager.add(overlay); keyManager.registerKeyListener(this); @@ -149,8 +145,6 @@ public class ObjectIndicatorsPlugin extends Plugin implements KeyListener @Override protected void shutDown() { - eventbus.unregister(this); - overlayManager.remove(overlay); keyManager.unregisterKeyListener(this); points.clear(); @@ -158,25 +152,7 @@ public class ObjectIndicatorsPlugin extends Plugin implements KeyListener hotKeyPressed = false; } - private void addSubscriptions() - { - eventbus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventbus.subscribe(FocusChanged.class, this, this::onFocusChanged); - eventbus.subscribe(WallObjectSpawned.class, this, this::onWallObjectSpawned); - eventbus.subscribe(WallObjectChanged.class, this, this::onWallObjectChanged); - eventbus.subscribe(WallObjectDespawned.class, this, this::onWallObjectDespawned); - 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(GroundObjectDespawned.class, this, this::onGroundObjectDespawned); - eventbus.subscribe(GroundObjectSpawned.class, this, this::onGroundObjectSpawned); - eventbus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventbus.subscribe(MenuOptionClicked.class, this, this::onMenuOptionClicked); - eventbus.subscribe(MenuEntryAdded.class, this, this::onMenuEntryAdded); - } - - @Override +@Override public void keyTyped(KeyEvent e) { @@ -200,6 +176,7 @@ public class ObjectIndicatorsPlugin extends Plugin implements KeyListener } } + @Subscribe private void onFocusChanged(final FocusChanged event) { if (!event.isFocused()) @@ -208,11 +185,13 @@ public class ObjectIndicatorsPlugin extends Plugin implements KeyListener } } + @Subscribe private void onWallObjectSpawned(WallObjectSpawned event) { checkObjectPoints(event.getWallObject()); } + @Subscribe private void onWallObjectChanged(WallObjectChanged event) { WallObject previous = event.getPrevious(); @@ -222,45 +201,53 @@ public class ObjectIndicatorsPlugin extends Plugin implements KeyListener checkObjectPoints(wallObject); } + @Subscribe private void onWallObjectDespawned(WallObjectDespawned event) { objects.remove(event.getWallObject()); } + @Subscribe private void onGameObjectSpawned(GameObjectSpawned event) { final GameObject eventObject = event.getGameObject(); checkObjectPoints(eventObject); } + @Subscribe private void onDecorativeObjectSpawned(DecorativeObjectSpawned event) { final DecorativeObject eventObject = event.getDecorativeObject(); checkObjectPoints(eventObject); } + @Subscribe private void onGameObjectDespawned(GameObjectDespawned event) { objects.remove(event.getGameObject()); } + @Subscribe private void onDecorativeObjectDespawned(DecorativeObjectDespawned event) { objects.remove(event.getDecorativeObject()); } + @Subscribe private void onGroundObjectSpawned(GroundObjectSpawned groundObjectSpawned) { final GroundObject groundObject = groundObjectSpawned.getGroundObject(); checkObjectPoints(groundObject); } + @Subscribe private void onGroundObjectDespawned(GroundObjectDespawned groundObjectDespawned) { GroundObject groundObject = groundObjectDespawned.getGroundObject(); objects.remove(groundObject); } + @Subscribe private void onGameStateChanged(GameStateChanged gameStateChanged) { GameState gameState = gameStateChanged.getGameState(); @@ -286,6 +273,7 @@ public class ObjectIndicatorsPlugin extends Plugin implements KeyListener } } + @Subscribe private void onMenuEntryAdded(MenuEntryAdded event) { if (!hotKeyPressed || event.getOpcode() != MenuOpcode.EXAMINE_OBJECT.getId()) @@ -308,6 +296,7 @@ public class ObjectIndicatorsPlugin extends Plugin implements KeyListener client.setMenuEntries(menuEntries); } + @Subscribe private void onMenuOptionClicked(MenuOptionClicked event) { if (event.getMenuOpcode() != MenuOpcode.RUNELITE @@ -503,7 +492,9 @@ public class ObjectIndicatorsPlugin extends Plugin implements KeyListener return null; } - Set points = GSON.fromJson(json, new TypeToken>() {}.getType()); + Set points = GSON.fromJson(json, new TypeToken>() + { + }.getType()); // Prior to multiloc support the plugin would mark objects named "null", which breaks // in most cases due to the specific object being identified being ambiguous, so remove // them @@ -513,6 +504,7 @@ public class ObjectIndicatorsPlugin extends Plugin implements KeyListener } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("objectindicators")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/openosrs/OpenOSRSPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/openosrs/OpenOSRSPlugin.java index abd1a6cdab..105ff993fb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/openosrs/OpenOSRSPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/openosrs/OpenOSRSPlugin.java @@ -40,7 +40,7 @@ import static net.runelite.api.widgets.WidgetInfo.*; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.Keybind; import net.runelite.client.config.OpenOSRSConfig; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.input.KeyListener; import net.runelite.client.input.KeyManager; @@ -74,9 +74,6 @@ public class OpenOSRSPlugin extends Plugin @Inject private ClientThread clientThread; - @Inject - private EventBus eventbus; - private HotkeyListener hotkeyListener = new HotkeyListener(() -> this.keybind) { @Override @@ -96,7 +93,6 @@ public class OpenOSRSPlugin extends Plugin @Override protected void startUp() throws Exception { - addSubscriptions(); entered = -1; enterIdx = 0; @@ -108,8 +104,6 @@ public class OpenOSRSPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventbus.unregister(this); - entered = 0; enterIdx = 0; expectInput = false; @@ -117,6 +111,7 @@ public class OpenOSRSPlugin extends Plugin keyManager.unregisterKeyListener(hotkeyListener); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("openosrs")) @@ -145,12 +140,7 @@ public class OpenOSRSPlugin extends Plugin } } - private void addSubscriptions() - { - eventbus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventbus.subscribe(ScriptCallbackEvent.class, this, this::onScriptCallbackEvent); - } - +@Subscribe private void onScriptCallbackEvent(ScriptCallbackEvent e) { if (!config.keyboardPin()) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java index 5db7532ebd..245197f3ca 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/opponentinfo/OpponentInfoPlugin.java @@ -50,6 +50,7 @@ import net.runelite.api.events.MenuOpened; import net.runelite.api.util.Text; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.HiscoreManager; import net.runelite.client.game.NPCManager; @@ -136,7 +137,7 @@ public class OpponentInfoPlugin extends Plugin this.showHitpoints = config.showHitpointsMenu(); updateConfig(); - addSubscriptions(); + updateMenuSubs(); overlayManager.add(opponentInfoOverlay); overlayManager.add(playerComparisonOverlay); @@ -145,7 +146,6 @@ public class OpponentInfoPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); eventBus.unregister(MENU); lastOpponent = null; @@ -154,16 +154,7 @@ public class OpponentInfoPlugin extends Plugin overlayManager.remove(playerComparisonOverlay); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(InteractingChanged.class, this, this::onInteractingChanged); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - updateMenuSubs(); - } - - private void updateMenuSubs() +private void updateMenuSubs() { if (showAttackers || showAttacking || showHitpoints) { @@ -176,6 +167,7 @@ public class OpponentInfoPlugin extends Plugin } } + @Subscribe private void onGameStateChanged(GameStateChanged gameStateChanged) { if (gameStateChanged.getGameState() != GameState.LOGGED_IN) @@ -202,6 +194,7 @@ public class OpponentInfoPlugin extends Plugin } } + @Subscribe private void onInteractingChanged(InteractingChanged event) { if (event.getSource() != client.getLocalPlayer()) @@ -220,6 +213,7 @@ public class OpponentInfoPlugin extends Plugin lastOpponent = opponent; } + @Subscribe private void onGameTick(GameTick gameTick) { if (lastOpponent != null @@ -232,6 +226,7 @@ public class OpponentInfoPlugin extends Plugin } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("opponentinfo")) @@ -417,9 +412,9 @@ public class OpponentInfoPlugin extends Plugin final int start = hadAggro ? 1 + COLOR_TAG_LENGTH : COLOR_TAG_LENGTH; target = (hasAggro ? '*' : "") + - (isTarget ? attackingColTag : - player ? ColorUtil.colorStartTag(0xffffff) : ColorUtil.colorStartTag(0xffff00)) + - target.substring(start); + (isTarget ? attackingColTag : + player ? ColorUtil.colorStartTag(0xffffff) : ColorUtil.colorStartTag(0xffff00)) + + target.substring(start); } else if (aggroChanged) { @@ -478,7 +473,7 @@ public class OpponentInfoPlugin extends Plugin } else { - result = "(" + (100 * ratio) / health + "%)"; + result = "(" + (100 * ratio) / health + "%)"; } return withColorTag ? ColorUtil.colorStartTag(0xff0000) + result : result; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java index e71792494c..749ec2c974 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java @@ -60,7 +60,7 @@ import net.runelite.client.chat.ChatMessageBuilder; import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.chat.QueuedMessage; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.events.OverlayMenuClicked; import net.runelite.client.events.PartyChanged; @@ -126,9 +126,6 @@ public class PartyPlugin extends Plugin implements KeyListener @Inject private ChatMessageManager chatMessageManager; - @Inject - private EventBus eventBus; - @Inject @Named("developerMode") boolean developerMode; @@ -161,7 +158,6 @@ public class PartyPlugin extends Plugin implements KeyListener protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); overlayManager.add(partyStatsOverlay); overlayManager.add(partyPingOverlay); @@ -175,8 +171,6 @@ public class PartyPlugin extends Plugin implements KeyListener @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - partyDataMap.clear(); pendingTilePings.clear(); worldMapManager.removeIf(PartyWorldMapPoint.class::isInstance); @@ -191,29 +185,13 @@ public class PartyPlugin extends Plugin implements KeyListener sendAlert = false; } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(OverlayMenuClicked.class, this, this::onOverlayMenuClicked); - eventBus.subscribe(MenuOptionClicked.class, this, this::onMenuOptionClicked); - eventBus.subscribe(TilePing.class, this, this::onTilePing); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(SkillUpdate.class, this, this::onSkillUpdate); - eventBus.subscribe(LocationUpdate.class, this, this::onLocationUpdate); - eventBus.subscribe(UserJoin.class, this, this::onUserJoin); - eventBus.subscribe(UserSync.class, this, this::onUserSync); - eventBus.subscribe(UserPart.class, this, this::onUserPart); - eventBus.subscribe(PartyChanged.class, this, this::onPartyChanged); - eventBus.subscribe(CommandExecuted.class, this, this::onCommandExecuted); - eventBus.subscribe(FocusChanged.class, this, this::onFocusChanged); - } - - @Provides +@Provides public PartyConfig provideConfig(ConfigManager configManager) { return configManager.getConfig(PartyConfig.class); } + @Subscribe private void onOverlayMenuClicked(OverlayMenuClicked event) { if (event.getEntry().getMenuOpcode() == MenuOpcode.RUNELITE_OVERLAY && @@ -239,6 +217,7 @@ public class PartyPlugin extends Plugin implements KeyListener } } + @Subscribe private void onMenuOptionClicked(MenuOptionClicked event) { if (!hotkeyDown || client.isMenuOpen() || party.getMembers().isEmpty() || !this.pings) @@ -278,6 +257,7 @@ public class PartyPlugin extends Plugin implements KeyListener wsClient.send(tilePing); } + @Subscribe private void onTilePing(TilePing event) { if (this.pings) @@ -323,6 +303,7 @@ public class PartyPlugin extends Plugin implements KeyListener wsClient.send(locationUpdate); } + @Subscribe private void onGameTick(final GameTick event) { if (sendAlert && client.getGameState() == GameState.LOGGED_IN) @@ -368,6 +349,7 @@ public class PartyPlugin extends Plugin implements KeyListener lastPray = currentPrayer; } + @Subscribe private void onSkillUpdate(final SkillUpdate event) { final PartyData partyData = getPartyData(event.getMemberId()); @@ -389,6 +371,7 @@ public class PartyPlugin extends Plugin implements KeyListener } } + @Subscribe private void onLocationUpdate(final LocationUpdate event) { final PartyData partyData = getPartyData(event.getMemberId()); @@ -401,6 +384,7 @@ public class PartyPlugin extends Plugin implements KeyListener partyData.getWorldMapPoint().setWorldPoint(event.getWorldPoint()); } + @Subscribe private void onUserJoin(final UserJoin event) { final PartyData partyData = getPartyData(event.getMemberId()); @@ -429,6 +413,7 @@ public class PartyPlugin extends Plugin implements KeyListener } } + @Subscribe private void onUserSync(final UserSync event) { final int currentHealth = client.getBoostedSkillLevel(Skill.HITPOINTS); @@ -449,6 +434,7 @@ public class PartyPlugin extends Plugin implements KeyListener } } + @Subscribe private void onUserPart(final UserPart event) { final PartyData removed = partyDataMap.remove(event.getMemberId()); @@ -473,6 +459,7 @@ public class PartyPlugin extends Plugin implements KeyListener } } + @Subscribe private void onPartyChanged(final PartyChanged event) { // Reset party @@ -481,6 +468,7 @@ public class PartyPlugin extends Plugin implements KeyListener worldMapManager.removeIf(PartyWorldMapPoint.class::isInstance); } + @Subscribe private void onCommandExecuted(CommandExecuted commandExecuted) { if (!developerMode || !commandExecuted.getCommand().equals("partyinfo")) @@ -527,6 +515,7 @@ public class PartyPlugin extends Plugin implements KeyListener }); } + @Subscribe private void onFocusChanged(FocusChanged event) { if (!event.isFocused()) @@ -572,6 +561,7 @@ public class PartyPlugin extends Plugin implements KeyListener .build()); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("party")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsPlugin.java index 5fede26720..870ffc5374 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/performancestats/PerformanceStatsPlugin.java @@ -52,7 +52,7 @@ import net.runelite.client.chat.ChatMessageBuilder; import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.chat.QueuedMessage; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.events.OverlayMenuClicked; import net.runelite.client.events.PartyChanged; @@ -109,9 +109,6 @@ public class PerformanceStatsPlugin extends Plugin @Inject private WSClient wsClient; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) private boolean enabled = false; @Getter(AccessLevel.PACKAGE) @@ -141,7 +138,6 @@ public class PerformanceStatsPlugin extends Plugin @Override protected void startUp() { - addSubscriptions(); this.submitTimeout = config.submitTimeout(); @@ -152,29 +148,13 @@ public class PerformanceStatsPlugin extends Plugin @Override protected void shutDown() { - eventBus.unregister(this); - overlayManager.remove(performanceTrackerOverlay); wsClient.unregisterMessage(Performance.class); disable(); reset(); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(HitsplatApplied.class, this, this::onHitsplatApplied); - eventBus.subscribe(StatChanged.class, this, this::onStatChanged); - eventBus.subscribe(ScriptCallbackEvent.class, this, this::onScriptCallbackEvent); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(OverlayMenuClicked.class, this, this::onOverlayMenuClicked); - eventBus.subscribe(Performance.class, this, this::onPerformance); - eventBus.subscribe(UserSync.class, this, this::onUserSync); - eventBus.subscribe(UserPart.class, this, this::onUserPart); - eventBus.subscribe(PartyChanged.class, this, this::onPartyChanged); - } - +@Subscribe private void onGameStateChanged(GameStateChanged event) { switch (event.getGameState()) @@ -188,6 +168,7 @@ public class PerformanceStatsPlugin extends Plugin } } + @Subscribe private void onHitsplatApplied(HitsplatApplied e) { if (isPaused()) @@ -207,6 +188,7 @@ public class PerformanceStatsPlugin extends Plugin } } + @Subscribe private void onStatChanged(StatChanged c) { if (isPaused() || hopping) @@ -242,6 +224,7 @@ public class PerformanceStatsPlugin extends Plugin } } + @Subscribe private void onScriptCallbackEvent(ScriptCallbackEvent e) { // Handles Fake XP drops (Ironman in PvP, DMM Cap, 200m xp, etc) @@ -273,6 +256,7 @@ public class PerformanceStatsPlugin extends Plugin } } + @Subscribe private void onGameTick(GameTick t) { oldTarget = client.getLocalPlayer().getInteracting(); @@ -312,6 +296,7 @@ public class PerformanceStatsPlugin extends Plugin sendPerformance(); } + @Subscribe private void onOverlayMenuClicked(OverlayMenuClicked c) { if (!c.getOverlay().equals(performanceTrackerOverlay)) @@ -372,6 +357,7 @@ public class PerformanceStatsPlugin extends Plugin /** * Calculates damage dealt based on HP xp gained accounting for multipliers such as DMM mode + * * @param diff HP xp gained * @return damage dealt */ @@ -445,11 +431,13 @@ public class PerformanceStatsPlugin extends Plugin } } + @Subscribe private void onPerformance(final Performance performance) { partyDataMap.put(performance.getMemberId(), performance); } + @Subscribe private void onUserSync(final UserSync event) { if (isEnabled()) @@ -458,17 +446,20 @@ public class PerformanceStatsPlugin extends Plugin } } + @Subscribe private void onUserPart(final UserPart event) { partyDataMap.remove(event.getMemberId()); } + @Subscribe private void onPartyChanged(final PartyChanged event) { // Reset party partyDataMap.clear(); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("performancestats")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlPlugin.java index badae4a764..6c4376aef6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pestcontrol/PestControlPlugin.java @@ -58,7 +58,7 @@ import net.runelite.api.util.Text; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.ItemManager; import net.runelite.client.plugins.Plugin; @@ -132,9 +132,6 @@ public class PestControlPlugin extends Plugin @Inject private PortalWeaknessOverlay portalWeaknessOverlay; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) private Game game; @@ -188,32 +185,16 @@ public class PestControlPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); loadPlugin(); } @Override protected void shutDown() throws Exception { - eventBus.unregister(this); unloadPlugin(); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(ChatMessage.class, this, this::onChatMessage); - eventBus.subscribe(WidgetLoaded.class, this, this::onWidgetLoaded); - eventBus.subscribe(GameObjectSpawned.class, this, this::onGameObjectSpawned); - eventBus.subscribe(GameObjectChanged.class, this, this::onGameObjectChanged); - eventBus.subscribe(GameObjectDespawned.class, this, this::onGameObjectDespawned); - eventBus.subscribe(GroundObjectSpawned.class, this, this::onGroundObjectSpawned); - eventBus.subscribe(GroundObjectChanged.class, this, this::onGroundObjectChanged); - eventBus.subscribe(GroundObjectDespawned.class, this, this::onGroundObjectDespawned); - } - +@Subscribe private void onConfigChanged(ConfigChanged configEvent) { if (configEvent.getGroup().equals("pestcontrol")) @@ -360,6 +341,7 @@ public class PestControlPlugin extends Plugin } } + @Subscribe public void onGameStateChanged(GameStateChanged event) { // LOGGED_IN also triggers when teleporting to the island @@ -504,6 +486,7 @@ public class PestControlPlugin extends Plugin handlePointsInfoboxCounter(); } + @Subscribe private void onGameTick(GameTick gameTickEvent) { // Check for widgets on main island @@ -568,6 +551,7 @@ public class PestControlPlugin extends Plugin game.onGameTick(gameTickEvent); } + @Subscribe private void onChatMessage(ChatMessage chatMessage) { if (game != null && chatMessage.getType() == ChatMessageType.GAMEMESSAGE) @@ -580,6 +564,7 @@ public class PestControlPlugin extends Plugin } } + @Subscribe private void onWidgetLoaded(WidgetLoaded event) { if (game != null) @@ -655,33 +640,39 @@ public class PestControlPlugin extends Plugin } } + @Subscribe private void onGameObjectSpawned(GameObjectSpawned event) { handleTileObject(event.getTile(), event.getGameObject()); } + @Subscribe private void onGameObjectChanged(GameObjectChanged event) { unlistTileObject(event.getPrevious()); handleTileObject(event.getTile(), event.getGameObject()); } + @Subscribe private void onGameObjectDespawned(GameObjectDespawned event) { unlistTileObject(event.getGameObject()); } + @Subscribe private void onGroundObjectSpawned(GroundObjectSpawned event) { handleTileObject(event.getTile(), event.getGroundObject()); } + @Subscribe private void onGroundObjectChanged(GroundObjectChanged event) { unlistTileObject(event.getPrevious()); handleTileObject(event.getTile(), event.getGroundObject()); } + @Subscribe private void onGroundObjectDespawned(GroundObjectDespawned event) { unlistTileObject(event.getGroundObject()); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsPlugin.java index 03a1139304..4e55a3af6b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pileindicators/PileIndicatorsPlugin.java @@ -39,7 +39,7 @@ import net.runelite.api.NPC; import net.runelite.api.Player; import net.runelite.api.Varbits; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -71,9 +71,6 @@ public class PileIndicatorsPlugin extends Plugin @Inject private PileIndicatorsOverlay overlay; - @Inject - private EventBus eventBus; - private boolean enablePlayers; private boolean wildyOnlyPlayer; private Color playerPileColor; @@ -99,15 +96,12 @@ public class PileIndicatorsPlugin extends Plugin { updateConfig(); - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - overlayManager.add(overlay); } @Override protected void shutDown() throws Exception { - eventBus.unregister(this); overlayManager.remove(overlay); } @@ -203,6 +197,7 @@ public class PileIndicatorsPlugin extends Plugin return pileType; } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("pileindicators")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java index ffb42de2a1..75eb117cc8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java @@ -56,6 +56,7 @@ import net.runelite.api.events.PlayerSpawned; import net.runelite.api.util.Text; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.ClanManager; import net.runelite.client.plugins.Plugin; @@ -139,7 +140,6 @@ public class PlayerIndicatorsPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); resultCache.clear(); overlayManager.add(playerIndicatorsOverlay); overlayManager.add(playerIndicatorsMinimapOverlay); @@ -149,22 +149,12 @@ public class PlayerIndicatorsPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); overlayManager.remove(playerIndicatorsOverlay); overlayManager.remove(playerIndicatorsMinimapOverlay); resultCache.clear(); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(ClanMemberJoined.class, this, this::onClanMemberJoined); - eventBus.subscribe(ClanMemberLeft.class, this, this::onClanMemberLeft); - eventBus.subscribe(MenuEntryAdded.class, this, this::onMenuEntryAdded); - eventBus.subscribe(InteractingChanged.class, this, this::onInteractingChanged); - eventBus.subscribe(PlayerSpawned.class, this, this::onPlayerSpawned); - } - +@Subscribe private void onInteractingChanged(InteractingChanged event) { if (!this.highlightCallerTargets || event.getSource() == null || callers.isEmpty() || !isCaller(event.getSource())) @@ -194,6 +184,7 @@ public class PlayerIndicatorsPlugin extends Plugin callerPiles.put(caller.getName(), event.getTarget()); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("playerindicators")) @@ -204,16 +195,19 @@ public class PlayerIndicatorsPlugin extends Plugin updateConfig(); } + @Subscribe private void onClanMemberJoined(ClanMemberJoined event) { getCallerList(); } + @Subscribe private void onClanMemberLeft(ClanMemberLeft event) { getCallerList(); } + @Subscribe private void onPlayerSpawned(PlayerSpawned event) { final Player player = event.getPlayer(); @@ -251,6 +245,7 @@ public class PlayerIndicatorsPlugin extends Plugin }); } + @Subscribe private void onMenuEntryAdded(MenuEntryAdded menuEntryAdded) { int type = menuEntryAdded.getOpcode(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerscouter/PlayerScouter.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerscouter/PlayerScouter.java index 3a1169eebc..a454cc4053 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/playerscouter/PlayerScouter.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerscouter/PlayerScouter.java @@ -60,6 +60,7 @@ import net.runelite.api.events.PlayerSpawned; import net.runelite.api.kit.KitType; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.ItemManager; import net.runelite.client.game.ItemMapping; @@ -150,13 +151,13 @@ public class PlayerScouter extends Plugin private void addSubscriptions() { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); eventBus.subscribe(GameTick.class, this, this::onGameTick); eventBus.subscribe(PlayerDespawned.class, this, this::onPlayerDespawned); eventBus.subscribe(PlayerSpawned.class, this, this::onPlayerSpawned); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("playerscouter")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohPlugin.java index e5872c6b59..b4c8b5f626 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/poh/PohPlugin.java @@ -50,14 +50,14 @@ import net.runelite.api.Tile; import net.runelite.api.TileObject; import net.runelite.api.coords.LocalPoint; import net.runelite.api.events.AnimationChanged; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.DecorativeObjectDespawned; import net.runelite.api.events.DecorativeObjectSpawned; import net.runelite.api.events.GameObjectDespawned; import net.runelite.api.events.GameObjectSpawned; import net.runelite.api.events.GameStateChanged; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.HiscoreManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -105,9 +105,6 @@ public class PohPlugin extends Plugin @Inject private BurnerOverlay burnerOverlay; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) private boolean showPortals; @Getter(AccessLevel.PACKAGE) @@ -145,7 +142,6 @@ public class PohPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); overlayManager.add(overlay); overlayManager.add(burnerOverlay); @@ -155,25 +151,13 @@ public class PohPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(overlay); overlayManager.remove(burnerOverlay); pohObjects.clear(); incenseBurners.clear(); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameObjectSpawned.class, this, this::onGameObjectSpawned); - eventBus.subscribe(GameObjectDespawned.class, this, this::onGameObjectDespawned); - eventBus.subscribe(DecorativeObjectSpawned.class, this, this::onDecorativeObjectSpawned); - eventBus.subscribe(DecorativeObjectDespawned.class, this, this::onDecorativeObjectDespawned); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(AnimationChanged.class, this, this::onAnimationChanged); - } - +@Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("poh")) @@ -186,6 +170,7 @@ public class PohPlugin extends Plugin overlay.updateConfig(); } + @Subscribe private void onGameObjectSpawned(GameObjectSpawned event) { final GameObject gameObject = event.getGameObject(); @@ -205,12 +190,14 @@ public class PohPlugin extends Plugin incenseBurners.put(event.getTile(), new IncenseBurner(gameObject.getId(), countdownTimer, randomTimer, null)); } + @Subscribe private void onGameObjectDespawned(GameObjectDespawned event) { GameObject gameObject = event.getGameObject(); pohObjects.remove(gameObject); } + @Subscribe private void onDecorativeObjectSpawned(DecorativeObjectSpawned event) { DecorativeObject decorativeObject = event.getDecorativeObject(); @@ -220,12 +207,14 @@ public class PohPlugin extends Plugin } } + @Subscribe private void onDecorativeObjectDespawned(DecorativeObjectDespawned event) { DecorativeObject decorativeObject = event.getDecorativeObject(); pohObjects.remove(decorativeObject); } + @Subscribe private void onGameStateChanged(GameStateChanged event) { if (event.getGameState() == GameState.LOADING) @@ -235,6 +224,7 @@ public class PohPlugin extends Plugin } } + @Subscribe private void onAnimationChanged(AnimationChanged event) { final Actor actor = event.getActor(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonPlugin.java index 3581b03f3b..a95d034aa3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonPlugin.java @@ -55,7 +55,7 @@ import net.runelite.api.events.PlayerDespawned; import net.runelite.api.events.VarbitChanged; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.SpriteManager; import net.runelite.client.plugins.Plugin; @@ -115,9 +115,6 @@ public class PoisonPlugin extends Plugin @Inject private PoisonActorOverlay actorOverlay; - @Inject - private EventBus eventBus; - @Getter private int lastDamage; @@ -148,7 +145,6 @@ public class PoisonPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); actorOverlay.setFontSize(this.fontSize); overlayManager.add(poisonOverlay); @@ -167,8 +163,6 @@ public class PoisonPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(poisonOverlay); if (infobox != null) @@ -187,16 +181,7 @@ public class PoisonPlugin extends Plugin clientThread.invoke(this::resetHealthIcon); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(VarbitChanged.class, this, this::onVarbitChanged); - eventBus.subscribe(HitsplatApplied.class, this, this::onHitsplatApplied); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(NpcDespawned.class, this, this::onNpcDespawned); - eventBus.subscribe(PlayerDespawned.class, this, this::onPlayerDespawned); - } - +@Subscribe private void onVarbitChanged(VarbitChanged event) { final int poisonValue = client.getVar(VarPlayer.POISON); @@ -245,6 +230,7 @@ public class PoisonPlugin extends Plugin } } + @Subscribe private void onHitsplatApplied(HitsplatApplied event) { Hitsplat.HitsplatType type = event.getHitsplat().getHitsplatType(); @@ -309,6 +295,7 @@ public class PoisonPlugin extends Plugin info.setLastDamageTick(tickCount); } + @Subscribe private void onGameTick(GameTick event) { int tickCount = client.getTickCount(); @@ -317,16 +304,19 @@ public class PoisonPlugin extends Plugin poisonedActors.values().removeIf(info -> info.getLastDamageTick() + POISON_TICK_TICKS + 5 < tickCount); } + @Subscribe private void onNpcDespawned(NpcDespawned event) { poisonedActors.remove(event.getNpc()); } + @Subscribe private void onPlayerDespawned(PlayerDespawned event) { poisonedActors.remove(event.getPlayer()); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals(PoisonConfig.GROUP)) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerPlugin.java index 58666f2bca..b6927271ff 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayagainstplayer/PrayAgainstPlayerPlugin.java @@ -48,7 +48,7 @@ import net.runelite.api.events.InteractingChanged; import net.runelite.api.events.PlayerDespawned; import net.runelite.api.events.PlayerSpawned; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.SpriteManager; import net.runelite.client.plugins.Plugin; @@ -103,9 +103,6 @@ public class PrayAgainstPlayerPlugin extends Plugin @Inject private PrayAgainstPlayerConfig config; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) private Color attackerPlayerColor; @Getter(AccessLevel.PACKAGE) @@ -143,6 +140,7 @@ public class PrayAgainstPlayerPlugin extends Plugin return configManager.getConfig(PrayAgainstPlayerConfig.class); } + @Subscribe private void onGameStateChanged(GameStateChanged gameStateChanged) { if (gameStateChanged.getGameState() == GameState.LOGGED_IN) @@ -155,7 +153,6 @@ public class PrayAgainstPlayerPlugin extends Plugin protected void startUp() { updateConfig(); - addSubscriptions(); potentialPlayersAttackingMe = new ArrayList<>(); playersAttackingMe = new ArrayList<>(); @@ -166,22 +163,11 @@ public class PrayAgainstPlayerPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(overlay); overlayManager.remove(overlayPrayerTab); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(AnimationChanged.class, this, this::onAnimationChanged); - eventBus.subscribe(InteractingChanged.class, this, this::onInteractingChanged); - eventBus.subscribe(PlayerDespawned.class, this, this::onPlayerDespawned); - eventBus.subscribe(PlayerSpawned.class, this, this::onPlayerSpawned); - } - +@Subscribe private void onAnimationChanged(AnimationChanged animationChanged) { if ((animationChanged.getActor() instanceof Player) && (animationChanged.getActor().getInteracting() instanceof Player) && (animationChanged.getActor().getInteracting() == client.getLocalPlayer())) @@ -220,6 +206,7 @@ public class PrayAgainstPlayerPlugin extends Plugin } } + @Subscribe private void onInteractingChanged(InteractingChanged interactingChanged) { // if someone interacts with you, add them to the potential attackers list @@ -246,6 +233,7 @@ public class PrayAgainstPlayerPlugin extends Plugin } } + @Subscribe private void onPlayerDespawned(PlayerDespawned playerDespawned) { PlayerContainer container = findPlayerInAttackerList(playerDespawned.getPlayer()); @@ -260,6 +248,7 @@ public class PrayAgainstPlayerPlugin extends Plugin } } + @Subscribe private void onPlayerSpawned(PlayerSpawned playerSpawned) { if (this.markNewPlayer) @@ -425,6 +414,7 @@ public class PrayAgainstPlayerPlugin extends Plugin return null; } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("prayagainstplayer")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerPlugin.java index 017976786c..d89100c0ed 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerPlugin.java @@ -38,11 +38,11 @@ import net.runelite.api.InventoryID; import net.runelite.api.Item; import net.runelite.api.ItemContainer; import net.runelite.api.Prayer; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.ItemContainerChanged; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.ItemManager; import net.runelite.client.game.SpriteManager; import net.runelite.client.plugins.Plugin; @@ -90,9 +90,6 @@ public class PrayerPlugin extends Plugin @Inject private PrayerConfig config; - @Inject - private EventBus eventBus; - @Inject private ItemManager itemManager; @@ -123,7 +120,6 @@ public class PrayerPlugin extends Plugin protected void startUp() { updateConfig(); - addSubscriptions(); overlayManager.add(flickOverlay); overlayManager.add(doseOverlay); @@ -133,21 +129,13 @@ public class PrayerPlugin extends Plugin @Override protected void shutDown() { - eventBus.unregister(this); - overlayManager.remove(flickOverlay); overlayManager.remove(doseOverlay); overlayManager.remove(barOverlay); removeIndicators(); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(ItemContainerChanged.class, this, this::onItemContainerChanged); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - } - +@Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("prayer")) @@ -164,6 +152,7 @@ public class PrayerPlugin extends Plugin } } + @Subscribe private void onItemContainerChanged(final ItemContainerChanged event) { final ItemContainer container = event.getItemContainer(); @@ -189,6 +178,7 @@ public class PrayerPlugin extends Plugin } } + @Subscribe private void onGameTick(GameTick tick) { prayersActive = isAnyPrayerActive(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/prayeralert/PrayerAlertPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/prayeralert/PrayerAlertPlugin.java index 629d9de7b1..7123eeae1a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/prayeralert/PrayerAlertPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/prayeralert/PrayerAlertPlugin.java @@ -22,7 +22,7 @@ import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -48,9 +48,6 @@ public class PrayerAlertPlugin extends Plugin @Inject private PrayerAlertConfig config; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) private boolean alwaysShowAlert; @Getter(AccessLevel.PACKAGE) @@ -68,19 +65,16 @@ public class PrayerAlertPlugin extends Plugin this.alwaysShowAlert = config.alwaysShowAlert(); this.oldRenderMode = config.oldRenderMode(); - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - overlayManager.add(overlay); } @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(overlay); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("prayeralert")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/privateserver/PrivateServerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/privateserver/PrivateServerPlugin.java index 9cb53c288f..f8bceb609a 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/privateserver/PrivateServerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/privateserver/PrivateServerPlugin.java @@ -36,7 +36,7 @@ import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.client.RuneLite; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -58,8 +58,6 @@ public class PrivateServerPlugin extends Plugin private Client client; @Inject private PrivateServerConfig config; - @Inject - private EventBus eventBus; @Provides PrivateServerConfig getConfig(ConfigManager configManager) @@ -79,22 +77,15 @@ public class PrivateServerPlugin extends Plugin { client.setModulus(new BigInteger(config.modulus(), 16)); } - - addSubscriptions(); } @Override protected void shutDown() throws Exception { client.setModulus(null); - eventBus.unregister(this); - } - - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - } + } +@Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("privateserver")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPlugin.java index fcdfea0705..ee4df7beb6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/profiles/ProfilesPlugin.java @@ -32,7 +32,7 @@ import javax.inject.Singleton; import net.runelite.api.GameState; import net.runelite.api.events.GameStateChanged; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -57,9 +57,6 @@ public class ProfilesPlugin extends Plugin @Inject private ProfilesConfig config; - @Inject - private EventBus eventBus; - @Inject private ScheduledExecutorService executorService; @@ -78,11 +75,9 @@ public class ProfilesPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); if (this.switchToPanel) { - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); } panel = injector.getInstance(ProfilesPanel.class); @@ -104,11 +99,10 @@ public class ProfilesPlugin extends Plugin @Override protected void shutDown() { - eventBus.unregister(this); - clientToolbar.removeNavigation(navButton); } + @Subscribe private void onGameStateChanged(GameStateChanged event) { if (!this.switchToPanel) @@ -124,6 +118,7 @@ public class ProfilesPlugin extends Plugin } } + @Subscribe private void onConfigChanged(ConfigChanged event) throws Exception { if (event.getGroup().equals("profiles") && event.getKey().equals("rememberPassword")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverPlugin.java index 8bb0bfad49..2ce1506b43 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/puzzlesolver/PuzzleSolverPlugin.java @@ -51,7 +51,7 @@ import static net.runelite.api.widgets.WidgetInfo.LIGHT_BOX_BUTTON_G; import static net.runelite.api.widgets.WidgetInfo.LIGHT_BOX_BUTTON_H; import static net.runelite.api.widgets.WidgetInfo.TO_GROUP; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -86,9 +86,6 @@ public class PuzzleSolverPlugin extends Plugin @Inject private PuzzleSolverConfig config; - @Inject - private EventBus eventBus; - private LightboxState lightbox; private final LightboxState[] changes = new LightboxState[LightBox.COMBINATIONS_POWER]; private Combination lastClick; @@ -105,7 +102,6 @@ public class PuzzleSolverPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); overlayManager.add(overlay); } @@ -113,25 +109,16 @@ public class PuzzleSolverPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(overlay); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(WidgetLoaded.class, this, this::onWidgetLoaded); - eventBus.subscribe(MenuOptionClicked.class, this, this::onMenuOptionClicked); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - } - - @Provides +@Provides PuzzleSolverConfig provideConfig(ConfigManager configManager) { return configManager.getConfig(PuzzleSolverConfig.class); } + @Subscribe private void onWidgetLoaded(WidgetLoaded widget) { if (widget.getGroupId() != WidgetID.VARROCK_MUSEUM_QUIZ_GROUP_ID) @@ -165,6 +152,7 @@ public class PuzzleSolverPlugin extends Plugin } } + @Subscribe private void onMenuOptionClicked(MenuOptionClicked menuOptionClicked) { int widgetId = menuOptionClicked.getParam1(); @@ -221,6 +209,7 @@ public class PuzzleSolverPlugin extends Plugin } } + @Subscribe public void onGameTick(GameTick event) { Widget lightboxWidget = client.getWidget(WidgetInfo.LIGHT_BOX_CONTENTS); @@ -309,6 +298,7 @@ public class PuzzleSolverPlugin extends Plugin } } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("puzzlesolver")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java index c50ba43ce1..813c3ae9f0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pvptools/PvpToolsPlugin.java @@ -49,7 +49,7 @@ import net.runelite.api.util.Text; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; import net.runelite.client.config.Keybind; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.ItemManager; import net.runelite.client.input.KeyManager; @@ -103,9 +103,6 @@ public class PvpToolsPlugin extends Plugin @Inject private ItemManager itemManager; - @Inject - private EventBus eventBus; - private final PvpToolsPlugin uhPvpToolsPlugin = this; /** @@ -178,7 +175,7 @@ public class PvpToolsPlugin extends Plugin } }; - private int[] overheadCount = new int[]{0, 0, 0}; + private int[] overheadCount = new int[] {0, 0, 0}; @Getter private int enemyPlayerCount = 0; @@ -234,7 +231,6 @@ public class PvpToolsPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); overlayManager.add(playerCountOverlay); keyManager.registerKeyListener(renderselfHotkeyListener); @@ -273,8 +269,6 @@ public class PvpToolsPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(playerCountOverlay); keyManager.unregisterKeyListener(renderselfHotkeyListener); clientToolbar.removeNavigation(navButton); @@ -287,15 +281,7 @@ public class PvpToolsPlugin extends Plugin loaded = false; } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(ItemContainerChanged.class, this, this::onItemContainerChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(PlayerSpawned.class, this, this::onPlayerSpawned); - eventBus.subscribe(PlayerDespawned.class, this, this::onPlayerDespawned); - } - +@Subscribe private void onConfigChanged(ConfigChanged configChanged) { if (!"pvptools".equals(configChanged.getGroup())) @@ -371,6 +357,7 @@ public class PvpToolsPlugin extends Plugin } } + @Subscribe private void onItemContainerChanged(ItemContainerChanged event) { if (event.getItemContainer().equals(client.getItemContainer(InventoryID.INVENTORY)) && @@ -380,6 +367,7 @@ public class PvpToolsPlugin extends Plugin } } + @Subscribe private void onGameStateChanged(GameStateChanged event) { if (event.getGameState().equals(GameState.LOGGED_IN)) @@ -399,6 +387,7 @@ public class PvpToolsPlugin extends Plugin } } + @Subscribe private void onPlayerSpawned(PlayerSpawned event) { if (this.countPlayers && PvPUtil.isAttackable(client, event.getPlayer())) @@ -411,6 +400,7 @@ public class PvpToolsPlugin extends Plugin } } + @Subscribe private void onPlayerDespawned(PlayerDespawned event) { if (this.countPlayers && PvPUtil.isAttackable(client, event.getPlayer())) @@ -473,7 +463,7 @@ public class PvpToolsPlugin extends Plugin private void countOverHeads() { - overheadCount = new int[]{0, 0, 0}; + overheadCount = new int[] {0, 0, 0}; for (Player p : client.getPlayers()) { if (Objects.nonNull(p) && PvPUtil.isAttackable(client, p) && diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java index 4975ec9465..b7fd485e76 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/pyramidplunder/PyramidPlunderPlugin.java @@ -55,7 +55,7 @@ import net.runelite.api.events.WallObjectChanged; import net.runelite.api.events.WallObjectDespawned; import net.runelite.api.events.WallObjectSpawned; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.ItemManager; import net.runelite.client.plugins.Plugin; @@ -80,7 +80,7 @@ public class PyramidPlunderPlugin extends Plugin static final int CLOSED_DOOR = TOMB_DOOR_20948; static final int OPENED_DOOR = TOMB_DOOR_20949; -// // Next 2 are in here for anyone who wants to spend more time on this + // // Next 2 are in here for anyone who wants to spend more time on this // private static final Set LOOTABLE = ImmutableSet.of( // GRAND_GOLD_CHEST, // SARCOPHAGUS_21255, @@ -120,9 +120,6 @@ public class PyramidPlunderPlugin extends Plugin @Inject private PyramidPlunderOverlay pyramidPlunderOverlay; - @Inject - private EventBus eventBus; - @Getter private boolean isInGame; @@ -150,32 +147,17 @@ public class PyramidPlunderPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); } @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(pyramidPlunderOverlay); highlighted.clear(); reset(); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(VarbitChanged.class, this, this::onVarbitChanged); - eventBus.subscribe(GameObjectSpawned.class, this, this::onGameObjectSpawned); - eventBus.subscribe(GameObjectChanged.class, this, this::onGameObjectChanged); - eventBus.subscribe(GameObjectDespawned.class, this, this::onGameObjectDespawned); - eventBus.subscribe(WallObjectSpawned.class, this, this::onWallObjectSpawned); - eventBus.subscribe(WallObjectChanged.class, this, this::onWallObjectChanged); - eventBus.subscribe(WallObjectDespawned.class, this, this::onWallObjectDespawned); - } - +@Subscribe private void onConfigChanged(ConfigChanged event) { if (!"pyramidplunder".equals(event.getGroup())) @@ -225,6 +207,7 @@ public class PyramidPlunderPlugin extends Plugin ); } + @Subscribe private void onGameStateChanged(GameStateChanged event) { switch (event.getGameState()) @@ -258,6 +241,7 @@ public class PyramidPlunderPlugin extends Plugin } + @Subscribe private void onVarbitChanged(VarbitChanged event) { int lastValue = pyramidTimer; @@ -292,31 +276,37 @@ public class PyramidPlunderPlugin extends Plugin removeTimer(); } + @Subscribe private void onGameObjectSpawned(GameObjectSpawned event) { onTileObject(event.getTile(), null, event.getGameObject()); } + @Subscribe private void onGameObjectChanged(GameObjectChanged event) { onTileObject(event.getTile(), event.getPrevious(), event.getGameObject()); } + @Subscribe private void onGameObjectDespawned(GameObjectDespawned event) { onTileObject(event.getTile(), event.getGameObject(), null); } + @Subscribe private void onWallObjectSpawned(WallObjectSpawned event) { onTileObject(event.getTile(), null, event.getWallObject()); } + @Subscribe private void onWallObjectChanged(WallObjectChanged event) { onTileObject(event.getTile(), event.getPrevious(), event.getWallObject()); } + @Subscribe private void onWallObjectDespawned(WallObjectDespawned event) { onTileObject(event.getTile(), event.getWallObject(), null); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/questlist/QuestListPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/questlist/QuestListPlugin.java index 018a9c502c..72987fadf2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/questlist/QuestListPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/questlist/QuestListPlugin.java @@ -47,6 +47,7 @@ import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.ScriptCallbackEvent; import net.runelite.api.events.VarClientIntChanged; import net.runelite.api.events.VarbitChanged; +import net.runelite.api.util.Text; import net.runelite.api.vars.InterfaceTab; import net.runelite.api.widgets.JavaScriptCallback; import net.runelite.api.widgets.Widget; @@ -54,12 +55,11 @@ import net.runelite.api.widgets.WidgetInfo; import net.runelite.api.widgets.WidgetPositionMode; import net.runelite.api.widgets.WidgetType; import net.runelite.client.callback.ClientThread; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.game.chatbox.ChatboxPanelManager; import net.runelite.client.game.chatbox.ChatboxTextInput; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; -import net.runelite.api.util.Text; @PluginDescriptor( name = "Quest List", @@ -88,9 +88,6 @@ public class QuestListPlugin extends Plugin @Inject private ClientThread clientThread; - @Inject - private EventBus eventBus; - private ChatboxTextInput searchInput; private Widget questSearchButton; private Widget questHideButton; @@ -102,15 +99,12 @@ public class QuestListPlugin extends Plugin @Override protected void startUp() { - addSubscriptions(); clientThread.invoke(this::addQuestButtons); } @Override protected void shutDown() { - eventBus.unregister(this); - Widget header = client.getWidget(WidgetInfo.QUESTLIST_BOX); if (header != null) { @@ -118,14 +112,7 @@ public class QuestListPlugin extends Plugin } } - private void addSubscriptions() - { - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(ScriptCallbackEvent.class, this, this::onScriptCallbackEvent); - eventBus.subscribe(VarbitChanged.class, this, this::onVarbitChanged); - eventBus.subscribe(VarClientIntChanged.class, this, this::onVarClientIntChanged); - } - +@Subscribe private void onGameStateChanged(GameStateChanged e) { if (e.getGameState() == GameState.LOGGING_IN) @@ -134,6 +121,7 @@ public class QuestListPlugin extends Plugin } } + @Subscribe private void onScriptCallbackEvent(ScriptCallbackEvent event) { if (!event.getEventName().equals("questProgressUpdated")) @@ -183,6 +171,7 @@ public class QuestListPlugin extends Plugin } } + @Subscribe private void onVarbitChanged(VarbitChanged varbitChanged) { if (isChatboxOpen() && isNotOnQuestTab()) @@ -191,6 +180,7 @@ public class QuestListPlugin extends Plugin } } + @Subscribe private void onVarClientIntChanged(VarClientIntChanged varClientIntChanged) { if (varClientIntChanged.getIndex() == VarClientInt.INTERFACE_TAB.getIndex() && isChatboxOpen() && isNotOnQuestTab()) 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 2667f7c374..0acf108d5d 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 @@ -65,6 +65,7 @@ import net.runelite.api.events.ChatMessage; import net.runelite.api.events.ClientTick; import net.runelite.api.events.VarbitChanged; import net.runelite.api.events.WidgetHiddenChanged; +import net.runelite.api.util.Text; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.callback.ClientThread; @@ -74,6 +75,7 @@ import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.chat.QueuedMessage; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.events.OverlayMenuClicked; import net.runelite.client.game.ItemManager; @@ -93,13 +95,12 @@ import net.runelite.client.ui.overlay.infobox.InfoBoxManager; import net.runelite.client.ui.overlay.tooltip.Tooltip; import net.runelite.client.ui.overlay.tooltip.TooltipManager; import net.runelite.client.util.ImageUtil; -import net.runelite.api.util.Text; -import org.apache.commons.lang3.StringUtils; -import static org.apache.commons.lang3.StringUtils.containsIgnoreCase; import net.runelite.client.ws.PartyMember; import net.runelite.client.ws.PartyService; import net.runelite.client.ws.WSClient; import net.runelite.http.api.ws.messages.party.PartyChatMessage; +import org.apache.commons.lang3.StringUtils; +import static org.apache.commons.lang3.StringUtils.containsIgnoreCase; @PluginDescriptor( name = "CoX Scouter", @@ -290,7 +291,6 @@ public class RaidsPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); overlayManager.add(overlay); overlayManager.add(pointsOverlay); @@ -316,8 +316,6 @@ public class RaidsPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(overlay); overlayManager.remove(pointsOverlay); clientToolbar.removeNavigation(navButton); @@ -334,16 +332,7 @@ public class RaidsPlugin extends Plugin reset(); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(WidgetHiddenChanged.class, this, this::onWidgetHiddenChanged); - eventBus.subscribe(VarbitChanged.class, this, this::onVarbitChanged); - eventBus.subscribe(ChatMessage.class, this, this::onChatMessage); - eventBus.subscribe(ClientTick.class, this, this::onClientTick); - eventBus.subscribe(OverlayMenuClicked.class, this, this::onOverlayMenuClicked); - } - +@Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("raids")) @@ -375,6 +364,7 @@ public class RaidsPlugin extends Plugin clientThread.invokeLater(() -> checkRaidPresence(true)); } + @Subscribe private void onWidgetHiddenChanged(WidgetHiddenChanged event) { if (!inRaidChambers || event.isHidden()) @@ -390,6 +380,7 @@ public class RaidsPlugin extends Plugin } } + @Subscribe private void onVarbitChanged(VarbitChanged event) { checkRaidPresence(false); @@ -399,6 +390,7 @@ public class RaidsPlugin extends Plugin } } + @Subscribe private void onChatMessage(ChatMessage event) { if (inRaidChambers && event.getType() == ChatMessageType.FRIENDSCHATNOTIFICATION) @@ -531,6 +523,7 @@ public class RaidsPlugin extends Plugin } } + @Subscribe private void onClientTick(ClientTick event) { if (!this.raidsTimer @@ -547,6 +540,7 @@ public class RaidsPlugin extends Plugin } } + @Subscribe private void onOverlayMenuClicked(OverlayMenuClicked event) { OverlayMenuEntry entry = event.getEntry(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raids/shortcuts/ShortcutPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/raids/shortcuts/ShortcutPlugin.java index 8448937d91..996d6ae93f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raids/shortcuts/ShortcutPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raids/shortcuts/ShortcutPlugin.java @@ -15,7 +15,7 @@ import net.runelite.api.events.GameObjectDespawned; import net.runelite.api.events.GameObjectSpawned; import net.runelite.api.events.GameTick; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -41,8 +41,6 @@ public class ShortcutPlugin extends Plugin private ShortcutOverlay overlay; @Inject private ShortcutConfig config; - @Inject - private EventBus eventBus; @Getter(AccessLevel.PACKAGE) private boolean highlightShortcuts; @@ -61,7 +59,6 @@ public class ShortcutPlugin extends Plugin @Override protected void startUp() { - addSubscriptions(); this.highlightShortcuts = config.highlightShortcuts(); overlayManager.add(overlay); @@ -70,18 +67,10 @@ public class ShortcutPlugin extends Plugin @Override protected void shutDown() { - eventBus.unregister(this); overlayManager.remove(overlay); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameObjectSpawned.class, this, this::onGameObjectSpawned); - eventBus.subscribe(GameObjectDespawned.class, this, this::onGameObjectDespawned); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - } - +@Subscribe private void onGameObjectSpawned(GameObjectSpawned event) { WorldPoint worldPoint = WorldPoint.fromLocalInstance(client, event.getGameObject().getLocalLocation()); @@ -95,16 +84,19 @@ public class ShortcutPlugin extends Plugin } } + @Subscribe private void onGameObjectDespawned(GameObjectDespawned event) { shortcut.remove(event.getGameObject()); } + @Subscribe private void onGameTick(GameTick tick) { shortcut.removeIf(object -> object.getCanvasLocation() == null); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("shortcut")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/RaidsThievingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/RaidsThievingPlugin.java index 014b476b9b..d743ae3c3e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/RaidsThievingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/raidsthieving/RaidsThievingPlugin.java @@ -47,7 +47,7 @@ import net.runelite.api.events.GraphicsObjectCreated; import net.runelite.api.events.VarbitChanged; import net.runelite.client.Notifier; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -79,8 +79,6 @@ public class RaidsThievingPlugin extends Plugin private Notifier notifier; @Inject private RaidsThievingConfig config; - @Inject - private EventBus eventBus; @Getter(AccessLevel.PACKAGE) private final Map chests = new HashMap<>(); @@ -110,7 +108,6 @@ public class RaidsThievingPlugin extends Plugin { reset(); updateConfig(); - addSubscriptions(); overlayManager.add(overlay); } @@ -122,17 +119,9 @@ public class RaidsThievingPlugin extends Plugin lastActionTime = Instant.ofEpochMilli(0); chests.clear(); - eventBus.unregister(this); - } - - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameObjectSpawned.class, this, this::onGameObjectSpawned); - eventBus.subscribe(GraphicsObjectCreated.class, this, this::onGraphicsObjectCreated); - eventBus.subscribe(VarbitChanged.class, this, this::onVarbitChanged); - } + } +@Subscribe private void onGameObjectSpawned(GameObjectSpawned event) { GameObject obj = event.getGameObject(); @@ -197,6 +186,7 @@ public class RaidsThievingPlugin extends Plugin } } + @Subscribe private void onGraphicsObjectCreated(GraphicsObjectCreated event) { GraphicsObject obj = event.getGraphicsObject(); @@ -213,6 +203,7 @@ public class RaidsThievingPlugin extends Plugin } } + @Subscribe private void onVarbitChanged(VarbitChanged event) { boolean setting = client.getVar(Varbits.IN_RAID) == 1; @@ -224,6 +215,7 @@ public class RaidsThievingPlugin extends Plugin } } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("raidsthievingplugin")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/randomevents/RandomEventPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/randomevents/RandomEventPlugin.java index 4f9c926a88..4a5b62607d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/randomevents/RandomEventPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/randomevents/RandomEventPlugin.java @@ -42,7 +42,7 @@ import net.runelite.api.events.MenuEntryAdded; import net.runelite.api.events.NpcDespawned; import net.runelite.client.Notifier; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -97,9 +97,6 @@ public class RandomEventPlugin extends Plugin @Inject private RandomEventConfig config; - @Inject - private EventBus eventBus; - private boolean notifyAllEvents; private boolean notifyDemon; private boolean notifyForester; @@ -121,25 +118,16 @@ public class RandomEventPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); } @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - lastNotificationTick = 0; currentRandomEvent = null; } - private void addSubscriptions() - { - eventBus.subscribe(InteractingChanged.class, this, this::onInteractingChanged); - eventBus.subscribe(MenuEntryAdded.class, this, this::onMenuEntryAdded); - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - } - +@Subscribe private void onInteractingChanged(InteractingChanged event) { Actor source = event.getSource(); @@ -172,6 +160,7 @@ public class RandomEventPlugin extends Plugin } } + @Subscribe private void onNpcDespawned(NpcDespawned npcDespawned) { NPC npc = npcDespawned.getNpc(); @@ -182,6 +171,7 @@ public class RandomEventPlugin extends Plugin } } + @Subscribe private void onMenuEntryAdded(MenuEntryAdded event) { if (event.getOpcode() >= MenuOpcode.NPC_FIRST_OPTION.getId() @@ -233,6 +223,7 @@ public class RandomEventPlugin extends Plugin } } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!"randomevents".equals(event.getGroup())) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/reminders/RemindersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/reminders/RemindersPlugin.java index 04d292d17e..b9772fd46c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/reminders/RemindersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/reminders/RemindersPlugin.java @@ -33,7 +33,6 @@ import java.time.temporal.ChronoUnit; import javax.inject.Inject; import lombok.extern.slf4j.Slf4j; import net.runelite.api.ChatMessageType; -import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.events.GameStateChanged; import net.runelite.client.chat.ChatColorType; @@ -41,7 +40,7 @@ import net.runelite.client.chat.ChatMessageBuilder; import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.chat.QueuedMessage; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -60,12 +59,6 @@ import net.runelite.client.task.Schedule; public class RemindersPlugin extends Plugin { - @Inject - private Client client; - - @Inject - private EventBus eventBus; - @Inject private RemindersConfig config; @@ -93,7 +86,6 @@ public class RemindersPlugin extends Plugin private int personalReminderTime3; - @Provides RemindersConfig provideConfig(ConfigManager configManager) { @@ -103,23 +95,16 @@ public class RemindersPlugin extends Plugin @Override public void startUp() { - addSubscriptions(); updateConfig(); } @Override public void shutDown() { - eventBus.unregister(this); loginTime = null; } - private void addSubscriptions() - { - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - } - +@Subscribe public void onGameStateChanged(GameStateChanged event) { final GameState state = event.getGameState(); @@ -142,6 +127,7 @@ public class RemindersPlugin extends Plugin } } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("Reminders")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/reorderprayers/ReorderPrayersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/reorderprayers/ReorderPrayersPlugin.java index 85638b9d22..3de0159ca0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/reorderprayers/ReorderPrayersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/reorderprayers/ReorderPrayersPlugin.java @@ -47,7 +47,7 @@ import static net.runelite.api.widgets.WidgetConfig.DRAG_ON; import net.runelite.api.widgets.WidgetID; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.menus.MenuManager; import net.runelite.client.menus.WidgetMenuOption; @@ -181,9 +181,6 @@ public class ReorderPrayersPlugin extends Plugin @Inject private MenuManager menuManager; - @Inject - private EventBus eventBus; - private Prayer[] prayerOrder; static String prayerOrderToString(Prayer[] prayerOrder) @@ -224,7 +221,6 @@ public class ReorderPrayersPlugin extends Plugin @Override protected void startUp() throws Exception { - addSubscriptions(); refreshPrayerTabOption(); prayerOrder = stringToPrayerOrder(config.prayerOrder()); @@ -234,22 +230,12 @@ public class ReorderPrayersPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - clearPrayerTabMenus(); prayerOrder = Prayer.values(); reorderPrayers(false); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(WidgetLoaded.class, this, this::onWidgetLoaded); - eventBus.subscribe(DraggingWidgetChanged.class, this, this::onDraggingWidgetChanged); - eventBus.subscribe(WidgetMenuOptionClicked.class, this, this::onWidgetMenuOptionClicked); - } - +@Subscribe private void onGameStateChanged(GameStateChanged event) { if (event.getGameState() == GameState.LOGGED_IN) @@ -258,6 +244,7 @@ public class ReorderPrayersPlugin extends Plugin } } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals(CONFIG_GROUP_KEY)) @@ -274,6 +261,7 @@ public class ReorderPrayersPlugin extends Plugin } } + @Subscribe private void onWidgetLoaded(WidgetLoaded event) { if (event.getGroupId() == WidgetID.PRAYER_GROUP_ID || event.getGroupId() == WidgetID.QUICK_PRAYERS_GROUP_ID) @@ -282,6 +270,7 @@ public class ReorderPrayersPlugin extends Plugin } } + @Subscribe private void onDraggingWidgetChanged(DraggingWidgetChanged event) { // is dragging widget and mouse button released @@ -313,6 +302,7 @@ public class ReorderPrayersPlugin extends Plugin } } + @Subscribe private void onWidgetMenuOptionClicked(WidgetMenuOptionClicked event) { if (event.getWidget() == WidgetInfo.FIXED_VIEWPORT_PRAYER_TAB diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/reportbutton/ReportButtonPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/reportbutton/ReportButtonPlugin.java index ca90e7b599..ffc03c1493 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/reportbutton/ReportButtonPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/reportbutton/ReportButtonPlugin.java @@ -44,7 +44,7 @@ import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -76,9 +76,6 @@ public class ReportButtonPlugin extends Plugin @Inject private ReportButtonConfig config; - @Inject - private EventBus eventBus; - private TimeStyle timeStyle; @Provides @@ -90,7 +87,6 @@ public class ReportButtonPlugin extends Plugin @Override public void startUp() { - addSubscriptions(); this.timeStyle = config.time(); clientThread.invoke(this::updateReportButtonTime); @@ -99,8 +95,6 @@ public class ReportButtonPlugin extends Plugin @Override public void shutDown() { - eventBus.unregister(this); - clientThread.invoke(() -> { Widget reportButton = client.getWidget(WidgetInfo.CHATBOX_REPORT_TEXT); @@ -111,12 +105,7 @@ public class ReportButtonPlugin extends Plugin }); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - } - +@Subscribe private void onGameStateChanged(GameStateChanged event) { GameState state = event.getGameState(); @@ -217,6 +206,7 @@ public class ReportButtonPlugin extends Plugin return DATE_FORMAT.format(new Date()); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("reportButton")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/RoguesDenPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/RoguesDenPlugin.java index e77b5e2019..85e678234f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/RoguesDenPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/roguesden/RoguesDenPlugin.java @@ -49,7 +49,7 @@ import net.runelite.api.events.ItemContainerChanged; import net.runelite.api.events.WallObjectChanged; import net.runelite.api.events.WallObjectDespawned; import net.runelite.api.events.WallObjectSpawned; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.ui.overlay.OverlayManager; @@ -83,13 +83,9 @@ public class RoguesDenPlugin extends Plugin @Inject private RoguesDenMinimapOverlay minimapOverlay; - @Inject - private EventBus eventBus; - @Override protected void startUp() throws Exception { - addSubscriptions(); overlayManager.add(overlay); overlayManager.add(minimapOverlay); @@ -98,8 +94,6 @@ public class RoguesDenPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(overlay); overlayManager.remove(minimapOverlay); obstaclesHull.clear(); @@ -107,24 +101,7 @@ public class RoguesDenPlugin extends Plugin hasGem = false; } - private void addSubscriptions() - { - eventBus.subscribe(ItemContainerChanged.class, this, this::onItemContainerChanged); - eventBus.subscribe(GameObjectSpawned.class, this, this::onGameObjectSpawned); - eventBus.subscribe(GameObjectChanged.class, this, this::onGameObjectChanged); - eventBus.subscribe(GameObjectDespawned.class, this, this::onGameObjectDespawned); - eventBus.subscribe(GroundObjectSpawned.class, this, this::onGroundObjectSpawned); - eventBus.subscribe(GroundObjectChanged.class, this, this::onGroundObjectChanged); - eventBus.subscribe(GroundObjectDespawned.class, this, this::onGroundObjectDespawned); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(WallObjectSpawned.class, this, this::onWallObjectSpawned); - eventBus.subscribe(WallObjectChanged.class, this, this::onWallObjectChanged); - eventBus.subscribe(WallObjectDespawned.class, this, this::onWallObjectDespawned); - eventBus.subscribe(DecorativeObjectSpawned.class, this, this::onDecorativeObjectSpawned); - eventBus.subscribe(DecorativeObjectChanged.class, this, this::onDecorativeObjectChanged); - eventBus.subscribe(DecorativeObjectDespawned.class, this, this::onDecorativeObjectDespawned); - } - +@Subscribe private void onItemContainerChanged(ItemContainerChanged event) { if (event.getItemContainer() != client.getItemContainer(InventoryID.INVENTORY)) @@ -135,6 +112,7 @@ public class RoguesDenPlugin extends Plugin hasGem = ItemUtil.containsItemId(event.getItemContainer().getItems(), MYSTIC_JEWEL); } + @Subscribe private void onGameStateChanged(GameStateChanged event) { if (event.getGameState() == GameState.LOADING) @@ -144,61 +122,73 @@ public class RoguesDenPlugin extends Plugin } } + @Subscribe private void onGameObjectSpawned(GameObjectSpawned event) { onTileObject(event.getTile(), null, event.getGameObject()); } + @Subscribe private void onGameObjectChanged(GameObjectChanged event) { onTileObject(event.getTile(), event.getPrevious(), event.getGameObject()); } + @Subscribe private void onGameObjectDespawned(GameObjectDespawned event) { onTileObject(event.getTile(), event.getGameObject(), null); } + @Subscribe private void onGroundObjectSpawned(GroundObjectSpawned event) { onTileObject(event.getTile(), null, event.getGroundObject()); } + @Subscribe private void onGroundObjectChanged(GroundObjectChanged event) { onTileObject(event.getTile(), event.getPrevious(), event.getGroundObject()); } + @Subscribe private void onGroundObjectDespawned(GroundObjectDespawned event) { onTileObject(event.getTile(), event.getGroundObject(), null); } + @Subscribe private void onWallObjectSpawned(WallObjectSpawned event) { onTileObject(event.getTile(), null, event.getWallObject()); } + @Subscribe private void onWallObjectChanged(WallObjectChanged event) { onTileObject(event.getTile(), event.getPrevious(), event.getWallObject()); } + @Subscribe private void onWallObjectDespawned(WallObjectDespawned event) { onTileObject(event.getTile(), event.getWallObject(), null); } + @Subscribe private void onDecorativeObjectSpawned(DecorativeObjectSpawned event) { onTileObject(event.getTile(), null, event.getDecorativeObject()); } + @Subscribe private void onDecorativeObjectChanged(DecorativeObjectChanged event) { onTileObject(event.getTile(), event.getPrevious(), event.getDecorativeObject()); } + @Subscribe private void onDecorativeObjectDespawned(DecorativeObjectDespawned event) { onTileObject(event.getTile(), event.getDecorativeObject(), null); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java index f8a057ed86..18d9b0baa4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runecraft/RunecraftPlugin.java @@ -45,7 +45,6 @@ import net.runelite.api.NPC; import net.runelite.api.NpcID; import net.runelite.api.VarPlayer; import net.runelite.api.events.ChatMessage; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.DecorativeObjectDespawned; import net.runelite.api.events.DecorativeObjectSpawned; import net.runelite.api.events.GameStateChanged; @@ -56,6 +55,8 @@ import net.runelite.api.events.NpcSpawned; import net.runelite.client.Notifier; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.menus.BaseComparableEntry; import static net.runelite.client.menus.ComparableEntries.newBaseComparableEntry; import net.runelite.client.menus.MenuManager; @@ -147,7 +148,6 @@ public class RunecraftPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); overlayManager.add(abyssOverlay); overlayManager.add(abyssMinimapOverlay); overlayManager.add(runecraftOverlay); @@ -157,7 +157,6 @@ public class RunecraftPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); abyssObjects.clear(); darkMage = null; degradedPouchInInventory = false; @@ -167,19 +166,7 @@ public class RunecraftPlugin extends Plugin removeSwaps(); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(ChatMessage.class, this, this::onChatMessage); - eventBus.subscribe(DecorativeObjectSpawned.class, this, this::onDecorativeObjectSpawned); - eventBus.subscribe(DecorativeObjectDespawned.class, this, this::onDecorativeObjectDespawned); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(ItemContainerChanged.class, this, this::onItemContainerChanged); - eventBus.subscribe(NpcSpawned.class, this, this::onNpcSpawned); - eventBus.subscribe(NpcDespawned.class, this, this::onNpcDespawned); - } - - private void onGameTick(GameTick event) +private void onGameTick(GameTick event) { final int before = pouchVar; pouchVar = client.getVar(VarPlayer.POUCH_STATUS); @@ -212,6 +199,7 @@ public class RunecraftPlugin extends Plugin } } + @Subscribe private void onItemContainerChanged(ItemContainerChanged event) { final ItemContainer container = event.getItemContainer(); @@ -259,6 +247,7 @@ public class RunecraftPlugin extends Plugin } } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("runecraft")) @@ -275,6 +264,7 @@ public class RunecraftPlugin extends Plugin } } + @Subscribe private void onChatMessage(ChatMessage event) { if (event.getType() != ChatMessageType.GAMEMESSAGE) @@ -288,6 +278,7 @@ public class RunecraftPlugin extends Plugin } } + @Subscribe private void onDecorativeObjectSpawned(DecorativeObjectSpawned event) { final DecorativeObject decorativeObject = event.getDecorativeObject(); @@ -297,12 +288,14 @@ public class RunecraftPlugin extends Plugin } } + @Subscribe private void onDecorativeObjectDespawned(DecorativeObjectDespawned event) { final DecorativeObject decorativeObject = event.getDecorativeObject(); abyssObjects.remove(decorativeObject); } + @Subscribe private void onGameStateChanged(GameStateChanged event) { final GameState gameState = event.getGameState(); @@ -324,6 +317,7 @@ public class RunecraftPlugin extends Plugin } } + @Subscribe private void onNpcSpawned(NpcSpawned event) { final NPC npc = event.getNpc(); @@ -334,6 +328,7 @@ public class RunecraftPlugin extends Plugin } } + @Subscribe private void onNpcDespawned(NpcDespawned event) { final NPC npc = event.getNpc(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuPlugin.java index c1d9e953eb..e58c7000e6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runedoku/RunedokuPlugin.java @@ -32,7 +32,7 @@ import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -60,9 +60,6 @@ public class RunedokuPlugin extends Plugin @Inject private RunedokuConfig config; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) private Color mindRuneColor; @Getter(AccessLevel.PACKAGE) @@ -95,19 +92,16 @@ public class RunedokuPlugin extends Plugin { updateConfig(); - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - overlayManager.add(runedokuOverlay); } @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(runedokuOverlay); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("runedoku")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchPlugin.java index 4255248a2b..23ccb5ae42 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runepouch/RunepouchPlugin.java @@ -31,7 +31,7 @@ import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -55,9 +55,6 @@ public class RunepouchPlugin extends Plugin @Inject private RunepouchConfig config; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) private Color fontColor; @Getter(AccessLevel.PACKAGE) @@ -75,7 +72,6 @@ public class RunepouchPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); overlayManager.add(overlay); } @@ -83,12 +79,11 @@ public class RunepouchPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(overlay); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("runepouch")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerPlugin.java index 8dd065337d..90c46a4efd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerPlugin.java @@ -42,9 +42,9 @@ import javax.inject.Inject; import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; -import net.runelite.client.events.ConfigChanged; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.input.MouseManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -92,9 +92,6 @@ public class ScreenMarkerPlugin extends Plugin @Inject private ColorPickerManager colorPickerManager; - @Inject - private EventBus eventBus; - private ScreenMarkerMouseListener mouseListener; private ScreenMarkerPluginPanel pluginPanel; private NavigationButton navigationButton; @@ -109,8 +106,6 @@ public class ScreenMarkerPlugin extends Plugin @Override protected void startUp() throws Exception { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - overlayManager.add(overlay); loadConfig(configManager.getConfiguration(CONFIG_GROUP, CONFIG_KEY)).forEach(screenMarkers::add); screenMarkers.forEach(overlayManager::add); @@ -135,8 +130,6 @@ public class ScreenMarkerPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(overlay); overlayManager.removeIf(ScreenMarkerOverlay.class::isInstance); screenMarkers.clear(); @@ -150,6 +143,7 @@ public class ScreenMarkerPlugin extends Plugin navigationButton = null; } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (screenMarkers.isEmpty() && event.getGroup().equals(CONFIG_GROUP) && event.getKey().equals(CONFIG_KEY)) @@ -258,7 +252,9 @@ public class ScreenMarkerPlugin extends Plugin } final Gson gson = new Gson(); - final List screenMarkerData = gson.fromJson(json, new TypeToken>() {}.getType()); + final List screenMarkerData = gson.fromJson(json, new TypeToken>() + { + }.getType()); return screenMarkerData.stream().map(ScreenMarkerOverlay::new); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java index c4b8d9a109..13f7aabcd4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java @@ -88,7 +88,7 @@ import net.runelite.client.Notifier; import static net.runelite.client.RuneLite.SCREENSHOT_DIR; import net.runelite.client.config.ConfigManager; import net.runelite.client.config.Keybind; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.events.PlayerLootReceived; import net.runelite.client.game.SpriteManager; @@ -193,9 +193,6 @@ public class ScreenshotPlugin extends Plugin @Inject private SpriteManager spriteManager; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) private BufferedImage reportButton; @@ -242,7 +239,6 @@ public class ScreenshotPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); overlayManager.add(screenshotOverlay); SCREENSHOT_DIR.mkdirs(); @@ -279,25 +275,12 @@ public class ScreenshotPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(screenshotOverlay); clientToolbar.removeNavigation(titleBarButton); keyManager.unregisterKeyListener(hotkeyListener); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(LocalPlayerDeath.class, this, this::onLocalPlayerDeath); - eventBus.subscribe(PlayerDeath.class, this, this::onPlayerDeath); - eventBus.subscribe(PlayerLootReceived.class, this, this::onPlayerLootReceived); - eventBus.subscribe(ChatMessage.class, this, this::onChatMessage); - eventBus.subscribe(WidgetLoaded.class, this, this::onWidgetLoaded); - } - +@Subscribe private void onGameStateChanged(GameStateChanged event) { if (event.getGameState() == GameState.LOGGED_IN @@ -307,6 +290,7 @@ public class ScreenshotPlugin extends Plugin } } + @Subscribe void onGameTick(GameTick event) { if (!shouldTakeScreenshot) @@ -338,6 +322,7 @@ public class ScreenshotPlugin extends Plugin } } + @Subscribe private void onLocalPlayerDeath(LocalPlayerDeath event) { if (this.screenshotPlayerDeath && client.getLocalPlayer().getName() != null) @@ -346,6 +331,7 @@ public class ScreenshotPlugin extends Plugin } } + @Subscribe private void onPlayerDeath(PlayerDeath event) { int tob = client.getVar(Varbits.THEATRE_OF_BLOOD); @@ -357,6 +343,7 @@ public class ScreenshotPlugin extends Plugin } } + @Subscribe private void onPlayerLootReceived(final PlayerLootReceived playerLootReceived) { if (this.screenshotKills) @@ -368,6 +355,7 @@ public class ScreenshotPlugin extends Plugin } } + @Subscribe void onChatMessage(ChatMessage event) { if (event.getType() != ChatMessageType.GAMEMESSAGE && event.getType() != ChatMessageType.SPAM && event.getType() != ChatMessageType.TRADE) @@ -434,7 +422,7 @@ public class ScreenshotPlugin extends Plugin takeScreenshot(fileName); } - if (this.screenshotBossKills ) + if (this.screenshotBossKills) { Matcher m = BOSSKILL_MESSAGE_PATTERN.matcher(chatMessage); if (m.matches()) @@ -481,6 +469,7 @@ public class ScreenshotPlugin extends Plugin } } + @Subscribe void onWidgetLoaded(WidgetLoaded event) { String fileName; @@ -619,7 +608,7 @@ public class ScreenshotPlugin extends Plugin * Saves a screenshot of the client window to the screenshot folder as a PNG, * and optionally uploads it to an image-hosting service. * - * @param fileName Filename to use, without file extension. + * @param fileName Filename to use, without file extension. */ private void takeScreenshot(String fileName) { @@ -650,7 +639,7 @@ public class ScreenshotPlugin extends Plugin * Saves a screenshot of the client window to the screenshot folder as a PNG, * and optionally uploads it to an image-hosting service. * - * @param fileName Filename to use, without file extension. + * @param fileName Filename to use, without file extension. * @param subdirectory The subdirectory to save it in */ private void takeScreenshot(String fileName, String subdirectory) @@ -678,6 +667,7 @@ public class ScreenshotPlugin extends Plugin drawManager.requestNextFrameListener(imageCallback); } } + private void takeScreenshot(String fileName, Image image, @Nullable String subdirectory) { BufferedImage screenshot = this.includeFrame @@ -876,6 +866,7 @@ public class ScreenshotPlugin extends Plugin return theatreOfBloodNumber; } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("screenshot")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/shayzieninfirmary/ShayzienInfirmaryPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/shayzieninfirmary/ShayzienInfirmaryPlugin.java index 7280e59e8c..06107a533f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/shayzieninfirmary/ShayzienInfirmaryPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/shayzieninfirmary/ShayzienInfirmaryPlugin.java @@ -34,7 +34,7 @@ import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.NPC; import net.runelite.api.events.GameTick; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginType; @@ -60,16 +60,12 @@ public class ShayzienInfirmaryPlugin extends Plugin @Inject private Client client; - @Inject - private EventBus eventBus; - @Inject private ShayzienInfirmaryOverlay overlay; @Override protected void startUp() throws Exception { - eventBus.subscribe(GameTick.class, this, this::onGameTick); loadPlugin(); } @@ -77,8 +73,6 @@ public class ShayzienInfirmaryPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - unloadPlugin(); } @@ -92,6 +86,7 @@ public class ShayzienInfirmaryPlugin extends Plugin overlayManager.remove(overlay); } + @Subscribe private void onGameTick(GameTick event) { if (isNotAtInfirmary()) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerPlugin.java index 7b56520bf3..7e9858769c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/shiftwalker/ShiftWalkerPlugin.java @@ -39,6 +39,7 @@ import net.runelite.api.events.GameStateChanged; import net.runelite.client.config.ConfigManager; import net.runelite.client.config.Keybind; import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.input.KeyManager; import net.runelite.client.menus.AbstractComparableEntry; @@ -175,8 +176,6 @@ public class ShiftWalkerPlugin extends Plugin { this.shiftWalk = config.shiftWalk(); this.shiftLoot = config.shiftLoot(); - - addSubscriptions(); if (client.getGameState() == GameState.LOGGED_IN) { keyManager.registerKeyListener(shift); @@ -186,17 +185,10 @@ public class ShiftWalkerPlugin extends Plugin @Override public void shutDown() { - eventBus.unregister(this); keyManager.unregisterKeyListener(shift); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(FocusChanged.class, this, this::onFocusChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - } - + @Subscribe private void onGameStateChanged(GameStateChanged event) { if (event.getGameState() != GameState.LOGGED_IN) @@ -207,6 +199,7 @@ public class ShiftWalkerPlugin extends Plugin keyManager.registerKeyListener(shift); } + @Subscribe private void onFocusChanged(FocusChanged event) { if (!event.isFocused()) @@ -215,6 +208,7 @@ public class ShiftWalkerPlugin extends Plugin } } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("shiftwalkhere")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPlugin.java index e79886c2e4..ef1b755556 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPlugin.java @@ -39,7 +39,7 @@ import net.runelite.api.ItemContainer; import net.runelite.api.events.ScriptCallbackEvent; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.ItemManager; import net.runelite.client.game.SkillIconManager; @@ -81,9 +81,6 @@ public class SkillCalculatorPlugin extends Plugin @Inject private SkillCalculatorConfig skillCalculatorConfig; - @Inject - private EventBus eventBus; - private NavigationButton uiNavigationButton; private NavigationButton bankedUiNavigationButton; @@ -99,7 +96,6 @@ public class SkillCalculatorPlugin extends Plugin @Override protected void startUp() throws Exception { - addSubscriptions(); final BufferedImage icon = ImageUtil.getResourceStreamFromClass(getClass(), "calc.png"); final SkillCalculatorPanel uiPanel = new SkillCalculatorPanel(skillIconManager, client, spriteManager, itemManager); @@ -119,7 +115,6 @@ public class SkillCalculatorPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); clientToolbar.removeNavigation(uiNavigationButton); if (bankedUiNavigationButton != null) { @@ -127,12 +122,7 @@ public class SkillCalculatorPlugin extends Plugin } } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(ScriptCallbackEvent.class, this, this::onScriptCallbackEvent); - } - +@Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("skillCalculator") && event.getKey().equals("enabledBankedXp")) @@ -141,6 +131,7 @@ public class SkillCalculatorPlugin extends Plugin } } + @Subscribe public void onScriptCallbackEvent(ScriptCallbackEvent event) { if (!event.getEventName().equals("setBankTitle") || !skillCalculatorConfig.showBankedXp()) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skybox/SkyboxPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/skybox/SkyboxPlugin.java index 7a0c11bf33..1c8e1e806e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skybox/SkyboxPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skybox/SkyboxPlugin.java @@ -33,7 +33,7 @@ import net.runelite.api.Player; import net.runelite.api.coords.LocalPoint; import net.runelite.api.events.BeforeRender; import net.runelite.api.events.GameStateChanged; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -49,15 +49,11 @@ public class SkyboxPlugin extends Plugin @Inject private Client client; - @Inject - private EventBus eventBus; - private Skybox skybox; @Override public void startUp() throws IOException { - addSubscriptions(); skybox = new Skybox(SkyboxPlugin.class.getResourceAsStream("skybox.txt"), "skybox.txt"); } @@ -65,19 +61,11 @@ public class SkyboxPlugin extends Plugin @Override public void shutDown() { - eventBus.unregister(this); - client.setSkyboxColor(0); skybox = null; } - private void addSubscriptions() - { - eventBus.subscribe(BeforeRender.class, this, this::onBeforeRender); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - } - - private int mapChunk(int cx, int cy, int plane) +private int mapChunk(int cx, int cy, int plane) { cx -= client.getBaseX() / 8; cy -= client.getBaseY() / 8; @@ -92,6 +80,7 @@ public class SkyboxPlugin extends Plugin return instanceTemplateChunks[cx][cy]; } + @Subscribe private void onBeforeRender(BeforeRender r) { if (skybox == null || client.getGameState() != GameState.LOGGED_IN) @@ -136,6 +125,7 @@ public class SkyboxPlugin extends Plugin )); } + @Subscribe private void onGameStateChanged(GameStateChanged gameStateChanged) { if (gameStateChanged.getGameState() == GameState.LOGIN_SCREEN) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java index cab9e0afcd..acd3bae4a2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java @@ -65,7 +65,6 @@ import net.runelite.api.Varbits; import net.runelite.api.WorldType; import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.ChatMessage; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.InteractingChanged; @@ -85,8 +84,9 @@ import net.runelite.client.chat.ChatCommandManager; import net.runelite.client.chat.ChatMessageBuilder; import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ChatInput; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.ItemManager; import net.runelite.client.game.SpriteManager; import net.runelite.client.plugins.Plugin; @@ -223,9 +223,6 @@ public class SlayerPlugin extends Plugin @Inject private ChatClient chatClient; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) private final Set highlightedTargets = new HashSet<>(); @@ -300,7 +297,6 @@ public class SlayerPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); weaknessOverlayAttached = false; @@ -342,8 +338,6 @@ public class SlayerPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(overlay); overlayManager.remove(targetClickboxOverlay); overlayManager.remove(targetWeaknessOverlay); @@ -358,26 +352,13 @@ public class SlayerPlugin extends Plugin cachedXp = -1; } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(NpcSpawned.class, this, this::onNpcSpawned); - eventBus.subscribe(NpcDefinitionChanged.class, this, this::onNpcDefinitionChanged); - eventBus.subscribe(NpcDespawned.class, this, this::onNpcDespawned); - eventBus.subscribe(VarbitChanged.class, this, this::onVarbitChanged); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(ChatMessage.class, this, this::onChatMessage); - eventBus.subscribe(StatChanged.class, this, this::onStatChanged); - eventBus.subscribe(InteractingChanged.class, this, this::onInteractingChanged); - } - - @Provides +@Provides SlayerConfig getConfig(ConfigManager configManager) { return configManager.getConfig(SlayerConfig.class); } + @Subscribe void onGameStateChanged(GameStateChanged event) { switch (event.getGameState()) @@ -420,6 +401,7 @@ public class SlayerPlugin extends Plugin config.streak(streak); } + @Subscribe private void onNpcSpawned(NpcSpawned npcSpawned) { NPC npc = npcSpawned.getNpc(); @@ -429,6 +411,7 @@ public class SlayerPlugin extends Plugin } } + @Subscribe private void onNpcDefinitionChanged(NpcDefinitionChanged event) { NPC npc = event.getNpc(); @@ -439,6 +422,7 @@ public class SlayerPlugin extends Plugin } } + @Subscribe private void onNpcDespawned(NpcDespawned npcDespawned) { NPC npc = npcDespawned.getNpc(); @@ -450,6 +434,7 @@ public class SlayerPlugin extends Plugin } } + @Subscribe public void onVarbitChanged(VarbitChanged event) { if (client.getVar(Varbits.SLAYER_REWARD_POINTS) == cachedPoints) @@ -564,6 +549,7 @@ public class SlayerPlugin extends Plugin private static final int FORCED_WAIT = 2; private int forcedWait = -1; + @Subscribe public void onGameTick(GameTick tick) { loginTick = false; @@ -645,6 +631,7 @@ public class SlayerPlugin extends Plugin } } + @Subscribe public void onChatMessage(ChatMessage event) { if (event.getType() != ChatMessageType.GAMEMESSAGE && event.getType() != ChatMessageType.SPAM) @@ -730,6 +717,7 @@ public class SlayerPlugin extends Plugin } } + @Subscribe public void onStatChanged(StatChanged statChanged) { if (statChanged.getSkill() != SLAYER) @@ -787,6 +775,7 @@ public class SlayerPlugin extends Plugin cachedXp = slayerExp; } + @Subscribe private void onInteractingChanged(InteractingChanged event) { if (client.getLocalPlayer() == null) @@ -818,6 +807,7 @@ public class SlayerPlugin extends Plugin return SUPERIOR_SLAYER_MONSTERS.contains(name.toLowerCase()); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("slayer")) @@ -1140,6 +1130,7 @@ public class SlayerPlugin extends Plugin counter = null; } + @Subscribe void taskLookup(ChatMessage chatMessage, String message) { if (!this.taskCommand) @@ -1215,6 +1206,7 @@ public class SlayerPlugin extends Plugin client.refreshChat(); } + @Subscribe private void pointsLookup(ChatMessage chatMessage, String message) { if (!this.pointsCommand) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayermusiq/SlayermusiqPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayermusiq/SlayermusiqPlugin.java index 68b82d00e5..3eb5d01b54 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/slayermusiq/SlayermusiqPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/slayermusiq/SlayermusiqPlugin.java @@ -64,7 +64,7 @@ import net.runelite.api.events.MenuOptionClicked; import net.runelite.api.util.Text; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.chat.ChatMessageManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginType; @@ -96,22 +96,17 @@ public class SlayermusiqPlugin extends Plugin @Inject private ChatMessageManager chatMessageManager; - @Inject - private EventBus eventBus; - @Override protected void startUp() throws Exception { - eventBus.subscribe(MenuEntryAdded.class, this, this::onMenuEntryAdded); - eventBus.subscribe(MenuOptionClicked.class, this, this::onMenuOptionClicked); } @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - } + } + @Subscribe private void onMenuEntryAdded(MenuEntryAdded event) { int widgetID = event.getParam1(); @@ -127,6 +122,7 @@ public class SlayermusiqPlugin extends Plugin } } + @Subscribe private void onMenuOptionClicked(MenuOptionClicked ev) { if (ev.getMenuOpcode() == MenuOpcode.RUNELITE && ev.getOption().equals(MENUOP_SLAYERMUSIQ)) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingPlugin.java index 5638a4ec2d..f81d53e600 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/smelting/SmeltingPlugin.java @@ -36,7 +36,7 @@ import net.runelite.api.MenuOpcode; import net.runelite.api.events.ChatMessage; import net.runelite.api.events.GameTick; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.events.OverlayMenuClicked; import net.runelite.client.plugins.Plugin; @@ -64,9 +64,6 @@ public class SmeltingPlugin extends Plugin @Inject private OverlayManager overlayManager; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) private SmeltingSession session; @@ -81,7 +78,6 @@ public class SmeltingPlugin extends Plugin @Override protected void startUp() { - addSubscriptions(); this.statTimeout = config.statTimeout(); session = null; @@ -91,20 +87,11 @@ public class SmeltingPlugin extends Plugin @Override protected void shutDown() { - eventBus.unregister(this); - overlayManager.remove(overlay); session = null; } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(ChatMessage.class, this, this::onChatMessage); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(OverlayMenuClicked.class, this, this::onOverlayMenuClicked); - } - +@Subscribe public void onOverlayMenuClicked(OverlayMenuClicked overlayMenuClicked) { OverlayMenuEntry overlayMenuEntry = overlayMenuClicked.getEntry(); @@ -116,6 +103,7 @@ public class SmeltingPlugin extends Plugin } } + @Subscribe void onChatMessage(ChatMessage event) { if (event.getType() != ChatMessageType.SPAM) @@ -141,6 +129,7 @@ public class SmeltingPlugin extends Plugin } } + @Subscribe private void onGameTick(GameTick event) { if (session != null) @@ -155,6 +144,7 @@ public class SmeltingPlugin extends Plugin } } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("smelting")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/SpawnTimerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/SpawnTimerPlugin.java index 7062b2038d..ffdacd0ab2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/SpawnTimerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/spawntimer/SpawnTimerPlugin.java @@ -19,7 +19,7 @@ import net.runelite.api.events.NpcDespawned; import net.runelite.api.events.NpcSpawned; import net.runelite.api.util.Text; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -39,9 +39,6 @@ public class SpawnTimerPlugin extends Plugin @Inject private OverlayManager overlayManager; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) private final Set highlightedNpcs = new HashSet<>(); @@ -70,7 +67,6 @@ public class SpawnTimerPlugin extends Plugin @Override protected void startUp() throws Exception { - addSubscriptions(); this.getNpcToHighlight = config.getNpcToHighlight(); this.getHighlightColor = config.getHighlightColor(); @@ -83,27 +79,18 @@ public class SpawnTimerPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - ticks.clear(); highlightedNpcs.clear(); overlayManager.remove(SpawnTimerOverlay); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(NpcSpawned.class, this, this::onNpcSpawned); - eventBus.subscribe(NpcDespawned.class, this, this::onNpcDespawned); - } - +@Subscribe private void onGameTick(GameTick g) { currentTick++; } + @Subscribe private void onGameStateChanged(GameStateChanged event) { if (event.getGameState() == GameState.LOGIN_SCREEN || @@ -114,6 +101,7 @@ public class SpawnTimerPlugin extends Plugin } } + @Subscribe private void onNpcSpawned(NpcSpawned n) { if (n.getNpc() != null) @@ -127,6 +115,7 @@ public class SpawnTimerPlugin extends Plugin } } + @Subscribe private void onNpcDespawned(NpcDespawned n) { final NPC npc = n.getNpc(); @@ -151,6 +140,7 @@ public class SpawnTimerPlugin extends Plugin return Text.fromCSV(configNpcs); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("spawntimer")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/specbar/SpecBarPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/specbar/SpecBarPlugin.java index ecb7d2832d..d6ae3cf212 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/specbar/SpecBarPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/specbar/SpecBarPlugin.java @@ -28,7 +28,7 @@ import javax.inject.Inject; import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.events.ScriptCallbackEvent; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginType; @@ -47,21 +47,17 @@ public class SpecBarPlugin extends Plugin @Inject private Client client; - @Inject - private EventBus eventBus; - @Override protected void startUp() throws Exception { - eventBus.subscribe(ScriptCallbackEvent.class, this, this::onScriptCallbackEvent); } @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - } + } + @Subscribe private void onScriptCallbackEvent(ScriptCallbackEvent event) { if (!"drawSpecbarAnyway".equals(event.getEventName())) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java index c28057a6b7..5df37f147f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/specialcounter/SpecialCounterPlugin.java @@ -46,7 +46,7 @@ import net.runelite.api.events.GameTick; import net.runelite.api.events.NpcDespawned; import net.runelite.api.events.VarbitChanged; import net.runelite.client.callback.ClientThread; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.game.ItemManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -92,13 +92,9 @@ public class SpecialCounterPlugin extends Plugin @Inject private ItemManager itemManager; - @Inject - private EventBus eventBus; - @Override protected void startUp() { - addSubscriptions(); wsClient.registerMessage(SpecialCounterUpdate.class); } @@ -106,21 +102,11 @@ public class SpecialCounterPlugin extends Plugin @Override protected void shutDown() { - eventBus.unregister(this); - removeCounters(); wsClient.unregisterMessage(SpecialCounterUpdate.class); } - private void addSubscriptions() - { - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(VarbitChanged.class, this, this::onVarbitChanged); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(NpcDespawned.class, this, this::onNpcDespawned); - eventBus.subscribe(SpecialCounterUpdate.class, this, this::onSpecialCounterUpdate); - } - +@Subscribe private void onGameStateChanged(GameStateChanged event) { if (event.getGameState() == GameState.LOGGED_IN) @@ -137,6 +123,7 @@ public class SpecialCounterPlugin extends Plugin } } + @Subscribe private void onVarbitChanged(VarbitChanged event) { int specialPercentage = client.getVar(VarPlayer.SPECIAL_ATTACK_PERCENT); @@ -156,6 +143,7 @@ public class SpecialCounterPlugin extends Plugin specialHitpointsExperience = client.getSkillExperience(Skill.HITPOINTS); } + @Subscribe private void onGameTick(GameTick tick) { if (client.getGameState() != GameState.LOGGED_IN) @@ -232,6 +220,7 @@ public class SpecialCounterPlugin extends Plugin } } + @Subscribe private void onNpcDespawned(NpcDespawned npcDespawned) { NPC actor = npcDespawned.getNpc(); @@ -242,6 +231,7 @@ public class SpecialCounterPlugin extends Plugin } } + @Subscribe private void onSpecialCounterUpdate(SpecialCounterUpdate event) { if (party.getLocalMember().getMemberId().equals(event.getMemberId())) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java index a0573e14dc..f296ce90e5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/spellbook/SpellbookPlugin.java @@ -61,7 +61,7 @@ import static net.runelite.api.widgets.WidgetInfo.SPELLBOOK_FILTER_SECTION_PAREN import static net.runelite.api.widgets.WidgetInfo.SPELL_TOOLTIP; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.input.MouseManager; import net.runelite.client.menus.MenuManager; @@ -123,9 +123,6 @@ public class SpellbookPlugin extends Plugin @Inject private SpellbookDragOverlay overlay; - @Inject - private EventBus eventBus; - @Getter private boolean dragging; @@ -152,7 +149,6 @@ public class SpellbookPlugin extends Plugin @Override protected void startUp() { - addSubscriptions(); updateConfig(); refreshMagicTabOption(); } @@ -160,7 +156,6 @@ public class SpellbookPlugin extends Plugin @Override protected void shutDown() { - eventBus.unregister(this); clearMagicTabMenus(); saveSpells(); config.canDrag(false); @@ -168,16 +163,7 @@ public class SpellbookPlugin extends Plugin mouseManager.unregisterMouseWheelListener(mouseListener); } - private void addSubscriptions() - { - eventBus.subscribe(VarClientIntChanged.class, this, this::onVarCIntChanged); - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(WidgetMenuOptionClicked.class, this, this::onWidgetMenuOptionClicked); - eventBus.subscribe(ScriptCallbackEvent.class, this, this::onScriptCallbackEvent); - } - - private void updateConfig() +private void updateConfig() { loadFilter(); this.enableMobile = config.enableMobile(); @@ -186,6 +172,7 @@ public class SpellbookPlugin extends Plugin this.size = config.size(); } + @Subscribe private void onConfigChanged(final ConfigChanged event) { if (!"spellbook".equals(event.getGroup())) @@ -225,6 +212,7 @@ public class SpellbookPlugin extends Plugin loadSpells(); } + @Subscribe private void onGameStateChanged(final GameStateChanged event) { if (event.getGameState() == GameState.LOGGED_IN) @@ -234,6 +222,7 @@ public class SpellbookPlugin extends Plugin } } + @Subscribe private void onVarCIntChanged(final VarClientIntChanged event) { if (event.getIndex() != VarClientInt.INTERFACE_TAB.getIndex()) @@ -264,6 +253,7 @@ public class SpellbookPlugin extends Plugin config.canDrag(false); } + @Subscribe private void onWidgetMenuOptionClicked(final WidgetMenuOptionClicked event) { if (event.getWidget() != WidgetInfo.FIXED_VIEWPORT_MAGIC_TAB @@ -335,6 +325,7 @@ public class SpellbookPlugin extends Plugin } } + @Subscribe private void onScriptCallbackEvent(final ScriptCallbackEvent event) { if (client.getVar(Varbits.FILTER_SPELLBOOK) != 0 @@ -486,8 +477,10 @@ public class SpellbookPlugin extends Plugin } // CHECKSTYLE:OFF - final Collection gson = GSON.fromJson(cfg, new TypeToken>() {} - .getType()); + final Collection gson = GSON.fromJson(cfg, new TypeToken>() + { + } + .getType()); // CHECKSTYLE:ON for (final Spell s : gson) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsPlugin.java index 14df6900df..efd95ddab5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsPlugin.java @@ -41,7 +41,7 @@ import net.runelite.api.NPC; import net.runelite.api.NPCDefinition; import net.runelite.api.events.GameTick; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDependency; @@ -91,9 +91,6 @@ public class StatusBarsPlugin extends Plugin @Inject private StatusBarsConfig config; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) private Instant lastCombatAction; @@ -114,7 +111,6 @@ public class StatusBarsPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); overlayManager.add(overlay); barRenderers.put(BarMode.DISABLED, null); @@ -129,6 +125,7 @@ public class StatusBarsPlugin extends Plugin this.lastCombatAction = Instant.now(); } + @Subscribe private void onGameTick(GameTick gameTick) { if (!this.toggleRestorationBars) @@ -167,24 +164,17 @@ public class StatusBarsPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(overlay); barRenderers.clear(); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - } - - @Provides +@Provides StatusBarsConfig provideConfig(ConfigManager configManager) { return configManager.getConfig(StatusBarsConfig.class); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!"statusbars".equals(event.getGroup())) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/statusorbs/StatusOrbsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/statusorbs/StatusOrbsPlugin.java index af4d6617d6..a46d869dc1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/statusorbs/StatusOrbsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/statusorbs/StatusOrbsPlugin.java @@ -51,7 +51,7 @@ import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.Notifier; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -99,9 +99,6 @@ public class StatusOrbsPlugin extends Plugin @Inject private Notifier notifier; - @Inject - private EventBus eventBus; - @Getter private double hitpointsPercentage; @@ -153,7 +150,6 @@ public class StatusOrbsPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); overlayManager.add(overlay); if (this.dynamicHpHeart && client.getGameState().equals(GameState.LOGGED_IN)) @@ -165,8 +161,6 @@ public class StatusOrbsPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(overlay); localPlayerRunningToDestination = false; prevLocalPlayerLocation = null; @@ -177,14 +171,7 @@ public class StatusOrbsPlugin extends Plugin } } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(VarbitChanged.class, this, this::onVarbitChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - } - +@Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("statusorbs")) @@ -212,6 +199,7 @@ public class StatusOrbsPlugin extends Plugin } } + @Subscribe private void onVarbitChanged(VarbitChanged e) { if (this.dynamicHpHeart) @@ -227,6 +215,7 @@ public class StatusOrbsPlugin extends Plugin wasRapidHeal = isRapidHeal; } + @Subscribe private void onGameStateChanged(GameStateChanged ev) { if (ev.getGameState() == GameState.HOPPING || ev.getGameState() == GameState.LOGIN_SCREEN) @@ -237,6 +226,7 @@ public class StatusOrbsPlugin extends Plugin } } + @Subscribe private void onGameTick(GameTick event) { if (client.getVar(VarPlayer.SPECIAL_ATTACK_PERCENT) == 1000) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stonedtracker/StonedTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/stonedtracker/StonedTrackerPlugin.java index e32015a690..b5b17b9371 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stonedtracker/StonedTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stonedtracker/StonedTrackerPlugin.java @@ -48,6 +48,7 @@ import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.ItemManager; import net.runelite.client.plugins.Plugin; @@ -123,6 +124,7 @@ public class StonedTrackerPlugin extends Plugin SwingUtilities.invokeLater(() -> panel.showSelectionView()); } + @Subscribe private void onConfigChanged(final ConfigChanged event) { if (event.getGroup().equals("stonedtracker")) @@ -134,7 +136,6 @@ public class StonedTrackerPlugin extends Plugin @Override protected void startUp() { - addSubscriptions(); panel = new LootTrackerPanel(itemManager, this); @@ -172,7 +173,6 @@ public class StonedTrackerPlugin extends Plugin @Override protected void shutDown() { - eventBus.unregister(this); clientToolbar.removeNavigation(navButton); } @@ -180,11 +180,11 @@ public class StonedTrackerPlugin extends Plugin { this.eventBus.subscribe(LTRecordStored.class, this, this::onLTRecordStored); this.eventBus.subscribe(LTNameChange.class, this, this::onLTNameChange); - this.eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); this.eventBus.subscribe(WidgetLoaded.class, this, this::onWidgetLoaded); this.eventBus.subscribe(GameTick.class, this, this::onGameTick); } + @Subscribe private void onWidgetLoaded(WidgetLoaded event) { if (event.getGroupId() != WidgetID.DIALOG_SPRITE_GROUP_ID) @@ -199,6 +199,7 @@ public class StonedTrackerPlugin extends Plugin } } + @Subscribe private void onGameTick(GameTick t) { if (unsiredReclaiming) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/stretchedmode/StretchedModePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/stretchedmode/StretchedModePlugin.java index 29f2fb3f43..abf54df0e2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/stretchedmode/StretchedModePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/stretchedmode/StretchedModePlugin.java @@ -29,10 +29,10 @@ import com.google.inject.Provides; import javax.inject.Inject; import javax.inject.Singleton; import net.runelite.api.Client; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.ResizeableChanged; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.input.MouseManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -61,9 +61,6 @@ public class StretchedModePlugin extends Plugin @Inject private TranslateMouseWheelListener mouseWheelListener; - @Inject - private EventBus eventBus; - @Provides StretchedModeConfig provideConfig(ConfigManager configManager) { @@ -73,8 +70,6 @@ public class StretchedModePlugin extends Plugin @Override protected void startUp() { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(ResizeableChanged.class, this, this::onResizeableChanged); mouseManager.registerMouseListener(0, mouseListener); mouseManager.registerMouseWheelListener(0, mouseWheelListener); @@ -86,8 +81,6 @@ public class StretchedModePlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - client.setStretchedEnabled(false); client.invalidateStretching(true); @@ -95,11 +88,13 @@ public class StretchedModePlugin extends Plugin mouseManager.unregisterMouseWheelListener(mouseWheelListener); } + @Subscribe private void onResizeableChanged(ResizeableChanged event) { client.invalidateStretching(true); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("stretchedmode")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java index 45f6a2d5f8..2bbb88cc0f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/suppliestracker/SuppliesTrackerPlugin.java @@ -61,7 +61,7 @@ import net.runelite.api.events.ItemContainerChanged; import net.runelite.api.events.MenuOptionClicked; import net.runelite.api.events.VarbitChanged; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.game.ItemManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -114,8 +114,8 @@ public class SuppliesTrackerPlugin extends Plugin private static final Random random = new Random(); - private static final int[] THROWING_IDS = new int[]{BRONZE_DART, IRON_DART, STEEL_DART, BLACK_DART, MITHRIL_DART, ADAMANT_DART, RUNE_DART, DRAGON_DART, BRONZE_KNIFE, IRON_KNIFE, STEEL_KNIFE, BLACK_KNIFE, MITHRIL_KNIFE, ADAMANT_KNIFE, RUNE_KNIFE, BRONZE_THROWNAXE, IRON_THROWNAXE, STEEL_THROWNAXE, MITHRIL_THROWNAXE, ADAMANT_THROWNAXE, RUNE_THROWNAXE, DRAGON_KNIFE, DRAGON_KNIFE_22812, DRAGON_KNIFE_22814, DRAGON_KNIFEP_22808, DRAGON_KNIFEP_22810, DRAGON_KNIFEP, DRAGON_THROWNAXE, CHINCHOMPA_10033, RED_CHINCHOMPA_10034, BLACK_CHINCHOMPA}; - private static final int[] RUNE_IDS = new int[]{AIR_RUNE, WATER_RUNE, EARTH_RUNE, MIND_RUNE, BODY_RUNE, COSMIC_RUNE, CHAOS_RUNE, NATURE_RUNE, LAW_RUNE, DEATH_RUNE, ASTRAL_RUNE, BLOOD_RUNE, SOUL_RUNE, WRATH_RUNE, MIST_RUNE, DUST_RUNE, MUD_RUNE, SMOKE_RUNE, STEAM_RUNE, LAVA_RUNE}; + private static final int[] THROWING_IDS = new int[] {BRONZE_DART, IRON_DART, STEEL_DART, BLACK_DART, MITHRIL_DART, ADAMANT_DART, RUNE_DART, DRAGON_DART, BRONZE_KNIFE, IRON_KNIFE, STEEL_KNIFE, BLACK_KNIFE, MITHRIL_KNIFE, ADAMANT_KNIFE, RUNE_KNIFE, BRONZE_THROWNAXE, IRON_THROWNAXE, STEEL_THROWNAXE, MITHRIL_THROWNAXE, ADAMANT_THROWNAXE, RUNE_THROWNAXE, DRAGON_KNIFE, DRAGON_KNIFE_22812, DRAGON_KNIFE_22814, DRAGON_KNIFEP_22808, DRAGON_KNIFEP_22810, DRAGON_KNIFEP, DRAGON_THROWNAXE, CHINCHOMPA_10033, RED_CHINCHOMPA_10034, BLACK_CHINCHOMPA}; + private static final int[] RUNE_IDS = new int[] {AIR_RUNE, WATER_RUNE, EARTH_RUNE, MIND_RUNE, BODY_RUNE, COSMIC_RUNE, CHAOS_RUNE, NATURE_RUNE, LAW_RUNE, DEATH_RUNE, ASTRAL_RUNE, BLOOD_RUNE, SOUL_RUNE, WRATH_RUNE, MIST_RUNE, DUST_RUNE, MUD_RUNE, SMOKE_RUNE, STEAM_RUNE, LAVA_RUNE}; //Hold Supply Data private static final Map suppliesEntry = new HashMap<>(); @@ -131,7 +131,7 @@ public class SuppliesTrackerPlugin extends Plugin private int mainHand = 0; private SuppliesTrackerPanel panel; private NavigationButton navButton; - private final String[] RAIDS_CONSUMABLES = new String[]{"xeric's", "elder", "twisted", "revitalisation", "overload", "prayer enhance", "pysk", "suphi", "leckish", "brawk", "mycil", "roqed", "kyren", "guanic", "prael", "giral", "phluxia", "kryket", "murng", "psykk"}; + private final String[] RAIDS_CONSUMABLES = new String[] {"xeric's", "elder", "twisted", "revitalisation", "overload", "prayer enhance", "pysk", "suphi", "leckish", "brawk", "mycil", "roqed", "kyren", "guanic", "prael", "giral", "phluxia", "kryket", "murng", "psykk"}; private int attackStyleVarbit = -1; private int ticks = 0; @@ -149,13 +149,9 @@ public class SuppliesTrackerPlugin extends Plugin @Inject private Client client; - @Inject - private EventBus eventBus; - @Override protected void startUp() throws Exception { - addSubscriptions(); panel = new SuppliesTrackerPanel(itemManager, this); final BufferedImage header = ImageUtil.getResourceStreamFromClass(getClass(), "panel_icon.png"); @@ -175,26 +171,16 @@ public class SuppliesTrackerPlugin extends Plugin @Override protected void shutDown() { - eventBus.unregister(this); clientToolbar.removeNavigation(navButton); } - private void addSubscriptions() - { - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(VarbitChanged.class, this, this::onVarbitChanged); - eventBus.subscribe(CannonballFired.class, this, this::onCannonballFired); - eventBus.subscribe(AnimationChanged.class, this, this::onAnimationChanged); - eventBus.subscribe(ItemContainerChanged.class, this, this::onItemContainerChanged); - eventBus.subscribe(MenuOptionClicked.class, this, this::onMenuOptionClicked); - } - - @Provides +@Provides SuppliesTrackerConfig provideConfig(ConfigManager configManager) { return configManager.getConfig(SuppliesTrackerConfig.class); } + @Subscribe private void onGameTick(GameTick tick) { Player player = client.getLocalPlayer(); @@ -252,6 +238,7 @@ public class SuppliesTrackerPlugin extends Plugin return percent; } + @Subscribe private void onVarbitChanged(VarbitChanged event) { if (attackStyleVarbit == -1 || attackStyleVarbit != client.getVar(VarPlayer.ATTACK_STYLE)) @@ -326,11 +313,13 @@ public class SuppliesTrackerPlugin extends Plugin } } + @Subscribe private void onCannonballFired(CannonballFired cannonballFired) { buildEntries(CANNONBALL); } + @Subscribe private void onAnimationChanged(AnimationChanged animationChanged) { if (animationChanged.getActor() == client.getLocalPlayer()) @@ -384,6 +373,7 @@ public class SuppliesTrackerPlugin extends Plugin } } + @Subscribe private void onItemContainerChanged(ItemContainerChanged itemContainerChanged) { ItemContainer itemContainer = itemContainerChanged.getItemContainer(); @@ -514,6 +504,7 @@ public class SuppliesTrackerPlugin extends Plugin } } + @Subscribe private void onMenuOptionClicked(final MenuOptionClicked event) { // Fix for house pool diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairPlugin.java index 9bb03bf433..5b42a05ced 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tarnslair/TarnsLairPlugin.java @@ -43,7 +43,7 @@ import net.runelite.api.events.GameTick; import net.runelite.api.events.GroundObjectChanged; import net.runelite.api.events.GroundObjectDespawned; import net.runelite.api.events.GroundObjectSpawned; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginType; @@ -84,9 +84,6 @@ public class TarnsLairPlugin extends Plugin @Inject private TarnsLairOverlay overlay; - @Inject - private EventBus eventBus; - @Override protected void startUp() throws Exception { @@ -96,8 +93,6 @@ public class TarnsLairPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(overlay); staircases.clear(); wallTraps.clear(); @@ -105,54 +100,50 @@ public class TarnsLairPlugin extends Plugin inLair = false; } - private void addSubscriptions() - { - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(GameObjectSpawned.class, this, this::onGameObjectSpawned); - eventBus.subscribe(GameObjectChanged.class, this, this::onGameObjectChanged); - eventBus.subscribe(GameObjectDespawned.class, this, this::onGameObjectDespawned); - eventBus.subscribe(GroundObjectSpawned.class, this, this::onGroundObjectSpawned); - eventBus.subscribe(GroundObjectChanged.class, this, this::onGroundObjectChanged); - eventBus.subscribe(GroundObjectDespawned.class, this, this::onGroundObjectDespawned); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - } - + @Subscribe private void onGameTick(GameTick event) { int regionID = client.getLocalPlayer().getWorldLocation().getRegionID(); inLair = (regionID == TARNS_LAIR_NORTH_REGION || regionID == TARNS_LAIR_SOUTH_REGION); } + @Subscribe private void onGameObjectSpawned(GameObjectSpawned event) { onTileObject(event.getTile(), null, event.getGameObject()); } + @Subscribe private void onGameObjectChanged(GameObjectChanged event) { onTileObject(event.getTile(), event.getPrevious(), event.getGameObject()); } + @Subscribe private void onGameObjectDespawned(GameObjectDespawned event) { onTileObject(event.getTile(), event.getGameObject(), null); } + @Subscribe private void onGroundObjectSpawned(GroundObjectSpawned event) { onTileObject(event.getTile(), null, event.getGroundObject()); } + @Subscribe private void onGroundObjectChanged(GroundObjectChanged event) { onTileObject(event.getTile(), event.getPrevious(), event.getGroundObject()); } + @Subscribe private void onGroundObjectDespawned(GroundObjectDespawned event) { onTileObject(event.getTile(), event.getGroundObject(), null); } + @Subscribe private void onGameStateChanged(GameStateChanged event) { if (event.getGameState() == GameState.LOADING) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixPlugin.java index 881f9a4945..3042be7e63 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tearsofguthix/TearsOfGuthixPlugin.java @@ -39,7 +39,7 @@ import net.runelite.api.Skill; import net.runelite.api.events.DecorativeObjectDespawned; import net.runelite.api.events.DecorativeObjectSpawned; import net.runelite.api.events.GameStateChanged; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.ui.overlay.OverlayManager; @@ -66,9 +66,6 @@ public class TearsOfGuthixPlugin extends Plugin @Inject private TearsOfGuthixExperienceOverlay experienceOverlay; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) private final Map streams = new HashMap<>(); @@ -78,7 +75,6 @@ public class TearsOfGuthixPlugin extends Plugin @Override protected void startUp() { - addSubscriptions(); overlayManager.add(overlay); overlayManager.add(experienceOverlay); @@ -87,21 +83,13 @@ public class TearsOfGuthixPlugin extends Plugin @Override protected void shutDown() { - eventBus.unregister(this); - overlayManager.remove(overlay); overlayManager.remove(experienceOverlay); streams.clear(); playerLowestSkill = null; } - private void addSubscriptions() - { - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(DecorativeObjectSpawned.class, this, this::onDecorativeObjectSpawned); - eventBus.subscribe(DecorativeObjectDespawned.class, this, this::onDecorativeObjectDespawned); - } - +@Subscribe private void onGameStateChanged(GameStateChanged event) { switch (event.getGameState()) @@ -133,6 +121,7 @@ public class TearsOfGuthixPlugin extends Plugin } } + @Subscribe private void onDecorativeObjectSpawned(DecorativeObjectSpawned event) { DecorativeObject object = event.getDecorativeObject(); @@ -145,6 +134,7 @@ public class TearsOfGuthixPlugin extends Plugin } } + @Subscribe private void onDecorativeObjectDespawned(DecorativeObjectDespawned event) { if (streams.isEmpty()) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/TheatrePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/TheatrePlugin.java index cc90977b22..d6b5dd9655 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/theatre/TheatrePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/theatre/TheatrePlugin.java @@ -30,6 +30,7 @@ import net.runelite.api.events.SpotAnimationChanged; import net.runelite.api.events.VarbitChanged; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.ItemManager; import net.runelite.client.graphics.ModelOutlineRenderer; @@ -119,7 +120,6 @@ public class TheatrePlugin extends Plugin protected void startUp() { updateConfig(); - addSubscriptions(); room = TheatreRoom.UNKNOWN; maidenHandler = new MaidenHandler(client, this, modelOutline); bloatHandler = new BloatHandler(client, this); @@ -133,7 +133,6 @@ public class TheatrePlugin extends Plugin @Override protected void shutDown() { - eventBus.unregister(this); maidenHandler.onStop(); maidenHandler = null; bloatHandler.onStop(); @@ -151,22 +150,7 @@ public class TheatrePlugin extends Plugin overlayManager.remove(overlay); } - private void addSubscriptions() - { - eventBus.subscribe(AnimationChanged.class, this, this::onAnimationChanged); - eventBus.subscribe(ChatMessage.class, this, this::onChatMessage); - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(GroundObjectSpawned.class, this, this::onGroundObjectSpawned); - eventBus.subscribe(NpcDefinitionChanged.class, this, this::onNpcDefinitionChanged); - eventBus.subscribe(NpcDespawned.class, this, this::onNpcDespawned); - eventBus.subscribe(NpcSpawned.class, this, this::onNpcSpawned); - eventBus.subscribe(ProjectileMoved.class, this, this::onProjectileMoved); - eventBus.subscribe(ProjectileSpawned.class, this, this::onProjectileSpawned); - eventBus.subscribe(SpotAnimationChanged.class, this, this::onSpotAnimationChanged); - eventBus.subscribe(VarbitChanged.class, this, this::onVarbitChanged); - } - +@Subscribe private void onAnimationChanged(AnimationChanged event) { if (verzikHandler != null) @@ -175,6 +159,7 @@ public class TheatrePlugin extends Plugin } } + @Subscribe private void onChatMessage(ChatMessage event) { if (maidenHandler != null) @@ -183,6 +168,7 @@ public class TheatrePlugin extends Plugin } } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("Theatre")) @@ -196,6 +182,7 @@ public class TheatrePlugin extends Plugin } } + @Subscribe private void onGameTick(GameTick event) { if (maidenHandler != null) @@ -229,6 +216,7 @@ public class TheatrePlugin extends Plugin } } + @Subscribe private void onGroundObjectSpawned(GroundObjectSpawned event) { if (sotetsegHandler != null) @@ -242,6 +230,7 @@ public class TheatrePlugin extends Plugin } } + @Subscribe private void onNpcDefinitionChanged(NpcDefinitionChanged event) { if (maidenHandler != null) @@ -250,6 +239,7 @@ public class TheatrePlugin extends Plugin } } + @Subscribe private void onNpcDespawned(NpcDespawned event) { if (maidenHandler != null) @@ -279,6 +269,7 @@ public class TheatrePlugin extends Plugin } + @Subscribe private void onNpcSpawned(NpcSpawned event) { if (maidenHandler != null) @@ -313,6 +304,7 @@ public class TheatrePlugin extends Plugin } + @Subscribe private void onProjectileMoved(ProjectileMoved event) { if (verzikHandler != null) @@ -321,6 +313,7 @@ public class TheatrePlugin extends Plugin } } + @Subscribe private void onProjectileSpawned(ProjectileSpawned event) { if (sotetsegHandler != null) @@ -330,6 +323,7 @@ public class TheatrePlugin extends Plugin } } + @Subscribe private void onSpotAnimationChanged(SpotAnimationChanged event) { if (maidenHandler != null) @@ -338,6 +332,7 @@ public class TheatrePlugin extends Plugin } } + @Subscribe private void onVarbitChanged(VarbitChanged event) { if (bloatHandler != null) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingPlugin.java index fad58ec12f..e4380c54ea 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/thieving/ThievingPlugin.java @@ -44,7 +44,7 @@ import net.runelite.api.events.GameObjectDespawned; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDependency; @@ -79,9 +79,6 @@ public class ThievingPlugin extends Plugin @Inject private OverlayManager overlayManager; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) private ThievingSession session; @@ -100,7 +97,6 @@ public class ThievingPlugin extends Plugin @Override protected void startUp() throws Exception { - addSubscriptions(); this.statTimeout = config.statTimeout(); @@ -117,22 +113,12 @@ public class ThievingPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(overlay); overlayManager.remove(chestOverlay); session = null; } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(ChatMessage.class, this, this::onChatMessage); - eventBus.subscribe(GameObjectDespawned.class, this, this::onGameObjectDespawned); - } - +@Subscribe private void onGameStateChanged(GameStateChanged event) { if (event.getGameState() == GameState.LOGGED_IN) @@ -141,6 +127,7 @@ public class ThievingPlugin extends Plugin } } + @Subscribe private void onGameTick(GameTick gameTick) { recentlyLoggedIn = false; @@ -159,6 +146,7 @@ public class ThievingPlugin extends Plugin } } + @Subscribe private void onChatMessage(ChatMessage event) { if (event.getType() != ChatMessageType.SPAM) @@ -190,6 +178,7 @@ public class ThievingPlugin extends Plugin } } + @Subscribe private void onGameObjectDespawned(GameObjectDespawned event) { if (client.getGameState() != GameState.LOGGED_IN || recentlyLoggedIn) @@ -207,6 +196,7 @@ public class ThievingPlugin extends Plugin } } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!"thieving".equals(event.getGroup())) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TickTimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TickTimersPlugin.java index dace016484..668d374391 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TickTimersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/ticktimers/TickTimersPlugin.java @@ -41,7 +41,7 @@ import net.runelite.api.events.GameTick; import net.runelite.api.events.NpcDespawned; import net.runelite.api.events.NpcSpawned; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.NPCManager; import net.runelite.client.plugins.Plugin; @@ -76,8 +76,6 @@ public class TickTimersPlugin extends Plugin private TickTimersConfig config; @Inject private NPCManager npcManager; - @Inject - private EventBus eventBus; @Getter(AccessLevel.PACKAGE) private Set npcContainer = new HashSet<>(); private boolean validRegion; @@ -107,28 +105,18 @@ public class TickTimersPlugin extends Plugin public void startUp() { updateConfig(); - addSubscriptions(); npcContainer.clear(); } @Override public void shutDown() { - eventBus.unregister(this); npcContainer.clear(); overlayManager.remove(timersOverlay); validRegion = false; } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(NpcSpawned.class, this, this::onNpcSpawned); - eventBus.subscribe(NpcDespawned.class, this, this::onNpcDespawned); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - } - +@Subscribe private void onGameStateChanged(GameStateChanged gameStateChanged) { if (gameStateChanged.getGameState() != GameState.LOGGED_IN) @@ -149,6 +137,7 @@ public class TickTimersPlugin extends Plugin npcContainer.clear(); } + @Subscribe private void onNpcSpawned(NpcSpawned event) { if (!validRegion) @@ -192,6 +181,7 @@ public class TickTimersPlugin extends Plugin } } + @Subscribe private void onNpcDespawned(NpcDespawned event) { if (!validRegion) @@ -227,6 +217,7 @@ public class TickTimersPlugin extends Plugin } } + @Subscribe public void onGameTick(GameTick Event) { if (!validRegion) @@ -263,6 +254,7 @@ public class TickTimersPlugin extends Plugin ); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!"TickTimers".equals(event.getGroup())) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsPlugin.java index 40db3ebaaf..a984a7e6f7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tileindicators/TileIndicatorsPlugin.java @@ -31,7 +31,7 @@ import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -55,9 +55,6 @@ public class TileIndicatorsPlugin extends Plugin @Inject private TileIndicatorsConfig config; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) private Color highlightDestinationColor; @Getter(AccessLevel.PACKAGE) @@ -87,19 +84,16 @@ public class TileIndicatorsPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - overlayManager.add(overlay); } @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(overlay); } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!"tileindicators".equals(event.getGroup())) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java index 85a758a630..6c6f9db353 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java @@ -55,7 +55,6 @@ import net.runelite.api.WorldType; import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.AnimationChanged; import net.runelite.api.events.ChatMessage; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.ItemContainerChanged; @@ -71,7 +70,8 @@ import net.runelite.api.widgets.WidgetID; import net.runelite.api.widgets.WidgetInfo; import static net.runelite.api.widgets.WidgetInfo.PVP_WORLD_SAFE_ZONE; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.ItemManager; import net.runelite.client.game.SpriteManager; import net.runelite.client.plugins.Plugin; @@ -113,7 +113,6 @@ public class TimersPlugin extends Plugin private static final String SUPER_ANTIFIRE_EXPIRED_MESSAGE = "Your super antifire potion has expired."; private static final int VENOM_VALUE_CUTOFF = -40; // Antivenom < -40 =< Antipoison < 0 private static final int POISON_TICK_LENGTH = 30; - private static final String SUPER_ANTIVENOM_DRINK_MESSAGE = "You drink some of your super antivenom potion"; private static final String KILLED_TELEBLOCK_OPPONENT_TEXT = "Your Tele Block has been removed because you killed "; private static final String PRAYER_ENHANCE_EXPIRED = "Your prayer enhance effect has worn off."; private static final Pattern DEADMAN_HALF_TELEBLOCK_PATTERN = Pattern.compile("A Tele Block spell has been cast on you by (.+)\\. It will expire in 1 minute, 15 seconds\\."); @@ -153,9 +152,6 @@ public class TimersPlugin extends Plugin @Inject private InfoBoxManager infoBoxManager; - @Inject - private EventBus eventBus; - private boolean showHomeMinigameTeleports; private boolean showAntiPoison; private boolean showAntiFire; @@ -187,14 +183,11 @@ public class TimersPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); } @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - infoBoxManager.removeIf(t -> t instanceof TimerTimer); lastRaidVarb = -1; lastPoint = null; @@ -207,23 +200,7 @@ public class TimersPlugin extends Plugin imbuedHeartClicked = false; } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(VarbitChanged.class, this, this::onVarbitChanged); - eventBus.subscribe(WidgetHiddenChanged.class, this, this::onWidgetHiddenChanged); - eventBus.subscribe(MenuOptionClicked.class, this, this::onMenuOptionClicked); - eventBus.subscribe(ChatMessage.class, this, this::onChatMessage); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(AnimationChanged.class, this, this::onAnimationChanged); - eventBus.subscribe(SpotAnimationChanged.class, this, this::onSpotAnimationChanged); - eventBus.subscribe(ItemContainerChanged.class, this, this::onItemContainerChanged); - eventBus.subscribe(NpcDespawned.class, this, this::onNpcDespawned); - eventBus.subscribe(LocalPlayerDeath.class, this, this::onLocalPlayerDeath); - eventBus.subscribe(StatChanged.class, this, this::onStatChanged); - } - +@Subscribe private void onVarbitChanged(VarbitChanged event) { int raidVarb = client.getVar(Varbits.IN_RAID); @@ -311,6 +288,7 @@ public class TimersPlugin extends Plugin } } + @Subscribe private void onWidgetHiddenChanged(WidgetHiddenChanged event) { Widget widget = event.getWidget(); @@ -321,6 +299,7 @@ public class TimersPlugin extends Plugin } } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("timers")) @@ -427,6 +406,7 @@ public class TimersPlugin extends Plugin } } + @Subscribe private void onMenuOptionClicked(MenuOptionClicked event) { if (this.showStamina @@ -497,6 +477,7 @@ public class TimersPlugin extends Plugin } } + @Subscribe void onChatMessage(ChatMessage event) { if (event.getType() != ChatMessageType.SPAM && event.getType() != ChatMessageType.GAMEMESSAGE) @@ -695,6 +676,7 @@ public class TimersPlugin extends Plugin } } + @Subscribe private void onGameTick(GameTick event) { loggedInRace = false; @@ -750,6 +732,7 @@ public class TimersPlugin extends Plugin } } + @Subscribe private void onGameStateChanged(GameStateChanged gameStateChanged) { switch (gameStateChanged.getGameState()) @@ -764,6 +747,7 @@ public class TimersPlugin extends Plugin } } + @Subscribe private void onAnimationChanged(AnimationChanged event) { Actor actor = event.getActor(); @@ -824,6 +808,7 @@ public class TimersPlugin extends Plugin lastAnimation = player.getAnimation(); } + @Subscribe private void onSpotAnimationChanged(SpotAnimationChanged event) { Actor actor = event.getActor(); @@ -885,6 +870,7 @@ public class TimersPlugin extends Plugin * * @param itemContainerChanged */ + @Subscribe private void onItemContainerChanged(ItemContainerChanged itemContainerChanged) { ItemContainer container = itemContainerChanged.getItemContainer(); @@ -920,6 +906,7 @@ public class TimersPlugin extends Plugin } } + @Subscribe private void onNpcDespawned(NpcDespawned npcDespawned) { NPC npc = npcDespawned.getNpc(); @@ -937,11 +924,13 @@ public class TimersPlugin extends Plugin } } + @Subscribe private void onLocalPlayerDeath(LocalPlayerDeath event) { infoBoxManager.removeIf(t -> t instanceof TimerTimer && ((TimerTimer) t).getTimer().isRemovedOnDeath()); } + @Subscribe private void onStatChanged(StatChanged event) { Skill skill = event.getSkill(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timestamp/TimestampPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timestamp/TimestampPlugin.java index 027769f892..2acd2fbe30 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timestamp/TimestampPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timestamp/TimestampPlugin.java @@ -38,10 +38,10 @@ import lombok.Getter; import net.runelite.api.Client; import net.runelite.api.MessageNode; import net.runelite.api.Varbits; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.ScriptCallbackEvent; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.util.ColorUtil; @@ -61,9 +61,6 @@ public class TimestampPlugin extends Plugin @Inject private TimestampConfig config; - @Inject - private EventBus eventBus; - @Getter private SimpleDateFormat formatter; @@ -76,8 +73,6 @@ public class TimestampPlugin extends Plugin @Override protected void startUp() throws Exception { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(ScriptCallbackEvent.class, this, this::onScriptCallbackEvent); updateFormatter(); } @@ -85,11 +80,10 @@ public class TimestampPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - formatter = null; } + @Subscribe void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("timestamp") && event.getKey().equals("format")) @@ -98,6 +92,7 @@ public class TimestampPlugin extends Plugin } } + @Subscribe private void onScriptCallbackEvent(ScriptCallbackEvent event) { if (!event.getEventName().equals("addTimestamp")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/TimeTrackingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/TimeTrackingPlugin.java index 64d0a80a14..ef7f4481bf 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/TimeTrackingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timetracking/TimeTrackingPlugin.java @@ -36,13 +36,13 @@ import javax.inject.Inject; import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.coords.WorldPoint; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.UsernameChanged; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.ItemManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -88,9 +88,6 @@ public class TimeTrackingPlugin extends Plugin @Inject private ScheduledExecutorService executorService; - @Inject - private EventBus eventBus; - private ScheduledFuture panelUpdateFuture; private TimeTrackingPanel panel; @@ -109,7 +106,6 @@ public class TimeTrackingPlugin extends Plugin @Override protected void startUp() throws Exception { - addSubscriptions(); clockManager.loadTimers(); clockManager.loadStopwatches(); @@ -135,8 +131,6 @@ public class TimeTrackingPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - lastTickLocation = null; lastTickPostLogin = false; @@ -149,13 +143,7 @@ public class TimeTrackingPlugin extends Plugin clientToolbar.removeNavigation(navButton); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(UsernameChanged.class, this, this::onUsernameChanged); - } - +@Subscribe private void onConfigChanged(ConfigChanged e) { if (!e.getGroup().equals(CONFIG_GROUP)) @@ -173,6 +161,7 @@ public class TimeTrackingPlugin extends Plugin } } + @Subscribe private void onGameTick(GameTick t) { if (client.getGameState() != GameState.LOGGED_IN) @@ -212,6 +201,7 @@ public class TimeTrackingPlugin extends Plugin } } + @Subscribe private void onUsernameChanged(UsernameChanged e) { farmingTracker.loadCompletionTimes(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlugin.java index cca15f8b14..c5dde171bf 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tithefarm/TitheFarmPlugin.java @@ -35,11 +35,11 @@ import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.GameObject; import net.runelite.api.coords.WorldPoint; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.GameObjectSpawned; import net.runelite.api.events.GameTick; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.ui.overlay.OverlayManager; @@ -62,9 +62,6 @@ public class TitheFarmPlugin extends Plugin @Inject private TitheFarmPluginConfig config; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) private final Set plants = new HashSet<>(); @@ -85,7 +82,6 @@ public class TitheFarmPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); overlayManager.add(titheFarmOverlay); titheFarmOverlay.updateConfig(); @@ -94,18 +90,10 @@ public class TitheFarmPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(titheFarmOverlay); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(GameObjectSpawned.class, this, this::onGameObjectSpawned); - } - +@Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("tithefarmplugin")) @@ -116,11 +104,13 @@ public class TitheFarmPlugin extends Plugin } } + @Subscribe private void onGameTick(final GameTick event) { plants.removeIf(plant -> plant.getPlantTimeRelative() == 1); } + @Subscribe private void onGameObjectSpawned(GameObjectSpawned event) { GameObject gameObject = event.getGameObject(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tmorph/TMorph.java b/runelite-client/src/main/java/net/runelite/client/plugins/tmorph/TMorph.java index ffcd191873..e93e32dad1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tmorph/TMorph.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tmorph/TMorph.java @@ -46,6 +46,7 @@ import net.runelite.api.kit.KitType; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -121,7 +122,6 @@ public class TMorph extends Plugin private void addSubscriptions() { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); eventBus.subscribe(AnimationChanged.class, this, this::onAnimationChanged); eventBus.subscribe(GameTick.class, this, this::onGameTick); eventBus.subscribe(SpotAnimationChanged.class, this, this::onSpotAnimationChanged); @@ -184,6 +184,7 @@ public class TMorph extends Plugin } } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("TMorph")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/tobdamagecount/DamageCounterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/tobdamagecount/DamageCounterPlugin.java index 53ed573c96..d25ff6f297 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/tobdamagecount/DamageCounterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/tobdamagecount/DamageCounterPlugin.java @@ -47,7 +47,7 @@ import net.runelite.client.chat.ChatColorType; import net.runelite.client.chat.ChatMessageBuilder; import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.chat.QueuedMessage; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginType; @@ -106,27 +106,20 @@ public class DamageCounterPlugin extends Plugin private Client client; @Inject private ChatMessageManager chatMessangerManager; - @Inject - private EventBus eventBus; @Override protected void startUp() throws Exception { - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(HitsplatApplied.class, this, this::onHitsplatApplied); - eventBus.subscribe(NpcDespawned.class, this, this::onNpcDespawned); - eventBus.subscribe(LocalPlayerDeath.class, this, this::onLocalPlayerDeath); } @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - } + } //every game tick it will go through methods + @Subscribe private void onGameTick(GameTick tick) { if (client.getGameState() != GameState.LOGGED_IN) @@ -160,6 +153,7 @@ public class DamageCounterPlugin extends Plugin } //if you hop it will reset the counter + @Subscribe private void onGameStateChanged(GameStateChanged event) { if (event.getGameState() == GameState.LOGGED_IN) @@ -223,6 +217,7 @@ public class DamageCounterPlugin extends Plugin //will add the damage that you have taken from the current boss fight + @Subscribe private void onHitsplatApplied(HitsplatApplied Hit) { if (Hit.getActor().equals(client.getLocalPlayer())) @@ -237,6 +232,7 @@ public class DamageCounterPlugin extends Plugin because every time she phases she "dies" so making sure the counter doesn't print out the damage for phase 1, 2, and 3. */ + @Subscribe private void onNpcDespawned(NpcDespawned npc) { NPC actor = npc.getNpc(); @@ -359,6 +355,7 @@ public class DamageCounterPlugin extends Plugin //whenever you have died in tob you will get a death message with damage // made sure the message works at ToB area or else it will message every where + @Subscribe private void onLocalPlayerDeath(LocalPlayerDeath death) { if (client.getLocalPlayer() == null) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/twitch/TwitchPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/twitch/TwitchPlugin.java index 7e8e95f067..871089c4a4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/twitch/TwitchPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/twitch/TwitchPlugin.java @@ -34,7 +34,6 @@ import lombok.extern.slf4j.Slf4j; import net.runelite.api.ChatMessageType; import net.runelite.api.Client; import net.runelite.api.GameState; -import net.runelite.client.events.ConfigChanged; import net.runelite.client.chat.ChatColorType; import net.runelite.client.chat.ChatMessageBuilder; import net.runelite.client.chat.ChatMessageManager; @@ -42,8 +41,9 @@ import net.runelite.client.chat.ChatboxInputListener; import net.runelite.client.chat.CommandManager; import net.runelite.client.chat.QueuedMessage; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ChatboxInput; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.events.PrivateMessageInput; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -72,16 +72,11 @@ public class TwitchPlugin extends Plugin implements TwitchListener, ChatboxInput @Inject private CommandManager commandManager; - @Inject - private EventBus eventBus; - private TwitchIRCClient twitchIRCClient; @Override protected void startUp() { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - connect(); commandManager.register(this); } @@ -89,8 +84,6 @@ public class TwitchPlugin extends Plugin implements TwitchListener, ChatboxInput @Override protected void shutDown() { - eventBus.unregister(this); - if (twitchIRCClient != null) { twitchIRCClient.close(); @@ -156,6 +149,7 @@ public class TwitchPlugin extends Plugin implements TwitchListener, ChatboxInput } } + @Subscribe private void onConfigChanged(ConfigChanged configChanged) { if (!configChanged.getGroup().equals("twitch")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionPlugin.java index 3207e576bb..60d1da044f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/vetion/VetionPlugin.java @@ -33,7 +33,7 @@ import lombok.Getter; import net.runelite.api.Actor; import net.runelite.api.AnimationID; import net.runelite.api.events.AnimationChanged; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginType; @@ -56,16 +56,12 @@ public class VetionPlugin extends Plugin @Inject private VetionOverlay overlay; - @Inject - private EventBus eventBus; - @Getter private Map vetions; @Override protected void startUp() { - eventBus.subscribe(AnimationChanged.class, this, this::onAnimationChanged); vetions = new HashMap<>(); overlayManager.add(overlay); @@ -78,6 +74,7 @@ public class VetionPlugin extends Plugin vetions = null; } + @Subscribe private void onAnimationChanged(AnimationChanged event) { if (event.getActor().getAnimation() == AnimationID.VETION_EARTHQUAKE) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/virtuallevels/VirtualLevelsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/virtuallevels/VirtualLevelsPlugin.java index 902c695b67..b71c317662 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/virtuallevels/VirtualLevelsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/virtuallevels/VirtualLevelsPlugin.java @@ -31,11 +31,11 @@ import javax.inject.Singleton; import net.runelite.api.Client; import net.runelite.api.Experience; import net.runelite.api.Skill; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.ScriptCallbackEvent; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.events.PluginChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -60,9 +60,6 @@ public class VirtualLevelsPlugin extends Plugin @Inject private ClientThread clientThread; - @Inject - private EventBus eventBus; - @Provides VirtualLevelsConfig provideConfig(ConfigManager configManager) { @@ -73,19 +70,15 @@ public class VirtualLevelsPlugin extends Plugin @Override protected void startUp() throws Exception { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(PluginChanged.class, this, this::onPluginChanged); - eventBus.subscribe(ScriptCallbackEvent.class, this, this::onScriptCallbackEvent); } @Override protected void shutDown() { - eventBus.unregister(this); - clientThread.invoke(this::simulateSkillChange); } + @Subscribe private void onPluginChanged(PluginChanged pluginChanged) { // this is guaranteed to be called after the plugin has been registered by the eventbus. startUp is not. @@ -95,6 +88,7 @@ public class VirtualLevelsPlugin extends Plugin } } + @Subscribe private void onConfigChanged(ConfigChanged configChanged) { if (!configChanged.getGroup().equals("virtuallevels")) @@ -105,6 +99,7 @@ public class VirtualLevelsPlugin extends Plugin clientThread.invoke(this::simulateSkillChange); } + @Subscribe private void onScriptCallbackEvent(ScriptCallbackEvent e) { final String eventName = e.getEventName(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java index 8c0e589b10..df1f2224d1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/vorkath/VorkathPlugin.java @@ -57,7 +57,7 @@ import net.runelite.api.events.ProjectileSpawned; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -88,8 +88,6 @@ public class VorkathPlugin extends Plugin private AcidPathOverlay acidPathOverlay; @Inject private VorkathConfig config; - @Inject - private EventBus eventBus; @Getter(AccessLevel.PACKAGE) private Vorkath vorkath; @Getter(AccessLevel.PACKAGE) @@ -125,7 +123,6 @@ public class VorkathPlugin extends Plugin @Override protected void startUp() { - addSubscriptions(); updateConfig(); } @@ -135,20 +132,7 @@ public class VorkathPlugin extends Plugin reset(); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(NpcSpawned.class, this, this::onNpcSpawned); - eventBus.subscribe(NpcDespawned.class, this, this::onNpcDespawned); - eventBus.subscribe(ProjectileMoved.class, this, this::onProjectileMoved); - eventBus.subscribe(ProjectileSpawned.class, this, this::onProjectileSpawned); - eventBus.subscribe(AnimationChanged.class, this, this::onAnimationChanged); - eventBus.subscribe(GameObjectSpawned.class, this, this::onGameObjectSpawned); - eventBus.subscribe(GameObjectDespawned.class, this, this::onGameObjectDespawned); - eventBus.subscribe(ClientTick.class, this, this::onClientTick); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - } - +@Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("vorkath")) @@ -159,6 +143,7 @@ public class VorkathPlugin extends Plugin updateConfig(); } + @Subscribe private void onNpcSpawned(NpcSpawned event) { if (!isAtVorkath()) @@ -184,6 +169,7 @@ public class VorkathPlugin extends Plugin } } + @Subscribe private void onNpcDespawned(NpcDespawned event) { if (!isAtVorkath()) @@ -208,6 +194,7 @@ public class VorkathPlugin extends Plugin } } + @Subscribe private void onProjectileSpawned(ProjectileSpawned event) { if (!isAtVorkath() || vorkath == null) @@ -250,6 +237,7 @@ public class VorkathPlugin extends Plugin } } + @Subscribe private void onProjectileMoved(ProjectileMoved event) { if (!isAtVorkath()) @@ -266,6 +254,7 @@ public class VorkathPlugin extends Plugin } } + @Subscribe private void onGameObjectSpawned(GameObjectSpawned event) { if (!isAtVorkath()) @@ -281,6 +270,7 @@ public class VorkathPlugin extends Plugin } } + @Subscribe private void onGameObjectDespawned(GameObjectDespawned event) { if (!isAtVorkath()) @@ -296,6 +286,7 @@ public class VorkathPlugin extends Plugin } } + @Subscribe private void onAnimationChanged(AnimationChanged event) { if (!isAtVorkath()) @@ -321,6 +312,7 @@ public class VorkathPlugin extends Plugin } } + @Subscribe private void onGameTick(GameTick event) { if (!isAtVorkath()) @@ -362,6 +354,7 @@ public class VorkathPlugin extends Plugin } } + @Subscribe private void onClientTick(ClientTick event) { if (acidSpots.size() != lastAcidSpotsSize) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorPlugin.java index fb3a98911e..16c9aa4c30 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/warindicators/WarIndicatorPlugin.java @@ -36,7 +36,7 @@ import static net.runelite.api.MenuOpcode.*; import net.runelite.api.Player; import net.runelite.api.events.MenuEntryAdded; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -69,9 +69,6 @@ public class WarIndicatorPlugin extends Plugin @Inject private Client client; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) private boolean highLightCallers; @Getter(AccessLevel.PACKAGE) @@ -103,7 +100,6 @@ public class WarIndicatorPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); overlayManager.add(warIndicatorOverlay); overlayManager.add(warIndicatorMiniMapOverlay); @@ -112,17 +108,11 @@ public class WarIndicatorPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); overlayManager.remove(warIndicatorOverlay); overlayManager.remove(warIndicatorMiniMapOverlay); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(MenuEntryAdded.class, this, this::onMenuEntryAdded); - } - +@Subscribe private void onMenuEntryAdded(MenuEntryAdded onMenuEntryAdded) { int type = onMenuEntryAdded.getOpcode(); @@ -194,6 +184,7 @@ public class WarIndicatorPlugin extends Plugin } } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (event.getGroup().equals("warIndicators")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java index 9d5769fee2..e812e91219 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/whalewatchers/WhaleWatchersPlugin.java @@ -38,7 +38,7 @@ import net.runelite.api.events.MenuOptionClicked; import net.runelite.api.events.VarbitChanged; import net.runelite.api.kit.KitType; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.events.OverlayMenuClicked; import net.runelite.client.game.Sound; @@ -81,8 +81,6 @@ public class WhaleWatchersPlugin extends Plugin private OverlayManager overlayManager; @Inject private SoundManager soundManager; - @Inject - private EventBus eventBus; private int tickCountdown = 0; @Getter(AccessLevel.PACKAGE) private boolean displaySmiteOverlay; @@ -104,6 +102,7 @@ public class WhaleWatchersPlugin extends Plugin return configManager.getConfig(WhaleWatchersConfig.class); } + @Subscribe private void onOverlayMenuClicked(OverlayMenuClicked event) { if (event.getOverlay().equals(overlay) && event.getEntry().getOption().equals("Reset")) @@ -116,7 +115,6 @@ public class WhaleWatchersPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); overlayManager.add(overlay); overlayManager.add(whaleWatchersProtOverlay); @@ -127,7 +125,6 @@ public class WhaleWatchersPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); overlayManager.remove(overlay); overlayManager.remove(whaleWatchersProtOverlay); overlayManager.remove(whaleWatchersSmiteableOverlay); @@ -135,18 +132,7 @@ public class WhaleWatchersPlugin extends Plugin resetDamageCounter(); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(OverlayMenuClicked.class, this, this::onOverlayMenuClicked); - eventBus.subscribe(HitsplatApplied.class, this, this::onHitsplatApplied); - eventBus.subscribe(ItemContainerChanged.class, this, this::onItemContainerChanged); - eventBus.subscribe(MenuOptionClicked.class, this, this::onMenuOptionClicked); - eventBus.subscribe(VarbitChanged.class, this, this::onVarbitChanged); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(ChatMessage.class, this, this::onChatMessage); - } - +@Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("WhaleWatchers")) @@ -170,6 +156,7 @@ public class WhaleWatchersPlugin extends Plugin } } + @Subscribe private void onChatMessage(ChatMessage event) { if (this.pneckBreak && event.getType() == ChatMessageType.GAMEMESSAGE && event.getMessage().equals(BROKEN_PNECK_MESSAGE)) @@ -178,6 +165,7 @@ public class WhaleWatchersPlugin extends Plugin } } + @Subscribe private void onHitsplatApplied(HitsplatApplied event) { if (this.showDamageCounter) @@ -202,6 +190,7 @@ public class WhaleWatchersPlugin extends Plugin } } + @Subscribe private void onItemContainerChanged(ItemContainerChanged event) { if (this.gloryWarning && event.getItemContainer() == client.getItemContainer(InventoryID.EQUIPMENT)) @@ -216,6 +205,7 @@ public class WhaleWatchersPlugin extends Plugin } } + @Subscribe private void onMenuOptionClicked(MenuOptionClicked event) { if (this.showDamageCounter && event.getMenuOpcode().equals(MenuOpcode.SPELL_CAST_ON_PLAYER)) @@ -224,12 +214,13 @@ public class WhaleWatchersPlugin extends Plugin } } + @Subscribe private void onVarbitChanged(VarbitChanged event) { if (this.showDamageCounter && client.getVar(VarPlayer.ATTACKING_PLAYER) == -1 && inCombat) - { - tickCountdown = 10; - } + { + tickCountdown = 10; + } if (this.protectItemWarning) { @@ -264,6 +255,7 @@ public class WhaleWatchersPlugin extends Plugin } } + @Subscribe private void onGameTick(GameTick event) { if (this.showDamageCounter && tickCountdown > 0 && tickCountdown < 11) @@ -315,7 +307,7 @@ public class WhaleWatchersPlugin extends Plugin damageTaken = 0; damageDone = 0; } - + private void updateConfig() { this.protectItemWarning = config.protectItemWarning(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java index 1327059ec8..a48ee55f23 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wiki/WikiPlugin.java @@ -50,7 +50,7 @@ import net.runelite.api.widgets.WidgetInfo; import net.runelite.api.widgets.WidgetPositionMode; import net.runelite.api.widgets.WidgetType; import net.runelite.client.callback.ClientThread; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.game.ItemManager; import net.runelite.client.game.SpriteManager; import net.runelite.client.game.chatbox.ChatboxPanelManager; @@ -101,9 +101,6 @@ public class WikiPlugin extends Plugin @Inject private Provider wikiSearchChatboxTextInputProvider; - @Inject - private EventBus eventBus; - private Widget icon; private boolean wikiSelected = false; @@ -111,7 +108,6 @@ public class WikiPlugin extends Plugin @Override public void startUp() { - addSubscriptions(); spriteManager.addSpriteOverrides(WikiSprite.values()); clientThread.invokeLater(this::addWidgets); @@ -120,8 +116,6 @@ public class WikiPlugin extends Plugin @Override public void shutDown() { - eventBus.unregister(this); - spriteManager.removeSpriteOverrides(WikiSprite.values()); clientThread.invokeLater(() -> { @@ -142,13 +136,7 @@ public class WikiPlugin extends Plugin }); } - private void addSubscriptions() - { - eventBus.subscribe(WidgetLoaded.class, this, this::onWidgetLoaded); - eventBus.subscribe(MenuOptionClicked.class, this, this::onMenuOptionClicked); - eventBus.subscribe(MenuEntryAdded.class, this, this::onMenuEntryAdded); - } - +@Subscribe private void onWidgetLoaded(WidgetLoaded l) { if (l.getGroupId() == WidgetID.MINIMAP_GROUP_ID) @@ -208,6 +196,7 @@ public class WikiPlugin extends Plugin } } + @Subscribe private void onMenuOptionClicked(MenuOptionClicked ev) { optarget: @@ -346,6 +335,7 @@ public class WikiPlugin extends Plugin return w; } + @Subscribe private void onMenuEntryAdded(MenuEntryAdded event) { int widgetIndex = event.getParam0(); @@ -362,9 +352,7 @@ public class WikiPlugin extends Plugin // plugin might have added something on this same event, and we probably shouldn't remove that instead MenuEntry[] oldEntries = menuEntries; menuEntries = Arrays.copyOf(menuEntries, menuEntries.length - 1); - for (int ourEntry = oldEntries.length - 1; - ourEntry >= 2 && oldEntries[oldEntries.length - 1].getOpcode() != MenuOpcode.SPELL_CAST_ON_WIDGET.getId(); - ourEntry--) + for (int ourEntry = oldEntries.length - 1; ourEntry >= 2 && oldEntries[oldEntries.length - 1].getOpcode() != MenuOpcode.SPELL_CAST_ON_WIDGET.getId(); ourEntry--) { menuEntries[ourEntry - 1] = oldEntries[ourEntry]; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsPlugin.java index 1fd026bf19..fe2de5762c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wildernesslocations/WildernessLocationsPlugin.java @@ -29,7 +29,7 @@ import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; import net.runelite.client.config.Keybind; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.WorldLocation; import net.runelite.client.input.KeyManager; @@ -75,9 +75,6 @@ public class WildernessLocationsPlugin extends Plugin @Inject private KeyManager keyManager; - @Inject - private EventBus eventBus; - @Inject private WildernessLocationsMapOverlay wildernessLocationsMapOverlay; @@ -117,7 +114,6 @@ public class WildernessLocationsPlugin extends Plugin @Override protected void startUp() throws Exception { - addSubscriptions(); updateConfig(); @@ -137,13 +133,7 @@ public class WildernessLocationsPlugin extends Plugin this.worldMapOverlay = this.worldMapNames || this.outlineLocations; } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(VarClientStrChanged.class, this, this::onVarClientStrChanged); - } - +@Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("wildernesslocations")) @@ -157,13 +147,12 @@ public class WildernessLocationsPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(overlay); overlayManager.remove(wildernessLocationsMapOverlay); keyManager.unregisterKeyListener(hotkeyListener); } + @Subscribe private void onGameTick(GameTick event) { if (currentCooldown != 0) @@ -189,6 +178,7 @@ public class WildernessLocationsPlugin extends Plugin } } + @Subscribe private void onVarClientStrChanged(VarClientStrChanged varClient) { String newChat = client.getVar(VarClientStr.CHATBOX_TYPED_TEXT); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java index dfba3b554e..0949c4bf76 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wintertodt/WintertodtPlugin.java @@ -53,7 +53,7 @@ import net.runelite.api.events.VarbitChanged; import net.runelite.client.Notifier; import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -93,9 +93,6 @@ public class WintertodtPlugin extends Plugin @Inject private ChatMessageManager chatMessageManager; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) private WintertodtActivity currentActivity = WintertodtActivity.IDLE; @@ -126,8 +123,6 @@ public class WintertodtPlugin extends Plugin this.notifyCondition = config.notifyCondition(); this.damageNotificationColor = config.damageNotificationColor(); - addSubscriptions(); - reset(); overlayManager.add(overlay); } @@ -141,16 +136,7 @@ public class WintertodtPlugin extends Plugin reset(); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(VarbitChanged.class, this, this::onVarbitChanged); - eventBus.subscribe(ChatMessage.class, this, this::onChatMessage); - eventBus.subscribe(AnimationChanged.class, this, this::onAnimationChanged); - eventBus.subscribe(ItemContainerChanged.class, this, this::onItemContainerChanged); - } - +@Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("wintertodt")) @@ -180,6 +166,7 @@ public class WintertodtPlugin extends Plugin return false; } + @Subscribe private void onGameTick(GameTick gameTick) { if (!isInWintertodtRegion()) @@ -204,6 +191,7 @@ public class WintertodtPlugin extends Plugin checkActionTimeout(); } + @Subscribe void onVarbitChanged(VarbitChanged varbitChanged) { int timerValue = client.getVar(Varbits.WINTERTODT_TIMER); @@ -250,6 +238,7 @@ public class WintertodtPlugin extends Plugin } } + @Subscribe private void onChatMessage(ChatMessage chatMessage) { if (!isInWintertodt) @@ -393,6 +382,7 @@ public class WintertodtPlugin extends Plugin notifier.notify(notification); } + @Subscribe private void onAnimationChanged(final AnimationChanged event) { if (!isInWintertodt) @@ -442,6 +432,7 @@ public class WintertodtPlugin extends Plugin } } + @Subscribe private void onItemContainerChanged(ItemContainerChanged event) { final ItemContainer container = event.getItemContainer(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingPlugin.java index a9c2520eea..648f1ebebf 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/woodcutting/WoodcuttingPlugin.java @@ -49,7 +49,7 @@ import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.client.Notifier; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.events.OverlayMenuClicked; import net.runelite.client.game.ItemManager; @@ -90,9 +90,6 @@ public class WoodcuttingPlugin extends Plugin @Inject private ItemManager itemManager; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) private WoodcuttingSession session; @@ -125,7 +122,6 @@ public class WoodcuttingPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); overlayManager.add(overlay); overlayManager.add(treesOverlay); @@ -134,8 +130,6 @@ public class WoodcuttingPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(overlay); overlayManager.remove(treesOverlay); treeObjects.clear(); @@ -143,19 +137,7 @@ public class WoodcuttingPlugin extends Plugin axe = null; } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(ChatMessage.class, this, this::onChatMessage); - eventBus.subscribe(GameObjectSpawned.class, this, this::onGameObjectSpawned); - eventBus.subscribe(GameObjectDespawned.class, this, this::onGameObjectDespawned); - eventBus.subscribe(GameObjectChanged.class, this, this::onGameObjectChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(AnimationChanged.class, this, this::onAnimationChanged); - eventBus.subscribe(OverlayMenuClicked.class, this, this::onOverlayMenuClicked); - } - +@Subscribe private void onOverlayMenuClicked(OverlayMenuClicked overlayMenuClicked) { OverlayMenuEntry overlayMenuEntry = overlayMenuClicked.getEntry(); @@ -167,6 +149,7 @@ public class WoodcuttingPlugin extends Plugin } } + @Subscribe private void onGameTick(GameTick gameTick) { if (session == null || session.getLastLogCut() == null) @@ -184,6 +167,7 @@ public class WoodcuttingPlugin extends Plugin } } + @Subscribe private void onChatMessage(ChatMessage event) { if (event.getType() == ChatMessageType.SPAM || event.getType() == ChatMessageType.GAMEMESSAGE) @@ -253,6 +237,7 @@ public class WoodcuttingPlugin extends Plugin } } + @Subscribe private void onGameObjectSpawned(final GameObjectSpawned event) { GameObject gameObject = event.getGameObject(); @@ -264,16 +249,19 @@ public class WoodcuttingPlugin extends Plugin } } + @Subscribe private void onGameObjectDespawned(final GameObjectDespawned event) { treeObjects.remove(event.getGameObject()); } + @Subscribe private void onGameObjectChanged(final GameObjectChanged event) { treeObjects.remove(event.getGameObject()); } + @Subscribe private void onGameStateChanged(final GameStateChanged event) { if (event.getGameState() != GameState.LOGGED_IN) @@ -282,6 +270,7 @@ public class WoodcuttingPlugin extends Plugin } } + @Subscribe private void onAnimationChanged(final AnimationChanged event) { Player local = client.getLocalPlayer(); @@ -299,6 +288,7 @@ public class WoodcuttingPlugin extends Plugin } } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("woodcutting")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java index 2841a9172f..11a3d7ad63 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldHopperPlugin.java @@ -59,7 +59,6 @@ import net.runelite.api.MenuEntry; import net.runelite.api.MenuOpcode; import net.runelite.api.Varbits; import net.runelite.api.events.ChatMessage; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.MenuEntryAdded; @@ -74,7 +73,8 @@ import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.chat.QueuedMessage; import net.runelite.client.config.ConfigManager; import net.runelite.client.config.Keybind; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.input.KeyManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -132,9 +132,6 @@ public class WorldHopperPlugin extends Plugin @Inject private WorldHopperConfig config; - @Inject - private EventBus eventBus; - @Inject private OverlayManager overlayManager; @@ -205,7 +202,6 @@ public class WorldHopperPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); firstRun = true; currentPing = -1; @@ -246,8 +242,6 @@ public class WorldHopperPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - pingFuture.cancel(true); pingFuture = null; @@ -270,18 +264,7 @@ public class WorldHopperPlugin extends Plugin hopperExecutorService = null; } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(VarbitChanged.class, this, this::onVarbitChanged); - eventBus.subscribe(MenuEntryAdded.class, this, this::onMenuEntryAdded); - eventBus.subscribe(PlayerMenuOptionClicked.class, this, this::onPlayerMenuOptionClicked); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(WorldListLoad.class, this, this::onWorldListLoad); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(ChatMessage.class, this, this::onChatMessage); - } - +@Subscribe private void onConfigChanged(final ConfigChanged event) { if (event.getGroup().equals(WorldHopperConfig.GROUP)) @@ -365,6 +348,7 @@ public class WorldHopperPlugin extends Plugin panel.updateFavoriteMenu(world.getId(), false); } + @Subscribe private void onVarbitChanged(VarbitChanged varbitChanged) { int old1 = favoriteWorld1; @@ -379,6 +363,7 @@ public class WorldHopperPlugin extends Plugin } } + @Subscribe private void onMenuEntryAdded(MenuEntryAdded event) { if (!this.menuOption) @@ -449,6 +434,7 @@ public class WorldHopperPlugin extends Plugin client.setMenuEntries(newMenu); } + @Subscribe private void onPlayerMenuOptionClicked(PlayerMenuOptionClicked event) { if (!event.getMenuOption().equals(HOP_TO)) @@ -464,6 +450,7 @@ public class WorldHopperPlugin extends Plugin } } + @Subscribe private void onGameStateChanged(GameStateChanged gameStateChanged) { // If the player has disabled the side bar plugin panel, do not update the UI @@ -478,6 +465,7 @@ public class WorldHopperPlugin extends Plugin } } + @Subscribe private void onWorldListLoad(WorldListLoad worldListLoad) { if (!this.showSidebar) @@ -714,6 +702,7 @@ public class WorldHopperPlugin extends Plugin displaySwitcherAttempts = 0; } + @Subscribe private void onGameTick(GameTick event) { if (quickHopTargetWorld == null) @@ -752,6 +741,7 @@ public class WorldHopperPlugin extends Plugin } } + @Subscribe private void onChatMessage(ChatMessage event) { if (event.getType() != ChatMessageType.GAMEMESSAGE) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/WorldMapPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/WorldMapPlugin.java index 2248a0ccc9..89791d0443 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/WorldMapPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/worldmap/WorldMapPlugin.java @@ -35,13 +35,13 @@ import net.runelite.api.GameState; import net.runelite.api.Quest; import net.runelite.api.QuestState; import net.runelite.api.Skill; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.StatChanged; import net.runelite.api.events.WidgetLoaded; import net.runelite.api.widgets.WidgetID; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.AgilityShortcut; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -124,9 +124,6 @@ public class WorldMapPlugin extends Plugin @Inject private WorldMapPointManager worldMapPointManager; - @Inject - private EventBus eventBus; - @Inject private ScheduledExecutorService executor; @@ -161,7 +158,6 @@ public class WorldMapPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); agilityLevel = client.getRealSkillLevel(Skill.AGILITY); woodcuttingLevel = client.getRealSkillLevel(Skill.WOODCUTTING); @@ -171,8 +167,6 @@ public class WorldMapPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - worldMapPointManager.removeIf(FairyRingPoint.class::isInstance); worldMapPointManager.removeIf(AgilityShortcutPoint.class::isInstance); worldMapPointManager.removeIf(QuestStartPoint.class::isInstance); @@ -185,13 +179,7 @@ public class WorldMapPlugin extends Plugin woodcuttingLevel = 0; } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(StatChanged.class, this, this::onStatChanged); - eventBus.subscribe(WidgetLoaded.class, this, this::onWidgetLoaded); - } - +@Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals(CONFIG_KEY)) @@ -203,6 +191,7 @@ public class WorldMapPlugin extends Plugin updateShownIcons(); } + @Subscribe private void onStatChanged(StatChanged statChanged) { switch (statChanged.getSkill()) @@ -230,6 +219,7 @@ public class WorldMapPlugin extends Plugin } } + @Subscribe private void onWidgetLoaded(WidgetLoaded widgetLoaded) { if (widgetLoaded.getGroupId() == WidgetID.WORLD_MAP_GROUP_ID) @@ -341,7 +331,7 @@ public class WorldMapPlugin extends Plugin } }).map(TeleportPoint::new) .forEach(worldMapPointManager::add) - ); + ); } private void updateQuestStartPointIcons() diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesPlugin.java index 6e0671dfc5..22f2f16ee3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesPlugin.java @@ -35,13 +35,12 @@ import javax.inject.Inject; import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; -import net.runelite.api.Client; import net.runelite.api.Experience; import net.runelite.api.Skill; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.StatChanged; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDependency; @@ -67,9 +66,6 @@ public class XpGlobesPlugin extends Plugin @Getter private final List xpGlobes = new ArrayList<>(); - @Inject - private Client client; - @Inject private XpGlobesConfig config; @@ -79,9 +75,6 @@ public class XpGlobesPlugin extends Plugin @Inject private XpGlobesOverlay overlay; - @Inject - private EventBus eventBus; - @Getter(AccessLevel.PACKAGE) private boolean enableTooltips; private boolean hideMaxed; @@ -117,7 +110,6 @@ public class XpGlobesPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); overlayManager.add(overlay); } @@ -125,18 +117,10 @@ public class XpGlobesPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(overlay); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(StatChanged.class, this, this::onStatChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - } - +@Subscribe private void onStatChanged(StatChanged statChanged) { Skill skill = statChanged.getSkill(); @@ -216,6 +200,7 @@ public class XpGlobesPlugin extends Plugin globeCache = new XpGlobe[Skill.values().length - 1]; } + @Subscribe private void onGameStateChanged(GameStateChanged event) { switch (event.getGameState()) @@ -227,6 +212,7 @@ public class XpGlobesPlugin extends Plugin } } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("xpglobes")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java index 6ccfac9dea..40159e318f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java @@ -62,7 +62,7 @@ import net.runelite.api.util.Text; import net.runelite.api.widgets.WidgetID; import static net.runelite.api.widgets.WidgetInfo.TO_GROUP; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.events.ConfigChanged; import net.runelite.client.game.NPCManager; import net.runelite.client.game.SkillIconManager; @@ -118,9 +118,6 @@ public class XpTrackerPlugin extends Plugin @Inject private OverlayManager overlayManager; - @Inject - private EventBus eventBus; - private NavigationButton navButton; @Setter(AccessLevel.PACKAGE) @VisibleForTesting @@ -162,7 +159,6 @@ public class XpTrackerPlugin extends Plugin protected void startUp() throws Exception { updateConfig(); - addSubscriptions(); xpPanel = new XpPanel(this, client, skillIconManager); @@ -185,23 +181,12 @@ public class XpTrackerPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); overlayManager.removeIf(e -> e instanceof XpInfoBoxOverlay); xpState.reset(); clientToolbar.removeNavigation(navButton); } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged); - eventBus.subscribe(StatChanged.class, this, this::onStatChanged); - eventBus.subscribe(NpcDespawned.class, this, this::onNpcDespawned); - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(MenuEntryAdded.class, this, this::onMenuEntryAdded); - eventBus.subscribe(MenuOptionClicked.class, this, this::onMenuOptionClicked); - } - +@Subscribe void onGameStateChanged(GameStateChanged event) { GameState state = event.getGameState(); @@ -371,6 +356,7 @@ public class XpTrackerPlugin extends Plugin } } + @Subscribe void onStatChanged(StatChanged statChanged) { final Skill skill = statChanged.getSkill(); @@ -410,6 +396,7 @@ public class XpTrackerPlugin extends Plugin xpPanel.updateTotal(xpState.getTotalSnapshot()); } + @Subscribe private void onNpcDespawned(NpcDespawned event) { final NPC npc = event.getNpc(); @@ -429,6 +416,7 @@ public class XpTrackerPlugin extends Plugin xpPanel.updateTotal(xpState.getTotalSnapshot()); } + @Subscribe void onGameTick(GameTick event) { if (initializeTracker) @@ -496,6 +484,7 @@ public class XpTrackerPlugin extends Plugin rebuildSkills(); } + @Subscribe private void onMenuEntryAdded(final MenuEntryAdded event) { int widgetID = event.getParam1(); @@ -524,6 +513,7 @@ public class XpTrackerPlugin extends Plugin client.setMenuEntries(menuEntries); } + @Subscribe private void onMenuOptionClicked(MenuOptionClicked event) { if (event.getMenuOpcode().getId() != MenuOpcode.RUNELITE.getId() @@ -746,6 +736,7 @@ public class XpTrackerPlugin extends Plugin } } + @Subscribe private void onConfigChanged(ConfigChanged event) { if (!event.getGroup().equals("xpTracker")) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xtea/XteaPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/xtea/XteaPlugin.java index 18d553bee1..ed4fb9725d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xtea/XteaPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xtea/XteaPlugin.java @@ -31,7 +31,6 @@ import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.events.GameStateChanged; -import net.runelite.client.eventbus.EventBus; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.http.api.xtea.XteaClient; @@ -52,23 +51,8 @@ public class XteaPlugin extends Plugin @Inject private Client client; - @Inject - private EventBus eventBus; - - @Override - protected void startUp() throws Exception - { - //todo re-enable when we have our server back up. - /*eventBus.subscribe(GameStateChanged.class, this, this::onGameStateChanged);*/ - } - - @Override - protected void shutDown() throws Exception - { - //todo re-enable when we have our server back up. - /*eventBus.unregister(this);*/ - } - + // todo re-enable when we have our server back up. + // @Subscribe private void onGameStateChanged(GameStateChanged gameStateChanged) { if (gameStateChanged.getGameState() != GameState.LOGGED_IN) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zalcano/ZalcanoPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/zalcano/ZalcanoPlugin.java index a5d0be7736..fd8316f840 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/zalcano/ZalcanoPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/zalcano/ZalcanoPlugin.java @@ -23,7 +23,6 @@ * * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * */ - package net.runelite.client.plugins.zalcano; import com.google.inject.Binder; @@ -44,6 +43,7 @@ import net.runelite.api.events.NpcSpawned; import net.runelite.api.kit.KitType; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginType; @@ -58,7 +58,6 @@ import net.runelite.client.ui.overlay.OverlayManager; @Slf4j public class ZalcanoPlugin extends Plugin { - @Inject private Client client; @@ -108,7 +107,6 @@ public class ZalcanoPlugin extends Plugin @Override protected void shutDown() { - eventBus.unregister(this); eventBus.unregister("regionchecker"); overlayManager.remove(overlay); overlayManager.remove(stepsOverlay); @@ -124,10 +122,6 @@ public class ZalcanoPlugin extends Plugin if (util.isInZalcanoRegion()) { log.debug("region check complete loading other events"); - eventBus.subscribe(NpcSpawned.class, this, this::onNpcSpawned); - eventBus.subscribe(NpcDespawned.class, this, this::onNpcDespawned); - eventBus.subscribe(GameTick.class, this, this::gameTickStepMachine); - eventBus.subscribe(GameTick.class, this, this::gameTickOreListener); util.manuallyFindZalcano(); //this is here because the new subscribed npcspawn doesn't catch a pre existing zalcano @@ -138,6 +132,7 @@ public class ZalcanoPlugin extends Plugin } } + @Subscribe private void onNpcSpawned(NpcSpawned npcSpawned) { switch (npcSpawned.getNpc().getId()) @@ -153,6 +148,7 @@ public class ZalcanoPlugin extends Plugin } } + @Subscribe private void onNpcDespawned(NpcDespawned npcDespawned) { switch (npcDespawned.getNpc().getId()) @@ -176,6 +172,7 @@ public class ZalcanoPlugin extends Plugin * * @param gameTick */ + @Subscribe private void gameTickStepMachine(GameTick gameTick) { if (!config.showSteps()) @@ -222,6 +219,7 @@ public class ZalcanoPlugin extends Plugin setStep(Step.IDLE); } + @Subscribe private void gameTickOreListener(GameTick gameTick) { if (!config.showSteps()) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zoom/ZoomPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/zoom/ZoomPlugin.java index 4033e4e843..10990c7842 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/zoom/ZoomPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/zoom/ZoomPlugin.java @@ -30,12 +30,12 @@ import com.google.inject.Provides; import java.awt.event.KeyEvent; import net.runelite.api.Client; import net.runelite.api.ScriptID; -import net.runelite.client.events.ConfigChanged; import net.runelite.api.events.FocusChanged; import net.runelite.api.events.ScriptCallbackEvent; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; +import net.runelite.client.events.ConfigChanged; import net.runelite.client.input.KeyListener; import net.runelite.client.input.KeyManager; import net.runelite.client.plugins.Plugin; @@ -52,7 +52,7 @@ public class ZoomPlugin extends Plugin implements KeyListener { /** * The largest (most zoomed in) value that can be used without the client crashing. - * + *

* Larger values trigger an overflow in the engine's fov to scale code. */ private static final int INNER_ZOOM_LIMIT = 1004; @@ -72,15 +72,13 @@ public class ZoomPlugin extends Plugin implements KeyListener @Inject private KeyManager keyManager; - @Inject - private EventBus eventBus; - @Provides ZoomConfig getConfig(ConfigManager configManager) { return configManager.getConfig(ZoomConfig.class); } + @Subscribe private void onScriptCallbackEvent(ScriptCallbackEvent event) { if (client.getIndexScripts().isOverlayOutdated()) @@ -144,6 +142,7 @@ public class ZoomPlugin extends Plugin implements KeyListener } } + @Subscribe private void onFocusChanged(FocusChanged event) { if (!event.isFocused()) @@ -155,7 +154,6 @@ public class ZoomPlugin extends Plugin implements KeyListener @Override protected void startUp() { - addSubscriptions(); client.setCameraPitchRelaxerEnabled(zoomConfig.relaxCameraPitch()); keyManager.registerKeyListener(this); @@ -164,20 +162,12 @@ public class ZoomPlugin extends Plugin implements KeyListener @Override protected void shutDown() { - eventBus.unregister(this); - client.setCameraPitchRelaxerEnabled(false); keyManager.unregisterKeyListener(this); controlDown = false; } - private void addSubscriptions() - { - eventBus.subscribe(ConfigChanged.class, this, this::onConfigChanged); - eventBus.subscribe(ScriptCallbackEvent.class, this, this::onScriptCallbackEvent); - eventBus.subscribe(FocusChanged.class, this, this::onFocusChanged); - } - + @Subscribe private void onConfigChanged(ConfigChanged ev) { client.setCameraPitchRelaxerEnabled(zoomConfig.relaxCameraPitch()); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java index 3328d50d89..79e7d90c39 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/zulrah/ZulrahPlugin.java @@ -44,7 +44,7 @@ import net.runelite.api.events.GameTick; import net.runelite.api.events.NpcDespawned; import net.runelite.api.events.NpcSpawned; import net.runelite.client.config.ConfigManager; -import net.runelite.client.eventbus.EventBus; +import net.runelite.client.eventbus.Subscribe; import net.runelite.client.game.Sound; import net.runelite.client.game.SoundManager; import net.runelite.client.plugins.Plugin; @@ -98,8 +98,6 @@ public class ZulrahPlugin extends Plugin private ZulrahPrayerOverlay zulrahPrayerOverlay; @Inject private ZulrahOverlay zulrahOverlay; - @Inject - private EventBus eventBus; private ZulrahInstance instance; @Provides @@ -111,7 +109,6 @@ public class ZulrahPlugin extends Plugin @Override protected void startUp() throws Exception { - addSubscriptions(); overlayManager.add(currentPhaseOverlay); overlayManager.add(nextPhaseOverlay); @@ -122,8 +119,6 @@ public class ZulrahPlugin extends Plugin @Override protected void shutDown() throws Exception { - eventBus.unregister(this); - overlayManager.remove(currentPhaseOverlay); overlayManager.remove(nextPhaseOverlay); overlayManager.remove(zulrahPrayerOverlay); @@ -132,14 +127,7 @@ public class ZulrahPlugin extends Plugin instance = null; } - private void addSubscriptions() - { - eventBus.subscribe(GameTick.class, this, this::onGameTick); - eventBus.subscribe(AnimationChanged.class, this, this::onAnimationChanged); - eventBus.subscribe(NpcSpawned.class, this, this::onNpcSpawned); - eventBus.subscribe(NpcDespawned.class, this, this::onNpcDespawned); - } - +@Subscribe private void onGameTick(GameTick event) { if (client.getGameState() != GameState.LOGGED_IN) @@ -209,6 +197,7 @@ public class ZulrahPlugin extends Plugin } } + @Subscribe private void onAnimationChanged(AnimationChanged event) { if (instance == null) @@ -247,6 +236,7 @@ public class ZulrahPlugin extends Plugin } } + @Subscribe private void onNpcSpawned(NpcSpawned event) { NPC npc = event.getNpc(); @@ -257,6 +247,7 @@ public class ZulrahPlugin extends Plugin } } + @Subscribe private void onNpcDespawned(NpcDespawned event) { NPC npc = event.getNpc();