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

rs-client: more random bits and pieces, last for today i swear

Browse Source
This commit is contained in:
Lucwousin
2019-08-03 01:10:32 +02:00
parent 5b5ee5b5a6
commit b871ebc8e4
11 changed files with 489 additions and 496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runelite-mixins/src/main/java/net/runelite/mixins/RSRasterizer2DMixin.java
View File

@@ -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) public static void rs$raster2d7(int var0, int var1, int var2, int var3, int var4, int var5, byte[] var6, int var7)
{ {
throw new RuntimeException(); 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) 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(); final int width = client.getGraphicsPixelsWidth();

8
runescape-client/src/main/java/Client.java
View File

@@ -1338,10 +1338,10 @@ public final class Client extends GameShell implements Usernamed {
instanceChunkTemplates = new int[4][13][13]; 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}; 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; field718 = 0;
field715 = 2301979; field715 = 0x23201b;
field716 = 5063219; field716 = 0x4d4233;
field720 = 3353893; field720 = 0x332d25;
field772 = 7759444; field772 = 0x766654;
field719 = false; field719 = false;
field882 = 0; field882 = 0;
camAngleX = 128; camAngleX = 128;

30
runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java
View File

@@ -144,7 +144,7 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator {
if (objectType == 22) { if (objectType == 22) {
if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) {
if (var8.animationId == -1 && var8.transforms == null) { 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 { } else {
var22 = new DynamicObject(objectID, 22, rotation, plane, x, y, var8.animationId, true, (Entity)null); 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) { } else if (objectType == 10 || objectType == 11) {
if (var8.animationId == -1 && var8.transforms == null) { 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 { } else {
var22 = new DynamicObject(objectID, 10, rotation, plane, x, y, var8.animationId, true, (Entity) null); 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) { } else if (objectType >= 12) {
if (var8.animationId == -1 && var8.transforms == null) { 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 { } else {
var22 = new DynamicObject(objectID, objectType, rotation, plane, x, y, var8.animationId, true, (Entity) null); 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) { } else if (objectType == 0) {
if (var8.animationId == -1 && var8.transforms == null) { 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 { } else {
var22 = new DynamicObject(objectID, 0, rotation, plane, x, y, var8.animationId, true, (Entity) null); 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) { } else if (objectType == 1) {
if (var8.animationId == -1 && var8.transforms == null) { 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 { } else {
var22 = new DynamicObject(objectID, 1, rotation, plane, x, y, var8.animationId, true, (Entity) null); 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 var29;
Object var30; Object var30;
if (var8.animationId == -1 && var8.transforms == null) { if (var8.animationId == -1 && var8.transforms == null) {
var29 = var8.method4591(2, rotation + 4, var15, var17, var16, var18); var29 = var8.getEntity(2, rotation + 4, var15, var17, var16, var18);
var30 = var8.method4591(2, var28, var15, var17, var16, var18); var30 = var8.getEntity(2, var28, var15, var17, var16, var18);
} else { } else {
var29 = new DynamicObject(objectID, 2, rotation + 4, plane, x, y, var8.animationId, true, (Entity) null); 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); 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) { } else if (objectType == 3) {
if (var8.animationId == -1 && var8.transforms == null) { 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 { } else {
var22 = new DynamicObject(objectID, 3, rotation, plane, x, y, var8.animationId, true, (Entity) null); 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) { } else if (objectType == 9) {
if (var8.animationId == -1 && var8.transforms == null) { 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 { } else {
var22 = new DynamicObject(objectID, objectType, rotation, plane, x, y, var8.animationId, true, (Entity) null); 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) { } else if (objectType == 4) {
if (var8.animationId == -1 && var8.transforms == null) { 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 { } else {
var22 = new DynamicObject(objectID, 4, rotation, plane, x, y, var8.animationId, true, (Entity) null); 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) { 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 { } else {
var33 = new DynamicObject(objectID, 4, rotation, plane, x, y, var8.animationId, true, (Entity) null); 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) { 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 { } else {
var33 = new DynamicObject(objectID, 4, rotation + 4, plane, x, y, var8.animationId, true, (Entity) null); 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) { } else if (objectType == 7) {
int var23 = rotation + 2 & 3; int var23 = rotation + 2 & 3;
if (var8.animationId == -1 && var8.transforms == null) { 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 { } else {
var22 = new DynamicObject(objectID, 4, var23 + 4, plane, x, y, var8.animationId, true, (Entity) null); 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 var26;
Object var33; Object var33;
if (var8.animationId == -1 && var8.transforms == null) { 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);
var26 = var8.method4591(4, var27 + 4, var15, var17, var16, var18); var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18);
} else { } else {
var33 = new DynamicObject(objectID, 4, rotation + 4, plane, x, y, var8.animationId, true, (Entity) null); 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); var26 = new DynamicObject(objectID, 4, var27 + 4, plane, x, y, var8.animationId, true, (Entity) null);

141
runescape-client/src/main/java/Model.java
View File

@@ -374,7 +374,9 @@ public class Model extends Entity {
int var8 = var2 + this.xzRadius; int var8 = var2 + this.xzRadius;
int var9 = var4 - this.xzRadius; int var9 = var4 - this.xzRadius;
int var10 = var4 + this.xzRadius; int var10 = var4 + this.xzRadius;
if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { if (var7 < 0 || var8 + 128 >> 7 >= var1.length || var9 < 0 || var10 + 128 >> 7 >= var1[0].length) {
return this;
}
var7 >>= 7; var7 >>= 7;
var8 = var8 + 127 >> 7; var8 = var8 + 127 >> 7;
var9 >>= 7; var9 >>= 7;
@@ -438,7 +440,9 @@ public class Model extends Entity {
} else { } else {
for (var12 = 0; var12 < var11.verticesCount; ++var12) { for (var12 = 0; var12 < var11.verticesCount; ++var12) {
var13 = (-this.verticesY[var12] << 16) / super.height; var13 = (-this.verticesY[var12] << 16) / super.height;
if (var13 < var6) { if (var13 >= var6) {
continue;
}
var14 = var2 + this.verticesX[var12]; var14 = var2 + this.verticesX[var12];
var15 = var4 + this.verticesZ[var12]; var15 = var4 + this.verticesZ[var12];
var16 = var14 & 127; var16 = var14 & 127;
@@ -451,13 +455,10 @@ public class Model extends Entity {
var11.verticesY[var12] = (var6 - var13) * (var22 - var3) / var6 + this.verticesY[var12]; var11.verticesY[var12] = (var6 - var13) * (var22 - var3) / var6 + this.verticesY[var12];
} }
} }
}
var11.resetBounds(); var11.resetBounds();
return var11; return var11;
} }
return this;
}
@ObfuscatedName("w") @ObfuscatedName("w")
@ObfuscatedSignature( @ObfuscatedSignature(
@@ -769,7 +770,9 @@ public class Model extends Entity {
for (var8 = 0; var8 < var6; ++var8) { for (var8 = 0; var8 < var6; ++var8) {
int var9 = var2[var8]; int var9 = var2[var8];
if (var9 < this.vertexLabels.length) { if (var9 >= this.vertexLabels.length) {
continue;
}
int[] var10 = this.vertexLabels[var9]; int[] var10 = this.vertexLabels[var9];
for (var11 = 0; var11 < var10.length; ++var11) { for (var11 = 0; var11 < var10.length; ++var11) {
@@ -780,7 +783,6 @@ public class Model extends Entity {
++var7; ++var7;
} }
} }
}
if (var7 > 0) { if (var7 > 0) {
Model_transformTempX = var3 + Model_transformTempX / var7; Model_transformTempX = var3 + Model_transformTempX / var7;
@@ -792,42 +794,35 @@ public class Model extends Entity {
Model_transformTempZ = var5; Model_transformTempZ = var5;
} }
} else { } else if (var1 == 1) {
int[] var10000;
int[] var18;
int var19;
if (var1 == 1) {
for (var7 = 0; var7 < var6; ++var7) { for (var7 = 0; var7 < var6; ++var7) {
var8 = var2[var7]; var8 = var2[var7];
if (var8 < this.vertexLabels.length) { if (var8 >= this.vertexLabels.length) {
var18 = this.vertexLabels[var8]; continue;
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;
} }
int[] var18 = this.vertexLabels[var8];
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 == 2) { } else if (var1 == 2) {
for (var7 = 0; var7 < var6; ++var7) { for (var7 = 0; var7 < var6; ++var7) {
var8 = var2[var7]; var8 = var2[var7];
if (var8 < this.vertexLabels.length) { if (var8 >= this.vertexLabels.length) {
var18 = this.vertexLabels[var8]; continue;
}
int[] var18 = this.vertexLabels[var8];
for (var19 = 0; var19 < var18.length; ++var19) { for (int var19 = 0; var19 < var18.length; ++var19) {
var11 = var18[var19]; var11 = var18[var19];
var10000 = this.verticesX; this.verticesX[var11] -= Model_transformTempX;
var10000[var11] -= Model_transformTempX; this.verticesY[var11] -= Model_transformTempY;
var10000 = this.verticesY; this.verticesZ[var11] -= Model_transformTempZ;
var10000[var11] -= Model_transformTempY;
var10000 = this.verticesZ;
var10000[var11] -= Model_transformTempZ;
var12 = (var3 & 255) * 8; var12 = (var3 & 255) * 8;
int var13 = (var4 & 255) * 8; int var13 = (var4 & 255) * 8;
int var14 = (var5 & 255) * 8; int var14 = (var5 & 255) * 8;
@@ -858,13 +853,9 @@ public class Model extends Entity {
this.verticesX[var11] = var17; this.verticesX[var11] = var17;
} }
var10000 = this.verticesX; this.verticesX[var11] += Model_transformTempX;
var10000[var11] += Model_transformTempX; this.verticesY[var11] += Model_transformTempY;
var10000 = this.verticesY; this.verticesZ[var11] += Model_transformTempZ;
var10000[var11] += Model_transformTempY;
var10000 = this.verticesZ;
var10000[var11] += Model_transformTempZ;
}
} }
} }
@@ -872,37 +863,34 @@ public class Model extends Entity {
for (var7 = 0; var7 < var6; ++var7) { for (var7 = 0; var7 < var6; ++var7) {
var8 = var2[var7]; var8 = var2[var7];
if (var8 < this.vertexLabels.length) { if (var8 < this.vertexLabels.length) {
var18 = this.vertexLabels[var8]; int[] var18 = this.vertexLabels[var8];
for (var19 = 0; var19 < var18.length; ++var19) { for (int var19 = 0; var19 < var18.length; ++var19) {
var11 = var18[var19]; var11 = var18[var19];
var10000 = this.verticesX; this.verticesX[var11] -= Model_transformTempX;
var10000[var11] -= Model_transformTempX; this.verticesY[var11] -= Model_transformTempY;
var10000 = this.verticesY; this.verticesZ[var11] -= Model_transformTempZ;
var10000[var11] -= Model_transformTempY;
var10000 = this.verticesZ;
var10000[var11] -= Model_transformTempZ;
this.verticesX[var11] = var3 * this.verticesX[var11] / 128; this.verticesX[var11] = var3 * this.verticesX[var11] / 128;
this.verticesY[var11] = var4 * this.verticesY[var11] / 128; this.verticesY[var11] = var4 * this.verticesY[var11] / 128;
this.verticesZ[var11] = var5 * this.verticesZ[var11] / 128; this.verticesZ[var11] = var5 * this.verticesZ[var11] / 128;
var10000 = this.verticesX; this.verticesX[var11] += Model_transformTempX;
var10000[var11] += Model_transformTempX; this.verticesY[var11] += Model_transformTempY;
var10000 = this.verticesY; this.verticesZ[var11] += Model_transformTempZ;
var10000[var11] += Model_transformTempY;
var10000 = this.verticesZ;
var10000[var11] += Model_transformTempZ;
} }
} }
} }
} else if (var1 == 5) { } else if (var1 == 5) {
if (this.faceLabelsAlpha != null && this.faceAlphas != null) { if (this.faceLabelsAlpha == null || this.faceAlphas == null) {
return;
}
for (var7 = 0; var7 < var6; ++var7) { for (var7 = 0; var7 < var6; ++var7) {
var8 = var2[var7]; var8 = var2[var7];
if (var8 < this.faceLabelsAlpha.length) { if (var8 >= this.faceLabelsAlpha.length) {
var18 = this.faceLabelsAlpha[var8]; continue;
}
int[] var18 = this.faceLabelsAlpha[var8];
for (var19 = 0; var19 < var18.length; ++var19) { for (int var19 = 0; var19 < var18.length; ++var19) {
var11 = var18[var19]; var11 = var18[var19];
var12 = (this.faceAlphas[var11] & 255) + var3 * 8; var12 = (this.faceAlphas[var11] & 255) + var3 * 8;
if (var12 < 0) { if (var12 < 0) {
@@ -914,12 +902,9 @@ public class Model extends Entity {
this.faceAlphas[var11] = (byte) var12; this.faceAlphas[var11] = (byte) var12;
} }
} }
}
}
} }
} }
}
@ObfuscatedName("y") @ObfuscatedName("y")
@Export("rotateY90Ccw") @Export("rotateY90Ccw")
@@ -975,12 +960,9 @@ public class Model extends Entity {
@Export("offsetBy") @Export("offsetBy")
public void offsetBy(int var1, int var2, int var3) { public void offsetBy(int var1, int var2, int var3) {
for (int var4 = 0; var4 < this.verticesCount; ++var4) { for (int var4 = 0; var4 < this.verticesCount; ++var4) {
int[] var10000 = this.verticesX; this.verticesX[var4] += var1;
var10000[var4] += var1; this.verticesY[var4] += var2;
var10000 = this.verticesY; this.verticesZ[var4] += var3;
var10000[var4] += var2;
var10000 = this.verticesZ;
var10000[var4] += var3;
} }
this.resetBounds(); this.resetBounds();
@@ -1604,19 +1586,29 @@ public class Model extends Entity {
int var12 = var2 * var7 + var3 * var11 >> 16; int var12 = var2 * var7 + var3 * var11 >> 16;
int var13 = var3 * this.xzRadius >> 16; int var13 = var3 * this.xzRadius >> 16;
int var14 = var12 + var13; int var14 = var12 + var13;
if (var14 > 50 && var12 < 3500) { if (var14 <= 50 || var12 >= 3500) {
return;
}
int var15 = var8 * var4 + var5 * var6 >> 16; int var15 = var8 * var4 + var5 * var6 >> 16;
int var16 = (var15 - this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom; int var16 = (var15 - this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom;
if (var16 / var14 < Rasterizer3D.Rasterizer3D_clipMidX2) { if (var16 / var14 >= Rasterizer3D.Rasterizer3D_clipMidX2) {
return;
}
int var17 = (var15 + this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom; int var17 = (var15 + this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom;
if (var17 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidX) { if (var17 / var14 <= Rasterizer3D.Rasterizer3D_clipNegativeMidX) {
return;
}
int var18 = var3 * var7 - var11 * var2 >> 16; int var18 = var3 * var7 - var11 * var2 >> 16;
int var19 = var2 * this.xzRadius >> 16; int var19 = var2 * this.xzRadius >> 16;
int var20 = (var18 + var19) * Rasterizer3D.Rasterizer3D_zoom; int var20 = (var18 + var19) * Rasterizer3D.Rasterizer3D_zoom;
if (var20 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidY) { if (var20 / var14 <= Rasterizer3D.Rasterizer3D_clipNegativeMidY) {
return;
}
int var21 = (var3 * super.height >> 16) + var19; int var21 = (var3 * super.height >> 16) + var19;
int var22 = (var18 - var21) * Rasterizer3D.Rasterizer3D_zoom; int var22 = (var18 - var21) * Rasterizer3D.Rasterizer3D_zoom;
if (var22 / var14 < Rasterizer3D.Rasterizer3D_clipMidY2) { if (var22 / var14 >= Rasterizer3D.Rasterizer3D_clipMidY2) {
return;
}
int var23 = var13 + (var2 * super.height >> 16); int var23 = var13 + (var2 * super.height >> 16);
boolean var24 = false; boolean var24 = false;
boolean var25 = false; boolean var25 = false;
@@ -1732,8 +1724,3 @@ public class Model extends Entity {
} }
} }
}
}
}
}
}

6
runescape-client/src/main/java/ModelData.java
View File

@@ -1244,10 +1244,10 @@ public class ModelData extends Entity {
@ObfuscatedName("y") @ObfuscatedName("y")
@Export("recolor") @Export("recolor")
public void recolor(short var1, short var2) { public void recolor(short from, short to) {
for (int var3 = 0; var3 < this.faceCount; ++var3) { for (int var3 = 0; var3 < this.faceCount; ++var3) {
if (this.faceColors[var3] == var1) { if (this.faceColors[var3] == from) {
this.faceColors[var3] = var2; this.faceColors[var3] = to;
} }
} }

45
runescape-client/src/main/java/ObjectDefinition.java
View File

@@ -572,17 +572,18 @@ public class ObjectDefinition extends DualNode {
signature = "(II[[IIIIB)Leo;", signature = "(II[[IIIIB)Leo;",
garbageValue = "-18" 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; long var7;
if (this.field3359 == null) { if (this.field3359 == null) {
var7 = (long)(var2 + (this.id << 10)); var7 = (long)(rotation + (this.id << 10));
} else { } else {
var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); var7 = (long)(rotation + (type << 3) + (this.id << 10));
} }
Object var9 = (Entity)ObjectDefinition_cachedEntities.get(var7); Object var9 = (Entity)ObjectDefinition_cachedEntities.get(var7);
if (var9 == null) { if (var9 == null) {
ModelData var10 = this.getModelData(var1, var2); ModelData var10 = this.getModelData(type, rotation);
if (var10 == null) { if (var10 == null) {
return null; return null;
} }
@@ -605,9 +606,9 @@ public class ObjectDefinition extends DualNode {
if (this.clipType * 256 >= 0) { if (this.clipType * 256 >= 0) {
if (var9 instanceof Model) { 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) { } 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" garbageValue = "-1160623337"
) )
@Export("getModel") @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; long var7;
if (this.field3359 == null) { if (this.field3359 == null) {
var7 = (long)(var2 + (this.id << 10)); var7 = (long)(rotation + (this.id << 10));
} else { } else {
var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); var7 = (long)(rotation + (type << 3) + (this.id << 10));
} }
Model var9 = (Model)ObjectDefinition_cachedModels.get(var7); Model var9 = (Model)ObjectDefinition_cachedModels.get(var7);
if (var9 == null) { if (var9 == null) {
ModelData var10 = this.getModelData(var1, var2); ModelData var10 = this.getModelData(type, rotation);
if (var10 == null) { if (var10 == null) {
return null; return null;
} }
@@ -640,7 +641,7 @@ public class ObjectDefinition extends DualNode {
} }
if (this.clipType * 256 >= 0) { 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; return var9;
@@ -693,13 +694,13 @@ public class ObjectDefinition extends DualNode {
garbageValue = "828225621" garbageValue = "828225621"
) )
@Export("getModelData") @Export("getModelData")
final ModelData getModelData(int var1, int var2) { final ModelData getModelData(int type, int rotation) {
ModelData var3 = null; ModelData var3 = null;
boolean var4; boolean var4;
int var5; int var5;
int var7; int var7;
if (this.field3359 == null) { if (this.field3359 == null) {
if (var1 != 10) { if (type != 10) {
return null; return null;
} }
@@ -708,7 +709,7 @@ public class ObjectDefinition extends DualNode {
} }
var4 = this.isRotated; var4 = this.isRotated;
if (var1 == 2 && var2 > 3) { if (type == 2 && rotation > 3) {
var4 = !var4; var4 = !var4;
} }
@@ -746,7 +747,7 @@ public class ObjectDefinition extends DualNode {
int var9 = -1; int var9 = -1;
for (var5 = 0; var5 < this.field3359.length; ++var5) { for (var5 = 0; var5 < this.field3359.length; ++var5) {
if (this.field3359[var5] == var1) { if (this.field3359[var5] == type) {
var9 = var5; var9 = var5;
break; break;
} }
@@ -757,7 +758,7 @@ public class ObjectDefinition extends DualNode {
} }
var5 = this.field3362[var9]; var5 = this.field3362[var9];
boolean var10 = this.isRotated ^ var2 > 3; boolean var10 = this.isRotated ^ rotation > 3;
if (var10) { if (var10) {
var5 += 65536; var5 += 65536;
} }
@@ -790,18 +791,18 @@ public class ObjectDefinition extends DualNode {
var11 = true; var11 = true;
} }
ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, null == this.recolorFrom, this.retextureFrom == null, true); ModelData var8 = new ModelData(var3, rotation == 0 && !var4 && !var11, null == this.recolorFrom, this.retextureFrom == null, true);
if (var1 == 4 && var2 > 3) { if (type == 4 && rotation > 3) {
var8.method2781(256); var8.method2781(256);
var8.method2782(45, 0, -45); var8.method2782(45, 0, -45);
} }
var2 &= 3; rotation &= 3;
if (var2 == 1) { if (rotation == 1) {
var8.method2778(); var8.method2778();
} else if (var2 == 2) { } else if (rotation == 2) {
var8.method2797(); var8.method2797();
} else if (var2 == 3) { } else if (rotation == 3) {
var8.method2780(); var8.method2780();
} }

74
runescape-client/src/main/java/Rasterizer2D.java
View File

@@ -528,65 +528,69 @@ public class Rasterizer2D extends DualNode {
signature = "(IIIIII[BIZ)V", signature = "(IIIIII[BIZ)V",
garbageValue = "1" garbageValue = "1"
) )
@Export("raster2d7") @Export("Rasterizer2D_drawGradientPixels")
public static void raster2d7(int var0, int var1, int var2, int var3, int var4, int var5, byte[] var6, int var7) { public static void Rasterizer2D_drawGradientPixels(int x, int y, int w, int h, int bgCol, int fgCol, byte[] pixels, int pxPerTile) {
if (var0 + var2 >= 0 && var3 + var1 >= 0) { if (x + w < 0 || h + y < 0) {
if (var0 < Rasterizer2D_width && var1 < Rasterizer2D_height) { return;
}
if (x >= Rasterizer2D_width || y >= Rasterizer2D_height) {
return;
}
int var8 = 0; int var8 = 0;
int var9 = 0; int var9 = 0;
if (var0 < 0) { if (x < 0) {
var8 -= var0; var8 -= x;
var2 += var0; w += x;
} }
if (var1 < 0) { if (y < 0) {
var9 -= var1; var9 -= y;
var3 += var1; h += y;
} }
if (var0 + var2 > Rasterizer2D_width) { if (x + w > Rasterizer2D_width) {
var2 = Rasterizer2D_width - var0; w = Rasterizer2D_width - x;
} }
if (var3 + var1 > Rasterizer2D_height) { if (h + y > Rasterizer2D_height) {
var3 = Rasterizer2D_height - var1; h = Rasterizer2D_height - y;
} }
int var10 = var6.length / var7; int var10 = pixels.length / pxPerTile;
int var11 = Rasterizer2D_width - var2; int var11 = Rasterizer2D_width - w;
int var12 = var4 >>> 24; int var12 = bgCol >>> 24;
int var13 = var5 >>> 24; int var13 = fgCol >>> 24;
int var14; int var14;
int var15; int var15;
int var16; int var16;
int var17; int var17;
int var18; int var18;
if (var12 == 255 && var13 == 255) { if (var12 == 255 && var13 == 255) {
var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width; var14 = x + var8 + (var9 + y) * Rasterizer2D_width;
for (var15 = var9 + var1; var15 < var3 + var9 + var1; ++var15) { for (var15 = var9 + y; var15 < h + var9 + y; ++var15) {
for (var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) { for (var16 = x + var8; var16 < x + var8 + w; ++var16) {
var17 = (var15 - var1) % var10; var17 = (var15 - y) % var10;
var18 = (var16 - var0) % var7; var18 = (var16 - x) % pxPerTile;
if (var6[var18 + var17 * var7] != 0) { if (pixels[var18 + var17 * pxPerTile] != 0) {
Rasterizer2D_pixels[var14++] = var5; Rasterizer2D_pixels[var14++] = fgCol;
} else { } else {
Rasterizer2D_pixels[var14++] = var4; Rasterizer2D_pixels[var14++] = bgCol;
} }
} }
var14 += var11; var14 += var11;
} }
} else { } else {
var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width; var14 = x + var8 + (var9 + y) * Rasterizer2D_width;
for (var15 = var9 + var1; var15 < var3 + var9 + var1; ++var15) { for (var15 = var9 + y; var15 < h + var9 + y; ++var15) {
for (var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) { for (var16 = x + var8; var16 < x + var8 + w; ++var16) {
var17 = (var15 - var1) % var10; var17 = (var15 - y) % var10;
var18 = (var16 - var0) % var7; var18 = (var16 - x) % pxPerTile;
int var19 = var4; int var19 = bgCol;
if (var6[var18 + var17 * var7] != 0) { if (pixels[var18 + var17 * pxPerTile] != 0) {
var19 = var5; var19 = fgCol;
} }
int var20 = var19 >>> 24; int var20 = var19 >>> 24;
@@ -601,8 +605,6 @@ public class Rasterizer2D extends DualNode {
} }
} }
}
}
@ObfuscatedName("de") @ObfuscatedName("de")
@Export("Rasterizer2D_drawRectangle") @Export("Rasterizer2D_drawRectangle")

10
runescape-client/src/main/java/Scene.java
View File

@@ -419,7 +419,9 @@ public class Scene {
) )
@Export("newBoundaryObject") @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) { 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) { if (var5 == null && var6 == null) {
return;
}
BoundaryObject var12 = new BoundaryObject(); BoundaryObject var12 = new BoundaryObject();
var12.tag = var9; var12.tag = var9;
var12.flags = var11; var12.flags = var11;
@@ -439,7 +441,6 @@ public class Scene {
this.tiles[var1][var2][var3].boundaryObject = var12; this.tiles[var1][var2][var3].boundaryObject = var12;
} }
}
@ObfuscatedName("u") @ObfuscatedName("u")
@ObfuscatedSignature( @ObfuscatedSignature(
@@ -447,7 +448,9 @@ public class Scene {
) )
@Export("newWallDecoration") @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) { 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) { if (var5 == null) {
return;
}
WallDecoration var14 = new WallDecoration(); WallDecoration var14 = new WallDecoration();
var14.tag = var11; var14.tag = var11;
var14.flags = var13; var14.flags = var13;
@@ -469,7 +472,6 @@ public class Scene {
this.tiles[var1][var2][var3].wallDecoration = var14; this.tiles[var1][var2][var3].wallDecoration = var14;
} }
}
@ObfuscatedName("x") @ObfuscatedName("x")
@ObfuscatedSignature( @ObfuscatedSignature(

4
runescape-client/src/main/java/WorldMapRegion.java
View File

@@ -538,7 +538,7 @@ public class WorldMapRegion {
} else if (var11.primaryRgb == 0xff00ff) { } else if (var11.primaryRgb == 0xff00ff) {
var9 = var10; var9 = var10;
} else { } else {
var17 = class192.method3679(var11.hue, var11.saturation, var11.lightness); var17 = class192.WorldMap_hslToRgb(var11.hue, var11.saturation, var11.lightness);
var15 = 96; var15 = 96;
if (var17 == -2) { if (var17 == -2) {
var14 = 12345678; var14 = 12345678;
@@ -648,7 +648,7 @@ public class WorldMapRegion {
} else if (var9.primaryRgb == 0xff00ff) { } else if (var9.primaryRgb == 0xff00ff) {
var7 = var8; var7 = var8;
} else { } else {
var16 = class192.method3679(var9.hue, var9.saturation, var9.lightness); var16 = class192.WorldMap_hslToRgb(var9.hue, var9.saturation, var9.lightness);
var13 = 96; var13 = 96;
if (var16 == -2) { if (var16 == -2) {
var12 = 12345678; var12 = 12345678;

3
runescape-client/src/main/java/class192.java
View File

@@ -125,7 +125,8 @@ public enum class192 implements Enumerated {
signature = "(IIIB)I", signature = "(IIIB)I",
garbageValue = "69" 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) { if (var2 > 179) {
var1 /= 2; var1 /= 2;
} }

4
runescape-client/src/main/java/class40.java
View File

@@ -42,11 +42,11 @@ public class class40 {
signature = "(IIIIIIIII)V", signature = "(IIIIIIIII)V",
garbageValue = "1804465340" 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) { if (var7 != 0 && this.pixelsPerTile != 0 && this.tileTemplates != null) {
var8 = this.method699(var8, var7); var8 = this.method699(var8, var7);
var7 = this.method712(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);
} }
} }