refactor: move unrelated static out of Landscape

Author: Jameskmonger

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

@@ -1918,7 +1918,7 @@ public static void method943(int arg0, TypeFace arg2, int arg3, int arg4) {
     public static void method910() {
         if(true) {
             if (VertexNormal.lowMemory && MovedStatics.onBuildTimePlane != Player.worldLevel)
-                Landscape.method789(Player.localPlayer.pathY[0], MovedStatics.regionY, MovedStatics.regionX, Player.localPlayer.pathX[0], Player.worldLevel);
+                MovedStatics.method789(Player.localPlayer.pathY[0], MovedStatics.regionY, MovedStatics.regionX, Player.localPlayer.pathX[0], Player.worldLevel);
             else if (MovedStatics.anInt1985 != Player.worldLevel) {
                 MovedStatics.anInt1985 = Player.worldLevel;
                 Minimap.method299(Player.worldLevel);

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

@@ -12,7 +12,6 @@
 import org.runejs.client.media.renderable.GameObject;
 import org.runejs.client.media.renderable.Model;
 import org.runejs.client.media.renderable.Renderable;
-import org.runejs.client.media.renderable.actor.Npc;
 import org.runejs.client.media.renderable.actor.Player;
 import org.runejs.client.net.IncomingPackets;
 import org.runejs.client.net.OutgoingPackets;
@@ -881,7 +880,7 @@ public void constructMapRegion(boolean generatedMap) {
                     }
                 }
             }
-            method789(chunkLocalX, chunkY, chunkX, chunkLocalY, level);
+            MovedStatics.method789(chunkLocalX, chunkY, chunkX, chunkLocalY, level);
         } else {
             int chunkLocalY = IncomingPackets.incomingPacketBuffer.getUnsignedShortBE();
             int chunkX = IncomingPackets.incomingPacketBuffer.getUnsignedShortLE();
@@ -925,7 +924,7 @@ public void constructMapRegion(boolean generatedMap) {
                 }
             }
 
-            method789(chunkLocalX, chunkY, chunkX, chunkLocalY, level);
+            MovedStatics.method789(chunkLocalX, chunkY, chunkX, chunkLocalY, level);
         }
     }
 
@@ -1354,93 +1353,6 @@ private static int generateHslBitset(int s, int l, int h) {
         return l / 2 + (s / 32 << 7) + (h / 4 << 10);
     }
 
-    public static void method789(int chunkLocalX, int chunkY, int chunkX, int chunkLocalY, int level) {
-        if(chunkX != MovedStatics.regionX || chunkY != MovedStatics.regionY || MovedStatics.onBuildTimePlane != level && VertexNormal.lowMemory) {
-            MovedStatics.onBuildTimePlane = level;
-            MovedStatics.regionX = chunkX;
-            if(!VertexNormal.lowMemory)
-                MovedStatics.onBuildTimePlane = 0;
-            MovedStatics.regionY = chunkY;
-            MovedStatics.processGameStatus(25);
-            MovedStatics.method940(English.loadingPleaseWait, false, null);
-            int i = MovedStatics.baseY;
-            int i_33_ = MovedStatics.baseX;
-            MovedStatics.baseX = (chunkX - 6) * 8;
-            int i_34_ = MovedStatics.baseX + -i_33_;
-            i_33_ = MovedStatics.baseX;
-            MovedStatics.baseY = (-6 + chunkY) * 8;
-            int i_35_ = MovedStatics.baseY + -i;
-            i = MovedStatics.baseY;
-            for(int i_36_ = 0; i_36_ < 32768; i_36_++) {
-                Npc class40_sub5_sub17_sub4_sub2 = Player.npcs[i_36_];
-                if(class40_sub5_sub17_sub4_sub2 != null) {
-                    for(int i_37_ = 0; i_37_ < 10; i_37_++) {
-                        class40_sub5_sub17_sub4_sub2.pathY[i_37_] -= i_34_;
-                        class40_sub5_sub17_sub4_sub2.pathX[i_37_] -= i_35_;
-                    }
-                    class40_sub5_sub17_sub4_sub2.worldX -= 128 * i_34_;
-                    class40_sub5_sub17_sub4_sub2.worldY -= i_35_ * 128;
-                }
-            }
-            for(int i_38_ = 0; i_38_ < 2048; i_38_++) {
-                Player class40_sub5_sub17_sub4_sub1 = Player.trackedPlayers[i_38_];
-                if(class40_sub5_sub17_sub4_sub1 != null) {
-                    for(int i_39_ = 0; i_39_ < 10; i_39_++) {
-                        class40_sub5_sub17_sub4_sub1.pathY[i_39_] -= i_34_;
-                        class40_sub5_sub17_sub4_sub1.pathX[i_39_] -= i_35_;
-                    }
-                    class40_sub5_sub17_sub4_sub1.worldY -= 128 * i_35_;
-                    class40_sub5_sub17_sub4_sub1.worldX -= 128 * i_34_;
-                }
-            }
-            Player.worldLevel = level;
-            int i_40_ = 0;
-            Player.localPlayer.method787(chunkLocalY, false, chunkLocalX);
-            int i_41_ = 104;
-            int i_42_ = 1;
-            if(i_34_ < 0) {
-                i_41_ = -1;
-                i_40_ = 103;
-                i_42_ = -1;
-            }
-            int i_43_ = 104;
-            int i_44_ = 0;
-            int i_45_ = 1;
-            if(i_35_ < 0) {
-                i_44_ = 103;
-                i_43_ = -1;
-                i_45_ = -1;
-            }
-            for(int i_46_ = i_40_; i_41_ != i_46_; i_46_ += i_42_) {
-                for(int i_47_ = i_44_; i_43_ != i_47_; i_47_ += i_45_) {
-                    int i_48_ = i_34_ + i_46_;
-                    int i_49_ = i_35_ + i_47_;
-                    for(int i_50_ = 0; i_50_ < 4; i_50_++) {
-                        if(i_48_ < 0 || i_49_ < 0 || i_48_ >= 104 || i_49_ >= 104)
-                            MovedStatics.groundItems[i_50_][i_46_][i_47_] = null;
-                        else
-                            MovedStatics.groundItems[i_50_][i_46_][i_47_] = MovedStatics.groundItems[i_50_][i_48_][i_49_];
-                    }
-                }
-            }
-            for(InteractiveObjectTemporary obj = (InteractiveObjectTemporary) MovedStatics.interactiveObjectTemporaryNodeCache.peekFirst(); obj != null; obj = (InteractiveObjectTemporary) MovedStatics.interactiveObjectTemporaryNodeCache.pollFirst()) {
-                obj.y -= i_35_;
-                obj.x -= i_34_;
-                if(obj.x < 0 || obj.y < 0 || obj.x >= 104 || obj.y >= 104)
-                    obj.unlink();
-            }
-            MovedStatics.anInt1985 = -1;
-            if(MovedStatics.destinationX != 0) {
-                MovedStatics.destinationX -= i_34_;
-                Game.destinationY -= i_35_;
-            }
-            Player.cutsceneActive = false;
-            SoundSystem.reset();
-            MovedStatics.spotAnimQueue.clear();
-            MovedStatics.projectileQueue.clear();
-        }
-    }
-
     private static int getPerlinVertexHeight(int x, int y) {
         int vertexHeight = -128 + PerlinNoise.get(x + 45365, 91923 + y, 4) - (-(PerlinNoise.get(x + 10294, 37821 + y, 2) - 128 >> 1) + -(-128 + PerlinNoise.get(x, y, 1) >> 2));
         vertexHeight = 35 + (int) (0.3 * (double) vertexHeight);

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

@@ -3657,4 +3657,91 @@ public static boolean method472(CacheArchive arg1, int arg2) {
         return true;
 
     }
+
+    public static void method789(int chunkLocalX, int chunkY, int chunkX, int chunkLocalY, int level) {
+        if(chunkX != regionX || chunkY != regionY || onBuildTimePlane != level && VertexNormal.lowMemory) {
+            onBuildTimePlane = level;
+            regionX = chunkX;
+            if(!VertexNormal.lowMemory)
+                onBuildTimePlane = 0;
+            regionY = chunkY;
+            processGameStatus(25);
+            method940(English.loadingPleaseWait, false, null);
+            int i = baseY;
+            int i_33_ = baseX;
+            baseX = (chunkX - 6) * 8;
+            int i_34_ = baseX + -i_33_;
+            i_33_ = baseX;
+            baseY = (-6 + chunkY) * 8;
+            int i_35_ = baseY + -i;
+            i = baseY;
+            for(int i_36_ = 0; i_36_ < 32768; i_36_++) {
+                Npc class40_sub5_sub17_sub4_sub2 = Player.npcs[i_36_];
+                if(class40_sub5_sub17_sub4_sub2 != null) {
+                    for(int i_37_ = 0; i_37_ < 10; i_37_++) {
+                        class40_sub5_sub17_sub4_sub2.pathY[i_37_] -= i_34_;
+                        class40_sub5_sub17_sub4_sub2.pathX[i_37_] -= i_35_;
+                    }
+                    class40_sub5_sub17_sub4_sub2.worldX -= 128 * i_34_;
+                    class40_sub5_sub17_sub4_sub2.worldY -= i_35_ * 128;
+                }
+            }
+            for(int i_38_ = 0; i_38_ < 2048; i_38_++) {
+                Player class40_sub5_sub17_sub4_sub1 = Player.trackedPlayers[i_38_];
+                if(class40_sub5_sub17_sub4_sub1 != null) {
+                    for(int i_39_ = 0; i_39_ < 10; i_39_++) {
+                        class40_sub5_sub17_sub4_sub1.pathY[i_39_] -= i_34_;
+                        class40_sub5_sub17_sub4_sub1.pathX[i_39_] -= i_35_;
+                    }
+                    class40_sub5_sub17_sub4_sub1.worldY -= 128 * i_35_;
+                    class40_sub5_sub17_sub4_sub1.worldX -= 128 * i_34_;
+                }
+            }
+            Player.worldLevel = level;
+            int i_40_ = 0;
+            Player.localPlayer.method787(chunkLocalY, false, chunkLocalX);
+            int i_41_ = 104;
+            int i_42_ = 1;
+            if(i_34_ < 0) {
+                i_41_ = -1;
+                i_40_ = 103;
+                i_42_ = -1;
+            }
+            int i_43_ = 104;
+            int i_44_ = 0;
+            int i_45_ = 1;
+            if(i_35_ < 0) {
+                i_44_ = 103;
+                i_43_ = -1;
+                i_45_ = -1;
+            }
+            for(int i_46_ = i_40_; i_41_ != i_46_; i_46_ += i_42_) {
+                for(int i_47_ = i_44_; i_43_ != i_47_; i_47_ += i_45_) {
+                    int i_48_ = i_34_ + i_46_;
+                    int i_49_ = i_35_ + i_47_;
+                    for(int i_50_ = 0; i_50_ < 4; i_50_++) {
+                        if(i_48_ < 0 || i_49_ < 0 || i_48_ >= 104 || i_49_ >= 104)
+                            groundItems[i_50_][i_46_][i_47_] = null;
+                        else
+                            groundItems[i_50_][i_46_][i_47_] = groundItems[i_50_][i_48_][i_49_];
+                    }
+                }
+            }
+            for(InteractiveObjectTemporary obj = (InteractiveObjectTemporary) interactiveObjectTemporaryNodeCache.peekFirst(); obj != null; obj = (InteractiveObjectTemporary) interactiveObjectTemporaryNodeCache.pollFirst()) {
+                obj.y -= i_35_;
+                obj.x -= i_34_;
+                if(obj.x < 0 || obj.y < 0 || obj.x >= 104 || obj.y >= 104)
+                    obj.unlink();
+            }
+            anInt1985 = -1;
+            if(destinationX != 0) {
+                destinationX -= i_34_;
+                Game.destinationY -= i_35_;
+            }
+            Player.cutsceneActive = false;
+            SoundSystem.reset();
+            spotAnimQueue.clear();
+            projectileQueue.clear();
+        }
+    }
 }

src/main/java/org/runejs/client/message/handler/rs435/region/LoadConstructedRegionMessageHandler.java

@@ -56,6 +56,6 @@ public void handle(LoadConstructedRegionInboundMessage message) {
                 }
             }
         }
-        Landscape.method789(chunkLocalX, chunkY, chunkX, chunkLocalY, level);
+        MovedStatics.method789(chunkLocalX, chunkY, chunkX, chunkLocalY, level);
     }
 }

src/main/java/org/runejs/client/message/handler/rs435/region/LoadStandardRegionMessageHandler.java

@@ -51,6 +51,6 @@ public void handle(LoadStandardRegionInboundMessage message) {
             }
         }
 
-        Landscape.method789(chunkLocalX, chunkY, chunkX, chunkLocalY, level);
+        MovedStatics.method789(chunkLocalX, chunkY, chunkX, chunkLocalY, level);
     }
 }