Skip to content
This repository has been archived by the owner on Jan 5, 2025. It is now read-only.

Commit

Permalink
Merge pull request #1 from Ilwyd/player
Browse files Browse the repository at this point in the history 
rename Player variables and clientModeGame / clientLanguageId
  • Loading branch information
@DesecratedTree
DesecratedTree authored Mar 2, 2024
2 parents 4add1e0 + f4de0f2 commit e150c5f
Show file tree
Hide file tree
Showing 46 changed files with 230 additions and 230 deletions.
2 changes: 1 addition & 1 deletion client/src/main/java/Class362.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public boolean method8349() {
if (this.aPrivilegedRequest7 == null) {
try {
@Pc(23) int local23 = ModeWhere.LIVE == Static2.aModeWhere1 ? 80 : Static527.aClass229_3.worldId + 7000;
this.aPrivilegedRequest7 = Static446.aSignlink6.method8992(new URL("http://" + Static527.aClass229_3.aString60 + ":" + local23 + "/news.ws?game=" + Static392.aModeGame4.id));
this.aPrivilegedRequest7 = Static446.aSignlink6.method8992(new URL("http://" + Static527.aClass229_3.aString60 + ":" + local23 + "/news.ws?game=" + Static392.clientModeGame.id));
} catch (@Pc(54) MalformedURLException local54) {
return true;
}
Expand Down
28 changes: 14 additions & 14 deletions client/src/main/java/Player.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
public final class Player extends PathingEntity {

@OriginalMember(owner = "client!ca", name = "Sc", descriptor = "Ljava/lang/String;")
public String aString8;
public String name1;

@OriginalMember(owner = "client!ca", name = "Mc", descriptor = "Lclient!ju;")
public PlayerAppearance aPlayerAppearance1;

@OriginalMember(owner = "client!ca", name = "xd", descriptor = "Ljava/lang/String;")
public String aString9;
public String name2;

@OriginalMember(owner = "client!ca", name = "bd", descriptor = "I")
public int anInt1441;
Expand Down Expand Up @@ -49,7 +49,7 @@ public final class Player extends PathingEntity {
public boolean aBoolean126 = false;

@OriginalMember(owner = "client!ca", name = "cd", descriptor = "I")
public int anInt1437 = 0;
public int combatLevel1 = 0;

@OriginalMember(owner = "client!ca", name = "Ad", descriptor = "I")
public int anInt1436 = 0;
Expand All @@ -67,7 +67,7 @@ public final class Player extends PathingEntity {
public boolean aBoolean129 = false;

@OriginalMember(owner = "client!ca", name = "Fd", descriptor = "I")
public int anInt1444 = 0;
public int combatLevel2 = 0;

@OriginalMember(owner = "client!ca", name = "zd", descriptor = "Z")
public boolean aBoolean128 = false;
Expand Down Expand Up @@ -202,7 +202,7 @@ public void method9285(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @
@Override
protected int method9320(@OriginalArg(0) int arg0) {
if (arg0 != 0) {
this.anInt1444 = -112;
this.combatLevel2 = -112;
}
return this.anInt1443;
}
Expand Down Expand Up @@ -485,22 +485,22 @@ public void method1420(@OriginalArg(0) Packet arg0) {
local332[local184] = local191;
}
this.anInt1443 = arg0.g2();
this.aString8 = arg0.gjstr();
this.name1 = arg0.gjstr();
if (Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2 == this) {
Static515.aString96 = this.aString8;
Static515.aString96 = this.name1;
}
this.aString9 = this.aString8;
this.anInt1444 = arg0.g1();
this.name2 = this.name1;
this.combatLevel2 = arg0.g1();
if (local40) {
this.anInt1436 = arg0.g2();
this.anInt1437 = this.anInt1444;
this.combatLevel1 = this.combatLevel2;
if (this.anInt1436 == 65535) {
this.anInt1436 = -1;
}
this.anInt1471 = -1;
} else {
this.anInt1436 = 0;
this.anInt1437 = arg0.g1();
this.combatLevel1 = arg0.g1();
this.anInt1471 = arg0.g1();
if (this.anInt1471 == 255) {
this.anInt1471 = -1;
Expand Down Expand Up @@ -630,7 +630,7 @@ public boolean method9311() {

@OriginalMember(owner = "client!ca", name = "a", descriptor = "(ZI)Ljava/lang/String;")
public String method1422() {
return this.aString9;
return this.name2;
}

@OriginalMember(owner = "client!ca", name = "a", descriptor = "(ZZ)Ljava/lang/String;")
Expand All @@ -657,7 +657,7 @@ public String method1424(@OriginalArg(0) boolean arg0) {
local40[this.aByte31] = -1;
}
}
local5 = local5 + this.aString8;
local5 = local5 + this.name1;
if (Static377.aStringArray30 != null) {
local5 = local5 + Static377.aStringArray30[this.aByte31];
}
Expand All @@ -674,7 +674,7 @@ public Class80 method9318(@OriginalArg(0) int arg0) {
if (super.aClass80_3.aString20 == null) {
return null;
}
if (Static133.anInt2458 == 0 || Static133.anInt2458 == 3 || Static133.anInt2458 == 1 && Static362.method5241(arg0 + 3109, this.aString9)) {
if (Static133.anInt2458 == 0 || Static133.anInt2458 == 3 || Static133.anInt2458 == 1 && Static362.method5241(arg0 + 3109, this.name2)) {
return super.aClass80_3;
}
}
Expand Down
18 changes: 9 additions & 9 deletions client/src/main/java/Protocol.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep
arg0.packetType = null;
return true;
} else if (ServerProt.OPCODE_89 == arg0.packetType) {
Static331.aString52 = arg0.anInt3648 <= 2 ? LocalizedText.WALK_HERE.get(Static51.anInt1052) : local11.gjstr();
Static331.aString52 = arg0.anInt3648 <= 2 ? LocalizedText.WALK_HERE.get(Static51.clientLanguageId) : local11.gjstr();
Static331.anInt5439 = arg0.anInt3648 <= 0 ? -1 : local11.g2();
if (Static331.anInt5439 == 65535) {
Static331.anInt5439 = -1;
Expand Down Expand Up @@ -1794,7 +1794,7 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep
Static87.aClass241Array1[local1449].anInt6148 = local1409;
Static87.aClass241Array1[local1449].aByte99 = local7377;
Static87.aClass241Array1[local1449].aString65 = local1427;
if (local627.equals(Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aString9)) {
if (local627.equals(Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.name2)) {
Static682.aByte142 = local7377;
}
Static352.anInt5754 = Static642.anInt9599;
Expand All @@ -1817,7 +1817,7 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep
}
Static87.aClass241Array1[local1449 + 1] = local7394;
Static706.anInt10633++;
if (local627.equals(Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aString9)) {
if (local627.equals(Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.name2)) {
Static682.aByte142 = local7377;
}
}
Expand Down Expand Up @@ -1849,12 +1849,12 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep
local526 = local11.g2();
local1409 = local11.g1();
local6565 = (local526 & 0x8000) != 0;
if (local7724.aString9 != null && local7724.aPlayerAppearance1 != null) {
if (local7724.name2 != null && local7724.aPlayerAppearance1 != null) {
local1425 = false;
if (local1409 <= 1) {
if (!local6565 && (Static389.aBoolean459 && !Static34.aBoolean62 || Static617.aBoolean724)) {
local1425 = true;
} else if (Static71.method1524(local7724.aString9)) {
} else if (Static71.method1524(local7724.name2)) {
local1425 = true;
}
}
Expand All @@ -1875,11 +1875,11 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep
local1449 = local6565 ? 17 : 2;
}
if (local1409 == 2) {
Static662.method8625("<img=1>" + local7724.method1422(), "<img=1>" + local7724.method1424(false), local996, local1427, (String) null, 0, local7724.aString8, local1449);
Static662.method8625("<img=1>" + local7724.method1422(), "<img=1>" + local7724.method1424(false), local996, local1427, (String) null, 0, local7724.name1, local1449);
} else if (local1409 == 1) {
Static662.method8625("<img=0>" + local7724.method1422(), "<img=0>" + local7724.method1424(false), local996, local1427, (String) null, 0, local7724.aString8, local1449);
Static662.method8625("<img=0>" + local7724.method1422(), "<img=0>" + local7724.method1424(false), local996, local1427, (String) null, 0, local7724.name1, local1449);
} else {
Static662.method8625(local7724.method1422(), local7724.method1424(false), local996, local1427, (String) null, 0, local7724.aString8, local1449);
Static662.method8625(local7724.method1422(), local7724.method1424(false), local996, local1427, (String) null, 0, local7724.name1, local1449);
}
}
}
Expand Down Expand Up @@ -2062,7 +2062,7 @@ public static boolean method4334(@OriginalArg(0) Connection arg0) throws IOExcep
local8611[local2098].anInt6148 = local11.g2();
local8611[local2098].aByte99 = local11.g1b();
local8611[local2098].aString65 = local11.gjstr();
if (local8611[local2098].aString66.equals(Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aString9)) {
if (local8611[local2098].aString66.equals(Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.name2)) {
Static682.aByte142 = local8611[local2098].aByte99;
}
}
Expand Down
2 changes: 1 addition & 1 deletion client/src/main/java/Static104.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public static void method2029(@OriginalArg(1) String arg0) {
@Pc(39) int[] local39 = Static664.method8652(local6);
@Pc(43) int local43 = local6.buffer.pos;
local6.buffer.pjstr(arg0);
local6.buffer.p1(Static51.anInt1052);
local6.buffer.p1(Static51.clientLanguageId);
local6.buffer.pos += 7;
local6.buffer.tinyenc(local39, local43, local6.buffer.pos);
local6.buffer.psize2(local6.buffer.pos - local28);
Expand Down
2 changes: 1 addition & 1 deletion client/src/main/java/Static147.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public static void method2417(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1
}
} else {
if (Static501.aBoolean576) {
Static416.method5707(false, -1, 0L, local140, local142, LocalizedText.FACE_HERE.get(Static51.anInt1052), 11, true, -1, "", (long) (local142 | local140 << 0), true);
Static416.method5707(false, -1, 0L, local140, local142, LocalizedText.FACE_HERE.get(Static51.clientLanguageId), 11, true, -1, "", (long) (local142 | local140 << 0), true);
}
Static416.method5707(false, -1, 0L, local140, local142, Static331.aString52, 58, true, Static331.anInt5439, "", (long) (local142 | local140 << 0), true);
}
Expand Down
2 changes: 1 addition & 1 deletion client/src/main/java/Static149.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public static void method2449(@OriginalArg(0) Class19 arg0) {
@Pc(23) int local23 = local7 + Static84.anInt1775;
@Pc(25) int local25 = Static682.anInt10295;
@Pc(29) int local29 = Static407.anInt6288 - 3;
Static87.method1693(Static682.anInt10295, Static407.anInt6288, LocalizedText.CHOOSE_OPTION.get(Static51.anInt1052), arg0, local7 + Static84.anInt1775, Static71.anInt1576 - -local5);
Static87.method1693(Static682.anInt10295, Static407.anInt6288, LocalizedText.CHOOSE_OPTION.get(Static51.clientLanguageId), arg0, local7 + Static84.anInt1775, Static71.anInt1576 - -local5);
@Pc(55) int local55 = Static189.aMouse1.method8853() + local5;
@Pc(66) int local66 = local7 + Static189.aMouse1.method8854();
@Pc(70) int local70;
Expand Down
2 changes: 1 addition & 1 deletion client/src/main/java/Static159.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public static void method2574(@OriginalArg(0) Class19 arg0) {
local9 = Static422.method5771();
}
Static97.method1905(Static84.anInt1775 + local9, Static71.anInt1576 - -local7, Static407.anInt6288, arg0, Static682.anInt10295);
Static180.aClass14_3.method8829(Static71.anInt1576 + local7 + 3, Static84.anInt1775 - (-local9 + -14), LocalizedText.CHOOSE_OPTION.get(Static51.anInt1052), -1, -10660793);
Static180.aClass14_3.method8829(Static71.anInt1576 + local7 + 3, Static84.anInt1775 - (-local9 + -14), LocalizedText.CHOOSE_OPTION.get(Static51.clientLanguageId), -1, -10660793);
@Pc(69) int local69 = Static189.aMouse1.method8853() + local7;
@Pc(76) int local76 = Static189.aMouse1.method8854() + local9;
@Pc(80) int local80;
Expand Down
4 changes: 2 additions & 2 deletions client/src/main/java/Static161.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,9 @@ public static void method2585(@OriginalArg(1) Player arg0, @OriginalArg(2) int a
@Pc(574) String local574 = arg2.gjstr();
if (local574.charAt(0) == '~') {
local574 = local574.substring(1);
Static44.method1072(local574, arg0.method1424(false), 0, arg0.aString8, arg0.method1422(), 2);
Static44.method1072(local574, arg0.method1424(false), 0, arg0.name1, arg0.method1422(), 2);
} else if (arg0 == Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2) {
Static44.method1072(local574, arg0.method1424(false), 0, arg0.aString8, arg0.method1422(), 2);
Static44.method1072(local574, arg0.method1424(false), 0, arg0.name1, arg0.method1422(), 2);
}
arg0.method1413(0, 0, local574);
}
Expand Down
2 changes: 1 addition & 1 deletion client/src/main/java/Static229.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ public final class Static229 {
public static void method3368() {
if (Static473.aClass140_22 != null) {
Static449.aClass364_1 = new Class364();
Static449.aClass364_1.method8374(Static473.aClass140_22.anInt3271, Static473.aClass140_22.aLocalizedText_63.get(Static51.anInt1052), Static473.aClass140_22, Static72.aLong52);
Static449.aClass364_1.method8374(Static473.aClass140_22.anInt3271, Static473.aClass140_22.aLocalizedText_63.get(Static51.clientLanguageId), Static473.aClass140_22, Static72.aLong52);
Static242.aThread1 = new Thread(Static449.aClass364_1, "");
Static242.aThread1.start();
}
Expand Down
20 changes: 10 additions & 10 deletions client/src/main/java/Static231.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ public static void method3381(@OriginalArg(1) boolean arg0, @OriginalArg(2) bool
return;
}
} catch (@Pc(323) Exception local323) {
Static79.method1579(LocalizedText.ERROR_EXECUTING.get(Static51.anInt1052));
Static79.method1579(LocalizedText.ERROR_EXECUTING.get(Static51.clientLanguageId));
return;
}
if (ModeWhere.LIVE != Static2.aModeWhere1 || Static608.anInt9290 >= 2) {
Expand Down Expand Up @@ -802,12 +802,12 @@ public static void method3381(@OriginalArg(1) boolean arg0, @OriginalArg(2) bool
return;
}
} catch (@Pc(2894) Exception local2894) {
Static79.method1579(LocalizedText.ERROR_EXECUTING.get(Static51.anInt1052));
Static79.method1579(LocalizedText.ERROR_EXECUTING.get(Static51.clientLanguageId));
return;
}
}
if (Static283.gameState != 11) {
Static79.method1579(LocalizedText.UNKNOWN_COMMAND.get(Static51.anInt1052) + arg2);
Static79.method1579(LocalizedText.UNKNOWN_COMMAND.get(Static51.clientLanguageId) + arg2);
}
}

Expand All @@ -817,7 +817,7 @@ public static void method3382(@OriginalArg(0) boolean arg0, @OriginalArg(1) Stri
return;
}
if (Static436.anInt3849 >= 100) {
Static67.method6098(LocalizedText.IGNORE_FULL.get(Static51.anInt1052));
Static67.method6098(LocalizedText.IGNORE_FULL.get(Static51.clientLanguageId));
return;
}
@Pc(27) String local27 = Static390.method5492(arg1);
Expand All @@ -828,33 +828,33 @@ public static void method3382(@OriginalArg(0) boolean arg0, @OriginalArg(1) Stri
for (@Pc(33) int local33 = 0; local33 < Static436.anInt3849; local33++) {
@Pc(40) String local40 = Static390.method5492(Static632.aStringArray44[local33]);
if (local40 != null && local40.equals(local27)) {
Static67.method6098(arg1 + LocalizedText.IGNORE_ALREADY_ADDED.get(Static51.anInt1052));
Static67.method6098(arg1 + LocalizedText.IGNORE_ALREADY_ADDED.get(Static51.clientLanguageId));
return;
}
if (Static10.aStringArray1[local33] != null) {
local76 = Static390.method5492(Static10.aStringArray1[local33]);
if (local76 != null && local76.equals(local27)) {
Static67.method6098(arg1 + LocalizedText.IGNORE_ALREADY_ADDED.get(Static51.anInt1052));
Static67.method6098(arg1 + LocalizedText.IGNORE_ALREADY_ADDED.get(Static51.clientLanguageId));
return;
}
}
}
for (@Pc(106) int local106 = 0; local106 < Static327.anInt5392; local106++) {
local76 = Static390.method5492(Static330.aStringArray25[local106]);
if (local76 != null && local76.equals(local27)) {
Static67.method6098(LocalizedText.FRIEND_REMOVE_PRE.get(Static51.anInt1052) + arg1 + LocalizedText.FRIEND_REMOVE_POST.get(Static51.anInt1052));
Static67.method6098(LocalizedText.FRIEND_REMOVE_PRE.get(Static51.clientLanguageId) + arg1 + LocalizedText.FRIEND_REMOVE_POST.get(Static51.clientLanguageId));
return;
}
if (Static572.aStringArray42[local106] != null) {
@Pc(154) String local154 = Static390.method5492(Static572.aStringArray42[local106]);
if (local154 != null && local154.equals(local27)) {
Static67.method6098(LocalizedText.FRIEND_REMOVE_PRE.get(Static51.anInt1052) + arg1 + LocalizedText.FRIEND_REMOVE_POST.get(Static51.anInt1052));
Static67.method6098(LocalizedText.FRIEND_REMOVE_PRE.get(Static51.clientLanguageId) + arg1 + LocalizedText.FRIEND_REMOVE_POST.get(Static51.clientLanguageId));
return;
}
}
}
if (Static390.method5492(Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.aString9).equals(local27)) {
Static67.method6098(LocalizedText.IGNORE_CANNOT_ADD_SELF.get(Static51.anInt1052));
if (Static390.method5492(Static556.aClass8_Sub2_Sub1_Sub2_Sub1_2.name2).equals(local27)) {
Static67.method6098(LocalizedText.IGNORE_CANNOT_ADD_SELF.get(Static51.clientLanguageId));
return;
}
@Pc(216) Connection local216 = Connection.getActiveConnection();
Expand Down
Loading

0 comments on commit e150c5f

Please sign in to comment.