From d948dc05ed183b15af2b59c0fe36db443c180da2 Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Fri, 22 Jun 2018 11:11:39 +0200 Subject: [PATCH] Move drawAboveOverheads call to mixins Signed-off-by: Tomas Slusny --- .../net/runelite/client/callback/Hooks.java | 3 +- .../net/runelite/client/callback/Hooks.java | 5 +++ .../mixins/RSTextureProviderMixin.java | 42 +++++++++++++++++++ 3 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 runelite-mixins/src/main/java/net/runelite/mixins/RSTextureProviderMixin.java 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 e4dc01babe..8ba888da83 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 @@ -43,7 +43,6 @@ import net.runelite.api.MainBufferProvider; import net.runelite.api.MenuAction; import net.runelite.api.Region; import net.runelite.api.RenderOverview; -import net.runelite.api.TextureProvider; import net.runelite.api.WorldMapManager; import net.runelite.api.events.GameTick; import net.runelite.api.events.MenuOptionClicked; @@ -307,7 +306,7 @@ public class Hooks } } - public static void drawAboveOverheads(TextureProvider textureProvider, int var1) + public static void drawAboveOverheads() { MainBufferProvider bufferProvider = (MainBufferProvider) client.getBufferProvider(); BufferedImage image = (BufferedImage) bufferProvider.getImage(); diff --git a/runelite-mixins/src/main/java/net/runelite/client/callback/Hooks.java b/runelite-mixins/src/main/java/net/runelite/client/callback/Hooks.java index f84b121474..124fd68dcc 100644 --- a/runelite-mixins/src/main/java/net/runelite/client/callback/Hooks.java +++ b/runelite-mixins/src/main/java/net/runelite/client/callback/Hooks.java @@ -49,6 +49,11 @@ public class Hooks throw new IllegalStateException(); } + public static void drawAboveOverheads() + { + throw new IllegalStateException(); + } + public static MouseEvent mousePressed(MouseEvent mouseEvent) { throw new RuntimeException(); diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSTextureProviderMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSTextureProviderMixin.java new file mode 100644 index 0000000000..b7d60b0f01 --- /dev/null +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSTextureProviderMixin.java @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2018, Tomas Slusny + * 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.mixins; + +import net.runelite.api.mixins.Inject; +import net.runelite.api.mixins.MethodHook; +import net.runelite.api.mixins.Mixin; +import net.runelite.client.callback.Hooks; +import net.runelite.rs.api.RSTextureProvider; + +@Mixin(RSTextureProvider.class) +public abstract class RSTextureProviderMixin implements RSTextureProvider +{ + @Inject + @MethodHook(value = "checkTextures", end = true) + public void checkTextures(int var1) + { + Hooks.drawAboveOverheads(); + } +}