Loads of refactoring, renamed Class3_Sub13 to EnumStringEntry too

This commit is contained in:
Pazaz 2022-04-23 16:25:30 -04:00
parent e11ef7d372
commit d2c6c19cb8
263 changed files with 2432 additions and 2436 deletions

View file

@ -30,29 +30,29 @@ public final class Static173 {
@Pc(158) int local158;
@Pc(171) int local171;
for (local7 = 0; local7 < Static272.anInt5214; local7++) {
local16 = Static175.aClass8_Sub4_Sub2Array1[Static33.anIntArray79[local7]];
if (local16 != null && local16.method2682() && local16.aClass96_1.aBoolean182 == arg0 && local16.aClass96_1.method2933()) {
@Pc(42) int local42 = local16.method2693();
local16 = Static175.npcs[Static33.anIntArray79[local7]];
if (local16 != null && local16.method2682() && local16.type.aBoolean182 == arg0 && local16.type.method2933()) {
@Pc(42) int local42 = local16.getSize();
@Pc(97) int local97;
if (local42 == 1) {
if ((local16.anInt3412 & 0x7F) == 64 && (local16.anInt3421 & 0x7F) == 64) {
local97 = local16.anInt3412 >> 7;
local107 = local16.anInt3421 >> 7;
if ((local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64) {
local97 = local16.xFine >> 7;
local107 = local16.zFine >> 7;
if (local97 >= 0 && local97 < 104 && local107 >= 0 && local107 < 104) {
local171 = Static31.anIntArrayArray6[local97][local107]++;
}
}
} else if (((local42 & 0x1) != 0 || (local16.anInt3412 & 0x7F) == 0 && (local16.anInt3421 & 0x7F) == 0) && ((local42 & 0x1) != 1 || (local16.anInt3412 & 0x7F) == 64 && (local16.anInt3421 & 0x7F) == 64)) {
local97 = local16.anInt3412 - local42 * 64 >> 7;
local107 = local16.anInt3421 - local42 * 64 >> 7;
local113 = local16.method2693() + local97;
} else if (((local42 & 0x1) != 0 || (local16.xFine & 0x7F) == 0 && (local16.zFine & 0x7F) == 0) && ((local42 & 0x1) != 1 || (local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64)) {
local97 = local16.xFine - local42 * 64 >> 7;
local107 = local16.zFine - local42 * 64 >> 7;
local113 = local16.getSize() + local97;
if (local97 < 0) {
local97 = 0;
}
if (local113 > 104) {
local113 = 104;
}
local133 = local107 + local16.method2693();
local133 = local107 + local16.getSize();
if (local107 < 0) {
local107 = 0;
}
@ -68,14 +68,14 @@ public final class Static173 {
}
}
label200: for (local7 = 0; local7 < Static272.anInt5214; local7++) {
local16 = Static175.aClass8_Sub4_Sub2Array1[Static33.anIntArray79[local7]];
local16 = Static175.npcs[Static33.anIntArray79[local7]];
@Pc(262) long local262 = (long) Static33.anIntArray79[local7] << 32 | 0x20000000L;
if (local16 != null && local16.method2682() && local16.aClass96_1.aBoolean182 == arg0 && local16.aClass96_1.method2933()) {
local107 = local16.method2693();
if (local16 != null && local16.method2682() && local16.type.aBoolean182 == arg0 && local16.type.method2933()) {
local107 = local16.getSize();
if (local107 == 1) {
if ((local16.anInt3412 & 0x7F) == 64 && (local16.anInt3421 & 0x7F) == 64) {
local113 = local16.anInt3412 >> 7;
local133 = local16.anInt3421 >> 7;
if ((local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64) {
local113 = local16.xFine >> 7;
local133 = local16.zFine >> 7;
if (local113 < 0 || local113 >= 104 || local133 < 0 || local133 >= 104) {
continue;
}
@ -84,9 +84,9 @@ public final class Static173 {
continue;
}
}
} else if ((local107 & 0x1) == 0 && (local16.anInt3412 & 0x7F) == 0 && (local16.anInt3421 & 0x7F) == 0 || (local107 & 0x1) == 1 && (local16.anInt3412 & 0x7F) == 64 && (local16.anInt3421 & 0x7F) == 64) {
local113 = local16.anInt3412 - local107 * 64 >> 7;
local133 = local16.anInt3421 - local107 * 64 >> 7;
} else if ((local107 & 0x1) == 0 && (local16.xFine & 0x7F) == 0 && (local16.zFine & 0x7F) == 0 || (local107 & 0x1) == 1 && (local16.xFine & 0x7F) == 64 && (local16.zFine & 0x7F) == 64) {
local113 = local16.xFine - local107 * 64 >> 7;
local133 = local16.zFine - local107 * 64 >> 7;
local158 = local133 + local107;
if (local133 < 0) {
local133 = 0;
@ -125,11 +125,11 @@ public final class Static173 {
}
}
}
if (!local16.aClass96_1.aBoolean183) {
if (!local16.type.aBoolean183) {
local262 |= Long.MIN_VALUE;
}
local16.anInt3424 = Static207.method3685(Static55.level, local16.anInt3412, local16.anInt3421);
Static43.method1141(Static55.level, local16.anInt3412, local16.anInt3421, local16.anInt3424, local107 * 64 + 60 - 64, local16, local16.anInt3381, local262, local16.aBoolean171);
local16.anInt3424 = Static207.method3685(Static55.level, local16.xFine, local16.zFine);
Static43.method1141(Static55.level, local16.xFine, local16.zFine, local16.anInt3424, local107 * 64 + 60 - 64, local16, local16.anInt3381, local262, local16.aBoolean171);
}
}
}