ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Move drawRegion call to mixins

Browse Source 
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
This commit is contained in:
Tomas Slusny
2018-06-22 11:14:56 +02:00
committed by Adam
parent d948dc05ed
commit 7437da1237
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
runelite-client/src/main/java/net/runelite/client/callback/Hooks.java
View File

@@ -41,7 +41,6 @@ import java.awt.image.VolatileImage;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.MainBufferProvider; import net.runelite.api.MainBufferProvider;
import net.runelite.api.MenuAction; import net.runelite.api.MenuAction;
import net.runelite.api.Region;
import net.runelite.api.RenderOverview; import net.runelite.api.RenderOverview;
import net.runelite.api.WorldMapManager; import net.runelite.api.WorldMapManager;
import net.runelite.api.events.GameTick; import net.runelite.api.events.GameTick;
@@ -290,7 +289,7 @@ public class Hooks
renderHooks.processDrawComplete(image); renderHooks.processDrawComplete(image);
} }
public static void drawRegion(Region region, int var1, int var2, int var3, int var4, int var5, int var6) public static void drawRegion()
{ {
MainBufferProvider bufferProvider = (MainBufferProvider) client.getBufferProvider(); MainBufferProvider bufferProvider = (MainBufferProvider) client.getBufferProvider();
BufferedImage image = (BufferedImage) bufferProvider.getImage(); BufferedImage image = (BufferedImage) bufferProvider.getImage();

5
runelite-mixins/src/main/java/net/runelite/client/callback/Hooks.java
View File

@@ -54,6 +54,11 @@ public class Hooks
throw new IllegalStateException(); throw new IllegalStateException();
} }
public static void drawRegion()
{
throw new IllegalStateException();
}
public static MouseEvent mousePressed(MouseEvent mouseEvent) public static MouseEvent mousePressed(MouseEvent mouseEvent)
{ {
throw new RuntimeException(); throw new RuntimeException();

2
runelite-mixins/src/main/java/net/runelite/mixins/RSRegionMixin.java
View File

@@ -31,6 +31,7 @@ import net.runelite.api.mixins.Copy;
import net.runelite.api.mixins.Inject; import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.Mixin; import net.runelite.api.mixins.Mixin;
import net.runelite.api.mixins.Replace; import net.runelite.api.mixins.Replace;
import net.runelite.client.callback.Hooks;
import static net.runelite.client.callback.Hooks.log; import static net.runelite.client.callback.Hooks.log;
import net.runelite.rs.api.RSDecorativeObject; import net.runelite.rs.api.RSDecorativeObject;
import net.runelite.rs.api.RSGroundObject; import net.runelite.rs.api.RSGroundObject;
@@ -54,6 +55,7 @@ public abstract class RSRegionMixin implements RSRegion
{ {
isDrawingRegion = true; isDrawingRegion = true;
rs$drawRegion(cameraX, cameraY, cameraZ, cameraPitch, cameraYaw, plane); rs$drawRegion(cameraX, cameraY, cameraZ, cameraPitch, cameraYaw, plane);
Hooks.drawRegion();
} }
finally finally
{ {