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

runescape-client: fix the thing

Browse Source
This commit is contained in:
ThatGamerBlue
2020-12-11 06:14:29 +00:00
parent f74baf08ce
commit 463bc42f5f
325 changed files with 35526 additions and 35531 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,31 +86,31 @@ public class DynamicObject extends Entity {
)
DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, Entity var9) {
this.id = var1;
this.type = var2;
this.orientation = var3;
this.plane = var4;
this.x = var5;
this.y = var6;
if (var7 != -1) {
this.sequenceDefinition = ParamDefinition.SequenceDefinition_get(var7);
this.frame = 0;
this.cycleStart = Client.cycle - 1;
if (this.sequenceDefinition.field3548 == 0 && var9 != null && var9 instanceof DynamicObject) {
DynamicObject var10 = (DynamicObject)var9;
if (var10.sequenceDefinition == this.sequenceDefinition) {
this.frame = var10.frame;
this.cycleStart = var10.cycleStart;
return;
this.type = var2; // L: 21
this.orientation = var3; // L: 22
this.plane = var4; // L: 23
this.x = var5; // L: 24
this.y = var6; // L: 25
if (var7 != -1) { // L: 26
this.sequenceDefinition = ParamDefinition.SequenceDefinition_get(var7); // L: 27
this.frame = 0; // L: 28
this.cycleStart = Client.cycle - 1; // L: 29
if (this.sequenceDefinition.field3548 == 0 && var9 != null && var9 instanceof DynamicObject) { // L: 30
DynamicObject var10 = (DynamicObject)var9; // L: 31
if (var10.sequenceDefinition == this.sequenceDefinition) { // L: 32
this.frame = var10.frame; // L: 33
this.cycleStart = var10.cycleStart; // L: 34
return; // L: 35
}
}
if (var8 && this.sequenceDefinition.frameCount != -1) {
this.frame = (int)(Math.random() * (double)this.sequenceDefinition.frameIds.length);
this.cycleStart -= (int)(Math.random() * (double)this.sequenceDefinition.frameLengths[this.frame]);
if (var8 && this.sequenceDefinition.frameCount != -1) { // L: 38
this.frame = (int)(Math.random() * (double)this.sequenceDefinition.frameIds.length); // L: 39
this.cycleStart -= (int)(Math.random() * (double)this.sequenceDefinition.frameLengths[this.frame]); // L: 40
}
}
}
} // L: 43
@ObfuscatedName("l")
@ObfuscatedSignature(
@@ -119,59 +119,59 @@ public class DynamicObject extends Entity {
)
@Export("getModel")
protected final Model getModel() {
if (this.sequenceDefinition != null) {
int var1 = Client.cycle - this.cycleStart;
if (var1 > 100 && this.sequenceDefinition.frameCount > 0) {
if (this.sequenceDefinition != null) { // L: 46
int var1 = Client.cycle - this.cycleStart; // L: 47
if (var1 > 100 && this.sequenceDefinition.frameCount > 0) { // L: 48
var1 = 100;
}
label56: {
do {
do {
if (var1 <= this.sequenceDefinition.frameLengths[this.frame]) {
if (var1 <= this.sequenceDefinition.frameLengths[this.frame]) { // L: 49
break label56;
}
var1 -= this.sequenceDefinition.frameLengths[this.frame];
++this.frame;
} while(this.frame < this.sequenceDefinition.frameIds.length);
var1 -= this.sequenceDefinition.frameLengths[this.frame]; // L: 50
++this.frame; // L: 51
} while(this.frame < this.sequenceDefinition.frameIds.length); // L: 52
this.frame -= this.sequenceDefinition.frameCount;
this.frame -= this.sequenceDefinition.frameCount; // L: 53
} while(this.frame >= 0 && this.frame < this.sequenceDefinition.frameIds.length);
this.sequenceDefinition = null;
this.sequenceDefinition = null; // L: 55
}
this.cycleStart = Client.cycle - var1;
this.cycleStart = Client.cycle - var1; // L: 60
}
ObjectDefinition var12 = WorldMapDecoration.getObjectDefinition(this.id);
if (var12.transforms != null) {
ObjectDefinition var12 = WorldMapDecoration.getObjectDefinition(this.id); // L: 62
if (var12.transforms != null) { // L: 63
var12 = var12.transform();
}
if (var12 == null) {
if (var12 == null) { // L: 64
return null;
} else {
int var2;
int var3;
if (this.orientation != 1 && this.orientation != 3) {
var2 = var12.sizeX;
var3 = var12.sizeY;
if (this.orientation != 1 && this.orientation != 3) { // L: 67
var2 = var12.sizeX; // L: 72
var3 = var12.sizeY; // L: 73
} else {
var2 = var12.sizeY;
var3 = var12.sizeX;
var2 = var12.sizeY; // L: 68
var3 = var12.sizeX; // L: 69
}
int var4 = (var2 >> 1) + this.x;
int var5 = (var2 + 1 >> 1) + this.x;
int var6 = (var3 >> 1) + this.y;
int var7 = (var3 + 1 >> 1) + this.y;
int[][] var8 = Tiles.Tiles_heights[this.plane];
int var9 = var8[var5][var7] + var8[var4][var7] + var8[var5][var6] + var8[var4][var6] >> 2;
int var10 = (this.x << 7) + (var2 << 6);
int var11 = (this.y << 7) + (var3 << 6);
return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame);
int var4 = (var2 >> 1) + this.x; // L: 75
int var5 = (var2 + 1 >> 1) + this.x; // L: 76
int var6 = (var3 >> 1) + this.y; // L: 77
int var7 = (var3 + 1 >> 1) + this.y; // L: 78
int[][] var8 = Tiles.Tiles_heights[this.plane]; // L: 79
int var9 = var8[var5][var7] + var8[var4][var7] + var8[var5][var6] + var8[var4][var6] >> 2; // L: 80
int var10 = (this.x << 7) + (var2 << 6); // L: 81
int var11 = (this.y << 7) + (var3 << 6); // L: 82
return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame); // L: 83
}
}
@@ -181,7 +181,7 @@ public class DynamicObject extends Entity {
garbageValue = "92"
)
static WorldMapSprite method2300(byte[] var0) {
return var0 == null ? new WorldMapSprite() : new WorldMapSprite(WorldMapSection0.convertJpgToSprite(var0).pixels);
return var0 == null ? new WorldMapSprite() : new WorldMapSprite(WorldMapSection0.convertJpgToSprite(var0).pixels); // L: 19 20
}
@ObfuscatedName("h")
@@ -190,7 +190,7 @@ public class DynamicObject extends Entity {
garbageValue = "1772389683"
)
static int method2304() {
return 12;
return 12; // L: 123
}
@ObfuscatedName("aw")
@@ -199,7 +199,7 @@ public class DynamicObject extends Entity {
garbageValue = "-35"
)
public static int method2305(byte[] var0, int var1) {
return WorldMapRectangle.method334(var0, 0, var1);
return WorldMapRectangle.method334(var0, 0, var1); // L: 54
}
@ObfuscatedName("ix")
@@ -209,9 +209,9 @@ public class DynamicObject extends Entity {
)
@Export("resumePauseWidget")
static void resumePauseWidget(int var0, int var1) {
PacketBufferNode var2 = ItemContainer.getPacketBufferNode(ClientPacket.field2266, Client.packetWriter.isaacCipher);
var2.packetBuffer.writeInt(var0);
var2.packetBuffer.writeShort(var1);
Client.packetWriter.addNode(var2);
}
PacketBufferNode var2 = ItemContainer.getPacketBufferNode(ClientPacket.field2266, Client.packetWriter.isaacCipher); // L: 8361
var2.packetBuffer.writeInt(var0); // L: 8362
var2.packetBuffer.writeShort(var1); // L: 8363
Client.packetWriter.addNode(var2); // L: 8364
} // L: 8365
}