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

rs-client: rename some methods/fields

Browse Source
This commit is contained in:
Lucwousin
2019-07-24 08:44:49 +02:00
parent 4264aeecaf
commit 5dd21dc0de
19 changed files with 81 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runescape-api/src/main/java/net/runelite/rs/api/RSClient.java
View File

@@ -483,7 +483,7 @@ public interface RSClient extends RSGameShell, Client
@Override
RSIterableNodeHashTable getMessages();
@Import("revision")
@Import("RunException_revision")
@Override
int getRevision();

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

@@ -483,7 +483,8 @@ public final class Client extends GameShell implements Usernamed {
@ObfuscatedGetter(
intValue = -602987385
)
static int field872;
@Export("tradeChatMode")
static int tradeChatMode;
@ObfuscatedName("pv")
@ObfuscatedGetter(
intValue = -547874643
@@ -1486,7 +1487,7 @@ public final class Client extends GameShell implements Usernamed {
isResizable = true;
field870 = new int[]{16776960, 16711680, 65280, 65535, 16711935, 16777215};
publicChatMode = 0;
field872 = 0;
tradeChatMode = 0;
field762 = "";
field922 = new long[100];
field875 = 0;
@@ -1961,7 +1962,7 @@ public final class Client extends GameShell implements Usernamed {
ScriptFrame.clientLanguage = var11;
break;
case 7:
PacketBufferNode.field2337 = ServerBuild.valueOf(Integer.parseInt(var4));
PacketBufferNode.serverBuild = ServerBuild.valueOf(Integer.parseInt(var4));
break;
case 8:
if (var4.equalsIgnoreCase("true")) {
@@ -1971,10 +1972,10 @@ public final class Client extends GameShell implements Usernamed {
class294.field3695 = var4;
break;
case 10:
StudioGame[] var5 = new StudioGame[]{StudioGame.field3110, StudioGame.field3107, StudioGame.field3109, StudioGame.field3106, StudioGame.field3108, StudioGame.field3112};
WorldMapRegion.field248 = (StudioGame)SoundSystem.findEnumerated(var5, Integer.parseInt(var4));
if (WorldMapRegion.field248 == StudioGame.field3110) {
class40.loginType = LoginType.field4052;
StudioGame[] var5 = new StudioGame[]{StudioGame.oldscape, StudioGame.runescape, StudioGame.game5, StudioGame.stellardawn, StudioGame.game4, StudioGame.game3};
WorldMapRegion.studioGame = (StudioGame)SoundSystem.findEnumerated(var5, Integer.parseInt(var4));
if (WorldMapRegion.studioGame == StudioGame.oldscape) {
class40.loginType = LoginType.oldscape;
} else {
class40.loginType = LoginType.field4056;
}
@@ -1994,9 +1995,9 @@ public final class Client extends GameShell implements Usernamed {
}
}
class215.method4022();
class215.setLowDetailOff();
ClientPreferences.worldHost = this.getCodeBase().getHost();
String var9 = PacketBufferNode.field2337.name;
String var9 = PacketBufferNode.serverBuild.name;
byte var10 = 0;
try {
@@ -2006,7 +2007,7 @@ public final class Client extends GameShell implements Usernamed {
}
WorldMapSprite.client = this;
RunException.field4066 = clientType;
RunException.RunException_clientType = clientType;
this.startThread(765, 503, 181);
}
} catch (RuntimeException var8) {
@@ -4028,7 +4029,7 @@ public final class Client extends GameShell implements Usernamed {
}
if (ServerPacket.field2183 == var1.serverPacket) {
class226.field3072 = NetSocket.method3530(var3.readUnsignedByte());
class226.privateChatMode = NetSocket.method3530(var3.readUnsignedByte());
var1.serverPacket = null;
return true;
}
@@ -4686,7 +4687,7 @@ public final class Client extends GameShell implements Usernamed {
}
if (ServerPacket.field2195 == var1.serverPacket) {
field872 = var3.readUnsignedByteNegate();
tradeChatMode = var3.readUnsignedByteNegate();
publicChatMode = var3.readUnsignedByteNegate();
var1.serverPacket = null;
return true;

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

@@ -233,16 +233,16 @@ public class ClientPreferences {
if (var0 == ScriptOpcodes.CHAT_SETFILTER) {
HealthBarUpdate.Interpreter_intStackSize -= 3;
Client.publicChatMode = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
class226.field3072 = NetSocket.method3530(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]);
if (class226.field3072 == null) {
class226.field3072 = class310.field3816;
class226.privateChatMode = NetSocket.method3530(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]);
if (class226.privateChatMode == null) {
class226.privateChatMode = class310.field3816;
}
Client.field872 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2];
Client.tradeChatMode = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2];
PacketBufferNode var18 = Archive.method4265(ClientPacket.field2294, Client.packetWriter.isaacCipher);
var18.packetBuffer.writeByte(Client.publicChatMode);
var18.packetBuffer.writeByte(class226.field3072.field3815);
var18.packetBuffer.writeByte(Client.field872);
var18.packetBuffer.writeByte(class226.privateChatMode.field3815);
var18.packetBuffer.writeByte(Client.tradeChatMode);
Client.packetWriter.method2219(var18);
return 1;
}
@@ -307,10 +307,10 @@ public class ClientPreferences {
return 1;
}
if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) {
if (class226.field3072 == null) {
if (class226.privateChatMode == null) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1;
} else {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = class226.field3072.field3815;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = class226.privateChatMode.field3815;
}
return 1;
@@ -467,7 +467,7 @@ public class ClientPreferences {
return 1;
}
if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) {
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.field872;
Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.tradeChatMode;
return 1;
}
if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) {

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

@@ -75,7 +75,7 @@ public final class FloorDecoration {
String var1;
if (var0 instanceof RunException) {
RunException var2 = (RunException)var0;
var1 = var2.string + " | ";
var1 = var2.message + " | ";
var0 = var2.throwable;
} else {
var1 = "";

14
runescape-client/src/main/java/GameShell.java
View File

@@ -481,7 +481,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
gameShell = this;
GrandExchangeEvent.canvasWidth = var1;
ParamDefinition.canvasHeight = var2;
RunException.revision = var3;
RunException.RunException_revision = var3;
RunException.RunException_applet = this;
if (taskHandler == null) {
taskHandler = new TaskHandler();
@@ -553,8 +553,12 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
@Export("checkHost")
protected final boolean checkHost() {
String var1 = this.getDocumentBase().getHost().toLowerCase();
if (!var1.equals("jagex.com") && !var1.endsWith(".jagex.com")) {
if (!var1.equals("runescape.com") && !var1.endsWith(".runescape.com")) {
if (var1.equals("jagex.com") || var1.endsWith(".jagex.com")) {
return true;
}
if (var1.equals("runescape.com") || var1.endsWith(".runescape.com")) {
return true;
}
if (var1.endsWith("127.0.0.1")) {
return true;
}
@@ -568,10 +572,6 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
this.error("invalidhost");
return false;
}
return true;
}
return true;
}
@ObfuscatedName("j")
@ObfuscatedSignature(

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

@@ -425,7 +425,7 @@ public class HitSplatDefinition extends DualNode {
return;
}
URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + RunException.revision + "&u=" + GrandExchangeOfferUnitPriceComparator.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + RunException.field4066 + "&e=" + var2);
URL var3 = new URL(RunException.RunException_applet.getCodeBase(), "clienterror.ws?c=" + RunException.RunException_revision + "&u=" + GrandExchangeOfferUnitPriceComparator.localPlayerName + "&v1=" + TaskHandler.javaVendor + "&v2=" + TaskHandler.javaVersion + "&ct=" + RunException.RunException_clientType + "&e=" + var2);
DataInputStream var4 = new DataInputStream(var3.openStream());
var4.read();
var4.close();

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

@@ -247,8 +247,8 @@ public final class IsaacCipher {
signature = "(I)[Lht;",
garbageValue = "547339899"
)
@Export("values")
static ServerBuild[] values() {
@Export("ServerBuild_values")
static ServerBuild[] ServerBuild_values() {
return new ServerBuild[]{ServerBuild.RC, ServerBuild.LIVE, ServerBuild.WIP, ServerBuild.BUILDLIVE};
}
}

8
runescape-client/src/main/java/LoginType.java
View File

@@ -1,3 +1,4 @@
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
@@ -10,7 +11,8 @@ public class LoginType {
@ObfuscatedSignature(
signature = "Lmu;"
)
public static final LoginType field4052;
@Export("oldscape")
public static final LoginType oldscape;
@ObfuscatedName("w")
@ObfuscatedSignature(
signature = "Lmu;"
@@ -60,7 +62,7 @@ public class LoginType {
final String field4048;
static {
field4052 = new LoginType(0, 0, "", "");
oldscape = new LoginType(0, 0, "", "");
field4049 = new LoginType(3, 1, "", "");
field4050 = new LoginType(4, 2, "", "");
field4051 = new LoginType(7, 3, "", "");
@@ -68,7 +70,7 @@ public class LoginType {
field4053 = new LoginType(8, 5, "", "");
field4054 = new LoginType(1, 6, "", "");
field4055 = new LoginType(6, 7, "", "");
field4056 = new LoginType(2, -1, "", "", true, new LoginType[]{field4052, field4049, field4050, field4058, field4051});
field4056 = new LoginType(2, -1, "", "", true, new LoginType[]{oldscape, field4049, field4050, field4058, field4051});
}
LoginType(int var1, int var2, String var3, String var4) {

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

@@ -34,7 +34,7 @@ public class ModelData0 {
ClientPreferences var1 = new ClientPreferences();
try {
var0 = WorldMapIcon_0.getPreferencesFile("", WorldMapRegion.field248.name, false);
var0 = WorldMapIcon_0.getPreferencesFile("", WorldMapRegion.studioGame.name, false);
byte[] var2 = new byte[(int)var0.length()];
int var4;

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

@@ -23,7 +23,8 @@ public class PacketBufferNode extends Node {
@ObfuscatedSignature(
signature = "Lht;"
)
static ServerBuild field2337;
@Export("serverBuild")
static ServerBuild serverBuild;
@ObfuscatedName("q")
@ObfuscatedSignature(
signature = "Lgx;"

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

@@ -58,7 +58,7 @@ public class ReflectionCheck extends Node {
AccessFile var0 = null;
try {
var0 = WorldMapIcon_0.getPreferencesFile("", WorldMapRegion.field248.name, true);
var0 = WorldMapIcon_0.getPreferencesFile("", WorldMapRegion.studioGame.name, true);
Buffer var1 = WorldMapLabelSize.clientPreferences.toBuffer();
var0.write(var1.array, 0, var1.offset);
} catch (Exception var3) {

13
runescape-client/src/main/java/RunException.java
View File

@@ -14,22 +14,23 @@ public class RunException extends RuntimeException {
@ObfuscatedGetter(
intValue = -345454085
)
@Export("revision")
public static int revision;
@Export("RunException_revision")
public static int RunException_revision;
@ObfuscatedName("p")
@ObfuscatedGetter(
intValue = 875770709
)
public static int field4066;
@Export("RunException_clientType")
public static int RunException_clientType;
@ObfuscatedName("k")
@Export("string")
String string;
@Export("message")
String message;
@ObfuscatedName("l")
@Export("throwable")
Throwable throwable;
RunException(Throwable var1, String var2) {
this.string = var2;
this.message = var2;
this.throwable = var1;
}
}

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

@@ -61,7 +61,7 @@ public class ServerBuild {
)
@Export("valueOf")
public static ServerBuild valueOf(int var0) {
ServerBuild[] var1 = IsaacCipher.values();
ServerBuild[] var1 = IsaacCipher.ServerBuild_values();
for (int var2 = 0; var2 < var1.length; ++var2) {
ServerBuild var3 = var1[var2];

18
runescape-client/src/main/java/StudioGame.java
View File

@@ -12,32 +12,38 @@ public enum StudioGame implements Enumerated {
@ObfuscatedSignature(
signature = "Lhl;"
)
field3107("runescape", "RuneScape", 0),
@Export("runescape")
runescape("runescape", "RuneScape", 0),
@ObfuscatedName("w")
@ObfuscatedSignature(
signature = "Lhl;"
)
field3106("stellardawn", "Stellar Dawn", 1),
@Export("stellardawn")
stellardawn("stellardawn", "Stellar Dawn", 1),
@ObfuscatedName("e")
@ObfuscatedSignature(
signature = "Lhl;"
)
field3112("game3", "Game 3", 2),
@Export("game3")
game3("game3", "Game 3", 2),
@ObfuscatedName("p")
@ObfuscatedSignature(
signature = "Lhl;"
)
field3108("game4", "Game 4", 3),
@Export("game4")
game4("game4", "Game 4", 3),
@ObfuscatedName("k")
@ObfuscatedSignature(
signature = "Lhl;"
)
field3109("game5", "Game 5", 4),
@Export("game5")
game5("game5", "Game 5", 4),
@ObfuscatedName("l")
@ObfuscatedSignature(
signature = "Lhl;"
)
field3110("oldscape", "RuneScape 2007", 5);
@Export("oldscape")
oldscape("oldscape", "RuneScape 2007", 5);
@ObfuscatedName("b")
@Export("name")

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

@@ -49,7 +49,7 @@ public class UserComparator9 extends AbstractUserComparator {
RunException var2;
if (var0 instanceof RunException) {
var2 = (RunException)var0;
var2.string = var2.string + ' ' + var1;
var2.message = var2.message + ' ' + var1;
} else {
var2 = new RunException(var0, var1);
}

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

@@ -164,7 +164,7 @@ public class Varcs {
)
@Export("getPreferencesFile")
AccessFile getPreferencesFile(boolean var1) {
return WorldMapIcon_0.getPreferencesFile("2", WorldMapRegion.field248.name, var1);
return WorldMapIcon_0.getPreferencesFile("2", WorldMapRegion.studioGame.name, var1);
}
@ObfuscatedName("c")

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

@@ -23,7 +23,8 @@ public class WorldMapRegion {
@ObfuscatedSignature(
signature = "Lhl;"
)
static StudioGame field248;
@Export("studioGame")
static StudioGame studioGame;
@ObfuscatedName("du")
@ObfuscatedSignature(
signature = "Liu;"

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

@@ -77,7 +77,8 @@ public class class215 {
signature = "(I)V",
garbageValue = "-1461227743"
)
static final void method4022() {
@Export("setLowDetailOff")
static final void setLowDetailOff() {
Scene.Scene_isLowDetail = false;
Client.isLowDetail = false;
}

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

@@ -8,7 +8,8 @@ public class class226 {
@ObfuscatedSignature(
signature = "Lkl;"
)
static class310 field3072;
@Export("privateChatMode")
static class310 privateChatMode;
@ObfuscatedName("r")
@ObfuscatedSignature(
signature = "Lhq;"