diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSRasterizer2DMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSRasterizer2DMixin.java index 0233976309..198ad56c74 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSRasterizer2DMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSRasterizer2DMixin.java @@ -109,13 +109,13 @@ public abstract class RSRasterizer2DMixin implements RSClient } } - @Copy("raster2d7") + @Copy("Rasterizer2D_drawGradientPixels") public static void rs$raster2d7(int var0, int var1, int var2, int var3, int var4, int var5, byte[] var6, int var7) { throw new RuntimeException(); } - @Replace("raster2d7") + @Replace("Rasterizer2D_drawGradientPixels") public static void rl$raster2d7(int var0, int var1, int var2, int var3, int var4, int var5, byte[] var6, int var7) { final int width = client.getGraphicsPixelsWidth(); diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index 751d01ed77..7c04c35861 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -1338,10 +1338,10 @@ public final class Client extends GameShell implements Usernamed { instanceChunkTemplates = new int[4][13][13]; field713 = new int[]{0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3}; field718 = 0; - field715 = 2301979; - field716 = 5063219; - field720 = 3353893; - field772 = 7759444; + field715 = 0x23201b; + field716 = 0x4d4233; + field720 = 0x332d25; + field772 = 0x766654; field719 = false; field882 = 0; camAngleX = 128; diff --git a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java index c8b4a45cd0..9c134ed005 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java @@ -144,7 +144,7 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator { if (objectType == 22) { if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.method4591(22, rotation, var15, var17, var16, var18); + var22 = var8.getEntity(22, rotation, var15, var17, var16, var18); } else { var22 = new DynamicObject(objectID, 22, rotation, plane, x, y, var8.animationId, true, (Entity)null); } @@ -157,7 +157,7 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator { } } else if (objectType == 10 || objectType == 11) { if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.method4591(10, rotation, var15, var17, var16, var18); + var22 = var8.getEntity(10, rotation, var15, var17, var16, var18); } else { var22 = new DynamicObject(objectID, 10, rotation, plane, x, y, var8.animationId, true, (Entity) null); } @@ -186,7 +186,7 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator { } else if (objectType >= 12) { if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.method4591(objectType, rotation, var15, var17, var16, var18); + var22 = var8.getEntity(objectType, rotation, var15, var17, var16, var18); } else { var22 = new DynamicObject(objectID, objectType, rotation, plane, x, y, var8.animationId, true, (Entity) null); } @@ -203,7 +203,7 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator { } else if (objectType == 0) { if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.method4591(0, rotation, var15, var17, var16, var18); + var22 = var8.getEntity(0, rotation, var15, var17, var16, var18); } else { var22 = new DynamicObject(objectID, 0, rotation, plane, x, y, var8.animationId, true, (Entity) null); } @@ -261,7 +261,7 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator { } else if (objectType == 1) { if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.method4591(1, rotation, var15, var17, var16, var18); + var22 = var8.getEntity(1, rotation, var15, var17, var16, var18); } else { var22 = new DynamicObject(objectID, 1, rotation, plane, x, y, var8.animationId, true, (Entity) null); } @@ -288,8 +288,8 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator { Object var29; Object var30; if (var8.animationId == -1 && var8.transforms == null) { - var29 = var8.method4591(2, rotation + 4, var15, var17, var16, var18); - var30 = var8.method4591(2, var28, var15, var17, var16, var18); + var29 = var8.getEntity(2, rotation + 4, var15, var17, var16, var18); + var30 = var8.getEntity(2, var28, var15, var17, var16, var18); } else { var29 = new DynamicObject(objectID, 2, rotation + 4, plane, x, y, var8.animationId, true, (Entity) null); var30 = new DynamicObject(objectID, 2, var28, plane, x, y, var8.animationId, true, (Entity) null); @@ -330,7 +330,7 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator { } else if (objectType == 3) { if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.method4591(3, rotation, var15, var17, var16, var18); + var22 = var8.getEntity(3, rotation, var15, var17, var16, var18); } else { var22 = new DynamicObject(objectID, 3, rotation, plane, x, y, var8.animationId, true, (Entity) null); } @@ -354,7 +354,7 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator { } else if (objectType == 9) { if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.method4591(objectType, rotation, var15, var17, var16, var18); + var22 = var8.getEntity(objectType, rotation, var15, var17, var16, var18); } else { var22 = new DynamicObject(objectID, objectType, rotation, plane, x, y, var8.animationId, true, (Entity) null); } @@ -370,7 +370,7 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator { } else if (objectType == 4) { if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.method4591(4, rotation, var15, var17, var16, var18); + var22 = var8.getEntity(4, rotation, var15, var17, var16, var18); } else { var22 = new DynamicObject(objectID, 4, rotation, plane, x, y, var8.animationId, true, (Entity) null); } @@ -385,7 +385,7 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator { } if (var8.animationId == -1 && var8.transforms == null) { - var33 = var8.method4591(4, rotation, var15, var17, var16, var18); + var33 = var8.getEntity(4, rotation, var15, var17, var16, var18); } else { var33 = new DynamicObject(objectID, 4, rotation, plane, x, y, var8.animationId, true, (Entity) null); } @@ -400,7 +400,7 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator { } if (var8.animationId == -1 && var8.transforms == null) { - var33 = var8.method4591(4, rotation + 4, var15, var17, var16, var18); + var33 = var8.getEntity(4, rotation + 4, var15, var17, var16, var18); } else { var33 = new DynamicObject(objectID, 4, rotation + 4, plane, x, y, var8.animationId, true, (Entity) null); } @@ -409,7 +409,7 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator { } else if (objectType == 7) { int var23 = rotation + 2 & 3; if (var8.animationId == -1 && var8.transforms == null) { - var22 = var8.method4591(4, var23 + 4, var15, var17, var16, var18); + var22 = var8.getEntity(4, var23 + 4, var15, var17, var16, var18); } else { var22 = new DynamicObject(objectID, 4, var23 + 4, plane, x, y, var8.animationId, true, (Entity) null); } @@ -426,8 +426,8 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator { Object var26; Object var33; if (var8.animationId == -1 && var8.transforms == null) { - var33 = var8.method4591(4, rotation + 4, var15, var17, var16, var18); - var26 = var8.method4591(4, var27 + 4, var15, var17, var16, var18); + var33 = var8.getEntity(4, rotation + 4, var15, var17, var16, var18); + var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); } else { var33 = new DynamicObject(objectID, 4, rotation + 4, plane, x, y, var8.animationId, true, (Entity) null); var26 = new DynamicObject(objectID, 4, var27 + 4, plane, x, y, var8.animationId, true, (Entity) null); diff --git a/runescape-client/src/main/java/Model.java b/runescape-client/src/main/java/Model.java index 2af540dcab..4b732d9948 100644 --- a/runescape-client/src/main/java/Model.java +++ b/runescape-client/src/main/java/Model.java @@ -374,89 +374,90 @@ public class Model extends Entity { int var8 = var2 + this.xzRadius; int var9 = var4 - this.xzRadius; int var10 = var4 + this.xzRadius; - if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { - var7 >>= 7; - var8 = var8 + 127 >> 7; - var9 >>= 7; - var10 = var10 + 127 >> 7; - if (var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) { - return this; - } - Model var11; - if (var5) { - var11 = new Model(); - var11.verticesCount = this.verticesCount; - var11.indicesCount = this.indicesCount; - var11.field1691 = this.field1691; - var11.verticesX = this.verticesX; - var11.verticesZ = this.verticesZ; - var11.indices1 = this.indices1; - var11.indices2 = this.indices2; - var11.indices3 = this.indices3; - var11.faceColors1 = this.faceColors1; - var11.faceColors2 = this.faceColors2; - var11.faceColors3 = this.faceColors3; - var11.faceRenderPriorities = this.faceRenderPriorities; - var11.faceAlphas = this.faceAlphas; - var11.field1688 = this.field1688; - var11.faceTextures = this.faceTextures; - var11.field1690 = this.field1690; - var11.field1692 = this.field1692; - var11.field1693 = this.field1693; - var11.field1694 = this.field1694; - var11.vertexLabels = this.vertexLabels; - var11.faceLabelsAlpha = this.faceLabelsAlpha; - var11.isSingleTile = this.isSingleTile; - var11.verticesY = new int[var11.verticesCount]; - } else { - var11 = this; - } - - int var12; - int var13; - int var14; - int var15; - int var16; - int var17; - int var18; - int var19; - int var20; - int var21; - if (var6 == 0) { - for (var12 = 0; var12 < var11.verticesCount; ++var12) { - var13 = var2 + this.verticesX[var12]; - var14 = var4 + this.verticesZ[var12]; - var15 = var13 & 127; - var16 = var14 & 127; - var17 = var13 >> 7; - var18 = var14 >> 7; - var19 = var1[var17][var18] * (128 - var15) + var1[var17 + 1][var18] * var15 >> 7; - var20 = var1[var17][var18 + 1] * (128 - var15) + var15 * var1[var17 + 1][var18 + 1] >> 7; - var21 = var19 * (128 - var16) + var20 * var16 >> 7; - var11.verticesY[var12] = var21 + this.verticesY[var12] - var3; - } - } else { - for (var12 = 0; var12 < var11.verticesCount; ++var12) { - var13 = (-this.verticesY[var12] << 16) / super.height; - if (var13 < var6) { - var14 = var2 + this.verticesX[var12]; - var15 = var4 + this.verticesZ[var12]; - var16 = var14 & 127; - var17 = var15 & 127; - var18 = var14 >> 7; - var19 = var15 >> 7; - var20 = var1[var18][var19] * (128 - var16) + var1[var18 + 1][var19] * var16 >> 7; - var21 = var1[var18][var19 + 1] * (128 - var16) + var16 * var1[var18 + 1][var19 + 1] >> 7; - int var22 = var20 * (128 - var17) + var21 * var17 >> 7; - var11.verticesY[var12] = (var6 - var13) * (var22 - var3) / var6 + this.verticesY[var12]; - } - } - } - - var11.resetBounds(); - return var11; + if (var7 < 0 || var8 + 128 >> 7 >= var1.length || var9 < 0 || var10 + 128 >> 7 >= var1[0].length) { + return this; } - return this; + var7 >>= 7; + var8 = var8 + 127 >> 7; + var9 >>= 7; + var10 = var10 + 127 >> 7; + if (var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) { + return this; + } + Model var11; + if (var5) { + var11 = new Model(); + var11.verticesCount = this.verticesCount; + var11.indicesCount = this.indicesCount; + var11.field1691 = this.field1691; + var11.verticesX = this.verticesX; + var11.verticesZ = this.verticesZ; + var11.indices1 = this.indices1; + var11.indices2 = this.indices2; + var11.indices3 = this.indices3; + var11.faceColors1 = this.faceColors1; + var11.faceColors2 = this.faceColors2; + var11.faceColors3 = this.faceColors3; + var11.faceRenderPriorities = this.faceRenderPriorities; + var11.faceAlphas = this.faceAlphas; + var11.field1688 = this.field1688; + var11.faceTextures = this.faceTextures; + var11.field1690 = this.field1690; + var11.field1692 = this.field1692; + var11.field1693 = this.field1693; + var11.field1694 = this.field1694; + var11.vertexLabels = this.vertexLabels; + var11.faceLabelsAlpha = this.faceLabelsAlpha; + var11.isSingleTile = this.isSingleTile; + var11.verticesY = new int[var11.verticesCount]; + } else { + var11 = this; + } + + int var12; + int var13; + int var14; + int var15; + int var16; + int var17; + int var18; + int var19; + int var20; + int var21; + if (var6 == 0) { + for (var12 = 0; var12 < var11.verticesCount; ++var12) { + var13 = var2 + this.verticesX[var12]; + var14 = var4 + this.verticesZ[var12]; + var15 = var13 & 127; + var16 = var14 & 127; + var17 = var13 >> 7; + var18 = var14 >> 7; + var19 = var1[var17][var18] * (128 - var15) + var1[var17 + 1][var18] * var15 >> 7; + var20 = var1[var17][var18 + 1] * (128 - var15) + var15 * var1[var17 + 1][var18 + 1] >> 7; + var21 = var19 * (128 - var16) + var20 * var16 >> 7; + var11.verticesY[var12] = var21 + this.verticesY[var12] - var3; + } + } else { + for (var12 = 0; var12 < var11.verticesCount; ++var12) { + var13 = (-this.verticesY[var12] << 16) / super.height; + if (var13 >= var6) { + continue; + } + var14 = var2 + this.verticesX[var12]; + var15 = var4 + this.verticesZ[var12]; + var16 = var14 & 127; + var17 = var15 & 127; + var18 = var14 >> 7; + var19 = var15 >> 7; + var20 = var1[var18][var19] * (128 - var16) + var1[var18 + 1][var19] * var16 >> 7; + var21 = var1[var18][var19 + 1] * (128 - var16) + var16 * var1[var18 + 1][var19 + 1] >> 7; + int var22 = var20 * (128 - var17) + var21 * var17 >> 7; + var11.verticesY[var12] = (var6 - var13) * (var22 - var3) / var6 + this.verticesY[var12]; + } + } + + var11.resetBounds(); + return var11; } @ObfuscatedName("w") @@ -769,16 +770,17 @@ public class Model extends Entity { for (var8 = 0; var8 < var6; ++var8) { int var9 = var2[var8]; - if (var9 < this.vertexLabels.length) { - int[] var10 = this.vertexLabels[var9]; + if (var9 >= this.vertexLabels.length) { + continue; + } + int[] var10 = this.vertexLabels[var9]; - for (var11 = 0; var11 < var10.length; ++var11) { - var12 = var10[var11]; - Model_transformTempX += this.verticesX[var12]; - Model_transformTempY += this.verticesY[var12]; - Model_transformTempZ += this.verticesZ[var12]; - ++var7; - } + for (var11 = 0; var11 < var10.length; ++var11) { + var12 = var10[var11]; + Model_transformTempX += this.verticesX[var12]; + Model_transformTempY += this.verticesY[var12]; + Model_transformTempZ += this.verticesZ[var12]; + ++var7; } } @@ -792,132 +794,115 @@ public class Model extends Entity { Model_transformTempZ = var5; } - } else { - int[] var10000; - int[] var18; - int var19; - if (var1 == 1) { - for (var7 = 0; var7 < var6; ++var7) { - var8 = var2[var7]; - if (var8 < this.vertexLabels.length) { - var18 = this.vertexLabels[var8]; - - for (var19 = 0; var19 < var18.length; ++var19) { - var11 = var18[var19]; - var10000 = this.verticesX; - var10000[var11] += var3; - var10000 = this.verticesY; - var10000[var11] += var4; - var10000 = this.verticesZ; - var10000[var11] += var5; - } - } + } else if (var1 == 1) { + for (var7 = 0; var7 < var6; ++var7) { + var8 = var2[var7]; + if (var8 >= this.vertexLabels.length) { + continue; } + int[] var18 = this.vertexLabels[var8]; - } else if (var1 == 2) { - for (var7 = 0; var7 < var6; ++var7) { - var8 = var2[var7]; - if (var8 < this.vertexLabels.length) { - var18 = this.vertexLabels[var8]; - - for (var19 = 0; var19 < var18.length; ++var19) { - var11 = var18[var19]; - var10000 = this.verticesX; - var10000[var11] -= Model_transformTempX; - var10000 = this.verticesY; - var10000[var11] -= Model_transformTempY; - var10000 = this.verticesZ; - var10000[var11] -= Model_transformTempZ; - var12 = (var3 & 255) * 8; - int var13 = (var4 & 255) * 8; - int var14 = (var5 & 255) * 8; - int var15; - int var16; - int var17; - if (var14 != 0) { - var15 = Model_sine[var14]; - var16 = Model_cosine[var14]; - var17 = var15 * this.verticesY[var11] + var16 * this.verticesX[var11] >> 16; - this.verticesY[var11] = var16 * this.verticesY[var11] - var15 * this.verticesX[var11] >> 16; - this.verticesX[var11] = var17; - } - - if (var12 != 0) { - var15 = Model_sine[var12]; - var16 = Model_cosine[var12]; - var17 = var16 * this.verticesY[var11] - var15 * this.verticesZ[var11] >> 16; - this.verticesZ[var11] = var15 * this.verticesY[var11] + var16 * this.verticesZ[var11] >> 16; - this.verticesY[var11] = var17; - } - - if (var13 != 0) { - var15 = Model_sine[var13]; - var16 = Model_cosine[var13]; - var17 = var15 * this.verticesZ[var11] + var16 * this.verticesX[var11] >> 16; - this.verticesZ[var11] = var16 * this.verticesZ[var11] - var15 * this.verticesX[var11] >> 16; - this.verticesX[var11] = var17; - } - - var10000 = this.verticesX; - var10000[var11] += Model_transformTempX; - var10000 = this.verticesY; - var10000[var11] += Model_transformTempY; - var10000 = this.verticesZ; - var10000[var11] += Model_transformTempZ; - } - } + for (int var19 = 0; var19 < var18.length; ++var19) { + var11 = var18[var19]; + this.verticesX[var11] += var3; + this.verticesY[var11] += var4; + this.verticesZ[var11] += var5; } - - } else if (var1 == 3) { - for (var7 = 0; var7 < var6; ++var7) { - var8 = var2[var7]; - if (var8 < this.vertexLabels.length) { - var18 = this.vertexLabels[var8]; - - for (var19 = 0; var19 < var18.length; ++var19) { - var11 = var18[var19]; - var10000 = this.verticesX; - var10000[var11] -= Model_transformTempX; - var10000 = this.verticesY; - var10000[var11] -= Model_transformTempY; - var10000 = this.verticesZ; - var10000[var11] -= Model_transformTempZ; - this.verticesX[var11] = var3 * this.verticesX[var11] / 128; - this.verticesY[var11] = var4 * this.verticesY[var11] / 128; - this.verticesZ[var11] = var5 * this.verticesZ[var11] / 128; - var10000 = this.verticesX; - var10000[var11] += Model_transformTempX; - var10000 = this.verticesY; - var10000[var11] += Model_transformTempY; - var10000 = this.verticesZ; - var10000[var11] += Model_transformTempZ; - } - } - } - - } else if (var1 == 5) { - if (this.faceLabelsAlpha != null && this.faceAlphas != null) { - for (var7 = 0; var7 < var6; ++var7) { - var8 = var2[var7]; - if (var8 < this.faceLabelsAlpha.length) { - var18 = this.faceLabelsAlpha[var8]; - - for (var19 = 0; var19 < var18.length; ++var19) { - var11 = var18[var19]; - var12 = (this.faceAlphas[var11] & 255) + var3 * 8; - if (var12 < 0) { - var12 = 0; - } else if (var12 > 255) { - var12 = 255; - } - - this.faceAlphas[var11] = (byte)var12; - } - } - } - } - } + + } else if (var1 == 2) { + for (var7 = 0; var7 < var6; ++var7) { + var8 = var2[var7]; + if (var8 >= this.vertexLabels.length) { + continue; + } + int[] var18 = this.vertexLabels[var8]; + + for (int var19 = 0; var19 < var18.length; ++var19) { + var11 = var18[var19]; + this.verticesX[var11] -= Model_transformTempX; + this.verticesY[var11] -= Model_transformTempY; + this.verticesZ[var11] -= Model_transformTempZ; + var12 = (var3 & 255) * 8; + int var13 = (var4 & 255) * 8; + int var14 = (var5 & 255) * 8; + int var15; + int var16; + int var17; + if (var14 != 0) { + var15 = Model_sine[var14]; + var16 = Model_cosine[var14]; + var17 = var15 * this.verticesY[var11] + var16 * this.verticesX[var11] >> 16; + this.verticesY[var11] = var16 * this.verticesY[var11] - var15 * this.verticesX[var11] >> 16; + this.verticesX[var11] = var17; + } + + if (var12 != 0) { + var15 = Model_sine[var12]; + var16 = Model_cosine[var12]; + var17 = var16 * this.verticesY[var11] - var15 * this.verticesZ[var11] >> 16; + this.verticesZ[var11] = var15 * this.verticesY[var11] + var16 * this.verticesZ[var11] >> 16; + this.verticesY[var11] = var17; + } + + if (var13 != 0) { + var15 = Model_sine[var13]; + var16 = Model_cosine[var13]; + var17 = var15 * this.verticesZ[var11] + var16 * this.verticesX[var11] >> 16; + this.verticesZ[var11] = var16 * this.verticesZ[var11] - var15 * this.verticesX[var11] >> 16; + this.verticesX[var11] = var17; + } + + this.verticesX[var11] += Model_transformTempX; + this.verticesY[var11] += Model_transformTempY; + this.verticesZ[var11] += Model_transformTempZ; + } + } + + } else if (var1 == 3) { + for (var7 = 0; var7 < var6; ++var7) { + var8 = var2[var7]; + if (var8 < this.vertexLabels.length) { + int[] var18 = this.vertexLabels[var8]; + + for (int var19 = 0; var19 < var18.length; ++var19) { + var11 = var18[var19]; + this.verticesX[var11] -= Model_transformTempX; + this.verticesY[var11] -= Model_transformTempY; + this.verticesZ[var11] -= Model_transformTempZ; + this.verticesX[var11] = var3 * this.verticesX[var11] / 128; + this.verticesY[var11] = var4 * this.verticesY[var11] / 128; + this.verticesZ[var11] = var5 * this.verticesZ[var11] / 128; + this.verticesX[var11] += Model_transformTempX; + this.verticesY[var11] += Model_transformTempY; + this.verticesZ[var11] += Model_transformTempZ; + } + } + } + } else if (var1 == 5) { + if (this.faceLabelsAlpha == null || this.faceAlphas == null) { + return; + } + for (var7 = 0; var7 < var6; ++var7) { + var8 = var2[var7]; + if (var8 >= this.faceLabelsAlpha.length) { + continue; + } + int[] var18 = this.faceLabelsAlpha[var8]; + + for (int var19 = 0; var19 < var18.length; ++var19) { + var11 = var18[var19]; + var12 = (this.faceAlphas[var11] & 255) + var3 * 8; + if (var12 < 0) { + var12 = 0; + } else if (var12 > 255) { + var12 = 255; + } + + this.faceAlphas[var11] = (byte) var12; + } + } + } } @@ -975,12 +960,9 @@ public class Model extends Entity { @Export("offsetBy") public void offsetBy(int var1, int var2, int var3) { for (int var4 = 0; var4 < this.verticesCount; ++var4) { - int[] var10000 = this.verticesX; - var10000[var4] += var1; - var10000 = this.verticesY; - var10000[var4] += var2; - var10000 = this.verticesZ; - var10000[var4] += var3; + this.verticesX[var4] += var1; + this.verticesY[var4] += var2; + this.verticesZ[var4] += var3; } this.resetBounds(); @@ -1604,136 +1586,141 @@ public class Model extends Entity { int var12 = var2 * var7 + var3 * var11 >> 16; int var13 = var3 * this.xzRadius >> 16; int var14 = var12 + var13; - if (var14 > 50 && var12 < 3500) { - int var15 = var8 * var4 + var5 * var6 >> 16; - int var16 = (var15 - this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom; - if (var16 / var14 < Rasterizer3D.Rasterizer3D_clipMidX2) { - int var17 = (var15 + this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom; - if (var17 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidX) { - int var18 = var3 * var7 - var11 * var2 >> 16; - int var19 = var2 * this.xzRadius >> 16; - int var20 = (var18 + var19) * Rasterizer3D.Rasterizer3D_zoom; - if (var20 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidY) { - int var21 = (var3 * super.height >> 16) + var19; - int var22 = (var18 - var21) * Rasterizer3D.Rasterizer3D_zoom; - if (var22 / var14 < Rasterizer3D.Rasterizer3D_clipMidY2) { - int var23 = var13 + (var2 * super.height >> 16); - boolean var24 = false; - boolean var25 = false; - if (var12 - var23 <= 50) { - var25 = true; - } + if (var14 <= 50 || var12 >= 3500) { + return; + } + int var15 = var8 * var4 + var5 * var6 >> 16; + int var16 = (var15 - this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom; + if (var16 / var14 >= Rasterizer3D.Rasterizer3D_clipMidX2) { + return; + } + int var17 = (var15 + this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom; + if (var17 / var14 <= Rasterizer3D.Rasterizer3D_clipNegativeMidX) { + return; + } + int var18 = var3 * var7 - var11 * var2 >> 16; + int var19 = var2 * this.xzRadius >> 16; + int var20 = (var18 + var19) * Rasterizer3D.Rasterizer3D_zoom; + if (var20 / var14 <= Rasterizer3D.Rasterizer3D_clipNegativeMidY) { + return; + } + int var21 = (var3 * super.height >> 16) + var19; + int var22 = (var18 - var21) * Rasterizer3D.Rasterizer3D_zoom; + if (var22 / var14 >= Rasterizer3D.Rasterizer3D_clipMidY2) { + return; + } + int var23 = var13 + (var2 * super.height >> 16); + boolean var24 = false; + boolean var25 = false; + if (var12 - var23 <= 50) { + var25 = true; + } - boolean var26 = var25 || this.field1691 > 0; - int var27 = ViewportMouse.ViewportMouse_x; - int var29 = ViewportMouse.ViewportMouse_y; - boolean var31 = ViewportMouse.ViewportMouse_isInViewport; - boolean var34 = 0L != var9; - boolean var35; - if (var34) { - var35 = (int)(var9 >>> 16 & 1L) == 1; - var34 = !var35; - } + boolean var26 = var25 || this.field1691 > 0; + int var27 = ViewportMouse.ViewportMouse_x; + int var29 = ViewportMouse.ViewportMouse_y; + boolean var31 = ViewportMouse.ViewportMouse_isInViewport; + boolean var34 = 0L != var9; + boolean var35; + if (var34) { + var35 = (int)(var9 >>> 16 & 1L) == 1; + var34 = !var35; + } - var35 = false; - int var37; - int var38; - int var39; - if (var34 && var31) { - boolean var36 = false; - if (field1732) { - var36 = Frames.boundingBoxCheck(this, var6, var7, var8); - } else { - var37 = var12 - var13; - if (var37 <= 50) { - var37 = 50; - } + var35 = false; + int var37; + int var38; + int var39; + if (var34 && var31) { + boolean var36 = false; + if (field1732) { + var36 = Frames.boundingBoxCheck(this, var6, var7, var8); + } else { + var37 = var12 - var13; + if (var37 <= 50) { + var37 = 50; + } - if (var15 > 0) { - var16 /= var14; - var17 /= var37; - } else { - var17 /= var14; - var16 /= var37; - } + if (var15 > 0) { + var16 /= var14; + var17 /= var37; + } else { + var17 /= var14; + var16 /= var37; + } - if (var18 > 0) { - var22 /= var14; - var20 /= var37; - } else { - var20 /= var14; - var22 /= var37; - } + if (var18 > 0) { + var22 /= var14; + var20 /= var37; + } else { + var20 /= var14; + var22 /= var37; + } - var38 = var27 - Rasterizer3D.Rasterizer3D_clipMidX; - var39 = var29 - Rasterizer3D.Rasterizer3D_clipMidY; - if (var38 > var16 && var38 < var17 && var39 > var22 && var39 < var20) { - var36 = true; - } - } + var38 = var27 - Rasterizer3D.Rasterizer3D_clipMidX; + var39 = var29 - Rasterizer3D.Rasterizer3D_clipMidY; + if (var38 > var16 && var38 < var17 && var39 > var22 && var39 < var20) { + var36 = true; + } + } - if (var36) { - if (this.isSingleTile) { - ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var9; - } else { - var35 = true; - } - } - } - - int var49 = Rasterizer3D.Rasterizer3D_clipMidX; - var37 = Rasterizer3D.Rasterizer3D_clipMidY; - var38 = 0; - var39 = 0; - if (var1 != 0) { - var38 = Model_sine[var1]; - var39 = Model_cosine[var1]; - } - - for (int var40 = 0; var40 < this.verticesCount; ++var40) { - int var41 = this.verticesX[var40]; - int var42 = this.verticesY[var40]; - int var43 = this.verticesZ[var40]; - int var44; - if (var1 != 0) { - var44 = var43 * var38 + var41 * var39 >> 16; - var43 = var43 * var39 - var41 * var38 >> 16; - var41 = var44; - } - - var41 += var6; - var42 += var7; - var43 += var8; - var44 = var43 * var4 + var5 * var41 >> 16; - var43 = var5 * var43 - var41 * var4 >> 16; - var41 = var44; - var44 = var3 * var42 - var43 * var2 >> 16; - var43 = var42 * var2 + var3 * var43 >> 16; - field1714[var40] = var43 - var12; - if (var43 >= 50) { - modelViewportXs[var40] = var41 * Rasterizer3D.Rasterizer3D_zoom / var43 + var49; - modelViewportYs[var40] = var44 * Rasterizer3D.Rasterizer3D_zoom / var43 + var37; - } else { - modelViewportXs[var40] = -5000; - var24 = true; - } - - if (var26) { - field1715[var40] = var41; - field1716[var40] = var44; - field1717[var40] = var43; - } - } - - try { - this.draw0(var24, var35, this.isSingleTile, var9); - } catch (Exception var48) { - } - - } - } + if (var36) { + if (this.isSingleTile) { + ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var9; + } else { + var35 = true; } } } + + int var49 = Rasterizer3D.Rasterizer3D_clipMidX; + var37 = Rasterizer3D.Rasterizer3D_clipMidY; + var38 = 0; + var39 = 0; + if (var1 != 0) { + var38 = Model_sine[var1]; + var39 = Model_cosine[var1]; + } + + for (int var40 = 0; var40 < this.verticesCount; ++var40) { + int var41 = this.verticesX[var40]; + int var42 = this.verticesY[var40]; + int var43 = this.verticesZ[var40]; + int var44; + if (var1 != 0) { + var44 = var43 * var38 + var41 * var39 >> 16; + var43 = var43 * var39 - var41 * var38 >> 16; + var41 = var44; + } + + var41 += var6; + var42 += var7; + var43 += var8; + var44 = var43 * var4 + var5 * var41 >> 16; + var43 = var5 * var43 - var41 * var4 >> 16; + var41 = var44; + var44 = var3 * var42 - var43 * var2 >> 16; + var43 = var42 * var2 + var3 * var43 >> 16; + field1714[var40] = var43 - var12; + if (var43 >= 50) { + modelViewportXs[var40] = var41 * Rasterizer3D.Rasterizer3D_zoom / var43 + var49; + modelViewportYs[var40] = var44 * Rasterizer3D.Rasterizer3D_zoom / var43 + var37; + } else { + modelViewportXs[var40] = -5000; + var24 = true; + } + + if (var26) { + field1715[var40] = var41; + field1716[var40] = var44; + field1717[var40] = var43; + } + } + + try { + this.draw0(var24, var35, this.isSingleTile, var9); + } catch (Exception var48) { + } + } } diff --git a/runescape-client/src/main/java/ModelData.java b/runescape-client/src/main/java/ModelData.java index 1feef7bf5f..5e798e4881 100644 --- a/runescape-client/src/main/java/ModelData.java +++ b/runescape-client/src/main/java/ModelData.java @@ -1244,10 +1244,10 @@ public class ModelData extends Entity { @ObfuscatedName("y") @Export("recolor") - public void recolor(short var1, short var2) { + public void recolor(short from, short to) { for (int var3 = 0; var3 < this.faceCount; ++var3) { - if (this.faceColors[var3] == var1) { - this.faceColors[var3] = var2; + if (this.faceColors[var3] == from) { + this.faceColors[var3] = to; } } diff --git a/runescape-client/src/main/java/ObjectDefinition.java b/runescape-client/src/main/java/ObjectDefinition.java index 057af02454..450c3ad965 100644 --- a/runescape-client/src/main/java/ObjectDefinition.java +++ b/runescape-client/src/main/java/ObjectDefinition.java @@ -572,17 +572,18 @@ public class ObjectDefinition extends DualNode { signature = "(II[[IIIIB)Leo;", garbageValue = "-18" ) - public final Entity method4591(int var1, int var2, int[][] var3, int var4, int var5, int var6) { + @Export("getEntity") + public final Entity getEntity(int type, int rotation, int[][] tileHeights, int xPacked, int avgHeight, int yPacked) { long var7; if (this.field3359 == null) { - var7 = (long)(var2 + (this.id << 10)); + var7 = (long)(rotation + (this.id << 10)); } else { - var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); + var7 = (long)(rotation + (type << 3) + (this.id << 10)); } Object var9 = (Entity)ObjectDefinition_cachedEntities.get(var7); if (var9 == null) { - ModelData var10 = this.getModelData(var1, var2); + ModelData var10 = this.getModelData(type, rotation); if (var10 == null) { return null; } @@ -605,9 +606,9 @@ public class ObjectDefinition extends DualNode { if (this.clipType * 256 >= 0) { if (var9 instanceof Model) { - var9 = ((Model)var9).contourGround(var3, var4, var5, var6, true, this.clipType * 256); + var9 = ((Model)var9).contourGround(tileHeights, xPacked, avgHeight, yPacked, true, this.clipType * 256); } else if (var9 instanceof ModelData) { - var9 = ((ModelData)var9).method2776(var3, var4, var5, var6, true, this.clipType * 256); + var9 = ((ModelData)var9).method2776(tileHeights, xPacked, avgHeight, yPacked, true, this.clipType * 256); } } @@ -620,17 +621,17 @@ public class ObjectDefinition extends DualNode { garbageValue = "-1160623337" ) @Export("getModel") - public final Model getModel(int var1, int var2, int[][] var3, int var4, int var5, int var6) { + public final Model getModel(int type, int rotation, int[][] tileHeights, int xPacked, int avgHeight, int yPacked) { long var7; if (this.field3359 == null) { - var7 = (long)(var2 + (this.id << 10)); + var7 = (long)(rotation + (this.id << 10)); } else { - var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); + var7 = (long)(rotation + (type << 3) + (this.id << 10)); } Model var9 = (Model)ObjectDefinition_cachedModels.get(var7); if (var9 == null) { - ModelData var10 = this.getModelData(var1, var2); + ModelData var10 = this.getModelData(type, rotation); if (var10 == null) { return null; } @@ -640,7 +641,7 @@ public class ObjectDefinition extends DualNode { } if (this.clipType * 256 >= 0) { - var9 = var9.contourGround(var3, var4, var5, var6, true, this.clipType * 256); + var9 = var9.contourGround(tileHeights, xPacked, avgHeight, yPacked, true, this.clipType * 256); } return var9; @@ -693,13 +694,13 @@ public class ObjectDefinition extends DualNode { garbageValue = "828225621" ) @Export("getModelData") - final ModelData getModelData(int var1, int var2) { + final ModelData getModelData(int type, int rotation) { ModelData var3 = null; boolean var4; int var5; int var7; if (this.field3359 == null) { - if (var1 != 10) { + if (type != 10) { return null; } @@ -708,7 +709,7 @@ public class ObjectDefinition extends DualNode { } var4 = this.isRotated; - if (var1 == 2 && var2 > 3) { + if (type == 2 && rotation > 3) { var4 = !var4; } @@ -746,7 +747,7 @@ public class ObjectDefinition extends DualNode { int var9 = -1; for (var5 = 0; var5 < this.field3359.length; ++var5) { - if (this.field3359[var5] == var1) { + if (this.field3359[var5] == type) { var9 = var5; break; } @@ -757,7 +758,7 @@ public class ObjectDefinition extends DualNode { } var5 = this.field3362[var9]; - boolean var10 = this.isRotated ^ var2 > 3; + boolean var10 = this.isRotated ^ rotation > 3; if (var10) { var5 += 65536; } @@ -790,18 +791,18 @@ public class ObjectDefinition extends DualNode { var11 = true; } - ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, null == this.recolorFrom, this.retextureFrom == null, true); - if (var1 == 4 && var2 > 3) { + ModelData var8 = new ModelData(var3, rotation == 0 && !var4 && !var11, null == this.recolorFrom, this.retextureFrom == null, true); + if (type == 4 && rotation > 3) { var8.method2781(256); var8.method2782(45, 0, -45); } - var2 &= 3; - if (var2 == 1) { + rotation &= 3; + if (rotation == 1) { var8.method2778(); - } else if (var2 == 2) { + } else if (rotation == 2) { var8.method2797(); - } else if (var2 == 3) { + } else if (rotation == 3) { var8.method2780(); } diff --git a/runescape-client/src/main/java/Rasterizer2D.java b/runescape-client/src/main/java/Rasterizer2D.java index 89f285e36b..64b207fe5f 100644 --- a/runescape-client/src/main/java/Rasterizer2D.java +++ b/runescape-client/src/main/java/Rasterizer2D.java @@ -528,80 +528,82 @@ public class Rasterizer2D extends DualNode { signature = "(IIIIII[BIZ)V", garbageValue = "1" ) - @Export("raster2d7") - public static void raster2d7(int var0, int var1, int var2, int var3, int var4, int var5, byte[] var6, int var7) { - if (var0 + var2 >= 0 && var3 + var1 >= 0) { - if (var0 < Rasterizer2D_width && var1 < Rasterizer2D_height) { - int var8 = 0; - int var9 = 0; - if (var0 < 0) { - var8 -= var0; - var2 += var0; - } + @Export("Rasterizer2D_drawGradientPixels") + public static void Rasterizer2D_drawGradientPixels(int x, int y, int w, int h, int bgCol, int fgCol, byte[] pixels, int pxPerTile) { + if (x + w < 0 || h + y < 0) { + return; + } + if (x >= Rasterizer2D_width || y >= Rasterizer2D_height) { + return; + } + int var8 = 0; + int var9 = 0; + if (x < 0) { + var8 -= x; + w += x; + } - if (var1 < 0) { - var9 -= var1; - var3 += var1; - } + if (y < 0) { + var9 -= y; + h += y; + } - if (var0 + var2 > Rasterizer2D_width) { - var2 = Rasterizer2D_width - var0; - } + if (x + w > Rasterizer2D_width) { + w = Rasterizer2D_width - x; + } - if (var3 + var1 > Rasterizer2D_height) { - var3 = Rasterizer2D_height - var1; - } + if (h + y > Rasterizer2D_height) { + h = Rasterizer2D_height - y; + } - int var10 = var6.length / var7; - int var11 = Rasterizer2D_width - var2; - int var12 = var4 >>> 24; - int var13 = var5 >>> 24; - int var14; - int var15; - int var16; - int var17; - int var18; - if (var12 == 255 && var13 == 255) { - var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width; + int var10 = pixels.length / pxPerTile; + int var11 = Rasterizer2D_width - w; + int var12 = bgCol >>> 24; + int var13 = fgCol >>> 24; + int var14; + int var15; + int var16; + int var17; + int var18; + if (var12 == 255 && var13 == 255) { + var14 = x + var8 + (var9 + y) * Rasterizer2D_width; - for (var15 = var9 + var1; var15 < var3 + var9 + var1; ++var15) { - for (var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) { - var17 = (var15 - var1) % var10; - var18 = (var16 - var0) % var7; - if (var6[var18 + var17 * var7] != 0) { - Rasterizer2D_pixels[var14++] = var5; - } else { - Rasterizer2D_pixels[var14++] = var4; - } - } - - var14 += var11; - } - } else { - var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width; - - for (var15 = var9 + var1; var15 < var3 + var9 + var1; ++var15) { - for (var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) { - var17 = (var15 - var1) % var10; - var18 = (var16 - var0) % var7; - int var19 = var4; - if (var6[var18 + var17 * var7] != 0) { - var19 = var5; - } - - int var20 = var19 >>> 24; - int var21 = 255 - var20; - int var22 = Rasterizer2D_pixels[var14]; - int var23 = ((var19 & 0xff00ff) * var20 + (var22 & 0xff00ff) * var21 & 0xff00ff00) + (var20 * (var19 & 0xff00) + var21 * (var22 & 0xff00) & 0xff0000) >> 8; - Rasterizer2D_pixels[var14++] = var23; - } - - var14 += var11; + for (var15 = var9 + y; var15 < h + var9 + y; ++var15) { + for (var16 = x + var8; var16 < x + var8 + w; ++var16) { + var17 = (var15 - y) % var10; + var18 = (var16 - x) % pxPerTile; + if (pixels[var18 + var17 * pxPerTile] != 0) { + Rasterizer2D_pixels[var14++] = fgCol; + } else { + Rasterizer2D_pixels[var14++] = bgCol; } } + var14 += var11; + } + } else { + var14 = x + var8 + (var9 + y) * Rasterizer2D_width; + + for (var15 = var9 + y; var15 < h + var9 + y; ++var15) { + for (var16 = x + var8; var16 < x + var8 + w; ++var16) { + var17 = (var15 - y) % var10; + var18 = (var16 - x) % pxPerTile; + int var19 = bgCol; + if (pixels[var18 + var17 * pxPerTile] != 0) { + var19 = fgCol; + } + + int var20 = var19 >>> 24; + int var21 = 255 - var20; + int var22 = Rasterizer2D_pixels[var14]; + int var23 = ((var19 & 0xff00ff) * var20 + (var22 & 0xff00ff) * var21 & 0xff00ff00) + (var20 * (var19 & 0xff00) + var21 * (var22 & 0xff00) & 0xff0000) >> 8; + Rasterizer2D_pixels[var14++] = var23; + } + + var14 += var11; } } + } @ObfuscatedName("de") diff --git a/runescape-client/src/main/java/Scene.java b/runescape-client/src/main/java/Scene.java index 216d9ceeba..20f1b54cc2 100644 --- a/runescape-client/src/main/java/Scene.java +++ b/runescape-client/src/main/java/Scene.java @@ -419,26 +419,27 @@ public class Scene { ) @Export("newBoundaryObject") public void newBoundaryObject(int var1, int var2, int var3, int var4, Entity var5, Entity var6, int var7, int var8, long var9, int var11) { - if (var5 != null || var6 != null) { - BoundaryObject var12 = new BoundaryObject(); - var12.tag = var9; - var12.flags = var11; - var12.x = var2 * 128 + 64; - var12.y = var3 * 128 + 64; - var12.tileHeight = var4; - var12.entity1 = var5; - var12.entity2 = var6; - var12.orientationA = var7; - var12.orientationB = var8; - - for (int var13 = var1; var13 >= 0; --var13) { - if (this.tiles[var13][var2][var3] == null) { - this.tiles[var13][var2][var3] = new Tile(var13, var2, var3); - } - } - - this.tiles[var1][var2][var3].boundaryObject = var12; + if (var5 == null && var6 == null) { + return; } + BoundaryObject var12 = new BoundaryObject(); + var12.tag = var9; + var12.flags = var11; + var12.x = var2 * 128 + 64; + var12.y = var3 * 128 + 64; + var12.tileHeight = var4; + var12.entity1 = var5; + var12.entity2 = var6; + var12.orientationA = var7; + var12.orientationB = var8; + + for (int var13 = var1; var13 >= 0; --var13) { + if (this.tiles[var13][var2][var3] == null) { + this.tiles[var13][var2][var3] = new Tile(var13, var2, var3); + } + } + + this.tiles[var1][var2][var3].boundaryObject = var12; } @ObfuscatedName("u") @@ -447,28 +448,29 @@ public class Scene { ) @Export("newWallDecoration") public void newWallDecoration(int var1, int var2, int var3, int var4, Entity var5, Entity var6, int var7, int var8, int var9, int var10, long var11, int var13) { - if (var5 != null) { - WallDecoration var14 = new WallDecoration(); - var14.tag = var11; - var14.flags = var13; - var14.x = var2 * 128 + 64; - var14.y = var3 * 128 + 64; - var14.tileHeight = var4; - var14.entity1 = var5; - var14.entity2 = var6; - var14.orientation = var7; - var14.orientation2 = var8; - var14.xOffset = var9; - var14.yOffset = var10; - - for (int var15 = var1; var15 >= 0; --var15) { - if (this.tiles[var15][var2][var3] == null) { - this.tiles[var15][var2][var3] = new Tile(var15, var2, var3); - } - } - - this.tiles[var1][var2][var3].wallDecoration = var14; + if (var5 == null) { + return; } + WallDecoration var14 = new WallDecoration(); + var14.tag = var11; + var14.flags = var13; + var14.x = var2 * 128 + 64; + var14.y = var3 * 128 + 64; + var14.tileHeight = var4; + var14.entity1 = var5; + var14.entity2 = var6; + var14.orientation = var7; + var14.orientation2 = var8; + var14.xOffset = var9; + var14.yOffset = var10; + + for (int var15 = var1; var15 >= 0; --var15) { + if (this.tiles[var15][var2][var3] == null) { + this.tiles[var15][var2][var3] = new Tile(var15, var2, var3); + } + } + + this.tiles[var1][var2][var3].wallDecoration = var14; } @ObfuscatedName("x") diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index 6e3a8e91b8..14cc0e091c 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -538,7 +538,7 @@ public class WorldMapRegion { } else if (var11.primaryRgb == 0xff00ff) { var9 = var10; } else { - var17 = class192.method3679(var11.hue, var11.saturation, var11.lightness); + var17 = class192.WorldMap_hslToRgb(var11.hue, var11.saturation, var11.lightness); var15 = 96; if (var17 == -2) { var14 = 12345678; @@ -648,7 +648,7 @@ public class WorldMapRegion { } else if (var9.primaryRgb == 0xff00ff) { var7 = var8; } else { - var16 = class192.method3679(var9.hue, var9.saturation, var9.lightness); + var16 = class192.WorldMap_hslToRgb(var9.hue, var9.saturation, var9.lightness); var13 = 96; if (var16 == -2) { var12 = 12345678; diff --git a/runescape-client/src/main/java/class192.java b/runescape-client/src/main/java/class192.java index 4f9987e1b7..9ba2e7309d 100644 --- a/runescape-client/src/main/java/class192.java +++ b/runescape-client/src/main/java/class192.java @@ -125,7 +125,8 @@ public enum class192 implements Enumerated { signature = "(IIIB)I", garbageValue = "69" ) - static int method3679(int var0, int var1, int var2) { + @Export("WorldMap_hslToRgb") + static int WorldMap_hslToRgb(int var0, int var1, int var2) { if (var2 > 179) { var1 /= 2; } diff --git a/runescape-client/src/main/java/class40.java b/runescape-client/src/main/java/class40.java index 8fe17bae47..cd72bc66dd 100644 --- a/runescape-client/src/main/java/class40.java +++ b/runescape-client/src/main/java/class40.java @@ -42,11 +42,11 @@ public class class40 { signature = "(IIIIIIIII)V", garbageValue = "1804465340" ) - void method698(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { + void method698(int x, int y, int var3, int col, int w, int h, int var7, int var8) { if (var7 != 0 && this.pixelsPerTile != 0 && this.tileTemplates != null) { var8 = this.method699(var8, var7); var7 = this.method712(var7); - Rasterizer2D.raster2d7(var1, var2, var5, var6, var3, var4, this.tileTemplates[var7 - 1][var8], this.pixelsPerTile); + Rasterizer2D.Rasterizer2D_drawGradientPixels(x, y, w, h, var3, col, this.tileTemplates[var7 - 1][var8], this.pixelsPerTile); } }