chore: Updated SeqType property names

Taken from OS 216 function names
Left/right hand replacements were flipped unintentionally before

Author: Pazaz

src/main/java/jagex2/client/Client.java

@@ -5244,7 +5244,7 @@ public final void updateSequences(ClientEntity e) {
 			}
 
 			if (e.primarySeqFrame >= seq.frameCount) {
-				e.primarySeqFrame -= seq.replayoff;
+				e.primarySeqFrame -= seq.loops;
 				e.primarySeqLoop++;
 
 				if (e.primarySeqLoop >= seq.replaycount) {
@@ -9158,7 +9158,7 @@ public final void getPlayerExtendedInfo(int mask, Packet buf, int index, ClientP
 
 			int delay = buf.g1();
 			if (player.primarySeqId == seqId && seqId != -1) {
-				int replaceMode = SeqType.types[seqId].restart_mode;
+				int replaceMode = SeqType.types[seqId].duplicatebehavior;
 
 				if (replaceMode == 1) {
 					player.primarySeqFrame = 0;
@@ -9479,7 +9479,7 @@ public final void getNpcPosExtended(Packet buf, int size) {
 				int delay = buf.g1();
 
 				if (npc.primarySeqId == seqId && seqId != -1) {
-					int restartMode = SeqType.types[seqId].restart_mode;
+					int restartMode = SeqType.types[seqId].duplicatebehavior;
 
 					if (restartMode == 1) {
 						npc.primarySeqFrame = 0;
@@ -11330,7 +11330,7 @@ public final boolean updateInterfaceAnimation(int delta, int id) {
 						child.seqFrame++;
 
 						if (child.seqFrame >= seq.frameCount) {
-							child.seqFrame -= seq.replayoff;
+							child.seqFrame -= seq.loops;
 
 							if (child.seqFrame < 0 || child.seqFrame >= seq.frameCount) {
 								child.seqFrame = 0;

src/main/java/jagex2/config/SeqType.java

@@ -27,7 +27,7 @@ public class SeqType {
 	public int[] delay;
 
 	@ObfuscatedName("nc.i")
-	public int replayoff = -1;
+	public int loops = -1;
 
 	@ObfuscatedName("nc.j")
 	public int[] walkmerge;
@@ -39,10 +39,10 @@ public class SeqType {
 	public int priority = 5;
 
 	@ObfuscatedName("nc.m")
-	public int righthand = -1;
+	public int replaceheldleft = -1;
 
 	@ObfuscatedName("nc.n")
-	public int lefthand = -1;
+	public int replaceheldright = -1;
 
 	@ObfuscatedName("nc.o")
 	public int replaycount = 99;
@@ -54,7 +54,7 @@ public class SeqType {
 	public int postanim_mode = -1;
 
 	@ObfuscatedName("nc.r")
-	public int restart_mode;
+	public int duplicatebehavior;
 
 	@ObfuscatedName("nc.a(Lyb;B)V")
 	public static void unpack(Jagfile config) {
@@ -150,7 +150,7 @@ public void decode(Packet buf) {
 					this.delay[i] = buf.g2();
 				}
 			} else if (code == 2) {
-				this.replayoff = buf.g2();
+				this.loops = buf.g2();
 			} else if (code == 3) {
 				int count = buf.g1();
 				this.walkmerge = new int[count + 1];
@@ -165,17 +165,17 @@ public void decode(Packet buf) {
 			} else if (code == 5) {
 				this.priority = buf.g1();
 			} else if (code == 6) {
-				this.righthand = buf.g2();
+				this.replaceheldleft = buf.g2();
 			} else if (code == 7) {
-				this.lefthand = buf.g2();
+				this.replaceheldright = buf.g2();
 			} else if (code == 8) {
 				this.replaycount = buf.g1();
 			} else if (code == 9) {
 				this.preanim_move = buf.g1();
 			} else if (code == 10) {
 				this.postanim_mode = buf.g1();
 			} else if (code == 11) {
-				this.restart_mode = buf.g1();
+				this.duplicatebehavior = buf.g1();
 			} else {
 				System.out.println("Error unrecognised seq config code: " + code);
 			}

src/main/java/jagex2/dash3d/ClientLocAnim.java

@@ -51,7 +51,7 @@ public ClientLocAnim(int heightmapNW, int heightmapNE, int heightmapSW, int shap
 		this.seqFrame = 0;
 		this.seqCycle = Client.loopCycle;
 
-		if (randomFrame && this.seq.replayoff != -1) {
+		if (randomFrame && this.seq.loops != -1) {
 			this.seqFrame = (int) (Math.random() * (double) this.seq.frameCount);
 			this.seqCycle -= (int) (Math.random() * (double) this.seq.getFrameDuration(this.seqFrame));
 		}
@@ -61,7 +61,7 @@ public ClientLocAnim(int heightmapNW, int heightmapNE, int heightmapSW, int shap
 	public final Model getModel() {
 		if (this.seq != null) {
 			int delta = Client.loopCycle - this.seqCycle;
-			if (delta > 100 && this.seq.replayoff > 0) {
+			if (delta > 100 && this.seq.loops > 0) {
 				delta = 100;
 			}
 
@@ -73,7 +73,7 @@ public final Model getModel() {
 					continue;
 				}
 
-				this.seqFrame -= this.seq.replayoff;
+				this.seqFrame -= this.seq.loops;
 
 				if (this.seqFrame < 0 || this.seqFrame >= this.seq.frameCount) {
 					this.seq = null;

src/main/java/jagex2/dash3d/ClientPlayer.java

@@ -256,8 +256,8 @@ public final Model getAnimatedModel() {
 		long hash = this.hash;
 		int primaryTransformId = -1;
 		int secondaryTransformId = -1;
-		int rightHandValue = -1;
 		int leftHandValue = -1;
+		int rightHandValue = -1;
 
 		if (super.primarySeqId >= 0 && super.primarySeqDelay == 0) {
 			SeqType seq = SeqType.types[super.primarySeqId];
@@ -268,14 +268,14 @@ public final Model getAnimatedModel() {
 				secondaryTransformId = SeqType.types[super.secondarySeqId].frames[super.secondarySeqFrame];
 			}
 
-			if (seq.righthand >= 0) {
-				rightHandValue = seq.righthand;
-				hash += rightHandValue - this.appearance[5] << 40;
+			if (seq.replaceheldleft >= 0) {
+				leftHandValue = seq.replaceheldleft;
+				hash += leftHandValue - this.appearance[5] << 40;
 			}
 
-			if (seq.lefthand >= 0) {
-				leftHandValue = seq.lefthand;
-				hash += leftHandValue - this.appearance[3] << 48;
+			if (seq.replaceheldright >= 0) {
+				rightHandValue = seq.replaceheldright;
+				hash += rightHandValue - this.appearance[3] << 48;
 			}
 		} else if (super.secondarySeqId >= 0) {
 			primaryTransformId = SeqType.types[super.secondarySeqId].frames[super.secondarySeqFrame];
@@ -285,15 +285,15 @@ public final Model getAnimatedModel() {
 		if (model == null) {
 			boolean needsModel = false;
 
-			for (int part = 0; part < 12; part++) {
-				int value = this.appearance[part];
+			for (int slot = 0; slot < 12; slot++) {
+				int value = this.appearance[slot];
 
-				if (leftHandValue >= 0 && part == 3) {
-					value = leftHandValue;
+				if (rightHandValue >= 0 && slot == 3) {
+					value = rightHandValue;
 				}
 
-				if (rightHandValue >= 0 && part == 5) {
-					value = rightHandValue;
+				if (leftHandValue >= 0 && slot == 5) {
+					value = leftHandValue;
 				}
 
 				if (value >= 0x100 && value < 0x200 && !IdkType.types[value - 0x100].modelIsReady()) {
@@ -322,12 +322,12 @@ public final Model getAnimatedModel() {
 
 			for (int i = 0; i < 12; i++) {
 				int part = this.appearance[i];
-				if (leftHandValue >= 0 && i == 3) {
-					part = leftHandValue;
-				}
-				if (rightHandValue >= 0 && i == 5) {
+				if (rightHandValue >= 0 && i == 3) {
 					part = rightHandValue;
 				}
+				if (leftHandValue >= 0 && i == 5) {
+					part = leftHandValue;
+				}
 
 				if (part >= 0x100 && part < 0x200) {
 					Model idkModel = IdkType.types[part - 0x100].getModel();