refactor: move rendering to Game

Author: Jameskmonger

src/main/java/org/runejs/client/Game.java

@@ -769,8 +769,8 @@ public static void method353() {
         renderNPCs(true);
         renderPlayers(0, false);
         renderNPCs(false);
-        MovedStatics.renderProjectiles();
-        MovedStatics.renderSpotAnims();
+        renderProjectiles();
+        renderSpotAnims();
         if(!Player.cutsceneActive) {
             int pitch = Game.playerCamera.getPitch();
             if(SceneCamera.cameraTerrainMinScaledPitch / 256 > pitch) {
@@ -2075,6 +2075,49 @@ public static void clearCaches() {
         CacheArchive.clientScriptCacheArchive.clearCache();
     }
 
+    public static void renderProjectiles() {
+        Projectile projectile = (Projectile) MovedStatics.projectileQueue.peekFirst();
+        for (/**/; projectile != null; projectile = (Projectile) MovedStatics.projectileQueue.pollFirst()) {
+            if (Player.worldLevel == projectile.anInt2981 && MovedStatics.pulseCycle <= projectile.endCycle) {
+                if (projectile.delay <= MovedStatics.pulseCycle) {
+                    if (projectile.entityIndex > 0) {
+                        Npc npc = Player.npcs[-1 + projectile.entityIndex];
+                        if (npc != null && npc.worldX >= 0 && npc.worldX < 13312 && npc.worldY >= 0 && npc.worldY < 13312)
+                            projectile.trackTarget(MovedStatics.pulseCycle, 61 + -61, npc.worldY, Scene.getFloorDrawHeight(projectile.anInt2981, npc.worldX, npc.worldY) - projectile.endHeight, npc.worldX);
+                    }
+                    if (projectile.entityIndex < 0) {
+                        int i = -1 + -projectile.entityIndex;
+                        Player player;
+                        if (i != Player.localPlayerId)
+                            player = Player.trackedPlayers[i];
+                        else
+                            player = Player.localPlayer;
+                        if (player != null && player.worldX >= 0 && player.worldX < 13312 && player.worldY >= 0 && player.worldY < 13312)
+                            projectile.trackTarget(MovedStatics.pulseCycle, 0, player.worldY, Scene.getFloorDrawHeight(projectile.anInt2981, player.worldX, player.worldY) - projectile.endHeight, player.worldX);
+                    }
+                    projectile.move(MovedStatics.anInt199);
+                    currentScene.method134(Player.worldLevel, (int) projectile.currentX, (int) projectile.currentY, (int) projectile.currentHeight, 60, projectile, projectile.anInt3013, -1, false);
+                }
+            } else
+                projectile.unlink();
+        }
+    }
+
+    public static void renderSpotAnims() {
+        for (SpotAnim spotAnim = (SpotAnim) MovedStatics.spotAnimQueue.peekFirst(); spotAnim != null; spotAnim = (SpotAnim) MovedStatics.spotAnimQueue.pollFirst()) {
+            if (Player.worldLevel == spotAnim.plane && !spotAnim.animationFinished) {
+                if (MovedStatics.pulseCycle >= spotAnim.startCycle) {
+                    spotAnim.method834(MovedStatics.anInt199);
+                    if (spotAnim.animationFinished)
+                        spotAnim.unlink();
+                    else
+                        currentScene.method134(spotAnim.plane, spotAnim.x, spotAnim.y, spotAnim.z, 60, spotAnim, 0, -1, false);
+                }
+            } else
+                spotAnim.unlink();
+        }
+    }
+
     public void method35(int arg1) {
         if (currentPort != gameServerPort)
             currentPort = gameServerPort;

src/main/java/org/runejs/client/MovedStatics.java

@@ -472,21 +472,6 @@ public static void method996() {
         sidebarOffsets = Rasterizer3D.setLineOffsets(sidebarOffsets);
     }
 
-    public static void renderSpotAnims() {
-        for (SpotAnim spotAnim = (SpotAnim) spotAnimQueue.peekFirst(); spotAnim != null; spotAnim = (SpotAnim) spotAnimQueue.pollFirst()) {
-            if (Player.worldLevel == spotAnim.plane && !spotAnim.animationFinished) {
-                if (pulseCycle >= spotAnim.startCycle) {
-                    spotAnim.method834(anInt199);
-                    if (spotAnim.animationFinished)
-                        spotAnim.unlink();
-                    else
-                        Game.currentScene.method134(spotAnim.plane, spotAnim.x, spotAnim.y, spotAnim.z, 60, spotAnim, 0, -1, false);
-                }
-            } else
-                spotAnim.unlink();
-        }
-    }
-
     public static int getCutsceneCameraPlane() {
         if (!Configuration.ROOFS_ENABLED) {
             return Player.worldLevel;
@@ -545,34 +530,6 @@ public static RSString intToStr(int arg0) {
         return method521(false, 10, arg0);
     }
 
-    public static void renderProjectiles() {
-        Projectile projectile = (Projectile) projectileQueue.peekFirst();
-        for (/**/; projectile != null; projectile = (Projectile) projectileQueue.pollFirst()) {
-            if (Player.worldLevel == projectile.anInt2981 && pulseCycle <= projectile.endCycle) {
-                if (projectile.delay <= pulseCycle) {
-                    if (projectile.entityIndex > 0) {
-                        Npc class40_sub5_sub17_sub4_sub2 = Player.npcs[-1 + projectile.entityIndex];
-                        if (class40_sub5_sub17_sub4_sub2 != null && class40_sub5_sub17_sub4_sub2.worldX >= 0 && class40_sub5_sub17_sub4_sub2.worldX < 13312 && class40_sub5_sub17_sub4_sub2.worldY >= 0 && class40_sub5_sub17_sub4_sub2.worldY < 13312)
-                            projectile.trackTarget(pulseCycle, 61 + -61, class40_sub5_sub17_sub4_sub2.worldY, Scene.getFloorDrawHeight(projectile.anInt2981, class40_sub5_sub17_sub4_sub2.worldX, class40_sub5_sub17_sub4_sub2.worldY) - projectile.endHeight, class40_sub5_sub17_sub4_sub2.worldX);
-                    }
-                    if (projectile.entityIndex < 0) {
-                        int i = -1 + -projectile.entityIndex;
-                        Player class40_sub5_sub17_sub4_sub1;
-                        if (i != Player.localPlayerId)
-                            class40_sub5_sub17_sub4_sub1 = Player.trackedPlayers[i];
-                        else
-                            class40_sub5_sub17_sub4_sub1 = Player.localPlayer;
-                        if (class40_sub5_sub17_sub4_sub1 != null && class40_sub5_sub17_sub4_sub1.worldX >= 0 && class40_sub5_sub17_sub4_sub1.worldX < 13312 && class40_sub5_sub17_sub4_sub1.worldY >= 0 && class40_sub5_sub17_sub4_sub1.worldY < 13312)
-                            projectile.trackTarget(pulseCycle, 0, class40_sub5_sub17_sub4_sub1.worldY, Scene.getFloorDrawHeight(projectile.anInt2981, class40_sub5_sub17_sub4_sub1.worldX, class40_sub5_sub17_sub4_sub1.worldY) - projectile.endHeight, class40_sub5_sub17_sub4_sub1.worldX);
-                    }
-                    projectile.move(anInt199);
-                    Game.currentScene.method134(Player.worldLevel, (int) projectile.currentX, (int) projectile.currentY, (int) projectile.currentHeight, 60, projectile, projectile.anInt3013, -1, false);
-                }
-            } else
-                projectile.unlink();
-        }
-    }
-
     public static int perlinNoise(int x, int y, int scale) {
         int muX = x & -1 + scale;
         int scaledY = y / scale;