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

rs-client: add missing exports

Browse Source
This commit is contained in:
Lucwousin
2019-08-04 00:42:53 +02:00
parent b871ebc8e4
commit dea63ba878
8 changed files with 242 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -734,7 +734,7 @@ public class Decimator {
var85.drawTransAt(var56 + var65 - var29, var66, var73); var85.drawTransAt(var56 + var65 - var29, var66, var73);
} }
var86.drawAlpha(var45, var55 + var65, var69, var95.field3333, 0, var73); var86.drawAlpha(var45, var55 + var65, var69, var95.textColor, 0, var73);
if (var81 != null) { if (var81 != null) {
if (var30 != null) { if (var30 != null) {
var30.drawTransAt(var65 + var57 - var38, var66, var73); var30.drawTransAt(var65 + var57 - var38, var66, var73);
@@ -754,7 +754,7 @@ public class Decimator {
var33.drawTransAt(var60 + var65 - var41, var66, var73); var33.drawTransAt(var60 + var65 - var41, var66, var73);
} }
var44.drawAlpha(var46, var65 + var61, var72, var81.field3333, 0, var73); var44.drawAlpha(var46, var65 + var61, var72, var81.textColor, 0, var73);
} }
} else { } else {
if (var82 != null) { if (var82 != null) {
@@ -775,7 +775,7 @@ public class Decimator {
var85.drawTransBgAt(var65 + var56 - var29, var66); var85.drawTransBgAt(var65 + var56 - var29, var66);
} }
var86.draw(var45, var65 + var55, var69, var95.field3333 | 0xff000000, 0); var86.draw(var45, var65 + var55, var69, var95.textColor | 0xff000000, 0);
if (var81 == null) { if (var81 == null) {
continue; continue;
} }
@@ -797,7 +797,7 @@ public class Decimator {
var33.drawTransBgAt(var60 + var65 - var41, var66); var33.drawTransBgAt(var60 + var65 - var41, var66);
} }
var44.draw(var46, var61 + var65, var72, var81.field3333 | 0xff000000, 0); var44.draw(var46, var61 + var65, var72, var81.textColor | 0xff000000, 0);
} }
} }

1
runescape-client/src/main/java/DynamicObject.java
View File

@@ -9,6 +9,7 @@ import net.runelite.mapping.ObfuscatedSignature;
@Implements("DynamicObject") @Implements("DynamicObject")
public class DynamicObject extends Entity { public class DynamicObject extends Entity {
@ObfuscatedName("x") @ObfuscatedName("x")
@Export("Tiles_hueMultiplier")
static int[] Tiles_hueMultiplier; static int[] Tiles_hueMultiplier;
@ObfuscatedName("q") @ObfuscatedName("q")
@ObfuscatedGetter( @ObfuscatedGetter(

1
runescape-client/src/main/java/GameShell.java
View File

@@ -68,6 +68,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = 369880599 intValue = 369880599
) )
@Export("fiveOrOne")
static int fiveOrOne; static int fiveOrOne;
@ObfuscatedName("m") @ObfuscatedName("m")
@ObfuscatedGetter( @ObfuscatedGetter(

7
runescape-client/src/main/java/HitSplatDefinition.java
View File

@@ -55,7 +55,8 @@ public class HitSplatDefinition extends DualNode {
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = -1445466235 intValue = -1445466235
) )
public int field3333; @Export("textColor")
public int textColor;
@ObfuscatedName("r") @ObfuscatedName("r")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = -1814689987 intValue = -1814689987
@@ -132,7 +133,7 @@ public class HitSplatDefinition extends DualNode {
HitSplatDefinition() { HitSplatDefinition() {
this.fontId = -1; this.fontId = -1;
this.field3333 = 0xffffff; this.textColor = 0xffffff;
this.field3344 = 70; this.field3344 = 70;
this.field3334 = -1; this.field3334 = -1;
this.field3336 = -1; this.field3336 = -1;
@@ -175,7 +176,7 @@ public class HitSplatDefinition extends DualNode {
if (var2 == 1) { if (var2 == 1) {
this.fontId = var1.method5511(); this.fontId = var1.method5511();
} else if (var2 == 2) { } else if (var2 == 2) {
this.field3333 = var1.readMedium(); this.textColor = var1.readMedium();
} else if (var2 == 3) { } else if (var2 == 3) {
this.field3334 = var1.method5511(); this.field3334 = var1.method5511();
} else if (var2 == 4) { } else if (var2 == 4) {

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

@@ -839,38 +839,39 @@ public class Scene {
for (int var5 = 0; var5 < this.xSize; ++var5) { for (int var5 = 0; var5 < this.xSize; ++var5) {
for (int var6 = 0; var6 < this.ySize; ++var6) { for (int var6 = 0; var6 < this.ySize; ++var6) {
Tile var7 = this.tiles[var4][var5][var6]; Tile var7 = this.tiles[var4][var5][var6];
if (var7 != null) { if (var7 == null) {
BoundaryObject var8 = var7.boundaryObject; continue;
ModelData var10; }
if (var8 != null && var8.entity1 instanceof ModelData) { BoundaryObject var8 = var7.boundaryObject;
ModelData var9 = (ModelData)var8.entity1; ModelData var10;
this.method3099(var9, var4, var5, var6, 1, 1); if (var8 != null && var8.entity1 instanceof ModelData) {
if (var8.entity2 instanceof ModelData) { ModelData var9 = (ModelData)var8.entity1;
var10 = (ModelData)var8.entity2; this.method3099(var9, var4, var5, var6, 1, 1);
this.method3099(var10, var4, var5, var6, 1, 1); if (var8.entity2 instanceof ModelData) {
ModelData.method2790(var9, var10, 0, 0, 0, false); var10 = (ModelData)var8.entity2;
var8.entity2 = var10.toModel(var10.field1580, var10.field1577, var1, var2, var3); this.method3099(var10, var4, var5, var6, 1, 1);
} ModelData.method2790(var9, var10, 0, 0, 0, false);
var8.entity2 = var10.toModel(var10.field1580, var10.field1577, var1, var2, var3);
var8.entity1 = var9.toModel(var9.field1580, var9.field1577, var1, var2, var3);
} }
for (int var12 = 0; var12 < var7.gameObjectsCount; ++var12) { var8.entity1 = var9.toModel(var9.field1580, var9.field1577, var1, var2, var3);
GameObject var14 = var7.gameObjects[var12]; }
if (var14 != null && var14.entity instanceof ModelData) {
ModelData var11 = (ModelData)var14.entity;
this.method3099(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1);
var14.entity = var11.toModel(var11.field1580, var11.field1577, var1, var2, var3);
}
}
FloorDecoration var13 = var7.floorDecoration; for (int var12 = 0; var12 < var7.gameObjectsCount; ++var12) {
if (var13 != null && var13.entity instanceof ModelData) { GameObject var14 = var7.gameObjects[var12];
var10 = (ModelData)var13.entity; if (var14 != null && var14.entity instanceof ModelData) {
this.method3120(var10, var4, var5, var6); ModelData var11 = (ModelData)var14.entity;
var13.entity = var10.toModel(var10.field1580, var10.field1577, var1, var2, var3); this.method3099(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1);
var14.entity = var11.toModel(var11.field1580, var11.field1577, var1, var2, var3);
} }
} }
FloorDecoration var13 = var7.floorDecoration;
if (var13 != null && var13.entity instanceof ModelData) {
var10 = (ModelData)var13.entity;
this.method3120(var10, var4, var5, var6);
var13.entity = var10.toModel(var10.field1580, var10.field1577, var1, var2, var3);
}
} }
} }
} }
@@ -930,46 +931,50 @@ public class Scene {
int var11 = var4 + var6; int var11 = var4 + var6;
for (int var12 = var2; var12 <= var2 + 1; ++var12) { for (int var12 = var2; var12 <= var2 + 1; ++var12) {
if (var12 != this.planes) { if (var12 == this.planes) {
for (int var13 = var8; var13 <= var9; ++var13) { continue;
if (var13 >= 0 && var13 < this.xSize) { }
for (int var14 = var10; var14 <= var11; ++var14) { for (int var13 = var8; var13 <= var9; ++var13) {
if (var14 >= 0 && var14 < this.ySize && (!var7 || var13 >= var9 || var14 >= var11 || var14 < var4 && var3 != var13)) { if (var13 < 0 || var13 >= this.xSize) {
Tile var15 = this.tiles[var12][var13][var14]; continue;
if (var15 != null) { }
int var16 = (this.tileHeights[var12][var13 + 1][var14] + this.tileHeights[var12][var13 + 1][var14 + 1] + this.tileHeights[var12][var13][var14] + this.tileHeights[var12][var13][var14 + 1]) / 4 - (this.tileHeights[var2][var3 + 1][var4] + this.tileHeights[var2][var3][var4] + this.tileHeights[var2][var3 + 1][var4 + 1] + this.tileHeights[var2][var3][var4 + 1]) / 4; for (int var14 = var10; var14 <= var11; ++var14) {
BoundaryObject var17 = var15.boundaryObject; if (var14 < 0 || var14 >= this.ySize || (var7 && var13 < var9 && var14 < var11 && (var14 >= var4 || var3 == var13))) {
if (var17 != null) { continue;
ModelData var18; }
if (var17.entity1 instanceof ModelData) { Tile var15 = this.tiles[var12][var13][var14];
var18 = (ModelData)var17.entity1; if (var15 == null) {
ModelData.method2790(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); continue;
} }
int var16 = (this.tileHeights[var12][var13 + 1][var14] + this.tileHeights[var12][var13 + 1][var14 + 1] + this.tileHeights[var12][var13][var14] + this.tileHeights[var12][var13][var14 + 1]) / 4 - (this.tileHeights[var2][var3 + 1][var4] + this.tileHeights[var2][var3][var4] + this.tileHeights[var2][var3 + 1][var4 + 1] + this.tileHeights[var2][var3][var4 + 1]) / 4;
BoundaryObject var17 = var15.boundaryObject;
if (var17 != null) {
ModelData var18;
if (var17.entity1 instanceof ModelData) {
var18 = (ModelData)var17.entity1;
ModelData.method2790(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7);
}
if (var17.entity2 instanceof ModelData) { if (var17.entity2 instanceof ModelData) {
var18 = (ModelData)var17.entity2; var18 = (ModelData)var17.entity2;
ModelData.method2790(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); ModelData.method2790(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7);
} }
} }
for (int var23 = 0; var23 < var15.gameObjectsCount; ++var23) { for (int var23 = 0; var23 < var15.gameObjectsCount; ++var23) {
GameObject var19 = var15.gameObjects[var23]; GameObject var19 = var15.gameObjects[var23];
if (var19 != null && var19.entity instanceof ModelData) { if (var19 != null && var19.entity instanceof ModelData) {
ModelData var20 = (ModelData)var19.entity; ModelData var20 = (ModelData)var19.entity;
int var21 = var19.endX - var19.startX + 1; int var21 = var19.endX - var19.startX + 1;
int var22 = var19.endY - var19.startY + 1; int var22 = var19.endY - var19.startY + 1;
ModelData.method2790(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); ModelData.method2790(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7);
}
}
}
}
} }
} }
} }
--var8;
var7 = false;
} }
--var8;
var7 = false;
} }
} }
@@ -978,63 +983,64 @@ public class Scene {
@Export("drawTileMinimap") @Export("drawTileMinimap")
public void drawTileMinimap(int[] var1, int var2, int var3, int var4, int var5, int var6) { public void drawTileMinimap(int[] var1, int var2, int var3, int var4, int var5, int var6) {
Tile var7 = this.tiles[var4][var5][var6]; Tile var7 = this.tiles[var4][var5][var6];
if (var7 != null) { if (var7 == null) {
TilePaint var8 = var7.paint; return;
int var10; }
if (var8 != null) { TilePaint var8 = var7.paint;
int var9 = var8.rgb; int var10;
if (var9 != 0) { if (var8 != null) {
for (var10 = 0; var10 < 4; ++var10) { int var9 = var8.rgb;
var1[var2] = var9; if (var9 != 0) {
var1[var2 + 1] = var9; for (var10 = 0; var10 < 4; ++var10) {
var1[var2 + 2] = var9; var1[var2] = var9;
var1[var2 + 3] = var9; var1[var2 + 1] = var9;
var1[var2 + 2] = var9;
var1[var2 + 3] = var9;
var2 += var3;
}
}
} else {
TileModel var18 = var7.model;
if (var18 != null) {
var10 = var18.shape;
int var11 = var18.rotation;
int var12 = var18.underlayRgb;
int var13 = var18.overlayRgb;
int[] var14 = this.tileShape2D[var10];
int[] var15 = this.tileRotation2D[var11];
int var16 = 0;
int var17;
if (var12 != 0) {
for (var17 = 0; var17 < 4; ++var17) {
var1[var2] = var14[var15[var16++]] == 0 ? var12 : var13;
var1[var2 + 1] = var14[var15[var16++]] == 0 ? var12 : var13;
var1[var2 + 2] = var14[var15[var16++]] == 0 ? var12 : var13;
var1[var2 + 3] = var14[var15[var16++]] == 0 ? var12 : var13;
var2 += var3; var2 += var3;
} }
} else {
} for (var17 = 0; var17 < 4; ++var17) {
} else { if (var14[var15[var16++]] != 0) {
TileModel var18 = var7.model; var1[var2] = var13;
if (var18 != null) {
var10 = var18.shape;
int var11 = var18.rotation;
int var12 = var18.underlayRgb;
int var13 = var18.overlayRgb;
int[] var14 = this.tileShape2D[var10];
int[] var15 = this.tileRotation2D[var11];
int var16 = 0;
int var17;
if (var12 != 0) {
for (var17 = 0; var17 < 4; ++var17) {
var1[var2] = var14[var15[var16++]] == 0 ? var12 : var13;
var1[var2 + 1] = var14[var15[var16++]] == 0 ? var12 : var13;
var1[var2 + 2] = var14[var15[var16++]] == 0 ? var12 : var13;
var1[var2 + 3] = var14[var15[var16++]] == 0 ? var12 : var13;
var2 += var3;
} }
} else {
for (var17 = 0; var17 < 4; ++var17) {
if (var14[var15[var16++]] != 0) {
var1[var2] = var13;
}
if (var14[var15[var16++]] != 0) { if (var14[var15[var16++]] != 0) {
var1[var2 + 1] = var13; var1[var2 + 1] = var13;
}
if (var14[var15[var16++]] != 0) {
var1[var2 + 2] = var13;
}
if (var14[var15[var16++]] != 0) {
var1[var2 + 3] = var13;
}
var2 += var3;
} }
if (var14[var15[var16++]] != 0) {
var1[var2 + 2] = var13;
}
if (var14[var15[var16++]] != 0) {
var1[var2 + 3] = var13;
}
var2 += var3;
} }
} }
} }
} }
} }
@@ -1812,91 +1818,95 @@ public class Scene {
var21 = var17 * var4 - var3 * var12 >> 16; var21 = var17 * var4 - var3 * var12 >> 16;
var12 = var3 * var17 + var12 * var4 >> 16; var12 = var3 * var17 + var12 * var4 >> 16;
var17 = var21; var17 = var21;
if (var12 >= 50) { if (var12 < 50) {
var21 = var14 * var6 + var5 * var11 >> 16; return;
var11 = var11 * var6 - var5 * var14 >> 16; }
var14 = var21; var21 = var14 * var6 + var5 * var11 >> 16;
var21 = var18 * var4 - var3 * var11 >> 16; var11 = var11 * var6 - var5 * var14 >> 16;
var11 = var3 * var18 + var11 * var4 >> 16; var14 = var21;
var18 = var21; var21 = var18 * var4 - var3 * var11 >> 16;
if (var11 >= 50) { var11 = var3 * var18 + var11 * var4 >> 16;
var21 = var13 * var6 + var5 * var16 >> 16; var18 = var21;
var16 = var16 * var6 - var5 * var13 >> 16; if (var11 < 50) {
var13 = var21; return;
var21 = var19 * var4 - var3 * var16 >> 16; }
var16 = var3 * var19 + var16 * var4 >> 16; var21 = var13 * var6 + var5 * var16 >> 16;
var19 = var21; var16 = var16 * var6 - var5 * var13 >> 16;
if (var16 >= 50) { var13 = var21;
var21 = var9 * var6 + var5 * var15 >> 16; var21 = var19 * var4 - var3 * var16 >> 16;
var15 = var15 * var6 - var5 * var9 >> 16; var16 = var3 * var19 + var16 * var4 >> 16;
var9 = var21; var19 = var21;
var21 = var20 * var4 - var3 * var15 >> 16; if (var16 < 50) {
var15 = var3 * var20 + var15 * var4 >> 16; return;
if (var15 >= 50) { }
int var22 = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; var21 = var9 * var6 + var5 * var15 >> 16;
int var23 = var17 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; var15 = var15 * var6 - var5 * var9 >> 16;
int var24 = var14 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidX; var9 = var21;
int var25 = var18 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidY; var21 = var20 * var4 - var3 * var15 >> 16;
int var26 = var13 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidX; var15 = var3 * var20 + var15 * var4 >> 16;
int var27 = var19 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidY; if (var15 < 50) {
int var28 = var9 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidX; return;
int var29 = var21 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidY; }
Rasterizer3D.Rasterizer3D_alpha = 0; int var22 = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX;
int var30; int var23 = var17 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY;
if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { int var24 = var14 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidX;
Rasterizer3D.field1763 = false; int var25 = var18 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidY;
if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) { int var26 = var13 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidX;
Rasterizer3D.field1763 = true; int var27 = var19 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidY;
} int var28 = var9 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidX;
int var29 = var21 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidY;
Rasterizer3D.Rasterizer3D_alpha = 0;
int var30;
if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) {
Rasterizer3D.field1763 = false;
if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) {
Rasterizer3D.field1763 = true;
}
if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) {
Scene_selectedX = var7; Scene_selectedX = var7;
Scene_selectedY = var8; Scene_selectedY = var8;
} }
if (var1.texture == -1) { if (var1.texture == -1) {
if (var1.neColor != 12345678) { if (var1.neColor != 12345678) {
Rasterizer3D.method3020(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor); Rasterizer3D.method3020(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor);
}
} else if (!Scene_isLowDetail) {
if (var1.isFlat) {
Rasterizer3D.method2988(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture);
} else {
Rasterizer3D.method2988(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var13, var9, var14, var19, var21, var18, var16, var15, var11, var1.texture);
}
} else {
var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture);
Rasterizer3D.method3020(var27, var29, var25, var26, var28, var24, method3111(var30, var1.neColor), method3111(var30, var1.nwColor), method3111(var30, var1.seColor));
}
}
if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) {
Rasterizer3D.field1763 = false;
if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) {
Rasterizer3D.field1763 = true;
}
if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) {
Scene_selectedX = var7;
Scene_selectedY = var8;
}
if (var1.texture == -1) {
if (var1.swColor != 12345678) {
Rasterizer3D.method3020(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor);
}
} else if (!Scene_isLowDetail) {
Rasterizer3D.method2988(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture);
} else {
var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture);
Rasterizer3D.method3020(var23, var25, var29, var22, var24, var28, method3111(var30, var1.swColor), method3111(var30, var1.seColor), method3111(var30, var1.nwColor));
}
}
}
} }
} else if (!Scene_isLowDetail) {
if (var1.isFlat) {
Rasterizer3D.method2988(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture);
} else {
Rasterizer3D.method2988(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var13, var9, var14, var19, var21, var18, var16, var15, var11, var1.texture);
}
} else {
var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture);
Rasterizer3D.method3020(var27, var29, var25, var26, var28, var24, method3111(var30, var1.neColor), method3111(var30, var1.nwColor), method3111(var30, var1.seColor));
} }
} }
if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) {
Rasterizer3D.field1763 = false;
if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) {
Rasterizer3D.field1763 = true;
}
if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) {
Scene_selectedX = var7;
Scene_selectedY = var8;
}
if (var1.texture == -1) {
if (var1.swColor != 12345678) {
Rasterizer3D.method3020(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor);
}
} else if (!Scene_isLowDetail) {
Rasterizer3D.method2988(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture);
} else {
var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture);
Rasterizer3D.method3020(var23, var25, var29, var22, var24, var28, method3111(var30, var1.swColor), method3111(var30, var1.seColor), method3111(var30, var1.nwColor));
}
}
} }
@ObfuscatedName("ay") @ObfuscatedName("ay")
@@ -1948,31 +1958,32 @@ public class Scene {
int var16 = TileModel.field1605[var10]; int var16 = TileModel.field1605[var10];
int var17 = TileModel.field1605[var11]; int var17 = TileModel.field1605[var11];
int var18 = TileModel.field1605[var12]; int var18 = TileModel.field1605[var12];
if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) <= 0) {
Rasterizer3D.field1763 = false; continue;
if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) { }
Rasterizer3D.field1763 = true; Rasterizer3D.field1763 = false;
} if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) {
Rasterizer3D.field1763 = true;
}
if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) { if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) {
Scene_selectedX = var6; Scene_selectedX = var6;
Scene_selectedY = var7; Scene_selectedY = var7;
} }
if (var1.triangleTextureId != null && var1.triangleTextureId[var9] != -1) { if (var1.triangleTextureId != null && var1.triangleTextureId[var9] != -1) {
if (!Scene_isLowDetail) { if (!Scene_isLowDetail) {
if (var1.isFlat) { if (var1.isFlat) {
Rasterizer3D.method2988(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field1594[0], TileModel.field1594[1], TileModel.field1594[3], TileModel.field1607[0], TileModel.field1607[1], TileModel.field1607[3], TileModel.field1608[0], TileModel.field1608[1], TileModel.field1608[3], var1.triangleTextureId[var9]); Rasterizer3D.method2988(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field1594[0], TileModel.field1594[1], TileModel.field1594[3], TileModel.field1607[0], TileModel.field1607[1], TileModel.field1607[3], TileModel.field1608[0], TileModel.field1608[1], TileModel.field1608[3], var1.triangleTextureId[var9]);
} else {
Rasterizer3D.method2988(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field1594[var10], TileModel.field1594[var11], TileModel.field1594[var12], TileModel.field1607[var10], TileModel.field1607[var11], TileModel.field1607[var12], TileModel.field1608[var10], TileModel.field1608[var11], TileModel.field1608[var12], var1.triangleTextureId[var9]);
}
} else { } else {
int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); Rasterizer3D.method2988(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field1594[var10], TileModel.field1594[var11], TileModel.field1594[var12], TileModel.field1607[var10], TileModel.field1607[var11], TileModel.field1607[var12], TileModel.field1608[var10], TileModel.field1608[var11], TileModel.field1608[var12], var1.triangleTextureId[var9]);
Rasterizer3D.method3020(var16, var17, var18, var13, var14, var15, method3111(var19, var1.triangleColorA[var9]), method3111(var19, var1.triangleColorB[var9]), method3111(var19, var1.triangleColorC[var9]));
} }
} else if (var1.triangleColorA[var9] != 12345678) { } else {
Rasterizer3D.method3020(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]);
Rasterizer3D.method3020(var16, var17, var18, var13, var14, var15, method3111(var19, var1.triangleColorA[var9]), method3111(var19, var1.triangleColorB[var9]), method3111(var19, var1.triangleColorC[var9]));
} }
} else if (var1.triangleColorA[var9] != 12345678) {
Rasterizer3D.method3020(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]);
} }
} }
@@ -2582,12 +2593,12 @@ public class Scene {
int var8 = (var1 - var2) * (var6 - var5) - (var0 - var5) * (var3 - var2); int var8 = (var1 - var2) * (var6 - var5) - (var0 - var5) * (var3 - var2);
int var9 = (var7 - var6) * (var1 - var3) - (var0 - var6) * (var4 - var3); int var9 = (var7 - var6) * (var1 - var3) - (var0 - var6) * (var4 - var3);
int var10 = (var5 - var7) * (var1 - var4) - (var2 - var4) * (var0 - var7); int var10 = (var5 - var7) * (var1 - var4) - (var2 - var4) * (var0 - var7);
if (var8 == 0) { if (var8 != 0) {
if (var9 != 0) { return var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0;
return var9 < 0 ? var10 <= 0 : var10 >= 0;
}
return true;
} }
return var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0; if (var9 != 0) {
return var9 < 0 ? var10 <= 0 : var10 >= 0;
}
return true;
} }
} }

1
runescape-client/src/main/java/ScriptFrame.java
View File

@@ -353,6 +353,7 @@ public class ScriptFrame {
signature = "(III)V", signature = "(III)V",
garbageValue = "-881674814" garbageValue = "-881674814"
) )
@Export("resumePauseWidget")
static void resumePauseWidget(int parentID, int childID) { static void resumePauseWidget(int parentID, int childID) {
PacketBufferNode var2 = Archive.method4265(ClientPacket.field2273, Client.packetWriter.isaacCipher); PacketBufferNode var2 = Archive.method4265(ClientPacket.field2273, Client.packetWriter.isaacCipher);
var2.packetBuffer.writeIntLE16(parentID); var2.packetBuffer.writeIntLE16(parentID);

1
runescape-client/src/main/java/ServerBuild.java
View File

@@ -32,6 +32,7 @@ public class ServerBuild {
@Export("WIP") @Export("WIP")
static final ServerBuild WIP; static final ServerBuild WIP;
@ObfuscatedName("f") @ObfuscatedName("f")
@Export("Tiles_hue")
static int[] Tiles_hue; static int[] Tiles_hue;
@ObfuscatedName("k") @ObfuscatedName("k")
@Export("name") @Export("name")

2
runescape-client/src/main/java/Tiles.java
View File

@@ -33,8 +33,10 @@ public final class Tiles {
@ObfuscatedName("c") @ObfuscatedName("c")
static int[][] field515; static int[][] field515;
@ObfuscatedName("m") @ObfuscatedName("m")
@Export("Tiles_saturation")
static int[] Tiles_saturation; static int[] Tiles_saturation;
@ObfuscatedName("u") @ObfuscatedName("u")
@Export("Tiles_lightness")
static int[] Tiles_lightness; static int[] Tiles_lightness;
@ObfuscatedName("j") @ObfuscatedName("j")
static final int[] field512; static final int[] field512;