Skip to content

Commit 9204b79

Browse files
PazazPazaz
committed
chore: Assigned names to JagString members based on behavior
1 parent 2e2fa67 commit 9204b79

9 files changed

Lines changed: 132 additions & 132 deletions

File tree

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1387,7 +1387,7 @@ public static void errorUsage(boolean arg0) {
13871387
System.out.println("Usage: worldid, [live/office/local], [live/rc/wip], [lowmem/highmem], [free/members], [english/german], [game0/game1]");
13881388
System.exit(1);
13891389
if (arg0) {
1390-
JagString.method782(-33);
1390+
JagString.isAlphanumericChar(-33);
13911391
}
13921392
}
13931393

@@ -3366,13 +3366,13 @@ public static void doCheat(JagString arg0) {
33663366
}
33673367
}
33683368
if (arg0.startsWith(AUTO_FPS) && modewhere != 0) {
3369-
GameShell.setFramerate(arg0.substring(6).method603());
3369+
GameShell.setFramerate(arg0.substring(6).toInt());
33703370
}
33713371
if (arg0.equalsIgnoreCase(AUTO_ERRORTEST) && modewhere == 2) {
33723372
throw new RuntimeException();
33733373
}
33743374
if (arg0.startsWith(AUTO_RECT_DEBUG)) {
3375-
componentRectDebug = arg0.substring(12).method602().method603();
3375+
componentRectDebug = arg0.substring(12).trim().toInt();
33763376
addChat(JagString.join(new JagString[] { field1750, JagString.parseInt(componentRectDebug) }), 0, null);
33773377
}
33783378
if (arg0.equalsIgnoreCase(AUTO_QA_OP_TEST)) {
@@ -6877,7 +6877,7 @@ public static boolean tcpInInner() throws IOException {
68776877
if (!var186 && chatDisabled == 0) {
68786878
field3203[field1150] = var184;
68796879
field1150 = (field1150 + 1) % 100;
6880-
JagString var189 = PixfontGeneric.escape(WordPack.unpack2(in).method622());
6880+
JagString var189 = PixfontGeneric.escape(WordPack.unpack2(in).toSentenceCase());
68816881
if (var183 == 2 || var183 == 3) {
68826882
friendAddChat(JagString.join(new JagString[] { field472, JagString.toRawUsername(var175).toScreenName() }), var189, JagString.toRawUsername(var177).toScreenName());
68836883
} else if (var183 == 1) {
@@ -6938,7 +6938,7 @@ public static boolean tcpInInner() throws IOException {
69386938
if (!var199 && chatDisabled == 0) {
69396939
field3203[field1150] = var197;
69406940
field1150 = (field1150 + 1) % 100;
6941-
JagString var202 = PixfontGeneric.escape(WordPack.unpack2(in).method622());
6941+
JagString var202 = PixfontGeneric.escape(WordPack.unpack2(in).toSentenceCase());
69426942
if (var196 == 2 || var196 == 3) {
69436943
addChat(var202, 7, JagString.join(new JagString[] { field472, JagString.toRawUsername(var190).toScreenName() }));
69446944
} else if (var196 == 1) {
@@ -7567,7 +7567,7 @@ public static boolean tcpInInner() throws IOException {
75677567
} else if (ptype == 172) {
75687568
// MESSAGE_PRIVATE_ECHO
75697569
long var327 = in.g8();
7570-
JagString var329 = PixfontGeneric.escape(WordPack.unpack2(in).method622());
7570+
JagString var329 = PixfontGeneric.escape(WordPack.unpack2(in).toSentenceCase());
75717571
addChat(var329, 6, JagString.toRawUsername(var327).toScreenName());
75727572
ptype = -1;
75737573
return true;
@@ -8322,9 +8322,9 @@ public static void getPlayerPosExtended(int arg0, ClientPlayer arg1, int arg2) {
83228322
var13 &= 0x7FFF;
83238323
var23 = var24.type.decodeMessage(tempP);
83248324
} else {
8325-
var23 = PixfontGeneric.escape(WordPack.unpack2(tempP).method622());
8325+
var23 = PixfontGeneric.escape(WordPack.unpack2(tempP).toSentenceCase());
83268326
}
8327-
arg1.chat = var23.method602();
8327+
arg1.chat = var23.trim();
83288328
arg1.chatTimer = 150;
83298329
arg1.chatColour = var13 >> 8;
83308330
arg1.chatEffect = var13 & 0xFF;
@@ -9395,7 +9395,7 @@ public static void doAction(int arg0) {
93959395

93969396
@ObfuscatedName("be.a(ILi;I)V")
93979397
public static void opPlayer(JagString arg0, int arg1) {
9398-
JagString var2 = arg0.method611().toScreenName();
9398+
JagString var2 = arg0.toCleanUsername().toScreenName();
93999399
boolean var3 = false;
94009400
for (int var4 = 0; var4 < playerCount; var4++) {
94019401
ClientPlayer var5 = players[playerIds[var4]];
@@ -12308,7 +12308,7 @@ public static boolean hide(IfType arg0) {
1230812308
public static JagString getIfTypeOpName(IfType arg0, int arg1) {
1230912309
if (!ServerActive.hasOp(arg1, getActive(arg0)) && arg0.onop == null) {
1231012310
return null;
12311-
} else if (arg0.opNames == null || arg1 >= arg0.opNames.length || arg0.opNames[arg1] == null || arg0.opNames[arg1].method602().length() == 0) {
12311+
} else if (arg0.opNames == null || arg1 >= arg0.opNames.length || arg0.opNames[arg1] == null || arg0.opNames[arg1].trim().length() == 0) {
1231212312
return qaOpTest ? JagString.join(new JagString[] {field1802, JagString.parseInt(arg1) }) : null;
1231312313
} else {
1231412314
return arg0.opNames[arg1];
@@ -12319,7 +12319,7 @@ public static JagString getIfTypeOpName(IfType arg0, int arg1) {
1231912319
public static JagString targetVerb(IfType arg0) {
1232012320
if (ServerActive.targetMask(getActive(arg0)) == 0) {
1232112321
return null;
12322-
} else if (arg0.targetVerb == null || arg0.targetVerb.method602().length() == 0) {
12322+
} else if (arg0.targetVerb == null || arg0.targetVerb.trim().length() == 0) {
1232312323
return qaOpTest ? field2321 : null;
1232412324
} else {
1232512325
return arg0.targetVerb;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,7 @@ public static void setFramerate(int arg0) {
680680
@ObfuscatedName("pb.b(ILi;)V")
681681
public static void method1138(JagString arg0) {
682682
try {
683-
shell.getAppletContext().showDocument(arg0.method632(shell.getCodeBase()), "_blank");
683+
shell.getAppletContext().showDocument(arg0.resolveURL(shell.getCodeBase()), "_blank");
684684
} catch (Exception var1) {
685685
}
686686
}
@@ -698,7 +698,7 @@ public static void method1132(JagString arg0) {
698698
if (arg0.length() == 0) {
699699
var4 = JagString.join(new JagString[] { var3, field920});
700700
} else {
701-
var4 = JagString.join(new JagString[] { var3, field1982, method1139(MonotonicTime.currentTime() + 94608000000L), field1767, JagString.method1556(94608000L) });
701+
var4 = JagString.join(new JagString[] { var3, field1982, method1139(MonotonicTime.currentTime() + 94608000000L), field1767, JagString.valueOf(94608000L) });
702702
}
703703
JagString.join(new JagString[] {field3237, var4, field591}).eval(signlink.applet);
704704
} catch (Throwable var5) {

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ public static void executeScript(HookReq arg0, int arg1) {
309309
if (var382 == 37) {
310310
int var22 = var8[var7];
311311
var6 -= var22;
312-
JagString var23 = JagString.method1133(var22, stringStack, var6);
312+
JagString var23 = JagString.joinRange(var22, stringStack, var6);
313313
stringStack[var6++] = var23;
314314
continue;
315315
}
@@ -1277,8 +1277,8 @@ public static void executeScript(HookReq arg0, int arg1) {
12771277
var6--;
12781278
JagString var337 = stringStack[var6];
12791279
int var338 = 0;
1280-
if (var337.method621()) {
1281-
var338 = var337.method603();
1280+
if (var337.isDecimal()) {
1281+
var338 = var337.toInt();
12821282
}
12831283
Client.out.p1Enc(152);
12841284
Client.out.p4(var338);
@@ -2010,7 +2010,7 @@ public static void executeScript(HookReq arg0, int arg1) {
20102010
JagString var258 = stringStack[var6];
20112011
var5--;
20122012
int var259 = intStack[var5];
2013-
stringStack[var6++] = JagString.join(new JagString[]{var258, JagString.method375(var259)});
2013+
stringStack[var6++] = JagString.join(new JagString[]{var258, JagString.formatIntSigned(var259)});
20142014
continue;
20152015
}
20162016
if (var382 == 4103) {
@@ -2049,7 +2049,7 @@ public static void executeScript(HookReq arg0, int arg1) {
20492049
}
20502050
if (var382 == 4107) {
20512051
var6 -= 2;
2052-
intStack[var5++] = stringStack[var6].method627(stringStack[var6 + 1]);
2052+
intStack[var5++] = stringStack[var6].compareSorted(stringStack[var6 + 1]);
20532053
continue;
20542054
}
20552055
if (var382 == 4108) {
@@ -2102,31 +2102,31 @@ public static void executeScript(HookReq arg0, int arg1) {
21022102
if (var283 == -1) {
21032103
throw new RuntimeException("null char");
21042104
}
2105-
stringStack[var6++] = var284.method618(var283);
2105+
stringStack[var6++] = var284.appendChar(var283);
21062106
continue;
21072107
}
21082108
if (var382 == 4113) {
21092109
var5--;
21102110
int var285 = intStack[var5];
2111-
intStack[var5++] = JagString.method1489(var285) ? 1 : 0;
2111+
intStack[var5++] = JagString.isPrintableChar(var285) ? 1 : 0;
21122112
continue;
21132113
}
21142114
if (var382 == 4114) {
21152115
var5--;
21162116
int var286 = intStack[var5];
2117-
intStack[var5++] = JagString.method782(var286) ? 1 : 0;
2117+
intStack[var5++] = JagString.isAlphanumericChar(var286) ? 1 : 0;
21182118
continue;
21192119
}
21202120
if (var382 == 4115) {
21212121
var5--;
21222122
int var287 = intStack[var5];
2123-
intStack[var5++] = JagString.method746(var287) ? 1 : 0;
2123+
intStack[var5++] = JagString.isLetterChar(var287) ? 1 : 0;
21242124
continue;
21252125
}
21262126
if (var382 == 4116) {
21272127
var5--;
21282128
int var288 = intStack[var5];
2129-
intStack[var5++] = JagString.method24(var288) ? 1 : 0;
2129+
intStack[var5++] = JagString.isDigitChar(var288) ? 1 : 0;
21302130
continue;
21312131
}
21322132
if (var382 == 4117) {
@@ -2163,7 +2163,7 @@ public static void executeScript(HookReq arg0, int arg1) {
21632163
var294.append(var297);
21642164
}
21652165
}
2166-
var294.method629();
2166+
var294.compact();
21672167
stringStack[var6++] = var294;
21682168
continue;
21692169
}
@@ -2173,7 +2173,7 @@ public static void executeScript(HookReq arg0, int arg1) {
21732173
JagString var298 = stringStack[var6];
21742174
int var299 = intStack[var5];
21752175
int var300 = intStack[var5 + 1];
2176-
intStack[var5++] = var298.method594(var299, var300);
2176+
intStack[var5++] = var298.indexOfChar(var299, var300);
21772177
continue;
21782178
}
21792179
if (var382 == 4121) {
@@ -2182,19 +2182,19 @@ public static void executeScript(HookReq arg0, int arg1) {
21822182
var5--;
21832183
int var302 = intStack[var5];
21842184
JagString var303 = stringStack[var6];
2185-
intStack[var5++] = var303.method634(var302, var301);
2185+
intStack[var5++] = var303.indexOfFrom(var302, var301);
21862186
continue;
21872187
}
21882188
if (var382 == 4122) {
21892189
var5--;
21902190
int var304 = intStack[var5];
2191-
intStack[var5++] = JagString.method102(var304);
2191+
intStack[var5++] = JagString.toLowerCaseChar(var304);
21922192
continue;
21932193
}
21942194
if (var382 == 4123) {
21952195
var5--;
21962196
int var305 = intStack[var5];
2197-
intStack[var5++] = JagString.method51(var305);
2197+
intStack[var5++] = JagString.toUpperCaseChar(var305);
21982198
continue;
21992199
}
22002200
} else if (var382 < 4300) {

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ public static void draw(PixfontGeneric arg0, PixfontGeneric arg1) {
207207
int var11 = var10 + 10;
208208
arg1.drawString(JagString.join(new JagString[] { Text.USERNAMEPROMPT, PixfontGeneric.escape(loginUser) }), 272, 266, 16777215, 0);
209209
int var13 = var11 + 15;
210-
arg1.drawString(JagString.join(new JagString[] { Text.PASSWORDPROMPT, loginPass.method596() }), 274, 281, 16777215, 0);
210+
arg1.drawString(JagString.join(new JagString[] { Text.PASSWORDPROMPT, loginPass.toMaskedString() }), 274, 281, 16777215, 0);
211211
int var15 = var13 + 15;
212212
}
213213
if (Client.state == 10) {
@@ -243,7 +243,7 @@ public static void draw(PixfontGeneric arg0, PixfontGeneric arg1) {
243243
var5 = false;
244244
}
245245
var12 += 15;
246-
arg1.drawString(JagString.join(new JagString[] { Text.PASSWORDPROMPT, loginPass.method596(), var5 ? field3843 : AUTO_EMPTY}), 274, 281, 16777215, 0);
246+
arg1.drawString(JagString.join(new JagString[] { Text.PASSWORDPROMPT, loginPass.toMaskedString(), var5 ? field3843 : AUTO_EMPTY}), 274, 281, 16777215, 0);
247247
titleBut.plotSprite(229, 301);
248248
var12 += 15;
249249
arg1.centreString(Text.LOGIN, 302, 326, 16777215, 0);
@@ -354,7 +354,7 @@ public static void loop(GameShell arg0) {
354354
}
355355
var8 += 15;
356356
if (var1 == 1 && var2 >= 227 && var2 <= 377 && var3 >= 301 && var3 <= 341) {
357-
loginUser = loginUser.method611().toScreenName();
357+
loginUser = loginUser.toCleanUsername().toScreenName();
358358
if (loginUser.length() == 0) {
359359
loginMes(Text.LOGIN_USER_LENGTH_C, Text.LOGIN_USER_LENGTH_A, Text.LOGIN_USER_LENGTH_B);
360360
} else if (loginPass.length() == 0) {
@@ -390,7 +390,7 @@ public static void loop(GameShell arg0) {
390390
loginSelect = 1;
391391
}
392392
if (var6 && loginUser.length() < 12) {
393-
loginUser = loginUser.method618(ClientKeyboardListener.ch);
393+
loginUser = loginUser.appendChar(ClientKeyboardListener.ch);
394394
}
395395
}
396396
return;
@@ -402,7 +402,7 @@ public static void loop(GameShell arg0) {
402402
loginSelect = 0;
403403
}
404404
if (Client.modewhere != 0 && ClientKeyboardListener.code == 84) {
405-
loginUser = loginUser.method611().toScreenName();
405+
loginUser = loginUser.toCleanUsername().toScreenName();
406406
if (loginUser.length() == 0) {
407407
loginMes(Text.LOGIN_USER_LENGTH_C, Text.LOGIN_USER_LENGTH_A, Text.LOGIN_USER_LENGTH_B);
408408
return;
@@ -416,7 +416,7 @@ public static void loop(GameShell arg0) {
416416
return;
417417
}
418418
if (var6 && loginPass.length() < 20) {
419-
loginPass = loginPass.method618(ClientKeyboardListener.ch);
419+
loginPass = loginPass.appendChar(ClientKeyboardListener.ch);
420420
}
421421
}
422422
}
@@ -907,7 +907,7 @@ public static void drawFlames() {
907907
public static void listFetch() {
908908
try {
909909
if (gameworldListDownloadRequest == null) {
910-
gameworldListDownloadRequest = new HTTPRequest(GameShell.signlink, JagString.join(new JagString[] { field3983, JagString.parseInt(Client.lang), field915}).method606());
910+
gameworldListDownloadRequest = new HTTPRequest(GameShell.signlink, JagString.join(new JagString[] { field3983, JagString.parseInt(Client.lang), field915}).toURL());
911911
} else {
912912
byte[] var0 = gameworldListDownloadRequest.getData();
913913
if (var0 != null) {
@@ -1108,7 +1108,7 @@ public static void worldSwitchLoop(GameShell arg0) {
11081108
}
11091109
JagString var3 = JagString.join(new JagString[]{AUTO_PROTOCOL, var1.host, AUTO_DOMAIN, JagString.parseInt(Client.lang), AUTO_ANDL, JagString.parseInt(Client.lowMem ? 1 : 0), AUTO_ANDP, JagString.parseInt(Client.plug), AUTO_ANDJS, JagString.parseInt(Client.js)});
11101110
try {
1111-
arg0.getAppletContext().showDocument(var3.method606(), "_self");
1111+
arg0.getAppletContext().showDocument(var3.toURL(), "_self");
11121112
} catch (Exception var4) {
11131113
}
11141114
}

‎src/main/java/jagex3/config/QuickChatPhraseType.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public static JagString formatDynamicValue(long arg0, int arg1, int[] arg2) {
8080
return var4;
8181
}
8282
}
83-
return arg1 == 5 ? JagString.toRawUsername(arg0).toScreenName() : JagString.method1556(arg0);
83+
return arg1 == 5 ? JagString.toRawUsername(arg0).toScreenName() : JagString.valueOf(arg0);
8484
}
8585

8686
@ObfuscatedName("si.a(BI)I")
@@ -96,7 +96,7 @@ public int getDynamicCommandCount() {
9696
@ObfuscatedName("si.a(BLea;I)V")
9797
public void decodeInner(Packet arg0, int arg1) {
9898
if (arg1 == 1) {
99-
this.textSegments = arg0.gjstr().method600(60);
99+
this.textSegments = arg0.gjstr().splitOn(60);
100100
} else if (arg1 == 2) {
101101
int var3 = arg0.g1();
102102
this.autoResponses = new int[var3];
@@ -128,7 +128,7 @@ public JagString decodeMessage(Packet arg0) {
128128
}
129129
}
130130
var2.append(this.textSegments[this.textSegments.length - 1]);
131-
return var2.method629();
131+
return var2.compact();
132132
}
133133

134134
@ObfuscatedName("si.e(I)Li;")
@@ -142,7 +142,7 @@ public JagString getText() {
142142
var1.append(field3644);
143143
var1.append(this.textSegments[var2]);
144144
}
145-
return var1.method629();
145+
return var1.compact();
146146
}
147147

148148
@ObfuscatedName("si.a(Lea;B)V")

0 commit comments

Comments
 (0)