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

project: Fix some fields manually

Browse Source
This commit is contained in:
Owain van Brakel
2021-12-14 19:14:32 +01:00
parent 7c7bf0901a
commit a1e17650f6
40 changed files with 362 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,25 +20,26 @@ public class Widget extends Node {
@ObfuscatedSignature(
descriptor = "Liq;"
)
@Export("Widget_cachedSprites")
static EvictingDualNodeHashTable Widget_cachedSprites;
@ObfuscatedName("h")
@ObfuscatedSignature(
descriptor = "Liq;"
)
@Export("Widget_cachedModels")
static EvictingDualNodeHashTable Widget_cachedModels;
@ObfuscatedName("h")
@ObfuscatedName("g")
@ObfuscatedSignature(
descriptor = "Liq;"
)
@Export("Widget_cachedFonts")
static EvictingDualNodeHashTable Widget_cachedFonts;
@ObfuscatedName("g")
@ObfuscatedName("e")
@ObfuscatedSignature(
descriptor = "Liq;"
)
@Export("Widget_cachedSpriteMasks")
static EvictingDualNodeHashTable Widget_cachedSpriteMasks;
@ObfuscatedName("e")
@ObfuscatedSignature(
descriptor = "Liq;"
)
static EvictingDualNodeHashTable field3222;
@ObfuscatedName("a")
public static boolean field3223;
@ObfuscatedName("u")
@@ -221,7 +222,7 @@ public class Widget extends Node {
descriptor = "Lpg;"
)
@Export("fillMode")
public class429 fillMode;
public FillMode fillMode;
@ObfuscatedName("ae")
@ObfuscatedGetter(
intValue = 193150235
@@ -689,10 +690,10 @@ public class Widget extends Node {
public boolean prioritizeMenuEntry;
static {
Widget_cachedModels = new EvictingDualNodeHashTable(200);
Widget_cachedFonts = new EvictingDualNodeHashTable(50);
Widget_cachedSpriteMasks = new EvictingDualNodeHashTable(20);
field3222 = new EvictingDualNodeHashTable(8);
Widget_cachedSprites = new EvictingDualNodeHashTable(200);
Widget_cachedModels = new EvictingDualNodeHashTable(50);
Widget_cachedFonts = new EvictingDualNodeHashTable(20);
Widget_cachedSpriteMasks = new EvictingDualNodeHashTable(8);
field3223 = false;
}
@@ -727,7 +728,7 @@ public class Widget extends Node {
this.mouseOverColor = 0;
this.mouseOverColor2 = 0;
this.fill = false;
this.fillMode = class429.SOLID;
this.fillMode = FillMode.SOLID;
this.transparencyTop = 0;
this.transparencyBot = 0;
this.lineWid = 1;
@@ -1274,7 +1275,7 @@ public class Widget extends Node {
return null;
} else {
long var3 = ((long)this.spriteShadow << 40) + ((this.spriteFlipV ? 1L : 0L) << 38) + (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipH ? 1L : 0L) << 39);
SpritePixels var5 = (SpritePixels)Widget_cachedModels.get(var3);
SpritePixels var5 = (SpritePixels) Widget_cachedSprites.get(var3);
if (var5 != null) {
return var5;
} else {
@@ -1307,7 +1308,7 @@ public class Widget extends Node {
var5.shadow(this.spriteShadow);
}
Widget_cachedModels.put(var5, var3);
Widget_cachedSprites.put(var5, var3);
return var5;
}
}
@@ -1325,7 +1326,7 @@ public class Widget extends Node {
if (this.fontId == -1) {
return null;
} else {
Font var1 = (Font)Widget_cachedSpriteMasks.get((long)this.fontId);
Font var1 = (Font) Widget_cachedFonts.get((long)this.fontId);
if (var1 != null) {
return var1;
} else {
@@ -1350,7 +1351,7 @@ public class Widget extends Node {
}
if (var2 != null) {
Widget_cachedSpriteMasks.put(var2, (long)this.fontId);
Widget_cachedFonts.put(var2, (long)this.fontId);
} else {
field3223 = true;
}
@@ -1373,13 +1374,13 @@ public class Widget extends Node {
if (var2 == -1) {
return null;
} else {
SpritePixels var3 = (SpritePixels)Widget_cachedModels.get((long)var2);
SpritePixels var3 = (SpritePixels) Widget_cachedSprites.get((long)var2);
if (var3 != null) {
return var3;
} else {
var3 = class6.SpriteBuffer_getSprite(GraphicsObject.Widget_spritesArchive, var2, 0);
if (var3 != null) {
Widget_cachedModels.put(var3, (long)var2);
Widget_cachedSprites.put(var3, (long)var2);
} else {
field3223 = true;
}
@@ -1415,7 +1416,7 @@ public class Widget extends Node {
} else if (var5 == 1 && var6 == -1) {
return null;
} else {
Model var7 = (Model)Widget_cachedFonts.get((long)(var6 + (var5 << 16)));
Model var7 = (Model) Widget_cachedModels.get((long)(var6 + (var5 << 16)));
if (var7 == null) {
ModelData var8;
if (var5 == 1) {
@@ -1463,7 +1464,7 @@ public class Widget extends Node {
var7 = var8.toModel(var9.ambient + 64, var9.contrast + 768, -50, -10, -50);
}
Widget_cachedFonts.put(var7, (long)(var6 + (var5 << 16)));
Widget_cachedModels.put(var7, (long)(var6 + (var5 << 16)));
}
if (var1 != null) {
@@ -1490,7 +1491,7 @@ public class Widget extends Node {
return null;
} else {
long var3 = ((long)this.spriteShadow << 40) + ((long)this.outline << 36) + (long)var2 + ((this.spriteFlipV ? 1L : 0L) << 38) + ((this.spriteFlipH ? 1L : 0L) << 39);
SpriteMask var5 = (SpriteMask)field3222.get(var3);
SpriteMask var5 = (SpriteMask) Widget_cachedSpriteMasks.get(var3);
if (var5 != null) {
return var5;
} else {
@@ -1526,7 +1527,7 @@ public class Widget extends Node {
}
var5 = new SpriteMask(var7.subWidth, var7.subHeight, var9, var8, var2);
field3222.put(var5, var3);
Widget_cachedSpriteMasks.put(var5, var3);
return var5;
}
}