2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2025-12-10 10:20:41 -07:00
Code Issues Projects Releases Packages Wiki Activity

minor renaming

Browse source
This commit is contained in:
Woah 2021-03-25 17:09:48 -04:00
parent 8d56a8c0de
commit 8949233eae
38 changed files with 555 additions and 615 deletions
Download patch file Download diff file Expand all files Collapse all files

62
Client/src/main/java/org/runite/client/CS2Script.java
View file

@ -1656,7 +1656,7 @@ public final class CS2Script extends Linkable {
int j24 = ItemDefinition.intsStack[--iStackCounter];
int k55 = -1;
if (j24 < 100 && null != LinkableRSString.aClass94Array2580[j24])
k55 = ConfigInventoryDefinition.anIntArray3082[j24];
k55 = MessageManager.anIntArray3082[j24];
ItemDefinition.intsStack[iStackCounter++] = k55;
continue;
}
@ -1807,7 +1807,7 @@ public final class CS2Script extends Linkable {
int k24 = ItemDefinition.intsStack[--iStackCounter];
RSString class94_49 = null;
if (k24 < 100)
class94_49 = ConfigInventoryDefinition.aClass94Array3226[k24];
class94_49 = MessageManager.aClass94Array3226[k24];
if (null == class94_49)
class94_49 = TextCore.aClass94_2331;
ItemDefinition.stringsStack[sStackCounter++] = class94_49;
@ -1827,7 +1827,7 @@ public final class CS2Script extends Linkable {
int i25 = ItemDefinition.intsStack[--iStackCounter];
int l55 = -1;
if (i25 < 100)
l55 = ConfigInventoryDefinition.anIntArray1835[i25];
l55 = MessageManager.anIntArray1835[i25];
ItemDefinition.intsStack[iStackCounter++] = l55;
continue;
}
@ -2226,11 +2226,11 @@ public final class CS2Script extends Linkable {
int i59 = ItemDefinition.intsStack[1 + iStackCounter];
int l31 = ItemDefinition.intsStack[iStackCounter];
GameObject.graphicsSettings(false, 3, l31, i59);
ItemDefinition.intsStack[iStackCounter++] = null != TextureOperation30.aFrame3121 ? 1 : 0;
ItemDefinition.intsStack[iStackCounter++] = null != TextureOperation30.fullScreenFrame ? 1 : 0;
continue;
}
if (opcode == 5301) {
if (null != TextureOperation30.aFrame3121)
if (null != TextureOperation30.fullScreenFrame)
GameObject.graphicsSettings(false, Unsorted.anInt2577, -1, -1);
continue;
}
@ -2286,7 +2286,7 @@ public final class CS2Script extends Linkable {
if (l32 < 0 || l32 > 2)
l32 = 0;
Unsorted.anInt2577 = l32;
Class119.method1730(Class38.signlink);
Class119.method1730(Class38.gameSignlink);
continue;
}
if (5500 > opcode) {
@ -2345,7 +2345,7 @@ public final class CS2Script extends Linkable {
continue;
}
if (opcode == 5411) {
if (TextureOperation30.aFrame3121 != null)
if (TextureOperation30.fullScreenFrame != null)
GameObject.graphicsSettings(false, Unsorted.anInt2577, -1, -1);
if (null == GameShell.frame)
System.exit(0);
@ -2372,7 +2372,7 @@ public final class CS2Script extends Linkable {
continue;
}
if (opcode == 5421) {
if (null != TextureOperation30.aFrame3121)
if (null != TextureOperation30.fullScreenFrame)
GameObject.graphicsSettings(false, Unsorted.anInt2577, -1, -1);
boolean flag5 = 1 == ItemDefinition.intsStack[--iStackCounter];
RSString class94_25 = ItemDefinition.stringsStack[--sStackCounter];
@ -2384,7 +2384,7 @@ public final class CS2Script extends Linkable {
} else {
Unsorted.aBoolean2154 = flag5;
TextureOperation5.aClass94_3295 = class94_64;
Class15.aClass64_351 = Class38.signlink.method1452(new String(class94_64.method1568(), StandardCharsets.ISO_8859_1), true);
Class15.aClass64_351 = Class38.gameSignlink.method1452(new String(class94_64.method1568(), StandardCharsets.ISO_8859_1), true);
}
continue;
}
@ -2537,7 +2537,7 @@ public final class CS2Script extends Linkable {
Class84.method1417();
}
Unsorted.method746((byte) -29);
Class119.method1730(Class38.signlink);
Class119.method1730(Class38.gameSignlink);
aBoolean2705 = false;
continue;
}
@ -2546,52 +2546,52 @@ public final class CS2Script extends Linkable {
Class3_Sub10.method139(66);
Class84.method1417();
Unsorted.method792();
Class119.method1730(Class38.signlink);
Class119.method1730(Class38.gameSignlink);
aBoolean2705 = false;
continue;
}
if (opcode == 6003) {
Unsorted.aBoolean3604 = ItemDefinition.intsStack[--iStackCounter] == 1;
Unsorted.method792();
Class119.method1730(Class38.signlink);
Class119.method1730(Class38.gameSignlink);
aBoolean2705 = false;
continue;
}
if (opcode == 6005) {
KeyboardListener.aBoolean1905 = ItemDefinition.intsStack[--iStackCounter] == 1;
Class84.method1417();
Class119.method1730(Class38.signlink);
Class119.method1730(Class38.gameSignlink);
aBoolean2705 = false;
continue;
}
if (opcode == 6006) {
Class25.aBoolean488 = ItemDefinition.intsStack[--iStackCounter] == 1;
((Class102) Class51.anInterface2_838).method1616(!Class25.aBoolean488);
Class119.method1730(Class38.signlink);
Class119.method1730(Class38.gameSignlink);
aBoolean2705 = false;
continue;
}
if (opcode == 6007) {
RSInterface.aBoolean236 = ItemDefinition.intsStack[--iStackCounter] == 1;
Class119.method1730(Class38.signlink);
Class119.method1730(Class38.gameSignlink);
aBoolean2705 = false;
continue;
}
if (opcode == 6008) {
WorldListEntry.aBoolean2623 = ItemDefinition.intsStack[--iStackCounter] == 1;
Class119.method1730(Class38.signlink);
Class119.method1730(Class38.gameSignlink);
aBoolean2705 = false;
continue;
}
if (opcode == 6009) {
Unsorted.aBoolean3275 = ItemDefinition.intsStack[--iStackCounter] == 1;
Class119.method1730(Class38.signlink);
Class119.method1730(Class38.gameSignlink);
aBoolean2705 = false;
continue;
}
if (opcode == 6010) {
Class140_Sub6.aBoolean2910 = 1 == ItemDefinition.intsStack[--iStackCounter];
Class119.method1730(Class38.signlink);
Class119.method1730(Class38.gameSignlink);
aBoolean2705 = false;
continue;
}
@ -2600,7 +2600,7 @@ public final class CS2Script extends Linkable {
if (l34 < 0 || l34 > 2)
l34 = 0;
Unsorted.anInt1137 = l34;
Class119.method1730(Class38.signlink);
Class119.method1730(Class38.gameSignlink);
aBoolean2705 = false;
continue;
}
@ -2621,7 +2621,7 @@ public final class CS2Script extends Linkable {
Class51.method1137(0.6F);
}
Class84.method1417();
Class119.method1730(Class38.signlink);
Class119.method1730(Class38.gameSignlink);
aBoolean2705 = false;
continue;
}
@ -2629,7 +2629,7 @@ public final class CS2Script extends Linkable {
Class128.aBoolean1685 = ItemDefinition.intsStack[--iStackCounter] == 1;
if (HDToolKit.highDetail)
Class84.method1417();
Class119.method1730(Class38.signlink);
Class119.method1730(Class38.gameSignlink);
aBoolean2705 = false;
continue;
}
@ -2637,7 +2637,7 @@ public final class CS2Script extends Linkable {
Class38.aBoolean661 = ItemDefinition.intsStack[--iStackCounter] == 1;
if (HDToolKit.highDetail)
TextureOperation31.method236();
Class119.method1730(Class38.signlink);
Class119.method1730(Class38.gameSignlink);
aBoolean2705 = false;
continue;
}
@ -2653,7 +2653,7 @@ public final class CS2Script extends Linkable {
if (opcode == 6017) {
TextureOperation17.aBoolean3184 = ItemDefinition.intsStack[--iStackCounter] == 1;
GameShell.method34();
Class119.method1730(Class38.signlink);
Class119.method1730(Class38.gameSignlink);
aBoolean2705 = false;
continue;
}
@ -2664,7 +2664,7 @@ public final class CS2Script extends Linkable {
if (j35 > 127)
j35 = 127;
AudioHandler.soundEffectVolume = j35;
Class119.method1730(Class38.signlink);
Class119.method1730(Class38.gameSignlink);
aBoolean2705 = false;
continue;
}
@ -2686,7 +2686,7 @@ public final class CS2Script extends Linkable {
}
Unsorted.anInt120 = k35;
}
Class119.method1730(Class38.signlink);
Class119.method1730(Class38.gameSignlink);
aBoolean2705 = false;
continue;
}
@ -2697,7 +2697,7 @@ public final class CS2Script extends Linkable {
if (127 < l35)
l35 = 127;
Sprites.anInt340 = l35;
Class119.method1730(Class38.signlink);
Class119.method1730(Class38.gameSignlink);
aBoolean2705 = false;
continue;
}
@ -2718,7 +2718,7 @@ public final class CS2Script extends Linkable {
i36 = 0;
}
Class127_Sub1.method1758(i36);
Class119.method1730(Class38.signlink);
Class119.method1730(Class38.gameSignlink);
aBoolean2705 = false;
ItemDefinition.intsStack[iStackCounter++] = flag6 ? 0 : 1;
continue;
@ -2728,13 +2728,13 @@ public final class CS2Script extends Linkable {
if (j36 < 0 || 2 < j36)
j36 = 0;
Class3_Sub28_Sub9.anInt3622 = j36;
Class119.method1730(Class38.signlink);
Class119.method1730(Class38.gameSignlink);
continue;
}
if (opcode != 6028)
break;
Class163_Sub3.aBoolean3004 = ItemDefinition.intsStack[--iStackCounter] != 0;
Class119.method1730(Class38.signlink);
Class119.method1730(Class38.gameSignlink);
continue;
}
if (opcode < 6200) {
@ -2939,7 +2939,7 @@ public final class CS2Script extends Linkable {
}
if (opcode == 6504) {
Unsorted.anInt2148 = ItemDefinition.intsStack[--iStackCounter];
Class119.method1730(Class38.signlink);
Class119.method1730(Class38.gameSignlink);
continue;
}
if (6505 == opcode) {
@ -2979,7 +2979,7 @@ public final class CS2Script extends Linkable {
break;
if (6600 == opcode) {
Class15.aBoolean346 = ItemDefinition.intsStack[--iStackCounter] == 1;
Class119.method1730(Class38.signlink);
Class119.method1730(Class38.gameSignlink);
continue;
}
if (opcode != 6601)

4
Client/src/main/java/org/runite/client/CacheResourceWorker.java
View file

@ -100,7 +100,7 @@ final class CacheResourceWorker implements Runnable {
request.data = request.cache.read((int) request.nodeKey);
}
} catch (Exception var5) {
Class49.reportError(null, var5, (byte) 111);
Class49.reportError(null, var5);
}
request.waiting = false;
@ -108,7 +108,7 @@ final class CacheResourceWorker implements Runnable {
}
public CacheResourceWorker() {
Class64 var1 = Class38.signlink.method1451(5, this);
Class64 var1 = Class38.gameSignlink.startThread(5, this);
while (Objects.requireNonNull(var1).anInt978 == 0) {
TimeUtils.sleep(10L);

2
Client/src/main/java/org/runite/client/Class106.java
View file

@ -3,7 +3,7 @@ package org.runite.client;
final class Class106 {
static boolean aBoolean1441 = true;
static int anInt1442 = 0;
static int rightMargin = 0;
static int anInt1446 = 0;
static boolean paramUserUsingInternetExplorer = false;
int anInt1447;

30
Client/src/main/java/org/runite/client/Class119.java
View file

@ -12,33 +12,33 @@ final class Class119 {
static void method1729() {
try {
Object var1;
if (null == TextureOperation30.aFrame3121) {
if (null == TextureOperation30.fullScreenFrame) {
if (GameShell.frame == null) {
var1 = Class38.signlink.gameApplet;
var1 = Class38.gameSignlink.gameApplet;
} else {
var1 = GameShell.frame;
}
} else {
var1 = TextureOperation30.aFrame3121;
var1 = TextureOperation30.fullScreenFrame;
}
Unsorted.anInt2334 = ((Container) var1).getSize().width;
Class70.anInt1047 = ((Container) var1).getSize().height;
Unsorted.frameWidth = ((Container) var1).getSize().width;
Class70.frameHeight = ((Container) var1).getSize().height;
Insets var2;
if (var1 == GameShell.frame) {
var2 = GameShell.frame.getInsets();
Class70.anInt1047 -= var2.bottom + var2.top;
Unsorted.anInt2334 -= var2.right + var2.left;
Class70.frameHeight -= var2.bottom + var2.top;
Unsorted.frameWidth -= var2.right + var2.left;
}
if (Class83.getWindowType() >= 2) {
Class23.canvasWidth = Unsorted.anInt2334;
Class84.anInt1164 = 0;
Class106.anInt1442 = 0;
Class140_Sub7.canvasHeight = Class70.anInt1047;
Class23.canvasWidth = Unsorted.frameWidth;
Class84.leftMargin = 0;
Class106.rightMargin = 0;
Class140_Sub7.canvasHeight = Class70.frameHeight;
} else {
Class106.anInt1442 = 0;
Class84.anInt1164 = (-765 + Unsorted.anInt2334) / 2;
Class106.rightMargin = 0;
Class84.leftMargin = (-765 + Unsorted.frameWidth) / 2;
Class140_Sub7.canvasHeight = 503;
Class23.canvasWidth = 765;
}
@ -50,9 +50,9 @@ final class Class119 {
GameShell.canvas.setSize(Class23.canvasWidth, Class140_Sub7.canvasHeight);
if (var1 == GameShell.frame) {
var2 = GameShell.frame.getInsets();
GameShell.canvas.setLocation(var2.left + Class84.anInt1164, Class106.anInt1442 + var2.top);
GameShell.canvas.setLocation(var2.left + Class84.leftMargin, Class106.rightMargin + var2.top);
} else {
GameShell.canvas.setLocation(Class84.anInt1164, Class106.anInt1442);
GameShell.canvas.setLocation(Class84.leftMargin, Class106.rightMargin);
}
if (ConfigInventoryDefinition.anInt3655 != -1) {

44
Client/src/main/java/org/runite/client/Class121.java
View file

@ -102,27 +102,27 @@ final class Class121 {
return 0;
}
Class3_Sub9.aClass64_2318 = Class38.signlink.method1441((byte) 8, GameConfig.IP_MANAGEMENT, GameConfig.WL_PORT);//, Class123.anInt1658);
Class3_Sub9.aClass64_2318 = Class38.gameSignlink.method1441((byte) 8, GameConfig.IP_MANAGEMENT, GameConfig.WL_PORT);//, Class123.anInt1658);
RSInterface.aLong261 = TimeUtils.time();
Class43.worldListStage = 1;
}
if (30000L + RSInterface.aLong261 < TimeUtils.time()) {
return TextureOperation33.method179((byte) 92, 1000);
return method179((byte) 92, 1000);
}
int wlUpdateStamp;
int var2;
if (1 == Class43.worldListStage) {
if (Class3_Sub9.aClass64_2318.anInt978 == 2) {
return TextureOperation33.method179((byte) 92, 1001);
return method179((byte) 92, 1001);
}
if (1 != Class3_Sub9.aClass64_2318.anInt978) {
return -1;
}
Class3_Sub15.activeConnection = new Connection((Socket) Class3_Sub9.aClass64_2318.anObject974, Class38.signlink);
Class3_Sub15.activeConnection = new Connection((Socket) Class3_Sub9.aClass64_2318.anObject974, Class38.gameSignlink);
TextureOperation12.outgoingBuffer.index = 0;
Class3_Sub9.aClass64_2318 = null;
wlUpdateStamp = 0;
@ -152,7 +152,7 @@ final class Class121 {
}
if (var2 != 0) {
return TextureOperation33.method179((byte) 92, var2);
return method179((byte) 92, var2);
}
Class43.worldListStage = 2;
@ -205,13 +205,13 @@ final class Class121 {
return 0;
}
return TextureOperation33.method179((byte) 92, 1002);
return method179((byte) 92, 1002);
}
return -1;
}
} catch (IOException var5) {
return TextureOperation33.method179((byte) 92, 1003);
return method179((byte) 92, 1003);
}
return -1;
@ -247,4 +247,34 @@ final class Class121 {
}
}
static int method179(byte var0, int var1) {
try {
if (var0 == 92) {
if (null != Class3_Sub15.activeConnection) {
Class3_Sub15.activeConnection.close();
Class3_Sub15.activeConnection = null;
}
++Unsorted.anInt1088;
if (Unsorted.anInt1088 > 4) {
Class43.worldListStage = 0;
Unsorted.anInt1088 = 0;
return var1;
} else {
Class43.worldListStage = 0;
if (Class123.anInt1658 == Client.anInt3773) {
Class123.anInt1658 = Class53.anInt867;
} else {
Class123.anInt1658 = Client.anInt3773;
}
return -1;
}
} else {
return 122;
}
} catch (RuntimeException var3) {
throw ClientErrorException.clientError(var3, "an.F(" + var0 + ',' + var1 + ')');
}
}
}

2
Client/src/main/java/org/runite/client/Class140_Sub3.java
View file

@ -30,7 +30,7 @@ final class Class140_Sub3 extends GameObject {
static Model method1957(int var0, boolean var1, SequenceDefinition var2, int var3, int var4, int var5, int var6, int var7, Model var8, int var9, int var10, int var11, int var12) {
try {
long var14 = ((long) var4 << 48) + (long) (var7 + (var0 << 16) - -(var12 << 24)) + ((long) var6 << 32);
long var14 = ((long) var4 << 48) + (var7 + ((long) var0 << 16) - -((long) var12 << 24)) + ((long) var6 << 32);
Model var16 = (Model) Class158_Sub1.aReferenceCache_2982.get(var14);
int var21;
int var23;

2
Client/src/main/java/org/runite/client/Class15.java
View file

@ -284,7 +284,7 @@ public final class Class15 implements Runnable {
Class81.method1400(this.aClass87_350, null, -71);
}
} catch (Exception var7) {
Class49.reportError(null, var7, (byte) 111);
Class49.reportError(null, var7);
} finally {
this.aBoolean353 = false;
}

2
Client/src/main/java/org/runite/client/Class159.java
View file

@ -30,7 +30,7 @@ public final class Class159 {
try {
if (Unsorted.paramJavaScriptEnabled) {
try {
return !(Boolean) RSString.parse("showingVideoAd").method1577(Class38.signlink.gameApplet);
return !(Boolean) RSString.parse("showingVideoAd").method1577(Class38.gameSignlink.gameApplet);
} catch (Throwable var2) {
}
}

4
Client/src/main/java/org/runite/client/Class163_Sub1_Sub1.java
View file

@ -73,7 +73,7 @@ public final class Class163_Sub1_Sub1 extends Class163_Sub1 {
}
if (adminLoginStage == 1) {
Class3_Sub9.aClass64_2318 = Class38.signlink.method1441((byte) 8, ClientErrorException.worldListHost, Class123.anInt1658);
Class3_Sub9.aClass64_2318 = Class38.gameSignlink.method1441((byte) 8, ClientErrorException.worldListHost, Class123.anInt1658);
adminLoginStage = 2;
}
@ -87,7 +87,7 @@ public final class Class163_Sub1_Sub1 extends Class163_Sub1 {
return;
}
Class3_Sub15.activeConnection = new Connection((Socket) Class3_Sub9.aClass64_2318.anObject974, Class38.signlink);
Class3_Sub15.activeConnection = new Connection((Socket) Class3_Sub9.aClass64_2318.anObject974, Class38.gameSignlink);
Class3_Sub9.aClass64_2318 = null;
Class3_Sub15.activeConnection.sendBytes(TextureOperation12.outgoingBuffer.buffer, TextureOperation12.outgoingBuffer.index);
if (WorldListEntry.aClass155_2627 != null) {

1
Client/src/main/java/org/runite/client/Class17.java
View file

@ -3,7 +3,6 @@ package org.runite.client;
final class Class17 {
static Interface2 anInterface2_408;
static Thread aThread409;
static int anInt410;
static Class64 aClass64_413;

2
Client/src/main/java/org/runite/client/Class21.java
View file

@ -51,7 +51,7 @@ public final class Class21 {
Unsorted.aBooleanArray3674[var1] = true;
}
TextureOperation9.method204(-3);
TextureOperation9.method204();
} catch (RuntimeException var2) {
throw ClientErrorException.clientError(var2, "dh.F(" + false + ')');
}

2
Client/src/main/java/org/runite/client/Class38.java
View file

@ -6,7 +6,7 @@ class Class38 {
static boolean aBoolean661 = true;
static int[][] anIntArrayArray663;
static int[] anIntArray664 = new int[14];
static Signlink signlink;
static Signlink gameSignlink;
static Class146 aClass146_668;
static void method1028() {

12
Client/src/main/java/org/runite/client/Class49.java
View file

@ -1,6 +1,5 @@
package org.runite.client;
import org.rs09.client.data.NodeCache;
import org.rs09.client.rendering.Toolkit;
import org.runite.client.drawcalls.ContextMenu;
@ -14,7 +13,6 @@ public final class Class49 {
static boolean[][] aBooleanArrayArray814;
static int anInt815 = 0;
static int anInt817;
static NodeCache aClass47_818 = new NodeCache(64);
static int anInt819 = 0;
@ -130,11 +128,7 @@ public final class Class49 {
}
}
static void reportError(String var0, Throwable var1, byte var2) {
if (var2 <= 100) {
aClass47_818 = null;
}
static void reportError(String var0, Throwable var1) {
try {
String var3 = "";
if (null != var1) {
@ -154,11 +148,11 @@ public final class Class49 {
var3 = InterfaceWidget.a("@", "%40", var3);
var3 = InterfaceWidget.a("&", "%26", var3);
var3 = InterfaceWidget.a("#", "%23", var3);
if (TextureOperation30.aClass87_3125.gameApplet == null) {
if (TextureOperation30.signlink.gameApplet == null) {
return;
}
Class64 var4 = TextureOperation30.aClass87_3125.method1439(false, new URL(TextureOperation30.aClass87_3125.gameApplet.getCodeBase(), "clienterror.ws?c=&u=" + PacketParser.aLong3202 + "&v1=" + Signlink.javaVendor + "&v2=" + Signlink.javaVersion + "&e=" + var3));
Class64 var4 = TextureOperation30.signlink.method1439(false, new URL(TextureOperation30.signlink.gameApplet.getCodeBase(), "clienterror.ws?c=&u=" + PacketParser.aLong3202 + "&v1=" + Signlink.javaVendor + "&v2=" + Signlink.javaVersion + "&e=" + var3));
while (var4.anInt978 == 0) {
TimeUtils.sleep(1L);

4
Client/src/main/java/org/runite/client/Class58.java
View file

@ -53,7 +53,7 @@ public final class Class58 {
if (Class3_Sub24_Sub4.anInt3507 > 0 && null == Class38_Sub1.aClass15_2613) {
Class38_Sub1.aClass15_2613 = new Class15();
Class38_Sub1.aClass15_2613.aClass87_350 = var1;
var1.method1451(Class3_Sub24_Sub4.anInt3507, Class38_Sub1.aClass15_2613);
var1.startThread(Class3_Sub24_Sub4.anInt3507, Class38_Sub1.aClass15_2613);
}
if (Class38_Sub1.aClass15_2613 != null) {
@ -77,7 +77,7 @@ public final class Class58 {
if (Class3_Sub24_Sub4.anInt3507 > 0 && null == Class38_Sub1.aClass15_2613) {
Class38_Sub1.aClass15_2613 = new Class15();
Class38_Sub1.aClass15_2613.aClass87_350 = var1;
var1.method1451(Class3_Sub24_Sub4.anInt3507, Class38_Sub1.aClass15_2613);
var1.startThread(Class3_Sub24_Sub4.anInt3507, Class38_Sub1.aClass15_2613);
}
if (Class38_Sub1.aClass15_2613 != null) {

2
Client/src/main/java/org/runite/client/Class70.java
View file

@ -3,7 +3,7 @@ package org.runite.client;
final class Class70 {
static RSString[] aClass94Array1046 = new RSString[200];
static int anInt1047;
static int frameHeight;
static double aDouble1050 = -1.0D;
static int anInt1053 = 0;
int anInt1045;

2
Client/src/main/java/org/runite/client/Class83.java
View file

@ -319,7 +319,7 @@ public final class Class83 {
public static int getWindowType() {
try {
if (TextureOperation30.aFrame3121 == null) {
if (TextureOperation30.fullScreenFrame == null) {
if (HDToolKit.highDetail && Class3_Sub15.aBoolean2427) {
return 2;
} else {

2
Client/src/main/java/org/runite/client/Class84.java
View file

@ -5,7 +5,7 @@ public final class Class84 {
static int[][] anIntArrayArray1160 = new int[104][104];
static LinkedList aLinkedList_1162 = new LinkedList();
public static int[] anIntArray1163 = new int[1000];
static int anInt1164 = 0;
static int leftMargin = 0;
static Class3_Sub28_Sub16_Sub2 aClass3_Sub28_Sub16_Sub2_1381;
static int[] anIntArray1729 = new int[]{12543016, 15504954, 15914854, 16773818};

2
Client/src/main/java/org/runite/client/Class99.java
View file

@ -20,7 +20,7 @@ final class Class99 {
if (var2) {
if (HDToolKit.highDetail && InterfaceWidget.aBoolean3594) {
try {
Class42.method1056(Class38.signlink.gameApplet, new Object[]{var0.method1547(LinkableRSString.anApplet_Sub1_2588.getCodeBase()).toString()});
Class42.method1056(Class38.gameSignlink.gameApplet, new Object[]{var0.method1547(LinkableRSString.anApplet_Sub1_2588.getCodeBase()).toString()});
return;
} catch (Throwable var6) {
}

112
Client/src/main/java/org/runite/client/Client.java
View file

File diff suppressed because one or more lines are too long

4
Client/src/main/java/org/runite/client/ClientCommands.java
View file

@ -81,7 +81,7 @@ public class ClientCommands {
}
if (command.equalsStringIgnoreCase(TextCore.COMMAND_BREAK_CONNECTION)) {
Class38.signlink.method1431();
Class38.gameSignlink.method1431();
Class3_Sub15.activeConnection.applyDummyStreams();
Class58.aJs5Worker_917.applyDummyStreams();
}
@ -158,7 +158,7 @@ public class ClientCommands {
if (command.startsWith(TextCore.COMMAND_SET_PARTICLES)) {
Class127_Sub1.method1758(command.substring(15).parseInt());
Class119.method1730(Class38.signlink);
Class119.method1730(Class38.gameSignlink);
CS2Script.aBoolean2705 = false;
}

10
Client/src/main/java/org/runite/client/ConfigInventoryDefinition.java
View file

@ -1,18 +1,16 @@
package org.runite.client;
import org.rs09.client.Node;
import org.rs09.client.data.NodeCache;
public final class ConfigInventoryDefinition extends Node {
static int[] anIntArray1835 = new int[100];
static int[] anIntArray3082 = new int[100];
static RSString[] aClass94Array3226 = new RSString[100];
static NodeCache aClass47_818 = new NodeCache(64);
int size = 0;
static short[][] aShortArrayArray3654 = new short[][]{{(short) 6798, (short) 107, (short) 10283, (short) 16, (short) 4797, (short) 7744, (short) 5799, (short) 4634, (short) -31839, (short) 22433, (short) 2983, (short) -11343, (short) 8, (short) 5281, (short) 10438, (short) 3650, (short) -27322, (short) -21845, (short) 200, (short) 571, (short) 908, (short) 21830, (short) 28946, (short) -15701, (short) -14010}, {(short) 8741, (short) 12, (short) -1506, (short) -22374, (short) 7735, (short) 8404, (short) 1701, (short) -27106, (short) 24094, (short) 10153, (short) -8915, (short) 4783, (short) 1341, (short) 16578, (short) -30533, (short) 25239, (short) 8, (short) 5281, (short) 10438, (short) 3650, (short) -27322, (short) -21845, (short) 200, (short) 571, (short) 908, (short) 21830, (short) 28946, (short) -15701, (short) -14010}, {(short) 25238, (short) 8742, (short) 12, (short) -1506, (short) -22374, (short) 7735, (short) 8404, (short) 1701, (short) -27106, (short) 24094, (short) 10153, (short) -8915, (short) 4783, (short) 1341, (short) 16578, (short) -30533, (short) 8, (short) 5281, (short) 10438, (short) 3650, (short) -27322, (short) -21845, (short) 200, (short) 571, (short) 908, (short) 21830, (short) 28946, (short) -15701, (short) -14010}, {(short) 4626, (short) 11146, (short) 6439, (short) 12, (short) 4758, (short) 10270}, {(short) 4550, (short) 4537, (short) 5681, (short) 5673, (short) 5790, (short) 6806, (short) 8076, (short) 4574}};
static int anInt3655 = -1;
public static ConfigInventoryDefinition retrieveConfigurationInventoryFile(int var0) {
ConfigInventoryDefinition var2 = (ConfigInventoryDefinition) Class49.aClass47_818.get(var0);
ConfigInventoryDefinition var2 = (ConfigInventoryDefinition) aClass47_818.get(var0);
if (null == var2) {
byte[] var3 = Class8.configurationReferenceCache.getFile(5, var0);
var2 = new ConfigInventoryDefinition();
@ -20,7 +18,7 @@ public final class ConfigInventoryDefinition extends Node {
var2.decode(new DataBuffer(var3));
}
Class49.aClass47_818.put(var0, var2);
aClass47_818.put(var0, var2);
}
return var2;
}

110
Client/src/main/java/org/runite/client/GameShell.java
View file

@ -16,6 +16,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
public static Canvas canvas;
public static Frame frame;
static Thread aThread409;
private static int anInt950;
private static volatile boolean hasWindowFocus = true;
private static long aLong2313 = 0L;
@ -38,9 +39,9 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
}
Class140_Sub3.method1959(TextureOperation17.aBoolean3184);
WorldListEntry.aClass155_2627 = Class58.method1195(22050, Class38.signlink, canvas, 0);
WorldListEntry.aClass155_2627 = Class58.method1195(22050, Class38.gameSignlink, canvas, 0);
WorldListEntry.aClass155_2627.method2154(114, Client.aClass3_Sub24_Sub4_1193);
Class3_Sub21.aClass155_2491 = Class58.method1195(2048, Class38.signlink, canvas, 1);
Class3_Sub21.aClass155_2491 = Class58.method1195(2048, Class38.gameSignlink, canvas, 1);
Class3_Sub21.aClass155_2491.method2154(-126, Class3_Sub26.aClass3_Sub24_Sub2_2563);
} catch (RuntimeException var2) {
throw ClientErrorException.clientError(var2, "rc.DA(" + -32589 + ')');
@ -49,8 +50,8 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
public static void provideSignlink(Signlink var0) {
try {
Class38.signlink = var0;
TextureOperation30.aClass87_3125 = var0;
Class38.gameSignlink = var0;
TextureOperation30.signlink = var0;
TextureOperation12.method445();
} catch (RuntimeException var2) {
throw ClientErrorException.clientError(var2, "rc.providesignlink(" + (var0 != null ? "{...}" : "null") + ')');
@ -88,7 +89,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
public final AppletContext getAppletContext() {
try {
return null != frame ? null : (Class38.signlink != null && this != Class38.signlink.gameApplet ? Class38.signlink.gameApplet.getAppletContext() : super.getAppletContext());
return null != frame ? null : (Class38.gameSignlink != null && this != Class38.gameSignlink.gameApplet ? Class38.gameSignlink.gameApplet.getAppletContext() : super.getAppletContext());
} catch (RuntimeException var2) {
throw ClientErrorException.clientError(var2, "rc.getAppletContext()");
}
@ -97,7 +98,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
public final void focusGained(FocusEvent var1) {
try {
hasWindowFocus = true;
TextureOperation30.aBoolean3116 = true;
TextureOperation30.fullRedraw = true;
} catch (RuntimeException var3) {
throw ClientErrorException.clientError(var3, "rc.focusGained(" + (var1 != null ? "{...}" : "null") + ')');
}
@ -107,17 +108,16 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
}
final synchronized void addCanvas() {
try {
if (canvas != null) {
canvas.removeFocusListener(this);
canvas.getParent().remove(canvas);
}
Container var2;
if (TextureOperation30.aFrame3121 != null) {
var2 = TextureOperation30.aFrame3121;
if (TextureOperation30.fullScreenFrame != null) {
var2 = TextureOperation30.fullScreenFrame;
} else if (null == frame) {
var2 = Class38.signlink.gameApplet;
var2 = Class38.gameSignlink.gameApplet;
} else {
var2 = frame;
}
@ -129,22 +129,19 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
canvas.setVisible(true);
if (var2 == frame) {
Insets var3 = frame.getInsets();
canvas.setLocation(Class84.anInt1164 + var3.left, var3.top + Class106.anInt1442);
canvas.setLocation(Class84.leftMargin + var3.left, var3.top + Class106.rightMargin);
} else {
canvas.setLocation(Class84.anInt1164, Class106.anInt1442);
canvas.setLocation(Class84.leftMargin, Class106.rightMargin);
}
canvas.addFocusListener(this);
canvas.requestFocus();
hasWindowFocus = true;
TextureOperation30.aBoolean3116 = true;
TextureOperation30.fullRedraw = true;
TextureOperation26.aBoolean3078 = true;
Class3_Sub28_Sub5.forceReplaceCanvasEnable = false;
SequenceDefinition.aLong1847 = TimeUtils.time();
ClientCommands.tweeningEnabled = true;
} catch (RuntimeException var4) {
throw ClientErrorException.clientError(var4, "rc.BA(" + ')');
}
}
public final void destroy() {
@ -152,7 +149,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
if (this == LinkableRSString.anApplet_Sub1_2588 && !Class29.aBoolean554) {
aLong2313 = TimeUtils.time();
TimeUtils.sleep(5000L);
TextureOperation30.aClass87_3125 = null;
TextureOperation30.signlink = null;
this.method35(false);
}
} catch (RuntimeException var2) {
@ -187,7 +184,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
public final URL getDocumentBase() {
try {
return null != frame ? null : (Class38.signlink != null && this != Class38.signlink.gameApplet ? Class38.signlink.gameApplet.getDocumentBase() : super.getDocumentBase());
return null != frame ? null : (Class38.gameSignlink != null && this != Class38.gameSignlink.gameApplet ? Class38.gameSignlink.gameApplet.getDocumentBase() : super.getDocumentBase());
} catch (RuntimeException var2) {
throw ClientErrorException.clientError(var2, "rc.getDocumentBase()");
}
@ -195,12 +192,12 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
public final synchronized void paint(Graphics g) {
if (LinkableRSString.anApplet_Sub1_2588 == this && !Class29.aBoolean554) {
TextureOperation30.aBoolean3116 = true;
TextureOperation30.fullRedraw = true;
if (aBoolean1784 && !HDToolKit.highDetail && -SequenceDefinition.aLong1847 + TimeUtils.time() > 1000) {
Rectangle var2 = g.getClipBounds();
if (var2 == null || Unsorted.anInt2334 <= var2.width && var2.height >= Class70.anInt1047) {
if (var2 == null || Unsorted.frameWidth <= var2.width && var2.height >= Class70.frameHeight) {
Class3_Sub28_Sub5.forceReplaceCanvasEnable = true;
}
}
@ -220,8 +217,8 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
Class29.aBoolean554 = true;
}
if (Class38.signlink.gameApplet != null) {
Class38.signlink.gameApplet.destroy();
if (Class38.gameSignlink.gameApplet != null) {
Class38.gameSignlink.gameApplet.destroy();
}
try {
@ -237,9 +234,9 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
}
}
if (null != Class38.signlink) {
if (null != Class38.gameSignlink) {
try {
Class38.signlink.method1445(0);
Class38.gameSignlink.method1445(0);
} catch (Exception var6) {
}
}
@ -292,15 +289,15 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
}
if (50 < TextureOperation28.anInt3313++) {
TextureOperation30.aBoolean3116 = true;
TextureOperation30.fullRedraw = true;
TextureOperation28.anInt3313 -= 50;
canvas.setSize(Class23.canvasWidth, Class140_Sub7.canvasHeight);
canvas.setVisible(true);
if (frame != null && null == TextureOperation30.aFrame3121) {
if (frame != null && null == TextureOperation30.fullScreenFrame) {
Insets var8 = frame.getInsets();
canvas.setLocation(var8.left + Class84.anInt1164, Class106.anInt1442 + var8.top);
canvas.setLocation(var8.left + Class84.leftMargin, Class106.rightMargin + var8.top);
} else {
canvas.setLocation(Class84.anInt1164, Class106.anInt1442);
canvas.setLocation(Class84.leftMargin, Class106.rightMargin);
}
}
@ -313,7 +310,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
abstract void method38();
public final URL getCodeBase() {
return frame == null ? (null != Class38.signlink && this != Class38.signlink.gameApplet ? Class38.signlink.gameApplet.getCodeBase() : super.getCodeBase()) : null;
return frame == null ? (null != Class38.gameSignlink && this != Class38.gameSignlink.gameApplet ? Class38.gameSignlink.gameApplet.getCodeBase() : super.getCodeBase()) : null;
}
public final void run() {
@ -358,11 +355,11 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
}
}
if (Class38.signlink.gameApplet != null) {
if (Class38.gameSignlink.gameApplet != null) {
Method var8 = Signlink.setFocusCycleRoot;
if (null != var8) {
try {
var8.invoke(Class38.signlink.gameApplet, Boolean.TRUE);
var8.invoke(Class38.gameSignlink.gameApplet, Boolean.TRUE);
} catch (Throwable var4) {
}
}
@ -382,10 +379,10 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
}
this.method37();
Class81.method1400(Class38.signlink, canvas, -80);
Class81.method1400(Class38.gameSignlink, canvas, -80);
}
} catch (Exception var5) {
Class49.reportError(null, var5, (byte) 127);
Class49.reportError(null, var5);
this.errorPrint("crash");
}
@ -398,7 +395,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
public final String getParameter(String var1) {
try {
return frame == null ? (Class38.signlink != null && this != Class38.signlink.gameApplet ? Class38.signlink.gameApplet.getParameter(var1) : super.getParameter(var1)) : null;
return frame == null ? (Class38.gameSignlink != null && this != Class38.gameSignlink.gameApplet ? Class38.gameSignlink.gameApplet.getParameter(var1) : super.getParameter(var1)) : null;
} catch (RuntimeException var3) {
throw ClientErrorException.clientError(var3, "rc.getParameter(" + (var1 != null ? "{...}" : "null") + ')');
}
@ -419,14 +416,13 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
public abstract void init();
final void launch() {
try {
try {
Class140_Sub7.canvasHeight = 768;
Class70.anInt1047 = 768;
Class84.anInt1164 = 0;
Class70.frameHeight = 768;
Class84.leftMargin = 0;
Class23.canvasWidth = 1024;
Unsorted.anInt2334 = 1024;
Class106.anInt1442 = 0;
Unsorted.frameWidth = 1024;
Class106.rightMargin = 0;
LinkableRSString.anApplet_Sub1_2588 = this;
Frame frame = new Frame();
frame.setTitle("Jagex");
@ -434,23 +430,19 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
frame.addWindowListener(this);
frame.setVisible(true);
frame.toFront();
Insets var9 = frame.getInsets();
frame.setSize(var9.left + Unsorted.anInt2334 + var9.right, var9.top + Class70.anInt1047 + var9.bottom);
TextureOperation30.aClass87_3125 = Class38.signlink = new Signlink(null, 32 - -TextureOperation20.paramModeWhat, "runescape", 29);
Class64 var10 = Class38.signlink.method1451(1, this);
Insets insets = frame.getInsets();
frame.setSize(insets.left + Unsorted.frameWidth + insets.right, insets.top + Class70.frameHeight + insets.bottom);
TextureOperation30.signlink = Class38.gameSignlink = new Signlink(null, 32 + TextureOperation20.paramModeWhat, "runescape", 29);
Class64 var10 = Class38.gameSignlink.startThread(1, this);
while (0 == Objects.requireNonNull(var10).anInt978) {
TimeUtils.sleep(10L);
}
Class17.aThread409 = (Thread) var10.anObject974;
ClientLoader.create().launch();
aThread409 = (Thread) var10.anObject974;
//ClientLoader.create().launch();
} catch (Exception var11) {
Class49.reportError(null, var11, (byte) 115);
}
} catch (RuntimeException var12) {
throw ClientErrorException.clientError(var12, "rc.S(" + ',' + 1024 + ',' + "{...}" + ',' + 768 + ',' + -8057 + ',' + 28 + ')');
Class49.reportError(null, var11);
}
}
@ -481,28 +473,28 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
return;
}
LinkableRSString.anApplet_Sub1_2588 = this;
Class106.anInt1442 = 0;
Class106.rightMargin = 0;
Class23.canvasWidth = 765;
Unsorted.anInt2334 = 765;
Class84.anInt1164 = 0;
Unsorted.frameWidth = 765;
Class84.leftMargin = 0;
Class140_Sub7.canvasHeight = 503;
Class70.anInt1047 = 503;
Class70.frameHeight = 503;
String var6 = this.getParameter("openwinjs");
InterfaceWidget.aBoolean3594 = var6 != null && var6.equals("1");
if (null == Class38.signlink) {
TextureOperation30.aClass87_3125 = Class38.signlink = new Signlink(this, var3, null, 0);
if (null == Class38.gameSignlink) {
TextureOperation30.signlink = Class38.gameSignlink = new Signlink(this, var3, null, 0);
}
Class64 var7 = Class38.signlink.method1451(1, this);
Class64 var7 = Class38.gameSignlink.startThread(1, this);
while (Objects.requireNonNull(var7).anInt978 == 0) {
TimeUtils.sleep(10L);
}
Class17.aThread409 = (Thread) var7.anObject974;
aThread409 = (Thread) var7.anObject974;
} catch (Exception var8) {
Class49.reportError(null, var8, (byte) 113);
Class49.reportError(null, var8);
this.errorPrint("crash");
}

8
Client/src/main/java/org/runite/client/LinkableRSString.java
View file

@ -121,10 +121,10 @@ public final class LinkableRSString extends Linkable {
static void method734(RSString var1) {
try {
Class163_Sub2.paramSettings = var1;
if (null != Class38.signlink.gameApplet) {
if (null != Class38.gameSignlink.gameApplet) {
try {
RSString var2 = TextCore.aClass94_2044.getParamValue(Class38.signlink.gameApplet);
RSString var3 = TextCore.aClass94_1885.getParamValue(Class38.signlink.gameApplet);
RSString var2 = TextCore.aClass94_2044.getParamValue(Class38.gameSignlink.gameApplet);
RSString var3 = TextCore.aClass94_1885.getParamValue(Class38.gameSignlink.gameApplet);
RSString var4 = RSString.stringCombiner(new RSString[]{var2, TextCore.aClass94_1151, var1, TextCore.aClass94_2074, var3});
if (0 == var1.length()) {
var4 = RSString.stringCombiner(new RSString[]{var4, TextCore.HasAgeExpire});
@ -132,7 +132,7 @@ public final class LinkableRSString extends Linkable {
var4 = RSString.stringCombiner(new RSString[]{var4, TextCore.HasExpires, Class15.method894(94608000000L + TimeUtils.time()), TextCore.HasMaxAge, QuickChatDefinition.method612(94608000L)});
}
RSString.stringCombiner(new RSString[]{TextCore.aClass94_1694, var4, TextCore.aClass94_1698}).method1554(Class38.signlink.gameApplet);
RSString.stringCombiner(new RSString[]{TextCore.aClass94_1694, var4, TextCore.aClass94_1698}).method1554(Class38.gameSignlink.gameApplet);
} catch (Throwable var5) {
}

105
Client/src/main/java/org/runite/client/LoginHandler.java
View file

@ -10,6 +10,7 @@ import java.util.Objects;
public class LoginHandler {
private static final BufferedDataStream buffer = new BufferedDataStream();
static CacheIndex aClass153_1680;
static boolean dynamic;
public static int loginStage = 0;
@ -42,7 +43,7 @@ public class LoginHandler {
++Class166.anInt2079;
}
if (loginStage == 1) {
Class3_Sub9.aClass64_2318 = Class38.signlink.method1441((byte) 8, Class38_Sub1.accRegistryIp, GameConfig.SERVER_PORT + GameConfig.WORLD);//Class140_Sub6.accRegistryPort);
Class3_Sub9.aClass64_2318 = Class38.gameSignlink.method1441((byte) 8, Class38_Sub1.accRegistryIp, GameConfig.SERVER_PORT + GameConfig.WORLD);//Class140_Sub6.accRegistryPort);
loginStage = 2;
}
@ -55,7 +56,7 @@ public class LoginHandler {
return;
}
Class3_Sub15.activeConnection = new Connection((Socket) Class3_Sub9.aClass64_2318.anObject974, Class38.signlink);
Class3_Sub15.activeConnection = new Connection((Socket) Class3_Sub9.aClass64_2318.anObject974, Class38.gameSignlink);
Class3_Sub9.aClass64_2318 = null;
long var1 = PacketParser.aLong3202 = Class131.username.toLong();
TextureOperation12.outgoingBuffer.index = 0;
@ -114,59 +115,59 @@ public class LoginHandler {
TextureOperation12.outgoingBuffer.writeString(Class131.password);
TextureOperation12.method229();
TextureOperation12.outgoingBuffer.rsaEncrypt(TextureOperation10.EXPONENT, TextureOperation31.MODULUS);
Unsorted.aBufferedDataStream_2942.index = 0;
buffer.index = 0;
if (40 == Class143.gameStage) {
Unsorted.aBufferedDataStream_2942.writeByte(18);
buffer.writeByte(18);
} else {
Unsorted.aBufferedDataStream_2942.writeByte(16);
buffer.writeByte(16);
}
Unsorted.aBufferedDataStream_2942.writeShort(TextureOperation12.outgoingBuffer.index + 163 - -TextureOperation29.method326((byte) 111, Class163_Sub2.paramSettings));
Unsorted.aBufferedDataStream_2942.writeInt(GameConfig.CLIENT_BUILD);
Unsorted.aBufferedDataStream_2942.writeByte(Class7.anInt2161);
Unsorted.aBufferedDataStream_2942.writeByte(!Client.paramAdvertisementSuppressed ? 0 : 1);
Unsorted.aBufferedDataStream_2942.writeByte(1);
Unsorted.aBufferedDataStream_2942.writeByte(Class83.getWindowType());
Unsorted.aBufferedDataStream_2942.writeShort(Class23.canvasWidth);
Unsorted.aBufferedDataStream_2942.writeShort(Class140_Sub7.canvasHeight);
Unsorted.aBufferedDataStream_2942.writeByte(Unsorted.anInt3671);
Class81.putRandomDataFile(Unsorted.aBufferedDataStream_2942, true);
Unsorted.aBufferedDataStream_2942.writeString(Class163_Sub2.paramSettings);
Unsorted.aBufferedDataStream_2942.writeInt(Class3_Sub26.paramAffid);
Unsorted.aBufferedDataStream_2942.writeInt(Class84.method1421());
buffer.writeShort(TextureOperation12.outgoingBuffer.index + 163 - -TextureOperation29.method326((byte) 111, Class163_Sub2.paramSettings));
buffer.writeInt(GameConfig.CLIENT_BUILD);
buffer.writeByte(Class7.anInt2161);
buffer.writeByte(!Client.paramAdvertisementSuppressed ? 0 : 1);
buffer.writeByte(1);
buffer.writeByte(Class83.getWindowType());
buffer.writeShort(Class23.canvasWidth);
buffer.writeShort(Class140_Sub7.canvasHeight);
buffer.writeByte(Unsorted.anInt3671);
Class81.putRandomDataFile(buffer, true);
buffer.writeString(Class163_Sub2.paramSettings);
buffer.writeInt(Class3_Sub26.paramAffid);
buffer.writeInt(Class84.method1421());
CS2Script.aBoolean2705 = true;
Unsorted.aBufferedDataStream_2942.writeShort(Class113.interfacePacketCounter);
Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.skeletonsIndex.getReferenceTableCrc());
Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.skinsIndex.getReferenceTableCrc());
Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.configurationsIndex.getReferenceTableCrc());
Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.interfacesIndex.getReferenceTableCrc());
Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.soundFXIndex.getReferenceTableCrc());
Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.landscapesIndex.getReferenceTableCrc());
Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.musicIndex.getReferenceTableCrc());
Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.modelsIndex.getReferenceTableCrc());
Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.spritesIndex.getReferenceTableCrc());
Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.texturesIndex.getReferenceTableCrc());
Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.huffmanEncodingIndex.getReferenceTableCrc());
Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.music2Index.getReferenceTableCrc());
Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.interfaceScriptsIndex.getReferenceTableCrc());
Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.fontsIndex.getReferenceTableCrc());
Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.soundFX2Index.getReferenceTableCrc());
Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.soundFX3Index.getReferenceTableCrc());
Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.objectConfigIndex.getReferenceTableCrc());
Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.clientscriptMaskIndex.getReferenceTableCrc());
Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.npcConfigIndex.getReferenceTableCrc());
Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.itemConfigIndex.getReferenceTableCrc());
Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.animationIndex.getReferenceTableCrc());
Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.graphicFXIndex.getReferenceTableCrc());
Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.clientScriptConfigIndex.getReferenceTableCrc());
Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.worldmapIndex.getReferenceTableCrc());
Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.quickchatMessagesIndex.getReferenceTableCrc());
Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.quickchatMenusIndex.getReferenceTableCrc());
Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.materialsIndex.getReferenceTableCrc());
Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.particlesConfigIndex.getReferenceTableCrc());
Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.libIndex.getReferenceTableCrc());
Unsorted.aBufferedDataStream_2942.putBytes(TextureOperation12.outgoingBuffer.buffer, TextureOperation12.outgoingBuffer.index);
Class3_Sub15.activeConnection.sendBytes(Unsorted.aBufferedDataStream_2942.buffer, Unsorted.aBufferedDataStream_2942.index);
buffer.writeShort(Class113.interfacePacketCounter);
buffer.writeInt(CacheIndex.skeletonsIndex.getReferenceTableCrc());
buffer.writeInt(CacheIndex.skinsIndex.getReferenceTableCrc());
buffer.writeInt(CacheIndex.configurationsIndex.getReferenceTableCrc());
buffer.writeInt(CacheIndex.interfacesIndex.getReferenceTableCrc());
buffer.writeInt(CacheIndex.soundFXIndex.getReferenceTableCrc());
buffer.writeInt(CacheIndex.landscapesIndex.getReferenceTableCrc());
buffer.writeInt(CacheIndex.musicIndex.getReferenceTableCrc());
buffer.writeInt(CacheIndex.modelsIndex.getReferenceTableCrc());
buffer.writeInt(CacheIndex.spritesIndex.getReferenceTableCrc());
buffer.writeInt(CacheIndex.texturesIndex.getReferenceTableCrc());
buffer.writeInt(CacheIndex.huffmanEncodingIndex.getReferenceTableCrc());
buffer.writeInt(CacheIndex.music2Index.getReferenceTableCrc());
buffer.writeInt(CacheIndex.interfaceScriptsIndex.getReferenceTableCrc());
buffer.writeInt(CacheIndex.fontsIndex.getReferenceTableCrc());
buffer.writeInt(CacheIndex.soundFX2Index.getReferenceTableCrc());
buffer.writeInt(CacheIndex.soundFX3Index.getReferenceTableCrc());
buffer.writeInt(CacheIndex.objectConfigIndex.getReferenceTableCrc());
buffer.writeInt(CacheIndex.clientscriptMaskIndex.getReferenceTableCrc());
buffer.writeInt(CacheIndex.npcConfigIndex.getReferenceTableCrc());
buffer.writeInt(CacheIndex.itemConfigIndex.getReferenceTableCrc());
buffer.writeInt(CacheIndex.animationIndex.getReferenceTableCrc());
buffer.writeInt(CacheIndex.graphicFXIndex.getReferenceTableCrc());
buffer.writeInt(CacheIndex.clientScriptConfigIndex.getReferenceTableCrc());
buffer.writeInt(CacheIndex.worldmapIndex.getReferenceTableCrc());
buffer.writeInt(CacheIndex.quickchatMessagesIndex.getReferenceTableCrc());
buffer.writeInt(CacheIndex.quickchatMenusIndex.getReferenceTableCrc());
buffer.writeInt(CacheIndex.materialsIndex.getReferenceTableCrc());
buffer.writeInt(CacheIndex.particlesConfigIndex.getReferenceTableCrc());
buffer.writeInt(CacheIndex.libIndex.getReferenceTableCrc());
buffer.putBytes(TextureOperation12.outgoingBuffer.buffer, TextureOperation12.outgoingBuffer.index);
Class3_Sub15.activeConnection.sendBytes(buffer.buffer, buffer.index);
TextureOperation12.outgoingBuffer.method814(var9);
for (int var2 = 0; var2 < 4; ++var2) {
@ -278,12 +279,12 @@ public class LoginHandler {
if (!Client.paramAdvertisementSuppressed) {
if ((!Class3_Sub15.aBoolean2433 || Unsorted.aBoolean4063) && !TextureOperation3.disableGEBoxes) {
try {
TextCore.aClass94_516.method1577(Class38.signlink.gameApplet);
TextCore.aClass94_516.method1577(Class38.gameSignlink.gameApplet);
} catch (Throwable var5) {
}
} else {
try {
Class97.aClass94_1374.method1577(Class38.signlink.gameApplet);
Class97.aClass94_1374.method1577(Class38.gameSignlink.gameApplet);
} catch (Throwable var6) {
}
}

16
Client/src/main/java/org/runite/client/MessageManager.java
View file

@ -2,20 +2,24 @@ package org.runite.client;
public final class MessageManager {
static RSString[] aClass94Array3226 = new RSString[100];
static int[] anIntArray1835 = new int[100];
static int[] anIntArray3082 = new int[100];
static void sendGameMessage(int var0, int type, RSString message, RSString var3, RSString var5) {
for (int i = 99; i > 0; --i) {
ConfigInventoryDefinition.anIntArray3082[i] = ConfigInventoryDefinition.anIntArray3082[i - 1];
ConfigInventoryDefinition.aClass94Array3226[i] = ConfigInventoryDefinition.aClass94Array3226[i - 1];
anIntArray3082[i] = anIntArray3082[i - 1];
aClass94Array3226[i] = aClass94Array3226[i - 1];
LinkableRSString.aClass94Array2580[i] = LinkableRSString.aClass94Array2580[-1 + i];
Class163_Sub3.aClass94Array3003[i] = Class163_Sub3.aClass94Array3003[i + -1];
ConfigInventoryDefinition.anIntArray1835[i] = ConfigInventoryDefinition.anIntArray1835[i - 1];
anIntArray1835[i] = anIntArray1835[i - 1];
}
++TextureOperation16.anInt3114;
ConfigInventoryDefinition.anIntArray3082[0] = type;
ConfigInventoryDefinition.aClass94Array3226[0] = var5;
anIntArray3082[0] = type;
aClass94Array3226[0] = var5;
Class24.anInt472 = PacketParser.anInt3213;
ConfigInventoryDefinition.anIntArray1835[0] = var0;
anIntArray1835[0] = var0;
RSString primaryMsg = RSString.parse("null");
RSString secondaryMsg = RSString.parse("null");
int cutOff = 81 - (var3 != null ? var3.length : 0) - (var5 != null ? var5.length : 0);

10
Client/src/main/java/org/runite/client/PacketParser.java
View file

@ -394,7 +394,7 @@ public final class PacketParser {
}
} else if (Unsorted.incomingOpcode == 164) {
nodeModelId = BufferedDataStream.incomingBuffer.readIntV1();
Class136.aClass64_1778 = Class38.signlink.method1449((byte) -83 ^ -82, nodeModelId);
Class136.aClass64_1778 = Class38.gameSignlink.method1449((byte) -83 ^ -82, nodeModelId);
Unsorted.incomingOpcode = -1;
return true;
} else if (Unsorted.incomingOpcode == 225) {
@ -1037,7 +1037,7 @@ public final class PacketParser {
Class140_Sub6.anInt2905 = anInt3213;
return true;
} else if (Unsorted.incomingOpcode == 114) {
TextureOperation3.method305(Class38.signlink, BufferedDataStream.incomingBuffer, Unsorted.incomingPacketLength);
TextureOperation3.method305(Class38.gameSignlink, BufferedDataStream.incomingBuffer, Unsorted.incomingPacketLength);
Unsorted.incomingOpcode = -1;
return true;
} else if (65 == Unsorted.incomingOpcode) {
@ -1092,7 +1092,7 @@ public final class PacketParser {
Unsorted.incomingOpcode = -1;
return true;
} else if (Unsorted.incomingOpcode == 42) {
if (null != TextureOperation30.aFrame3121) {
if (null != TextureOperation30.fullScreenFrame) {
GameObject.graphicsSettings(false, Unsorted.anInt2577, -1, -1);
}
@ -1104,7 +1104,7 @@ public final class PacketParser {
} else {
TextureOperation5.aClass94_3295 = playerName;
Unsorted.aBoolean2154 = true;
Class15.aClass64_351 = Class38.signlink.method1452(new String(playerName.method1568(), StandardCharsets.ISO_8859_1), true);
Class15.aClass64_351 = Class38.gameSignlink.method1452(new String(playerName.method1568(), StandardCharsets.ISO_8859_1), true);
}
Unsorted.incomingOpcode = -1;
@ -1711,7 +1711,7 @@ public final class PacketParser {
Unsorted.incomingOpcode = -1;
return true;
} else {
Class49.reportError("T1 - " + Unsorted.incomingOpcode + "," + Class7.anInt2166 + "," + Class24.anInt469 + " - " + Unsorted.incomingPacketLength, null, (byte) 117);
Class49.reportError("T1 - " + Unsorted.incomingOpcode + "," + Class7.anInt2166 + "," + Class24.anInt469 + " - " + Unsorted.incomingPacketLength, null);
Class167.method2269((byte) 46);
return true;
}

2
Client/src/main/java/org/runite/client/SequenceDefinition.java
View file

@ -550,7 +550,7 @@ public final class SequenceDefinition {
TextureOperation38.aShortArray3455 = TextureOperation16.aShortArray3110 = Class136.aShortArray1779 = TextureOperation38.aShortArray3453 = new short[256];
InvalidateData.method165();
Unsorted.aBoolean1951 = false;
TextureOperation9.method204(-3);
TextureOperation9.method204();
} catch (RuntimeException var6) {
throw ClientErrorException.clientError(var6, "tk.A(" + true + ')');
}

2
Client/src/main/java/org/runite/client/Signlink.java
View file

@ -619,7 +619,7 @@ public class Signlink implements Runnable {
return this.method1435(6, var1 + (var2 << 16), null, (var4 << 16) + var3);
}
public final Class64 method1451(int var2, Runnable var3) {
public final Class64 startThread(int var2, Runnable var3) {
return this.method1435(2, 0, var3, var2);
}

4
Client/src/main/java/org/runite/client/TextureOperation20.java
View file

@ -36,13 +36,13 @@ final class TextureOperation20 extends TextureOperation {
if(image == null) {
cursor = -1;
} else {
Class38.signlink.method1434(image.method655(), 10000, image.anInt3697, GameShell.canvas, new Point(cursorDef.getHotspotX(), cursorDef.getHotspotY()), image.anInt3706);
Class38.gameSignlink.method1434(image.method655(), 10000, image.anInt3697, GameShell.canvas, new Point(cursorDef.getHotspotX(), cursorDef.getHotspotY()), image.anInt3706);
Class65.anInt991 = cursor;
}
}
if(cursor == -1 && Class65.anInt991 != -1) {
Class38.signlink.method1434(null, 10000, -1, GameShell.canvas, new Point(), -1);
Class38.gameSignlink.method1434(null, 10000, -1, GameShell.canvas, new Point(), -1);
Class65.anInt991 = -1;
}

26
Client/src/main/java/org/runite/client/TextureOperation30.java
View file

@ -4,11 +4,11 @@ import java.util.Objects;
final class TextureOperation30 extends TextureOperation {
static volatile boolean aBoolean3116 = true;
static volatile boolean fullRedraw = true;
static boolean[][] aBooleanArrayArray3118 = new boolean[][]{new boolean[0], {true, false, true}, {true, false, false, true}, {false, false, true, true}, {true, true, false}, {false, true, true}, {true, false, false, true}, {false, false, false, true, true}, {false, true, true}, {true, false, true, true, true}, {false, true, true, true, true}, {false, true, true, true, true, false}};
static Frame aFrame3121;
static Signlink aClass87_3125;
static Frame fullScreenFrame;
static Signlink signlink;
private int anInt3126 = 2048;
private int anInt3127 = 3072;
private int anInt3128 = 1024;
@ -44,20 +44,6 @@ final class TextureOperation30 extends TextureOperation {
}
}
public static void method211(int var0) {
try {
if(var0 != 1024) {
aClass87_3125 = null;
}
TextCore.COMMAND_NOCLIP = null;
aFrame3121 = null;
aBooleanArrayArray3118 = null;
aClass87_3125 = null;
} catch (RuntimeException var2) {
throw ClientErrorException.clientError(var2, "fh.C(" + var0 + ')');
}
}
final int[] method154(int var1, byte var2) {
try {
int[] var7 = this.aClass114_2382.method1709(var1);
@ -184,7 +170,7 @@ final class TextureOperation30 extends TextureOperation {
short var2 = 256;
int var3 = 0;
if(var0 >= -80) {
aBoolean3116 = true;
fullRedraw = true;
}
while(Class161.anIntArray2026.length > var3) {
@ -247,10 +233,6 @@ final class TextureOperation30 extends TextureOperation {
}
}
if(-1 != -1) {
method211(51);
}
return var3;
} catch (RuntimeException var12) {
throw ClientErrorException.clientError(var12, "fh.T(" + -1 + ',' + var2 + ')');

47
Client/src/main/java/org/runite/client/TextureOperation33.java
View file

@ -47,10 +47,6 @@ public final class TextureOperation33 extends TextureOperation {
final void decode(int var1, DataBuffer var2) {
try {
if (!true) {
CS2Script.aShort3052 = -37;
}
if (0 == var1) {
this.anInt3047 = var2.readUnsignedShort();
} else if (var1 == 1) {
@ -62,37 +58,6 @@ public final class TextureOperation33 extends TextureOperation {
}
}
static int method179(byte var0, int var1) {
try {
if (var0 == 92) {
if (null != Class3_Sub15.activeConnection) {
Class3_Sub15.activeConnection.close();
Class3_Sub15.activeConnection = null;
}
++Unsorted.anInt1088;
if (Unsorted.anInt1088 > 4) {
Class43.worldListStage = 0;
Unsorted.anInt1088 = 0;
return var1;
} else {
Class43.worldListStage = 0;
if (Class123.anInt1658 == Client.anInt3773) {
Class123.anInt1658 = Class53.anInt867;
} else {
Class123.anInt1658 = Client.anInt3773;
}
return -1;
}
} else {
return 122;
}
} catch (RuntimeException var3) {
throw ClientErrorException.clientError(var3, "an.F(" + var0 + ',' + var1 + ')');
}
}
static void method180(int var0, int var1, int var2) {
try {
int var3;
@ -142,7 +107,7 @@ public final class TextureOperation33 extends TextureOperation {
var2 = var2 + BufferedDataStream.incomingBuffer.buffer[var3] + ",";
}
Class49.reportError(var2, var5, (byte) 108);
Class49.reportError(var2, var5);
Class167.method2269((byte) 46);
return true;
}
@ -150,10 +115,6 @@ public final class TextureOperation33 extends TextureOperation {
static void method182() {
try {
if (false) {
method179((byte) 120, -73);
}
Texture.aReferenceCache_1146.clear();
Class159.aReferenceCache_2016.clear();
} catch (RuntimeException var2) {
@ -163,7 +124,6 @@ public final class TextureOperation33 extends TextureOperation {
static void method183() {
try {
Unsorted.aReferenceCache_684.clear();
Class163_Sub1.aReferenceCache_2984.clear();
} catch (RuntimeException var2) {
@ -247,11 +207,6 @@ public final class TextureOperation33 extends TextureOperation {
var9[var10] = var13;
}
}
if (-1 != -1) {
method180(-55, -63, -5);
}
return var3;
} catch (RuntimeException var21) {
throw ClientErrorException.clientError(var21, "an.T(" + -1 + ',' + var2 + ')');

4
Client/src/main/java/org/runite/client/TextureOperation37.java
View file

@ -76,7 +76,7 @@ final class TextureOperation37 extends TextureOperation {
if(Unsorted.registryStage == 1) {
//Ip & Port
Class3_Sub9.aClass64_2318 = Class38.signlink.method1441((byte)8, Class38_Sub1.accRegistryIp, Class140_Sub6.accRegistryPort);
Class3_Sub9.aClass64_2318 = Class38.gameSignlink.method1441((byte)8, Class38_Sub1.accRegistryIp, Class140_Sub6.accRegistryPort);
Unsorted.registryStage = 2;
}
@ -88,7 +88,7 @@ final class TextureOperation37 extends TextureOperation {
if(1 != Class3_Sub9.aClass64_2318.anInt978) {
return;
}
Class3_Sub15.activeConnection = new Connection((Socket)Class3_Sub9.aClass64_2318.anObject974, Class38.signlink);
Class3_Sub15.activeConnection = new Connection((Socket)Class3_Sub9.aClass64_2318.anObject974, Class38.gameSignlink);
Class3_Sub9.aClass64_2318 = null;
Class3_Sub15.activeConnection.sendBytes(TextureOperation12.outgoingBuffer.buffer, TextureOperation12.outgoingBuffer.index);
if(WorldListEntry.aClass155_2627 != null) {

8
Client/src/main/java/org/runite/client/TextureOperation9.java
View file

@ -99,20 +99,16 @@ public final class TextureOperation9 extends TextureOperation {
}
}
static void method204(int var0) {
static void method204() {
try {
//Client Resize.
TextureOperation12.outgoingBuffer.putOpcode(243);
TextureOperation12.outgoingBuffer.writeByte(Class83.getWindowType());
TextureOperation12.outgoingBuffer.writeShort(Class23.canvasWidth);
if(var0 != -3) {
anInt3103 = -41;
}
TextureOperation12.outgoingBuffer.writeShort(Class140_Sub7.canvasHeight);
TextureOperation12.outgoingBuffer.writeByte(Unsorted.anInt3671);
} catch (RuntimeException var2) {
throw ClientErrorException.clientError(var2, "ej.C(" + var0 + ')');
throw ClientErrorException.clientError(var2, "ej.C(" + -3 + ')');
}
}

88
Client/src/main/java/org/runite/client/Unsorted.java
View file

File diff suppressed because one or more lines are too long

2
Client/src/main/java/org/runite/client/WaterfallShader.java
View file

@ -35,7 +35,7 @@ final class WaterfallShader implements ShaderInterface {
WorldListEntry var2 = Class3_Sub8.getWorld(97, var0);
if(var2 == null) {
return false;
} else if (1 != Signlink.anInt1214 && Signlink.anInt1214 != 2 && Class44.paramModeWhere != 2) {
} else if (Signlink.anInt1214 != 1 && Signlink.anInt1214 != 2 && Class44.paramModeWhere != 2) {
RSString var9 = aClass94_8;
if (Class44.paramModeWhere != 0) {
var9 = RSString.stringCombiner(new RSString[]{TextCore.aClass94_4007, RSString.stringAnimator(var2.worldId - -7000)});

1
Client/src/main/kotlin/org/rs09/client/constants/Parameter.kt
View file

@ -25,7 +25,6 @@ object Parameter {
const val LANGUAGE_ENGLISH = 0
const val LANGUAGE_GERMAN = 1
const val LANGUAGE_FRENCH = 2
const val LANGUAGE_PORTUGUESE = 3
/**
* Game type

2
Client/src/main/kotlin/org/rs09/client/net/Connection.kt
View file

@ -132,7 +132,7 @@ class Connection(val socket: Socket, val signlink: Signlink) : Runnable {
}
if (class64 == null) {
class64 = signlink.method1451(3, this)
class64 = signlink.startThread(3, this)
}
condition.signalAll()