mirror of
https://gitlab.com/2009scape/rt4-client.git
synced 2026-08-10 21:21:06 -06:00
Loads of refactoring, renamed Class3_Sub13 to EnumStringEntry too
This commit is contained in:
Pazaz
parent
e11ef7d372
commit
d2c6c19cb8
263 changed files with 2432 additions and 2436 deletions
|
|
@ -10,8 +10,8 @@ public final class Static104 {
|
|||
@OriginalMember(owner = "client!ia", name = "a", descriptor = "(BLclient!fe;)V")
|
||||
public static void method2247(@OriginalArg(1) PathingEntity arg0) {
|
||||
@Pc(9) BasType local9 = arg0.method2681();
|
||||
arg0.anInt3366 = local9.anInt1037;
|
||||
if (arg0.anInt3409 == 0) {
|
||||
arg0.anInt3366 = local9.idleAnimationId;
|
||||
if (arg0.movementQueueSize == 0) {
|
||||
arg0.anInt3417 = 0;
|
||||
return;
|
||||
}
|
||||
|
|
@ -26,13 +26,13 @@ public final class Static104 {
|
|||
return;
|
||||
}
|
||||
}
|
||||
@Pc(79) int local79 = arg0.anInt3412;
|
||||
@Pc(82) int local82 = arg0.anInt3421;
|
||||
@Pc(99) int local99 = arg0.movementQueueX[arg0.anInt3409 - 1] * 128 + arg0.method2693() * 64;
|
||||
@Pc(116) int local116 = arg0.movementQueueZ[arg0.anInt3409 - 1] * 128 + arg0.method2693() * 64;
|
||||
@Pc(79) int local79 = arg0.xFine;
|
||||
@Pc(82) int local82 = arg0.zFine;
|
||||
@Pc(99) int local99 = arg0.movementQueueX[arg0.movementQueueSize - 1] * 128 + arg0.getSize() * 64;
|
||||
@Pc(116) int local116 = arg0.movementQueueZ[arg0.movementQueueSize - 1] * 128 + arg0.getSize() * 64;
|
||||
if (local99 - local79 > 256 || local99 - local79 < -256 || local116 - local82 > 256 || local116 - local82 < -256) {
|
||||
arg0.anInt3412 = local99;
|
||||
arg0.anInt3421 = local116;
|
||||
arg0.xFine = local99;
|
||||
arg0.zFine = local116;
|
||||
return;
|
||||
}
|
||||
if (local99 <= local79) {
|
||||
|
|
@ -57,87 +57,87 @@ public final class Static104 {
|
|||
arg0.anInt3400 = 1536;
|
||||
}
|
||||
@Pc(224) int local224 = arg0.anInt3400 - arg0.anInt3381 & 0x7FF;
|
||||
@Pc(227) int local227 = local9.anInt1056;
|
||||
@Pc(227) int local227 = local9.turnAnimation1;
|
||||
if (local224 > 1024) {
|
||||
local224 -= 2048;
|
||||
}
|
||||
@Pc(233) boolean local233 = true;
|
||||
@Pc(235) byte local235 = 1;
|
||||
if (local224 >= -256 && local224 <= 256) {
|
||||
local227 = local9.anInt1051;
|
||||
local227 = local9.walkAnimation;
|
||||
} else if (local224 >= 256 && local224 < 768) {
|
||||
local227 = local9.anInt1035;
|
||||
local227 = local9.turnAnimation3;
|
||||
} else if (local224 >= -768 && local224 <= -256) {
|
||||
local227 = local9.anInt1057;
|
||||
local227 = local9.turnAnimation2;
|
||||
}
|
||||
@Pc(273) int local273 = 4;
|
||||
if (local227 == -1) {
|
||||
local227 = local9.anInt1051;
|
||||
local227 = local9.walkAnimation;
|
||||
}
|
||||
arg0.anInt3366 = local227;
|
||||
if (arg0 instanceof Npc) {
|
||||
local233 = ((Npc) arg0).aClass96_1.aBoolean181;
|
||||
local233 = ((Npc) arg0).type.aBoolean181;
|
||||
}
|
||||
if (local233) {
|
||||
if (arg0.anInt3381 != arg0.anInt3400 && arg0.anInt3370 == -1 && arg0.anInt3376 != 0) {
|
||||
local273 = 2;
|
||||
}
|
||||
if (arg0.anInt3409 > 2) {
|
||||
if (arg0.movementQueueSize > 2) {
|
||||
local273 = 6;
|
||||
}
|
||||
if (arg0.anInt3409 > 3) {
|
||||
if (arg0.movementQueueSize > 3) {
|
||||
local273 = 8;
|
||||
}
|
||||
if (arg0.anInt3417 > 0 && arg0.anInt3409 > 1) {
|
||||
if (arg0.anInt3417 > 0 && arg0.movementQueueSize > 1) {
|
||||
local273 = 8;
|
||||
arg0.anInt3417--;
|
||||
}
|
||||
} else {
|
||||
if (arg0.anInt3409 > 1) {
|
||||
if (arg0.movementQueueSize > 1) {
|
||||
local273 = 6;
|
||||
}
|
||||
if (arg0.anInt3409 > 2) {
|
||||
if (arg0.movementQueueSize > 2) {
|
||||
local273 = 8;
|
||||
}
|
||||
if (arg0.anInt3417 > 0 && arg0.anInt3409 > 1) {
|
||||
if (arg0.anInt3417 > 0 && arg0.movementQueueSize > 1) {
|
||||
arg0.anInt3417--;
|
||||
local273 = 8;
|
||||
}
|
||||
}
|
||||
if (arg0.aByteArray48[arg0.anInt3409 - 1] == 2) {
|
||||
if (arg0.movementQueueSpeed[arg0.movementQueueSize - 1] == 2) {
|
||||
local273 <<= 0x1;
|
||||
local235 = 2;
|
||||
} else if (arg0.aByteArray48[arg0.anInt3409 - 1] == 0) {
|
||||
} else if (arg0.movementQueueSpeed[arg0.movementQueueSize - 1] == 0) {
|
||||
local235 = 0;
|
||||
local273 >>= 0x1;
|
||||
}
|
||||
if (local273 < 8 || local9.anInt1058 == -1) {
|
||||
if (local273 < 8 || local9.runAnimationId == -1) {
|
||||
if (local9.anInt1062 != -1 && local235 == 0) {
|
||||
if (local9.anInt1056 == arg0.anInt3366 && local9.anInt1042 != -1) {
|
||||
if (local9.turnAnimation1 == arg0.anInt3366 && local9.anInt1042 != -1) {
|
||||
arg0.anInt3366 = local9.anInt1042;
|
||||
} else if (local9.anInt1057 == arg0.anInt3366 && local9.anInt1066 != -1) {
|
||||
} else if (local9.turnAnimation2 == arg0.anInt3366 && local9.anInt1066 != -1) {
|
||||
arg0.anInt3366 = local9.anInt1066;
|
||||
} else if (local9.anInt1035 == arg0.anInt3366 && local9.anInt1048 != -1) {
|
||||
} else if (local9.turnAnimation3 == arg0.anInt3366 && local9.anInt1048 != -1) {
|
||||
arg0.anInt3366 = local9.anInt1048;
|
||||
} else {
|
||||
arg0.anInt3366 = local9.anInt1062;
|
||||
}
|
||||
}
|
||||
} else if (local9.anInt1056 == arg0.anInt3366 && local9.anInt1054 != -1) {
|
||||
arg0.anInt3366 = local9.anInt1054;
|
||||
} else if (arg0.anInt3366 == local9.anInt1057 && local9.anInt1043 != -1) {
|
||||
arg0.anInt3366 = local9.anInt1043;
|
||||
} else if (arg0.anInt3366 == local9.anInt1035 && local9.anInt1045 != -1) {
|
||||
arg0.anInt3366 = local9.anInt1045;
|
||||
} else if (local9.turnAnimation1 == arg0.anInt3366 && local9.runAnimationId2 != -1) {
|
||||
arg0.anInt3366 = local9.runAnimationId2;
|
||||
} else if (arg0.anInt3366 == local9.turnAnimation2 && local9.runAnimationId3 != -1) {
|
||||
arg0.anInt3366 = local9.runAnimationId3;
|
||||
} else if (arg0.anInt3366 == local9.turnAnimation3 && local9.runAnimationId4 != -1) {
|
||||
arg0.anInt3366 = local9.runAnimationId4;
|
||||
} else {
|
||||
arg0.anInt3366 = local9.anInt1058;
|
||||
arg0.anInt3366 = local9.runAnimationId;
|
||||
}
|
||||
if (local9.anInt1032 != -1) {
|
||||
local273 <<= 0x7;
|
||||
if (arg0.anInt3409 == 1) {
|
||||
@Pc(594) int local594 = (local99 >= arg0.anInt3412 ? local99 - arg0.anInt3412 : -local99 + arg0.anInt3412) << 7;
|
||||
if (arg0.movementQueueSize == 1) {
|
||||
@Pc(594) int local594 = (local99 >= arg0.xFine ? local99 - arg0.xFine : -local99 + arg0.xFine) << 7;
|
||||
@Pc(600) int local600 = arg0.anInt3358 * arg0.anInt3358;
|
||||
@Pc(622) int local622 = (local116 < arg0.anInt3421 ? arg0.anInt3421 - local116 : -arg0.anInt3421 + local116) << 7;
|
||||
@Pc(622) int local622 = (local116 < arg0.zFine ? arg0.zFine - local116 : -arg0.zFine + local116) << 7;
|
||||
@Pc(629) int local629 = local594 > local622 ? local594 : local622;
|
||||
@Pc(636) int local636 = local9.anInt1032 * 2 * local629;
|
||||
if (local636 < local600) {
|
||||
|
|
@ -170,29 +170,29 @@ public final class Static104 {
|
|||
}
|
||||
}
|
||||
if (local79 < local99) {
|
||||
arg0.anInt3412 += local273;
|
||||
if (local99 < arg0.anInt3412) {
|
||||
arg0.anInt3412 = local99;
|
||||
arg0.xFine += local273;
|
||||
if (local99 < arg0.xFine) {
|
||||
arg0.xFine = local99;
|
||||
}
|
||||
} else if (local79 > local99) {
|
||||
arg0.anInt3412 -= local273;
|
||||
if (local99 > arg0.anInt3412) {
|
||||
arg0.anInt3412 = local99;
|
||||
arg0.xFine -= local273;
|
||||
if (local99 > arg0.xFine) {
|
||||
arg0.xFine = local99;
|
||||
}
|
||||
}
|
||||
if (local82 < local116) {
|
||||
arg0.anInt3421 += local273;
|
||||
if (arg0.anInt3421 > local116) {
|
||||
arg0.anInt3421 = local116;
|
||||
arg0.zFine += local273;
|
||||
if (arg0.zFine > local116) {
|
||||
arg0.zFine = local116;
|
||||
}
|
||||
} else if (local116 < local82) {
|
||||
arg0.anInt3421 -= local273;
|
||||
if (local116 > arg0.anInt3421) {
|
||||
arg0.anInt3421 = local116;
|
||||
arg0.zFine -= local273;
|
||||
if (local116 > arg0.zFine) {
|
||||
arg0.zFine = local116;
|
||||
}
|
||||
}
|
||||
if (arg0.anInt3412 == local99 && local116 == arg0.anInt3421) {
|
||||
arg0.anInt3409--;
|
||||
if (arg0.xFine == local99 && local116 == arg0.zFine) {
|
||||
arg0.movementQueueSize--;
|
||||
if (arg0.anInt3405 > 0) {
|
||||
arg0.anInt3405--;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue