diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index 8a9e045c79..8ce33f383f 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -46,9 +46,8 @@ provided - com.google.code.findbugs - jsr305 - 1.3.9 + com.google.guava + guava diff --git a/runelite-api/src/main/java/net/runelite/api/events/ActorDespawned.java b/runelite-api/src/main/java/net/runelite/api/events/ActorDespawned.java deleted file mode 100644 index 20af3e82db..0000000000 --- a/runelite-api/src/main/java/net/runelite/api/events/ActorDespawned.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2018, Adam - * All rights reserved. - * - * 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.api.events; - -import net.runelite.api.Actor; - -/** - * Represents the base event where an {@link Actor} has despawned. - *

- * To hook into a more focused actor type, see the {@link PlayerDespawned} - * or {@link NpcDespawned} events. - *

- * Examples of when this event may trigger include: - *

- *

- * During a world change, the event is only called for Players, - * ie. {@link PlayerDespawned} will trigger but {@link NpcDespawned} - * will not. - *

- * The client logging out does not trigger this event. - */ -public interface ActorDespawned -{ - /** - * Gets the despawned player or NPC. - * - * @return despawned entity - */ - Actor getActor(); -} diff --git a/runelite-api/src/main/java/net/runelite/api/events/EventBus.java b/runelite-api/src/main/java/net/runelite/api/events/EventBus.java new file mode 100644 index 0000000000..7277a3a0af --- /dev/null +++ b/runelite-api/src/main/java/net/runelite/api/events/EventBus.java @@ -0,0 +1,249 @@ +/* + * Copyright (c) 2018, Tomas Slusny + * Copyright (c) 2018, Abex + * All rights reserved. + * + * 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.api.events; + +import com.google.common.base.Preconditions; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.ImmutableMultimap; +import com.google.common.collect.Multimap; +import java.lang.invoke.CallSite; +import java.lang.invoke.LambdaMetafactory; +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.lang.invoke.MethodType; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.function.Consumer; +import javax.annotation.Nonnull; +import javax.annotation.concurrent.ThreadSafe; +import lombok.EqualsAndHashCode; +import lombok.RequiredArgsConstructor; +import lombok.Value; +import lombok.extern.slf4j.Slf4j; + +@Slf4j +@RequiredArgsConstructor +@ThreadSafe +public class EventBus +{ + @FunctionalInterface + public interface SubscriberMethod + { + void invoke(Object event); + } + + @Value + private static class Subscriber + { + private final Object object; + private final Method method; + @EqualsAndHashCode.Exclude + private final SubscriberMethod lamda; + + void invoke(final Object arg) throws Exception + { + if (lamda != null) + { + lamda.invoke(arg); + } + else + { + method.invoke(object, arg); + } + } + } + + private final Consumer exceptionHandler; + private ImmutableMultimap subscribers = ImmutableMultimap.of(); + + /** + * Instantiates EventBus with default exception handler + */ + public EventBus() + { + this((e) -> log.warn("Uncaught exception in event subscriber", e)); + } + + /** + * Registers subscriber to EventBus. All methods in subscriber and it's parent classes are checked for + * {@link Subscribe} annotation and then added to map of subscriptions. + * + * @param object subscriber to register + * @throws IllegalArgumentException in case subscriber method name is wrong (correct format is 'on' + EventName + */ + public synchronized void register(@Nonnull final Object object) + { + final ImmutableMultimap.Builder builder = ImmutableMultimap.builder(); + + if (subscribers != null) + { + builder.putAll(subscribers); + } + + for (Class clazz = object.getClass(); clazz != null; clazz = clazz.getSuperclass()) + { + for (final Method method : clazz.getDeclaredMethods()) + { + final Subscribe sub = method.getAnnotation(Subscribe.class); + + if (sub == null) + { + continue; + } + + Preconditions.checkArgument(method.getReturnType() == Void.TYPE, "@Subscribed method \"" + method + "\" cannot return a value"); + Preconditions.checkArgument(method.getParameterCount() == 1, "@Subscribed method \"" + method + "\" must take exactly 1 argument"); + Preconditions.checkArgument(!Modifier.isStatic(method.getModifiers()), "@Subscribed method \"" + method + "\" cannot be static"); + + final Class parameterClazz = method.getParameterTypes()[0]; + + Preconditions.checkArgument(!parameterClazz.isPrimitive(), "@Subscribed method \"" + method + "\" cannot subscribe to primitives"); + Preconditions.checkArgument((parameterClazz.getModifiers() & (Modifier.ABSTRACT | Modifier.INTERFACE)) == 0, "@Subscribed method \"" + method + "\" cannot subscribe to polymorphic classes"); + + for (Class psc = parameterClazz.getSuperclass(); psc != null; psc = psc.getSuperclass()) + { + if (subscribers.containsKey(psc)) + { + throw new IllegalArgumentException("@Subscribed method \"" + method + "\" cannot subscribe to class which inherits from subscribed class \"" + psc + "\""); + } + } + + final String preferredName = "on" + parameterClazz.getSimpleName(); + Preconditions.checkArgument(method.getName().equals(preferredName), "Subscribed method " + method + " should be named " + preferredName); + + method.setAccessible(true); + SubscriberMethod lambda = null; + + try + { + final MethodHandles.Lookup caller = privateLookupIn(clazz); + final MethodType subscription = MethodType.methodType(void.class, parameterClazz); + final MethodHandle target = caller.findVirtual(clazz, method.getName(), subscription); + final CallSite site = LambdaMetafactory.metafactory( + caller, + "invoke", + MethodType.methodType(SubscriberMethod.class, clazz), + subscription.changeParameterType(0, Object.class), + target, + subscription); + + final MethodHandle factory = site.getTarget(); + lambda = (SubscriberMethod) factory.bindTo(object).invokeExact(); + } + catch (Throwable e) + { + log.warn("Unable to create lambda for method {}", method, e); + } + + final Subscriber subscriber = new Subscriber(object, method, lambda); + builder.put(parameterClazz, subscriber); + log.debug("Registering {} - {}", parameterClazz, subscriber); + } + } + + subscribers = builder.build(); + } + + /** + * Unregisters all subscribed methods from provided subscriber object. + * + * @param object object to unsubscribe from + */ + public synchronized void unregister(@Nonnull final Object object) + { + if (subscribers == null) + { + return; + } + + final Multimap map = HashMultimap.create(); + map.putAll(subscribers); + + for (Class clazz = object.getClass(); clazz != null; clazz = clazz.getSuperclass()) + { + for (final Method method : clazz.getDeclaredMethods()) + { + final Subscribe sub = method.getAnnotation(Subscribe.class); + + if (sub == null) + { + continue; + } + + final Class parameterClazz = method.getParameterTypes()[0]; + map.remove(parameterClazz, new Subscriber(object, method, null)); + } + } + + subscribers = ImmutableMultimap.copyOf(map); + } + + /** + * Posts provided event to all registered subscribers. Subscriber calls are invoked immediately and in order + * in which subscribers were registered. + * + * @param event event to post + */ + public void post(@Nonnull final Object event) + { + for (final Subscriber subscriber : subscribers.get(event.getClass())) + { + try + { + subscriber.invoke(event); + } + catch (Exception e) + { + exceptionHandler.accept(e); + } + } + } + + private static MethodHandles.Lookup privateLookupIn(Class clazz) throws IllegalAccessException, NoSuchFieldException, InvocationTargetException + { + try + { + // Java 9+ has privateLookupIn method on MethodHandles, but since we are shipping and using Java 8 + // we need to access it via reflection. This is preferred way because it's Java 9+ public api and is + // likely to not change + final Method privateLookupIn = MethodHandles.class.getMethod("privateLookupIn", Class.class, MethodHandles.Lookup.class); + return (MethodHandles.Lookup) privateLookupIn.invoke(null, clazz, MethodHandles.lookup()); + } + catch (NoSuchMethodException e) + { + // In Java 8 we first do standard lookupIn class + final MethodHandles.Lookup lookupIn = MethodHandles.lookup().in(clazz); + + // and then we mark it as trusted for private lookup via reflection on private field + final Field modes = MethodHandles.Lookup.class.getDeclaredField("allowedModes"); + modes.setAccessible(true); + modes.setInt(lookupIn, -1); // -1 == TRUSTED + return lookupIn; + } + } +} diff --git a/runelite-api/src/main/java/net/runelite/api/events/NpcDespawned.java b/runelite-api/src/main/java/net/runelite/api/events/NpcDespawned.java index c2b7ac9878..0f6399fa4a 100644 --- a/runelite-api/src/main/java/net/runelite/api/events/NpcDespawned.java +++ b/runelite-api/src/main/java/net/runelite/api/events/NpcDespawned.java @@ -32,14 +32,13 @@ import net.runelite.api.NPC; * An event where an {@link NPC} has despawned. */ @Value -public class NpcDespawned implements ActorDespawned +public class NpcDespawned { /** * The despawned NPC. */ private final NPC npc; - @Override public Actor getActor() { return npc; diff --git a/runelite-api/src/main/java/net/runelite/api/events/NpcSpawned.java b/runelite-api/src/main/java/net/runelite/api/events/NpcSpawned.java index 30ea6cf148..2101bdd4fb 100644 --- a/runelite-api/src/main/java/net/runelite/api/events/NpcSpawned.java +++ b/runelite-api/src/main/java/net/runelite/api/events/NpcSpawned.java @@ -32,14 +32,13 @@ import net.runelite.api.NPC; * An event where an {@link NPC} has spawned. */ @Value -public class NpcSpawned implements ActorSpawned +public class NpcSpawned { /** * The spawned NPC. */ private final NPC npc; - @Override public Actor getActor() { return npc; diff --git a/runelite-api/src/main/java/net/runelite/api/events/PlayerDespawned.java b/runelite-api/src/main/java/net/runelite/api/events/PlayerDespawned.java index 8692d07d97..9e38311069 100644 --- a/runelite-api/src/main/java/net/runelite/api/events/PlayerDespawned.java +++ b/runelite-api/src/main/java/net/runelite/api/events/PlayerDespawned.java @@ -34,14 +34,13 @@ import net.runelite.api.Player; * Note: This event does not get called for the local player. */ @Value -public class PlayerDespawned implements ActorDespawned +public class PlayerDespawned { /** * The despawned player. */ private final Player player; - @Override public Actor getActor() { return player; diff --git a/runelite-api/src/main/java/net/runelite/api/events/PlayerSpawned.java b/runelite-api/src/main/java/net/runelite/api/events/PlayerSpawned.java index f4372ee818..f730a0b652 100644 --- a/runelite-api/src/main/java/net/runelite/api/events/PlayerSpawned.java +++ b/runelite-api/src/main/java/net/runelite/api/events/PlayerSpawned.java @@ -32,14 +32,13 @@ import net.runelite.api.Player; * An event where a {@link Player} has spawned. */ @Value -public class PlayerSpawned implements ActorSpawned +public class PlayerSpawned { /** * The spawned player. */ private final Player player; - @Override public Actor getActor() { return player; diff --git a/runelite-api/src/main/java/net/runelite/api/events/ActorSpawned.java b/runelite-api/src/main/java/net/runelite/api/events/Subscribe.java similarity index 68% rename from runelite-api/src/main/java/net/runelite/api/events/ActorSpawned.java rename to runelite-api/src/main/java/net/runelite/api/events/Subscribe.java index 1856dfebdb..4c70602f83 100644 --- a/runelite-api/src/main/java/net/runelite/api/events/ActorSpawned.java +++ b/runelite-api/src/main/java/net/runelite/api/events/Subscribe.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Adam + * Copyright (c) 2018, Abex * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -24,27 +24,18 @@ */ package net.runelite.api.events; -import net.runelite.api.Actor; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** - * Represents the base event where an {@link Actor} has spawned. - *

- * To hook into a more focused actor type, see the {@link PlayerSpawned} - * or {@link NpcSpawned} events. - *

- * Examples of when this event may trigger include: - *

+ * Marks a method as an event subscriber. */ -public interface ActorSpawned +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.METHOD) +@Documented +public @interface Subscribe { - /** - * Gets the spawned player or NPC. - * - * @return spawned entity - */ - Actor getActor(); } diff --git a/runelite-api/src/main/java/net/runelite/api/queries/ActorQuery.java b/runelite-api/src/main/java/net/runelite/api/queries/ActorQuery.java index f9b2971179..f6b74c25b7 100644 --- a/runelite-api/src/main/java/net/runelite/api/queries/ActorQuery.java +++ b/runelite-api/src/main/java/net/runelite/api/queries/ActorQuery.java @@ -32,8 +32,6 @@ import net.runelite.api.coords.LocalPoint; /** * Used for getting players in view,deprecated as of existence of Actor spawn events * - * @see net.runelite.api.events.ActorSpawned - * @see net.runelite.api.events.ActorDespawned */ @Deprecated public abstract class ActorQuery extends Query diff --git a/runelite-client/src/main/java/net/runelite/client/RuneLite.java b/runelite-client/src/main/java/net/runelite/client/RuneLite.java index 13d30d85f0..2121c44b48 100644 --- a/runelite-client/src/main/java/net/runelite/client/RuneLite.java +++ b/runelite-client/src/main/java/net/runelite/client/RuneLite.java @@ -27,7 +27,6 @@ package net.runelite.client; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; import com.google.common.annotations.VisibleForTesting; -import com.google.common.eventbus.EventBus; import com.google.inject.Guice; import com.google.inject.Inject; import com.google.inject.Injector; @@ -45,6 +44,7 @@ import joptsimple.util.EnumConverter; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; +import net.runelite.api.events.EventBus; import net.runelite.client.account.SessionManager; import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.chat.CommandManager; diff --git a/runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java b/runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java index ed2e7ac7dc..1b4fce3b38 100644 --- a/runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java +++ b/runelite-client/src/main/java/net/runelite/client/RuneLiteModule.java @@ -24,8 +24,6 @@ */ package net.runelite.client; -import com.google.common.eventbus.EventBus; -import com.google.common.eventbus.SubscriberExceptionContext; import com.google.inject.AbstractModule; import com.google.inject.Provides; import com.google.inject.name.Names; @@ -36,6 +34,7 @@ import javax.annotation.Nullable; import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; +import net.runelite.api.events.EventBus; import net.runelite.api.hooks.Callbacks; import net.runelite.client.account.SessionManager; import net.runelite.client.callback.Hooks; @@ -87,6 +86,9 @@ public class RuneLiteModule extends AbstractModule bind(Callbacks.class).to(Hooks.class); + bind(EventBus.class) + .toInstance(new EventBus()); + bind(EventBus.class) .annotatedWith(Names.named("Deferred EventBus")) .to(DeferredEventBus.class); @@ -123,16 +125,4 @@ public class RuneLiteModule extends AbstractModule { return configManager.getConfig(ChatColorConfig.class); } - - @Provides - @Singleton - EventBus provideEventBus() - { - return new EventBus(RuneLiteModule::eventExceptionHandler); - } - - private static void eventExceptionHandler(Throwable exception, SubscriberExceptionContext context) - { - log.warn("uncaught exception in event subscriber", exception); - } } diff --git a/runelite-client/src/main/java/net/runelite/client/account/SessionManager.java b/runelite-client/src/main/java/net/runelite/client/account/SessionManager.java index 5a17b54b79..05376aa1b0 100644 --- a/runelite-client/src/main/java/net/runelite/client/account/SessionManager.java +++ b/runelite-client/src/main/java/net/runelite/client/account/SessionManager.java @@ -24,8 +24,6 @@ */ package net.runelite.client.account; -import com.google.common.eventbus.EventBus; -import com.google.common.eventbus.Subscribe; import com.google.gson.Gson; import java.io.File; import java.io.FileInputStream; @@ -38,8 +36,10 @@ import javax.inject.Inject; import javax.inject.Singleton; import lombok.Getter; import lombok.extern.slf4j.Slf4j; +import net.runelite.api.events.EventBus; import net.runelite.api.events.SessionClose; import net.runelite.api.events.SessionOpen; +import net.runelite.api.events.Subscribe; import net.runelite.client.RuneLite; import net.runelite.client.config.ConfigManager; import net.runelite.client.util.LinkBrowser; diff --git a/runelite-client/src/main/java/net/runelite/client/account/WSClient.java b/runelite-client/src/main/java/net/runelite/client/account/WSClient.java index 4df3d3aca0..fb1e44178b 100644 --- a/runelite-client/src/main/java/net/runelite/client/account/WSClient.java +++ b/runelite-client/src/main/java/net/runelite/client/account/WSClient.java @@ -24,7 +24,6 @@ */ package net.runelite.client.account; -import com.google.common.eventbus.EventBus; import com.google.gson.Gson; import java.time.Duration; import java.time.Instant; @@ -32,6 +31,7 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import lombok.extern.slf4j.Slf4j; +import net.runelite.api.events.EventBus; import net.runelite.http.api.RuneLiteAPI; import net.runelite.http.api.ws.WebsocketGsonFactory; import net.runelite.http.api.ws.WebsocketMessage; diff --git a/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java b/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java index 766e6acd24..20c75583c4 100644 --- a/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java +++ b/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java @@ -24,7 +24,6 @@ */ package net.runelite.client.callback; -import com.google.common.eventbus.EventBus; import com.google.inject.Injector; import java.awt.Color; import java.awt.Dimension; @@ -47,6 +46,7 @@ import net.runelite.api.MainBufferProvider; import net.runelite.api.RenderOverview; import net.runelite.api.Renderable; import net.runelite.api.WorldMapManager; +import net.runelite.api.events.EventBus; import net.runelite.api.events.GameTick; import net.runelite.api.hooks.Callbacks; import net.runelite.api.hooks.DrawCallbacks; diff --git a/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java b/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java index ef6270fe40..2f891bec5f 100644 --- a/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java +++ b/runelite-client/src/main/java/net/runelite/client/chat/ChatMessageManager.java @@ -28,7 +28,6 @@ import com.google.common.base.MoreObjects; import com.google.common.base.Strings; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import com.google.common.eventbus.Subscribe; import java.awt.Color; import java.util.Arrays; import java.util.Collection; @@ -47,6 +46,7 @@ import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.ResizeableChanged; import net.runelite.api.events.ScriptCallbackEvent; import net.runelite.api.events.SetMessage; +import net.runelite.api.events.Subscribe; import net.runelite.api.events.VarbitChanged; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ChatColorConfig; diff --git a/runelite-client/src/main/java/net/runelite/client/chat/CommandManager.java b/runelite-client/src/main/java/net/runelite/client/chat/CommandManager.java index 4812370f06..690e472d64 100644 --- a/runelite-client/src/main/java/net/runelite/client/chat/CommandManager.java +++ b/runelite-client/src/main/java/net/runelite/client/chat/CommandManager.java @@ -25,8 +25,6 @@ */ package net.runelite.client.chat; -import com.google.common.eventbus.EventBus; -import com.google.common.eventbus.Subscribe; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -37,7 +35,9 @@ import net.runelite.api.Client; import net.runelite.api.ScriptID; import net.runelite.api.VarClientStr; import net.runelite.api.events.CommandExecuted; +import net.runelite.api.events.EventBus; import net.runelite.api.events.ScriptCallbackEvent; +import net.runelite.api.events.Subscribe; import net.runelite.client.callback.ClientThread; import net.runelite.client.events.ChatboxInput; import net.runelite.client.events.PrivateMessageInput; diff --git a/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java b/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java index d85139cfdb..ad5314557d 100644 --- a/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java +++ b/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java @@ -27,7 +27,6 @@ package net.runelite.client.config; import com.google.common.base.Strings; import com.google.common.collect.ComparisonChain; import com.google.common.collect.ImmutableMap; -import com.google.common.eventbus.EventBus; import java.awt.Color; import java.awt.Dimension; import java.awt.Point; @@ -56,6 +55,7 @@ import javax.inject.Inject; import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; import net.runelite.api.events.ConfigChanged; +import net.runelite.api.events.EventBus; import net.runelite.client.RuneLite; import net.runelite.client.account.AccountSession; import net.runelite.http.api.config.ConfigClient; diff --git a/runelite-client/src/main/java/net/runelite/client/discord/DiscordService.java b/runelite-client/src/main/java/net/runelite/client/discord/DiscordService.java index ecb337780f..90ac759f00 100644 --- a/runelite-client/src/main/java/net/runelite/client/discord/DiscordService.java +++ b/runelite-client/src/main/java/net/runelite/client/discord/DiscordService.java @@ -25,12 +25,12 @@ package net.runelite.client.discord; import com.google.common.base.Strings; -import com.google.common.eventbus.EventBus; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import javax.inject.Inject; import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; +import net.runelite.api.events.EventBus; import net.runelite.client.RuneLiteProperties; import net.runelite.client.discord.events.DiscordDisconnected; import net.runelite.client.discord.events.DiscordErrored; diff --git a/runelite-client/src/main/java/net/runelite/client/game/ChatboxInputManager.java b/runelite-client/src/main/java/net/runelite/client/game/ChatboxInputManager.java index 8614109385..2e398adee3 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/ChatboxInputManager.java +++ b/runelite-client/src/main/java/net/runelite/client/game/ChatboxInputManager.java @@ -24,15 +24,15 @@ */ package net.runelite.client.game; -import com.google.common.eventbus.EventBus; -import com.google.common.eventbus.Subscribe; import com.google.inject.Inject; import com.google.inject.Singleton; import java.util.function.Consumer; import lombok.Getter; import net.runelite.api.Client; import net.runelite.api.ScriptID; +import net.runelite.api.events.EventBus; import net.runelite.api.events.ScriptCallbackEvent; +import net.runelite.api.events.Subscribe; import net.runelite.client.callback.ClientThread; @Singleton diff --git a/runelite-client/src/main/java/net/runelite/client/game/ClanManager.java b/runelite-client/src/main/java/net/runelite/client/game/ClanManager.java index b9f5be6d1a..0f7d1a10a7 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/ClanManager.java +++ b/runelite-client/src/main/java/net/runelite/client/game/ClanManager.java @@ -27,7 +27,6 @@ package net.runelite.client.game; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; -import com.google.common.eventbus.Subscribe; import java.awt.Color; import java.awt.Dimension; import java.awt.image.BufferedImage; @@ -49,6 +48,7 @@ import net.runelite.api.IndexedSprite; import net.runelite.api.SpriteID; import net.runelite.api.events.ClanChanged; import net.runelite.api.events.GameStateChanged; +import net.runelite.api.events.Subscribe; import net.runelite.client.util.ImageUtil; import net.runelite.client.util.Text; diff --git a/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java b/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java index 32e6bac7e0..35ba0a0035 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java +++ b/runelite-client/src/main/java/net/runelite/client/game/ItemManager.java @@ -28,7 +28,6 @@ import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableMap; -import com.google.common.eventbus.Subscribe; import java.awt.Color; import java.awt.image.BufferedImage; import java.io.IOException; @@ -51,8 +50,9 @@ import net.runelite.api.ItemID; import static net.runelite.api.ItemID.*; import net.runelite.api.SpritePixels; import net.runelite.api.events.GameStateChanged; -import net.runelite.client.callback.ClientThread; import net.runelite.api.events.PostItemComposition; +import net.runelite.api.events.Subscribe; +import net.runelite.client.callback.ClientThread; import net.runelite.http.api.item.ItemClient; import net.runelite.http.api.item.ItemPrice; diff --git a/runelite-client/src/main/java/net/runelite/client/game/LootManager.java b/runelite-client/src/main/java/net/runelite/client/game/LootManager.java index 371fa8744f..36d9da368b 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/LootManager.java +++ b/runelite-client/src/main/java/net/runelite/client/game/LootManager.java @@ -27,8 +27,6 @@ package net.runelite.client.game; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ListMultimap; -import com.google.common.eventbus.EventBus; -import com.google.common.eventbus.Subscribe; import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; @@ -49,12 +47,14 @@ import net.runelite.api.Tile; import net.runelite.api.coords.LocalPoint; import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.AnimationChanged; +import net.runelite.api.events.EventBus; import net.runelite.api.events.GameTick; import net.runelite.api.events.ItemDespawned; import net.runelite.api.events.ItemQuantityChanged; import net.runelite.api.events.ItemSpawned; import net.runelite.api.events.NpcDespawned; import net.runelite.api.events.PlayerDespawned; +import net.runelite.api.events.Subscribe; import net.runelite.client.events.NpcLootReceived; import net.runelite.client.events.PlayerLootReceived; diff --git a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxPanelManager.java b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxPanelManager.java index 954a83b08c..df3b55668e 100644 --- a/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxPanelManager.java +++ b/runelite-client/src/main/java/net/runelite/client/game/chatbox/ChatboxPanelManager.java @@ -24,8 +24,6 @@ */ package net.runelite.client.game.chatbox; -import com.google.common.eventbus.EventBus; -import com.google.common.eventbus.Subscribe; import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; @@ -35,8 +33,10 @@ import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.ScriptID; import net.runelite.api.VarClientInt; +import net.runelite.api.events.EventBus; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.ScriptCallbackEvent; +import net.runelite.api.events.Subscribe; import net.runelite.api.vars.InputType; import net.runelite.api.widgets.JavaScriptCallback; import net.runelite.api.widgets.Widget; diff --git a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java index e5b3278f27..f0166940ea 100644 --- a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java +++ b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java @@ -27,8 +27,6 @@ package net.runelite.client.menus; import com.google.common.base.Preconditions; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import com.google.common.eventbus.EventBus; -import com.google.common.eventbus.Subscribe; import java.util.Arrays; import java.util.Collection; import java.util.HashMap; @@ -43,11 +41,13 @@ import net.runelite.api.MenuAction; import net.runelite.api.MenuEntry; import net.runelite.api.NPC; import net.runelite.api.NPCComposition; +import net.runelite.api.events.EventBus; import net.runelite.api.events.MenuEntryAdded; import net.runelite.api.events.MenuOptionClicked; import net.runelite.api.events.NpcActionChanged; import net.runelite.api.events.PlayerMenuOptionClicked; import net.runelite.api.events.PlayerMenuOptionsChanged; +import net.runelite.api.events.Subscribe; import net.runelite.api.events.WidgetMenuOptionClicked; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.util.Text; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java b/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java index 5dc44b1264..d54048eae6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/PluginManager.java @@ -27,8 +27,6 @@ package net.runelite.client.plugins; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; -import com.google.common.eventbus.EventBus; -import com.google.common.eventbus.Subscribe; import com.google.common.graph.Graph; import com.google.common.graph.GraphBuilder; import com.google.common.graph.Graphs; @@ -59,8 +57,10 @@ import javax.inject.Singleton; import javax.swing.SwingUtilities; import lombok.Setter; import lombok.extern.slf4j.Slf4j; +import net.runelite.api.events.EventBus; import net.runelite.api.events.SessionClose; import net.runelite.api.events.SessionOpen; +import net.runelite.api.events.Subscribe; import net.runelite.client.RuneLite; import net.runelite.client.config.Config; import net.runelite.client.config.ConfigGroup; @@ -337,7 +337,7 @@ public class PluginManager schedule(plugin); eventBus.post(new PluginChanged(plugin, true)); } - catch (InterruptedException | InvocationTargetException ex) + catch (InterruptedException | InvocationTargetException | IllegalArgumentException ex) { throw new PluginInstantiationException(ex); } 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 ebc080bd8a..c0aedef526 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,7 +24,6 @@ */ package net.runelite.client.plugins.account; -import com.google.common.eventbus.Subscribe; import java.awt.image.BufferedImage; import java.util.concurrent.ScheduledExecutorService; import javax.inject.Inject; @@ -32,6 +31,7 @@ import javax.swing.JOptionPane; import lombok.extern.slf4j.Slf4j; import net.runelite.api.events.SessionClose; import net.runelite.api.events.SessionOpen; +import net.runelite.api.events.Subscribe; import net.runelite.client.account.AccountSession; import net.runelite.client.account.SessionManager; import net.runelite.client.plugins.Plugin; 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 b83e8129e6..81057f1b3d 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 @@ -25,7 +25,6 @@ */ package net.runelite.client.plugins.achievementdiary; -import com.google.common.eventbus.Subscribe; import java.awt.Color; import java.util.ArrayList; import java.util.Collection; @@ -37,6 +36,7 @@ import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.ScriptID; import net.runelite.api.Skill; +import net.runelite.api.events.Subscribe; import net.runelite.api.events.WidgetLoaded; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetID; 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 4756373f06..a1414eb527 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 @@ -24,7 +24,6 @@ */ package net.runelite.client.plugins.agility; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.util.ArrayList; import java.util.Arrays; @@ -58,6 +57,7 @@ import net.runelite.api.events.GroundObjectDespawned; import net.runelite.api.events.GroundObjectSpawned; import net.runelite.api.events.ItemDespawned; import net.runelite.api.events.ItemSpawned; +import net.runelite.api.events.Subscribe; import net.runelite.api.events.WallObjectChanged; import net.runelite.api.events.WallObjectDespawned; import net.runelite.api.events.WallObjectSpawned; 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 300e581a0e..d4834166c1 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 @@ -24,14 +24,14 @@ */ package net.runelite.client.plugins.animsmoothing; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; +import javax.inject.Inject; import net.runelite.api.Client; import net.runelite.api.events.ConfigChanged; +import net.runelite.api.events.Subscribe; import net.runelite.client.config.ConfigManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; -import javax.inject.Inject; @PluginDescriptor( name = "Animation Smoothing", 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 cae25bae3e..b43d21956d 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 @@ -24,12 +24,12 @@ */ package net.runelite.client.plugins.antidrag; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.awt.event.KeyEvent; import javax.inject.Inject; import net.runelite.api.Client; import net.runelite.api.events.FocusChanged; +import net.runelite.api.events.Subscribe; import net.runelite.client.config.ConfigManager; import net.runelite.client.input.KeyListener; import net.runelite.client.input.KeyManager; 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 0c1d668a2d..accb5a081c 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 @@ -27,7 +27,6 @@ package net.runelite.client.plugins.attackstyles; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.HashBasedTable; import com.google.common.collect.Table; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.util.HashSet; import java.util.Set; @@ -39,6 +38,7 @@ import net.runelite.api.VarPlayer; import net.runelite.api.Varbits; import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; +import net.runelite.api.events.Subscribe; import net.runelite.api.events.VarbitChanged; import net.runelite.api.events.WidgetHiddenChanged; import net.runelite.api.events.WidgetLoaded; 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 505d0f2cd0..fbb66fed45 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 @@ -28,7 +28,6 @@ package net.runelite.client.plugins.banktags; import com.google.common.base.Joiner; import com.google.common.base.Splitter; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.awt.event.KeyEvent; import java.awt.event.MouseWheelEvent; @@ -54,6 +53,7 @@ import net.runelite.api.events.GameTick; import net.runelite.api.events.MenuEntryAdded; import net.runelite.api.events.MenuOptionClicked; import net.runelite.api.events.ScriptCallbackEvent; +import net.runelite.api.events.Subscribe; import net.runelite.api.events.WidgetLoaded; import net.runelite.api.vars.InputType; import net.runelite.api.widgets.Widget; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/bankvalue/BankValuePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/bankvalue/BankValuePlugin.java index 5f1bde8251..2f8c6518a8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/bankvalue/BankValuePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/bankvalue/BankValuePlugin.java @@ -25,11 +25,11 @@ */ package net.runelite.client.plugins.bankvalue; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import javax.inject.Inject; import net.runelite.api.Client; import net.runelite.api.events.GameTick; +import net.runelite.api.events.Subscribe; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.callback.ClientThread; 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 e1d4e7bc10..ce51926140 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 @@ -25,7 +25,6 @@ */ package net.runelite.client.plugins.barbarianassault; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.awt.Font; import java.awt.Image; @@ -36,6 +35,7 @@ import net.runelite.api.ItemID; import net.runelite.api.Varbits; import net.runelite.api.events.ChatMessage; import net.runelite.api.events.GameTick; +import net.runelite.api.events.Subscribe; import net.runelite.api.events.VarbitChanged; import net.runelite.api.events.WidgetLoaded; import net.runelite.api.kit.KitType; 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 6867216a7e..c8458a3bf1 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 @@ -25,7 +25,6 @@ package net.runelite.client.plugins.barrows; import com.google.common.collect.Sets; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.util.HashSet; import java.util.Set; @@ -46,6 +45,7 @@ import net.runelite.api.events.GameObjectChanged; import net.runelite.api.events.GameObjectDespawned; import net.runelite.api.events.GameObjectSpawned; import net.runelite.api.events.GameStateChanged; +import net.runelite.api.events.Subscribe; import net.runelite.api.events.WallObjectChanged; import net.runelite.api.events.WallObjectDespawned; import net.runelite.api.events.WallObjectSpawned; 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 cac536401d..f0359cfa04 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 @@ -24,18 +24,18 @@ */ package net.runelite.client.plugins.blastfurnace; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import javax.inject.Inject; import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.GameObject; import net.runelite.api.GameState; -import static net.runelite.api.ObjectID.CONVEYOR_BELT; import static net.runelite.api.NullObjectID.NULL_9092; +import static net.runelite.api.ObjectID.CONVEYOR_BELT; import net.runelite.api.events.GameObjectDespawned; import net.runelite.api.events.GameObjectSpawned; import net.runelite.api.events.GameStateChanged; +import net.runelite.api.events.Subscribe; import net.runelite.client.config.ConfigManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; 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 95a5be6b05..36593cf1b1 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 @@ -24,7 +24,6 @@ */ package net.runelite.client.plugins.blastmine; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.util.HashMap; import java.util.Map; @@ -37,6 +36,7 @@ import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.GameObjectSpawned; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; +import net.runelite.api.events.Subscribe; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.config.ConfigManager; 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 2cfbb1cef5..49ae722171 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 @@ -25,7 +25,6 @@ package net.runelite.client.plugins.boosts; import com.google.common.collect.ImmutableSet; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.util.Arrays; import java.util.HashSet; @@ -40,6 +39,7 @@ import net.runelite.api.events.BoostedLevelChanged; import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; +import net.runelite.api.events.Subscribe; import net.runelite.client.Notifier; import net.runelite.client.config.ConfigManager; import net.runelite.client.game.SkillIconManager; 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 159681998a..99097f040d 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 @@ -25,11 +25,11 @@ */ package net.runelite.client.plugins.bosstimer; -import com.google.common.eventbus.Subscribe; import javax.inject.Inject; import lombok.extern.slf4j.Slf4j; import net.runelite.api.NPC; import net.runelite.api.events.NpcDespawned; +import net.runelite.api.events.Subscribe; import net.runelite.client.game.ItemManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; 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 9e015b7e42..78aae516f0 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 @@ -24,7 +24,6 @@ */ package net.runelite.client.plugins.cannon; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.awt.Color; import java.time.temporal.ChronoUnit; @@ -53,6 +52,7 @@ import net.runelite.api.events.GameObjectSpawned; import net.runelite.api.events.GameTick; import net.runelite.api.events.ItemContainerChanged; import net.runelite.api.events.ProjectileMoved; +import net.runelite.api.events.Subscribe; import net.runelite.client.Notifier; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; 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 c10b9f872e..c23dc61709 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 @@ -26,7 +26,6 @@ package net.runelite.client.plugins.cerberus; import com.google.common.collect.ComparisonChain; -import com.google.common.eventbus.Subscribe; import java.util.ArrayList; import java.util.List; import javax.inject.Inject; @@ -38,6 +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.api.events.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.ui.overlay.OverlayManager; 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 5b75132b2b..f94587974a 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 @@ -24,10 +24,10 @@ */ package net.runelite.client.plugins.chatboxperformance; -import com.google.common.eventbus.Subscribe; import javax.inject.Inject; import net.runelite.api.Client; import net.runelite.api.WidgetType; +import net.runelite.api.events.Subscribe; import net.runelite.api.events.WidgetPositioned; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; 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 5a811a7eab..486c2b9c87 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 @@ -25,7 +25,6 @@ */ package net.runelite.client.plugins.chatcommands; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.io.IOException; import java.util.List; @@ -45,6 +44,7 @@ import net.runelite.api.MessageNode; import net.runelite.api.events.ChatMessage; import net.runelite.api.events.GameTick; import net.runelite.api.events.SetMessage; +import net.runelite.api.events.Subscribe; import net.runelite.api.events.WidgetLoaded; import net.runelite.api.vars.AccountType; import net.runelite.api.widgets.Widget; 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 de0bd188b1..354b796bcc 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 @@ -26,13 +26,13 @@ package net.runelite.client.plugins.chathistory; import com.google.common.collect.EvictingQueue; import com.google.common.collect.Sets; -import com.google.common.eventbus.Subscribe; import java.util.Queue; import java.util.Set; import javax.inject.Inject; import net.runelite.api.ChatMessageType; import net.runelite.api.events.MenuOptionClicked; import net.runelite.api.events.SetMessage; +import net.runelite.api.events.Subscribe; import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.chat.QueuedMessage; import net.runelite.client.plugins.Plugin; 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 3199e27fe4..424790f0bd 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 @@ -27,7 +27,6 @@ package net.runelite.client.plugins.chatnotifications; import com.google.common.base.Splitter; import com.google.common.base.Strings; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.util.List; import java.util.regex.Matcher; @@ -40,6 +39,7 @@ import net.runelite.api.MessageNode; import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.SetMessage; +import net.runelite.api.events.Subscribe; import net.runelite.client.Notifier; import net.runelite.client.RuneLiteProperties; import net.runelite.client.chat.ChatColorType; 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 72f32b3860..ec92d18569 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 @@ -28,7 +28,6 @@ import com.google.common.base.Joiner; import com.google.common.base.Splitter; import com.google.common.base.Strings; import com.google.common.collect.Lists; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.util.ArrayList; import java.util.List; @@ -42,6 +41,7 @@ import net.runelite.api.WidgetType; import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.SetMessage; +import net.runelite.api.events.Subscribe; import net.runelite.api.events.VarClientStrChanged; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; 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 6f7e1b74c1..c1b5f434e6 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 @@ -26,7 +26,6 @@ */ package net.runelite.client.plugins.cluescrolls; -import com.google.common.eventbus.Subscribe; import com.google.inject.Binder; import com.google.inject.Provides; import java.awt.image.BufferedImage; @@ -62,6 +61,7 @@ import net.runelite.api.events.ItemContainerChanged; import net.runelite.api.events.MenuOptionClicked; import net.runelite.api.events.NpcDespawned; import net.runelite.api.events.NpcSpawned; +import net.runelite.api.events.Subscribe; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.config.ConfigManager; 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 5facaecd93..02075c8ab0 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 @@ -24,7 +24,6 @@ */ package net.runelite.client.plugins.combatlevel; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.text.DecimalFormat; import javax.inject.Inject; @@ -33,6 +32,7 @@ import net.runelite.api.Experience; import net.runelite.api.GameState; import net.runelite.api.Skill; import net.runelite.api.events.GameTick; +import net.runelite.api.events.Subscribe; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.config.ConfigManager; 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 3b9af9868c..73c4011cf2 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 @@ -24,11 +24,11 @@ */ package net.runelite.client.plugins.config; -import com.google.common.eventbus.Subscribe; import java.awt.image.BufferedImage; import java.util.concurrent.ScheduledExecutorService; import javax.inject.Inject; import javax.swing.SwingUtilities; +import net.runelite.api.events.Subscribe; import net.runelite.client.config.ChatColorConfig; import net.runelite.client.config.ConfigManager; import net.runelite.client.config.RuneLiteConfig; @@ -36,8 +36,8 @@ import net.runelite.client.events.PluginChanged; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginManager; -import net.runelite.client.ui.NavigationButton; import net.runelite.client.ui.ClientToolbar; +import net.runelite.client.ui.NavigationButton; import net.runelite.client.util.ImageUtil; @PluginDescriptor( 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 fd966c9f7f..e48a9a3611 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 @@ -24,7 +24,6 @@ */ package net.runelite.client.plugins.corp; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.util.HashSet; import java.util.Set; @@ -48,6 +47,7 @@ import net.runelite.api.events.InteractingChanged; import net.runelite.api.events.MenuEntryAdded; import net.runelite.api.events.NpcDespawned; import net.runelite.api.events.NpcSpawned; +import net.runelite.api.events.Subscribe; import net.runelite.client.chat.ChatColorType; import net.runelite.client.chat.ChatMessageBuilder; import net.runelite.client.chat.ChatMessageManager; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/crystalmathlabs/CrystalMathLabs.java b/runelite-client/src/main/java/net/runelite/client/plugins/crystalmathlabs/CrystalMathLabs.java index f8a4b2a667..4103b3a03d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/crystalmathlabs/CrystalMathLabs.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/crystalmathlabs/CrystalMathLabs.java @@ -24,22 +24,22 @@ */ package net.runelite.client.plugins.crystalmathlabs; -import com.google.common.eventbus.Subscribe; import java.io.IOException; -import lombok.extern.slf4j.Slf4j; import javax.inject.Inject; +import lombok.extern.slf4j.Slf4j; +import net.runelite.api.Client; +import net.runelite.api.GameState; import net.runelite.api.Player; +import net.runelite.api.events.GameStateChanged; +import net.runelite.api.events.Subscribe; +import net.runelite.client.plugins.Plugin; +import net.runelite.client.plugins.PluginDescriptor; import net.runelite.http.api.RuneLiteAPI; import okhttp3.Call; import okhttp3.Callback; import okhttp3.HttpUrl; import okhttp3.OkHttpClient; import okhttp3.Request; -import net.runelite.api.Client; -import net.runelite.client.plugins.PluginDescriptor; -import net.runelite.api.GameState; -import net.runelite.api.events.GameStateChanged; -import net.runelite.client.plugins.Plugin; import okhttp3.Response; @PluginDescriptor( 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 ddbf8dc1ae..557ff704a5 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 @@ -26,7 +26,6 @@ package net.runelite.client.plugins.dailytaskindicators; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import javax.inject.Inject; import net.runelite.api.ChatMessageType; @@ -37,6 +36,7 @@ import net.runelite.api.VarPlayer; import net.runelite.api.Varbits; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; +import net.runelite.api.events.Subscribe; import net.runelite.api.vars.AccountType; import net.runelite.client.chat.ChatColorType; import net.runelite.client.chat.ChatMessageBuilder; 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 53bff2e7ee..efc978bbd4 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 @@ -25,7 +25,6 @@ package net.runelite.client.plugins.deathindicator; import com.google.common.collect.ImmutableSet; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.awt.image.BufferedImage; import java.time.Duration; @@ -42,6 +41,7 @@ import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.LocalPlayerDeath; +import net.runelite.api.events.Subscribe; import net.runelite.client.config.ConfigManager; import net.runelite.client.game.ItemManager; import net.runelite.client.plugins.Plugin; 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 37db1ae603..fb59740083 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 @@ -24,7 +24,6 @@ */ package net.runelite.client.plugins.defaultworld; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.io.IOException; import javax.inject.Inject; @@ -33,6 +32,7 @@ import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.SessionOpen; +import net.runelite.api.events.Subscribe; import net.runelite.client.config.ConfigManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; 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 36cdd819d2..0717b55855 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 @@ -24,7 +24,6 @@ */ package net.runelite.client.plugins.demonicgorilla; -import com.google.common.eventbus.Subscribe; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -54,6 +53,7 @@ import net.runelite.api.events.NpcSpawned; import net.runelite.api.events.PlayerDespawned; import net.runelite.api.events.PlayerSpawned; import net.runelite.api.events.ProjectileMoved; +import net.runelite.api.events.Subscribe; import net.runelite.client.callback.ClientThread; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; 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 0994745b42..33ff4de722 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 @@ -27,8 +27,6 @@ package net.runelite.client.plugins.devtools; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; import com.google.common.collect.ImmutableList; -import com.google.common.eventbus.EventBus; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.awt.image.BufferedImage; import static java.lang.Math.min; @@ -45,8 +43,10 @@ import net.runelite.api.Player; import net.runelite.api.Skill; import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.CommandExecuted; +import net.runelite.api.events.EventBus; import net.runelite.api.events.ExperienceChanged; import net.runelite.api.events.MenuEntryAdded; +import net.runelite.api.events.Subscribe; import net.runelite.api.events.VarbitChanged; import net.runelite.api.kit.KitType; import net.runelite.client.config.ConfigManager; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/VarInspector.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/VarInspector.java index 4295012d54..71979b919d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/VarInspector.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/VarInspector.java @@ -24,8 +24,6 @@ */ package net.runelite.client.plugins.devtools; -import com.google.common.eventbus.EventBus; -import com.google.common.eventbus.Subscribe; import com.google.inject.Inject; import java.awt.BorderLayout; import java.awt.Dimension; @@ -52,6 +50,8 @@ import net.runelite.api.VarClientInt; import net.runelite.api.VarClientStr; import net.runelite.api.VarPlayer; import net.runelite.api.Varbits; +import net.runelite.api.events.EventBus; +import net.runelite.api.events.Subscribe; import net.runelite.api.events.VarClientIntChanged; import net.runelite.api.events.VarClientStrChanged; import net.runelite.api.events.VarbitChanged; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInspector.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInspector.java index e4f1f79632..d848969f37 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInspector.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInspector.java @@ -26,8 +26,6 @@ */ package net.runelite.client.plugins.devtools; -import com.google.common.eventbus.EventBus; -import com.google.common.eventbus.Subscribe; import com.google.inject.Inject; import java.awt.BorderLayout; import java.awt.Dimension; @@ -50,6 +48,8 @@ import javax.swing.tree.DefaultTreeModel; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.events.ConfigChanged; +import net.runelite.api.events.EventBus; +import net.runelite.api.events.Subscribe; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.api.widgets.WidgetItem; 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 41bd358d2d..96dd363f25 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 @@ -25,7 +25,6 @@ */ package net.runelite.client.plugins.discord; -import com.google.common.eventbus.Subscribe; import com.google.inject.Inject; import com.google.inject.Provides; import java.awt.image.BufferedImage; @@ -41,6 +40,7 @@ import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.ExperienceChanged; import net.runelite.api.events.GameStateChanged; +import net.runelite.api.events.Subscribe; import net.runelite.api.events.VarbitChanged; import net.runelite.client.RuneLiteProperties; import net.runelite.client.config.ConfigManager; 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 be0267f078..e1bc19010e 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 @@ -25,7 +25,6 @@ */ package net.runelite.client.plugins.entityhider; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import javax.inject.Inject; import net.runelite.api.Client; @@ -34,6 +33,7 @@ import net.runelite.api.Player; import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; +import net.runelite.api.events.Subscribe; import net.runelite.client.config.ConfigManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; 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 9af8e73a8d..9e30bc254e 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 @@ -26,7 +26,6 @@ package net.runelite.client.plugins.examine; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; -import com.google.common.eventbus.Subscribe; import java.time.Instant; import java.util.ArrayDeque; import java.util.Deque; @@ -39,6 +38,7 @@ import net.runelite.api.ItemComposition; import net.runelite.api.events.ChatMessage; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.MenuOptionClicked; +import net.runelite.api.events.Subscribe; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import static net.runelite.api.widgets.WidgetInfo.TO_CHILD; 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 9247df508a..9cf2d7396e 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 @@ -24,7 +24,6 @@ */ package net.runelite.client.plugins.experiencedrop; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.util.Arrays; import java.util.stream.IntStream; @@ -32,6 +31,7 @@ import javax.inject.Inject; import net.runelite.api.Client; import net.runelite.api.SpriteID; import net.runelite.api.Varbits; +import net.runelite.api.events.Subscribe; import net.runelite.api.events.WidgetHiddenChanged; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetID; 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 342cd40fa1..779801b2e2 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 @@ -29,7 +29,6 @@ package net.runelite.client.plugins.fairyring; import com.google.common.base.Strings; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.util.Collection; import java.util.Map; @@ -46,6 +45,7 @@ import net.runelite.api.SpriteID; import net.runelite.api.Varbits; import net.runelite.api.WidgetType; import net.runelite.api.events.GameTick; +import net.runelite.api.events.Subscribe; import net.runelite.api.events.VarbitChanged; import net.runelite.api.events.WidgetLoaded; import net.runelite.api.widgets.JavaScriptCallback; 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 79ada10499..7d87f05ad8 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 @@ -25,7 +25,6 @@ package net.runelite.client.plugins.feed; import com.google.common.base.Suppliers; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.awt.image.BufferedImage; import java.io.IOException; @@ -36,12 +35,13 @@ import java.util.function.Supplier; import javax.inject.Inject; import lombok.extern.slf4j.Slf4j; import net.runelite.api.events.ConfigChanged; +import net.runelite.api.events.Subscribe; import net.runelite.client.config.ConfigManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.task.Schedule; -import net.runelite.client.ui.NavigationButton; import net.runelite.client.ui.ClientToolbar; +import net.runelite.client.ui.NavigationButton; import net.runelite.client.util.ImageUtil; import net.runelite.http.api.feed.FeedClient; import net.runelite.http.api.feed.FeedResult; 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 8185f6661e..68f5a3f7c7 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 @@ -24,7 +24,6 @@ */ package net.runelite.client.plugins.fightcave; -import com.google.common.eventbus.Subscribe; import javax.annotation.Nullable; import javax.inject.Inject; import lombok.AccessLevel; @@ -34,6 +33,7 @@ import net.runelite.api.NpcID; import net.runelite.api.events.AnimationChanged; import net.runelite.api.events.NpcDespawned; import net.runelite.api.events.NpcSpawned; +import net.runelite.api.events.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.ui.overlay.OverlayManager; 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 a8ebb11440..614a7d78d0 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 @@ -25,7 +25,6 @@ */ package net.runelite.client.plugins.fishing; -import com.google.common.eventbus.Subscribe; import com.google.common.primitives.Ints; import com.google.inject.Provides; import java.time.Duration; @@ -55,6 +54,7 @@ import net.runelite.api.events.GameTick; import net.runelite.api.events.InteractingChanged; import net.runelite.api.events.ItemContainerChanged; import net.runelite.api.events.NpcDespawned; +import net.runelite.api.events.Subscribe; import net.runelite.api.events.VarbitChanged; import net.runelite.api.queries.NPCQuery; import net.runelite.client.Notifier; 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 a218d51e4a..82a7975c25 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 @@ -24,11 +24,11 @@ */ package net.runelite.client.plugins.fps; -import com.google.common.eventbus.Subscribe; import com.google.inject.Inject; import com.google.inject.Provides; import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.FocusChanged; +import net.runelite.api.events.Subscribe; import net.runelite.client.config.ConfigManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; 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 ee1542259e..4a46c6e392 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 @@ -25,11 +25,11 @@ */ package net.runelite.client.plugins.friendlist; -import com.google.common.eventbus.Subscribe; import javax.inject.Inject; import net.runelite.api.Client; import net.runelite.api.VarPlayer; import net.runelite.api.events.GameTick; +import net.runelite.api.events.Subscribe; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.plugins.Plugin; 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 af13da28a9..06c77989e6 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 @@ -29,7 +29,6 @@ package net.runelite.client.plugins.friendnotes; import com.google.common.base.Strings; import com.google.common.collect.ObjectArrays; -import com.google.common.eventbus.Subscribe; import java.awt.Color; import javax.annotation.Nullable; import javax.inject.Inject; @@ -44,6 +43,7 @@ import net.runelite.api.events.MenuEntryAdded; import net.runelite.api.events.MenuOptionClicked; import net.runelite.api.events.NameableNameChanged; import net.runelite.api.events.RemovedFriend; +import net.runelite.api.events.Subscribe; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.config.ConfigManager; import net.runelite.client.game.chatbox.ChatboxPanelManager; 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 74c7cc360e..d4bb3d1782 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 @@ -24,7 +24,6 @@ */ package net.runelite.client.plugins.gpu; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import com.jogamp.nativewindow.awt.AWTGraphicsConfiguration; import com.jogamp.nativewindow.awt.JAWTWindow; @@ -64,6 +63,7 @@ import net.runelite.api.SceneTilePaint; import net.runelite.api.Texture; import net.runelite.api.TextureProvider; import net.runelite.api.events.GameStateChanged; +import net.runelite.api.events.Subscribe; import net.runelite.api.hooks.DrawCallbacks; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; @@ -72,12 +72,12 @@ import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginInstantiationException; import net.runelite.client.plugins.PluginManager; import static net.runelite.client.plugins.gpu.GLUtil.glDeleteBuffer; +import static net.runelite.client.plugins.gpu.GLUtil.glDeleteFrameBuffer; import static net.runelite.client.plugins.gpu.GLUtil.glDeleteTexture; import static net.runelite.client.plugins.gpu.GLUtil.glDeleteVertexArrays; -import static net.runelite.client.plugins.gpu.GLUtil.glDeleteFrameBuffer; import static net.runelite.client.plugins.gpu.GLUtil.glGenBuffers; -import static net.runelite.client.plugins.gpu.GLUtil.glGenTexture; import static net.runelite.client.plugins.gpu.GLUtil.glGenFrameBuffer; +import static net.runelite.client.plugins.gpu.GLUtil.glGenTexture; import static net.runelite.client.plugins.gpu.GLUtil.glGenVertexArrays; import static net.runelite.client.plugins.gpu.GLUtil.inputStreamToString; import net.runelite.client.plugins.gpu.template.Template; 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 3c4e56eb6b..23bff5cfa2 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 @@ -27,7 +27,6 @@ package net.runelite.client.plugins.grandexchange; -import com.google.common.eventbus.Subscribe; import com.google.common.reflect.TypeToken; import com.google.gson.Gson; import com.google.inject.Provides; @@ -57,6 +56,7 @@ import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.GrandExchangeOfferChanged; import net.runelite.api.events.MenuEntryAdded; +import net.runelite.api.events.Subscribe; import net.runelite.api.events.WidgetLoaded; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetID; 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 1fb6a01af7..e72fafbaf2 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 @@ -29,7 +29,6 @@ import com.google.common.base.Joiner; import com.google.common.base.Splitter; import com.google.common.cache.CacheBuilder; import com.google.common.cache.LoadingCache; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.awt.Color; import java.awt.Rectangle; @@ -64,6 +63,7 @@ import net.runelite.api.events.ItemDespawned; import net.runelite.api.events.ItemQuantityChanged; import net.runelite.api.events.ItemSpawned; import net.runelite.api.events.MenuEntryAdded; +import net.runelite.api.events.Subscribe; import net.runelite.client.Notifier; import net.runelite.client.config.ConfigManager; import net.runelite.client.game.ItemManager; 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 b1e9e86ed3..25b44bcbb0 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 @@ -26,7 +26,6 @@ package net.runelite.client.plugins.groundmarkers; import com.google.common.base.Strings; -import com.google.common.eventbus.Subscribe; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.google.inject.Provides; @@ -52,6 +51,7 @@ import net.runelite.api.events.FocusChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.MenuEntryAdded; import net.runelite.api.events.MenuOptionClicked; +import net.runelite.api.events.Subscribe; import net.runelite.client.config.ConfigManager; import net.runelite.client.input.KeyManager; import net.runelite.client.plugins.Plugin; 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 99e9bc8d4a..24c5c919a9 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 @@ -24,7 +24,6 @@ */ package net.runelite.client.plugins.herbiboars; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.util.Arrays; import java.util.HashMap; @@ -52,6 +51,7 @@ import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GroundObjectChanged; import net.runelite.api.events.GroundObjectDespawned; import net.runelite.api.events.GroundObjectSpawned; +import net.runelite.api.events.Subscribe; import net.runelite.api.events.VarbitChanged; import net.runelite.client.config.ConfigManager; import net.runelite.client.plugins.Plugin; 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 c1bfb361ca..a45b4fa9d1 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 @@ -26,7 +26,6 @@ package net.runelite.client.plugins.hiscore; import com.google.common.collect.ImmutableList; import com.google.common.collect.ObjectArrays; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.awt.image.BufferedImage; import java.lang.reflect.InvocationTargetException; @@ -45,13 +44,14 @@ import net.runelite.api.events.ChatMessage; import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.MenuEntryAdded; import net.runelite.api.events.PlayerMenuOptionClicked; +import net.runelite.api.events.Subscribe; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.config.ConfigManager; import net.runelite.client.menus.MenuManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; -import net.runelite.client.ui.NavigationButton; import net.runelite.client.ui.ClientToolbar; +import net.runelite.client.ui.NavigationButton; import net.runelite.client.util.ImageUtil; import net.runelite.client.util.Text; import org.apache.commons.lang3.ArrayUtils; 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 9ba95ad3aa..baaee12577 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 @@ -24,7 +24,6 @@ */ package net.runelite.client.plugins.hunter; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.time.Instant; import java.util.HashMap; @@ -44,6 +43,7 @@ import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameObjectSpawned; import net.runelite.api.events.GameTick; +import net.runelite.api.events.Subscribe; import net.runelite.client.Notifier; import net.runelite.client.config.ConfigManager; import net.runelite.client.plugins.Plugin; 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 8182235cad..b84bc3e0af 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 @@ -25,7 +25,6 @@ */ package net.runelite.client.plugins.idlenotifier; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.time.Duration; import java.time.Instant; @@ -49,6 +48,7 @@ import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.HitsplatApplied; import net.runelite.api.events.InteractingChanged; +import net.runelite.api.events.Subscribe; import net.runelite.client.Notifier; import net.runelite.client.config.ConfigManager; import net.runelite.client.plugins.Plugin; 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 159d68752f..02bb7b8a93 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 @@ -24,7 +24,6 @@ */ package net.runelite.client.plugins.implings; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.awt.Color; import java.util.ArrayList; @@ -37,6 +36,7 @@ import net.runelite.api.NPC; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.NpcDespawned; import net.runelite.api.events.NpcSpawned; +import net.runelite.api.events.Subscribe; import net.runelite.client.config.ConfigManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPanel.java index 45a4df8625..9e88629796 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPanel.java @@ -26,8 +26,6 @@ package net.runelite.client.plugins.info; import com.google.common.base.MoreObjects; -import com.google.common.eventbus.EventBus; -import com.google.common.eventbus.Subscribe; import com.google.inject.Inject; import java.awt.BorderLayout; import java.awt.Color; @@ -46,8 +44,10 @@ import javax.swing.JPanel; import javax.swing.border.EmptyBorder; import javax.swing.event.HyperlinkEvent; import net.runelite.api.Client; +import net.runelite.api.events.EventBus; import net.runelite.api.events.SessionClose; import net.runelite.api.events.SessionOpen; +import net.runelite.api.events.Subscribe; import net.runelite.client.RuneLiteProperties; import net.runelite.client.account.SessionManager; import net.runelite.client.ui.ColorScheme; 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 04ab89801d..3dda691e1b 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 @@ -24,10 +24,10 @@ */ package net.runelite.client.plugins.instancemap; -import com.google.common.eventbus.Subscribe; import com.google.inject.Binder; import javax.inject.Inject; import net.runelite.api.events.GameStateChanged; +import net.runelite.api.events.Subscribe; import net.runelite.api.events.WidgetMenuOptionClicked; import net.runelite.api.widgets.WidgetInfo; import static net.runelite.api.widgets.WidgetInfo.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 4241f4acea..2456fce749 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 @@ -26,7 +26,6 @@ */ package net.runelite.client.plugins.interfacestyles; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.awt.image.BufferedImage; import java.awt.image.PixelGrabber; @@ -39,6 +38,7 @@ import net.runelite.api.Client; import net.runelite.api.SpriteID; import net.runelite.api.SpritePixels; import net.runelite.api.events.ConfigChanged; +import net.runelite.api.events.Subscribe; import net.runelite.api.events.WidgetPositioned; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; 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 45e22dfb83..669d6d3fdd 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 @@ -26,7 +26,6 @@ package net.runelite.client.plugins.inventorytags; import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableList; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.awt.Color; import java.util.List; @@ -42,6 +41,7 @@ import net.runelite.api.MenuEntry; import net.runelite.api.events.ItemContainerChanged; import net.runelite.api.events.MenuOpened; import net.runelite.api.events.MenuOptionClicked; +import net.runelite.api.events.Subscribe; import net.runelite.api.events.WidgetMenuOptionClicked; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.config.ConfigManager; 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 c7d4448a3b..b6da211813 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 @@ -24,7 +24,6 @@ */ package net.runelite.client.plugins.itemcharges; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -33,6 +32,7 @@ import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.ChatMessageType; import net.runelite.api.events.ChatMessage; +import net.runelite.api.events.Subscribe; import net.runelite.client.Notifier; import net.runelite.client.config.ConfigManager; import net.runelite.client.plugins.Plugin; 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 6dd0402097..165d95f0c2 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 @@ -25,7 +25,6 @@ package net.runelite.client.plugins.kingdomofmiscellania; import com.google.common.collect.ImmutableSet; -import com.google.common.eventbus.Subscribe; import javax.inject.Inject; import lombok.Getter; import lombok.extern.slf4j.Slf4j; @@ -35,6 +34,7 @@ import static net.runelite.api.ItemID.TEAK_CHEST; import net.runelite.api.VarPlayer; import net.runelite.api.Varbits; import net.runelite.api.events.GameStateChanged; +import net.runelite.api.events.Subscribe; import net.runelite.api.events.VarbitChanged; import net.runelite.client.game.ItemManager; import net.runelite.client.plugins.Plugin; 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 f1be1bd385..a75d497523 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 @@ -24,7 +24,6 @@ */ package net.runelite.client.plugins.kourendlibrary; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.awt.image.BufferedImage; import java.util.regex.Matcher; @@ -43,6 +42,7 @@ import net.runelite.api.events.ChatMessage; import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.MenuOptionClicked; +import net.runelite.api.events.Subscribe; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.config.ConfigManager; 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 9a6903fa36..cc7cd06552 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 @@ -25,7 +25,6 @@ package net.runelite.client.plugins.loginscreen; import com.google.common.base.Strings; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.awt.Toolkit; import java.awt.datatransfer.DataFlavor; @@ -38,6 +37,7 @@ import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.SessionOpen; +import net.runelite.api.events.Subscribe; import net.runelite.client.config.ConfigManager; import net.runelite.client.input.KeyListener; import net.runelite.client.input.KeyManager; 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 4aa68399c1..47589ac9a2 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 @@ -27,7 +27,6 @@ package net.runelite.client.plugins.loottracker; import com.google.common.base.Joiner; import com.google.common.base.Splitter; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.awt.image.BufferedImage; import java.util.ArrayList; @@ -53,6 +52,7 @@ import net.runelite.api.SpriteID; import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.ChatMessage; import net.runelite.api.events.ConfigChanged; +import net.runelite.api.events.Subscribe; import net.runelite.api.events.WidgetLoaded; import net.runelite.api.widgets.WidgetID; import net.runelite.client.config.ConfigManager; 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 a5907541f3..20bcd7a7c8 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 @@ -24,11 +24,11 @@ */ package net.runelite.client.plugins.lowmemory; -import com.google.common.eventbus.Subscribe; import javax.inject.Inject; import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.events.GameStateChanged; +import net.runelite.api.events.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; 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 f9a66fceaa..2aa0d2ae28 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 @@ -26,7 +26,6 @@ package net.runelite.client.plugins.menuentryswapper; import com.google.common.collect.ImmutableSet; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.util.Set; import javax.inject.Inject; @@ -44,6 +43,7 @@ import net.runelite.api.events.MenuEntryAdded; import net.runelite.api.events.MenuOpened; import net.runelite.api.events.MenuOptionClicked; import net.runelite.api.events.PostItemComposition; +import net.runelite.api.events.Subscribe; import net.runelite.api.events.WidgetMenuOptionClicked; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.config.ConfigManager; 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 264ef22fa1..673a8eec5f 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 @@ -25,12 +25,12 @@ */ package net.runelite.client.plugins.metronome; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import javax.inject.Inject; import net.runelite.api.Client; import net.runelite.api.SoundEffectID; import net.runelite.api.events.GameTick; +import net.runelite.api.events.Subscribe; import net.runelite.client.config.ConfigManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; 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 85bdd6f2b1..9aeaf7aef4 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 @@ -24,7 +24,6 @@ */ package net.runelite.client.plugins.minimap; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.awt.Color; import java.util.Arrays; @@ -34,6 +33,7 @@ import net.runelite.api.GameState; import net.runelite.api.SpritePixels; import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; +import net.runelite.api.events.Subscribe; import net.runelite.api.events.WidgetHiddenChanged; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; 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 f20faca83d..6ae629bfdb 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 @@ -27,7 +27,6 @@ package net.runelite.client.plugins.motherlode; import com.google.common.collect.ImmutableSet; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.time.Duration; import java.time.Instant; @@ -60,6 +59,7 @@ import net.runelite.api.events.GameObjectChanged; import net.runelite.api.events.GameObjectDespawned; import net.runelite.api.events.GameObjectSpawned; import net.runelite.api.events.GameStateChanged; +import net.runelite.api.events.Subscribe; import net.runelite.api.events.VarbitChanged; import net.runelite.api.events.WallObjectChanged; import net.runelite.api.events.WallObjectDespawned; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTAPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTAPlugin.java index ad93152fcf..c42c845e86 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTAPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/MTAPlugin.java @@ -24,12 +24,12 @@ */ package net.runelite.client.plugins.mta; -import com.google.common.eventbus.EventBus; import com.google.inject.Provides; import javax.inject.Inject; import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.Client; +import net.runelite.api.events.EventBus; import net.runelite.client.config.ConfigManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java index a5ded67181..43904e8d2f 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoom.java @@ -25,7 +25,7 @@ */ package net.runelite.client.plugins.mta.alchemy; -import com.google.common.eventbus.Subscribe; +import net.runelite.api.events.Subscribe; import java.awt.Color; import java.awt.Graphics2D; import java.awt.Rectangle; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/enchantment/EnchantmentRoom.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/enchantment/EnchantmentRoom.java index fa7ce35271..33d57265c1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/enchantment/EnchantmentRoom.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/enchantment/EnchantmentRoom.java @@ -24,7 +24,7 @@ */ package net.runelite.client.plugins.mta.enchantment; -import com.google.common.eventbus.Subscribe; +import net.runelite.api.events.Subscribe; import java.util.ArrayList; import java.util.List; import javax.inject.Inject; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardRoom.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardRoom.java index 0f5442187f..d5a0ab25b1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardRoom.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/graveyard/GraveyardRoom.java @@ -24,7 +24,7 @@ */ package net.runelite.client.plugins.mta.graveyard; -import com.google.common.eventbus.Subscribe; +import net.runelite.api.events.Subscribe; import java.awt.image.BufferedImage; import javax.inject.Inject; import net.runelite.api.Client; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java b/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java index 34a0539ded..32b3f13eff 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java @@ -24,7 +24,7 @@ */ package net.runelite.client.plugins.mta.telekinetic; -import com.google.common.eventbus.Subscribe; +import net.runelite.api.events.Subscribe; import java.awt.Color; import java.awt.Graphics2D; import java.awt.Polygon; 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 f49b86c619..813a633a45 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 @@ -24,7 +24,6 @@ */ package net.runelite.client.plugins.nightmarezone; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.util.Arrays; import javax.inject.Inject; @@ -34,6 +33,7 @@ import net.runelite.api.Varbits; import net.runelite.api.events.ChatMessage; import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameTick; +import net.runelite.api.events.Subscribe; import net.runelite.client.Notifier; import net.runelite.client.config.ConfigManager; import net.runelite.client.plugins.Plugin; 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 373ba4ce02..8f64b4c591 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 @@ -24,16 +24,16 @@ */ package net.runelite.client.plugins.notes; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.awt.image.BufferedImage; import javax.inject.Inject; import net.runelite.api.events.SessionOpen; +import net.runelite.api.events.Subscribe; import net.runelite.client.config.ConfigManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; -import net.runelite.client.ui.NavigationButton; import net.runelite.client.ui.ClientToolbar; +import net.runelite.client.ui.NavigationButton; import net.runelite.client.util.ImageUtil; @PluginDescriptor( 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 e446c2baeb..94d421af17 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 @@ -28,7 +28,6 @@ package net.runelite.client.plugins.npchighlight; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.time.Instant; import java.util.ArrayList; @@ -57,6 +56,7 @@ import net.runelite.api.events.GraphicsObjectCreated; import net.runelite.api.events.MenuOptionClicked; import net.runelite.api.events.NpcDespawned; import net.runelite.api.events.NpcSpawned; +import net.runelite.api.events.Subscribe; import net.runelite.client.callback.ClientThread; import net.runelite.client.config.ConfigManager; import net.runelite.client.input.KeyManager; 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 1f38dc136d..c4d3f3a84b 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 @@ -25,7 +25,6 @@ */ package net.runelite.client.plugins.opponentinfo; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.time.Duration; import java.time.Instant; @@ -40,6 +39,7 @@ import net.runelite.api.WorldType; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.InteractingChanged; +import net.runelite.api.events.Subscribe; import net.runelite.client.config.ConfigManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; 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 fd3b980c70..8c3bcb9ef8 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 @@ -24,13 +24,13 @@ */ package net.runelite.client.plugins.pestcontrol; -import com.google.common.eventbus.Subscribe; import java.util.regex.Matcher; import java.util.regex.Pattern; import javax.inject.Inject; import net.runelite.api.ChatMessageType; import net.runelite.api.Client; import net.runelite.api.events.ChatMessage; +import net.runelite.api.events.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.ui.overlay.OverlayManager; 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 8922203a0d..66aae636bc 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 @@ -24,7 +24,7 @@ */ package net.runelite.client.plugins.playerindicators; -import com.google.common.eventbus.Subscribe; +import net.runelite.api.events.Subscribe; import com.google.inject.Provides; import java.awt.Color; import javax.inject.Inject; 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 f0bed99d6c..d562057c11 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 @@ -25,7 +25,6 @@ package net.runelite.client.plugins.poh; import com.google.common.collect.Sets; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.io.IOException; import java.util.Comparator; @@ -55,6 +54,7 @@ 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.api.events.Subscribe; import net.runelite.client.config.ConfigManager; import net.runelite.client.game.HiscoreManager; import net.runelite.client.plugins.Plugin; 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 a28e535906..17f65fe05c 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 @@ -25,7 +25,6 @@ */ package net.runelite.client.plugins.prayer; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.time.Duration; import java.time.Instant; @@ -40,6 +39,7 @@ import net.runelite.api.Prayer; import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.ItemContainerChanged; +import net.runelite.api.events.Subscribe; import net.runelite.client.config.ConfigManager; import net.runelite.client.game.SpriteManager; import net.runelite.client.plugins.Plugin; 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 46997322f9..04275bd678 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 @@ -25,7 +25,6 @@ */ package net.runelite.client.plugins.puzzlesolver; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.awt.Color; import java.util.Arrays; @@ -34,6 +33,7 @@ import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.events.GameTick; import net.runelite.api.events.MenuOptionClicked; +import net.runelite.api.events.Subscribe; import net.runelite.api.events.WidgetLoaded; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetID; 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 8a7fe8faa6..c258ab8a2a 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 @@ -24,7 +24,6 @@ */ package net.runelite.client.plugins.raids; -import com.google.common.eventbus.Subscribe; import com.google.inject.Binder; import com.google.inject.Provides; import java.text.DecimalFormat; @@ -49,6 +48,7 @@ import net.runelite.api.VarPlayer; import net.runelite.api.Varbits; import net.runelite.api.events.ChatMessage; import net.runelite.api.events.ConfigChanged; +import net.runelite.api.events.Subscribe; import net.runelite.api.events.VarbitChanged; import net.runelite.api.events.WidgetHiddenChanged; import net.runelite.api.widgets.Widget; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/regenmeter/RegenMeterPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/regenmeter/RegenMeterPlugin.java index 902e0ebd3c..da2b97dcc5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/regenmeter/RegenMeterPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/regenmeter/RegenMeterPlugin.java @@ -26,7 +26,6 @@ */ package net.runelite.client.plugins.regenmeter; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import javax.inject.Inject; import lombok.Getter; @@ -37,6 +36,7 @@ import net.runelite.api.Skill; import net.runelite.api.VarPlayer; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; +import net.runelite.api.events.Subscribe; import net.runelite.api.events.VarbitChanged; import net.runelite.client.config.ConfigManager; import net.runelite.client.plugins.Plugin; 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 1c36d55ab2..48f64721b0 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 @@ -25,7 +25,6 @@ package net.runelite.client.plugins.reorderprayers; import com.google.common.collect.ImmutableList; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.util.Arrays; import java.util.List; @@ -40,6 +39,7 @@ import net.runelite.api.WidgetNode; import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.DraggingWidgetChanged; import net.runelite.api.events.GameStateChanged; +import net.runelite.api.events.Subscribe; import net.runelite.api.events.WidgetLoaded; import net.runelite.api.events.WidgetMenuOptionClicked; import net.runelite.api.widgets.Widget; 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 ecd76ae0b6..5572face78 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 @@ -24,7 +24,6 @@ */ package net.runelite.client.plugins.reportbutton; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.time.Duration; import java.time.Instant; @@ -37,6 +36,7 @@ import javax.inject.Inject; import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.events.GameStateChanged; +import net.runelite.api.events.Subscribe; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.callback.ClientThread; 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 db154b6f4d..27597a2bf7 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 @@ -24,7 +24,6 @@ */ package net.runelite.client.plugins.roguesden; -import com.google.common.eventbus.Subscribe; import java.time.temporal.ChronoUnit; import java.util.HashMap; import javax.inject.Inject; @@ -45,6 +44,7 @@ import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GroundObjectChanged; import net.runelite.api.events.GroundObjectDespawned; import net.runelite.api.events.GroundObjectSpawned; +import net.runelite.api.events.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.task.Schedule; 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 d50b4d67f4..34b2321222 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 @@ -24,7 +24,6 @@ */ package net.runelite.client.plugins.runecraft; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.util.HashSet; import java.util.Set; @@ -50,6 +49,7 @@ import net.runelite.api.events.DecorativeObjectSpawned; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.MenuOptionClicked; +import net.runelite.api.events.Subscribe; import net.runelite.api.queries.InventoryItemQuery; import net.runelite.api.queries.NPCQuery; import net.runelite.api.widgets.Widget; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/runenergy/RunEnergyPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/runenergy/RunEnergyPlugin.java index 1260df244a..25e2d13b1c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/runenergy/RunEnergyPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/runenergy/RunEnergyPlugin.java @@ -25,7 +25,6 @@ package net.runelite.client.plugins.runenergy; import com.google.common.collect.ImmutableSet; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import javax.inject.Inject; import net.runelite.api.Client; @@ -39,6 +38,7 @@ import net.runelite.api.Varbits; import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameTick; +import net.runelite.api.events.Subscribe; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.config.ConfigManager; 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 8c149e0212..e91bc005a2 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 @@ -27,7 +27,6 @@ package net.runelite.client.plugins.screenmarkers; import com.google.common.base.Strings; -import com.google.common.eventbus.Subscribe; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import java.awt.Dimension; @@ -43,13 +42,14 @@ import javax.inject.Inject; import lombok.AccessLevel; import lombok.Getter; import net.runelite.api.events.ConfigChanged; +import net.runelite.api.events.Subscribe; import net.runelite.client.config.ConfigManager; import net.runelite.client.input.MouseManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.screenmarkers.ui.ScreenMarkerPluginPanel; -import net.runelite.client.ui.NavigationButton; import net.runelite.client.ui.ClientToolbar; +import net.runelite.client.ui.NavigationButton; import net.runelite.client.ui.overlay.OverlayManager; import net.runelite.client.util.ImageUtil; 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 a9b8e931d7..06a80a33ca 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 @@ -27,7 +27,6 @@ package net.runelite.client.plugins.screenshot; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.awt.Desktop; import java.awt.Graphics; @@ -65,6 +64,7 @@ import net.runelite.api.events.ChatMessage; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.LocalPlayerDeath; +import net.runelite.api.events.Subscribe; import net.runelite.api.events.WidgetLoaded; import net.runelite.api.widgets.Widget; import static net.runelite.api.widgets.WidgetID.BARROWS_REWARD_GROUP_ID; 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 ba1716a6b7..694a417869 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 @@ -26,7 +26,6 @@ package net.runelite.client.plugins.slayer; import com.google.common.annotations.VisibleForTesting; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.awt.Color; import java.awt.image.BufferedImage; @@ -50,7 +49,6 @@ import net.runelite.api.ItemID; import net.runelite.api.NPC; import net.runelite.api.NPCComposition; import static net.runelite.api.Skill.SLAYER; -import net.runelite.api.vars.SlayerUnlock; import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.ChatMessage; import net.runelite.api.events.ConfigChanged; @@ -59,6 +57,8 @@ 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.api.events.Subscribe; +import net.runelite.api.vars.SlayerUnlock; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.Notifier; 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 4c7efd76f5..3d1ef0299f 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 @@ -24,7 +24,6 @@ */ package net.runelite.client.plugins.specialcounter; -import com.google.common.eventbus.Subscribe; import java.util.HashSet; import java.util.Set; import javax.inject.Inject; @@ -42,6 +41,7 @@ import net.runelite.api.VarPlayer; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.NpcDespawned; +import net.runelite.api.events.Subscribe; import net.runelite.api.events.VarbitChanged; import net.runelite.client.game.ItemManager; import net.runelite.client.plugins.Plugin; 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 42cfbed78b..a4dd60682c 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 @@ -25,12 +25,12 @@ */ package net.runelite.client.plugins.stretchedmode; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import javax.inject.Inject; import net.runelite.api.Client; import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.ResizeableChanged; +import net.runelite.api.events.Subscribe; import net.runelite.client.config.ConfigManager; import net.runelite.client.input.MouseManager; import net.runelite.client.plugins.Plugin; 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 231affd33d..d77c32711d 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 @@ -24,7 +24,7 @@ */ package net.runelite.client.plugins.tearsofguthix; -import com.google.common.eventbus.Subscribe; +import net.runelite.api.events.Subscribe; import java.time.Instant; import java.util.HashMap; import java.util.Map; 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 ca6f1027a4..dc9c20ce37 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 @@ -25,7 +25,7 @@ */ package net.runelite.client.plugins.timers; -import com.google.common.eventbus.Subscribe; +import net.runelite.api.events.Subscribe; import com.google.inject.Provides; import java.awt.image.BufferedImage; import javax.inject.Inject; 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 11491596f7..782373c0f4 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 @@ -25,7 +25,6 @@ */ package net.runelite.client.plugins.timetracking; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.awt.image.BufferedImage; import java.time.Instant; @@ -39,6 +38,7 @@ import net.runelite.api.GameState; import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameTick; +import net.runelite.api.events.Subscribe; import net.runelite.api.events.UsernameChanged; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; @@ -53,8 +53,8 @@ import net.runelite.client.plugins.timetracking.clocks.ClockManager; import net.runelite.client.plugins.timetracking.farming.FarmingTracker; import net.runelite.client.plugins.timetracking.hunter.BirdHouseTracker; import net.runelite.client.task.Schedule; -import net.runelite.client.ui.NavigationButton; import net.runelite.client.ui.ClientToolbar; +import net.runelite.client.ui.NavigationButton; import net.runelite.client.util.ImageUtil; @PluginDescriptor( 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 3f6994c943..b060874ae8 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 @@ -24,7 +24,6 @@ */ package net.runelite.client.plugins.tithefarm; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.util.HashSet; import java.util.Set; @@ -36,6 +35,7 @@ import net.runelite.api.coords.WorldPoint; import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameObjectSpawned; import net.runelite.api.events.GameTick; +import net.runelite.api.events.Subscribe; import net.runelite.client.config.ConfigManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; 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 df04e691c7..c6f74c8912 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 @@ -24,7 +24,6 @@ */ package net.runelite.client.plugins.twitch; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.time.temporal.ChronoUnit; import java.util.Map; @@ -34,6 +33,7 @@ import net.runelite.api.ChatMessageType; import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.events.ConfigChanged; +import net.runelite.api.events.Subscribe; import net.runelite.client.chat.ChatColorType; import net.runelite.client.chat.ChatMessageBuilder; import net.runelite.client.chat.ChatMessageManager; 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 34f8aceb90..b2dd1d626c 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 @@ -25,12 +25,12 @@ */ package net.runelite.client.plugins.virtuallevels; -import com.google.common.eventbus.Subscribe; import javax.inject.Inject; import net.runelite.api.Client; import net.runelite.api.Experience; import net.runelite.api.Skill; import net.runelite.api.events.ScriptCallbackEvent; +import net.runelite.api.events.Subscribe; import net.runelite.client.callback.ClientThread; import net.runelite.client.events.PluginChanged; import net.runelite.client.plugins.Plugin; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/wasdcamera/WASDCameraPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/wasdcamera/WASDCameraPlugin.java index f93d065fd3..801a299446 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/wasdcamera/WASDCameraPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/wasdcamera/WASDCameraPlugin.java @@ -25,7 +25,6 @@ */ package net.runelite.client.plugins.wasdcamera; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.awt.Color; import javax.inject.Inject; @@ -39,6 +38,7 @@ import net.runelite.api.VarClientInt; import net.runelite.api.VarClientStr; import net.runelite.api.Varbits; import net.runelite.api.events.ScriptCallbackEvent; +import net.runelite.api.events.Subscribe; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.callback.ClientThread; 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 ae047af48d..f3f28abdf4 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 @@ -25,7 +25,6 @@ */ package net.runelite.client.plugins.wintertodt; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.time.Duration; import java.time.Instant; @@ -61,6 +60,7 @@ import net.runelite.api.events.AnimationChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.ItemContainerChanged; import net.runelite.api.events.SetMessage; +import net.runelite.api.events.Subscribe; import net.runelite.client.Notifier; import net.runelite.client.chat.ChatMessageManager; import net.runelite.client.config.ConfigManager; 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 bb5615f7fe..d735e3669c 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 @@ -24,7 +24,6 @@ */ package net.runelite.client.plugins.woodcutting; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.time.Duration; import java.time.Instant; @@ -44,6 +43,7 @@ import net.runelite.api.events.GameObjectDespawned; import net.runelite.api.events.GameObjectSpawned; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; +import net.runelite.api.events.Subscribe; import net.runelite.client.Notifier; import net.runelite.client.config.ConfigManager; import net.runelite.client.plugins.Plugin; 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 a6bc3b8c28..c6d08e721a 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 @@ -27,7 +27,6 @@ package net.runelite.client.plugins.worldhopper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ObjectArrays; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.awt.image.BufferedImage; import java.io.IOException; @@ -61,6 +60,7 @@ import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.MenuEntryAdded; import net.runelite.api.events.PlayerMenuOptionClicked; +import net.runelite.api.events.Subscribe; import net.runelite.api.events.VarbitChanged; import net.runelite.api.events.WorldListLoad; import net.runelite.api.widgets.WidgetInfo; 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 c19e72cff2..b041883910 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 @@ -25,7 +25,6 @@ */ package net.runelite.client.plugins.worldmap; -import com.google.common.eventbus.Subscribe; import com.google.inject.Inject; import com.google.inject.Provides; import java.awt.image.BufferedImage; @@ -35,6 +34,7 @@ import net.runelite.api.Experience; import net.runelite.api.Skill; import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.ExperienceChanged; +import net.runelite.api.events.Subscribe; import net.runelite.client.config.ConfigManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; 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 4d01c36d9a..278c7b30d8 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 @@ -24,7 +24,6 @@ */ package net.runelite.client.plugins.xpglobes; -import com.google.common.eventbus.Subscribe; import com.google.inject.Provides; import java.time.Instant; import java.time.temporal.ChronoUnit; @@ -38,6 +37,7 @@ import net.runelite.api.Experience; import net.runelite.api.Skill; import net.runelite.api.events.ExperienceChanged; import net.runelite.api.events.GameStateChanged; +import net.runelite.api.events.Subscribe; import net.runelite.client.config.ConfigManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDependency; 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 92f8e7daa8..ddaa4dda07 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 @@ -27,7 +27,6 @@ package net.runelite.client.plugins.xptracker; import static com.google.common.base.MoreObjects.firstNonNull; import com.google.common.collect.ImmutableList; -import com.google.common.eventbus.Subscribe; import com.google.inject.Binder; import com.google.inject.Provides; import java.awt.image.BufferedImage; @@ -50,6 +49,7 @@ import net.runelite.api.events.ExperienceChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; import net.runelite.api.events.NpcDespawned; +import net.runelite.api.events.Subscribe; import net.runelite.client.config.ConfigManager; import net.runelite.client.game.NPCManager; import net.runelite.client.game.SkillIconManager; 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 22d081ad1d..e5899ca594 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 @@ -24,7 +24,6 @@ */ package net.runelite.client.plugins.xtea; -import com.google.common.eventbus.Subscribe; import java.util.HashSet; import java.util.Set; import javax.inject.Inject; @@ -32,6 +31,7 @@ import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.events.GameStateChanged; +import net.runelite.api.events.Subscribe; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; import net.runelite.http.api.xtea.XteaClient; 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 893e1210df..a515c5a5e1 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 @@ -25,7 +25,6 @@ */ package net.runelite.client.plugins.zoom; -import com.google.common.eventbus.Subscribe; import com.google.inject.Inject; import com.google.inject.Provides; import java.awt.event.KeyEvent; @@ -33,6 +32,7 @@ import net.runelite.api.Client; import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.FocusChanged; import net.runelite.api.events.ScriptCallbackEvent; +import net.runelite.api.events.Subscribe; import net.runelite.client.config.ConfigManager; import net.runelite.client.input.KeyListener; import net.runelite.client.input.KeyManager; diff --git a/runelite-client/src/main/java/net/runelite/client/ui/ClientToolbar.java b/runelite-client/src/main/java/net/runelite/client/ui/ClientToolbar.java index 781751961c..8306df1596 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/ClientToolbar.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/ClientToolbar.java @@ -24,11 +24,11 @@ */ package net.runelite.client.ui; -import com.google.common.eventbus.EventBus; import java.util.HashSet; import java.util.Set; import javax.inject.Inject; import javax.inject.Singleton; +import net.runelite.api.events.EventBus; import net.runelite.client.events.NavigationButtonAdded; import net.runelite.client.events.NavigationButtonRemoved; diff --git a/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java b/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java index ea5573588c..c0156bc73d 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java @@ -25,7 +25,6 @@ package net.runelite.client.ui; import com.google.common.base.Strings; -import com.google.common.eventbus.Subscribe; import java.applet.Applet; import java.awt.Canvas; import java.awt.CardLayout; @@ -66,6 +65,7 @@ import net.runelite.api.Player; import net.runelite.api.Point; import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.GameStateChanged; +import net.runelite.api.events.Subscribe; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.RuneLite; diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java index 061a5177af..1e3c4b1c94 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayManager.java @@ -25,7 +25,6 @@ package net.runelite.client.ui.overlay; import com.google.common.annotations.VisibleForTesting; -import com.google.common.eventbus.Subscribe; import java.awt.Dimension; import java.awt.Point; import java.util.ArrayList; @@ -39,6 +38,7 @@ import javax.inject.Inject; import javax.inject.Singleton; import lombok.AccessLevel; import lombok.Getter; +import net.runelite.api.events.Subscribe; import net.runelite.client.config.ConfigGroup; import net.runelite.client.config.ConfigManager; import net.runelite.client.config.RuneLiteConfig; diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java index 3f31c26476..4ed2062ef8 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java @@ -25,7 +25,6 @@ package net.runelite.client.ui.overlay; import com.google.common.base.MoreObjects; -import com.google.common.eventbus.Subscribe; import com.google.common.primitives.Ints; import java.awt.Color; import java.awt.Dimension; @@ -41,6 +40,7 @@ import javax.swing.SwingUtilities; import net.runelite.api.Client; import net.runelite.api.GameState; import net.runelite.api.events.FocusChanged; +import net.runelite.api.events.Subscribe; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.config.RuneLiteConfig; diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/infobox/InfoBoxManager.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/infobox/InfoBoxManager.java index 5a8c906190..4b89bb437d 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/infobox/InfoBoxManager.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/infobox/InfoBoxManager.java @@ -26,7 +26,6 @@ package net.runelite.client.ui.overlay.infobox; import com.google.common.base.Preconditions; import com.google.common.collect.ComparisonChain; -import com.google.common.eventbus.Subscribe; import java.awt.Graphics; import java.awt.Image; import java.awt.image.BufferedImage; @@ -39,6 +38,7 @@ import javax.inject.Inject; import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; import net.runelite.api.events.ConfigChanged; +import net.runelite.api.events.Subscribe; import net.runelite.client.config.RuneLiteConfig; import net.runelite.client.plugins.PluginDescriptor; diff --git a/runelite-client/src/main/java/net/runelite/client/util/DeferredEventBus.java b/runelite-client/src/main/java/net/runelite/client/util/DeferredEventBus.java index 8890c65871..fb3166a783 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/DeferredEventBus.java +++ b/runelite-client/src/main/java/net/runelite/client/util/DeferredEventBus.java @@ -24,11 +24,11 @@ */ package net.runelite.client.util; -import com.google.common.eventbus.EventBus; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; import javax.inject.Inject; import javax.inject.Singleton; +import net.runelite.api.events.EventBus; @Singleton public class DeferredEventBus extends EventBus diff --git a/runelite-client/src/main/java/net/runelite/client/util/GameEventManager.java b/runelite-client/src/main/java/net/runelite/client/util/GameEventManager.java index 88e69d8d78..44c09276e4 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/GameEventManager.java +++ b/runelite-client/src/main/java/net/runelite/client/util/GameEventManager.java @@ -24,7 +24,6 @@ */ package net.runelite.client.util; -import com.google.common.eventbus.EventBus; import java.util.Arrays; import java.util.Objects; import java.util.Optional; @@ -43,6 +42,7 @@ import net.runelite.api.Player; import net.runelite.api.Scene; import net.runelite.api.Tile; import net.runelite.api.events.DecorativeObjectSpawned; +import net.runelite.api.events.EventBus; import net.runelite.api.events.GameObjectSpawned; import net.runelite.api.events.GroundObjectSpawned; import net.runelite.api.events.ItemContainerChanged; diff --git a/runelite-client/src/test/java/net/runelite/client/config/ConfigManagerTest.java b/runelite-client/src/test/java/net/runelite/client/config/ConfigManagerTest.java index b5f520ee2a..ad8ca4f2ea 100644 --- a/runelite-client/src/test/java/net/runelite/client/config/ConfigManagerTest.java +++ b/runelite-client/src/test/java/net/runelite/client/config/ConfigManagerTest.java @@ -24,7 +24,6 @@ */ package net.runelite.client.config; -import com.google.common.eventbus.EventBus; import com.google.inject.Guice; import com.google.inject.testing.fieldbinder.Bind; import com.google.inject.testing.fieldbinder.BoundFieldModule; @@ -33,6 +32,7 @@ import java.time.Instant; import java.util.UUID; import java.util.concurrent.ScheduledExecutorService; import javax.inject.Inject; +import net.runelite.api.events.EventBus; import net.runelite.client.account.AccountSession; import org.junit.Assert; import org.junit.Before;