Merge remote-tracking branch 'upstream/master' into master

Nice insider info btw, be nice if you shared it, so-called "open source" client.
This commit is contained in:
ThatGamerBlue
2021-05-28 21:39:25 +01:00
481 changed files with 53410 additions and 51723 deletions

View File

@@ -4,85 +4,43 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("fq")
@ObfuscatedName("fu")
@Implements("WorldMapRectangle")
public final class WorldMapRectangle {
@ObfuscatedName("i")
@ObfuscatedSignature(
descriptor = "Lee;"
)
@Export("clock")
protected static Clock clock;
@ObfuscatedName("h")
@ObfuscatedName("v")
@ObfuscatedGetter(
intValue = -127047771
intValue = 1091176811
)
@Export("width")
int width;
@ObfuscatedName("c")
@ObfuscatedName("n")
@ObfuscatedGetter(
intValue = -1046559811
intValue = 946840675
)
@Export("height")
int height;
@ObfuscatedName("o")
@ObfuscatedName("f")
@ObfuscatedGetter(
intValue = 1278151187
intValue = 1906627729
)
@Export("x")
int x;
@ObfuscatedName("g")
@ObfuscatedName("y")
@ObfuscatedGetter(
intValue = -234126027
intValue = -1404335247
)
@Export("y")
int y;
// $FF: synthetic field
@ObfuscatedSignature(
descriptor = "Lfs;"
descriptor = "Lff;"
)
final WorldMapManager this$0;
@ObfuscatedSignature(
descriptor = "(Lfs;)V"
descriptor = "(Lff;)V"
)
WorldMapRectangle(WorldMapManager var1) {
this.this$0 = var1; // L: 305
}
@ObfuscatedName("g")
@ObfuscatedSignature(
descriptor = "(II)Z",
garbageValue = "847610173"
)
public static boolean method3569(int var0) {
return var0 >= WorldMapDecorationType.field3159.id && var0 <= WorldMapDecorationType.field3148.id || var0 == WorldMapDecorationType.field3162.id; // L: 42
}
@ObfuscatedName("jg")
@ObfuscatedSignature(
descriptor = "(IIIIIB)V",
garbageValue = "-116"
)
@Export("drawScrollBar")
static final void drawScrollBar(int var0, int var1, int var2, int var3, int var4) {
GrandExchangeOfferTotalQuantityComparator.scrollBarSprites[0].drawAt(var0, var1); // L: 10138
GrandExchangeOfferTotalQuantityComparator.scrollBarSprites[1].drawAt(var0, var3 + var1 - 16); // L: 10139
Rasterizer2D.Rasterizer2D_fillRectangle(var0, var1 + 16, 16, var3 - 32, Client.field679); // L: 10140
int var5 = var3 * (var3 - 32) / var4; // L: 10141
if (var5 < 8) { // L: 10142
var5 = 8;
}
int var6 = (var3 - 32 - var5) * var2 / (var4 - var3); // L: 10143
Rasterizer2D.Rasterizer2D_fillRectangle(var0, var6 + var1 + 16, 16, var5, Client.field680); // L: 10144
Rasterizer2D.Rasterizer2D_drawVerticalLine(var0, var6 + var1 + 16, var5, Client.field658); // L: 10145
Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 1, var6 + var1 + 16, var5, Client.field658); // L: 10146
Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 16, 16, Client.field658); // L: 10147
Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var1 + 17, 16, Client.field658); // L: 10148
Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 15, var6 + var1 + 16, var5, Client.field681); // L: 10149
Rasterizer2D.Rasterizer2D_drawVerticalLine(var0 + 14, var6 + var1 + 17, var5 - 1, Client.field681); // L: 10150
Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0, var6 + var5 + var1 + 15, 16, Client.field681); // L: 10151
Rasterizer2D.Rasterizer2D_drawHorizontalLine(var0 + 1, var6 + var5 + var1 + 14, 15, Client.field681); // L: 10152
} // L: 10153
}