Skip to content

Commit d391236

Browse files
PromisesPromises
authored
Merge pull request #61 from hallowatcher/deob-2
Another deob round
2 parents 9502c2f + 8786413 commit d391236

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1061
-1129
lines changed

‎src/main/java/com/jagex/runescape/Class17.java‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@ public class Class17 {
2323
public static int anInt464 = 0;
2424
public static int[] anIntArray466 = new int[256];
2525

26-
public static void method273(Class64 arg0, int arg1, boolean arg2) {
27-
if(Class57.aClass64_1345 != null) {
26+
public static void method273(GameSocket arg0, boolean arg2) {
27+
if(Class57.gameSocket != null) {
2828
try {
29-
Class57.aClass64_1345.method1009();
29+
Class57.gameSocket.method1009();
3030
} catch(Exception exception) {
3131
exception.printStackTrace();
3232
/* empty */
3333
}
34-
Class57.aClass64_1345 = null;
34+
Class57.gameSocket = null;
3535
}
36-
Class57.aClass64_1345 = arg0;
36+
Class57.gameSocket = arg0;
3737
GameShell.method19(arg2, 24041);
3838
LinkedList.aClass40_Sub1_1081.currentPosition = 0;
3939
Class40_Sub5_Sub13.aClass40_Sub1_2752 = null;
@@ -62,23 +62,21 @@ public static void method273(Class64 arg0, int arg1, boolean arg2) {
6262
class40_sub1.putByte(4);
6363
class40_sub1.putByte(Class8.aByte302);
6464
class40_sub1.putShortBE(0);
65-
Class57.aClass64_1345.method1010(4, (byte) -19, 0, class40_sub1.buffer);
65+
Class57.gameSocket.method1010(4, 0, class40_sub1.buffer);
6666
} catch(java.io.IOException ioexception) {
6767
ioexception.printStackTrace();
6868
try {
69-
Class57.aClass64_1345.method1009();
69+
Class57.gameSocket.method1009();
7070
} catch(Exception exception) {
7171
exception.printStackTrace();
7272
/* empty */
7373
}
74-
Class57.aClass64_1345 = null;
74+
Class57.gameSocket = null;
7575
MovedStatics.anInt2278++;
7676
}
7777
}
78-
if(arg1 < 102)
79-
method273(null, 92, true);
80-
Class22.anInt547 = 0;
81-
LinkedList.aLong1051 = System.currentTimeMillis();
78+
Class22.msSinceLastUpdate = 0;
79+
LinkedList.lastUpdateInMillis = System.currentTimeMillis();
8280
}
8381

8482
public static int method274(boolean arg0) {

‎src/main/java/com/jagex/runescape/Class22.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public abstract class Class22 {
2424
public static boolean membersWorld = false;
2525
public static boolean accountFlagged = false;
2626
public static int anInt545;
27-
public static int anInt547 = 0;
27+
public static int msSinceLastUpdate = 0;
2828
public static boolean[] aBooleanArray548 = new boolean[]{true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false, true, false, false};
2929

3030
public static void method299(byte arg0, int arg1) {

‎src/main/java/com/jagex/runescape/Class22_Sub2_Sub2.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,13 @@ public class Class22_Sub2_Sub2 extends Class22_Sub2 implements Runnable {
1414
public static int anInt2229;
1515

1616
public Class22_Sub2_Sub2(Signlink arg0, Runnable_Impl1 arg1) {
17-
1817
aRunnable_Impl1_2223 = arg1;
1918
aRunnable_Impl1_2223.method3(25832);
2019
aRunnable_Impl1_2223.method6(116);
2120
this.method321((byte) 109, (long) anInt2226);
2221
aRunnable_Impl1_2223.method2(anIntArray2227, anInt2229);
2322
anInt2229 = 0;
24-
arg0.method394(10, 0, this);
23+
arg0.createCanvasNode(10, this);
2524
}
2625

2726
public static void method325() {
@@ -111,7 +110,7 @@ public void run() {
111110
Class43.sleep(100L);
112111
}
113112
} catch(Exception exception) {
114-
MovedStatics.method169(null, (byte) -127, exception);
113+
MovedStatics.printException(null, exception);
115114
}
116115

117116
}

‎src/main/java/com/jagex/runescape/Class29.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.jagex.runescape.scene.util.CollisionMap;
55

66
public class Class29 {
7-
public static Class64 aClass64_676;
7+
public static GameSocket gameSocket;
88

99
public static boolean isHovering(int areaId, int arg2) {
1010
if(areaId == 0 && ItemDefinition.anInt2850 == arg2)

‎src/main/java/com/jagex/runescape/Class39.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public static boolean method452(Signlink arg0, boolean arg2) {
5656
MovedStatics.aClass22_189 = new Class22_Sub2_Sub1(); // Java Midi Based
5757
return true;
5858
} catch(Throwable throwable) {
59-
Runnable_Impl1 runnable_impl1 = arg0.method391(1048576);
59+
Runnable_Impl1 runnable_impl1 = arg0.method391();
6060
if(runnable_impl1 != null) {
6161
MovedStatics.aClass22_189 = new Class22_Sub2_Sub2(arg0, runnable_impl1); // ???
6262
return true;

‎src/main/java/com/jagex/runescape/Class40_Sub3.java‎

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,11 @@
99
import com.jagex.runescape.frame.console.Console;
1010
import com.jagex.runescape.input.KeyFocusListener;
1111
import com.jagex.runescape.input.MouseHandler;
12-
import com.jagex.runescape.io.Buffer;
1312
import com.jagex.runescape.language.English;
1413
import com.jagex.runescape.language.Native;
1514
import com.jagex.runescape.media.Rasterizer3D;
1615
import com.jagex.runescape.media.VertexNormal;
1716
import com.jagex.runescape.media.renderable.Item;
18-
import com.jagex.runescape.media.renderable.actor.Actor;
1917
import com.jagex.runescape.media.renderable.actor.Npc;
2018
import com.jagex.runescape.media.renderable.actor.PlayerAppearance;
2119
import com.jagex.runescape.net.ISAAC;
@@ -153,7 +151,7 @@ public static void startup(int arg0) {
153151
} else if (Class40_Sub5_Sub6.loadingPercent == 70) {
154152
if (CacheArchive.gameDefinitionsCacheArchive.method185((byte) 98)) {
155153
MovedStatics.method441(CacheArchive.gameDefinitionsCacheArchive);
156-
UnderlayDefinition.method616(CacheArchive.gameDefinitionsCacheArchive);
154+
UnderlayDefinition.initializeUnderlayDefinitionCache(CacheArchive.gameDefinitionsCacheArchive);
157155
method977(3, CacheArchive.gameDefinitionsCacheArchive, CacheArchive.modelCacheArchive);
158156
method980(28987, CacheArchive.modelCacheArchive, VertexNormal.lowMemory, CacheArchive.gameDefinitionsCacheArchive);
159157
Main.method357(CacheArchive.modelCacheArchive, arg0 ^ ~0x2a85, CacheArchive.gameDefinitionsCacheArchive);
@@ -269,7 +267,7 @@ public static void startup(int arg0) {
269267
}
270268
} else if (Class40_Sub5_Sub6.loadingPercent == 110) {
271269
Class12.mouseCapturer = new Class39();
272-
Main.signlink.method394(10, 0, Class12.mouseCapturer);
270+
Main.signlink.createCanvasNode(10, Class12.mouseCapturer);
273271
Native.currentLoadingText = English.loadedInputHandler;
274272
Class40_Sub5_Sub6.loadingPercent = 120;
275273
MovedStatics.anInt1607 = 94;
@@ -304,21 +302,6 @@ public static void startup(int arg0) {
304302
}
305303
}
306304

307-
public static UnderlayDefinition method531(byte arg0, int arg1) {
308-
UnderlayDefinition underlayDefinition = (UnderlayDefinition) WallDecoration.aClass9_1247.get((long) arg1);
309-
if (underlayDefinition != null)
310-
return underlayDefinition;
311-
byte[] is = Actor.aCacheArchive_3150.getFile(1, arg1);
312-
underlayDefinition = new UnderlayDefinition();
313-
if (is != null)
314-
underlayDefinition.readValues(new Buffer(is));
315-
underlayDefinition.calculateHsl();
316-
if (arg0 >= -39)
317-
English.commandFpson = null;
318-
WallDecoration.aClass9_1247.put((long) arg1, underlayDefinition);
319-
return underlayDefinition;
320-
}
321-
322305
public static void method977(int arg0, CacheArchive arg1, CacheArchive arg2) {
323306
MovedStatics.aCacheArchive_654 = arg2;
324307
if (arg0 == 3) {

‎src/main/java/com/jagex/runescape/Class40_Sub5_Sub17_Sub1.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -361,8 +361,8 @@ else if(i_22_ > i_25_)
361361

362362
public static void addObject(int objectId, int localX, int localY, int plane, int face, int type, Scene scene, CollisionMap collisionMap) {
363363
if(!VertexNormal.lowMemory || (0x2 & OverlayDefinition.tile_flags[0][localX][localY]) != 0 || (0x10 & OverlayDefinition.tile_flags[plane][localX][localY]) == 0 && MovedStatics.onBuildTimePlane == Class59.getVisibilityPlaneFor(plane, localY, 0, localX)) {
364-
if(Class64.lowestPlane > plane)
365-
Class64.lowestPlane = plane;
364+
if(MovedStatics.lowestPlane > plane)
365+
MovedStatics.lowestPlane = plane;
366366
int vertexHeight = MovedStatics.tile_height[plane][localX][localY];
367367
int vertexHeightRight = MovedStatics.tile_height[plane][localX + 1][localY];
368368
int vertexHeightTopRight = MovedStatics.tile_height[plane][localX + 1][localY + 1];

‎src/main/java/com/jagex/runescape/Class40_Sub5_Sub6.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import com.jagex.runescape.net.ISAAC;
1515
import com.jagex.runescape.net.PacketBuffer;
1616
import com.jagex.runescape.node.CachedNode;
17-
import com.jagex.runescape.scene.GroundItemTile;
1817
import com.jagex.runescape.scene.InteractiveObject;
1918
import com.jagex.runescape.scene.SceneCluster;
2019
import com.jagex.runescape.scene.util.CollisionMap;
@@ -70,7 +69,7 @@ public static void manageTextInputs() {
7069
ChatBox.redrawChatbox = true;
7170
if(Class37.anInt876 == 1) {
7271
long l = RSString.nameToLong(ChatBox.chatMessage);
73-
UnderlayDefinition.addFriend(l);
72+
MovedStatics.addFriend(l);
7473
}
7574
if(Class37.anInt876 == 2 && Player.friendsCount > 0) {
7675
long l = RSString.nameToLong(ChatBox.chatMessage);

‎src/main/java/com/jagex/runescape/Class43.java‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import com.jagex.runescape.media.VertexNormal;
1616
import com.jagex.runescape.media.renderable.Item;
1717
import com.jagex.runescape.media.renderable.actor.Player;
18-
import com.jagex.runescape.net.ISAAC;
1918
import com.jagex.runescape.scene.InteractiveObject;
2019
import com.jagex.runescape.scene.tile.FloorDecoration;
2120
import com.jagex.runescape.scene.tile.SceneTile;
@@ -27,13 +26,15 @@ public class Class43 {
2726
public static LinkedList aLinkedList_1022 = new LinkedList();
2827
public static int bankInsertMode = 0;
2928

30-
public static void sleep(long arg0) {
31-
if(arg0 > 0L) {
32-
if(arg0 % 10L == 0L) {
33-
ISAAC.method283(-1L + arg0, -110);
34-
ISAAC.method283(1L, -110);
35-
} else
36-
ISAAC.method283(arg0, -103);
29+
public static void sleep(long ms) {
30+
if (ms <= 0L) {
31+
return;
32+
}
33+
34+
try {
35+
Thread.sleep(ms);
36+
} catch(InterruptedException interruptedexception) {
37+
/* empty */
3738
}
3839
}
3940

@@ -77,7 +78,7 @@ public static void processRightClick() {
7778
// Right game screen
7879
if(ScreenController.isCoordinatesIn3dScreen(Class13.mouseX ,Landscape.mouseY )) {
7980
if(GameInterface.gameScreenInterfaceId == -1) {
80-
Class64.method1013();
81+
MovedStatics.method1013();
8182
} else {
8283
int yOffset = (ScreenController.drawHeight /2) - (334/2) - (184/2);
8384
int xOffset = (ScreenController.drawWidth /2) - (512/2) - (234/3);

‎src/main/java/com/jagex/runescape/Class44.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ public void run() {
159159
}
160160
}
161161
} catch(Exception exception) {
162-
MovedStatics.method169(null, (byte) -127, exception);
162+
MovedStatics.printException(null, exception);
163163
}
164164
}
165165
}

0 commit comments

Comments
 (0)