Consolidated a LOT of static classes (first pass)

This commit is contained in:
Pazaz 2022-06-27 14:24:48 -04:00
parent 9789c5b66e
commit 7ffd30e31c
264 changed files with 7190 additions and 8201 deletions

View file

@ -5,7 +5,9 @@ import org.openrs2.deob.annotation.Pc;
public final class Static123 {
@OriginalMember(owner = "client!jj", name = "e", descriptor = "I")
@OriginalMember(owner = "client!qk", name = "b", descriptor = "Lclient!na;")
public static final JagString aClass100_900 = JagString.parse("tbrefresh");
@OriginalMember(owner = "client!jj", name = "e", descriptor = "I")
public static int anInt3058 = 0;
@OriginalMember(owner = "client!jj", name = "j", descriptor = "Z")
@ -13,12 +15,22 @@ public final class Static123 {
@OriginalMember(owner = "client!ml", name = "K", descriptor = "I")
public static int anInt3947;
@OriginalMember(owner = "client!k", name = "l", descriptor = "[I")
public static int[] anIntArray292;
@OriginalMember(owner = "client!ta", name = "o", descriptor = "[I")
public static int[] anIntArray454;
@OriginalMember(owner = "client!nd", name = "s", descriptor = "I")
public static int anInt4069;
@OriginalMember(owner = "client!qk", name = "c", descriptor = "[I")
public static int[] anIntArray427;
@OriginalMember(owner = "client!lj", name = "B", descriptor = "I")
public static int anInt3555;
@OriginalMember(owner = "client!jj", name = "a", descriptor = "(Z)V")
public static void topBannerRefresh() {
if (!client.advertSuppressed && client.modeWhere != 2) {
try {
Static206.aClass100_900.browserControlCall(client.instance);
aClass100_900.browserControlCall(client.instance);
} catch (@Pc(26) Throwable local26) {
}
}
@ -32,7 +44,7 @@ public final class Static123 {
@Pc(14) int local14;
if (Static8.anIntArray8 != null) {
for (local14 = 0; local14 < Static8.anIntArray8.length; local14++) {
if (Static8.anIntArray8[local14] != -1000000 && (local10.anInt4444 <= Static8.anIntArray8[local14] || local10.anInt4447 <= Static8.anIntArray8[local14]) && (local10.anInt4460 <= Static96.anIntArray234[local14] || local10.anInt4445 <= Static96.anIntArray234[local14]) && (local10.anInt4460 >= Static127.anIntArray292[local14] || local10.anInt4445 >= Static127.anIntArray292[local14]) && (local10.anInt4458 <= Static234.anIntArray454[local14] || local10.anInt4449 <= Static234.anIntArray454[local14]) && (local10.anInt4458 >= Static206.anIntArray427[local14] || local10.anInt4449 >= Static206.anIntArray427[local14])) {
if (Static8.anIntArray8[local14] != -1000000 && (local10.anInt4444 <= Static8.anIntArray8[local14] || local10.anInt4447 <= Static8.anIntArray8[local14]) && (local10.anInt4460 <= Static96.anIntArray234[local14] || local10.anInt4445 <= Static96.anIntArray234[local14]) && (local10.anInt4460 >= anIntArray292[local14] || local10.anInt4445 >= anIntArray292[local14]) && (local10.anInt4458 <= anIntArray454[local14] || local10.anInt4449 <= anIntArray454[local14]) && (local10.anInt4458 >= anIntArray427[local14] || local10.anInt4449 >= anIntArray427[local14])) {
continue label194;
}
}
@ -42,7 +54,7 @@ public final class Static123 {
@Pc(158) int local158;
@Pc(137) boolean local137;
if (local10.anInt4453 == 1) {
local14 = local10.anInt4452 + SceneGraph.visibility - Static167.anInt4069;
local14 = local10.anInt4452 + SceneGraph.visibility - anInt4069;
if (local14 >= 0 && local14 <= SceneGraph.visibility + SceneGraph.visibility) {
local115 = local10.anInt4461 + SceneGraph.visibility - Static193.anInt4539;
if (local115 < 0) {
@ -60,7 +72,7 @@ public final class Static123 {
}
}
if (local137) {
local158 = Static149.anInt3555 - local10.anInt4460;
local158 = anInt3555 - local10.anInt4460;
if (local158 > 32) {
local10.anInt4462 = 1;
} else {
@ -80,11 +92,11 @@ public final class Static123 {
} else if (local10.anInt4453 == 2) {
local14 = local10.anInt4461 + SceneGraph.visibility - Static193.anInt4539;
if (local14 >= 0 && local14 <= SceneGraph.visibility + SceneGraph.visibility) {
local115 = local10.anInt4452 + SceneGraph.visibility - Static167.anInt4069;
local115 = local10.anInt4452 + SceneGraph.visibility - anInt4069;
if (local115 < 0) {
local115 = 0;
}
local126 = local10.anInt4446 + SceneGraph.visibility - Static167.anInt4069;
local126 = local10.anInt4446 + SceneGraph.visibility - anInt4069;
if (local126 > SceneGraph.visibility + SceneGraph.visibility) {
local126 = SceneGraph.visibility + SceneGraph.visibility;
}
@ -106,8 +118,8 @@ public final class Static123 {
local10.anInt4462 = 4;
local158 = -local158;
}
local10.anInt4448 = (local10.anInt4460 - Static149.anInt3555 << 8) / local158;
local10.anInt4456 = (local10.anInt4445 - Static149.anInt3555 << 8) / local158;
local10.anInt4448 = (local10.anInt4460 - anInt3555 << 8) / local158;
local10.anInt4456 = (local10.anInt4445 - anInt3555 << 8) / local158;
local10.anInt4459 = (local10.anInt4444 - anInt3947 << 8) / local158;
local10.anInt4463 = (local10.anInt4447 - anInt3947 << 8) / local158;
SceneGraph.aClass120Array2[SceneGraph.anInt4870++] = local10;
@ -125,11 +137,11 @@ public final class Static123 {
local126 = SceneGraph.visibility + SceneGraph.visibility;
}
if (local115 <= local126) {
@Pc(408) int local408 = local10.anInt4452 + SceneGraph.visibility - Static167.anInt4069;
@Pc(408) int local408 = local10.anInt4452 + SceneGraph.visibility - anInt4069;
if (local408 < 0) {
local408 = 0;
}
local158 = local10.anInt4446 + SceneGraph.visibility - Static167.anInt4069;
local158 = local10.anInt4446 + SceneGraph.visibility - anInt4069;
if (local158 > SceneGraph.visibility + SceneGraph.visibility) {
local158 = SceneGraph.visibility + SceneGraph.visibility;
}
@ -144,8 +156,8 @@ public final class Static123 {
}
if (local430) {
local10.anInt4462 = 5;
local10.anInt4448 = (local10.anInt4460 - Static149.anInt3555 << 8) / local14;
local10.anInt4456 = (local10.anInt4445 - Static149.anInt3555 << 8) / local14;
local10.anInt4448 = (local10.anInt4460 - anInt3555 << 8) / local14;
local10.anInt4456 = (local10.anInt4445 - anInt3555 << 8) / local14;
local10.anInt4454 = (local10.anInt4458 - Static217.anInt4903 << 8) / local14;
local10.anInt4450 = (local10.anInt4449 - Static217.anInt4903 << 8) / local14;
SceneGraph.aClass120Array2[SceneGraph.anInt4870++] = local10;