From 653780b8db2f428068b0daedaf57e8f2de79e72d Mon Sep 17 00:00:00 2001 From: Lucas Date: Wed, 12 Jun 2019 23:33:50 +0200 Subject: [PATCH] Fix rasterizer2d fillRectangleAlpha import/export --- .../main/java/net/runelite/injector/raw/RasterizerHook.java | 4 ++-- runescape-api/src/main/java/net/runelite/rs/api/RSClient.java | 2 +- runescape-client/src/main/java/Client.java | 4 ++-- runescape-client/src/main/java/DevicePcmPlayerProvider.java | 2 +- runescape-client/src/main/java/Rasterizer2D.java | 4 ++-- runescape-client/src/main/java/WorldMap.java | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/injector-plugin/src/main/java/net/runelite/injector/raw/RasterizerHook.java b/injector-plugin/src/main/java/net/runelite/injector/raw/RasterizerHook.java index c23b3dc159..1abad350be 100644 --- a/injector-plugin/src/main/java/net/runelite/injector/raw/RasterizerHook.java +++ b/injector-plugin/src/main/java/net/runelite/injector/raw/RasterizerHook.java @@ -42,7 +42,7 @@ public class RasterizerHook private static final String circle_alpha = "Rasterizer2D_drawCircleAlpha"; private static final String line_alpha = "Rasterizer2D_drawHorizontalLineAlpha"; private static final String line_alpha2 = "Rasterizer2D_drawVerticalLineAlpha"; - private static final String more_alpha = "Rasterizer2D_moreAlpha"; + private static final String fill_rect_alpha = "Rasterizer2D_fillRectangleAlpha"; private static final String r3d_vert = "Rasterizer3D_vertAlpha"; private static final String r3d_horiz = "Rasterizer3D_horizAlpha"; private static final String r3d_field = "Rasterizer3D_alpha"; @@ -94,7 +94,7 @@ public class RasterizerHook runAlpha(circle_alpha, 2, 4); runAlpha(line_alpha, 1, 4); runAlpha(line_alpha2, 1, 4); - runAlpha(more_alpha, 1, 5); + runAlpha(fill_rect_alpha, 1, 5); runAlpha(sprite_alpha1, 1, 9, 0); runAlpha(sprite_alpha2, 1, 12, 0); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java index b3e6f2e792..90d5abcec3 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java @@ -976,7 +976,7 @@ public interface RSClient extends RSGameShell, Client @Import("drawGradient") void rasterizerDrawGradient(int x, int y, int w, int h, int rgbTop, int rgbBottom); - @Import("Rasterizer2D_drawRectangleAlpha") + @Import("Rasterizer2D_fillRectangleAlpha") void rasterizerFillRectangleAlpha(int x, int y, int w, int h, int rgb, int a); @Import("Rasterizer2D_drawRectangle") diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index a53da50771..9dd78cb754 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -4762,9 +4762,9 @@ public final class Client extends GameShell implements Usernamed { if(gameDrawingMode == 3) { for(var1 = 0; var1 < rootWidgetCount; ++var1) { if(__client_oq[var1]) { - Rasterizer2D.Rasterizer2D_moreAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 0xff00ff, 128); + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 0xff00ff, 128); } else if(__client_ot[var1]) { - Rasterizer2D.Rasterizer2D_moreAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 0xff0000, 128); + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(rootWidgetXs[var1], rootWidgetYs[var1], rootWidgetWidths[var1], rootWidgetHeights[var1], 0xff0000, 128); } } } diff --git a/runescape-client/src/main/java/DevicePcmPlayerProvider.java b/runescape-client/src/main/java/DevicePcmPlayerProvider.java index b5bda991c5..d2cc9dfb49 100644 --- a/runescape-client/src/main/java/DevicePcmPlayerProvider.java +++ b/runescape-client/src/main/java/DevicePcmPlayerProvider.java @@ -474,7 +474,7 @@ public class DevicePcmPlayerProvider implements PcmPlayerProvider { if(var14 == 0) { Rasterizer2D.Rasterizer2D_fillRectangle(var12, var13, var10.width, var10.height, var30); } else { - Rasterizer2D.Rasterizer2D_moreAlpha(var12, var13, var10.width, var10.height, var30, 256 - (var14 & 255)); + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var12, var13, var10.width, var10.height, var30, 256 - (var14 & 255)); } } } else if(var14 == 0) { diff --git a/runescape-client/src/main/java/Rasterizer2D.java b/runescape-client/src/main/java/Rasterizer2D.java index ca4f71584b..477a8d02cc 100644 --- a/runescape-client/src/main/java/Rasterizer2D.java +++ b/runescape-client/src/main/java/Rasterizer2D.java @@ -348,8 +348,8 @@ public class Rasterizer2D extends DualNode { } @ObfuscatedName("dl") - @Export("Rasterizer2D_moreAlpha") - public static void Rasterizer2D_moreAlpha(int var0, int var1, int var2, int var3, int var4, int var5) { + @Export("Rasterizer2D_fillRectangleAlpha") + public static void Rasterizer2D_fillRectangleAlpha(int var0, int var1, int var2, int var3, int var4, int var5) { if(var0 < Rasterizer2D_xClipStart) { var2 -= Rasterizer2D_xClipStart - var0; var0 = Rasterizer2D_xClipStart; diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java index 3071f792e7..8a74c8b56c 100644 --- a/runescape-client/src/main/java/WorldMap.java +++ b/runescape-client/src/main/java/WorldMap.java @@ -857,7 +857,7 @@ public class WorldMap { var14 = var2 - this.worldMapManager.__z * (var7 - (var12 - this.__bu)); } - Rasterizer2D.Rasterizer2D_moreAlpha(var1, var2, var3, var4, 0, 128); + Rasterizer2D.Rasterizer2D_fillRectangleAlpha(var1, var2, var3, var4, 0, 128); if(1.0F == var10) { this.sprite.__v_510(var13, var14, 192); } else {