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

Merge pull request #3151 from JumpIfZero/rev204-fixes

Browse Source
This commit is contained in:
Owain van Brakel
2022-03-23 18:26:57 +01:00
committed by GitHub
parent 5007a492cb f37ae1dd7c
commit 583cf58b4f
9 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
runescape-client/src/main/java/Buffer.java
View File

@@ -1049,7 +1049,8 @@ public class Buffer extends Node {
descriptor = "(II)V", descriptor = "(II)V",
garbageValue = "-646414330" garbageValue = "-646414330"
) )
public void method7807(int var1) { @Export("writeIntME")
public void writeIntME(int var1) {
this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 624 this.array[++this.offset - 1] = (byte)(var1 >> 8); // L: 624
this.array[++this.offset - 1] = (byte)var1; // L: 625 this.array[++this.offset - 1] = (byte)var1; // L: 625
this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 626 this.array[++this.offset - 1] = (byte)(var1 >> 24); // L: 626

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

@@ -2494,14 +2494,14 @@ public final class Client extends GameEngine implements Usernamed, OAuthApi {
var5.packetBuffer.writeInt(0); // L: 2030 var5.packetBuffer.writeInt(0); // L: 2030
var5.packetBuffer.writeInt(class268.archive11.hash); // L: 2031 var5.packetBuffer.writeInt(class268.archive11.hash); // L: 2031
var5.packetBuffer.method7806(ReflectionCheck.archive20.hash); // L: 2032 var5.packetBuffer.method7806(ReflectionCheck.archive20.hash); // L: 2032
var5.packetBuffer.method7807(DevicePcmPlayerProvider.archive14.hash); // L: 2033 var5.packetBuffer.writeIntME(DevicePcmPlayerProvider.archive14.hash); // L: 2033
var5.packetBuffer.writeInt(WorldMapData_1.archive8.hash); // L: 2034 var5.packetBuffer.writeInt(WorldMapData_1.archive8.hash); // L: 2034
var5.packetBuffer.method7807(FloorOverlayDefinition.archive2.hash); // L: 2035 var5.packetBuffer.writeIntME(FloorOverlayDefinition.archive2.hash); // L: 2035
var5.packetBuffer.method7807(class202.archive19.hash); // L: 2036 var5.packetBuffer.writeIntME(class202.archive19.hash); // L: 2036
var5.packetBuffer.method7806(0); // L: 2037 var5.packetBuffer.method7806(0); // L: 2037
var5.packetBuffer.method7746(MouseHandler.archive4.hash); // L: 2038 var5.packetBuffer.method7746(MouseHandler.archive4.hash); // L: 2038
var5.packetBuffer.writeInt(class132.archive9.hash); // L: 2039 var5.packetBuffer.writeInt(class132.archive9.hash); // L: 2039
var5.packetBuffer.method7807(World.archive10.hash); // L: 2040 var5.packetBuffer.writeIntME(World.archive10.hash); // L: 2040
var5.packetBuffer.writeInt(class4.archive13.hash); // L: 2041 var5.packetBuffer.writeInt(class4.archive13.hash); // L: 2041
var5.packetBuffer.method7806(JagexCache.archive18.hash); // L: 2042 var5.packetBuffer.method7806(JagexCache.archive18.hash); // L: 2042
var5.packetBuffer.method7806(ViewportMouse.archive15.hash); // L: 2043 var5.packetBuffer.method7806(ViewportMouse.archive15.hash); // L: 2043
@@ -2511,7 +2511,7 @@ public final class Client extends GameEngine implements Usernamed, OAuthApi {
var5.packetBuffer.method7806(class121.archive3.hash); // L: 2047 var5.packetBuffer.method7806(class121.archive3.hash); // L: 2047
var5.packetBuffer.method7746(class321.archive1.hash); // L: 2048 var5.packetBuffer.method7746(class321.archive1.hash); // L: 2048
var5.packetBuffer.method7806(ArchiveLoader.archive17.hash); // L: 2049 var5.packetBuffer.method7806(ArchiveLoader.archive17.hash); // L: 2049
var5.packetBuffer.method7807(TileItem.archive0.hash); // L: 2050 var5.packetBuffer.writeIntME(TileItem.archive0.hash); // L: 2050
var5.packetBuffer.writeInt(class135.archive12.hash); // L: 2051 var5.packetBuffer.writeInt(class135.archive12.hash); // L: 2051
var5.packetBuffer.xteaEncrypt(var29, var7, var5.packetBuffer.offset); // L: 2052 var5.packetBuffer.xteaEncrypt(var29, var7, var5.packetBuffer.offset); // L: 2052
var5.packetBuffer.writeLengthShort(var5.packetBuffer.offset - var14); // L: 2053 var5.packetBuffer.writeLengthShort(var5.packetBuffer.offset - var14); // L: 2053

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

@@ -399,7 +399,7 @@ public enum HorizontalAlignment implements MouseWheel {
Login.Login_loadingPercent = 90; // L: 1680 Login.Login_loadingPercent = 90; // L: 1680
} else { } else {
class33.textureProvider = new TextureProvider(class132.archive9, WorldMapData_1.archive8, 20, Interpreter.clientPreferences.method2266(), Client.isLowDetail ? 64 : 128); // L: 1683 class33.textureProvider = new TextureProvider(class132.archive9, WorldMapData_1.archive8, 20, Interpreter.clientPreferences.method2266(), Client.isLowDetail ? 64 : 128); // L: 1683
Rasterizer3D.Rasterizer3D_textureLoader(class33.textureProvider); // L: 1684 Rasterizer3D.Rasterizer3D_setTextureLoader(class33.textureProvider); // L: 1684
Rasterizer3D.Rasterizer3D_setBrightness(Interpreter.clientPreferences.method2266()); // L: 1685 Rasterizer3D.Rasterizer3D_setBrightness(Interpreter.clientPreferences.method2266()); // L: 1685
Client.titleLoadingStage = 100; // L: 1686 Client.titleLoadingStage = 100; // L: 1686
} }

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

@@ -41,7 +41,8 @@ public class LoginPacket implements class261 {
@ObfuscatedSignature( @ObfuscatedSignature(
descriptor = "[Ljx;" descriptor = "[Ljx;"
) )
static final LoginPacket[] field3138; @Export("LoginPacket_indexedValues")
static final LoginPacket[] LoginPacket_indexedValues;
@ObfuscatedName("d") @ObfuscatedName("d")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = -441279243 intValue = -441279243
@@ -56,11 +57,11 @@ public class LoginPacket implements class261 {
field3134 = new LoginPacket(18, -2); // L: 8 field3134 = new LoginPacket(18, -2); // L: 8
field3137 = new LoginPacket(19, -2); // L: 9 field3137 = new LoginPacket(19, -2); // L: 9
field3136 = new LoginPacket(27, 0); // L: 10 field3136 = new LoginPacket(27, 0); // L: 10
field3138 = new LoginPacket[32]; // L: 12 LoginPacket_indexedValues = new LoginPacket[32]; // L: 12
LoginPacket[] var0 = VertexNormal.method4495(); // L: 15 LoginPacket[] var0 = VertexNormal.method4495(); // L: 15
for (int var1 = 0; var1 < var0.length; ++var1) { // L: 16 for (int var1 = 0; var1 < var0.length; ++var1) { // L: 16
field3138[var0[var1].id] = var0[var1]; // L: 17 LoginPacket_indexedValues[var0[var1].id] = var0[var1]; // L: 17
} }
} // L: 19 } // L: 19

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

@@ -52,7 +52,7 @@ public class Messages {
@Export("resumePauseWidget") @Export("resumePauseWidget")
static void resumePauseWidget(int var0, int var1) { static void resumePauseWidget(int var0, int var1) {
PacketBufferNode var2 = ItemContainer.getPacketBufferNode(ClientPacket.field2943, Client.packetWriter.isaacCipher); // L: 9075 PacketBufferNode var2 = ItemContainer.getPacketBufferNode(ClientPacket.field2943, Client.packetWriter.isaacCipher); // L: 9075
var2.packetBuffer.method7807(var0); // L: 9076 var2.packetBuffer.writeIntME(var0); // L: 9076
var2.packetBuffer.method7795(var1); // L: 9077 var2.packetBuffer.method7795(var1); // L: 9077
Client.packetWriter.addNode(var2); // L: 9078 Client.packetWriter.addNode(var2); // L: 9078
} // L: 9079 } // L: 9079

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

@@ -152,7 +152,7 @@ public class Rasterizer3D extends Rasterizer2D {
descriptor = "(Lht;)V" descriptor = "(Lht;)V"
) )
@Export("Rasterizer3D_setTextureLoader") @Export("Rasterizer3D_setTextureLoader")
public static final void Rasterizer3D_textureLoader(TextureLoader var0) { public static final void Rasterizer3D_setTextureLoader(TextureLoader var0) {
Rasterizer3D_textureLoader = var0; // L: 91 Rasterizer3D_textureLoader = var0; // L: 91
} // L: 92 } // L: 92

16
runescape-client/src/main/java/SoundCache.java
View File

@@ -311,7 +311,7 @@ public class SoundCache {
Client.destinationY = var1; // L: 8687 Client.destinationY = var1; // L: 8687
var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2947, Client.packetWriter.isaacCipher); // L: 8689 var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2947, Client.packetWriter.isaacCipher); // L: 8689
var9.packetBuffer.method7795(var3); // L: 8690 var9.packetBuffer.method7795(var3); // L: 8690
var9.packetBuffer.method7807(PendingSpawn.selectedItemWidget); // L: 8691 var9.packetBuffer.writeIntME(PendingSpawn.selectedItemWidget); // L: 8691
var9.packetBuffer.method7791(selectedItemId); // L: 8692 var9.packetBuffer.method7791(selectedItemId); // L: 8692
var9.packetBuffer.method7788(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8693 var9.packetBuffer.method7788(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8693
var9.packetBuffer.method7796(class19.selectedItemSlot); // L: 8694 var9.packetBuffer.method7796(class19.selectedItemSlot); // L: 8694
@@ -420,7 +420,7 @@ public class SoundCache {
var9.packetBuffer.writeShort(var3); // L: 8473 var9.packetBuffer.writeShort(var3); // L: 8473
var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8474 var9.packetBuffer.writeByte(KeyHandler.KeyHandler_pressedKeys[82] ? 1 : 0); // L: 8474
var9.packetBuffer.method7796(class19.selectedItemSlot); // L: 8475 var9.packetBuffer.method7796(class19.selectedItemSlot); // L: 8475
var9.packetBuffer.method7807(PendingSpawn.selectedItemWidget); // L: 8476 var9.packetBuffer.writeIntME(PendingSpawn.selectedItemWidget); // L: 8476
Client.packetWriter.addNode(var9); // L: 8477 Client.packetWriter.addNode(var9); // L: 8477
} }
} else if (var2 == 15) { } else if (var2 == 15) {
@@ -453,7 +453,7 @@ public class SoundCache {
var8.packetBuffer.method7796(var3); // L: 8969 var8.packetBuffer.method7796(var3); // L: 8969
var8.packetBuffer.method7796(var0 + ApproximateRouteStrategy.baseX); // L: 8970 var8.packetBuffer.method7796(var0 + ApproximateRouteStrategy.baseX); // L: 8970
var8.packetBuffer.method7791(class250.baseY + var1); // L: 8971 var8.packetBuffer.method7791(class250.baseY + var1); // L: 8971
var8.packetBuffer.method7807(PendingSpawn.selectedItemWidget); // L: 8972 var8.packetBuffer.writeIntME(PendingSpawn.selectedItemWidget); // L: 8972
var8.packetBuffer.writeShort(selectedItemId); // L: 8973 var8.packetBuffer.writeShort(selectedItemId); // L: 8973
Client.packetWriter.addNode(var8); // L: 8974 Client.packetWriter.addNode(var8); // L: 8974
} else if (var2 == 17) { } else if (var2 == 17) {
@@ -615,7 +615,7 @@ public class SoundCache {
} }
} else if (var2 == 31) { } else if (var2 == 31) {
var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2954, Client.packetWriter.isaacCipher); // L: 8560 var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2954, Client.packetWriter.isaacCipher); // L: 8560
var8.packetBuffer.method7807(PendingSpawn.selectedItemWidget); // L: 8561 var8.packetBuffer.writeIntME(PendingSpawn.selectedItemWidget); // L: 8561
var8.packetBuffer.method7795(class19.selectedItemSlot); // L: 8562 var8.packetBuffer.method7795(class19.selectedItemSlot); // L: 8562
var8.packetBuffer.method7806(var1); // L: 8563 var8.packetBuffer.method7806(var1); // L: 8563
var8.packetBuffer.writeShort(var3); // L: 8564 var8.packetBuffer.writeShort(var3); // L: 8564
@@ -628,7 +628,7 @@ public class SoundCache {
} else if (var2 == 32) { } else if (var2 == 32) {
var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2984, Client.packetWriter.isaacCipher); // L: 8636 var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2984, Client.packetWriter.isaacCipher); // L: 8636
var8.packetBuffer.method7796(var3); // L: 8637 var8.packetBuffer.method7796(var3); // L: 8637
var8.packetBuffer.method7807(class92.selectedSpellWidget); // L: 8638 var8.packetBuffer.writeIntME(class92.selectedSpellWidget); // L: 8638
var8.packetBuffer.method7796(var0); // L: 8639 var8.packetBuffer.method7796(var0); // L: 8639
var8.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 8640 var8.packetBuffer.writeShort(Client.selectedSpellChildIndex); // L: 8640
var8.packetBuffer.writeInt(var1); // L: 8641 var8.packetBuffer.writeInt(var1); // L: 8641
@@ -674,7 +674,7 @@ public class SoundCache {
Client.field741 = var0; // L: 8521 Client.field741 = var0; // L: 8521
} else if (var2 == 37) { } else if (var2 == 37) {
var8 = ItemContainer.getPacketBufferNode(ClientPacket.field3002, Client.packetWriter.isaacCipher); // L: 8295 var8 = ItemContainer.getPacketBufferNode(ClientPacket.field3002, Client.packetWriter.isaacCipher); // L: 8295
var8.packetBuffer.method7807(var1); // L: 8296 var8.packetBuffer.writeIntME(var1); // L: 8296
var8.packetBuffer.writeShort(var3); // L: 8297 var8.packetBuffer.writeShort(var3); // L: 8297
var8.packetBuffer.method7791(var0); // L: 8298 var8.packetBuffer.method7791(var0); // L: 8298
Client.packetWriter.addNode(var8); // L: 8299 Client.packetWriter.addNode(var8); // L: 8299
@@ -709,7 +709,7 @@ public class SoundCache {
Client.field741 = var0; // L: 8844 Client.field741 = var0; // L: 8844
} else if (var2 == 40) { } else if (var2 == 40) {
var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2931, Client.packetWriter.isaacCipher); // L: 8368 var8 = ItemContainer.getPacketBufferNode(ClientPacket.field2931, Client.packetWriter.isaacCipher); // L: 8368
var8.packetBuffer.method7807(var1); // L: 8369 var8.packetBuffer.writeIntME(var1); // L: 8369
var8.packetBuffer.writeShort(var0); // L: 8370 var8.packetBuffer.writeShort(var0); // L: 8370
var8.packetBuffer.method7796(var3); // L: 8371 var8.packetBuffer.method7796(var3); // L: 8371
Client.packetWriter.addNode(var8); // L: 8372 Client.packetWriter.addNode(var8); // L: 8372
@@ -863,7 +863,7 @@ public class SoundCache {
if (var16 != null) { // L: 8649 if (var16 != null) { // L: 8649
var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2932, Client.packetWriter.isaacCipher); // L: 8651 var9 = ItemContainer.getPacketBufferNode(ClientPacket.field2932, Client.packetWriter.isaacCipher); // L: 8651
var9.packetBuffer.writeShort(Client.field688); // L: 8652 var9.packetBuffer.writeShort(Client.field688); // L: 8652
var9.packetBuffer.method7807(class92.selectedSpellWidget); // L: 8653 var9.packetBuffer.writeIntME(class92.selectedSpellWidget); // L: 8653
var9.packetBuffer.method7796(var16.itemId); // L: 8654 var9.packetBuffer.method7796(var16.itemId); // L: 8654
var9.packetBuffer.method7791(Client.selectedSpellChildIndex); // L: 8655 var9.packetBuffer.method7791(Client.selectedSpellChildIndex); // L: 8655
var9.packetBuffer.writeInt(var1); // L: 8656 var9.packetBuffer.writeInt(var1); // L: 8656

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

@@ -725,7 +725,7 @@ public class Varcs {
var22 = var9.method5686(); // L: 10790 var22 = var9.method5686(); // L: 10790
if (var22 != null) { // L: 10791 if (var22 != null) { // L: 10791
PacketBufferNode var23 = ItemContainer.getPacketBufferNode(ClientPacket.field2999, Client.packetWriter.isaacCipher); // L: 10792 PacketBufferNode var23 = ItemContainer.getPacketBufferNode(ClientPacket.field2999, Client.packetWriter.isaacCipher); // L: 10792
var23.packetBuffer.method7807(var22[0]); // L: 10793 var23.packetBuffer.writeIntME(var22[0]); // L: 10793
var23.packetBuffer.method7795(var9.childIndex); // L: 10794 var23.packetBuffer.method7795(var9.childIndex); // L: 10794
var23.packetBuffer.method7806(var22[1]); // L: 10795 var23.packetBuffer.method7806(var22[1]); // L: 10795
var23.packetBuffer.method7746(var9.method5699()); // L: 10796 var23.packetBuffer.method7746(var9.method5699()); // L: 10796

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

@@ -670,7 +670,7 @@ public class Widget extends Node {
@Export("containsMouse") @Export("containsMouse")
public boolean containsMouse; public boolean containsMouse;
@ObfuscatedName("fp") @ObfuscatedName("fp")
@Export("containsMouse") @Export("isClicked")
public boolean isClicked; public boolean isClicked;
@ObfuscatedName("fx") @ObfuscatedName("fx")
@ObfuscatedGetter( @ObfuscatedGetter(