2009Scape/rt4-client
1
0
Fork 0
mirror of https://gitlab.com/2009scape/rt4-client.git synced 2025-12-09 16:45:46 -07:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'deob' into 'master'

Browse source 
Deobfuscate a number of JagString and StringUtils values

See merge request 2009scape/rt4-client!12
This commit is contained in:
bushtail 2024-11-05 08:17:42 +00:00
commit 834cf0112a
6 changed files with 33 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/src/main/java/rt4/Cheat.java
View file

@ -102,7 +102,7 @@ public class Cheat {
@OriginalMember(owner = "client!en", name = "a", descriptor = "(IIIB)V") @OriginalMember(owner = "client!en", name = "a", descriptor = "(IIIB)V")
public static void teleport(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { public static void teleport(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) {
@Pc(66) JagString local66 = JagString.concatenate(new JagString[]{aClass100_521, JagString.parseInt(arg2), JagString.aClass100_760, JagString.parseInt(arg0 >> 6), JagString.aClass100_760, JagString.parseInt(arg1 >> 6), JagString.aClass100_760, JagString.parseInt(arg0 & 0x3F), JagString.aClass100_760, JagString.parseInt(arg1 & 0x3F)}); @Pc(66) JagString local66 = JagString.concatenate(new JagString[]{aClass100_521, JagString.parseInt(arg2), JagString.COMMA, JagString.parseInt(arg0 >> 6), JagString.COMMA, JagString.parseInt(arg1 >> 6), JagString.COMMA, JagString.parseInt(arg0 & 0x3F), JagString.COMMA, JagString.parseInt(arg1 & 0x3F)});
local66.print(); local66.print();
execute(local66); execute(local66);
} }

12
client/src/main/java/rt4/Cs1ScriptRunner.java
View file

@ -1034,7 +1034,7 @@ public class Cs1ScriptRunner {
local3297 = interpolate(component, local3297); local3297 = interpolate(component, local3297);
@Pc(3325) JagString local3325; @Pc(3325) JagString local3325;
while (local3297.length() > 0) { while (local3297.length() > 0) {
cardMemory = local3297.indexOf(JagString.aClass100_556); cardMemory = local3297.indexOf(JagString.LINE_BREAK);
if (cardMemory == -1) { if (cardMemory == -1) {
local3325 = local3297; local3325 = local3297;
local3297 = JagString.EMPTY; local3297 = JagString.EMPTY;
@ -1072,7 +1072,7 @@ public class Cs1ScriptRunner {
objId = local556 + local3299.lineHeight + 2; objId = local556 + local3299.lineHeight + 2;
local3297 = interpolate(component, local3297); local3297 = interpolate(component, local3297);
while (local3297.length() > 0) { while (local3297.length() > 0) {
local563 = local3297.indexOf(JagString.aClass100_556); local563 = local3297.indexOf(JagString.LINE_BREAK);
if (local563 == -1) { if (local563 == -1) {
local3325 = local3297; local3325 = local3297;
local3297 = JagString.EMPTY; local3297 = JagString.EMPTY;
@ -1246,14 +1246,14 @@ public class Cs1ScriptRunner {
public static JagString method1548(@OriginalArg(1) int arg0) { public static JagString method1548(@OriginalArg(1) int arg0) {
@Pc(9) JagString local9 = JagString.parseInt(arg0); @Pc(9) JagString local9 = JagString.parseInt(arg0);
for (@Pc(21) int local21 = local9.length() - 3; local21 > 0; local21 -= 3) { for (@Pc(21) int local21 = local9.length() - 3; local21 > 0; local21 -= 3) {
local9 = JagString.concatenate(new JagString[]{local9.substring(local21, 0), JagString.aClass100_760, local9.substring(local21)}); local9 = JagString.concatenate(new JagString[]{local9.substring(local21, 0), JagString.COMMA, local9.substring(local21)});
} }
if (local9.length() > 9) { if (local9.length() > 9) {
return JagString.concatenate(new JagString[]{JagString.aClass100_1043, local9.substring(local9.length() - 8, 0), LocalizedText.MILLION_SHORT, MiniMenu.OPEN_PARENTHESIS, local9, JagString.aClass100_583}); return JagString.concatenate(new JagString[]{JagString.LIGHT_GREEN, local9.substring(local9.length() - 8, 0), LocalizedText.MILLION_SHORT, MiniMenu.OPEN_PARENTHESIS, local9, JagString.aClass100_583});
} else if (local9.length() > 6) { } else if (local9.length() > 6) {
return JagString.concatenate(new JagString[]{JagString.aClass100_589, local9.substring(local9.length() - 4, 0), LocalizedText.THOUSAND_SHORT, MiniMenu.OPEN_PARENTHESIS, local9, JagString.aClass100_583}); return JagString.concatenate(new JagString[]{JagString.WHITE, local9.substring(local9.length() - 4, 0), LocalizedText.THOUSAND_SHORT, MiniMenu.OPEN_PARENTHESIS, local9, JagString.aClass100_583});
} else { } else {
return JagString.concatenate(new JagString[]{JagString.aClass100_1101, local9, JagString.aClass100_978}); return JagString.concatenate(new JagString[]{JagString.YELLOW, local9, JagString.aClass100_978});
} }
} }

2
client/src/main/java/rt4/DateUtil.java
View file

@ -94,6 +94,6 @@ public final class DateUtil {
@Pc(36) int local36 = calendar.get(Calendar.HOUR_OF_DAY); @Pc(36) int local36 = calendar.get(Calendar.HOUR_OF_DAY);
@Pc(40) int local40 = calendar.get(Calendar.MINUTE); @Pc(40) int local40 = calendar.get(Calendar.MINUTE);
@Pc(44) int local44 = calendar.get(Calendar.SECOND); @Pc(44) int local44 = calendar.get(Calendar.SECOND);
return JagString.concatenate(new JagString[]{DAYS[local13 - 1], JagString.aClass100_461, JagString.parseInt(local17 / 10), JagString.parseInt(local17 % 10), JagString.aClass100_1089, MONTHS[local21], JagString.aClass100_1089, JagString.parseInt(local32), JagString.SPACE, JagString.parseInt(local36 / 10), JagString.parseInt(local36 % 10), JagString.COLON, JagString.parseInt(local40 / 10), JagString.parseInt(local40 % 10), JagString.COLON, JagString.parseInt(local44 / 10), JagString.parseInt(local44 % 10), JagString.TIMEZONE}); return JagString.concatenate(new JagString[]{DAYS[local13 - 1], JagString.COMMA_SPACE, JagString.parseInt(local17 / 10), JagString.parseInt(local17 % 10), JagString.HYPHEN, MONTHS[local21], JagString.HYPHEN, JagString.parseInt(local32), JagString.SPACE, JagString.parseInt(local36 / 10), JagString.parseInt(local36 % 10), JagString.COLON, JagString.parseInt(local40 / 10), JagString.parseInt(local40 % 10), JagString.COLON, JagString.parseInt(local44 / 10), JagString.parseInt(local44 % 10), JagString.TIMEZONE});
} }
} }

22
client/src/main/java/rt4/JagString.java
View file

@ -17,35 +17,35 @@ public final class JagString implements StringInterface {
@OriginalMember(owner = "client!pa", name = "O", descriptor = "Lclient!na;") @OriginalMember(owner = "client!pa", name = "O", descriptor = "Lclient!na;")
public static final JagString EMPTY = parse(""); public static final JagString EMPTY = parse("");
@OriginalMember(owner = "client!pi", name = "Q", descriptor = "Lclient!na;") @OriginalMember(owner = "client!pi", name = "Q", descriptor = "Lclient!na;")
public static final JagString aClass100_853 = parse("null"); public static final JagString NULL = parse("null");
@OriginalMember(owner = "client!t", name = "C", descriptor = "Lclient!na;") @OriginalMember(owner = "client!t", name = "C", descriptor = "Lclient!na;")
public static final JagString PERIOD = parse(")3"); public static final JagString PERIOD = parse(")3");
@OriginalMember(owner = "client!vk", name = "a", descriptor = "[I") @OriginalMember(owner = "client!vk", name = "a", descriptor = "[I")
public static final int[] anIntArray471 = new int[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 73, 74, 76, 78, 83, 84, 85, 86, 91, 92, 93, 94, 95, 97, 103, 104, 105, 106, 107, 108, 113, 114, 115, 116, 118, 119, 120, 121, 122, 123, 124, 125, 133, 134, 136, 138, 143, 144, 145, 146, 151, 152, 153, 154, 155, 157, 163, 164, 165, 166, 168, 169, 174, 175, 176, 177, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 97, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 157, 215, 216, 117, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 66, 66, 66, 66, 66, 66, 65, 75, 79, 79, 79, 79, 87, 87, 87, 87, 77, 96, 98, 98, 98, 98, 98, 250, 251, 109, 109, 109, 109, 117, 252, 167, 126, 126, 126, 126, 126, 126, 125, 135, 139, 139, 139, 139, 147, 147, 147, 147, 137, 156, 158, 158, 158, 158, 158, 253, 254, 170, 170, 170, 170, 178, 255, 178}; public static final int[] anIntArray471 = new int[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 73, 74, 76, 78, 83, 84, 85, 86, 91, 92, 93, 94, 95, 97, 103, 104, 105, 106, 107, 108, 113, 114, 115, 116, 118, 119, 120, 121, 122, 123, 124, 125, 133, 134, 136, 138, 143, 144, 145, 146, 151, 152, 153, 154, 155, 157, 163, 164, 165, 166, 168, 169, 174, 175, 176, 177, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 97, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 157, 215, 216, 117, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 66, 66, 66, 66, 66, 66, 65, 75, 79, 79, 79, 79, 87, 87, 87, 87, 77, 96, 98, 98, 98, 98, 98, 250, 251, 109, 109, 109, 109, 117, 252, 167, 126, 126, 126, 126, 126, 126, 125, 135, 139, 139, 139, 139, 147, 147, 147, 147, 137, 156, 158, 158, 158, 158, 158, 253, 254, 170, 170, 170, 170, 178, 255, 178};
@OriginalMember(owner = "client!sh", name = "e", descriptor = "Lclient!na;") @OriginalMember(owner = "client!sh", name = "e", descriptor = "Lclient!na;")
public static final JagString aClass100_967 = parse(""); public static final JagString EMPTY2 = parse("");
@OriginalMember(owner = "client!dm", name = "n", descriptor = "Lclient!na;") @OriginalMember(owner = "client!dm", name = "n", descriptor = "Lclient!na;")
public static final JagString PERCENT_SIGN = parse("(U"); public static final JagString PERCENT_SIGN = parse("(U");
@OriginalMember(owner = "client!wa", name = "pb", descriptor = "Lclient!na;") @OriginalMember(owner = "client!wa", name = "pb", descriptor = "Lclient!na;")
public static final JagString aClass100_556 = parse("<br>"); public static final JagString LINE_BREAK = parse("<br>");
@OriginalMember(owner = "client!ed", name = "H", descriptor = "Lclient!na;") @OriginalMember(owner = "client!ed", name = "H", descriptor = "Lclient!na;")
public static final JagString aClass100_375 = parse("<)4col> x"); public static final JagString aClass100_375 = parse("<)4col> x");
@OriginalMember(owner = "client!je", name = "db", descriptor = "Lclient!na;") @OriginalMember(owner = "client!je", name = "db", descriptor = "Lclient!na;")
public static final JagString aClass100_589 = parse(" <col=ffffff>"); public static final JagString WHITE = parse(" <col=ffffff>");
@OriginalMember(owner = "client!uf", name = "s", descriptor = "Lclient!na;") @OriginalMember(owner = "client!uf", name = "s", descriptor = "Lclient!na;")
public static final JagString aClass100_1043 = parse(" <col=00ff80>"); public static final JagString LIGHT_GREEN = parse(" <col=00ff80>");
@OriginalMember(owner = "client!wj", name = "b", descriptor = "Lclient!na;") @OriginalMember(owner = "client!wj", name = "b", descriptor = "Lclient!na;")
public static final JagString aClass100_1101 = parse(" <col=ffff00>"); public static final JagString YELLOW = parse(" <col=ffff00>");
@OriginalMember(owner = "client!mi", name = "R", descriptor = "Lclient!na;") @OriginalMember(owner = "client!mi", name = "R", descriptor = "Lclient!na;")
public static final JagString aClass100_760 = parse(")1"); public static final JagString COMMA = parse(")1");
@OriginalMember(owner = "client!sj", name = "w", descriptor = "Lclient!na;") @OriginalMember(owner = "client!sj", name = "w", descriptor = "Lclient!na;")
public static final JagString aClass100_978 = parse("<)4col>"); public static final JagString aClass100_978 = parse("<)4col>");
@OriginalMember(owner = "client!jb", name = "c", descriptor = "Lclient!na;") @OriginalMember(owner = "client!jb", name = "c", descriptor = "Lclient!na;")
public static final JagString aClass100_583 = parse("(Y<)4col>"); public static final JagString aClass100_583 = parse("(Y<)4col>");
@OriginalMember(owner = "client!fn", name = "Z", descriptor = "Lclient!na;") @OriginalMember(owner = "client!fn", name = "Z", descriptor = "Lclient!na;")
public static final JagString aClass100_461 = parse(")1 "); public static final JagString COMMA_SPACE = parse(")1 ");
@OriginalMember(owner = "client!wb", name = "a", descriptor = "Lclient!na;") @OriginalMember(owner = "client!wb", name = "a", descriptor = "Lclient!na;")
public static final JagString aClass100_1089 = parse(")2"); public static final JagString HYPHEN = parse(")2");
@OriginalMember(owner = "client!dm", name = "j", descriptor = "Lclient!na;") @OriginalMember(owner = "client!dm", name = "j", descriptor = "Lclient!na;")
public static final JagString SPACE = parse(" "); public static final JagString SPACE = parse(" ");
@OriginalMember(owner = "client!vh", name = "c", descriptor = "Lclient!na;") @OriginalMember(owner = "client!vh", name = "c", descriptor = "Lclient!na;")
@ -76,7 +76,7 @@ public final class JagString implements StringInterface {
@Pc(5) int local5 = 0; @Pc(5) int local5 = 0;
for (@Pc(7) int local7 = 0; local7 < arg1; local7++) { for (@Pc(7) int local7 = 0; local7 < arg1; local7++) {
if (arg2[arg0 + local7] == null) { if (arg2[arg0 + local7] == null) {
arg2[local7 + arg0] = aClass100_853; arg2[local7 + arg0] = NULL;
} }
local5 += arg2[local7 + arg0].length; local5 += arg2[local7 + arg0].length;
} }
@ -1077,7 +1077,7 @@ public final class JagString implements StringInterface {
@OriginalMember(owner = "client!na", name = "k", descriptor = "(I)Lclient!na;") @OriginalMember(owner = "client!na", name = "k", descriptor = "(I)Lclient!na;")
public final JagString method3159() { public final JagString method3159() {
@Pc(9) JagString local9 = Base37.decode37(this.encode37()); @Pc(9) JagString local9 = Base37.decode37(this.encode37());
return local9 == null ? aClass100_967 : local9; return local9 == null ? EMPTY2 : local9;
} }
@OriginalMember(owner = "client!na", name = "a", descriptor = "(Z[BIII)I") @OriginalMember(owner = "client!na", name = "a", descriptor = "(Z[BIII)I")

26
client/src/main/java/rt4/StringUtils.java
View file

@ -6,17 +6,17 @@ import org.openrs2.deob.annotation.Pc;
public class StringUtils { public class StringUtils {
@OriginalMember(owner = "client!ag", name = "ab", descriptor = "Lclient!na;") @OriginalMember(owner = "client!ag", name = "ab", descriptor = "Lclient!na;")
public static final JagString aClass100_17 = JagString.parse("0"); public static final JagString ZERO = JagString.parse("0");
@OriginalMember(owner = "client!ca", name = "cb", descriptor = "Lclient!na;") @OriginalMember(owner = "client!ca", name = "cb", descriptor = "Lclient!na;")
public static final JagString nonBreakingSpace = JagString.getNbsp(); public static final JagString nonBreakingSpace = JagString.getNbsp();
@OriginalMember(owner = "client!rm", name = "i", descriptor = "Lclient!na;") @OriginalMember(owner = "client!rm", name = "i", descriptor = "Lclient!na;")
public static final JagString ASTERISK = JagString.parse("(Z"); public static final JagString ASTERISK = JagString.parse("(Z");
@OriginalMember(owner = "client!fm", name = "W", descriptor = "Lclient!na;") @OriginalMember(owner = "client!fm", name = "W", descriptor = "Lclient!na;")
public static final JagString aClass100_453 = JagString.parse(")2"); public static final JagString HYPHEN = JagString.parse(")2");
@OriginalMember(owner = "client!cg", name = "h", descriptor = "Lclient!na;") @OriginalMember(owner = "client!cg", name = "h", descriptor = "Lclient!na;")
public static final JagString aClass100_185 = JagString.parse(")3"); public static final JagString PERIOD = JagString.parse(")3");
@OriginalMember(owner = "client!tl", name = "i", descriptor = "Lclient!na;") @OriginalMember(owner = "client!tl", name = "i", descriptor = "Lclient!na;")
public static final JagString aClass100_1017 = JagString.parse(")1"); public static final JagString COMMA = JagString.parse(")1");
@OriginalMember(owner = "client!vf", name = "a", descriptor = "(IB)Lclient!na;") @OriginalMember(owner = "client!vf", name = "a", descriptor = "(IB)Lclient!na;")
public static JagString toString(@OriginalArg(0) int arg0) { public static JagString toString(@OriginalArg(0) int arg0) {
@ -28,21 +28,21 @@ public class StringUtils {
@Pc(9) JagString local9 = JagString.allocate(0); @Pc(9) JagString local9 = JagString.allocate(0);
if (arg3 < 0L) { if (arg3 < 0L) {
arg3 = -arg3; arg3 = -arg3;
local9.method3113(aClass100_453); local9.method3113(HYPHEN);
} }
@Pc(26) JagString local26 = aClass100_1017; @Pc(26) JagString local26 = COMMA;
@Pc(28) JagString local28 = aClass100_185; @Pc(28) JagString local28 = PERIOD;
if (arg0 == 1) { if (arg0 == 1) {
local26 = aClass100_185; local26 = PERIOD;
local28 = aClass100_1017; local28 = COMMA;
} }
if (arg0 == 2) { if (arg0 == 2) {
local28 = aClass100_1017; local28 = COMMA;
local26 = nonBreakingSpace; local26 = nonBreakingSpace;
} }
if (arg0 == 3) { if (arg0 == 3) {
local26 = aClass100_185; local26 = PERIOD;
local28 = aClass100_1017; local28 = COMMA;
} }
@Pc(59) JagString local59 = JagString.allocate(0); @Pc(59) JagString local59 = JagString.allocate(0);
@Pc(61) int local61; @Pc(61) int local61;
@ -53,7 +53,7 @@ public class StringUtils {
local61 = 0; local61 = 0;
@Pc(137) JagString local137; @Pc(137) JagString local137;
if (arg3 == 0L) { if (arg3 == 0L) {
local137 = aClass100_17; local137 = ZERO;
} else { } else {
@Pc(95) JagString local95 = JagString.allocate(0); @Pc(95) JagString local95 = JagString.allocate(0);
while (arg3 > 0L) { while (arg3 > 0L) {

2
client/src/main/java/rt4/client.java
View file

@ -881,7 +881,7 @@ public final class client extends GameShell {
} else if (gameState == 30) { } else if (gameState == 30) {
LoginManager.method1841(); LoginManager.method1841();
} else if (gameState == 40) { } else if (gameState == 40) {
Fonts.drawTextOnScreen(false, JagString.concatenate(new JagString[]{LocalizedText.CONLOST, JagString.aClass100_556, LocalizedText.ATTEMPT_TO_REESTABLISH})); Fonts.drawTextOnScreen(false, JagString.concatenate(new JagString[]{LocalizedText.CONLOST, JagString.LINE_BREAK, LocalizedText.ATTEMPT_TO_REESTABLISH}));
} }
if (GlRenderer.enabled && gameState != 0) { if (GlRenderer.enabled && gameState != 0) {
GlRenderer.swapBuffers(); GlRenderer.swapBuffers();