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

Merge branch 'upstream-master' into runelite

Browse Source 
# Conflicts:
#	cache-client/pom.xml
#	cache-updater/pom.xml
#	cache/pom.xml
#	http-api/pom.xml
#	http-service/pom.xml
#	pom.xml
#	runelite-api/pom.xml
#	runelite-api/src/main/java/net/runelite/api/Client.java
#	runelite-api/src/main/java/net/runelite/api/events/MenuEntryAdded.java
#	runelite-api/src/main/java/net/runelite/api/events/NpcActionChanged.java
#	runelite-api/src/main/java/net/runelite/api/events/PlayerMenuOptionClicked.java
#	runelite-client/pom.xml
#	runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java
#	runelite-client/src/test/java/net/runelite/client/plugins/slayer/SlayerPluginTest.java
#	runelite-script-assembler-plugin/pom.xml
This commit is contained in:
zeruth
2021-01-29 21:19:28 -05:00
parent 48fdf79e65 e3b0755385
commit 7b0678d0a1
55 changed files with 1763 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -526,7 +526,7 @@ public class ArchiveLoader {
class22.field107 = "Can't login? Click here."; // L: 1256
}
GameShell.field481 = new Bounds(Login.loginBoxCenter, var31, var1.stringWidth(class22.field107), 11); // L: 1259
GameEngine.field481 = new Bounds(Login.loginBoxCenter, var31, var1.stringWidth(class22.field107), 11); // L: 1259
GrandExchangeOfferOwnWorldComparator.field643 = new Bounds(Login.loginBoxCenter, var31, var1.stringWidth("Still having trouble logging in?"), 11); // L: 1260
var1.drawCentered(class22.field107, Login.loginBoxCenter, var31, 16777215, 0); // L: 1261
} else if (Login.loginIndex == 3) { // L: 1263

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

@@ -78,7 +78,7 @@ public final class Canvas extends java.awt.Canvas {
DynamicObject.archive2 = WorldMapCacheName.newArchive(2, true, false, true); // L: 1744
class330.archive3 = WorldMapCacheName.newArchive(3, false, true, true); // L: 1745
class227.archive4 = WorldMapCacheName.newArchive(4, false, true, true); // L: 1746
GameShell.archive5 = WorldMapCacheName.newArchive(5, true, true, true); // L: 1747
GameEngine.archive5 = WorldMapCacheName.newArchive(5, true, true, true); // L: 1747
class217.archive6 = WorldMapCacheName.newArchive(6, true, true, true); // L: 1748
BuddyRankComparator.archive7 = WorldMapCacheName.newArchive(7, false, true, true); // L: 1749
Messages.archive8 = WorldMapCacheName.newArchive(8, false, true, true); // L: 1750
@@ -103,7 +103,7 @@ public final class Canvas extends java.awt.Canvas {
var12 += DynamicObject.archive2.percentage() * 2 / 100; // L: 1771
var12 += class330.archive3.percentage() * 2 / 100; // L: 1772
var12 += class227.archive4.percentage() * 6 / 100; // L: 1773
var12 += GameShell.archive5.percentage() * 4 / 100; // L: 1774
var12 += GameEngine.archive5.percentage() * 4 / 100; // L: 1774
var12 += class217.archive6.percentage() * 2 / 100; // L: 1775
var12 += BuddyRankComparator.archive7.percentage() * 56 / 100; // L: 1776
var12 += Messages.archive8.percentage() * 2 / 100; // L: 1777
@@ -128,7 +128,7 @@ public final class Canvas extends java.awt.Canvas {
UserComparator4.method3469(SceneTilePaint.archive0, "Animations"); // L: 1794
UserComparator4.method3469(WorldMapSprite.archive1, "Skeletons"); // L: 1795
UserComparator4.method3469(class227.archive4, "Sound FX"); // L: 1796
UserComparator4.method3469(GameShell.archive5, "Maps"); // L: 1797
UserComparator4.method3469(GameEngine.archive5, "Maps"); // L: 1797
UserComparator4.method3469(class217.archive6, "Music Tracks"); // L: 1798
UserComparator4.method3469(BuddyRankComparator.archive7, "Models"); // L: 1799
UserComparator4.method3469(Messages.archive8, "Sprites"); // L: 1800
@@ -152,7 +152,7 @@ public final class Canvas extends java.awt.Canvas {
WorldMapIcon_0.method270(22050, !Client.isLowDetail, 2); // L: 1815
MidiPcmStream var20 = new MidiPcmStream(); // L: 1816
var20.method3759(9, 128); // L: 1817
AbstractWorldMapData.pcmPlayer0 = UserComparator6.method3526(GameShell.taskHandler, 0, 22050); // L: 1818
AbstractWorldMapData.pcmPlayer0 = UserComparator6.method3526(GameEngine.taskHandler, 0, 22050); // L: 1818
AbstractWorldMapData.pcmPlayer0.setStream(var20); // L: 1819
var21 = Client.archive15; // L: 1820
var2 = FontName.archive14; // L: 1821
@@ -161,7 +161,7 @@ public final class Canvas extends java.awt.Canvas {
class206.musicSamplesArchive = var2; // L: 1825
class206.soundEffectsArchive = var16; // L: 1826
class206.midiPcmStream = var20; // L: 1827
FriendLoginUpdate.pcmPlayer1 = UserComparator6.method3526(GameShell.taskHandler, 1, 2048); // L: 1829
FriendLoginUpdate.pcmPlayer1 = UserComparator6.method3526(GameEngine.taskHandler, 1, 2048); // L: 1829
WorldMapManager.pcmStreamMixer = new PcmStreamMixer(); // L: 1830
FriendLoginUpdate.pcmPlayer1.setStream(WorldMapManager.pcmStreamMixer); // L: 1831
ItemLayer.decimator = new Decimator(22050, PcmPlayer.field1443); // L: 1832
@@ -498,7 +498,7 @@ public final class Canvas extends java.awt.Canvas {
}
} else if (Client.titleLoadingStage == 110) { // L: 2132
SoundCache.mouseRecorder = new MouseRecorder(); // L: 2133
GameShell.taskHandler.newThreadTask(SoundCache.mouseRecorder, 10); // L: 2134
GameEngine.taskHandler.newThreadTask(SoundCache.mouseRecorder, 10); // L: 2134
Login.Login_loadingText = "Loaded input handler"; // L: 2135
Login.Login_loadingPercent = 92; // L: 2136
Client.titleLoadingStage = 120; // L: 2137

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

@@ -15,7 +15,7 @@ import netscape.javascript.JSObject;
@Implements("Client")
@ObfuscatedName("client")
public final class Client extends GameShell implements Usernamed {
public final class Client extends GameEngine implements Usernamed {
@ObfuscatedName("ns")
@ObfuscatedSignature(
descriptor = "Lhe;"
@@ -1691,7 +1691,7 @@ public final class Client extends GameShell implements Usernamed {
int var2;
for (var2 = 0; var2 < WorldMapIcon_0.regionLandArchives.length; ++var2) { // L: 947
if (class41.regionMapArchiveIds[var2] != -1 && WorldMapIcon_0.regionLandArchives[var2] == null) { // L: 948 949
WorldMapIcon_0.regionLandArchives[var2] = GameShell.archive5.takeFile(class41.regionMapArchiveIds[var2], 0); // L: 950
WorldMapIcon_0.regionLandArchives[var2] = GameEngine.archive5.takeFile(class41.regionMapArchiveIds[var2], 0); // L: 950
if (WorldMapIcon_0.regionLandArchives[var2] == null) { // L: 951
var43 = false; // L: 952
++field700; // L: 953
@@ -1699,7 +1699,7 @@ public final class Client extends GameShell implements Usernamed {
}
if (GrandExchangeOfferTotalQuantityComparator.regionLandArchiveIds[var2] != -1 && MouseRecorder.regionMapArchives[var2] == null) { // L: 957 958
MouseRecorder.regionMapArchives[var2] = GameShell.archive5.takeFileEncrypted(GrandExchangeOfferTotalQuantityComparator.regionLandArchiveIds[var2], 0, class227.xteaKeys[var2]); // L: 959
MouseRecorder.regionMapArchives[var2] = GameEngine.archive5.takeFileEncrypted(GrandExchangeOfferTotalQuantityComparator.regionLandArchiveIds[var2], 0, class227.xteaKeys[var2]); // L: 959
if (MouseRecorder.regionMapArchives[var2] == null) { // L: 960
var43 = false; // L: 961
++field700; // L: 962
@@ -2050,8 +2050,8 @@ public final class Client extends GameShell implements Usernamed {
for (var46 = var4 - 1; var46 <= var5 + 1; ++var46) { // L: 1223
for (var9 = var6 - 1; var9 <= var7 + 1; ++var9) { // L: 1224
if (var46 < var4 || var46 > var5 || var9 < var6 || var9 > var7) { // L: 1225
GameShell.archive5.loadRegionFromName("m" + var46 + "_" + var9); // L: 1226
GameShell.archive5.loadRegionFromName("l" + var46 + "_" + var9); // L: 1227
GameEngine.archive5.loadRegionFromName("m" + var46 + "_" + var9); // L: 1226
GameEngine.archive5.loadRegionFromName("l" + var46 + "_" + var9); // L: 1227
}
}
}
@@ -2076,11 +2076,11 @@ public final class Client extends GameShell implements Usernamed {
class225.clock.mark(); // L: 1250
for (var5 = 0; var5 < 32; ++var5) { // L: 1251
GameShell.graphicsTickTimes[var5] = 0L;
GameEngine.graphicsTickTimes[var5] = 0L;
}
for (var5 = 0; var5 < 32; ++var5) { // L: 1252
GameShell.clientTickTimes[var5] = 0L;
GameEngine.clientTickTimes[var5] = 0L;
}
class8.gameCyclesToDo = 0; // L: 1253
@@ -2687,7 +2687,7 @@ public final class Client extends GameShell implements Usernamed {
if (--field864 + 1 <= 0) { // L: 1561
try {
if (js5ConnectState == 0) { // L: 1563
WorldMapManager.js5SocketTask = GameShell.taskHandler.newSocketTask(WorldMapSprite.worldHost, ArchiveDiskAction.port3); // L: 1564
WorldMapManager.js5SocketTask = GameEngine.taskHandler.newSocketTask(WorldMapSprite.worldHost, ArchiveDiskAction.port3); // L: 1564
++js5ConnectState; // L: 1565
}
@@ -2706,7 +2706,7 @@ public final class Client extends GameShell implements Usernamed {
if (useBufferedSocket) { // L: 1575
TaskHandler.js5Socket = class219.method4011((Socket)WorldMapManager.js5SocketTask.result, 40000, 5000); // L: 1576
} else {
TaskHandler.js5Socket = new NetSocket((Socket)WorldMapManager.js5SocketTask.result, GameShell.taskHandler, 5000); // L: 1579
TaskHandler.js5Socket = new NetSocket((Socket)WorldMapManager.js5SocketTask.result, GameEngine.taskHandler, 5000); // L: 1579
}
Buffer var1 = new Buffer(5); // L: 1581
@@ -2875,7 +2875,7 @@ public final class Client extends GameShell implements Usernamed {
if (loginState == 1) { // L: 2221
if (WorldMapID.socketTask == null) { // L: 2222
WorldMapID.socketTask = GameShell.taskHandler.newSocketTask(WorldMapSprite.worldHost, ArchiveDiskAction.port3); // L: 2223
WorldMapID.socketTask = GameEngine.taskHandler.newSocketTask(WorldMapSprite.worldHost, ArchiveDiskAction.port3); // L: 2223
}
if (WorldMapID.socketTask.status == 2) { // L: 2225
@@ -2886,7 +2886,7 @@ public final class Client extends GameShell implements Usernamed {
if (useBufferedSocket) { // L: 2227
var1 = class219.method4011((Socket)WorldMapID.socketTask.result, 40000, 5000); // L: 2228
} else {
var1 = new NetSocket((Socket)WorldMapID.socketTask.result, GameShell.taskHandler, 5000); // L: 2231
var1 = new NetSocket((Socket)WorldMapID.socketTask.result, GameEngine.taskHandler, 5000); // L: 2231
}
packetWriter.setSocket((AbstractSocket)var1); // L: 2233
@@ -3042,7 +3042,7 @@ public final class Client extends GameShell implements Usernamed {
var5.packetBuffer.writeBytes(var29.array, 0, var29.array.length); // L: 2364
var5.packetBuffer.writeByte(clientType); // L: 2365
var5.packetBuffer.writeInt(0); // L: 2366
var5.packetBuffer.method5718(GameShell.archive5.hash); // L: 2367
var5.packetBuffer.method5718(GameEngine.archive5.hash); // L: 2367
var5.packetBuffer.method5718(GrandExchangeOfferUnitPriceComparator.archive13.hash); // L: 2368
var5.packetBuffer.method5718(PacketBufferNode.archive12.hash); // L: 2369
var5.packetBuffer.method5587(ItemContainer.archive11.hash); // L: 2370
@@ -3164,7 +3164,7 @@ public final class Client extends GameShell implements Usernamed {
if (loginState == 13) { // L: 2493
field892 = 0; // L: 2494
GameShell.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field682 / 60 + " seconds."); // L: 2495
GameEngine.setLoginResponseString("You have only just left another world.", "Your profile will be transferred in:", field682 / 60 + " seconds."); // L: 2495
if (--field682 <= 0) { // L: 2496
loginState = 0;
}
@@ -3270,7 +3270,7 @@ public final class Client extends GameShell implements Usernamed {
String var25 = var2.readStringCp1252NullTerminated(); // L: 2591
String var33 = var2.readStringCp1252NullTerminated(); // L: 2592
String var27 = var2.readStringCp1252NullTerminated(); // L: 2593
GameShell.setLoginResponseString(var25, var33, var27); // L: 2594
GameEngine.setLoginResponseString(var25, var33, var27); // L: 2594
WorldMapCacheName.updateGameState(10); // L: 2595
}
@@ -5333,7 +5333,7 @@ public final class Client extends GameShell implements Usernamed {
var57.packetBuffer.method5569(var18); // L: 6401
var57.packetBuffer.method5718(var16); // L: 6402
var57.packetBuffer.method5587(var5); // L: 6403
var57.packetBuffer.method5568(GameShell.fps); // L: 6404
var57.packetBuffer.method5568(GameEngine.fps); // L: 6404
packetWriter.addNode(var57); // L: 6405
var1.serverPacket = null; // L: 6406
return true; // L: 6407

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

@@ -237,7 +237,7 @@ public class FontName {
if (var10.contentType == 1336) { // L: 9016
if (Client.displayFps) { // L: 9017
var13 += 15; // L: 9018
WorldMapLabelSize.fontPlain12.drawRightAligned("Fps:" + GameShell.fps, var12 + var10.width, var13, 16776960, -1); // L: 9019
WorldMapLabelSize.fontPlain12.drawRightAligned("Fps:" + GameEngine.fps, var12 + var10.width, var13, 16776960, -1); // L: 9019
var13 += 15; // L: 9020
Runtime var42 = Runtime.getRuntime(); // L: 9021
var20 = (int)((var42.totalMemory() - var42.freeMemory()) / 1024L); // L: 9022

20
runescape-client/src/main/java/GameShell.java → runescape-client/src/main/java/GameEngine.java
View File

@@ -26,7 +26,7 @@ import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("bd")
@Implements("GameShell")
public abstract class GameShell extends Applet implements Runnable, FocusListener, WindowListener {
public abstract class GameEngine extends Applet implements Runnable, FocusListener, WindowListener {
@ObfuscatedName("h")
@ObfuscatedSignature(
descriptor = "Lfa;"
@@ -38,7 +38,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
descriptor = "Lbd;"
)
@Export("gameShell")
static GameShell gameShell;
static GameEngine gameEngine;
@ObfuscatedName("t")
@ObfuscatedGetter(
intValue = 548418733
@@ -192,7 +192,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
final EventQueue eventQueue;
static {
gameShell = null; // L: 41
gameEngine = null; // L: 41
GameShell_redundantStartThreadCount = 0; // L: 43
stopTimeMs = 0L; // L: 44
isKilled = false; // L: 45
@@ -207,7 +207,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
garbageCollectorLastCheckTimeMs = -1L; // L: 86
}
protected GameShell() {
protected GameEngine() {
this.hasErrored = false; // L: 46
this.canvasX = 0; // L: 59
this.canvasY = 0; // L: 60
@@ -451,7 +451,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
@Export("startThread")
protected final void startThread(int var1, int var2, int var3) {
try {
if (gameShell != null) { // L: 220
if (gameEngine != null) { // L: 220
++GameShell_redundantStartThreadCount; // L: 221
if (GameShell_redundantStartThreadCount >= 3) { // L: 222
this.error("alreadyloaded"); // L: 223
@@ -462,7 +462,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
return; // L: 227
}
gameShell = this; // L: 229
gameEngine = this; // L: 229
IgnoreList.canvasWidth = var1; // L: 230
ModelData0.canvasHeight = var2; // L: 231
RunException.RunException_revision = var3; // L: 232
@@ -851,7 +851,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
protected abstract void vmethod1777();
public final synchronized void paint(Graphics var1) {
if (this == gameShell && !isKilled) { // L: 449
if (this == gameEngine && !isKilled) { // L: 449
this.fullRedraw = true; // L: 450
if (class298.currentTimeMillis() - this.field472 > 1000L) { // L: 451
Rectangle var2 = var1.getClipBounds(); // L: 452
@@ -864,7 +864,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
} // L: 455
public final void destroy() {
if (this == gameShell && !isKilled) { // L: 438
if (this == gameEngine && !isKilled) { // L: 438
stopTimeMs = class298.currentTimeMillis(); // L: 439
class236.sleepExact(5000L); // L: 440
this.kill(); // L: 441
@@ -899,13 +899,13 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
public abstract void init();
public final void stop() {
if (this == gameShell && !isKilled) { // L: 433
if (this == gameEngine && !isKilled) { // L: 433
stopTimeMs = class298.currentTimeMillis() + 4000L; // L: 434
}
} // L: 435
public final void start() {
if (this == gameShell && !isKilled) { // L: 428
if (this == gameEngine && !isKilled) { // L: 428
stopTimeMs = 0L; // L: 429
}
} // L: 430

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

@@ -132,11 +132,11 @@ public class GrandExchangeEvent {
int var0;
for (var0 = 0; var0 < 32; ++var0) { // L: 422
GameShell.graphicsTickTimes[var0] = 0L;
GameEngine.graphicsTickTimes[var0] = 0L;
}
for (var0 = 0; var0 < 32; ++var0) { // L: 423
GameShell.clientTickTimes[var0] = 0L;
GameEngine.clientTickTimes[var0] = 0L;
}
class8.gameCyclesToDo = 0; // L: 424

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

@@ -108,8 +108,8 @@ final class GrandExchangeOfferNameComparator implements Comparator {
GarbageCollectorMXBean var2 = (GarbageCollectorMXBean)var1.next(); // L: 570
if (var2.isValid()) { // L: 572
class25.garbageCollector = var2; // L: 573
GameShell.garbageCollectorLastCheckTimeMs = -1L; // L: 574
GameShell.garbageCollectorLastCollectionTime = -1L; // L: 575
GameEngine.garbageCollectorLastCheckTimeMs = -1L; // L: 574
GameEngine.garbageCollectorLastCollectionTime = -1L; // L: 575
}
}
} catch (Throwable var11) { // L: 580
@@ -119,16 +119,16 @@ final class GrandExchangeOfferNameComparator implements Comparator {
if (class25.garbageCollector != null) { // L: 582
long var9 = class298.currentTimeMillis(); // L: 583
long var3 = class25.garbageCollector.getCollectionTime(); // L: 584
if (-1L != GameShell.garbageCollectorLastCollectionTime) { // L: 585
long var5 = var3 - GameShell.garbageCollectorLastCollectionTime; // L: 586
long var7 = var9 - GameShell.garbageCollectorLastCheckTimeMs; // L: 587
if (-1L != GameEngine.garbageCollectorLastCollectionTime) { // L: 585
long var5 = var3 - GameEngine.garbageCollectorLastCollectionTime; // L: 586
long var7 = var9 - GameEngine.garbageCollectorLastCheckTimeMs; // L: 587
if (var7 != 0L) { // L: 588
var0 = (int)(100L * var5 / var7);
}
}
GameShell.garbageCollectorLastCollectionTime = var3; // L: 590
GameShell.garbageCollectorLastCheckTimeMs = var9; // L: 591
GameEngine.garbageCollectorLastCollectionTime = var3; // L: 590
GameEngine.garbageCollectorLastCheckTimeMs = var9; // L: 591
}
return var0; // L: 593

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

@@ -170,8 +170,8 @@ public class ItemContainer extends Node {
var8 = var7 + (var6 << 8); // L: 5317
if (!var16 || var7 != 49 && var7 != 149 && var7 != 147 && var6 != 50 && (var6 != 49 || var7 != 47)) { // L: 5318
FileSystem.regions[var4] = var8; // L: 5319
class41.regionMapArchiveIds[var4] = GameShell.archive5.getGroupId("m" + var6 + "_" + var7); // L: 5320
GrandExchangeOfferTotalQuantityComparator.regionLandArchiveIds[var4] = GameShell.archive5.getGroupId("l" + var6 + "_" + var7); // L: 5321
class41.regionMapArchiveIds[var4] = GameEngine.archive5.getGroupId("m" + var6 + "_" + var7); // L: 5320
GrandExchangeOfferTotalQuantityComparator.regionLandArchiveIds[var4] = GameEngine.archive5.getGroupId("l" + var6 + "_" + var7); // L: 5321
++var4; // L: 5322
}
}
@@ -236,8 +236,8 @@ public class ItemContainer extends Node {
FileSystem.regions[var5] = var12; // L: 5368
var13 = var12 >> 8 & 255; // L: 5369
int var14 = var12 & 255; // L: 5370
class41.regionMapArchiveIds[var5] = GameShell.archive5.getGroupId("m" + var13 + "_" + var14); // L: 5371
GrandExchangeOfferTotalQuantityComparator.regionLandArchiveIds[var5] = GameShell.archive5.getGroupId("l" + var13 + "_" + var14); // L: 5372
class41.regionMapArchiveIds[var5] = GameEngine.archive5.getGroupId("m" + var13 + "_" + var14); // L: 5371
GrandExchangeOfferTotalQuantityComparator.regionLandArchiveIds[var5] = GameEngine.archive5.getGroupId("l" + var13 + "_" + var14); // L: 5372
++var5; // L: 5373
}
}

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

@@ -94,6 +94,6 @@ public class Messages {
)
static void method2285() {
Login.loginIndex = 24; // L: 1517
GameShell.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); // L: 1518
GameEngine.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", ""); // L: 1518
} // L: 1519
}

38
runescape-client/src/main/java/SequenceDefinition.java
View File

@@ -381,7 +381,7 @@ public class SequenceDefinition extends DualNode {
garbageValue = "1"
)
@Export("doCycleTitle")
static void doCycleTitle(GameShell var0) {
static void doCycleTitle(GameEngine var0) {
int var2;
int var3;
int var4;
@@ -662,12 +662,12 @@ public class SequenceDefinition extends DualNode {
var35 += 15; // L: 496
var36 = 361; // L: 497
if (GameShell.field481 != null) { // L: 498
var38 = GameShell.field481.highX / 2; // L: 499
if (var4 == 1 && var44 >= GameShell.field481.lowX - var38 && var44 <= var38 + GameShell.field481.lowX && var34 >= var36 - 15 && var34 < var36) { // L: 500
if (GameEngine.field481 != null) { // L: 498
var38 = GameEngine.field481.highX / 2; // L: 499
if (var4 == 1 && var44 >= GameEngine.field481.lowX - var38 && var44 <= var38 + GameEngine.field481.lowX && var34 >= var36 - 15 && var34 < var36) { // L: 500
switch(Login.field1190) { // L: 501
case 1:
GameShell.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 504
GameEngine.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 504
Login.loginIndex = 5; // L: 505
return; // L: 506
case 2:
@@ -681,16 +681,16 @@ public class SequenceDefinition extends DualNode {
if (var4 == 1 && var44 >= var38 - 75 && var44 <= var38 + 75 && var34 >= var37 - 20 && var34 <= var37 + 20) { // L: 518
Login.Login_username = Login.Login_username.trim(); // L: 519
if (Login.Login_username.length() == 0) { // L: 520
GameShell.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 521
GameEngine.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 521
return; // L: 522
}
if (Login.Login_password.length() == 0) { // L: 524
GameShell.setLoginResponseString("", "Please enter your password.", ""); // L: 525
GameEngine.setLoginResponseString("", "Please enter your password.", ""); // L: 525
return; // L: 526
}
GameShell.setLoginResponseString("", "Connecting to server...", ""); // L: 528
GameEngine.setLoginResponseString("", "Connecting to server...", ""); // L: 528
WorldMapDecoration.method380(false); // L: 529
WorldMapCacheName.updateGameState(20); // L: 530
return; // L: 531
@@ -782,16 +782,16 @@ public class SequenceDefinition extends DualNode {
if (StudioGame.field3135 == 84) { // L: 591
Login.Login_username = Login.Login_username.trim(); // L: 592
if (Login.Login_username.length() == 0) { // L: 593
GameShell.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 594
GameEngine.setLoginResponseString("", "Please enter your username/email address.", ""); // L: 594
return; // L: 595
}
if (Login.Login_password.length() == 0) { // L: 597
GameShell.setLoginResponseString("", "Please enter your password.", ""); // L: 598
GameEngine.setLoginResponseString("", "Please enter your password.", ""); // L: 598
return; // L: 599
}
GameShell.setLoginResponseString("", "Connecting to server...", ""); // L: 601
GameEngine.setLoginResponseString("", "Connecting to server...", ""); // L: 601
WorldMapDecoration.method380(false); // L: 602
WorldMapCacheName.updateGameState(20); // L: 603
return; // L: 604
@@ -880,7 +880,7 @@ public class SequenceDefinition extends DualNode {
var35 = Login.loginBoxX + 180; // L: 688
var8 = 326; // L: 689
if (var4 == 1 && var44 >= var35 - 75 && var44 <= var35 + 75 && var34 >= var8 - 20 && var34 <= var8 + 20) { // L: 690
GameShell.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 691
GameEngine.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 691
Login.loginIndex = 5; // L: 692
return; // L: 693
}
@@ -892,14 +892,14 @@ public class SequenceDefinition extends DualNode {
if (var4 == 1 && var44 >= var35 - 75 && var44 <= var35 + 75 && var34 >= var8 - 20 && var34 <= var8 + 20) { // L: 699
SecureRandomCallable.otp.trim(); // L: 700
if (SecureRandomCallable.otp.length() != 6) { // L: 701
GameShell.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 702
GameEngine.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 702
return; // L: 703
}
WorldMapSection1.field313 = Integer.parseInt(SecureRandomCallable.otp); // L: 705
SecureRandomCallable.otp = ""; // L: 706
WorldMapDecoration.method380(true); // L: 707
GameShell.setLoginResponseString("", "Connecting to server...", ""); // L: 708
GameEngine.setLoginResponseString("", "Connecting to server...", ""); // L: 708
WorldMapCacheName.updateGameState(20); // L: 709
return; // L: 710
}
@@ -945,14 +945,14 @@ public class SequenceDefinition extends DualNode {
if (StudioGame.field3135 == 84) { // L: 743
SecureRandomCallable.otp.trim(); // L: 744
if (SecureRandomCallable.otp.length() != 6) { // L: 745
GameShell.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 746
GameEngine.setLoginResponseString("", "Please enter a 6-digit PIN.", ""); // L: 746
return; // L: 747
}
WorldMapSection1.field313 = Integer.parseInt(SecureRandomCallable.otp); // L: 749
SecureRandomCallable.otp = ""; // L: 750
WorldMapDecoration.method380(true); // L: 751
GameShell.setLoginResponseString("", "Connecting to server...", ""); // L: 752
GameEngine.setLoginResponseString("", "Connecting to server...", ""); // L: 752
WorldMapCacheName.updateGameState(20); // L: 753
return; // L: 754
}
@@ -1016,7 +1016,7 @@ public class SequenceDefinition extends DualNode {
var8 = 321; // L: 812
if (var4 == 1 && var44 >= var35 - 75 && var44 <= var35 + 75 && var34 >= var8 - 20 && var34 <= var8 + 20) { // L: 813
AttackOption.openURL(AbstractWorldMapIcon.method632("secure", true) + "m=dob/set_dob.ws", true, false); // L: 814
GameShell.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 815
GameEngine.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 815
Login.loginIndex = 6; // L: 816
return; // L: 817
}
@@ -1030,7 +1030,7 @@ public class SequenceDefinition extends DualNode {
var8 = 321; // L: 826
if (var4 == 1 && var44 >= var35 - 75 && var44 <= var35 + 75 && var34 >= var8 - 20 && var34 <= var8 + 20) { // L: 827
AttackOption.openURL("https://www.jagex.com/terms/privacy", true, false); // L: 828
GameShell.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 829
GameEngine.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 829
Login.loginIndex = 6; // L: 830
return; // L: 831
}
@@ -1056,7 +1056,7 @@ public class SequenceDefinition extends DualNode {
var37 = 276; // L: 852
if (var4 == 1 && var44 >= var38 - 75 && var44 <= var38 + 75 && var34 >= var37 - 20 && var34 <= var37 + 20) { // L: 853
AttackOption.openURL(var30, true, false); // L: 854
GameShell.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 855
GameEngine.setLoginResponseString("", "Page has opened in a new window.", "(Please check your popup blocker.)"); // L: 855
Login.loginIndex = 6; // L: 856
return; // L: 857
}

60
runescape-client/src/main/java/UserComparator8.java
View File

@@ -44,11 +44,11 @@ public class UserComparator8 extends AbstractUserComparator {
@Export("getLoginError")
static void getLoginError(int var0) {
if (var0 == -3) { // L: 2791
GameShell.setLoginResponseString("Connection timed out.", "Please try using a different world.", "");
GameEngine.setLoginResponseString("Connection timed out.", "Please try using a different world.", "");
} else if (var0 == -2) { // L: 2792
GameShell.setLoginResponseString("Error connecting to server.", "Please try using a different world.", "");
GameEngine.setLoginResponseString("Error connecting to server.", "Please try using a different world.", "");
} else if (var0 == -1) { // L: 2793
GameShell.setLoginResponseString("No response from server.", "Please try using a different world.", "");
GameEngine.setLoginResponseString("No response from server.", "Please try using a different world.", "");
} else if (var0 == 3) { // L: 2794
Login.loginIndex = 3; // L: 2795
Login.field1190 = 1; // L: 2796
@@ -57,66 +57,66 @@ public class UserComparator8 extends AbstractUserComparator {
Login.field1199 = 0; // L: 2801
} else if (var0 == 5) { // L: 2804
Login.field1190 = 2; // L: 2805
GameShell.setLoginResponseString("Your account has not logged out from its last", "session or the server is too busy right now.", "Please try again in a few minutes."); // L: 2806
GameEngine.setLoginResponseString("Your account has not logged out from its last", "session or the server is too busy right now.", "Please try again in a few minutes."); // L: 2806
} else if (var0 != 68 && (Client.onMobile || var0 != 6)) { // L: 2808
if (var0 == 7) { // L: 2811
GameShell.setLoginResponseString("This world is full.", "Please use a different world.", "");
GameEngine.setLoginResponseString("This world is full.", "Please use a different world.", "");
} else if (var0 == 8) { // L: 2812
GameShell.setLoginResponseString("Unable to connect.", "Login server offline.", "");
GameEngine.setLoginResponseString("Unable to connect.", "Login server offline.", "");
} else if (var0 == 9) { // L: 2813
GameShell.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", "");
GameEngine.setLoginResponseString("Login limit exceeded.", "Too many connections from your address.", "");
} else if (var0 == 10) { // L: 2814
GameShell.setLoginResponseString("Unable to connect.", "Bad session id.", "");
GameEngine.setLoginResponseString("Unable to connect.", "Bad session id.", "");
} else if (var0 == 11) { // L: 2815
GameShell.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", "");
GameEngine.setLoginResponseString("We suspect someone knows your password.", "Press 'change your password' on front page.", "");
} else if (var0 == 12) { // L: 2816
GameShell.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", "");
GameEngine.setLoginResponseString("You need a members account to login to this world.", "Please subscribe, or use a different world.", "");
} else if (var0 == 13) { // L: 2817
GameShell.setLoginResponseString("Could not complete login.", "Please try using a different world.", "");
GameEngine.setLoginResponseString("Could not complete login.", "Please try using a different world.", "");
} else if (var0 == 14) { // L: 2818
GameShell.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", "");
GameEngine.setLoginResponseString("The server is being updated.", "Please wait 1 minute and try again.", "");
} else if (var0 == 16) { // L: 2819
GameShell.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", "");
GameEngine.setLoginResponseString("Too many login attempts.", "Please wait a few minutes before trying again.", "");
} else if (var0 == 17) { // L: 2820
GameShell.setLoginResponseString("You are standing in a members-only area.", "To play on this world move to a free area first", "");
GameEngine.setLoginResponseString("You are standing in a members-only area.", "To play on this world move to a free area first", "");
} else if (var0 == 18) { // L: 2821
Login.loginIndex = 12; // L: 2823
Login.field1199 = 1; // L: 2824
} else if (var0 == 19) { // L: 2827
GameShell.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world.");
GameEngine.setLoginResponseString("This world is running a closed Beta.", "Sorry invited players only.", "Please use a different world.");
} else if (var0 == 20) { // L: 2828
GameShell.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", "");
GameEngine.setLoginResponseString("Invalid loginserver requested.", "Please try using a different world.", "");
} else if (var0 == 22) { // L: 2829
GameShell.setLoginResponseString("Malformed login packet.", "Please try again.", "");
GameEngine.setLoginResponseString("Malformed login packet.", "Please try again.", "");
} else if (var0 == 23) { // L: 2830
GameShell.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", "");
GameEngine.setLoginResponseString("No reply from loginserver.", "Please wait 1 minute and try again.", "");
} else if (var0 == 24) { // L: 2831
GameShell.setLoginResponseString("Error loading your profile.", "Please contact customer support.", "");
GameEngine.setLoginResponseString("Error loading your profile.", "Please contact customer support.", "");
} else if (var0 == 25) { // L: 2832
GameShell.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", "");
GameEngine.setLoginResponseString("Unexpected loginserver response.", "Please try using a different world.", "");
} else if (var0 == 26) { // L: 2833
GameShell.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", "");
GameEngine.setLoginResponseString("This computers address has been blocked", "as it was used to break our rules.", "");
} else if (var0 == 27) { // L: 2834
GameShell.setLoginResponseString("", "Service unavailable.", "");
GameEngine.setLoginResponseString("", "Service unavailable.", "");
} else if (var0 == 31) { // L: 2835
GameShell.setLoginResponseString("Your account must have a displayname set", "in order to play the game. Please set it", "via the website, or the main game.");
GameEngine.setLoginResponseString("Your account must have a displayname set", "in order to play the game. Please set it", "via the website, or the main game.");
} else if (var0 == 32) {
GameShell.setLoginResponseString("Your attempt to log into your account was", "unsuccessful. Don't worry, you can sort", "this out by visiting the billing system."); // L: 2836
GameEngine.setLoginResponseString("Your attempt to log into your account was", "unsuccessful. Don't worry, you can sort", "this out by visiting the billing system."); // L: 2836
} else if (var0 == 37) { // L: 2837
GameShell.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", "");
GameEngine.setLoginResponseString("Your account is currently inaccessible.", "Please try again in a few minutes.", "");
} else if (var0 == 38) { // L: 2838
GameShell.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!");
GameEngine.setLoginResponseString("You need to vote to play!", "Visit runescape.com and vote,", "and then come back here!");
} else if (var0 == 55) { // L: 2839
Login.loginIndex = 8; // L: 2840
} else {
if (var0 == 56) { // L: 2842
GameShell.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); // L: 2843
GameEngine.setLoginResponseString("Enter the 6-digit code generated by your", "authenticator app.", ""); // L: 2843
WorldMapCacheName.updateGameState(11); // L: 2844
return; // L: 2845
}
if (var0 == 57) { // L: 2847
GameShell.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); // L: 2848
GameEngine.setLoginResponseString("The code you entered was incorrect.", "Please try again.", ""); // L: 2848
WorldMapCacheName.updateGameState(11); // L: 2849
return; // L: 2850
}
@@ -124,11 +124,11 @@ public class UserComparator8 extends AbstractUserComparator {
if (var0 == 61) { // L: 2852
Login.loginIndex = 7; // L: 2853
} else {
GameShell.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); // L: 2855
GameEngine.setLoginResponseString("Unexpected server response", "Please try using a different world.", ""); // L: 2855
}
}
} else {
GameShell.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); // L: 2809
GameEngine.setLoginResponseString("RuneScape has been updated!", "Please reload this page.", ""); // L: 2809
}
WorldMapCacheName.updateGameState(10); // L: 2856

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

@@ -140,7 +140,7 @@ public final class WorldMapRectangle {
WorldMapSprite.archive1.clearFiles(); // L: 2905
class330.archive3.clearFiles(); // L: 2906
class227.archive4.clearFiles(); // L: 2907
GameShell.archive5.clearFiles(); // L: 2908
GameEngine.archive5.clearFiles(); // L: 2908
class217.archive6.clearFiles(); // L: 2909
BuddyRankComparator.archive7.clearFiles(); // L: 2910
Messages.archive8.clearFiles(); // L: 2911

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

@@ -182,7 +182,7 @@ public class WorldMapSection1 implements WorldMapSection {
switch(var0) { // L: 2941
case 1:
Login.loginIndex = 24; // L: 2950
GameShell.setLoginResponseString("", "You were disconnected from the server.", ""); // L: 2951
GameEngine.setLoginResponseString("", "You were disconnected from the server.", ""); // L: 2951
break;
case 2:
Messages.method2285(); // L: 2944

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

@@ -444,7 +444,7 @@ public enum class7 implements Enumerated {
static void method83() {
Login.Login_username = Login.Login_username.trim(); // L: 896
if (Login.Login_username.length() == 0) { // L: 897
GameShell.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 898
GameEngine.setLoginResponseString("Please enter your username.", "If you created your account after November", "2010, this will be the creation email address."); // L: 898
} else {
long var1;
try {
@@ -488,23 +488,23 @@ public enum class7 implements Enumerated {
switch(var0) { // L: 936
case 2:
GameShell.setLoginResponseString(Strings.field3053, Strings.field3054, Strings.field3055); // L: 941
GameEngine.setLoginResponseString(Strings.field3053, Strings.field3054, Strings.field3055); // L: 941
Login.loginIndex = 6; // L: 942
break; // L: 943
case 3:
GameShell.setLoginResponseString("", "Error connecting to server.", ""); // L: 954
GameEngine.setLoginResponseString("", "Error connecting to server.", ""); // L: 954
break;
case 4:
GameShell.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); // L: 951
GameEngine.setLoginResponseString("The part of the website you are trying", "to connect to is offline at the moment.", "Please try again later."); // L: 951
break; // L: 952
case 5:
GameShell.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); // L: 938
GameEngine.setLoginResponseString("Sorry, there was an error trying to", "log you in to this part of the website.", "Please try again later."); // L: 938
break; // L: 939
case 6:
GameShell.setLoginResponseString("", "Error connecting to server.", ""); // L: 948
GameEngine.setLoginResponseString("", "Error connecting to server.", ""); // L: 948
break; // L: 949
case 7:
GameShell.setLoginResponseString("You must enter a valid login to proceed. For accounts", "created after 24th November 2010, please use your", "email address. Otherwise please use your username."); // L: 945
GameEngine.setLoginResponseString("You must enter a valid login to proceed. For accounts", "created after 24th November 2010, please use your", "email address. Otherwise please use your username."); // L: 945
}
}