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

i

Browse Source
This commit is contained in:
Owain van Brakel
2019-09-30 07:20:31 +02:00
parent d0133dc77a
commit 3231abf89c
13 changed files with 242 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
runescape-client/.DS_Store vendored
View File

Binary file not shown.

5
runescape-client/src/main/java/Actor.java
View File

@@ -29,7 +29,8 @@ public abstract class Actor extends Entity {
@Export("isWalking")
boolean isWalking;
@ObfuscatedName("ax")
int field932;
@Export("size")
int size;
@ObfuscatedName("as")
@ObfuscatedGetter(
intValue = -334562759
@@ -315,7 +316,7 @@ public abstract class Actor extends Entity {
Actor() {
this.isWalking = false;
this.field932 = 772175475;
this.size = 772175475;
this.readySequence = -1;
this.turnLeftSequence = -1;
this.turnRightSequence = -1;

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

@@ -2110,7 +2110,7 @@ public final class Client extends GameShell implements Usernamed {
}
ViewportMouse.client = this;
class319.field3843 = clientType;
ClientType.clientType = clientType;
this.startThread(765, 503, 184);
}
} catch (RuntimeException var22) {
@@ -5267,9 +5267,9 @@ public final class Client extends GameShell implements Usernamed {
garbageValue = "1638335073"
)
@Export("openMenu")
final void openMenu(int var1, int var2) {
UserComparator6.calculateMenuBounds(var1, var2);
PacketWriter.scene.menuOpen(WorldMapRectangle.plane, var1, var2, false);
final void openMenu(int screenX, int screenY) {
UserComparator6.calculateMenuBounds(screenX, screenY);
PacketWriter.scene.menuOpen(WorldMapRectangle.plane, screenX, screenY, false);
isMenuOpen = true;
}

7
runescape-client/src/main/java/class319.java → runescape-client/src/main/java/ClientType.java
View File

@@ -1,11 +1,14 @@
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
@ObfuscatedName("ln")
public class class319 {
@Implements("ClientType")
public class ClientType
{
@ObfuscatedName("u")
@ObfuscatedGetter(
intValue = 2052078695
)
public static int field3843;
public static int clientType;
}

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

@@ -169,10 +169,10 @@ public class HealthBar extends Node {
if (var0.field976 == Client.cycle || var0.sequence == -1 || var0.sequenceDelay != 0 || var0.sequenceFrameCycle + 1 > GrandExchangeOfferUnitPriceComparator.SequenceDefinition_get(var0.sequence).frameLengths[var0.sequenceFrame]) {
int var1 = var0.field976 - var0.field948;
int var2 = Client.cycle - var0.field948;
int var3 = var0.field932 * -527978816 + var0.field971 * 128;
int var4 = var0.field932 * -527978816 + var0.field973 * 128;
int var5 = var0.field972 * 128 + var0.field932 * -527978816;
int var6 = var0.field932 * -527978816 + var0.field974 * 128;
int var3 = var0.size * -527978816 + var0.field971 * 128;
int var4 = var0.size * -527978816 + var0.field973 * 128;
int var5 = var0.field972 * 128 + var0.size * -527978816;
int var6 = var0.size * -527978816 + var0.field974 * 128;
var0.x = (var2 * var5 + var3 * (var1 - var2)) / var1;
var0.y = (var6 * var2 + var4 * (var1 - var2)) / var1;
}

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

@@ -212,7 +212,7 @@ public class InterfaceParent extends Node {
var9 = var1.readBits(1);
var4.definition = PacketBufferNode.getNpcDefinition(var1.readBits(14));
var4.field932 = var4.definition.size * 772175475;
var4.size = var4.definition.size * 772175475;
var4.field982 = var4.definition.rotation;
if (var4.field982 == 0) {
var4.rotation = 0;
@@ -317,7 +317,7 @@ public class InterfaceParent extends Node {
if ((var5 & 32) != 0) {
var4.definition = PacketBufferNode.getNpcDefinition(var1.method5647());
var4.field932 = var4.definition.size * 772175475;
var4.size = var4.definition.size * 772175475;
var4.field982 = var4.definition.rotation;
var4.walkSequence = var4.definition.walkSequence;
var4.walkBackSequence = var4.definition.walkBackSequence;

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

@@ -122,8 +122,8 @@ public final class NPC extends Actor {
super.field949 = 0;
super.pathX[0] = var1;
super.pathY[0] = var2;
super.x = super.pathX[0] * 128 + super.field932 * -527978816;
super.y = super.pathY[0] * 128 + super.field932 * -527978816;
super.x = super.pathX[0] * 128 + super.size * -527978816;
super.y = super.pathY[0] * 128 + super.size * -527978816;
}
@ObfuscatedName("y")

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

@@ -317,39 +317,42 @@ public class Scene {
@ObfuscatedName("p")
@Export("addTile")
public void addTile(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20) {
public void addTile(int z, int x, int y, int shape, int rotation, int texture, int heightSw, int heightNw,
int heightNe, int heightSe, int underlaySwColor, int underlayNwColor, int underlayNeColor,
int underlaySeColor, int overlaySwColor, int overlayNwColor, int overlayNeColor,
int overlaySeColor, int underlayRgb, int overlayRgb) {
TilePaint var21;
int var22;
if (var4 == 0) {
var21 = new TilePaint(var11, var12, var13, var14, -1, var19, false);
if (shape == 0) {
var21 = new TilePaint(underlaySwColor, underlayNwColor, underlayNeColor, underlaySeColor, -1, underlayRgb, false);
for (var22 = var1; var22 >= 0; --var22) {
if (this.tiles[var22][var2][var3] == null) {
this.tiles[var22][var2][var3] = new Tile(var22, var2, var3);
for (var22 = z; var22 >= 0; --var22) {
if (this.tiles[var22][x][y] == null) {
this.tiles[var22][x][y] = new Tile(var22, x, y);
}
}
this.tiles[var1][var2][var3].paint = var21;
} else if (var4 != 1) {
TileModel var23 = new TileModel(var4, var5, var6, var2, var3, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19, var20);
this.tiles[z][x][y].paint = var21;
} else if (shape != 1) {
TileModel var23 = new TileModel(shape, rotation, texture, x, y, heightSw, heightNw, heightNe, heightSe, underlaySwColor, underlayNwColor, underlayNeColor, underlaySeColor, overlaySwColor, overlayNwColor, overlayNeColor, overlaySeColor, underlayRgb, overlayRgb);
for (var22 = var1; var22 >= 0; --var22) {
if (this.tiles[var22][var2][var3] == null) {
this.tiles[var22][var2][var3] = new Tile(var22, var2, var3);
for (var22 = z; var22 >= 0; --var22) {
if (this.tiles[var22][x][y] == null) {
this.tiles[var22][x][y] = new Tile(var22, x, y);
}
}
this.tiles[var1][var2][var3].model = var23;
this.tiles[z][x][y].model = var23;
} else {
var21 = new TilePaint(var15, var16, var17, var18, var6, var20, var8 == var7 && var7 == var9 && var10 == var7);
var21 = new TilePaint(overlaySwColor, overlayNwColor, overlayNeColor, overlaySeColor, texture, overlayRgb, heightNw == heightSw && heightSw == heightNe && heightSe == heightSw);
for (var22 = var1; var22 >= 0; --var22) {
if (this.tiles[var22][var2][var3] == null) {
this.tiles[var22][var2][var3] = new Tile(var22, var2, var3);
for (var22 = z; var22 >= 0; --var22) {
if (this.tiles[var22][x][y] == null) {
this.tiles[var22][x][y] = new Tile(var22, x, y);
}
}
this.tiles[var1][var2][var3].paint = var21;
this.tiles[z][x][y].paint = var21;
}
}
@@ -970,61 +973,61 @@ public class Scene {
@ObfuscatedName("ai")
@Export("drawTileMinimap")
public void drawTileMinimap(int[] var1, int var2, int var3, int var4, int var5, int var6) {
Tile var7 = this.tiles[var4][var5][var6];
if (var7 != null) {
TilePaint var8 = var7.paint;
int var10;
if (var8 != null) {
int var9 = var8.rgb;
if (var9 != 0) {
for (var10 = 0; var10 < 4; ++var10) {
var1[var2] = var9;
var1[var2 + 1] = var9;
var1[var2 + 2] = var9;
var1[var2 + 3] = var9;
var2 += var3;
public void drawTileMinimap(int[] pixels, int index, int width, int plane, int x, int y) {
Tile tile = this.tiles[plane][x][y];
if (tile != null) {
TilePaint tilePaint = tile.paint;
int shape;
if (tilePaint != null) {
int rgb = tilePaint.rgb;
if (rgb != 0) {
for (shape = 0; shape < 4; ++shape) {
pixels[index] = rgb;
pixels[index + 1] = rgb;
pixels[index + 2] = rgb;
pixels[index + 3] = rgb;
index += width;
}
}
} 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];
TileModel tileModel = tile.model;
if (tileModel != null) {
shape = tileModel.shape;
int rotation = tileModel.rotation;
int underlayRgb = tileModel.underlayRgb;
int overlayRgb = tileModel.overlayRgb;
int[] shapes = this.tileShape2D[shape];
int[] rotations = this.tileRotation2D[rotation];
int var16 = 0;
int var17;
if (var12 != 0) {
if (underlayRgb != 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;
pixels[index] = shapes[rotations[var16++]] == 0 ? underlayRgb : overlayRgb;
pixels[index + 1] = shapes[rotations[var16++]] == 0 ? underlayRgb : overlayRgb;
pixels[index + 2] = shapes[rotations[var16++]] == 0 ? underlayRgb : overlayRgb;
pixels[index + 3] = shapes[rotations[var16++]] == 0 ? underlayRgb : overlayRgb;
index += width;
}
} else {
for (var17 = 0; var17 < 4; ++var17) {
if (var14[var15[var16++]] != 0) {
var1[var2] = var13;
if (shapes[rotations[var16++]] != 0) {
pixels[index] = overlayRgb;
}
if (var14[var15[var16++]] != 0) {
var1[var2 + 1] = var13;
if (shapes[rotations[var16++]] != 0) {
pixels[index + 1] = overlayRgb;
}
if (var14[var15[var16++]] != 0) {
var1[var2 + 2] = var13;
if (shapes[rotations[var16++]] != 0) {
pixels[index + 2] = overlayRgb;
}
if (var14[var15[var16++]] != 0) {
var1[var2 + 3] = var13;
if (shapes[rotations[var16++]] != 0) {
pixels[index + 3] = overlayRgb;
}
var2 += var3;
index += width;
}
}
@@ -1035,13 +1038,13 @@ public class Scene {
@ObfuscatedName("am")
@Export("menuOpen")
public void menuOpen(int var1, int var2, int var3, boolean var4) {
if (!method3085() || var4) {
public void menuOpen(int plane, int screenX, int screenY, boolean walking) {
if (!method3085() || walking) {
checkClick = true;
viewportWalking = var4;
Scene_selectedPlane = var1;
Scene_selectedScreenX = var2;
Scene_selectedScreenY = var3;
viewportWalking = walking;
Scene_selectedPlane = plane;
Scene_selectedScreenX = screenX;
Scene_selectedScreenY = screenY;
Scene_selectedX = -1;
Scene_selectedY = -1;
}

294
runescape-client/src/main/java/Sprite.java
View File

@@ -109,25 +109,25 @@ public final class Sprite extends Rasterizer2D {
@ObfuscatedName("r")
@Export("pad")
public void pad(int var1) {
public void pad(int amount) {
if (this.subWidth != this.width || this.subHeight != this.height) {
int var2 = var1;
if (var1 > this.xOffset) {
int var2 = amount;
if (amount > this.xOffset) {
var2 = this.xOffset;
}
int var3 = var1;
if (var1 + this.xOffset + this.subWidth > this.width) {
int var3 = amount;
if (amount + this.xOffset + this.subWidth > this.width) {
var3 = this.width - this.xOffset - this.subWidth;
}
int var4 = var1;
if (var1 > this.yOffset) {
int var4 = amount;
if (amount > this.yOffset) {
var4 = this.yOffset;
}
int var5 = var1;
if (var1 + this.yOffset + this.subHeight > this.height) {
int var5 = amount;
if (amount + this.yOffset + this.subHeight > this.height) {
var5 = this.height - this.yOffset - this.subHeight;
}
@@ -183,7 +183,7 @@ public final class Sprite extends Rasterizer2D {
@ObfuscatedName("m")
@Export("outline")
public void outline(int var1) {
public void outline(int color) {
int[] var2 = new int[this.subWidth * this.subHeight];
int var3 = 0;
@@ -192,13 +192,13 @@ public final class Sprite extends Rasterizer2D {
int var6 = this.pixels[var3];
if (var6 == 0) {
if (var5 > 0 && this.pixels[var3 - 1] != 0) {
var6 = var1;
var6 = color;
} else if (var4 > 0 && this.pixels[var3 - this.subWidth] != 0) {
var6 = var1;
var6 = color;
} else if (var5 < this.subWidth - 1 && this.pixels[var3 + 1] != 0) {
var6 = var1;
var6 = color;
} else if (var4 < this.subHeight - 1 && this.pixels[var3 + this.subWidth] != 0) {
var6 = var1;
var6 = color;
}
}
@@ -226,40 +226,40 @@ public final class Sprite extends Rasterizer2D {
@ObfuscatedName("i")
@Export("drawAt")
public void drawAt(int var1, int var2) {
var1 += this.xOffset;
var2 += this.yOffset;
int var3 = var1 + var2 * Rasterizer2D.Rasterizer2D_width;
public void drawAt(int x, int y) {
x += this.xOffset;
y += this.yOffset;
int var3 = x + y * Rasterizer2D.Rasterizer2D_width;
int var4 = 0;
int var5 = this.subHeight;
int var6 = this.subWidth;
int var7 = Rasterizer2D.Rasterizer2D_width - var6;
int var8 = 0;
int var9;
if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
var9 = Rasterizer2D.Rasterizer2D_yClipStart - var2;
if (y < Rasterizer2D.Rasterizer2D_yClipStart) {
var9 = Rasterizer2D.Rasterizer2D_yClipStart - y;
var5 -= var9;
var2 = Rasterizer2D.Rasterizer2D_yClipStart;
y = Rasterizer2D.Rasterizer2D_yClipStart;
var4 += var9 * var6;
var3 += var9 * Rasterizer2D.Rasterizer2D_width;
}
if (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) {
var5 -= var5 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd;
if (var5 + y > Rasterizer2D.Rasterizer2D_yClipEnd) {
var5 -= var5 + y - Rasterizer2D.Rasterizer2D_yClipEnd;
}
if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
var9 = Rasterizer2D.Rasterizer2D_xClipStart - var1;
if (x < Rasterizer2D.Rasterizer2D_xClipStart) {
var9 = Rasterizer2D.Rasterizer2D_xClipStart - x;
var6 -= var9;
var1 = Rasterizer2D.Rasterizer2D_xClipStart;
x = Rasterizer2D.Rasterizer2D_xClipStart;
var4 += var9;
var3 += var9;
var8 += var9;
var7 += var9;
}
if (var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
var9 = var6 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd;
if (var6 + x > Rasterizer2D.Rasterizer2D_xClipEnd) {
var9 = var6 + x - Rasterizer2D.Rasterizer2D_xClipEnd;
var6 -= var9;
var8 += var9;
var7 += var9;
@@ -272,40 +272,40 @@ public final class Sprite extends Rasterizer2D {
@ObfuscatedName("b")
@Export("drawTransBgAt")
public void drawTransBgAt(int var1, int var2) {
var1 += this.xOffset;
var2 += this.yOffset;
int var3 = var1 + var2 * Rasterizer2D.Rasterizer2D_width;
public void drawTransBgAt(int x, int y) {
x += this.xOffset;
y += this.yOffset;
int var3 = x + y * Rasterizer2D.Rasterizer2D_width;
int var4 = 0;
int var5 = this.subHeight;
int var6 = this.subWidth;
int var7 = Rasterizer2D.Rasterizer2D_width - var6;
int var8 = 0;
int var9;
if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
var9 = Rasterizer2D.Rasterizer2D_yClipStart - var2;
if (y < Rasterizer2D.Rasterizer2D_yClipStart) {
var9 = Rasterizer2D.Rasterizer2D_yClipStart - y;
var5 -= var9;
var2 = Rasterizer2D.Rasterizer2D_yClipStart;
y = Rasterizer2D.Rasterizer2D_yClipStart;
var4 += var9 * var6;
var3 += var9 * Rasterizer2D.Rasterizer2D_width;
}
if (var5 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) {
var5 -= var5 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd;
if (var5 + y > Rasterizer2D.Rasterizer2D_yClipEnd) {
var5 -= var5 + y - Rasterizer2D.Rasterizer2D_yClipEnd;
}
if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
var9 = Rasterizer2D.Rasterizer2D_xClipStart - var1;
if (x < Rasterizer2D.Rasterizer2D_xClipStart) {
var9 = Rasterizer2D.Rasterizer2D_xClipStart - x;
var6 -= var9;
var1 = Rasterizer2D.Rasterizer2D_xClipStart;
x = Rasterizer2D.Rasterizer2D_xClipStart;
var4 += var9;
var3 += var9;
var8 += var9;
var7 += var9;
}
if (var6 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
var9 = var6 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd;
if (var6 + x > Rasterizer2D.Rasterizer2D_xClipEnd) {
var9 = var6 + x - Rasterizer2D.Rasterizer2D_xClipEnd;
var6 -= var9;
var8 += var9;
var7 += var9;
@@ -318,275 +318,275 @@ public final class Sprite extends Rasterizer2D {
@ObfuscatedName("a")
@Export("drawScaledAt")
public void drawScaledAt(int var1, int var2, int var3, int var4) {
if (var3 > 0 && var4 > 0) {
public void drawScaledAt(int x, int y, int width, int height) {
if (width > 0 && height > 0) {
int var5 = this.subWidth;
int var6 = this.subHeight;
int var7 = 0;
int var8 = 0;
int var9 = this.width;
int var10 = this.height;
int var11 = (var9 << 16) / var3;
int var12 = (var10 << 16) / var4;
int var11 = (var9 << 16) / width;
int var12 = (var10 << 16) / height;
int var13;
if (this.xOffset > 0) {
var13 = (var11 + (this.xOffset << 16) - 1) / var11;
var1 += var13;
x += var13;
var7 += var13 * var11 - (this.xOffset << 16);
}
if (this.yOffset > 0) {
var13 = (var12 + (this.yOffset << 16) - 1) / var12;
var2 += var13;
y += var13;
var8 += var13 * var12 - (this.yOffset << 16);
}
if (var5 < var9) {
var3 = (var11 + ((var5 << 16) - var7) - 1) / var11;
width = (var11 + ((var5 << 16) - var7) - 1) / var11;
}
if (var6 < var10) {
var4 = (var12 + ((var6 << 16) - var8) - 1) / var12;
height = (var12 + ((var6 << 16) - var8) - 1) / var12;
}
var13 = var1 + var2 * Rasterizer2D.Rasterizer2D_width;
int var14 = Rasterizer2D.Rasterizer2D_width - var3;
if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) {
var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd;
var13 = x + y * Rasterizer2D.Rasterizer2D_width;
int var14 = Rasterizer2D.Rasterizer2D_width - width;
if (y + height > Rasterizer2D.Rasterizer2D_yClipEnd) {
height -= y + height - Rasterizer2D.Rasterizer2D_yClipEnd;
}
int var15;
if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
var15 = Rasterizer2D.Rasterizer2D_yClipStart - var2;
var4 -= var15;
if (y < Rasterizer2D.Rasterizer2D_yClipStart) {
var15 = Rasterizer2D.Rasterizer2D_yClipStart - y;
height -= var15;
var13 += var15 * Rasterizer2D.Rasterizer2D_width;
var8 += var12 * var15;
}
if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
var15 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd;
var3 -= var15;
if (width + x > Rasterizer2D.Rasterizer2D_xClipEnd) {
var15 = width + x - Rasterizer2D.Rasterizer2D_xClipEnd;
width -= var15;
var14 += var15;
}
if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
var15 = Rasterizer2D.Rasterizer2D_xClipStart - var1;
var3 -= var15;
if (x < Rasterizer2D.Rasterizer2D_xClipStart) {
var15 = Rasterizer2D.Rasterizer2D_xClipStart - x;
width -= var15;
var13 += var15;
var7 += var11 * var15;
var14 += var15;
}
Sprite_drawScaled(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var7, var8, var13, var14, var3, var4, var11, var12, var5);
Sprite_drawScaled(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var7, var8, var13, var14, width, height, var11, var12, var5);
}
}
@ObfuscatedName("x")
@Export("drawTransOverlayAt")
public void drawTransOverlayAt(int var1, int var2, int var3, int var4) {
if (var3 == 256) {
this.drawTransBgAt(var1, var2);
public void drawTransOverlayAt(int x, int y, int overlayOpacity, int overlayColor) {
if (overlayOpacity == 256) {
this.drawTransBgAt(x, y);
} else {
var1 += this.xOffset;
var2 += this.yOffset;
int var5 = var1 + var2 * Rasterizer2D.Rasterizer2D_width;
x += this.xOffset;
y += this.yOffset;
int var5 = x + y * Rasterizer2D.Rasterizer2D_width;
int var6 = 0;
int var7 = this.subHeight;
int var8 = this.subWidth;
int var9 = Rasterizer2D.Rasterizer2D_width - var8;
int var10 = 0;
int var11;
if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
var11 = Rasterizer2D.Rasterizer2D_yClipStart - var2;
if (y < Rasterizer2D.Rasterizer2D_yClipStart) {
var11 = Rasterizer2D.Rasterizer2D_yClipStart - y;
var7 -= var11;
var2 = Rasterizer2D.Rasterizer2D_yClipStart;
y = Rasterizer2D.Rasterizer2D_yClipStart;
var6 += var11 * var8;
var5 += var11 * Rasterizer2D.Rasterizer2D_width;
}
if (var7 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) {
var7 -= var7 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd;
if (var7 + y > Rasterizer2D.Rasterizer2D_yClipEnd) {
var7 -= var7 + y - Rasterizer2D.Rasterizer2D_yClipEnd;
}
if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
var11 = Rasterizer2D.Rasterizer2D_xClipStart - var1;
if (x < Rasterizer2D.Rasterizer2D_xClipStart) {
var11 = Rasterizer2D.Rasterizer2D_xClipStart - x;
var8 -= var11;
var1 = Rasterizer2D.Rasterizer2D_xClipStart;
x = Rasterizer2D.Rasterizer2D_xClipStart;
var6 += var11;
var5 += var11;
var10 += var11;
var9 += var11;
}
if (var8 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
var11 = var8 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd;
if (var8 + x > Rasterizer2D.Rasterizer2D_xClipEnd) {
var11 = var8 + x - Rasterizer2D.Rasterizer2D_xClipEnd;
var8 -= var11;
var10 += var11;
var9 += var11;
}
if (var8 > 0 && var7 > 0) {
Sprite_drawTransOverlay(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var6, var5, var8, var7, var9, var10, var3, var4);
Sprite_drawTransOverlay(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var6, var5, var8, var7, var9, var10, overlayOpacity, overlayColor);
}
}
}
@ObfuscatedName("s")
@Export("drawTransAt")
public void drawTransAt(int var1, int var2, int var3) {
var1 += this.xOffset;
var2 += this.yOffset;
int var4 = var1 + var2 * Rasterizer2D.Rasterizer2D_width;
public void drawTransAt(int x, int y, int opacity) {
x += this.xOffset;
y += this.yOffset;
int var4 = x + y * Rasterizer2D.Rasterizer2D_width;
int var5 = 0;
int var6 = this.subHeight;
int var7 = this.subWidth;
int var8 = Rasterizer2D.Rasterizer2D_width - var7;
int var9 = 0;
int var10;
if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2;
if (y < Rasterizer2D.Rasterizer2D_yClipStart) {
var10 = Rasterizer2D.Rasterizer2D_yClipStart - y;
var6 -= var10;
var2 = Rasterizer2D.Rasterizer2D_yClipStart;
y = Rasterizer2D.Rasterizer2D_yClipStart;
var5 += var10 * var7;
var4 += var10 * Rasterizer2D.Rasterizer2D_width;
}
if (var6 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) {
var6 -= var6 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd;
if (var6 + y > Rasterizer2D.Rasterizer2D_yClipEnd) {
var6 -= var6 + y - Rasterizer2D.Rasterizer2D_yClipEnd;
}
if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1;
if (x < Rasterizer2D.Rasterizer2D_xClipStart) {
var10 = Rasterizer2D.Rasterizer2D_xClipStart - x;
var7 -= var10;
var1 = Rasterizer2D.Rasterizer2D_xClipStart;
x = Rasterizer2D.Rasterizer2D_xClipStart;
var5 += var10;
var4 += var10;
var9 += var10;
var8 += var10;
}
if (var7 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
var10 = var7 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd;
if (var7 + x > Rasterizer2D.Rasterizer2D_xClipEnd) {
var10 = var7 + x - Rasterizer2D.Rasterizer2D_xClipEnd;
var7 -= var10;
var9 += var10;
var8 += var10;
}
if (var7 > 0 && var6 > 0) {
Sprite_drawTransparent(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var5, var4, var7, var6, var8, var9, var3);
Sprite_drawTransparent(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var5, var4, var7, var6, var8, var9, opacity);
}
}
@ObfuscatedName("j")
@Export("drawTransScaledAt")
public void drawTransScaledAt(int var1, int var2, int var3, int var4, int var5) {
if (var3 > 0 && var4 > 0) {
public void drawTransScaledAt(int x, int y, int width, int height, int opacity) {
if (width > 0 && height > 0) {
int var6 = this.subWidth;
int var7 = this.subHeight;
int var8 = 0;
int var9 = 0;
int var10 = this.width;
int var11 = this.height;
int var12 = (var10 << 16) / var3;
int var13 = (var11 << 16) / var4;
int var12 = (var10 << 16) / width;
int var13 = (var11 << 16) / height;
int var14;
if (this.xOffset > 0) {
var14 = (var12 + (this.xOffset << 16) - 1) / var12;
var1 += var14;
x += var14;
var8 += var14 * var12 - (this.xOffset << 16);
}
if (this.yOffset > 0) {
var14 = (var13 + (this.yOffset << 16) - 1) / var13;
var2 += var14;
y += var14;
var9 += var14 * var13 - (this.yOffset << 16);
}
if (var6 < var10) {
var3 = (var12 + ((var6 << 16) - var8) - 1) / var12;
width = (var12 + ((var6 << 16) - var8) - 1) / var12;
}
if (var7 < var11) {
var4 = (var13 + ((var7 << 16) - var9) - 1) / var13;
height = (var13 + ((var7 << 16) - var9) - 1) / var13;
}
var14 = var1 + var2 * Rasterizer2D.Rasterizer2D_width;
int var15 = Rasterizer2D.Rasterizer2D_width - var3;
if (var2 + var4 > Rasterizer2D.Rasterizer2D_yClipEnd) {
var4 -= var2 + var4 - Rasterizer2D.Rasterizer2D_yClipEnd;
var14 = x + y * Rasterizer2D.Rasterizer2D_width;
int var15 = Rasterizer2D.Rasterizer2D_width - width;
if (y + height > Rasterizer2D.Rasterizer2D_yClipEnd) {
height -= y + height - Rasterizer2D.Rasterizer2D_yClipEnd;
}
int var16;
if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
var16 = Rasterizer2D.Rasterizer2D_yClipStart - var2;
var4 -= var16;
if (y < Rasterizer2D.Rasterizer2D_yClipStart) {
var16 = Rasterizer2D.Rasterizer2D_yClipStart - y;
height -= var16;
var14 += var16 * Rasterizer2D.Rasterizer2D_width;
var9 += var13 * var16;
}
if (var3 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
var16 = var3 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd;
var3 -= var16;
if (width + x > Rasterizer2D.Rasterizer2D_xClipEnd) {
var16 = width + x - Rasterizer2D.Rasterizer2D_xClipEnd;
width -= var16;
var15 += var16;
}
if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
var16 = Rasterizer2D.Rasterizer2D_xClipStart - var1;
var3 -= var16;
if (x < Rasterizer2D.Rasterizer2D_xClipStart) {
var16 = Rasterizer2D.Rasterizer2D_xClipStart - x;
width -= var16;
var14 += var16;
var8 += var12 * var16;
var15 += var16;
}
Sprite_drawTransScaled(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var8, var9, var14, var15, var3, var4, var12, var13, var6, var5);
Sprite_drawTransScaled(Rasterizer2D.Rasterizer2D_pixels, this.pixels, 0, var8, var9, var14, var15, width, height, var12, var13, var6, opacity);
}
}
@ObfuscatedName("l")
public void method6082(int var1, int var2, int var3) {
var1 += this.xOffset;
var2 += this.yOffset;
int var4 = var1 + var2 * Rasterizer2D.Rasterizer2D_width;
public void method6082(int x, int y, int opacity) {
x += this.xOffset;
y += this.yOffset;
int var4 = x + y * Rasterizer2D.Rasterizer2D_width;
int var5 = 0;
int var6 = this.subHeight;
int var7 = this.subWidth;
int var8 = Rasterizer2D.Rasterizer2D_width - var7;
int var9 = 0;
int var10;
if (var2 < Rasterizer2D.Rasterizer2D_yClipStart) {
var10 = Rasterizer2D.Rasterizer2D_yClipStart - var2;
if (y < Rasterizer2D.Rasterizer2D_yClipStart) {
var10 = Rasterizer2D.Rasterizer2D_yClipStart - y;
var6 -= var10;
var2 = Rasterizer2D.Rasterizer2D_yClipStart;
y = Rasterizer2D.Rasterizer2D_yClipStart;
var5 += var10 * var7;
var4 += var10 * Rasterizer2D.Rasterizer2D_width;
}
if (var6 + var2 > Rasterizer2D.Rasterizer2D_yClipEnd) {
var6 -= var6 + var2 - Rasterizer2D.Rasterizer2D_yClipEnd;
if (var6 + y > Rasterizer2D.Rasterizer2D_yClipEnd) {
var6 -= var6 + y - Rasterizer2D.Rasterizer2D_yClipEnd;
}
if (var1 < Rasterizer2D.Rasterizer2D_xClipStart) {
var10 = Rasterizer2D.Rasterizer2D_xClipStart - var1;
if (x < Rasterizer2D.Rasterizer2D_xClipStart) {
var10 = Rasterizer2D.Rasterizer2D_xClipStart - x;
var7 -= var10;
var1 = Rasterizer2D.Rasterizer2D_xClipStart;
x = Rasterizer2D.Rasterizer2D_xClipStart;
var5 += var10;
var4 += var10;
var9 += var10;
var8 += var10;
}
if (var7 + var1 > Rasterizer2D.Rasterizer2D_xClipEnd) {
var10 = var7 + var1 - Rasterizer2D.Rasterizer2D_xClipEnd;
if (var7 + x > Rasterizer2D.Rasterizer2D_xClipEnd) {
var10 = var7 + x - Rasterizer2D.Rasterizer2D_xClipEnd;
var7 -= var10;
var9 += var10;
var8 += var10;
}
if (var7 > 0 && var6 > 0) {
if (var3 == 256) {
if (opacity == 256) {
method6071(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9);
} else {
method6084(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, var3);
method6084(0, 0, 0, Rasterizer2D.Rasterizer2D_pixels, this.pixels, var5, 0, var4, 0, var7, var6, var8, var9, opacity);
}
}
@@ -711,25 +711,25 @@ public final class Sprite extends Rasterizer2D {
@ObfuscatedName("ax")
@Export("drawRotatedMaskedCenteredAround")
public void drawRotatedMaskedCenteredAround(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int[] var9, int[] var10) {
public void drawRotatedMaskedCenteredAround(int x, int y, int width, int height, int xOffset, int yOffset, int rotation, int zoom, int[] xOffsets, int[] yOffsets) {
try {
int var11 = -var3 / 2;
int var12 = -var4 / 2;
int var13 = (int)(Math.sin((double)var7 / 326.11D) * 65536.0D);
int var14 = (int)(Math.cos((double)var7 / 326.11D) * 65536.0D);
var13 = var13 * var8 >> 8;
var14 = var14 * var8 >> 8;
int var15 = var12 * var13 + var11 * var14 + (var5 << 16);
int var16 = var12 * var14 - var11 * var13 + (var6 << 16);
int var17 = var1 + var2 * Rasterizer2D.Rasterizer2D_width;
int var11 = -width / 2;
int var12 = -height / 2;
int var13 = (int)(Math.sin((double)rotation / 326.11D) * 65536.0D);
int var14 = (int)(Math.cos((double)rotation / 326.11D) * 65536.0D);
var13 = var13 * zoom >> 8;
var14 = var14 * zoom >> 8;
int var15 = var12 * var13 + var11 * var14 + (xOffset << 16);
int var16 = var12 * var14 - var11 * var13 + (yOffset << 16);
int var17 = x + y * Rasterizer2D.Rasterizer2D_width;
for (var2 = 0; var2 < var4; ++var2) {
int var18 = var9[var2];
for (y = 0; y < height; ++y) {
int var18 = xOffsets[y];
int var19 = var17 + var18;
int var20 = var15 + var14 * var18;
int var21 = var16 - var13 * var18;
for (var1 = -var10[var2]; var1 < 0; ++var1) {
for (x = -yOffsets[y]; x < 0; ++x) {
Rasterizer2D.Rasterizer2D_pixels[var19++] = this.pixels[this.subWidth * (var21 >> 16) + (var20 >> 16)];
var20 += var14;
var21 -= var13;

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

@@ -49,8 +49,8 @@ public class class191 {
)
static final void method3639(Actor var0) {
int var1 = var0.field948 - Client.cycle;
int var2 = var0.field932 * -527978816 + var0.field971 * 128;
int var3 = var0.field932 * -527978816 + var0.field973 * 128;
int var2 = var0.size * -527978816 + var0.field971 * 128;
int var3 = var0.size * -527978816 + var0.field973 * 128;
var0.x += (var2 - var0.x) / var1;
var0.y += (var3 - var0.y) / var1;
var0.field949 = 0;

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

@@ -46,7 +46,7 @@ public class class32 {
return;
}
URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + RunException.RunException_revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + class319.field3843 + "&e=" + var2);
URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + RunException.RunException_revision + "&u=" + RunException.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + ClientType.clientType + "&e=" + var2);
DataInputStream var4 = new DataInputStream(var3.openStream());
var4.read();
var4.close();

12
runescape-client/src/main/java/class325.java
View File

@@ -63,8 +63,8 @@ public class class325 {
var11 = var0.x;
var12 = var0.y;
var4 = var0.pathX[var0.pathLength - 1] * 128 + var0.field932 * -527978816;
int var5 = var0.field932 * -527978816 + var0.pathY[var0.pathLength - 1] * 128;
var4 = var0.pathX[var0.pathLength - 1] * 128 + var0.size * -527978816;
int var5 = var0.size * -527978816 + var0.pathY[var0.pathLength - 1] * 128;
if (var11 < var4) {
if (var12 < var5) {
var0.orientation = 1280;
@@ -203,8 +203,8 @@ public class class325 {
var0.spotAnimation = -1;
var0.field948 = 0;
var0.field976 = 0;
var0.x = var0.pathX[0] * 128 + var0.field932 * -527978816;
var0.y = var0.field932 * -527978816 + var0.pathY[0] * 128;
var0.x = var0.pathX[0] * 128 + var0.size * -527978816;
var0.y = var0.size * -527978816 + var0.pathY[0] * 128;
var0.method1765();
}
@@ -213,8 +213,8 @@ public class class325 {
var0.spotAnimation = -1;
var0.field948 = 0;
var0.field976 = 0;
var0.x = var0.field932 * -527978816 + var0.pathX[0] * 128;
var0.y = var0.field932 * -527978816 + var0.pathY[0] * 128;
var0.x = var0.size * -527978816 + var0.pathX[0] * 128;
var0.y = var0.size * -527978816 + var0.pathY[0] * 128;
var0.method1765();
}

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

@@ -152,7 +152,7 @@ final class class4 implements class0 {
int var3 = var2.x >> 7;
int var4 = var2.y >> 7;
if (var3 >= 0 && var3 < 104 && var4 >= 0 && var4 < 104) {
if (var2.field932 * 1669471931 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) {
if (var2.size * 1669471931 == 1 && (var2.x & 127) == 64 && (var2.y & 127) == 64) {
if (Client.tileLastDrawnActor[var3][var4] == Client.viewportDrawCount) {
continue;
}
@@ -162,7 +162,7 @@ final class class4 implements class0 {
long var5 = class267.calculateTag(0, 0, 1, !var2.definition.isInteractable, Client.npcIndices[var1]);
var2.playerCycle = Client.cycle;
PacketWriter.scene.drawEntity(WorldMapRectangle.plane, var2.x, var2.y, MusicPatchPcmStream.getTileHeight(var2.field932 * -527978816 - 64 + var2.x, var2.field932 * -527978816 - 64 + var2.y, WorldMapRectangle.plane), var2.field932 * -527978816 - 64 + 60, var2, var2.rotation, var5, var2.isWalking);
PacketWriter.scene.drawEntity(WorldMapRectangle.plane, var2.x, var2.y, MusicPatchPcmStream.getTileHeight(var2.size * -527978816 - 64 + var2.x, var2.size * -527978816 - 64 + var2.y, WorldMapRectangle.plane), var2.size * -527978816 - 64 + 60, var2, var2.rotation, var5, var2.isWalking);
}
}
}