diff --git a/Client/src/main/java/org/runite/client/CS2Script.java b/Client/src/main/java/org/runite/client/CS2Script.java index c5cd28611..9e2f97ece 100644 --- a/Client/src/main/java/org/runite/client/CS2Script.java +++ b/Client/src/main/java/org/runite/client/CS2Script.java @@ -1656,7 +1656,7 @@ public final class CS2Script extends Linkable { int j24 = ItemDefinition.intsStack[--iStackCounter]; int k55 = -1; if (j24 < 100 && null != LinkableRSString.aClass94Array2580[j24]) - k55 = ConfigInventoryDefinition.anIntArray3082[j24]; + k55 = MessageManager.anIntArray3082[j24]; ItemDefinition.intsStack[iStackCounter++] = k55; continue; } @@ -1807,7 +1807,7 @@ public final class CS2Script extends Linkable { int k24 = ItemDefinition.intsStack[--iStackCounter]; RSString class94_49 = null; if (k24 < 100) - class94_49 = ConfigInventoryDefinition.aClass94Array3226[k24]; + class94_49 = MessageManager.aClass94Array3226[k24]; if (null == class94_49) class94_49 = TextCore.aClass94_2331; ItemDefinition.stringsStack[sStackCounter++] = class94_49; @@ -1827,7 +1827,7 @@ public final class CS2Script extends Linkable { int i25 = ItemDefinition.intsStack[--iStackCounter]; int l55 = -1; if (i25 < 100) - l55 = ConfigInventoryDefinition.anIntArray1835[i25]; + l55 = MessageManager.anIntArray1835[i25]; ItemDefinition.intsStack[iStackCounter++] = l55; continue; } @@ -2226,11 +2226,11 @@ public final class CS2Script extends Linkable { int i59 = ItemDefinition.intsStack[1 + iStackCounter]; int l31 = ItemDefinition.intsStack[iStackCounter]; GameObject.graphicsSettings(false, 3, l31, i59); - ItemDefinition.intsStack[iStackCounter++] = null != TextureOperation30.aFrame3121 ? 1 : 0; + ItemDefinition.intsStack[iStackCounter++] = null != TextureOperation30.fullScreenFrame ? 1 : 0; continue; } if (opcode == 5301) { - if (null != TextureOperation30.aFrame3121) + if (null != TextureOperation30.fullScreenFrame) GameObject.graphicsSettings(false, Unsorted.anInt2577, -1, -1); continue; } @@ -2286,7 +2286,7 @@ public final class CS2Script extends Linkable { if (l32 < 0 || l32 > 2) l32 = 0; Unsorted.anInt2577 = l32; - Class119.method1730(Class38.signlink); + Class119.method1730(Class38.gameSignlink); continue; } if (5500 > opcode) { @@ -2345,7 +2345,7 @@ public final class CS2Script extends Linkable { continue; } if (opcode == 5411) { - if (TextureOperation30.aFrame3121 != null) + if (TextureOperation30.fullScreenFrame != null) GameObject.graphicsSettings(false, Unsorted.anInt2577, -1, -1); if (null == GameShell.frame) System.exit(0); @@ -2372,7 +2372,7 @@ public final class CS2Script extends Linkable { continue; } if (opcode == 5421) { - if (null != TextureOperation30.aFrame3121) + if (null != TextureOperation30.fullScreenFrame) GameObject.graphicsSettings(false, Unsorted.anInt2577, -1, -1); boolean flag5 = 1 == ItemDefinition.intsStack[--iStackCounter]; RSString class94_25 = ItemDefinition.stringsStack[--sStackCounter]; @@ -2384,7 +2384,7 @@ public final class CS2Script extends Linkable { } else { Unsorted.aBoolean2154 = flag5; TextureOperation5.aClass94_3295 = class94_64; - Class15.aClass64_351 = Class38.signlink.method1452(new String(class94_64.method1568(), StandardCharsets.ISO_8859_1), true); + Class15.aClass64_351 = Class38.gameSignlink.method1452(new String(class94_64.method1568(), StandardCharsets.ISO_8859_1), true); } continue; } @@ -2537,7 +2537,7 @@ public final class CS2Script extends Linkable { Class84.method1417(); } Unsorted.method746((byte) -29); - Class119.method1730(Class38.signlink); + Class119.method1730(Class38.gameSignlink); aBoolean2705 = false; continue; } @@ -2546,52 +2546,52 @@ public final class CS2Script extends Linkable { Class3_Sub10.method139(66); Class84.method1417(); Unsorted.method792(); - Class119.method1730(Class38.signlink); + Class119.method1730(Class38.gameSignlink); aBoolean2705 = false; continue; } if (opcode == 6003) { Unsorted.aBoolean3604 = ItemDefinition.intsStack[--iStackCounter] == 1; Unsorted.method792(); - Class119.method1730(Class38.signlink); + Class119.method1730(Class38.gameSignlink); aBoolean2705 = false; continue; } if (opcode == 6005) { KeyboardListener.aBoolean1905 = ItemDefinition.intsStack[--iStackCounter] == 1; Class84.method1417(); - Class119.method1730(Class38.signlink); + Class119.method1730(Class38.gameSignlink); aBoolean2705 = false; continue; } if (opcode == 6006) { Class25.aBoolean488 = ItemDefinition.intsStack[--iStackCounter] == 1; ((Class102) Class51.anInterface2_838).method1616(!Class25.aBoolean488); - Class119.method1730(Class38.signlink); + Class119.method1730(Class38.gameSignlink); aBoolean2705 = false; continue; } if (opcode == 6007) { RSInterface.aBoolean236 = ItemDefinition.intsStack[--iStackCounter] == 1; - Class119.method1730(Class38.signlink); + Class119.method1730(Class38.gameSignlink); aBoolean2705 = false; continue; } if (opcode == 6008) { WorldListEntry.aBoolean2623 = ItemDefinition.intsStack[--iStackCounter] == 1; - Class119.method1730(Class38.signlink); + Class119.method1730(Class38.gameSignlink); aBoolean2705 = false; continue; } if (opcode == 6009) { Unsorted.aBoolean3275 = ItemDefinition.intsStack[--iStackCounter] == 1; - Class119.method1730(Class38.signlink); + Class119.method1730(Class38.gameSignlink); aBoolean2705 = false; continue; } if (opcode == 6010) { Class140_Sub6.aBoolean2910 = 1 == ItemDefinition.intsStack[--iStackCounter]; - Class119.method1730(Class38.signlink); + Class119.method1730(Class38.gameSignlink); aBoolean2705 = false; continue; } @@ -2600,7 +2600,7 @@ public final class CS2Script extends Linkable { if (l34 < 0 || l34 > 2) l34 = 0; Unsorted.anInt1137 = l34; - Class119.method1730(Class38.signlink); + Class119.method1730(Class38.gameSignlink); aBoolean2705 = false; continue; } @@ -2621,7 +2621,7 @@ public final class CS2Script extends Linkable { Class51.method1137(0.6F); } Class84.method1417(); - Class119.method1730(Class38.signlink); + Class119.method1730(Class38.gameSignlink); aBoolean2705 = false; continue; } @@ -2629,7 +2629,7 @@ public final class CS2Script extends Linkable { Class128.aBoolean1685 = ItemDefinition.intsStack[--iStackCounter] == 1; if (HDToolKit.highDetail) Class84.method1417(); - Class119.method1730(Class38.signlink); + Class119.method1730(Class38.gameSignlink); aBoolean2705 = false; continue; } @@ -2637,7 +2637,7 @@ public final class CS2Script extends Linkable { Class38.aBoolean661 = ItemDefinition.intsStack[--iStackCounter] == 1; if (HDToolKit.highDetail) TextureOperation31.method236(); - Class119.method1730(Class38.signlink); + Class119.method1730(Class38.gameSignlink); aBoolean2705 = false; continue; } @@ -2653,7 +2653,7 @@ public final class CS2Script extends Linkable { if (opcode == 6017) { TextureOperation17.aBoolean3184 = ItemDefinition.intsStack[--iStackCounter] == 1; GameShell.method34(); - Class119.method1730(Class38.signlink); + Class119.method1730(Class38.gameSignlink); aBoolean2705 = false; continue; } @@ -2664,7 +2664,7 @@ public final class CS2Script extends Linkable { if (j35 > 127) j35 = 127; AudioHandler.soundEffectVolume = j35; - Class119.method1730(Class38.signlink); + Class119.method1730(Class38.gameSignlink); aBoolean2705 = false; continue; } @@ -2686,7 +2686,7 @@ public final class CS2Script extends Linkable { } Unsorted.anInt120 = k35; } - Class119.method1730(Class38.signlink); + Class119.method1730(Class38.gameSignlink); aBoolean2705 = false; continue; } @@ -2697,7 +2697,7 @@ public final class CS2Script extends Linkable { if (127 < l35) l35 = 127; Sprites.anInt340 = l35; - Class119.method1730(Class38.signlink); + Class119.method1730(Class38.gameSignlink); aBoolean2705 = false; continue; } @@ -2718,7 +2718,7 @@ public final class CS2Script extends Linkable { i36 = 0; } Class127_Sub1.method1758(i36); - Class119.method1730(Class38.signlink); + Class119.method1730(Class38.gameSignlink); aBoolean2705 = false; ItemDefinition.intsStack[iStackCounter++] = flag6 ? 0 : 1; continue; @@ -2728,13 +2728,13 @@ public final class CS2Script extends Linkable { if (j36 < 0 || 2 < j36) j36 = 0; Class3_Sub28_Sub9.anInt3622 = j36; - Class119.method1730(Class38.signlink); + Class119.method1730(Class38.gameSignlink); continue; } if (opcode != 6028) break; Class163_Sub3.aBoolean3004 = ItemDefinition.intsStack[--iStackCounter] != 0; - Class119.method1730(Class38.signlink); + Class119.method1730(Class38.gameSignlink); continue; } if (opcode < 6200) { @@ -2939,7 +2939,7 @@ public final class CS2Script extends Linkable { } if (opcode == 6504) { Unsorted.anInt2148 = ItemDefinition.intsStack[--iStackCounter]; - Class119.method1730(Class38.signlink); + Class119.method1730(Class38.gameSignlink); continue; } if (6505 == opcode) { @@ -2979,7 +2979,7 @@ public final class CS2Script extends Linkable { break; if (6600 == opcode) { Class15.aBoolean346 = ItemDefinition.intsStack[--iStackCounter] == 1; - Class119.method1730(Class38.signlink); + Class119.method1730(Class38.gameSignlink); continue; } if (opcode != 6601) diff --git a/Client/src/main/java/org/runite/client/CacheResourceWorker.java b/Client/src/main/java/org/runite/client/CacheResourceWorker.java index f0e587e33..8fde4d47d 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.reportError(null, var5, (byte) 111); + Class49.reportError(null, var5); } request.waiting = false; @@ -108,7 +108,7 @@ final class CacheResourceWorker implements Runnable { } public CacheResourceWorker() { - Class64 var1 = Class38.signlink.method1451(5, this); + Class64 var1 = Class38.gameSignlink.startThread(5, this); while (Objects.requireNonNull(var1).anInt978 == 0) { TimeUtils.sleep(10L); diff --git a/Client/src/main/java/org/runite/client/Class106.java b/Client/src/main/java/org/runite/client/Class106.java index f42bcd9d0..d6913591f 100644 --- a/Client/src/main/java/org/runite/client/Class106.java +++ b/Client/src/main/java/org/runite/client/Class106.java @@ -3,7 +3,7 @@ package org.runite.client; final class Class106 { static boolean aBoolean1441 = true; - static int anInt1442 = 0; + static int rightMargin = 0; static int anInt1446 = 0; static boolean paramUserUsingInternetExplorer = false; int anInt1447; diff --git a/Client/src/main/java/org/runite/client/Class119.java b/Client/src/main/java/org/runite/client/Class119.java index bd5c83e57..a5cadd6f1 100644 --- a/Client/src/main/java/org/runite/client/Class119.java +++ b/Client/src/main/java/org/runite/client/Class119.java @@ -12,33 +12,33 @@ final class Class119 { static void method1729() { try { Object var1; - if (null == TextureOperation30.aFrame3121) { + if (null == TextureOperation30.fullScreenFrame) { if (GameShell.frame == null) { - var1 = Class38.signlink.gameApplet; + var1 = Class38.gameSignlink.gameApplet; } else { var1 = GameShell.frame; } } else { - var1 = TextureOperation30.aFrame3121; + var1 = TextureOperation30.fullScreenFrame; } - Unsorted.anInt2334 = ((Container) var1).getSize().width; - Class70.anInt1047 = ((Container) var1).getSize().height; + Unsorted.frameWidth = ((Container) var1).getSize().width; + Class70.frameHeight = ((Container) var1).getSize().height; Insets var2; if (var1 == GameShell.frame) { var2 = GameShell.frame.getInsets(); - Class70.anInt1047 -= var2.bottom + var2.top; - Unsorted.anInt2334 -= var2.right + var2.left; + Class70.frameHeight -= var2.bottom + var2.top; + Unsorted.frameWidth -= var2.right + var2.left; } if (Class83.getWindowType() >= 2) { - Class23.canvasWidth = Unsorted.anInt2334; - Class84.anInt1164 = 0; - Class106.anInt1442 = 0; - Class140_Sub7.canvasHeight = Class70.anInt1047; + Class23.canvasWidth = Unsorted.frameWidth; + Class84.leftMargin = 0; + Class106.rightMargin = 0; + Class140_Sub7.canvasHeight = Class70.frameHeight; } else { - Class106.anInt1442 = 0; - Class84.anInt1164 = (-765 + Unsorted.anInt2334) / 2; + Class106.rightMargin = 0; + Class84.leftMargin = (-765 + Unsorted.frameWidth) / 2; Class140_Sub7.canvasHeight = 503; Class23.canvasWidth = 765; } @@ -50,9 +50,9 @@ final class Class119 { GameShell.canvas.setSize(Class23.canvasWidth, Class140_Sub7.canvasHeight); if (var1 == GameShell.frame) { var2 = GameShell.frame.getInsets(); - GameShell.canvas.setLocation(var2.left + Class84.anInt1164, Class106.anInt1442 + var2.top); + GameShell.canvas.setLocation(var2.left + Class84.leftMargin, Class106.rightMargin + var2.top); } else { - GameShell.canvas.setLocation(Class84.anInt1164, Class106.anInt1442); + GameShell.canvas.setLocation(Class84.leftMargin, Class106.rightMargin); } if (ConfigInventoryDefinition.anInt3655 != -1) { diff --git a/Client/src/main/java/org/runite/client/Class121.java b/Client/src/main/java/org/runite/client/Class121.java index ef2ecec86..a141f8166 100644 --- a/Client/src/main/java/org/runite/client/Class121.java +++ b/Client/src/main/java/org/runite/client/Class121.java @@ -102,27 +102,27 @@ final class Class121 { return 0; } - Class3_Sub9.aClass64_2318 = Class38.signlink.method1441((byte) 8, GameConfig.IP_MANAGEMENT, GameConfig.WL_PORT);//, Class123.anInt1658); + Class3_Sub9.aClass64_2318 = Class38.gameSignlink.method1441((byte) 8, GameConfig.IP_MANAGEMENT, GameConfig.WL_PORT);//, Class123.anInt1658); RSInterface.aLong261 = TimeUtils.time(); Class43.worldListStage = 1; } if (30000L + RSInterface.aLong261 < TimeUtils.time()) { - return TextureOperation33.method179((byte) 92, 1000); + return method179((byte) 92, 1000); } int wlUpdateStamp; int var2; if (1 == Class43.worldListStage) { if (Class3_Sub9.aClass64_2318.anInt978 == 2) { - return TextureOperation33.method179((byte) 92, 1001); + return method179((byte) 92, 1001); } if (1 != Class3_Sub9.aClass64_2318.anInt978) { return -1; } - Class3_Sub15.activeConnection = new Connection((Socket) Class3_Sub9.aClass64_2318.anObject974, Class38.signlink); + Class3_Sub15.activeConnection = new Connection((Socket) Class3_Sub9.aClass64_2318.anObject974, Class38.gameSignlink); TextureOperation12.outgoingBuffer.index = 0; Class3_Sub9.aClass64_2318 = null; wlUpdateStamp = 0; @@ -152,7 +152,7 @@ final class Class121 { } if (var2 != 0) { - return TextureOperation33.method179((byte) 92, var2); + return method179((byte) 92, var2); } Class43.worldListStage = 2; @@ -205,13 +205,13 @@ final class Class121 { return 0; } - return TextureOperation33.method179((byte) 92, 1002); + return method179((byte) 92, 1002); } return -1; } } catch (IOException var5) { - return TextureOperation33.method179((byte) 92, 1003); + return method179((byte) 92, 1003); } return -1; @@ -247,4 +247,34 @@ final class Class121 { } } + static int method179(byte var0, int var1) { + try { + if (var0 == 92) { + if (null != Class3_Sub15.activeConnection) { + Class3_Sub15.activeConnection.close(); + Class3_Sub15.activeConnection = null; + } + + ++Unsorted.anInt1088; + if (Unsorted.anInt1088 > 4) { + Class43.worldListStage = 0; + Unsorted.anInt1088 = 0; + return var1; + } else { + Class43.worldListStage = 0; + if (Class123.anInt1658 == Client.anInt3773) { + Class123.anInt1658 = Class53.anInt867; + } else { + Class123.anInt1658 = Client.anInt3773; + } + + return -1; + } + } else { + return 122; + } + } catch (RuntimeException var3) { + throw ClientErrorException.clientError(var3, "an.F(" + var0 + ',' + var1 + ')'); + } + } } 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 87c51810a..8e07b6334 100644 --- a/Client/src/main/java/org/runite/client/Class140_Sub3.java +++ b/Client/src/main/java/org/runite/client/Class140_Sub3.java @@ -30,7 +30,7 @@ final class Class140_Sub3 extends GameObject { static Model method1957(int var0, boolean var1, SequenceDefinition var2, int var3, int var4, int var5, int var6, int var7, Model var8, int var9, int var10, int var11, int var12) { try { - long var14 = ((long) var4 << 48) + (long) (var7 + (var0 << 16) - -(var12 << 24)) + ((long) var6 << 32); + long var14 = ((long) var4 << 48) + (var7 + ((long) var0 << 16) - -((long) var12 << 24)) + ((long) var6 << 32); Model var16 = (Model) Class158_Sub1.aReferenceCache_2982.get(var14); int var21; int var23; diff --git a/Client/src/main/java/org/runite/client/Class15.java b/Client/src/main/java/org/runite/client/Class15.java index da7092f7b..0c7828699 100644 --- a/Client/src/main/java/org/runite/client/Class15.java +++ b/Client/src/main/java/org/runite/client/Class15.java @@ -284,7 +284,7 @@ public final class Class15 implements Runnable { Class81.method1400(this.aClass87_350, null, -71); } } catch (Exception var7) { - Class49.reportError(null, var7, (byte) 111); + Class49.reportError(null, var7); } finally { this.aBoolean353 = false; } diff --git a/Client/src/main/java/org/runite/client/Class159.java b/Client/src/main/java/org/runite/client/Class159.java index 79b4b6d36..848f774ce 100644 --- a/Client/src/main/java/org/runite/client/Class159.java +++ b/Client/src/main/java/org/runite/client/Class159.java @@ -30,7 +30,7 @@ public final class Class159 { try { if (Unsorted.paramJavaScriptEnabled) { try { - return !(Boolean) RSString.parse("showingVideoAd").method1577(Class38.signlink.gameApplet); + return !(Boolean) RSString.parse("showingVideoAd").method1577(Class38.gameSignlink.gameApplet); } catch (Throwable var2) { } } 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 d1c65f2c8..47284e40b 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 @@ -73,7 +73,7 @@ public final class Class163_Sub1_Sub1 extends Class163_Sub1 { } if (adminLoginStage == 1) { - Class3_Sub9.aClass64_2318 = Class38.signlink.method1441((byte) 8, ClientErrorException.worldListHost, Class123.anInt1658); + Class3_Sub9.aClass64_2318 = Class38.gameSignlink.method1441((byte) 8, ClientErrorException.worldListHost, Class123.anInt1658); adminLoginStage = 2; } @@ -87,7 +87,7 @@ public final class Class163_Sub1_Sub1 extends Class163_Sub1 { return; } - Class3_Sub15.activeConnection = new Connection((Socket) Class3_Sub9.aClass64_2318.anObject974, Class38.signlink); + Class3_Sub15.activeConnection = new Connection((Socket) Class3_Sub9.aClass64_2318.anObject974, Class38.gameSignlink); Class3_Sub9.aClass64_2318 = null; Class3_Sub15.activeConnection.sendBytes(TextureOperation12.outgoingBuffer.buffer, TextureOperation12.outgoingBuffer.index); if (WorldListEntry.aClass155_2627 != null) { diff --git a/Client/src/main/java/org/runite/client/Class17.java b/Client/src/main/java/org/runite/client/Class17.java index 8b5287f99..e9e893206 100644 --- a/Client/src/main/java/org/runite/client/Class17.java +++ b/Client/src/main/java/org/runite/client/Class17.java @@ -3,7 +3,6 @@ package org.runite.client; final class Class17 { static Interface2 anInterface2_408; - static Thread aThread409; static int anInt410; static Class64 aClass64_413; diff --git a/Client/src/main/java/org/runite/client/Class21.java b/Client/src/main/java/org/runite/client/Class21.java index 3ff07b655..547338ae7 100644 --- a/Client/src/main/java/org/runite/client/Class21.java +++ b/Client/src/main/java/org/runite/client/Class21.java @@ -51,7 +51,7 @@ public final class Class21 { Unsorted.aBooleanArray3674[var1] = true; } - TextureOperation9.method204(-3); + TextureOperation9.method204(); } catch (RuntimeException var2) { throw ClientErrorException.clientError(var2, "dh.F(" + false + ')'); } diff --git a/Client/src/main/java/org/runite/client/Class38.java b/Client/src/main/java/org/runite/client/Class38.java index e8ac4bbde..49bd2d767 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 signlink; + static Signlink gameSignlink; static Class146 aClass146_668; static void method1028() { diff --git a/Client/src/main/java/org/runite/client/Class3_Sub9.java b/Client/src/main/java/org/runite/client/Class3_Sub9.java index f7d2756d7..042761096 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub9.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub9.java @@ -4,147 +4,147 @@ import org.rs09.client.Linkable; final class Class3_Sub9 extends Linkable { - int anInt2307; - int anInt2308; - int anInt2310; - Class3_Sub24_Sub1 aClass3_Sub24_Sub1_2312; - int anInt2314; - Class3_Sub24_Sub1 aClass3_Sub24_Sub1_2315; - int anInt2316; - static Class64 aClass64_2318; - ObjectDefinition aClass111_2320; - int anInt2321; - int anInt2322 = 0; - NPC aClass140_Sub4_Sub2_2324; - int anInt2325; - int anInt2326; - Player aClass140_Sub4_Sub1_2327; - int anInt2328; - boolean aBoolean2329; - int anInt2332; - int[] anIntArray2333; + int anInt2307; + int anInt2308; + int anInt2310; + Class3_Sub24_Sub1 aClass3_Sub24_Sub1_2312; + int anInt2314; + Class3_Sub24_Sub1 aClass3_Sub24_Sub1_2315; + int anInt2316; + static Class64 aClass64_2318; + ObjectDefinition aClass111_2320; + int anInt2321; + int anInt2322 = 0; + NPC aClass140_Sub4_Sub2_2324; + int anInt2325; + int anInt2326; + Player aClass140_Sub4_Sub1_2327; + int anInt2328; + boolean aBoolean2329; + int anInt2332; + int[] anIntArray2333; - static Class3_Sub28_Sub5 method133(int var0) { - try { - Class3_Sub28_Sub5 var2 = (Class3_Sub28_Sub5)Class159.aReferenceCache_2016.get(var0); - if(var2 == null) { - var2 = Unsorted.method1089(Class131.skeletonsReferenceIndex, Class7.skinsReferenceIndex, var0); - if(null != var2) { - Class159.aReferenceCache_2016.put(var2, var0); + static Class3_Sub28_Sub5 method133(int var0) { + try { + Class3_Sub28_Sub5 var2 = (Class3_Sub28_Sub5) Class159.aReferenceCache_2016.get(var0); + if (var2 == null) { + var2 = Unsorted.method1089(Class131.skeletonsReferenceIndex, Class7.skinsReferenceIndex, var0); + if (null != var2) { + Class159.aReferenceCache_2016.put(var2, var0); + } + } + return var2; + } catch (RuntimeException var3) { + throw ClientErrorException.clientError(var3, "fl.B(" + var0 + ',' + 0 + ')'); + } + } - } - return var2; - } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "fl.B(" + var0 + ',' + 0 + ')'); - } - } - - final void method134() { - try { - int var2 = this.anInt2332; - if(null != this.aClass111_2320) { - ObjectDefinition var3 = this.aClass111_2320.method1685(0); - if(var3 == null) { - this.anInt2332 = -1; - this.anIntArray2333 = null; - this.anInt2325 = 0; - this.anInt2328 = 0; - this.anInt2310 = 0; + final void method134() { + try { + int var2 = this.anInt2332; + if (null != this.aClass111_2320) { + ObjectDefinition var3 = this.aClass111_2320.method1685(0); + if (var3 == null) { + this.anInt2332 = -1; + this.anIntArray2333 = null; + this.anInt2325 = 0; + this.anInt2328 = 0; + this.anInt2310 = 0; + } else { + this.anInt2325 = var3.anInt1515; + this.anInt2332 = var3.anInt1512; + this.anInt2310 = var3.anInt1518; + this.anInt2328 = var3.anInt1484 * 128; + this.anIntArray2333 = var3.anIntArray1539; + } + } else if (this.aClass140_Sub4_Sub2_2324 == null) { + if (null != this.aClass140_Sub4_Sub1_2327) { + this.anInt2332 = Class81.method1398(this.aClass140_Sub4_Sub1_2327); + this.anInt2328 = 128 * this.aClass140_Sub4_Sub1_2327.anInt3969; + } } else { - this.anInt2325 = var3.anInt1515; - this.anInt2332 = var3.anInt1512; - this.anInt2310 = var3.anInt1518; - this.anInt2328 = var3.anInt1484 * 128; - this.anIntArray2333 = var3.anIntArray1539; - } - } else if(this.aClass140_Sub4_Sub2_2324 == null) { - if(null != this.aClass140_Sub4_Sub1_2327) { - this.anInt2332 = Class81.method1398(this.aClass140_Sub4_Sub1_2327); - this.anInt2328 = 128 * this.aClass140_Sub4_Sub1_2327.anInt3969; - } - } else { - int var6 = Class70.method1232(this.aClass140_Sub4_Sub2_2324); - if(var2 != var6) { - NPCDefinition var4 = this.aClass140_Sub4_Sub2_2324.definition; - this.anInt2332 = var6; - if(var4.childNPCs != null) { - var4 = var4.method1471((byte)-87); - } + int var6 = Class70.method1232(this.aClass140_Sub4_Sub2_2324); + if (var2 != var6) { + NPCDefinition var4 = this.aClass140_Sub4_Sub2_2324.definition; + this.anInt2332 = var6; + if (var4.childNPCs != null) { + var4 = var4.method1471((byte) -87); + } - if(var4 == null) { - this.anInt2328 = 0; - } else { - this.anInt2328 = var4.anInt1291 * 128; - } - } - } - - if(this.anInt2332 != var2 && this.aClass3_Sub24_Sub1_2312 != null) { - Class3_Sub26.aClass3_Sub24_Sub2_2563.method461(this.aClass3_Sub24_Sub1_2312); - this.aClass3_Sub24_Sub1_2312 = null; - } - - } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "fl.A(" + 1 + ')'); - } - } - - static void method135(int var0, int var1, int var2, int var4, int var5) { - try { - TextureOperation18.method282(Class38.anIntArrayArray663[var0], var1 - var2, -76, var2 + var1, var5); - int var6 = 0; - int var8 = var2 * var2; - int var9 = var4 * var4; - int var7 = var4; - int var10 = var9 << 1; - int var11 = var8 << 1; - int var12 = var4 << 1; - int var13 = var10 + (1 + -var12) * var8; - int var14 = var9 - var11 * (var12 - 1); - int var15 = var8 << 2; - - int var16 = var9 << 2; - int var17 = var10 * (3 + (var6 << 1)); - int var18 = var11 * ((var4 << 1) + -3); - int var19 = (1 + var6) * var16; - int var20 = var15 * (var4 - 1); - - while(var7 > 0) { - --var7; - int var22 = var7 + var0; - int var21 = var0 - var7; - if(var13 < 0) { - while(var13 < 0) { - ++var6; - var13 += var17; - var14 += var19; - var19 += var16; - var17 += var16; - } + if (var4 == null) { + this.anInt2328 = 0; + } else { + this.anInt2328 = var4.anInt1291 * 128; + } + } } - if(var14 < 0) { - var13 += var17; - var17 += var16; - var14 += var19; - ++var6; - var19 += var16; + if (this.anInt2332 != var2 && this.aClass3_Sub24_Sub1_2312 != null) { + Class3_Sub26.aClass3_Sub24_Sub2_2563.method461(this.aClass3_Sub24_Sub1_2312); + this.aClass3_Sub24_Sub1_2312 = null; } - int var23 = var6 + var1; - var14 += -var18; - var18 -= var15; - var13 += -var20; - int var24 = var1 + -var6; - var20 -= var15; - TextureOperation18.method282(Class38.anIntArrayArray663[var21], var24, -110, var23, var5); - TextureOperation18.method282(Class38.anIntArrayArray663[var22], var24, 112, var23, var5); - } + } catch (RuntimeException var5) { + throw ClientErrorException.clientError(var5, "fl.A(" + 1 + ')'); + } + } - } catch (RuntimeException var25) { - throw ClientErrorException.clientError(var25, "fl.C(" + var0 + ',' + var1 + ',' + var2 + ',' + -111 + ',' + var4 + ',' + var5 + ')'); - } - } + static void method135(int var0, int var1, int var2, int var4, int var5) { + try { + TextureOperation18.method282(Class38.anIntArrayArray663[var0], var1 - var2, -76, var2 + var1, var5); + int var6 = 0; + int var8 = var2 * var2; + int var9 = var4 * var4; + int var7 = var4; + int var10 = var9 << 1; + int var11 = var8 << 1; + int var12 = var4 << 1; + int var13 = var10 + (1 + -var12) * var8; + int var14 = var9 - var11 * (var12 - 1); + int var15 = var8 << 2; + + int var16 = var9 << 2; + int var17 = var10 * (3 + (var6 << 1)); + int var18 = var11 * ((var4 << 1) + -3); + int var19 = (1 + var6) * var16; + int var20 = var15 * (var4 - 1); + + while (var7 > 0) { + --var7; + int var22 = var7 + var0; + int var21 = var0 - var7; + if (var13 < 0) { + while (var13 < 0) { + ++var6; + var13 += var17; + var14 += var19; + var19 += var16; + var17 += var16; + } + } + + if (var14 < 0) { + var13 += var17; + var17 += var16; + var14 += var19; + ++var6; + var19 += var16; + } + + int var23 = var6 + var1; + var14 += -var18; + var18 -= var15; + var13 += -var20; + int var24 = var1 + -var6; + var20 -= var15; + TextureOperation18.method282(Class38.anIntArrayArray663[var21], var24, -110, var23, var5); + TextureOperation18.method282(Class38.anIntArrayArray663[var22], var24, 112, var23, var5); + } + + } catch (RuntimeException var25) { + throw ClientErrorException.clientError(var25, "fl.C(" + var0 + ',' + var1 + ',' + var2 + ',' + -111 + ',' + var4 + ',' + var5 + ')'); + } + } } diff --git a/Client/src/main/java/org/runite/client/Class49.java b/Client/src/main/java/org/runite/client/Class49.java index 84abfab71..0f42db134 100644 --- a/Client/src/main/java/org/runite/client/Class49.java +++ b/Client/src/main/java/org/runite/client/Class49.java @@ -1,6 +1,5 @@ package org.runite.client; -import org.rs09.client.data.NodeCache; import org.rs09.client.rendering.Toolkit; import org.runite.client.drawcalls.ContextMenu; @@ -14,7 +13,6 @@ public final class Class49 { static boolean[][] aBooleanArrayArray814; static int anInt815 = 0; static int anInt817; - static NodeCache aClass47_818 = new NodeCache(64); static int anInt819 = 0; @@ -130,11 +128,7 @@ public final class Class49 { } } - static void reportError(String var0, Throwable var1, byte var2) { - if (var2 <= 100) { - aClass47_818 = null; - } - + static void reportError(String var0, Throwable var1) { try { String var3 = ""; if (null != var1) { @@ -154,11 +148,11 @@ public final class Class49 { var3 = InterfaceWidget.a("@", "%40", var3); var3 = InterfaceWidget.a("&", "%26", var3); var3 = InterfaceWidget.a("#", "%23", var3); - if (TextureOperation30.aClass87_3125.gameApplet == null) { + if (TextureOperation30.signlink.gameApplet == null) { return; } - Class64 var4 = TextureOperation30.aClass87_3125.method1439(false, new URL(TextureOperation30.aClass87_3125.gameApplet.getCodeBase(), "clienterror.ws?c=&u=" + PacketParser.aLong3202 + "&v1=" + Signlink.javaVendor + "&v2=" + Signlink.javaVersion + "&e=" + var3)); + Class64 var4 = TextureOperation30.signlink.method1439(false, new URL(TextureOperation30.signlink.gameApplet.getCodeBase(), "clienterror.ws?c=&u=" + PacketParser.aLong3202 + "&v1=" + Signlink.javaVendor + "&v2=" + Signlink.javaVersion + "&e=" + var3)); while (var4.anInt978 == 0) { TimeUtils.sleep(1L); diff --git a/Client/src/main/java/org/runite/client/Class58.java b/Client/src/main/java/org/runite/client/Class58.java index 881674a7d..ce30ff8a6 100644 --- a/Client/src/main/java/org/runite/client/Class58.java +++ b/Client/src/main/java/org/runite/client/Class58.java @@ -53,7 +53,7 @@ public final class Class58 { if (Class3_Sub24_Sub4.anInt3507 > 0 && null == Class38_Sub1.aClass15_2613) { Class38_Sub1.aClass15_2613 = new Class15(); Class38_Sub1.aClass15_2613.aClass87_350 = var1; - var1.method1451(Class3_Sub24_Sub4.anInt3507, Class38_Sub1.aClass15_2613); + var1.startThread(Class3_Sub24_Sub4.anInt3507, Class38_Sub1.aClass15_2613); } if (Class38_Sub1.aClass15_2613 != null) { @@ -77,7 +77,7 @@ public final class Class58 { if (Class3_Sub24_Sub4.anInt3507 > 0 && null == Class38_Sub1.aClass15_2613) { Class38_Sub1.aClass15_2613 = new Class15(); Class38_Sub1.aClass15_2613.aClass87_350 = var1; - var1.method1451(Class3_Sub24_Sub4.anInt3507, Class38_Sub1.aClass15_2613); + var1.startThread(Class3_Sub24_Sub4.anInt3507, Class38_Sub1.aClass15_2613); } if (Class38_Sub1.aClass15_2613 != null) { diff --git a/Client/src/main/java/org/runite/client/Class70.java b/Client/src/main/java/org/runite/client/Class70.java index d2a64e1c0..af4615c58 100644 --- a/Client/src/main/java/org/runite/client/Class70.java +++ b/Client/src/main/java/org/runite/client/Class70.java @@ -3,7 +3,7 @@ package org.runite.client; final class Class70 { static RSString[] aClass94Array1046 = new RSString[200]; - static int anInt1047; + static int frameHeight; static double aDouble1050 = -1.0D; static int anInt1053 = 0; int anInt1045; diff --git a/Client/src/main/java/org/runite/client/Class83.java b/Client/src/main/java/org/runite/client/Class83.java index ac5186d20..86a9ede0b 100644 --- a/Client/src/main/java/org/runite/client/Class83.java +++ b/Client/src/main/java/org/runite/client/Class83.java @@ -319,7 +319,7 @@ public final class Class83 { public static int getWindowType() { try { - if (TextureOperation30.aFrame3121 == null) { + if (TextureOperation30.fullScreenFrame == null) { if (HDToolKit.highDetail && Class3_Sub15.aBoolean2427) { return 2; } else { diff --git a/Client/src/main/java/org/runite/client/Class84.java b/Client/src/main/java/org/runite/client/Class84.java index ef75bfd1c..f4587fc2b 100644 --- a/Client/src/main/java/org/runite/client/Class84.java +++ b/Client/src/main/java/org/runite/client/Class84.java @@ -5,7 +5,7 @@ public final class Class84 { static int[][] anIntArrayArray1160 = new int[104][104]; static LinkedList aLinkedList_1162 = new LinkedList(); public static int[] anIntArray1163 = new int[1000]; - static int anInt1164 = 0; + static int leftMargin = 0; static Class3_Sub28_Sub16_Sub2 aClass3_Sub28_Sub16_Sub2_1381; static int[] anIntArray1729 = new int[]{12543016, 15504954, 15914854, 16773818}; diff --git a/Client/src/main/java/org/runite/client/Class99.java b/Client/src/main/java/org/runite/client/Class99.java index 0f2da888d..3fe04700a 100644 --- a/Client/src/main/java/org/runite/client/Class99.java +++ b/Client/src/main/java/org/runite/client/Class99.java @@ -20,7 +20,7 @@ final class Class99 { if (var2) { if (HDToolKit.highDetail && InterfaceWidget.aBoolean3594) { try { - Class42.method1056(Class38.signlink.gameApplet, new Object[]{var0.method1547(LinkableRSString.anApplet_Sub1_2588.getCodeBase()).toString()}); + Class42.method1056(Class38.gameSignlink.gameApplet, new Object[]{var0.method1547(LinkableRSString.anApplet_Sub1_2588.getCodeBase()).toString()}); return; } catch (Throwable var6) { } diff --git a/Client/src/main/java/org/runite/client/Client.java b/Client/src/main/java/org/runite/client/Client.java index 5c4afcfe9..102109ba1 100644 --- a/Client/src/main/java/org/runite/client/Client.java +++ b/Client/src/main/java/org/runite/client/Client.java @@ -6,6 +6,8 @@ import org.rs09.Discord; import org.rs09.SystemLogger; import org.rs09.client.config.GameConfig; import org.rs09.client.console.DeveloperConsole; +import org.rs09.client.constants.gametype.MechscapeGameAppearance; +import org.rs09.client.constants.gametype.RunescapeGameAppearance; import org.rs09.client.data.HashTable; import org.rs09.client.filestore.resources.configs.enums.EnumDefinitionProvider; import org.rs09.client.filestore.resources.configs.structs.StructDefinitionProvider; @@ -38,14 +40,11 @@ public final class Client extends GameShell { static int LoadingStageNumber = 10; static int anInt869; static int loginScreenInterfaceID; - static short[] aShortArray2219 = new short[]{(short) -4160, (short) -4163, (short) -8256, (short) -8259, (short) 22461}; static int anInt2275 = 1; static int anInt2317 = 0; static int anInt3068 = 0; static int[] anIntArray3288 = new int[]{4, 4, 1, 2, 6, 4, 2, 49, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}; static long aLong3296 = 0L; - static short[] aShortArray3349 = new short[]{(short) -10304, (short) 9104, (short) -1, (short) -1, (short) -1}; - static short[][] aShortArrayArray2634 = new short[][]{{(short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 4, (short) 24, (short) 44, (short) 64, (short) 84, (short) 104, (short) 304, (short) 678, (short) 698, (short) 550, (short) 934, (short) 954, (short) 6448, (short) 6946, (short) 6966, (short) 2352, (short) 2726, (short) 2746, (short) 10544, (short) 10918, (short) 10938, (short) 10304, (short) 10550, (short) 10570, (short) 14640, (short) 15014, (short) 15034, (short) 19760, (short) 20134, (short) 20154, (short) -29392, (short) -29018, (short) -28998, (short) 31024, (short) 31270, (short) 31290, (short) -24272, (short) -23898, (short) -23878, (short) -19152, (short) -18778, (short) -18758, (short) -14032, (short) -13658, (short) -13638, (short) -6864, (short) -6490, (short) -6470, (short) 516, (short) 536, (short) 6788, (short) 6808, (short) 11012, (short) 11032, (short) 14980, (short) 15000, (short) 21124, (short) 21144, (short) -28924, (short) -28904, (short) -22012, (short) -21992, (short) -12924, (short) -12904}, {(short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 10339, (short) 10574, (short) 10425, (short) 10398, (short) 10345, (short) 7512, (short) 8507, (short) 7378, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0}, {(short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 4, (short) 24, (short) 44, (short) 64, (short) 84, (short) 104, (short) 304, (short) 678, (short) 698, (short) 550, (short) 934, (short) 954, (short) 6448, (short) 6946, (short) 6966, (short) 2352, (short) 2726, (short) 2746, (short) 10544, (short) 10918, (short) 10938, (short) 10304, (short) 10550, (short) 10570, (short) 14640, (short) 15014, (short) 15034, (short) 19760, (short) 20134, (short) 20154, (short) -29392, (short) -29018, (short) -28998, (short) 31024, (short) 31270, (short) 31290, (short) -24272, (short) -23898, (short) -23878, (short) -19152, (short) -18778, (short) -18758, (short) -14032, (short) -13658, (short) -13638, (short) -6864, (short) -6490, (short) -6470, (short) 516, (short) 536, (short) 6788, (short) 6808, (short) 11012, (short) 11032, (short) 14980, (short) 15000, (short) 21124, (short) 21144, (short) -28924, (short) -28904, (short) -22012, (short) -21992, (short) -12924, (short) -12904}, {(short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 13753, (short) 13737, (short) 13719, (short) 13883, (short) 13863, (short) 13974, (short) 19643, (short) 18601, (short) 16532, (short) 23993, (short) 25121, (short) 24980, (short) 26944, (short) 26921, (short) 24854, (short) 27191, (short) 27171, (short) 26130, (short) 26941, (short) 28696, (short) 30100, (short) 12477, (short) 10407, (short) 10388, (short) 10685, (short) 10665, (short) 10646, (short) 6711, (short) 6693, (short) 6674, (short) 6965, (short) 7073, (short) 7056, (short) 2361, (short) 4387, (short) 3346, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0}, {(short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 4, (short) 24, (short) 44, (short) 64, (short) 84, (short) 104, (short) 304, (short) 678, (short) 698, (short) 550, (short) 934, (short) 954, (short) 6448, (short) 6946, (short) 6966, (short) 2352, (short) 2726, (short) 2746, (short) 10544, (short) 10918, (short) 10938, (short) 10304, (short) 10550, (short) 10570, (short) 14640, (short) 15014, (short) 15034, (short) 19760, (short) 20134, (short) 20154, (short) -29392, (short) -29018, (short) -28998, (short) 31024, (short) 31270, (short) 31290, (short) -24272, (short) -23898, (short) -23878, (short) -19152, (short) -18778, (short) -18758, (short) -14032, (short) -13658, (short) -13638, (short) -6864, (short) -6490, (short) -6470, (short) 516, (short) 536, (short) 6788, (short) 6808, (short) 11012, (short) 11032, (short) 14980, (short) 15000, (short) 21124, (short) 21144, (short) -28924, (short) -28904, (short) -22012, (short) -21992, (short) -12924, (short) -12904}}; static Class3_Sub24_Sub4 aClass3_Sub24_Sub4_1193; static long aLong1310 = 0L; static int anInt1354 = 0; @@ -127,100 +126,94 @@ public final class Client extends GameShell { */ public static void main(String[] args) { try { + if (args.length != 4) { + invalidArgument("argument count"); + } + + int language = -1; + + ObjectDefinition.paramWorldID = Integer.parseInt(args[0]); + + Class44.paramModeWhere = LOCAL_ENVIRONMENT; + + switch (args[1]) { + case "live": + TextureOperation20.paramModeWhat = LIVE_SERVER; + break; + case "rc": + TextureOperation20.paramModeWhat = RELEASE_CANDIDATE; + break; + case "wip": + TextureOperation20.paramModeWhat = WORK_IN_PROGRESS; + break; + default: + invalidArgument("modewhat"); + break; + } + + paramAdvertisementSuppressed = false; + try { - if (args.length != 4) { - invalidArgument("argument count"); - } - - int language = -1; - - ObjectDefinition.paramWorldID = Integer.parseInt(args[0]); - - Class44.paramModeWhere = 2; - - switch (args[1]) { - case "live": - TextureOperation20.paramModeWhat = 0; - break; - case "rc": - TextureOperation20.paramModeWhat = 1; - break; - case "wip": - TextureOperation20.paramModeWhat = 2; - break; - default: - invalidArgument("modewhat"); - break; - } - - paramAdvertisementSuppressed = false; - - try { - byte[] languageSelection = args[2].getBytes(StandardCharsets.ISO_8859_1); + byte[] languageSelection = args[2].getBytes(StandardCharsets.ISO_8859_1); /* Accepts en, de, fr, pt */ - language = TextureOperation15.compareEnteredLanguageArgument(TextureOperation33.bufferToString(languageSelection, languageSelection.length, 0)); - } catch (Exception ignored) { + language = TextureOperation15.compareEnteredLanguageArgument(TextureOperation33.bufferToString(languageSelection, languageSelection.length, 0)); + } catch (Exception ignored) { - } - - 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.paramLanguage = language; - } - - 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.paramCountryID = 0; - - Class106.paramUserUsingInternetExplorer = false; - - Class3_Sub26.paramAffid = 0; - - Class163_Sub2.paramSettings = RSString.parse(""); - - Client client = new Client(); - clientInstance = client; - client.launch(); - - GameShell.frame.setLocation(40, 40); - - } catch (Exception var4) { - Class49.reportError(null, var4, (byte) 119); } - } catch (RuntimeException var5) { - throw ClientErrorException.clientError(var5, "client.main(" + (args != null ? "{...}" : "null") + ')'); + if (language == -1) { + switch (args[2]) { + case "english": + Class3_Sub20.paramLanguage = LANGUAGE_ENGLISH; + break; + case "german": + Class3_Sub20.paramLanguage = LANGUAGE_GERMAN; + break; + case "french": + Class3_Sub20.paramLanguage = LANGUAGE_FRENCH; + break; + default: + invalidArgument("language"); + break; + } + } else { + Class3_Sub20.paramLanguage = language; + } + + Unsorted.languageSetter(Class3_Sub20.paramLanguage); + + Class163_Sub2_Sub1.paramObjectTagEnabled = false; + Unsorted.paramJavaScriptEnabled = false; + + switch (args[3]) { + case "game0": + Class158.paramGameTypeID = GAME_TYPE_RUNESCAPE; + break; + case "game1": + Class158.paramGameTypeID = GAME_TYPE_MECHSCAPE; + break; + default: + invalidArgument("game"); + break; + } + + Class3_Sub31.paramCountryID = 0; + + Class106.paramUserUsingInternetExplorer = false; + + Class3_Sub26.paramAffid = NO_AFFILIATE; + + Class163_Sub2.paramSettings = RSString.parse(""); + + Client client = new Client(); + clientInstance = client; + client.launch(); + GameShell.frame.setLocation(40, 40); + + } catch (Exception var4) { + Class49.reportError(null, var4); } } @@ -761,10 +754,10 @@ public final class Client extends GameShell { int var4; int var5; - if (null == TextureOperation30.aFrame3121) { + if (null == TextureOperation30.fullScreenFrame) { Object var3; if (GameShell.frame == null) { - var3 = Class38.signlink.gameApplet; + var3 = Class38.gameSignlink.gameApplet; } else { var3 = GameShell.frame; } @@ -777,10 +770,10 @@ public final class Client extends GameShell { var5 -= var6.top + var6.bottom; } - if (var4 != Unsorted.anInt2334 || Class70.anInt1047 != var5) { + if (var4 != Unsorted.frameWidth || Class70.frameHeight != var5) { if (Signlink.osName.startsWith("mac")) { - Unsorted.anInt2334 = var4; - Class70.anInt1047 = var5; + Unsorted.frameWidth = var4; + Class70.frameHeight = var5; } else { Class119.method1729(); } @@ -789,14 +782,14 @@ public final class Client extends GameShell { } } - if (TextureOperation30.aFrame3121 != null && !TextureOperation26.aBoolean3078 && (30 == Class143.gameStage || 10 == Class143.gameStage)) { + if (TextureOperation30.fullScreenFrame != null && !TextureOperation26.aBoolean3078 && (30 == Class143.gameStage || 10 == Class143.gameStage)) { GameObject.graphicsSettings(false, Unsorted.anInt2577, -1, -1); } boolean var10 = false; - if (TextureOperation30.aBoolean3116) { + if (TextureOperation30.fullRedraw) { var10 = true; - TextureOperation30.aBoolean3116 = false; + TextureOperation30.fullRedraw = false; } if (var10) { @@ -887,7 +880,7 @@ public final class Client extends GameShell { if (Unsorted.aBoolean2146 && 10 == Class143.gameStage && ConfigInventoryDefinition.anInt3655 != -1) { Unsorted.aBoolean2146 = false; - Class119.method1730(Class38.signlink); + Class119.method1730(Class38.gameSignlink); } DeveloperConsole.INSTANCE.postDraw(); @@ -908,13 +901,13 @@ public final class Client extends GameShell { HDToolKit.method1842(); } - if (null != TextureOperation30.aFrame3121) { - Unsorted.method593(TextureOperation30.aFrame3121, Class38.signlink); - TextureOperation30.aFrame3121 = null; + if (null != TextureOperation30.fullScreenFrame) { + Unsorted.method593(TextureOperation30.fullScreenFrame, Class38.gameSignlink); + TextureOperation30.fullScreenFrame = null; } - if (null != Class38.signlink) { - Class38.signlink.method1442(this.getClass(), 0); + if (null != Class38.gameSignlink) { + Class38.gameSignlink.method1442(this.getClass(), 0); } if (null != TextureOperation20.aClass67_1443) { @@ -978,8 +971,9 @@ public final class Client extends GameShell { try { 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) { + if (Class44.paramModeWhere < LIVE_ENVIRONMENT || Class44.paramModeWhere > LOCAL_ENVIRONMENT) { Class44.paramModeWhere = 0; } @@ -1053,7 +1047,7 @@ public final class Client extends GameShell { CS2Script.userCurrentWorldID = ObjectDefinition.paramWorldID; - Unsorted.parsePreferences(Class38.signlink); + Unsorted.parsePreferences(Class38.gameSignlink); SystemLogger.logInfo("port: " + Class53.anInt867); SystemLogger.logInfo("MSIP: " + GameConfig.IP_MANAGEMENT); @@ -1077,20 +1071,20 @@ public final class Client extends GameShell { switch (Class158.paramGameTypeID) { case GAME_TYPE_RUNESCAPE: - Class15.aShortArrayArray344 = ConfigInventoryDefinition.aShortArrayArray3654; - Class91.aShortArray1311 = aShortArray3349; - Class101.aShortArrayArray1429 = Class20.aShortArrayArray435; - Class3_Sub25.aShortArray2548 = Class164_Sub1.aShortArray3011; + Class15.aShortArrayArray344 = RunescapeGameAppearance.INSTANCE.getAShortArrayArray3654(); + Class91.aShortArray1311 = RunescapeGameAppearance.INSTANCE.getAShortArray3349(); + Class101.aShortArrayArray1429 = RunescapeGameAppearance.INSTANCE.getAShortArrayArray435(); + Class3_Sub25.aShortArray2548 = RunescapeGameAppearance.INSTANCE.getAShortArray3011(); break; case GAME_TYPE_MECHSCAPE: ClientCommands.shiftClickEnabled = true; Class92.defaultScreenColorRgb = 16777215; Class92.defaultRegionAmbientRGB = 0; - Class15.aShortArrayArray344 = Unsorted.aShortArrayArray1619; - Class101.aShortArrayArray1429 = aShortArrayArray2634; - Class3_Sub25.aShortArray2548 = Unsorted.aShortArray63; - Class91.aShortArray1311 = aShortArray2219; + Class15.aShortArrayArray344 = MechscapeGameAppearance.INSTANCE.getAShortArrayArray1619(); + Class101.aShortArrayArray1429 = MechscapeGameAppearance.INSTANCE.getAShortArrayArray2634(); + Class3_Sub25.aShortArray2548 = MechscapeGameAppearance.INSTANCE.getAShortArray63(); + Class91.aShortArray1311 = MechscapeGameAppearance.INSTANCE.getAShortArray2219(); break; } @@ -1115,20 +1109,20 @@ public final class Client extends GameShell { } try { - if (Class38.signlink.cacheDataFile != null) { - Class101.aClass30_1422 = new Class30(Class38.signlink.cacheDataFile, 5200); + if (Class38.gameSignlink.cacheDataFile != null) { + Class101.aClass30_1422 = new Class30(Class38.gameSignlink.cacheDataFile, 5200); for (int var2 = 0; var2 < 29; ++var2) { - Class163_Sub2.aClass30Array2998[var2] = new Class30(Class38.signlink.cacheIndicesFiles[var2], 6000); + Class163_Sub2.aClass30Array2998[var2] = new Class30(Class38.gameSignlink.cacheIndicesFiles[var2], 6000); } - aClass30_1572 = new Class30(Class38.signlink.cacheChecksumFile, 6000); + aClass30_1572 = new Class30(Class38.gameSignlink.cacheChecksumFile, 6000); AtmosphereParser.aClass41_1186 = new Class41(255, Class101.aClass30_1422, aClass30_1572, 500000); - 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; + Unsorted.aClass30_1039 = new Class30(Class38.gameSignlink.randomDatFile, 24); + Class38.gameSignlink.cacheIndicesFiles = null; + Class38.gameSignlink.cacheChecksumFile = null; + Class38.gameSignlink.randomDatFile = null; + Class38.gameSignlink.cacheDataFile = null; } } catch (IOException var3) { Unsorted.aClass30_1039 = null; @@ -1360,7 +1354,7 @@ public final class Client extends GameShell { } else { try { if (PacketParser.anInt80 == 0) { - Class17.aClass64_413 = Class38.signlink.method1441((byte) 8, Class38_Sub1.accRegistryIp, Class140_Sub6.accRegistryPort); + Class17.aClass64_413 = Class38.gameSignlink.method1441((byte) 8, Class38_Sub1.accRegistryIp, Class140_Sub6.accRegistryPort); ++PacketParser.anInt80; } @@ -1376,7 +1370,7 @@ public final class Client extends GameShell { } if (2 == PacketParser.anInt80) { - Unsorted.js5Connection = new Connection((Socket) Objects.requireNonNull(Class17.aClass64_413).anObject974, Class38.signlink); + Unsorted.js5Connection = new Connection((Socket) Objects.requireNonNull(Class17.aClass64_413).anObject974, Class38.gameSignlink); DataBuffer var2 = new DataBuffer(9); var2.writeByte(15); //JS5 handshake var2.writeInt(GameConfig.CLIENT_BUILD); @@ -1529,10 +1523,10 @@ public final class Client extends GameShell { Class140_Sub3.method1959(TextureOperation17.aBoolean3184); aClass3_Sub24_Sub4_1193 = new Class3_Sub24_Sub4(); aClass3_Sub24_Sub4_1193.method479(); - WorldListEntry.aClass155_2627 = Class58.method1195(22050, Class38.signlink, GameShell.canvas, 0); + WorldListEntry.aClass155_2627 = Class58.method1195(22050, Class38.gameSignlink, 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.signlink, GameShell.canvas, 1); + Class3_Sub21.aClass155_2491 = Class58.method1195(2048, Class38.gameSignlink, 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); @@ -1642,7 +1636,7 @@ public final class Client extends GameShell { } } else if (anInt1354 == 110) { TextureOperation20.aClass67_1443 = new Class67(); - Class38.signlink.method1451(10, TextureOperation20.aClass67_1443); + Class38.gameSignlink.startThread(10, TextureOperation20.aClass67_1443); Class3_Sub17.aClass94_2464 = TextCore.LoadedInputHandler; LoadingStageNumber = 75; anInt1354 = 120; @@ -1710,7 +1704,7 @@ public final class Client extends GameShell { } Unsorted.aBoolean2146 = true; - Class119.method1730(Class38.signlink); + Class119.method1730(Class38.gameSignlink); GameObject.graphicsSettings(false, Unsorted.anInt2577, -1, -1); LoadingStageNumber = 100; anInt1354 = 160; diff --git a/Client/src/main/java/org/runite/client/ClientCommands.java b/Client/src/main/java/org/runite/client/ClientCommands.java index 7a1ca61a7..ede2c12af 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.signlink.method1431(); + Class38.gameSignlink.method1431(); Class3_Sub15.activeConnection.applyDummyStreams(); Class58.aJs5Worker_917.applyDummyStreams(); } @@ -158,7 +158,7 @@ public class ClientCommands { if (command.startsWith(TextCore.COMMAND_SET_PARTICLES)) { Class127_Sub1.method1758(command.substring(15).parseInt()); - Class119.method1730(Class38.signlink); + Class119.method1730(Class38.gameSignlink); CS2Script.aBoolean2705 = false; } diff --git a/Client/src/main/java/org/runite/client/ConfigInventoryDefinition.java b/Client/src/main/java/org/runite/client/ConfigInventoryDefinition.java index 4dd5313c6..db6b0b90e 100644 --- a/Client/src/main/java/org/runite/client/ConfigInventoryDefinition.java +++ b/Client/src/main/java/org/runite/client/ConfigInventoryDefinition.java @@ -1,18 +1,16 @@ package org.runite.client; import org.rs09.client.Node; +import org.rs09.client.data.NodeCache; public final class ConfigInventoryDefinition extends Node { - static int[] anIntArray1835 = new int[100]; - static int[] anIntArray3082 = new int[100]; - static RSString[] aClass94Array3226 = new RSString[100]; + static NodeCache aClass47_818 = new NodeCache(64); int size = 0; - static short[][] aShortArrayArray3654 = new short[][]{{(short) 6798, (short) 107, (short) 10283, (short) 16, (short) 4797, (short) 7744, (short) 5799, (short) 4634, (short) -31839, (short) 22433, (short) 2983, (short) -11343, (short) 8, (short) 5281, (short) 10438, (short) 3650, (short) -27322, (short) -21845, (short) 200, (short) 571, (short) 908, (short) 21830, (short) 28946, (short) -15701, (short) -14010}, {(short) 8741, (short) 12, (short) -1506, (short) -22374, (short) 7735, (short) 8404, (short) 1701, (short) -27106, (short) 24094, (short) 10153, (short) -8915, (short) 4783, (short) 1341, (short) 16578, (short) -30533, (short) 25239, (short) 8, (short) 5281, (short) 10438, (short) 3650, (short) -27322, (short) -21845, (short) 200, (short) 571, (short) 908, (short) 21830, (short) 28946, (short) -15701, (short) -14010}, {(short) 25238, (short) 8742, (short) 12, (short) -1506, (short) -22374, (short) 7735, (short) 8404, (short) 1701, (short) -27106, (short) 24094, (short) 10153, (short) -8915, (short) 4783, (short) 1341, (short) 16578, (short) -30533, (short) 8, (short) 5281, (short) 10438, (short) 3650, (short) -27322, (short) -21845, (short) 200, (short) 571, (short) 908, (short) 21830, (short) 28946, (short) -15701, (short) -14010}, {(short) 4626, (short) 11146, (short) 6439, (short) 12, (short) 4758, (short) 10270}, {(short) 4550, (short) 4537, (short) 5681, (short) 5673, (short) 5790, (short) 6806, (short) 8076, (short) 4574}}; static int anInt3655 = -1; public static ConfigInventoryDefinition retrieveConfigurationInventoryFile(int var0) { - ConfigInventoryDefinition var2 = (ConfigInventoryDefinition) Class49.aClass47_818.get(var0); + ConfigInventoryDefinition var2 = (ConfigInventoryDefinition) aClass47_818.get(var0); if (null == var2) { byte[] var3 = Class8.configurationReferenceCache.getFile(5, var0); var2 = new ConfigInventoryDefinition(); @@ -20,7 +18,7 @@ public final class ConfigInventoryDefinition extends Node { var2.decode(new DataBuffer(var3)); } - Class49.aClass47_818.put(var0, var2); + aClass47_818.put(var0, var2); } return var2; } diff --git a/Client/src/main/java/org/runite/client/GameShell.java b/Client/src/main/java/org/runite/client/GameShell.java index c1dd334bc..874dfd90c 100644 --- a/Client/src/main/java/org/runite/client/GameShell.java +++ b/Client/src/main/java/org/runite/client/GameShell.java @@ -16,6 +16,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene public static Canvas canvas; public static Frame frame; + static Thread aThread409; private static int anInt950; private static volatile boolean hasWindowFocus = true; private static long aLong2313 = 0L; @@ -38,9 +39,9 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } Class140_Sub3.method1959(TextureOperation17.aBoolean3184); - WorldListEntry.aClass155_2627 = Class58.method1195(22050, Class38.signlink, canvas, 0); + WorldListEntry.aClass155_2627 = Class58.method1195(22050, Class38.gameSignlink, canvas, 0); WorldListEntry.aClass155_2627.method2154(114, Client.aClass3_Sub24_Sub4_1193); - Class3_Sub21.aClass155_2491 = Class58.method1195(2048, Class38.signlink, canvas, 1); + Class3_Sub21.aClass155_2491 = Class58.method1195(2048, Class38.gameSignlink, canvas, 1); Class3_Sub21.aClass155_2491.method2154(-126, Class3_Sub26.aClass3_Sub24_Sub2_2563); } catch (RuntimeException var2) { throw ClientErrorException.clientError(var2, "rc.DA(" + -32589 + ')'); @@ -49,8 +50,8 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene public static void provideSignlink(Signlink var0) { try { - Class38.signlink = var0; - TextureOperation30.aClass87_3125 = var0; + Class38.gameSignlink = var0; + TextureOperation30.signlink = var0; TextureOperation12.method445(); } catch (RuntimeException var2) { throw ClientErrorException.clientError(var2, "rc.providesignlink(" + (var0 != null ? "{...}" : "null") + ')'); @@ -88,7 +89,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene public final AppletContext getAppletContext() { try { - return null != frame ? null : (Class38.signlink != null && this != Class38.signlink.gameApplet ? Class38.signlink.gameApplet.getAppletContext() : super.getAppletContext()); + return null != frame ? null : (Class38.gameSignlink != null && this != Class38.gameSignlink.gameApplet ? Class38.gameSignlink.gameApplet.getAppletContext() : super.getAppletContext()); } catch (RuntimeException var2) { throw ClientErrorException.clientError(var2, "rc.getAppletContext()"); } @@ -97,7 +98,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene public final void focusGained(FocusEvent var1) { try { hasWindowFocus = true; - TextureOperation30.aBoolean3116 = true; + TextureOperation30.fullRedraw = true; } catch (RuntimeException var3) { throw ClientErrorException.clientError(var3, "rc.focusGained(" + (var1 != null ? "{...}" : "null") + ')'); } @@ -107,17 +108,16 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } final synchronized void addCanvas() { - try { if (canvas != null) { canvas.removeFocusListener(this); canvas.getParent().remove(canvas); } Container var2; - if (TextureOperation30.aFrame3121 != null) { - var2 = TextureOperation30.aFrame3121; + if (TextureOperation30.fullScreenFrame != null) { + var2 = TextureOperation30.fullScreenFrame; } else if (null == frame) { - var2 = Class38.signlink.gameApplet; + var2 = Class38.gameSignlink.gameApplet; } else { var2 = frame; } @@ -129,22 +129,19 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene canvas.setVisible(true); if (var2 == frame) { Insets var3 = frame.getInsets(); - canvas.setLocation(Class84.anInt1164 + var3.left, var3.top + Class106.anInt1442); + canvas.setLocation(Class84.leftMargin + var3.left, var3.top + Class106.rightMargin); } else { - canvas.setLocation(Class84.anInt1164, Class106.anInt1442); + canvas.setLocation(Class84.leftMargin, Class106.rightMargin); } canvas.addFocusListener(this); canvas.requestFocus(); hasWindowFocus = true; - TextureOperation30.aBoolean3116 = true; + TextureOperation30.fullRedraw = true; TextureOperation26.aBoolean3078 = true; Class3_Sub28_Sub5.forceReplaceCanvasEnable = false; SequenceDefinition.aLong1847 = TimeUtils.time(); ClientCommands.tweeningEnabled = true; - } catch (RuntimeException var4) { - throw ClientErrorException.clientError(var4, "rc.BA(" + ')'); - } } public final void destroy() { @@ -152,7 +149,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene if (this == LinkableRSString.anApplet_Sub1_2588 && !Class29.aBoolean554) { aLong2313 = TimeUtils.time(); TimeUtils.sleep(5000L); - TextureOperation30.aClass87_3125 = null; + TextureOperation30.signlink = null; this.method35(false); } } catch (RuntimeException var2) { @@ -187,7 +184,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene public final URL getDocumentBase() { try { - return null != frame ? null : (Class38.signlink != null && this != Class38.signlink.gameApplet ? Class38.signlink.gameApplet.getDocumentBase() : super.getDocumentBase()); + return null != frame ? null : (Class38.gameSignlink != null && this != Class38.gameSignlink.gameApplet ? Class38.gameSignlink.gameApplet.getDocumentBase() : super.getDocumentBase()); } catch (RuntimeException var2) { throw ClientErrorException.clientError(var2, "rc.getDocumentBase()"); } @@ -195,12 +192,12 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene public final synchronized void paint(Graphics g) { if (LinkableRSString.anApplet_Sub1_2588 == this && !Class29.aBoolean554) { - TextureOperation30.aBoolean3116 = true; + TextureOperation30.fullRedraw = true; if (aBoolean1784 && !HDToolKit.highDetail && -SequenceDefinition.aLong1847 + TimeUtils.time() > 1000) { Rectangle var2 = g.getClipBounds(); - if (var2 == null || Unsorted.anInt2334 <= var2.width && var2.height >= Class70.anInt1047) { + if (var2 == null || Unsorted.frameWidth <= var2.width && var2.height >= Class70.frameHeight) { Class3_Sub28_Sub5.forceReplaceCanvasEnable = true; } } @@ -220,8 +217,8 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene Class29.aBoolean554 = true; } - if (Class38.signlink.gameApplet != null) { - Class38.signlink.gameApplet.destroy(); + if (Class38.gameSignlink.gameApplet != null) { + Class38.gameSignlink.gameApplet.destroy(); } try { @@ -237,9 +234,9 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } } - if (null != Class38.signlink) { + if (null != Class38.gameSignlink) { try { - Class38.signlink.method1445(0); + Class38.gameSignlink.method1445(0); } catch (Exception var6) { } } @@ -292,15 +289,15 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } if (50 < TextureOperation28.anInt3313++) { - TextureOperation30.aBoolean3116 = true; + TextureOperation30.fullRedraw = true; TextureOperation28.anInt3313 -= 50; canvas.setSize(Class23.canvasWidth, Class140_Sub7.canvasHeight); canvas.setVisible(true); - if (frame != null && null == TextureOperation30.aFrame3121) { + if (frame != null && null == TextureOperation30.fullScreenFrame) { Insets var8 = frame.getInsets(); - canvas.setLocation(var8.left + Class84.anInt1164, Class106.anInt1442 + var8.top); + canvas.setLocation(var8.left + Class84.leftMargin, Class106.rightMargin + var8.top); } else { - canvas.setLocation(Class84.anInt1164, Class106.anInt1442); + canvas.setLocation(Class84.leftMargin, Class106.rightMargin); } } @@ -313,7 +310,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene abstract void method38(); public final URL getCodeBase() { - return frame == null ? (null != Class38.signlink && this != Class38.signlink.gameApplet ? Class38.signlink.gameApplet.getCodeBase() : super.getCodeBase()) : null; + return frame == null ? (null != Class38.gameSignlink && this != Class38.gameSignlink.gameApplet ? Class38.gameSignlink.gameApplet.getCodeBase() : super.getCodeBase()) : null; } public final void run() { @@ -358,11 +355,11 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } } - if (Class38.signlink.gameApplet != null) { + if (Class38.gameSignlink.gameApplet != null) { Method var8 = Signlink.setFocusCycleRoot; if (null != var8) { try { - var8.invoke(Class38.signlink.gameApplet, Boolean.TRUE); + var8.invoke(Class38.gameSignlink.gameApplet, Boolean.TRUE); } catch (Throwable var4) { } } @@ -382,10 +379,10 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } this.method37(); - Class81.method1400(Class38.signlink, canvas, -80); + Class81.method1400(Class38.gameSignlink, canvas, -80); } } catch (Exception var5) { - Class49.reportError(null, var5, (byte) 127); + Class49.reportError(null, var5); this.errorPrint("crash"); } @@ -398,7 +395,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene public final String getParameter(String var1) { try { - return frame == null ? (Class38.signlink != null && this != Class38.signlink.gameApplet ? Class38.signlink.gameApplet.getParameter(var1) : super.getParameter(var1)) : null; + return frame == null ? (Class38.gameSignlink != null && this != Class38.gameSignlink.gameApplet ? Class38.gameSignlink.gameApplet.getParameter(var1) : super.getParameter(var1)) : null; } catch (RuntimeException var3) { throw ClientErrorException.clientError(var3, "rc.getParameter(" + (var1 != null ? "{...}" : "null") + ')'); } @@ -420,37 +417,32 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene final void launch() { try { - try { - Class140_Sub7.canvasHeight = 768; - Class70.anInt1047 = 768; - Class84.anInt1164 = 0; - Class23.canvasWidth = 1024; - Unsorted.anInt2334 = 1024; - Class106.anInt1442 = 0; - LinkableRSString.anApplet_Sub1_2588 = this; - Frame frame = new Frame(); - frame.setTitle("Jagex"); - frame.setResizable(true); - frame.addWindowListener(this); - frame.setVisible(true); - frame.toFront(); - Insets var9 = frame.getInsets(); - frame.setSize(var9.left + Unsorted.anInt2334 + var9.right, var9.top + Class70.anInt1047 + var9.bottom); - TextureOperation30.aClass87_3125 = Class38.signlink = new Signlink(null, 32 - -TextureOperation20.paramModeWhat, "runescape", 29); - Class64 var10 = Class38.signlink.method1451(1, this); + Class140_Sub7.canvasHeight = 768; + Class70.frameHeight = 768; + Class84.leftMargin = 0; + Class23.canvasWidth = 1024; + Unsorted.frameWidth = 1024; + Class106.rightMargin = 0; + LinkableRSString.anApplet_Sub1_2588 = this; + Frame frame = new Frame(); + frame.setTitle("Jagex"); + frame.setResizable(true); + frame.addWindowListener(this); + frame.setVisible(true); + frame.toFront(); + Insets insets = frame.getInsets(); + frame.setSize(insets.left + Unsorted.frameWidth + insets.right, insets.top + Class70.frameHeight + insets.bottom); + TextureOperation30.signlink = Class38.gameSignlink = new Signlink(null, 32 + TextureOperation20.paramModeWhat, "runescape", 29); + Class64 var10 = Class38.gameSignlink.startThread(1, this); - while (0 == Objects.requireNonNull(var10).anInt978) { - TimeUtils.sleep(10L); - } - - Class17.aThread409 = (Thread) var10.anObject974; - ClientLoader.create().launch(); - } catch (Exception var11) { - Class49.reportError(null, var11, (byte) 115); + while (0 == Objects.requireNonNull(var10).anInt978) { + TimeUtils.sleep(10L); } - } catch (RuntimeException var12) { - throw ClientErrorException.clientError(var12, "rc.S(" + ',' + 1024 + ',' + "{...}" + ',' + 768 + ',' + -8057 + ',' + 28 + ')'); + aThread409 = (Thread) var10.anObject974; + //ClientLoader.create().launch(); + } catch (Exception var11) { + Class49.reportError(null, var11); } } @@ -481,28 +473,28 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene return; } LinkableRSString.anApplet_Sub1_2588 = this; - Class106.anInt1442 = 0; + Class106.rightMargin = 0; Class23.canvasWidth = 765; - Unsorted.anInt2334 = 765; - Class84.anInt1164 = 0; + Unsorted.frameWidth = 765; + Class84.leftMargin = 0; Class140_Sub7.canvasHeight = 503; - Class70.anInt1047 = 503; + Class70.frameHeight = 503; String var6 = this.getParameter("openwinjs"); InterfaceWidget.aBoolean3594 = var6 != null && var6.equals("1"); - if (null == Class38.signlink) { - TextureOperation30.aClass87_3125 = Class38.signlink = new Signlink(this, var3, null, 0); + if (null == Class38.gameSignlink) { + TextureOperation30.signlink = Class38.gameSignlink = new Signlink(this, var3, null, 0); } - Class64 var7 = Class38.signlink.method1451(1, this); + Class64 var7 = Class38.gameSignlink.startThread(1, this); while (Objects.requireNonNull(var7).anInt978 == 0) { TimeUtils.sleep(10L); } - Class17.aThread409 = (Thread) var7.anObject974; + aThread409 = (Thread) var7.anObject974; } catch (Exception var8) { - Class49.reportError(null, var8, (byte) 113); + Class49.reportError(null, var8); this.errorPrint("crash"); } diff --git a/Client/src/main/java/org/runite/client/LinkableRSString.java b/Client/src/main/java/org/runite/client/LinkableRSString.java index 618310842..40d9e5cf2 100644 --- a/Client/src/main/java/org/runite/client/LinkableRSString.java +++ b/Client/src/main/java/org/runite/client/LinkableRSString.java @@ -121,10 +121,10 @@ public final class LinkableRSString extends Linkable { static void method734(RSString var1) { try { Class163_Sub2.paramSettings = var1; - if (null != Class38.signlink.gameApplet) { + if (null != Class38.gameSignlink.gameApplet) { try { - RSString var2 = TextCore.aClass94_2044.getParamValue(Class38.signlink.gameApplet); - RSString var3 = TextCore.aClass94_1885.getParamValue(Class38.signlink.gameApplet); + RSString var2 = TextCore.aClass94_2044.getParamValue(Class38.gameSignlink.gameApplet); + RSString var3 = TextCore.aClass94_1885.getParamValue(Class38.gameSignlink.gameApplet); RSString var4 = RSString.stringCombiner(new RSString[]{var2, TextCore.aClass94_1151, var1, TextCore.aClass94_2074, var3}); if (0 == var1.length()) { var4 = RSString.stringCombiner(new RSString[]{var4, TextCore.HasAgeExpire}); @@ -132,7 +132,7 @@ public final class LinkableRSString extends Linkable { var4 = RSString.stringCombiner(new RSString[]{var4, TextCore.HasExpires, Class15.method894(94608000000L + TimeUtils.time()), TextCore.HasMaxAge, QuickChatDefinition.method612(94608000L)}); } - RSString.stringCombiner(new RSString[]{TextCore.aClass94_1694, var4, TextCore.aClass94_1698}).method1554(Class38.signlink.gameApplet); + RSString.stringCombiner(new RSString[]{TextCore.aClass94_1694, var4, TextCore.aClass94_1698}).method1554(Class38.gameSignlink.gameApplet); } catch (Throwable var5) { } diff --git a/Client/src/main/java/org/runite/client/LoginHandler.java b/Client/src/main/java/org/runite/client/LoginHandler.java index d3f205240..428a8af03 100644 --- a/Client/src/main/java/org/runite/client/LoginHandler.java +++ b/Client/src/main/java/org/runite/client/LoginHandler.java @@ -10,6 +10,7 @@ import java.util.Objects; public class LoginHandler { + private static final BufferedDataStream buffer = new BufferedDataStream(); static CacheIndex aClass153_1680; static boolean dynamic; public static int loginStage = 0; @@ -42,7 +43,7 @@ public class LoginHandler { ++Class166.anInt2079; } if (loginStage == 1) { - Class3_Sub9.aClass64_2318 = Class38.signlink.method1441((byte) 8, Class38_Sub1.accRegistryIp, GameConfig.SERVER_PORT + GameConfig.WORLD);//Class140_Sub6.accRegistryPort); + Class3_Sub9.aClass64_2318 = Class38.gameSignlink.method1441((byte) 8, Class38_Sub1.accRegistryIp, GameConfig.SERVER_PORT + GameConfig.WORLD);//Class140_Sub6.accRegistryPort); loginStage = 2; } @@ -55,7 +56,7 @@ public class LoginHandler { return; } - Class3_Sub15.activeConnection = new Connection((Socket) Class3_Sub9.aClass64_2318.anObject974, Class38.signlink); + Class3_Sub15.activeConnection = new Connection((Socket) Class3_Sub9.aClass64_2318.anObject974, Class38.gameSignlink); Class3_Sub9.aClass64_2318 = null; long var1 = PacketParser.aLong3202 = Class131.username.toLong(); TextureOperation12.outgoingBuffer.index = 0; @@ -114,59 +115,59 @@ public class LoginHandler { TextureOperation12.outgoingBuffer.writeString(Class131.password); TextureOperation12.method229(); TextureOperation12.outgoingBuffer.rsaEncrypt(TextureOperation10.EXPONENT, TextureOperation31.MODULUS); - Unsorted.aBufferedDataStream_2942.index = 0; + buffer.index = 0; if (40 == Class143.gameStage) { - Unsorted.aBufferedDataStream_2942.writeByte(18); + buffer.writeByte(18); } else { - Unsorted.aBufferedDataStream_2942.writeByte(16); + buffer.writeByte(16); } - Unsorted.aBufferedDataStream_2942.writeShort(TextureOperation12.outgoingBuffer.index + 163 - -TextureOperation29.method326((byte) 111, Class163_Sub2.paramSettings)); - Unsorted.aBufferedDataStream_2942.writeInt(GameConfig.CLIENT_BUILD); - Unsorted.aBufferedDataStream_2942.writeByte(Class7.anInt2161); - Unsorted.aBufferedDataStream_2942.writeByte(!Client.paramAdvertisementSuppressed ? 0 : 1); - Unsorted.aBufferedDataStream_2942.writeByte(1); - Unsorted.aBufferedDataStream_2942.writeByte(Class83.getWindowType()); - Unsorted.aBufferedDataStream_2942.writeShort(Class23.canvasWidth); - Unsorted.aBufferedDataStream_2942.writeShort(Class140_Sub7.canvasHeight); - Unsorted.aBufferedDataStream_2942.writeByte(Unsorted.anInt3671); - Class81.putRandomDataFile(Unsorted.aBufferedDataStream_2942, true); - Unsorted.aBufferedDataStream_2942.writeString(Class163_Sub2.paramSettings); - Unsorted.aBufferedDataStream_2942.writeInt(Class3_Sub26.paramAffid); - Unsorted.aBufferedDataStream_2942.writeInt(Class84.method1421()); + buffer.writeShort(TextureOperation12.outgoingBuffer.index + 163 - -TextureOperation29.method326((byte) 111, Class163_Sub2.paramSettings)); + buffer.writeInt(GameConfig.CLIENT_BUILD); + buffer.writeByte(Class7.anInt2161); + buffer.writeByte(!Client.paramAdvertisementSuppressed ? 0 : 1); + buffer.writeByte(1); + buffer.writeByte(Class83.getWindowType()); + buffer.writeShort(Class23.canvasWidth); + buffer.writeShort(Class140_Sub7.canvasHeight); + buffer.writeByte(Unsorted.anInt3671); + Class81.putRandomDataFile(buffer, true); + buffer.writeString(Class163_Sub2.paramSettings); + buffer.writeInt(Class3_Sub26.paramAffid); + buffer.writeInt(Class84.method1421()); CS2Script.aBoolean2705 = true; - Unsorted.aBufferedDataStream_2942.writeShort(Class113.interfacePacketCounter); - Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.skeletonsIndex.getReferenceTableCrc()); - Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.skinsIndex.getReferenceTableCrc()); - Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.configurationsIndex.getReferenceTableCrc()); - Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.interfacesIndex.getReferenceTableCrc()); - Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.soundFXIndex.getReferenceTableCrc()); - Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.landscapesIndex.getReferenceTableCrc()); - Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.musicIndex.getReferenceTableCrc()); - Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.modelsIndex.getReferenceTableCrc()); - Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.spritesIndex.getReferenceTableCrc()); - Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.texturesIndex.getReferenceTableCrc()); - Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.huffmanEncodingIndex.getReferenceTableCrc()); - Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.music2Index.getReferenceTableCrc()); - Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.interfaceScriptsIndex.getReferenceTableCrc()); - Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.fontsIndex.getReferenceTableCrc()); - Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.soundFX2Index.getReferenceTableCrc()); - Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.soundFX3Index.getReferenceTableCrc()); - Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.objectConfigIndex.getReferenceTableCrc()); - Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.clientscriptMaskIndex.getReferenceTableCrc()); - Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.npcConfigIndex.getReferenceTableCrc()); - Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.itemConfigIndex.getReferenceTableCrc()); - Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.animationIndex.getReferenceTableCrc()); - Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.graphicFXIndex.getReferenceTableCrc()); - Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.clientScriptConfigIndex.getReferenceTableCrc()); - Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.worldmapIndex.getReferenceTableCrc()); - Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.quickchatMessagesIndex.getReferenceTableCrc()); - Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.quickchatMenusIndex.getReferenceTableCrc()); - Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.materialsIndex.getReferenceTableCrc()); - Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.particlesConfigIndex.getReferenceTableCrc()); - Unsorted.aBufferedDataStream_2942.writeInt(CacheIndex.libIndex.getReferenceTableCrc()); - Unsorted.aBufferedDataStream_2942.putBytes(TextureOperation12.outgoingBuffer.buffer, TextureOperation12.outgoingBuffer.index); - Class3_Sub15.activeConnection.sendBytes(Unsorted.aBufferedDataStream_2942.buffer, Unsorted.aBufferedDataStream_2942.index); + buffer.writeShort(Class113.interfacePacketCounter); + buffer.writeInt(CacheIndex.skeletonsIndex.getReferenceTableCrc()); + buffer.writeInt(CacheIndex.skinsIndex.getReferenceTableCrc()); + buffer.writeInt(CacheIndex.configurationsIndex.getReferenceTableCrc()); + buffer.writeInt(CacheIndex.interfacesIndex.getReferenceTableCrc()); + buffer.writeInt(CacheIndex.soundFXIndex.getReferenceTableCrc()); + buffer.writeInt(CacheIndex.landscapesIndex.getReferenceTableCrc()); + buffer.writeInt(CacheIndex.musicIndex.getReferenceTableCrc()); + buffer.writeInt(CacheIndex.modelsIndex.getReferenceTableCrc()); + buffer.writeInt(CacheIndex.spritesIndex.getReferenceTableCrc()); + buffer.writeInt(CacheIndex.texturesIndex.getReferenceTableCrc()); + buffer.writeInt(CacheIndex.huffmanEncodingIndex.getReferenceTableCrc()); + buffer.writeInt(CacheIndex.music2Index.getReferenceTableCrc()); + buffer.writeInt(CacheIndex.interfaceScriptsIndex.getReferenceTableCrc()); + buffer.writeInt(CacheIndex.fontsIndex.getReferenceTableCrc()); + buffer.writeInt(CacheIndex.soundFX2Index.getReferenceTableCrc()); + buffer.writeInt(CacheIndex.soundFX3Index.getReferenceTableCrc()); + buffer.writeInt(CacheIndex.objectConfigIndex.getReferenceTableCrc()); + buffer.writeInt(CacheIndex.clientscriptMaskIndex.getReferenceTableCrc()); + buffer.writeInt(CacheIndex.npcConfigIndex.getReferenceTableCrc()); + buffer.writeInt(CacheIndex.itemConfigIndex.getReferenceTableCrc()); + buffer.writeInt(CacheIndex.animationIndex.getReferenceTableCrc()); + buffer.writeInt(CacheIndex.graphicFXIndex.getReferenceTableCrc()); + buffer.writeInt(CacheIndex.clientScriptConfigIndex.getReferenceTableCrc()); + buffer.writeInt(CacheIndex.worldmapIndex.getReferenceTableCrc()); + buffer.writeInt(CacheIndex.quickchatMessagesIndex.getReferenceTableCrc()); + buffer.writeInt(CacheIndex.quickchatMenusIndex.getReferenceTableCrc()); + buffer.writeInt(CacheIndex.materialsIndex.getReferenceTableCrc()); + buffer.writeInt(CacheIndex.particlesConfigIndex.getReferenceTableCrc()); + buffer.writeInt(CacheIndex.libIndex.getReferenceTableCrc()); + buffer.putBytes(TextureOperation12.outgoingBuffer.buffer, TextureOperation12.outgoingBuffer.index); + Class3_Sub15.activeConnection.sendBytes(buffer.buffer, buffer.index); TextureOperation12.outgoingBuffer.method814(var9); for (int var2 = 0; var2 < 4; ++var2) { @@ -278,12 +279,12 @@ public class LoginHandler { if (!Client.paramAdvertisementSuppressed) { if ((!Class3_Sub15.aBoolean2433 || Unsorted.aBoolean4063) && !TextureOperation3.disableGEBoxes) { try { - TextCore.aClass94_516.method1577(Class38.signlink.gameApplet); + TextCore.aClass94_516.method1577(Class38.gameSignlink.gameApplet); } catch (Throwable var5) { } } else { try { - Class97.aClass94_1374.method1577(Class38.signlink.gameApplet); + Class97.aClass94_1374.method1577(Class38.gameSignlink.gameApplet); } catch (Throwable var6) { } } diff --git a/Client/src/main/java/org/runite/client/MessageManager.java b/Client/src/main/java/org/runite/client/MessageManager.java index 28299b894..bd6eaab37 100644 --- a/Client/src/main/java/org/runite/client/MessageManager.java +++ b/Client/src/main/java/org/runite/client/MessageManager.java @@ -2,20 +2,24 @@ package org.runite.client; public final class MessageManager { + static RSString[] aClass94Array3226 = new RSString[100]; + static int[] anIntArray1835 = new int[100]; + static int[] anIntArray3082 = new int[100]; + static void sendGameMessage(int var0, int type, RSString message, RSString var3, RSString var5) { for (int i = 99; i > 0; --i) { - ConfigInventoryDefinition.anIntArray3082[i] = ConfigInventoryDefinition.anIntArray3082[i - 1]; - ConfigInventoryDefinition.aClass94Array3226[i] = ConfigInventoryDefinition.aClass94Array3226[i - 1]; + anIntArray3082[i] = anIntArray3082[i - 1]; + aClass94Array3226[i] = aClass94Array3226[i - 1]; LinkableRSString.aClass94Array2580[i] = LinkableRSString.aClass94Array2580[-1 + i]; Class163_Sub3.aClass94Array3003[i] = Class163_Sub3.aClass94Array3003[i + -1]; - ConfigInventoryDefinition.anIntArray1835[i] = ConfigInventoryDefinition.anIntArray1835[i - 1]; + anIntArray1835[i] = anIntArray1835[i - 1]; } ++TextureOperation16.anInt3114; - ConfigInventoryDefinition.anIntArray3082[0] = type; - ConfigInventoryDefinition.aClass94Array3226[0] = var5; + anIntArray3082[0] = type; + aClass94Array3226[0] = var5; Class24.anInt472 = PacketParser.anInt3213; - ConfigInventoryDefinition.anIntArray1835[0] = var0; + anIntArray1835[0] = var0; RSString primaryMsg = RSString.parse("null"); RSString secondaryMsg = RSString.parse("null"); int cutOff = 81 - (var3 != null ? var3.length : 0) - (var5 != null ? var5.length : 0); diff --git a/Client/src/main/java/org/runite/client/PacketParser.java b/Client/src/main/java/org/runite/client/PacketParser.java index aa161ec1c..3399badf6 100644 --- a/Client/src/main/java/org/runite/client/PacketParser.java +++ b/Client/src/main/java/org/runite/client/PacketParser.java @@ -394,7 +394,7 @@ public final class PacketParser { } } else if (Unsorted.incomingOpcode == 164) { nodeModelId = BufferedDataStream.incomingBuffer.readIntV1(); - Class136.aClass64_1778 = Class38.signlink.method1449((byte) -83 ^ -82, nodeModelId); + Class136.aClass64_1778 = Class38.gameSignlink.method1449((byte) -83 ^ -82, nodeModelId); Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 225) { @@ -1037,7 +1037,7 @@ public final class PacketParser { Class140_Sub6.anInt2905 = anInt3213; return true; } else if (Unsorted.incomingOpcode == 114) { - TextureOperation3.method305(Class38.signlink, BufferedDataStream.incomingBuffer, Unsorted.incomingPacketLength); + TextureOperation3.method305(Class38.gameSignlink, BufferedDataStream.incomingBuffer, Unsorted.incomingPacketLength); Unsorted.incomingOpcode = -1; return true; } else if (65 == Unsorted.incomingOpcode) { @@ -1092,7 +1092,7 @@ public final class PacketParser { Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 42) { - if (null != TextureOperation30.aFrame3121) { + if (null != TextureOperation30.fullScreenFrame) { GameObject.graphicsSettings(false, Unsorted.anInt2577, -1, -1); } @@ -1104,7 +1104,7 @@ public final class PacketParser { } else { TextureOperation5.aClass94_3295 = playerName; Unsorted.aBoolean2154 = true; - Class15.aClass64_351 = Class38.signlink.method1452(new String(playerName.method1568(), StandardCharsets.ISO_8859_1), true); + Class15.aClass64_351 = Class38.gameSignlink.method1452(new String(playerName.method1568(), StandardCharsets.ISO_8859_1), true); } Unsorted.incomingOpcode = -1; @@ -1711,7 +1711,7 @@ public final class PacketParser { Unsorted.incomingOpcode = -1; return true; } else { - Class49.reportError("T1 - " + Unsorted.incomingOpcode + "," + Class7.anInt2166 + "," + Class24.anInt469 + " - " + Unsorted.incomingPacketLength, null, (byte) 117); + Class49.reportError("T1 - " + Unsorted.incomingOpcode + "," + Class7.anInt2166 + "," + Class24.anInt469 + " - " + Unsorted.incomingPacketLength, null); Class167.method2269((byte) 46); return true; } diff --git a/Client/src/main/java/org/runite/client/SequenceDefinition.java b/Client/src/main/java/org/runite/client/SequenceDefinition.java index 749e4d177..5f5bab456 100644 --- a/Client/src/main/java/org/runite/client/SequenceDefinition.java +++ b/Client/src/main/java/org/runite/client/SequenceDefinition.java @@ -550,7 +550,7 @@ public final class SequenceDefinition { TextureOperation38.aShortArray3455 = TextureOperation16.aShortArray3110 = Class136.aShortArray1779 = TextureOperation38.aShortArray3453 = new short[256]; InvalidateData.method165(); Unsorted.aBoolean1951 = false; - TextureOperation9.method204(-3); + TextureOperation9.method204(); } catch (RuntimeException var6) { throw ClientErrorException.clientError(var6, "tk.A(" + true + ')'); } diff --git a/Client/src/main/java/org/runite/client/Signlink.java b/Client/src/main/java/org/runite/client/Signlink.java index ad0e84b68..bbbbc2c13 100644 --- a/Client/src/main/java/org/runite/client/Signlink.java +++ b/Client/src/main/java/org/runite/client/Signlink.java @@ -619,7 +619,7 @@ public class Signlink implements Runnable { return this.method1435(6, var1 + (var2 << 16), null, (var4 << 16) + var3); } - public final Class64 method1451(int var2, Runnable var3) { + public final Class64 startThread(int var2, Runnable var3) { return this.method1435(2, 0, var3, var2); } diff --git a/Client/src/main/java/org/runite/client/TextureOperation20.java b/Client/src/main/java/org/runite/client/TextureOperation20.java index 9a40eb26a..032ed3946 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation20.java +++ b/Client/src/main/java/org/runite/client/TextureOperation20.java @@ -36,13 +36,13 @@ final class TextureOperation20 extends TextureOperation { if(image == null) { cursor = -1; } else { - Class38.signlink.method1434(image.method655(), 10000, image.anInt3697, GameShell.canvas, new Point(cursorDef.getHotspotX(), cursorDef.getHotspotY()), image.anInt3706); + Class38.gameSignlink.method1434(image.method655(), 10000, image.anInt3697, GameShell.canvas, new Point(cursorDef.getHotspotX(), cursorDef.getHotspotY()), image.anInt3706); Class65.anInt991 = cursor; } } if(cursor == -1 && Class65.anInt991 != -1) { - Class38.signlink.method1434(null, 10000, -1, GameShell.canvas, new Point(), -1); + Class38.gameSignlink.method1434(null, 10000, -1, GameShell.canvas, new Point(), -1); Class65.anInt991 = -1; } diff --git a/Client/src/main/java/org/runite/client/TextureOperation30.java b/Client/src/main/java/org/runite/client/TextureOperation30.java index 73229309c..d5245c8a1 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation30.java +++ b/Client/src/main/java/org/runite/client/TextureOperation30.java @@ -4,11 +4,11 @@ import java.util.Objects; final class TextureOperation30 extends TextureOperation { - static volatile boolean aBoolean3116 = true; + static volatile boolean fullRedraw = true; static boolean[][] aBooleanArrayArray3118 = new boolean[][]{new boolean[0], {true, false, true}, {true, false, false, true}, {false, false, true, true}, {true, true, false}, {false, true, true}, {true, false, false, true}, {false, false, false, true, true}, {false, true, true}, {true, false, true, true, true}, {false, true, true, true, true}, {false, true, true, true, true, false}}; - static Frame aFrame3121; - static Signlink aClass87_3125; + static Frame fullScreenFrame; + static Signlink signlink; private int anInt3126 = 2048; private int anInt3127 = 3072; private int anInt3128 = 1024; @@ -44,20 +44,6 @@ final class TextureOperation30 extends TextureOperation { } } - public static void method211(int var0) { - try { - if(var0 != 1024) { - aClass87_3125 = null; - } - TextCore.COMMAND_NOCLIP = null; - aFrame3121 = null; - aBooleanArrayArray3118 = null; - aClass87_3125 = null; - } catch (RuntimeException var2) { - throw ClientErrorException.clientError(var2, "fh.C(" + var0 + ')'); - } - } - final int[] method154(int var1, byte var2) { try { int[] var7 = this.aClass114_2382.method1709(var1); @@ -184,7 +170,7 @@ final class TextureOperation30 extends TextureOperation { short var2 = 256; int var3 = 0; if(var0 >= -80) { - aBoolean3116 = true; + fullRedraw = true; } while(Class161.anIntArray2026.length > var3) { @@ -247,10 +233,6 @@ final class TextureOperation30 extends TextureOperation { } } - if(-1 != -1) { - method211(51); - } - return var3; } catch (RuntimeException var12) { throw ClientErrorException.clientError(var12, "fh.T(" + -1 + ',' + var2 + ')'); diff --git a/Client/src/main/java/org/runite/client/TextureOperation33.java b/Client/src/main/java/org/runite/client/TextureOperation33.java index 364e7cca2..a7fa10d66 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation33.java +++ b/Client/src/main/java/org/runite/client/TextureOperation33.java @@ -47,10 +47,6 @@ public final class TextureOperation33 extends TextureOperation { final void decode(int var1, DataBuffer var2) { try { - if (!true) { - CS2Script.aShort3052 = -37; - } - if (0 == var1) { this.anInt3047 = var2.readUnsignedShort(); } else if (var1 == 1) { @@ -62,37 +58,6 @@ public final class TextureOperation33 extends TextureOperation { } } - static int method179(byte var0, int var1) { - try { - if (var0 == 92) { - if (null != Class3_Sub15.activeConnection) { - Class3_Sub15.activeConnection.close(); - Class3_Sub15.activeConnection = null; - } - - ++Unsorted.anInt1088; - if (Unsorted.anInt1088 > 4) { - Class43.worldListStage = 0; - Unsorted.anInt1088 = 0; - return var1; - } else { - Class43.worldListStage = 0; - if (Class123.anInt1658 == Client.anInt3773) { - Class123.anInt1658 = Class53.anInt867; - } else { - Class123.anInt1658 = Client.anInt3773; - } - - return -1; - } - } else { - return 122; - } - } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "an.F(" + var0 + ',' + var1 + ')'); - } - } - static void method180(int var0, int var1, int var2) { try { int var3; @@ -142,7 +107,7 @@ public final class TextureOperation33 extends TextureOperation { var2 = var2 + BufferedDataStream.incomingBuffer.buffer[var3] + ","; } - Class49.reportError(var2, var5, (byte) 108); + Class49.reportError(var2, var5); Class167.method2269((byte) 46); return true; } @@ -150,10 +115,6 @@ public final class TextureOperation33 extends TextureOperation { static void method182() { try { - if (false) { - method179((byte) 120, -73); - } - Texture.aReferenceCache_1146.clear(); Class159.aReferenceCache_2016.clear(); } catch (RuntimeException var2) { @@ -163,7 +124,6 @@ public final class TextureOperation33 extends TextureOperation { static void method183() { try { - Unsorted.aReferenceCache_684.clear(); Class163_Sub1.aReferenceCache_2984.clear(); } catch (RuntimeException var2) { @@ -247,11 +207,6 @@ public final class TextureOperation33 extends TextureOperation { var9[var10] = var13; } } - - if (-1 != -1) { - method180(-55, -63, -5); - } - return var3; } catch (RuntimeException var21) { throw ClientErrorException.clientError(var21, "an.T(" + -1 + ',' + var2 + ')'); diff --git a/Client/src/main/java/org/runite/client/TextureOperation37.java b/Client/src/main/java/org/runite/client/TextureOperation37.java index 59d076e3d..7591bc1b0 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation37.java +++ b/Client/src/main/java/org/runite/client/TextureOperation37.java @@ -76,7 +76,7 @@ final class TextureOperation37 extends TextureOperation { if(Unsorted.registryStage == 1) { //Ip & Port - Class3_Sub9.aClass64_2318 = Class38.signlink.method1441((byte)8, Class38_Sub1.accRegistryIp, Class140_Sub6.accRegistryPort); + Class3_Sub9.aClass64_2318 = Class38.gameSignlink.method1441((byte)8, Class38_Sub1.accRegistryIp, Class140_Sub6.accRegistryPort); Unsorted.registryStage = 2; } @@ -88,7 +88,7 @@ final class TextureOperation37 extends TextureOperation { if(1 != Class3_Sub9.aClass64_2318.anInt978) { return; } - Class3_Sub15.activeConnection = new Connection((Socket)Class3_Sub9.aClass64_2318.anObject974, Class38.signlink); + Class3_Sub15.activeConnection = new Connection((Socket)Class3_Sub9.aClass64_2318.anObject974, Class38.gameSignlink); Class3_Sub9.aClass64_2318 = null; Class3_Sub15.activeConnection.sendBytes(TextureOperation12.outgoingBuffer.buffer, TextureOperation12.outgoingBuffer.index); if(WorldListEntry.aClass155_2627 != null) { diff --git a/Client/src/main/java/org/runite/client/TextureOperation9.java b/Client/src/main/java/org/runite/client/TextureOperation9.java index 7acca5668..0acaa8e40 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation9.java +++ b/Client/src/main/java/org/runite/client/TextureOperation9.java @@ -99,20 +99,16 @@ public final class TextureOperation9 extends TextureOperation { } } - static void method204(int var0) { + static void method204() { try { //Client Resize. TextureOperation12.outgoingBuffer.putOpcode(243); TextureOperation12.outgoingBuffer.writeByte(Class83.getWindowType()); TextureOperation12.outgoingBuffer.writeShort(Class23.canvasWidth); - if(var0 != -3) { - anInt3103 = -41; - } - TextureOperation12.outgoingBuffer.writeShort(Class140_Sub7.canvasHeight); TextureOperation12.outgoingBuffer.writeByte(Unsorted.anInt3671); } catch (RuntimeException var2) { - throw ClientErrorException.clientError(var2, "ej.C(" + var0 + ')'); + throw ClientErrorException.clientError(var2, "ej.C(" + -3 + ')'); } } diff --git a/Client/src/main/java/org/runite/client/Unsorted.java b/Client/src/main/java/org/runite/client/Unsorted.java index 02cc5daa7..fa71534bc 100644 --- a/Client/src/main/java/org/runite/client/Unsorted.java +++ b/Client/src/main/java/org/runite/client/Unsorted.java @@ -46,7 +46,6 @@ public class Unsorted { public static RSInterface aClass11_1933; public static float[] aFloatArray1934 = new float[]{0.073F, 0.169F, 0.24F, 1.0F}; public static Class8 aClass8_1936; - public static BufferedDataStream aBufferedDataStream_2942 = new BufferedDataStream(); public static int[] anIntArray2952 = new int[128]; public static int anInt2958 = 0; public static LinkedList aLinkedList_78 = new LinkedList(); @@ -102,7 +101,6 @@ public class Unsorted { public static int anInt3642 = 0; public static int anInt3644 = 0; public static int anInt59 = 0; - public static short[] aShortArray63 = new short[]{(short) 960, (short) 957, (short) -21568, (short) -21571, (short) 22464}; public static int anInt65; public static boolean isMember = false; public static int anInt67; @@ -124,7 +122,6 @@ public class Unsorted { public static CacheIndex aClass153_4048; public static int[] anIntArray4050 = new int[1000]; public static ReferenceCache aReferenceCache_4051 = new ReferenceCache(30); - public static short[][] aShortArrayArray1619 = new short[][]{{(short) 10, (short) 30, (short) 50, (short) 70, (short) 90, (short) 110, (short) 310, (short) 684, (short) 704, (short) 556, (short) 940, (short) 960, (short) 6454, (short) 6952, (short) 6972, (short) 2358, (short) 2732, (short) 2752, (short) 10550, (short) 10924, (short) 10944, (short) 10310, (short) 10556, (short) 10576, (short) 14646, (short) 15020, (short) 15040, (short) 19766, (short) 20140, (short) 20160, (short) -29386, (short) -29012, (short) -28992, (short) 31030, (short) 31276, (short) 31296, (short) -24266, (short) -23892, (short) -23872, (short) -19146, (short) -18772, (short) -18752, (short) -14026, (short) -13652, (short) -13632, (short) -6858, (short) -6484, (short) -6464, (short) 522, (short) 542, (short) 6794, (short) 6814, (short) 11018, (short) 11038, (short) 14986, (short) 15006, (short) 21130, (short) 21150, (short) -28918, (short) -28898, (short) -22006, (short) -21986, (short) -12918, (short) -12898, (short) 10, (short) 30, (short) 50, (short) 70, (short) 90, (short) 110, (short) 310, (short) 684, (short) 704, (short) 556, (short) 940, (short) 960, (short) 6454, (short) 6952, (short) 6972, (short) 2358, (short) 2732, (short) 2752, (short) 10550, (short) 10924, (short) 10944, (short) 10310, (short) 10556, (short) 10576, (short) 14646, (short) 15020, (short) 15040, (short) 19766, (short) 20140, (short) 20160, (short) -29386, (short) -29012, (short) -28992, (short) 31030, (short) 31276, (short) 31296, (short) -24266, (short) -23892, (short) -23872, (short) -19146, (short) -18772, (short) -18752, (short) -14026, (short) -13652, (short) -13632, (short) -6858, (short) -6484, (short) -6464, (short) 522, (short) 542, (short) 6794, (short) 6814, (short) 11018, (short) 11038, (short) 14986, (short) 15006, (short) 21130, (short) 21150, (short) -28918, (short) -28898, (short) -22006, (short) -21986, (short) -12918, (short) -12898, (short) 10, (short) 30, (short) 50, (short) 70, (short) 90, (short) 110, (short) 310, (short) 684, (short) 704, (short) 556, (short) 940, (short) 960, (short) 6454, (short) 6952, (short) 6972, (short) 2358, (short) 2732, (short) 2752, (short) 10550, (short) 10924, (short) 10944, (short) 10310, (short) 10556, (short) 10576, (short) 14646, (short) 15020, (short) 15040, (short) 19766, (short) 20140, (short) 20160, (short) -29386, (short) -29012, (short) -28992, (short) 31030, (short) 31276, (short) 31296, (short) -24266, (short) -23892, (short) -23872, (short) -19146, (short) -18772, (short) -18752, (short) -14026, (short) -13652, (short) -13632, (short) -6858, (short) -6484, (short) -6464, (short) 522, (short) 542, (short) 6794, (short) 6814, (short) 11018, (short) 11038, (short) 14986, (short) 15006, (short) 21130, (short) 21150, (short) -28918, (short) -28898, (short) -22006, (short) -21986, (short) -12918, (short) -12898, (short) 10, (short) 30, (short) 50, (short) 70, (short) 90, (short) 110, (short) 310, (short) 684, (short) 704, (short) 556, (short) 940, (short) 960, (short) 6454, (short) 6952, (short) 6972, (short) 2358, (short) 2732, (short) 2752, (short) 10550, (short) 10924, (short) 10944, (short) 10310, (short) 10556, (short) 10576, (short) 14646, (short) 15020, (short) 15040, (short) 19766, (short) 20140, (short) 20160, (short) -29386, (short) -29012, (short) -28992, (short) 31030, (short) 31276, (short) 31296, (short) -24266, (short) -23892, (short) -23872, (short) -19146, (short) -18772, (short) -18752, (short) -14026, (short) -13652, (short) -13632, (short) -6858, (short) -6484, (short) -6464, (short) 522, (short) 542, (short) 6794, (short) 6814, (short) 11018, (short) 11038, (short) 14986, (short) 15006, (short) 21130, (short) 21150, (short) -28918, (short) -28898, (short) -22006, (short) -21986, (short) -12918, (short) -12898}, {(short) 10, (short) 30, (short) 50, (short) 70, (short) 90, (short) 110, (short) 310, (short) 684, (short) 704, (short) 556, (short) 940, (short) 960, (short) 6454, (short) 6952, (short) 6972, (short) 2358, (short) 2732, (short) 2752, (short) 10550, (short) 10924, (short) 10944, (short) 10310, (short) 10556, (short) 10576, (short) 14646, (short) 15020, (short) 15040, (short) 19766, (short) 20140, (short) 20160, (short) -29386, (short) -29012, (short) -28992, (short) 31030, (short) 31276, (short) 31296, (short) -24266, (short) -23892, (short) -23872, (short) -19146, (short) -18772, (short) -18752, (short) -14026, (short) -13652, (short) -13632, (short) -6858, (short) -6484, (short) -6464, (short) 522, (short) 542, (short) 6794, (short) 6814, (short) 11018, (short) 11038, (short) 14986, (short) 15006, (short) 21130, (short) 21150, (short) -28918, (short) -28898, (short) -22006, (short) -21986, (short) -12918, (short) -12898, (short) 10, (short) 30, (short) 50, (short) 70, (short) 90, (short) 110, (short) 310, (short) 684, (short) 704, (short) 556, (short) 940, (short) 960, (short) 6454, (short) 6952, (short) 6972, (short) 2358, (short) 2732, (short) 2752, (short) 10550, (short) 10924, (short) 10944, (short) 10310, (short) 10556, (short) 10576, (short) 14646, (short) 15020, (short) 15040, (short) 19766, (short) 20140, (short) 20160, (short) -29386, (short) -29012, (short) -28992, (short) 31030, (short) 31276, (short) 31296, (short) -24266, (short) -23892, (short) -23872, (short) -19146, (short) -18772, (short) -18752, (short) -14026, (short) -13652, (short) -13632, (short) -6858, (short) -6484, (short) -6464, (short) 522, (short) 542, (short) 6794, (short) 6814, (short) 11018, (short) 11038, (short) 14986, (short) 15006, (short) 21130, (short) 21150, (short) -28918, (short) -28898, (short) -22006, (short) -21986, (short) -12918, (short) -12898, (short) 10, (short) 30, (short) 50, (short) 70, (short) 90, (short) 110, (short) 310, (short) 684, (short) 704, (short) 556, (short) 940, (short) 960, (short) 6454, (short) 6952, (short) 6972, (short) 2358, (short) 2732, (short) 2752, (short) 10550, (short) 10924, (short) 10944, (short) 10310, (short) 10556, (short) 10576, (short) 14646, (short) 15020, (short) 15040, (short) 19766, (short) 20140, (short) 20160, (short) -29386, (short) -29012, (short) -28992, (short) 31030, (short) 31276, (short) 31296, (short) -24266, (short) -23892, (short) -23872, (short) -19146, (short) -18772, (short) -18752, (short) -14026, (short) -13652, (short) -13632, (short) -6858, (short) -6484, (short) -6464, (short) 522, (short) 542, (short) 6794, (short) 6814, (short) 11018, (short) 11038, (short) 14986, (short) 15006, (short) 21130, (short) 21150, (short) -28918, (short) -28898, (short) -22006, (short) -21986, (short) -12918, (short) -12898, (short) 10347, (short) 10582, (short) 10429, (short) 10407, (short) 10359, (short) 8414, (short) 9540, (short) 10456, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0}, {(short) 10, (short) 30, (short) 50, (short) 70, (short) 90, (short) 110, (short) 310, (short) 684, (short) 704, (short) 556, (short) 940, (short) 960, (short) 6454, (short) 6952, (short) 6972, (short) 2358, (short) 2732, (short) 2752, (short) 10550, (short) 10924, (short) 10944, (short) 10310, (short) 10556, (short) 10576, (short) 14646, (short) 15020, (short) 15040, (short) 19766, (short) 20140, (short) 20160, (short) -29386, (short) -29012, (short) -28992, (short) 31030, (short) 31276, (short) 31296, (short) -24266, (short) -23892, (short) -23872, (short) -19146, (short) -18772, (short) -18752, (short) -14026, (short) -13652, (short) -13632, (short) -6858, (short) -6484, (short) -6464, (short) 522, (short) 542, (short) 6794, (short) 6814, (short) 11018, (short) 11038, (short) 14986, (short) 15006, (short) 21130, (short) 21150, (short) -28918, (short) -28898, (short) -22006, (short) -21986, (short) -12918, (short) -12898, (short) 10, (short) 30, (short) 50, (short) 70, (short) 90, (short) 110, (short) 310, (short) 684, (short) 704, (short) 556, (short) 940, (short) 960, (short) 6454, (short) 6952, (short) 6972, (short) 2358, (short) 2732, (short) 2752, (short) 10550, (short) 10924, (short) 10944, (short) 10310, (short) 10556, (short) 10576, (short) 14646, (short) 15020, (short) 15040, (short) 19766, (short) 20140, (short) 20160, (short) -29386, (short) -29012, (short) -28992, (short) 31030, (short) 31276, (short) 31296, (short) -24266, (short) -23892, (short) -23872, (short) -19146, (short) -18772, (short) -18752, (short) -14026, (short) -13652, (short) -13632, (short) -6858, (short) -6484, (short) -6464, (short) 522, (short) 542, (short) 6794, (short) 6814, (short) 11018, (short) 11038, (short) 14986, (short) 15006, (short) 21130, (short) 21150, (short) -28918, (short) -28898, (short) -22006, (short) -21986, (short) -12918, (short) -12898, (short) 10, (short) 30, (short) 50, (short) 70, (short) 90, (short) 110, (short) 310, (short) 684, (short) 704, (short) 556, (short) 940, (short) 960, (short) 6454, (short) 6952, (short) 6972, (short) 2358, (short) 2732, (short) 2752, (short) 10550, (short) 10924, (short) 10944, (short) 10310, (short) 10556, (short) 10576, (short) 14646, (short) 15020, (short) 15040, (short) 19766, (short) 20140, (short) 20160, (short) -29386, (short) -29012, (short) -28992, (short) 31030, (short) 31276, (short) 31296, (short) -24266, (short) -23892, (short) -23872, (short) -19146, (short) -18772, (short) -18752, (short) -14026, (short) -13652, (short) -13632, (short) -6858, (short) -6484, (short) -6464, (short) 522, (short) 542, (short) 6794, (short) 6814, (short) 11018, (short) 11038, (short) 14986, (short) 15006, (short) 21130, (short) 21150, (short) -28918, (short) -28898, (short) -22006, (short) -21986, (short) -12918, (short) -12898, (short) 10, (short) 30, (short) 50, (short) 70, (short) 90, (short) 110, (short) 310, (short) 684, (short) 704, (short) 556, (short) 940, (short) 960, (short) 6454, (short) 6952, (short) 6972, (short) 2358, (short) 2732, (short) 2752, (short) 10550, (short) 10924, (short) 10944, (short) 10310, (short) 10556, (short) 10576, (short) 14646, (short) 15020, (short) 15040, (short) 19766, (short) 20140, (short) 20160, (short) -29386, (short) -29012, (short) -28992, (short) 31030, (short) 31276, (short) 31296, (short) -24266, (short) -23892, (short) -23872, (short) -19146, (short) -18772, (short) -18752, (short) -14026, (short) -13652, (short) -13632, (short) -6858, (short) -6484, (short) -6464, (short) 522, (short) 542, (short) 6794, (short) 6814, (short) 11018, (short) 11038, (short) 14986, (short) 15006, (short) 21130, (short) 21150, (short) -28918, (short) -28898, (short) -22006, (short) -21986, (short) -12918, (short) -12898}, {(short) 4300, (short) 3294, (short) 3303, (short) 3264, (short) 4506, (short) 4382, (short) 4387, (short) 5293, (short) 7622, (short) 7384, (short) 8412, (short) 7496, (short) 86, (short) 123, (short) 111, (short) 99, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 10, (short) 30, (short) 50, (short) 70, (short) 90, (short) 110, (short) 310, (short) 684, (short) 704, (short) 556, (short) 940, (short) 960, (short) 6454, (short) 6952, (short) 6972, (short) 2358, (short) 2732, (short) 2752, (short) 10550, (short) 10924, (short) 10944, (short) 10310, (short) 10556, (short) 10576, (short) 14646, (short) 15020, (short) 15040, (short) 19766, (short) 20140, (short) 20160, (short) -29386, (short) -29012, (short) -28992, (short) 31030, (short) 31276, (short) 31296, (short) -24266, (short) -23892, (short) -23872, (short) -19146, (short) -18772, (short) -18752, (short) -14026, (short) -13652, (short) -13632, (short) -6858, (short) -6484, (short) -6464, (short) 522, (short) 542, (short) 6794, (short) 6814, (short) 11018, (short) 11038, (short) 14986, (short) 15006, (short) 21130, (short) 21150, (short) -28918, (short) -28898, (short) -22006, (short) -21986, (short) -12918, (short) -12898, (short) 10, (short) 30, (short) 50, (short) 70, (short) 90, (short) 110, (short) 310, (short) 684, (short) 704, (short) 556, (short) 940, (short) 960, (short) 6454, (short) 6952, (short) 6972, (short) 2358, (short) 2732, (short) 2752, (short) 10550, (short) 10924, (short) 10944, (short) 10310, (short) 10556, (short) 10576, (short) 14646, (short) 15020, (short) 15040, (short) 19766, (short) 20140, (short) 20160, (short) -29386, (short) -29012, (short) -28992, (short) 31030, (short) 31276, (short) 31296, (short) -24266, (short) -23892, (short) -23872, (short) -19146, (short) -18772, (short) -18752, (short) -14026, (short) -13652, (short) -13632, (short) -6858, (short) -6484, (short) -6464, (short) 522, (short) 542, (short) 6794, (short) 6814, (short) 11018, (short) 11038, (short) 14986, (short) 15006, (short) 21130, (short) 21150, (short) -28918, (short) -28898, (short) -22006, (short) -21986, (short) -12918, (short) -12898, (short) 13766, (short) 13745, (short) 13726, (short) 13890, (short) 13743, (short) 13852, (short) 17602, (short) 18605, (short) 21660, (short) 24000, (short) 24997, (short) 24088, (short) 27972, (short) 25903, (short) 26904, (short) 27193, (short) 27175, (short) 27156, (short) 30020, (short) 28975, (short) 29976, (short) 12482, (short) 13485, (short) 10392, (short) 10692, (short) 10669, (short) 10776, (short) 6717, (short) 6695, (short) 7830, (short) 6971, (short) 6951, (short) 5910, (short) 3389, (short) 3369, (short) 3356, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0, (short) 0}, {(short) 10, (short) 30, (short) 50, (short) 70, (short) 90, (short) 110, (short) 310, (short) 684, (short) 704, (short) 556, (short) 940, (short) 960, (short) 6454, (short) 6952, (short) 6972, (short) 2358, (short) 2732, (short) 2752, (short) 10550, (short) 10924, (short) 10944, (short) 10310, (short) 10556, (short) 10576, (short) 14646, (short) 15020, (short) 15040, (short) 19766, (short) 20140, (short) 20160, (short) -29386, (short) -29012, (short) -28992, (short) 31030, (short) 31276, (short) 31296, (short) -24266, (short) -23892, (short) -23872, (short) -19146, (short) -18772, (short) -18752, (short) -14026, (short) -13652, (short) -13632, (short) -6858, (short) -6484, (short) -6464, (short) 522, (short) 542, (short) 6794, (short) 6814, (short) 11018, (short) 11038, (short) 14986, (short) 15006, (short) 21130, (short) 21150, (short) -28918, (short) -28898, (short) -22006, (short) -21986, (short) -12918, (short) -12898, (short) 10, (short) 30, (short) 50, (short) 70, (short) 90, (short) 110, (short) 310, (short) 684, (short) 704, (short) 556, (short) 940, (short) 960, (short) 6454, (short) 6952, (short) 6972, (short) 2358, (short) 2732, (short) 2752, (short) 10550, (short) 10924, (short) 10944, (short) 10310, (short) 10556, (short) 10576, (short) 14646, (short) 15020, (short) 15040, (short) 19766, (short) 20140, (short) 20160, (short) -29386, (short) -29012, (short) -28992, (short) 31030, (short) 31276, (short) 31296, (short) -24266, (short) -23892, (short) -23872, (short) -19146, (short) -18772, (short) -18752, (short) -14026, (short) -13652, (short) -13632, (short) -6858, (short) -6484, (short) -6464, (short) 522, (short) 542, (short) 6794, (short) 6814, (short) 11018, (short) 11038, (short) 14986, (short) 15006, (short) 21130, (short) 21150, (short) -28918, (short) -28898, (short) -22006, (short) -21986, (short) -12918, (short) -12898, (short) 10, (short) 30, (short) 50, (short) 70, (short) 90, (short) 110, (short) 310, (short) 684, (short) 704, (short) 556, (short) 940, (short) 960, (short) 6454, (short) 6952, (short) 6972, (short) 2358, (short) 2732, (short) 2752, (short) 10550, (short) 10924, (short) 10944, (short) 10310, (short) 10556, (short) 10576, (short) 14646, (short) 15020, (short) 15040, (short) 19766, (short) 20140, (short) 20160, (short) -29386, (short) -29012, (short) -28992, (short) 31030, (short) 31276, (short) 31296, (short) -24266, (short) -23892, (short) -23872, (short) -19146, (short) -18772, (short) -18752, (short) -14026, (short) -13652, (short) -13632, (short) -6858, (short) -6484, (short) -6464, (short) 522, (short) 542, (short) 6794, (short) 6814, (short) 11018, (short) 11038, (short) 14986, (short) 15006, (short) 21130, (short) 21150, (short) -28918, (short) -28898, (short) -22006, (short) -21986, (short) -12918, (short) -12898, (short) 10, (short) 30, (short) 50, (short) 70, (short) 90, (short) 110, (short) 310, (short) 684, (short) 704, (short) 556, (short) 940, (short) 960, (short) 6454, (short) 6952, (short) 6972, (short) 2358, (short) 2732, (short) 2752, (short) 10550, (short) 10924, (short) 10944, (short) 10310, (short) 10556, (short) 10576, (short) 14646, (short) 15020, (short) 15040, (short) 19766, (short) 20140, (short) 20160, (short) -29386, (short) -29012, (short) -28992, (short) 31030, (short) 31276, (short) 31296, (short) -24266, (short) -23892, (short) -23872, (short) -19146, (short) -18772, (short) -18752, (short) -14026, (short) -13652, (short) -13632, (short) -6858, (short) -6484, (short) -6464, (short) 522, (short) 542, (short) 6794, (short) 6814, (short) 11018, (short) 11038, (short) 14986, (short) 15006, (short) 21130, (short) 21150, (short) -28918, (short) -28898, (short) -22006, (short) -21986, (short) -12918, (short) -12898}}; public static int gameWindowWidth = 0; public static Player[] players = new Player[2048]; static int anInt942; @@ -159,7 +156,7 @@ public class Unsorted { static int anInt2281 = 0; static int anInt2309 = 128; static boolean aBoolean2311; - static int anInt2334; + static int frameWidth; static int anInt3071 = 0; static int anInt3070 = 0; static int[] anIntArray3076; @@ -1109,7 +1106,7 @@ public class Unsorted { try { if (Class56.aClass106Array890 == null) { - Class106[] var1 = method596(Class38.signlink); + Class106[] var1 = method596(Class38.gameSignlink); Class106[] var2 = new Class106[var1.length]; int var3 = 0; @@ -1230,17 +1227,17 @@ public class Unsorted { public static void method1396(int var0) { try { - int var2 = Class106.anInt1442; - int var1 = Class84.anInt1164; - int var4 = -Class140_Sub7.canvasHeight + (Class70.anInt1047 - var2); - int var3 = -var1 + anInt2334 - Class23.canvasWidth; + int var2 = Class106.rightMargin; + int var1 = Class84.leftMargin; + int var4 = -Class140_Sub7.canvasHeight + (Class70.frameHeight - var2); + int var3 = -var1 + frameWidth - Class23.canvasWidth; if (~var1 < var0 || var3 > 0 || var2 > 0 || var4 > 0) { try { Object var5; - if (null != TextureOperation30.aFrame3121) { - var5 = TextureOperation30.aFrame3121; + if (null != TextureOperation30.fullScreenFrame) { + var5 = TextureOperation30.fullScreenFrame; } else if (GameShell.frame == null) { - var5 = Class38.signlink.gameApplet; + var5 = Class38.gameSignlink.gameApplet; } else { var5 = GameShell.frame; } @@ -1256,19 +1253,19 @@ public class Unsorted { Graphics var11 = ((Container) var5).getGraphics(); var11.setColor(Color.black); if (var1 > 0) { - var11.fillRect(var6, var7, var1, Class70.anInt1047); + var11.fillRect(var6, var7, var1, Class70.frameHeight); } if (0 < var2) { - var11.fillRect(var6, var7, anInt2334, var2); + var11.fillRect(var6, var7, frameWidth, var2); } if (var3 > 0) { - var11.fillRect(-var3 + var6 + anInt2334, var7, var3, Class70.anInt1047); + var11.fillRect(-var3 + var6 + frameWidth, var7, var3, Class70.frameHeight); } if (var4 > 0) { - var11.fillRect(var6, -var4 + var7 + Class70.anInt1047, anInt2334, var4); + var11.fillRect(var6, -var4 + var7 + Class70.frameHeight, frameWidth, var4); } } catch (Exception var9) { } @@ -1398,51 +1395,51 @@ public class Unsorted { HDToolKit.method1842(); } - if (null != TextureOperation30.aFrame3121 && (3 != var1 || TextureOperation.anInt2378 != var5 || anInt3071 != var6)) { - method593(TextureOperation30.aFrame3121, Class38.signlink); - TextureOperation30.aFrame3121 = null; + if (null != TextureOperation30.fullScreenFrame && (3 != var1 || TextureOperation.anInt2378 != var5 || anInt3071 != var6)) { + method593(TextureOperation30.fullScreenFrame, Class38.gameSignlink); + TextureOperation30.fullScreenFrame = null; } - if (3 == var1 && null == TextureOperation30.aFrame3121) { - TextureOperation30.aFrame3121 = Class99.method1597(0, var6, var5, Class38.signlink); - if (null != TextureOperation30.aFrame3121) { + if (3 == var1 && null == TextureOperation30.fullScreenFrame) { + TextureOperation30.fullScreenFrame = Class99.method1597(0, var6, var5, Class38.gameSignlink); + if (null != TextureOperation30.fullScreenFrame) { anInt3071 = var6; TextureOperation.anInt2378 = var5; - Class119.method1730(Class38.signlink); + Class119.method1730(Class38.gameSignlink); } } - if (var1 == 3 && TextureOperation30.aFrame3121 == null) { + if (var1 == 3 && TextureOperation30.fullScreenFrame == null) { method598(true, anInt2577, true, var3, var4, -1, -1); } else { Object var7; - if (null == TextureOperation30.aFrame3121) { + if (null == TextureOperation30.fullScreenFrame) { if (null == GameShell.frame) { - var7 = Class38.signlink.gameApplet; + var7 = Class38.gameSignlink.gameApplet; } else { var7 = GameShell.frame; } } else { - var7 = TextureOperation30.aFrame3121; + var7 = TextureOperation30.fullScreenFrame; } - anInt2334 = ((Container) var7).getSize().width; - Class70.anInt1047 = ((Container) var7).getSize().height; + frameWidth = ((Container) var7).getSize().width; + Class70.frameHeight = ((Container) var7).getSize().height; Insets var8; if (GameShell.frame == var7) { var8 = GameShell.frame.getInsets(); - anInt2334 -= var8.right + var8.left; - Class70.anInt1047 -= var8.bottom + var8.top; + frameWidth -= var8.right + var8.left; + Class70.frameHeight -= var8.bottom + var8.top; } if (var1 >= 2) { - Class23.canvasWidth = anInt2334; - Class140_Sub7.canvasHeight = Class70.anInt1047; - Class84.anInt1164 = 0; - Class106.anInt1442 = 0; + Class23.canvasWidth = frameWidth; + Class140_Sub7.canvasHeight = Class70.frameHeight; + Class84.leftMargin = 0; + Class106.rightMargin = 0; } else { - Class106.anInt1442 = 0; - Class84.anInt1164 = (anInt2334 + -765) / 2; + Class106.rightMargin = 0; + Class84.leftMargin = (frameWidth + -765) / 2; Class23.canvasWidth = 765; Class140_Sub7.canvasHeight = 503; } @@ -1468,9 +1465,9 @@ public class Unsorted { 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); + GameShell.canvas.setLocation(var8.left - -Class84.leftMargin, var8.top + Class106.rightMargin); } else { - GameShell.canvas.setLocation(Class84.anInt1164, Class106.anInt1442); + GameShell.canvas.setLocation(Class84.leftMargin, Class106.rightMargin); } } @@ -1505,7 +1502,7 @@ public class Unsorted { aClass158_3009 = null; } - Class64 var13 = Class38.signlink.method1444(-43, Client.clientInstance.getClass()); + Class64 var13 = Class38.gameSignlink.method1444(-43, Client.clientInstance.getClass()); while (var13.anInt978 == 0) { TimeUtils.sleep(100L); @@ -1525,7 +1522,7 @@ public class Unsorted { method598(true, 0, true, var3, false, -1, -1); } else { if (var1 > 0 && var3 == 0) { - Class17.aThread409.setPriority(5); + GameShell.aThread409.setPriority(5); aClass158_3009 = null; Class140_Sub1_Sub2.method1935(); ((Class102) Class51.anInterface2_838).method1619(200); @@ -1535,7 +1532,7 @@ public class Unsorted { InvalidateData.method165(); } else if (0 == var1 && var3 > 0) { - Class17.aThread409.setPriority(1); + GameShell.aThread409.setPriority(1); aClass158_3009 = TextureOperation18.method285(503, 765, GameShell.canvas); Class140_Sub1_Sub2.method1938(); ((Class102) Class51.anInterface2_838).method1619(20); @@ -1573,14 +1570,14 @@ public class Unsorted { } if (null != Class3_Sub15.activeConnection && (Class143.gameStage == 30 || Class143.gameStage == 25)) { - TextureOperation9.method204(-3); + TextureOperation9.method204(); } for (int var12 = 0; var12 < 100; ++var12) { aBooleanArray3674[var12] = true; } - TextureOperation30.aBoolean3116 = true; + TextureOperation30.fullRedraw = true; } } } catch (RuntimeException var10) { @@ -3534,7 +3531,7 @@ public class Unsorted { try { if (paramJavaScriptEnabled) { try { - TextCore.aClass94_106.method1577(Class38.signlink.gameApplet); + TextCore.aClass94_106.method1577(Class38.gameSignlink.gameApplet); return true; } catch (Throwable var2) { } @@ -4988,7 +4985,6 @@ public class Unsorted { public static void method1726(int var0) { try { TextCore.aClass94_1622 = null; - aShortArrayArray1619 = null; TextCore.aClass94_1617 = null; } catch (RuntimeException var2) { diff --git a/Client/src/main/java/org/runite/client/WaterfallShader.java b/Client/src/main/java/org/runite/client/WaterfallShader.java index 02f7ca551..69844448d 100644 --- a/Client/src/main/java/org/runite/client/WaterfallShader.java +++ b/Client/src/main/java/org/runite/client/WaterfallShader.java @@ -35,7 +35,7 @@ final class WaterfallShader implements ShaderInterface { WorldListEntry var2 = Class3_Sub8.getWorld(97, var0); if(var2 == null) { return false; - } else if (1 != Signlink.anInt1214 && Signlink.anInt1214 != 2 && Class44.paramModeWhere != 2) { + } else if (Signlink.anInt1214 != 1 && Signlink.anInt1214 != 2 && Class44.paramModeWhere != 2) { RSString var9 = aClass94_8; if (Class44.paramModeWhere != 0) { var9 = RSString.stringCombiner(new RSString[]{TextCore.aClass94_4007, RSString.stringAnimator(var2.worldId - -7000)}); diff --git a/Client/src/main/kotlin/org/rs09/client/constants/Parameter.kt b/Client/src/main/kotlin/org/rs09/client/constants/Parameter.kt index 15a5b1a78..d5fbab7b7 100644 --- a/Client/src/main/kotlin/org/rs09/client/constants/Parameter.kt +++ b/Client/src/main/kotlin/org/rs09/client/constants/Parameter.kt @@ -25,7 +25,6 @@ object Parameter { const val LANGUAGE_ENGLISH = 0 const val LANGUAGE_GERMAN = 1 const val LANGUAGE_FRENCH = 2 - const val LANGUAGE_PORTUGUESE = 3 /** * Game type diff --git a/Client/src/main/kotlin/org/rs09/client/net/Connection.kt b/Client/src/main/kotlin/org/rs09/client/net/Connection.kt index f0e54b694..15abf0b15 100644 --- a/Client/src/main/kotlin/org/rs09/client/net/Connection.kt +++ b/Client/src/main/kotlin/org/rs09/client/net/Connection.kt @@ -132,7 +132,7 @@ class Connection(val socket: Socket, val signlink: Signlink) : Runnable { } if (class64 == null) { - class64 = signlink.method1451(3, this) + class64 = signlink.startThread(3, this) } condition.signalAll()