2009Scape/rt4-client
1
0
Fork 0
mirror of https://gitlab.com/2009scape/rt4-client.git synced 2025-12-19 04:50:25 -07:00
Code Issues Projects Releases Packages Wiki Activity

Moved around more static methods, nothing final

Browse source 
Some of these are "incorrect" - I wanted to decrease the # of static classes first by grouping them if they're slightly related.
Then I'll do a second pass in each class to reorganize later.
This commit is contained in:
Pazaz 2022-05-16 01:13:34 -04:00
parent c988509e8e
commit ba4debb0d3
No known key found for this signature in database
GPG key ID: 8658637376F9B835
150 changed files with 2805 additions and 3034 deletions
Download patch file Download diff file Expand all files Collapse all files

38
client/src/main/java/rt4/Static247.java
View file

@ -6,7 +6,17 @@ import org.openrs2.deob.annotation.Pc;
public final class Static247 {
@OriginalMember(owner = "client!bl", name = "X", descriptor = "I")
@OriginalMember(owner = "client!ka", name = "t", descriptor = "[I")
public static final int[] anIntArray294 = new int[] { 0, 0, 2, 0, 0, 2, 1, 1, 0 };
@OriginalMember(owner = "client!uj", name = "A", descriptor = "[I")
public static final int[] anIntArray489 = new int[] { 2, 0, 0, 2, 0, 0, 0, 4, 4 };
@OriginalMember(owner = "client!gm", name = "gb", descriptor = "[I")
public static final int[] anIntArray211 = new int[] { 0, 4, 4, 8, 0, 0, 8, 0, 0 };
@OriginalMember(owner = "client!kd", name = "sb", descriptor = "[I")
public static final int[] anIntArray307 = new int[] { 1, 1, 0, 0, 0, 8, 0, 0, 8 };
@OriginalMember(owner = "client!hb", name = "t", descriptor = "[I")
public static final int[] anIntArray215 = new int[] { 160, 192, 80, 96, 0, 144, 80, 48, 160 };
@OriginalMember(owner = "client!bl", name = "X", descriptor = "I")
public static int anInt730 = -1;
@OriginalMember(owner = "client!ub", name = "a", descriptor = "(IIIIIII)V")
@ -224,23 +234,23 @@ public final class Static247 {
local8.anInt670 = Static191.anIntArray386[var10];
}
if (local616 != null) {
if ((local616.anInt3049 & Static90.anIntArray215[var10]) == 0) {
if ((local616.anInt3049 & anIntArray215[var10]) == 0) {
local8.anInt663 = 0;
} else if (local616.anInt3049 == 16) {
local8.anInt663 = 3;
local8.anInt665 = Static128.anIntArray294[var10];
local8.anInt665 = anIntArray294[var10];
local8.anInt667 = 3 - local8.anInt665;
} else if (local616.anInt3049 == 32) {
local8.anInt663 = 6;
local8.anInt665 = Static254.anIntArray489[var10];
local8.anInt665 = anIntArray489[var10];
local8.anInt667 = 6 - local8.anInt665;
} else if (local616.anInt3049 == 64) {
local8.anInt663 = 12;
local8.anInt665 = Static86.anIntArray211[var10];
local8.anInt665 = anIntArray211[var10];
local8.anInt667 = 12 - local8.anInt665;
} else {
local8.anInt663 = 9;
local8.anInt665 = Static131.anIntArray307[var10];
local8.anInt665 = anIntArray307[var10];
local8.anInt667 = 9 - local8.anInt665;
}
if ((local616.anInt3049 & local65) != 0 && !Static260.method3850(local27, local18, local21, local616.anInt3049)) {
@ -256,7 +266,7 @@ public final class Static247 {
local616.aClass8_6.render(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local616.anInt3048 - Static149.anInt3555, local616.anInt3051 - Static123.anInt3947, local616.anInt3044 - Static217.anInt4903, local616.key, local24, null);
}
}
if (local619 != null && !Static276.method4611(local27, local18, local21, local619.primary.getMaxY())) {
if (local619 != null && !method4611(local27, local18, local21, local619.primary.getMaxY())) {
if (GlRenderer.enabled) {
GlRenderer.method4159(local33 - 0.5F);
}
@ -573,7 +583,7 @@ public final class Static247 {
}
if (local8.anInt670 != 0) {
@Pc(2109) WallDecor local2109 = local8.wallDecor;
if (local2109 != null && !Static276.method4611(local27, local18, local21, local2109.primary.getMaxY())) {
if (local2109 != null && !method4611(local27, local18, local21, local2109.primary.getMaxY())) {
if ((local2109.anInt1395 & local8.anInt670) != 0) {
if (GlRenderer.enabled) {
LightingManager.method2393(Static149.anInt3555, Static123.anInt3947, Static217.anInt4903, local24, local18, local21);
@ -624,7 +634,7 @@ public final class Static247 {
}
}
@Pc(2388) Tile local2388;
if (local24 < Static126.anInt3114 - 1) {
if (local24 < SceneGraph.anInt3114 - 1) {
local2388 = SceneGraph.tiles[local24 + 1][local18][local21];
if (local2388 != null && local2388.aBoolean46) {
Static7.aClass69_32.addTail(local2388);
@ -681,4 +691,14 @@ public final class Static247 {
return arg0 & 0xFF;
}
@OriginalMember(owner = "client!wh", name = "a", descriptor = "(IIII)Z")
public static boolean method4611(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
if (Static9.method187(arg0, arg1, arg2)) {
@Pc(10) int local10 = arg1 << 7;
@Pc(14) int local14 = arg2 << 7;
return SceneGraph.method4394(local10 + 1, SceneGraph.tileHeights[arg0][arg1][arg2] + arg3, local14 + 1) && SceneGraph.method4394(local10 + 128 - 1, SceneGraph.tileHeights[arg0][arg1 + 1][arg2] + arg3, local14 + 1) && SceneGraph.method4394(local10 + 128 - 1, SceneGraph.tileHeights[arg0][arg1 + 1][arg2 + 1] + arg3, local14 + 128 - 1) && SceneGraph.method4394(local10 + 1, SceneGraph.tileHeights[arg0][arg1][arg2 + 1] + arg3, local14 + 128 - 1);
} else {
return false;
}
}
}