rs-client: add missing exports

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

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);
} }
} }

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(

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(

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) {

View File

@@ -839,7 +839,9 @@ 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) {
continue;
}
BoundaryObject var8 = var7.boundaryObject; BoundaryObject var8 = var7.boundaryObject;
ModelData var10; ModelData var10;
if (var8 != null && var8.entity1 instanceof ModelData) { if (var8 != null && var8.entity1 instanceof ModelData) {
@@ -873,7 +875,6 @@ public class Scene {
} }
} }
} }
}
} }
@@ -930,13 +931,21 @@ 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) {
continue;
}
for (int var13 = var8; var13 <= var9; ++var13) { for (int var13 = var8; var13 <= var9; ++var13) {
if (var13 >= 0 && var13 < this.xSize) { if (var13 < 0 || var13 >= this.xSize) {
continue;
}
for (int var14 = var10; var14 <= var11; ++var14) { for (int var14 = var10; var14 <= var11; ++var14) {
if (var14 >= 0 && var14 < this.ySize && (!var7 || var13 >= var9 || var14 >= var11 || var14 < var4 && var3 != var13)) { if (var14 < 0 || var14 >= this.ySize || (var7 && var13 < var9 && var14 < var11 && (var14 >= var4 || var3 == var13))) {
continue;
}
Tile var15 = this.tiles[var12][var13][var14]; Tile var15 = this.tiles[var12][var13][var14];
if (var15 != null) { if (var15 == null) {
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; 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; BoundaryObject var17 = var15.boundaryObject;
if (var17 != null) { if (var17 != null) {
@@ -963,14 +972,10 @@ public class Scene {
} }
} }
} }
}
}
}
--var8; --var8;
var7 = false; var7 = false;
} }
}
} }
@@ -978,7 +983,9 @@ 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) {
return;
}
TilePaint var8 = var7.paint; TilePaint var8 = var7.paint;
int var10; int var10;
if (var8 != null) { if (var8 != null) {
@@ -1037,7 +1044,6 @@ public class Scene {
} }
} }
} }
}
@ObfuscatedName("aa") @ObfuscatedName("aa")
@Export("menuOpen") @Export("menuOpen")
@@ -1812,27 +1818,35 @@ 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) {
return;
}
var21 = var14 * var6 + var5 * var11 >> 16; var21 = var14 * var6 + var5 * var11 >> 16;
var11 = var11 * var6 - var5 * var14 >> 16; var11 = var11 * var6 - var5 * var14 >> 16;
var14 = var21; var14 = var21;
var21 = var18 * var4 - var3 * var11 >> 16; var21 = var18 * var4 - var3 * var11 >> 16;
var11 = var3 * var18 + var11 * var4 >> 16; var11 = var3 * var18 + var11 * var4 >> 16;
var18 = var21; var18 = var21;
if (var11 >= 50) { if (var11 < 50) {
return;
}
var21 = var13 * var6 + var5 * var16 >> 16; var21 = var13 * var6 + var5 * var16 >> 16;
var16 = var16 * var6 - var5 * var13 >> 16; var16 = var16 * var6 - var5 * var13 >> 16;
var13 = var21; var13 = var21;
var21 = var19 * var4 - var3 * var16 >> 16; var21 = var19 * var4 - var3 * var16 >> 16;
var16 = var3 * var19 + var16 * var4 >> 16; var16 = var3 * var19 + var16 * var4 >> 16;
var19 = var21; var19 = var21;
if (var16 >= 50) { if (var16 < 50) {
return;
}
var21 = var9 * var6 + var5 * var15 >> 16; var21 = var9 * var6 + var5 * var15 >> 16;
var15 = var15 * var6 - var5 * var9 >> 16; var15 = var15 * var6 - var5 * var9 >> 16;
var9 = var21; var9 = var21;
var21 = var20 * var4 - var3 * var15 >> 16; var21 = var20 * var4 - var3 * var15 >> 16;
var15 = var3 * var20 + var15 * var4 >> 16; var15 = var3 * var20 + var15 * var4 >> 16;
if (var15 >= 50) { if (var15 < 50) {
return;
}
int var22 = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; int var22 = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX;
int var23 = var17 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; int var23 = var17 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY;
int var24 = var14 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidX; int var24 = var14 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidX;
@@ -1894,10 +1908,6 @@ public class Scene {
} }
} }
}
}
}
}
@ObfuscatedName("ay") @ObfuscatedName("ay")
@ObfuscatedSignature( @ObfuscatedSignature(
@@ -1948,7 +1958,9 @@ 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) {
continue;
}
Rasterizer3D.field1763 = false; Rasterizer3D.field1763 = false;
if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) { if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) {
Rasterizer3D.field1763 = true; Rasterizer3D.field1763 = true;
@@ -1974,7 +1986,6 @@ public class Scene {
Rasterizer3D.method3020(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); 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) {
return var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0;
}
if (var9 != 0) { if (var9 != 0) {
return var9 < 0 ? var10 <= 0 : var10 >= 0; return var9 < 0 ? var10 <= 0 : var10 >= 0;
} }
return true; return true;
} }
return var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0;
}
} }

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);

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")

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;