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

rs-client: refactoring (#1344)

Browse Source 
* Rename some things to be more consistent everywhere

* rs-client: refactoring

* MenuAction -> MenuOpcode merge
This commit is contained in:
Lucwousin
2019-08-20 22:24:51 +02:00
committed by GitHub
parent 0f46656e9d
commit db705f5dd5
297 changed files with 13734 additions and 14043 deletions
Download Patch File Download Diff File Expand all files Collapse all files

426
runescape-client/src/main/java/WorldMapIcon_0.java
View File

@@ -167,7 +167,7 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon {
)
@Export("getPreferencesFile")
public static AccessFile getPreferencesFile(String var0, String var1, boolean var2) {
File var3 = new File(class1.field2, "preferences" + var0 + ".dat");
File var3 = new File(class1.cacheDir, "preferences" + var0 + ".dat");
if (var3.exists()) {
try {
AccessFile var10 = new AccessFile(var3, "rw", 10000L);
@@ -177,9 +177,9 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon {
}
String var4 = "";
if (TextureProvider.field1539 == 33) {
if (TextureProvider.cacheGamebuild == 33) {
var4 = "_rc";
} else if (TextureProvider.field1539 == 34) {
} else if (TextureProvider.cacheGamebuild == 34) {
var4 = "_wip";
}
@@ -206,7 +206,8 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon {
signature = "(Lkx;II)V",
garbageValue = "164873785"
)
static void method210(PacketBuffer var0, int var1) {
@Export("readPlayerUpdate")
static void readPlayerUpdate(PacketBuffer var0, int var1) {
boolean var2 = var0.readBits(1) == 1;
if (var2) {
Players.Players_pendingUpdateIndices[++Players.Players_pendingUpdateCount - 1] = var1;
@@ -220,7 +221,7 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon {
} else if (Client.localPlayerIndex == var1) {
throw new RuntimeException();
} else {
Players.Players_regions[var1] = (var4.plane << 28) + (MusicPatchNode2.baseX * 64 + var4.pathX[0] >> 13 << 14) + (class1.baseY * 64 + var4.pathY[0] >> 13);
Players.Players_regions[var1] = (var4.plane << 28) + ((((MusicPatchNode2.baseX * 64) + var4.pathX[0]) >> 13) << 14) + (((class1.baseY * 64) + var4.pathY[0]) >> 13);
if (var4.field976 != -1) {
Players.Players_orientations[var1] = var4.field976;
} else {
@@ -232,178 +233,161 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon {
if (var0.readBits(1) != 0) {
class226.updateExternalPlayer(var0, var1);
}
}
} else if (var3 == 1) {
int var5 = var0.readBits(3);
int var6 = var4.pathX[0];
int var7 = var4.pathY[0];
if (var5 == 0) {
--var6;
--var7;
} else if (var5 == 1) {
--var7;
} else if (var5 == 2) {
++var6;
--var7;
} else if (var5 == 3) {
--var6;
} else if (var5 == 4) {
++var6;
} else if (var5 == 5) {
--var6;
++var7;
} else if (var5 == 6) {
++var7;
} else if (var5 == 7) {
++var6;
++var7;
}
if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) {
var4.resetPath(var6, var7);
var4.field638 = false;
} else if (var2) {
var4.field638 = true;
var4.tileX = var6;
var4.tileY = var7;
} else {
var4.field638 = false;
var4.method1189(var6, var7, Players.field1250[var1]);
}
} else if (var3 == 2) {
int var5 = var0.readBits(4);
int var6 = var4.pathX[0];
int var7 = var4.pathY[0];
if (var5 == 0) {
var6 -= 2;
var7 -= 2;
} else if (var5 == 1) {
--var6;
var7 -= 2;
} else if (var5 == 2) {
var7 -= 2;
} else if (var5 == 3) {
++var6;
var7 -= 2;
} else if (var5 == 4) {
var6 += 2;
var7 -= 2;
} else if (var5 == 5) {
var6 -= 2;
--var7;
} else if (var5 == 6) {
var6 += 2;
--var7;
} else if (var5 == 7) {
var6 -= 2;
} else if (var5 == 8) {
var6 += 2;
} else if (var5 == 9) {
var6 -= 2;
++var7;
} else if (var5 == 10) {
var6 += 2;
++var7;
} else if (var5 == 11) {
var6 -= 2;
var7 += 2;
} else if (var5 == 12) {
--var6;
var7 += 2;
} else if (var5 == 13) {
var7 += 2;
} else if (var5 == 14) {
++var6;
var7 += 2;
} else if (var5 == 15) {
var6 += 2;
var7 += 2;
}
if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) {
var4.resetPath(var6, var7);
var4.field638 = false;
} else if (var2) {
var4.field638 = true;
var4.tileX = var6;
var4.tileY = var7;
} else {
var4.field638 = false;
var4.method1189(var6, var7, Players.field1250[var1]);
}
} else if (var0.readBits(1) == 0) {
int var6 = var0.readBits(12);
int var7 = var6 >> 10;
int var8 = var6 >> 5 & 31;
if (var8 > 15) {
var8 -= 32;
}
int var9 = var6 & 31;
if (var9 > 15) {
var9 -= 32;
}
int var10 = var8 + var4.pathX[0];
int var11 = var9 + var4.pathY[0];
if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) {
var4.resetPath(var10, var11);
var4.field638 = false;
} else if (var2) {
var4.field638 = true;
var4.tileX = var10;
var4.tileY = var11;
} else {
var4.field638 = false;
var4.method1189(var10, var11, Players.field1250[var1]);
}
var4.plane = (byte) (var7 + var4.plane & 3);
if (Client.localPlayerIndex == var1) {
class42.plane = var4.plane;
}
} else {
int var5;
int var6;
int var7;
if (var3 == 1) {
var5 = var0.readBits(3);
var6 = var4.pathX[0];
var7 = var4.pathY[0];
if (var5 == 0) {
--var6;
--var7;
} else if (var5 == 1) {
--var7;
} else if (var5 == 2) {
++var6;
--var7;
} else if (var5 == 3) {
--var6;
} else if (var5 == 4) {
++var6;
} else if (var5 == 5) {
--var6;
++var7;
} else if (var5 == 6) {
++var7;
} else if (var5 == 7) {
++var6;
++var7;
}
if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) {
var4.resetPath(var6, var7);
var4.field638 = false;
} else if (var2) {
var4.field638 = true;
var4.tileX = var6;
var4.tileY = var7;
} else {
var4.field638 = false;
var4.method1189(var6, var7, Players.field1250[var1]);
}
} else if (var3 == 2) {
var5 = var0.readBits(4);
var6 = var4.pathX[0];
var7 = var4.pathY[0];
if (var5 == 0) {
var6 -= 2;
var7 -= 2;
} else if (var5 == 1) {
--var6;
var7 -= 2;
} else if (var5 == 2) {
var7 -= 2;
} else if (var5 == 3) {
++var6;
var7 -= 2;
} else if (var5 == 4) {
var6 += 2;
var7 -= 2;
} else if (var5 == 5) {
var6 -= 2;
--var7;
} else if (var5 == 6) {
var6 += 2;
--var7;
} else if (var5 == 7) {
var6 -= 2;
} else if (var5 == 8) {
var6 += 2;
} else if (var5 == 9) {
var6 -= 2;
++var7;
} else if (var5 == 10) {
var6 += 2;
++var7;
} else if (var5 == 11) {
var6 -= 2;
var7 += 2;
} else if (var5 == 12) {
--var6;
var7 += 2;
} else if (var5 == 13) {
var7 += 2;
} else if (var5 == 14) {
++var6;
var7 += 2;
} else if (var5 == 15) {
var6 += 2;
var7 += 2;
}
if (Client.localPlayerIndex != var1 || var4.x >= 1536 && var4.y >= 1536 && var4.x < 11776 && var4.y < 11776) {
if (var2) {
var4.field638 = true;
var4.tileX = var6;
var4.tileY = var7;
} else {
var4.field638 = false;
var4.method1189(var6, var7, Players.field1250[var1]);
}
} else {
var4.resetPath(var6, var7);
var4.field638 = false;
}
int var6 = var0.readBits(30);
int var7 = var6 >> 28;
int var8 = var6 >> 14 & 16383;
int var9 = var6 & 16383;
int var10 = (MusicPatchNode2.baseX * 64 + var8 + var4.pathX[0] & 16383) - MusicPatchNode2.baseX * 64;
int var11 = (class1.baseY * 64 + var9 + var4.pathY[0] & 16383) - class1.baseY * 64;
if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) {
var4.resetPath(var10, var11);
var4.field638 = false;
} else if (var2) {
var4.field638 = true;
var4.tileX = var10;
var4.tileY = var11;
} else {
var5 = var0.readBits(1);
int var8;
int var9;
int var10;
int var11;
if (var5 == 0) {
var6 = var0.readBits(12);
var7 = var6 >> 10;
var8 = var6 >> 5 & 31;
if (var8 > 15) {
var8 -= 32;
}
var9 = var6 & 31;
if (var9 > 15) {
var9 -= 32;
}
var10 = var8 + var4.pathX[0];
var11 = var9 + var4.pathY[0];
if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) {
var4.resetPath(var10, var11);
var4.field638 = false;
} else if (var2) {
var4.field638 = true;
var4.tileX = var10;
var4.tileY = var11;
} else {
var4.field638 = false;
var4.method1189(var10, var11, Players.field1250[var1]);
}
var4.plane = (byte)(var7 + var4.plane & 3);
if (Client.localPlayerIndex == var1) {
class42.plane = var4.plane;
}
} else {
var6 = var0.readBits(30);
var7 = var6 >> 28;
var8 = var6 >> 14 & 16383;
var9 = var6 & 16383;
var10 = (MusicPatchNode2.baseX * 64 + var8 + var4.pathX[0] & 16383) - MusicPatchNode2.baseX * 64;
var11 = (class1.baseY * 64 + var9 + var4.pathY[0] & 16383) - class1.baseY * 64;
if (Client.localPlayerIndex == var1 && (var4.x < 1536 || var4.y < 1536 || var4.x >= 11776 || var4.y >= 11776)) {
var4.resetPath(var10, var11);
var4.field638 = false;
} else if (var2) {
var4.field638 = true;
var4.tileX = var10;
var4.tileY = var11;
} else {
var4.field638 = false;
var4.method1189(var10, var11, Players.field1250[var1]);
}
var4.plane = (byte)(var7 + var4.plane & 3);
if (Client.localPlayerIndex == var1) {
class42.plane = var4.plane;
}
}
var4.field638 = false;
var4.method1189(var10, var11, Players.field1250[var1]);
}
var4.plane = (byte) (var7 + var4.plane & 3);
if (Client.localPlayerIndex == var1) {
class42.plane = var4.plane;
}
}
}
@@ -414,47 +398,50 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon {
)
@Export("checkIfMinimapClicked")
static final void checkIfMinimapClicked(Widget var0, int var1, int var2) {
if (Client.minimapState == 0 || Client.minimapState == 3) {
if (!Client.isMenuOpen && (MouseHandler.MouseHandler_lastButton == 1 || !DevicePcmPlayerProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4)) {
SpriteMask var3 = var0.getSpriteMask(true);
if (var3 == null) {
return;
}
int var4 = MouseHandler.MouseHandler_lastPressedX - var1;
int var5 = MouseHandler.MouseHandler_lastPressedY - var2;
if (var3.contains(var4, var5)) {
var4 -= var3.width / 2;
var5 -= var3.height / 2;
int var6 = Client.camAngleY & 2047;
int var7 = Rasterizer3D.Rasterizer3D_sine[var6];
int var8 = Rasterizer3D.Rasterizer3D_cosine[var6];
int var9 = var4 * var8 + var5 * var7 >> 11;
int var10 = var5 * var8 - var7 * var4 >> 11;
int var11 = var9 + Client.localPlayer.x >> 7;
int var12 = Client.localPlayer.y - var10 >> 7;
PacketBufferNode var13 = Archive.method4265(ClientPacket.field2262, Client.packetWriter.isaacCipher);
var13.packetBuffer.writeByte(18);
var13.packetBuffer.method5530(class1.baseY * 64 + var12);
var13.packetBuffer.method5530(MusicPatchNode2.baseX * 64 + var11);
var13.packetBuffer.method5520(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0);
var13.packetBuffer.writeByte(var4);
var13.packetBuffer.writeByte(var5);
var13.packetBuffer.writeShort(Client.camAngleY);
var13.packetBuffer.writeByte(57);
var13.packetBuffer.writeByte(0);
var13.packetBuffer.writeByte(0);
var13.packetBuffer.writeByte(89);
var13.packetBuffer.writeShort(Client.localPlayer.x);
var13.packetBuffer.writeShort(Client.localPlayer.y);
var13.packetBuffer.writeByte(63);
Client.packetWriter.method2219(var13);
Client.destinationX = var11;
Client.destinationY = var12;
}
}
if (Client.minimapState != 0 && Client.minimapState != 3) {
return;
}
if (Client.isMenuOpen || (MouseHandler.MouseHandler_lastButton != 1 && (DevicePcmPlayerProvider.mouseCam || MouseHandler.MouseHandler_lastButton != 4))) {
return;
}
SpriteMask var3 = var0.getSpriteMask(true);
if (var3 == null) {
return;
}
int var4 = MouseHandler.MouseHandler_lastPressedX - var1;
int var5 = MouseHandler.MouseHandler_lastPressedY - var2;
if (!var3.contains(var4, var5)) {
return;
}
var4 -= var3.width / 2;
var5 -= var3.height / 2;
int var6 = Client.camAngleY & 2047;
int var7 = Rasterizer3D.Rasterizer3D_sine[var6];
int var8 = Rasterizer3D.Rasterizer3D_cosine[var6];
int var9 = var4 * var8 + var5 * var7 >> 11;
int var10 = var5 * var8 - var7 * var4 >> 11;
int var11 = var9 + Client.localPlayer.x >> 7;
int var12 = Client.localPlayer.y - var10 >> 7;
PacketBufferNode var13 = Archive.getPacketBufferNode(ClientPacket.field2262, Client.packetWriter.isaacCipher);
var13.packetBuffer.writeByte(18);
var13.packetBuffer.method5530(class1.baseY * 64 + var12);
var13.packetBuffer.method5530(MusicPatchNode2.baseX * 64 + var11);
var13.packetBuffer.method5520(KeyHandler.KeyHandler_pressedKeys[82] ? (KeyHandler.KeyHandler_pressedKeys[81] ? 2 : 1) : 0);
var13.packetBuffer.writeByte(var4);
var13.packetBuffer.writeByte(var5);
var13.packetBuffer.writeShort(Client.camAngleY);
var13.packetBuffer.writeByte(57);
var13.packetBuffer.writeByte(0);
var13.packetBuffer.writeByte(0);
var13.packetBuffer.writeByte(89);
var13.packetBuffer.writeShort(Client.localPlayer.x);
var13.packetBuffer.writeShort(Client.localPlayer.y);
var13.packetBuffer.writeByte(63);
Client.packetWriter.addNode(var13);
Client.destinationX = var11;
Client.destinationY = var12;
}
@ObfuscatedName("jf")
@@ -465,13 +452,14 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon {
@Export("drawCompass")
static final void drawCompass(Widget var0, int var1, int var2, int var3) {
SpriteMask var4 = var0.getSpriteMask(false);
if (var4 != null) {
if (Client.minimapState < 3) {
Message.compass.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths);
} else {
Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths);
}
if (var4 == null) {
return;
}
if (Client.minimapState < 3) {
Message.compass.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, 25, 25, Client.camAngleY, 256, var4.xStarts, var4.xWidths);
} else {
Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths);
}
}
}