From f857dba9263ca2b38969e7ab2a858928a24b216b Mon Sep 17 00:00:00 2001
From: Pazaz <pazaz@itspazaz.com>
Date: Wed, 6 Jul 2022 16:47:26 -0400
Subject: [PATCH] Renamed a couple text alignment fields in Component

---
 client/src/main/java/rt4/Component.java       | 18 +++++++++---------
 client/src/main/java/rt4/Cs1ScriptRunner.java |  2 +-
 client/src/main/java/rt4/MiniMenu.java        |  2 +-
 client/src/main/java/rt4/ScriptRunner.java    |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/client/src/main/java/rt4/Component.java b/client/src/main/java/rt4/Component.java
index 263a8bc7..181910f9 100644
--- a/client/src/main/java/rt4/Component.java
+++ b/client/src/main/java/rt4/Component.java
@@ -243,7 +243,7 @@ public final class Component {
 	public int spriteId = -1;
 
 	@OriginalMember(owner = "client!be", name = "eb", descriptor = "I")
-	public int anInt467 = 0;
+	public int vpadding = 0;
 
 	@OriginalMember(owner = "client!be", name = "a", descriptor = "Z")
 	public boolean hidden = false;
@@ -269,7 +269,7 @@ public final class Component {
 	public boolean aBoolean19 = false;
 
 	@OriginalMember(owner = "client!be", name = "yb", descriptor = "I")
-	public int anInt478 = 0;
+	public int valign = 0;
 
 	@OriginalMember(owner = "client!be", name = "lb", descriptor = "I")
 	public int anInt470 = -1;
@@ -461,7 +461,7 @@ public final class Component {
 	public byte dynamicWidthValue = 0;
 
 	@OriginalMember(owner = "client!be", name = "Wc", descriptor = "I")
-	private int anInt518 = 1;
+	private int activeModelType = 1;
 
 	@OriginalMember(owner = "client!be", name = "pd", descriptor = "I")
 	public int anInt526 = 0;
@@ -695,8 +695,8 @@ public final class Component {
 		}
 		if (this.type == 4 || this.type == 1) {
 			this.halign = buffer.g1();
-			this.anInt478 = buffer.g1();
-			this.anInt467 = buffer.g1();
+			this.valign = buffer.g1(); // this is an educated guess, follow arg8 in Font.renderParagraphAlpha
+			this.vpadding = buffer.g1(); // this is an educated guess, follow arg9 in Font.renderParagraphAlpha
 			this.font = buffer.g2();
 			if (this.font == 65535) {
 				this.font = -1;
@@ -722,10 +722,10 @@ public final class Component {
 		if (this.type == 6) {
 			this.modelType = 1;
 			this.modelId = buffer.g2();
-			this.anInt518 = 1;
 			if (this.modelId == 65535) {
 				this.modelId = -1;
 			}
+			this.activeModelType = 1;
 			this.activeModelId = buffer.g2();
 			if (this.activeModelId == 65535) {
 				this.activeModelId = -1;
@@ -876,7 +876,7 @@ public final class Component {
 		@Pc(10) int local10;
 		@Pc(13) int local13;
 		if (arg4) {
-			local10 = this.anInt518;
+			local10 = this.activeModelType;
 			local13 = this.activeModelId;
 		} else {
 			local13 = this.modelId;
@@ -1090,9 +1090,9 @@ public final class Component {
 				this.font = -1;
 			}
 			this.text = buffer.gjstr();
-			this.anInt467 = buffer.g1();
+			this.vpadding = buffer.g1();
 			this.halign = buffer.g1();
-			this.anInt478 = buffer.g1();
+			this.valign = buffer.g1();
 			this.shadowed = buffer.g1() == 1;
 			this.color = buffer.g4();
 		}
diff --git a/client/src/main/java/rt4/Cs1ScriptRunner.java b/client/src/main/java/rt4/Cs1ScriptRunner.java
index d8a64f67..c9d39b04 100644
--- a/client/src/main/java/rt4/Cs1ScriptRunner.java
+++ b/client/src/main/java/rt4/Cs1ScriptRunner.java
@@ -782,7 +782,7 @@ public class Cs1ScriptRunner {
 											if (!component.if3) {
 												local1934 = interpolate(component, local1934);
 											}
-											local1921.drawInterfaceText(local1934, local123, local114, component.width, component.height, local276, component.shadowed ? 0 : -1, component.halign, component.anInt478, component.anInt467);
+											local1921.drawInterfaceText(local1934, local123, local114, component.width, component.height, local276, component.shadowed ? 0 : -1, component.halign, component.valign, component.vpadding);
 										} else if (Component.aBoolean72) {
 											InterfaceList.redraw(component);
 										}
diff --git a/client/src/main/java/rt4/MiniMenu.java b/client/src/main/java/rt4/MiniMenu.java
index e0de2b38..2ad93b03 100644
--- a/client/src/main/java/rt4/MiniMenu.java
+++ b/client/src/main/java/rt4/MiniMenu.java
@@ -1568,7 +1568,7 @@ public class MiniMenu {
 		if (local59 == null) {
 			local59 = Fonts.b12Full;
 		}
-		local59.method2878(local24, arg2, arg1, arg0.width, arg0.height, arg0.color, arg0.shadowColor, arg0.halign, arg0.anInt478, client.aRandom1, gregorianDateSeed, anIntArray132);
+		local59.method2878(local24, arg2, arg1, arg0.width, arg0.height, arg0.color, arg0.shadowColor, arg0.halign, arg0.valign, client.aRandom1, gregorianDateSeed, anIntArray132);
 		InterfaceList.redrawScreen(anIntArray132[0], anIntArray132[2], anIntArray132[1], anIntArray132[3]);
 	}
 
diff --git a/client/src/main/java/rt4/ScriptRunner.java b/client/src/main/java/rt4/ScriptRunner.java
index e7615f50..eb96a58a 100644
--- a/client/src/main/java/rt4/ScriptRunner.java
+++ b/client/src/main/java/rt4/ScriptRunner.java
@@ -2396,8 +2396,8 @@ public final class ScriptRunner {
 								if (opcode == Cs2Opcodes.setTextAlignment) {
 									isp -= 3;
 									component.halign = intStack[isp];
-									component.anInt478 = intStack[isp + 1];
-									component.anInt467 = intStack[isp + 2];
+									component.valign = intStack[isp + 1];
+									component.vpadding = intStack[isp + 2];
 									InterfaceList.redraw(component);
 									continue;
 								}