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

Merge pull request #3125 from JumpIfZero/rev-203-fix

Browse Source
This commit is contained in:
Owain van Brakel
2022-02-09 15:20:29 +01:00
committed by GitHub
parent 4e08e411d4 264cd50281
commit 7933406a3e
4 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -247,7 +247,8 @@ public class CollisionMap {
descriptor = "(IIB)V",
garbageValue = "-55"
)
public void method3650(int var1, int var2) {
@Export("setBlockedByFloor")
public void setBlockedByFloor(int var1, int var2) {
var1 -= this.xInset; // L: 199
var2 -= this.yInset; // L: 200
int[] var10000 = this.flags[var1]; // L: 201

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

@@ -249,7 +249,8 @@ public class KitDefinition extends DualNode {
descriptor = "(IIIB)I",
garbageValue = "78"
)
static final int method3224(int var0, int var1, int var2) {
@Export("hslToRgb")
static final int hslToRgb(int var0, int var1, int var2) {
if (var2 > 179) { // L: 1019
var1 /= 2;
}

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

@@ -51,7 +51,8 @@ public class LoginPacket implements class253 {
@ObfuscatedSignature(
descriptor = "[Lis;"
)
static final LoginPacket[] field3070;
@Export("LoginPacket_indexedValues")
static final LoginPacket[] LoginPacket_indexedValues;
@ObfuscatedName("w")
@ObfuscatedGetter(
intValue = -997966029
@@ -67,12 +68,12 @@ public class LoginPacket implements class253 {
field3066 = new LoginPacket(19, -2); // L: 9
field3063 = new LoginPacket(26, 8); // L: 10
field3068 = new LoginPacket(27, 0); // L: 11
field3070 = new LoginPacket[32]; // L: 13
LoginPacket_indexedValues = new LoginPacket[32]; // L: 13
LoginPacket[] var0 = new LoginPacket[]{field3063, field3066, field3064, field3071, field3068, field3065, field3067}; // L: 18
LoginPacket[] var1 = var0; // L: 20
for (int var2 = 0; var2 < var1.length; ++var2) { // L: 21
field3070[var1[var2].id] = var1[var2]; // L: 22
LoginPacket_indexedValues[var1[var2].id] = var1[var2]; // L: 22
}
} // L: 24

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

@@ -68,7 +68,7 @@ public class class145 extends class126 {
}
if (var5 >= 0) { // L: 601
var1[var5].method3650(var3, var4);
var1[var5].setBlockedByFloor(var3, var4);
}
}
}
@@ -259,7 +259,7 @@ public class class145 extends class126 {
var32 = var12 * 256 / var15; // L: 742
var33 = var13 / var16; // L: 743
var34 = var14 / var16; // L: 744
var30 = KitDefinition.method3224(var32, var33, var34); // L: 745
var30 = KitDefinition.hslToRgb(var32, var33, var34); // L: 745
var32 = var32 + Tiles.rndHue & 255; // L: 746
var34 += Tiles.rndLightness; // L: 747
if (var34 < 0) { // L: 748
@@ -268,7 +268,7 @@ public class class145 extends class126 {
var34 = 255;
}
var31 = KitDefinition.method3224(var32, var33, var34); // L: 750
var31 = KitDefinition.hslToRgb(var32, var33, var34); // L: 750
}
FloorOverlayDefinition var35;
@@ -346,7 +346,7 @@ public class class145 extends class126 {
var47 = -1; // L: 811
var40 = -2; // L: 812
} else {
var39 = KitDefinition.method3224(var35.hue, var35.saturation, var35.lightness); // L: 815
var39 = KitDefinition.hslToRgb(var35.hue, var35.saturation, var35.lightness); // L: 815
var41 = var35.hue + Tiles.rndHue & 255; // L: 816
var42 = var35.lightness + Tiles.rndLightness; // L: 817
if (var42 < 0) { // L: 818
@@ -355,7 +355,7 @@ public class class145 extends class126 {
var42 = 255;
}
var40 = KitDefinition.method3224(var41, var35.saturation, var42); // L: 820
var40 = KitDefinition.hslToRgb(var41, var35.saturation, var42); // L: 820
}
var41 = 0; // L: 823
@@ -372,7 +372,7 @@ public class class145 extends class126 {
var43 = 255;
}
var40 = KitDefinition.method3224(var42, var35.secondarySaturation, var43); // L: 830
var40 = KitDefinition.hslToRgb(var42, var35.secondarySaturation, var43); // L: 830
var41 = Rasterizer3D.Rasterizer3D_colorPalette[IgnoreList.method6264(var40, 96)]; // L: 831
}