diff --git a/runelite-api/src/main/java/net/runelite/api/TextureProvider.java b/runelite-api/src/main/java/net/runelite/api/TextureProvider.java new file mode 100644 index 0000000000..1123fcde3c --- /dev/null +++ b/runelite-api/src/main/java/net/runelite/api/TextureProvider.java @@ -0,0 +1,30 @@ +/* + * 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.api; + +public interface TextureProvider +{ + void checkTextures(int var1); +} 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 d9a73fb7ac..42ad695b22 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,6 +24,7 @@ */ package net.runelite.client.callback; +import net.runelite.api.TextureProvider; import net.runelite.api.events.GameTick; import net.runelite.api.events.ProjectileMoved; import net.runelite.api.events.MenuEntryAdded; @@ -127,6 +128,22 @@ public class Hooks BufferedImage image = (BufferedImage) bufferProvider.getImage(); Graphics2D graphics2d = (Graphics2D) image.getGraphics(); + try + { + renderer.render(graphics2d, OverlayLayer.ABOVE_SCENE); + } + catch (Exception ex) + { + log.warn("Error during overlay rendering", ex); + } + } + + public static void drawAboveOverheads(TextureProvider textureProvider, int var1) + { + MainBufferProvider bufferProvider = (MainBufferProvider) client.getBufferProvider(); + BufferedImage image = (BufferedImage) bufferProvider.getImage(); + Graphics2D graphics2d = (Graphics2D) image.getGraphics(); + try { renderer.render(graphics2d, OverlayLayer.UNDER_WIDGETS); diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayLayer.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayLayer.java index 4d109ec793..c5dcd1dcfc 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayLayer.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayLayer.java @@ -27,17 +27,22 @@ package net.runelite.client.ui.overlay; public enum OverlayLayer { /** - * Render overlay above all game elements + * Render right above the scene (that contains actors and the surface) */ - ALWAYS_ON_TOP, + ABOVE_SCENE, /** - * Render under all interfaces + * Render under all interfaces, but above overheads */ UNDER_WIDGETS, /** * Render under the right-click menu */ - ABOVE_WIDGETS + ABOVE_WIDGETS, + + /** + * Render overlay above all game elements + */ + ALWAYS_ON_TOP, } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSTextureProvider.java b/runescape-api/src/main/java/net/runelite/rs/api/RSTextureProvider.java new file mode 100644 index 0000000000..fd41b1aa7e --- /dev/null +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSTextureProvider.java @@ -0,0 +1,35 @@ +/* + * 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.rs.api; + +import net.runelite.api.TextureProvider; +import net.runelite.mapping.Import; + +public interface RSTextureProvider extends TextureProvider +{ + @Override + @Import("checkTextures") + void checkTextures(int var1); +}