Moved some more methods to utility classes

This commit is contained in:
Pazaz 2022-06-28 04:19:41 -04:00
parent ad45cb829b
commit 4c73508f1f
25 changed files with 817 additions and 805 deletions

View file

@ -1383,7 +1383,7 @@ public class LoginManager {
@Pc(98) int local98 = (local88 / 8 << 8) + local76 / 8;
for (@Pc(100) int local100 = 0; local100 < regionBitPacked.length; local100++) {
if (regionBitPacked[local100] == local98 && local13[local100] != null) {
method4228(local82, local32 * 8, local21, PathFinder.collisionMaps, local39 * 8, local13[local100], local65, (local76 & 0x7) * 8, (local88 & 0x7) * 8, arg0);
SceneGraph.method4228(local82, local32 * 8, local21, PathFinder.collisionMaps, local39 * 8, local13[local100], local65, (local76 & 0x7) * 8, (local88 & 0x7) * 8, arg0);
local54 = true;
break;
}
@ -1391,7 +1391,7 @@ public class LoginManager {
}
}
if (!local54) {
method645(local21, local39 * 8, local32 * 8, 8, 8);
SceneGraph.method645(local21, local39 * 8, local32 * 8, 8, 8);
}
}
}
@ -1489,227 +1489,11 @@ public class LoginManager {
Protocol.anInt4247 = 0;
}
@OriginalMember(owner = "client!tm", name = "a", descriptor = "(III[Lclient!mj;IB[BIIIZ)V")
public static void method4228(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) CollisionMap[] arg3, @OriginalArg(4) int arg4, @OriginalArg(6) byte[] arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7, @OriginalArg(9) int arg8, @OriginalArg(10) boolean arg9) {
@Pc(17) int local17;
if (!arg9) {
for (@Pc(10) int local10 = 0; local10 < 8; local10++) {
for (local17 = 0; local17 < 8; local17++) {
if (arg1 + local10 > 0 && local10 + arg1 < 103 && local17 + arg4 > 0 && arg4 + local17 < 103) {
arg3[arg2].flags[local10 + arg1][local17 + arg4] &= 0xFEFFFFFF;
}
}
}
}
@Pc(87) byte local87;
if (arg9) {
local87 = 1;
} else {
local87 = 4;
}
@Pc(96) Buffer local96 = new Buffer(arg5);
@Pc(103) int local103;
@Pc(108) int local108;
for (local17 = 0; local17 < local87; local17++) {
for (local103 = 0; local103 < 64; local103++) {
for (local108 = 0; local108 < 64; local108++) {
if (arg6 == local17 && arg8 <= local103 && arg8 + 8 > local103 && arg7 <= local108 && local108 < arg7 + 8) {
SceneGraph.readTile(0, 0, arg9, local96, method3659(arg0, local103 & 0x7, local108 & 0x7) + arg4, method4360(arg0, local108 & 0x7, local103 & 0x7) + arg1, arg0, arg2);
} else {
SceneGraph.readTile(0, 0, arg9, local96, -1, -1, 0, 0);
}
}
}
}
@Pc(232) int local232;
@Pc(417) int local417;
@Pc(255) int local255;
@Pc(266) int local266;
@Pc(316) int local316;
while (local96.data.length > local96.offset) {
local103 = local96.g1();
if (local103 != 129) {
local96.offset--;
break;
}
for (local108 = 0; local108 < 4; local108++) {
@Pc(223) byte local223 = local96.g1b();
@Pc(237) int local237;
if (local223 == 0) {
if (local108 <= arg6) {
local237 = arg1 + 7;
local232 = arg1;
local255 = arg4 + 7;
if (local255 < 0) {
local255 = 0;
} else if (local255 >= 104) {
local255 = 104;
}
if (local237 < 0) {
local237 = 0;
} else if (local237 >= 104) {
local237 = 104;
}
local417 = arg4;
if (arg4 < 0) {
local417 = 0;
} else if (arg4 >= 104) {
local417 = 104;
}
if (arg1 < 0) {
local232 = 0;
} else if (arg1 >= 104) {
local232 = 104;
}
while (local237 > local232) {
while (local417 < local255) {
SceneGraph.aByteArrayArrayArray13[arg2][local232][local417] = 0;
local417++;
}
local232++;
}
}
} else if (local223 == 1) {
for (local232 = 0; local232 < 64; local232 += 4) {
for (local237 = 0; local237 < 64; local237 += 4) {
@Pc(246) byte local246 = local96.g1b();
if (local108 <= arg6) {
for (local255 = local232; local255 < local232 + 4; local255++) {
for (local266 = local237; local266 < local237 + 4; local266++) {
if (local255 >= arg8 && local255 < arg8 + 8 && local266 >= arg7 && arg7 + 8 > arg7) {
local316 = arg1 + method4360(arg0, local266 & 0x7, local255 & 0x7);
@Pc(328) int local328 = method3659(arg0, local255 & 0x7, local266 & 0x7) + arg4;
if (local316 >= 0 && local316 < 104 && local328 >= 0 && local328 < 104) {
SceneGraph.aByteArrayArrayArray13[arg2][local316][local328] = local246;
}
}
}
}
}
}
}
} else if (local223 == 2) {
}
}
}
@Pc(497) int local497;
if (GlRenderer.enabled && !arg9) {
@Pc(472) Environment local472 = null;
label207:
while (true) {
label200:
do {
while (local96.data.length > local96.offset) {
local108 = local96.g1();
if (local108 != 0) {
if (local108 != 1) {
throw new IllegalStateException();
}
local497 = local96.g1();
continue label200;
}
local472 = new Environment(local96);
}
if (local472 == null) {
local472 = new Environment();
}
FogManager.chunksAtmosphere[arg1 >> 3][arg4 >> 3] = local472;
break label207;
} while (local497 <= 0);
for (local232 = 0; local232 < local497; local232++) {
@Pc(517) Light local517 = new Light(local96);
if (local517.anInt2243 == 31) {
@Pc(529) LightType local529 = LightTypeList.get(local96.g2());
local517.method1762(local529.anInt2865, local529.anInt2873, local529.anInt2867, local529.anInt2872);
}
local417 = local517.x >> 7;
local255 = local517.z >> 7;
if (arg6 == local517.level && local417 >= arg8 && arg8 + 8 > local417 && arg7 <= local255 && arg7 + 8 > local255) {
local266 = method3675(arg0, local517.x & 0x3FF, local517.z & 0x3FF) + (arg1 << 7);
local316 = method3388(local517.x & 0x3FF, arg0, local517.z & 0x3FF) + (arg4 << 7);
local517.x = local266;
local517.z = local316;
local417 = local517.x >> 7;
local255 = local517.z >> 7;
if (local417 >= 0 && local255 >= 0 && local417 < 104 && local255 < 104) {
local517.aBoolean125 = (SceneGraph.tileFlags[1][local417][local255] & 0x2) != 0;
local517.y = SceneGraph.tileHeights[local517.level][local417][local255] - local517.y;
LightingManager.method2389(local517);
}
}
}
}
}
local103 = arg1 + 7;
local108 = arg4 + 7;
for (local497 = arg1; local497 < local103; local497++) {
for (local232 = arg4; local232 < local108; local232++) {
SceneGraph.aByteArrayArrayArray13[arg2][local497][local232] = 0;
}
}
}
@OriginalMember(owner = "client!tb", name = "h", descriptor = "(I)I")
public static int method4044() {
return Cheat.shiftClick && Keyboard.pressedKeys[Keyboard.KEY_SHIFT] && MiniMenu.size > 2 ? MiniMenu.cursors[MiniMenu.size - 2] : MiniMenu.cursors[MiniMenu.size - 1];
}
@OriginalMember(owner = "client!rg", name = "a", descriptor = "(IZII)I")
public static int method4360(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
@Pc(3) int local3 = arg0 & 0x3;
if (local3 == 0) {
return arg2;
} else if (local3 == 1) {
return arg1;
} else if (local3 == 2) {
return 7 - arg2;
} else {
return 7 - arg1;
}
}
@OriginalMember(owner = "client!qg", name = "a", descriptor = "(IBII)I")
public static int method3659(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
@Pc(3) int local3 = arg0 & 0x3;
if (local3 == 0) {
return arg2;
} else if (local3 == 1) {
return 7 - arg1;
} else if (local3 == 2) {
return 7 - arg2;
} else {
return arg1;
}
}
@OriginalMember(owner = "client!qi", name = "a", descriptor = "(IIBI)I")
public static int method3675(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2) {
@Pc(3) int local3 = arg0 & 0x3;
if (local3 == 0) {
return arg1;
} else if (local3 == 1) {
return arg2;
} else if (local3 == 2) {
return 1023 - arg1;
} else {
return 1023 - arg2;
}
}
@OriginalMember(owner = "client!ol", name = "a", descriptor = "(IIZI)I")
public static int method3388(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2) {
@Pc(3) int local3 = arg1 & 0x3;
if (local3 == 0) {
return arg2;
} else if (local3 == 1) {
return 1023 - arg0;
} else if (local3 == 2) {
return 1023 - arg2;
} else {
return arg0;
}
}
@OriginalMember(owner = "client!ij", name = "a", descriptor = "(B)V")
public static void method2297() {
@Pc(3) int local3 = InterfaceList.anInt4271;
@ -1866,7 +1650,7 @@ public class LoginManager {
local53 = local9[local20];
if (local53 != null) {
client.audioLoop();
method2203(PathFinder.collisionMaps, arg0, SceneGraph.centralZoneX * 8 - 48, local49, local38, (SceneGraph.centralZoneZ - 6) * 8, local53);
SceneGraph.method2203(PathFinder.collisionMaps, arg0, SceneGraph.centralZoneX * 8 - 48, local49, local38, (SceneGraph.centralZoneZ - 6) * 8, local53);
}
}
for (local20 = 0; local20 < local18; local20++) {
@ -1876,254 +1660,12 @@ public class LoginManager {
if (local53 == null && SceneGraph.centralZoneZ < 800) {
client.audioLoop();
for (@Pc(130) int local130 = 0; local130 < local7; local130++) {
method645(local130, local49, local38, 64, 64);
SceneGraph.method645(local130, local49, local38, 64, 64);
}
}
}
}
@OriginalMember(owner = "client!wa", name = "a", descriptor = "([Lclient!mj;ZIIIII[B)V")
public static void method2203(@OriginalArg(0) CollisionMap[] arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) byte[] arg6) {
@Pc(14) int local14;
@Pc(21) int local21;
if (!arg1) {
for (@Pc(9) int local9 = 0; local9 < 4; local9++) {
for (local14 = 0; local14 < 64; local14++) {
for (local21 = 0; local21 < 64; local21++) {
if (arg4 + local14 > 0 && local14 + arg4 < 103 && arg3 + local21 > 0 && local21 + arg3 < 103) {
arg0[local9].flags[local14 + arg4][arg3 + local21] &= 0xFEFFFFFF;
}
}
}
}
}
@Pc(95) Buffer local95 = new Buffer(arg6);
@Pc(99) byte local99;
if (arg1) {
local99 = 1;
} else {
local99 = 4;
}
@Pc(117) int local117;
for (local14 = 0; local14 < local99; local14++) {
for (local21 = 0; local21 < 64; local21++) {
for (local117 = 0; local117 < 64; local117++) {
SceneGraph.readTile(arg2, arg5, arg1, local95, local117 + arg3, arg4 + local21, 0, local14);
}
}
}
@Pc(146) boolean local146 = false;
@Pc(243) int local243;
@Pc(188) int local188;
@Pc(190) int local190;
@Pc(194) int local194;
while (local95.offset < local95.data.length) {
local21 = local95.g1();
if (local21 != 129) {
local95.offset--;
break;
}
for (local117 = 0; local117 < 4; local117++) {
@Pc(168) byte local168 = local95.g1b();
if (local168 == 0) {
local243 = arg4;
if (arg4 < 0) {
local243 = 0;
} else if (arg4 >= 104) {
local243 = 104;
}
local190 = arg3;
if (arg3 < 0) {
local190 = 0;
} else if (arg3 >= 104) {
local190 = 104;
}
local188 = arg4 + 64;
local194 = arg3 + 64;
if (local194 < 0) {
local194 = 0;
} else if (local194 >= 104) {
local194 = 104;
}
if (local188 < 0) {
local188 = 0;
} else if (local188 >= 104) {
local188 = 104;
}
while (local243 < local188) {
while (local190 < local194) {
SceneGraph.aByteArrayArrayArray13[local117][local243][local190] = 0;
local190++;
}
local243++;
}
} else if (local168 == 1) {
for (local243 = 0; local243 < 64; local243 += 4) {
for (local188 = 0; local188 < 64; local188 += 4) {
@Pc(305) byte local305 = local95.g1b();
for (local194 = local243 + arg4; local194 < arg4 + local243 + 4; local194++) {
for (@Pc(320) int local320 = arg3 + local188; local320 < arg3 + local188 + 4; local320++) {
if (local194 >= 0 && local194 < 104 && local320 >= 0 && local320 < 104) {
SceneGraph.aByteArrayArrayArray13[local117][local194][local320] = local305;
}
}
}
}
}
} else if (local168 == 2 && local117 > 0) {
local188 = arg4 + 64;
local190 = arg3;
local194 = arg3 + 64;
if (local188 < 0) {
local188 = 0;
} else if (local188 >= 104) {
local188 = 104;
}
if (arg3 < 0) {
local190 = 0;
} else if (arg3 >= 104) {
local190 = 104;
}
if (local194 < 0) {
local194 = 0;
} else if (local194 >= 104) {
local194 = 104;
}
local243 = arg4;
if (arg4 < 0) {
local243 = 0;
} else if (arg4 >= 104) {
local243 = 104;
}
while (local188 > local243) {
while (local190 < local194) {
SceneGraph.aByteArrayArrayArray13[local117][local243][local190] = SceneGraph.aByteArrayArrayArray13[local117 - 1][local243][local190];
local190++;
}
local243++;
}
}
}
local146 = true;
}
@Pc(515) int local515;
if (GlRenderer.enabled && !arg1) {
@Pc(490) Environment local490 = null;
label270:
while (true) {
label263:
do {
while (local95.offset < local95.data.length) {
local117 = local95.g1();
if (local117 != 0) {
if (local117 != 1) {
throw new IllegalStateException();
}
local515 = local95.g1();
continue label263;
}
local490 = new Environment(local95);
}
if (local490 == null) {
local490 = new Environment();
}
for (local117 = 0; local117 < 8; local117++) {
for (local515 = 0; local515 < 8; local515++) {
local243 = local117 + (arg4 >> 3);
local188 = (arg3 >> 3) + local515;
if (local243 >= 0 && local243 < 13 && local188 >= 0 && local188 < 13) {
FogManager.chunksAtmosphere[local243][local188] = local490;
}
}
}
break label270;
} while (local515 <= 0);
for (local243 = 0; local243 < local515; local243++) {
@Pc(529) Light local529 = new Light(local95);
if (local529.anInt2243 == 31) {
@Pc(541) LightType local541 = LightTypeList.get(local95.g2());
local529.method1762(local541.anInt2865, local541.anInt2873, local541.anInt2867, local541.anInt2872);
}
local529.z += arg3 << 7;
local529.x += arg4 << 7;
local194 = local529.z >> 7;
local190 = local529.x >> 7;
if (local190 >= 0 && local194 >= 0 && local190 < 104 && local194 < 104) {
local529.aBoolean125 = (SceneGraph.tileFlags[1][local190][local194] & 0x2) != 0;
local529.y = SceneGraph.tileHeights[local529.level][local190][local194] - local529.y;
LightingManager.method2389(local529);
}
}
}
}
if (local146) {
return;
}
for (local21 = 0; local21 < 4; local21++) {
for (local117 = 0; local117 < 16; local117++) {
for (local515 = 0; local515 < 16; local515++) {
local243 = (arg4 >> 2) + local117;
local188 = local515 + (arg3 >> 2);
if (local243 >= 0 && local243 < 26 && local188 >= 0 && local188 < 26) {
SceneGraph.aByteArrayArrayArray13[local21][local243][local188] = 0;
}
}
}
}
}
@OriginalMember(owner = "client!bm", name = "a", descriptor = "(IBIIII)V")
public static void method645(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) {
@Pc(3) int local3;
@Pc(10) int local10;
for (local3 = arg1; local3 <= arg3 + arg1; local3++) {
for (local10 = arg2; local10 <= arg4 + arg2; local10++) {
if (local10 >= 0 && local10 < 104 && local3 >= 0 && local3 < 104) {
SceneGraph.aByteArrayArrayArray9[arg0][local10][local3] = 127;
}
}
}
for (local3 = arg1; local3 < arg3 + arg1; local3++) {
for (local10 = arg2; local10 < arg2 + arg4; local10++) {
if (local10 >= 0 && local10 < 104 && local3 >= 0 && local3 < 104) {
SceneGraph.tileHeights[arg0][local10][local3] = arg0 <= 0 ? 0 : SceneGraph.tileHeights[arg0 - 1][local10][local3];
}
}
}
if (arg2 > 0 && arg2 < 104) {
for (local3 = arg1 + 1; local3 < arg1 + arg3; local3++) {
if (local3 >= 0 && local3 < 104) {
SceneGraph.tileHeights[arg0][arg2][local3] = SceneGraph.tileHeights[arg0][arg2 - 1][local3];
}
}
}
if (arg1 > 0 && arg1 < 104) {
for (local3 = arg2 + 1; local3 < arg2 + arg4; local3++) {
if (local3 >= 0 && local3 < 104) {
SceneGraph.tileHeights[arg0][local3][arg1] = SceneGraph.tileHeights[arg0][local3][arg1 - 1];
}
}
}
if (arg2 < 0 || arg1 < 0 || arg2 >= 104 || arg1 >= 104) {
return;
}
if (arg0 == 0) {
if (arg2 > 0 && SceneGraph.tileHeights[arg0][arg2 - 1][arg1] != 0) {
SceneGraph.tileHeights[arg0][arg2][arg1] = SceneGraph.tileHeights[arg0][arg2 - 1][arg1];
} else if (arg1 > 0 && SceneGraph.tileHeights[arg0][arg2][arg1 - 1] != 0) {
SceneGraph.tileHeights[arg0][arg2][arg1] = SceneGraph.tileHeights[arg0][arg2][arg1 - 1];
} else if (arg2 > 0 && arg1 > 0 && SceneGraph.tileHeights[arg0][arg2 - 1][arg1 - 1] != 0) {
SceneGraph.tileHeights[arg0][arg2][arg1] = SceneGraph.tileHeights[arg0][arg2 - 1][arg1 - 1];
}
} else if (arg2 > 0 && SceneGraph.tileHeights[arg0 - 1][arg2 - 1][arg1] != SceneGraph.tileHeights[arg0][arg2 - 1][arg1]) {
SceneGraph.tileHeights[arg0][arg2][arg1] = SceneGraph.tileHeights[arg0][arg2 - 1][arg1];
} else if (arg1 > 0 && SceneGraph.tileHeights[arg0][arg2][arg1 - 1] != SceneGraph.tileHeights[arg0 - 1][arg2][arg1 - 1]) {
SceneGraph.tileHeights[arg0][arg2][arg1] = SceneGraph.tileHeights[arg0][arg2][arg1 - 1];
} else if (arg2 > 0 && arg1 > 0 && SceneGraph.tileHeights[arg0][arg2 - 1][arg1 - 1] != SceneGraph.tileHeights[arg0 - 1][arg2 - 1][arg1 - 1]) {
SceneGraph.tileHeights[arg0][arg2][arg1] = SceneGraph.tileHeights[arg0][arg2 - 1][arg1 - 1];
}
}
@OriginalMember(owner = "client!j", name = "g", descriptor = "(I)V")
public static void method4637() {
aClass3_Sub2_Sub1_8 = null;