refactor: move perlin to landscape

Author: Jameskmonger

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

@@ -1436,7 +1436,7 @@ public static void method789(int chunkLocalX, int chunkY, int chunkX, int chunkL
     }
 
     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));
+        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) {
@@ -1447,4 +1447,39 @@ public static int method888(int x, int y) {
 
         return vertexHeight;
     }
+
+    public static int interpolateForPerlin(int arg0, int arg1, int arg2, boolean arg3, int arg4) {
+        if (!arg3)
+            return -109;
+        int i = 65536 + -Rasterizer3D.cosinetable[1024 * arg4 / arg1] >> 1;
+        return ((65536 + -i) * arg0 >> 16) + (arg2 * i >> 16);
+    }
+
+    public static int randomNoiseWeightedSum(int arg1, int 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);
+    }
+
+    public static int perlinNoise(int x, int y, int scale) {
+        int muX = x & -1 + scale;
+        int scaledY = y / scale;
+        int muY = scale - 1 & y;
+        int scaledX = x / scale;
+        int a = randomNoiseWeightedSum(scaledX, scaledY);
+        int b = randomNoiseWeightedSum(1 + scaledX, scaledY);
+        int c = randomNoiseWeightedSum(scaledX, 1 + scaledY);
+        int d = randomNoiseWeightedSum(1 + scaledX, 1 + scaledY);
+        int i1 = interpolateForPerlin(a, scale, b, true, muX);
+        int i2 = interpolateForPerlin(c, scale, d, true, muX);
+        return interpolateForPerlin(i1, scale, i2, true, muY);
+    }
+
+    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;
+    }
 }

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

@@ -483,20 +483,6 @@ public static RSString intToStr(int arg0) {
         return method521(false, 10, arg0);
     }
 
-    public static int perlinNoise(int x, int y, int scale) {
-        int muX = x & -1 + scale;
-        int scaledY = y / scale;
-        int muY = scale - 1 & y;
-        int scaledX = x / scale;
-        int a = CollisionMap.randomNoiseWeightedSum(scaledX, scaledY);
-        int b = CollisionMap.randomNoiseWeightedSum(1 + scaledX, scaledY);
-        int c = CollisionMap.randomNoiseWeightedSum(scaledX, 1 + scaledY);
-        int d = CollisionMap.randomNoiseWeightedSum(1 + scaledX, 1 + scaledY);
-        int i1 = interpolateForPerlin(a, scale, b, true, muX);
-        int i2 = interpolateForPerlin(c, scale, d, true, muX);
-        return interpolateForPerlin(i1, scale, i2, true, muY);
-    }
-
     public static int calculateCrc8(int offset, int size, byte[] data) {
         int crc = -1;
         for (int currentByte = offset; currentByte < size; currentByte++) {
@@ -1507,13 +1493,6 @@ public static Point2d getScreenMidpoint() {
     public static int[] anIntArray1847 = new int[2000];
 	public static long aLong1841;
 
-    private static int interpolateForPerlin(int arg0, int arg1, int arg2, boolean arg3, int arg4) {
-        if (!arg3)
-            return -109;
-        int i = 65536 + -Rasterizer3D.cosinetable[1024 * arg4 / arg1] >> 1;
-        return ((65536 + -i) * arg0 >> 16) + (arg2 * i >> 16);
-    }
-
     private static void method344(int arg0) {
         if(aBoolean2083) {
             chatboxLineOffsets = null;

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

@@ -41,13 +41,6 @@ public static void method144(int arg0) {
     }
 
 
-    public static int randomNoiseWeightedSum(int arg1, int 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);
-    }
-
     public static void method543(CollisionMap arg0, int arg1, int arg2, int arg3, int arg4, Scene arg5, int arg6, int arg7, int arg8, int arg9) {
         int i = Landscape.tile_height[arg2][arg9][arg8];
         int i_0_ = Landscape.tile_height[arg2][1 + arg9][arg8];
@@ -221,13 +214,6 @@ 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);
     }