diff --git a/client/src/main/java/Class3_Sub14.java b/client/src/main/java/Class3_Sub14.java index c0910e7..13a70b3 100644 --- a/client/src/main/java/Class3_Sub14.java +++ b/client/src/main/java/Class3_Sub14.java @@ -280,7 +280,7 @@ public final class Class3_Sub14 extends Node { Static239.method4177(-1); Static27.method766(0, 0); } else { - Static94.anInterface1_2.method3227(this.anInt2485); + Rasteriser.anInterface1_2.method3227(this.anInt2485); } @Pc(282) int local282 = this.aBoolean139 ? 40 : 36; if (this.aClass155_3 == null) { diff --git a/client/src/main/java/Class3_Sub2_Sub18.java b/client/src/main/java/Class3_Sub2_Sub18.java index 27695a5..ee5d78d 100644 --- a/client/src/main/java/Class3_Sub2_Sub18.java +++ b/client/src/main/java/Class3_Sub2_Sub18.java @@ -25,7 +25,7 @@ public final class Class3_Sub2_Sub18 extends SecondaryNode { this.anInt5058 = local12[0]; this.anInt5059 = Static63.anInt1943; Static239.method4177(this.anInt5058); - @Pc(32) int local32 = Static94.anIntArray220[arg0]; + @Pc(32) int local32 = Rasteriser.anIntArray220[arg0]; @Pc(58) byte[] local58 = new byte[] { (byte) (local32 >> 16), (byte) (local32 >> 8), (byte) local32, -1 }; @Pc(61) ByteBuffer local61 = ByteBuffer.wrap(local58); local9.glTexImage2D(GL.GL_TEXTURE_2D, 0, GL.GL_RGBA, 1, 1, 0, GL.GL_RGBA, GL.GL_UNSIGNED_BYTE, local61); diff --git a/client/src/main/java/GlModel.java b/client/src/main/java/GlModel.java index ce2193a..7ddedb6 100644 --- a/client/src/main/java/GlModel.java +++ b/client/src/main/java/GlModel.java @@ -137,7 +137,7 @@ public final class GlModel extends Model { @Pc(23) int[] local23 = new int[arg0.anInt2136]; this.anIntArray462 = new int[arg0.anInt2139 + 1]; for (@Pc(32) int local32 = 0; local32 < arg0.anInt2136; local32++) { - if ((arg0.aByteArray30 == null || arg0.aByteArray30[local32] != 2) && (arg0.aShortArray23 == null || arg0.aShortArray23[local32] == -1 || !Static94.anInterface1_2.method3231(arg0.aShortArray23[local32] & 0xFFFF))) { + if ((arg0.aByteArray30 == null || arg0.aByteArray30[local32] != 2) && (arg0.aShortArray23 == null || arg0.aShortArray23[local32] == -1 || !Rasteriser.anInterface1_2.method3231(arg0.aShortArray23[local32] & 0xFFFF))) { local23[this.anInt5297++] = local32; this.anIntArray462[arg0.anIntArray197[local32]]++; this.anIntArray462[arg0.anIntArray200[local32]]++; @@ -159,11 +159,11 @@ public final class GlModel extends Model { if (arg0.aShortArray23 != null) { local135 = arg0.aShortArray23[local125]; if (local135 != -1) { - local131 = Static94.anInterface1_2.method3237(local135 & 0xFFFF); - local133 = Static94.anInterface1_2.method3228(local135 & 0xFFFF); + local131 = Rasteriser.anInterface1_2.method3237(local135 & 0xFFFF); + local133 = Rasteriser.anInterface1_2.method3228(local135 & 0xFFFF); } } - @Pc(182) boolean local182 = arg0.aByteArray26 != null && arg0.aByteArray26[local125] != 0 || local135 != -1 && !Static94.anInterface1_2.method3226(local135 & 0xFFFF); + @Pc(182) boolean local182 = arg0.aByteArray26 != null && arg0.aByteArray26[local125] != 0 || local135 != -1 && !Rasteriser.anInterface1_2.method3226(local135 & 0xFFFF); if ((arg3 || local182) && arg0.aByteArray35 != null) { local127 += arg0.aByteArray35[local125] << 17; } @@ -1742,14 +1742,14 @@ public final class GlModel extends Model { local1 = 0; @Pc(22) int local22 = 0; if (arg0 != -1) { - local1 = Static94.anInterface1_2.method3238(arg0 & 0xFFFF); - local22 = Static94.anInterface1_2.method3229(arg0 & 0xFFFF); + local1 = Rasteriser.anInterface1_2.method3238(arg0 & 0xFFFF); + local22 = Rasteriser.anInterface1_2.method3229(arg0 & 0xFFFF); } @Pc(41) int local41 = 0; @Pc(43) int local43 = 0; if (arg1 != -1) { - local41 = Static94.anInterface1_2.method3238(arg1 & 0xFFFF); - local43 = Static94.anInterface1_2.method3229(arg1 & 0xFFFF); + local41 = Rasteriser.anInterface1_2.method3238(arg1 & 0xFFFF); + local43 = Rasteriser.anInterface1_2.method3229(arg1 & 0xFFFF); } if (local1 != local41 || local22 != local43) { this.aClass127_1.aBoolean235 = false; @@ -3069,7 +3069,7 @@ public final class GlModel extends Model { Static239.method4177(-1); Static27.method766(0, 0); } else { - Static94.anInterface1_2.method3227(local439 & 0xFFFF); + Rasteriser.anInterface1_2.method3227(local439 & 0xFFFF); } if (this.aClass127_5.aClass155_4 == null) { this.aClass127_5.aByteBuffer8.position(local427 * 12); @@ -3230,7 +3230,7 @@ public final class GlModel extends Model { @Pc(322) int local322 = Static237.anIntArray467[local297]; @Pc(326) int local326 = Static237.anIntArray467[local302]; if ((local246 - local248) * (local322 - local326) - (local322 - local318) * (local258 - local248) > 0) { - Static94.method1921(local151.aByteArray18, local318, local322, local326, local246, local248, local258, local134); + Rasteriser.method1921(local151.aByteArray18, local318, local322, local326, local246, local248, local258, local134); } } } diff --git a/client/src/main/java/Light.java b/client/src/main/java/Light.java index 5714904..31bf6e0 100644 --- a/client/src/main/java/Light.java +++ b/client/src/main/java/Light.java @@ -85,7 +85,7 @@ public final class Light { for (local87 = 0; local87 < this.aShortArray30.length; local87++) { this.aShortArray30[local87] = (short) arg0.method2163(); } - this.anInt2247 = Static94.anIntArray220[arg0.method2163()]; + this.anInt2247 = Rasteriser.anIntArray220[arg0.method2163()]; local87 = arg0.method2229(); this.anInt2249 = (local87 & 0xE0) << 3; this.anInt2243 = local87 & 0x1F; diff --git a/client/src/main/java/Static94.java b/client/src/main/java/Rasteriser.java similarity index 99% rename from client/src/main/java/Static94.java rename to client/src/main/java/Rasteriser.java index 1c17042..f6e0ac9 100644 --- a/client/src/main/java/Static94.java +++ b/client/src/main/java/Rasteriser.java @@ -2,7 +2,7 @@ import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; -public final class Static94 { +public final class Rasteriser { @OriginalMember(owner = "client!hf", name = "b", descriptor = "I") public static int anInt2469; diff --git a/client/src/main/java/SoftwareModel.java b/client/src/main/java/SoftwareModel.java index f665228..709900e 100644 --- a/client/src/main/java/SoftwareModel.java +++ b/client/src/main/java/SoftwareModel.java @@ -159,7 +159,7 @@ public final class SoftwareModel extends Model { this.aShortArray92 = new short[this.anInt5787]; for (local133 = 0; local133 < this.anInt5787; local133++) { @Pc(142) short local142 = arg0.aShortArray23[local133]; - if (local142 != -1 && Static94.anInterface1_2.method3236(local142)) { + if (local142 != -1 && Rasteriser.anInterface1_2.method3236(local142)) { this.aShortArray92[local133] = local142; } else { this.aShortArray92[local133] = -1; @@ -429,11 +429,11 @@ public final class SoftwareModel extends Model { @Pc(12) int local12 = this.anIntArray534[arg0]; @Pc(17) int local17 = this.anIntArray524[arg0]; @Pc(22) int local22 = this.anIntArray529[arg0]; - Static94.aBoolean138 = Static268.aBooleanArray133[arg0]; + Rasteriser.aBoolean138 = Static268.aBooleanArray133[arg0]; if (this.aByteArray75 == null) { - Static94.anInt2473 = 0; + Rasteriser.anInt2473 = 0; } else { - Static94.anInt2473 = this.aByteArray75[arg0] & 0xFF; + Rasteriser.anInt2473 = this.aByteArray75[arg0] & 0xFF; } if (this.aShortArray92 != null && this.aShortArray92[arg0] != -1) { @Pc(141) int local141; @@ -450,14 +450,14 @@ public final class SoftwareModel extends Model { local151 = this.anIntArray525[local136]; } if (this.anIntArray532[arg0] == -1) { - Static94.method1912(Static268.anIntArray551[local12], Static268.anIntArray551[local17], Static268.anIntArray551[local22], Static268.anIntArray556[local12], Static268.anIntArray556[local17], Static268.anIntArray556[local22], this.anIntArray533[arg0], this.anIntArray533[arg0], this.anIntArray533[arg0], Static268.anIntArray560[local141], Static268.anIntArray560[local146], Static268.anIntArray560[local151], Static268.anIntArray548[local141], Static268.anIntArray548[local146], Static268.anIntArray548[local151], Static268.anIntArray544[local141], Static268.anIntArray544[local146], Static268.anIntArray544[local151], this.aShortArray92[arg0]); + Rasteriser.method1912(Static268.anIntArray551[local12], Static268.anIntArray551[local17], Static268.anIntArray551[local22], Static268.anIntArray556[local12], Static268.anIntArray556[local17], Static268.anIntArray556[local22], this.anIntArray533[arg0], this.anIntArray533[arg0], this.anIntArray533[arg0], Static268.anIntArray560[local141], Static268.anIntArray560[local146], Static268.anIntArray560[local151], Static268.anIntArray548[local141], Static268.anIntArray548[local146], Static268.anIntArray548[local151], Static268.anIntArray544[local141], Static268.anIntArray544[local146], Static268.anIntArray544[local151], this.aShortArray92[arg0]); } else { - Static94.method1912(Static268.anIntArray551[local12], Static268.anIntArray551[local17], Static268.anIntArray551[local22], Static268.anIntArray556[local12], Static268.anIntArray556[local17], Static268.anIntArray556[local22], this.anIntArray533[arg0], this.anIntArray523[arg0], this.anIntArray532[arg0], Static268.anIntArray560[local141], Static268.anIntArray560[local146], Static268.anIntArray560[local151], Static268.anIntArray548[local141], Static268.anIntArray548[local146], Static268.anIntArray548[local151], Static268.anIntArray544[local141], Static268.anIntArray544[local146], Static268.anIntArray544[local151], this.aShortArray92[arg0]); + Rasteriser.method1912(Static268.anIntArray551[local12], Static268.anIntArray551[local17], Static268.anIntArray551[local22], Static268.anIntArray556[local12], Static268.anIntArray556[local17], Static268.anIntArray556[local22], this.anIntArray533[arg0], this.anIntArray523[arg0], this.anIntArray532[arg0], Static268.anIntArray560[local141], Static268.anIntArray560[local146], Static268.anIntArray560[local151], Static268.anIntArray548[local141], Static268.anIntArray548[local146], Static268.anIntArray548[local151], Static268.anIntArray544[local141], Static268.anIntArray544[local146], Static268.anIntArray544[local151], this.aShortArray92[arg0]); } } else if (this.anIntArray532[arg0] == -1) { - Static94.method1918(Static268.anIntArray551[local12], Static268.anIntArray551[local17], Static268.anIntArray551[local22], Static268.anIntArray556[local12], Static268.anIntArray556[local17], Static268.anIntArray556[local22], Static94.anIntArray220[this.anIntArray533[arg0] & 0xFFFF]); + Rasteriser.method1918(Static268.anIntArray551[local12], Static268.anIntArray551[local17], Static268.anIntArray551[local22], Static268.anIntArray556[local12], Static268.anIntArray556[local17], Static268.anIntArray556[local22], Rasteriser.anIntArray220[this.anIntArray533[arg0] & 0xFFFF]); } else { - Static94.method1928(Static268.anIntArray551[local12], Static268.anIntArray551[local17], Static268.anIntArray551[local22], Static268.anIntArray556[local12], Static268.anIntArray556[local17], Static268.anIntArray556[local22], this.anIntArray533[arg0] & 0xFFFF, this.anIntArray523[arg0] & 0xFFFF, this.anIntArray532[arg0] & 0xFFFF); + Rasteriser.method1928(Static268.anIntArray551[local12], Static268.anIntArray551[local17], Static268.anIntArray551[local22], Static268.anIntArray556[local12], Static268.anIntArray556[local17], Static268.anIntArray556[local22], this.anIntArray533[arg0] & 0xFFFF, this.anIntArray523[arg0] & 0xFFFF, this.anIntArray532[arg0] & 0xFFFF); } } @@ -650,8 +650,8 @@ public final class SoftwareModel extends Model { @Pc(154) boolean local154 = false; @Pc(161) boolean local161 = local53 <= 50; @Pc(170) boolean local170 = local161 || this.anInt5789 > 0; - @Pc(172) int local172 = Static94.anInt2471; - @Pc(174) int local174 = Static94.anInt2469; + @Pc(172) int local172 = Rasteriser.anInt2471; + @Pc(174) int local174 = Rasteriser.anInt2469; @Pc(176) int local176 = 0; @Pc(178) int local178 = 0; if (arg0 != 0) { @@ -937,8 +937,8 @@ public final class SoftwareModel extends Model { if (!this.aBoolean305) { this.method4592(); } - @Pc(6) int local6 = Static94.anInt2471; - @Pc(8) int local8 = Static94.anInt2469; + @Pc(6) int local6 = Rasteriser.anInt2471; + @Pc(8) int local8 = Rasteriser.anInt2469; @Pc(12) int local12 = MathUtils.anIntArray223[0]; @Pc(16) int local16 = MathUtils.anIntArray225[0]; @Pc(20) int local20 = MathUtils.anIntArray223[arg0]; @@ -984,8 +984,8 @@ public final class SoftwareModel extends Model { @OriginalMember(owner = "client!w", name = "g", descriptor = "(I)V") private void method4587(@OriginalArg(0) int arg0) { - @Pc(1) int local1 = Static94.anInt2471; - @Pc(3) int local3 = Static94.anInt2469; + @Pc(1) int local1 = Rasteriser.anInt2471; + @Pc(3) int local3 = Rasteriser.anInt2469; @Pc(5) int local5 = 0; @Pc(10) int local10 = this.anIntArray534[arg0]; @Pc(15) int local15 = this.anIntArray524[arg0]; @@ -994,9 +994,9 @@ public final class SoftwareModel extends Model { @Pc(28) int local28 = Static268.anIntArray544[local15]; @Pc(32) int local32 = Static268.anIntArray544[local20]; if (this.aByteArray75 == null) { - Static94.anInt2473 = 0; + Rasteriser.anInt2473 = 0; } else { - Static94.anInt2473 = this.aByteArray75[arg0] & 0xFF; + Rasteriser.anInt2473 = this.aByteArray75[arg0] & 0xFF; } @Pc(75) int local75; @Pc(79) int local79; @@ -1073,14 +1073,14 @@ public final class SoftwareModel extends Model { local99 = Static268.anIntArray547[0]; @Pc(614) int local614 = Static268.anIntArray547[1]; @Pc(618) int local618 = Static268.anIntArray547[2]; - Static94.aBoolean138 = false; + Rasteriser.aBoolean138 = false; @Pc(709) int local709; @Pc(714) int local714; @Pc(719) int local719; @Pc(704) int local704; if (local5 == 3) { - if (local75 < 0 || local79 < 0 || local86 < 0 || local75 > Static94.anInt2472 || local79 > Static94.anInt2472 || local86 > Static94.anInt2472) { - Static94.aBoolean138 = true; + if (local75 < 0 || local79 < 0 || local86 < 0 || local75 > Rasteriser.anInt2472 || local79 > Rasteriser.anInt2472 || local86 > Rasteriser.anInt2472) { + Rasteriser.aBoolean138 = true; } if (this.aShortArray92 != null && this.aShortArray92[arg0] != -1) { if (this.aByteArray74 == null || this.aByteArray74[arg0] == -1) { @@ -1094,21 +1094,21 @@ public final class SoftwareModel extends Model { local719 = this.anIntArray525[local704]; } if (this.anIntArray532[arg0] == -1) { - Static94.method1912(local99, local614, local618, local75, local79, local86, this.anIntArray533[arg0], this.anIntArray533[arg0], this.anIntArray533[arg0], Static268.anIntArray560[local709], Static268.anIntArray560[local714], Static268.anIntArray560[local719], Static268.anIntArray548[local709], Static268.anIntArray548[local714], Static268.anIntArray548[local719], Static268.anIntArray544[local709], Static268.anIntArray544[local714], Static268.anIntArray544[local719], this.aShortArray92[arg0]); + Rasteriser.method1912(local99, local614, local618, local75, local79, local86, this.anIntArray533[arg0], this.anIntArray533[arg0], this.anIntArray533[arg0], Static268.anIntArray560[local709], Static268.anIntArray560[local714], Static268.anIntArray560[local719], Static268.anIntArray548[local709], Static268.anIntArray548[local714], Static268.anIntArray548[local719], Static268.anIntArray544[local709], Static268.anIntArray544[local714], Static268.anIntArray544[local719], this.aShortArray92[arg0]); } else { - Static94.method1912(local99, local614, local618, local75, local79, local86, Static268.anIntArray553[0], Static268.anIntArray553[1], Static268.anIntArray553[2], Static268.anIntArray560[local709], Static268.anIntArray560[local714], Static268.anIntArray560[local719], Static268.anIntArray548[local709], Static268.anIntArray548[local714], Static268.anIntArray548[local719], Static268.anIntArray544[local709], Static268.anIntArray544[local714], Static268.anIntArray544[local719], this.aShortArray92[arg0]); + Rasteriser.method1912(local99, local614, local618, local75, local79, local86, Static268.anIntArray553[0], Static268.anIntArray553[1], Static268.anIntArray553[2], Static268.anIntArray560[local709], Static268.anIntArray560[local714], Static268.anIntArray560[local719], Static268.anIntArray548[local709], Static268.anIntArray548[local714], Static268.anIntArray548[local719], Static268.anIntArray544[local709], Static268.anIntArray544[local714], Static268.anIntArray544[local719], this.aShortArray92[arg0]); } } else if (this.anIntArray532[arg0] == -1) { - Static94.method1918(local99, local614, local618, local75, local79, local86, Static94.anIntArray220[this.anIntArray533[arg0] & 0xFFFF]); + Rasteriser.method1918(local99, local614, local618, local75, local79, local86, Rasteriser.anIntArray220[this.anIntArray533[arg0] & 0xFFFF]); } else { - Static94.method1928(local99, local614, local618, local75, local79, local86, Static268.anIntArray553[0], Static268.anIntArray553[1], Static268.anIntArray553[2]); + Rasteriser.method1928(local99, local614, local618, local75, local79, local86, Static268.anIntArray553[0], Static268.anIntArray553[1], Static268.anIntArray553[2]); } } if (local5 != 4) { return; } - if (local75 < 0 || local79 < 0 || local86 < 0 || local75 > Static94.anInt2472 || local79 > Static94.anInt2472 || local86 > Static94.anInt2472 || Static268.anIntArray542[3] < 0 || Static268.anIntArray542[3] > Static94.anInt2472) { - Static94.aBoolean138 = true; + if (local75 < 0 || local79 < 0 || local86 < 0 || local75 > Rasteriser.anInt2472 || local79 > Rasteriser.anInt2472 || local86 > Rasteriser.anInt2472 || Static268.anIntArray542[3] < 0 || Static268.anIntArray542[3] > Rasteriser.anInt2472) { + Rasteriser.aBoolean138 = true; } if (this.aShortArray92 != null && this.aShortArray92[arg0] != -1) { if (this.aByteArray74 == null || this.aByteArray74[arg0] == -1) { @@ -1123,19 +1123,19 @@ public final class SoftwareModel extends Model { } @Pc(984) short local984 = this.aShortArray92[arg0]; if (this.anIntArray532[arg0] == -1) { - Static94.method1912(local99, local614, local618, local75, local79, local86, this.anIntArray533[arg0], this.anIntArray533[arg0], this.anIntArray533[arg0], Static268.anIntArray560[local709], Static268.anIntArray560[local714], Static268.anIntArray560[local719], Static268.anIntArray548[local709], Static268.anIntArray548[local714], Static268.anIntArray548[local719], Static268.anIntArray544[local709], Static268.anIntArray544[local714], Static268.anIntArray544[local719], local984); - Static94.method1912(local99, local618, Static268.anIntArray547[3], local75, local86, Static268.anIntArray542[3], this.anIntArray533[arg0], this.anIntArray533[arg0], this.anIntArray533[arg0], Static268.anIntArray560[local709], Static268.anIntArray560[local714], Static268.anIntArray560[local719], Static268.anIntArray548[local709], Static268.anIntArray548[local714], Static268.anIntArray548[local719], Static268.anIntArray544[local709], Static268.anIntArray544[local714], Static268.anIntArray544[local719], local984); + Rasteriser.method1912(local99, local614, local618, local75, local79, local86, this.anIntArray533[arg0], this.anIntArray533[arg0], this.anIntArray533[arg0], Static268.anIntArray560[local709], Static268.anIntArray560[local714], Static268.anIntArray560[local719], Static268.anIntArray548[local709], Static268.anIntArray548[local714], Static268.anIntArray548[local719], Static268.anIntArray544[local709], Static268.anIntArray544[local714], Static268.anIntArray544[local719], local984); + Rasteriser.method1912(local99, local618, Static268.anIntArray547[3], local75, local86, Static268.anIntArray542[3], this.anIntArray533[arg0], this.anIntArray533[arg0], this.anIntArray533[arg0], Static268.anIntArray560[local709], Static268.anIntArray560[local714], Static268.anIntArray560[local719], Static268.anIntArray548[local709], Static268.anIntArray548[local714], Static268.anIntArray548[local719], Static268.anIntArray544[local709], Static268.anIntArray544[local714], Static268.anIntArray544[local719], local984); } else { - Static94.method1912(local99, local614, local618, local75, local79, local86, Static268.anIntArray553[0], Static268.anIntArray553[1], Static268.anIntArray553[2], Static268.anIntArray560[local709], Static268.anIntArray560[local714], Static268.anIntArray560[local719], Static268.anIntArray548[local709], Static268.anIntArray548[local714], Static268.anIntArray548[local719], Static268.anIntArray544[local709], Static268.anIntArray544[local714], Static268.anIntArray544[local719], local984); - Static94.method1912(local99, local618, Static268.anIntArray547[3], local75, local86, Static268.anIntArray542[3], Static268.anIntArray553[0], Static268.anIntArray553[2], Static268.anIntArray553[3], Static268.anIntArray560[local709], Static268.anIntArray560[local714], Static268.anIntArray560[local719], Static268.anIntArray548[local709], Static268.anIntArray548[local714], Static268.anIntArray548[local719], Static268.anIntArray544[local709], Static268.anIntArray544[local714], Static268.anIntArray544[local719], local984); + Rasteriser.method1912(local99, local614, local618, local75, local79, local86, Static268.anIntArray553[0], Static268.anIntArray553[1], Static268.anIntArray553[2], Static268.anIntArray560[local709], Static268.anIntArray560[local714], Static268.anIntArray560[local719], Static268.anIntArray548[local709], Static268.anIntArray548[local714], Static268.anIntArray548[local719], Static268.anIntArray544[local709], Static268.anIntArray544[local714], Static268.anIntArray544[local719], local984); + Rasteriser.method1912(local99, local618, Static268.anIntArray547[3], local75, local86, Static268.anIntArray542[3], Static268.anIntArray553[0], Static268.anIntArray553[2], Static268.anIntArray553[3], Static268.anIntArray560[local709], Static268.anIntArray560[local714], Static268.anIntArray560[local719], Static268.anIntArray548[local709], Static268.anIntArray548[local714], Static268.anIntArray548[local719], Static268.anIntArray544[local709], Static268.anIntArray544[local714], Static268.anIntArray544[local719], local984); } } else if (this.anIntArray532[arg0] == -1) { - local709 = Static94.anIntArray220[this.anIntArray533[arg0] & 0xFFFF]; - Static94.method1918(local99, local614, local618, local75, local79, local86, local709); - Static94.method1918(local99, local618, Static268.anIntArray547[3], local75, local86, Static268.anIntArray542[3], local709); + local709 = Rasteriser.anIntArray220[this.anIntArray533[arg0] & 0xFFFF]; + Rasteriser.method1918(local99, local614, local618, local75, local79, local86, local709); + Rasteriser.method1918(local99, local618, Static268.anIntArray547[3], local75, local86, Static268.anIntArray542[3], local709); } else { - Static94.method1928(local99, local614, local618, local75, local79, local86, Static268.anIntArray553[0], Static268.anIntArray553[1], Static268.anIntArray553[2]); - Static94.method1928(local99, local618, Static268.anIntArray547[3], local75, local86, Static268.anIntArray542[3], Static268.anIntArray553[0], Static268.anIntArray553[2], Static268.anIntArray553[3]); + Rasteriser.method1928(local99, local614, local618, local75, local79, local86, Static268.anIntArray553[0], Static268.anIntArray553[1], Static268.anIntArray553[2]); + Rasteriser.method1928(local99, local618, Static268.anIntArray547[3], local75, local86, Static268.anIntArray542[3], Static268.anIntArray553[0], Static268.anIntArray553[2], Static268.anIntArray553[3]); } } @@ -1487,13 +1487,13 @@ public final class SoftwareModel extends Model { } } } else { - if (arg1 && this.method4589(Static150.anInt3582 + Static94.anInt2471, Static34.anInt1053 + Static94.anInt2469, Static268.anIntArray551[local51], Static268.anIntArray551[local56], Static268.anIntArray551[local61], local65, local69, local73)) { + if (arg1 && this.method4589(Static150.anInt3582 + Rasteriser.anInt2471, Static34.anInt1053 + Rasteriser.anInt2469, Static268.anIntArray551[local51], Static268.anIntArray551[local56], Static268.anIntArray551[local61], local65, local69, local73)) { Static259.aLongArray11[Static2.anInt7++] = arg2; arg1 = false; } if ((local65 - local69) * (Static268.anIntArray551[local61] - Static268.anIntArray551[local56]) - (Static268.anIntArray551[local51] - Static268.anIntArray551[local56]) * (local73 - local69) > 0) { Static268.aBooleanArray132[local11] = false; - if (local65 >= 0 && local69 >= 0 && local73 >= 0 && local65 <= Static94.anInt2472 && local69 <= Static94.anInt2472 && local73 <= Static94.anInt2472) { + if (local65 >= 0 && local69 >= 0 && local73 >= 0 && local65 <= Rasteriser.anInt2472 && local69 <= Rasteriser.anInt2472 && local73 <= Rasteriser.anInt2472) { Static268.aBooleanArray133[local11] = false; } else { Static268.aBooleanArray133[local11] = true; @@ -1739,8 +1739,8 @@ public final class SoftwareModel extends Model { if (!this.aBoolean305) { this.method4592(); } - @Pc(6) int local6 = Static94.anInt2471; - @Pc(8) int local8 = Static94.anInt2469; + @Pc(6) int local6 = Rasteriser.anInt2471; + @Pc(8) int local8 = Rasteriser.anInt2469; @Pc(12) int local12 = MathUtils.anIntArray223[0]; @Pc(16) int local16 = MathUtils.anIntArray225[0]; @Pc(20) int local20 = MathUtils.anIntArray223[arg0]; diff --git a/client/src/main/java/Static129.java b/client/src/main/java/Static129.java index 10ef474..6c07d6c 100644 --- a/client/src/main/java/Static129.java +++ b/client/src/main/java/Static129.java @@ -224,8 +224,8 @@ public final class Static129 { @Pc(67) int local67 = arg5 * local43 + 1 >> 17; @Pc(73) int local73 = arg5 * local37 >> 17; @Pc(81) int local81 = arg5 * local37 + 1 >> 17; - @Pc(85) int local85 = arg0 - Static94.method1913(); - @Pc(89) int local89 = arg1 - Static94.method1927(); + @Pc(85) int local85 = arg0 - Rasteriser.method1913(); + @Pc(89) int local89 = arg1 - Rasteriser.method1927(); @Pc(93) int local93 = local85 + local59; @Pc(97) int local97 = local85 - local67; @Pc(103) int local103 = local85 + local3 - local67; @@ -234,10 +234,10 @@ public final class Static129 { @Pc(117) int local117 = local89 - local81; @Pc(123) int local123 = local89 + local7 - local81; @Pc(129) int local129 = local89 + local7 + local73; - Static94.method1922(local93, local97, local103); - Static94.method1918(local113, local117, local123, local93, local97, local103, arg4); - Static94.method1922(local93, local103, local109); - Static94.method1918(local113, local123, local129, local93, local103, local109, arg4); + Rasteriser.method1922(local93, local97, local103); + Rasteriser.method1918(local113, local117, local123, local93, local97, local103, arg4); + Rasteriser.method1922(local93, local103, local109); + Rasteriser.method1918(local113, local123, local129, local93, local103, local109, arg4); } @OriginalMember(owner = "client!kb", name = "c", descriptor = "(IIIII)V") diff --git a/client/src/main/java/Static132.java b/client/src/main/java/Static132.java index 50f1e22..b0aae12 100644 --- a/client/src/main/java/Static132.java +++ b/client/src/main/java/Static132.java @@ -136,63 +136,63 @@ public final class Static132 { if (local261 < 50) { return; } - @Pc(275) int local275 = Static94.anInt2471 + (local97 << 9) / local117; - @Pc(283) int local283 = Static94.anInt2469 + (local119 << 9) / local117; - @Pc(291) int local291 = Static94.anInt2471 + (local21 << 9) / local165; - @Pc(299) int local299 = Static94.anInt2469 + (local49 << 9) / local165; - @Pc(307) int local307 = Static94.anInt2471 + (local193 << 9) / local27; - @Pc(315) int local315 = Static94.anInt2469 + (local63 << 9) / local27; - @Pc(323) int local323 = Static94.anInt2471 + (local241 << 9) / local261; - @Pc(331) int local331 = Static94.anInt2469 + (local85 << 9) / local261; - Static94.anInt2473 = 0; + @Pc(275) int local275 = Rasteriser.anInt2471 + (local97 << 9) / local117; + @Pc(283) int local283 = Rasteriser.anInt2469 + (local119 << 9) / local117; + @Pc(291) int local291 = Rasteriser.anInt2471 + (local21 << 9) / local165; + @Pc(299) int local299 = Rasteriser.anInt2469 + (local49 << 9) / local165; + @Pc(307) int local307 = Rasteriser.anInt2471 + (local193 << 9) / local27; + @Pc(315) int local315 = Rasteriser.anInt2469 + (local63 << 9) / local27; + @Pc(323) int local323 = Rasteriser.anInt2471 + (local241 << 9) / local261; + @Pc(331) int local331 = Rasteriser.anInt2469 + (local85 << 9) / local261; + Rasteriser.anInt2473 = 0; @Pc(475) int local475; if ((local307 - local323) * (local299 - local331) - (local315 - local331) * (local291 - local323) > 0) { - if (Static158.aBoolean187 && Static19.method583(Static89.anInt2388 + Static94.anInt2471, Static131.anInt3259 + Static94.anInt2469, local315, local331, local299, local307, local323, local291)) { + if (Static158.aBoolean187 && Static19.method583(Static89.anInt2388 + Rasteriser.anInt2471, Static131.anInt3259 + Rasteriser.anInt2469, local315, local331, local299, local307, local323, local291)) { Static56.anInt1742 = arg6; Static116.anInt2954 = arg7; } if (!Static239.aBoolean269 && !arg8) { - Static94.aBoolean138 = false; - if (local307 < 0 || local323 < 0 || local291 < 0 || local307 > Static94.anInt2472 || local323 > Static94.anInt2472 || local291 > Static94.anInt2472) { - Static94.aBoolean138 = true; + Rasteriser.aBoolean138 = false; + if (local307 < 0 || local323 < 0 || local291 < 0 || local307 > Rasteriser.anInt2472 || local323 > Rasteriser.anInt2472 || local291 > Rasteriser.anInt2472) { + Rasteriser.aBoolean138 = true; } if (arg0.anInt4869 == -1) { if (arg0.anInt4865 != 12345678) { - Static94.method1928(local315, local331, local299, local307, local323, local291, arg0.anInt4865, arg0.anInt4864, arg0.anInt4867); + Rasteriser.method1928(local315, local331, local299, local307, local323, local291, arg0.anInt4865, arg0.anInt4864, arg0.anInt4867); } } else if (!Static159.aBoolean189) { - local475 = Static94.anInterface1_2.method3234(arg0.anInt4869); - Static94.method1928(local315, local331, local299, local307, local323, local291, Static216.method1640(local475, arg0.anInt4865), Static216.method1640(local475, arg0.anInt4864), Static216.method1640(local475, arg0.anInt4867)); + local475 = Rasteriser.anInterface1_2.method3234(arg0.anInt4869); + Rasteriser.method1928(local315, local331, local299, local307, local323, local291, Static216.method1640(local475, arg0.anInt4865), Static216.method1640(local475, arg0.anInt4864), Static216.method1640(local475, arg0.anInt4867)); } else if (arg0.aBoolean241) { - Static94.method1909(local315, local331, local299, local307, local323, local291, arg0.anInt4865, arg0.anInt4864, arg0.anInt4867, local97, local21, local241, local119, local49, local85, local117, local165, local261, arg0.anInt4869); + Rasteriser.method1909(local315, local331, local299, local307, local323, local291, arg0.anInt4865, arg0.anInt4864, arg0.anInt4867, local97, local21, local241, local119, local49, local85, local117, local165, local261, arg0.anInt4869); } else { - Static94.method1909(local315, local331, local299, local307, local323, local291, arg0.anInt4865, arg0.anInt4864, arg0.anInt4867, local193, local241, local21, local63, local85, local49, local27, local261, local165, arg0.anInt4869); + Rasteriser.method1909(local315, local331, local299, local307, local323, local291, arg0.anInt4865, arg0.anInt4864, arg0.anInt4867, local193, local241, local21, local63, local85, local49, local27, local261, local165, arg0.anInt4869); } } } if ((local275 - local291) * (local331 - local299) - (local283 - local299) * (local323 - local291) <= 0) { return; } - if (Static158.aBoolean187 && Static19.method583(Static89.anInt2388 + Static94.anInt2471, Static131.anInt3259 + Static94.anInt2469, local283, local299, local331, local275, local291, local323)) { + if (Static158.aBoolean187 && Static19.method583(Static89.anInt2388 + Rasteriser.anInt2471, Static131.anInt3259 + Rasteriser.anInt2469, local283, local299, local331, local275, local291, local323)) { Static56.anInt1742 = arg6; Static116.anInt2954 = arg7; } if (Static239.aBoolean269 || arg8) { return; } - Static94.aBoolean138 = false; - if (local275 < 0 || local291 < 0 || local323 < 0 || local275 > Static94.anInt2472 || local291 > Static94.anInt2472 || local323 > Static94.anInt2472) { - Static94.aBoolean138 = true; + Rasteriser.aBoolean138 = false; + if (local275 < 0 || local291 < 0 || local323 < 0 || local275 > Rasteriser.anInt2472 || local291 > Rasteriser.anInt2472 || local323 > Rasteriser.anInt2472) { + Rasteriser.aBoolean138 = true; } if (arg0.anInt4869 == -1) { if (arg0.anInt4872 != 12345678) { - Static94.method1928(local283, local299, local331, local275, local291, local323, arg0.anInt4872, arg0.anInt4867, arg0.anInt4864); + Rasteriser.method1928(local283, local299, local331, local275, local291, local323, arg0.anInt4872, arg0.anInt4867, arg0.anInt4864); } } else if (Static159.aBoolean189) { - Static94.method1909(local283, local299, local331, local275, local291, local323, arg0.anInt4872, arg0.anInt4867, arg0.anInt4864, local97, local21, local241, local119, local49, local85, local117, local165, local261, arg0.anInt4869); + Rasteriser.method1909(local283, local299, local331, local275, local291, local323, arg0.anInt4872, arg0.anInt4867, arg0.anInt4864, local97, local21, local241, local119, local49, local85, local117, local165, local261, arg0.anInt4869); } else { - local475 = Static94.anInterface1_2.method3234(arg0.anInt4869); - Static94.method1928(local283, local299, local331, local275, local291, local323, Static216.method1640(local475, arg0.anInt4872), Static216.method1640(local475, arg0.anInt4867), Static216.method1640(local475, arg0.anInt4864)); + local475 = Rasteriser.anInterface1_2.method3234(arg0.anInt4869); + Rasteriser.method1928(local283, local299, local331, local275, local291, local323, Static216.method1640(local475, arg0.anInt4872), Static216.method1640(local475, arg0.anInt4867), Static216.method1640(local475, arg0.anInt4864)); } } } diff --git a/client/src/main/java/Static141.java b/client/src/main/java/Static141.java index 00f07f1..7522d95 100644 --- a/client/src/main/java/Static141.java +++ b/client/src/main/java/Static141.java @@ -47,7 +47,7 @@ public final class Static141 { Static217.method3768(); Static255.aClass54_16.method1815(); Static171.aClass139_1 = new Class139(); - ((Js5GlTextureProvider) Static94.anInterface1_2).method3247(); + ((Js5GlTextureProvider) Rasteriser.anInterface1_2).method3247(); Static120.anInt3034 = 0; Static120.aClass51Array1 = new Light[255]; Static237.method4120(); diff --git a/client/src/main/java/Static147.java b/client/src/main/java/Static147.java index eaf1b4f..a8dc73c 100644 --- a/client/src/main/java/Static147.java +++ b/client/src/main/java/Static147.java @@ -47,10 +47,10 @@ public final class Static147 { Static68.anIntArray170[local5] = local61; Static68.anIntArray169[local5] = local71; } - Static68.anIntArray165[local5] = Static94.anInt2471 + (local39 << 9) / local71; - Static68.anIntArray164[local5] = Static94.anInt2469 + (local61 << 9) / local71; + Static68.anIntArray165[local5] = Rasteriser.anInt2471 + (local39 << 9) / local71; + Static68.anIntArray164[local5] = Rasteriser.anInt2469 + (local61 << 9) / local71; } - Static94.anInt2473 = 0; + Rasteriser.anInt2473 = 0; local3 = arg0.anIntArray166.length; for (local5 = 0; local5 < local3; local5++) { local15 = arg0.anIntArray166[local5]; @@ -63,26 +63,26 @@ public final class Static147 { @Pc(160) int local160 = Static68.anIntArray164[local22]; @Pc(164) int local164 = Static68.anIntArray164[local29]; if ((local39 - local148) * (local164 - local160) - (local156 - local160) * (local152 - local148) > 0) { - if (Static158.aBoolean187 && Static19.method583(Static89.anInt2388 + Static94.anInt2471, Static131.anInt3259 + Static94.anInt2469, local156, local160, local164, local39, local148, local152)) { + if (Static158.aBoolean187 && Static19.method583(Static89.anInt2388 + Rasteriser.anInt2471, Static131.anInt3259 + Rasteriser.anInt2469, local156, local160, local164, local39, local148, local152)) { Static56.anInt1742 = arg5; Static116.anInt2954 = arg6; } if (!Static239.aBoolean269 && !arg7) { - Static94.aBoolean138 = false; - if (local39 < 0 || local148 < 0 || local152 < 0 || local39 > Static94.anInt2472 || local148 > Static94.anInt2472 || local152 > Static94.anInt2472) { - Static94.aBoolean138 = true; + Rasteriser.aBoolean138 = false; + if (local39 < 0 || local148 < 0 || local152 < 0 || local39 > Rasteriser.anInt2472 || local148 > Rasteriser.anInt2472 || local152 > Rasteriser.anInt2472) { + Rasteriser.aBoolean138 = true; } if (arg0.anIntArray161 == null || arg0.anIntArray161[local5] == -1) { if (arg0.anIntArray167[local5] != 12345678) { - Static94.method1928(local156, local160, local164, local39, local148, local152, arg0.anIntArray167[local5], arg0.anIntArray172[local5], arg0.anIntArray171[local5]); + Rasteriser.method1928(local156, local160, local164, local39, local148, local152, arg0.anIntArray167[local5], arg0.anIntArray172[local5], arg0.anIntArray171[local5]); } } else if (!Static159.aBoolean189) { - @Pc(373) int local373 = Static94.anInterface1_2.method3234(arg0.anIntArray161[local5]); - Static94.method1928(local156, local160, local164, local39, local148, local152, Static216.method1640(local373, arg0.anIntArray167[local5]), Static216.method1640(local373, arg0.anIntArray172[local5]), Static216.method1640(local373, arg0.anIntArray171[local5])); + @Pc(373) int local373 = Rasteriser.anInterface1_2.method3234(arg0.anIntArray161[local5]); + Rasteriser.method1928(local156, local160, local164, local39, local148, local152, Static216.method1640(local373, arg0.anIntArray167[local5]), Static216.method1640(local373, arg0.anIntArray172[local5]), Static216.method1640(local373, arg0.anIntArray171[local5])); } else if (arg0.aBoolean113) { - Static94.method1909(local156, local160, local164, local39, local148, local152, arg0.anIntArray167[local5], arg0.anIntArray172[local5], arg0.anIntArray171[local5], Static68.anIntArray159[0], Static68.anIntArray159[1], Static68.anIntArray159[3], Static68.anIntArray170[0], Static68.anIntArray170[1], Static68.anIntArray170[3], Static68.anIntArray169[0], Static68.anIntArray169[1], Static68.anIntArray169[3], arg0.anIntArray161[local5]); + Rasteriser.method1909(local156, local160, local164, local39, local148, local152, arg0.anIntArray167[local5], arg0.anIntArray172[local5], arg0.anIntArray171[local5], Static68.anIntArray159[0], Static68.anIntArray159[1], Static68.anIntArray159[3], Static68.anIntArray170[0], Static68.anIntArray170[1], Static68.anIntArray170[3], Static68.anIntArray169[0], Static68.anIntArray169[1], Static68.anIntArray169[3], arg0.anIntArray161[local5]); } else { - Static94.method1909(local156, local160, local164, local39, local148, local152, arg0.anIntArray167[local5], arg0.anIntArray172[local5], arg0.anIntArray171[local5], Static68.anIntArray159[local15], Static68.anIntArray159[local22], Static68.anIntArray159[local29], Static68.anIntArray170[local15], Static68.anIntArray170[local22], Static68.anIntArray170[local29], Static68.anIntArray169[local15], Static68.anIntArray169[local22], Static68.anIntArray169[local29], arg0.anIntArray161[local5]); + Rasteriser.method1909(local156, local160, local164, local39, local148, local152, arg0.anIntArray167[local5], arg0.anIntArray172[local5], arg0.anIntArray171[local5], Static68.anIntArray159[local15], Static68.anIntArray159[local22], Static68.anIntArray159[local29], Static68.anIntArray170[local15], Static68.anIntArray170[local22], Static68.anIntArray170[local29], Static68.anIntArray169[local15], Static68.anIntArray169[local22], Static68.anIntArray169[local29], arg0.anIntArray161[local5]); } } } diff --git a/client/src/main/java/Static156.java b/client/src/main/java/Static156.java index e0daabb..1f9f22a 100644 --- a/client/src/main/java/Static156.java +++ b/client/src/main/java/Static156.java @@ -177,7 +177,7 @@ public final class Static156 { Static239.method4178(); for (@Pc(19) int local19 = 0; local19 < Static36.aClass3_Sub14ArrayArray1[0].length; local19++) { @Pc(31) Class3_Sub14 local31 = Static36.aClass3_Sub14ArrayArray1[0][local19]; - if (local31.anInt2485 >= 0 && Static94.anInterface1_2.method3237(local31.anInt2485) == 4) { + if (local31.anInt2485 >= 0 && Rasteriser.anInterface1_2.method3237(local31.anInt2485) == 4) { local1.glColor4fv(Static190.method3441(local31.anInt2486), 0); @Pc(57) float local57 = 201.5F - (local31.aBoolean140 ? 1.0F : 0.5F); local31.method1944(Static130.aClass3_Sub5ArrayArrayArray1, local57, true); diff --git a/client/src/main/java/Static164.java b/client/src/main/java/Static164.java index 7d743af..d472d77 100644 --- a/client/src/main/java/Static164.java +++ b/client/src/main/java/Static164.java @@ -219,10 +219,10 @@ public final class Static164 { Static129.method2497(local125); @Pc(133) SoftwareSprite local133 = new SoftwareSprite(36, 32); Static129.method2491(local133.anIntArray20, 36, 32); - Static94.method1908(); - Static94.method1919(16, 16); + Rasteriser.method1908(); + Rasteriser.method1919(16, 16); @Pc(145) int local145 = local5.anInt2375; - Static94.aBoolean136 = false; + Rasteriser.aBoolean136 = false; if (arg6) { local145 = (int) ((double) local145 * 1.5D); } else if (arg4 == 2) { @@ -253,8 +253,8 @@ public final class Static164 { } Static129.method2491(local118, local120, local122); Static129.method2488(local125); - Static94.method1908(); - Static94.aBoolean136 = true; + Rasteriser.method1908(); + Rasteriser.aBoolean136 = true; return Static239.aBoolean269 && !arg1 ? new GlSprite(local133) : local133; } } diff --git a/client/src/main/java/Static19.java b/client/src/main/java/Static19.java index f63137f..ea8ba96 100644 --- a/client/src/main/java/Static19.java +++ b/client/src/main/java/Static19.java @@ -76,9 +76,9 @@ public final class Static19 { @OriginalMember(owner = "client!bi", name = "a", descriptor = "(IIBI)I") public static int method588(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2) { - @Pc(19) int local19 = Static94.anIntArray220[Static268.method4585(arg1, arg2)]; + @Pc(19) int local19 = Rasteriser.anIntArray220[Static268.method4585(arg1, arg2)]; if (arg0 > 0) { - @Pc(31) int local31 = Static94.anInterface1_2.method3238(arg0 & 0xFFFF); + @Pc(31) int local31 = Rasteriser.anInterface1_2.method3238(arg0 & 0xFFFF); @Pc(49) int local49; @Pc(73) int local73; if (local31 != 0) { @@ -96,7 +96,7 @@ public final class Static19 { local19 = ((local49 & 0xFF00) * local31 + local73 * (local19 & 0xFF00) & 0xFF0000) + (local31 * (local49 & 0xFF00FF) + ((local19 & 0xFF00FF) * local73) & 0xFF00FF00) >> 8; } } - local49 = Static94.anInterface1_2.method3229(arg0 & 0xFFFF); + local49 = Rasteriser.anInterface1_2.method3229(arg0 & 0xFFFF); if (local49 != 0) { local49 += 256; @Pc(125) int local125 = (local19 >> 16 & 0xFF) * local49; diff --git a/client/src/main/java/Static190.java b/client/src/main/java/Static190.java index 8bd05eb..e3ba542 100644 --- a/client/src/main/java/Static190.java +++ b/client/src/main/java/Static190.java @@ -42,9 +42,9 @@ public final class Static190 { if (local43 != null) { return local43; } - Static94.aBoolean134 = false; + Rasteriser.aBoolean134 = false; local43 = Static164.method3150(arg4, false, arg1, arg2, arg0, arg3, false); - if (local43 != null && !Static94.aBoolean134) { + if (local43 != null && !Rasteriser.aBoolean134) { Static118.aClass99_16.method3095(local43, local37); } return local43; diff --git a/client/src/main/java/Static197.java b/client/src/main/java/Static197.java index d543a31..9da9e42 100644 --- a/client/src/main/java/Static197.java +++ b/client/src/main/java/Static197.java @@ -168,9 +168,9 @@ public final class Static197 { Static37.aThread1.setPriority(5); Static260.aClass27_2 = null; Static268.method4580(); - ((Js5GlTextureProvider) Static94.anInterface1_2).method3248(200); + ((Js5GlTextureProvider) Rasteriser.anInterface1_2).method3248(200); if (Static178.aBoolean202) { - Static94.method1911(0.7F); + Rasteriser.method1911(0.7F); } Static114.method4637(); } else if (arg1 == 0 && arg3 > 0) { @@ -178,19 +178,19 @@ public final class Static197 { Static260.aClass27_2 = Static131.method2579(503, 765, Static154.aCanvas1); Static268.method4583(); Static76.method1643(); - ((Js5GlTextureProvider) Static94.anInterface1_2).method3248(20); + ((Js5GlTextureProvider) Rasteriser.anInterface1_2).method3248(20); if (Static178.aBoolean202) { if (Static113.anInt4609 == 1) { - Static94.method1911(0.9F); + Rasteriser.method1911(0.9F); } if (Static113.anInt4609 == 2) { - Static94.method1911(0.8F); + Rasteriser.method1911(0.8F); } if (Static113.anInt4609 == 3) { - Static94.method1911(0.7F); + Rasteriser.method1911(0.7F); } if (Static113.anInt4609 == 4) { - Static94.method1911(0.6F); + Rasteriser.method1911(0.6F); } } Static95.method1939(); diff --git a/client/src/main/java/Static217.java b/client/src/main/java/Static217.java index 142f2f2..62a66e7 100644 --- a/client/src/main/java/Static217.java +++ b/client/src/main/java/Static217.java @@ -116,7 +116,7 @@ public final class Static217 { Static90.method1857(); Static139.aClass99_22.method3104(); if (!Static239.aBoolean269) { - ((Js5GlTextureProvider) Static94.anInterface1_2).method3247(); + ((Js5GlTextureProvider) Rasteriser.anInterface1_2).method3247(); } Static105.aClass54_9.method1815(); Static213.aClass153_88.method4499(); diff --git a/client/src/main/java/Static237.java b/client/src/main/java/Static237.java index 9504246..dfd5303 100644 --- a/client/src/main/java/Static237.java +++ b/client/src/main/java/Static237.java @@ -116,9 +116,9 @@ public final class Static237 { @OriginalMember(owner = "client!td", name = "a", descriptor = "(ISIB)I") public static int method4096(@OriginalArg(0) int arg0, @OriginalArg(1) short arg1, @OriginalArg(2) int arg2, @OriginalArg(3) byte arg3) { - @Pc(5) int local5 = Static94.anIntArray220[Static268.method4585(arg0, arg2)]; + @Pc(5) int local5 = Rasteriser.anIntArray220[Static268.method4585(arg0, arg2)]; if (arg1 != -1) { - @Pc(15) int local15 = Static94.anInterface1_2.method3238(arg1 & 0xFFFF); + @Pc(15) int local15 = Rasteriser.anInterface1_2.method3238(arg1 & 0xFFFF); @Pc(21) int local21; @Pc(44) int local44; if (local15 != 0) { @@ -136,7 +136,7 @@ public final class Static237 { local5 = ((local21 & 0xFF00FF) * local15 + (local5 & 0xFF00FF) * local44 & 0xFF00FF00) + ((local21 & 0xFF00) * local15 + (local5 & 0xFF00) * local44 & 0xFF0000) >> 8; } } - local21 = Static94.anInterface1_2.method3229(arg1 & 0xFFFF); + local21 = Rasteriser.anInterface1_2.method3229(arg1 & 0xFFFF); if (local21 != 0) { local21 += 256; @Pc(92) int local92 = (local5 >> 16 & 0xFF) * local21; diff --git a/client/src/main/java/Static248.java b/client/src/main/java/Static248.java index 8615b41..b747131 100644 --- a/client/src/main/java/Static248.java +++ b/client/src/main/java/Static248.java @@ -128,7 +128,7 @@ public final class Static248 { for (local37 = 0; local37 < Static182.aClass3_Sub14ArrayArray2[local32].length; local37++) { @Pc(336) Class3_Sub14 local336 = Static182.aClass3_Sub14ArrayArray2[local32][local37]; @Pc(350) float local350 = 201.5F - (float) local32 * 50.0F - (local336.aBoolean140 ? 1.0F : 0.5F); - if (local336.anInt2485 != -1 && Static94.anInterface1_2.method3237(local336.anInt2485) == 4 && Static220.aBoolean244) { + if (local336.anInt2485 != -1 && Rasteriser.anInterface1_2.method3237(local336.anInt2485) == 4 && Static220.aBoolean244) { Static21.method619(local336.anInt2486); } local336.method1944(Static130.aClass3_Sub5ArrayArrayArray1, local350, false); diff --git a/client/src/main/java/Static253.java b/client/src/main/java/Static253.java index 7a942bc..885074c 100644 --- a/client/src/main/java/Static253.java +++ b/client/src/main/java/Static253.java @@ -119,7 +119,7 @@ public final class Static253 { Static239.method4171(arg2, arg4, arg3, arg0, arg3 / 2 + arg2, arg4 - -(arg0 / 2), local248, local253, Static223.anInt5029, Static223.anInt5029); } else { Static129.method2496(arg2, arg4, arg3 + arg2, arg0 + arg4); - Static94.method1908(); + Rasteriser.method1908(); } if (Static60.aBoolean108 || Static155.anInt3751 < arg2 || Static155.anInt3751 >= arg3 + arg2 || arg4 > Static60.anInt1892 || arg0 + arg4 <= Static60.anInt1892) { Static39.aBoolean77 = false; @@ -165,7 +165,7 @@ public final class Static253 { Static142.method2726(arg4, arg3, arg2, 256, arg0, 256); Static233.method4000(arg3, arg2, arg0, 256, 256, arg4); } - ((Js5GlTextureProvider) Static94.anInterface1_2).method3239(Static178.anInt4247); + ((Js5GlTextureProvider) Rasteriser.anInterface1_2).method3239(Static178.anInt4247); Static115.method2310(arg3, arg4, arg0, arg2); Static240.anInt5333 = local123; Static134.anInt3302 = local121; diff --git a/client/src/main/java/Static33.java b/client/src/main/java/Static33.java index 2d66c81..37d928f 100644 --- a/client/src/main/java/Static33.java +++ b/client/src/main/java/Static33.java @@ -167,7 +167,7 @@ public final class Static33 { local519 = 127; } @Pc(541) int local541 = local519 + (local480 & 0x380) + (local480 + local19 & 0xFC00); - local462[((local367 & 0x3F) << 6) + (local102 & 0x3F)] = Static94.anIntArray220[Static87.method1814(96, local541)]; + local462[((local367 & 0x3F) << 6) + (local102 & 0x3F)] = Rasteriser.anIntArray220[Static87.method1814(96, local541)]; } else if (local462 != null) { local462[((local367 & 0x3F) << 6) + (local102 & 0x3F)] = 0; } diff --git a/client/src/main/java/Static45.java b/client/src/main/java/Static45.java index 0faaabf..4660f9d 100644 --- a/client/src/main/java/Static45.java +++ b/client/src/main/java/Static45.java @@ -223,7 +223,7 @@ public final class Static45 { local267 = 127; } local273 = (local234 & 0x380) + (local234 + local10 & 0xFC00) + local267; - local254 = Static94.anIntArray220[Static87.method1814(96, local273)]; + local254 = Rasteriser.anIntArray220[Static87.method1814(96, local273)]; } local267 = local146[local168][local173]; local332 = local146[local168][local173 + 1]; @@ -241,7 +241,7 @@ public final class Static45 { @Pc(1834) int local1834 = Static240.aByteArrayArrayArray14[local152][local322][local1794] & 0xFF; if (local1834 != 0) { @Pc(1842) FloType local1842 = Static256.method4395(local1834 - 1); - if (local1842.anInt5892 != -1 && Static94.anInterface1_2.method3237(local1842.anInt5892) == 4) { + if (local1842.anInt5892 != -1 && Rasteriser.anInterface1_2.method3237(local1842.anInt5892) == 4) { Static62.anIntArrayArray11[local168][local173] = local1842.anInt5889 + (local1842.anInt5898 << 24); continue label771; } @@ -258,7 +258,7 @@ public final class Static45 { @Pc(1353) int local1353; @Pc(1288) int local1288; if (Static239.aBoolean269 && !arg1 && Static62.anIntArrayArray11 != null && local152 == 0) { - if (local1248.anInt5892 != -1 && Static94.anInterface1_2.method3237(local1248.anInt5892) == 4) { + if (local1248.anInt5892 != -1 && Rasteriser.anInterface1_2.method3237(local1248.anInt5892) == 4) { Static62.anIntArrayArray11[local168][local173] = (local1248.anInt5898 << 24) + local1248.anInt5889; } else { label737: for (local1288 = local168 - 1; local1288 <= local168 + 1; local1288++) { @@ -267,7 +267,7 @@ public final class Static45 { local1353 = Static240.aByteArrayArrayArray14[local152][local1288][local1301] & 0xFF; if (local1353 != 0) { @Pc(1366) FloType local1366 = Static256.method4395(local1353 - 1); - if (local1366.anInt5892 != -1 && Static94.anInterface1_2.method3237(local1366.anInt5892) == 4) { + if (local1366.anInt5892 != -1 && Rasteriser.anInterface1_2.method3237(local1366.anInt5892) == 4) { Static62.anIntArrayArray11[local168][local173] = local1366.anInt5889 + (local1366.anInt5898 << 24); break label737; } @@ -278,14 +278,14 @@ public final class Static45 { } } local1288 = local1248.anInt5892; - if (local1288 >= 0 && !Static94.anInterface1_2.method3236(local1288)) { + if (local1288 >= 0 && !Rasteriser.anInterface1_2.method3236(local1288)) { local1288 = -1; } @Pc(1458) int local1458; @Pc(1429) int local1429; if (local1288 >= 0) { local1301 = -1; - local1353 = Static94.anIntArray220[Static230.method3949(Static94.anInterface1_2.method3234(local1288), 96)]; + local1353 = Rasteriser.anIntArray220[Static230.method3949(Rasteriser.anInterface1_2.method3234(local1288), 96)]; } else if (local1248.anInt5899 == -1) { local1301 = -2; local1353 = 0; @@ -298,7 +298,7 @@ public final class Static45 { local1429 = 127; } local1458 = (local1301 & 0x380) + ((local1301 + local10 & 0xFC00) + local1429); - local1353 = Static94.anIntArray220[Static230.method3949(local1458, 96)]; + local1353 = Rasteriser.anIntArray220[Static230.method3949(local1458, 96)]; } if (local1248.anInt5894 >= 0) { local1429 = local1248.anInt5894; @@ -309,7 +309,7 @@ public final class Static45 { local1458 = 127; } @Pc(1529) int local1529 = (local1429 & 0x380) + ((local1429 + local10 & 0xFC00) + local1458); - local1353 = Static94.anIntArray220[Static230.method3949(local1529, 96)]; + local1353 = Rasteriser.anIntArray220[Static230.method3949(local1529, 96)]; } Static176.method3305(local152, local168, local173, local322, local1242, local1288, local200, local202, local209, local349, Static87.method1814(local267, local234), Static87.method1814(local273, local234), Static87.method1814(local326, local234), Static87.method1814(local332, local234), Static230.method3949(local1301, local267), Static230.method3949(local1301, local273), Static230.method3949(local1301, local326), Static230.method3949(local1301, local332), local254, local1353); if (Static239.aBoolean269 && local152 > 0) { diff --git a/client/src/main/java/Static70.java b/client/src/main/java/Static70.java index e1fec29..4815a20 100644 --- a/client/src/main/java/Static70.java +++ b/client/src/main/java/Static70.java @@ -49,7 +49,7 @@ public final class Static70 { @Pc(18) FloType local18 = Static256.method4395(local11); if (local18 != null) { @Pc(24) int local24 = local18.anInt5892; - if (local24 >= 0 && !Static94.anInterface1_2.method3236(local24)) { + if (local24 >= 0 && !Rasteriser.anInterface1_2.method3236(local24)) { local24 = -1; } @Pc(53) int local53; @@ -65,9 +65,9 @@ public final class Static70 { local72 = 127; } local95 = (local66 & 0x380) + (arg1 + local66 & 0xFC00) + local72; - local53 = Static94.anIntArray220[Static230.method3949(local95, 96)]; + local53 = Rasteriser.anIntArray220[Static230.method3949(local95, 96)]; } else if (local24 >= 0) { - local53 = Static94.anIntArray220[Static230.method3949(Static94.anInterface1_2.method3234(local24), 96)]; + local53 = Rasteriser.anIntArray220[Static230.method3949(Rasteriser.anInterface1_2.method3234(local24), 96)]; } else if (local18.anInt5899 == -1) { local53 = -1; } else { @@ -79,7 +79,7 @@ public final class Static70 { local72 = 127; } local95 = local72 + (local66 & 0x380) + (local66 + arg1 & 0xFC00); - local53 = Static94.anIntArray220[Static230.method3949(local95, 96)]; + local53 = Rasteriser.anIntArray220[Static230.method3949(local95, 96)]; } Static145.anIntArray330[local11 + 1] = local53; } diff --git a/client/src/main/java/Static87.java b/client/src/main/java/Static87.java index 0396ea4..c6582cb 100644 --- a/client/src/main/java/Static87.java +++ b/client/src/main/java/Static87.java @@ -113,7 +113,7 @@ public final class Static87 { Static46.method1187(arg0, arg6, arg4, arg7); } else { Static129.method2496(arg0, arg6, arg4, arg7); - Static94.method1908(); + Rasteriser.method1908(); } for (@Pc(18) int local18 = 0; local18 < arg3.length; local18++) { @Pc(30) Class13 local30 = arg3[local18]; @@ -394,7 +394,7 @@ public final class Static87 { Static46.method1187(arg0, arg6, arg4, arg7); } else { Static129.method2496(arg0, arg6, arg4, arg7); - Static94.method1908(); + Rasteriser.method1908(); } } if (Static223.aBooleanArray116[local57] || Static199.anInt4672 > 1) { @@ -421,7 +421,7 @@ public final class Static87 { } else { local1476 = Static190.method3443(1, local545, local30.aBoolean31, local30.anIntArray50[local270], 3153952); } - if (Static94.aBoolean134) { + if (Rasteriser.aBoolean134) { Static186.aBooleanArray100[local57] = true; } if (local1476 == null) { @@ -754,7 +754,7 @@ public final class Static87 { Static239.method4157(); } } else { - Static94.method1919(local556, local545); + Rasteriser.method1919(local556, local545); local563 = MathUtils.anIntArray223[local30.anInt450] * local30.anInt443 >> 16; local571 = local30.anInt443 * MathUtils.anIntArray225[local30.anInt450] >> 16; if (!local30.aBoolean32) { @@ -764,7 +764,7 @@ public final class Static87 { } else { local2589.method4571(local30.anInt524, local30.anInt508, local30.anInt450, local30.anInt494, local30.anInt497 + local563 + local503, local571 + local30.anInt497, -1L); } - Static94.method1915(); + Rasteriser.method1915(); } } } else { diff --git a/client/src/main/java/Static88.java b/client/src/main/java/Static88.java index 3c5cebf..3a2d36a 100644 --- a/client/src/main/java/Static88.java +++ b/client/src/main/java/Static88.java @@ -3218,16 +3218,16 @@ public final class Static88 { Static113.anInt4609 = local809; if (!Static239.aBoolean269 || !Static178.aBoolean202) { if (Static113.anInt4609 == 1) { - Static94.method1911(0.9F); + Rasteriser.method1911(0.9F); } if (Static113.anInt4609 == 2) { - Static94.method1911(0.8F); + Rasteriser.method1911(0.8F); } if (Static113.anInt4609 == 3) { - Static94.method1911(0.7F); + Rasteriser.method1911(0.7F); } if (Static113.anInt4609 == 4) { - Static94.method1911(0.6F); + Rasteriser.method1911(0.6F); } } if (Static239.aBoolean269) { @@ -3270,7 +3270,7 @@ public final class Static88 { if (local226 == 6006) { local28--; Static53.aBoolean99 = Static254.anIntArray487[local28] == 1; - ((Js5GlTextureProvider) Static94.anInterface1_2).method3245(!Static53.aBoolean99); + ((Js5GlTextureProvider) Rasteriser.anInterface1_2).method3245(!Static53.aBoolean99); Static203.method3663(Static71.aClass213_3); Static18.aBoolean39 = false; continue; @@ -3321,19 +3321,19 @@ public final class Static88 { local28--; Static178.aBoolean202 = Static254.anIntArray487[local28] == 1; if (Static239.aBoolean269 && Static178.aBoolean202) { - Static94.method1911(0.7F); + Rasteriser.method1911(0.7F); } else { if (Static113.anInt4609 == 1) { - Static94.method1911(0.9F); + Rasteriser.method1911(0.9F); } if (Static113.anInt4609 == 2) { - Static94.method1911(0.8F); + Rasteriser.method1911(0.8F); } if (Static113.anInt4609 == 3) { - Static94.method1911(0.7F); + Rasteriser.method1911(0.7F); } if (Static113.anInt4609 == 4) { - Static94.method1911(0.6F); + Rasteriser.method1911(0.6F); } } Static145.method2742(); diff --git a/client/src/main/java/client.java b/client/src/main/java/client.java index 7d034e8..7552c93 100644 --- a/client/src/main/java/client.java +++ b/client/src/main/java/client.java @@ -834,18 +834,18 @@ public final class client extends GameShell { } else if (Static166.anInt4051 == 90) { if (Static167.aClass153_63.method4475()) { @Pc(951) Js5GlTextureProvider local951 = new Js5GlTextureProvider(Static195.aClass153_80, Static167.aClass153_63, Static209.aClass153_86, 20, !Static53.aBoolean99); - Static94.method1914(local951); + Rasteriser.method1914(local951); if (Static113.anInt4609 == 1) { - Static94.method1911(0.9F); + Rasteriser.method1911(0.9F); } if (Static113.anInt4609 == 2) { - Static94.method1911(0.8F); + Rasteriser.method1911(0.8F); } if (Static113.anInt4609 == 3) { - Static94.method1911(0.7F); + Rasteriser.method1911(0.7F); } if (Static113.anInt4609 == 4) { - Static94.method1911(0.6F); + Rasteriser.method1911(0.6F); } Static126.aClass100_602 = Static86.aClass100_489; Static166.anInt4051 = 100;