From aa88e228b97798121815a1652fc2a08de7e5ddb7 Mon Sep 17 00:00:00 2001 From: Pazaz Date: Tue, 19 Apr 2022 17:38:34 -0400 Subject: [PATCH] Renamed Class38 to BufferedFile, was incorrect before (actually TriangleNormal) --- client/src/main/java/BufferedFile.java | 292 +++++++++++++++++++++-- client/src/main/java/Cache.java | 12 +- client/src/main/java/Class38.java | 289 ---------------------- client/src/main/java/Class59.java | 2 +- client/src/main/java/GlModel.java | 2 +- client/src/main/java/RawModel.java | 6 +- client/src/main/java/SoftwareModel.java | 2 +- client/src/main/java/Static121.java | 2 +- client/src/main/java/Static172.java | 2 +- client/src/main/java/Static190.java | 2 +- client/src/main/java/Static47.java | 2 +- client/src/main/java/TriangleNormal.java | 33 +++ client/src/main/java/client.java | 8 +- 13 files changed, 327 insertions(+), 327 deletions(-) delete mode 100644 client/src/main/java/Class38.java create mode 100644 client/src/main/java/TriangleNormal.java diff --git a/client/src/main/java/BufferedFile.java b/client/src/main/java/BufferedFile.java index cff8643..a251ec7 100644 --- a/client/src/main/java/BufferedFile.java +++ b/client/src/main/java/BufferedFile.java @@ -1,33 +1,289 @@ +import java.io.EOFException; +import java.io.File; +import java.io.IOException; +import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; -@OriginalClass("client!qj") +@OriginalClass("client!en") public final class BufferedFile { - @OriginalMember(owner = "client!qj", name = "a", descriptor = "[J") - public static final long[] aLongArray7 = new long[256]; + @OriginalMember(owner = "client!en", name = "m", descriptor = "J") + private long aLong67; - @OriginalMember(owner = "client!qj", name = "c", descriptor = "I") - public int anInt4767; + @OriginalMember(owner = "client!en", name = "v", descriptor = "I") + private int anInt1906; - @OriginalMember(owner = "client!qj", name = "e", descriptor = "I") - public int anInt4769; + @OriginalMember(owner = "client!en", name = "p", descriptor = "J") + private long aLong68 = -1L; - @OriginalMember(owner = "client!qj", name = "f", descriptor = "I") - public int anInt4770; + @OriginalMember(owner = "client!en", name = "g", descriptor = "I") + private int anInt1899 = 0; - static { - for (@Pc(4) int local4 = 0; local4 < 256; local4++) { - @Pc(10) long local10 = (long) local4; - for (@Pc(12) int local12 = 0; local12 < 8; local12++) { - if ((local10 & 0x1L) == 1L) { - local10 = local10 >>> 1 ^ 0xC96C5795D7870F42L; - } else { - local10 >>>= 0x1; + @OriginalMember(owner = "client!en", name = "w", descriptor = "J") + private long aLong69 = -1L; + + @OriginalMember(owner = "client!en", name = "s", descriptor = "Lsignlink!qm;") + private final FileOnDisk aClass214_1; + + @OriginalMember(owner = "client!en", name = "a", descriptor = "J") + private long aLong64; + + @OriginalMember(owner = "client!en", name = "j", descriptor = "J") + private long aLong65; + + @OriginalMember(owner = "client!en", name = "q", descriptor = "[B") + private final byte[] aByteArray20; + + @OriginalMember(owner = "client!en", name = "b", descriptor = "[B") + private final byte[] aByteArray19; + + @OriginalMember(owner = "client!en", name = "k", descriptor = "J") + private long aLong66; + + @OriginalMember(owner = "client!en", name = "", descriptor = "(Lsignlink!qm;II)V") + public BufferedFile(@OriginalArg(0) FileOnDisk arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) throws IOException { + this.aClass214_1 = arg0; + this.aLong65 = this.aLong64 = arg0.method5137(); + this.aByteArray20 = new byte[arg2]; + this.aByteArray19 = new byte[arg1]; + this.aLong66 = 0L; + } + + @OriginalMember(owner = "client!en", name = "a", descriptor = "(B)V") + private void method1450() throws IOException { + if (this.aLong68 == -1L) { + return; + } + if (this.aLong68 != this.aLong67) { + this.aClass214_1.method5133(this.aLong68); + this.aLong67 = this.aLong68; + } + this.aClass214_1.method5134(this.aByteArray20, this.anInt1899, 0); + @Pc(45) long local45 = -1L; + if (this.aLong69 <= this.aLong68 && this.aLong69 + (long) this.anInt1906 > this.aLong68) { + local45 = this.aLong68; + } else if (this.aLong68 <= this.aLong69 && this.aLong69 < this.aLong68 + (long) this.anInt1899) { + local45 = this.aLong69; + } + this.aLong67 += this.anInt1899; + if (this.aLong64 < this.aLong67) { + this.aLong64 = this.aLong67; + } + @Pc(118) long local118 = -1L; + if (this.aLong69 < this.aLong68 + (long) this.anInt1899 && (long) this.anInt1906 + this.aLong69 >= (long) this.anInt1899 + this.aLong68) { + local118 = this.aLong68 + (long) this.anInt1899; + } else if (this.aLong69 + (long) this.anInt1906 > this.aLong68 && (long) this.anInt1899 + this.aLong68 >= (long) this.anInt1906 + this.aLong69) { + local118 = (long) this.anInt1906 + this.aLong69; + } + if (local45 > -1L && local118 > local45) { + @Pc(208) int local208 = (int) (local118 - local45); + Static289.method2612(this.aByteArray20, (int) (local45 - this.aLong68), this.aByteArray19, (int) (local45 - this.aLong69), local208); + } + this.anInt1899 = 0; + this.aLong68 = -1L; + } + + @OriginalMember(owner = "client!en", name = "a", descriptor = "(I)J") + public final long method1451() { + return this.aLong65; + } + + @OriginalMember(owner = "client!en", name = "b", descriptor = "(I)Ljava/io/File;") + private File method1452() { + return this.aClass214_1.method5138(); + } + + @OriginalMember(owner = "client!en", name = "a", descriptor = "(I[BII)V") + public final void method1453(@OriginalArg(0) int arg0, @OriginalArg(1) byte[] arg1, @OriginalArg(2) int arg2) throws IOException { + try { + if (arg2 > arg1.length) { + throw new ArrayIndexOutOfBoundsException(arg2 - arg1.length); + } + if (this.aLong68 != -1L && this.aLong66 >= this.aLong68 && (long) this.anInt1899 + this.aLong68 >= (long) arg2 + this.aLong66) { + Static289.method2612(this.aByteArray20, (int) (this.aLong66 - this.aLong68), arg1, 0, arg2); + this.aLong66 += arg2; + return; + } + @Pc(71) long local71 = this.aLong66; + @Pc(75) int local75 = arg2; + @Pc(102) int local102; + if (this.aLong69 <= this.aLong66 && this.aLong69 + (long) this.anInt1906 > this.aLong66) { + local102 = (int) ((long) this.anInt1906 + this.aLong69 - this.aLong66); + if (local102 > arg2) { + local102 = arg2; + } + Static289.method2612(this.aByteArray19, (int) (this.aLong66 - this.aLong69), arg1, 0, local102); + arg0 = local102; + arg2 -= local102; + this.aLong66 += local102; + } + if (this.aByteArray19.length < arg2) { + this.aClass214_1.method5133(this.aLong66); + this.aLong67 = this.aLong66; + while (arg2 > 0) { + local102 = this.aClass214_1.method5135(arg0, arg2, arg1); + if (local102 == -1) { + break; + } + this.aLong67 += local102; + arg2 -= local102; + arg0 += local102; + this.aLong66 += local102; + } + } else if (arg2 > 0) { + this.method1456(); + local102 = arg2; + if (arg2 > this.anInt1906) { + local102 = this.anInt1906; + } + Static289.method2612(this.aByteArray19, 0, arg1, arg0, local102); + arg2 -= local102; + arg0 += local102; + this.aLong66 += local102; + } + if (this.aLong68 != -1L) { + if (this.aLong66 < this.aLong68 && arg2 > 0) { + local102 = (int) (this.aLong68 - this.aLong66) + arg0; + if (arg0 + arg2 < local102) { + local102 = arg0 + arg2; + } + while (arg0 < local102) { + arg1[arg0++] = 0; + this.aLong66++; + arg2--; + } + } + @Pc(298) long local298 = -1L; + @Pc(300) long local300 = -1L; + if ((long) this.anInt1899 + this.aLong68 > local71 && (long) local75 + local71 >= (long) this.anInt1899 + this.aLong68) { + local300 = (long) this.anInt1899 + this.aLong68; + } else if (this.aLong68 < (long) local75 + local71 && (long) this.anInt1899 + this.aLong68 >= (long) local75 + local71) { + local300 = (long) local75 + local71; + } + if (local71 <= this.aLong68 && local71 + (long) local75 > this.aLong68) { + local298 = this.aLong68; + } else if (local71 >= this.aLong68 && local71 < (long) this.anInt1899 + this.aLong68) { + local298 = local71; + } + if (local298 > -1L && local300 > local298) { + @Pc(426) int local426 = (int) (local300 - local298); + Static289.method2612(this.aByteArray20, (int) (local298 - this.aLong68), arg1, (int) (local298 - local71), local426); + if (this.aLong66 < local300) { + arg2 = (int) ((long) arg2 + this.aLong66 - local300); + this.aLong66 = local300; + } } } - aLongArray7[local4] = local10; + } catch (@Pc(464) IOException local464) { + this.aLong67 = -1L; + throw local464; + } + if (arg2 > 0) { + throw new EOFException(); } } + + @OriginalMember(owner = "client!en", name = "b", descriptor = "(Z)V") + public final void method1455() throws IOException { + this.method1450(); + this.aClass214_1.method5136(); + } + + @OriginalMember(owner = "client!en", name = "c", descriptor = "(I)V") + private void method1456() throws IOException { + this.anInt1906 = 0; + if (this.aLong67 != this.aLong66) { + this.aClass214_1.method5133(this.aLong66); + this.aLong67 = this.aLong66; + } + this.aLong69 = this.aLong66; + while (this.aByteArray19.length > this.anInt1906) { + @Pc(49) int local49 = this.aByteArray19.length - this.anInt1906; + if (local49 > 200000000) { + local49 = 200000000; + } + @Pc(66) int local66 = this.aClass214_1.method5135(this.anInt1906, local49, this.aByteArray19); + if (local66 == -1) { + break; + } + this.aLong67 += local66; + this.anInt1906 += local66; + } + } + + @OriginalMember(owner = "client!en", name = "a", descriptor = "(Z[B)V") + public final void method1457(@OriginalArg(1) byte[] arg0) throws IOException { + this.method1453(0, arg0, arg0.length); + } + + @OriginalMember(owner = "client!en", name = "a", descriptor = "([BIII)V") + public final void method1458(@OriginalArg(0) byte[] arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2) throws IOException { + try { + if (this.aLong65 < (long) arg2 + this.aLong66) { + this.aLong65 = (long) arg2 + this.aLong66; + } + if (this.aLong68 != -1L && (this.aLong68 > this.aLong66 || this.aLong66 > (long) this.anInt1899 + this.aLong68)) { + this.method1450(); + } + if (this.aLong68 != -1L && (long) this.aByteArray20.length + this.aLong68 < (long) arg2 + this.aLong66) { + @Pc(90) int local90 = (int) ((long) this.aByteArray20.length + this.aLong68 - this.aLong66); + arg2 -= local90; + Static289.method2612(arg0, arg1, this.aByteArray20, (int) (this.aLong66 - this.aLong68), local90); + this.aLong66 += local90; + this.anInt1899 = this.aByteArray20.length; + this.method1450(); + arg1 += local90; + } + if (this.aByteArray20.length < arg2) { + if (this.aLong66 != this.aLong67) { + this.aClass214_1.method5133(this.aLong66); + this.aLong67 = this.aLong66; + } + this.aClass214_1.method5134(arg0, arg2, arg1); + @Pc(165) long local165 = -1L; + if (this.aLong69 <= this.aLong66 && (long) this.anInt1906 + this.aLong69 > this.aLong66) { + local165 = this.aLong66; + } else if (this.aLong66 <= this.aLong69 && (long) arg2 + this.aLong66 > this.aLong69) { + local165 = this.aLong69; + } + this.aLong67 += arg2; + @Pc(226) long local226 = -1L; + if (this.aLong64 < this.aLong67) { + this.aLong64 = this.aLong67; + } + if (this.aLong66 + (long) arg2 > this.aLong69 && this.aLong66 + (long) arg2 <= this.aLong69 - -((long) this.anInt1906)) { + local226 = (long) arg2 + this.aLong66; + } else if (this.aLong69 + (long) this.anInt1906 > this.aLong66 && this.aLong66 + (long) arg2 >= (long) this.anInt1906 + this.aLong69) { + local226 = (long) this.anInt1906 + this.aLong69; + } + if (local165 > -1L && local226 > local165) { + @Pc(324) int local324 = (int) (local226 - local165); + Static289.method2612(arg0, (int) (local165 + (long) arg1 - this.aLong66), this.aByteArray19, (int) (local165 - this.aLong69), local324); + } + this.aLong66 += arg2; + } else if (arg2 > 0) { + if (this.aLong68 == -1L) { + this.aLong68 = this.aLong66; + } + Static289.method2612(arg0, arg1, this.aByteArray20, (int) (this.aLong66 - this.aLong68), arg2); + this.aLong66 += arg2; + if ((long) this.anInt1899 < this.aLong66 - this.aLong68) { + this.anInt1899 = (int) (this.aLong66 - this.aLong68); + } + } + } catch (@Pc(414) IOException local414) { + this.aLong67 = -1L; + throw local414; + } + } + + @OriginalMember(owner = "client!en", name = "a", descriptor = "(IJ)V") + public final void method1459(@OriginalArg(1) long arg0) throws IOException { + if (arg0 < 0L) { + throw new IOException("Invalid seek to " + arg0 + " in file " + this.method1452()); + } + this.aLong66 = arg0; + } } diff --git a/client/src/main/java/Cache.java b/client/src/main/java/Cache.java index 3e583a8..6ab374e 100644 --- a/client/src/main/java/Cache.java +++ b/client/src/main/java/Cache.java @@ -9,10 +9,10 @@ import org.openrs2.deob.annotation.Pc; public final class Cache { @OriginalMember(owner = "client!ge", name = "a", descriptor = "Lclient!en;") - private Class38 aClass38_1 = null; + private BufferedFile aClass38_1 = null; @OriginalMember(owner = "client!ge", name = "f", descriptor = "Lclient!en;") - private Class38 aClass38_2 = null; + private BufferedFile aClass38_2 = null; @OriginalMember(owner = "client!ge", name = "l", descriptor = "I") private int anInt2156 = 65000; @@ -21,7 +21,7 @@ public final class Cache { private final int anInt2150; @OriginalMember(owner = "client!ge", name = "", descriptor = "(ILclient!en;Lclient!en;I)V") - public Cache(@OriginalArg(0) int arg0, @OriginalArg(1) Class38 arg1, @OriginalArg(2) Class38 arg2, @OriginalArg(3) int arg3) { + public Cache(@OriginalArg(0) int arg0, @OriginalArg(1) BufferedFile arg1, @OriginalArg(2) BufferedFile arg2, @OriginalArg(3) int arg3) { this.anInt2156 = arg3; this.aClass38_2 = arg2; this.anInt2150 = arg0; @@ -36,7 +36,7 @@ public final class Cache { @OriginalMember(owner = "client!ge", name = "a", descriptor = "(II[BB)Z") public final boolean method1700(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) byte[] arg2) { - @Pc(7) Class38 local7 = this.aClass38_1; + @Pc(7) BufferedFile local7 = this.aClass38_1; synchronized (this.aClass38_1) { if (arg1 < 0 || arg1 > this.anInt2156) { throw new IllegalArgumentException(); @@ -51,7 +51,7 @@ public final class Cache { @OriginalMember(owner = "client!ge", name = "a", descriptor = "(IB)[B") public final byte[] method1701(@OriginalArg(0) int arg0) { - @Pc(9) Class38 local9 = this.aClass38_1; + @Pc(9) BufferedFile local9 = this.aClass38_1; synchronized (this.aClass38_1) { try { @Pc(27) Object local27; @@ -113,7 +113,7 @@ public final class Cache { @OriginalMember(owner = "client!ge", name = "a", descriptor = "(BII[BZ)Z") private boolean method1704(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) byte[] arg2, @OriginalArg(4) boolean arg3) { - @Pc(9) Class38 local9 = this.aClass38_1; + @Pc(9) BufferedFile local9 = this.aClass38_1; synchronized (this.aClass38_1) { try { @Pc(67) int local67; diff --git a/client/src/main/java/Class38.java b/client/src/main/java/Class38.java deleted file mode 100644 index 4f9076c..0000000 --- a/client/src/main/java/Class38.java +++ /dev/null @@ -1,289 +0,0 @@ -import java.io.EOFException; -import java.io.File; -import java.io.IOException; -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalClass; -import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; - -@OriginalClass("client!en") -public final class Class38 { - - @OriginalMember(owner = "client!en", name = "m", descriptor = "J") - private long aLong67; - - @OriginalMember(owner = "client!en", name = "v", descriptor = "I") - private int anInt1906; - - @OriginalMember(owner = "client!en", name = "p", descriptor = "J") - private long aLong68 = -1L; - - @OriginalMember(owner = "client!en", name = "g", descriptor = "I") - private int anInt1899 = 0; - - @OriginalMember(owner = "client!en", name = "w", descriptor = "J") - private long aLong69 = -1L; - - @OriginalMember(owner = "client!en", name = "s", descriptor = "Lsignlink!qm;") - private final FileOnDisk aClass214_1; - - @OriginalMember(owner = "client!en", name = "a", descriptor = "J") - private long aLong64; - - @OriginalMember(owner = "client!en", name = "j", descriptor = "J") - private long aLong65; - - @OriginalMember(owner = "client!en", name = "q", descriptor = "[B") - private final byte[] aByteArray20; - - @OriginalMember(owner = "client!en", name = "b", descriptor = "[B") - private final byte[] aByteArray19; - - @OriginalMember(owner = "client!en", name = "k", descriptor = "J") - private long aLong66; - - @OriginalMember(owner = "client!en", name = "", descriptor = "(Lsignlink!qm;II)V") - public Class38(@OriginalArg(0) FileOnDisk arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) throws IOException { - this.aClass214_1 = arg0; - this.aLong65 = this.aLong64 = arg0.method5137(); - this.aByteArray20 = new byte[arg2]; - this.aByteArray19 = new byte[arg1]; - this.aLong66 = 0L; - } - - @OriginalMember(owner = "client!en", name = "a", descriptor = "(B)V") - private void method1450() throws IOException { - if (this.aLong68 == -1L) { - return; - } - if (this.aLong68 != this.aLong67) { - this.aClass214_1.method5133(this.aLong68); - this.aLong67 = this.aLong68; - } - this.aClass214_1.method5134(this.aByteArray20, this.anInt1899, 0); - @Pc(45) long local45 = -1L; - if (this.aLong69 <= this.aLong68 && this.aLong69 + (long) this.anInt1906 > this.aLong68) { - local45 = this.aLong68; - } else if (this.aLong68 <= this.aLong69 && this.aLong69 < this.aLong68 + (long) this.anInt1899) { - local45 = this.aLong69; - } - this.aLong67 += this.anInt1899; - if (this.aLong64 < this.aLong67) { - this.aLong64 = this.aLong67; - } - @Pc(118) long local118 = -1L; - if (this.aLong69 < this.aLong68 + (long) this.anInt1899 && (long) this.anInt1906 + this.aLong69 >= (long) this.anInt1899 + this.aLong68) { - local118 = this.aLong68 + (long) this.anInt1899; - } else if (this.aLong69 + (long) this.anInt1906 > this.aLong68 && (long) this.anInt1899 + this.aLong68 >= (long) this.anInt1906 + this.aLong69) { - local118 = (long) this.anInt1906 + this.aLong69; - } - if (local45 > -1L && local118 > local45) { - @Pc(208) int local208 = (int) (local118 - local45); - Static289.method2612(this.aByteArray20, (int) (local45 - this.aLong68), this.aByteArray19, (int) (local45 - this.aLong69), local208); - } - this.anInt1899 = 0; - this.aLong68 = -1L; - } - - @OriginalMember(owner = "client!en", name = "a", descriptor = "(I)J") - public final long method1451() { - return this.aLong65; - } - - @OriginalMember(owner = "client!en", name = "b", descriptor = "(I)Ljava/io/File;") - private File method1452() { - return this.aClass214_1.method5138(); - } - - @OriginalMember(owner = "client!en", name = "a", descriptor = "(I[BII)V") - public final void method1453(@OriginalArg(0) int arg0, @OriginalArg(1) byte[] arg1, @OriginalArg(2) int arg2) throws IOException { - try { - if (arg2 > arg1.length) { - throw new ArrayIndexOutOfBoundsException(arg2 - arg1.length); - } - if (this.aLong68 != -1L && this.aLong66 >= this.aLong68 && (long) this.anInt1899 + this.aLong68 >= (long) arg2 + this.aLong66) { - Static289.method2612(this.aByteArray20, (int) (this.aLong66 - this.aLong68), arg1, 0, arg2); - this.aLong66 += arg2; - return; - } - @Pc(71) long local71 = this.aLong66; - @Pc(75) int local75 = arg2; - @Pc(102) int local102; - if (this.aLong69 <= this.aLong66 && this.aLong69 + (long) this.anInt1906 > this.aLong66) { - local102 = (int) ((long) this.anInt1906 + this.aLong69 - this.aLong66); - if (local102 > arg2) { - local102 = arg2; - } - Static289.method2612(this.aByteArray19, (int) (this.aLong66 - this.aLong69), arg1, 0, local102); - arg0 = local102; - arg2 -= local102; - this.aLong66 += local102; - } - if (this.aByteArray19.length < arg2) { - this.aClass214_1.method5133(this.aLong66); - this.aLong67 = this.aLong66; - while (arg2 > 0) { - local102 = this.aClass214_1.method5135(arg0, arg2, arg1); - if (local102 == -1) { - break; - } - this.aLong67 += local102; - arg2 -= local102; - arg0 += local102; - this.aLong66 += local102; - } - } else if (arg2 > 0) { - this.method1456(); - local102 = arg2; - if (arg2 > this.anInt1906) { - local102 = this.anInt1906; - } - Static289.method2612(this.aByteArray19, 0, arg1, arg0, local102); - arg2 -= local102; - arg0 += local102; - this.aLong66 += local102; - } - if (this.aLong68 != -1L) { - if (this.aLong66 < this.aLong68 && arg2 > 0) { - local102 = (int) (this.aLong68 - this.aLong66) + arg0; - if (arg0 + arg2 < local102) { - local102 = arg0 + arg2; - } - while (arg0 < local102) { - arg1[arg0++] = 0; - this.aLong66++; - arg2--; - } - } - @Pc(298) long local298 = -1L; - @Pc(300) long local300 = -1L; - if ((long) this.anInt1899 + this.aLong68 > local71 && (long) local75 + local71 >= (long) this.anInt1899 + this.aLong68) { - local300 = (long) this.anInt1899 + this.aLong68; - } else if (this.aLong68 < (long) local75 + local71 && (long) this.anInt1899 + this.aLong68 >= (long) local75 + local71) { - local300 = (long) local75 + local71; - } - if (local71 <= this.aLong68 && local71 + (long) local75 > this.aLong68) { - local298 = this.aLong68; - } else if (local71 >= this.aLong68 && local71 < (long) this.anInt1899 + this.aLong68) { - local298 = local71; - } - if (local298 > -1L && local300 > local298) { - @Pc(426) int local426 = (int) (local300 - local298); - Static289.method2612(this.aByteArray20, (int) (local298 - this.aLong68), arg1, (int) (local298 - local71), local426); - if (this.aLong66 < local300) { - arg2 = (int) ((long) arg2 + this.aLong66 - local300); - this.aLong66 = local300; - } - } - } - } catch (@Pc(464) IOException local464) { - this.aLong67 = -1L; - throw local464; - } - if (arg2 > 0) { - throw new EOFException(); - } - } - - @OriginalMember(owner = "client!en", name = "b", descriptor = "(Z)V") - public final void method1455() throws IOException { - this.method1450(); - this.aClass214_1.method5136(); - } - - @OriginalMember(owner = "client!en", name = "c", descriptor = "(I)V") - private void method1456() throws IOException { - this.anInt1906 = 0; - if (this.aLong67 != this.aLong66) { - this.aClass214_1.method5133(this.aLong66); - this.aLong67 = this.aLong66; - } - this.aLong69 = this.aLong66; - while (this.aByteArray19.length > this.anInt1906) { - @Pc(49) int local49 = this.aByteArray19.length - this.anInt1906; - if (local49 > 200000000) { - local49 = 200000000; - } - @Pc(66) int local66 = this.aClass214_1.method5135(this.anInt1906, local49, this.aByteArray19); - if (local66 == -1) { - break; - } - this.aLong67 += local66; - this.anInt1906 += local66; - } - } - - @OriginalMember(owner = "client!en", name = "a", descriptor = "(Z[B)V") - public final void method1457(@OriginalArg(1) byte[] arg0) throws IOException { - this.method1453(0, arg0, arg0.length); - } - - @OriginalMember(owner = "client!en", name = "a", descriptor = "([BIII)V") - public final void method1458(@OriginalArg(0) byte[] arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2) throws IOException { - try { - if (this.aLong65 < (long) arg2 + this.aLong66) { - this.aLong65 = (long) arg2 + this.aLong66; - } - if (this.aLong68 != -1L && (this.aLong68 > this.aLong66 || this.aLong66 > (long) this.anInt1899 + this.aLong68)) { - this.method1450(); - } - if (this.aLong68 != -1L && (long) this.aByteArray20.length + this.aLong68 < (long) arg2 + this.aLong66) { - @Pc(90) int local90 = (int) ((long) this.aByteArray20.length + this.aLong68 - this.aLong66); - arg2 -= local90; - Static289.method2612(arg0, arg1, this.aByteArray20, (int) (this.aLong66 - this.aLong68), local90); - this.aLong66 += local90; - this.anInt1899 = this.aByteArray20.length; - this.method1450(); - arg1 += local90; - } - if (this.aByteArray20.length < arg2) { - if (this.aLong66 != this.aLong67) { - this.aClass214_1.method5133(this.aLong66); - this.aLong67 = this.aLong66; - } - this.aClass214_1.method5134(arg0, arg2, arg1); - @Pc(165) long local165 = -1L; - if (this.aLong69 <= this.aLong66 && (long) this.anInt1906 + this.aLong69 > this.aLong66) { - local165 = this.aLong66; - } else if (this.aLong66 <= this.aLong69 && (long) arg2 + this.aLong66 > this.aLong69) { - local165 = this.aLong69; - } - this.aLong67 += arg2; - @Pc(226) long local226 = -1L; - if (this.aLong64 < this.aLong67) { - this.aLong64 = this.aLong67; - } - if (this.aLong66 + (long) arg2 > this.aLong69 && this.aLong66 + (long) arg2 <= this.aLong69 - -((long) this.anInt1906)) { - local226 = (long) arg2 + this.aLong66; - } else if (this.aLong69 + (long) this.anInt1906 > this.aLong66 && this.aLong66 + (long) arg2 >= (long) this.anInt1906 + this.aLong69) { - local226 = (long) this.anInt1906 + this.aLong69; - } - if (local165 > -1L && local226 > local165) { - @Pc(324) int local324 = (int) (local226 - local165); - Static289.method2612(arg0, (int) (local165 + (long) arg1 - this.aLong66), this.aByteArray19, (int) (local165 - this.aLong69), local324); - } - this.aLong66 += arg2; - } else if (arg2 > 0) { - if (this.aLong68 == -1L) { - this.aLong68 = this.aLong66; - } - Static289.method2612(arg0, arg1, this.aByteArray20, (int) (this.aLong66 - this.aLong68), arg2); - this.aLong66 += arg2; - if ((long) this.anInt1899 < this.aLong66 - this.aLong68) { - this.anInt1899 = (int) (this.aLong66 - this.aLong68); - } - } - } catch (@Pc(414) IOException local414) { - this.aLong67 = -1L; - throw local414; - } - } - - @OriginalMember(owner = "client!en", name = "a", descriptor = "(IJ)V") - public final void method1459(@OriginalArg(1) long arg0) throws IOException { - if (arg0 < 0L) { - throw new IOException("Invalid seek to " + arg0 + " in file " + this.method1452()); - } - this.aLong66 = arg0; - } -} diff --git a/client/src/main/java/Class59.java b/client/src/main/java/Class59.java index eb1258b..7ba96cd 100644 --- a/client/src/main/java/Class59.java +++ b/client/src/main/java/Class59.java @@ -75,7 +75,7 @@ public final class Class59 { private void method1947() { @Pc(8) long local8 = this.aLong88; this.aLong88 = -1L; - @Pc(13) long[] local13 = BufferedFile.aLongArray7; + @Pc(13) long[] local13 = TriangleNormal.aLongArray7; this.aLong88 = local13[(int) (((long) (this.anInt2497 >> 8) ^ this.aLong88) & 0xFFL)] ^ this.aLong88 >>> 8; this.aLong88 = local13[(int) ((this.aLong88 ^ (long) this.anInt2497) & 0xFFL)] ^ this.aLong88 >>> 8; @Pc(53) int local53; diff --git a/client/src/main/java/GlModel.java b/client/src/main/java/GlModel.java index 4dd44d9..ce2193a 100644 --- a/client/src/main/java/GlModel.java +++ b/client/src/main/java/GlModel.java @@ -564,7 +564,7 @@ public final class GlModel extends Model { @Pc(2065) Class57 local2065 = arg0.aClass57Array1[local2060]; this.aShortArray83[local439] = this.method4098(arg0, local2060, local1994 + (long) local868, local2065.anInt2437, local2065.anInt2431, local2065.anInt2436, local2065.anInt2432, local714, local685); } else if (local902 == 1) { - @Pc(2096) BufferedFile local2096 = arg0.aClass126Array1[local810]; + @Pc(2096) TriangleNormal local2096 = arg0.aClass126Array1[local810]; @Pc(2137) long local2137 = (long) ((local833 << 2) + (local2096.anInt4769 > 0 ? 1024 : 2048) + (local2096.anInt4770 + 256 << 12) + (local2096.anInt4767 + 256 << 22)) + ((long) (local553 << 24) + (long) (local817 << 8) + (long) local844 << 32); this.aShortArray77[local439] = this.method4098(arg0, arg0.anIntArray197[local810], local2137, local2096.anInt4769, local2096.anInt4770, local2096.anInt4767, 0, local854, local856); this.aShortArray82[local439] = this.method4098(arg0, arg0.anIntArray200[local810], local2137 + (long) local866, local2096.anInt4769, local2096.anInt4770, local2096.anInt4767, 0, local858, local683); diff --git a/client/src/main/java/RawModel.java b/client/src/main/java/RawModel.java index 6943823..fa068ca 100644 --- a/client/src/main/java/RawModel.java +++ b/client/src/main/java/RawModel.java @@ -112,7 +112,7 @@ public final class RawModel extends Entity { public int[] anIntArray202; @OriginalMember(owner = "client!gb", name = "kb", descriptor = "[Lclient!qj;") - public BufferedFile[] aClass126Array1; + public TriangleNormal[] aClass126Array1; @OriginalMember(owner = "client!gb", name = "mb", descriptor = "[S") public short[] aShortArray27; @@ -608,9 +608,9 @@ public final class RawModel extends Entity { local272.anInt2432++; } else if (local201 == 1) { if (this.aClass126Array1 == null) { - this.aClass126Array1 = new BufferedFile[this.anInt2136]; + this.aClass126Array1 = new TriangleNormal[this.anInt2136]; } - @Pc(317) BufferedFile local317 = this.aClass126Array1[local10] = new BufferedFile(); + @Pc(317) TriangleNormal local317 = this.aClass126Array1[local10] = new TriangleNormal(); local317.anInt4769 = local112; local317.anInt4770 = local120; local317.anInt4767 = local128; diff --git a/client/src/main/java/SoftwareModel.java b/client/src/main/java/SoftwareModel.java index ac604cf..f665228 100644 --- a/client/src/main/java/SoftwareModel.java +++ b/client/src/main/java/SoftwareModel.java @@ -234,7 +234,7 @@ public final class SoftwareModel extends Model { } @Pc(435) Class57 local435; @Pc(468) int local468; - @Pc(614) BufferedFile local614; + @Pc(614) TriangleNormal local614; if (local388 == -1) { if (local366 == 0) { @Pc(416) int local416 = arg0.aShortArray24[local133] & 0xFFFF; diff --git a/client/src/main/java/Static121.java b/client/src/main/java/Static121.java index 1b3cad6..e66d140 100644 --- a/client/src/main/java/Static121.java +++ b/client/src/main/java/Static121.java @@ -11,7 +11,7 @@ public final class Static121 { public static int anInt3039; @OriginalMember(owner = "client!jg", name = "c", descriptor = "Lclient!en;") - public static Class38 aClass38_3; + public static BufferedFile aClass38_3; @OriginalMember(owner = "client!jg", name = "g", descriptor = "I") public static int anInt3041; diff --git a/client/src/main/java/Static172.java b/client/src/main/java/Static172.java index 6af76fd..10ed24a 100644 --- a/client/src/main/java/Static172.java +++ b/client/src/main/java/Static172.java @@ -11,7 +11,7 @@ public final class Static172 { public static MidiPcmStream aClass3_Sub3_Sub4_2; @OriginalMember(owner = "client!nj", name = "f", descriptor = "Lclient!en;") - public static Class38 aClass38_4; + public static BufferedFile aClass38_4; @OriginalMember(owner = "client!nj", name = "g", descriptor = "Lclient!ve;") public static Js5 aClass153_70; diff --git a/client/src/main/java/Static190.java b/client/src/main/java/Static190.java index 1d4f91b..251b92e 100644 --- a/client/src/main/java/Static190.java +++ b/client/src/main/java/Static190.java @@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static190 { @OriginalMember(owner = "client!pf", name = "f", descriptor = "Lclient!en;") - public static Class38 aClass38_5; + public static BufferedFile aClass38_5; @OriginalMember(owner = "client!pf", name = "b", descriptor = "Lclient!n;") public static final Class99 aClass99_26 = new Class99(200); diff --git a/client/src/main/java/Static47.java b/client/src/main/java/Static47.java index dd88589..07eb560 100644 --- a/client/src/main/java/Static47.java +++ b/client/src/main/java/Static47.java @@ -11,7 +11,7 @@ public final class Static47 { public static final JagString aClass100_992 = Static28.method790("blinken1:"); @OriginalMember(owner = "client!dk", name = "j", descriptor = "[Lclient!en;") - public static final Class38[] aClass38Array2 = new Class38[28]; + public static final BufferedFile[] aClass38Array2 = new BufferedFile[28]; @OriginalMember(owner = "client!dk", name = "a", descriptor = "(III)Lclient!ec;") public static Scenery method3996(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { diff --git a/client/src/main/java/TriangleNormal.java b/client/src/main/java/TriangleNormal.java new file mode 100644 index 0000000..7048495 --- /dev/null +++ b/client/src/main/java/TriangleNormal.java @@ -0,0 +1,33 @@ +import org.openrs2.deob.annotation.OriginalClass; +import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; + +@OriginalClass("client!qj") +public final class TriangleNormal { + + @OriginalMember(owner = "client!qj", name = "a", descriptor = "[J") + public static final long[] aLongArray7 = new long[256]; + + @OriginalMember(owner = "client!qj", name = "c", descriptor = "I") + public int anInt4767; + + @OriginalMember(owner = "client!qj", name = "e", descriptor = "I") + public int anInt4769; + + @OriginalMember(owner = "client!qj", name = "f", descriptor = "I") + public int anInt4770; + + static { + for (@Pc(4) int local4 = 0; local4 < 256; local4++) { + @Pc(10) long local10 = (long) local4; + for (@Pc(12) int local12 = 0; local12 < 8; local12++) { + if ((local10 & 0x1L) == 1L) { + local10 = local10 >>> 1 ^ 0xC96C5795D7870F42L; + } else { + local10 >>>= 0x1; + } + } + aLongArray7[local4] = local10; + } + } +} diff --git a/client/src/main/java/client.java b/client/src/main/java/client.java index b17e4f3..7d034e8 100644 --- a/client/src/main/java/client.java +++ b/client/src/main/java/client.java @@ -373,13 +373,13 @@ public final class client extends GameShell { Static7.anInt986 = SignLink.anInt5928; try { if (Static71.aClass213_3.aClass214_2 != null) { - Static172.aClass38_4 = new Class38(Static71.aClass213_3.aClass214_2, 5200, 0); + Static172.aClass38_4 = new BufferedFile(Static71.aClass213_3.aClass214_2, 5200, 0); for (@Pc(162) int local162 = 0; local162 < 28; local162++) { - Static47.aClass38Array2[local162] = new Class38(Static71.aClass213_3.aClass214Array1[local162], 6000, 0); + Static47.aClass38Array2[local162] = new BufferedFile(Static71.aClass213_3.aClass214Array1[local162], 6000, 0); } - Static190.aClass38_5 = new Class38(Static71.aClass213_3.aClass214_3, 6000, 0); + Static190.aClass38_5 = new BufferedFile(Static71.aClass213_3.aClass214_3, 6000, 0); Static148.aClass49_4 = new Cache(255, Static172.aClass38_4, Static190.aClass38_5, 500000); - Static121.aClass38_3 = new Class38(Static71.aClass213_3.aClass214_4, 24, 0); + Static121.aClass38_3 = new BufferedFile(Static71.aClass213_3.aClass214_4, 24, 0); Static71.aClass213_3.aClass214Array1 = null; Static71.aClass213_3.aClass214_3 = null; Static71.aClass213_3.aClass214_4 = null;