diff --git a/client/src/main/java/GlModel.java b/client/src/main/java/GlModel.java index 4a964eb..f6c88e6 100644 --- a/client/src/main/java/GlModel.java +++ b/client/src/main/java/GlModel.java @@ -667,8 +667,8 @@ public final class GlModel extends Model { @Pc(161) int local161 = 0; @Pc(163) int local163 = 0; if (arg0 != 0) { - local161 = MathUtils.anIntArray223[arg0]; - local163 = MathUtils.anIntArray225[arg0]; + local161 = MathUtils.sin[arg0]; + local163 = MathUtils.cos[arg0]; } if (arg8 > 0L && Static39.aBoolean77 && local70 > 0) { @Pc(187) int local187; @@ -847,8 +847,8 @@ public final class GlModel extends Model { @OriginalMember(owner = "client!td", name = "c", descriptor = "(I)V") @Override public final void method4564(@OriginalArg(0) int arg0) { - @Pc(3) int local3 = MathUtils.anIntArray223[arg0]; - @Pc(7) int local7 = MathUtils.anIntArray225[arg0]; + @Pc(3) int local3 = MathUtils.sin[arg0]; + @Pc(7) int local7 = MathUtils.cos[arg0]; for (@Pc(9) int local9 = 0; local9 < this.anInt5295; local9++) { @Pc(29) int local29 = this.anIntArray465[local9] * local3 + this.anIntArray461[local9] * local7 >> 16; this.anIntArray465[local9] = this.anIntArray465[local9] * local7 - this.anIntArray461[local9] * local3 >> 16; @@ -1108,8 +1108,8 @@ public final class GlModel extends Model { @OriginalMember(owner = "client!td", name = "b", descriptor = "(I)V") @Override public final void method4554(@OriginalArg(0) int arg0) { - @Pc(3) int local3 = MathUtils.anIntArray223[arg0]; - @Pc(7) int local7 = MathUtils.anIntArray225[arg0]; + @Pc(3) int local3 = MathUtils.sin[arg0]; + @Pc(7) int local7 = MathUtils.cos[arg0]; for (@Pc(9) int local9 = 0; local9 < this.anInt5295; local9++) { @Pc(29) int local29 = this.anIntArray466[local9] * local3 + this.anIntArray461[local9] * local7 >> 16; this.anIntArray466[local9] = this.anIntArray466[local9] * local7 - this.anIntArray461[local9] * local3 >> 16; @@ -1228,22 +1228,22 @@ public final class GlModel extends Model { this.anIntArray465[local45] -= Static237.anInt5300; this.anIntArray466[local45] -= Static237.anInt5299; if (arg4 != 0) { - local53 = MathUtils.anIntArray223[arg4]; - local343 = MathUtils.anIntArray225[arg4]; + local53 = MathUtils.sin[arg4]; + local343 = MathUtils.cos[arg4]; local365 = this.anIntArray465[local45] * local53 + this.anIntArray461[local45] * local343 + 32767 >> 16; this.anIntArray465[local45] = this.anIntArray465[local45] * local343 + 32767 - this.anIntArray461[local45] * local53 >> 16; this.anIntArray461[local45] = local365; } if (arg2 != 0) { - local53 = MathUtils.anIntArray223[arg2]; - local343 = MathUtils.anIntArray225[arg2]; + local53 = MathUtils.sin[arg2]; + local343 = MathUtils.cos[arg2]; local365 = this.anIntArray465[local45] * local343 + 32767 - this.anIntArray466[local45] * local53 >> 16; this.anIntArray466[local45] = this.anIntArray465[local45] * local53 + this.anIntArray466[local45] * local343 + 32767 >> 16; this.anIntArray465[local45] = local365; } if (arg3 != 0) { - local53 = MathUtils.anIntArray223[arg3]; - local343 = MathUtils.anIntArray225[arg3]; + local53 = MathUtils.sin[arg3]; + local343 = MathUtils.cos[arg3]; local365 = this.anIntArray466[local45] * local53 + this.anIntArray461[local45] * local343 + 32767 >> 16; this.anIntArray466[local45] = this.anIntArray466[local45] * local343 + 32767 - this.anIntArray461[local45] * local53 >> 16; this.anIntArray461[local45] = local365; @@ -1271,22 +1271,22 @@ public final class GlModel extends Model { break; } if (arg4 != 0) { - local428 = MathUtils.anIntArray223[arg4]; - local434 = MathUtils.anIntArray225[arg4]; + local428 = MathUtils.sin[arg4]; + local434 = MathUtils.cos[arg4]; local440 = this.aShortArray79[local387] * local428 + this.aShortArray76[local387] * local434 + 32767 >> 16; this.aShortArray79[local387] = (short) (this.aShortArray79[local387] * local434 + 32767 - this.aShortArray76[local387] * local428 >> 16); this.aShortArray76[local387] = (short) local440; } if (arg2 != 0) { - local428 = MathUtils.anIntArray223[arg2]; - local434 = MathUtils.anIntArray225[arg2]; + local428 = MathUtils.sin[arg2]; + local434 = MathUtils.cos[arg2]; local440 = this.aShortArray79[local387] * local434 + 32767 - this.aShortArray85[local387] * local428 >> 16; this.aShortArray85[local387] = (short) (this.aShortArray79[local387] * local428 + this.aShortArray85[local387] * local434 + 32767 >> 16); this.aShortArray79[local387] = (short) local440; } if (arg3 != 0) { - local428 = MathUtils.anIntArray223[arg3]; - local434 = MathUtils.anIntArray225[arg3]; + local428 = MathUtils.sin[arg3]; + local434 = MathUtils.cos[arg3]; local440 = this.aShortArray85[local387] * local428 + this.aShortArray76[local387] * local434 + 32767 >> 16; this.aShortArray85[local387] = (short) (this.aShortArray85[local387] * local434 + 32767 - this.aShortArray76[local387] * local428 >> 16); this.aShortArray76[local387] = (short) local440; @@ -1320,12 +1320,12 @@ public final class GlModel extends Model { Static237.aBoolean260 = false; } @Pc(410) int[] local410 = new int[9]; - local365 = MathUtils.anIntArray225[arg2] >> 1; - local387 = MathUtils.anIntArray223[arg2] >> 1; - local428 = MathUtils.anIntArray225[arg3] >> 1; - local434 = MathUtils.anIntArray223[arg3] >> 1; - local440 = MathUtils.anIntArray225[arg4] >> 1; - local446 = MathUtils.anIntArray223[arg4] >> 1; + local365 = MathUtils.cos[arg2] >> 1; + local387 = MathUtils.sin[arg2] >> 1; + local428 = MathUtils.cos[arg3] >> 1; + local434 = MathUtils.sin[arg3] >> 1; + local440 = MathUtils.cos[arg4] >> 1; + local446 = MathUtils.sin[arg4] >> 1; local454 = local387 * local440 + 16384 >> 15; local462 = local387 * local446 + 16384 >> 15; local410[0] = local428 * local440 + local434 * local462 + 16384 >> 15; @@ -2698,22 +2698,22 @@ public final class GlModel extends Model { this.anIntArray465[local45] -= Static237.anInt5300; this.anIntArray466[local45] -= Static237.anInt5299; if (arg4 != 0) { - local53 = MathUtils.anIntArray223[arg4]; - local246 = MathUtils.anIntArray225[arg4]; + local53 = MathUtils.sin[arg4]; + local246 = MathUtils.cos[arg4]; local264 = this.anIntArray465[local45] * local53 + this.anIntArray461[local45] * local246 + 32767 >> 16; this.anIntArray465[local45] = this.anIntArray465[local45] * local246 + 32767 - this.anIntArray461[local45] * local53 >> 16; this.anIntArray461[local45] = local264; } if (arg2 != 0) { - local53 = MathUtils.anIntArray223[arg2]; - local246 = MathUtils.anIntArray225[arg2]; + local53 = MathUtils.sin[arg2]; + local246 = MathUtils.cos[arg2]; local264 = this.anIntArray465[local45] * local246 + 32767 - this.anIntArray466[local45] * local53 >> 16; this.anIntArray466[local45] = this.anIntArray465[local45] * local53 + this.anIntArray466[local45] * local246 + 32767 >> 16; this.anIntArray465[local45] = local264; } if (arg3 != 0) { - local53 = MathUtils.anIntArray223[arg3]; - local246 = MathUtils.anIntArray225[arg3]; + local53 = MathUtils.sin[arg3]; + local246 = MathUtils.cos[arg3]; local264 = this.anIntArray466[local45] * local53 + this.anIntArray461[local45] * local246 + 32767 >> 16; this.anIntArray466[local45] = this.anIntArray466[local45] * local246 + 32767 - this.anIntArray461[local45] * local53 >> 16; this.anIntArray461[local45] = local264; @@ -2742,22 +2742,22 @@ public final class GlModel extends Model { @Pc(498) int local498; @Pc(516) int local516; if (arg4 != 0) { - local494 = MathUtils.anIntArray223[arg4]; - local498 = MathUtils.anIntArray225[arg4]; + local494 = MathUtils.sin[arg4]; + local498 = MathUtils.cos[arg4]; local516 = this.aShortArray79[local484] * local494 + this.aShortArray76[local484] * local498 + 32767 >> 16; this.aShortArray79[local484] = (short) (this.aShortArray79[local484] * local498 + 32767 - this.aShortArray76[local484] * local494 >> 16); this.aShortArray76[local484] = (short) local516; } if (arg2 != 0) { - local494 = MathUtils.anIntArray223[arg2]; - local498 = MathUtils.anIntArray225[arg2]; + local494 = MathUtils.sin[arg2]; + local498 = MathUtils.cos[arg2]; local516 = this.aShortArray79[local484] * local498 + 32767 - this.aShortArray85[local484] * local494 >> 16; this.aShortArray85[local484] = (short) (this.aShortArray79[local484] * local494 + this.aShortArray85[local484] * local498 + 32767 >> 16); this.aShortArray79[local484] = (short) local516; } if (arg3 != 0) { - local494 = MathUtils.anIntArray223[arg3]; - local498 = MathUtils.anIntArray225[arg3]; + local494 = MathUtils.sin[arg3]; + local498 = MathUtils.cos[arg3]; local516 = this.aShortArray85[local484] * local494 + this.aShortArray76[local484] * local498 + 32767 >> 16; this.aShortArray85[local484] = (short) (this.aShortArray85[local484] * local498 + 32767 - this.aShortArray76[local484] * local494 >> 16); this.aShortArray76[local484] = (short) local516; @@ -2885,22 +2885,22 @@ public final class GlModel extends Model { this.anIntArray465[local3] -= Static237.anInt5300; this.anIntArray466[local3] -= Static237.anInt5299; if (arg3 != 0) { - local11 = MathUtils.anIntArray223[arg3]; - local146 = MathUtils.anIntArray225[arg3]; + local11 = MathUtils.sin[arg3]; + local146 = MathUtils.cos[arg3]; local164 = this.anIntArray465[local3] * local11 + this.anIntArray461[local3] * local146 + 32767 >> 16; this.anIntArray465[local3] = this.anIntArray465[local3] * local146 + 32767 - this.anIntArray461[local3] * local11 >> 16; this.anIntArray461[local3] = local164; } if (arg1 != 0) { - local11 = MathUtils.anIntArray223[arg1]; - local146 = MathUtils.anIntArray225[arg1]; + local11 = MathUtils.sin[arg1]; + local146 = MathUtils.cos[arg1]; local164 = this.anIntArray465[local3] * local146 + 32767 - this.anIntArray466[local3] * local11 >> 16; this.anIntArray466[local3] = this.anIntArray465[local3] * local11 + this.anIntArray466[local3] * local146 + 32767 >> 16; this.anIntArray465[local3] = local164; } if (arg2 != 0) { - local11 = MathUtils.anIntArray223[arg2]; - local146 = MathUtils.anIntArray225[arg2]; + local11 = MathUtils.sin[arg2]; + local146 = MathUtils.cos[arg2]; local164 = this.anIntArray466[local3] * local11 + this.anIntArray461[local3] * local146 + 32767 >> 16; this.anIntArray466[local3] = this.anIntArray466[local3] * local146 + 32767 - this.anIntArray461[local3] * local11 >> 16; this.anIntArray461[local3] = local164; @@ -3122,8 +3122,8 @@ public final class GlModel extends Model { @OriginalMember(owner = "client!td", name = "d", descriptor = "(I)V") @Override public final void method4574(@OriginalArg(0) int arg0) { - @Pc(3) int local3 = MathUtils.anIntArray223[arg0]; - @Pc(7) int local7 = MathUtils.anIntArray225[arg0]; + @Pc(3) int local3 = MathUtils.sin[arg0]; + @Pc(7) int local7 = MathUtils.cos[arg0]; for (@Pc(9) int local9 = 0; local9 < this.anInt5295; local9++) { @Pc(29) int local29 = this.anIntArray465[local9] * local7 - this.anIntArray466[local9] * local3 >> 16; this.anIntArray466[local9] = this.anIntArray465[local9] * local3 + this.anIntArray466[local9] * local7 >> 16; @@ -3139,8 +3139,8 @@ public final class GlModel extends Model { this.method4554(256); return; } - @Pc(10) int local10 = MathUtils.anIntArray223[256]; - @Pc(14) int local14 = MathUtils.anIntArray225[256]; + @Pc(10) int local10 = MathUtils.sin[256]; + @Pc(14) int local14 = MathUtils.cos[256]; @Pc(16) int local16; @Pc(36) int local36; for (local16 = 0; local16 < this.anInt5295; local16++) { diff --git a/client/src/main/java/Light.java b/client/src/main/java/Light.java index 550a888..2bedb44 100644 --- a/client/src/main/java/Light.java +++ b/client/src/main/java/Light.java @@ -114,7 +114,7 @@ public final class Light { @Pc(29) int local29 = this.anInt2233; @Pc(62) int local62; if (local29 == 1) { - local62 = (MathUtils.anIntArray223[local26] >> 6) + 1024; + local62 = (MathUtils.sin[local26] >> 6) + 1024; } else if (local29 == 3) { local62 = Static62.anIntArray150[local26] >> 1; } else if (local29 == 4) { diff --git a/client/src/main/java/MathUtils.java b/client/src/main/java/MathUtils.java index f695b21..d04268b 100644 --- a/client/src/main/java/MathUtils.java +++ b/client/src/main/java/MathUtils.java @@ -6,28 +6,28 @@ import org.openrs2.deob.annotation.Pc; public final class MathUtils { @OriginalMember(owner = "client!hf", name = "g", descriptor = "[I") - public static final int[] anIntArray223 = new int[2048]; + public static final int[] sin = new int[2048]; @OriginalMember(owner = "client!hf", name = "h", descriptor = "[I") - public static final int[] anIntArray224 = new int[2048]; + public static final int[] reciprical16 = new int[2048]; @OriginalMember(owner = "client!hf", name = "f", descriptor = "[I") - private static final int[] anIntArray222 = new int[512]; + private static final int[] reciprical15 = new int[512]; @OriginalMember(owner = "client!hf", name = "r", descriptor = "[I") - public static final int[] anIntArray225 = new int[2048]; + public static final int[] cos = new int[2048]; static { - @Pc(33) int local33; - for (local33 = 1; local33 < 512; local33++) { - anIntArray222[local33] = 32768 / local33; + @Pc(33) int i; + for (i = 1; i < 512; i++) { + reciprical15[i] = 32768 / i; } - for (local33 = 1; local33 < 2048; local33++) { - anIntArray224[local33] = 65536 / local33; + for (i = 1; i < 2048; i++) { + reciprical16[i] = 65536 / i; } - for (local33 = 0; local33 < 2048; local33++) { - anIntArray223[local33] = (int) (Math.sin((double) local33 * 0.0030679615D) * 65536.0D); - anIntArray225[local33] = (int) (Math.cos((double) local33 * 0.0030679615D) * 65536.0D); + for (i = 0; i < 2048; i++) { + sin[i] = (int) (Math.sin((double) i * 0.0030679615D) * 65536.0D); + cos[i] = (int) (Math.cos((double) i * 0.0030679615D) * 65536.0D); } } } diff --git a/client/src/main/java/NpcType.java b/client/src/main/java/NpcType.java index e615d1b..c031924 100644 --- a/client/src/main/java/NpcType.java +++ b/client/src/main/java/NpcType.java @@ -276,12 +276,12 @@ public final class NpcType { local259[0] = local259[4] = local259[8] = 32768; local259[12] = -local235; } else { - local300 = MathUtils.anIntArray225[local207] >> 1; - @Pc(306) int local306 = MathUtils.anIntArray223[local207] >> 1; - @Pc(312) int local312 = MathUtils.anIntArray225[local214] >> 1; - local318 = MathUtils.anIntArray225[local228] >> 1; - local324 = MathUtils.anIntArray223[local214] >> 1; - local330 = MathUtils.anIntArray223[local228] >> 1; + local300 = MathUtils.cos[local207] >> 1; + @Pc(306) int local306 = MathUtils.sin[local207] >> 1; + @Pc(312) int local312 = MathUtils.cos[local214] >> 1; + local318 = MathUtils.cos[local228] >> 1; + local324 = MathUtils.sin[local214] >> 1; + local330 = MathUtils.sin[local228] >> 1; local259[3] = local300 * local330 + 16384 >> 15; local259[8] = local300 * local312 + 16384 >> 15; local259[5] = -local306; diff --git a/client/src/main/java/PathingEntity.java b/client/src/main/java/PathingEntity.java index bef2a7c..ab6d956 100644 --- a/client/src/main/java/PathingEntity.java +++ b/client/src/main/java/PathingEntity.java @@ -357,8 +357,8 @@ public abstract class PathingEntity extends Entity { if (local24 == 0 || local27 == 0) { return; } - @Pc(39) int local39 = MathUtils.anIntArray223[arg1]; - @Pc(43) int local43 = MathUtils.anIntArray225[arg1]; + @Pc(39) int local39 = MathUtils.sin[arg1]; + @Pc(43) int local43 = MathUtils.cos[arg1]; @Pc(48) int local48 = -local24 / 2; @Pc(53) int local53 = -local27 / 2; @Pc(64) int local64 = local53 * local43 - local48 * local39 >> 16; diff --git a/client/src/main/java/PlayerAppearance.java b/client/src/main/java/PlayerAppearance.java index 9b880f1..9f832f9 100644 --- a/client/src/main/java/PlayerAppearance.java +++ b/client/src/main/java/PlayerAppearance.java @@ -252,12 +252,12 @@ public final class PlayerAppearance { local404[0] = local404[4] = local404[8] = 32768; local404[14] = -local360; } else { - local451 = MathUtils.anIntArray225[local374] >> 1; - local457 = MathUtils.anIntArray223[local374] >> 1; - @Pc(463) int local463 = MathUtils.anIntArray225[local367] >> 1; - @Pc(469) int local469 = MathUtils.anIntArray223[local367] >> 1; - local475 = MathUtils.anIntArray225[local381] >> 1; - local481 = MathUtils.anIntArray223[local381] >> 1; + local451 = MathUtils.cos[local374] >> 1; + local457 = MathUtils.sin[local374] >> 1; + @Pc(463) int local463 = MathUtils.cos[local367] >> 1; + @Pc(469) int local469 = MathUtils.sin[local367] >> 1; + local475 = MathUtils.cos[local381] >> 1; + local481 = MathUtils.sin[local381] >> 1; local404[4] = local451 * local475 + 16384 >> 15; local404[5] = -local457; local404[3] = local481 * local451 + 16384 >> 15; diff --git a/client/src/main/java/SoftwareModel.java b/client/src/main/java/SoftwareModel.java index 8afb97f..45e7ddf 100644 --- a/client/src/main/java/SoftwareModel.java +++ b/client/src/main/java/SoftwareModel.java @@ -580,8 +580,8 @@ public final class SoftwareModel extends Model { @OriginalMember(owner = "client!w", name = "d", descriptor = "(I)V") @Override public final void method4574(@OriginalArg(0) int arg0) { - @Pc(3) int local3 = MathUtils.anIntArray223[arg0]; - @Pc(7) int local7 = MathUtils.anIntArray225[arg0]; + @Pc(3) int local3 = MathUtils.sin[arg0]; + @Pc(7) int local7 = MathUtils.cos[arg0]; for (@Pc(9) int local9 = 0; local9 < this.anInt5788; local9++) { @Pc(29) int local29 = this.anIntArray527[local9] * local7 - this.anIntArray531[local9] * local3 >> 16; this.anIntArray531[local9] = this.anIntArray527[local9] * local3 + this.anIntArray531[local9] * local7 >> 16; @@ -606,8 +606,8 @@ public final class SoftwareModel extends Model { @OriginalMember(owner = "client!w", name = "c", descriptor = "(I)V") @Override public final void method4564(@OriginalArg(0) int arg0) { - @Pc(3) int local3 = MathUtils.anIntArray223[arg0]; - @Pc(7) int local7 = MathUtils.anIntArray225[arg0]; + @Pc(3) int local3 = MathUtils.sin[arg0]; + @Pc(7) int local7 = MathUtils.cos[arg0]; for (@Pc(9) int local9 = 0; local9 < this.anInt5788; local9++) { @Pc(29) int local29 = this.anIntArray527[local9] * local3 + this.anIntArray528[local9] * local7 >> 16; this.anIntArray527[local9] = this.anIntArray527[local9] * local7 - this.anIntArray528[local9] * local3 >> 16; @@ -655,8 +655,8 @@ public final class SoftwareModel extends Model { @Pc(176) int local176 = 0; @Pc(178) int local178 = 0; if (arg0 != 0) { - local176 = MathUtils.anIntArray223[arg0]; - local178 = MathUtils.anIntArray225[arg0]; + local176 = MathUtils.sin[arg0]; + local178 = MathUtils.cos[arg0]; } @Pc(190) boolean local190 = false; @Pc(204) int local204; @@ -939,14 +939,14 @@ public final class SoftwareModel extends Model { } @Pc(6) int local6 = Rasteriser.centerX; @Pc(8) int local8 = Rasteriser.centerY; - @Pc(12) int local12 = MathUtils.anIntArray223[0]; - @Pc(16) int local16 = MathUtils.anIntArray225[0]; - @Pc(20) int local20 = MathUtils.anIntArray223[arg0]; - @Pc(24) int local24 = MathUtils.anIntArray225[arg0]; - @Pc(28) int local28 = MathUtils.anIntArray223[arg1]; - @Pc(32) int local32 = MathUtils.anIntArray225[arg1]; - @Pc(36) int local36 = MathUtils.anIntArray223[arg2]; - @Pc(40) int local40 = MathUtils.anIntArray225[arg2]; + @Pc(12) int local12 = MathUtils.sin[0]; + @Pc(16) int local16 = MathUtils.cos[0]; + @Pc(20) int local20 = MathUtils.sin[arg0]; + @Pc(24) int local24 = MathUtils.cos[arg0]; + @Pc(28) int local28 = MathUtils.sin[arg1]; + @Pc(32) int local32 = MathUtils.cos[arg1]; + @Pc(36) int local36 = MathUtils.sin[arg2]; + @Pc(40) int local40 = MathUtils.cos[arg2]; @Pc(50) int local50 = arg4 * local36 + arg5 * local40 >> 16; for (@Pc(52) int local52 = 0; local52 < this.anInt5788; local52++) { @Pc(61) int local61 = this.anIntArray528[local52]; @@ -1012,14 +1012,14 @@ public final class SoftwareModel extends Model { local79 = Static268.anIntArray548[local10]; local86 = this.anIntArray533[arg0] & 0xFFFF; if (local32 >= 50) { - local99 = (50 - local24) * MathUtils.anIntArray224[local32 - local24]; + local99 = (50 - local24) * MathUtils.reciprical16[local32 - local24]; Static268.anIntArray542[0] = local1 + (local75 + ((Static268.anIntArray560[local20] - local75) * local99 >> 16) << 9) / 50; Static268.anIntArray547[0] = local3 + (local79 + ((Static268.anIntArray548[local20] - local79) * local99 >> 16) << 9) / 50; local5++; Static268.anIntArray553[0] = local86 + (((this.anIntArray532[arg0] & 0xFFFF) - local86) * local99 >> 16); } if (local28 >= 50) { - local99 = (50 - local24) * MathUtils.anIntArray224[local28 - local24]; + local99 = (50 - local24) * MathUtils.reciprical16[local28 - local24]; Static268.anIntArray542[local5] = local1 + (local75 + ((Static268.anIntArray560[local15] - local75) * local99 >> 16) << 9) / 50; Static268.anIntArray547[local5] = local3 + (local79 + ((Static268.anIntArray548[local15] - local79) * local99 >> 16) << 9) / 50; Static268.anIntArray553[local5++] = local86 + (((this.anIntArray523[arg0] & 0xFFFF) - local86) * local99 >> 16); @@ -1034,13 +1034,13 @@ public final class SoftwareModel extends Model { local79 = Static268.anIntArray548[local15]; local86 = this.anIntArray523[arg0] & 0xFFFF; if (local24 >= 50) { - local99 = (50 - local28) * MathUtils.anIntArray224[local24 - local28]; + local99 = (50 - local28) * MathUtils.reciprical16[local24 - local28]; Static268.anIntArray542[local5] = local1 + (local75 + ((Static268.anIntArray560[local10] - local75) * local99 >> 16) << 9) / 50; Static268.anIntArray547[local5] = local3 + (local79 + ((Static268.anIntArray548[local10] - local79) * local99 >> 16) << 9) / 50; Static268.anIntArray553[local5++] = local86 + (((this.anIntArray533[arg0] & 0xFFFF) - local86) * local99 >> 16); } if (local32 >= 50) { - local99 = (50 - local28) * MathUtils.anIntArray224[local32 - local28]; + local99 = (50 - local28) * MathUtils.reciprical16[local32 - local28]; Static268.anIntArray542[local5] = local1 + (local75 + ((Static268.anIntArray560[local20] - local75) * local99 >> 16) << 9) / 50; Static268.anIntArray547[local5] = local3 + (local79 + ((Static268.anIntArray548[local20] - local79) * local99 >> 16) << 9) / 50; Static268.anIntArray553[local5++] = local86 + (((this.anIntArray532[arg0] & 0xFFFF) - local86) * local99 >> 16); @@ -1055,13 +1055,13 @@ public final class SoftwareModel extends Model { local79 = Static268.anIntArray548[local20]; local86 = this.anIntArray532[arg0] & 0xFFFF; if (local28 >= 50) { - local99 = (50 - local32) * MathUtils.anIntArray224[local28 - local32]; + local99 = (50 - local32) * MathUtils.reciprical16[local28 - local32]; Static268.anIntArray542[local5] = local1 + (local75 + ((Static268.anIntArray560[local15] - local75) * local99 >> 16) << 9) / 50; Static268.anIntArray547[local5] = local3 + (local79 + ((Static268.anIntArray548[local15] - local79) * local99 >> 16) << 9) / 50; Static268.anIntArray553[local5++] = local86 + (((this.anIntArray523[arg0] & 0xFFFF) - local86) * local99 >> 16); } if (local24 >= 50) { - local99 = (50 - local32) * MathUtils.anIntArray224[local24 - local32]; + local99 = (50 - local32) * MathUtils.reciprical16[local24 - local32]; Static268.anIntArray542[local5] = local1 + (local75 + ((Static268.anIntArray560[local10] - local75) * local99 >> 16) << 9) / 50; Static268.anIntArray547[local5] = local3 + (local79 + ((Static268.anIntArray548[local10] - local79) * local99 >> 16) << 9) / 50; Static268.anIntArray553[local5++] = local86 + (((this.anIntArray533[arg0] & 0xFFFF) - local86) * local99 >> 16); @@ -1210,8 +1210,8 @@ public final class SoftwareModel extends Model { @OriginalMember(owner = "client!w", name = "b", descriptor = "(I)V") @Override public final void method4554(@OriginalArg(0) int arg0) { - @Pc(3) int local3 = MathUtils.anIntArray223[arg0]; - @Pc(7) int local7 = MathUtils.anIntArray225[arg0]; + @Pc(3) int local3 = MathUtils.sin[arg0]; + @Pc(7) int local7 = MathUtils.cos[arg0]; for (@Pc(9) int local9 = 0; local9 < this.anInt5788; local9++) { @Pc(29) int local29 = this.anIntArray531[local9] * local3 + this.anIntArray528[local9] * local7 >> 16; this.anIntArray531[local9] = this.anIntArray531[local9] * local7 - this.anIntArray528[local9] * local3 >> 16; @@ -1287,22 +1287,22 @@ public final class SoftwareModel extends Model { this.anIntArray527[local33] -= Static268.anInt5791; this.anIntArray531[local33] -= Static268.anInt5792; if (arg4 != 0) { - local41 = MathUtils.anIntArray223[arg4]; - local222 = MathUtils.anIntArray225[arg4]; + local41 = MathUtils.sin[arg4]; + local222 = MathUtils.cos[arg4]; local240 = this.anIntArray527[local33] * local41 + this.anIntArray528[local33] * local222 + 32767 >> 16; this.anIntArray527[local33] = this.anIntArray527[local33] * local222 + 32767 - this.anIntArray528[local33] * local41 >> 16; this.anIntArray528[local33] = local240; } if (arg2 != 0) { - local41 = MathUtils.anIntArray223[arg2]; - local222 = MathUtils.anIntArray225[arg2]; + local41 = MathUtils.sin[arg2]; + local222 = MathUtils.cos[arg2]; local240 = this.anIntArray527[local33] * local222 + 32767 - this.anIntArray531[local33] * local41 >> 16; this.anIntArray531[local33] = this.anIntArray527[local33] * local41 + this.anIntArray531[local33] * local222 + 32767 >> 16; this.anIntArray527[local33] = local240; } if (arg3 != 0) { - local41 = MathUtils.anIntArray223[arg3]; - local222 = MathUtils.anIntArray225[arg3]; + local41 = MathUtils.sin[arg3]; + local222 = MathUtils.cos[arg3]; local240 = this.anIntArray531[local33] * local41 + this.anIntArray528[local33] * local222 + 32767 >> 16; this.anIntArray531[local33] = this.anIntArray531[local33] * local222 + 32767 - this.anIntArray528[local33] * local41 >> 16; this.anIntArray528[local33] = local240; @@ -1741,14 +1741,14 @@ public final class SoftwareModel extends Model { } @Pc(6) int local6 = Rasteriser.centerX; @Pc(8) int local8 = Rasteriser.centerY; - @Pc(12) int local12 = MathUtils.anIntArray223[0]; - @Pc(16) int local16 = MathUtils.anIntArray225[0]; - @Pc(20) int local20 = MathUtils.anIntArray223[arg0]; - @Pc(24) int local24 = MathUtils.anIntArray225[arg0]; - @Pc(28) int local28 = MathUtils.anIntArray223[arg1]; - @Pc(32) int local32 = MathUtils.anIntArray225[arg1]; - @Pc(36) int local36 = MathUtils.anIntArray223[arg2]; - @Pc(40) int local40 = MathUtils.anIntArray225[arg2]; + @Pc(12) int local12 = MathUtils.sin[0]; + @Pc(16) int local16 = MathUtils.cos[0]; + @Pc(20) int local20 = MathUtils.sin[arg0]; + @Pc(24) int local24 = MathUtils.cos[arg0]; + @Pc(28) int local28 = MathUtils.sin[arg1]; + @Pc(32) int local32 = MathUtils.cos[arg1]; + @Pc(36) int local36 = MathUtils.sin[arg2]; + @Pc(40) int local40 = MathUtils.cos[arg2]; @Pc(50) int local50 = arg4 * local36 + arg5 * local40 >> 16; for (@Pc(52) int local52 = 0; local52 < this.anInt5788; local52++) { @Pc(61) int local61 = this.anIntArray528[local52]; @@ -1948,22 +1948,22 @@ public final class SoftwareModel extends Model { this.anIntArray527[local33] -= Static268.anInt5791; this.anIntArray531[local33] -= Static268.anInt5792; if (arg4 != 0) { - local41 = MathUtils.anIntArray223[arg4]; - local307 = MathUtils.anIntArray225[arg4]; + local41 = MathUtils.sin[arg4]; + local307 = MathUtils.cos[arg4]; local329 = this.anIntArray527[local33] * local41 + this.anIntArray528[local33] * local307 + 32767 >> 16; this.anIntArray527[local33] = this.anIntArray527[local33] * local307 + 32767 - this.anIntArray528[local33] * local41 >> 16; this.anIntArray528[local33] = local329; } if (arg2 != 0) { - local41 = MathUtils.anIntArray223[arg2]; - local307 = MathUtils.anIntArray225[arg2]; + local41 = MathUtils.sin[arg2]; + local307 = MathUtils.cos[arg2]; local329 = this.anIntArray527[local33] * local307 + 32767 - this.anIntArray531[local33] * local41 >> 16; this.anIntArray531[local33] = this.anIntArray527[local33] * local41 + this.anIntArray531[local33] * local307 + 32767 >> 16; this.anIntArray527[local33] = local329; } if (arg3 != 0) { - local41 = MathUtils.anIntArray223[arg3]; - local307 = MathUtils.anIntArray225[arg3]; + local41 = MathUtils.sin[arg3]; + local307 = MathUtils.cos[arg3]; local329 = this.anIntArray531[local33] * local41 + this.anIntArray528[local33] * local307 + 32767 >> 16; this.anIntArray531[local33] = this.anIntArray531[local33] * local307 + 32767 - this.anIntArray528[local33] * local41 >> 16; this.anIntArray528[local33] = local329; @@ -1995,12 +1995,12 @@ public final class SoftwareModel extends Model { Static268.aBoolean306 = false; } @Pc(374) int[] local374 = new int[9]; - local329 = MathUtils.anIntArray225[arg2] >> 1; - local351 = MathUtils.anIntArray223[arg2] >> 1; - local392 = MathUtils.anIntArray225[arg3] >> 1; - local398 = MathUtils.anIntArray223[arg3] >> 1; - local404 = MathUtils.anIntArray225[arg4] >> 1; - local410 = MathUtils.anIntArray223[arg4] >> 1; + local329 = MathUtils.cos[arg2] >> 1; + local351 = MathUtils.sin[arg2] >> 1; + local392 = MathUtils.cos[arg3] >> 1; + local398 = MathUtils.sin[arg3] >> 1; + local404 = MathUtils.cos[arg4] >> 1; + local410 = MathUtils.sin[arg4] >> 1; local418 = local351 * local404 + 16384 >> 15; local426 = local351 * local410 + 16384 >> 15; local374[0] = local392 * local404 + local398 * local426 + 16384 >> 15; @@ -2261,22 +2261,22 @@ public final class SoftwareModel extends Model { this.anIntArray527[local3] -= Static268.anInt5791; this.anIntArray531[local3] -= Static268.anInt5792; if (arg3 != 0) { - local11 = MathUtils.anIntArray223[arg3]; - local146 = MathUtils.anIntArray225[arg3]; + local11 = MathUtils.sin[arg3]; + local146 = MathUtils.cos[arg3]; local164 = this.anIntArray527[local3] * local11 + this.anIntArray528[local3] * local146 + 32767 >> 16; this.anIntArray527[local3] = this.anIntArray527[local3] * local146 + 32767 - this.anIntArray528[local3] * local11 >> 16; this.anIntArray528[local3] = local164; } if (arg1 != 0) { - local11 = MathUtils.anIntArray223[arg1]; - local146 = MathUtils.anIntArray225[arg1]; + local11 = MathUtils.sin[arg1]; + local146 = MathUtils.cos[arg1]; local164 = this.anIntArray527[local3] * local146 + 32767 - this.anIntArray531[local3] * local11 >> 16; this.anIntArray531[local3] = this.anIntArray527[local3] * local11 + this.anIntArray531[local3] * local146 + 32767 >> 16; this.anIntArray527[local3] = local164; } if (arg2 != 0) { - local11 = MathUtils.anIntArray223[arg2]; - local146 = MathUtils.anIntArray225[arg2]; + local11 = MathUtils.sin[arg2]; + local146 = MathUtils.cos[arg2]; local164 = this.anIntArray531[local3] * local11 + this.anIntArray528[local3] * local146 + 32767 >> 16; this.anIntArray531[local3] = this.anIntArray531[local3] * local146 + 32767 - this.anIntArray528[local3] * local11 >> 16; this.anIntArray528[local3] = local164; diff --git a/client/src/main/java/Static156.java b/client/src/main/java/Static156.java index bc554b8..efd4848 100644 --- a/client/src/main/java/Static156.java +++ b/client/src/main/java/Static156.java @@ -29,10 +29,10 @@ public final class Static156 { } else if (arg2 >= Static99.mapSizeZ * 128) { arg2 = Static99.mapSizeZ * 128 - 1; } - Static109.anInt2886 = MathUtils.anIntArray223[arg3]; - Static121.anInt3038 = MathUtils.anIntArray225[arg3]; - Static231.anInt5205 = MathUtils.anIntArray223[arg4]; - Static81.anInt2222 = MathUtils.anIntArray225[arg4]; + Static109.anInt2886 = MathUtils.sin[arg3]; + Static121.anInt3038 = MathUtils.cos[arg3]; + Static231.anInt5205 = MathUtils.sin[arg4]; + Static81.anInt2222 = MathUtils.cos[arg4]; Static149.anInt3555 = arg0; Static162.anInt3947 = arg1; Static217.anInt4903 = arg2; diff --git a/client/src/main/java/Static164.java b/client/src/main/java/Static164.java index 768951e..8da6ed0 100644 --- a/client/src/main/java/Static164.java +++ b/client/src/main/java/Static164.java @@ -216,8 +216,8 @@ public final class Static164 { } else if (arg4 == 2) { local145 = (int) ((double) local145 * 1.04D); } - @Pc(176) int local176 = MathUtils.anIntArray225[local5.xAngle2d] * local145 >> 16; - @Pc(185) int local185 = MathUtils.anIntArray223[local5.xAngle2d] * local145 >> 16; + @Pc(176) int local176 = MathUtils.cos[local5.xAngle2d] * local145 >> 16; + @Pc(185) int local185 = MathUtils.sin[local5.xAngle2d] * local145 >> 16; local60.method4571(local5.yAngle2d, local5.zAngle2d, local5.xAngle2d, local5.xOffset2d, local185 + local5.yOffset2d - local60.method4549() / 2, local5.yOffset2d + local176, -1L); if (arg4 >= 1) { local133.method303(1); diff --git a/client/src/main/java/Static170.java b/client/src/main/java/Static170.java index d9033b4..bf8474a 100644 --- a/client/src/main/java/Static170.java +++ b/client/src/main/java/Static170.java @@ -18,7 +18,7 @@ public final class Static170 { @OriginalMember(owner = "client!nh", name = "a", descriptor = "(IIIII)I") public static int method2569(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) { - @Pc(22) int local22 = 65536 - MathUtils.anIntArray225[arg2 * 1024 / arg3] >> 1; + @Pc(22) int local22 = 65536 - MathUtils.cos[arg2 * 1024 / arg3] >> 1; return (arg0 * (65536 - local22) >> 16) + (arg1 * local22 >> 16); } diff --git a/client/src/main/java/Static18.java b/client/src/main/java/Static18.java index ab83a0b..4eb7f5b 100644 --- a/client/src/main/java/Static18.java +++ b/client/src/main/java/Static18.java @@ -74,14 +74,14 @@ public final class Static18 { @Pc(72) int local72; @Pc(68) int local68; if (local5 != 0) { - local68 = MathUtils.anIntArray225[local5]; - local72 = MathUtils.anIntArray223[local5]; + local68 = MathUtils.cos[local5]; + local72 = MathUtils.sin[local5]; local59 = local72 * -arg3 >> 16; local57 = local68 * arg3 >> 16; } if (local29 != 0) { - local72 = MathUtils.anIntArray223[local29]; - local68 = MathUtils.anIntArray225[local29]; + local72 = MathUtils.sin[local29]; + local68 = MathUtils.cos[local29]; local55 = local72 * local57 >> 16; local57 = local57 * local68 >> 16; } diff --git a/client/src/main/java/Static198.java b/client/src/main/java/Static198.java index 608ee9d..7304fbd 100644 --- a/client/src/main/java/Static198.java +++ b/client/src/main/java/Static198.java @@ -59,10 +59,10 @@ public final class Static198 { @Pc(42) int local42 = arg2 - Static134.renderZ; @Pc(46) int local46 = local38 - Static5.anInt40; @Pc(50) int local50 = arg5 - Static138.renderX; - @Pc(54) int local54 = MathUtils.anIntArray223[Static240.cameraPitch]; - @Pc(58) int local58 = MathUtils.anIntArray225[Static240.cameraPitch]; - @Pc(62) int local62 = MathUtils.anIntArray223[Static184.cameraYaw]; - @Pc(66) int local66 = MathUtils.anIntArray225[Static184.cameraYaw]; + @Pc(54) int local54 = MathUtils.sin[Static240.cameraPitch]; + @Pc(58) int local58 = MathUtils.cos[Static240.cameraPitch]; + @Pc(62) int local62 = MathUtils.sin[Static184.cameraYaw]; + @Pc(66) int local66 = MathUtils.cos[Static184.cameraYaw]; @Pc(76) int local76 = local50 * local66 + local62 * local42 >> 16; @Pc(87) int local87 = local42 * local66 - local62 * local50 >> 16; @Pc(89) int local89 = local76; diff --git a/client/src/main/java/Static41.java b/client/src/main/java/Static41.java index 0ab893f..fe69286 100644 --- a/client/src/main/java/Static41.java +++ b/client/src/main/java/Static41.java @@ -62,8 +62,8 @@ public final class Static41 { local130 = local83[local115]; for (@Pc(132) int local132 = 0; local132 < local41; local132++) { @Pc(141) int local141 = (local132 << 11) / local41; - @Pc(152) int local152 = arg5 + MathUtils.anIntArray225[local141] * local130 >> 16; - local162 = arg3 + MathUtils.anIntArray223[local141] * local126 >> 16; + @Pc(152) int local152 = arg5 + MathUtils.cos[local141] * local130 >> 16; + local162 = arg3 + MathUtils.sin[local141] * local126 >> 16; local113[local115][local132] = local103.method1685(local162, local152); } } diff --git a/client/src/main/java/Static54.java b/client/src/main/java/Static54.java index 8f58936..3d4cebc 100644 --- a/client/src/main/java/Static54.java +++ b/client/src/main/java/Static54.java @@ -46,8 +46,8 @@ public final class Static54 { for (@Pc(117) int local117 = 0; local117 < Static235.mapFunctionGroup.anInt5074; local117++) { if (Static235.mapFunctionGroup.method3892(local117)) { local146 = (Static235.mapFunctionGroup.aShortArray73[local117] - Static225.originX) * 4 + 2 - Static173.self.xFine / 32; - local150 = MathUtils.anIntArray223[local48]; - local154 = MathUtils.anIntArray225[local48]; + local150 = MathUtils.sin[local48]; + local154 = MathUtils.cos[local48]; @Pc(156) Font local156 = Static114.aClass3_Sub2_Sub9_42; @Pc(164) int local164 = local150 * 256 / (Static273.anInt4130 + 256); local181 = (Static235.mapFunctionGroup.aShortArray72[local117] - Static142.originZ) * 4 + 2 - Static173.self.zFine / 32; diff --git a/client/src/main/java/Static60.java b/client/src/main/java/Static60.java index dd244c1..929c635 100644 --- a/client/src/main/java/Static60.java +++ b/client/src/main/java/Static60.java @@ -42,9 +42,9 @@ public final class Static60 { if (local39 * local39 < local21) { return; } - @Pc(50) int local50 = MathUtils.anIntArray223[local27]; + @Pc(50) int local50 = MathUtils.sin[local27]; @Pc(58) int local58 = local50 * 256 / (Static273.anInt4130 + 256); - @Pc(62) int local62 = MathUtils.anIntArray225[local27]; + @Pc(62) int local62 = MathUtils.cos[local27]; @Pc(70) int local70 = local62 * 256 / (Static273.anInt4130 + 256); @Pc(81) int local81 = local58 * arg2 + arg3 * local70 >> 16; @Pc(92) int local92 = local70 * arg2 - arg3 * local58 >> 16; diff --git a/client/src/main/java/Static75.java b/client/src/main/java/Static75.java index f1e8ec0..ebece21 100644 --- a/client/src/main/java/Static75.java +++ b/client/src/main/java/Static75.java @@ -417,8 +417,8 @@ public final class Static75 { local1188 = local1232.modelRotateTranslate[local1194][0]; local224 -= local1232.modelRotateTranslate[local1194][1]; @Pc(1264) int local1264 = local1232.modelRotateTranslate[local1194][2]; - @Pc(1269) int local1269 = MathUtils.anIntArray223[local1198.anInt3381]; - @Pc(1274) int local1274 = MathUtils.anIntArray225[local1198.anInt3381]; + @Pc(1269) int local1269 = MathUtils.sin[local1198.anInt3381]; + @Pc(1274) int local1274 = MathUtils.cos[local1198.anInt3381]; @Pc(1284) int local1284 = local1188 * local1274 + local1264 * local1269 >> 16; @Pc(1295) int local1295 = local1274 * local1264 - local1188 * local1269 >> 16; local19 += local1295; diff --git a/client/src/main/java/Static77.java b/client/src/main/java/Static77.java index 080f6ef..2fc7589 100644 --- a/client/src/main/java/Static77.java +++ b/client/src/main/java/Static77.java @@ -8,13 +8,13 @@ public final class Static77 { public static final int[] anIntArray194 = new int[10000]; @OriginalMember(owner = "client!gb", name = "N", descriptor = "[I") - public static final int[] anIntArray195 = MathUtils.anIntArray225; + public static final int[] anIntArray195 = MathUtils.cos; @OriginalMember(owner = "client!gb", name = "S", descriptor = "I") public static int anInt2138 = 0; @OriginalMember(owner = "client!gb", name = "V", descriptor = "[I") - public static final int[] anIntArray198 = MathUtils.anIntArray223; + public static final int[] anIntArray198 = MathUtils.sin; @OriginalMember(owner = "client!gb", name = "Z", descriptor = "[I") public static final int[] anIntArray199 = new int[10000]; diff --git a/client/src/main/java/Static87.java b/client/src/main/java/Static87.java index 481e1ce..c28a31f 100644 --- a/client/src/main/java/Static87.java +++ b/client/src/main/java/Static87.java @@ -238,8 +238,8 @@ public final class Static87 { local276 -= local30.anInt459 / 2; local503 = (int)Camera.yawTarget + Static59.anInt1814 & 0x7FF; local270 -= local30.anInt445 / 2; - local514 = MathUtils.anIntArray223[local503]; - local518 = MathUtils.anIntArray225[local503]; + local514 = MathUtils.sin[local503]; + local518 = MathUtils.cos[local503]; local514 = (Static273.anInt4130 + 256) * local514 >> 8; local518 = (Static273.anInt4130 + 256) * local518 >> 8; local545 = local518 * local276 - local514 * local270 >> 11; @@ -743,8 +743,8 @@ public final class Static87 { if (local30.aBoolean34) { GlRenderer.disableDepthMask(); } - local563 = MathUtils.anIntArray223[local30.modelXAngle] * local30.modelZoom >> 16; - local571 = local30.modelZoom * MathUtils.anIntArray225[local30.modelXAngle] >> 16; + local563 = MathUtils.sin[local30.modelXAngle] * local30.modelZoom >> 16; + local571 = local30.modelZoom * MathUtils.cos[local30.modelXAngle] >> 16; if (local30.aBoolean32) { local2589.method4571(local30.modelYAngle, local30.modelYOffset, local30.modelXAngle, local30.modelXOffset, local30.modelZOffset + local563 + local503, local30.modelZOffset + local571, -1L); } else { @@ -755,8 +755,8 @@ public final class Static87 { } } else { Rasteriser.setBounds(local556, local545); - local563 = MathUtils.anIntArray223[local30.modelXAngle] * local30.modelZoom >> 16; - local571 = local30.modelZoom * MathUtils.anIntArray225[local30.modelXAngle] >> 16; + local563 = MathUtils.sin[local30.modelXAngle] * local30.modelZoom >> 16; + local571 = local30.modelZoom * MathUtils.cos[local30.modelXAngle] >> 16; if (!local30.aBoolean32) { local2589.method4571(local30.modelYAngle, 0, local30.modelXAngle, 0, local563, local571, -1L); } else if (local30.aBoolean22) { diff --git a/client/src/main/java/Static97.java b/client/src/main/java/Static97.java index dc4d2fd..f70667d 100644 --- a/client/src/main/java/Static97.java +++ b/client/src/main/java/Static97.java @@ -36,8 +36,8 @@ public final class Static97 { } local30 -= 10; @Pc(58) int local58 = Static59.anInt1814 + (int)Camera.yawTarget & 0x7FF; - @Pc(62) int local62 = MathUtils.anIntArray225[local58]; - @Pc(66) int local66 = MathUtils.anIntArray223[local58]; + @Pc(62) int local62 = MathUtils.cos[local58]; + @Pc(66) int local66 = MathUtils.sin[local58]; @Pc(74) int local74 = local66 * 256 / (Static273.anInt4130 + 256); @Pc(82) int local82 = local62 * 256 / (Static273.anInt4130 + 256); @Pc(93) int local93 = arg4 * local74 + local82 * arg3 >> 16;