refactor: renaming for hinticon positioning

Jameskmonger · Jameskmonger · commit 112964b2b577 · 2023-07-10T14:31:38.000+01:00
diff --git a/src/main/java/org/runejs/client/Class35.java b/src/main/java/org/runejs/client/Class35.java
@@ -5,7 +5,10 @@
 import org.runejs.client.io.Buffer;
 
 public class Class35 implements Interface3 {
-    public static int anInt1730 = 0;
+    /**
+     * Position of the hint icon within the specific tile.
+     */
+    public static int hintIconInnerPosY = 0;
     public static boolean aBoolean1734 = false;
     public static boolean aBoolean1735 = true;
     /**
diff --git a/src/main/java/org/runejs/client/Class37.java b/src/main/java/org/runejs/client/Class37.java
@@ -1,7 +1,6 @@
 package org.runejs.client;
 
 import org.runejs.client.cache.def.ActorDefinition;
-import org.runejs.client.cache.def.OverlayDefinition;
 import org.runejs.client.cache.media.AnimationSequence;
 import org.runejs.client.cache.media.ImageRGB;
 import org.runejs.client.frame.ScreenController;
@@ -137,8 +136,8 @@ else if(isTeammate)
                 }
             }
             if(Player.headIconDrawType == 2) {
-                int hintX = -(Player.localPlayer.worldY / 32) + 2 + 4 * (-Class26.baseY + MovedStatics.anInt175);
-                int hintY = 4 * (ProducingGraphicsBuffer.anInt1637 - MovedStatics.baseX) - (-2 + Player.localPlayer.worldX / 32);
+                int hintX = -(Player.localPlayer.worldY / 32) + 2 + 4 * (-Class26.baseY + MovedStatics.hintIconPosY);
+                int hintY = 4 * (ProducingGraphicsBuffer.hintIconPosX - MovedStatics.baseX) - (-2 + Player.localPlayer.worldX / 32);
                 MovedStatics.drawMinimapMark(Class40_Sub3.aClass40_Sub5_Sub14_Sub4Array2019[1], hintY, hintX);
             }
             if(Player.headIconDrawType == 10 && ProducingGraphicsBuffer.anInt1623 >= 0 && Player.trackedPlayers.length > ProducingGraphicsBuffer.anInt1623) {
diff --git a/src/main/java/org/runejs/client/Landscape.java b/src/main/java/org/runejs/client/Landscape.java
@@ -30,7 +30,10 @@ public class Landscape {
     public static int mouseY = 0;
     public static CollisionMap[] currentCollisionMap = new CollisionMap[4];
     public static int[] anIntArray1168;
-    public static int anInt1170 = 0;
+    /**
+     * Position of the hint icon within the specific tile.
+     */
+    public static int hintIconInnerPosX = 0;
     public static int anInt1171 = 0;
     public static String[] menuActionTexts = new String[500];
     public static ProducingGraphicsBuffer framePieceRight;
diff --git a/src/main/java/org/runejs/client/MovedStatics.java b/src/main/java/org/runejs/client/MovedStatics.java
@@ -93,7 +93,11 @@ public class MovedStatics {
     public static int anInt573 = -1;
     public static boolean menuOpen = false;
     public static volatile long aLong174 = 0L;
-    public static int anInt175 = 0;
+
+    /**
+     * Position of the hint icon in world coordinates (e.g. 3222,3222).
+     */
+    public static int hintIconPosY = 0;
     public static int[] anIntArray178;
     public static int[] chatboxLineOffsets;
     public static int anInt199 = 0;
@@ -1949,7 +1953,7 @@ public static void method311(Component arg1) {
 
 	public static void method450() {
 	    if (Player.headIconDrawType == 2) {
-	        MovedStatics.getProjectedScreenPosition(2 * ActorDefinition.anInt2404, Class35.anInt1730 + (-Class26.baseY + anInt175 << 7), (ProducingGraphicsBuffer.anInt1637 + -baseX << 7) + Landscape.anInt1170);
+	        MovedStatics.getProjectedScreenPosition(2 * ActorDefinition.hintIconPosZ, Class35.hintIconInnerPosY + (-Class26.baseY + hintIconPosY << 7), (ProducingGraphicsBuffer.hintIconPosX + -baseX << 7) + Landscape.hintIconInnerPosX);
 	        if (ISAAC.anInt522 > -1 && pulseCycle % 20 < 10)
 	            hintIconSprites[0].drawImage(ISAAC.anInt522 + -12, -28 + Class44.anInt1048);
 	    }
diff --git a/src/main/java/org/runejs/client/ProducingGraphicsBuffer.java b/src/main/java/org/runejs/client/ProducingGraphicsBuffer.java
@@ -13,7 +13,11 @@ public abstract class ProducingGraphicsBuffer {
     public static ProducingGraphicsBuffer aProducingGraphicsBuffer_1631;
     public static SignlinkNode updateServerSignlinkNode;
     public static int anInt1634 = 0;
-    public static int anInt1637 = 0;
+
+    /**
+     * Position of the hint icon in world coordinates (e.g. 3222,3222)
+     */
+    public static int hintIconPosX = 0;
     public static ProducingGraphicsBuffer muteButton;
 
     public int height;
diff --git a/src/main/java/org/runejs/client/cache/def/ActorDefinition.java b/src/main/java/org/runejs/client/cache/def/ActorDefinition.java
@@ -23,7 +23,11 @@ public class ActorDefinition extends CachedNode implements EntityDefinition {
 
     public static int[] sidebarOffsets;
     public static int menuActionRow = 0;
-    public static int anInt2404 = 0;
+
+    /**
+     * Draw height of the icon in 3d positions.
+     */
+    public static int hintIconPosZ = 0;
     public static int count;
 
     public boolean isClickable = true;
diff --git a/src/main/java/org/runejs/client/frame/Minimap.java b/src/main/java/org/runejs/client/frame/Minimap.java
@@ -12,8 +12,6 @@
 import org.runejs.client.media.renderable.actor.Actor;
 import org.runejs.client.media.renderable.actor.Npc;
 import org.runejs.client.media.renderable.actor.Player;
-import org.runejs.client.scene.GroundItemTile;
-import org.runejs.client.scene.SceneCamera;
 import org.runejs.client.scene.tile.Wall;
 import org.runejs.client.*;
 
@@ -181,8 +179,8 @@ else if(isTeammate)
                 }
             }
             if(Player.headIconDrawType == 2) {
-                int hintY = -(Player.localPlayer.worldY / 32) + 2 + 4 * (-Class26.baseY + MovedStatics.anInt175);
-                int hintX = 4 * (ProducingGraphicsBuffer.anInt1637 - MovedStatics.baseX) - (-2 + Player.localPlayer.worldX / 32);
+                int hintY = -(Player.localPlayer.worldY / 32) + 2 + 4 * (-Class26.baseY + MovedStatics.hintIconPosY);
+                int hintX = 4 * (ProducingGraphicsBuffer.hintIconPosX - MovedStatics.baseX) - (-2 + Player.localPlayer.worldX / 32);
                 drawMinimapMark(Class40_Sub3.aClass40_Sub5_Sub14_Sub4Array2019[1], hintX, hintY);
             }
             if(Player.headIconDrawType == 10 && ProducingGraphicsBuffer.anInt1623 >= 0 && Player.trackedPlayers.length > ProducingGraphicsBuffer.anInt1623) {
diff --git a/src/main/java/org/runejs/client/message/handler/rs435/misc/SetHintIconMessageHandler.java b/src/main/java/org/runejs/client/message/handler/rs435/misc/SetHintIconMessageHandler.java
@@ -33,11 +33,11 @@ private void handleNoneType(SetHintIconInboundMessage message) {
 
     private void handlePositionType(SetHintIconInboundMessage message) {
         Player.headIconDrawType = 2;
-        ProducingGraphicsBuffer.anInt1637 = message.positionInfo.x;
-        MovedStatics.anInt175 = message.positionInfo.y;
-        ActorDefinition.anInt2404 = message.positionInfo.drawHeight;
-        Landscape.anInt1170 = message.positionInfo.drawOffsetX;
-        Class35.anInt1730 = message.positionInfo.drawOffsetY;
+        ProducingGraphicsBuffer.hintIconPosX = message.positionInfo.x;
+        MovedStatics.hintIconPosY = message.positionInfo.y;
+        ActorDefinition.hintIconPosZ = message.positionInfo.drawHeight;
+        Landscape.hintIconInnerPosX = message.positionInfo.drawOffsetX;
+        Class35.hintIconInnerPosY = message.positionInfo.drawOffsetY;
     }
 
     private void handleNPCType(SetHintIconInboundMessage message) {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`package org.runejs.client;`
`2`	`2`
`3`	`3`	`import org.runejs.client.cache.def.ActorDefinition;`
`4`		`-import org.runejs.client.cache.def.OverlayDefinition;`
`5`	`4`	`import org.runejs.client.cache.media.AnimationSequence;`
`6`	`5`	`import org.runejs.client.cache.media.ImageRGB;`
`7`	`6`	`import org.runejs.client.frame.ScreenController;`
`@@ -137,8 +136,8 @@ else if(isTeammate)`
`137`	`136`	`}`
`138`	`137`	`}`
`139`	`138`	`if(Player.headIconDrawType == 2) {`
`140`		`- int hintX = -(Player.localPlayer.worldY / 32) + 2 + 4 * (-Class26.baseY + MovedStatics.anInt175);`
`141`		`- int hintY = 4 * (ProducingGraphicsBuffer.anInt1637 - MovedStatics.baseX) - (-2 + Player.localPlayer.worldX / 32);`
	`139`	`+ int hintX = -(Player.localPlayer.worldY / 32) + 2 + 4 * (-Class26.baseY + MovedStatics.hintIconPosY);`
	`140`	`+ int hintY = 4 * (ProducingGraphicsBuffer.hintIconPosX - MovedStatics.baseX) - (-2 + Player.localPlayer.worldX / 32);`
`142`	`141`	`MovedStatics.drawMinimapMark(Class40_Sub3.aClass40_Sub5_Sub14_Sub4Array2019[1], hintY, hintX);`
`143`	`142`	`}`
`144`	`143`	`if(Player.headIconDrawType == 10 && ProducingGraphicsBuffer.anInt1623 >= 0 && Player.trackedPlayers.length > ProducingGraphicsBuffer.anInt1623) {`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,6 @@`
`12`	`12`	`import org.runejs.client.media.renderable.actor.Actor;`
`13`	`13`	`import org.runejs.client.media.renderable.actor.Npc;`
`14`	`14`	`import org.runejs.client.media.renderable.actor.Player;`
`15`		`-import org.runejs.client.scene.GroundItemTile;`
`16`		`-import org.runejs.client.scene.SceneCamera;`
`17`	`15`	`import org.runejs.client.scene.tile.Wall;`
`18`	`16`	`import org.runejs.client.*;`
`19`	`17`
`@@ -181,8 +179,8 @@ else if(isTeammate)`
`181`	`179`	`}`
`182`	`180`	`}`
`183`	`181`	`if(Player.headIconDrawType == 2) {`
`184`		`- int hintY = -(Player.localPlayer.worldY / 32) + 2 + 4 * (-Class26.baseY + MovedStatics.anInt175);`
`185`		`- int hintX = 4 * (ProducingGraphicsBuffer.anInt1637 - MovedStatics.baseX) - (-2 + Player.localPlayer.worldX / 32);`
	`182`	`+ int hintY = -(Player.localPlayer.worldY / 32) + 2 + 4 * (-Class26.baseY + MovedStatics.hintIconPosY);`
	`183`	`+ int hintX = 4 * (ProducingGraphicsBuffer.hintIconPosX - MovedStatics.baseX) - (-2 + Player.localPlayer.worldX / 32);`
`186`	`184`	`drawMinimapMark(Class40_Sub3.aClass40_Sub5_Sub14_Sub4Array2019[1], hintX, hintY);`
`187`	`185`	`}`
`188`	`186`	`if(Player.headIconDrawType == 10 && ProducingGraphicsBuffer.anInt1623 >= 0 && Player.trackedPlayers.length > ProducingGraphicsBuffer.anInt1623) {`