Skip to content

Commit f0ceae4

Browse files
PazazPazaz
committed
chore: Renaming more methods
1 parent b5c2c20 commit f0ceae4

25 files changed

+661
-606
lines changed

‎src/main/java/jagex3/client/Client.java‎

Lines changed: 189 additions & 187 deletions
Large diffs are not rendered by default.

‎src/main/java/jagex3/client/GameShellCache.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ public static void storeUID192(Packet arg0, int arg1) {
268268
}
269269

270270
@ObfuscatedName("cw.c(I)V")
271-
public static void method1141() {
271+
public static void shutdown() {
272272
try {
273273
cacheDat.close();
274274
for (int var0 = 0; var0 < archiveCount; var0++) {
@@ -350,13 +350,13 @@ public static void imethod1(String var18, int var19) {
350350
var26++;
351351
}
352352
}
353-
CacheUtil.method61(cacheDirectory);
353+
CacheUtil.setCacheDir(cacheDirectory);
354354
openUID();
355-
cacheDat = new BufferedRandomAccessFile(new FileOnDisk(CacheUtil.method1039("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0);
356-
masterIndex = new BufferedRandomAccessFile(new FileOnDisk(CacheUtil.method1039("main_file_cache.idx255"), "rw", 1048576L), 6000, 0);
355+
cacheDat = new BufferedRandomAccessFile(new FileOnDisk(CacheUtil.getFile("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0);
356+
masterIndex = new BufferedRandomAccessFile(new FileOnDisk(CacheUtil.getFile("main_file_cache.idx255"), "rw", 1048576L), 6000, 0);
357357
cacheIndex = new BufferedRandomAccessFile[archiveCount];
358358
for (int i = 0; i < archiveCount; i++) {
359-
cacheIndex[i] = new BufferedRandomAccessFile(new FileOnDisk(CacheUtil.method1039("main_file_cache.idx" + i), "rw", 1048576L), 6000, 0);
359+
cacheIndex[i] = new BufferedRandomAccessFile(new FileOnDisk(CacheUtil.getFile("main_file_cache.idx" + i), "rw", 1048576L), 6000, 0);
360360
}
361361
} catch (Exception ex) {
362362
JagException.report(null, ex);

‎src/main/java/jagex3/client/JagException.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ public class JagException extends RuntimeException {
1919
public static int revision;
2020

2121
@ObfuscatedName("fa.m")
22-
public String field2494;
22+
public String message;
2323

2424
@ObfuscatedName("fa.c")
25-
public Throwable field2498;
25+
public Throwable cause;
2626

2727
public JagException(Throwable arg0, String arg1) {
28-
this.field2494 = arg1;
29-
this.field2498 = arg0;
28+
this.message = arg1;
29+
this.cause = arg0;
3030
}
3131

3232
@ObfuscatedName("dy.r(Ljava/lang/String;Ljava/lang/Throwable;I)V")
@@ -38,8 +38,8 @@ public static void report(String arg0, Throwable arg1) {
3838
String var5;
3939
if (arg1 instanceof JagException) {
4040
JagException var4 = (JagException) arg1;
41-
var5 = var4.field2494 + " | ";
42-
var3 = var4.field2498;
41+
var5 = var4.message + " | ";
42+
var3 = var4.cause;
4343
} else {
4444
var5 = "";
4545
}
@@ -102,7 +102,7 @@ public static JagException report(Throwable arg0, String arg1) {
102102
JagException var2;
103103
if (arg0 instanceof JagException) {
104104
var2 = (JagException) arg0;
105-
var2.field2494 = var2.field2494 + ' ' + arg1;
105+
var2.message = var2.message + ' ' + arg1;
106106
} else {
107107
var2 = new JagException(arg0, arg1);
108108
}

‎src/main/java/jagex3/client/TitleScreen.java‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import deob.ObfuscatedName;
44
import jagex3.client.applet.GameShell;
5-
import jagex3.client.applet.JavaKeyboardProvider;
6-
import jagex3.client.applet.JavaMouseProvider;
5+
import jagex3.client.applet.ClientKeyboardListener;
6+
import jagex3.client.applet.ClientMouseListener;
77
import jagex3.graphics.*;
88
import jagex3.io.Packet;
99
import jagex3.js5.Js5Loader;
@@ -247,7 +247,7 @@ public static void loop(GameShell app) {
247247
return;
248248
}
249249

250-
if (JavaMouseProvider.mouseClickButton == 1 && JavaMouseProvider.mouseClickX >= 715 && JavaMouseProvider.mouseClickY >= 453) {
250+
if (ClientMouseListener.mouseClickButton == 1 && ClientMouseListener.mouseClickX >= 715 && ClientMouseListener.mouseClickY >= 453) {
251251
mute = !mute;
252252

253253
if (mute) {
@@ -272,12 +272,12 @@ public static void loop(GameShell app) {
272272
}
273273

274274
if (Client.lang == 0) {
275-
if (JavaMouseProvider.mouseClickButton == 1) {
275+
if (ClientMouseListener.mouseClickButton == 1) {
276276
byte var4 = 5;
277277
short var5 = 463;
278278
byte var6 = 100;
279279
byte var7 = 35;
280-
if (JavaMouseProvider.mouseClickX >= var4 && JavaMouseProvider.mouseClickX <= var4 + var6 && JavaMouseProvider.mouseClickY >= var5 && JavaMouseProvider.mouseClickY <= var5 + var7) {
280+
if (ClientMouseListener.mouseClickX >= var4 && ClientMouseListener.mouseClickX <= var4 + var6 && ClientMouseListener.mouseClickY >= var5 && ClientMouseListener.mouseClickY <= var5 + var7) {
281281
listFetch();
282282
return;
283283
}
@@ -287,9 +287,9 @@ public static void loop(GameShell app) {
287287
}
288288
}
289289

290-
int var8 = JavaMouseProvider.mouseClickButton;
291-
int var9 = JavaMouseProvider.mouseClickX;
292-
int var10 = JavaMouseProvider.mouseClickY;
290+
int var8 = ClientMouseListener.mouseClickButton;
291+
int var9 = ClientMouseListener.mouseClickX;
292+
int var10 = ClientMouseListener.mouseClickY;
293293

294294
if (loginscreen == 0) {
295295
short var11 = 302;
@@ -341,33 +341,33 @@ public static void loop(GameShell app) {
341341
loginPass = "";
342342
}
343343

344-
while (JavaKeyboardProvider.pollKey()) {
344+
while (ClientKeyboardListener.pollKey()) {
345345
boolean var21 = false;
346346
for (int var22 = 0; var22 < charList.length(); var22++) {
347-
if (JavaKeyboardProvider.ch == charList.charAt(var22)) {
347+
if (ClientKeyboardListener.ch == charList.charAt(var22)) {
348348
var21 = true;
349349
break;
350350
}
351351
}
352352

353353
if (field150 == 0) {
354-
if (JavaKeyboardProvider.code == 85 && loginUser.length() > 0) {
354+
if (ClientKeyboardListener.code == 85 && loginUser.length() > 0) {
355355
loginUser = loginUser.substring(0, loginUser.length() - 1);
356356
}
357-
if (JavaKeyboardProvider.code == 84 || JavaKeyboardProvider.code == 80) {
357+
if (ClientKeyboardListener.code == 84 || ClientKeyboardListener.code == 80) {
358358
field150 = 1;
359359
}
360360
if (var21 && loginUser.length() < 320) {
361-
loginUser += JavaKeyboardProvider.ch;
361+
loginUser += ClientKeyboardListener.ch;
362362
}
363363
} else if (field150 == 1) {
364-
if (JavaKeyboardProvider.code == 85 && loginPass.length() > 0) {
364+
if (ClientKeyboardListener.code == 85 && loginPass.length() > 0) {
365365
loginPass = loginPass.substring(0, loginPass.length() - 1);
366366
}
367-
if (JavaKeyboardProvider.code == 84 || JavaKeyboardProvider.code == 80) {
367+
if (ClientKeyboardListener.code == 84 || ClientKeyboardListener.code == 80) {
368368
field150 = 0;
369369
}
370-
if (Client.modewhere == 2 && JavaKeyboardProvider.code == 84) {
370+
if (Client.modewhere == 2 && ClientKeyboardListener.code == 84) {
371371
loginUser = loginUser.trim();
372372
if (loginUser.length() == 0) {
373373
loginMes(Text.field978, Text.field979, Text.field980);
@@ -382,7 +382,7 @@ public static void loop(GameShell app) {
382382
break;
383383
}
384384
if (var21 && loginPass.length() < 20) {
385-
loginPass += JavaKeyboardProvider.ch;
385+
loginPass += ClientKeyboardListener.ch;
386386
}
387387
}
388388
}
@@ -956,7 +956,7 @@ public static void worldSwitchRender(PixFontGeneric arg0, PixFontGeneric arg1) {
956956
var21 = false;
957957
}
958958

959-
if (JavaMouseProvider.mouseX >= var17 && JavaMouseProvider.mouseY >= var16 && JavaMouseProvider.mouseX < var6 + var17 && JavaMouseProvider.mouseY < var7 + var16 && var21) {
959+
if (ClientMouseListener.mouseX >= var17 && ClientMouseListener.mouseY >= var16 && ClientMouseListener.mouseX < var6 + var17 && ClientMouseListener.mouseY < var7 + var16 && var21) {
960960
slLastWorld = var19;
961961
slBack[var20.members ? 1 : 0].litPlotSprite(var17, var16, 128, 0xffffff);
962962
} else {
@@ -991,51 +991,51 @@ public static void worldSwitchRender(PixFontGeneric arg0, PixFontGeneric arg1) {
991991
// jag::oldscape::TitleScreen::WorldSwitchLoop
992992
@ObfuscatedName("cm.g(Ldj;I)V")
993993
public static void worldSwitchLoop(GameShell shell) {
994-
if (JavaMouseProvider.mouseClickButton != 1) {
994+
if (ClientMouseListener.mouseClickButton != 1) {
995995
return;
996996
}
997997

998998
short var1 = 280;
999-
if (JavaMouseProvider.mouseClickX >= var1 && JavaMouseProvider.mouseClickX <= var1 + 14 && JavaMouseProvider.mouseClickY >= 4 && JavaMouseProvider.mouseClickY <= 18) {
999+
if (ClientMouseListener.mouseClickX >= var1 && ClientMouseListener.mouseClickX <= var1 + 14 && ClientMouseListener.mouseClickY >= 4 && ClientMouseListener.mouseClickY <= 18) {
10001000
listReorder(0, 0);
10011001
return;
10021002
}
1003-
if (JavaMouseProvider.mouseClickX >= var1 + 15 && JavaMouseProvider.mouseClickX <= var1 + 80 && JavaMouseProvider.mouseClickY >= 4 && JavaMouseProvider.mouseClickY <= 18) {
1003+
if (ClientMouseListener.mouseClickX >= var1 + 15 && ClientMouseListener.mouseClickX <= var1 + 80 && ClientMouseListener.mouseClickY >= 4 && ClientMouseListener.mouseClickY <= 18) {
10041004
listReorder(0, 1);
10051005
return;
10061006
}
10071007

10081008
short var2 = 390;
1009-
if (JavaMouseProvider.mouseClickX >= var2 && JavaMouseProvider.mouseClickX <= var2 + 14 && JavaMouseProvider.mouseClickY >= 4 && JavaMouseProvider.mouseClickY <= 18) {
1009+
if (ClientMouseListener.mouseClickX >= var2 && ClientMouseListener.mouseClickX <= var2 + 14 && ClientMouseListener.mouseClickY >= 4 && ClientMouseListener.mouseClickY <= 18) {
10101010
listReorder(1, 0);
10111011
return;
10121012
}
1013-
if (JavaMouseProvider.mouseClickX >= var2 + 15 && JavaMouseProvider.mouseClickX <= var2 + 80 && JavaMouseProvider.mouseClickY >= 4 && JavaMouseProvider.mouseClickY <= 18) {
1013+
if (ClientMouseListener.mouseClickX >= var2 + 15 && ClientMouseListener.mouseClickX <= var2 + 80 && ClientMouseListener.mouseClickY >= 4 && ClientMouseListener.mouseClickY <= 18) {
10141014
listReorder(1, 1);
10151015
return;
10161016
}
10171017

10181018
short var3 = 500;
1019-
if (JavaMouseProvider.mouseClickX >= var3 && JavaMouseProvider.mouseClickX <= var3 + 14 && JavaMouseProvider.mouseClickY >= 4 && JavaMouseProvider.mouseClickY <= 18) {
1019+
if (ClientMouseListener.mouseClickX >= var3 && ClientMouseListener.mouseClickX <= var3 + 14 && ClientMouseListener.mouseClickY >= 4 && ClientMouseListener.mouseClickY <= 18) {
10201020
listReorder(2, 0);
10211021
return;
10221022
}
1023-
if (JavaMouseProvider.mouseClickX >= var3 + 15 && JavaMouseProvider.mouseClickX <= var3 + 80 && JavaMouseProvider.mouseClickY >= 4 && JavaMouseProvider.mouseClickY <= 18) {
1023+
if (ClientMouseListener.mouseClickX >= var3 + 15 && ClientMouseListener.mouseClickX <= var3 + 80 && ClientMouseListener.mouseClickY >= 4 && ClientMouseListener.mouseClickY <= 18) {
10241024
listReorder(2, 1);
10251025
return;
10261026
}
10271027

10281028
short var4 = 610;
1029-
if (JavaMouseProvider.mouseClickX >= var4 && JavaMouseProvider.mouseClickX <= var4 + 14 && JavaMouseProvider.mouseClickY >= 4 && JavaMouseProvider.mouseClickY <= 18) {
1029+
if (ClientMouseListener.mouseClickX >= var4 && ClientMouseListener.mouseClickX <= var4 + 14 && ClientMouseListener.mouseClickY >= 4 && ClientMouseListener.mouseClickY <= 18) {
10301030
listReorder(3, 0);
10311031
return;
10321032
}
1033-
if (JavaMouseProvider.mouseClickX >= var4 + 15 && JavaMouseProvider.mouseClickX <= var4 + 80 && JavaMouseProvider.mouseClickY >= 4 && JavaMouseProvider.mouseClickY <= 18) {
1033+
if (ClientMouseListener.mouseClickX >= var4 + 15 && ClientMouseListener.mouseClickX <= var4 + 80 && ClientMouseListener.mouseClickY >= 4 && ClientMouseListener.mouseClickY <= 18) {
10341034
listReorder(3, 1);
10351035
return;
10361036
}
10371037

1038-
if (JavaMouseProvider.mouseClickX >= 708 && JavaMouseProvider.mouseClickY >= 4 && JavaMouseProvider.mouseClickX <= 758 && JavaMouseProvider.mouseClickY <= 20) {
1038+
if (ClientMouseListener.mouseClickX >= 708 && ClientMouseListener.mouseClickY >= 4 && ClientMouseListener.mouseClickX <= 758 && ClientMouseListener.mouseClickY <= 20) {
10391039
switchScreen = false;
10401040
titleBack.quickPlotSprite(0, 0);
10411041
titleBack2.quickPlotSprite(382, 0);

src/main/java/jagex3/client/applet/JavaKeyboardProvider.java renamed to src/main/java/jagex3/client/applet/ClientKeyboardListener.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@
1010
import java.awt.event.KeyEvent;
1111
import java.awt.event.KeyListener;
1212

13+
// jag::oldscape::input::ClientKeyboardListener
1314
@ObfuscatedName("az")
14-
public class JavaKeyboardProvider implements KeyListener, FocusListener {
15+
public class ClientKeyboardListener implements KeyListener, FocusListener {
1516

1617
@ObfuscatedName("az.r")
17-
public static JavaKeyboardProvider instance = new JavaKeyboardProvider();
18+
public static ClientKeyboardListener instance = new ClientKeyboardListener();
1819

1920
@ObfuscatedName("az.cu")
2021
public static boolean[] keyHeld = new boolean[112];
@@ -94,15 +95,15 @@ public static void removeListeners(Component c) {
9495
@ObfuscatedName("dw.l(I)V")
9596
public static void shutdown() {
9697
if (instance != null) {
97-
JavaKeyboardProvider lock = instance;
98+
ClientKeyboardListener lock = instance;
9899
synchronized (lock) {
99100
instance = null;
100101
}
101102
}
102103
}
103104

104105
public static void cycle() {
105-
JavaKeyboardProvider lock = instance;
106+
ClientKeyboardListener lock = instance;
106107
synchronized (lock) {
107108
idleTimer++;
108109

@@ -198,10 +199,11 @@ public final synchronized void keyReleased(KeyEvent e) {
198199
e.consume();
199200
}
200201

202+
// jag::oldscape::input::ClientKeyboardListener::HandleKeyChar
201203
public final void keyTyped(KeyEvent e) {
202204
if (instance != null) {
203205
char ch = e.getKeyChar();
204-
if (ch != 0 && ch != 65535 && Cp1252.method767(ch)) {
206+
if (ch != 0 && ch != 65535 && Cp1252.canEncodeToCp1252(ch)) {
205207
int next = keyWritePos + 1 & 0x7F;
206208
if (keyReadPos != next) {
207209
keyCodeBuffer[keyWritePos] = -1;
@@ -254,7 +256,7 @@ public static void setupKeyCodeMap() {
254256
}
255257

256258
public static boolean pollKey() {
257-
JavaKeyboardProvider lock = instance;
259+
ClientKeyboardListener lock = instance;
258260
synchronized (lock) {
259261
if (keyReadPos == lastKeyWritePos) {
260262
return false;

src/main/java/jagex3/client/applet/JavaMouseProvider.java renamed to src/main/java/jagex3/client/applet/ClientMouseListener.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
import java.awt.*;
77
import java.awt.event.*;
88

9+
// jag::oldscape::input::ClientMouseListener
910
@ObfuscatedName("an")
10-
public class JavaMouseProvider implements MouseListener, MouseMotionListener, FocusListener {
11+
public class ClientMouseListener implements MouseListener, MouseMotionListener, FocusListener {
1112

1213
@ObfuscatedName("an.r")
13-
public static JavaMouseProvider instance = new JavaMouseProvider();
14+
public static ClientMouseListener instance = new ClientMouseListener();
1415

1516
@ObfuscatedName("an.d")
1617
public static volatile int idleTimer = 0;
@@ -70,7 +71,7 @@ public static void setIdleTimer(int v) {
7071
}
7172

7273
public static void cycle() {
73-
JavaMouseProvider lock = instance;
74+
ClientMouseListener lock = instance;
7475
synchronized (lock) {
7576
mouseButton = nextMouseButton;
7677
mouseX = nextMouseX;
@@ -179,7 +180,7 @@ public static void removeListeners(Canvas c) {
179180

180181
public static void shutdown() {
181182
if (instance != null) {
182-
JavaMouseProvider lock = instance;
183+
ClientMouseListener lock = instance;
183184
synchronized (lock) {
184185
instance = null;
185186
}

src/main/java/jagex3/client/applet/JavaMouseWheelProvider.java renamed to src/main/java/jagex3/client/applet/ClientMouseWheelListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import java.awt.event.MouseWheelListener;
88

99
@ObfuscatedName("dh")
10-
public class JavaMouseWheelProvider extends MouseWheelProvider implements MouseWheelListener {
10+
public class ClientMouseWheelListener extends MouseWheelInterface implements MouseWheelListener {
1111

1212
@ObfuscatedName("dh.r")
1313
public int rotation = 0;

‎src/main/java/jagex3/client/applet/GameShell.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ public void run() {
242242
}
243243

244244
String var6 = version.substring(6, var3);
245-
if (StringTools.method62(var6)) {
245+
if (StringTools.isInt(var6)) {
246246
int var7 = StringTools.checkedParseInt(var6, 10, true);
247247
if (var7 < 10) {
248248
this.error("wrongjava");

‎src/main/java/jagex3/client/applet/MouseTracking.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ public void run() {
2525
while (this.active) {
2626
synchronized (this.lock) {
2727
if (this.length < 500) {
28-
this.x[this.length] = JavaMouseProvider.mouseX;
29-
this.y[this.length] = JavaMouseProvider.mouseY;
28+
this.x[this.length] = ClientMouseListener.mouseX;
29+
this.y[this.length] = ClientMouseListener.mouseY;
3030
this.length++;
3131
}
3232
}

src/main/java/jagex3/client/applet/MouseWheelProvider.java renamed to src/main/java/jagex3/client/applet/MouseWheelInterface.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
import java.awt.*;
66

77
@ObfuscatedName("ac")
8-
public abstract class MouseWheelProvider {
8+
public abstract class MouseWheelInterface {
99

1010
@ObfuscatedName("bv.r(I)Lac;")
11-
public static MouseWheelProvider getProvider() {
11+
public static MouseWheelInterface getProvider() {
1212
try {
13-
return new JavaMouseWheelProvider();
13+
return new ClientMouseWheelListener();
1414
} catch (Throwable ex) {
1515
return null;
1616
}

0 commit comments

Comments
 (0)