ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

rs-client: name Language (#1090)

Browse Source
This commit is contained in:
Lucwousin
2019-07-23 23:21:00 +02:00
committed by ThatGamerBlue
parent 8422c71e83
commit 2f5a53149e
15 changed files with 100 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
runescape-client/src/main/java/Client.java
View File

@@ -1585,9 +1585,9 @@ public final class Client extends GameShell implements Usernamed {
class189.ByteArrayPool_arrays = null;
}
class190.port1 = gameBuild == 0 ? 43594 : worldId + 40000;
Language.port1 = gameBuild == 0 ? 43594 : worldId + 40000;
Skeleton.port2 = gameBuild == 0 ? 443 : worldId + 50000;
Varcs.port3 = class190.port1;
Varcs.port3 = Language.port1;
ModelData0.field1870 = class215.field2540;
class247.field3291 = class215.field2541;
WorldMapCacheName.field309 = class215.field2542;
@@ -1880,8 +1880,8 @@ public final class Client extends GameShell implements Usernamed {
class80.pcmPlayer0.shutdown();
}
if (class190.pcmPlayer1 != null) {
class190.pcmPlayer1.shutdown();
if (Language.pcmPlayer1 != null) {
Language.pcmPlayer1.shutdown();
}
if (NetCache.NetCache_socket != null) {
@@ -1951,14 +1951,14 @@ public final class Client extends GameShell implements Usernamed {
break;
case 6:
int var6 = Integer.parseInt(var4);
class190 var11;
if (var6 >= 0 && var6 < class190.field2355.length) {
var11 = class190.field2355[var6];
Language var11;
if (var6 >= 0 && var6 < Language.Language_valuesOrdered.length) {
var11 = Language.Language_valuesOrdered[var6];
} else {
var11 = null;
}
ScriptFrame.field528 = var11;
ScriptFrame.clientLanguage = var11;
break;
case 7:
PacketBufferNode.field2337 = ServerBuild.valueOf(Integer.parseInt(var4));
@@ -2125,10 +2125,10 @@ public final class Client extends GameShell implements Usernamed {
class191.js5SocketTask = null;
HealthBarUpdate.js5Socket = null;
js5ConnectState = 0;
if (class190.port1 == Varcs.port3) {
if (Language.port1 == Varcs.port3) {
Varcs.port3 = Skeleton.port2;
} else {
Varcs.port3 = class190.port1;
Varcs.port3 = Language.port1;
}
++js5Errors;
@@ -2232,8 +2232,8 @@ public final class Client extends GameShell implements Usernamed {
class80.pcmPlayer0.method2407();
}
if (class190.pcmPlayer1 != null) {
class190.pcmPlayer1.method2407();
if (Language.pcmPlayer1 != null) {
Language.pcmPlayer1.method2407();
}
var14 = true;
@@ -2247,8 +2247,8 @@ public final class Client extends GameShell implements Usernamed {
class80.pcmPlayer0.method2407();
}
if (class190.pcmPlayer1 != null) {
class190.pcmPlayer1.method2407();
if (Language.pcmPlayer1 != null) {
Language.pcmPlayer1.method2407();
}
if (var15 != 0) {
@@ -2562,10 +2562,10 @@ public final class Client extends GameShell implements Usernamed {
++field687;
if (field687 > 2000) {
if (field688 < 1) {
if (class190.port1 == Varcs.port3) {
if (Language.port1 == Varcs.port3) {
Varcs.port3 = Skeleton.port2;
} else {
Varcs.port3 = class190.port1;
Varcs.port3 = Language.port1;
}
++field688;
@@ -2635,10 +2635,10 @@ public final class Client extends GameShell implements Usernamed {
}
} catch (IOException var22) {
if (field688 < 1) {
if (Varcs.port3 == class190.port1) {
if (Varcs.port3 == Language.port1) {
Varcs.port3 = Skeleton.port2;
} else {
Varcs.port3 = class190.port1;
Varcs.port3 = Language.port1;
}
++field688;
@@ -3203,7 +3203,7 @@ public final class Client extends GameShell implements Usernamed {
if (isCameraLocked) {
var4 = DevicePcmPlayerProvider.field412 * 16384 + 64;
var5 = class210.field2516 * 16384 + 64;
var6 = ScriptEvent.getTileHeight(var4, var5, class42.plane) - class190.field2345;
var6 = ScriptEvent.getTileHeight(var4, var5, class42.plane) - Language.field2345;
if (PacketBuffer.cameraX < var4) {
PacketBuffer.cameraX = (var4 - PacketBuffer.cameraX) * class96.field1327 / 1000 + PacketBuffer.cameraX + class83.field1166;
if (PacketBuffer.cameraX > var4) {
@@ -4202,13 +4202,13 @@ public final class Client extends GameShell implements Usernamed {
isCameraLocked = true;
DevicePcmPlayerProvider.field412 = var3.readUnsignedByte() * 128;
class210.field2516 = var3.readUnsignedByte() * 128;
class190.field2345 = var3.readUnsignedShort();
Language.field2345 = var3.readUnsignedShort();
class83.field1166 = var3.readUnsignedByte();
class96.field1327 = var3.readUnsignedByte();
if (class96.field1327 >= 100) {
PacketBuffer.cameraX = DevicePcmPlayerProvider.field412 * 16384 + 64;
class1.cameraZ = class210.field2516 * 16384 + 64;
class43.cameraY = ScriptEvent.getTileHeight(PacketBuffer.cameraX, class1.cameraZ, class42.plane) - class190.field2345;
class43.cameraY = ScriptEvent.getTileHeight(PacketBuffer.cameraX, class1.cameraZ, class42.plane) - Language.field2345;
}
var1.serverPacket = null;

4
runescape-client/src/main/java/ClientPreferences.java
View File

@@ -356,7 +356,7 @@ public class ClientPreferences {
} else if (var14.startsWith("glow3:")) {
var17 = 11;
var3 = var3.substring("glow3:".length());
} else if (ScriptFrame.field528 != class190.field2348) {
} else if (ScriptFrame.clientLanguage != Language.Language_EN) {
if (var14.startsWith("yellow:")) {
var17 = 0;
var3 = var3.substring("yellow:".length());
@@ -413,7 +413,7 @@ public class ClientPreferences {
} else if (var14.startsWith("slide:")) {
var7 = 5;
var3 = var3.substring("slide:".length());
} else if (class190.field2348 != ScriptFrame.field528) {
} else if (Language.Language_EN != ScriptFrame.clientLanguage) {
if (var14.startsWith("wave:")) {
var7 = 1;
var3 = var3.substring("wave:".length());

88
runescape-client/src/main/java/class190.java → runescape-client/src/main/java/Language.java
View File

@@ -1,11 +1,13 @@
import java.util.Locale;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("gu")
public class class190 implements Enumerated {
@Implements("Language")
public class Language implements Enumerated {
@ObfuscatedName("qk")
@ObfuscatedSignature(
signature = "Ldn;"
@@ -21,42 +23,50 @@ public class class190 implements Enumerated {
@ObfuscatedSignature(
signature = "Lgu;"
)
public static final class190 field2348;
@Export("Language_EN")
public static final Language Language_EN;
@ObfuscatedName("w")
@ObfuscatedSignature(
signature = "Lgu;"
)
static final class190 field2351;
@Export("Language_DE")
static final Language Language_DE;
@ObfuscatedName("e")
@ObfuscatedSignature(
signature = "Lgu;"
)
public static final class190 field2347;
@Export("Language_FR")
public static final Language Language_FR;
@ObfuscatedName("p")
@ObfuscatedSignature(
signature = "Lgu;"
)
static final class190 field2352;
@Export("Language_PT")
static final Language Language_PT;
@ObfuscatedName("k")
@ObfuscatedSignature(
signature = "Lgu;"
)
static final class190 field2349;
@Export("Language_NL")
static final Language Language_NL;
@ObfuscatedName("l")
@ObfuscatedSignature(
signature = "Lgu;"
)
public static final class190 field2350;
@Export("Language_ES")
public static final Language Language_ES;
@ObfuscatedName("b")
@ObfuscatedSignature(
signature = "Lgu;"
)
static final class190 field2360;
@Export("Language_ES_MX")
static final Language Language_ES_MX;
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "[Lgu;"
)
public static final class190[] field2355;
@Export("Language_valuesOrdered")
public static final Language[] Language_valuesOrdered;
@ObfuscatedName("eg")
@ObfuscatedGetter(
intValue = -1179519055
@@ -66,32 +76,34 @@ public class class190 implements Enumerated {
@ObfuscatedName("i")
final String field2346;
@ObfuscatedName("c")
final String field2353;
@Export("language")
final String language;
@ObfuscatedName("f")
@ObfuscatedGetter(
intValue = 1003386863
)
final int field2354;
@Export("id")
final int id;
static {
field2348 = new class190("EN", "en", "English", class192.field2375, 0, "GB");
field2351 = new class190("DE", "de", "German", class192.field2375, 1, "DE");
field2347 = new class190("FR", "fr", "French", class192.field2375, 2, "FR");
field2352 = new class190("PT", "pt", "Portuguese", class192.field2375, 3, "BR");
field2349 = new class190("NL", "nl", "Dutch", class192.field2381, 4, "NL");
field2350 = new class190("ES", "es", "Spanish", class192.field2381, 5, "ES");
field2360 = new class190("ES_MX", "es-mx", "Spanish (Latin American)", class192.field2375, 6, "MX");
class190[] var0 = method3664();
field2355 = new class190[var0.length];
class190[] var1 = var0;
Language_EN = new Language("EN", "en", "English", class192.field2375, 0, "GB");
Language_DE = new Language("DE", "de", "German", class192.field2375, 1, "DE");
Language_FR = new Language("FR", "fr", "French", class192.field2375, 2, "FR");
Language_PT = new Language("PT", "pt", "Portuguese", class192.field2375, 3, "BR");
Language_NL = new Language("NL", "nl", "Dutch", class192.field2381, 4, "NL");
Language_ES = new Language("ES", "es", "Spanish", class192.field2381, 5, "ES");
Language_ES_MX = new Language("ES_MX", "es-mx", "Spanish (Latin American)", class192.field2375, 6, "MX");
Language[] var0 = Language_values();
Language_valuesOrdered = new Language[var0.length];
Language[] var1 = var0;
for (int var2 = 0; var2 < var1.length; ++var2) {
class190 var3 = var1[var2];
if (field2355[var3.field2354] != null) {
Language var3 = var1[var2];
if (Language_valuesOrdered[var3.id] != null) {
throw new IllegalStateException();
}
field2355[var3.field2354] = var3;
Language_valuesOrdered[var3.id] = var3;
}
}
@@ -99,14 +111,14 @@ public class class190 implements Enumerated {
@ObfuscatedSignature(
signature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lgd;ILjava/lang/String;)V"
)
class190(String var1, String var2, String var3, class192 var4, int var5, String var6) {
Language(String var1, String language, String var3, class192 var4, int var5, String country) {
this.field2346 = var1;
this.field2353 = var2;
this.field2354 = var5;
if (var6 != null) {
new Locale(var2.substring(0, 2), var6);
this.language = language;
this.id = var5;
if (country != null) {
new Locale(language.substring(0, 2), country);
} else {
new Locale(var2.substring(0, 2));
new Locale(language.substring(0, 2));
}
}
@@ -116,8 +128,9 @@ public class class190 implements Enumerated {
signature = "(I)Ljava/lang/String;",
garbageValue = "1097353533"
)
String method3656() {
return this.field2353;
@Export("getLanguage")
String getLanguage() {
return this.language;
}
@ObfuscatedName("e")
@@ -127,11 +140,11 @@ public class class190 implements Enumerated {
)
@Export("rsOrdinal")
public int rsOrdinal() {
return this.field2354;
return this.id;
}
public String toString() {
return this.method3656().toLowerCase(Locale.ENGLISH);
return this.getLanguage().toLowerCase(Locale.ENGLISH);
}
@ObfuscatedName("q")
@@ -139,8 +152,9 @@ public class class190 implements Enumerated {
signature = "(B)[Lgu;",
garbageValue = "99"
)
static class190[] method3664() {
return new class190[]{field2351, field2349, field2347, field2350, field2348, field2360, field2352};
@Export("Language_values")
static Language[] Language_values() {
return new Language[]{Language_DE, Language_NL, Language_FR, Language_ES, Language_EN, Language_ES_MX, Language_PT};
}
@ObfuscatedName("i")
@@ -199,6 +213,6 @@ public class class190 implements Enumerated {
}
String var4 = "runescape.com";
return var2 + var0 + "." + var4 + "/l=" + ScriptFrame.field528 + "/a=" + InvDefinition.field3199 + var3 + "/";
return var2 + var0 + "." + var4 + "/l=" + ScriptFrame.clientLanguage + "/a=" + InvDefinition.field3199 + var3 + "/";
}
}

4
runescape-client/src/main/java/MenuAction.java
View File

@@ -49,7 +49,7 @@ public class MenuAction {
signature = "(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Lgu;B)I",
garbageValue = "-1"
)
public static int method1993(CharSequence var0, CharSequence var1, class190 var2) {
public static int method1993(CharSequence var0, CharSequence var1, Language var2) {
int var3 = var0.length();
int var4 = var1.length();
int var5 = 0;
@@ -130,7 +130,7 @@ public class MenuAction {
int var17;
char var20;
for (var17 = 0; var17 < var16; ++var17) {
if (var2 == class190.field2347) {
if (var2 == Language.Language_FR) {
var5 = var3 - 1 - var17;
var6 = var4 - 1 - var17;
} else {

4
runescape-client/src/main/java/MusicPatchPcmStream.java
View File

@@ -225,9 +225,9 @@ public class MusicPatchPcmStream extends PcmStream {
ClientPreferences.worldHost = var0.host;
Client.worldId = var0.id;
Client.worldProperties = var0.properties;
class190.port1 = Client.gameBuild == 0 ? 43594 : var0.id + 40000;
Language.port1 = Client.gameBuild == 0 ? 43594 : var0.id + 40000;
Skeleton.port2 = Client.gameBuild == 0 ? 443 : var0.id + 50000;
Varcs.port3 = class190.port1;
Varcs.port3 = Language.port1;
}
@ObfuscatedName("ih")

6
runescape-client/src/main/java/PacketBufferNode.java
View File

@@ -80,7 +80,7 @@ public class PacketBufferNode extends Node {
signature = "(CLgu;I)C",
garbageValue = "1821592074"
)
static char method3623(char var0, class190 var1) {
static char method3623(char var0, Language var1) {
if (var0 >= 192 && var0 <= 255) {
if (var0 >= 192 && var0 <= 198) {
return 'A';
@@ -98,7 +98,7 @@ public class PacketBufferNode extends Node {
return 'I';
}
if (var0 == 209 && var1 != class190.field2350) {
if (var0 == 209 && var1 != Language.Language_ES) {
return 'N';
}
@@ -134,7 +134,7 @@ public class PacketBufferNode extends Node {
return 'i';
}
if (var0 == 241 && var1 != class190.field2350) {
if (var0 == 241 && var1 != Language.Language_ES) {
return 'n';
}

3
runescape-client/src/main/java/ScriptFrame.java
View File

@@ -26,7 +26,8 @@ public class ScriptFrame {
@ObfuscatedSignature(
signature = "Lgu;"
)
static class190 field528;
@Export("clientLanguage")
static Language clientLanguage;
@ObfuscatedName("q")
@ObfuscatedSignature(
signature = "Lcx;"

4
runescape-client/src/main/java/Timer.java
View File

@@ -315,9 +315,9 @@ public class Timer {
class80.pcmPlayer0 = ArchiveDiskActionHandler.method4256(GameShell.taskHandler, 0, 22050);
class80.pcmPlayer0.setStream(var33);
ArchiveLoader.setAudioArchives(GrandExchangeOfferOwnWorldComparator.archive15, Tile.archive14, class13.archive4, var33);
class190.pcmPlayer1 = ArchiveDiskActionHandler.method4256(GameShell.taskHandler, 1, 2048);
Language.pcmPlayer1 = ArchiveDiskActionHandler.method4256(GameShell.taskHandler, 1, 2048);
SecureRandomCallable.pcmStreamMixer = new PcmStreamMixer();
class190.pcmPlayer1.setStream(SecureRandomCallable.pcmStreamMixer);
Language.pcmPlayer1.setStream(SecureRandomCallable.pcmStreamMixer);
AttackOption.decimator = new Decimator(22050, CollisionMap.PcmPlayer_sampleRate);
Login.Login_loadingText = "Prepared sound engine";
Login.Login_loadingPercent = 35;

4
runescape-client/src/main/java/UserComparator10.java
View File

@@ -56,7 +56,7 @@ public class UserComparator10 extends AbstractUserComparator {
} else {
long var1;
try {
URL var3 = new URL(class190.method3666("services", false) + "m=accountappeal/login.ws");
URL var3 = new URL(Language.method3666("services", false) + "m=accountappeal/login.ws");
URLConnection var4 = var3.openConnection();
var4.setRequestProperty("connection", "close");
var4.setDoInput(true);
@@ -171,7 +171,7 @@ public class UserComparator10 extends AbstractUserComparator {
byte var30;
try {
URL var17 = new URL(class190.method3666("services", false) + "m=accountappeal/login.ws");
URL var17 = new URL(Language.method3666("services", false) + "m=accountappeal/login.ws");
URLConnection var18 = var17.openConnection();
var18.setDoInput(true);
var18.setDoOutput(true);

12
runescape-client/src/main/java/VarbitDefinition.java
View File

@@ -207,7 +207,7 @@ public class VarbitDefinition extends DualNode {
}
long var11 = DirectByteArrayCopier.currentTimeMs();
if (class190.method3667() && -1L == Login.field1211) {
if (Language.method3667() && -1L == Login.field1211) {
Login.field1211 = var11;
if (Login.field1211 > Login.field1193) {
Login.field1193 = Login.field1211;
@@ -215,7 +215,7 @@ public class VarbitDefinition extends DualNode {
}
if (Client.gameState == 10 || Client.gameState == 11) {
if (class190.field2348 == ScriptFrame.field528) {
if (Language.Language_EN == ScriptFrame.clientLanguage) {
if (MouseHandler.MouseHandler_lastButton == 1 || !DevicePcmPlayerProvider.mouseCam && MouseHandler.MouseHandler_lastButton == 4) {
var3 = Login.xPadding + 5;
short var4 = 463;
@@ -258,7 +258,7 @@ public class VarbitDefinition extends DualNode {
var7 = ScriptEvent.loginBoxCenter - 80;
var8 = 291;
if (var3 == 1 && var15 >= var7 - 75 && var15 <= var7 + 75 && var16 >= var8 - 20 && var16 <= var8 + 20) {
GrandExchangeOfferWorldComparator.openURL(class190.method3666("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false);
GrandExchangeOfferWorldComparator.openURL(Language.method3666("secure", true) + "m=account-creation/g=oldscape/create_account_funnel.ws", true, false);
}
var7 = ScriptEvent.loginBoxCenter + 80;
@@ -506,7 +506,7 @@ public class VarbitDefinition extends DualNode {
}
if (var3 == 1 && var15 >= Login.loginBoxX + 180 - 34 && var15 <= Login.loginBoxX + 34 + 180 && var16 >= 351 && var16 <= 363) {
GrandExchangeOfferWorldComparator.openURL(class190.method3666("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false);
GrandExchangeOfferWorldComparator.openURL(Language.method3666("secure", true) + "m=totp-authenticator/disableTOTPRequest", true, false);
}
var18 = Login.loginBoxX + 180 + 80;
@@ -576,7 +576,7 @@ public class VarbitDefinition extends DualNode {
if (WorldMapAreaData.field332 != null) {
var22 = WorldMapAreaData.field332.highX / 2;
if (var3 == 1 && var15 >= WorldMapAreaData.field332.lowX - var22 && var15 <= var22 + WorldMapAreaData.field332.lowX && var16 >= var8 - 15 && var16 < var8) {
GrandExchangeOfferWorldComparator.openURL(class190.method3666("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false);
GrandExchangeOfferWorldComparator.openURL(Language.method3666("secure", true) + "m=weblogin/g=oldscape/cant_log_in", true, false);
}
}
@@ -626,7 +626,7 @@ public class VarbitDefinition extends DualNode {
var18 = Login.loginBoxX + 180 - 80;
var20 = 321;
if (var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) {
GrandExchangeOfferWorldComparator.openURL(class190.method3666("secure", true) + "m=dob/set_dob.ws", true, false);
GrandExchangeOfferWorldComparator.openURL(Language.method3666("secure", true) + "m=dob/set_dob.ws", true, false);
class268.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)");
Login.loginIndex = 6;
return;

4
runescape-client/src/main/java/WorldMapArea.java
View File

@@ -715,14 +715,14 @@ public class WorldMapArea {
signature = "(CLgu;I)I",
garbageValue = "-2081105774"
)
static int method387(char var0, class190 var1) {
static int method387(char var0, Language var1) {
int var2 = var0 << 4;
if (Character.isUpperCase(var0) || Character.isTitleCase(var0)) {
var0 = Character.toLowerCase(var0);
var2 = (var0 << 4) + 1;
}
if (var0 == 241 && var1 == class190.field2350) {
if (var0 == 241 && var1 == Language.Language_ES) {
var2 = 1762;
}

4
runescape-client/src/main/java/class186.java
View File

@@ -36,8 +36,8 @@ public class class186 {
)
@Export("playPcmPlayers")
static final void playPcmPlayers() {
if (class190.pcmPlayer1 != null) {
class190.pcmPlayer1.run();
if (Language.pcmPlayer1 != null) {
Language.pcmPlayer1.run();
}
if (class80.pcmPlayer0 != null) {

2
runescape-client/src/main/java/class189.java
View File

@@ -335,7 +335,7 @@ public class class189 {
}
Login.title_muteSprite[WorldMapLabelSize.clientPreferences.titleMusicDisabled ? 1 : 0].drawAt(Login.xPadding + 765 - 40, 463);
if (Client.gameState > 5 && ScriptFrame.field528 == class190.field2348) {
if (Client.gameState > 5 && ScriptFrame.clientLanguage == Language.Language_EN) {
if (class30.field264 != null) {
var23 = Login.xPadding + 5;
var24 = 463;

2
runescape-client/src/main/java/class208.java
View File

@@ -69,7 +69,7 @@ public class class208 {
}
if (var0 == ScriptOpcodes.COMPARE) {
Skills.Interpreter_stringStackSize -= 2;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WallDecoration.method3292(MenuAction.method1993(Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize + 1], ScriptFrame.field528));
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WallDecoration.method3292(MenuAction.method1993(Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize + 1], ScriptFrame.clientLanguage));
return 1;
}
int var5;

2
runescape-client/src/main/java/class4.java
View File

@@ -299,7 +299,7 @@ final class class4 implements class0 {
ViewportMouse.ViewportMouse_entityCount = 0;
ViewportMouse.ViewportMouse_false0 = false;
} else {
class190.method3665();
Language.method3665();
}
class186.playPcmPlayers();