From 35cf0a6705673a7d771bd506eb01431cebb7c4a5 Mon Sep 17 00:00:00 2001 From: Woah Date: Tue, 23 Mar 2021 04:17:16 -0400 Subject: [PATCH] Client renaming --- .../java/org/runite/client/CS2Methods.java | 22 ++ .../java/org/runite/client/CS2Script.java | 74 ++--- .../runite/client/CacheResourceWorker.java | 4 +- .../main/java/org/runite/client/Class1.java | 2 +- .../main/java/org/runite/client/Class106.java | 2 +- .../main/java/org/runite/client/Class108.java | 6 +- .../main/java/org/runite/client/Class119.java | 14 +- .../main/java/org/runite/client/Class121.java | 4 +- .../main/java/org/runite/client/Class124.java | 2 +- .../main/java/org/runite/client/Class126.java | 1 - .../main/java/org/runite/client/Class131.java | 6 +- .../main/java/org/runite/client/Class132.java | 8 +- .../java/org/runite/client/Class140_Sub3.java | 2 +- .../java/org/runite/client/Class140_Sub7.java | 4 +- .../main/java/org/runite/client/Class145.java | 2 +- .../main/java/org/runite/client/Class146.java | 9 +- .../main/java/org/runite/client/Class15.java | 2 +- .../main/java/org/runite/client/Class158.java | 2 +- .../main/java/org/runite/client/Class159.java | 4 +- .../org/runite/client/Class163_Sub1_Sub1.java | 4 +- .../java/org/runite/client/Class163_Sub2.java | 2 +- .../org/runite/client/Class163_Sub2_Sub1.java | 2 +- .../java/org/runite/client/Class163_Sub3.java | 10 +- .../main/java/org/runite/client/Class166.java | 2 +- .../main/java/org/runite/client/Class23.java | 2 +- .../main/java/org/runite/client/Class38.java | 2 +- .../org/runite/client/Class3_Sub13_Sub12.java | 4 +- .../org/runite/client/Class3_Sub13_Sub13.java | 10 +- .../org/runite/client/Class3_Sub13_Sub16.java | 2 +- .../org/runite/client/Class3_Sub13_Sub21.java | 4 +- .../client/Class3_Sub13_Sub23_Sub1.java | 9 - .../org/runite/client/Class3_Sub13_Sub3.java | 14 +- .../org/runite/client/Class3_Sub13_Sub30.java | 6 +- .../org/runite/client/Class3_Sub13_Sub36.java | 6 +- .../org/runite/client/Class3_Sub13_Sub8.java | 4 +- .../java/org/runite/client/Class3_Sub20.java | 2 +- .../java/org/runite/client/Class3_Sub23.java | 20 +- .../org/runite/client/Class3_Sub24_Sub3.java | 2 +- .../org/runite/client/Class3_Sub24_Sub4.java | 12 +- .../java/org/runite/client/Class3_Sub26.java | 2 +- .../org/runite/client/Class3_Sub28_Sub1.java | 10 +- .../org/runite/client/Class3_Sub28_Sub18.java | 18 -- .../org/runite/client/Class3_Sub28_Sub4.java | 2 +- .../org/runite/client/Class3_Sub30_Sub1.java | 12 +- .../java/org/runite/client/Class3_Sub31.java | 2 +- .../main/java/org/runite/client/Class44.java | 2 +- .../main/java/org/runite/client/Class49.java | 8 +- .../main/java/org/runite/client/Class72.java | 4 +- .../main/java/org/runite/client/Class79.java | 2 +- .../main/java/org/runite/client/Class8.java | 4 +- .../main/java/org/runite/client/Class81.java | 8 +- .../main/java/org/runite/client/Class84.java | 19 -- .../main/java/org/runite/client/Class99.java | 2 +- .../main/java/org/runite/client/Client.java | 284 ++++++++++-------- .../org/runite/client/ClientCommands.java | 8 +- .../java/org/runite/client/ClientLoader.java | 2 +- .../java/org/runite/client/DataBuffer.java | 4 +- .../java/org/runite/client/GameShell.java | 209 ++++++------- .../java/org/runite/client/HDToolKit.java | 3 +- .../org/runite/client/InterfaceWidget.java | 2 +- .../org/runite/client/LinkableRSString.java | 10 +- .../java/org/runite/client/LoginHandler.java | 22 +- .../src/main/java/org/runite/client/NPC.java | 2 +- .../org/runite/client/ObjectDefinition.java | 2 +- .../java/org/runite/client/PacketParser.java | 34 +-- .../main/java/org/runite/client/Player.java | 4 +- .../java/org/runite/client/RSInterface.java | 37 +-- .../main/java/org/runite/client/Signlink.java | 6 +- .../main/java/org/runite/client/TextCore.java | 2 +- .../main/java/org/runite/client/Unsorted.java | 95 +++--- .../org/runite/client/WaterfallShader.java | 21 +- .../rs09/client/console/DeveloperConsole.kt | 2 +- .../rs09/client/rendering/RenderingUtils.kt | 4 +- 73 files changed, 565 insertions(+), 572 deletions(-) create mode 100644 Client/src/main/java/org/runite/client/CS2Methods.java diff --git a/Client/src/main/java/org/runite/client/CS2Methods.java b/Client/src/main/java/org/runite/client/CS2Methods.java new file mode 100644 index 000000000..31d436f80 --- /dev/null +++ b/Client/src/main/java/org/runite/client/CS2Methods.java @@ -0,0 +1,22 @@ +package org.runite.client; + +public class CS2Methods { + static RSString method27(RSString var0) { + try { + + int var2 = Unsorted.method1602(var0); + return var2 != -1 ? Class119.aClass131_1624.aClass94Array1721[var2].method1560(TextCore.aClass94_3192, TextCore.aClass94_4066) : TextCore.aClass94_4049; + } catch (RuntimeException var3) { + throw ClientErrorException.clientError(var3, "rc.V(" + (var0 != null ? "{...}" : "null") + ',' + true + ')'); + } + } + + static void method28() { + try { + Class143.aReferenceCache_1874.clear(); + + } catch (RuntimeException var2) { + throw ClientErrorException.clientError(var2, "rc.Q(" + true + ')'); + } + } +} diff --git a/Client/src/main/java/org/runite/client/CS2Script.java b/Client/src/main/java/org/runite/client/CS2Script.java index fa9dde9d9..fa3038db8 100644 --- a/Client/src/main/java/org/runite/client/CS2Script.java +++ b/Client/src/main/java/org/runite/client/CS2Script.java @@ -1127,7 +1127,7 @@ final class CS2Script extends Linkable { continue; } if (3335 == opcode) { - ItemDefinition.intsStack[iStackCounter++] = Class3_Sub20.language; + ItemDefinition.intsStack[iStackCounter++] = Class3_Sub20.paramLanguage; continue; } if (opcode == 3336) { @@ -1144,7 +1144,7 @@ final class CS2Script extends Linkable { } if (opcode != 3337) break; - ItemDefinition.intsStack[iStackCounter++] = Class3_Sub26.anInt2554; + ItemDefinition.intsStack[iStackCounter++] = Class3_Sub26.paramAffid; continue; } if (opcode < 3500) { @@ -1399,7 +1399,7 @@ final class CS2Script extends Linkable { } if (opcode != 3629) break; - ItemDefinition.intsStack[iStackCounter++] = Class3_Sub31.countryId; + ItemDefinition.intsStack[iStackCounter++] = Class3_Sub31.paramCountryID; continue; } if (opcode < 4000) { @@ -1710,7 +1710,7 @@ final class CS2Script extends Linkable { } else if (class94_47.startsWith(TextCore.TextGlowThree)) { class94_18 = class94_18.substring(TextCore.TextGlowThree.length()); byte3 = 11; - } else if (0 != Class3_Sub20.language) + } else if (0 != Class3_Sub20.paramLanguage) if (class94_47.startsWith(TextCore.TextColorYellow)) { byte3 = 0; class94_18 = class94_18.substring(TextCore.TextColorYellow.length()); @@ -1765,7 +1765,7 @@ final class CS2Script extends Linkable { } else if (class94_47.startsWith(TextCore.TextSlide)) { byte4 = 5; class94_18 = class94_18.substring(TextCore.TextSlide.length()); - } else if (0 != Class3_Sub20.language) + } else if (0 != Class3_Sub20.paramLanguage) if (class94_47.startsWith(TextCore.TextWave)) { class94_18 = class94_18.substring(TextCore.TextWave.length()); byte4 = 1; @@ -2081,7 +2081,7 @@ final class CS2Script extends Linkable { continue; } if (5204 == opcode) { - ItemDefinition.stringsStack[sStackCounter - 1] = GameShell.method27(ItemDefinition.stringsStack[sStackCounter - 1]); + ItemDefinition.stringsStack[sStackCounter - 1] = CS2Methods.method27(ItemDefinition.stringsStack[sStackCounter - 1]); continue; } if (5205 == opcode) { @@ -2289,7 +2289,7 @@ final class CS2Script extends Linkable { if (l32 < 0 || l32 > 2) l32 = 0; Unsorted.anInt2577 = l32; - Class119.method1730(Class38.aClass87_665); + Class119.method1730(Class38.signlink); continue; } if (5500 > opcode) { @@ -2308,7 +2308,7 @@ final class CS2Script extends Linkable { if (opcode == 5401) { iStackCounter -= 2; Class3_Sub13_Sub38.aShortArray3455[ItemDefinition.intsStack[iStackCounter]] = (short) Class56.method1186(ItemDefinition.intsStack[iStackCounter + 1]); - GameShell.method28(); + CS2Methods.method28(); Unsorted.method746((byte) -29); Class167.method2265(); WorldListEntry.method1076(); @@ -2364,7 +2364,7 @@ final class CS2Script extends Linkable { if (Class136.aClass64_1778.anObject974 != null) { byte[] abyte0 = null; abyte0 = ((String) Class136.aClass64_1778.anObject974).getBytes(StandardCharsets.ISO_8859_1); - class94_24 = Class3_Sub13_Sub3.method178(abyte0, abyte0.length, 0); + class94_24 = Class3_Sub13_Sub3.bufferToString(abyte0, abyte0.length, 0); } } ItemDefinition.stringsStack[sStackCounter++] = class94_24; @@ -2382,12 +2382,12 @@ final class CS2Script extends Linkable { RSString class94_64 = RSString.stringCombiner(new RSString[]{ RSInterface.method856(), class94_25 }); - if (null == GameShell.frame && (!flag5 || Signlink.anInt1214 == 3 || !Signlink.osName.startsWith("win") || Class106.hasInternetExplorer6)) { + if (null == GameShell.frame && (!flag5 || Signlink.anInt1214 == 3 || !Signlink.osName.startsWith("win") || Class106.paramUserUsingInternetExplorer)) { Class99.method1596(class94_64, (byte) 127, flag5); } else { Unsorted.aBoolean2154 = flag5; Class3_Sub13_Sub24.aClass94_3295 = class94_64; - Class15.aClass64_351 = Class38.aClass87_665.method1452(new String(class94_64.method1568(), StandardCharsets.ISO_8859_1), true); + Class15.aClass64_351 = Class38.signlink.method1452(new String(class94_64.method1568(), StandardCharsets.ISO_8859_1), true); } continue; } @@ -2398,12 +2398,12 @@ final class CS2Script extends Linkable { RSString class94_26 = ItemDefinition.stringsStack[sStackCounter]; if (class94_26.length() > 0) { if (null == Class3_Sub30_Sub1.aClass94Array3802) - Class3_Sub30_Sub1.aClass94Array3802 = new RSString[Class3_Sub13_Sub18.anIntArray3218[Class158.anInt2014]]; + Class3_Sub30_Sub1.aClass94Array3802 = new RSString[Class3_Sub13_Sub18.anIntArray3218[Class158.paramGameTypeID]]; Class3_Sub30_Sub1.aClass94Array3802[i72] = class94_26; } if (class94_55.length() > 0) { if (Unsorted.aClass94Array45 == null) - Unsorted.aClass94Array45 = new RSString[Class3_Sub13_Sub18.anIntArray3218[Class158.anInt2014]]; + Unsorted.aClass94Array45 = new RSString[Class3_Sub13_Sub18.anIntArray3218[Class158.paramGameTypeID]]; Unsorted.aClass94Array45[i72] = class94_55; } continue; @@ -2540,7 +2540,7 @@ final class CS2Script extends Linkable { Class84.method1417(); } Unsorted.method746((byte) -29); - Class119.method1730(Class38.aClass87_665); + Class119.method1730(Class38.signlink); aBoolean2705 = false; continue; } @@ -2549,52 +2549,52 @@ final class CS2Script extends Linkable { Class3_Sub10.method139(66); Class84.method1417(); Unsorted.method792(); - Class119.method1730(Class38.aClass87_665); + Class119.method1730(Class38.signlink); aBoolean2705 = false; continue; } if (opcode == 6003) { Unsorted.aBoolean3604 = ItemDefinition.intsStack[--iStackCounter] == 1; Unsorted.method792(); - Class119.method1730(Class38.aClass87_665); + Class119.method1730(Class38.signlink); aBoolean2705 = false; continue; } if (opcode == 6005) { KeyboardListener.aBoolean1905 = ItemDefinition.intsStack[--iStackCounter] == 1; Class84.method1417(); - Class119.method1730(Class38.aClass87_665); + Class119.method1730(Class38.signlink); aBoolean2705 = false; continue; } if (opcode == 6006) { Class25.aBoolean488 = ItemDefinition.intsStack[--iStackCounter] == 1; ((Class102) Class51.anInterface2_838).method1616(!Class25.aBoolean488); - Class119.method1730(Class38.aClass87_665); + Class119.method1730(Class38.signlink); aBoolean2705 = false; continue; } if (opcode == 6007) { RSInterface.aBoolean236 = ItemDefinition.intsStack[--iStackCounter] == 1; - Class119.method1730(Class38.aClass87_665); + Class119.method1730(Class38.signlink); aBoolean2705 = false; continue; } if (opcode == 6008) { WorldListEntry.aBoolean2623 = ItemDefinition.intsStack[--iStackCounter] == 1; - Class119.method1730(Class38.aClass87_665); + Class119.method1730(Class38.signlink); aBoolean2705 = false; continue; } if (opcode == 6009) { Class3_Sub13_Sub22.aBoolean3275 = ItemDefinition.intsStack[--iStackCounter] == 1; - Class119.method1730(Class38.aClass87_665); + Class119.method1730(Class38.signlink); aBoolean2705 = false; continue; } if (opcode == 6010) { Class140_Sub6.aBoolean2910 = 1 == ItemDefinition.intsStack[--iStackCounter]; - Class119.method1730(Class38.aClass87_665); + Class119.method1730(Class38.signlink); aBoolean2705 = false; continue; } @@ -2603,7 +2603,7 @@ final class CS2Script extends Linkable { if (l34 < 0 || l34 > 2) l34 = 0; Unsorted.anInt1137 = l34; - Class119.method1730(Class38.aClass87_665); + Class119.method1730(Class38.signlink); aBoolean2705 = false; continue; } @@ -2624,7 +2624,7 @@ final class CS2Script extends Linkable { Class51.method1137(0.6F); } Class84.method1417(); - Class119.method1730(Class38.aClass87_665); + Class119.method1730(Class38.signlink); aBoolean2705 = false; continue; } @@ -2632,7 +2632,7 @@ final class CS2Script extends Linkable { Class128.aBoolean1685 = ItemDefinition.intsStack[--iStackCounter] == 1; if (HDToolKit.highDetail) Class84.method1417(); - Class119.method1730(Class38.aClass87_665); + Class119.method1730(Class38.signlink); aBoolean2705 = false; continue; } @@ -2640,7 +2640,7 @@ final class CS2Script extends Linkable { Class38.aBoolean661 = ItemDefinition.intsStack[--iStackCounter] == 1; if (HDToolKit.highDetail) Class3_Sub13_Sub14.method236(); - Class119.method1730(Class38.aClass87_665); + Class119.method1730(Class38.signlink); aBoolean2705 = false; continue; } @@ -2656,7 +2656,7 @@ final class CS2Script extends Linkable { if (opcode == 6017) { Class3_Sub13_Sub15.aBoolean3184 = ItemDefinition.intsStack[--iStackCounter] == 1; GameShell.method34(); - Class119.method1730(Class38.aClass87_665); + Class119.method1730(Class38.signlink); aBoolean2705 = false; continue; } @@ -2667,7 +2667,7 @@ final class CS2Script extends Linkable { if (j35 > 127) j35 = 127; anInt2453 = j35; - Class119.method1730(Class38.aClass87_665); + Class119.method1730(Class38.signlink); aBoolean2705 = false; continue; } @@ -2689,7 +2689,7 @@ final class CS2Script extends Linkable { } Unsorted.anInt120 = k35; } - Class119.method1730(Class38.aClass87_665); + Class119.method1730(Class38.signlink); aBoolean2705 = false; continue; } @@ -2700,7 +2700,7 @@ final class CS2Script extends Linkable { if (127 < l35) l35 = 127; Sprites.anInt340 = l35; - Class119.method1730(Class38.aClass87_665); + Class119.method1730(Class38.signlink); aBoolean2705 = false; continue; } @@ -2716,12 +2716,12 @@ final class CS2Script extends Linkable { if (i36 > 2) i36 = 2; boolean flag6 = false; - if (96 > Class3_Sub24_Sub3.anInt3492) { + if (96 > Class3_Sub24_Sub3.maxClientMemory) { flag6 = true; i36 = 0; } Class127_Sub1.method1758(i36); - Class119.method1730(Class38.aClass87_665); + Class119.method1730(Class38.signlink); aBoolean2705 = false; ItemDefinition.intsStack[iStackCounter++] = flag6 ? 0 : 1; continue; @@ -2731,13 +2731,13 @@ final class CS2Script extends Linkable { if (j36 < 0 || 2 < j36) j36 = 0; Class3_Sub28_Sub9.anInt3622 = j36; - Class119.method1730(Class38.aClass87_665); + Class119.method1730(Class38.signlink); continue; } if (opcode != 6028) break; Class163_Sub3.aBoolean3004 = ItemDefinition.intsStack[--iStackCounter] != 0; - Class119.method1730(Class38.aClass87_665); + Class119.method1730(Class38.signlink); continue; } if (opcode < 6200) { @@ -2942,7 +2942,7 @@ final class CS2Script extends Linkable { } if (opcode == 6504) { Unsorted.anInt2148 = ItemDefinition.intsStack[--iStackCounter]; - Class119.method1730(Class38.aClass87_665); + Class119.method1730(Class38.signlink); continue; } if (6505 == opcode) { @@ -2982,7 +2982,7 @@ final class CS2Script extends Linkable { break; if (6600 == opcode) { Class15.aBoolean346 = ItemDefinition.intsStack[--iStackCounter] == 1; - Class119.method1730(Class38.aClass87_665); + Class119.method1730(Class38.signlink); continue; } if (opcode != 6601) @@ -3429,7 +3429,7 @@ final class CS2Script extends Linkable { break; boolean flag1 = ItemDefinition.intsStack[--iStackCounter] != 0; int k64 = ItemDefinition.intsStack[--iStackCounter]; - ItemDefinition.stringsStack[sStackCounter++] = Class3_Sub23.method407(Class3_Sub20.language, flag1, 0, k64); + ItemDefinition.stringsStack[sStackCounter++] = Class3_Sub23.method407(Class3_Sub20.paramLanguage, flag1, 0, k64); continue; } RSInterface class11_8 = Class7.getRSInterface(ItemDefinition.intsStack[--iStackCounter]); diff --git a/Client/src/main/java/org/runite/client/CacheResourceWorker.java b/Client/src/main/java/org/runite/client/CacheResourceWorker.java index 80da5a4d5..f0e587e33 100644 --- a/Client/src/main/java/org/runite/client/CacheResourceWorker.java +++ b/Client/src/main/java/org/runite/client/CacheResourceWorker.java @@ -100,7 +100,7 @@ final class CacheResourceWorker implements Runnable { request.data = request.cache.read((int) request.nodeKey); } } catch (Exception var5) { - Class49.method1125(null, var5, (byte) 111); + Class49.reportError(null, var5, (byte) 111); } request.waiting = false; @@ -108,7 +108,7 @@ final class CacheResourceWorker implements Runnable { } public CacheResourceWorker() { - Class64 var1 = Class38.aClass87_665.method1451(5, this); + Class64 var1 = Class38.signlink.method1451(5, this); while (Objects.requireNonNull(var1).anInt978 == 0) { TimeUtils.sleep(10L); diff --git a/Client/src/main/java/org/runite/client/Class1.java b/Client/src/main/java/org/runite/client/Class1.java index a1de34f03..125d940a2 100644 --- a/Client/src/main/java/org/runite/client/Class1.java +++ b/Client/src/main/java/org/runite/client/Class1.java @@ -630,7 +630,7 @@ final class Class1 { int var15 = var0 + var2 * Class60.anInt930 / Class23.anInt455; int var7 = var2 * Class49.anInt817 / Class23.anInt455; int var9 = 16711680; - if (Class158.anInt2014 == 1) { + if (Class158.paramGameTypeID == 1) { var9 = 16777215; } Toolkit.getActiveToolkit().drawRect(var15, var6, var7, var8, var9, 255); diff --git a/Client/src/main/java/org/runite/client/Class106.java b/Client/src/main/java/org/runite/client/Class106.java index 41326f6db..9766a2fca 100644 --- a/Client/src/main/java/org/runite/client/Class106.java +++ b/Client/src/main/java/org/runite/client/Class106.java @@ -8,7 +8,7 @@ final class Class106 { int anInt1447; int anInt1449; int anInt1450; - static boolean hasInternetExplorer6 = false; + static boolean paramUserUsingInternetExplorer = false; static void method1642(RSString var1) { diff --git a/Client/src/main/java/org/runite/client/Class108.java b/Client/src/main/java/org/runite/client/Class108.java index 276f37115..264006b58 100644 --- a/Client/src/main/java/org/runite/client/Class108.java +++ b/Client/src/main/java/org/runite/client/Class108.java @@ -48,11 +48,11 @@ final class Class108 { } Class40.aAbstractSprite_680 = Class75_Sub2.method1344(var0, Class154.anInt1966); - int var2 = Class140_Sub7.anInt2934; + int var2 = Class140_Sub7.canvasHeight; int var3 = var2 * 956 / 503; - Objects.requireNonNull(Class40.aAbstractSprite_680).method639((Class23.anInt454 + -var3) / 2, 0, var3, var2); + Objects.requireNonNull(Class40.aAbstractSprite_680).method639((Class23.canvasWidth + -var3) / 2, 0, var3, var2); SequenceDefinition.aClass109_1856 = InterfaceWidget.a(Class79.anInt1124, var0); - Objects.requireNonNull(SequenceDefinition.aClass109_1856).method1667(Class23.anInt454 / 2 + -(SequenceDefinition.aClass109_1856.width / 2), 18); + Objects.requireNonNull(SequenceDefinition.aClass109_1856).method1667(Class23.canvasWidth / 2 + -(SequenceDefinition.aClass109_1856.width / 2), 18); Class140_Sub2.aBoolean2713 = true; if(var1 > -50) { Class140_Sub4.aReferenceCache_2792.clearSoftReferences(); diff --git a/Client/src/main/java/org/runite/client/Class119.java b/Client/src/main/java/org/runite/client/Class119.java index 94d4b3a38..30c0f29c7 100644 --- a/Client/src/main/java/org/runite/client/Class119.java +++ b/Client/src/main/java/org/runite/client/Class119.java @@ -14,7 +14,7 @@ final class Class119 { Object var1; if(null == Class3_Sub13_Sub10.aFrame3121) { if(GameShell.frame == null) { - var1 = Class38.aClass87_665.applet; + var1 = Class38.signlink.gameApplet; } else { var1 = GameShell.frame; } @@ -32,22 +32,22 @@ final class Class119 { } if(Class83.method1411(0) >= 2) { - Class23.anInt454 = Unsorted.anInt2334; + Class23.canvasWidth = Unsorted.anInt2334; Class84.anInt1164 = 0; Class106.anInt1442 = 0; - Class140_Sub7.anInt2934 = Class70.anInt1047; + Class140_Sub7.canvasHeight = Class70.anInt1047; } else { Class106.anInt1442 = 0; Class84.anInt1164 = (-765 + Unsorted.anInt2334) / 2; - Class140_Sub7.anInt2934 = 503; - Class23.anInt454 = 765; + Class140_Sub7.canvasHeight = 503; + Class23.canvasWidth = 765; } if(HDToolKit.highDetail) { - HDToolKit.method1854(Class23.anInt454, Class140_Sub7.anInt2934); + HDToolKit.method1854(Class23.canvasWidth, Class140_Sub7.canvasHeight); } - GameShell.canvas.setSize(Class23.anInt454, Class140_Sub7.anInt2934); + 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); diff --git a/Client/src/main/java/org/runite/client/Class121.java b/Client/src/main/java/org/runite/client/Class121.java index 50e794b82..cb0ffb66a 100644 --- a/Client/src/main/java/org/runite/client/Class121.java +++ b/Client/src/main/java/org/runite/client/Class121.java @@ -102,7 +102,7 @@ final class Class121 { return 0; } - Class3_Sub9.aClass64_2318 = Class38.aClass87_665.method1441((byte)8, GameConfig.IP_MANAGEMENT, GameConfig.WL_PORT);//, Class123.anInt1658); + Class3_Sub9.aClass64_2318 = Class38.signlink.method1441((byte)8, GameConfig.IP_MANAGEMENT, GameConfig.WL_PORT);//, Class123.anInt1658); RSInterface.aLong261 = TimeUtils.time(); Class43.anInt692 = 1; } @@ -122,7 +122,7 @@ final class Class121 { return -1; } - Class3_Sub15.activeConnection = new Connection((Socket)Class3_Sub9.aClass64_2318.anObject974, Class38.aClass87_665); + Class3_Sub15.activeConnection = new Connection((Socket)Class3_Sub9.aClass64_2318.anObject974, Class38.signlink); Class3_Sub13_Sub1.outgoingBuffer.index = 0; Class3_Sub9.aClass64_2318 = null; wlUpdateStamp = 0; diff --git a/Client/src/main/java/org/runite/client/Class124.java b/Client/src/main/java/org/runite/client/Class124.java index 50a200bdf..28710ae75 100644 --- a/Client/src/main/java/org/runite/client/Class124.java +++ b/Client/src/main/java/org/runite/client/Class124.java @@ -27,7 +27,7 @@ final class Class124 { aClass153_1661 = (CacheIndex)null; } - Class75_Sub4.method1352(Class140_Sub7.anInt2934, var0, Class3_Sub28_Sub12.anInt3655, Class23.anInt454); + Class75_Sub4.method1352(Class140_Sub7.canvasHeight, var0, Class3_Sub28_Sub12.anInt3655, Class23.canvasWidth); } catch (RuntimeException var3) { throw ClientErrorException.clientError(var3, "rb.C(" + var0 + ',' + var1 + ')'); } diff --git a/Client/src/main/java/org/runite/client/Class126.java b/Client/src/main/java/org/runite/client/Class126.java index b57675699..caf3a1fbd 100644 --- a/Client/src/main/java/org/runite/client/Class126.java +++ b/Client/src/main/java/org/runite/client/Class126.java @@ -11,7 +11,6 @@ public final class Class126 { int anInt1667; public static Class3_Sub28_Sub17 aClass3_Sub28_Sub17_1669; int anInt1670; - static Client aClient1671; int anInt1673; boolean aBoolean1674; int anInt1675; diff --git a/Client/src/main/java/org/runite/client/Class131.java b/Client/src/main/java/org/runite/client/Class131.java index 4ae243c2a..191bf01ae 100644 --- a/Client/src/main/java/org/runite/client/Class131.java +++ b/Client/src/main/java/org/runite/client/Class131.java @@ -5,8 +5,8 @@ import org.rs09.client.config.GameConfig; final class Class131 { static int anInt1716; - static RSString password = TextCore.aClass94_3672; - static RSString username = TextCore.aClass94_3672; + static RSString password = TextCore.emptyJagexString; + static RSString username = TextCore.emptyJagexString; short[] aShortArray1718; static int anInt1719 = -1; int anInt1720; @@ -128,7 +128,7 @@ final class Class131 { password = var1; Class7.anInt2161 = var2; username = var0; - if(username.equalsString(TextCore.aClass94_3672) || password.equalsString(TextCore.aClass94_3672)) { + if(username.equalsString(TextCore.emptyJagexString) || password.equalsString(TextCore.emptyJagexString)) { Class158.anInt2005 = 3; } else if (CS2Script.anInt2451 == -1) { Class163_Sub1_Sub1.anInt2246 = 0; diff --git a/Client/src/main/java/org/runite/client/Class132.java b/Client/src/main/java/org/runite/client/Class132.java index 831789270..799a167e7 100644 --- a/Client/src/main/java/org/runite/client/Class132.java +++ b/Client/src/main/java/org/runite/client/Class132.java @@ -72,12 +72,12 @@ final class Class132 { int var4 = Class38_Sub1.anInt2612; var1 += 8; var3 = NPCDefinition.anInt1297 + -(var1 / 2); - if(Class140_Sub7.anInt2934 < var4 + var2) { - var4 = Class140_Sub7.anInt2934 + -var2; + if(Class140_Sub7.canvasHeight < var4 + var2) { + var4 = Class140_Sub7.canvasHeight + -var2; } - if(Class23.anInt454 < var3 + var1) { - var3 = -var1 + Class23.anInt454; + if(Class23.canvasWidth < var3 + var1) { + var3 = -var1 + Class23.canvasWidth; } if(var3 < 0) { diff --git a/Client/src/main/java/org/runite/client/Class140_Sub3.java b/Client/src/main/java/org/runite/client/Class140_Sub3.java index 8ca118c94..ffb2e27c8 100644 --- a/Client/src/main/java/org/runite/client/Class140_Sub3.java +++ b/Client/src/main/java/org/runite/client/Class140_Sub3.java @@ -309,7 +309,7 @@ final class Class140_Sub3 extends GameObject { return null; } else { int var6; - if(Class158.anInt2014 != 0 && this.aBoolean2721 && (null == this.aClass142_2722 || var4.animationId != this.aClass142_2722.animId)) { + if(Class158.paramGameTypeID != 0 && this.aBoolean2721 && (null == this.aClass142_2722 || var4.animationId != this.aClass142_2722.animId)) { var6 = var4.animationId; if(var4.animationId == -1) { var6 = var5; diff --git a/Client/src/main/java/org/runite/client/Class140_Sub7.java b/Client/src/main/java/org/runite/client/Class140_Sub7.java index 922ef407d..48ade342c 100644 --- a/Client/src/main/java/org/runite/client/Class140_Sub7.java +++ b/Client/src/main/java/org/runite/client/Class140_Sub7.java @@ -6,7 +6,7 @@ public final class Class140_Sub7 extends GameObject { static int[] anIntArray2931; private int anInt2932 = -32768; static int[] anIntArray2933 = new int[]{2, 0, 0, 2, 0, 0, 0, 4, 4}; - public static int anInt2934; + public static int canvasHeight; static RSString[] aClass94Array2935 = new RSString[500]; int anInt2936; static int anInt2938; @@ -250,7 +250,7 @@ public final class Class140_Sub7 extends GameObject { byte[] var4 = new byte[var3]; var0.index += Class3_Sub13_Sub9.aClass36_3112.method1017(0, var3, var4, var0.buffer, var0.index); - return Class3_Sub13_Sub3.method178(var4, var3, 0); + return Class3_Sub13_Sub3.bufferToString(var4, var3, 0); } catch (Exception var6) { return TextCore.aClass94_2018; } diff --git a/Client/src/main/java/org/runite/client/Class145.java b/Client/src/main/java/org/runite/client/Class145.java index 0968de553..0efab19c7 100644 --- a/Client/src/main/java/org/runite/client/Class145.java +++ b/Client/src/main/java/org/runite/client/Class145.java @@ -614,7 +614,7 @@ final class Class145 { } var2.aBoolean2225 = false; - --GameShell.anInt3; + --Class146.anInt3; Class72 var29 = var2.aClass72_2245; if(var29 != null && var29.anInt1077 != 0) { if(HDToolKit.highDetail) { diff --git a/Client/src/main/java/org/runite/client/Class146.java b/Client/src/main/java/org/runite/client/Class146.java index 7c3df772d..78cc4aa1d 100644 --- a/Client/src/main/java/org/runite/client/Class146.java +++ b/Client/src/main/java/org/runite/client/Class146.java @@ -12,6 +12,7 @@ abstract class Class146 { static int anInt1901 = 2; static int[][][] anIntArrayArrayArray1903; static int anInt1904; + static int anInt3 = 0; abstract int method2078(); @@ -42,7 +43,7 @@ abstract class Class146 { static void method2083(int var0, int var1, int var2, byte[][][] var3, int var4, byte var5, int var6, int var7) { ++Class3_Sub28_Sub1.anInt3539; - GameShell.anInt3 = 0; + anInt3 = 0; int var8 = var6 - 16; int var9 = var6 + 16; int var10 = var7 - 16; @@ -63,7 +64,7 @@ abstract class Class146 { var16.aBoolean2225 = true; var16.aBoolean2236 = var16.anInt2223 > 0; - ++GameShell.anInt3; + ++anInt3; } else { var16.aBoolean2222 = false; var16.aBoolean2225 = false; @@ -202,7 +203,7 @@ abstract class Class146 { } } - if(GameShell.anInt3 == 0) { + if(anInt3 == 0) { if(!var22) { Class3_Sub13_Sub21.aBoolean3261 = false; } @@ -256,7 +257,7 @@ abstract class Class146 { } } - if(GameShell.anInt3 == 0) { + if(anInt3 == 0) { if(!var22) { Class3_Sub13_Sub21.aBoolean3261 = false; } diff --git a/Client/src/main/java/org/runite/client/Class15.java b/Client/src/main/java/org/runite/client/Class15.java index c2083395d..4ac6ae097 100644 --- a/Client/src/main/java/org/runite/client/Class15.java +++ b/Client/src/main/java/org/runite/client/Class15.java @@ -216,7 +216,7 @@ final class Class15 implements Runnable { Class81.method1400(this.aClass87_350, (Object)null, -71); } } catch (Exception var7) { - Class49.method1125((String)null, var7, (byte)111); + Class49.reportError((String)null, var7, (byte)111); } finally { this.aBoolean353 = false; } diff --git a/Client/src/main/java/org/runite/client/Class158.java b/Client/src/main/java/org/runite/client/Class158.java index 8641f2cf6..ba3e9d247 100644 --- a/Client/src/main/java/org/runite/client/Class158.java +++ b/Client/src/main/java/org/runite/client/Class158.java @@ -14,7 +14,7 @@ abstract class Class158 { static int anInt2010 = -16 + (int) (33.0D * Math.random()); int anInt2011; int anInt2012; - static int anInt2014 = 0; + static int paramGameTypeID = 0; static int anInt2015; abstract void method2179(Graphics var3); diff --git a/Client/src/main/java/org/runite/client/Class159.java b/Client/src/main/java/org/runite/client/Class159.java index 6dd160ca5..ca614077f 100644 --- a/Client/src/main/java/org/runite/client/Class159.java +++ b/Client/src/main/java/org/runite/client/Class159.java @@ -28,9 +28,9 @@ final class Class159 { static boolean method2194() { try { - if(Unsorted.aBoolean3641) { + if(Unsorted.paramJavaScriptEnabled) { try { - return !(Boolean) TextCore.aClass94_3209.method1577(Class38.aClass87_665.applet); + return !(Boolean) TextCore.aClass94_3209.method1577(Class38.signlink.gameApplet); } catch (Throwable var2) { } } diff --git a/Client/src/main/java/org/runite/client/Class163_Sub1_Sub1.java b/Client/src/main/java/org/runite/client/Class163_Sub1_Sub1.java index f57deaa76..a81873b9f 100644 --- a/Client/src/main/java/org/runite/client/Class163_Sub1_Sub1.java +++ b/Client/src/main/java/org/runite/client/Class163_Sub1_Sub1.java @@ -72,7 +72,7 @@ final class Class163_Sub1_Sub1 extends Class163_Sub1 { } if(anInt3375 == 1) { - Class3_Sub9.aClass64_2318 = Class38.aClass87_665.method1441((byte)8, ClientErrorException.worldListHost, Class123.anInt1658); + Class3_Sub9.aClass64_2318 = Class38.signlink.method1441((byte)8, ClientErrorException.worldListHost, Class123.anInt1658); anInt3375 = 2; } @@ -86,7 +86,7 @@ final class Class163_Sub1_Sub1 extends Class163_Sub1 { return; } - Class3_Sub15.activeConnection = new Connection((Socket)Class3_Sub9.aClass64_2318.anObject974, Class38.aClass87_665); + Class3_Sub15.activeConnection = new Connection((Socket)Class3_Sub9.aClass64_2318.anObject974, Class38.signlink); Class3_Sub9.aClass64_2318 = null; Class3_Sub15.activeConnection.sendBytes(Class3_Sub13_Sub1.outgoingBuffer.buffer, Class3_Sub13_Sub1.outgoingBuffer.index); if(WorldListEntry.aClass155_2627 != null) { diff --git a/Client/src/main/java/org/runite/client/Class163_Sub2.java b/Client/src/main/java/org/runite/client/Class163_Sub2.java index 891f3b360..28f59b724 100644 --- a/Client/src/main/java/org/runite/client/Class163_Sub2.java +++ b/Client/src/main/java/org/runite/client/Class163_Sub2.java @@ -2,7 +2,7 @@ package org.runite.client; class Class163_Sub2 extends Class163 { - static RSString aClass94_2996 = null; + static RSString paramSettings = null; static Class30[] aClass30Array2998 = new Class30[29]; //TODO diff --git a/Client/src/main/java/org/runite/client/Class163_Sub2_Sub1.java b/Client/src/main/java/org/runite/client/Class163_Sub2_Sub1.java index 8a55edffd..15a5c0c68 100644 --- a/Client/src/main/java/org/runite/client/Class163_Sub2_Sub1.java +++ b/Client/src/main/java/org/runite/client/Class163_Sub2_Sub1.java @@ -19,7 +19,7 @@ final class Class163_Sub2_Sub1 extends Class163_Sub2 { static ReferenceCache aReferenceCache_4015 = new ReferenceCache(64); static RSString[] aClass94Array4016 = new RSString[500]; static long[] aLongArray4017 = new long[100]; - static boolean aBoolean4018 = false; + static boolean paramObjectTagEnabled = false; static int anInt4019 = 0; static int anInt4020 = 0; static int anInt4021; diff --git a/Client/src/main/java/org/runite/client/Class163_Sub3.java b/Client/src/main/java/org/runite/client/Class163_Sub3.java index d6636485f..758709a4b 100644 --- a/Client/src/main/java/org/runite/client/Class163_Sub3.java +++ b/Client/src/main/java/org/runite/client/Class163_Sub3.java @@ -65,25 +65,25 @@ final class Class163_Sub3 extends Class163 { int var4; for(var4 = 0; Class8.anInt104 > var4; ++var4) { if(var0 == Class50.aLongArray826[var4]) { - Class3_Sub30_Sub1.addChatMessage(TextCore.aClass94_3672, 0, RSString.stringCombiner(new RSString[]{var3, TextCore.HasFriendsAlready}), -1); + Class3_Sub30_Sub1.addChatMessage(TextCore.emptyJagexString, 0, RSString.stringCombiner(new RSString[]{var3, TextCore.HasFriendsAlready}), -1); return; } } for(var4 = 0; var4 < Class3_Sub28_Sub5.anInt3591; ++var4) { if(Class114.ignores[var4] == var0) { - Class3_Sub30_Sub1.addChatMessage(TextCore.aClass94_3672, 0, RSString.stringCombiner(new RSString[]{TextCore.HasPleaseRemove, var3, TextCore.HasIgnoreToFriends}), -1); + Class3_Sub30_Sub1.addChatMessage(TextCore.emptyJagexString, 0, RSString.stringCombiner(new RSString[]{TextCore.HasPleaseRemove, var3, TextCore.HasIgnoreToFriends}), -1); return; } } if(var3.equalsString(Class102.player.displayName)) { - Class3_Sub30_Sub1.addChatMessage(TextCore.aClass94_3672, 0, TextCore.HasOnOwnFriendsList, -1); + Class3_Sub30_Sub1.addChatMessage(TextCore.emptyJagexString, 0, TextCore.HasOnOwnFriendsList, -1); } else { Class70.aClass94Array1046[Class8.anInt104] = var3; Class50.aLongArray826[Class8.anInt104] = var0; Unsorted.anIntArray882[Class8.anInt104] = 0; - Unsorted.aClass94Array2566[Class8.anInt104] = TextCore.aClass94_3672; + Unsorted.aClass94Array2566[Class8.anInt104] = TextCore.emptyJagexString; Class57.anIntArray904[Class8.anInt104] = 0; Unsorted.aBooleanArray73[Class8.anInt104] = false; ++Class8.anInt104; @@ -92,7 +92,7 @@ final class Class163_Sub3 extends Class163 { Class3_Sub13_Sub1.outgoingBuffer.writeLong(var0); } } else { - Class3_Sub30_Sub1.addChatMessage(TextCore.aClass94_3672, 0, TextCore.HasFriendsListFull, -1); + Class3_Sub30_Sub1.addChatMessage(TextCore.emptyJagexString, 0, TextCore.HasFriendsListFull, -1); } } } catch (RuntimeException var5) { diff --git a/Client/src/main/java/org/runite/client/Class166.java b/Client/src/main/java/org/runite/client/Class166.java index 15fdbd9c5..3994135f0 100644 --- a/Client/src/main/java/org/runite/client/Class166.java +++ b/Client/src/main/java/org/runite/client/Class166.java @@ -69,7 +69,7 @@ final class Class166 { } if(!var4) { - Class3_Sub30_Sub1.addChatMessage(TextCore.aClass94_3672, 0, RSString.stringCombiner(new RSString[]{TextCore.HasUnableFind, var3}), -1); + Class3_Sub30_Sub1.addChatMessage(TextCore.emptyJagexString, 0, RSString.stringCombiner(new RSString[]{TextCore.HasUnableFind, var3}), -1); } } catch (RuntimeException var7) { diff --git a/Client/src/main/java/org/runite/client/Class23.java b/Client/src/main/java/org/runite/client/Class23.java index a0dbd5000..330a81c48 100644 --- a/Client/src/main/java/org/runite/client/Class23.java +++ b/Client/src/main/java/org/runite/client/Class23.java @@ -3,7 +3,7 @@ package org.runite.client; public final class Class23 { static int anInt453 = 0; - public static int anInt454; + public static int canvasWidth; static int anInt455; static boolean[][] aBooleanArrayArray457; diff --git a/Client/src/main/java/org/runite/client/Class38.java b/Client/src/main/java/org/runite/client/Class38.java index e01d6bffe..fb7440d29 100644 --- a/Client/src/main/java/org/runite/client/Class38.java +++ b/Client/src/main/java/org/runite/client/Class38.java @@ -6,7 +6,7 @@ class Class38 { static boolean aBoolean661 = true; static int[][] anIntArrayArray663; static int[] anIntArray664 = new int[14]; - static Signlink aClass87_665; + static Signlink signlink; static Class146 aClass146_668; diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub12.java b/Client/src/main/java/org/runite/client/Class3_Sub13_Sub12.java index 3f5f88f43..397be3884 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub12.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub13_Sub12.java @@ -67,8 +67,8 @@ final class Class3_Sub13_Sub12 extends Class3_Sub13 { int windowWidth; int windowHeight; if (var2 == null) { - windowHeight = Class140_Sub7.anInt2934; - windowWidth = Class23.anInt454; + windowHeight = Class140_Sub7.canvasHeight; + windowWidth = Class23.canvasWidth; } else { windowHeight = var2.height; windowWidth = var2.width; diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub13.java b/Client/src/main/java/org/runite/client/Class3_Sub13_Sub13.java index 505da80c4..05e86f052 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub13.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub13_Sub13.java @@ -17,7 +17,7 @@ final class Class3_Sub13_Sub13 extends Class3_Sub13 { static boolean aBoolean2774 = true; static int anInt1977 = 0; private int anInt3147 = 4; - static int anInt3148 = 0; + static int paramModeWhat = 0; private int anInt3149 = 4; static CacheIndex aClass153_3154; static int anInt3156 = -1; @@ -36,13 +36,13 @@ final class Class3_Sub13_Sub13 extends Class3_Sub13 { if(image == null) { cursor = -1; } else { - Class38.aClass87_665.method1434(image.method655(), 10000, image.anInt3697, GameShell.canvas, new Point(cursorDef.getHotspotX(), cursorDef.getHotspotY()), image.anInt3706); + Class38.signlink.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.aClass87_665.method1434((int[])null, 10000, -1, GameShell.canvas, new Point(), -1); + Class38.signlink.method1434((int[])null, 10000, -1, GameShell.canvas, new Point(), -1); Class65.anInt991 = -1; } @@ -74,7 +74,7 @@ final class Class3_Sub13_Sub13 extends Class3_Sub13 { final void method157(int var1, DataBuffer var2, boolean var3) { try { if(!var3) { - anInt3148 = -117; + paramModeWhat = -117; } if(var1 == 0) { @@ -659,7 +659,7 @@ final class Class3_Sub13_Sub13 extends Class3_Sub13 { Class3_Sub28_Sub3.aClass11_3551 = null; if(Class3_Sub28_Sub12.anInt3655 != -1) { - GraphicDefinition.method967(0, 0, 0, Class23.anInt454, Class3_Sub28_Sub12.anInt3655, 0, Class140_Sub7.anInt2934); + GraphicDefinition.method967(0, 0, 0, Class23.canvasWidth, Class3_Sub28_Sub12.anInt3655, 0, Class140_Sub7.canvasHeight); } ++PacketParser.anInt3213; diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub16.java b/Client/src/main/java/org/runite/client/Class3_Sub13_Sub16.java index 3bbc0690e..b0a26f924 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub16.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub13_Sub16.java @@ -42,7 +42,7 @@ final class Class3_Sub13_Sub16 extends Class3_Sub13 { } } - static int method243(RSString var0) { + static int compareEnteredLanguageArgument(RSString var0) { try { for(int var2 = 0; Class3_Sub13_Sub19.aClass94Array3238.length > var2; ++var2) { diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub21.java b/Client/src/main/java/org/runite/client/Class3_Sub13_Sub21.java index f52118858..4a5e53cf0 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub21.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub13_Sub21.java @@ -76,7 +76,7 @@ final class Class3_Sub13_Sub21 extends Class3_Sub13 { if(Unsorted.registryStage == 1) { //Ip & Port - Class3_Sub9.aClass64_2318 = Class38.aClass87_665.method1441((byte)8, Class38_Sub1.accRegistryIp, Class140_Sub6.accRegistryPort); + Class3_Sub9.aClass64_2318 = Class38.signlink.method1441((byte)8, Class38_Sub1.accRegistryIp, Class140_Sub6.accRegistryPort); Unsorted.registryStage = 2; } @@ -88,7 +88,7 @@ final class Class3_Sub13_Sub21 extends Class3_Sub13 { if(1 != Class3_Sub9.aClass64_2318.anInt978) { return; } - Class3_Sub15.activeConnection = new Connection((Socket)Class3_Sub9.aClass64_2318.anObject974, Class38.aClass87_665); + Class3_Sub15.activeConnection = new Connection((Socket)Class3_Sub9.aClass64_2318.anObject974, Class38.signlink); Class3_Sub9.aClass64_2318 = null; Class3_Sub15.activeConnection.sendBytes(Class3_Sub13_Sub1.outgoingBuffer.buffer, Class3_Sub13_Sub1.outgoingBuffer.index); if(WorldListEntry.aClass155_2627 != null) { diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub23_Sub1.java b/Client/src/main/java/org/runite/client/Class3_Sub13_Sub23_Sub1.java index 469c4b1a1..e7b5545d8 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub23_Sub1.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub13_Sub23_Sub1.java @@ -74,15 +74,6 @@ final class Class3_Sub13_Sub23_Sub1 extends Class3_Sub13_Sub23 { } } - static void method283(String var0) { - try { - System.out.println("Bad " + var0 + ", Usage: worldid, , , "); - System.exit(1); - } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "kd.O(" + (var0 != null?"{...}":"null") + ',' + (byte) 38 + ')'); - } - } - static void method284(float[][] var0, int[][] var1, int var2, float[][] var3, int var4, int[] var5, Class37 var6, byte var7, Class43 var8, float[][] var9, int var10) { try { int[] var11 = new int[var5.length / 2]; diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub3.java b/Client/src/main/java/org/runite/client/Class3_Sub13_Sub3.java index b98f07217..bee37b0d7 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub3.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub13_Sub3.java @@ -13,14 +13,14 @@ public final class Class3_Sub13_Sub3 extends Class3_Sub13 { private boolean aBoolean3050 = true; - static RSString method178(byte[] var0, int var2, int var3) { + static RSString bufferToString(byte[] bytes, int length, int offset) { try { RSString var4 = new RSString(); - var4.buffer = new byte[var2]; + var4.buffer = new byte[length]; var4.length = 0; - for (int var5 = var3; var5 < var2 + var3; ++var5) { - if (var0[var5] != 0) { - var4.buffer[var4.length++] = var0[var5]; + for (int var5 = offset; var5 < length + offset; ++var5) { + if (bytes[var5] != 0) { + var4.buffer[var4.length++] = bytes[var5]; } } if (var4.toString().contains("RuneScape")) { @@ -37,7 +37,7 @@ public final class Class3_Sub13_Sub3 extends Class3_Sub13 { } return var4; } catch (RuntimeException var6) { - throw ClientErrorException.clientError(var6, "an.B(" + (var0 != null ? "{...}" : "null") + ',' + -4114 + ',' + var2 + ',' + var3 + ')'); + throw ClientErrorException.clientError(var6, "an.B(" + (bytes != null ? "{...}" : "null") + ',' + -4114 + ',' + length + ',' + offset + ')'); } } @@ -142,7 +142,7 @@ public final class Class3_Sub13_Sub3 extends Class3_Sub13 { var2 = var2 + GraphicDefinition.incomingBuffer.buffer[var3] + ","; } - Class49.method1125(var2, var5, (byte) 108); + Class49.reportError(var2, var5, (byte) 108); Class167.method2269((byte) 46); return true; } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub30.java b/Client/src/main/java/org/runite/client/Class3_Sub13_Sub30.java index 2514d1f5e..c3467c0cc 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub30.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub13_Sub30.java @@ -32,7 +32,7 @@ final class Class3_Sub13_Sub30 extends Class3_Sub13 { } } - RSString levelEquals = Class158.anInt2014 != 1?TextCore.HasLevel:TextCore.HasRating; + RSString levelEquals = Class158.paramGameTypeID != 1?TextCore.HasLevel:TextCore.HasRating; if(playerUsername.COMBAT_LEVEL < playerUsername.combatLevel) { var5 = RSString.stringCombiner(new RSString[]{playerUsername.getName(), var6 ? Player.combatLevelColor(playerUsername.COMBAT_LEVEL, (byte)-73, Class102.player.COMBAT_LEVEL) : ColorCore.ContextColor , TextCore.LEFT_PARENTHESES, levelEquals, RSString.stringAnimator(playerUsername.COMBAT_LEVEL), TextCore.aClass94_673, RSString.stringAnimator(playerUsername.combatLevel + -playerUsername.COMBAT_LEVEL), TextCore.RIGHT_PARENTHESES}); } else { @@ -50,7 +50,7 @@ final class Class3_Sub13_Sub30 extends Class3_Sub13 { for(var12 = 7; var12 >= 0; --var12) { if(null != Class91.aClass94Array1299[var12]) { short var14 = 0; - if(Class158.anInt2014 == 0 && Class91.aClass94Array1299[var12].equalsStringIgnoreCase(TextCore.HasAttack)) { + if(Class158.paramGameTypeID == 0 && Class91.aClass94Array1299[var12].equalsStringIgnoreCase(TextCore.HasAttack)) { //If other player level greater than my level, then right click to attack. if(playerUsername.COMBAT_LEVEL > Class102.player.COMBAT_LEVEL) { var14 = 2000;//Var for right click higher level players @@ -115,7 +115,7 @@ final class Class3_Sub13_Sub30 extends Class3_Sub13 { Class3_Sub13_Sub3.method183(); LinkableRSString.method727(); Class3_Sub21.method397((byte)-41); - if(Class3_Sub13_Sub13.anInt3148 != 0) { + if(Class3_Sub13_Sub13.paramModeWhat != 0) { for(int var1 = 0; var1 < Class3_Sub6.aByteArrayArray2287.length; ++var1) { Class3_Sub6.aByteArrayArray2287[var1] = null; } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub36.java b/Client/src/main/java/org/runite/client/Class3_Sub13_Sub36.java index a035ec4d9..493b5ff94 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub36.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub13_Sub36.java @@ -203,11 +203,11 @@ public final class Class3_Sub13_Sub36 extends Class3_Sub13 { Class3_Sub24_Sub4.method1177(Unsorted.anInt1887, 0L, (byte)-53, TextCore.aClass94_1724, var11, (short)11, Class3_Sub28_Sub9.aClass94_3621, var12); } } else { - if(Class158.anInt2014 == 1) { - Class3_Sub24_Sub4.method1177(-1, 0L, (byte)-62, TextCore.aClass94_3672, var11, (short)36, TextCore.HasFaceHere, var12); + if(Class158.paramGameTypeID == 1) { + Class3_Sub24_Sub4.method1177(-1, 0L, (byte)-62, TextCore.emptyJagexString, var11, (short)36, TextCore.HasFaceHere, var12); } - Class3_Sub24_Sub4.method1177(-1, 0L, (byte)-75, TextCore.aClass94_3672, var11, (short)60, Class3_Sub13_Sub28.aClass94_3353, var12); + Class3_Sub24_Sub4.method1177(-1, 0L, (byte)-75, TextCore.emptyJagexString, var11, (short)60, Class3_Sub13_Sub28.aClass94_3353, var12); } } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub8.java b/Client/src/main/java/org/runite/client/Class3_Sub13_Sub8.java index 42a6d6307..61c1aa525 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub13_Sub8.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub13_Sub8.java @@ -105,12 +105,12 @@ final class Class3_Sub13_Sub8 extends Class3_Sub13 { //Client Resize. Class3_Sub13_Sub1.outgoingBuffer.putOpcode(243); Class3_Sub13_Sub1.outgoingBuffer.writeByte(Class83.method1411(0)); - Class3_Sub13_Sub1.outgoingBuffer.writeShort(Class23.anInt454); + Class3_Sub13_Sub1.outgoingBuffer.writeShort(Class23.canvasWidth); if(var0 != -3) { anInt3103 = -41; } - Class3_Sub13_Sub1.outgoingBuffer.writeShort(Class140_Sub7.anInt2934); + Class3_Sub13_Sub1.outgoingBuffer.writeShort(Class140_Sub7.canvasHeight); Class3_Sub13_Sub1.outgoingBuffer.writeByte(Unsorted.anInt3671); } catch (RuntimeException var2) { throw ClientErrorException.clientError(var2, "ej.C(" + var0 + ')'); diff --git a/Client/src/main/java/org/runite/client/Class3_Sub20.java b/Client/src/main/java/org/runite/client/Class3_Sub20.java index 0f8b262d2..b33ecbe5e 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub20.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub20.java @@ -11,7 +11,7 @@ final class Class3_Sub20 extends Linkable { int anInt2483; static int wlPacketIndex = 0; - static int language = 0; + static int paramLanguage = 0; static int anInt2487; static int anInt2488 = 0; int anInt2489; diff --git a/Client/src/main/java/org/runite/client/Class3_Sub23.java b/Client/src/main/java/org/runite/client/Class3_Sub23.java index 1fb59d38f..5a193360a 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub23.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub23.java @@ -23,20 +23,20 @@ final class Class3_Sub23 extends Linkable { try { int var3; if(HDToolKit.highDetail || var1) { - var3 = Class140_Sub7.anInt2934; + var3 = Class140_Sub7.canvasHeight; int var4 = var3 * 956 / 503; - Class40.aAbstractSprite_680.method639((Class23.anInt454 + -var4) / 2, 0, var4, var3); - SequenceDefinition.aClass109_1856.method1667(-(SequenceDefinition.aClass109_1856.width / 2) + Class23.anInt454 / 2, 18); + Class40.aAbstractSprite_680.method639((Class23.canvasWidth + -var4) / 2, 0, var4, var3); + SequenceDefinition.aClass109_1856.method1667(-(SequenceDefinition.aClass109_1856.width / 2) + Class23.canvasWidth / 2, 18); } - var2.method699(TextCore.RSLoadingPleaseWait, Class23.anInt454 / 2, Class140_Sub7.anInt2934 / 2 - 26, 16777215, -1); - var3 = Class140_Sub7.anInt2934 / 2 + -18; - Toolkit.getActiveToolkit().drawRect(Class23.anInt454 / 2 - 152, var3, 304, 34, 9179409, 255); - Toolkit.getActiveToolkit().drawRect(-151 + Class23.anInt454 / 2, var3 - -1, 302, 32, 0, 255); - Toolkit.getActiveToolkit().method934(Class23.anInt454 / 2 - 150, var3 + 2, Client.LoadingStageNumber * 3, 30, 9179409); - Toolkit.getActiveToolkit().method934(Class23.anInt454 / 2 + -150 - -(3 * Client.LoadingStageNumber), 2 + var3, 300 + -(3 * Client.LoadingStageNumber), 30, 0); + var2.method699(TextCore.RSLoadingPleaseWait, Class23.canvasWidth / 2, Class140_Sub7.canvasHeight / 2 - 26, 16777215, -1); + var3 = Class140_Sub7.canvasHeight / 2 + -18; + Toolkit.getActiveToolkit().drawRect(Class23.canvasWidth / 2 - 152, var3, 304, 34, 9179409, 255); + Toolkit.getActiveToolkit().drawRect(-151 + Class23.canvasWidth / 2, var3 - -1, 302, 32, 0, 255); + Toolkit.getActiveToolkit().method934(Class23.canvasWidth / 2 - 150, var3 + 2, Client.LoadingStageNumber * 3, 30, 9179409); + Toolkit.getActiveToolkit().method934(Class23.canvasWidth / 2 + -150 - -(3 * Client.LoadingStageNumber), 2 + var3, 300 + -(3 * Client.LoadingStageNumber), 30, 0); - var2.method699(Class3_Sub17.aClass94_2464, Class23.anInt454 / 2, 4 + Class140_Sub7.anInt2934 / 2, 16777215, -1); + var2.method699(Class3_Sub17.aClass94_2464, Class23.canvasWidth / 2, 4 + Class140_Sub7.canvasHeight / 2, 16777215, -1); if(var0 < 50) { anIntArray2533 = (int[])null; } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub24_Sub3.java b/Client/src/main/java/org/runite/client/Class3_Sub24_Sub3.java index 4bec9bcab..fa5f8c5b0 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub24_Sub3.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub24_Sub3.java @@ -7,7 +7,7 @@ final class Class3_Sub24_Sub3 extends Class3_Sub24 { Class61 aClass61_3489 = new Class61(); static CacheIndex aClass153_3490; static int[] anIntArray3491 = new int[]{0, -1, 0, 1}; - static int anInt3492 = 64; + static int maxClientMemory = 64; private final Class3_Sub24_Sub4 aClass3_Sub24_Sub4_3493; static int[] anIntArray3494; Class3_Sub24_Sub2 aClass3_Sub24_Sub2_3495 = new Class3_Sub24_Sub2(); diff --git a/Client/src/main/java/org/runite/client/Class3_Sub24_Sub4.java b/Client/src/main/java/org/runite/client/Class3_Sub24_Sub4.java index ef58b0551..d605a2f52 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub24_Sub4.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub24_Sub4.java @@ -177,7 +177,7 @@ final class Class3_Sub24_Sub4 extends Class3_Sub24 { try { if(var3.anInt318 == 1) { - method1177(-1, 0L, (byte)-78, TextCore.aClass94_3672, 0, (short)8, var3.aClass94_289, var3.componentHash); + method1177(-1, 0L, (byte)-78, TextCore.emptyJagexString, 0, (short)8, var3.aClass94_289, var3.componentHash); } RSString var4; @@ -189,19 +189,19 @@ final class Class3_Sub24_Sub4 extends Class3_Sub24 { } if(var3.anInt318 == 3) { - method1177(-1, 0L, (byte)-59, TextCore.aClass94_3672, 0, (short)28, TextCore.HasClose, var3.componentHash); + method1177(-1, 0L, (byte)-59, TextCore.emptyJagexString, 0, (short)28, TextCore.HasClose, var3.componentHash); } if(var3.anInt318 == 4) { - method1177(-1, 0L, (byte)-71, TextCore.aClass94_3672, 0, (short)59, var3.aClass94_289, var3.componentHash); + method1177(-1, 0L, (byte)-71, TextCore.emptyJagexString, 0, (short)59, var3.aClass94_289, var3.componentHash); } if(var3.anInt318 == 5) { - method1177(-1, 0L, (byte)-92, TextCore.aClass94_3672, 0, (short)51, var3.aClass94_289, var3.componentHash); + method1177(-1, 0L, (byte)-92, TextCore.emptyJagexString, 0, (short)51, var3.aClass94_289, var3.componentHash); } if(var3.anInt318 == 6 && Class3_Sub13_Sub7.aClass11_3087 == null) { - method1177(-1, 0L, (byte)-100, TextCore.aClass94_3672, -1, (short)41, var3.aClass94_289, var3.componentHash); + method1177(-1, 0L, (byte)-100, TextCore.emptyJagexString, -1, (short)41, var3.aClass94_289, var3.componentHash); } int var5; @@ -354,7 +354,7 @@ final class Class3_Sub24_Sub4 extends Class3_Sub24 { } if(Client.method44(var3).method95()) { - method1177(-1, 0L, (byte)-74, TextCore.aClass94_3672, var3.anInt191, (short)41, TextCore.HasContinue, var3.componentHash); + method1177(-1, 0L, (byte)-74, TextCore.emptyJagexString, var3.anInt191, (short)41, TextCore.HasContinue, var3.componentHash); } } } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub26.java b/Client/src/main/java/org/runite/client/Class3_Sub26.java index 3f8eda2af..8f9a5f216 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub26.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub26.java @@ -5,7 +5,7 @@ import org.rs09.client.Linkable; final class Class3_Sub26 extends Linkable { int anInt2553; - static int anInt2554 = 0; + static int paramAffid = 0; int anInt2555; static int anInt2556 = 0; static Class61 aClass61_2557 = new Class61(); diff --git a/Client/src/main/java/org/runite/client/Class3_Sub28_Sub1.java b/Client/src/main/java/org/runite/client/Class3_Sub28_Sub1.java index bcfae5ae6..a38061dd6 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub28_Sub1.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub28_Sub1.java @@ -175,7 +175,7 @@ final class Class3_Sub28_Sub1 extends Node { aFontMetrics1822 = GameShell.canvas.getFontMetrics(TextCore.Helvetica); if(var2) { var5.setColor(Color.black); - var5.fillRect(0, 0, Class23.anInt454, Class140_Sub7.anInt2934); + var5.fillRect(0, 0, Class23.canvasWidth, Class140_Sub7.canvasHeight); } if(null == var0) { @@ -197,10 +197,10 @@ final class Class3_Sub28_Sub1 extends Node { var6.setFont(TextCore.Helvetica); var6.setColor(Color.white); var3.drawString(var6, 22, (-var3.method1575(aFontMetrics1822) + 304) / 2); - var5.drawImage(anImage2695, Class23.anInt454 / 2 - 152, -18 + Class140_Sub7.anInt2934 / 2, (ImageObserver)null); + var5.drawImage(anImage2695, Class23.canvasWidth / 2 - 152, -18 + Class140_Sub7.canvasHeight / 2, (ImageObserver)null); } catch (Exception var9) { - int var7 = -152 + Class23.anInt454 / 2; - int var8 = -18 + Class140_Sub7.anInt2934 / 2; + int var7 = -152 + Class23.canvasWidth / 2; + int var8 = -18 + Class140_Sub7.canvasHeight / 2; var5.setColor(var0); var5.drawRect(var7, var8, 303, 33); var5.fillRect(var7 + 2, 2 + var8, 3 * var4, 30); @@ -215,7 +215,7 @@ final class Class3_Sub28_Sub1 extends Node { if(Class167.aClass94_2083 != null) { var5.setFont(TextCore.Helvetica); var5.setColor(Color.white); - Class167.aClass94_2083.drawString(var5, Class140_Sub7.anInt2934 / 2 - 26, Class23.anInt454 / 2 - Class167.aClass94_2083.method1575(aFontMetrics1822) / 2); + Class167.aClass94_2083.drawString(var5, Class140_Sub7.canvasHeight / 2 - 26, Class23.canvasWidth / 2 - Class167.aClass94_2083.method1575(aFontMetrics1822) / 2); } } catch (Exception var10) { GameShell.canvas.repaint(); diff --git a/Client/src/main/java/org/runite/client/Class3_Sub28_Sub18.java b/Client/src/main/java/org/runite/client/Class3_Sub28_Sub18.java index cc2f0d21c..65195f8bd 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub28_Sub18.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub28_Sub18.java @@ -86,24 +86,6 @@ final class Class3_Sub28_Sub18 extends Node { } } - static void method713() { - try { - try { - Method var1 = Runtime.class.getMethod("maxMemory", new Class[0]); - try { - Runtime var2 = Runtime.getRuntime(); - Long var3 = (Long)var1.invoke(var2, (Object[])null); - Class3_Sub24_Sub3.anInt3492 = (int)(var3.longValue() / 1048576L) - -1; - } catch (Throwable var4) { - } - } catch (Exception var5) { - } - - } catch (RuntimeException var6) { - throw ClientErrorException.clientError(var6, "sd.A(" + 0 + ')'); - } - } - Class3_Sub28_Sub18(int var1) { try { GL var2 = HDToolKit.gl; diff --git a/Client/src/main/java/org/runite/client/Class3_Sub28_Sub4.java b/Client/src/main/java/org/runite/client/Class3_Sub28_Sub4.java index 5ad7deda5..4d80fe91a 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub28_Sub4.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub28_Sub4.java @@ -176,7 +176,7 @@ final class Class3_Sub28_Sub4 extends Node { Objects.requireNonNull(var2).append(this.aClass94Array3571[0]); for(int var3 = 1; var3 < this.aClass94Array3571.length; ++var3) { - var2.append(GameShell.aClass94_9); + var2.append(RSString.parse(")3)3)3")); var2.append(this.aClass94Array3571[var3]); } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub30_Sub1.java b/Client/src/main/java/org/runite/client/Class3_Sub30_Sub1.java index 969781faf..755d0e122 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub30_Sub1.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub30_Sub1.java @@ -159,7 +159,7 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { boolean var14; if(18 == var4) { - if(Class158.anInt2014 == 1) { + if(Class158.paramGameTypeID == 1) { Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var2, 1, 0, 2, var3, Class102.player.anIntArray2767[0]); } else { var14 = Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 0, false, 0, 2597 ^ 2599, var2, 0, 0, 2, var3, Class102.player.anIntArray2767[0]); @@ -199,7 +199,7 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { if(var4 == 1006) { var13 = Class7.getRSInterface(var3); if(null != var13 && var13.itemIds[var2] >= 100000) { - addChatMessage(TextCore.aClass94_3672, 0, RSString.stringCombiner(new RSString[]{RSString.stringAnimator(var13.itemIds[var2]), TextCore.aClass94_3777, ItemDefinition.getItemDefinition(var5).name}), -1); + addChatMessage(TextCore.emptyJagexString, 0, RSString.stringCombiner(new RSString[]{RSString.stringAnimator(var13.itemIds[var2]), TextCore.aClass94_3777, ItemDefinition.getItemDefinition(var5).name}), -1); } else { Class3_Sub13_Sub1.outgoingBuffer.putOpcode(92); Class3_Sub13_Sub1.outgoingBuffer.writeShort128LE(var5); @@ -372,7 +372,7 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { } if(var4 == 21) { - if(Class158.anInt2014 == 1) { + if(Class158.paramGameTypeID == 1) { Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2597 + -2595, var2, 1, 0, 2, var3, Class102.player.anIntArray2767[0]); } else { var14 = Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 0, false, 0, 2597 + -2595, var2, 0, 0, 2, var3, Class102.player.anIntArray2767[0]); @@ -463,7 +463,7 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { } if(34 == var4) { - if(Class158.anInt2014 == 1) { + if(Class158.paramGameTypeID == 1) { Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var2, 1, 0, 2, var3, Class102.player.anIntArray2767[0]); } else { var14 = Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 0, false, 0, 2597 ^ 2599, var2, 0, 0, 2, var3, Class102.player.anIntArray2767[0]); @@ -628,7 +628,7 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { } if(var4 == 24) { - if(Class158.anInt2014 == 1) { + if(Class158.paramGameTypeID == 1) { Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2597 + -2595, var2, 1, 0, 2, var3, Class102.player.anIntArray2767[0]); } else { var14 = Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 0, false, 0, 2, var2, 0, 0, 2, var3, Class102.player.anIntArray2767[0]); @@ -800,7 +800,7 @@ public final class Class3_Sub30_Sub1 extends DataBuffer { } if(var4 == 20) { - if(1 == Class158.anInt2014) { + if(1 == Class158.paramGameTypeID) { Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var2, 1, 0, 2, var3, Class102.player.anIntArray2767[0]); } else { var14 = Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 0, false, 0, 2, var2, 0, 0, 2, var3, Class102.player.anIntArray2767[0]); diff --git a/Client/src/main/java/org/runite/client/Class3_Sub31.java b/Client/src/main/java/org/runite/client/Class3_Sub31.java index b2b6bfd6a..db9766353 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub31.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub31.java @@ -9,7 +9,7 @@ final class Class3_Sub31 extends Linkable { int anInt2603; static ReferenceCache aReferenceCache_2604 = new ReferenceCache(64); static int[] anIntArray2606; - static int countryId; + static int paramCountryID; static void method820(int var0, int var1) { diff --git a/Client/src/main/java/org/runite/client/Class44.java b/Client/src/main/java/org/runite/client/Class44.java index d5f053091..28135a57c 100644 --- a/Client/src/main/java/org/runite/client/Class44.java +++ b/Client/src/main/java/org/runite/client/Class44.java @@ -10,7 +10,7 @@ import java.io.InputStreamReader; public abstract class Class44 { - static int anInt718 = 0; + static int paramModeWhere = 0; static int anInt719 = 0; static int[][][] anIntArrayArrayArray720; int countryIndex; diff --git a/Client/src/main/java/org/runite/client/Class49.java b/Client/src/main/java/org/runite/client/Class49.java index 4a42edf69..a80b5a075 100644 --- a/Client/src/main/java/org/runite/client/Class49.java +++ b/Client/src/main/java/org/runite/client/Class49.java @@ -128,7 +128,7 @@ final class Class49 { } } - static void method1125(String var0, Throwable var1, byte var2) { + static void reportError(String var0, Throwable var1, byte var2) { if(var2 <= 100) { aClass47_818 = (NodeCache)null; } @@ -152,11 +152,11 @@ final class Class49 { var3 = InterfaceWidget.a("@", "%40", var3); var3 = InterfaceWidget.a("&", "%26", var3); var3 = InterfaceWidget.a("#", "%23", var3); - if(Class3_Sub13_Sub10.aClass87_3125.applet == null) { + if(Class3_Sub13_Sub10.aClass87_3125.gameApplet == null) { return; } - Class64 var4 = Class3_Sub13_Sub10.aClass87_3125.method1439(false, new URL(Class3_Sub13_Sub10.aClass87_3125.applet.getCodeBase(), "clienterror.ws?c=" + GameShell.anInt4033 + "&u=" + PacketParser.aLong3202 + "&v1=" + Signlink.javaVendor + "&v2=" + Signlink.javaVersion + "&e=" + var3)); + Class64 var4 = Class3_Sub13_Sub10.aClass87_3125.method1439(false, new URL(Class3_Sub13_Sub10.aClass87_3125.gameApplet.getCodeBase(), "clienterror.ws?c=&u=" + PacketParser.aLong3202 + "&v1=" + Signlink.javaVendor + "&v2=" + Signlink.javaVersion + "&e=" + var3)); while(var4.anInt978 == 0) { TimeUtils.sleep(1L); @@ -197,7 +197,7 @@ final class Class49 { Unsorted.menuOptionCount = 1; Class140_Sub7.aClass94Array2935[0] = TextCore.HasCancel; - Class163_Sub2_Sub1.aClass94Array4016[0] = TextCore.aClass94_3672; + Class163_Sub2_Sub1.aClass94Array4016[0] = TextCore.emptyJagexString; Class3_Sub13_Sub7.aShortArray3095[0] = 1005; Class114.anIntArray1578[0] = Class3_Sub28_Sub5.anInt3590; } diff --git a/Client/src/main/java/org/runite/client/Class72.java b/Client/src/main/java/org/runite/client/Class72.java index 75042a3fc..0aa022fe9 100644 --- a/Client/src/main/java/org/runite/client/Class72.java +++ b/Client/src/main/java/org/runite/client/Class72.java @@ -18,9 +18,9 @@ final class Class72 { static void method1293() { try { - if(!Client.aBoolean3779 && Class44.anInt718 != 2) { + if(!Client.paramAdvertisementSuppressed && Class44.paramModeWhere != 2) { try { - TextCore.aClass94_38.method1577(Class126.aClient1671); + TextCore.aClass94_38.method1577(Client.clientInstance); } catch (Throwable var2) { } diff --git a/Client/src/main/java/org/runite/client/Class79.java b/Client/src/main/java/org/runite/client/Class79.java index 47cd36ecc..a4dd911e4 100644 --- a/Client/src/main/java/org/runite/client/Class79.java +++ b/Client/src/main/java/org/runite/client/Class79.java @@ -158,7 +158,7 @@ final class Class79 { if(var2 >= 4) { int var4 = var0.readUnsignedByte(); - if(Class3_Sub24_Sub3.anInt3492 < 96) { + if(Class3_Sub24_Sub3.maxClientMemory < 96) { var4 = 0; } diff --git a/Client/src/main/java/org/runite/client/Class8.java b/Client/src/main/java/org/runite/client/Class8.java index 893d41ebd..b863bf5fb 100644 --- a/Client/src/main/java/org/runite/client/Class8.java +++ b/Client/src/main/java/org/runite/client/Class8.java @@ -136,9 +136,9 @@ final class Class8 { static void method841() { try { aClass11Array1836 = null; - Class3_Sub13_Sub1.method171(-101, Class3_Sub28_Sub12.anInt3655, 0, Class23.anInt454, 0, -1, Class140_Sub7.anInt2934, 0, 0); + Class3_Sub13_Sub1.method171(-101, Class3_Sub28_Sub12.anInt3655, 0, Class23.canvasWidth, 0, -1, Class140_Sub7.canvasHeight, 0, 0); if(aClass11Array1836 != null) { - Unsorted.method1095(0, Unsorted.anInt1082, Unsorted.anInt3602, aClass11Array1836, Class23.anInt454, -1412584499, 0, Class140_Sub7.anInt2934, (byte)73, PacketParser.aClass11_88.anInt292); + Unsorted.method1095(0, Unsorted.anInt1082, Unsorted.anInt3602, aClass11Array1836, Class23.canvasWidth, -1412584499, 0, Class140_Sub7.canvasHeight, (byte)73, PacketParser.aClass11_88.anInt292); aClass11Array1836 = null; } diff --git a/Client/src/main/java/org/runite/client/Class81.java b/Client/src/main/java/org/runite/client/Class81.java index 2475e0bb3..49ee83a59 100644 --- a/Client/src/main/java/org/runite/client/Class81.java +++ b/Client/src/main/java/org/runite/client/Class81.java @@ -73,20 +73,20 @@ final class Class81 { int var5; for(var5 = 0; var5 < Class3_Sub28_Sub5.anInt3591; ++var5) { if(Class114.ignores[var5] == var1) { - Class3_Sub30_Sub1.addChatMessage(TextCore.aClass94_3672, 0, RSString.stringCombiner(new RSString[]{var4, TextCore.HasIgnoreAlready}), -1); + Class3_Sub30_Sub1.addChatMessage(TextCore.emptyJagexString, 0, RSString.stringCombiner(new RSString[]{var4, TextCore.HasIgnoreAlready}), -1); return; } } for(var5 = 0; Class8.anInt104 > var5; ++var5) { if(var1 == Class50.aLongArray826[var5]) { - Class3_Sub30_Sub1.addChatMessage(TextCore.aClass94_3672, 0, RSString.stringCombiner(new RSString[]{TextCore.HasPleaseRemove, var4, TextCore.HasFriendsToIgnore}), -1); + Class3_Sub30_Sub1.addChatMessage(TextCore.emptyJagexString, 0, RSString.stringCombiner(new RSString[]{TextCore.HasPleaseRemove, var4, TextCore.HasFriendsToIgnore}), -1); return; } } if(var4.equalsString(Class102.player.displayName)) { - Class3_Sub30_Sub1.addChatMessage(TextCore.aClass94_3672, 0, TextCore.HasOnOwnIgnoreList, -1); + Class3_Sub30_Sub1.addChatMessage(TextCore.emptyJagexString, 0, TextCore.HasOnOwnIgnoreList, -1); } else { Class114.ignores[Class3_Sub28_Sub5.anInt3591] = var1; Class3_Sub13_Sub27.aClass94Array3341[Class3_Sub28_Sub5.anInt3591++] = Unsorted.method1052(var1); @@ -95,7 +95,7 @@ final class Class81 { Class3_Sub13_Sub1.outgoingBuffer.writeLong(var1); } } else { - Class3_Sub30_Sub1.addChatMessage(TextCore.aClass94_3672, 0, TextCore.HasIgnoreListFull, -1); + Class3_Sub30_Sub1.addChatMessage(TextCore.emptyJagexString, 0, TextCore.HasIgnoreListFull, -1); } } } catch (RuntimeException var6) { diff --git a/Client/src/main/java/org/runite/client/Class84.java b/Client/src/main/java/org/runite/client/Class84.java index 5fd72d068..ec3fff6ae 100644 --- a/Client/src/main/java/org/runite/client/Class84.java +++ b/Client/src/main/java/org/runite/client/Class84.java @@ -83,25 +83,6 @@ final class Class84 { Toolkit.getActiveToolkit().drawRect(1 + x, y + 18, width + -2, -19 + height, GameConfig.RCM_BORDER_COLOR, GameConfig.RCM_BORDER_OPACITY); } - /** - * Old toolkit stuff, updated with new and improved toolkit (thanks Techdaan <3) - * - if(HDToolKit.highDetail) { - OpenGlToolkit.OPENGL_TOOLKIT.fillRect(var1, var2, var3, var4, var5, 45); - OpenGlToolkit.OPENGL_TOOLKIT.fillRect(1 + var1, 1 + var2, var3 + -2, 16, 0, 255); - OpenGlToolkit.OPENGL_TOOLKIT.drawRect(1 + var1, var2 + 18, var3 + -2, -19 + var4, 11119017, 120); - // Class22.method934(var1, var2, var3, var4, var5); Old "toolkit" - //System.out.println("Class84: rightClickContextMenuDraw debug: Context (choose option) menu: Passing values method934(" + var1 + ", " + var2 + ", " + var3 + ", " + var4 + ", " + var5 + ")"); - // Class22.method934(1 + var1, 1 + var2, var3 + -2, 16, 0); - //System.out.println("Class84: rightClickContextMenuDraw debug: Context (choose option) menu: Passing values method934(" + (1 + var1) +"," + (1 + var2) + ", " + (var3 + -2) + ", " + "16, " + "0)"); - // Class22.drawRect(1 + var1, var2 + 18, var3 + -2, -19 + var4, 0);//Outer Rectangle choose option Box (contains options) - //System.out.println("Class84: rightClickContextMenuDraw debug: Context (choose option) menu: Passing values drawRect(" + (1 + var1) + ", " + (var2 + 18) + ", " + (var3 + -2) + ", " + (-19 + var4) + ", " + "0)"); - } else { - Class74.method934(var1, var2, var3, var4, var5); - Class74.method934(1 + var1, 1 + var2, var3 + -2, 16, 0); - Class74.drawRect(1 + var1, var2 + 18, -2 + var3, -19 + var4, 0); - } - */ Class168.aClass3_Sub28_Sub17_2096.method681(RSString.parse(GameConfig.RCM_TITLE), x - -3, y + 14, contextMenuColor, -1); int var7 = Unsorted.anInt1709; int var6 = Class126.anInt1676; diff --git a/Client/src/main/java/org/runite/client/Class99.java b/Client/src/main/java/org/runite/client/Class99.java index 6b57e4a60..7e5521655 100644 --- a/Client/src/main/java/org/runite/client/Class99.java +++ b/Client/src/main/java/org/runite/client/Class99.java @@ -22,7 +22,7 @@ final class Class99 { if(var2) { if(HDToolKit.highDetail && InterfaceWidget.aBoolean3594) { try { - Class42.method1056(Class38.aClass87_665.applet, new Object[]{var0.method1547(LinkableRSString.anApplet_Sub1_2588.getCodeBase()).toString()}); + Class42.method1056(Class38.signlink.gameApplet, new Object[]{var0.method1547(LinkableRSString.anApplet_Sub1_2588.getCodeBase()).toString()}); return; } catch (Throwable var6) { } diff --git a/Client/src/main/java/org/runite/client/Client.java b/Client/src/main/java/org/runite/client/Client.java index e6bb8dad0..4a7231438 100644 --- a/Client/src/main/java/org/runite/client/Client.java +++ b/Client/src/main/java/org/runite/client/Client.java @@ -50,8 +50,9 @@ public final class Client extends GameShell { static Class61 aClass61_1471 = new Class61(); static Class30 aClass30_1572; static int[] anIntArray3780 = new int[32]; - static boolean aBoolean3779 = false; + static boolean paramAdvertisementSuppressed = false; static int anInt3773; + static Client clientInstance; static void method631(CacheIndex var1) { try { @@ -84,6 +85,15 @@ public final class Client extends GameShell { } } + static void invalidArgument(String var0) { + try { + System.out.println("Bad " + var0 + ", Usage: worldid, , , "); + System.exit(1); + } catch (RuntimeException var3) { + throw ClientErrorException.clientError(var3, "kd.O(" + (var0 != null?"{...}":"null") + ',' + (byte) 38 + ')'); + } + } + final void method38() { try { @@ -102,7 +112,7 @@ public final class Client extends GameShell { if (null == Class3_Sub13_Sub10.aFrame3121) { Object var3; if (GameShell.frame == null) { - var3 = Class38.aClass87_665.applet; + var3 = Class38.signlink.gameApplet; } else { var3 = GameShell.frame; } @@ -225,7 +235,7 @@ public final class Client extends GameShell { if (Unsorted.aBoolean2146 && 10 == Class143.loadingStage && Class3_Sub28_Sub12.anInt3655 != -1) { Unsorted.aBoolean2146 = false; - Class119.method1730(Class38.aClass87_665); + Class119.method1730(Class38.signlink); } DeveloperConsole.INSTANCE.postDraw(); @@ -263,12 +273,12 @@ public final class Client extends GameShell { } if (null != Class3_Sub13_Sub10.aFrame3121) { - Unsorted.method593(Class3_Sub13_Sub10.aFrame3121, Class38.aClass87_665); + Unsorted.method593(Class3_Sub13_Sub10.aFrame3121, Class38.signlink); Class3_Sub13_Sub10.aFrame3121 = null; } - if (null != Class38.aClass87_665) { - Class38.aClass87_665.method1442(this.getClass(), 0); + if (null != Class38.signlink) { + Class38.signlink.method1442(this.getClass(), 0); } if (null != Class3_Sub13_Sub13.aClass67_1443) { @@ -330,66 +340,66 @@ public final class Client extends GameShell { public final void init() { try { - GameConfig.WORLD = GameConfig.WORLD_OVERRIDE == -1 ? ObjectDefinition.worldId : GameConfig.WORLD_OVERRIDE; - ObjectDefinition.worldId = GameConfig.WORLD_OVERRIDE == -1 ? 1 : GameConfig.WORLD_OVERRIDE; - Class44.anInt718 = Integer.parseInt(Objects.requireNonNull(this.getParameter("modewhere"))); - if (0 > Class44.anInt718 || 1 < Class44.anInt718) { - Class44.anInt718 = 0; + GameConfig.WORLD = GameConfig.WORLD_OVERRIDE == -1 ? ObjectDefinition.paramWorldID : GameConfig.WORLD_OVERRIDE; + ObjectDefinition.paramWorldID = GameConfig.WORLD_OVERRIDE == -1 ? 1 : GameConfig.WORLD_OVERRIDE; + Class44.paramModeWhere = Integer.parseInt(Objects.requireNonNull(this.getParameter("modewhere"))); + if (0 > Class44.paramModeWhere || 1 < Class44.paramModeWhere) { + Class44.paramModeWhere = 0; } - Class3_Sub13_Sub13.anInt3148 = Integer.parseInt(Objects.requireNonNull(this.getParameter("modewhat"))); - if (Class3_Sub13_Sub13.anInt3148 < 0 || Class3_Sub13_Sub13.anInt3148 > 2) { - Class3_Sub13_Sub13.anInt3148 = 0; + Class3_Sub13_Sub13.paramModeWhat = Integer.parseInt(Objects.requireNonNull(this.getParameter("modewhat"))); + if (Class3_Sub13_Sub13.paramModeWhat < 0 || Class3_Sub13_Sub13.paramModeWhat > 2) { + Class3_Sub13_Sub13.paramModeWhat = 0; } String var1 = this.getParameter("advertsuppressed"); - aBoolean3779 = var1 != null && var1.equals("1"); + paramAdvertisementSuppressed = var1 != null && var1.equals("1"); try { - Class3_Sub20.language = Integer.parseInt(Objects.requireNonNull(this.getParameter("lang"))); + Class3_Sub20.paramLanguage = Integer.parseInt(Objects.requireNonNull(this.getParameter("lang"))); } catch (Exception var10) { - Class3_Sub20.language = 0; + Class3_Sub20.paramLanguage = 0; } - Unsorted.method87(-31, Class3_Sub20.language); + Unsorted.languageSetter(Class3_Sub20.paramLanguage); String var2 = this.getParameter("objecttag"); - Class163_Sub2_Sub1.aBoolean4018 = var2 != null && var2.equals("1"); + Class163_Sub2_Sub1.paramObjectTagEnabled = var2 != null && var2.equals("1"); String var3 = this.getParameter("js"); - Unsorted.aBoolean3641 = null != var3 && var3.equals("1"); + Unsorted.paramJavaScriptEnabled = null != var3 && var3.equals("1"); String var4 = this.getParameter("game"); if (var4 != null && var4.equals("1")) { - Class158.anInt2014 = 1; + Class158.paramGameTypeID = 1; } else { - Class158.anInt2014 = 0; + Class158.paramGameTypeID = 0; } try { - Class3_Sub26.anInt2554 = Integer.parseInt(Objects.requireNonNull(this.getParameter("affid"))); + Class3_Sub26.paramAffid = Integer.parseInt(Objects.requireNonNull(this.getParameter("affid"))); } catch (Exception var9) { - Class3_Sub26.anInt2554 = 0; + Class3_Sub26.paramAffid = 0; } - Class163_Sub2.aClass94_2996 = TextCore.aClass94_1745.getParamValue(this); - if (Class163_Sub2.aClass94_2996 == null) { - Class163_Sub2.aClass94_2996 = TextCore.aClass94_3672; + Class163_Sub2.paramSettings = TextCore.aClass94_1745.getParamValue(this); + if (Class163_Sub2.paramSettings == null) { + Class163_Sub2.paramSettings = TextCore.emptyJagexString; } String var5 = this.getParameter("country"); if (var5 != null) { try { - Class3_Sub31.countryId = Integer.parseInt(var5); + Class3_Sub31.paramCountryID = Integer.parseInt(var5); } catch (Exception var8) { - Class3_Sub31.countryId = 0; + Class3_Sub31.paramCountryID = 0; } } String var6 = this.getParameter("haveie6"); - Class106.hasInternetExplorer6 = null != var6 && var6.equals("1"); + Class106.paramUserUsingInternetExplorer = null != var6 && var6.equals("1"); - Class126.aClient1671 = this; - this.method41(32 - -Class3_Sub13_Sub13.anInt3148); + clientInstance = this; + this.method41(32 - -Class3_Sub13_Sub13.paramModeWhat); } catch (RuntimeException var11) { throw ClientErrorException.clientError(var11, "client.init()"); } @@ -400,30 +410,30 @@ public final class Client extends GameShell { Class119.method1729(); Class3_Sub13_Sub14.aCacheResourceWorker_3159 = new CacheResourceWorker(); Class58.aJs5Worker_917 = new Js5Worker(); - if (Class3_Sub13_Sub13.anInt3148 != 0) { + if (Class3_Sub13_Sub13.paramModeWhat != 0) { Class3_Sub6.aByteArrayArray2287 = new byte[50][]; } - CS2Script.anInt2451 = ObjectDefinition.worldId; - Unsorted.method564(Class38.aClass87_665); + CS2Script.anInt2451 = ObjectDefinition.paramWorldID; + Unsorted.method564(Class38.signlink); SystemLogger.logInfo("port: " + Class53.anInt867); SystemLogger.logInfo("MSIP: " + GameConfig.IP_MANAGEMENT); - if (Class44.anInt718 == 0) { + if (Class44.paramModeWhere == 0) { ClientErrorException.worldListHost = Objects.requireNonNull(this.getCodeBase()).getHost(); - Class53.anInt867 = GameConfig.SERVER_PORT + ObjectDefinition.worldId; //443 is secure port + Class53.anInt867 = GameConfig.SERVER_PORT + ObjectDefinition.paramWorldID; //443 is secure port anInt3773 = '\uaa4a'; - } else if (Class44.anInt718 == 1) { + } else if (Class44.paramModeWhere == 1) { ClientErrorException.worldListHost = Objects.requireNonNull(this.getCodeBase()).getHost(); //System.out.println("port = " + Class53.anInt867); - Class53.anInt867 = ObjectDefinition.worldId + 50000; - anInt3773 = 40000 + ObjectDefinition.worldId; - } else if (Class44.anInt718 == 2) { + Class53.anInt867 = ObjectDefinition.paramWorldID + 50000; + anInt3773 = 40000 + ObjectDefinition.paramWorldID; + } else if (Class44.paramModeWhere == 2) { ClientErrorException.worldListHost = "127.0.0.1"; System.out.println("Setting worldListHost to 127.0.0.1, port = " + Class53.anInt867); - Class53.anInt867 = ObjectDefinition.worldId + '\uc350'; - anInt3773 = ObjectDefinition.worldId + '\u9c40'; + Class53.anInt867 = ObjectDefinition.paramWorldID + '\uc350'; + anInt3773 = ObjectDefinition.paramWorldID + '\u9c40'; } - if (1 == Class158.anInt2014) { + if (1 == Class158.paramGameTypeID) { ClientCommands.shiftClickEnabled = true; Class92.defaultScreenColorRgb = 16777215; Class92.defaultRegionAmbientRGB = 0; @@ -445,8 +455,8 @@ public final class Client extends GameShell { Class3_Sub13_Sub38.aShortArray3455 = Class3_Sub13_Sub9.aShortArray3110 = Class136.aShortArray1779 = Class3_Sub13_Sub38.aShortArray3453 = new short[256]; Class140_Sub6.accRegistryPort = Class123.anInt1658; - if (Signlink.anInt1214 == 3 && 2 != Class44.anInt718) { - CS2Script.anInt2451 = ObjectDefinition.worldId; + if (Signlink.anInt1214 == 3 && 2 != Class44.paramModeWhere) { + CS2Script.anInt2451 = ObjectDefinition.paramWorldID; } KeyboardListener.adjustKeyCodeMap(); @@ -458,20 +468,20 @@ public final class Client extends GameShell { } try { - if (Class38.aClass87_665.cacheDataFile != null) { - Class101.aClass30_1422 = new Class30(Class38.aClass87_665.cacheDataFile, 5200); + if (Class38.signlink.cacheDataFile != null) { + Class101.aClass30_1422 = new Class30(Class38.signlink.cacheDataFile, 5200); for (int var2 = 0; var2 < 29; ++var2) { - Class163_Sub2.aClass30Array2998[var2] = new Class30(Class38.aClass87_665.cacheIndicesFiles[var2], 6000); + Class163_Sub2.aClass30Array2998[var2] = new Class30(Class38.signlink.cacheIndicesFiles[var2], 6000); } - aClass30_1572 = new Class30(Class38.aClass87_665.cacheChecksumFile, 6000); + aClass30_1572 = new Class30(Class38.signlink.cacheChecksumFile, 6000); AtmosphereParser.aClass41_1186 = new Class41(255, Class101.aClass30_1422, aClass30_1572, 500000); - Unsorted.aClass30_1039 = new Class30(Class38.aClass87_665.randomDatFile, 24); - Class38.aClass87_665.cacheIndicesFiles = null; - Class38.aClass87_665.cacheChecksumFile = null; - Class38.aClass87_665.randomDatFile = null; - Class38.aClass87_665.cacheDataFile = null; + Unsorted.aClass30_1039 = new Class30(Class38.signlink.randomDatFile, 24); + Class38.signlink.cacheIndicesFiles = null; + Class38.signlink.cacheChecksumFile = null; + Class38.signlink.randomDatFile = null; + Class38.signlink.cacheDataFile = null; } } catch (IOException var3) { Unsorted.aClass30_1039 = null; @@ -481,7 +491,7 @@ public final class Client extends GameShell { } Class167.aClass94_2083 = TextCore.RSLoadingPleaseWait; - if (Class44.anInt718 != 0) { + if (Class44.paramModeWhere != 0) { ClientCommands.fpsOverlayEnabled = true; } //Class3_Sub26.tweeningEnabled = true; @@ -521,7 +531,7 @@ public final class Client extends GameShell { ++Class106.anInt1446; if (-1 != Class3_Sub28_Sub12.anInt3655) { - GraphicDefinition.method967(0, 0, 0, Class23.anInt454, Class3_Sub28_Sub12.anInt3655, 0, Class140_Sub7.anInt2934); + GraphicDefinition.method967(0, 0, 0, Class23.canvasWidth, Class3_Sub28_Sub12.anInt3655, 0, Class140_Sub7.canvasHeight); } ++PacketParser.anInt3213; @@ -677,24 +687,24 @@ public final class Client extends GameShell { } if (Class58.aJs5Worker_917.errors >= 2 && Class58.aJs5Worker_917.status == 6) { - this.method31("js5connect_outofdate"); + this.errorPrint("js5connect_outofdate"); Class143.loadingStage = 1000; return; } if (Class58.aJs5Worker_917.errors >= 4 && Class58.aJs5Worker_917.status == -1) { - this.method31("js5crc"); + this.errorPrint("js5crc"); Class143.loadingStage = 1000; return; } if (Class58.aJs5Worker_917.errors >= 4 && (Class143.loadingStage == 0 || Class143.loadingStage == 5)) { if (Class58.aJs5Worker_917.status == 7 || Class58.aJs5Worker_917.status == 9) { - this.method31("js5connect_full"); + this.errorPrint("js5connect_full"); } else if (Class58.aJs5Worker_917.status > 0) { - this.method31("js5connect"); + this.errorPrint("js5connect"); } else { - this.method31("js5io"); + this.errorPrint("js5io"); } Class143.loadingStage = 1000; @@ -708,7 +718,7 @@ public final class Client extends GameShell { } else { try { if (PacketParser.anInt80 == 0) { - Class17.aClass64_413 = Class38.aClass87_665.method1441((byte) 8, Class38_Sub1.accRegistryIp, Class140_Sub6.accRegistryPort); + Class17.aClass64_413 = Class38.signlink.method1441((byte) 8, Class38_Sub1.accRegistryIp, Class140_Sub6.accRegistryPort); ++PacketParser.anInt80; } @@ -724,7 +734,7 @@ public final class Client extends GameShell { } if (2 == PacketParser.anInt80) { - Unsorted.js5Connection = new Connection((Socket) Objects.requireNonNull(Class17.aClass64_413).anObject974, Class38.aClass87_665); + Unsorted.js5Connection = new Connection((Socket) Objects.requireNonNull(Class17.aClass64_413).anObject974, Class38.signlink); DataBuffer var2 = new DataBuffer(9); var2.writeByte(15); //JS5 handshake var2.writeInt(GameConfig.CLIENT_BUILD); @@ -765,71 +775,109 @@ public final class Client extends GameShell { } } - public static void main(String[] var0) { + /** + * Client Initialization + *

+ * Client command line initialization (parameter modeWhere 3) + * NOTE: Attempting to run the client this way puts paramModeWhere into LOCAL_ENVIRONMENT mode + * All of these arguments can be set through "program arguments" + */ + public static void main(String[] args) { try { try { - if (4 != var0.length) { - Class3_Sub13_Sub23_Sub1.method283("argument count"); + if (args.length != 4) { + invalidArgument("argument count"); } - int var1 = -1; - ObjectDefinition.worldId = Integer.parseInt(var0[0]); - Class44.anInt718 = 2; - if (var0[1].equals("live")) { - Class3_Sub13_Sub13.anInt3148 = 0; - } else if (var0[1].equals("rc")) { - Class3_Sub13_Sub13.anInt3148 = 1; - } else if (var0[1].equals("wip")) { - Class3_Sub13_Sub13.anInt3148 = 2; - } else { - Class3_Sub13_Sub23_Sub1.method283("modewhat"); + int language = -1; + + ObjectDefinition.paramWorldID = Integer.parseInt(args[0]); + + Class44.paramModeWhere = 2; + + switch (args[1]) { + case "live": + Class3_Sub13_Sub13.paramModeWhat = 0; + break; + case "rc": + Class3_Sub13_Sub13.paramModeWhat = 1; + break; + case "wip": + Class3_Sub13_Sub13.paramModeWhat = 2; + break; + default: + invalidArgument("modewhat"); + break; } - aBoolean3779 = false; + paramAdvertisementSuppressed = false; try { - byte[] var2 = var0[2].getBytes(StandardCharsets.ISO_8859_1); - var1 = Class3_Sub13_Sub16.method243(Class3_Sub13_Sub3.method178(var2, var2.length, 0)); - } catch (Exception var3) { + byte[] languageSelection = args[2].getBytes(StandardCharsets.ISO_8859_1); + /* + Accepts en, de, fr, pt + */ + language = Class3_Sub13_Sub16.compareEnteredLanguageArgument(Class3_Sub13_Sub3.bufferToString(languageSelection, languageSelection.length, 0)); + } catch (Exception ignored) { + } - if (-1 == var1) { - if (var0[2].equals("english")) { - Class3_Sub20.language = 0; - } else if (var0[2].equals("german")) { - Class3_Sub20.language = 1; - } else { - Class3_Sub13_Sub23_Sub1.method283("language"); + if (language == -1) { + switch (args[2]) { + case "english": + Class3_Sub20.paramLanguage = 0; + break; + case "german": + Class3_Sub20.paramLanguage = 1; + break; + case "french": + Class3_Sub20.paramLanguage = 2; + break; + default: + invalidArgument("language"); + break; } } else { - Class3_Sub20.language = var1; + Class3_Sub20.paramLanguage = language; } - Unsorted.method87(-78, Class3_Sub20.language); - Class163_Sub2_Sub1.aBoolean4018 = false; - Unsorted.aBoolean3641 = false; - if (var0[3].equals("game0")) { - Class158.anInt2014 = 0; - } else if (var0[3].equals("game1")) { - Class158.anInt2014 = 1; - } else { - Class3_Sub13_Sub23_Sub1.method283("game"); + Unsorted.languageSetter(Class3_Sub20.paramLanguage); + + Class163_Sub2_Sub1.paramObjectTagEnabled = false; + Unsorted.paramJavaScriptEnabled = false; + + switch (args[3]) { + case "game0": + Class158.paramGameTypeID = 0; + break; + case "game1": + Class158.paramGameTypeID = 1; + break; + default: + invalidArgument("game"); + break; } - Class3_Sub31.countryId = 0; - Class106.hasInternetExplorer6 = false; - Class3_Sub26.anInt2554 = 0; - Class163_Sub2.aClass94_2996 = TextCore.aClass94_3672; - Client var6 = new Client(); - Class126.aClient1671 = var6; - var6.launch(); + Class3_Sub31.paramCountryID = 0; + + Class106.paramUserUsingInternetExplorer = false; + + Class3_Sub26.paramAffid = 0; + + Class163_Sub2.paramSettings = TextCore.emptyJagexString; + + Client client = new Client(); + clientInstance = client; + client.launch(); + GameShell.frame.setLocation(40, 40); + } catch (Exception var4) { - Class49.method1125(null, var4, (byte) 119); + Class49.reportError(null, var4, (byte) 119); } } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "client.main(" + (var0 != null ? "{...}" : "null") + ')'); + throw ClientErrorException.clientError(var5, "client.main(" + (args != null ? "{...}" : "null") + ')'); } } @@ -915,7 +963,7 @@ public final class Client extends GameShell { } else if (inter.anIntArray310 == null || Class44.anInt719 >= inter.anIntArray310[var19]) { byte var20 = inter.aByteArray231[var19]; if (var20 == 0 || ((var20 & 2) == 0 || ObjectDefinition.aBooleanArray1490[86]) && ((var20 & 1) == 0 || ObjectDefinition.aBooleanArray1490[82]) && ((var20 & 4) == 0 || ObjectDefinition.aBooleanArray1490[81])) { - Unsorted.method66(TextCore.aClass94_3672, -1, var19 + 1, (byte) -29, inter.componentHash); + Unsorted.method66(TextCore.emptyJagexString, -1, var19 + 1, (byte) -29, inter.componentHash); var21 = inter.anIntArray299[var19]; if (inter.anIntArray310 == null) { inter.anIntArray310 = new int[inter.aByteArray263.length]; @@ -1446,7 +1494,7 @@ public final class Client extends GameShell { } else if (anInt1354 == 40) { var2 = 0; - for (var3 = 0; var3 < 29; ++var3) { //TODO + for (var3 = 0; var3 < 29; ++var3) { var2 += Unsorted.aClass151_Sub1Array2601[var3].method2111() * anIntArray3288[var3] / 100; } @@ -1468,10 +1516,10 @@ public final class Client extends GameShell { Class140_Sub3.method1959(Class3_Sub13_Sub15.aBoolean3184); aClass3_Sub24_Sub4_1193 = new Class3_Sub24_Sub4(); aClass3_Sub24_Sub4_1193.method479(); - WorldListEntry.aClass155_2627 = Class58.method1195(22050, Class38.aClass87_665, GameShell.canvas, 0); + WorldListEntry.aClass155_2627 = Class58.method1195(22050, Class38.signlink, GameShell.canvas, 0); WorldListEntry.aClass155_2627.method2154(-116, aClass3_Sub24_Sub4_1193); RenderAnimationDefinition.method897(aClass3_Sub24_Sub4_1193, CacheIndex.soundFX3Index, CacheIndex.soundFX2Index, CacheIndex.soundFXIndex); - Class3_Sub21.aClass155_2491 = Class58.method1195(2048, Class38.aClass87_665, GameShell.canvas, 1); + Class3_Sub21.aClass155_2491 = Class58.method1195(2048, Class38.signlink, GameShell.canvas, 1); Class3_Sub26.aClass3_Sub24_Sub2_2563 = new Class3_Sub24_Sub2(); Class3_Sub21.aClass155_2491.method2154(-128, Class3_Sub26.aClass3_Sub24_Sub2_2563); Class27.aClass157_524 = new Class157(22050, Class21.anInt443); @@ -1581,7 +1629,7 @@ public final class Client extends GameShell { } } else if (anInt1354 == 110) { Class3_Sub13_Sub13.aClass67_1443 = new Class67(); - Class38.aClass87_665.method1451(10, Class3_Sub13_Sub13.aClass67_1443); + Class38.signlink.method1451(10, Class3_Sub13_Sub13.aClass67_1443); Class3_Sub17.aClass94_2464 = TextCore.LoadedInputHandler; LoadingStageNumber = 75; anInt1354 = 120; @@ -1617,14 +1665,14 @@ public final class Client extends GameShell { LoadingStageNumber = 95; Class3_Sub17.aClass94_2464 = TextCore.LoadingWLD; } else if (var2 == 7 || var2 == 9) { - this.method31("worldlistfull"); + this.errorPrint("worldlistfull"); Class117.method1719(1000); } else if (Class30.loadedWorldList) { Class3_Sub17.aClass94_2464 = TextCore.LoadedWLD; anInt1354 = 140; LoadingStageNumber = 96; } else { - this.method31("worldlistio_" + var2); + this.errorPrint("worldlistio_" + var2); Class117.method1719(1000); } } else if (anInt1354 == 140) { @@ -1649,7 +1697,7 @@ public final class Client extends GameShell { } Unsorted.aBoolean2146 = true; - Class119.method1730(Class38.aClass87_665); + Class119.method1730(Class38.signlink); GameObject.graphicsSettings(false, Unsorted.anInt2577, -1, -1); LoadingStageNumber = 100; anInt1354 = 160; @@ -1657,8 +1705,8 @@ public final class Client extends GameShell { } else if (anInt1354 == 160) { Class3_Sub13_Sub11.method219(true); } - } else if (CacheIndex.huffmanEncodingIndex.method2125(TextCore.aClass94_3672, TextCore.HasHuffman)) { - Class36 var9 = new Class36(CacheIndex.huffmanEncodingIndex.method2123(TextCore.aClass94_3672, TextCore.HasHuffman)); + } else if (CacheIndex.huffmanEncodingIndex.method2125(TextCore.emptyJagexString, TextCore.HasHuffman)) { + Class36 var9 = new Class36(CacheIndex.huffmanEncodingIndex.method2123(TextCore.emptyJagexString, TextCore.HasHuffman)); Class1.method69(var9); Class3_Sub17.aClass94_2464 = TextCore.LoadedWordPack; anInt1354 = 130; diff --git a/Client/src/main/java/org/runite/client/ClientCommands.java b/Client/src/main/java/org/runite/client/ClientCommands.java index 6b78bd393..2f574775f 100644 --- a/Client/src/main/java/org/runite/client/ClientCommands.java +++ b/Client/src/main/java/org/runite/client/ClientCommands.java @@ -81,7 +81,7 @@ public class ClientCommands { } if (command.equalsStringIgnoreCase(TextCore.COMMAND_BREAK_CONNECTION)) { - Class38.aClass87_665.method1431(); + Class38.signlink.method1431(); Class3_Sub15.activeConnection.applyDummyStreams(); Class58.aJs5Worker_917.applyDummyStreams(); } @@ -109,7 +109,7 @@ public class ClientCommands { } if(command.equalsStringIgnoreCase(TextCore.COMMAND_HISCORES) || command.equalsStringIgnoreCase(TextCore.COMMAND_HIGHSCORES)){ - int world = ObjectDefinition.worldId; + int world = ObjectDefinition.paramWorldID; String link = world == 1 ? "https://2009scape.org/services/m%3dhiscore/hiscores.html" : "https://2009scape.org/services/m=hiscore/hiscores.html?world=2"; if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) { try { @@ -158,11 +158,11 @@ public class ClientCommands { if (command.startsWith(TextCore.COMMAND_SET_PARTICLES)) { Class127_Sub1.method1758(command.substring(15).parseInt()); - Class119.method1730(Class38.aClass87_665); + Class119.method1730(Class38.signlink); CS2Script.aBoolean2705 = false; } - if (command.startsWith(TextCore.COMMAND_FPS) && Class44.anInt718 != 0) { + if (command.startsWith(TextCore.COMMAND_FPS) && Class44.paramModeWhere != 0) { Class65.method1237(command.substring(6).parseInt()); } diff --git a/Client/src/main/java/org/runite/client/ClientLoader.java b/Client/src/main/java/org/runite/client/ClientLoader.java index 09323a1c1..e4c5bbbc3 100644 --- a/Client/src/main/java/org/runite/client/ClientLoader.java +++ b/Client/src/main/java/org/runite/client/ClientLoader.java @@ -106,7 +106,7 @@ public class ClientLoader extends Applet { props.put("lowmem", "0"); props.put("settings", "kKmok3kJqOeN6D3mDdihco3oPeYN2KFy6W5--vZUbNA"); Signlink sn = new Signlink(this, 32, "runescape", 29); - Client.providesignlink(sn); + Client.provideSignlink(sn); game = new Client(); game.init(); } catch (Exception localException) { diff --git a/Client/src/main/java/org/runite/client/DataBuffer.java b/Client/src/main/java/org/runite/client/DataBuffer.java index a0629a270..faab63a4a 100644 --- a/Client/src/main/java/org/runite/client/DataBuffer.java +++ b/Client/src/main/java/org/runite/client/DataBuffer.java @@ -205,7 +205,7 @@ public class DataBuffer extends Linkable { while (Objects.requireNonNull(this.buffer)[this.index++] != 0) { } - return Class3_Sub13_Sub3.method178(this.buffer, this.index - (var3 - -1), var3); + return Class3_Sub13_Sub3.bufferToString(this.buffer, this.index - (var3 - -1), var3); } else { throw new IllegalStateException("Bad version number in gjstr2"); } @@ -358,7 +358,7 @@ public class DataBuffer extends Linkable { while (this.buffer[this.index++] != 0) ; - return Class3_Sub13_Sub3.method178(this.buffer, (this.index - 1) - startIndex, startIndex); + return Class3_Sub13_Sub3.bufferToString(this.buffer, (this.index - 1) - startIndex, startIndex); } final int getSmart() { diff --git a/Client/src/main/java/org/runite/client/GameShell.java b/Client/src/main/java/org/runite/client/GameShell.java index 3b64401c5..cef4cd516 100644 --- a/Client/src/main/java/org/runite/client/GameShell.java +++ b/Client/src/main/java/org/runite/client/GameShell.java @@ -15,21 +15,17 @@ import java.util.Objects; public abstract class GameShell extends Applet implements Runnable, FocusListener, WindowListener { public static Canvas canvas; - static int anInt950; - static volatile boolean hasWindowFocus = true; - static long aLong2313 = 0L; - static int anInt4033; - static int anInt1737 = 1; - static boolean aBoolean1784 = false; - private boolean aBoolean1 = false; - static int anInt3 = 0; - static Frame frame; + public static Frame frame; + private static int anInt950; + private static volatile boolean hasWindowFocus = true; + private static long aLong2313 = 0L; + private static int anInt1737 = 1; + private static boolean aBoolean1784 = false; + private boolean displayError = false; - - static boolean aBoolean6 = false; - static RSString aClass94_8 = RSString.parse(""); - static RSString aClass94_9 = RSString.parse(")3)3)3"); - static boolean aBoolean11 = false; + private static void getMaxMemory() { + Class3_Sub24_Sub3.maxClientMemory = (int) (Runtime.getRuntime().maxMemory() / 1048576L) + 1; + } public final void focusLost(FocusEvent var1) { try { @@ -55,19 +51,9 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene public final void windowDeactivated(WindowEvent var1) { } - static RSString method27(RSString var0) { - try { - - int var2 = Unsorted.method1602(var0); - return var2 != -1 ? Class119.aClass131_1624.aClass94Array1721[var2].method1560(TextCore.aClass94_3192, TextCore.aClass94_4066) : TextCore.aClass94_4049; - } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "rc.V(" + (var0 != null ? "{...}" : "null") + ',' + true + ')'); - } - } - public final AppletContext getAppletContext() { try { - return null != frame ? null : (Class38.aClass87_665 != null && this != Class38.aClass87_665.applet ? Class38.aClass87_665.applet.getAppletContext() : super.getAppletContext()); + return null != frame ? null : (Class38.signlink != null && this != Class38.signlink.gameApplet ? Class38.signlink.gameApplet.getAppletContext() : super.getAppletContext()); } catch (RuntimeException var2) { throw ClientErrorException.clientError(var2, "rc.getAppletContext()"); } @@ -82,58 +68,47 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } } - static void method28() { - try { - Class143.aReferenceCache_1874.clear(); - - } catch (RuntimeException var2) { - throw ClientErrorException.clientError(var2, "rc.Q(" + true + ')'); - } - } - public final void windowClosed(WindowEvent var1) { } - final synchronized void method30(byte var1) { + final synchronized void addCanvas() { try { if (canvas != null) { canvas.removeFocusListener(this); canvas.getParent().remove(canvas); } - Object var2; + Container var2; if (Class3_Sub13_Sub10.aFrame3121 != null) { var2 = Class3_Sub13_Sub10.aFrame3121; } else if (null == frame) { - var2 = Class38.aClass87_665.applet; + var2 = Class38.signlink.gameApplet; } else { var2 = frame; } - ((Container) var2).setLayout((LayoutManager) null); + var2.setLayout(null); canvas = new ComponentWrappedCanvas(this); - if (var1 >= 30) { - ((Container) var2).add(canvas); - canvas.setSize(Class23.anInt454, Class140_Sub7.anInt2934); - canvas.setVisible(true); - if (var2 == frame) { - Insets var3 = frame.getInsets(); - canvas.setLocation(Class84.anInt1164 + var3.left, var3.top + Class106.anInt1442); - } else { - canvas.setLocation(Class84.anInt1164, Class106.anInt1442); - } - - canvas.addFocusListener(this); - canvas.requestFocus(); - hasWindowFocus = true; - Class3_Sub13_Sub10.aBoolean3116 = true; - Class3_Sub13_Sub6.aBoolean3078 = true; - Class3_Sub28_Sub5.forceReplaceCanvasEnable = false; - SequenceDefinition.aLong1847 = TimeUtils.time(); - ClientCommands.tweeningEnabled = true; + var2.add(canvas); + canvas.setSize(Class23.canvasWidth, Class140_Sub7.canvasHeight); + canvas.setVisible(true); + if (var2 == frame) { + Insets var3 = frame.getInsets(); + canvas.setLocation(Class84.anInt1164 + var3.left, var3.top + Class106.anInt1442); + } else { + canvas.setLocation(Class84.anInt1164, Class106.anInt1442); } + + canvas.addFocusListener(this); + canvas.requestFocus(); + hasWindowFocus = true; + Class3_Sub13_Sub10.aBoolean3116 = true; + Class3_Sub13_Sub6.aBoolean3078 = true; + Class3_Sub28_Sub5.forceReplaceCanvasEnable = false; + SequenceDefinition.aLong1847 = TimeUtils.time(); + ClientCommands.tweeningEnabled = true; } catch (RuntimeException var4) { - throw ClientErrorException.clientError(var4, "rc.BA(" + var1 + ')'); + throw ClientErrorException.clientError(var4, "rc.BA(" + ')'); } } @@ -143,7 +118,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene aLong2313 = TimeUtils.time(); TimeUtils.sleep(5000L); Class3_Sub13_Sub10.aClass87_3125 = null; - this.method35(46, false); + this.method35(false); } } catch (RuntimeException var2) { throw ClientErrorException.clientError(var2, "rc.destroy()"); @@ -154,10 +129,10 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene this.paint(g); } - final void method31(String var1) { + final void errorPrint(String var1) { try { - if (!this.aBoolean1) { - this.aBoolean1 = true; + if (!this.displayError) { + this.displayError = true; System.out.println("error_game_" + var1); JOptionPane.showMessageDialog(frame, "Error: " + var1 + (var1.contains("js5connect") ? ". The game is likely down." : "") + "\nCheck Discord (https://discord.gg/43YPGND) in a relevant #help channel, and a kind user might be able to help you out."); try { @@ -177,7 +152,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene public final URL getDocumentBase() { try { - return null != frame ? null : (Class38.aClass87_665 != null && this != Class38.aClass87_665.applet ? Class38.aClass87_665.applet.getDocumentBase() : super.getDocumentBase()); + return null != frame ? null : (Class38.signlink != null && this != Class38.signlink.gameApplet ? Class38.signlink.gameApplet.getDocumentBase() : super.getDocumentBase()); } catch (RuntimeException var2) { throw ClientErrorException.clientError(var2, "rc.getDocumentBase()"); } @@ -211,16 +186,16 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } Class140_Sub3.method1959(Class3_Sub13_Sub15.aBoolean3184); - WorldListEntry.aClass155_2627 = Class58.method1195(22050, Class38.aClass87_665, canvas, 0); + WorldListEntry.aClass155_2627 = Class58.method1195(22050, Class38.signlink, canvas, 0); WorldListEntry.aClass155_2627.method2154(114, Client.aClass3_Sub24_Sub4_1193); - Class3_Sub21.aClass155_2491 = Class58.method1195(2048, Class38.aClass87_665, canvas, 1); + Class3_Sub21.aClass155_2491 = Class58.method1195(2048, Class38.signlink, canvas, 1); Class3_Sub21.aClass155_2491.method2154(-126, Class3_Sub26.aClass3_Sub24_Sub2_2563); } catch (RuntimeException var2) { throw ClientErrorException.clientError(var2, "rc.DA(" + -32589 + ')'); } } - private void method35(int var1, boolean var2) { + private void method35(boolean var2) { try { synchronized (this) { if (Class29.aBoolean554) { @@ -230,8 +205,8 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene Class29.aBoolean554 = true; } - if (Class38.aClass87_665.applet != null) { - Class38.aClass87_665.applet.destroy(); + if (Class38.signlink.gameApplet != null) { + Class38.signlink.gameApplet.destroy(); } try { @@ -247,17 +222,14 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } } - if (null != Class38.aClass87_665) { + if (null != Class38.signlink) { try { - Class38.aClass87_665.method1445(0); + Class38.signlink.method1445(0); } catch (Exception var6) { } } this.method33(); - if (var1 <= 31) { - this.launch(); - } if (null != frame) { try { @@ -268,7 +240,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene System.out.println("Shutdown complete - clean:" + var2); } catch (RuntimeException var10) { - throw ClientErrorException.clientError(var10, "rc.EA(" + var1 + ',' + var2 + ')'); + throw ClientErrorException.clientError(var10, "rc.EA(" + ',' + var2 + ')'); } } @@ -292,9 +264,9 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } } - public static void providesignlink(Signlink var0) { + public static void provideSignlink(Signlink var0) { try { - Class38.aClass87_665 = var0; + Class38.signlink = var0; Class3_Sub13_Sub10.aClass87_3125 = var0; Class3_Sub13_Sub1.method445(); } catch (RuntimeException var2) { @@ -317,7 +289,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene if (50 < Class3_Sub13_Sub25.anInt3313++) { Class3_Sub13_Sub10.aBoolean3116 = true; Class3_Sub13_Sub25.anInt3313 -= 50; - canvas.setSize(Class23.anInt454, Class140_Sub7.anInt2934); + canvas.setSize(Class23.canvasWidth, Class140_Sub7.canvasHeight); canvas.setVisible(true); if (frame != null && null == Class3_Sub13_Sub10.aFrame3121) { Insets var8 = frame.getInsets(); @@ -336,7 +308,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene abstract void method38(); public final URL getCodeBase() { - return frame == null ? (null != Class38.aClass87_665 && this != Class38.aClass87_665.applet ? Class38.aClass87_665.applet.getCodeBase() : super.getCodeBase()) : null; + return frame == null ? (null != Class38.signlink && this != Class38.signlink.gameApplet ? Class38.signlink.gameApplet.getCodeBase() : super.getCodeBase()) : null; } @@ -349,36 +321,38 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene public final void run() { try { try { - if (null != Signlink.javaVendor) { - String var1 = Signlink.javaVendor.toLowerCase(); - if (!var1.contains("sun") && !var1.contains("apple")) { - if (var1.contains("ibm") && Signlink.javaVendor.equals("1.4.2")) { - this.method31("wrongjava"); - return; - } - } else { - String var2 = Signlink.javaVendor; + if (Signlink.javaVendor != null) { + + String vendor = Signlink.javaVendor.toLowerCase(); + + if (vendor.contains("sun") || vendor.contains("apple")) { + + String var2 = Signlink.javaVersion; + if (var2.equals("1.1") || var2.startsWith("1.1.") || var2.equals("1.2") || var2.startsWith("1.2.")) { - this.method31("wrongjava"); + this.errorPrint("wrongjava"); return; } anInt1737 = 5; + } else if (vendor.contains("ibm") && Signlink.javaVersion.equals("1.4.2")) { + this.errorPrint("wrongjava"); + return; } } int var7; - if (null != Signlink.javaVendor && Signlink.javaVendor.startsWith("1.")) { + if (null != Signlink.javaVersion && Signlink.javaVersion.startsWith("1.")) { var7 = 2; int var9; - for (var9 = 0; Signlink.javaVendor.length() > var7; ++var7) { - char var3 = Signlink.javaVendor.charAt(var7); - if (var3 < 48 || 57 < var3) { + for (var9 = 0; Signlink.javaVersion.length() > var7; ++var7) { + char var3 = Signlink.javaVersion.charAt(var7); + if (var3 < 48 || var3 > 57) { break; } - var9 = var9 * 10 - (-var3 - -48); + var9 = var9 * 10 - (-var3 + 48); } if (var9 >= 5) { @@ -386,19 +360,19 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } } - if (null != Class38.aClass87_665.applet) { + if (Class38.signlink.gameApplet != null) { Method var8 = Signlink.setFocusCycleRoot; if (null != var8) { try { - var8.invoke(Class38.aClass87_665.applet, new Object[]{Boolean.TRUE}); + var8.invoke(Class38.signlink.gameApplet, Boolean.TRUE); } catch (Throwable var4) { } } } - Class3_Sub28_Sub18.method713(); - this.method30((byte) 120); - Class164_Sub1.aClass158_3009 = Class3_Sub13_Sub23_Sub1.method285(Class140_Sub7.anInt2934, Class23.anInt454, canvas); + getMaxMemory(); + this.addCanvas(); + Class164_Sub1.aClass158_3009 = Class3_Sub13_Sub23_Sub1.method285(Class140_Sub7.canvasHeight, Class23.canvasWidth, canvas); this.method39(); Class3_Sub25.aClass129_2552 = Class36.method1012(); @@ -410,14 +384,14 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } this.method37(); - Class81.method1400(Class38.aClass87_665, canvas, -80); + Class81.method1400(Class38.signlink, canvas, -80); } } catch (Exception var5) { - Class49.method1125(null, var5, (byte) 127); - this.method31("crash"); + Class49.reportError(null, var5, (byte) 127); + this.errorPrint("crash"); } - this.method35(107, true); + this.method35(true); } catch (RuntimeException var6) { throw ClientErrorException.clientError(var6, "rc.run()"); } @@ -426,7 +400,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene public final String getParameter(String var1) { try { - return frame == null ? (Class38.aClass87_665 != null && this != Class38.aClass87_665.applet ? Class38.aClass87_665.applet.getParameter(var1) : super.getParameter(var1)) : null; + return frame == null ? (Class38.signlink != null && this != Class38.signlink.gameApplet ? Class38.signlink.gameApplet.getParameter(var1) : super.getParameter(var1)) : null; } catch (RuntimeException var3) { throw ClientErrorException.clientError(var3, "rc.getParameter(" + (var1 != null ? "{...}" : "null") + ')'); } @@ -448,13 +422,11 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene final void launch() { try { - try { - Class140_Sub7.anInt2934 = 768; + Class140_Sub7.canvasHeight = 768; Class70.anInt1047 = 768; Class84.anInt1164 = 0; - anInt4033 = 530; - Class23.anInt454 = 1024; + Class23.canvasWidth = 1024; Unsorted.anInt2334 = 1024; Class106.anInt1442 = 0; LinkableRSString.anApplet_Sub1_2588 = this; @@ -466,8 +438,8 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene frame.toFront(); Insets var9 = frame.getInsets(); frame.setSize(var9.left + Unsorted.anInt2334 + var9.right, var9.top + Class70.anInt1047 + var9.bottom); - Class3_Sub13_Sub10.aClass87_3125 = Class38.aClass87_665 = new Signlink((Applet) null, 32 - -Class3_Sub13_Sub13.anInt3148, "runescape", 29); - Class64 var10 = Class38.aClass87_665.method1451(1, this); + Class3_Sub13_Sub10.aClass87_3125 = Class38.signlink = new Signlink((Applet) null, 32 - -Class3_Sub13_Sub13.paramModeWhat, "runescape", 29); + Class64 var10 = Class38.signlink.method1451(1, this); while (0 == Objects.requireNonNull(var10).anInt978) { TimeUtils.sleep(10L); @@ -476,7 +448,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene Class17.aThread409 = (Thread) var10.anObject974; ClientLoader.create().launch(); } catch (Exception var11) { - Class49.method1125((String) null, var11, (byte) 115); + Class49.reportError((String) null, var11, (byte) 115); } } catch (RuntimeException var12) { @@ -503,7 +475,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene if (LinkableRSString.anApplet_Sub1_2588 != null) { ++Class36.anInt639; if (Class36.anInt639 >= 3) { - this.method31("alreadyloaded"); + this.errorPrint("alreadyloaded"); return; } @@ -512,20 +484,19 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } LinkableRSString.anApplet_Sub1_2588 = this; Class106.anInt1442 = 0; - anInt4033 = 1530; - Class23.anInt454 = 765; + Class23.canvasWidth = 765; Unsorted.anInt2334 = 765; Class84.anInt1164 = 0; - Class140_Sub7.anInt2934 = 503; + Class140_Sub7.canvasHeight = 503; Class70.anInt1047 = 503; String var6 = this.getParameter("openwinjs"); InterfaceWidget.aBoolean3594 = var6 != null && var6.equals("1"); - if (null == Class38.aClass87_665) { - Class3_Sub13_Sub10.aClass87_3125 = Class38.aClass87_665 = new Signlink(this, var3, null, 0); + if (null == Class38.signlink) { + Class3_Sub13_Sub10.aClass87_3125 = Class38.signlink = new Signlink(this, var3, null, 0); } - Class64 var7 = Class38.aClass87_665.method1451(1, this); + Class64 var7 = Class38.signlink.method1451(1, this); while (Objects.requireNonNull(var7).anInt978 == 0) { TimeUtils.sleep(10L); @@ -533,8 +504,8 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene Class17.aThread409 = (Thread) var7.anObject974; } catch (Exception var8) { - Class49.method1125(null, var8, (byte) 113); - this.method31("crash"); + Class49.reportError(null, var8, (byte) 113); + this.errorPrint("crash"); } } catch (RuntimeException var9) { diff --git a/Client/src/main/java/org/runite/client/HDToolKit.java b/Client/src/main/java/org/runite/client/HDToolKit.java index 26f1e798e..fa71691ff 100644 --- a/Client/src/main/java/org/runite/client/HDToolKit.java +++ b/Client/src/main/java/org/runite/client/HDToolKit.java @@ -55,8 +55,7 @@ public final class HDToolKit { private static RSString method1820(String var0) { byte[] var1; var1 = var0.getBytes(StandardCharsets.ISO_8859_1); - - return Class3_Sub13_Sub3.method178(var1, var1.length, 0); + return Class3_Sub13_Sub3.bufferToString(var1, var1.length, 0); } static void method1821(int offsetX, int offsetY, int ratioWidth, int ratioHeight) { diff --git a/Client/src/main/java/org/runite/client/InterfaceWidget.java b/Client/src/main/java/org/runite/client/InterfaceWidget.java index 387ef3633..d02eb0a1b 100644 --- a/Client/src/main/java/org/runite/client/InterfaceWidget.java +++ b/Client/src/main/java/org/runite/client/InterfaceWidget.java @@ -212,7 +212,7 @@ final class InterfaceWidget extends Node { var8.writeInt((int)(Math.random() * 9.9999999E7D)); var8.writeString(var4); var8.writeInt((int)(Math.random() * 9.9999999E7D)); - var8.writeShort(Class3_Sub26.anInt2554); + var8.writeShort(Class3_Sub26.paramAffid); var8.writeByte(var0); var8.writeByte(var3); var8.writeInt((int)(Math.random() * 9.9999999E7D)); diff --git a/Client/src/main/java/org/runite/client/LinkableRSString.java b/Client/src/main/java/org/runite/client/LinkableRSString.java index a31d2fa1b..44dd3ec81 100644 --- a/Client/src/main/java/org/runite/client/LinkableRSString.java +++ b/Client/src/main/java/org/runite/client/LinkableRSString.java @@ -151,11 +151,11 @@ public final class LinkableRSString extends Linkable { static void method734(RSString var1) { try { - Class163_Sub2.aClass94_2996 = var1; - if (null != Class38.aClass87_665.applet) { + Class163_Sub2.paramSettings = var1; + if (null != Class38.signlink.gameApplet) { try { - RSString var2 = TextCore.aClass94_2044.getParamValue(Class38.aClass87_665.applet); - RSString var3 = TextCore.aClass94_1885.getParamValue(Class38.aClass87_665.applet); + RSString var2 = TextCore.aClass94_2044.getParamValue(Class38.signlink.gameApplet); + RSString var3 = TextCore.aClass94_1885.getParamValue(Class38.signlink.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}); @@ -163,7 +163,7 @@ public final class LinkableRSString extends Linkable { var4 = RSString.stringCombiner(new RSString[]{var4, TextCore.HasExpires, Class15.method894(94608000000L + TimeUtils.time()), TextCore.HasMaxAge, Class3_Sub28_Sub12.method612(94608000L)}); } - RSString.stringCombiner(new RSString[]{TextCore.aClass94_1694, var4, TextCore.aClass94_1698}).method1554(Class38.aClass87_665.applet); + RSString.stringCombiner(new RSString[]{TextCore.aClass94_1694, var4, TextCore.aClass94_1698}).method1554(Class38.signlink.gameApplet); } catch (Throwable var5) { } diff --git a/Client/src/main/java/org/runite/client/LoginHandler.java b/Client/src/main/java/org/runite/client/LoginHandler.java index 9b0f965fb..8719d0e31 100644 --- a/Client/src/main/java/org/runite/client/LoginHandler.java +++ b/Client/src/main/java/org/runite/client/LoginHandler.java @@ -41,7 +41,7 @@ class LoginHandler { ++Class166.anInt2079; } if(loginStage == 1) { - Class3_Sub9.aClass64_2318 = Class38.aClass87_665.method1441((byte)8, Class38_Sub1.accRegistryIp, GameConfig.SERVER_PORT + GameConfig.WORLD);//Class140_Sub6.accRegistryPort); + Class3_Sub9.aClass64_2318 = Class38.signlink.method1441((byte)8, Class38_Sub1.accRegistryIp, GameConfig.SERVER_PORT + GameConfig.WORLD);//Class140_Sub6.accRegistryPort); loginStage = 2; } @@ -54,7 +54,7 @@ class LoginHandler { return; } - Class3_Sub15.activeConnection = new Connection((Socket)Class3_Sub9.aClass64_2318.anObject974, Class38.aClass87_665); + Class3_Sub15.activeConnection = new Connection((Socket)Class3_Sub9.aClass64_2318.anObject974, Class38.signlink); Class3_Sub9.aClass64_2318 = null; long var1 = PacketParser.aLong3202 = Class131.username.toLong(); Class3_Sub13_Sub1.outgoingBuffer.index = 0; @@ -120,18 +120,18 @@ class LoginHandler { Unsorted.aClass3_Sub30_Sub1_2942.writeByte(16); } - Unsorted.aClass3_Sub30_Sub1_2942.writeShort(Class3_Sub13_Sub1.outgoingBuffer.index + 163 - -Class3_Sub13_Sub33.method326((byte)111, Class163_Sub2.aClass94_2996)); + Unsorted.aClass3_Sub30_Sub1_2942.writeShort(Class3_Sub13_Sub1.outgoingBuffer.index + 163 - -Class3_Sub13_Sub33.method326((byte)111, Class163_Sub2.paramSettings)); Unsorted.aClass3_Sub30_Sub1_2942.writeInt(GameConfig.CLIENT_BUILD); Unsorted.aClass3_Sub30_Sub1_2942.writeByte(Class7.anInt2161); - Unsorted.aClass3_Sub30_Sub1_2942.writeByte(!Client.aBoolean3779?0:1); + Unsorted.aClass3_Sub30_Sub1_2942.writeByte(!Client.paramAdvertisementSuppressed ?0:1); Unsorted.aClass3_Sub30_Sub1_2942.writeByte(1); Unsorted.aClass3_Sub30_Sub1_2942.writeByte(Class83.method1411(0)); - Unsorted.aClass3_Sub30_Sub1_2942.writeShort(Class23.anInt454); - Unsorted.aClass3_Sub30_Sub1_2942.writeShort(Class140_Sub7.anInt2934); + Unsorted.aClass3_Sub30_Sub1_2942.writeShort(Class23.canvasWidth); + Unsorted.aClass3_Sub30_Sub1_2942.writeShort(Class140_Sub7.canvasHeight); Unsorted.aClass3_Sub30_Sub1_2942.writeByte(Unsorted.anInt3671); Class81.putRandomDataFile(Unsorted.aClass3_Sub30_Sub1_2942, true); - Unsorted.aClass3_Sub30_Sub1_2942.writeString(Class163_Sub2.aClass94_2996); - Unsorted.aClass3_Sub30_Sub1_2942.writeInt(Class3_Sub26.anInt2554); + Unsorted.aClass3_Sub30_Sub1_2942.writeString(Class163_Sub2.paramSettings); + Unsorted.aClass3_Sub30_Sub1_2942.writeInt(Class3_Sub26.paramAffid); Unsorted.aClass3_Sub30_Sub1_2942.writeInt(Class84.method1421()); CS2Script.aBoolean2705 = true; Unsorted.aClass3_Sub30_Sub1_2942.writeShort(Class113.interfacePacketCounter); @@ -278,15 +278,15 @@ class LoginHandler { Unsorted.isMember = GraphicDefinition.incomingBuffer.readUnsignedByte() == 1; Class113.method1702(Unsorted.isMember); Class8.method845(Unsorted.isMember); - if(!Client.aBoolean3779) { + if(!Client.paramAdvertisementSuppressed) { if((!Class3_Sub15.aBoolean2433 || Unsorted.aBoolean4063) && !Class3_Sub13_Sub29.disableGEBoxes) { try { - TextCore.aClass94_516.method1577(Class38.aClass87_665.applet); + TextCore.aClass94_516.method1577(Class38.signlink.gameApplet); } catch (Throwable var5) { } } else { try { - Class97.aClass94_1374.method1577(Class38.aClass87_665.applet); + Class97.aClass94_1374.method1577(Class38.signlink.gameApplet); } catch (Throwable var6) { } } diff --git a/Client/src/main/java/org/runite/client/NPC.java b/Client/src/main/java/org/runite/client/NPC.java index a0794cecd..fb712dec3 100644 --- a/Client/src/main/java/org/runite/client/NPC.java +++ b/Client/src/main/java/org/runite/client/NPC.java @@ -285,7 +285,7 @@ final class NPC extends Class140_Sub4 { final int getRenderAnimationId() { try { - if(Class158.anInt2014 != 0 && this.definition.childNPCs != null) { + if(Class158.paramGameTypeID != 0 && this.definition.childNPCs != null) { NPCDefinition var2 = this.definition.method1471((byte)21); if(var2 != null && var2.renderAnimationId != -1) { return var2.renderAnimationId; diff --git a/Client/src/main/java/org/runite/client/ObjectDefinition.java b/Client/src/main/java/org/runite/client/ObjectDefinition.java index 13d5ae1ec..26abc6126 100644 --- a/Client/src/main/java/org/runite/client/ObjectDefinition.java +++ b/Client/src/main/java/org/runite/client/ObjectDefinition.java @@ -49,7 +49,7 @@ final class ObjectDefinition { private int anInt1511; int anInt1512; private byte[] aByteArray1513; - static int worldId = 1; + static int paramWorldID = 1; int anInt1515; int anInt1516; int anInt1517; diff --git a/Client/src/main/java/org/runite/client/PacketParser.java b/Client/src/main/java/org/runite/client/PacketParser.java index 9496cb2be..7972ab104 100644 --- a/Client/src/main/java/org/runite/client/PacketParser.java +++ b/Client/src/main/java/org/runite/client/PacketParser.java @@ -154,20 +154,20 @@ public final class PacketParser { } if (!isIgnored && inTutorialIsland == 0) { - Class3_Sub30_Sub1.addChatMessage(playerName, 10, TextCore.aClass94_3672, -1); + Class3_Sub30_Sub1.addChatMessage(playerName, 10, TextCore.emptyJagexString, -1); } } else if (message.endsWith(TextCore.HasClan)) { playerName = message.substring(0, message.indexOf(TextCore.HasClan, (byte) -83 ^ -50), 0); - Class3_Sub30_Sub1.addChatMessage(TextCore.aClass94_3672, 11, playerName, -1); + Class3_Sub30_Sub1.addChatMessage(TextCore.emptyJagexString, 11, playerName, -1); } else if (message.endsWith(TextCore.HasTrade)) { playerName = message.substring(0, message.indexOf(TextCore.HasTrade, 102), 0); if (0 == inTutorialIsland) { - Class3_Sub30_Sub1.addChatMessage(TextCore.aClass94_3672, 12, playerName, -1); + Class3_Sub30_Sub1.addChatMessage(TextCore.emptyJagexString, 12, playerName, -1); } } else if (message.endsWith(TextCore.HasAssist)) { playerName = message.substring(0, message.indexOf(TextCore.HasAssist, 121), 0); if (inTutorialIsland == 0) { - Class3_Sub30_Sub1.addChatMessage(TextCore.aClass94_3672, 13, playerName, -1); + Class3_Sub30_Sub1.addChatMessage(TextCore.emptyJagexString, 13, playerName, -1); } } else if (message.endsWith(TextCore.HasDuelStake)) { isIgnored = false; @@ -182,7 +182,7 @@ public final class PacketParser { } if (!isIgnored && inTutorialIsland == 0) { - Class3_Sub30_Sub1.addChatMessage(playerName, 14, TextCore.aClass94_3672, -1); + Class3_Sub30_Sub1.addChatMessage(playerName, 14, TextCore.emptyJagexString, -1); } } else if (message.endsWith(TextCore.HasDuelFriend)) { playerName = message.substring(0, message.indexOf(TextCore.char_colon, 118), 0); @@ -197,7 +197,7 @@ public final class PacketParser { } if (!isIgnored && 0 == inTutorialIsland) { - Class3_Sub30_Sub1.addChatMessage(playerName, 15, TextCore.aClass94_3672, -1); + Class3_Sub30_Sub1.addChatMessage(playerName, 15, TextCore.emptyJagexString, -1); } } else if (message.endsWith(TextCore.HasClanRequest)) { playerName = message.substring(0, message.indexOf(TextCore.char_colon, (byte) -83 + 138), 0); @@ -212,7 +212,7 @@ public final class PacketParser { } if (!isIgnored && inTutorialIsland == 0) { - Class3_Sub30_Sub1.addChatMessage(playerName, 16, TextCore.aClass94_3672, -1); + Class3_Sub30_Sub1.addChatMessage(playerName, 16, TextCore.emptyJagexString, -1); } } else if (message.endsWith(TextCore.HasAllyReq)) { playerName = message.substring(0, message.indexOf(TextCore.char_colon, (byte) -83 + 189), (byte) -83 + 83); @@ -231,7 +231,7 @@ public final class PacketParser { Class3_Sub30_Sub1.addChatMessage(playerName, 21, var41, -1); } } else { - Class3_Sub30_Sub1.addChatMessage(TextCore.aClass94_3672, 0, message, (byte) -83 + 82); + Class3_Sub30_Sub1.addChatMessage(TextCore.emptyJagexString, 0, message, (byte) -83 + 82); } Unsorted.incomingOpcode = -1; @@ -394,7 +394,7 @@ public final class PacketParser { } } else if (Unsorted.incomingOpcode == 164) { nodeModelId = GraphicDefinition.incomingBuffer.readIntV1(); - Class136.aClass64_1778 = Class38.aClass87_665.method1449((byte) -83 ^ -82, nodeModelId); + Class136.aClass64_1778 = Class38.signlink.method1449((byte) -83 ^ -82, nodeModelId); Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 225) { @@ -814,7 +814,7 @@ public final class PacketParser { isIgnored = false; } - var41 = TextCore.aClass94_3672; + var41 = TextCore.emptyJagexString; if (modelId > 0) { var41 = GraphicDefinition.incomingBuffer.readString(); } @@ -826,11 +826,11 @@ public final class PacketParser { if (Unsorted.anIntArray882[var33] != modelId) { Unsorted.anIntArray882[var33] = modelId; if (0 < modelId) { - Class3_Sub30_Sub1.addChatMessage(TextCore.aClass94_3672, 5, RSString.stringCombiner(new RSString[]{var46, TextCore.HasLoggedIn}), -1); + Class3_Sub30_Sub1.addChatMessage(TextCore.emptyJagexString, 5, RSString.stringCombiner(new RSString[]{var46, TextCore.HasLoggedIn}), -1); } if (modelId == 0) { - Class3_Sub30_Sub1.addChatMessage(TextCore.aClass94_3672, 5, RSString.stringCombiner(new RSString[]{var46, TextCore.HasLoggedOut}), -1); + Class3_Sub30_Sub1.addChatMessage(TextCore.emptyJagexString, 5, RSString.stringCombiner(new RSString[]{var46, TextCore.HasLoggedOut}), -1); } } @@ -1037,7 +1037,7 @@ public final class PacketParser { Class140_Sub6.anInt2905 = anInt3213; return true; } else if (Unsorted.incomingOpcode == 114) { - Class3_Sub13_Sub29.method305(Class38.aClass87_665, GraphicDefinition.incomingBuffer, Unsorted.incomingPacketLength); + Class3_Sub13_Sub29.method305(Class38.signlink, GraphicDefinition.incomingBuffer, Unsorted.incomingPacketLength); Unsorted.incomingOpcode = -1; return true; } else if (65 == Unsorted.incomingOpcode) { @@ -1098,13 +1098,13 @@ public final class PacketParser { byte[] var22 = new byte[Unsorted.incomingPacketLength]; GraphicDefinition.incomingBuffer.method811((byte) 30, 0, var22, Unsorted.incomingPacketLength); - playerName = Class3_Sub13_Sub3.method178(var22, Unsorted.incomingPacketLength, 0); - if (null == GameShell.frame && (3 == Signlink.anInt1214 || !Signlink.osName.startsWith("win") || Class106.hasInternetExplorer6)) { + playerName = Class3_Sub13_Sub3.bufferToString(var22, Unsorted.incomingPacketLength, 0); + if (null == GameShell.frame && (3 == Signlink.anInt1214 || !Signlink.osName.startsWith("win") || Class106.paramUserUsingInternetExplorer)) { Class99.method1596(playerName, (byte) 127, true); } else { Class3_Sub13_Sub24.aClass94_3295 = playerName; Unsorted.aBoolean2154 = true; - Class15.aClass64_351 = Class38.aClass87_665.method1452(new String(playerName.method1568(), StandardCharsets.ISO_8859_1), true); + Class15.aClass64_351 = Class38.signlink.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.method1125("T1 - " + Unsorted.incomingOpcode + "," + Class7.anInt2166 + "," + Class24.anInt469 + " - " + Unsorted.incomingPacketLength, null, (byte) 117); + Class49.reportError("T1 - " + Unsorted.incomingOpcode + "," + Class7.anInt2166 + "," + Class24.anInt469 + " - " + Unsorted.incomingPacketLength, null, (byte) 117); Class167.method2269((byte) 46); return true; } diff --git a/Client/src/main/java/org/runite/client/Player.java b/Client/src/main/java/org/runite/client/Player.java index 805a8fa3f..85f47fbed 100644 --- a/Client/src/main/java/org/runite/client/Player.java +++ b/Client/src/main/java/org/runite/client/Player.java @@ -226,12 +226,12 @@ final class Player extends Class140_Sub4 { SequenceDefinition var14 = this.anInt2764 != -1 && !this.aBoolean3968 && (this.method1965().anInt368 != this.anInt2764 || var13 == null)? SequenceDefinition.getAnimationDefinition(this.anInt2764):null; Model var15 = this.class52.method1165(this.aClass145Array2809, this.anInt2776, var14, var13, this.anInt2802, this.anInt2793, -120, this.anInt2760, this.anInt2832, this.anInt2813); int var16 = Unsorted.method1727((byte)123); - if(HDToolKit.highDetail && Class3_Sub24_Sub3.anInt3492 < 96 && var16 > 50) { + if(HDToolKit.highDetail && Class3_Sub24_Sub3.maxClientMemory < 96 && var16 > 50) { Class3_Sub1.method90(1); } int var17; - if(0 != Class3_Sub13_Sub13.anInt3148 && var16 < 50) { + if(0 != Class3_Sub13_Sub13.paramModeWhat && var16 < 50) { for(var17 = 50 - var16; Class56.anInt893 < var17; ++Class56.anInt893) { Class3_Sub6.aByteArrayArray2287[Class56.anInt893] = new byte[102400]; } diff --git a/Client/src/main/java/org/runite/client/RSInterface.java b/Client/src/main/java/org/runite/client/RSInterface.java index ca6f38346..730490683 100644 --- a/Client/src/main/java/org/runite/client/RSInterface.java +++ b/Client/src/main/java/org/runite/client/RSInterface.java @@ -2,6 +2,7 @@ package org.runite.client; public final class RSInterface { + static boolean aBoolean6 = false; boolean hidden = false; Object[] anObjectArray156; boolean aBoolean157; @@ -246,16 +247,16 @@ public final class RSInterface { try { RSString var1 = TextCore.aClass94_4052; - RSString var2 = TextCore.aClass94_3672; - if (Class44.anInt718 != 0) { + RSString var2 = TextCore.emptyJagexString; + if (Class44.paramModeWhere != 0) { var1 = RSString.parse("www)2wtqa"); } - if (null != Class163_Sub2.aClass94_2996) { - var2 = RSString.stringCombiner(new RSString[]{TextCore.aClass94_3637, Class163_Sub2.aClass94_2996}); + if (null != Class163_Sub2.paramSettings) { + var2 = RSString.stringCombiner(new RSString[]{TextCore.aClass94_3637, Class163_Sub2.paramSettings}); } - return RSString.stringCombiner(new RSString[]{TextCore.aClass94_577, var1, TextCore.aClass94_3601, RSString.stringAnimator(Class3_Sub20.language), TextCore.aClass94_1932, RSString.stringAnimator(Class3_Sub26.anInt2554), var2, TextCore.aClass94_2735}); + return RSString.stringCombiner(new RSString[]{TextCore.aClass94_577, var1, TextCore.aClass94_3601, RSString.stringAnimator(Class3_Sub20.paramLanguage), TextCore.aClass94_1932, RSString.stringAnimator(Class3_Sub26.paramAffid), var2, TextCore.aClass94_2735}); } catch (RuntimeException var3) { throw ClientErrorException.clientError(var3, "be.N(" + true + ')'); } @@ -541,7 +542,7 @@ public final class RSInterface { final AbstractSprite method859(int var2) { try { - GameShell.aBoolean6 = false; + aBoolean6 = false; if (var2 >= 0 && var2 < this.anIntArray197.length) { int var3 = this.anIntArray197[var2]; if (var3 == -1) { @@ -551,7 +552,7 @@ public final class RSInterface { if (var4 == null) { var4 = Unsorted.method602(var3, Class12.aClass153_323); if (null == var4) { - GameShell.aBoolean6 = true; + aBoolean6 = true; } else { Class114.aReferenceCache_1569.put(var4, (long) var3); } @@ -631,7 +632,7 @@ public final class RSInterface { final Model method865(int var1, SequenceDefinition var2, int var3, int var4, int var5, boolean var6, Class52 var7) { try { - GameShell.aBoolean6 = false; + aBoolean6 = false; int var8; int var9; if (var6) { @@ -655,7 +656,7 @@ public final class RSInterface { if (var10 == null) { Model_Sub1 var18 = Model_Sub1.method2015(Class119.aClass153_1628, var9); if (var18 == null) { - GameShell.aBoolean6 = true; + aBoolean6 = true; return null; } @@ -671,7 +672,7 @@ public final class RSInterface { } else if (var8 == 2) { var10 = NPCDefinition.getNPCDefinition(var9).getChatModel(var2, var5, var1, 27, var3); if (null == var10) { - GameShell.aBoolean6 = true; + aBoolean6 = true; return null; } else { return var10; @@ -681,7 +682,7 @@ public final class RSInterface { ItemDefinition var16 = ItemDefinition.getItemDefinition(var9); Model var17 = var16.method1110(var1, var5, var2, 10, var3); if (var17 == null) { - GameShell.aBoolean6 = true; + aBoolean6 = true; return null; } else { return var17; @@ -689,7 +690,7 @@ public final class RSInterface { } else if (var8 == 6) { var10 = NPCDefinition.getNPCDefinition(var9).method1476((Class145[]) null, 0, (byte) -120, 0, var1, var5, var3, (SequenceDefinition) null, 0, var2); if (null == var10) { - GameShell.aBoolean6 = true; + aBoolean6 = true; return null; } else { return var10; @@ -704,7 +705,7 @@ public final class RSInterface { int var12 = this.anInt265; Model var13 = var7.method1157(var1, var12, var15, var5, var2, var3, var11); if (var13 == null) { - GameShell.aBoolean6 = true; + aBoolean6 = true; return null; } else { return var13; @@ -715,7 +716,7 @@ public final class RSInterface { } else { var10 = var7.method1167(var5, var2, var3, var1); if (null == var10) { - GameShell.aBoolean6 = true; + aBoolean6 = true; return null; } else { return var10; @@ -729,7 +730,7 @@ public final class RSInterface { final AbstractSprite method866(boolean var2) { try { - GameShell.aBoolean6 = false; + aBoolean6 = false; int archiveId; if (var2) { archiveId = this.anInt296; @@ -750,7 +751,7 @@ public final class RSInterface { } if (null == var7) { - GameShell.aBoolean6 = true; + aBoolean6 = true; return null; } else { if (this.aBoolean178) { @@ -1007,7 +1008,7 @@ public final class RSInterface { final Class3_Sub28_Sub17 method868(AbstractIndexedSprite[] var1) { try { - GameShell.aBoolean6 = false; + aBoolean6 = false; if (this.anInt270 == -1) { return null; } else { @@ -1015,7 +1016,7 @@ public final class RSInterface { if (null == var3) { var3 = Unsorted.method1300(this.anInt270, Class12.aClass153_323, Class97.aClass153_1378); if (null == var3) { - GameShell.aBoolean6 = true; + aBoolean6 = true; } else { var3.method697(var1, null); Unsorted.aReferenceCache_743.put(var3, this.anInt270); diff --git a/Client/src/main/java/org/runite/client/Signlink.java b/Client/src/main/java/org/runite/client/Signlink.java index 202e35e2b..ded1b75f5 100644 --- a/Client/src/main/java/org/runite/client/Signlink.java +++ b/Client/src/main/java/org/runite/client/Signlink.java @@ -37,7 +37,7 @@ public class Signlink implements Runnable { public static String javaVendor; private Interface1 anInterface1_1217; public static String osArchitecture; - public Applet applet; + public Applet gameApplet; public static Method setFocusCycleRoot; static volatile long aLong1221 = 0L; public static Method setTraversalKeysEnabled; @@ -90,7 +90,7 @@ public class Signlink implements Runnable { public final Class64 method1436(Frame var1, int var2) { if (var2 <= 78) { - this.applet = null; + this.gameApplet = null; } return this.method1435(7, 0, var1, 0); @@ -538,7 +538,7 @@ public class Signlink implements Runnable { javaVersion = "1.1"; this.gameName = gameName; this.anInt1215 = var2; - this.applet = applet; + this.gameApplet = applet; javaVendor = "Unknown"; try { diff --git a/Client/src/main/java/org/runite/client/TextCore.java b/Client/src/main/java/org/runite/client/TextCore.java index 51eed44f9..99acacfe4 100644 --- a/Client/src/main/java/org/runite/client/TextCore.java +++ b/Client/src/main/java/org/runite/client/TextCore.java @@ -284,7 +284,7 @@ public class TextCore { static RSString worldmapOverlay2 = RSString.parse("overlay2"); static RSString aClass94_3133 = RSString.parse(")2"); static RSString aClass94_422 = RSString.parse("loc"); - static RSString aClass94_3672 = RSString.parse(""); + static RSString emptyJagexString = RSString.parse(""); static RSString clientDebugNotifier = RSString.parse("Client debug notifier"); static RSString aClass94_3209 = RSString.parse("showingVideoAd"); static RSString aClass94_592 = RSString.parse(""); diff --git a/Client/src/main/java/org/runite/client/Unsorted.java b/Client/src/main/java/org/runite/client/Unsorted.java index 0dc980163..3beb800ff 100644 --- a/Client/src/main/java/org/runite/client/Unsorted.java +++ b/Client/src/main/java/org/runite/client/Unsorted.java @@ -122,7 +122,7 @@ public class Unsorted { public static Class61 aClass61_2468 = new Class61(); public static int[] anIntArray2469; public static int[] anIntArray2470 = new int[]{0, 0, 2, 0, 0, 2, 1, 1, 0}; - public static boolean aBoolean3641 = false; + public static boolean paramJavaScriptEnabled = false; public static int anInt3642 = 0; public static int anInt3644 = 0; public static int anInt59 = 0; @@ -167,6 +167,7 @@ public class Unsorted { static byte[][][] aByteArrayArrayArray1774; static int[][] anIntArrayArray2039 = new int[][]{{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}, {12, 8, 4, 0, 13, 9, 5, 1, 14, 10, 6, 2, 15, 11, 7, 3}, {15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0}, {3, 7, 11, 15, 2, 6, 10, 14, 1, 5, 9, 13, 0, 4, 8, 12}}; static int menuOptionCount = 0; + static boolean aBoolean11 = false; static void method2086() { @@ -1151,12 +1152,8 @@ public class Unsorted { } } - public static void method87(int var0, int var1) { + public static void languageSetter(int var1) { try { - if (var0 >= -20) { - method83((byte) 44); - } - if (0 != var1) { if (var1 == 1) { Translation.englishToGerman(); @@ -1170,7 +1167,7 @@ public class Unsorted { } } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "ab.K(" + var0 + ',' + var1 + ')'); + throw ClientErrorException.clientError(var3, "ab.K(" + ',' + var1 + ')'); } } @@ -1178,7 +1175,7 @@ public class Unsorted { try { if (Class56.aClass106Array890 == null) { - Class106[] var1 = method596(Class38.aClass87_665); + Class106[] var1 = method596(Class38.signlink); Class106[] var2 = new Class106[var1.length]; int var3 = 0; @@ -1393,15 +1390,15 @@ public class Unsorted { try { int var2 = Class106.anInt1442; int var1 = Class84.anInt1164; - int var4 = -Class140_Sub7.anInt2934 + (Class70.anInt1047 - var2); - int var3 = -var1 + anInt2334 - Class23.anInt454; + int var4 = -Class140_Sub7.canvasHeight + (Class70.anInt1047 - var2); + int var3 = -var1 + anInt2334 - Class23.canvasWidth; if (~var1 < var0 || var3 > 0 || var2 > 0 || var4 > 0) { try { Object var5; if (null != Class3_Sub13_Sub10.aFrame3121) { var5 = Class3_Sub13_Sub10.aFrame3121; } else if (GameShell.frame == null) { - var5 = Class38.aClass87_665.applet; + var5 = Class38.signlink.gameApplet; } else { var5 = GameShell.frame; } @@ -1581,16 +1578,16 @@ public class Unsorted { } if (null != Class3_Sub13_Sub10.aFrame3121 && (3 != var1 || Class3_Sub13.anInt2378 != var5 || anInt3071 != var6)) { - method593(Class3_Sub13_Sub10.aFrame3121, Class38.aClass87_665); + method593(Class3_Sub13_Sub10.aFrame3121, Class38.signlink); Class3_Sub13_Sub10.aFrame3121 = null; } if (3 == var1 && null == Class3_Sub13_Sub10.aFrame3121) { - Class3_Sub13_Sub10.aFrame3121 = Class99.method1597(0, var6, var5, Class38.aClass87_665); + Class3_Sub13_Sub10.aFrame3121 = Class99.method1597(0, var6, var5, Class38.signlink); if (null != Class3_Sub13_Sub10.aFrame3121) { anInt3071 = var6; Class3_Sub13.anInt2378 = var5; - Class119.method1730(Class38.aClass87_665); + Class119.method1730(Class38.signlink); } } @@ -1600,7 +1597,7 @@ public class Unsorted { Object var7; if (null == Class3_Sub13_Sub10.aFrame3121) { if (null == GameShell.frame) { - var7 = Class38.aClass87_665.applet; + var7 = Class38.signlink.gameApplet; } else { var7 = GameShell.frame; } @@ -1618,15 +1615,15 @@ public class Unsorted { } if (var1 >= 2) { - Class23.anInt454 = anInt2334; - Class140_Sub7.anInt2934 = Class70.anInt1047; + Class23.canvasWidth = anInt2334; + Class140_Sub7.canvasHeight = Class70.anInt1047; Class84.anInt1164 = 0; Class106.anInt1442 = 0; } else { Class106.anInt1442 = 0; Class84.anInt1164 = (anInt2334 + -765) / 2; - Class23.anInt454 = 765; - Class140_Sub7.anInt2934 = 503; + Class23.canvasWidth = 765; + Class140_Sub7.canvasHeight = 503; } if (var0) { @@ -1636,7 +1633,7 @@ public class Unsorted { Class38.aClass146_668.method2082(GameShell.canvas); } - Class126.aClient1671.method30((byte) 97); + Client.clientInstance.addCanvas(); Class3_Sub13_Sub4.method193((byte) 97, GameShell.canvas); ItemDefinition.method1119(GameShell.canvas, var4); if (Class38.aClass146_668 != null) { @@ -1644,10 +1641,10 @@ public class Unsorted { } } else { if (HDToolKit.highDetail) { - HDToolKit.method1854(Class23.anInt454, Class140_Sub7.anInt2934); + HDToolKit.method1854(Class23.canvasWidth, Class140_Sub7.canvasHeight); } - GameShell.canvas.setSize(Class23.anInt454, Class140_Sub7.anInt2934); + GameShell.canvas.setSize(Class23.canvasWidth, Class140_Sub7.canvasHeight); if (GameShell.frame == var7) { var8 = GameShell.frame.getInsets(); GameShell.canvas.setLocation(var8.left - -Class84.anInt1164, var8.top + Class106.anInt1442); @@ -1663,10 +1660,10 @@ public class Unsorted { if (var2 && var1 > 0) { GameShell.canvas.setIgnoreRepaint(true); - if (!GameShell.aBoolean11) { + if (!aBoolean11) { Class32.method995(); Class164_Sub1.aClass158_3009 = null; - Class164_Sub1.aClass158_3009 = Class3_Sub13_Sub23_Sub1.method285(Class140_Sub7.anInt2934, Class23.anInt454, GameShell.canvas); + Class164_Sub1.aClass158_3009 = Class3_Sub13_Sub23_Sub1.method285(Class140_Sub7.canvasHeight, Class23.canvasWidth, GameShell.canvas); Class74.method1320(); if (5 == Class143.loadingStage) { Class3_Sub23.method406((byte) 122, true, Class168.aClass3_Sub28_Sub17_2096); @@ -1687,18 +1684,18 @@ public class Unsorted { Class164_Sub1.aClass158_3009 = null; } - Class64 var13 = Class38.aClass87_665.method1444(-43, Class126.aClient1671.getClass()); + Class64 var13 = Class38.signlink.method1444(-43, Client.clientInstance.getClass()); while (var13.anInt978 == 0) { TimeUtils.sleep(100L); } if (1 == var13.anInt978) { - GameShell.aBoolean11 = true; + aBoolean11 = true; } } - if (GameShell.aBoolean11) { + if (aBoolean11) { HDToolKit.method1853(GameShell.canvas, 2 * anInt3671); } } @@ -2488,13 +2485,13 @@ public class Unsorted { return var1; } - RSString var4 = TextCore.aClass94_3672; + RSString var4 = TextCore.emptyJagexString; if (null != Class136.aClass64_1778) { var4 = Class108.method1653(Class136.aClass64_1778.anInt979); if (null != Class136.aClass64_1778.anObject974) { byte[] var5 = ((String) Class136.aClass64_1778.anObject974).getBytes(StandardCharsets.ISO_8859_1); - var4 = Class3_Sub13_Sub3.method178(var5, var5.length, 0); + var4 = Class3_Sub13_Sub3.bufferToString(var5, var5.length, 0); } } @@ -2587,7 +2584,7 @@ public class Unsorted { if (var0.aBoolean1270) { RSString var5 = var0.NPCName; if (0 != var0.anInt1260) { - RSString var6 = Class158.anInt2014 != 1 ? TextCore.HasLevel : TextCore.HasRating; + RSString var6 = Class158.paramGameTypeID != 1 ? TextCore.HasLevel : TextCore.HasRating; var5 = RSString.stringCombiner(new RSString[]{var5, Player.combatLevelColor(var0.anInt1260, (byte) -122, Class102.player.COMBAT_LEVEL), TextCore.LEFT_PARENTHESES, var6, RSString.stringAnimator(var0.anInt1260), TextCore.RIGHT_PARENTHESES}); } @@ -2607,7 +2604,7 @@ public class Unsorted { int var7; if (var11 != null) { for (var7 = 4; var7 >= 0; --var7) { - if (var11[var7] != null && (Class158.anInt2014 != 0 || !var11[var7].equalsStringIgnoreCase(TextCore.HasAttack))) { + if (var11[var7] != null && (Class158.paramGameTypeID != 0 || !var11[var7].equalsStringIgnoreCase(TextCore.HasAttack))) { byte var8 = 0; if (var7 == 0) { var8 = 17; @@ -2643,7 +2640,7 @@ public class Unsorted { } } - if (0 == Class158.anInt2014 && var11 != null) { + if (0 == Class158.paramGameTypeID && var11 != null) { for (var7 = 4; var7 >= 0; --var7) { if (null != var11[var7] && var11[var7].equalsStringIgnoreCase(TextCore.HasAttack)) { short var14 = 0; @@ -3765,9 +3762,9 @@ public class Unsorted { public static boolean method1088(boolean var0) { try { - if (aBoolean3641) { + if (paramJavaScriptEnabled) { try { - TextCore.aClass94_106.method1577(Class38.aClass87_665.applet); + TextCore.aClass94_106.method1577(Class38.signlink.gameApplet); return true; } catch (Throwable var2) { } @@ -4057,11 +4054,11 @@ public class Unsorted { continue; } - if (Class158.anInt2014 == 1) { - Class3_Sub24_Sub4.method1177(-1, 1L, (byte) -41, TextCore.aClass94_3672, var28, (short) 36, TextCore.HasFaceHere, var29); + if (Class158.paramGameTypeID == 1) { + Class3_Sub24_Sub4.method1177(-1, 1L, (byte) -41, TextCore.emptyJagexString, var28, (short) 36, TextCore.HasFaceHere, var29); } - Class3_Sub24_Sub4.method1177(-1, 1L, (byte) -125, TextCore.aClass94_3672, var28, (short) 60, Class3_Sub13_Sub28.aClass94_3353, var29); + Class3_Sub24_Sub4.method1177(-1, 1L, (byte) -125, TextCore.emptyJagexString, var28, (short) 60, Class3_Sub13_Sub28.aClass94_3353, var29); continue; } @@ -4210,7 +4207,7 @@ public class Unsorted { menuOptionCount = 1; Class114.anIntArray1578[0] = Class3_Sub28_Sub5.anInt3590; Class140_Sub7.aClass94Array2935[0] = TextCore.HasCancel; - Class163_Sub2_Sub1.aClass94Array4016[0] = TextCore.aClass94_3672; + Class163_Sub2_Sub1.aClass94Array4016[0] = TextCore.emptyJagexString; Class3_Sub13_Sub7.aShortArray3095[0] = 1005; } @@ -4246,7 +4243,7 @@ public class Unsorted { menuOptionCount = 1; Class114.anIntArray1578[0] = Class3_Sub28_Sub5.anInt3590; Class3_Sub13_Sub7.aShortArray3095[0] = 1005; - Class163_Sub2_Sub1.aClass94Array4016[0] = TextCore.aClass94_3672; + Class163_Sub2_Sub1.aClass94Array4016[0] = TextCore.emptyJagexString; } Class3_Sub13_Sub1.method171(-101, var36.anInt2602, var16, var18, var13, var12, var19, var17, var14); @@ -4284,7 +4281,7 @@ public class Unsorted { if (null != var11.anIntArray197 && var20 < 20) { AbstractSprite var58 = var11.method859(var20); if (null == var58) { - if (GameShell.aBoolean6) { + if (RSInterface.aBoolean6) { Class20.method909(var11); } } else { @@ -4487,7 +4484,7 @@ public class Unsorted { } var34.method676(var45, var13, var14, var11.width, var11.height, var21, !var11.aBoolean215 ? -1 : 0, var11.anInt194, var11.anInt225, var11.anInt205); - } else if (GameShell.aBoolean6) { + } else if (RSInterface.aBoolean6) { Class20.method909(var11); } } else if (5 == var11.type) { @@ -4500,7 +4497,7 @@ public class Unsorted { } if (var37 == null) { - if (GameShell.aBoolean6) { + if (RSInterface.aBoolean6) { Class20.method909(var11); } } else { @@ -4587,7 +4584,7 @@ public class Unsorted { var37 = var11.method866(Class3_Sub28_Sub12.method609(var11, 69)); if (null != var37) { var37.drawAt(var13, var14); - } else if (GameShell.aBoolean6) { + } else if (RSInterface.aBoolean6) { Class20.method909(var11); } } @@ -4616,13 +4613,13 @@ public class Unsorted { } else if (5 != var11.modelType) { if (var21 == -1) { var38 = var11.method865(-1, (SequenceDefinition) null, -1, 126, 0, var41, Class102.player.class52); - if (null == var38 && GameShell.aBoolean6) { + if (null == var38 && RSInterface.aBoolean6) { Class20.method909(var11); } } else { SequenceDefinition var48 = SequenceDefinition.getAnimationDefinition(var21); var38 = var11.method865(var11.anInt260, var48, var11.anInt283, 127, var11.anInt267, var41, Class102.player.class52); - if (null == var38 && GameShell.aBoolean6) { + if (null == var38 && RSInterface.aBoolean6) { Class20.method909(var11); } } @@ -4709,7 +4706,7 @@ public class Unsorted { if (var11.type == 7) { var34 = var11.method868(Class3_Sub13_Sub22.nameIconsSpriteArray); if (var34 == null) { - if (GameShell.aBoolean6) { + if (RSInterface.aBoolean6) { Class20.method909(var11); } continue; @@ -4760,7 +4757,7 @@ public class Unsorted { var25 = var43.indexOf(TextCore.aClass94_2598, 62); if (var25 == -1) { var44 = var43; - var43 = TextCore.aClass94_3672; + var43 = TextCore.emptyJagexString; } else { var44 = var43.substring(0, var25, 0); var43 = var43.substring(var25 + 4); @@ -4799,7 +4796,7 @@ public class Unsorted { var28 = var43.indexOf(TextCore.aClass94_2598, 86); if (var28 == -1) { var44 = var43; - var43 = TextCore.aClass94_3672; + var43 = TextCore.emptyJagexString; } else { var44 = var43.substring(0, var28, 0); var43 = var43.substring(4 + var28); @@ -5030,7 +5027,7 @@ public class Unsorted { anInt3671 = 0; RandomAccessFileWrapper var2 = null; CS2Script.anInt2453 = 127; - if(Class3_Sub24_Sub3.anInt3492 >= 96) { + if(Class3_Sub24_Sub3.maxClientMemory >= 96) { Class127_Sub1.method1758(2); } else { Class127_Sub1.method1758(0); diff --git a/Client/src/main/java/org/runite/client/WaterfallShader.java b/Client/src/main/java/org/runite/client/WaterfallShader.java index 96e03dbc1..8048ecd91 100644 --- a/Client/src/main/java/org/runite/client/WaterfallShader.java +++ b/Client/src/main/java/org/runite/client/WaterfallShader.java @@ -12,7 +12,8 @@ final class WaterfallShader implements ShaderInterface { static boolean[] aBooleanArray2169 = new boolean[5]; static CacheIndex aClass153_2172; static int waterfallTextureId = -1; - private int listId; + static RSString aClass94_8 = RSString.parse(""); + private int listId; private final float[] aFloatArray2174 = new float[4]; private static RSString aClass94_2175 = RSString.parse(")4a="); @@ -34,23 +35,23 @@ 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.anInt718 != 2) { - RSString var9 = GameShell.aClass94_8; - if (Class44.anInt718 != 0) { + } else if (1 != Signlink.anInt1214 && 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)}); } if (var1 > -2) { return false; } else { - RSString var4 = GameShell.aClass94_8; - if (Class163_Sub2.aClass94_2996 != null) { - var4 = RSString.stringCombiner(new RSString[]{Class97.aClass94_1380, Class163_Sub2.aClass94_2996}); + RSString var4 = aClass94_8; + if (Class163_Sub2.paramSettings != null) { + var4 = RSString.stringCombiner(new RSString[]{Class97.aClass94_1380, Class163_Sub2.paramSettings}); } - RSString var5 = RSString.stringCombiner(new RSString[]{RSString.parse("http:)4)4"), var2.address, var9, TextCore.aClass94_2608, RSString.stringAnimator(Class3_Sub20.language), aClass94_2175, RSString.stringAnimator(Class3_Sub26.anInt2554), var4, TextCore.aClass94_1133, !Unsorted.aBoolean3641 ? TextCore.aClass94_3013 : TextCore.aClass94_339, TextCore.aClass94_2610, !Class163_Sub2_Sub1.aBoolean4018 ? TextCore.aClass94_3013 : TextCore.aClass94_339, TextCore.aClass94_1617, Client.aBoolean3779 ? TextCore.aClass94_339 : TextCore.aClass94_3013}); + RSString var5 = RSString.stringCombiner(new RSString[]{RSString.parse("http:)4)4"), var2.address, var9, TextCore.aClass94_2608, RSString.stringAnimator(Class3_Sub20.paramLanguage), aClass94_2175, RSString.stringAnimator(Class3_Sub26.paramAffid), var4, TextCore.aClass94_1133, !Unsorted.paramJavaScriptEnabled ? TextCore.aClass94_3013 : TextCore.aClass94_339, TextCore.aClass94_2610, !Class163_Sub2_Sub1.paramObjectTagEnabled ? TextCore.aClass94_3013 : TextCore.aClass94_339, TextCore.aClass94_1617, Client.paramAdvertisementSuppressed ? TextCore.aClass94_339 : TextCore.aClass94_3013}); try { - Objects.requireNonNull(Class126.aClient1671.getAppletContext()).showDocument(var5.toURL(), "_self"); + Objects.requireNonNull(Client.clientInstance.getAppletContext()).showDocument(var5.toURL(), "_self"); } catch (Exception var7) { return false; } @@ -64,7 +65,7 @@ final class WaterfallShader implements ShaderInterface { var2.address.method1568(); Class38_Sub1.accRegistryIp = GameConfig.IP_MANAGEMENT; CS2Script.anInt2451 = var2.worldId; - if (Class44.anInt718 != 0) { + if (Class44.paramModeWhere != 0) { Class162.anInt2036 = '\u9c40' + CS2Script.anInt2451; Class140_Sub6.accRegistryPort = Class162.anInt2036; Client.currentPort = CS2Script.anInt2451 + '\uc350'; diff --git a/Client/src/main/kotlin/org/rs09/client/console/DeveloperConsole.kt b/Client/src/main/kotlin/org/rs09/client/console/DeveloperConsole.kt index bcd4e398e..5bb1990bb 100644 --- a/Client/src/main/kotlin/org/rs09/client/console/DeveloperConsole.kt +++ b/Client/src/main/kotlin/org/rs09/client/console/DeveloperConsole.kt @@ -51,7 +51,7 @@ object DeveloperConsole { tk.fillRect(0, 0, RenderingUtils.width, HEIGHT, BACKGROUND_COLOR, 128) tk.drawHorizontalLine(0, HEIGHT - 14 - 2, RenderingUtils.width, -1) RenderingUtils.drawText(GameConfig.CLIENT_BUILD.toString(), RenderingUtils.width - 27, HEIGHT - 2, -1) - RenderingUtils.drawText("-> $str", 3, HEIGHT - 2, -1) + RenderingUtils.drawText("--> $str", 3, HEIGHT - 2, -1) RenderingUtils.setClipping(0, 0, RenderingUtils.width, HEIGHT - 16) synchronized(LOCK) { diff --git a/Client/src/main/kotlin/org/rs09/client/rendering/RenderingUtils.kt b/Client/src/main/kotlin/org/rs09/client/rendering/RenderingUtils.kt index 86cffcca3..56ccf1281 100644 --- a/Client/src/main/kotlin/org/rs09/client/rendering/RenderingUtils.kt +++ b/Client/src/main/kotlin/org/rs09/client/rendering/RenderingUtils.kt @@ -14,11 +14,11 @@ object RenderingUtils { // TODO Is this actually the width? val width: Int - get() = Class23.anInt454 + get() = Class23.canvasWidth // TODO Is this actually the height? val height: Int - get() = Class140_Sub7.anInt2934 + get() = Class140_Sub7.canvasHeight @JvmStatic @Deprecated("Please use the Toolkit methods instead of this delegating method", ReplaceWith("Toolkit.getActiveToolkit().fillRect(x, y, w, h, rgb, alpha)"))