Merge remote-tracking branch 'upstream/master' into master

Nice insider info btw, be nice if you shared it, so-called "open source" client.
2021-05-28 21:39:25 +01:00
parent a0ae15df6e 04dc76bbfd
commit 38634fcad3
481 changed files with 53410 additions and 51723 deletions
--- a/runescape-client/src/main/java/ModelData.java
+++ b/runescape-client/src/main/java/ModelData.java
@@ -3,134 +3,134 @@ import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;

-@ObfuscatedName("gk")
+@ObfuscatedName("gm")
@Implements("ModelData")
 public class ModelData extends Renderable {
+	@ObfuscatedName("as")
+	static int[] field2196;
+	@ObfuscatedName("aj")
+	static int[] field2163;
 	@ObfuscatedName("am")
-	static int[] field2187;
-	@ObfuscatedName("ax")
-	static int[] field2188;
-	@ObfuscatedName("ak")
-	static int field2189;
-	@ObfuscatedName("ay")
+	static int field2198;
+	@ObfuscatedName("az")
 	@Export("ModelData_sine")
 	static int[] ModelData_sine;
-	@ObfuscatedName("ai")
+	@ObfuscatedName("av")
 	@Export("ModelData_cosine")
 	static int[] ModelData_cosine;
-	@ObfuscatedName("h")
+	@ObfuscatedName("v")
 	@Export("verticesCount")
 	int verticesCount;
-	@ObfuscatedName("c")
+	@ObfuscatedName("n")
 	@Export("verticesX")
 	int[] verticesX;
-	@ObfuscatedName("o")
+	@ObfuscatedName("f")
 	@Export("verticesY")
 	int[] verticesY;
-	@ObfuscatedName("g")
+	@ObfuscatedName("y")
 	@Export("verticesZ")
 	int[] verticesZ;
-	@ObfuscatedName("l")
+	@ObfuscatedName("p")
 	@Export("faceCount")
 	int faceCount;
-	@ObfuscatedName("z")
+	@ObfuscatedName("j")
 	@Export("indices1")
 	int[] indices1;
-	@ObfuscatedName("t")
+	@ObfuscatedName("r")
 	@Export("indices2")
 	int[] indices2;
-	@ObfuscatedName("v")
+	@ObfuscatedName("b")
 	@Export("indices3")
 	int[] indices3;
-	@ObfuscatedName("b")
+	@ObfuscatedName("d")
 	@Export("faceRenderTypes")
 	byte[] faceRenderTypes;
-	@ObfuscatedName("q")
+	@ObfuscatedName("s")
 	@Export("faceRenderPriorities")
 	byte[] faceRenderPriorities;
-	@ObfuscatedName("i")
+	@ObfuscatedName("u")
 	@Export("faceAlphas")
 	byte[] faceAlphas;
-	@ObfuscatedName("x")
+	@ObfuscatedName("l")
 	@Export("textureCoords")
 	byte[] textureCoords;
-	@ObfuscatedName("k")
+	@ObfuscatedName("o")
 	@Export("faceColors")
 	short[] faceColors;
-	@ObfuscatedName("r")
+	@ObfuscatedName("c")
 	@Export("faceTextures")
 	short[] faceTextures;
-	@ObfuscatedName("p")
+	@ObfuscatedName("e")
 	@Export("priority")
 	byte priority;
-	@ObfuscatedName("a")
+	@ObfuscatedName("g")
 	@Export("textureTriangleCount")
 	int textureTriangleCount;
-	@ObfuscatedName("e")
+	@ObfuscatedName("a")
 	@Export("textureRenderTypes")
 	byte[] textureRenderTypes;
-	@ObfuscatedName("d")
+	@ObfuscatedName("k")
 	@Export("texTriangleX")
 	short[] texTriangleX;
-	@ObfuscatedName("u")
+	@ObfuscatedName("m")
 	@Export("texTriangleY")
 	short[] texTriangleY;
-	@ObfuscatedName("m")
+	@ObfuscatedName("x")
 	@Export("texTriangleZ")
 	short[] texTriangleZ;
-	@ObfuscatedName("j")
+	@ObfuscatedName("z")
 	@Export("vertexSkins")
 	int[] vertexSkins;
-	@ObfuscatedName("f")
+	@ObfuscatedName("w")
 	@Export("faceSkins")
 	int[] faceSkins;
-	@ObfuscatedName("s")
+	@ObfuscatedName("t")
 	@Export("vertexLabels")
 	int[][] vertexLabels;
-	@ObfuscatedName("y")
+	@ObfuscatedName("h")
 	@Export("faceLabelsAlpha")
 	int[][] faceLabelsAlpha;
-	@ObfuscatedName("w")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "[Lgt;"
+		descriptor = "[Lgk;"
 	)
 	@Export("faceNormals")
 	FaceNormal[] faceNormals;
-	@ObfuscatedName("n")
+	@ObfuscatedName("i")
 	@ObfuscatedSignature(
-		descriptor = "[Lgq;"
+		descriptor = "[Lgc;"
 	)
 	@Export("vertexNormals")
 	VertexNormal[] vertexNormals;
-	@ObfuscatedName("ag")
-	@ObfuscatedSignature(
-		descriptor = "[Lgq;"
-	)
-	VertexNormal[] field2175;
 	@ObfuscatedName("ae")
+	@ObfuscatedSignature(
+		descriptor = "[Lgc;"
+	)
+	VertexNormal[] field2166;
+	@ObfuscatedName("ap")
 	@Export("ambient")
 	public short ambient;
-	@ObfuscatedName("ao")
+	@ObfuscatedName("ab")
 	@Export("contrast")
 	public short contrast;
-	@ObfuscatedName("aj")
+	@ObfuscatedName("al")
 	@Export("isBoundsCalculated")
 	boolean isBoundsCalculated;
-	@ObfuscatedName("aw")
-	int field2178;
-	@ObfuscatedName("at")
-	int field2183;
-	@ObfuscatedName("av")
-	int field2184;
-	@ObfuscatedName("al")
-	int field2159;
-	@ObfuscatedName("ap")
-	int field2162;
+	@ObfuscatedName("ad")
+	int field2191;
+	@ObfuscatedName("ai")
+	int field2192;
+	@ObfuscatedName("ar")
+	int field2195;
+	@ObfuscatedName("ag")
+	int field2174;
+	@ObfuscatedName("ax")
+	int field2199;

 	static {
-		field2187 = new int[10000]; // L: 44
-		field2188 = new int[10000]; // L: 45
-		field2189 = 0; // L: 46
+		field2196 = new int[10000]; // L: 44
+		field2163 = new int[10000]; // L: 45
+		field2198 = 0; // L: 46
 		ModelData_sine = Rasterizer3D.Rasterizer3D_sine; // L: 47
 		ModelData_cosine = Rasterizer3D.Rasterizer3D_cosine; // L: 48
 	}
@@ -143,7 +143,7 @@ public class ModelData extends Renderable {
 	} // L: 50

 	@ObfuscatedSignature(
-		descriptor = "([Lgk;I)V"
+		descriptor = "([Lgm;I)V"
 	)
 	public ModelData(ModelData[] var1, int var2) {
 		this.verticesCount = 0;
@@ -242,8 +242,8 @@ public class ModelData extends Renderable {
 					}

 					if (var4) { // L: 529
-						if (var10.faceRenderPriorities != null) {
-							this.faceRenderPriorities[this.faceCount] = var10.faceRenderPriorities[var11]; // L: 530
+						if (var10.faceRenderPriorities != null) { // L: 530
+							this.faceRenderPriorities[this.faceCount] = var10.faceRenderPriorities[var11];
 						} else {
 							this.faceRenderPriorities[this.faceCount] = var10.priority; // L: 531
 						}
@@ -274,18 +274,18 @@ public class ModelData extends Renderable {
 					}

 					this.faceColors[this.faceCount] = var10.faceColors[var11]; // L: 547
-					this.indices1[this.faceCount] = this.method3794(var10, var10.indices1[var11]); // L: 548
-					this.indices2[this.faceCount] = this.method3794(var10, var10.indices2[var11]); // L: 549
-					this.indices3[this.faceCount] = this.method3794(var10, var10.indices3[var11]); // L: 550
+					this.indices1[this.faceCount] = this.method3759(var10, var10.indices1[var11]); // L: 548
+					this.indices2[this.faceCount] = this.method3759(var10, var10.indices2[var11]); // L: 549
+					this.indices3[this.faceCount] = this.method3759(var10, var10.indices3[var11]); // L: 550
 					++this.faceCount; // L: 551
 				}

 				for (var11 = 0; var11 < var10.textureTriangleCount; ++var11) { // L: 553
 					byte var12 = this.textureRenderTypes[this.textureTriangleCount] = var10.textureRenderTypes[var11]; // L: 554
 					if (var12 == 0) { // L: 555
-						this.texTriangleX[this.textureTriangleCount] = (short)this.method3794(var10, var10.texTriangleX[var11]); // L: 556
-						this.texTriangleY[this.textureTriangleCount] = (short)this.method3794(var10, var10.texTriangleY[var11]); // L: 557
-						this.texTriangleZ[this.textureTriangleCount] = (short)this.method3794(var10, var10.texTriangleZ[var11]); // L: 558
+						this.texTriangleX[this.textureTriangleCount] = (short)this.method3759(var10, var10.texTriangleX[var11]); // L: 556
+						this.texTriangleY[this.textureTriangleCount] = (short)this.method3759(var10, var10.texTriangleY[var11]); // L: 557
+						this.texTriangleZ[this.textureTriangleCount] = (short)this.method3759(var10, var10.texTriangleZ[var11]); // L: 558
 					}

 					++this.textureTriangleCount; // L: 560
@@ -301,15 +301,15 @@ public class ModelData extends Renderable {
 		this.priority = 0;
 		this.isBoundsCalculated = false;
 		if (var1[var1.length - 1] == -1 && var1[var1.length - 2] == -1) { // L: 59
-			this.method3734(var1);
+			this.method3780(var1);
 		} else {
-			this.method3722(var1); // L: 60
+			this.method3758(var1); // L: 60
 		}

 	} // L: 61

 	@ObfuscatedSignature(
-		descriptor = "(Lgk;ZZZZ)V",
+		descriptor = "(Lgm;ZZZZ)V",
 		garbageValue = "1"
 	)
 	public ModelData(ModelData var1, boolean var2, boolean var3, boolean var4, boolean var5) {
@@ -375,13 +375,13 @@ public class ModelData extends Renderable {
 		this.faceLabelsAlpha = var1.faceLabelsAlpha; // L: 640
 		this.vertexNormals = var1.vertexNormals; // L: 641
 		this.faceNormals = var1.faceNormals; // L: 642
-		this.field2175 = var1.field2175; // L: 643
+		this.field2166 = var1.field2166; // L: 643
 		this.ambient = var1.ambient; // L: 644
 		this.contrast = var1.contrast; // L: 645
 	}

-	@ObfuscatedName("o")
-	void method3734(byte[] var1) {
+	@ObfuscatedName("f")
+	void method3780(byte[] var1) {
 		Buffer var2 = new Buffer(var1); // L: 64
 		Buffer var3 = new Buffer(var1); // L: 65
 		Buffer var4 = new Buffer(var1); // L: 66
@@ -686,8 +686,8 @@ public class ModelData extends Renderable {

 	} // L: 273

-	@ObfuscatedName("g")
-	void method3722(byte[] var1) {
+	@ObfuscatedName("y")
+	void method3758(byte[] var1) {
 		boolean var2 = false; // L: 276
 		boolean var3 = false; // L: 277
 		Buffer var4 = new Buffer(var1); // L: 278
@@ -963,11 +963,11 @@ public class ModelData extends Renderable {

 	} // L: 468

-	@ObfuscatedName("l")
+	@ObfuscatedName("b")
 	@ObfuscatedSignature(
-		descriptor = "(Lgk;I)I"
+		descriptor = "(Lgm;I)I"
 	)
-	final int method3794(ModelData var1, int var2) {
+	final int method3759(ModelData var1, int var2) {
 		int var3 = -1; // L: 567
 		int var4 = var1.verticesX[var2]; // L: 568
 		int var5 = var1.verticesY[var2]; // L: 569
@@ -994,11 +994,11 @@ public class ModelData extends Renderable {
 		return var3; // L: 584
 	}

-	@ObfuscatedName("z")
+	@ObfuscatedName("d")
 	@ObfuscatedSignature(
-		descriptor = "()Lgk;"
+		descriptor = "()Lgm;"
 	)
-	public ModelData method3796() {
+	public ModelData method3760() {
 		ModelData var1 = new ModelData(); // L: 650
 		if (this.faceRenderTypes != null) { // L: 651
 			var1.faceRenderTypes = new byte[this.faceCount]; // L: 652
@@ -1038,16 +1038,16 @@ public class ModelData extends Renderable {
 		return var1; // L: 682
 	}

-	@ObfuscatedName("b")
+	@ObfuscatedName("s")
 	@ObfuscatedSignature(
-		descriptor = "([[IIIIZI)Lgk;"
+		descriptor = "([[IIIIZI)Lgm;"
 	)
-	public ModelData method3723(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) {
+	public ModelData method3761(int[][] var1, int var2, int var3, int var4, boolean var5, int var6) {
 		this.calculateBounds(); // L: 686
-		int var7 = var2 + this.field2183; // L: 687
-		int var8 = var2 + this.field2184; // L: 688
-		int var9 = var4 + this.field2162; // L: 689
-		int var10 = var4 + this.field2159; // L: 690
+		int var7 = var2 + this.field2192; // L: 687
+		int var8 = var2 + this.field2195; // L: 688
+		int var9 = var4 + this.field2199; // L: 689
+		int var10 = var4 + this.field2174; // L: 690
 		if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { // L: 691
 			var7 >>= 7; // L: 692
 			var8 = var8 + 127 >> 7; // L: 693
@@ -1132,8 +1132,8 @@ public class ModelData extends Renderable {
 		}
 	}

-	@ObfuscatedName("q")
-	void method3771() {
+	@ObfuscatedName("u")
+	void method3809() {
 		int[] var1;
 		int var2;
 		int var10002;
@@ -1193,8 +1193,8 @@ public class ModelData extends Renderable {

 	} // L: 804

-	@ObfuscatedName("i")
-	public void method3725() {
+	@ObfuscatedName("l")
+	public void method3763() {
 		for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 807
 			int var2 = this.verticesX[var1]; // L: 808
 			this.verticesX[var1] = this.verticesZ[var1]; // L: 809
@@ -1204,8 +1204,8 @@ public class ModelData extends Renderable {
 		this.invalidate(); // L: 812
 	} // L: 813

-	@ObfuscatedName("x")
-	public void method3759() {
+	@ObfuscatedName("o")
+	public void method3829() {
 		for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 816
 			this.verticesX[var1] = -this.verticesX[var1]; // L: 817
 			this.verticesZ[var1] = -this.verticesZ[var1]; // L: 818
@@ -1214,8 +1214,8 @@ public class ModelData extends Renderable {
 		this.invalidate(); // L: 820
 	} // L: 821

-	@ObfuscatedName("k")
-	public void method3727() {
+	@ObfuscatedName("c")
+	public void method3765() {
 		for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 824
 			int var2 = this.verticesZ[var1]; // L: 825
 			this.verticesZ[var1] = this.verticesX[var1]; // L: 826
@@ -1225,8 +1225,8 @@ public class ModelData extends Renderable {
 		this.invalidate(); // L: 829
 	} // L: 830

-	@ObfuscatedName("r")
-	public void method3728(int var1) {
+	@ObfuscatedName("e")
+	public void method3776(int var1) {
 		int var2 = ModelData_sine[var1]; // L: 833
 		int var3 = ModelData_cosine[var1]; // L: 834

@@ -1239,7 +1239,7 @@ public class ModelData extends Renderable {
 		this.invalidate(); // L: 840
 	} // L: 841

-	@ObfuscatedName("p")
+	@ObfuscatedName("g")
 	@Export("changeOffset")
 	public void changeOffset(int var1, int var2, int var3) {
 		for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 844
@@ -1265,7 +1265,7 @@ public class ModelData extends Renderable {

 	} // L: 856

-	@ObfuscatedName("e")
+	@ObfuscatedName("k")
 	@Export("retexture")
 	public void retexture(short var1, short var2) {
 		if (this.faceTextures != null) { // L: 859
@@ -1278,8 +1278,8 @@ public class ModelData extends Renderable {
 		}
 	} // L: 863

-	@ObfuscatedName("d")
-	public void method3732() {
+	@ObfuscatedName("m")
+	public void method3769() {
 		int var1;
 		for (var1 = 0; var1 < this.verticesCount; ++var1) { // L: 866
 			this.verticesZ[var1] = -this.verticesZ[var1];
@@ -1294,7 +1294,7 @@ public class ModelData extends Renderable {
 		this.invalidate(); // L: 872
 	} // L: 873

-	@ObfuscatedName("u")
+	@ObfuscatedName("x")
 	@Export("resize")
 	public void resize(int var1, int var2, int var3) {
 		for (int var4 = 0; var4 < this.verticesCount; ++var4) { // L: 876
@@ -1306,7 +1306,7 @@ public class ModelData extends Renderable {
 		this.invalidate(); // L: 881
 	} // L: 882

-	@ObfuscatedName("m")
+	@ObfuscatedName("z")
 	@Export("calculateVertexNormals")
 	public void calculateVertexNormals() {
 		if (this.vertexNormals == null) { // L: 885
@@ -1382,52 +1382,52 @@ public class ModelData extends Renderable {
 		}
 	} // L: 940

-	@ObfuscatedName("j")
+	@ObfuscatedName("w")
 	@Export("invalidate")
 	void invalidate() {
 		this.vertexNormals = null; // L: 943
-		this.field2175 = null; // L: 944
+		this.field2166 = null; // L: 944
 		this.faceNormals = null; // L: 945
 		this.isBoundsCalculated = false; // L: 946
 	} // L: 947

-	@ObfuscatedName("f")
+	@ObfuscatedName("t")
 	@Export("calculateBounds")
 	void calculateBounds() {
 		if (!this.isBoundsCalculated) { // L: 950
 			super.height = 0; // L: 951
-			this.field2178 = 0; // L: 952
-			this.field2183 = 999999; // L: 953
-			this.field2184 = -999999; // L: 954
-			this.field2159 = -99999; // L: 955
-			this.field2162 = 99999; // L: 956
+			this.field2191 = 0; // L: 952
+			this.field2192 = 999999; // L: 953
+			this.field2195 = -999999; // L: 954
+			this.field2174 = -99999; // L: 955
+			this.field2199 = 99999; // L: 956

 			for (int var1 = 0; var1 < this.verticesCount; ++var1) { // L: 957
 				int var2 = this.verticesX[var1]; // L: 958
 				int var3 = this.verticesY[var1]; // L: 959
 				int var4 = this.verticesZ[var1]; // L: 960
-				if (var2 < this.field2183) { // L: 961
-					this.field2183 = var2;
+				if (var2 < this.field2192) { // L: 961
+					this.field2192 = var2;
 				}

-				if (var2 > this.field2184) { // L: 962
-					this.field2184 = var2;
+				if (var2 > this.field2195) { // L: 962
+					this.field2195 = var2;
 				}

-				if (var4 < this.field2162) { // L: 963
-					this.field2162 = var4;
+				if (var4 < this.field2199) { // L: 963
+					this.field2199 = var4;
 				}

-				if (var4 > this.field2159) { // L: 964
-					this.field2159 = var4;
+				if (var4 > this.field2174) { // L: 964
+					this.field2174 = var4;
 				}

 				if (-var3 > super.height) { // L: 965
 					super.height = -var3;
 				}

-				if (var3 > this.field2178) { // L: 966
-					this.field2178 = var3;
+				if (var3 > this.field2191) { // L: 966
+					this.field2191 = var3;
 				}
 			}

@@ -1435,9 +1435,9 @@ public class ModelData extends Renderable {
 		}
 	} // L: 969

-	@ObfuscatedName("y")
+	@ObfuscatedName("q")
 	@ObfuscatedSignature(
-		descriptor = "(IIIII)Lgj;"
+		descriptor = "(IIIII)Lgr;"
 	)
 	@Export("toModel")
 	public final Model toModel(int var1, int var2, int var3, int var4, int var5) {
@@ -1458,38 +1458,38 @@ public class ModelData extends Renderable {
 				}
 			}

-			var8.field2432 = 0; // L: 1040
+			var8.field2442 = 0; // L: 1040

 			for (var10 = 0; var10 < this.textureTriangleCount; ++var10) { // L: 1041
 				if (var9[var10] > 0 && this.textureRenderTypes[var10] == 0) { // L: 1042
-					++var8.field2432;
+					++var8.field2442;
 				}
 			}

-			var8.field2433 = new int[var8.field2432]; // L: 1044
-			var8.field2434 = new int[var8.field2432]; // L: 1045
-			var8.field2436 = new int[var8.field2432]; // L: 1046
+			var8.field2443 = new int[var8.field2442]; // L: 1044
+			var8.field2444 = new int[var8.field2442]; // L: 1045
+			var8.field2468 = new int[var8.field2442]; // L: 1046
 			var10 = 0; // L: 1047

 			int var11;
 			for (var11 = 0; var11 < this.textureTriangleCount; ++var11) { // L: 1048
 				if (var9[var11] > 0 && this.textureRenderTypes[var11] == 0) { // L: 1049
-					var8.field2433[var10] = this.texTriangleX[var11] & '\uffff'; // L: 1050
-					var8.field2434[var10] = this.texTriangleY[var11] & '\uffff'; // L: 1051
-					var8.field2436[var10] = this.texTriangleZ[var11] & '\uffff'; // L: 1052
+					var8.field2443[var10] = this.texTriangleX[var11] & '\uffff'; // L: 1050
+					var8.field2444[var10] = this.texTriangleY[var11] & '\uffff'; // L: 1051
+					var8.field2468[var10] = this.texTriangleZ[var11] & '\uffff'; // L: 1052
 					var9[var11] = var10++; // L: 1053
 				} else {
 					var9[var11] = -1; // L: 1055
 				}
 			}

-			var8.field2429 = new byte[this.faceCount]; // L: 1057
+			var8.field2439 = new byte[this.faceCount]; // L: 1057

 			for (var11 = 0; var11 < this.faceCount; ++var11) { // L: 1058
 				if (this.textureCoords[var11] != -1) { // L: 1059
-					var8.field2429[var11] = (byte)var9[this.textureCoords[var11] & 255];
+					var8.field2439[var11] = (byte)var9[this.textureCoords[var11] & 255];
 				} else {
-					var8.field2429[var11] = -1; // L: 1060
+					var8.field2439[var11] = -1; // L: 1060
 				}
 			}
 		}
@@ -1532,7 +1532,7 @@ public class ModelData extends Renderable {
 					if (var17 == 1) { // L: 1093
 						var19 = this.faceNormals[var16]; // L: 1094
 						var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; // L: 1095
-						var8.faceColors1[var16] = method3738(this.faceColors[var16] & '\uffff', var14); // L: 1096
+						var8.faceColors1[var16] = method3764(this.faceColors[var16] & '\uffff', var14); // L: 1096
 						var8.faceColors3[var16] = -1; // L: 1097
 					} else if (var17 == 3) { // L: 1099
 						var8.faceColors1[var16] = 128; // L: 1100
@@ -1542,69 +1542,69 @@ public class ModelData extends Renderable {
 					}
 				} else {
 					int var15 = this.faceColors[var16] & '\uffff'; // L: 1079
-					if (this.field2175 != null && this.field2175[this.indices1[var16]] != null) { // L: 1080
-						var13 = this.field2175[this.indices1[var16]];
+					if (this.field2166 != null && this.field2166[this.indices1[var16]] != null) { // L: 1080
+						var13 = this.field2166[this.indices1[var16]];
 					} else {
 						var13 = this.vertexNormals[this.indices1[var16]]; // L: 1081
 					}

 					var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1082
-					var8.faceColors1[var16] = method3738(var15, var14); // L: 1083
-					if (this.field2175 != null && this.field2175[this.indices2[var16]] != null) { // L: 1084
-						var13 = this.field2175[this.indices2[var16]];
+					var8.faceColors1[var16] = method3764(var15, var14); // L: 1083
+					if (this.field2166 != null && this.field2166[this.indices2[var16]] != null) { // L: 1084
+						var13 = this.field2166[this.indices2[var16]];
 					} else {
 						var13 = this.vertexNormals[this.indices2[var16]]; // L: 1085
 					}

 					var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1086
-					var8.faceColors2[var16] = method3738(var15, var14); // L: 1087
-					if (this.field2175 != null && this.field2175[this.indices3[var16]] != null) { // L: 1088
-						var13 = this.field2175[this.indices3[var16]];
+					var8.faceColors2[var16] = method3764(var15, var14); // L: 1087
+					if (this.field2166 != null && this.field2166[this.indices3[var16]] != null) { // L: 1088
+						var13 = this.field2166[this.indices3[var16]];
 					} else {
 						var13 = this.vertexNormals[this.indices3[var16]]; // L: 1089
 					}

 					var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1090
-					var8.faceColors3[var16] = method3738(var15, var14); // L: 1091
+					var8.faceColors3[var16] = method3764(var15, var14); // L: 1091
 				}
 			} else if (var17 != 0) { // L: 1108
 				if (var17 == 1) { // L: 1124
 					var19 = this.faceNormals[var16]; // L: 1125
 					var14 = (var4 * var19.y + var5 * var19.z + var3 * var19.x) / (var7 / 2 + var7) + var1; // L: 1126
-					var8.faceColors1[var16] = method3739(var14); // L: 1127
+					var8.faceColors1[var16] = method3777(var14); // L: 1127
 					var8.faceColors3[var16] = -1; // L: 1128
 				} else {
 					var8.faceColors3[var16] = -2; // L: 1131
 				}
 			} else {
-				if (this.field2175 != null && this.field2175[this.indices1[var16]] != null) { // L: 1111
-					var13 = this.field2175[this.indices1[var16]];
+				if (this.field2166 != null && this.field2166[this.indices1[var16]] != null) { // L: 1111
+					var13 = this.field2166[this.indices1[var16]];
 				} else {
 					var13 = this.vertexNormals[this.indices1[var16]]; // L: 1112
 				}

 				var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1113
-				var8.faceColors1[var16] = method3739(var14); // L: 1114
-				if (this.field2175 != null && this.field2175[this.indices2[var16]] != null) { // L: 1115
-					var13 = this.field2175[this.indices2[var16]];
+				var8.faceColors1[var16] = method3777(var14); // L: 1114
+				if (this.field2166 != null && this.field2166[this.indices2[var16]] != null) { // L: 1115
+					var13 = this.field2166[this.indices2[var16]];
 				} else {
 					var13 = this.vertexNormals[this.indices2[var16]]; // L: 1116
 				}

 				var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1117
-				var8.faceColors2[var16] = method3739(var14); // L: 1118
-				if (this.field2175 != null && this.field2175[this.indices3[var16]] != null) { // L: 1119
-					var13 = this.field2175[this.indices3[var16]];
+				var8.faceColors2[var16] = method3777(var14); // L: 1118
+				if (this.field2166 != null && this.field2166[this.indices3[var16]] != null) { // L: 1119
+					var13 = this.field2166[this.indices3[var16]];
 				} else {
 					var13 = this.vertexNormals[this.indices3[var16]]; // L: 1120
 				}

 				var14 = (var4 * var13.y + var5 * var13.z + var3 * var13.x) / (var7 * var13.magnitude) + var1; // L: 1121
-				var8.faceColors3[var16] = method3739(var14); // L: 1122
+				var8.faceColors3[var16] = method3777(var14); // L: 1122
 			}
 		}

-		this.method3771(); // L: 1135
+		this.method3809(); // L: 1135
 		var8.verticesCount = this.verticesCount; // L: 1136
 		var8.verticesX = this.verticesX; // L: 1137
 		var8.verticesY = this.verticesY; // L: 1138
@@ -1615,16 +1615,16 @@ public class ModelData extends Renderable {
 		var8.indices3 = this.indices3; // L: 1143
 		var8.faceRenderPriorities = this.faceRenderPriorities; // L: 1144
 		var8.faceAlphas = this.faceAlphas; // L: 1145
-		var8.field2431 = this.priority; // L: 1146
+		var8.field2441 = this.priority; // L: 1146
 		var8.vertexLabels = this.vertexLabels; // L: 1147
 		var8.faceLabelsAlpha = this.faceLabelsAlpha; // L: 1148
 		var8.faceTextures = this.faceTextures; // L: 1149
 		return var8; // L: 1150
 	}

-	@ObfuscatedName("h")
+	@ObfuscatedName("v")
 	@ObfuscatedSignature(
-		descriptor = "(Ljp;II)Lgk;"
+		descriptor = "(Ljv;II)Lgm;"
 	)
 	@Export("ModelData_get")
 	public static ModelData ModelData_get(AbstractArchive var0, int var1, int var2) {
@@ -1632,16 +1632,16 @@ public class ModelData extends Renderable {
 		return var3 == null ? null : new ModelData(var3); // L: 54
 	}

-	@ObfuscatedName("s")
+	@ObfuscatedName("h")
 	@ObfuscatedSignature(
-		descriptor = "(Lgk;Lgk;IIIZ)V"
+		descriptor = "(Lgm;Lgm;IIIZ)V"
 	)
-	static void method3736(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) {
+	static void method3774(ModelData var0, ModelData var1, int var2, int var3, int var4, boolean var5) {
 		var0.calculateBounds(); // L: 972
 		var0.calculateVertexNormals(); // L: 973
 		var1.calculateBounds(); // L: 974
 		var1.calculateVertexNormals(); // L: 975
-		++field2189; // L: 976
+		++field2198; // L: 976
 		int var6 = 0; // L: 977
 		int[] var7 = var1.verticesX; // L: 978
 		int var8 = var1.verticesCount; // L: 979
@@ -1651,30 +1651,30 @@ public class ModelData extends Renderable {
 			VertexNormal var10 = var0.vertexNormals[var9]; // L: 981
 			if (var10.magnitude != 0) { // L: 982
 				int var11 = var0.verticesY[var9] - var3; // L: 983
-				if (var11 <= var1.field2178) { // L: 984
+				if (var11 <= var1.field2191) { // L: 984
 					int var12 = var0.verticesX[var9] - var2; // L: 985
-					if (var12 >= var1.field2183 && var12 <= var1.field2184) { // L: 986
+					if (var12 >= var1.field2192 && var12 <= var1.field2195) { // L: 986
 						int var13 = var0.verticesZ[var9] - var4; // L: 987
-						if (var13 >= var1.field2162 && var13 <= var1.field2159) { // L: 988
+						if (var13 >= var1.field2199 && var13 <= var1.field2174) { // L: 988
 							for (int var14 = 0; var14 < var8; ++var14) { // L: 989
 								VertexNormal var15 = var1.vertexNormals[var14]; // L: 990
 								if (var12 == var7[var14] && var13 == var1.verticesZ[var14] && var11 == var1.verticesY[var14] && var15.magnitude != 0) { // L: 991
-									if (var0.field2175 == null) { // L: 992
-										var0.field2175 = new VertexNormal[var0.verticesCount];
+									if (var0.field2166 == null) { // L: 992
+										var0.field2166 = new VertexNormal[var0.verticesCount];
 									}

-									if (var1.field2175 == null) { // L: 993
-										var1.field2175 = new VertexNormal[var8];
+									if (var1.field2166 == null) { // L: 993
+										var1.field2166 = new VertexNormal[var8];
 									}

-									VertexNormal var16 = var0.field2175[var9]; // L: 994
+									VertexNormal var16 = var0.field2166[var9]; // L: 994
 									if (var16 == null) { // L: 995
-										var16 = var0.field2175[var9] = new VertexNormal(var10);
+										var16 = var0.field2166[var9] = new VertexNormal(var10);
 									}

-									VertexNormal var17 = var1.field2175[var14]; // L: 996
+									VertexNormal var17 = var1.field2166[var14]; // L: 996
 									if (var17 == null) {
-										var17 = var1.field2175[var14] = new VertexNormal(var15); // L: 997
+										var17 = var1.field2166[var14] = new VertexNormal(var15); // L: 997
 									}

 									var16.x += var15.x; // L: 998
@@ -1686,8 +1686,8 @@ public class ModelData extends Renderable {
 									var17.z += var10.z; // L: 1004
 									var17.magnitude += var10.magnitude; // L: 1005
 									++var6; // L: 1006
-									field2187[var9] = field2189; // L: 1007
-									field2188[var14] = field2189; // L: 1008
+									field2196[var9] = field2198; // L: 1007
+									field2163[var14] = field2198; // L: 1008
 								}
 							}
 						}
@@ -1698,7 +1698,7 @@ public class ModelData extends Renderable {

 		if (var6 >= 3 && var5) { // L: 1012
 			for (var9 = 0; var9 < var0.faceCount; ++var9) { // L: 1013
-				if (field2187[var0.indices1[var9]] == field2189 && field2187[var0.indices2[var9]] == field2189 && field2187[var0.indices3[var9]] == field2189) { // L: 1014
+				if (field2196[var0.indices1[var9]] == field2198 && field2196[var0.indices2[var9]] == field2198 && field2196[var0.indices3[var9]] == field2198) { // L: 1014
 					if (var0.faceRenderTypes == null) { // L: 1015
 						var0.faceRenderTypes = new byte[var0.faceCount];
 					}
@@ -1708,7 +1708,7 @@ public class ModelData extends Renderable {
 			}

 			for (var9 = 0; var9 < var1.faceCount; ++var9) { // L: 1019
-				if (field2189 == field2188[var1.indices1[var9]] && field2189 == field2188[var1.indices2[var9]] && field2189 == field2188[var1.indices3[var9]]) { // L: 1020
+				if (field2198 == field2163[var1.indices1[var9]] && field2198 == field2163[var1.indices2[var9]] && field2198 == field2163[var1.indices3[var9]]) { // L: 1020
 					if (var1.faceRenderTypes == null) { // L: 1021
 						var1.faceRenderTypes = new byte[var1.faceCount];
 					}
@@ -1720,8 +1720,8 @@ public class ModelData extends Renderable {
 		}
 	} // L: 1025

-	@ObfuscatedName("w")
-	static final int method3738(int var0, int var1) {
+	@ObfuscatedName("i")
+	static final int method3764(int var0, int var1) {
 		var1 = (var0 & 127) * var1 >> 7; // L: 1154
 		if (var1 < 2) { // L: 1155
 			var1 = 2;
@@ -1732,8 +1732,8 @@ public class ModelData extends Renderable {
 		return (var0 & 65408) + var1; // L: 1157
 	}

-	@ObfuscatedName("n")
-	static final int method3739(int var0) {
+	@ObfuscatedName("ae")
+	static final int method3777(int var0) {
 		if (var0 < 2) { // L: 1161
 			var0 = 2;
 		} else if (var0 > 126) {