Rename Class3_Sub15 to Buffer

.gitignore

@@ -1,3 +1,4 @@
+.idea/
 target/
 
 dependency-reduced-pom.xml

client/src/main/java/Buffer.java

@@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
 @OriginalClass("client!wa")
-public class Class3_Sub15 extends Class3 {
+public class Buffer extends Class3 {
 
 	@OriginalMember(owner = "client!wa", name = "y", descriptor = "[B")
 	public byte[] aByteArray40;
@@ -14,13 +14,13 @@ public class Class3_Sub15 extends Class3 {
 	public int anInt2792;
 
 	@OriginalMember(owner = "client!wa", name = "<init>", descriptor = "(I)V")
-	public Class3_Sub15(@OriginalArg(0) int arg0) {
+	public Buffer(@OriginalArg(0) int arg0) {
 		this.aByteArray40 = Static228.method3907(arg0);
 		this.anInt2792 = 0;
 	}
 
 	@OriginalMember(owner = "client!wa", name = "<init>", descriptor = "([B)V")
-	public Class3_Sub15(@OriginalArg(0) byte[] arg0) {
+	public Buffer(@OriginalArg(0) byte[] arg0) {
 		this.anInt2792 = 0;
 		this.aByteArray40 = arg0;
 	}

client/src/main/java/Class104.java

@@ -39,8 +39,8 @@ public final class Class104 {
 	@OriginalMember(owner = "client!ne", name = "<init>", descriptor = "([BLclient!jm;)V")
 	public Class104(@OriginalArg(0) byte[] arg0, @OriginalArg(1) Class3_Sub20 arg1) {
 		this.aClass3_Sub20_1 = arg1;
-		@Pc(21) Class3_Sub15 local21 = new Class3_Sub15(arg0);
+		@Pc(21) Buffer local21 = new Buffer(arg0);
-		@Pc(26) Class3_Sub15 local26 = new Class3_Sub15(arg0);
+		@Pc(26) Buffer local26 = new Buffer(arg0);
 		local21.anInt2792 = 2;
 		@Pc(33) int local33 = local21.method2229();
 		@Pc(35) int local35 = 0;

client/src/main/java/Class107.java

@@ -92,7 +92,7 @@ public final class Class107 {
 	}
 
 	@OriginalMember(owner = "client!ni", name = "a", descriptor = "(ILclient!wa;I)V")
-	public final void method3217(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1) {
+	public final void method3217(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 		while (true) {
 			@Pc(7) int local7 = arg1.method2229();
 			if (local7 == 0) {
@@ -103,7 +103,7 @@ public final class Class107 {
 	}
 
 	@OriginalMember(owner = "client!ni", name = "a", descriptor = "(BILclient!wa;I)V")
-	private void method3220(@OriginalArg(1) int arg0, @OriginalArg(2) Class3_Sub15 arg1, @OriginalArg(3) int arg2) {
+	private void method3220(@OriginalArg(1) int arg0, @OriginalArg(2) Buffer arg1, @OriginalArg(3) int arg2) {
 		if (arg0 == 1) {
 			this.anInt4147 = arg1.method2220();
 			this.method3216(this.anInt4147);

client/src/main/java/Class109.java

@@ -66,7 +66,7 @@ public final class Class109 implements Interface1 {
 		} else {
 			this.aClass54_11 = null;
 		}
-		@Pc(51) Class3_Sub15 local51 = new Class3_Sub15(arg1.method4495(0, 0));
+		@Pc(51) Buffer local51 = new Buffer(arg1.method4495(0, 0));
 		@Pc(55) int local55 = local51.method2163();
 		this.aByteArray61 = new byte[local55];
 		this.aByteArray60 = new byte[local55];
@@ -171,7 +171,7 @@ public final class Class109 implements Interface1 {
 		if (local30 == null) {
 			return null;
 		} else {
-			@Pc(41) Class3_Sub15 local41 = new Class3_Sub15(local30);
+			@Pc(41) Buffer local41 = new Buffer(local30);
 			local14 = new Class3_Sub2_Sub20(local41);
 			this.aClass54_12.method1811(local14, (long) arg0);
 			return local14;

client/src/main/java/Class110.java

@@ -19,7 +19,7 @@ public final class Class110 {
 	private final int[] anIntArray369 = new int[2];
 
 	@OriginalMember(owner = "client!nl", name = "a", descriptor = "(Lclient!wa;Lclient!ff;)V")
-	public final void method3249(@OriginalArg(0) Class3_Sub15 arg0, @OriginalArg(1) Class42 arg1) {
+	public final void method3249(@OriginalArg(0) Buffer arg0, @OriginalArg(1) Class42 arg1) {
 		@Pc(3) int local3 = arg0.method2229();
 		this.anIntArray368[0] = local3 >> 4;
 		this.anIntArray368[1] = local3 & 0xF;

client/src/main/java/Class118.java

@@ -383,7 +383,7 @@ public final class Class118 {
 	}
 
 	@OriginalMember(owner = "client!pb", name = "a", descriptor = "(ILclient!wa;)V")
-	public final void method3424(@OriginalArg(1) Class3_Sub15 arg0) {
+	public final void method3424(@OriginalArg(1) Buffer arg0) {
 		while (true) {
 			@Pc(9) int local9 = arg0.method2229();
 			if (local9 == 0) {
@@ -394,7 +394,7 @@ public final class Class118 {
 	}
 
 	@OriginalMember(owner = "client!pb", name = "a", descriptor = "(Lclient!wa;II)V")
-	private void method3425(@OriginalArg(0) Class3_Sub15 arg0, @OriginalArg(1) int arg1) {
+	private void method3425(@OriginalArg(0) Buffer arg0, @OriginalArg(1) int arg1) {
 		@Pc(18) int local18;
 		@Pc(38) int local38;
 		if (arg1 == 1) {

client/src/main/java/Class123.java

@@ -261,7 +261,7 @@ public final class Class123 {
 	}
 
 	@OriginalMember(owner = "client!pj", name = "a", descriptor = "(Lclient!wa;)V")
-	public final void method3506(@OriginalArg(0) Class3_Sub15 arg0) {
+	public final void method3506(@OriginalArg(0) Buffer arg0) {
 		this.aClass42_5 = new Class42();
 		this.aClass42_5.method1515(arg0);
 		this.aClass42_3 = new Class42();

client/src/main/java/Class13.java

@@ -544,7 +544,7 @@ public final class Class13 {
 	}
 
 	@OriginalMember(owner = "client!be", name = "a", descriptor = "(ILclient!wa;)V")
-	public final void method481(@OriginalArg(1) Class3_Sub15 arg0) {
+	public final void method481(@OriginalArg(1) Buffer arg0) {
 		this.aBoolean32 = false;
 		this.anInt452 = arg0.method2229();
 		this.anInt530 = arg0.method2229();
@@ -788,7 +788,7 @@ public final class Class13 {
 	}
 
 	@OriginalMember(owner = "client!be", name = "b", descriptor = "(ILclient!wa;)[Ljava/lang/Object;")
-	private Object[] method485(@OriginalArg(1) Class3_Sub15 arg0) {
+	private Object[] method485(@OriginalArg(1) Buffer arg0) {
 		@Pc(11) int local11 = arg0.method2229();
 		if (local11 == 0) {
 			return null;
@@ -807,7 +807,7 @@ public final class Class13 {
 	}
 
 	@OriginalMember(owner = "client!be", name = "a", descriptor = "(Lclient!wa;Z)[I")
-	private int[] method486(@OriginalArg(0) Class3_Sub15 arg0) {
+	private int[] method486(@OriginalArg(0) Buffer arg0) {
 		@Pc(9) int local9 = arg0.method2229();
 		if (local9 == 0) {
 			return null;
@@ -974,7 +974,7 @@ public final class Class13 {
 	}
 
 	@OriginalMember(owner = "client!be", name = "c", descriptor = "(ILclient!wa;)V")
-	public final void method490(@OriginalArg(1) Class3_Sub15 arg0) {
+	public final void method490(@OriginalArg(1) Buffer arg0) {
 		this.aBoolean32 = true;
 		arg0.anInt2792++;
 		this.anInt452 = arg0.method2229();

client/src/main/java/Class130.java

@@ -31,7 +31,7 @@ public final class Class130 implements Interface4 {
 			this.anInt4830 = local19[0];
 			@Pc(42) int[][] local42 = Static33.method874(0.4F);
 			@Pc(53) int[][] local53 = Static33.method874(0.4F);
-			@Pc(58) Class3_Sub15 local58 = new Class3_Sub15(262144);
+			@Pc(58) Buffer local58 = new Buffer(262144);
 			for (@Pc(60) int local60 = 0; local60 < 256; local60++) {
 				@Pc(67) int[] local67 = local42[local60];
 				@Pc(71) int[] local71 = local53[local60];

client/src/main/java/Class136.java

@@ -28,7 +28,7 @@ public final class Class136 {
 	}
 
 	@OriginalMember(owner = "client!sg", name = "<init>", descriptor = "(Lclient!wa;)V")
-	public Class136(@OriginalArg(0) Class3_Sub15 arg0) {
+	public Class136(@OriginalArg(0) Buffer arg0) {
 		this.aByte17 = arg0.method2186();
 		this.anInt5094 = arg0.method2163();
 		this.anInt5099 = arg0.method2174();

client/src/main/java/Class138.java

@@ -16,7 +16,7 @@ public final class Class138 {
 	private int anInt5206;
 
 	@OriginalMember(owner = "client!sl", name = "<init>", descriptor = "(Lclient!wa;)V")
-	public Class138(@OriginalArg(0) Class3_Sub15 arg0) {
+	public Class138(@OriginalArg(0) Buffer arg0) {
 		for (@Pc(7) int local7 = 0; local7 < 10; local7++) {
 			@Pc(14) int local14 = arg0.method2229();
 			if (local14 != 0) {

client/src/main/java/Class144.java

@@ -61,7 +61,7 @@ public final class Class144 {
 	public boolean aBoolean280 = false;
 
 	@OriginalMember(owner = "client!tk", name = "a", descriptor = "(Lclient!wa;B)V")
-	public final void method4213(@OriginalArg(0) Class3_Sub15 arg0) {
+	public final void method4213(@OriginalArg(0) Buffer arg0) {
 		while (true) {
 			@Pc(19) int local19 = arg0.method2229();
 			if (local19 == 0) {
@@ -285,7 +285,7 @@ public final class Class144 {
 	}
 
 	@OriginalMember(owner = "client!tk", name = "a", descriptor = "(IBLclient!wa;)V")
-	private void method4220(@OriginalArg(0) int arg0, @OriginalArg(2) Class3_Sub15 arg1) {
+	private void method4220(@OriginalArg(0) int arg0, @OriginalArg(2) Buffer arg1) {
 		@Pc(8) int local8;
 		@Pc(14) int local14;
 		if (arg0 == 1) {

client/src/main/java/Class153.java

@@ -281,7 +281,7 @@ public final class Class153 {
 				local114 = Static138.method2696(this.anObjectArray32[arg0], false);
 			} else {
 				local114 = Static138.method2696(this.anObjectArray32[arg0], true);
-				@Pc(128) Class3_Sub15 local128 = new Class3_Sub15(local114);
+				@Pc(128) Buffer local128 = new Buffer(local114);
 				local128.method2196(arg1, local128.aByteArray40.length);
 			}
 			@Pc(140) byte[] local140;
@@ -300,7 +300,7 @@ public final class Class153 {
 				@Pc(216) int local216 = local213 - 1;
 				@Pc(220) int local220 = local140[local216] & 0xFF;
 				@Pc(228) int local228 = local216 - local31 * local220 * 4;
-				@Pc(233) Class3_Sub15 local233 = new Class3_Sub15(local140);
+				@Pc(233) Buffer local233 = new Buffer(local140);
 				local233.anInt2792 = local228;
 				@Pc(239) int[] local239 = new int[local31];
 				@Pc(250) int local250;

client/src/main/java/Class164.java

@@ -37,7 +37,7 @@ public final class Class164 {
 	public int anInt5889 = 1190717;
 
 	@OriginalMember(owner = "client!wl", name = "a", descriptor = "(ILclient!wa;I)V")
-	public final void method4669(@OriginalArg(1) Class3_Sub15 arg0, @OriginalArg(2) int arg1) {
+	public final void method4669(@OriginalArg(1) Buffer arg0, @OriginalArg(2) int arg1) {
 		while (true) {
 			@Pc(5) int local5 = arg0.method2229();
 			if (local5 == 0) {
@@ -48,7 +48,7 @@ public final class Class164 {
 	}
 
 	@OriginalMember(owner = "client!wl", name = "a", descriptor = "(IILclient!wa;I)V")
-	private void method4674(@OriginalArg(1) int arg0, @OriginalArg(2) Class3_Sub15 arg1, @OriginalArg(3) int arg2) {
+	private void method4674(@OriginalArg(1) int arg0, @OriginalArg(2) Buffer arg1, @OriginalArg(3) int arg2) {
 		if (arg0 == 1) {
 			this.anInt5899 = Static15.method492(arg1.method2220());
 		} else if (arg0 == 2) {

client/src/main/java/Class165.java

@@ -46,7 +46,7 @@ public final class Class165 {
 
 	@OriginalMember(owner = "client!wm", name = "a", descriptor = "([[III)V")
 	public final void method4676(@OriginalArg(0) int[][] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
-		@Pc(4) Class3_Sub15 local4 = new Class3_Sub15(1620);
+		@Pc(4) Buffer local4 = new Buffer(1620);
 		@Pc(11) int local11;
 		for (@Pc(6) int local6 = 0; local6 <= 8; local6++) {
 			for (local11 = 0; local11 <= 8; local11++) {
@@ -74,7 +74,7 @@ public final class Class165 {
 			this.aByteBuffer12.put(local4.aByteArray40, 0, local4.anInt2792);
 			this.aByteBuffer12.flip();
 		}
-		@Pc(147) Class3_Sub15 local147 = new Class3_Sub15(1536);
+		@Pc(147) Buffer local147 = new Buffer(1536);
 		for (local11 = 0; local11 < 8; local11++) {
 			for (@Pc(154) int local154 = 0; local154 < 8; local154++) {
 				if (Static239.aBoolean263) {

client/src/main/java/Class2.java

@@ -16,7 +16,7 @@ public final class Class2 {
 	public boolean aBoolean2 = false;
 
 	@OriginalMember(owner = "client!aa", name = "a", descriptor = "(BLclient!wa;I)V")
-	public final void method6(@OriginalArg(1) Class3_Sub15 arg0, @OriginalArg(2) int arg1) {
+	public final void method6(@OriginalArg(1) Buffer arg0, @OriginalArg(2) int arg1) {
 		while (true) {
 			@Pc(5) int local5 = arg0.method2229();
 			if (local5 == 0) {
@@ -47,7 +47,7 @@ public final class Class2 {
 	}
 
 	@OriginalMember(owner = "client!aa", name = "a", descriptor = "(ILclient!wa;II)V")
-	private void method11(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1, @OriginalArg(2) int arg2) {
+	private void method11(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1, @OriginalArg(2) int arg2) {
 		if (arg0 == 1) {
 			this.anInt12 = arg1.method2163();
 		} else if (arg0 == 2) {

client/src/main/java/Class20.java

@@ -92,7 +92,7 @@ public final class Class20 {
 	}
 
 	@OriginalMember(owner = "client!ck", name = "a", descriptor = "(ILclient!wa;)V")
-	public final void method880(@OriginalArg(1) Class3_Sub15 arg0) {
+	public final void method880(@OriginalArg(1) Buffer arg0) {
 		while (true) {
 			@Pc(16) int local16 = arg0.method2229();
 			if (local16 == 0) {
@@ -103,7 +103,7 @@ public final class Class20 {
 	}
 
 	@OriginalMember(owner = "client!ck", name = "a", descriptor = "(IBLclient!wa;)V")
-	private void method881(@OriginalArg(0) int arg0, @OriginalArg(2) Class3_Sub15 arg1) {
+	private void method881(@OriginalArg(0) int arg0, @OriginalArg(2) Buffer arg1) {
 		if (arg0 == 1) {
 			this.anInt1037 = arg1.method2163();
 			this.anInt1051 = arg1.method2163();

client/src/main/java/Class30.java

@@ -69,7 +69,7 @@ public final class Class30 {
 	}
 
 	@OriginalMember(owner = "client!dm", name = "a", descriptor = "(BLclient!wa;I)V")
-	private void method1203(@OriginalArg(1) Class3_Sub15 arg0, @OriginalArg(2) int arg1) {
+	private void method1203(@OriginalArg(1) Buffer arg0, @OriginalArg(2) int arg1) {
 		if (arg1 == 1) {
 			this.anInt1457 = arg0.method2229();
 			return;
@@ -146,7 +146,7 @@ public final class Class30 {
 	}
 
 	@OriginalMember(owner = "client!dm", name = "a", descriptor = "(ILclient!wa;)V")
-	public final void method1209(@OriginalArg(1) Class3_Sub15 arg0) {
+	public final void method1209(@OriginalArg(1) Buffer arg0) {
 		while (true) {
 			@Pc(13) int local13 = arg0.method2229();
 			if (local13 == 0) {

client/src/main/java/Class34.java

@@ -46,7 +46,7 @@ public final class Class34 {
 	private int anInt1755 = 0;
 
 	@OriginalMember(owner = "client!eg", name = "a", descriptor = "(Lclient!wa;B)V")
-	public final void method1316(@OriginalArg(0) Class3_Sub15 arg0) {
+	public final void method1316(@OriginalArg(0) Buffer arg0) {
 		while (true) {
 			@Pc(17) int local17 = arg0.method2229();
 			if (local17 == 0) {
@@ -57,7 +57,7 @@ public final class Class34 {
 	}
 
 	@OriginalMember(owner = "client!eg", name = "a", descriptor = "(Lclient!wa;II)V")
-	private void method1318(@OriginalArg(0) Class3_Sub15 arg0, @OriginalArg(1) int arg1) {
+	private void method1318(@OriginalArg(0) Buffer arg0, @OriginalArg(1) int arg1) {
 		if (arg1 == 1) {
 			this.anInt1753 = arg0.method2163();
 		} else if (arg1 == 2) {

client/src/main/java/Class35.java

@@ -10,7 +10,7 @@ public final class Class35 {
 	public int anInt1765 = 0;
 
 	@OriginalMember(owner = "client!eh", name = "a", descriptor = "(ILclient!wa;)V")
-	public final void method1323(@OriginalArg(1) Class3_Sub15 arg0) {
+	public final void method1323(@OriginalArg(1) Buffer arg0) {
 		while (true) {
 			@Pc(5) int local5 = arg0.method2229();
 			if (local5 == 0) {
@@ -21,7 +21,7 @@ public final class Class35 {
 	}
 
 	@OriginalMember(owner = "client!eh", name = "a", descriptor = "(Lclient!wa;BI)V")
-	private void method1325(@OriginalArg(0) Class3_Sub15 arg0, @OriginalArg(2) int arg1) {
+	private void method1325(@OriginalArg(0) Buffer arg0, @OriginalArg(2) int arg1) {
 		if (arg1 == 5) {
 			this.anInt1765 = arg0.method2163();
 		}

client/src/main/java/Class3_Sub1.java

@@ -43,7 +43,7 @@ public abstract class Class3_Sub1 extends Class3 {
 	}
 
 	@OriginalMember(owner = "client!j", name = "a", descriptor = "(ILclient!wa;Z)V")
-	public void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1) {
+	public void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 	}
 
 	@OriginalMember(owner = "client!j", name = "e", descriptor = "(I)V")

client/src/main/java/Class3_Sub14.java

@@ -156,7 +156,7 @@ public final class Class3_Sub14 extends Class3 {
 
 	@OriginalMember(owner = "client!hg", name = "d", descriptor = "()V")
 	public final void method1943() {
-		@Pc(12) Class3_Sub15 local12 = new Class3_Sub15((this.aBoolean139 ? 40 : 36) * this.anInt2483);
+		@Pc(12) Buffer local12 = new Buffer((this.aBoolean139 ? 40 : 36) * this.anInt2483);
 		for (@Pc(14) int local14 = 0; local14 < this.anInt2483; local14++) {
 			if (Static239.aBoolean263) {
 				local12.method2227((float) this.anIntArray232[local14]);
@@ -209,18 +209,18 @@ public final class Class3_Sub14 extends Class3 {
 	@OriginalMember(owner = "client!hg", name = "a", descriptor = "([[[Lclient!bj;FZ)V")
 	public final void method1944(@OriginalArg(0) Class3_Sub5[][][] arg0, @OriginalArg(1) float arg1, @OriginalArg(2) boolean arg2) {
 		if (Static95.aClass3_Sub15_3 == null || Static95.aClass3_Sub15_3.aByteArray40.length < this.anInt2488 * 4) {
-			Static95.aClass3_Sub15_3 = new Class3_Sub15(this.anInt2488 * 4);
+			Static95.aClass3_Sub15_3 = new Buffer(this.anInt2488 * 4);
 		} else {
 			Static95.aClass3_Sub15_3.anInt2792 = 0;
 		}
 		if (Static95.aClass3_Sub15_2 == null || Static95.aClass3_Sub15_2.aByteArray40.length < this.anInt2487 * 4) {
-			Static95.aClass3_Sub15_2 = new Class3_Sub15(this.anInt2487 * 4);
+			Static95.aClass3_Sub15_2 = new Buffer(this.anInt2487 * 4);
 		} else {
 			Static95.aClass3_Sub15_2.anInt2792 = 0;
 		}
 		@Pc(47) int local47;
 		@Pc(68) Class3_Sub5 local68;
-		@Pc(111) Class3_Sub15 local111;
+		@Pc(111) Buffer local111;
 		@Pc(78) int[] local78;
 		@Pc(86) int[] local86;
 		@Pc(90) int local90;

client/src/main/java/Class3_Sub15_Sub1.java

@@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
 import org.openrs2.deob.annotation.Pc;
 
 @OriginalClass("client!i")
-public final class Class3_Sub15_Sub1 extends Class3_Sub15 {
+public final class Class3_Sub15_Sub1 extends Buffer {
 
 	@OriginalMember(owner = "client!i", name = "Xb", descriptor = "Lclient!ij;")
 	private Class71 aClass71_1;

client/src/main/java/Class3_Sub17.java

@@ -95,7 +95,7 @@ public final class Class3_Sub17 extends Class3 {
 
 	@OriginalMember(owner = "client!jc", name = "a", descriptor = "([B)V")
 	private void method2342(@OriginalArg(0) byte[] arg0) {
-		@Pc(4) Class3_Sub15 local4 = new Class3_Sub15(arg0);
+		@Pc(4) Buffer local4 = new Buffer(arg0);
 		this.anInt2980 = local4.method2174();
 		this.anInt2974 = local4.method2174();
 		this.anInt2976 = local4.method2174();

client/src/main/java/Class3_Sub18.java

@@ -34,7 +34,7 @@ public final class Class3_Sub18 extends Class3 {
 	public Class3_Sub18(@OriginalArg(0) byte[] arg0) {
 		@Pc(29) int local29 = 0;
 		this.aByteArray44 = new byte[128];
-		@Pc(38) Class3_Sub15 local38 = new Class3_Sub15(arg0);
+		@Pc(38) Buffer local38 = new Buffer(arg0);
 		while (local38.aByteArray40[local29 + local38.anInt2792] != 0) {
 			local29++;
 		}

client/src/main/java/Class3_Sub1_Sub1.java

@@ -62,7 +62,7 @@ public final class Class3_Sub1_Sub1 extends Class3_Sub1 {
 
 	@OriginalMember(owner = "client!ag", name = "a", descriptor = "(ILclient!wa;Z)V")
 	@Override
-	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1) {
+	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 		if (arg0 == 0) {
 			this.anInt105 = arg1.method2229();
 		} else if (arg0 == 1) {

client/src/main/java/Class3_Sub1_Sub10.java

@@ -22,7 +22,7 @@ public final class Class3_Sub1_Sub10 extends Class3_Sub1 {
 
 	@OriginalMember(owner = "client!fh", name = "a", descriptor = "(ILclient!wa;Z)V")
 	@Override
-	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1) {
+	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 		if (arg0 == 0) {
 			this.anInt2007 = arg1.method2163();
 		} else if (arg0 == 1) {

client/src/main/java/Class3_Sub1_Sub11.java

@@ -52,7 +52,7 @@ public final class Class3_Sub1_Sub11 extends Class3_Sub1 {
 
 	@OriginalMember(owner = "client!fm", name = "a", descriptor = "(ILclient!wa;Z)V")
 	@Override
-	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1) {
+	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 		if (arg0 == 0) {
 			this.method1595(arg1.method2220());
 		}

client/src/main/java/Class3_Sub1_Sub13.java

@@ -19,7 +19,7 @@ public final class Class3_Sub1_Sub13 extends Class3_Sub1 {
 
 	@OriginalMember(owner = "client!gg", name = "a", descriptor = "(ILclient!wa;Z)V")
 	@Override
-	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1) {
+	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 		if (arg0 == 0) {
 			this.anInt2220 = arg1.method2229();
 		} else if (arg0 == 1) {

client/src/main/java/Class3_Sub1_Sub14.java

@@ -25,7 +25,7 @@ public final class Class3_Sub1_Sub14 extends Class3_Sub1 {
 
 	@OriginalMember(owner = "client!gm", name = "a", descriptor = "(ILclient!wa;Z)V")
 	@Override
-	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1) {
+	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 		if (arg0 == 0) {
 			this.anInt2298 = arg1.method2163();
 		} else if (arg0 == 1) {

client/src/main/java/Class3_Sub1_Sub15.java

@@ -40,7 +40,7 @@ public final class Class3_Sub1_Sub15 extends Class3_Sub1 {
 
 	@OriginalMember(owner = "client!hk", name = "a", descriptor = "(ILclient!wa;Z)V")
 	@Override
-	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1) {
+	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 		if (arg0 == 0) {
 			this.anInt2546 = arg1.method2213();
 		} else if (arg0 == 1) {

client/src/main/java/Class3_Sub1_Sub16.java

@@ -137,7 +137,7 @@ public final class Class3_Sub1_Sub16 extends Class3_Sub1 {
 
 	@OriginalMember(owner = "client!hm", name = "a", descriptor = "(ILclient!wa;Z)V")
 	@Override
-	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1) {
+	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 		if (arg0 == 0) {
 			this.anInt2645 = this.anInt2646 = arg1.method2229();
 		} else if (arg0 == 1) {

client/src/main/java/Class3_Sub1_Sub17.java

@@ -47,7 +47,7 @@ public final class Class3_Sub1_Sub17 extends Class3_Sub1 {
 
 	@OriginalMember(owner = "client!je", name = "a", descriptor = "(ILclient!wa;Z)V")
 	@Override
-	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1) {
+	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 		if (arg0 == 0) {
 			this.aBoolean309 = arg1.method2229() == 1;
 		}

client/src/main/java/Class3_Sub1_Sub18.java

@@ -78,7 +78,7 @@ public class Class3_Sub1_Sub18 extends Class3_Sub1 {
 
 	@OriginalMember(owner = "client!nh", name = "a", descriptor = "(ILclient!wa;Z)V")
 	@Override
-	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1) {
+	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 		if (arg0 == 0) {
 			this.anInt3235 = arg1.method2163();
 		}

client/src/main/java/Class3_Sub1_Sub19.java

@@ -63,7 +63,7 @@ public final class Class3_Sub1_Sub19 extends Class3_Sub1 {
 
 	@OriginalMember(owner = "client!ke", name = "a", descriptor = "(ILclient!wa;Z)V")
 	@Override
-	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1) {
+	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 		if (arg0 == 0) {
 			this.anInt3292 = arg1.method2163() << 4;
 		} else if (arg0 == 1) {

client/src/main/java/Class3_Sub1_Sub2.java

@@ -19,7 +19,7 @@ public final class Class3_Sub1_Sub2 extends Class3_Sub1 {
 
 	@OriginalMember(owner = "client!aj", name = "a", descriptor = "(ILclient!wa;Z)V")
 	@Override
-	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1) {
+	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 		if (arg0 == 0) {
 			this.anInt148 = arg1.method2163();
 		} else if (arg0 == 1) {

client/src/main/java/Class3_Sub1_Sub20.java

@@ -62,7 +62,7 @@ public final class Class3_Sub1_Sub20 extends Class3_Sub1 {
 
 	@OriginalMember(owner = "client!mc", name = "a", descriptor = "(ILclient!wa;Z)V")
 	@Override
-	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1) {
+	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 		if (arg0 == 0) {
 			this.anInt3685 = arg1.method2229();
 		} else if (arg0 == 1) {

client/src/main/java/Class3_Sub1_Sub21.java

@@ -22,7 +22,7 @@ public final class Class3_Sub1_Sub21 extends Class3_Sub1 {
 
 	@OriginalMember(owner = "client!mg", name = "a", descriptor = "(ILclient!wa;Z)V")
 	@Override
-	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1) {
+	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 		if (arg0 == 0) {
 			this.anInt3816 = arg1.method2163();
 		} else if (arg0 == 1) {

client/src/main/java/Class3_Sub1_Sub22.java

@@ -34,7 +34,7 @@ public final class Class3_Sub1_Sub22 extends Class3_Sub1 {
 
 	@OriginalMember(owner = "client!mh", name = "a", descriptor = "(ILclient!wa;Z)V")
 	@Override
-	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1) {
+	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 		if (arg0 == 0) {
 			this.anInt3860 = arg1.method2163();
 		} else if (arg0 == 1) {

client/src/main/java/Class3_Sub1_Sub23.java

@@ -23,7 +23,7 @@ public final class Class3_Sub1_Sub23 extends Class3_Sub1 {
 
 	@OriginalMember(owner = "client!mi", name = "a", descriptor = "(ILclient!wa;Z)V")
 	@Override
-	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1) {
+	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 		if (arg0 == 0) {
 			this.anInt3894 = (arg1.method2229() << 12) / 255;
 		}

client/src/main/java/Class3_Sub1_Sub24.java

@@ -127,7 +127,7 @@ public final class Class3_Sub1_Sub24 extends Class3_Sub1 {
 
 	@OriginalMember(owner = "client!nm", name = "a", descriptor = "(ILclient!wa;Z)V")
 	@Override
-	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1) {
+	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 		if (arg0 == 0) {
 			this.anInt4221 = arg1.method2229();
 		} else if (arg0 == 1) {

client/src/main/java/Class3_Sub1_Sub25.java

@@ -304,7 +304,7 @@ public final class Class3_Sub1_Sub25 extends Class3_Sub1 {
 
 	@OriginalMember(owner = "client!ol", name = "a", descriptor = "(ILclient!wa;Z)V")
 	@Override
-	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1) {
+	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 		if (arg0 == 0) {
 			this.anInt4354 = arg1.method2229();
 		} else if (arg0 == 1) {

client/src/main/java/Class3_Sub1_Sub26.java

@@ -39,7 +39,7 @@ public final class Class3_Sub1_Sub26 extends Class3_Sub1 {
 
 	@OriginalMember(owner = "client!pg", name = "a", descriptor = "(ILclient!wa;Z)V")
 	@Override
-	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1) {
+	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 		if (arg0 == 0) {
 			this.anInt4503 = arg1.method2163();
 		}

client/src/main/java/Class3_Sub1_Sub27.java

@@ -235,7 +235,7 @@ public final class Class3_Sub1_Sub27 extends Class3_Sub1 {
 
 	@OriginalMember(owner = "client!pi", name = "a", descriptor = "(ILclient!wa;Z)V")
 	@Override
-	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1) {
+	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 		if (arg0 == 0) {
 			this.anInt4543 = arg1.method2229();
 		} else if (arg0 == 1) {

client/src/main/java/Class3_Sub1_Sub28.java

@@ -25,7 +25,7 @@ public final class Class3_Sub1_Sub28 extends Class3_Sub1 {
 
 	@OriginalMember(owner = "client!pk", name = "a", descriptor = "(ILclient!wa;Z)V")
 	@Override
-	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1) {
+	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 		if (arg0 == 0) {
 			this.anInt4580 = arg1.method2163();
 		} else if (arg0 == 1) {

client/src/main/java/Class3_Sub1_Sub3.java

@@ -19,7 +19,7 @@ public final class Class3_Sub1_Sub3 extends Class3_Sub1 {
 
 	@OriginalMember(owner = "client!an", name = "a", descriptor = "(ILclient!wa;Z)V")
 	@Override
-	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1) {
+	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 		if (arg0 == 0) {
 			this.anInt316 = arg1.method2163();
 		} else if (arg0 == 1) {

client/src/main/java/Class3_Sub1_Sub32.java

@@ -57,7 +57,7 @@ public final class Class3_Sub1_Sub32 extends Class3_Sub1 {
 
 	@OriginalMember(owner = "client!sa", name = "a", descriptor = "(ILclient!wa;Z)V")
 	@Override
-	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1) {
+	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 		if (arg0 == 0) {
 			this.anInt4971 = arg1.method2163();
 		}

client/src/main/java/Class3_Sub1_Sub33.java

@@ -51,7 +51,7 @@ public final class Class3_Sub1_Sub33 extends Class3_Sub1 {
 
 	@OriginalMember(owner = "client!si", name = "a", descriptor = "(ILclient!wa;Z)V")
 	@Override
-	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1) {
+	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 		if (arg0 == 0) {
 			this.aClass18Array1 = new Class18[arg1.method2229()];
 			for (@Pc(11) int local11 = 0; local11 < this.aClass18Array1.length; local11++) {

client/src/main/java/Class3_Sub1_Sub34.java

@@ -28,7 +28,7 @@ public final class Class3_Sub1_Sub34 extends Class3_Sub1 {
 
 	@OriginalMember(owner = "client!sk", name = "a", descriptor = "(ILclient!wa;Z)V")
 	@Override
-	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1) {
+	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 		if (arg0 == 0) {
 			this.anInt5195 = arg1.method2163();
 		} else if (arg0 == 1) {

client/src/main/java/Class3_Sub1_Sub35.java

@@ -26,7 +26,7 @@ public final class Class3_Sub1_Sub35 extends Class3_Sub1 {
 
 	@OriginalMember(owner = "client!tb", name = "a", descriptor = "(ILclient!wa;Z)V")
 	@Override
-	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1) {
+	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 		if (arg0 == 0) {
 			this.aBoolean309 = arg1.method2229() == 1;
 		}

client/src/main/java/Class3_Sub1_Sub36.java

@@ -74,7 +74,7 @@ public final class Class3_Sub1_Sub36 extends Class3_Sub1 {
 
 	@OriginalMember(owner = "client!ui", name = "a", descriptor = "(ILclient!wa;Z)V")
 	@Override
-	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1) {
+	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 		if (arg0 == 0) {
 			this.anInt5539 = arg1.method2163();
 		}

client/src/main/java/Class3_Sub1_Sub37.java

@@ -222,7 +222,7 @@ public final class Class3_Sub1_Sub37 extends Class3_Sub1 {
 
 	@OriginalMember(owner = "client!um", name = "a", descriptor = "(ILclient!wa;Z)V")
 	@Override
-	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1) {
+	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 		if (arg0 != 0) {
 			return;
 		}

client/src/main/java/Class3_Sub1_Sub38.java

@@ -35,7 +35,7 @@ public final class Class3_Sub1_Sub38 extends Class3_Sub1 {
 
 	@OriginalMember(owner = "client!vc", name = "a", descriptor = "(ILclient!wa;Z)V")
 	@Override
-	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1) {
+	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 		if (arg0 == 0) {
 			this.anInt5716 = arg1.method2229();
 		} else if (arg0 == 1) {

client/src/main/java/Class3_Sub1_Sub39.java

@@ -153,7 +153,7 @@ public final class Class3_Sub1_Sub39 extends Class3_Sub1 {
 
 	@OriginalMember(owner = "client!wi", name = "a", descriptor = "(ILclient!wa;Z)V")
 	@Override
-	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1) {
+	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 		if (arg0 != 0) {
 			return;
 		}

client/src/main/java/Class3_Sub1_Sub4.java

@@ -156,7 +156,7 @@ public final class Class3_Sub1_Sub4 extends Class3_Sub1 {
 
 	@OriginalMember(owner = "client!bi", name = "a", descriptor = "(ILclient!wa;Z)V")
 	@Override
-	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1) {
+	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 		if (arg0 == 0) {
 			this.aBoolean44 = arg1.method2229() == 1;
 		} else if (arg0 == 1) {

client/src/main/java/Class3_Sub1_Sub5.java

@@ -51,7 +51,7 @@ public final class Class3_Sub1_Sub5 extends Class3_Sub1 {
 
 	@OriginalMember(owner = "client!bl", name = "a", descriptor = "(ILclient!wa;Z)V")
 	@Override
-	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1) {
+	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 		if (arg0 == 0) {
 			this.aBoolean309 = arg1.method2229() == 1;
 		}

client/src/main/java/Class3_Sub1_Sub6.java

@@ -33,7 +33,7 @@ public final class Class3_Sub1_Sub6 extends Class3_Sub1 {
 
 	@OriginalMember(owner = "client!ca", name = "a", descriptor = "(ILclient!wa;Z)V")
 	@Override
-	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1) {
+	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 		if (arg0 == 0) {
 			this.anInt857 = arg1.method2163();
 		} else if (arg0 == 1) {

client/src/main/java/Class3_Sub1_Sub7.java

@@ -50,7 +50,7 @@ public final class Class3_Sub1_Sub7 extends Class3_Sub1 {
 
 	@OriginalMember(owner = "client!d", name = "a", descriptor = "(ILclient!wa;Z)V")
 	@Override
-	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1) {
+	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 		if (arg0 == 0) {
 			this.anInt1233 = arg1.method2229();
 		} else if (arg0 == 1) {

client/src/main/java/Class3_Sub1_Sub8.java

@@ -19,7 +19,7 @@ public final class Class3_Sub1_Sub8 extends Class3_Sub1 {
 
 	@OriginalMember(owner = "client!ej", name = "a", descriptor = "(ILclient!wa;Z)V")
 	@Override
-	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1) {
+	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 		if (arg0 == 0) {
 			this.aBoolean104 = arg1.method2229() == 1;
 		} else if (arg0 == 1) {

client/src/main/java/Class3_Sub1_Sub9.java

@@ -22,7 +22,7 @@ public final class Class3_Sub1_Sub9 extends Class3_Sub1 {
 
 	@OriginalMember(owner = "client!f", name = "a", descriptor = "(ILclient!wa;Z)V")
 	@Override
-	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1) {
+	public final void method4629(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 		if (arg0 == 0) {
 			this.anInt1934 = arg1.method2229();
 		} else if (arg0 == 1) {

client/src/main/java/Class3_Sub20.java

@@ -27,7 +27,7 @@ public final class Class3_Sub20 extends Class3 {
 	@OriginalMember(owner = "client!jm", name = "<init>", descriptor = "(I[B)V")
 	public Class3_Sub20(@OriginalArg(0) int arg0, @OriginalArg(1) byte[] arg1) {
 		this.anInt3113 = arg0;
-		@Pc(9) Class3_Sub15 local9 = new Class3_Sub15(arg1);
+		@Pc(9) Buffer local9 = new Buffer(arg1);
 		this.anInt3116 = local9.method2229();
 		this.anIntArrayArray23 = new int[this.anInt3116][];
 		this.anIntArray291 = new int[this.anInt3116];

client/src/main/java/Class3_Sub29.java

@@ -13,7 +13,7 @@ public final class Class3_Sub29 extends Class3 {
 	public final byte[] aByteArray65;
 
 	@OriginalMember(owner = "client!rf", name = "<init>", descriptor = "(Lclient!wa;)V")
-	public Class3_Sub29(@OriginalArg(0) Class3_Sub15 arg0) {
+	public Class3_Sub29(@OriginalArg(0) Buffer arg0) {
 		arg0.anInt2792 = arg0.aByteArray40.length - 3;
 		@Pc(12) int local12 = arg0.method2229();
 		@Pc(16) int local16 = arg0.method2163();
@@ -160,7 +160,7 @@ public final class Class3_Sub29 extends Class3 {
 		@Pc(482) int local482 = arg0.anInt2792;
 		arg0.anInt2792 += local27 * 3;
 		this.aByteArray65 = new byte[local22];
-		@Pc(500) Class3_Sub15 local500 = new Class3_Sub15(this.aByteArray65);
+		@Pc(500) Buffer local500 = new Buffer(this.aByteArray65);
 		local500.method2164(1297377380);
 		local500.method2164(6);
 		local500.method2230(local12 > 1 ? 1 : 0);

client/src/main/java/Class3_Sub2_Sub12.java

@@ -16,7 +16,7 @@ public final class Class3_Sub2_Sub12 extends Class3_Sub2 {
 	public Class100 aClass100_544;
 
 	@OriginalMember(owner = "client!hn", name = "a", descriptor = "(ILclient!wa;I)V")
-	private void method2072(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1) {
+	private void method2072(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 		if (arg0 == 1) {
 			this.anInt2669 = arg1.method2229();
 		} else if (arg0 == 2) {
@@ -27,7 +27,7 @@ public final class Class3_Sub2_Sub12 extends Class3_Sub2 {
 	}
 
 	@OriginalMember(owner = "client!hn", name = "a", descriptor = "(ILclient!wa;)V")
-	public final void method2076(@OriginalArg(1) Class3_Sub15 arg0) {
+	public final void method2076(@OriginalArg(1) Buffer arg0) {
 		while (true) {
 			@Pc(13) int local13 = arg0.method2229();
 			if (local13 == 0) {

client/src/main/java/Class3_Sub2_Sub13.java

@@ -20,7 +20,7 @@ public final class Class3_Sub2_Sub13 extends Class3_Sub2 {
 	}
 
 	@OriginalMember(owner = "client!lk", name = "a", descriptor = "(Lclient!wa;IB)V")
-	private void method2799(@OriginalArg(0) Class3_Sub15 arg0, @OriginalArg(1) int arg1) {
+	private void method2799(@OriginalArg(0) Buffer arg0, @OriginalArg(1) int arg1) {
 		if (arg1 != 249) {
 			return;
 		}
@@ -54,7 +54,7 @@ public final class Class3_Sub2_Sub13 extends Class3_Sub2 {
 	}
 
 	@OriginalMember(owner = "client!lk", name = "a", descriptor = "(ILclient!wa;)V")
-	public final void method2806(@OriginalArg(1) Class3_Sub15 arg0) {
+	public final void method2806(@OriginalArg(1) Buffer arg0) {
 		while (true) {
 			@Pc(5) int local5 = arg0.method2229();
 			if (local5 == 0) {

client/src/main/java/Class3_Sub2_Sub14.java

@@ -10,7 +10,7 @@ public final class Class3_Sub2_Sub14 extends Class3_Sub2 {
 	public int anInt3706 = 0;
 
 	@OriginalMember(owner = "client!md", name = "a", descriptor = "(Lclient!wa;I)V")
-	public final void method2927(@OriginalArg(0) Class3_Sub15 arg0) {
+	public final void method2927(@OriginalArg(0) Buffer arg0) {
 		while (true) {
 			@Pc(10) int local10 = arg0.method2229();
 			if (local10 == 0) {
@@ -21,7 +21,7 @@ public final class Class3_Sub2_Sub14 extends Class3_Sub2 {
 	}
 
 	@OriginalMember(owner = "client!md", name = "a", descriptor = "(Lclient!wa;IZ)V")
-	private void method2931(@OriginalArg(0) Class3_Sub15 arg0, @OriginalArg(1) int arg1) {
+	private void method2931(@OriginalArg(0) Buffer arg0, @OriginalArg(1) int arg1) {
 		if (arg1 == 2) {
 			this.anInt3706 = arg0.method2163();
 		}

client/src/main/java/Class3_Sub2_Sub15.java

@@ -25,7 +25,7 @@ public final class Class3_Sub2_Sub15 extends Class3_Sub2 {
 	private Class100 aClass100_766 = Static87.aClass100_494;
 
 	@OriginalMember(owner = "client!ml", name = "a", descriptor = "(ILclient!wa;B)V")
-	private void method3084(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1) {
+	private void method3084(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1) {
 		if (arg0 == 1) {
 			this.anInt3957 = arg1.method2229();
 		} else if (arg0 == 2) {
@@ -117,7 +117,7 @@ public final class Class3_Sub2_Sub15 extends Class3_Sub2 {
 	}
 
 	@OriginalMember(owner = "client!ml", name = "a", descriptor = "(Lclient!wa;I)V")
-	public final void method3094(@OriginalArg(0) Class3_Sub15 arg0) {
+	public final void method3094(@OriginalArg(0) Buffer arg0) {
 		while (true) {
 			@Pc(9) int local9 = arg0.method2229();
 			if (local9 == 0) {

client/src/main/java/Class3_Sub2_Sub2.java

@@ -50,7 +50,7 @@ public final class Class3_Sub2_Sub2 extends Class3_Sub2 {
 	}
 
 	@OriginalMember(owner = "client!bc", name = "a", descriptor = "(Lclient!wa;II)V")
-	private void method467(@OriginalArg(0) Class3_Sub15 arg0, @OriginalArg(2) int arg1) {
+	private void method467(@OriginalArg(0) Buffer arg0, @OriginalArg(2) int arg1) {
 		if (arg1 == 1) {
 			this.aClass100_79 = arg0.method2202();
 			return;
@@ -91,7 +91,7 @@ public final class Class3_Sub2_Sub2 extends Class3_Sub2 {
 	}
 
 	@OriginalMember(owner = "client!bc", name = "a", descriptor = "(Lclient!wa;B)V")
-	public final void method470(@OriginalArg(0) Class3_Sub15 arg0) {
+	public final void method470(@OriginalArg(0) Buffer arg0) {
 		while (true) {
 			@Pc(12) int local12 = arg0.method2229();
 			if (local12 == 0) {

client/src/main/java/Class3_Sub2_Sub20.java

@@ -55,7 +55,7 @@ public final class Class3_Sub2_Sub20 extends Class3_Sub2 {
 	private final int anInt5489;
 
 	@OriginalMember(owner = "client!uh", name = "<init>", descriptor = "(Lclient!wa;)V")
-	public Class3_Sub2_Sub20(@OriginalArg(0) Class3_Sub15 arg0) {
+	public Class3_Sub2_Sub20(@OriginalArg(0) Buffer arg0) {
 		this.aClass88_1 = new Class88(arg0);
 		this.aBoolean286 = arg0.method2229() == 1;
 		this.aBoolean288 = arg0.method2229() == 1;

client/src/main/java/Class3_Sub2_Sub5_Sub2.java

@@ -11,7 +11,7 @@ public final class Class3_Sub2_Sub5_Sub2 extends Class3_Sub2_Sub5 {
 	public int anInt4617;
 
 	@OriginalMember(owner = "client!pm", name = "bb", descriptor = "Lclient!wa;")
-	public Class3_Sub15 aClass3_Sub15_7;
+	public Buffer aClass3_Sub15_7;
 
 	@OriginalMember(owner = "client!pm", name = "a", descriptor = "(Z)I")
 	@Override

client/src/main/java/Class3_Sub2_Sub6.java

@@ -22,7 +22,7 @@ public final class Class3_Sub2_Sub6 extends Class3_Sub2 {
 	public boolean aBoolean60 = true;
 
 	@OriginalMember(owner = "client!cb", name = "a", descriptor = "(Lclient!wa;[IZ)V")
-	public final void method760(@OriginalArg(0) Class3_Sub15 arg0, @OriginalArg(1) int[] arg1) {
+	public final void method760(@OriginalArg(0) Buffer arg0, @OriginalArg(1) int[] arg1) {
 		if (this.anIntArray71 == null) {
 			return;
 		}
@@ -35,7 +35,7 @@ public final class Class3_Sub2_Sub6 extends Class3_Sub2 {
 	}
 
 	@OriginalMember(owner = "client!cb", name = "a", descriptor = "(Lclient!wa;I)V")
-	public final void method761(@OriginalArg(0) Class3_Sub15 arg0) {
+	public final void method761(@OriginalArg(0) Buffer arg0) {
 		while (true) {
 			@Pc(9) int local9 = arg0.method2229();
 			if (local9 == 0) {
@@ -76,7 +76,7 @@ public final class Class3_Sub2_Sub6 extends Class3_Sub2 {
 	}
 
 	@OriginalMember(owner = "client!cb", name = "a", descriptor = "(Lclient!wa;II)V")
-	private void method768(@OriginalArg(0) Class3_Sub15 arg0, @OriginalArg(1) int arg1) {
+	private void method768(@OriginalArg(0) Buffer arg0, @OriginalArg(1) int arg1) {
 		if (arg1 == 1) {
 			this.aClass100Array35 = arg0.method2202().method3147(60);
 			return;
@@ -121,7 +121,7 @@ public final class Class3_Sub2_Sub6 extends Class3_Sub2 {
 	}
 
 	@OriginalMember(owner = "client!cb", name = "a", descriptor = "(ILclient!wa;)Lclient!na;")
-	public final Class100 method770(@OriginalArg(1) Class3_Sub15 arg0) {
+	public final Class100 method770(@OriginalArg(1) Buffer arg0) {
 		@Pc(17) Class100 local17 = Static87.method1804(80);
 		if (this.anIntArray71 != null) {
 			for (@Pc(22) int local22 = 0; local22 < this.anIntArray71.length; local22++) {

client/src/main/java/Class42.java

@@ -74,7 +74,7 @@ public final class Class42 {
 	}
 
 	@OriginalMember(owner = "client!ff", name = "a", descriptor = "(Lclient!wa;)V")
-	public final void method1514(@OriginalArg(0) Class3_Sub15 arg0) {
+	public final void method1514(@OriginalArg(0) Buffer arg0) {
 		this.anInt1957 = arg0.method2229();
 		this.anIntArray157 = new int[this.anInt1957];
 		this.anIntArray156 = new int[this.anInt1957];
@@ -85,7 +85,7 @@ public final class Class42 {
 	}
 
 	@OriginalMember(owner = "client!ff", name = "b", descriptor = "(Lclient!wa;)V")
-	public final void method1515(@OriginalArg(0) Class3_Sub15 arg0) {
+	public final void method1515(@OriginalArg(0) Buffer arg0) {
 		this.anInt1958 = arg0.method2229();
 		this.anInt1959 = arg0.method2174();
 		this.anInt1960 = arg0.method2174();

client/src/main/java/Class45.java

@@ -112,8 +112,8 @@ public final class Class45 {
 
 	@OriginalMember(owner = "client!fj", name = "a", descriptor = "()V")
 	public final void method1554() {
-		@Pc(7) Class3_Sub15 local7 = new Class3_Sub15(this.anInt2018 * 4);
+		@Pc(7) Buffer local7 = new Buffer(this.anInt2018 * 4);
-		@Pc(15) Class3_Sub15 local15 = new Class3_Sub15(this.anInt2017 * 16);
+		@Pc(15) Buffer local15 = new Buffer(this.anInt2017 * 16);
 		@Pc(19) int local19;
 		if (Static239.aBoolean263) {
 			for (local19 = 0; local19 < this.anInt2017; local19++) {

client/src/main/java/Class47_Sub1.java

@@ -6,7 +6,7 @@ public final class Class47_Sub1 extends Class47 {
 
 	static {
 		new Class132(8);
-		new Class3_Sub15(131056);
+		new Buffer(131056);
 	}
 
 	@OriginalMember(owner = "client!ga", name = "d", descriptor = "()V")

client/src/main/java/Class51.java

@@ -67,7 +67,7 @@ public final class Class51 {
 	public final float[] aFloatArray3 = new float[4];
 
 	@OriginalMember(owner = "client!gi", name = "<init>", descriptor = "(Lclient!wa;)V")
-	public Class51(@OriginalArg(0) Class3_Sub15 arg0) {
+	public Class51(@OriginalArg(0) Buffer arg0) {
 		if (Static62.anIntArray150 == null) {
 			Static84.method1771();
 		}

client/src/main/java/Class55.java

@@ -354,7 +354,7 @@ public final class Class55 {
 	}
 
 	@OriginalMember(owner = "client!h", name = "a", descriptor = "(ILclient!wa;)V")
-	public final void method1827(@OriginalArg(1) Class3_Sub15 arg0) {
+	public final void method1827(@OriginalArg(1) Buffer arg0) {
 		while (true) {
 			@Pc(5) int local5 = arg0.method2229();
 			if (local5 == 0) {
@@ -365,7 +365,7 @@ public final class Class55 {
 	}
 
 	@OriginalMember(owner = "client!h", name = "a", descriptor = "(BLclient!wa;I)V")
-	private void method1828(@OriginalArg(1) Class3_Sub15 arg0, @OriginalArg(2) int arg1) {
+	private void method1828(@OriginalArg(1) Buffer arg0, @OriginalArg(2) int arg1) {
 		if (arg1 == 1) {
 			this.anInt2320 = arg0.method2163();
 		} else if (arg1 == 2) {

client/src/main/java/Class56.java

@@ -20,7 +20,7 @@ public final class Class56 {
 	}
 
 	@OriginalMember(owner = "client!ha", name = "a", descriptor = "([BLclient!wa;Z)V")
-	public final void method1842(@OriginalArg(0) byte[] arg0, @OriginalArg(1) Class3_Sub15 arg1) {
+	public final void method1842(@OriginalArg(0) byte[] arg0, @OriginalArg(1) Buffer arg1) {
 		if (arg1.aByteArray40[arg1.anInt2792] != 31 || arg1.aByteArray40[arg1.anInt2792 + 1] != -117) {
 			throw new RuntimeException("Invalid GZIP header!");
 		}

client/src/main/java/Class63.java

@@ -29,7 +29,7 @@ public final class Class63 {
 	}
 
 	@OriginalMember(owner = "client!ia", name = "a", descriptor = "(Lclient!wa;IB)V")
-	public final void method2249(@OriginalArg(0) Class3_Sub15 arg0, @OriginalArg(1) int arg1) {
+	public final void method2249(@OriginalArg(0) Buffer arg0, @OriginalArg(1) int arg1) {
 		while (true) {
 			@Pc(18) int local18 = arg0.method2229();
 			if (local18 == 0) {
@@ -40,7 +40,7 @@ public final class Class63 {
 	}
 
 	@OriginalMember(owner = "client!ia", name = "a", descriptor = "(IIILclient!wa;)V")
-	private void method2250(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Class3_Sub15 arg2) {
+	private void method2250(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Buffer arg2) {
 		if (arg1 == 1) {
 			this.anInt2857 = arg2.method2163();
 		} else if (arg1 == 2) {

client/src/main/java/Class65.java

@@ -19,7 +19,7 @@ public final class Class65 {
 	public int anInt2873 = 2048;
 
 	@OriginalMember(owner = "client!ic", name = "a", descriptor = "(ILclient!wa;I)V")
-	public final void method2257(@OriginalArg(1) Class3_Sub15 arg0, @OriginalArg(2) int arg1) {
+	public final void method2257(@OriginalArg(1) Buffer arg0, @OriginalArg(2) int arg1) {
 		while (true) {
 			@Pc(5) int local5 = arg0.method2229();
 			if (local5 == 0) {
@@ -30,7 +30,7 @@ public final class Class65 {
 	}
 
 	@OriginalMember(owner = "client!ic", name = "a", descriptor = "(ILclient!wa;IZ)V")
-	private void method2258(@OriginalArg(0) int arg0, @OriginalArg(1) Class3_Sub15 arg1, @OriginalArg(2) int arg2) {
+	private void method2258(@OriginalArg(0) int arg0, @OriginalArg(1) Buffer arg1, @OriginalArg(2) int arg2) {
 		if (arg0 == 1) {
 			this.anInt2865 = arg1.method2229();
 		} else if (arg0 == 2) {

client/src/main/java/Class70.java

@@ -59,7 +59,7 @@ public final class Class70 {
 
 	@OriginalMember(owner = "client!ii", name = "a", descriptor = "(I[B)V")
 	private void method2293(@OriginalArg(1) byte[] arg0) {
-		@Pc(12) Class3_Sub15 local12 = new Class3_Sub15(Static162.method3092(arg0));
+		@Pc(12) Buffer local12 = new Buffer(Static162.method3092(arg0));
 		@Pc(16) int local16 = local12.method2229();
 		if (local16 != 5 && local16 != 6) {
 			throw new RuntimeException();

client/src/main/java/Class73.java

@@ -32,7 +32,7 @@ public final class Class73 {
 	private final Class16 aClass16_5 = new Class16();
 
 	@OriginalMember(owner = "client!jb", name = "E", descriptor = "Lclient!wa;")
-	private final Class3_Sub15 aClass3_Sub15_4 = new Class3_Sub15(4);
+	private final Buffer aClass3_Sub15_4 = new Buffer(4);
 
 	@OriginalMember(owner = "client!jb", name = "G", descriptor = "B")
 	private byte aByte8 = 0;
@@ -44,7 +44,7 @@ public final class Class73 {
 	public volatile int anInt2963 = 0;
 
 	@OriginalMember(owner = "client!jb", name = "F", descriptor = "Lclient!wa;")
-	private final Class3_Sub15 aClass3_Sub15_5 = new Class3_Sub15(8);
+	private final Buffer aClass3_Sub15_5 = new Buffer(8);
 
 	@OriginalMember(owner = "client!jb", name = "a", descriptor = "(I)Z")
 	public final boolean method2316() {
@@ -167,7 +167,7 @@ public final class Class73 {
 							}
 							@Pc(568) int local568 = local480 == 0 ? 5 : 9;
 							this.aClass3_Sub2_Sub5_Sub2_2 = local509;
-							this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7 = new Class3_Sub15(local476 + local568 + this.aClass3_Sub2_Sub5_Sub2_2.aByte16);
+							this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7 = new Buffer(local476 + local568 + this.aClass3_Sub2_Sub5_Sub2_2.aByte16);
 							this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7.method2178(local480);
 							this.aClass3_Sub2_Sub5_Sub2_2.aClass3_Sub15_7.method2164(local476);
 							this.aClass3_Sub2_Sub5_Sub2_2.anInt4617 = 8;

client/src/main/java/Class84.java

@@ -28,7 +28,7 @@ public final class Class84 {
 	private int anInt3304;
 
 	@OriginalMember(owner = "client!ki", name = "a", descriptor = "Lclient!wa;")
-	private final Class3_Sub15 aClass3_Sub15_6 = new Class3_Sub15(null);
+	private final Buffer aClass3_Sub15_6 = new Buffer(null);
 
 	@OriginalMember(owner = "client!ki", name = "<init>", descriptor = "()V")
 	public Class84() {

client/src/main/java/Class85.java

@@ -16,7 +16,7 @@ public final class Class85 {
 	public int anInt3327;
 
 	@OriginalMember(owner = "client!kk", name = "a", descriptor = "(Lclient!wa;I)V")
-	public final void method2651(@OriginalArg(0) Class3_Sub15 arg0) {
+	public final void method2651(@OriginalArg(0) Buffer arg0) {
 		while (true) {
 			@Pc(9) int local9 = arg0.method2229();
 			if (local9 == 0) {
@@ -27,7 +27,7 @@ public final class Class85 {
 	}
 
 	@OriginalMember(owner = "client!kk", name = "a", descriptor = "(Lclient!wa;II)V")
-	private void method2653(@OriginalArg(0) Class3_Sub15 arg0, @OriginalArg(2) int arg1) {
+	private void method2653(@OriginalArg(0) Buffer arg0, @OriginalArg(2) int arg1) {
 		if (arg1 == 1) {
 			this.anInt3327 = arg0.method2163();
 			this.anInt3318 = arg0.method2229();

client/src/main/java/Class88.java

@@ -22,7 +22,7 @@ public final class Class88 {
 	private final Class3_Sub1[] aClass3_Sub1Array22;
 
 	@OriginalMember(owner = "client!lc", name = "<init>", descriptor = "(Lclient!wa;)V")
-	public Class88(@OriginalArg(0) Class3_Sub15 arg0) {
+	public Class88(@OriginalArg(0) Buffer arg0) {
 		@Pc(7) int local7 = arg0.method2229();
 		this.aClass3_Sub1Array22 = new Class3_Sub1[local7];
 		@Pc(14) int[][] local14 = new int[local7][];

client/src/main/java/Class8_Sub1_Sub1.java

@@ -1673,7 +1673,7 @@ public final class Class8_Sub1_Sub1 extends Class8_Sub1 {
 	@OriginalMember(owner = "client!td", name = "q", descriptor = "()V")
 	private void method4103() {
 		if (Static237.aClass3_Sub15_8.aByteArray40.length < this.anInt5296 * 12) {
-			Static237.aClass3_Sub15_8 = new Class3_Sub15((this.anInt5296 + 100) * 12);
+			Static237.aClass3_Sub15_8 = new Buffer((this.anInt5296 + 100) * 12);
 		} else {
 			Static237.aClass3_Sub15_8.anInt2792 = 0;
 		}
@@ -2022,7 +2022,7 @@ public final class Class8_Sub1_Sub1 extends Class8_Sub1 {
 			return;
 		}
 		if (Static237.aClass3_Sub15_8.aByteArray40.length < this.anInt5296 * local1) {
-			Static237.aClass3_Sub15_8 = new Class3_Sub15((this.anInt5296 + 100) * local1);
+			Static237.aClass3_Sub15_8 = new Buffer((this.anInt5296 + 100) * local1);
 		} else {
 			Static237.aClass3_Sub15_8.anInt2792 = 0;
 		}

client/src/main/java/Class8_Sub4_Sub1.java

@@ -67,7 +67,7 @@ public final class Class8_Sub4_Sub1 extends Class8_Sub4 {
 	}
 
 	@OriginalMember(owner = "client!e", name = "a", descriptor = "(ILclient!wa;)V")
-	public final void method1262(@OriginalArg(1) Class3_Sub15 arg0) {
+	public final void method1262(@OriginalArg(1) Buffer arg0) {
 		arg0.anInt2792 = 0;
 		@Pc(20) int local20 = arg0.method2229();
 		@Pc(22) int local22 = -1;

client/src/main/java/Class8_Sub5.java

@@ -827,13 +827,13 @@ public final class Class8_Sub5 extends Class8 {
 
 	@OriginalMember(owner = "client!gb", name = "a", descriptor = "([B)V")
 	private void method1674(@OriginalArg(0) byte[] arg0) {
-		@Pc(4) Class3_Sub15 local4 = new Class3_Sub15(arg0);
+		@Pc(4) Buffer local4 = new Buffer(arg0);
-		@Pc(9) Class3_Sub15 local9 = new Class3_Sub15(arg0);
+		@Pc(9) Buffer local9 = new Buffer(arg0);
-		@Pc(14) Class3_Sub15 local14 = new Class3_Sub15(arg0);
+		@Pc(14) Buffer local14 = new Buffer(arg0);
-		@Pc(19) Class3_Sub15 local19 = new Class3_Sub15(arg0);
+		@Pc(19) Buffer local19 = new Buffer(arg0);
-		@Pc(24) Class3_Sub15 local24 = new Class3_Sub15(arg0);
+		@Pc(24) Buffer local24 = new Buffer(arg0);
-		@Pc(29) Class3_Sub15 local29 = new Class3_Sub15(arg0);
+		@Pc(29) Buffer local29 = new Buffer(arg0);
-		@Pc(34) Class3_Sub15 local34 = new Class3_Sub15(arg0);
+		@Pc(34) Buffer local34 = new Buffer(arg0);
 		local4.anInt2792 = arg0.length - 23;
 		@Pc(44) int local44 = local4.method2163();
 		@Pc(48) int local48 = local4.method2163();
@@ -1461,11 +1461,11 @@ public final class Class8_Sub5 extends Class8 {
 	private void method1688(@OriginalArg(0) byte[] arg0) {
 		@Pc(1) boolean local1 = false;
 		@Pc(3) boolean local3 = false;
-		@Pc(8) Class3_Sub15 local8 = new Class3_Sub15(arg0);
+		@Pc(8) Buffer local8 = new Buffer(arg0);
-		@Pc(13) Class3_Sub15 local13 = new Class3_Sub15(arg0);
+		@Pc(13) Buffer local13 = new Buffer(arg0);
-		@Pc(18) Class3_Sub15 local18 = new Class3_Sub15(arg0);
+		@Pc(18) Buffer local18 = new Buffer(arg0);
-		@Pc(23) Class3_Sub15 local23 = new Class3_Sub15(arg0);
+		@Pc(23) Buffer local23 = new Buffer(arg0);
-		@Pc(28) Class3_Sub15 local28 = new Class3_Sub15(arg0);
+		@Pc(28) Buffer local28 = new Buffer(arg0);
 		local8.anInt2792 = arg0.length - 18;
 		@Pc(38) int local38 = local8.method2163();
 		@Pc(42) int local42 = local8.method2163();

client/src/main/java/Class9.java

@@ -7,7 +7,7 @@ import org.openrs2.deob.annotation.Pc;
 public final class Class9 {
 
 	@OriginalMember(owner = "client!al", name = "a", descriptor = "Lclient!wa;")
-	private Class3_Sub15 aClass3_Sub15_1;
+	private Buffer aClass3_Sub15_1;
 
 	@OriginalMember(owner = "client!al", name = "s", descriptor = "[Lclient!bg;")
 	private Class14_Sub1[] aClass14_Sub1Array1;
@@ -44,7 +44,7 @@ public final class Class9 {
 		if (this.aClass3_Sub2_Sub5_Sub2_1.aBoolean226) {
 			return false;
 		} else {
-			this.aClass3_Sub15_1 = new Class3_Sub15(this.aClass3_Sub2_Sub5_Sub2_1.method3554());
+			this.aClass3_Sub15_1 = new Buffer(this.aClass3_Sub2_Sub5_Sub2_1.method3554());
 			this.aClass14_Sub1Array1 = new Class14_Sub1[(this.aClass3_Sub15_1.aByteArray40.length - 5) / 8];
 			return true;
 		}

client/src/main/java/Class92.java

@@ -47,7 +47,7 @@ public final class Class92 {
 	}
 
 	@OriginalMember(owner = "client!li", name = "<init>", descriptor = "(Lclient!wa;)V")
-	public Class92(@OriginalArg(0) Class3_Sub15 arg0) {
+	public Class92(@OriginalArg(0) Buffer arg0) {
 		@Pc(7) int local7 = arg0.method2229();
 		if ((local7 & 0x1) == 0) {
 			this.anInt3526 = Static161.anInt3923;

client/src/main/java/Class96.java

@@ -485,7 +485,7 @@ public final class Class96 {
 	}
 
 	@OriginalMember(owner = "client!me", name = "a", descriptor = "(Lclient!wa;I)V")
-	public final void method2939(@OriginalArg(0) Class3_Sub15 arg0) {
+	public final void method2939(@OriginalArg(0) Buffer arg0) {
 		while (true) {
 			@Pc(9) int local9 = arg0.method2229();
 			if (local9 == 0) {
@@ -554,7 +554,7 @@ public final class Class96 {
 	}
 
 	@OriginalMember(owner = "client!me", name = "a", descriptor = "(IILclient!wa;)V")
-	private void method2944(@OriginalArg(1) int arg0, @OriginalArg(2) Class3_Sub15 arg1) {
+	private void method2944(@OriginalArg(1) int arg0, @OriginalArg(2) Buffer arg1) {
 		@Pc(12) int local12;
 		@Pc(18) int local18;
 		if (arg0 == 1) {

client/src/main/java/Static110.java

@@ -28,7 +28,7 @@ public final class Static110 {
 		@Pc(30) byte[] local30 = Static39.aClass153_23.method4495(11, arg0);
 		local6 = new Class3_Sub2_Sub12();
 		if (local30 != null) {
-			local6.method2076(new Class3_Sub15(local30));
+			local6.method2076(new Buffer(local30));
 		}
 		Static272.aClass54_14.method1811(local6, (long) arg0);
 		return local6;

client/src/main/java/Static115.java

@@ -23,7 +23,7 @@ public final class Static115 {
 	public static final Class100 aClass100_579 = Static28.method790("Fps:");
 
 	@OriginalMember(owner = "client!ja", name = "l", descriptor = "[Lclient!wa;")
-	public static final Class3_Sub15[] aClass3_Sub15Array1 = new Class3_Sub15[2048];
+	public static final Buffer[] aClass3_Sub15Array1 = new Buffer[2048];
 
 	@OriginalMember(owner = "client!ja", name = "n", descriptor = "I")
 	public static int anInt2939 = 0;

client/src/main/java/Static123.java

@@ -28,7 +28,7 @@ public final class Static123 {
 		@Pc(26) byte[] local26 = Static23.aClass153_11.method4495(26, arg0);
 		local10 = new Class3_Sub2_Sub13();
 		if (local26 != null) {
-			local10.method2806(new Class3_Sub15(local26));
+			local10.method2806(new Buffer(local26));
 		}
 		Static231.aClass54_13.method1811(local10, (long) arg0);
 		return local10;

client/src/main/java/Static124.java

@@ -45,7 +45,7 @@ public final class Static124 {
 
 	@OriginalMember(owner = "client!jk", name = "a", descriptor = "(IZ[BII[Lclient!mj;)V")
 	public static void method2437(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) byte[] arg2, @OriginalArg(3) int arg3, @OriginalArg(5) Class97[] arg4) {
-		@Pc(10) Class3_Sub15 local10 = new Class3_Sub15(arg2);
+		@Pc(10) Buffer local10 = new Buffer(arg2);
 		@Pc(12) int local12 = -1;
 		while (true) {
 			@Pc(16) int local16 = local10.method2199();

client/src/main/java/Static125.java

@@ -52,7 +52,7 @@ public final class Static125 {
 		@Pc(31) byte[] local31 = Static172.aClass153_69.method4495(Static254.method4349(arg0), Static274.method3845(arg0));
 		local10 = new Class85();
 		if (local31 != null) {
-			local10.method2651(new Class3_Sub15(local31));
+			local10.method2651(new Buffer(local31));
 		}
 		aClass99_19.method3095(local10, (long) arg0);
 		return local10;

client/src/main/java/Static136.java

@@ -41,7 +41,7 @@ public final class Static136 {
 	}
 
 	@OriginalMember(owner = "client!kk", name = "b", descriptor = "(Lclient!wa;I)V")
-	public static void method2654(@OriginalArg(0) Class3_Sub15 arg0) {
+	public static void method2654(@OriginalArg(0) Buffer arg0) {
 		if (arg0.aByteArray40.length - arg0.anInt2792 < 1) {
 			return;
 		}

client/src/main/java/Static137.java

@@ -14,7 +14,7 @@ public final class Static137 {
 	public static final Class100 aClass100_637 = Static28.method790("<col=ffffff>");
 
 	@OriginalMember(owner = "client!kl", name = "a", descriptor = "(Lclient!wa;B)Lclient!kc;")
-	public static Class18_Sub2 method2664(@OriginalArg(0) Class3_Sub15 arg0) {
+	public static Class18_Sub2 method2664(@OriginalArg(0) Buffer arg0) {
 		return new Class18_Sub2(arg0.method2213(), arg0.method2213(), arg0.method2213(), arg0.method2213(), arg0.method2220(), arg0.method2220(), arg0.method2229());
 	}
 

client/src/main/java/Static140.java

@@ -19,7 +19,7 @@ public final class Static140 {
 	public static final Class100 aClass100_661 = Static28.method790("Chargement du module texte )2 ");
 
 	@OriginalMember(owner = "client!la", name = "a", descriptor = "(Lclient!wa;Z)V")
-	public static void method2705(@OriginalArg(0) Class3_Sub15 arg0) {
+	public static void method2705(@OriginalArg(0) Buffer arg0) {
 		@Pc(15) byte[] local15 = new byte[24];
 		if (Static121.aClass38_3 != null) {
 			try {
@@ -110,7 +110,7 @@ public final class Static140 {
 		@Pc(26) byte[] local26 = Static85.aClass153_36.method4495(31, arg0);
 		local10 = new Class65();
 		if (local26 != null) {
-			local10.method2257(new Class3_Sub15(local26), arg0);
+			local10.method2257(new Buffer(local26), arg0);
 		}
 		Static220.aClass99_28.method3095(local10, (long) arg0);
 		return local10;
@@ -125,7 +125,7 @@ public final class Static140 {
 		@Pc(29) int[] local29 = arg1.method4503(local10);
 		@Pc(35) Class134 local35 = new Class134(local29.length);
 		for (@Pc(37) int local37 = 0; local37 < local35.anInt5074; local37++) {
-			@Pc(56) Class3_Sub15 local56 = new Class3_Sub15(arg1.method4495(local10, local29[local37]));
+			@Pc(56) Buffer local56 = new Buffer(arg1.method4495(local10, local29[local37]));
 			local35.aClass100Array153[local37] = local56.method2202();
 			local35.aByteArray69[local37] = local56.method2186();
 			local35.aShortArray73[local37] = (short) local56.method2163();

client/src/main/java/Static146.java

@@ -23,7 +23,7 @@ public final class Static146 {
 	public static int anInt3508 = 99;
 
 	@OriginalMember(owner = "client!lg", name = "a", descriptor = "(ZLclient!wa;Lclient!na;)I")
-	public static int method2748(@OriginalArg(1) Class3_Sub15 arg0, @OriginalArg(2) Class100 arg1) {
+	public static int method2748(@OriginalArg(1) Buffer arg0, @OriginalArg(2) Class100 arg1) {
 		@Pc(6) int local6 = arg0.anInt2792;
 		@Pc(14) byte[] local14 = arg1.method3148();
 		arg0.method2194(local14.length);

client/src/main/java/Static156.java

@@ -191,7 +191,7 @@ public final class Static156 {
 	}
 
 	@OriginalMember(owner = "client!mf", name = "a", descriptor = "(BLclient!wa;)Lclient!ta;")
-	public static Class18_Sub4 method2960(@OriginalArg(1) Class3_Sub15 arg0) {
+	public static Class18_Sub4 method2960(@OriginalArg(1) Buffer arg0) {
 		return new Class18_Sub4(arg0.method2213(), arg0.method2213(), arg0.method2213(), arg0.method2213(), arg0.method2220(), arg0.method2220(), arg0.method2229());
 	}
 }