refactor: move some terrain statics

Author: Jameskmonger

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

@@ -770,7 +770,7 @@ private static void method922(int x, int arg1, Buffer fileData, int y, int regio
                 int opcode = fileData.getUnsignedByte();
                 if(opcode == 0) {
                     if(level == 0) {
-                        tile_height[0][x][y] = -MovedStatics.method888(regionX + x + 932731, regionY + 556238 + y) * 8;
+                        tile_height[0][x][y] = -method888(regionX + x + 932731, regionY + 556238 + y) * 8;
                     } else {
                         tile_height[level][x][y] = -240 + tile_height[level + -1][x][y];
                     }
@@ -1434,4 +1434,17 @@ public static void method789(int chunkLocalX, int chunkY, int chunkX, int chunkL
             MovedStatics.projectileQueue.clear();
         }
     }
+
+    public static int method888(int x, int y) {
+        int vertexHeight = -128 + MovedStatics.perlinNoise(x + 45365, 91923 + y, 4) - (-(MovedStatics.perlinNoise(x + 10294, 37821 + y, 2) - 128 >> 1) + -(-128 + MovedStatics.perlinNoise(x, y, 1) >> 2));
+        vertexHeight = 35 + (int) (0.3 * (double) vertexHeight);
+
+        if(vertexHeight >= 10) {
+            if(vertexHeight > 60)
+                vertexHeight = 60;
+        } else
+            vertexHeight = 10;
+
+        return vertexHeight;
+    }
 }

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

@@ -979,26 +979,6 @@ public static void addActionRow(String string, int menuAction, int firstOperand,
         }
     }
 
-    public static int randomNoise(int x, int y) {
-        int i = 57 * y + x;
-        i ^= i << 13;
-        int i_2_ = 1376312589 + (i * i * 15731 + 789221) * i & 0x7fffffff;
-        return i_2_ >> 19 & 0xff;
-    }
-
-
-    public static int method888(int x, int y) {
-        int vertexHeight = -128 + perlinNoise(x + 45365, 91923 + y, 4) - (-(perlinNoise(x + 10294, 37821 + y, 2) - 128 >> 1) + -(-128 + perlinNoise(x, y, 1) >> 2));
-        vertexHeight = 35 + (int) (0.3 * (double) vertexHeight);
-
-        if(vertexHeight >= 10) {
-            if(vertexHeight > 60)
-                vertexHeight = 60;
-        } else
-            vertexHeight = 10;
-
-        return vertexHeight;
-    }
 
     public static ProducingGraphicsBuffer createGraphicsBuffer(int width, int height, Component component) {
         try {

src/main/java/org/runejs/client/scene/util/CollisionMap.java

@@ -42,9 +42,9 @@ public static void method144(int arg0) {
 
 
     public static int randomNoiseWeightedSum(int arg1, int arg2) {
-        int i = MovedStatics.randomNoise(-1 + arg1, -1 + arg2) + MovedStatics.randomNoise(1 + arg1, arg2 - 1) + MovedStatics.randomNoise(-1 + arg1, 1 + arg2) + MovedStatics.randomNoise(1 + arg1, arg2 + 1);
-        int i_126_ = MovedStatics.randomNoise(arg1 - 1, arg2) + MovedStatics.randomNoise(arg1 + 1, arg2) - (-MovedStatics.randomNoise(arg1, arg2 - 1) + -MovedStatics.randomNoise(arg1, 1 + arg2));
-        int i_127_ = MovedStatics.randomNoise(arg1, arg2);
+        int i = randomNoise(-1 + arg1, -1 + arg2) + randomNoise(1 + arg1, arg2 - 1) + randomNoise(-1 + arg1, 1 + arg2) + randomNoise(1 + arg1, arg2 + 1);
+        int i_126_ = randomNoise(arg1 - 1, arg2) + randomNoise(arg1 + 1, arg2) - (-randomNoise(arg1, arg2 - 1) + -randomNoise(arg1, 1 + arg2));
+        int i_127_ = randomNoise(arg1, arg2);
         return i / 16 - (-(i_126_ / 8) - i_127_ / 4);
     }
 
@@ -221,6 +221,13 @@ public static void method543(CollisionMap arg0, int arg1, int arg2, int arg3, in
 
     }
 
+    public static int randomNoise(int x, int y) {
+        int i = 57 * y + x;
+        i ^= i << 13;
+        int i_2_ = 1376312589 + (i * i * 15731 + 789221) * i & 0x7fffffff;
+        return i_2_ >> 19 & 0xff;
+    }
+
     public void unset(int x, int y, int i) {
         clippingData[x][y] = BitUtils.bitWiseOR(clippingData[x][y], i);
     }