diff --git a/runelite-api/src/main/java/net/runelite/api/events/ScriptEvent.java b/runelite-api/src/main/java/net/runelite/api/events/ScriptCallbackEvent.java similarity index 97% rename from runelite-api/src/main/java/net/runelite/api/events/ScriptEvent.java rename to runelite-api/src/main/java/net/runelite/api/events/ScriptCallbackEvent.java index db6887c25e..863e18d7fd 100644 --- a/runelite-api/src/main/java/net/runelite/api/events/ScriptEvent.java +++ b/runelite-api/src/main/java/net/runelite/api/events/ScriptCallbackEvent.java @@ -28,7 +28,7 @@ import lombok.Data; import net.runelite.api.Script; @Data -public class ScriptEvent +public class ScriptCallbackEvent { private Script script; private String eventName; 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 2d505829a1..5bf86e1f86 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 @@ -38,7 +38,7 @@ import net.runelite.api.Item; import net.runelite.api.ItemContainer; import net.runelite.api.MenuAction; import net.runelite.api.events.MenuOptionClicked; -import net.runelite.api.events.ScriptEvent; +import net.runelite.api.events.ScriptCallbackEvent; import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.WidgetConfig; import net.runelite.api.widgets.WidgetInfo; @@ -109,7 +109,7 @@ public class BankTagsPlugin extends Plugin } @Subscribe - public void onScriptEvent(ScriptEvent event) + public void onScriptEvent(ScriptCallbackEvent event) { String eventName = event.getEventName(); 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 519ff7b02f..32e397ebb8 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 @@ -31,7 +31,7 @@ import com.google.inject.Provides; import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.events.ConfigChanged; -import net.runelite.api.events.ScriptEvent; +import net.runelite.api.events.ScriptCallbackEvent; import net.runelite.client.config.ConfigManager; import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.PluginDescriptor; @@ -55,7 +55,7 @@ public class ZoomPlugin extends Plugin } @Subscribe - public void onScriptEvent(ScriptEvent event) + public void onScriptEvent(ScriptCallbackEvent event) { int[] intStack = client.getIntStack(); int intStackSize = client.getIntStackSize(); diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/ScriptVMMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/ScriptVMMixin.java index 5d8b7cfbec..d8cad4db5e 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/ScriptVMMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/ScriptVMMixin.java @@ -25,7 +25,7 @@ package net.runelite.mixins; import net.runelite.api.Client; -import net.runelite.api.events.ScriptEvent; +import net.runelite.api.events.ScriptCallbackEvent; import net.runelite.api.mixins.Copy; import net.runelite.api.mixins.Inject; import net.runelite.api.mixins.Mixin; @@ -64,7 +64,7 @@ public abstract class ScriptVMMixin implements RSClient String stringOp = client.getStringStack()[--stringStackSize]; client.setStringStackSize(stringStackSize); - ScriptEvent event = new ScriptEvent(); + ScriptCallbackEvent event = new ScriptCallbackEvent(); event.setScript(currentScript); event.setEventName(stringOp); Hooks.eventBus.post(event);