From 66ccd9c0d6e2be5499f80cf766efe98987f2268f Mon Sep 17 00:00:00 2001 From: Max Weber Date: Mon, 14 May 2018 01:12:44 -0600 Subject: [PATCH] Add VarC events --- .../main/java/net/runelite/api/Client.java | 6 ++++ .../api/events/VarClientIntChanged.java | 34 +++++++++++++++++++ .../api/events/VarClientStrChanged.java | 34 +++++++++++++++++++ .../net/runelite/mixins/RSVarcsMixin.java | 27 +++++++++++++++ .../java/net/runelite/mixins/VarbitMixin.java | 18 ++++++++-- 5 files changed, 117 insertions(+), 2 deletions(-) create mode 100644 runelite-api/src/main/java/net/runelite/api/events/VarClientIntChanged.java create mode 100644 runelite-api/src/main/java/net/runelite/api/events/VarClientStrChanged.java create mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSVarcsMixin.java diff --git a/runelite-api/src/main/java/net/runelite/api/Client.java b/runelite-api/src/main/java/net/runelite/api/Client.java index beb6316e56..966ead302d 100644 --- a/runelite-api/src/main/java/net/runelite/api/Client.java +++ b/runelite-api/src/main/java/net/runelite/api/Client.java @@ -175,6 +175,12 @@ public interface Client extends GameEngine int[] getVarps(); + @VisibleForDevtools + int[] getIntVarcs(); + + @VisibleForDevtools + String[] getStrVarcs(); + int getVar(VarPlayer varPlayer); int getVar(Varbits varbit); diff --git a/runelite-api/src/main/java/net/runelite/api/events/VarClientIntChanged.java b/runelite-api/src/main/java/net/runelite/api/events/VarClientIntChanged.java new file mode 100644 index 0000000000..ffdca692ca --- /dev/null +++ b/runelite-api/src/main/java/net/runelite/api/events/VarClientIntChanged.java @@ -0,0 +1,34 @@ +/* + * 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 lombok.Value; + +@Value +public class VarClientIntChanged +{ + private int index; +} diff --git a/runelite-api/src/main/java/net/runelite/api/events/VarClientStrChanged.java b/runelite-api/src/main/java/net/runelite/api/events/VarClientStrChanged.java new file mode 100644 index 0000000000..21f085f1db --- /dev/null +++ b/runelite-api/src/main/java/net/runelite/api/events/VarClientStrChanged.java @@ -0,0 +1,34 @@ +/* + * 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 lombok.Value; + +@Value +public class VarClientStrChanged +{ + private int index; +} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSVarcsMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSVarcsMixin.java new file mode 100644 index 0000000000..1166398ac7 --- /dev/null +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSVarcsMixin.java @@ -0,0 +1,27 @@ +package net.runelite.mixins; + +import net.runelite.api.events.VarClientIntChanged; +import net.runelite.api.events.VarClientStrChanged; +import net.runelite.api.mixins.FieldHook; +import net.runelite.api.mixins.Inject; +import net.runelite.api.mixins.Mixin; +import net.runelite.client.callback.Hooks; +import net.runelite.rs.api.RSVarcs; + +@Mixin(RSVarcs.class) +public abstract class RSVarcsMixin implements RSVarcs +{ + @FieldHook("varCInts") + @Inject + public void onVarCIntChanged(int idx) + { + Hooks.eventBus.post(new VarClientIntChanged(idx)); + } + + @FieldHook("varCStrings") + @Inject + public void onVarCStrChanged(int idx) + { + Hooks.eventBus.post(new VarClientStrChanged(idx)); + } +} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/VarbitMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/VarbitMixin.java index 37e40ea589..0ebcb1c99c 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/VarbitMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/VarbitMixin.java @@ -113,13 +113,27 @@ public abstract class VarbitMixin implements RSClient @Override public int getVar(VarClientInt varClientInt) { - return getVarcs().getIntVarcs()[varClientInt.getIndex()]; + return getIntVarcs()[varClientInt.getIndex()]; } @Inject @Override public String getVar(VarClientStr varClientStr) { - return getVarcs().getStrVarcs()[varClientStr.getIndex()]; + return getStrVarcs()[varClientStr.getIndex()]; + } + + @Inject + @Override + public int[] getIntVarcs() + { + return getVarcs().getIntVarcs(); + } + + @Inject + @Override + public String[] getStrVarcs() + { + return getVarcs().getStrVarcs(); } }