diff --git a/Client/src/main/java/org/runite/client/BufferedDataStream.java b/Client/src/main/java/org/runite/client/BufferedDataStream.java index 622067993..c8ce5c186 100644 --- a/Client/src/main/java/org/runite/client/BufferedDataStream.java +++ b/Client/src/main/java/org/runite/client/BufferedDataStream.java @@ -19,6 +19,7 @@ public final class BufferedDataStream extends DataBuffer { static int anInt1736; static int[] anIntArray2709 = new int[]{0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535, 131071, 262143, 524287, 1048575, 2097151, 4194303, 8388607, 16777215, 33554431, 67108863, 134217727, 268435455, 536870911, 1073741823, Integer.MAX_VALUE, -1}; static int anInt1971; + static int anInt3652; private ISAACCipher isaacCipher; static int[] anIntArray3804 = new int[256]; static int[] anIntArray3805; @@ -27,7 +28,7 @@ public final class BufferedDataStream extends DataBuffer { static void addChatMessage(RSString var0, int type, RSString message, int var3) { try { - Class3_Sub28_Sub12.sendGameMessage(var3, type, message, null, var0); + MessageManager.sendGameMessage(var3, type, message, null, var0); } catch (RuntimeException var5) { throw ClientErrorException.clientError(var5, "i.W(" + (var0 != null ? "{...}" : "null") + ',' + type + ',' + (message != null ? "{...}" : "null") + ',' + var3 + ')'); } @@ -200,7 +201,7 @@ public final class BufferedDataStream extends DataBuffer { if (var4 == 1006) { var13 = Class7.getRSInterface(var3); if (null != var13 && var13.itemIds[var2] >= 100000) { - addChatMessage(TextCore.emptyJagexString, 0, RSString.stringCombiner(new RSString[]{RSString.stringAnimator(var13.itemIds[var2]), TextCore.aClass94_3777, ItemDefinition.getItemDefinition(var5).name}), -1); + addChatMessage(RSString.parse(""), 0, RSString.stringCombiner(new RSString[]{RSString.stringAnimator(var13.itemIds[var2]), TextCore.aClass94_3777, ItemDefinition.getItemDefinition(var5).name}), -1); } else { TextureOperation12.outgoingBuffer.putOpcode(92); TextureOperation12.outgoingBuffer.writeShort128LE(var5); @@ -902,7 +903,7 @@ public final class BufferedDataStream extends DataBuffer { TextureOperation36.aFloat3435 = TextureOperation36.aFloat3424; TextureOperation9.aFloat3105 = Class30.aFloat578; Class60.anInt932 = var6; - anInt1971 = Class3_Sub28_Sub12.anInt3652; + anInt1971 = anInt3652; anInt1407 = Unsorted.anInt689; RSInterface.aFloat246 = var9; Unsorted.anInt72 = 0; @@ -922,7 +923,7 @@ public final class BufferedDataStream extends DataBuffer { float var15 = (float) Unsorted.anInt72 / 65536.0F; int var13 = Unsorted.anInt72 >> 8; int var12 = -Unsorted.anInt72 + 65536 >> 8; - Class3_Sub28_Sub12.anInt3652 = (-16711936 & var13 * (anInt1345 & 16711935) + (16711935 & anInt1971) * var12) + (16711680 & var12 * (anInt1971 & 65280) + (65280 & anInt1345) * var13) >> 8; + anInt3652 = (-16711936 & var13 * (anInt1345 & 16711935) + (16711935 & anInt1971) * var12) + (16711680 & var12 * (anInt1971 & 65280) + (65280 & anInt1345) * var13) >> 8; float var14 = (float) (65536 - Unsorted.anInt72) / 65536.0F; Class30.aFloat578 = var14 * TextureOperation9.aFloat3105 + var15 * Class3_Sub17.aFloat2457; TextureOperation36.aFloat3424 = TextureOperation36.aFloat3435 * var14 + var15 * aFloat3044; @@ -932,11 +933,11 @@ public final class BufferedDataStream extends DataBuffer { } Class92.setLightParams(Unsorted.anInt1950, Class30.aFloat578, TextureOperation36.aFloat3424, Class12.aFloat319); - Class92.setFogValues(Class3_Sub28_Sub12.anInt3652, Unsorted.anInt689); + Class92.setFogValues(anInt3652, Unsorted.anInt689); Class92.setLightPosition((float) Class46.anInt741, (float) TextureOperation1.anInt3274, (float) AtmosphereParser.anInt1191); Class92.method1504(); - return Class3_Sub28_Sub12.anInt3652; + return anInt3652; } catch (RuntimeException var16) { throw ClientErrorException.clientError(var16, "i.F(" + var0 + ',' + var1 + ',' + var2 + ',' + var3 + ',' + 1 + ')'); } diff --git a/Client/src/main/java/org/runite/client/CS2Methods.java b/Client/src/main/java/org/runite/client/CS2Methods.java index 31d436f80..cc17268b2 100644 --- a/Client/src/main/java/org/runite/client/CS2Methods.java +++ b/Client/src/main/java/org/runite/client/CS2Methods.java @@ -5,7 +5,7 @@ public class CS2Methods { try { int var2 = Unsorted.method1602(var0); - return var2 != -1 ? Class119.aClass131_1624.aClass94Array1721[var2].method1560(TextCore.aClass94_3192, TextCore.aClass94_4066) : TextCore.aClass94_4049; + return var2 != -1 ? Class119.aClass131_1624.aClass94Array1721[var2].method1560(RSString.parse(" "), TextCore.aClass94_4066) : TextCore.aClass94_4049; } catch (RuntimeException var3) { throw ClientErrorException.clientError(var3, "rc.V(" + (var0 != null ? "{...}" : "null") + ',' + true + ')'); } diff --git a/Client/src/main/java/org/runite/client/CS2Script.java b/Client/src/main/java/org/runite/client/CS2Script.java index b40d57c75..32a902afa 100644 --- a/Client/src/main/java/org/runite/client/CS2Script.java +++ b/Client/src/main/java/org/runite/client/CS2Script.java @@ -979,7 +979,7 @@ public final class CS2Script extends Linkable { } if (3304 == opcode) { int l8 = ItemDefinition.intsStack[--iStackCounter]; - ItemDefinition.intsStack[iStackCounter++] = Unsorted.method2069(l8).size; + ItemDefinition.intsStack[iStackCounter++] = ConfigInventoryDefinition.retrieveConfigurationInventoryFile(l8).size; continue; } if (opcode == 3305) { //Skill update listener (mostly spams health value) @@ -1262,7 +1262,7 @@ public final class CS2Script extends Linkable { } if (opcode == 3609) { RSString class94_12 = ItemDefinition.stringsStack[--sStackCounter]; - if (class94_12.startsWith(TextCore.aClass94_2323) || class94_12.startsWith(TextCore.aClass94_3190)) + if (class94_12.startsWith(TextCore.aClass94_2323) || class94_12.startsWith(RSString.parse(""))) class94_12 = class94_12.substring(7); ItemDefinition.intsStack[iStackCounter++] = ItemDefinition.method1176(class94_12) ? 1 : 0; continue; @@ -1352,7 +1352,7 @@ public final class CS2Script extends Linkable { } if (3623 == opcode) { RSString class94_15 = ItemDefinition.stringsStack[--sStackCounter]; - if (class94_15.startsWith(TextCore.aClass94_2323) || class94_15.startsWith(TextCore.aClass94_3190)) + if (class94_15.startsWith(TextCore.aClass94_2323) || class94_15.startsWith(RSString.parse(""))) class94_15 = class94_15.substring(7); ItemDefinition.intsStack[iStackCounter++] = Class3_Sub24_Sub3.method467(class94_15) ? 1 : 0; continue; @@ -1390,7 +1390,7 @@ public final class CS2Script extends Linkable { } if (opcode == 3628) { RSString class94_16 = ItemDefinition.stringsStack[--sStackCounter]; - if (class94_16.startsWith(TextCore.aClass94_2323) || class94_16.startsWith(TextCore.aClass94_3190)) + if (class94_16.startsWith(TextCore.aClass94_2323) || class94_16.startsWith(RSString.parse(""))) class94_16 = class94_16.substring(7); ItemDefinition.intsStack[iStackCounter++] = PacketParser.method826(class94_16, -1); continue; @@ -1657,7 +1657,7 @@ public final class CS2Script extends Linkable { int j24 = ItemDefinition.intsStack[--iStackCounter]; int k55 = -1; if (j24 < 100 && null != LinkableRSString.aClass94Array2580[j24]) - k55 = Class3_Sub28_Sub12.anIntArray3082[j24]; + k55 = ConfigInventoryDefinition.anIntArray3082[j24]; ItemDefinition.intsStack[iStackCounter++] = k55; continue; } @@ -1808,7 +1808,7 @@ public final class CS2Script extends Linkable { int k24 = ItemDefinition.intsStack[--iStackCounter]; RSString class94_49 = null; if (k24 < 100) - class94_49 = Class3_Sub28_Sub12.aClass94Array3226[k24]; + class94_49 = ConfigInventoryDefinition.aClass94Array3226[k24]; if (null == class94_49) class94_49 = TextCore.aClass94_2331; ItemDefinition.stringsStack[sStackCounter++] = class94_49; @@ -1828,7 +1828,7 @@ public final class CS2Script extends Linkable { int i25 = ItemDefinition.intsStack[--iStackCounter]; int l55 = -1; if (i25 < 100) - l55 = Class3_Sub28_Sub12.anIntArray1835[i25]; + l55 = ConfigInventoryDefinition.anIntArray1835[i25]; ItemDefinition.intsStack[iStackCounter++] = l55; continue; } diff --git a/Client/src/main/java/org/runite/client/Class119.java b/Client/src/main/java/org/runite/client/Class119.java index 57b82e479..bd5c83e57 100644 --- a/Client/src/main/java/org/runite/client/Class119.java +++ b/Client/src/main/java/org/runite/client/Class119.java @@ -55,7 +55,7 @@ final class Class119 { GameShell.canvas.setLocation(Class84.anInt1164, Class106.anInt1442); } - if (Class3_Sub28_Sub12.anInt3655 != -1) { + if (ConfigInventoryDefinition.anInt3655 != -1) { Class124.method1746(true, (byte) -125); } diff --git a/Client/src/main/java/org/runite/client/Class120.java b/Client/src/main/java/org/runite/client/Class120.java index 65381f917..d42ff35de 100644 --- a/Client/src/main/java/org/runite/client/Class120.java +++ b/Client/src/main/java/org/runite/client/Class120.java @@ -33,7 +33,7 @@ final class Class120 { anIntArray1638 = null; } - return !Client.method44(var0).method92(var2, (byte) -110) && var0.anObjectArray314 == null ? null : (null != var0.aClass94Array171 && var0.aClass94Array171.length > var2 && var0.aClass94Array171[var2] != null && var0.aClass94Array171[var2].trim(1).length() != 0 ? var0.aClass94Array171[var2] : (!ClientCommands.commandQaOpEnabled ? null : RSString.stringCombiner(new RSString[]{TextCore.aClass94_1645, RSString.stringAnimator(var2)}))); + return !Client.method44(var0).method92(var2, (byte) -110) && var0.anObjectArray314 == null ? null : (null != var0.aClass94Array171 && var0.aClass94Array171.length > var2 && var0.aClass94Array171[var2] != null && var0.aClass94Array171[var2].trim(1).length() != 0 ? var0.aClass94Array171[var2] : (!ClientCommands.commandQaOpEnabled ? null : RSString.stringCombiner(new RSString[]{RSString.parse("Hidden)2"), RSString.stringAnimator(var2)}))); } catch (RuntimeException var4) { throw ClientErrorException.clientError(var4, "qj.B(" + (var0 != null ? "{...}" : "null") + ',' + var1 + ',' + var2 + ')'); } diff --git a/Client/src/main/java/org/runite/client/Class124.java b/Client/src/main/java/org/runite/client/Class124.java index 154932ba2..8451d3c9c 100644 --- a/Client/src/main/java/org/runite/client/Class124.java +++ b/Client/src/main/java/org/runite/client/Class124.java @@ -27,7 +27,7 @@ final class Class124 { aClass153_1661 = null; } - Class75_Sub4.method1352(Class140_Sub7.canvasHeight, var0, Class3_Sub28_Sub12.anInt3655, Class23.canvasWidth); + Class75_Sub4.method1352(Class140_Sub7.canvasHeight, var0, ConfigInventoryDefinition.anInt3655, Class23.canvasWidth); } catch (RuntimeException var3) { throw ClientErrorException.clientError(var3, "rb.C(" + var0 + ',' + var1 + ')'); } diff --git a/Client/src/main/java/org/runite/client/Class131.java b/Client/src/main/java/org/runite/client/Class131.java index 7b95436bf..def93ae8d 100644 --- a/Client/src/main/java/org/runite/client/Class131.java +++ b/Client/src/main/java/org/runite/client/Class131.java @@ -5,8 +5,8 @@ import org.rs09.client.config.GameConfig; public final class Class131 { public static int anInt1716; - static RSString password = TextCore.emptyJagexString; - static RSString username = TextCore.emptyJagexString; + static RSString password = RSString.parse(""); + static RSString username = RSString.parse(""); static int anInt1719 = -1; static CacheIndex skeletonsReferenceIndex; public short[] aShortArray1718; @@ -59,7 +59,7 @@ public final class Class131 { password = var1; Class7.anInt2161 = var2; username = var0; - if (username.equalsString(TextCore.emptyJagexString) || password.equalsString(TextCore.emptyJagexString)) { + if (username.equalsString(RSString.parse("")) || password.equalsString(RSString.parse(""))) { Client.messageToDisplay = 3; } else if (CS2Script.userCurrentWorldID == -1) { Class163_Sub1_Sub1.anInt2246 = 0; diff --git a/Client/src/main/java/org/runite/client/Class15.java b/Client/src/main/java/org/runite/client/Class15.java index ddb0e8092..da7092f7b 100644 --- a/Client/src/main/java/org/runite/client/Class15.java +++ b/Client/src/main/java/org/runite/client/Class15.java @@ -239,7 +239,7 @@ public final class Class15 implements Runnable { int var7 = Class3_Sub28_Sub5.aCalendar3581.get(Calendar.HOUR_OF_DAY); int var8 = Class3_Sub28_Sub5.aCalendar3581.get(Calendar.MINUTE); int var9 = Class3_Sub28_Sub5.aCalendar3581.get(Calendar.SECOND); - return RSString.stringCombiner(new RSString[]{TextCore.DaysOfTheWeek[var3 + -1], TextCore.aClass94_3145, RSString.stringAnimator(var4 / 10), RSString.stringAnimator(var4 % 10), TextCore.aClass94_2025, TextCore.MonthsOfTheYear[var5], TextCore.aClass94_2025, RSString.stringAnimator(var6), TextCore.aClass94_465, RSString.stringAnimator(var7 / 10), RSString.stringAnimator(var7 % 10), TextCore.char_colon, RSString.stringAnimator(var8 / 10), RSString.stringAnimator(var8 % 10), TextCore.char_colon, RSString.stringAnimator(var9 / 10), RSString.stringAnimator(var9 % 10), TextCore.timeZone}); + return RSString.stringCombiner(new RSString[]{TextCore.DaysOfTheWeek[var3 + -1], RSString.parse(")1 "), RSString.stringAnimator(var4 / 10), RSString.stringAnimator(var4 % 10), TextCore.aClass94_2025, TextCore.MonthsOfTheYear[var5], TextCore.aClass94_2025, RSString.stringAnimator(var6), RSString.parse(" "), RSString.stringAnimator(var7 / 10), RSString.stringAnimator(var7 % 10), RSString.parse(":"), RSString.stringAnimator(var8 / 10), RSString.stringAnimator(var8 % 10), RSString.parse(":"), RSString.stringAnimator(var9 / 10), RSString.stringAnimator(var9 % 10), RSString.parse(" GMT")}); } catch (RuntimeException var10) { throw ClientErrorException.clientError(var10, "cj.F(" + var0 + ')'); } diff --git a/Client/src/main/java/org/runite/client/Class159.java b/Client/src/main/java/org/runite/client/Class159.java index f42a67140..79b4b6d36 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) TextCore.aClass94_3209.method1577(Class38.signlink.gameApplet); + return !(Boolean) RSString.parse("showingVideoAd").method1577(Class38.signlink.gameApplet); } catch (Throwable var2) { } } @@ -154,15 +154,4 @@ public final class Class159 { throw ClientErrorException.clientError(var11, "vl.E(" + var0 + ',' + 0 + ')'); } } - -// static void method2196() { -// try { -// Class3_Sub13_Sub34.aReferenceCache_3412.clearSoftReferences(); -// -// Class3_Sub13_Sub31.aReferenceCache_3369.clearSoftReferences(); -// } catch (RuntimeException var2) { -// throw ClientErrorException.clientError(var2, "vl.D(" + 128 + ')'); -// } -// } - } diff --git a/Client/src/main/java/org/runite/client/Class161.java b/Client/src/main/java/org/runite/client/Class161.java index 78762be4d..ffc92a867 100644 --- a/Client/src/main/java/org/runite/client/Class161.java +++ b/Client/src/main/java/org/runite/client/Class161.java @@ -141,7 +141,7 @@ public final class Class161 { return -var6 + var5; } else { - return 2 == var1 ? var0.method1078(102).name.method1546(var3.method1078(-119).name) : (var1 == 3 ? (var0.activity.equalsString(TextCore.aClass94_946) ? (var3.activity.equalsString(TextCore.aClass94_946) ? 0 : (var4 ? -1 : 1)) : (var3.activity.equalsString(TextCore.aClass94_946) ? (var4 ? 1 : -1) : var0.activity.method1546(var3.activity))) : (var2 <= 67 ? 36 : (var1 == 4 ? (!var0.isLootShare() ? (!var3.isLootShare() ? 0 : -1) : (var3.isLootShare() ? 0 : 1)) : (var1 == 5 ? (var0.isQuickchat() ? (!var3.isQuickchat() ? 1 : 0) : (var3.isQuickchat() ? -1 : 0)) : (var1 != 6 ? (7 == var1 ? (var0.isMembers() ? (var3.isMembers() ? 0 : 1) : (var3.isMembers() ? -1 : 0)) : -var3.worldId + var0.worldId) : (var0.isPVP() ? (!var3.isPVP() ? 1 : 0) : (var3.isPVP() ? -1 : 0))))))); + return 2 == var1 ? var0.method1078(102).name.method1546(var3.method1078(-119).name) : (var1 == 3 ? (var0.activity.equalsString(RSString.parse(")2")) ? (var3.activity.equalsString(RSString.parse(")2")) ? 0 : (var4 ? -1 : 1)) : (var3.activity.equalsString(RSString.parse(")2")) ? (var4 ? 1 : -1) : var0.activity.method1546(var3.activity))) : (var2 <= 67 ? 36 : (var1 == 4 ? (!var0.isLootShare() ? (!var3.isLootShare() ? 0 : -1) : (var3.isLootShare() ? 0 : 1)) : (var1 == 5 ? (var0.isQuickchat() ? (!var3.isQuickchat() ? 1 : 0) : (var3.isQuickchat() ? -1 : 0)) : (var1 != 6 ? (7 == var1 ? (var0.isMembers() ? (var3.isMembers() ? 0 : 1) : (var3.isMembers() ? -1 : 0)) : -var3.worldId + var0.worldId) : (var0.isPVP() ? (!var3.isPVP() ? 1 : 0) : (var3.isPVP() ? -1 : 0))))))); } } catch (RuntimeException var7) { throw ClientErrorException.clientError(var7, "wb.C(" + (var0 != null ? "{...}" : "null") + ',' + var1 + ',' + var2 + ',' + (var3 != null ? "{...}" : "null") + ',' + var4 + ')'); diff --git a/Client/src/main/java/org/runite/client/Class163_Sub3.java b/Client/src/main/java/org/runite/client/Class163_Sub3.java index 744850ec3..ab2062df1 100644 --- a/Client/src/main/java/org/runite/client/Class163_Sub3.java +++ b/Client/src/main/java/org/runite/client/Class163_Sub3.java @@ -20,25 +20,25 @@ final class Class163_Sub3 extends Class163 { int var4; for (var4 = 0; Class8.anInt104 > var4; ++var4) { if (var0 == Class50.aLongArray826[var4]) { - BufferedDataStream.addChatMessage(TextCore.emptyJagexString, 0, RSString.stringCombiner(new RSString[]{var3, TextCore.HasFriendsAlready}), -1); + BufferedDataStream.addChatMessage(RSString.parse(""), 0, RSString.stringCombiner(new RSString[]{var3, TextCore.HasFriendsAlready}), -1); return; } } for (var4 = 0; var4 < Class3_Sub28_Sub5.anInt3591; ++var4) { if (Class114.ignores[var4] == var0) { - BufferedDataStream.addChatMessage(TextCore.emptyJagexString, 0, RSString.stringCombiner(new RSString[]{TextCore.HasPleaseRemove, var3, TextCore.HasIgnoreToFriends}), -1); + BufferedDataStream.addChatMessage(RSString.parse(""), 0, RSString.stringCombiner(new RSString[]{TextCore.HasPleaseRemove, var3, TextCore.HasIgnoreToFriends}), -1); return; } } if (var3.equalsString(Class102.player.displayName)) { - BufferedDataStream.addChatMessage(TextCore.emptyJagexString, 0, TextCore.HasOnOwnFriendsList, -1); + BufferedDataStream.addChatMessage(RSString.parse(""), 0, TextCore.HasOnOwnFriendsList, -1); } else { Class70.aClass94Array1046[Class8.anInt104] = var3; Class50.aLongArray826[Class8.anInt104] = var0; Unsorted.anIntArray882[Class8.anInt104] = 0; - Unsorted.aClass94Array2566[Class8.anInt104] = TextCore.emptyJagexString; + Unsorted.aClass94Array2566[Class8.anInt104] = RSString.parse(""); Class57.anIntArray904[Class8.anInt104] = 0; Unsorted.aBooleanArray73[Class8.anInt104] = false; ++Class8.anInt104; @@ -47,7 +47,7 @@ final class Class163_Sub3 extends Class163 { TextureOperation12.outgoingBuffer.writeLong(var0); } } else { - BufferedDataStream.addChatMessage(TextCore.emptyJagexString, 0, TextCore.HasFriendsListFull, -1); + BufferedDataStream.addChatMessage(RSString.parse(""), 0, TextCore.HasFriendsListFull, -1); } } } catch (RuntimeException var5) { diff --git a/Client/src/main/java/org/runite/client/Class166.java b/Client/src/main/java/org/runite/client/Class166.java index e6a208e11..1e35a5ad2 100644 --- a/Client/src/main/java/org/runite/client/Class166.java +++ b/Client/src/main/java/org/runite/client/Class166.java @@ -68,7 +68,7 @@ final class Class166 { } if (!var4) { - BufferedDataStream.addChatMessage(TextCore.emptyJagexString, 0, RSString.stringCombiner(new RSString[]{TextCore.HasUnableFind, var3}), -1); + BufferedDataStream.addChatMessage(RSString.parse(""), 0, RSString.stringCombiner(new RSString[]{TextCore.HasUnableFind, var3}), -1); } } catch (RuntimeException var7) { diff --git a/Client/src/main/java/org/runite/client/Class21.java b/Client/src/main/java/org/runite/client/Class21.java index d0e4a52fa..4159da596 100644 --- a/Client/src/main/java/org/runite/client/Class21.java +++ b/Client/src/main/java/org/runite/client/Class21.java @@ -120,8 +120,8 @@ public final class Class21 { } TextureOperation24.method226(interfaceId); - if (Class3_Sub28_Sub12.anInt3655 != -1) { - Class3_Sub8.method124(6422 ^ 6509, 1, Class3_Sub28_Sub12.anInt3655); + if (ConfigInventoryDefinition.anInt3655 != -1) { + Class3_Sub8.method124(6422 ^ 6509, 1, ConfigInventoryDefinition.anInt3655); } } catch (RuntimeException var10) { diff --git a/Client/src/main/java/org/runite/client/Class30.java b/Client/src/main/java/org/runite/client/Class30.java index 34ec1ec8a..04b77a708 100644 --- a/Client/src/main/java/org/runite/client/Class30.java +++ b/Client/src/main/java/org/runite/client/Class30.java @@ -38,7 +38,7 @@ final class Class30 { static void method979(int var0, int var1, int var2) { try { - RSString var4 = RSString.stringCombiner(new RSString[]{TextCore.aClass94_853, RSString.stringAnimator(var2), TextCore.aClass94_3268, RSString.stringAnimator(var0 >> 6), TextCore.aClass94_3268, RSString.stringAnimator(var1 >> 6), TextCore.aClass94_3268, RSString.stringAnimator(var0 & 63), TextCore.aClass94_3268, RSString.stringAnimator(63 & var1)}); + RSString var4 = RSString.stringCombiner(new RSString[]{TextCore.aClass94_853, RSString.stringAnimator(var2), RSString.parse(")1"), RSString.stringAnimator(var0 >> 6), RSString.parse(")1"), RSString.stringAnimator(var1 >> 6), RSString.parse(")1"), RSString.stringAnimator(var0 & 63), RSString.parse(")1"), RSString.stringAnimator(63 & var1)}); ClientCommands.ClientCommands(var4); } catch (RuntimeException var5) { diff --git a/Client/src/main/java/org/runite/client/Class36.java b/Client/src/main/java/org/runite/client/Class36.java index cb9b4091e..a11412442 100644 --- a/Client/src/main/java/org/runite/client/Class36.java +++ b/Client/src/main/java/org/runite/client/Class36.java @@ -127,10 +127,10 @@ final class Class36 { return null; } else { for (int var3 = Objects.requireNonNull(var2).length() + -3; var3 > 0; var3 -= 3) { - var2 = RSString.stringCombiner(new RSString[]{var2.substring(0, var3, 0), TextCore.aClass94_3268, var2.substring(var3)}); + var2 = RSString.stringCombiner(new RSString[]{var2.substring(0, var3, 0), RSString.parse(")1"), var2.substring(var3)}); } - return var2.length() > 9 ? RSString.stringCombiner(new RSString[]{ColorCore.MillionStackColor, var2.substring(0, -8 + var2.length(), 0), TextCore.MillionM, TextCore.LEFT_PARENTHESES, var2, TextCore.aClass94_995}) : (6 < var2.length() ? RSString.stringCombiner(new RSString[]{ColorCore.ThousandStackColor, var2.substring(0, -4 + var2.length(), 0), TextCore.ThousandK, TextCore.LEFT_PARENTHESES, var2, TextCore.aClass94_995}) : RSString.stringCombiner(new RSString[]{ColorCore.DefaultStackColor, var2, TextCore.aClass94_2584})); + return var2.length() > 9 ? RSString.stringCombiner(new RSString[]{ColorCore.MillionStackColor, var2.substring(0, -8 + var2.length(), 0), TextCore.MillionM, TextCore.LEFT_PARENTHESES, var2, RSString.parse("(Y<)4col>")}) : (6 < var2.length() ? RSString.stringCombiner(new RSString[]{ColorCore.ThousandStackColor, var2.substring(0, -4 + var2.length(), 0), TextCore.ThousandK, TextCore.LEFT_PARENTHESES, var2, RSString.parse("(Y<)4col>")}) : RSString.stringCombiner(new RSString[]{ColorCore.DefaultStackColor, var2, TextCore.aClass94_2584})); } } catch (RuntimeException var4) { throw ClientErrorException.clientError(var4, "fi.D(" + var0 + ',' + var1 + ')'); diff --git a/Client/src/main/java/org/runite/client/Class3_Sub17.java b/Client/src/main/java/org/runite/client/Class3_Sub17.java index ce1f48763..41dd1d83c 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub17.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub17.java @@ -31,8 +31,8 @@ final class Class3_Sub17 extends Linkable { static void method381(boolean var0) { try { - if(Class3_Sub28_Sub12.anInt3655 != -1) { - Class52.method1160(-120, Class3_Sub28_Sub12.anInt3655); + if(ConfigInventoryDefinition.anInt3655 != -1) { + Class52.method1160(-120, ConfigInventoryDefinition.anInt3655); } for(int var1 = 0; var1 < Class3_Sub28_Sub3.anInt3557; ++var1) { @@ -56,7 +56,7 @@ final class Class3_Sub17 extends Linkable { method380(-78); } - if(Class3_Sub28_Sub12.anInt3655 != -1) { + if(ConfigInventoryDefinition.anInt3655 != -1) { Class3_Sub28_Sub3.anInt3557 = 0; Class8.method841(); } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub23.java b/Client/src/main/java/org/runite/client/Class3_Sub23.java index 55f1d49bc..a603d13d3 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub23.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub23.java @@ -51,7 +51,7 @@ final class Class3_Sub23 extends Linkable { RSString var6 = Unsorted.emptyString(0); if(var3 < 0) { var3 = -var3; - Objects.requireNonNull(var6).append(TextCore.aClass94_3133); + Objects.requireNonNull(var6).append(RSString.parse(")2")); } RSString var8 = TextCore.aClass94_1880; @@ -82,7 +82,7 @@ final class Class3_Sub23 extends Linkable { var11 = 0; RSString var9; if(var3 == 0L) { - var9 = TextCore.aClass94_3039; + var9 = RSString.parse("0"); } else { RSString var12; for(var12 = Unsorted.emptyString(0); var3 > 0L; var3 /= 10L) { diff --git a/Client/src/main/java/org/runite/client/Class3_Sub24_Sub4.java b/Client/src/main/java/org/runite/client/Class3_Sub24_Sub4.java index 80ccfb5cc..389d83bd6 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub24_Sub4.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub24_Sub4.java @@ -165,7 +165,7 @@ final class Class3_Sub24_Sub4 extends Class3_Sub24 { try { if(var3.anInt318 == 1) { - method1177(-1, 0L, (byte)-78, TextCore.emptyJagexString, 0, (short)8, var3.aClass94_289, var3.componentHash); + method1177(-1, 0L, (byte)-78, RSString.parse(""), 0, (short)8, var3.aClass94_289, var3.componentHash); } RSString var4; @@ -177,19 +177,19 @@ final class Class3_Sub24_Sub4 extends Class3_Sub24 { } if(var3.anInt318 == 3) { - method1177(-1, 0L, (byte)-59, TextCore.emptyJagexString, 0, (short)28, TextCore.HasClose, var3.componentHash); + method1177(-1, 0L, (byte)-59, RSString.parse(""), 0, (short)28, TextCore.HasClose, var3.componentHash); } if(var3.anInt318 == 4) { - method1177(-1, 0L, (byte)-71, TextCore.emptyJagexString, 0, (short)59, var3.aClass94_289, var3.componentHash); + method1177(-1, 0L, (byte)-71, RSString.parse(""), 0, (short)59, var3.aClass94_289, var3.componentHash); } if(var3.anInt318 == 5) { - method1177(-1, 0L, (byte)-92, TextCore.emptyJagexString, 0, (short)51, var3.aClass94_289, var3.componentHash); + method1177(-1, 0L, (byte)-92, RSString.parse(""), 0, (short)51, var3.aClass94_289, var3.componentHash); } if(var3.anInt318 == 6 && TextureOperation27.aClass11_3087 == null) { - method1177(-1, 0L, (byte)-100, TextCore.emptyJagexString, -1, (short)41, var3.aClass94_289, var3.componentHash); + method1177(-1, 0L, (byte)-100, RSString.parse(""), -1, (short)41, var3.aClass94_289, var3.componentHash); } int var5; @@ -342,7 +342,7 @@ final class Class3_Sub24_Sub4 extends Class3_Sub24 { } if(Client.method44(var3).method95()) { - method1177(-1, 0L, (byte)-74, TextCore.emptyJagexString, var3.anInt191, (short)41, TextCore.HasContinue, var3.componentHash); + method1177(-1, 0L, (byte)-74, RSString.parse(""), var3.anInt191, (short)41, TextCore.HasContinue, var3.componentHash); } } } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub28_Sub12.java b/Client/src/main/java/org/runite/client/Class3_Sub28_Sub12.java deleted file mode 100644 index 5d15e184a..000000000 --- a/Client/src/main/java/org/runite/client/Class3_Sub28_Sub12.java +++ /dev/null @@ -1,107 +0,0 @@ -package org.runite.client; - -import org.rs09.client.Node; - -public final class Class3_Sub28_Sub12 extends Node { - - static int[] anIntArray1835 = new int[100]; - static int[] anIntArray3082 = new int[100]; - static RSString[] aClass94Array3226 = new RSString[100]; - int size = 0; - static int anInt3652; - 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; - - static boolean method609(RSInterface var0, int var1) { - if (null == var0.anIntArray275) { - return false; - } else { - int var2 = 0; - if (var1 <= 20) { - TextCore.COMMAND_MEMORY_MANAGEMENT = null; - } - - for (; var0.anIntArray275.length > var2; ++var2) { - int var3 = Class164_Sub2.method2247((byte) 119, var2, var0); - int var4 = var0.anIntArray307[var2]; - if (var0.anIntArray275[var2] != 2) { - if (var0.anIntArray275[var2] != 3) { - if (4 == var0.anIntArray275[var2]) { - if (var4 == var3) { - return false; - } - } else if (var3 != var4) { - return false; - } - } else if (var3 <= var4) { - return false; - } - } else if (var3 >= var4) { - return false; - } - } - - return true; - } - } - - public final void decode(DataBuffer buffer) { - while (true) { - int opcode = buffer.readUnsignedByte(); - if (0 == opcode) { - return; - } - - this.decode(buffer, opcode); - } - } - - static void sendGameMessage(int var0, int type, RSString message, RSString var3, RSString var5) { - for (int i = 99; i > 0; --i) { - 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]; - anIntArray1835[i] = anIntArray1835[i - 1]; - } - - ++TextureOperation16.anInt3114; - anIntArray3082[0] = type; - aClass94Array3226[0] = var5; - Class24.anInt472 = PacketParser.anInt3213; - 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); - if(message.length > cutOff && type != 0){ - String[] tokens = message.toString().split(" "); - if(tokens.length > 1) { - int counter = 0; - for (String tok : tokens) { - if (counter + tok.length() > cutOff) { - break; - } - counter += tok.length() + 1; - } - primaryMsg = message.substring(0, counter, 0); - secondaryMsg = message.substring(counter, message.length, 0); - message = primaryMsg; - } - } - LinkableRSString.aClass94Array2580[0] = message; - Class163_Sub3.aClass94Array3003[0] = var3; - if(!secondaryMsg.equalsString(RSString.parse("null"))) - sendGameMessage(var0,type,secondaryMsg,var3,var5); - } - - static RSString method612(long var0) { - return TextureOperation9.method207(10, false, 116, var0); - } - - private void decode(DataBuffer buffer, int opcode) { - if (opcode == 2) { - this.size = buffer.readUnsignedShort(); - } - } - -} diff --git a/Client/src/main/java/org/runite/client/Class3_Sub28_Sub4.java b/Client/src/main/java/org/runite/client/Class3_Sub28_Sub4.java index ceca124fc..a9cb8d823 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub28_Sub4.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub28_Sub4.java @@ -18,6 +18,10 @@ final class Class3_Sub28_Sub4 extends Node { static ReferenceCache aReferenceCache_3572 = new ReferenceCache(64); static Class83 aClass83_3579; + static RSString method612(long var0) { + return TextureOperation9.method207(10, false, 116, var0); + } + final void method545(DataBuffer var1, int[] var2) { try { if(this.anIntArray3566 != null) { diff --git a/Client/src/main/java/org/runite/client/Class3_Sub28_Sub8.java b/Client/src/main/java/org/runite/client/Class3_Sub28_Sub8.java index 794b2d3bd..e8e10e794 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub28_Sub8.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub28_Sub8.java @@ -53,7 +53,7 @@ final class Class3_Sub28_Sub8 extends Node { return -1; } else { for (int var2 = 0; var2 < Class119.aClass131_1624.anInt1720; ++var2) { - if (Class119.aClass131_1624.aClass94Array1721[var2].method1560(TextCore.aClass94_3192, TextCore.aClass94_4066).equalsString(var0)) { + if (Class119.aClass131_1624.aClass94Array1721[var2].method1560(RSString.parse(" "), TextCore.aClass94_4066).equalsString(var0)) { return var2; } } diff --git a/Client/src/main/java/org/runite/client/Class3_Sub6.java b/Client/src/main/java/org/runite/client/Class3_Sub6.java index 11a28b884..d03ccd93d 100644 --- a/Client/src/main/java/org/runite/client/Class3_Sub6.java +++ b/Client/src/main/java/org/runite/client/Class3_Sub6.java @@ -5,7 +5,7 @@ import org.rs09.client.Linkable; final class Class3_Sub6 extends Linkable { - static byte[][] aByteArrayArray2287; + static byte[][] softReferenceTestArray; static int[] anIntArray2288 = new int[32]; static int anInt2291; diff --git a/Client/src/main/java/org/runite/client/Class49.java b/Client/src/main/java/org/runite/client/Class49.java index 87c9c89a6..289b58425 100644 --- a/Client/src/main/java/org/runite/client/Class49.java +++ b/Client/src/main/java/org/runite/client/Class49.java @@ -124,7 +124,7 @@ public final class Class49 { } } - return Class3_Sub28_Sub12.method612(var1); + return Class3_Sub28_Sub4.method612(var1); } catch (RuntimeException var6) { throw ClientErrorException.clientError(var6, "ha.H(" + (var0 != null ? "{...}" : "null") + ',' + var1 + ',' + var3 + ',' + false + ')'); } @@ -199,13 +199,13 @@ public final class Class49 { Unsorted.menuOptionCount = 1; Class140_Sub7.aClass94Array2935[0] = TextCore.HasCancel; - Class163_Sub2_Sub1.aClass94Array4016[0] = TextCore.emptyJagexString; + Class163_Sub2_Sub1.aClass94Array4016[0] = RSString.parse(""); TextureOperation27.aShortArray3095[0] = 1005; Class114.anIntArray1578[0] = Class3_Sub28_Sub5.anInt3590; } - if (Class3_Sub28_Sub12.anInt3655 != -1) { - Class52.method1160(-113, Class3_Sub28_Sub12.anInt3655); + if (ConfigInventoryDefinition.anInt3655 != -1) { + Class52.method1160(-113, ConfigInventoryDefinition.anInt3655); } if (var0 == 0) { @@ -228,7 +228,7 @@ public final class Class49 { } Class3_Sub23.anInt2535 = Class44.anInt719; - if (Class3_Sub28_Sub12.anInt3655 != -1) { + if (ConfigInventoryDefinition.anInt3655 != -1) { Class3_Sub28_Sub3.anInt3557 = 0; Class8.method841(); } diff --git a/Client/src/main/java/org/runite/client/Class67.java b/Client/src/main/java/org/runite/client/Class67.java index dc357cccf..9444aa248 100644 --- a/Client/src/main/java/org/runite/client/Class67.java +++ b/Client/src/main/java/org/runite/client/Class67.java @@ -60,7 +60,7 @@ final class Class67 implements Runnable { if (var4.type == 6) { int var6; if (var4.animationId != -1 || var4.secondAnimationId != -1) { - boolean var9 = Class3_Sub28_Sub12.method609(var4, var0 + -23173); + boolean var9 = Unsorted.method609(var4, var0 + -23173); if (var9) { var6 = var4.secondAnimationId; } else { diff --git a/Client/src/main/java/org/runite/client/Class8.java b/Client/src/main/java/org/runite/client/Class8.java index 216f136d8..f7a9f4580 100644 --- a/Client/src/main/java/org/runite/client/Class8.java +++ b/Client/src/main/java/org/runite/client/Class8.java @@ -7,7 +7,7 @@ public final class Class8 { static RSInterface[] aClass11Array1836; static int anInt101; public static int anInt104 = 0; - static CacheIndex aClass153_105; + static CacheIndex configurationReferenceCache; private final Js5Worker aJs5Worker_102; private final CacheResourceWorker aCacheResourceWorker_103; private DataBuffer aClass3_Sub30_99; @@ -91,7 +91,7 @@ public final class Class8 { static void method841() { try { aClass11Array1836 = null; - TextureOperation12.method171(-101, Class3_Sub28_Sub12.anInt3655, 0, Class23.canvasWidth, 0, -1, Class140_Sub7.canvasHeight, 0, 0); + TextureOperation12.method171(-101, ConfigInventoryDefinition.anInt3655, 0, Class23.canvasWidth, 0, -1, Class140_Sub7.canvasHeight, 0, 0); if (aClass11Array1836 != null) { Unsorted.method1095(0, Unsorted.anInt1082, Unsorted.anInt3602, aClass11Array1836, Class23.canvasWidth, -1412584499, 0, Class140_Sub7.canvasHeight, (byte) 73, PacketParser.aClass11_88.anInt292); aClass11Array1836 = null; diff --git a/Client/src/main/java/org/runite/client/Class81.java b/Client/src/main/java/org/runite/client/Class81.java index 015e71773..776821066 100644 --- a/Client/src/main/java/org/runite/client/Class81.java +++ b/Client/src/main/java/org/runite/client/Class81.java @@ -74,20 +74,20 @@ final class Class81 { int var5; for (var5 = 0; var5 < Class3_Sub28_Sub5.anInt3591; ++var5) { if (Class114.ignores[var5] == var1) { - BufferedDataStream.addChatMessage(TextCore.emptyJagexString, 0, RSString.stringCombiner(new RSString[]{var4, TextCore.HasIgnoreAlready}), -1); + BufferedDataStream.addChatMessage(RSString.parse(""), 0, RSString.stringCombiner(new RSString[]{var4, TextCore.HasIgnoreAlready}), -1); return; } } for (var5 = 0; Class8.anInt104 > var5; ++var5) { if (var1 == Class50.aLongArray826[var5]) { - BufferedDataStream.addChatMessage(TextCore.emptyJagexString, 0, RSString.stringCombiner(new RSString[]{TextCore.HasPleaseRemove, var4, TextCore.HasFriendsToIgnore}), -1); + BufferedDataStream.addChatMessage(RSString.parse(""), 0, RSString.stringCombiner(new RSString[]{TextCore.HasPleaseRemove, var4, TextCore.HasFriendsToIgnore}), -1); return; } } if (var4.equalsString(Class102.player.displayName)) { - BufferedDataStream.addChatMessage(TextCore.emptyJagexString, 0, TextCore.HasOnOwnIgnoreList, -1); + BufferedDataStream.addChatMessage(RSString.parse(""), 0, TextCore.HasOnOwnIgnoreList, -1); } else { Class114.ignores[Class3_Sub28_Sub5.anInt3591] = var1; TextureOperation7.aClass94Array3341[Class3_Sub28_Sub5.anInt3591++] = Unsorted.method1052(var1); @@ -96,7 +96,7 @@ final class Class81 { TextureOperation12.outgoingBuffer.writeLong(var1); } } else { - BufferedDataStream.addChatMessage(TextCore.emptyJagexString, 0, TextCore.HasIgnoreListFull, -1); + BufferedDataStream.addChatMessage(RSString.parse(""), 0, TextCore.HasIgnoreListFull, -1); } } } catch (RuntimeException var6) { diff --git a/Client/src/main/java/org/runite/client/Client.java b/Client/src/main/java/org/runite/client/Client.java index 463beca2c..d9c01d14a 100644 --- a/Client/src/main/java/org/runite/client/Client.java +++ b/Client/src/main/java/org/runite/client/Client.java @@ -20,6 +20,8 @@ import java.util.Calendar; import java.util.GregorianCalendar; import java.util.Objects; +import static org.rs09.client.constants.Parameter.*; + public final class Client extends GameShell { /** @@ -205,7 +207,7 @@ public final class Client extends GameShell { Class3_Sub26.paramAffid = 0; - Class163_Sub2.paramSettings = TextCore.emptyJagexString; + Class163_Sub2.paramSettings = RSString.parse(""); Client client = new Client(); clientInstance = client; @@ -304,7 +306,7 @@ public final class Client extends GameShell { } else if (inter.anIntArray310 == null || Class44.anInt719 >= inter.anIntArray310[var19]) { byte var20 = inter.aByteArray231[var19]; if (var20 == 0 || ((var20 & 2) == 0 || ObjectDefinition.aBooleanArray1490[86]) && ((var20 & 1) == 0 || ObjectDefinition.aBooleanArray1490[82]) && ((var20 & 4) == 0 || ObjectDefinition.aBooleanArray1490[81])) { - Unsorted.method66(TextCore.emptyJagexString, -1, var19 + 1, (byte) -29, inter.componentHash); + Unsorted.method66(RSString.parse(""), -1, var19 + 1, (byte) -29, inter.componentHash); var21 = inter.anIntArray299[var19]; if (inter.anIntArray310 == null) { inter.anIntArray310 = new int[inter.aByteArray263.length]; @@ -828,14 +830,14 @@ public final class Client extends GameShell { } var4 = 50 * (LinkableRSString.anInt2579 + -Class40.anInt3293) / LinkableRSString.anInt2579; - LoadingBox.draw(false, RSString.stringCombiner(new RSString[]{TextCore.LoadingPleaseWait2, TextCore.aClass94_3399, RSString.stringAnimator(var4), TextCore.aClass94_148})); + LoadingBox.draw(false, RSString.stringCombiner(new RSString[]{TextCore.LoadingPleaseWait2, TextCore.aClass94_3399, RSString.stringAnimator(var4), RSString.parse("(U(Y")})); } else if (Class163_Sub2_Sub1.anInt4019 == 2) { if (anInt2275 < Class162.anInt2038) { anInt2275 = Class162.anInt2038; } var4 = (-Class162.anInt2038 + anInt2275) * 50 / anInt2275 + 50; - LoadingBox.draw(false, RSString.stringCombiner(new RSString[]{TextCore.LoadingPleaseWait2, TextCore.aClass94_3399, RSString.stringAnimator(var4), TextCore.aClass94_148})); + LoadingBox.draw(false, RSString.stringCombiner(new RSString[]{TextCore.LoadingPleaseWait2, TextCore.aClass94_3399, RSString.stringAnimator(var4), RSString.parse("(U(Y")})); } else { LoadingBox.draw(false, TextCore.LoadingPleaseWait2); } @@ -883,7 +885,7 @@ public final class Client extends GameShell { Class75_Sub3.sweepClientStartupReferenceCache(); } - if (Unsorted.aBoolean2146 && 10 == Class143.gameStage && Class3_Sub28_Sub12.anInt3655 != -1) { + if (Unsorted.aBoolean2146 && 10 == Class143.gameStage && ConfigInventoryDefinition.anInt3655 != -1) { Unsorted.aBoolean2146 = false; Class119.method1730(Class38.signlink); } @@ -1017,7 +1019,7 @@ public final class Client extends GameShell { Class163_Sub2.paramSettings = TextCore.aClass94_1745.getParamValue(this); if (Class163_Sub2.paramSettings == null) { - Class163_Sub2.paramSettings = TextCore.emptyJagexString; + Class163_Sub2.paramSettings = RSString.parse(""); } String var5 = this.getParameter("country"); @@ -1044,42 +1046,53 @@ public final class Client extends GameShell { Class119.method1729(); TextureOperation31.aCacheResourceWorker_3159 = new CacheResourceWorker(); Class58.aJs5Worker_917 = new Js5Worker(); - if (TextureOperation20.paramModeWhat != 0) { - Class3_Sub6.aByteArrayArray2287 = new byte[50][]; + + if (TextureOperation20.paramModeWhat != LIVE_ENVIRONMENT) { + Class3_Sub6.softReferenceTestArray = new byte[50][]; } CS2Script.userCurrentWorldID = ObjectDefinition.paramWorldID; - Unsorted.method564(Class38.signlink); + + Unsorted.parsePreferences(Class38.signlink); SystemLogger.logInfo("port: " + Class53.anInt867); SystemLogger.logInfo("MSIP: " + GameConfig.IP_MANAGEMENT); - if (Class44.paramModeWhere == 0) { + + if (Class44.paramModeWhere == LIVE_ENVIRONMENT) { ClientErrorException.worldListHost = Objects.requireNonNull(this.getCodeBase()).getHost(); Class53.anInt867 = GameConfig.SERVER_PORT + ObjectDefinition.paramWorldID; //443 is secure port anInt3773 = '\uaa4a'; - } else if (Class44.paramModeWhere == 1) { + + } else if (Class44.paramModeWhere == OFFICE_ENVIRONMENT) { ClientErrorException.worldListHost = Objects.requireNonNull(this.getCodeBase()).getHost(); //System.out.println("port = " + Class53.anInt867); Class53.anInt867 = ObjectDefinition.paramWorldID + 50000; anInt3773 = 40000 + ObjectDefinition.paramWorldID; - } else if (Class44.paramModeWhere == 2) { + + } else if (Class44.paramModeWhere == LOCAL_ENVIRONMENT) { ClientErrorException.worldListHost = "127.0.0.1"; System.out.println("Setting worldListHost to 127.0.0.1, port = " + Class53.anInt867); - Class53.anInt867 = ObjectDefinition.paramWorldID + '\uc350'; - anInt3773 = ObjectDefinition.paramWorldID + '\u9c40'; + Class53.anInt867 = ObjectDefinition.paramWorldID + 50000; + anInt3773 = ObjectDefinition.paramWorldID + 40000; } - if (1 == Class158.paramGameTypeID) { - ClientCommands.shiftClickEnabled = true; - Class92.defaultScreenColorRgb = 16777215; - Class92.defaultRegionAmbientRGB = 0; - Class15.aShortArrayArray344 = Unsorted.aShortArrayArray1619; - Class101.aShortArrayArray1429 = aShortArrayArray2634; - Class3_Sub25.aShortArray2548 = Unsorted.aShortArray63; - Class91.aShortArray1311 = aShortArray2219; - } else { - Class15.aShortArrayArray344 = Class3_Sub28_Sub12.aShortArrayArray3654; - Class91.aShortArray1311 = aShortArray3349; - Class101.aShortArrayArray1429 = Class20.aShortArrayArray435; - Class3_Sub25.aShortArray2548 = Class164_Sub1.aShortArray3011; + + switch (Class158.paramGameTypeID) { + case GAME_TYPE_RUNESCAPE: + Class15.aShortArrayArray344 = ConfigInventoryDefinition.aShortArrayArray3654; + Class91.aShortArray1311 = aShortArray3349; + Class101.aShortArrayArray1429 = Class20.aShortArrayArray435; + Class3_Sub25.aShortArray2548 = Class164_Sub1.aShortArray3011; + 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; + break; + } currentPort = Class53.anInt867; @@ -1159,8 +1172,8 @@ public final class Client extends GameShell { } ++Class106.anInt1446; - if (-1 != Class3_Sub28_Sub12.anInt3655) { - GraphicDefinition.method967(0, 0, 0, Class23.canvasWidth, Class3_Sub28_Sub12.anInt3655, 0, Class140_Sub7.canvasHeight); + if (-1 != ConfigInventoryDefinition.anInt3655) { + GraphicDefinition.method967(0, 0, 0, Class23.canvasWidth, ConfigInventoryDefinition.anInt3655, 0, Class140_Sub7.canvasHeight); } ++PacketParser.anInt3213; @@ -1500,7 +1513,7 @@ public final class Client extends GameShell { if (var2 < 100) { //!= 100 if (var2 != 0) { - Class3_Sub17.aClass94_2464 = RSString.stringCombiner(new RSString[]{TextCore.CheckingForUpdates, RSString.stringAnimator(var2), TextCore.aClass94_468}); + Class3_Sub17.aClass94_2464 = RSString.stringCombiner(new RSString[]{TextCore.CheckingForUpdates, RSString.stringAnimator(var2), RSString.parse("(U")}); } LoadingStageNumber = 20; @@ -1535,7 +1548,7 @@ public final class Client extends GameShell { LoadingStageNumber = 35; anInt1354 = 60; } else { - Class3_Sub17.aClass94_2464 = RSString.stringCombiner(new RSString[]{TextCore.LoadingFonts, RSString.stringAnimator(100 * var2 / var3), TextCore.aClass94_468}); + Class3_Sub17.aClass94_2464 = RSString.stringCombiner(new RSString[]{TextCore.LoadingFonts, RSString.stringAnimator(100 * var2 / var3), RSString.parse("(U")}); LoadingStageNumber = 35; } } else if (60 == anInt1354) { @@ -1545,7 +1558,7 @@ public final class Client extends GameShell { Class3_Sub17.aClass94_2464 = TextCore.LoadedTitleScreen; anInt1354 = 65; } else { - Class3_Sub17.aClass94_2464 = RSString.stringCombiner(new RSString[]{TextCore.LoadingTitleScreen, RSString.stringAnimator(100 * var2 / var3), TextCore.aClass94_468}); + Class3_Sub17.aClass94_2464 = RSString.stringCombiner(new RSString[]{TextCore.LoadingTitleScreen, RSString.stringAnimator(100 * var2 / var3), RSString.parse("(U")}); } LoadingStageNumber = 40; } else if (anInt1354 == 65) { @@ -1607,14 +1620,14 @@ public final class Client extends GameShell { Class29.method968(128); anInt1354 = 80; } else { - Class3_Sub17.aClass94_2464 = RSString.stringCombiner(new RSString[]{TextCore.LoadingConfig, RSString.stringAnimator(var2 / 11), TextCore.aClass94_468}); + Class3_Sub17.aClass94_2464 = RSString.stringCombiner(new RSString[]{TextCore.LoadingConfig, RSString.stringAnimator(var2 / 11), RSString.parse("(U")}); LoadingStageNumber = 50; } } else if (anInt1354 == 80) { var2 = Sprites.method107(CacheIndex.spritesIndex); var3 = 15; if (var2 < var3) { - Class3_Sub17.aClass94_2464 = RSString.stringCombiner(new RSString[]{TextCore.LoadingSprites, RSString.stringAnimator(var2 * 100 / var3), TextCore.aClass94_468}); + Class3_Sub17.aClass94_2464 = RSString.stringCombiner(new RSString[]{TextCore.LoadingSprites, RSString.stringAnimator(var2 * 100 / var3), RSString.parse("(U")}); LoadingStageNumber = 60; } else { Sprites.method887(CacheIndex.spritesIndex); @@ -1644,19 +1657,19 @@ public final class Client extends GameShell { Class3_Sub17.aClass94_2464 = TextCore.LoadedInterfaces; anInt1354 = 135; } else { - Class3_Sub17.aClass94_2464 = RSString.stringCombiner(new RSString[]{TextCore.LoadingInterfaces, RSString.stringAnimator(90 - -(CacheIndex.worldmapIndex.method2116(TextCore.aClass94_1342) / 10)), TextCore.aClass94_468}); + Class3_Sub17.aClass94_2464 = RSString.stringCombiner(new RSString[]{TextCore.LoadingInterfaces, RSString.stringAnimator(90 - -(CacheIndex.worldmapIndex.method2116(TextCore.aClass94_1342) / 10)), RSString.parse("(U")}); LoadingStageNumber = 85; } } else { - Class3_Sub17.aClass94_2464 = RSString.stringCombiner(new RSString[]{TextCore.LoadingInterfaces, RSString.stringAnimator(85 - -(CacheIndex.fontsIndex.method2136((byte) -124) / 20)), TextCore.aClass94_468}); + Class3_Sub17.aClass94_2464 = RSString.stringCombiner(new RSString[]{TextCore.LoadingInterfaces, RSString.stringAnimator(85 - -(CacheIndex.fontsIndex.method2136((byte) -124) / 20)), RSString.parse("(U")}); LoadingStageNumber = 85; } } else { - Class3_Sub17.aClass94_2464 = RSString.stringCombiner(new RSString[]{TextCore.LoadingInterfaces, RSString.stringAnimator(75 - -(CacheIndex.interfaceScriptsIndex.method2136((byte) -128) / 10)), TextCore.aClass94_468}); + Class3_Sub17.aClass94_2464 = RSString.stringCombiner(new RSString[]{TextCore.LoadingInterfaces, RSString.stringAnimator(75 - -(CacheIndex.interfaceScriptsIndex.method2136((byte) -128) / 10)), RSString.parse("(U")}); LoadingStageNumber = 85; } } else { - Class3_Sub17.aClass94_2464 = RSString.stringCombiner(new RSString[]{TextCore.LoadingInterfaces, RSString.stringAnimator(CacheIndex.interfacesIndex.method2136((byte) -123) * 3 / 4), TextCore.aClass94_468}); + Class3_Sub17.aClass94_2464 = RSString.stringCombiner(new RSString[]{TextCore.LoadingInterfaces, RSString.stringAnimator(CacheIndex.interfacesIndex.method2136((byte) -123) * 3 / 4), RSString.parse("(U")}); LoadingStageNumber = 85; } } else if (135 == anInt1354) { @@ -1705,8 +1718,8 @@ public final class Client extends GameShell { } else if (anInt1354 == 160) { TextureOperation1.method219(true); } - } else if (CacheIndex.huffmanEncodingIndex.method2125(TextCore.emptyJagexString, TextCore.HasHuffman)) { - Class36 var9 = new Class36(CacheIndex.huffmanEncodingIndex.method2123(TextCore.emptyJagexString, TextCore.HasHuffman)); + } else if (CacheIndex.huffmanEncodingIndex.method2125(RSString.parse(""), TextCore.HasHuffman)) { + Class36 var9 = new Class36(CacheIndex.huffmanEncodingIndex.method2123(RSString.parse(""), TextCore.HasHuffman)); Class1.method69(var9); Class3_Sub17.aClass94_2464 = TextCore.LoadedWordPack; anInt1354 = 130; @@ -1738,7 +1751,7 @@ public final class Client extends GameShell { anInt1354 = 100; LoadingStageNumber = 70; } else { - Class3_Sub17.aClass94_2464 = RSString.stringCombiner(new RSString[]{TextCore.LoadingTextures, RSString.stringAnimator(CacheIndex.materialsIndex.method2136((byte) -125)), TextCore.aClass94_468}); + Class3_Sub17.aClass94_2464 = RSString.stringCombiner(new RSString[]{TextCore.LoadingTextures, RSString.stringAnimator(CacheIndex.materialsIndex.method2136((byte) -125)), RSString.parse("(U")}); LoadingStageNumber = 70; } } diff --git a/Client/src/main/java/org/runite/client/ConfigInventoryDefinition.java b/Client/src/main/java/org/runite/client/ConfigInventoryDefinition.java new file mode 100644 index 000000000..4dd5313c6 --- /dev/null +++ b/Client/src/main/java/org/runite/client/ConfigInventoryDefinition.java @@ -0,0 +1,45 @@ +package org.runite.client; + +import org.rs09.client.Node; + +public final class ConfigInventoryDefinition extends Node { + + static int[] anIntArray1835 = new int[100]; + static int[] anIntArray3082 = new int[100]; + static RSString[] aClass94Array3226 = new RSString[100]; + 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); + if (null == var2) { + byte[] var3 = Class8.configurationReferenceCache.getFile(5, var0); + var2 = new ConfigInventoryDefinition(); + if (var3 != null) { + var2.decode(new DataBuffer(var3)); + } + + Class49.aClass47_818.put(var0, var2); + } + return var2; + } + + public final void decode(DataBuffer buffer) { + while (true) { + int opcode = buffer.readUnsignedByte(); + if (0 == opcode) { + return; + } + + this.decode(buffer, opcode); + } + } + + private void decode(DataBuffer buffer, int opcode) { + if (opcode == 2) { + this.size = buffer.readUnsignedShort(); + } + } + +} diff --git a/Client/src/main/java/org/runite/client/KeyboardListener.java b/Client/src/main/java/org/runite/client/KeyboardListener.java index e55333073..afa10ca95 100644 --- a/Client/src/main/java/org/runite/client/KeyboardListener.java +++ b/Client/src/main/java/org/runite/client/KeyboardListener.java @@ -170,17 +170,17 @@ final class KeyboardListener implements KeyListener, FocusListener { if(var1.isAltDown()){ if(var1.getKeyChar()=='n'){ GameConfig.NPC_DEBUG_ENABLED = !GameConfig.NPC_DEBUG_ENABLED; - BufferedDataStream.addChatMessage(TextCore.clientDebugNotifier, 0, RSString.parse("NPC debug context " + (GameConfig.NPC_DEBUG_ENABLED ? "enabled." : "disabled.")), -1); + BufferedDataStream.addChatMessage(RSString.parse("Client debug notifier"), 0, RSString.parse("NPC debug context " + (GameConfig.NPC_DEBUG_ENABLED ? "enabled." : "disabled.")), -1); return; } if(var1.getKeyChar()=='o'){ GameConfig.OBJECT_DEBUG_ENABLED = !GameConfig.OBJECT_DEBUG_ENABLED; - BufferedDataStream.addChatMessage(TextCore.clientDebugNotifier, 0, RSString.parse("Object debug context " + (GameConfig.OBJECT_DEBUG_ENABLED ? "enabled." : "disabled.")), -1); + BufferedDataStream.addChatMessage(RSString.parse("Client debug notifier"), 0, RSString.parse("Object debug context " + (GameConfig.OBJECT_DEBUG_ENABLED ? "enabled." : "disabled.")), -1); return; } if(var1.getKeyChar()=='i'){ GameConfig.ITEM_DEBUG_ENABLED = !GameConfig.ITEM_DEBUG_ENABLED; - BufferedDataStream.addChatMessage(TextCore.clientDebugNotifier, 0, RSString.parse("Item debug context " + (GameConfig.ITEM_DEBUG_ENABLED ? "enabled." : "disabled.")), -1); + BufferedDataStream.addChatMessage(RSString.parse("Client debug notifier"), 0, RSString.parse("Item debug context " + (GameConfig.ITEM_DEBUG_ENABLED ? "enabled." : "disabled.")), -1); return; } return; diff --git a/Client/src/main/java/org/runite/client/LinkableRSString.java b/Client/src/main/java/org/runite/client/LinkableRSString.java index 3a2952967..6d27abad2 100644 --- a/Client/src/main/java/org/runite/client/LinkableRSString.java +++ b/Client/src/main/java/org/runite/client/LinkableRSString.java @@ -160,7 +160,7 @@ public final class LinkableRSString extends Linkable { if (0 == var1.length()) { var4 = RSString.stringCombiner(new RSString[]{var4, TextCore.HasAgeExpire}); } else { - var4 = RSString.stringCombiner(new RSString[]{var4, TextCore.HasExpires, Class15.method894(94608000000L + TimeUtils.time()), TextCore.HasMaxAge, Class3_Sub28_Sub12.method612(94608000L)}); + var4 = RSString.stringCombiner(new RSString[]{var4, TextCore.HasExpires, Class15.method894(94608000000L + TimeUtils.time()), TextCore.HasMaxAge, Class3_Sub28_Sub4.method612(94608000L)}); } RSString.stringCombiner(new RSString[]{TextCore.aClass94_1694, var4, TextCore.aClass94_1698}).method1554(Class38.signlink.gameApplet); diff --git a/Client/src/main/java/org/runite/client/MessageManager.java b/Client/src/main/java/org/runite/client/MessageManager.java new file mode 100644 index 000000000..28299b894 --- /dev/null +++ b/Client/src/main/java/org/runite/client/MessageManager.java @@ -0,0 +1,42 @@ +package org.runite.client; + +public final class MessageManager { + + 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]; + LinkableRSString.aClass94Array2580[i] = LinkableRSString.aClass94Array2580[-1 + i]; + Class163_Sub3.aClass94Array3003[i] = Class163_Sub3.aClass94Array3003[i + -1]; + ConfigInventoryDefinition.anIntArray1835[i] = ConfigInventoryDefinition.anIntArray1835[i - 1]; + } + + ++TextureOperation16.anInt3114; + ConfigInventoryDefinition.anIntArray3082[0] = type; + ConfigInventoryDefinition.aClass94Array3226[0] = var5; + Class24.anInt472 = PacketParser.anInt3213; + ConfigInventoryDefinition.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); + if(message.length > cutOff && type != 0){ + String[] tokens = message.toString().split(" "); + if(tokens.length > 1) { + int counter = 0; + for (String tok : tokens) { + if (counter + tok.length() > cutOff) { + break; + } + counter += tok.length() + 1; + } + primaryMsg = message.substring(0, counter, 0); + secondaryMsg = message.substring(counter, message.length, 0); + message = primaryMsg; + } + } + LinkableRSString.aClass94Array2580[0] = message; + Class163_Sub3.aClass94Array3003[0] = var3; + if(!secondaryMsg.equalsString(RSString.parse("null"))) + sendGameMessage(var0,type,secondaryMsg,var3,var5); + } +} diff --git a/Client/src/main/java/org/runite/client/PacketParser.java b/Client/src/main/java/org/runite/client/PacketParser.java index 8a99be516..6ec444b5d 100644 --- a/Client/src/main/java/org/runite/client/PacketParser.java +++ b/Client/src/main/java/org/runite/client/PacketParser.java @@ -110,8 +110,8 @@ public final class PacketParser { RSString var41; if (Unsorted.incomingOpcode == 70) { RSString message = BufferedDataStream.incomingBuffer.readString(); - if (message.endsWith(TextCore.HasTradeRequest)) { - playerName = message.substring(0, message.indexOf(TextCore.char_colon, 65), 0); + if (message.endsWith(RSString.parse(":tradereq:"))) { + playerName = message.substring(0, message.indexOf(RSString.parse(":"), 65), 0); nameAsLong = playerName.toLong(); isIgnored = false; @@ -126,7 +126,7 @@ public final class PacketParser { BufferedDataStream.addChatMessage(playerName, 4, TextCore.HasWishToTrade, (byte) -83 + 82); } } else if (message.endsWith(TextCore.cmdChalReq)) { - playerName = message.substring(0, message.indexOf(TextCore.char_colon, 75), 0); + playerName = message.substring(0, message.indexOf(RSString.parse(":"), 75), 0); nameAsLong = playerName.toLong(); isIgnored = false; @@ -138,12 +138,12 @@ public final class PacketParser { } if (!isIgnored && inTutorialIsland == 0) { - var41 = message.substring(1 + message.indexOf(TextCore.char_colon, 101), message.length() + -9, (byte) -83 ^ -83); + var41 = message.substring(1 + message.indexOf(RSString.parse(":"), 101), message.length() + -9, (byte) -83 ^ -83); BufferedDataStream.addChatMessage(playerName, 8, var41, (byte) -83 ^ 82); } } else if (message.endsWith(TextCore.HasAssistRequest)) { isIgnored = false; - playerName = message.substring(0, message.indexOf(TextCore.char_colon, 96), 0); + playerName = message.substring(0, message.indexOf(RSString.parse(":"), 96), 0); nameAsLong = playerName.toLong(); for (var30 = 0; var30 < Class3_Sub28_Sub5.anInt3591; ++var30) { @@ -154,24 +154,24 @@ public final class PacketParser { } if (!isIgnored && inTutorialIsland == 0) { - BufferedDataStream.addChatMessage(playerName, 10, TextCore.emptyJagexString, -1); + BufferedDataStream.addChatMessage(playerName, 10, RSString.parse(""), -1); } } else if (message.endsWith(TextCore.HasClan)) { playerName = message.substring(0, message.indexOf(TextCore.HasClan, (byte) -83 ^ -50), 0); - BufferedDataStream.addChatMessage(TextCore.emptyJagexString, 11, playerName, -1); + BufferedDataStream.addChatMessage(RSString.parse(""), 11, playerName, -1); } else if (message.endsWith(TextCore.HasTrade)) { playerName = message.substring(0, message.indexOf(TextCore.HasTrade, 102), 0); if (0 == inTutorialIsland) { - BufferedDataStream.addChatMessage(TextCore.emptyJagexString, 12, playerName, -1); + BufferedDataStream.addChatMessage(RSString.parse(""), 12, playerName, -1); } } else if (message.endsWith(TextCore.HasAssist)) { playerName = message.substring(0, message.indexOf(TextCore.HasAssist, 121), 0); if (inTutorialIsland == 0) { - BufferedDataStream.addChatMessage(TextCore.emptyJagexString, 13, playerName, -1); + BufferedDataStream.addChatMessage(RSString.parse(""), 13, playerName, -1); } } else if (message.endsWith(TextCore.HasDuelStake)) { isIgnored = false; - playerName = message.substring(0, message.indexOf(TextCore.char_colon, 115), 0); + playerName = message.substring(0, message.indexOf(RSString.parse(":"), 115), 0); nameAsLong = playerName.toLong(); for (var30 = 0; Class3_Sub28_Sub5.anInt3591 > var30; ++var30) { @@ -182,10 +182,10 @@ public final class PacketParser { } if (!isIgnored && inTutorialIsland == 0) { - BufferedDataStream.addChatMessage(playerName, 14, TextCore.emptyJagexString, -1); + BufferedDataStream.addChatMessage(playerName, 14, RSString.parse(""), -1); } } else if (message.endsWith(TextCore.HasDuelFriend)) { - playerName = message.substring(0, message.indexOf(TextCore.char_colon, 118), 0); + playerName = message.substring(0, message.indexOf(RSString.parse(":"), 118), 0); isIgnored = false; nameAsLong = playerName.toLong(); @@ -197,10 +197,10 @@ public final class PacketParser { } if (!isIgnored && 0 == inTutorialIsland) { - BufferedDataStream.addChatMessage(playerName, 15, TextCore.emptyJagexString, -1); + BufferedDataStream.addChatMessage(playerName, 15, RSString.parse(""), -1); } } else if (message.endsWith(TextCore.HasClanRequest)) { - playerName = message.substring(0, message.indexOf(TextCore.char_colon, (byte) -83 + 138), 0); + playerName = message.substring(0, message.indexOf(RSString.parse(":"), (byte) -83 + 138), 0); nameAsLong = playerName.toLong(); isIgnored = false; @@ -212,10 +212,10 @@ public final class PacketParser { } if (!isIgnored && inTutorialIsland == 0) { - BufferedDataStream.addChatMessage(playerName, 16, TextCore.emptyJagexString, -1); + BufferedDataStream.addChatMessage(playerName, 16, RSString.parse(""), -1); } } else if (message.endsWith(TextCore.HasAllyReq)) { - playerName = message.substring(0, message.indexOf(TextCore.char_colon, (byte) -83 + 189), (byte) -83 + 83); + playerName = message.substring(0, message.indexOf(RSString.parse(":"), (byte) -83 + 189), (byte) -83 + 83); isIgnored = false; nameAsLong = playerName.toLong(); @@ -227,11 +227,11 @@ public final class PacketParser { } if (!isIgnored && inTutorialIsland == 0) { - var41 = message.substring(1 + message.indexOf(TextCore.char_colon, 92), message.length() - 9, (byte) -83 ^ -83); + var41 = message.substring(1 + message.indexOf(RSString.parse(":"), 92), message.length() - 9, (byte) -83 ^ -83); BufferedDataStream.addChatMessage(playerName, 21, var41, -1); } } else { - BufferedDataStream.addChatMessage(TextCore.emptyJagexString, 0, message, (byte) -83 + 82); + BufferedDataStream.addChatMessage(RSString.parse(""), 0, message, (byte) -83 + 82); } Unsorted.incomingOpcode = -1; @@ -321,11 +321,11 @@ public final class PacketParser { MouseListeningClass.anInt1921 = (1 + MouseListeningClass.anInt1921) % 100; RSString var61 = LinkableRSString.method733(var11).method555(BufferedDataStream.incomingBuffer); if (clanChatIcon == 2 || 3 == clanChatIcon) { - Class3_Sub28_Sub12.sendGameMessage(var11, 20, var61, Objects.requireNonNull(Unsorted.method1052(nameAsLong)).longToRSString(), RSString.stringCombiner(new RSString[]{TextCore.aClass94_444, Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString()})); + MessageManager.sendGameMessage(var11, 20, var61, Objects.requireNonNull(Unsorted.method1052(nameAsLong)).longToRSString(), RSString.stringCombiner(new RSString[]{RSString.parse(""), Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString()})); } else if (clanChatIcon == 1) { - Class3_Sub28_Sub12.sendGameMessage(var11, 20, var61, Objects.requireNonNull(Unsorted.method1052(nameAsLong)).longToRSString(), RSString.stringCombiner(new RSString[]{TextCore.aClass94_592, Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString()})); + MessageManager.sendGameMessage(var11, 20, var61, Objects.requireNonNull(Unsorted.method1052(nameAsLong)).longToRSString(), RSString.stringCombiner(new RSString[]{RSString.parse(""), Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString()})); } else { - Class3_Sub28_Sub12.sendGameMessage(var11, 20, var61, Objects.requireNonNull(Unsorted.method1052(nameAsLong)).longToRSString(), Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString()); + MessageManager.sendGameMessage(var11, 20, var61, Objects.requireNonNull(Unsorted.method1052(nameAsLong)).longToRSString(), Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString()); } } @@ -462,10 +462,10 @@ public final class PacketParser { if (var19 == 2) { Class7.method834(); } - Class3_Sub28_Sub12.anInt3655 = nodeModelId; + ConfigInventoryDefinition.anInt3655 = nodeModelId; TextureOperation20.method232(nodeModelId); Class124.method1746(false, (byte) -64); - TextureOperation24.method226(Class3_Sub28_Sub12.anInt3655); + TextureOperation24.method226(ConfigInventoryDefinition.anInt3655); for (counter = 0; counter < 100; ++counter) { Unsorted.aBooleanArray3674[counter] = true; @@ -486,7 +486,7 @@ public final class PacketParser { var2 = BufferedDataStream.incomingBuffer.readLong(); modelId = BufferedDataStream.incomingBuffer.readUnsignedShort(); var56 = LinkableRSString.method733(modelId).method555(BufferedDataStream.incomingBuffer); - Class3_Sub28_Sub12.sendGameMessage(modelId, 19, var56, null, Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString()); + MessageManager.sendGameMessage(modelId, 19, var56, null, Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString()); Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 169) { //UNUSED BY SERVER @@ -814,7 +814,7 @@ public final class PacketParser { isIgnored = false; } - var41 = TextCore.emptyJagexString; + var41 = RSString.parse(""); if (modelId > 0) { var41 = BufferedDataStream.incomingBuffer.readString(); } @@ -826,11 +826,11 @@ public final class PacketParser { if (Unsorted.anIntArray882[var33] != modelId) { Unsorted.anIntArray882[var33] = modelId; if (0 < modelId) { - BufferedDataStream.addChatMessage(TextCore.emptyJagexString, 5, RSString.stringCombiner(new RSString[]{var46, TextCore.HasLoggedIn}), -1); + BufferedDataStream.addChatMessage(RSString.parse(""), 5, RSString.stringCombiner(new RSString[]{var46, TextCore.HasLoggedIn}), -1); } if (modelId == 0) { - BufferedDataStream.addChatMessage(TextCore.emptyJagexString, 5, RSString.stringCombiner(new RSString[]{var46, TextCore.HasLoggedOut}), -1); + BufferedDataStream.addChatMessage(RSString.parse(""), 5, RSString.stringCombiner(new RSString[]{var46, TextCore.HasLoggedOut}), -1); } } @@ -961,11 +961,11 @@ public final class PacketParser { MouseListeningClass.anInt1921 = (1 + MouseListeningClass.anInt1921) % 100; var64 = LinkableRSString.method733(var33).method555(BufferedDataStream.incomingBuffer); if (chatIcon == 2) { - Class3_Sub28_Sub12.sendGameMessage(var33, 18, var64, null, RSString.stringCombiner(new RSString[]{TextCore.aClass94_444, Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString()})); + MessageManager.sendGameMessage(var33, 18, var64, null, RSString.stringCombiner(new RSString[]{RSString.parse(""), Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString()})); } else if (1 == chatIcon) { - Class3_Sub28_Sub12.sendGameMessage(var33, 18, var64, null, RSString.stringCombiner(new RSString[]{TextCore.aClass94_592, Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString()})); + MessageManager.sendGameMessage(var33, 18, var64, null, RSString.stringCombiner(new RSString[]{RSString.parse(""), Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString()})); } else { - Class3_Sub28_Sub12.sendGameMessage(var33, 18, var64, null, Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString()); + MessageManager.sendGameMessage(var33, 18, var64, null, Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString()); } } @@ -1000,8 +1000,8 @@ public final class PacketParser { Unsorted.method2104(var27, true, 48); } - if (Class3_Sub28_Sub12.anInt3655 != -1) { - Class3_Sub8.method124(28, 1, Class3_Sub28_Sub12.anInt3655); + if (ConfigInventoryDefinition.anInt3655 != -1) { + Class3_Sub8.method124(28, 1, ConfigInventoryDefinition.anInt3655); } Unsorted.incomingOpcode = -1; @@ -1056,8 +1056,8 @@ public final class PacketParser { Unsorted.incomingOpcode = -1; return true; } else if (Unsorted.incomingOpcode == 209) { - if (-1 != Class3_Sub28_Sub12.anInt3655) { - Class3_Sub8.method124(48, 0, Class3_Sub28_Sub12.anInt3655); + if (-1 != ConfigInventoryDefinition.anInt3655) { + Class3_Sub8.method124(48, 0, ConfigInventoryDefinition.anInt3655); } Unsorted.incomingOpcode = -1; @@ -1292,7 +1292,7 @@ public final class PacketParser { MouseListeningClass.anInt1921 = (MouseListeningClass.anInt1921 - -1) % 100; RSString var52 = Font.method686(Objects.requireNonNull(Class32.method992(BufferedDataStream.incomingBuffer).properlyCapitalize())); if (chatIcon == 2 || chatIcon == 3) { - BufferedDataStream.addChatMessage(RSString.stringCombiner(new RSString[]{TextCore.aClass94_444, Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString()}), 7, var52, -1); + BufferedDataStream.addChatMessage(RSString.stringCombiner(new RSString[]{RSString.parse(""), Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString()}), 7, var52, -1); } else if (chatIcon == 1) { BufferedDataStream.addChatMessage(RSString.stringCombiner(new RSString[]{RSString.parse(""), Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString()}), 7, var52, -1); } else { @@ -1344,9 +1344,9 @@ public final class PacketParser { MouseListeningClass.anInt1921 = (MouseListeningClass.anInt1921 + 1) % 100; var57 = Font.method686(Objects.requireNonNull(Class32.method992(BufferedDataStream.incomingBuffer).properlyCapitalize())); if (clanChatIcon == 2 || clanChatIcon == 3) { - TextureOperation1.method221(-1, var57, RSString.stringCombiner(new RSString[]{TextCore.aClass94_444, Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString()}), Objects.requireNonNull(Unsorted.method1052(nameAsLong)).longToRSString(), 9); + TextureOperation1.method221(-1, var57, RSString.stringCombiner(new RSString[]{RSString.parse(""), Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString()}), Objects.requireNonNull(Unsorted.method1052(nameAsLong)).longToRSString(), 9); } else if (clanChatIcon == 1) { - TextureOperation1.method221(-1, var57, RSString.stringCombiner(new RSString[]{TextCore.aClass94_592, Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString()}), Objects.requireNonNull(Unsorted.method1052(nameAsLong)).longToRSString(), 9); + TextureOperation1.method221(-1, var57, RSString.stringCombiner(new RSString[]{RSString.parse(""), Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString()}), Objects.requireNonNull(Unsorted.method1052(nameAsLong)).longToRSString(), 9); } else { if (clanChatIcon == 0) TextureOperation1.method221(-1, var57, Objects.requireNonNull(Unsorted.method1052(var2)).longToRSString(), Objects.requireNonNull(Unsorted.method1052(nameAsLong)).longToRSString(), 9); diff --git a/Client/src/main/java/org/runite/client/Player.java b/Client/src/main/java/org/runite/client/Player.java index ac6d5adb2..85c0a63b6 100644 --- a/Client/src/main/java/org/runite/client/Player.java +++ b/Client/src/main/java/org/runite/client/Player.java @@ -234,12 +234,12 @@ public final class Player extends Class140_Sub4 { int var17; if (0 != TextureOperation20.paramModeWhat && var16 < 50) { for (var17 = 50 - var16; Class56.anInt893 < var17; ++Class56.anInt893) { - Class3_Sub6.aByteArrayArray2287[Class56.anInt893] = new byte[102400]; + Class3_Sub6.softReferenceTestArray[Class56.anInt893] = new byte[102400]; } while (Class56.anInt893 > var17) { --Class56.anInt893; - Class3_Sub6.aByteArrayArray2287[Class56.anInt893] = null; + Class3_Sub6.softReferenceTestArray[Class56.anInt893] = null; } } diff --git a/Client/src/main/java/org/runite/client/PlayerRendering.java b/Client/src/main/java/org/runite/client/PlayerRendering.java index 2b38ace59..c7495b132 100644 --- a/Client/src/main/java/org/runite/client/PlayerRendering.java +++ b/Client/src/main/java/org/runite/client/PlayerRendering.java @@ -243,11 +243,11 @@ public final class PlayerRendering { var3.textCycle = 150; var3.textColor = var4 >> 8; if (chatIcon >= 2) { - Class3_Sub28_Sub12.sendGameMessage(var13, var8 ? 17 : 1, message, null, RSString.stringCombiner(new RSString[]{RSString.parse(""), var3.getName()})); + MessageManager.sendGameMessage(var13, var8 ? 17 : 1, message, null, RSString.stringCombiner(new RSString[]{RSString.parse(""), var3.getName()})); } else if (chatIcon == 1) { - Class3_Sub28_Sub12.sendGameMessage(var13, var8 ? 17 : 1, message, null, RSString.stringCombiner(new RSString[]{TextCore.aClass94_592, var3.getName()})); + MessageManager.sendGameMessage(var13, var8 ? 17 : 1, message, null, RSString.stringCombiner(new RSString[]{RSString.parse(""), var3.getName()})); } else { - Class3_Sub28_Sub12.sendGameMessage(var13, var8 ? 17 : 2, message, null, var3.getName()); + MessageManager.sendGameMessage(var13, var8 ? 17 : 2, message, null, var3.getName()); } } } diff --git a/Client/src/main/java/org/runite/client/RSInterface.java b/Client/src/main/java/org/runite/client/RSInterface.java index 0b5637ee2..c34b4a939 100644 --- a/Client/src/main/java/org/runite/client/RSInterface.java +++ b/Client/src/main/java/org/runite/client/RSInterface.java @@ -247,7 +247,7 @@ public final class RSInterface { try { RSString var1 = TextCore.aClass94_4052; - RSString var2 = TextCore.emptyJagexString; + RSString var2 = RSString.parse(""); if (Class44.paramModeWhere != 0) { var1 = RSString.parse("www)2wtqa"); } diff --git a/Client/src/main/java/org/runite/client/SequenceDefinition.java b/Client/src/main/java/org/runite/client/SequenceDefinition.java index a388c1c7d..962300d43 100644 --- a/Client/src/main/java/org/runite/client/SequenceDefinition.java +++ b/Client/src/main/java/org/runite/client/SequenceDefinition.java @@ -496,15 +496,15 @@ public final class SequenceDefinition { NPCDefinition.anIntArray1277[var1] = -1; } - if(Class3_Sub28_Sub12.anInt3655 != -1) { - Class60.method1208((byte)-128, Class3_Sub28_Sub12.anInt3655); + if(ConfigInventoryDefinition.anInt3655 != -1) { + Class60.method1208((byte)-128, ConfigInventoryDefinition.anInt3655); } for(Class3_Sub31 var7 = TextureOperation23.aHashTable_3208.first(); var7 != null; var7 = TextureOperation23.aHashTable_3208.next()) { TextureOperation19.method254(true, var7); } - Class3_Sub28_Sub12.anInt3655 = -1; + ConfigInventoryDefinition.anInt3655 = -1; TextureOperation23.aHashTable_3208 = new HashTable(8); Class3_Sub7.method122(-113); TextureOperation27.aClass11_3087 = null; diff --git a/Client/src/main/java/org/runite/client/TextCore.java b/Client/src/main/java/org/runite/client/TextCore.java index 838f403a9..b1e891dfa 100644 --- a/Client/src/main/java/org/runite/client/TextCore.java +++ b/Client/src/main/java/org/runite/client/TextCore.java @@ -132,7 +132,6 @@ public class TextCore { static RSString MillionM = RSString.parse("M"); static RSString HasDuelFriend = RSString.parse(":duelfriend:"); static RSString HasDuelStake = RSString.parse(":duelstake:"); - static RSString HasTradeRequest = RSString.parse(":tradereq:"); static RSString HasTrade = RSString.parse(":trade:"); static RSString HasAssist = RSString.parse(":assist:"); static RSString HasAssistRequest = RSString.parse(":assistreq:"); @@ -250,32 +249,6 @@ public class TextCore { * Unsorted */ static RSString Spacer = RSString.parse(" "); - static RSString aClass94_946 = RSString.parse(")2"); - static RSString aClass94_995 = RSString.parse("(Y<)4col>"); - static RSString aClass94_1645 = RSString.parse("Hidden)2"); - static RSString char_colon = RSString.parse(":"); - static RSString aClass94_148 = RSString.parse("(U(Y"); - static RSString aClass94_465 = RSString.parse(" "); - static RSString aClass94_468 = RSString.parse("(U"); - static RSString worldmapUnderlay = RSString.parse("underlay"); - static RSString worldmapOverlay = RSString.parse("overlay"); - static RSString worldmapOverlay2 = RSString.parse("overlay2"); - static RSString aClass94_3133 = RSString.parse(")2"); - static RSString aClass94_422 = RSString.parse("loc"); - static RSString emptyJagexString = RSString.parse(""); - static RSString clientDebugNotifier = RSString.parse("Client debug notifier"); - static RSString aClass94_3209 = RSString.parse("showingVideoAd"); - static RSString aClass94_592 = RSString.parse(""); - static RSString timeZone = RSString.parse(" GMT"); - static RSString aClass94_3190 = RSString.parse(""); - static RSString aClass94_3192 = RSString.parse(" "); - static RSString aClass94_3196 = RSString.parse("Fps:"); - static RSString openGLVersionText = RSString.parse("Client OpenGL Version:"); - static RSString graphicsCard = RSString.parse("Graphics Card:"); - static RSString aClass94_3039 = RSString.parse("0"); - static RSString aClass94_3055 = RSString.parse("k"); - static RSString aClass94_3145 = RSString.parse(")1 "); - static RSString aClass94_3268 = RSString.parse(")1"); static RSString aClass94_3339 = RSString.parse("null"); static RSString aClass94_3357 = RSString.parse(""); static RSString memoryEquals = RSString.parse("mem="); @@ -294,7 +267,6 @@ public class TextCore { static RSString aClass94_341 = RSString.parse(")3"); static RSString aClass94_436 = RSString.parse("Cache:"); static RSString aClass94_442 = RSString.parse("Number of player models in cache:"); - static RSString aClass94_444 = RSString.parse(""); static RSString aClass94_516 = RSString.parse("unzap"); static RSString aClass94_2610 = RSString.parse(")1o"); static RSString aClass94_673 = RSString.parse(")0"); diff --git a/Client/src/main/java/org/runite/client/TextureOperation1.java b/Client/src/main/java/org/runite/client/TextureOperation1.java index 2aafb7198..e0f6b8007 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation1.java +++ b/Client/src/main/java/org/runite/client/TextureOperation1.java @@ -60,21 +60,21 @@ final class TextureOperation1 extends TextureOperation { static void method219(boolean var0) { try { if(var0) { - if(-1 != Class3_Sub28_Sub12.anInt3655) { - Class60.method1208((byte)-128, Class3_Sub28_Sub12.anInt3655); + if(-1 != ConfigInventoryDefinition.anInt3655) { + Class60.method1208((byte)-128, ConfigInventoryDefinition.anInt3655); } for(Class3_Sub31 var2 = TextureOperation23.aHashTable_3208.first(); null != var2; var2 = TextureOperation23.aHashTable_3208.next()) { TextureOperation19.method254(true, var2); } - Class3_Sub28_Sub12.anInt3655 = -1; + ConfigInventoryDefinition.anInt3655 = -1; TextureOperation23.aHashTable_3208 = new HashTable(8); Class3_Sub7.method122(3000 + -2918); - Class3_Sub28_Sub12.anInt3655 = Client.loginScreenInterfaceID; + ConfigInventoryDefinition.anInt3655 = Client.loginScreenInterfaceID; Class124.method1746(false, (byte)-36); Unsorted.method1093(false); - TextureOperation24.method226(Class3_Sub28_Sub12.anInt3655); + TextureOperation24.method226(ConfigInventoryDefinition.anInt3655); } Class3_Sub28_Sub5.anInt3590 = -1; @@ -117,7 +117,7 @@ final class TextureOperation1 extends TextureOperation { static void method221(int var0, RSString var1, RSString var2, RSString var3, int var4) { try { - Class3_Sub28_Sub12.sendGameMessage(var0, var4, var1, var3, var2); + MessageManager.sendGameMessage(var0, var4, var1, var3, var2); } catch (RuntimeException var6) { throw ClientErrorException.clientError(var6, "fm.F(" + var0 + ',' + (var1 != null?"{...}":"null") + ',' + (var2 != null?"{...}":"null") + ',' + (var3 != null?"{...}":"null") + ',' + var4 + ')'); } @@ -125,10 +125,6 @@ final class TextureOperation1 extends TextureOperation { final void decode(int var1, DataBuffer var2) { try { - if(!true) { - method221(-64, null, null, null, 34); - } - if(var1 == 0) { this.method218(var2.readMedium()); } diff --git a/Client/src/main/java/org/runite/client/TextureOperation13.java b/Client/src/main/java/org/runite/client/TextureOperation13.java index 87fdb2206..22fb75c4d 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation13.java +++ b/Client/src/main/java/org/runite/client/TextureOperation13.java @@ -116,8 +116,8 @@ final class TextureOperation13 extends TextureOperation { LinkableRSString.method727(); Class3_Sub21.method397((byte)-41); if(TextureOperation20.paramModeWhat != 0) { - for(int var1 = 0; var1 < Class3_Sub6.aByteArrayArray2287.length; ++var1) { - Class3_Sub6.aByteArrayArray2287[var1] = null; + for(int var1 = 0; var1 < Class3_Sub6.softReferenceTestArray.length; ++var1) { + Class3_Sub6.softReferenceTestArray[var1] = null; } Class56.anInt893 = 0; diff --git a/Client/src/main/java/org/runite/client/TextureOperation19.java b/Client/src/main/java/org/runite/client/TextureOperation19.java index 81eb55474..8abe847ac 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation19.java +++ b/Client/src/main/java/org/runite/client/TextureOperation19.java @@ -55,8 +55,8 @@ final class TextureOperation19 extends TextureOperation { Class21.anInt3552 = var7 + 8; } - if(-1 != Class3_Sub28_Sub12.anInt3655) { - Class3_Sub8.method124(115, 1, Class3_Sub28_Sub12.anInt3655); + if(-1 != ConfigInventoryDefinition.anInt3655) { + Class3_Sub8.method124(115, 1, ConfigInventoryDefinition.anInt3655); } } catch (RuntimeException var10) { diff --git a/Client/src/main/java/org/runite/client/TextureOperation20.java b/Client/src/main/java/org/runite/client/TextureOperation20.java index 7c99c8d91..a4802dad9 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation20.java +++ b/Client/src/main/java/org/runite/client/TextureOperation20.java @@ -658,8 +658,8 @@ final class TextureOperation20 extends TextureOperation { } Class3_Sub28_Sub3.aClass11_3551 = null; - if(Class3_Sub28_Sub12.anInt3655 != -1) { - GraphicDefinition.method967(0, 0, 0, Class23.canvasWidth, Class3_Sub28_Sub12.anInt3655, 0, Class140_Sub7.canvasHeight); + if(ConfigInventoryDefinition.anInt3655 != -1) { + GraphicDefinition.method967(0, 0, 0, Class23.canvasWidth, ConfigInventoryDefinition.anInt3655, 0, Class140_Sub7.canvasHeight); } ++PacketParser.anInt3213; diff --git a/Client/src/main/java/org/runite/client/TextureOperation23.java b/Client/src/main/java/org/runite/client/TextureOperation23.java index f74dc9d73..0ed2d3119 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation23.java +++ b/Client/src/main/java/org/runite/client/TextureOperation23.java @@ -85,7 +85,7 @@ final class TextureOperation23 extends TextureOperation { static void method250(CacheIndex var1) { try { - Class8.aClass153_105 = var1; + Class8.configurationReferenceCache = var1; } catch (RuntimeException var3) { throw ClientErrorException.clientError(var3, "je.C(" + 2048 + ',' + (var1 != null?"{...}":"null") + ')'); } diff --git a/Client/src/main/java/org/runite/client/TextureOperation36.java b/Client/src/main/java/org/runite/client/TextureOperation36.java index 7acca2344..0f097b34a 100644 --- a/Client/src/main/java/org/runite/client/TextureOperation36.java +++ b/Client/src/main/java/org/runite/client/TextureOperation36.java @@ -35,10 +35,10 @@ public final class TextureOperation36 extends TextureOperation { } } else { if(Class158.paramGameTypeID == 1) { - Class3_Sub24_Sub4.method1177(-1, 0L, (byte)-62, TextCore.emptyJagexString, var11, (short)36, TextCore.HasFaceHere, var12); + Class3_Sub24_Sub4.method1177(-1, 0L, (byte)-62, RSString.parse(""), var11, (short)36, TextCore.HasFaceHere, var12); } - Class3_Sub24_Sub4.method1177(-1, 0L, (byte)-75, TextCore.emptyJagexString, var11, (short)60, TextureOperation32.aClass94_3353, var12); + Class3_Sub24_Sub4.method1177(-1, 0L, (byte)-75, RSString.parse(""), var11, (short)60, TextureOperation32.aClass94_3353, var12); } } diff --git a/Client/src/main/java/org/runite/client/Unsorted.java b/Client/src/main/java/org/runite/client/Unsorted.java index 8fa83af72..45b6a5285 100644 --- a/Client/src/main/java/org/runite/client/Unsorted.java +++ b/Client/src/main/java/org/runite/client/Unsorted.java @@ -1567,7 +1567,7 @@ public class Unsorted { Class3_Sub15.aBoolean2427 = var1 >= 2; - if (-1 != Class3_Sub28_Sub12.anInt3655) { + if (-1 != ConfigInventoryDefinition.anInt3655) { Class124.method1746(true, (byte) -107); } @@ -2272,7 +2272,7 @@ public class Unsorted { public static RSString method1303(RSInterface var0, RSString var1) { try { - if (var1.indexOf(TextCore.aClass94_468, 102) == -1) { + if (var1.indexOf(RSString.parse("(U"), 102) == -1) { return var1; } else { while (true) { @@ -2296,7 +2296,7 @@ public class Unsorted { return var1; } - RSString var4 = TextCore.emptyJagexString; + RSString var4 = RSString.parse(""); if (null != Class136.aClass64_1778) { var4 = Class108.method1653(Class136.aClass64_1778.anInt979); @@ -2505,20 +2505,6 @@ public class Unsorted { } } - public static Class3_Sub28_Sub12 method2069(int var0) { - Class3_Sub28_Sub12 var2 = (Class3_Sub28_Sub12) Class49.aClass47_818.get(var0); - if (null == var2) { - byte[] var3 = Class8.aClass153_105.getFile(5, var0); - var2 = new Class3_Sub28_Sub12(); - if (var3 != null) { - var2.decode(new DataBuffer(var3)); - } - - Class49.aClass47_818.put(var0, var2); - } - return var2; - } - static void method56(int var0) { InterfaceWidget var2 = InterfaceWidget.getWidget(6, var0); var2.a(); @@ -3838,10 +3824,10 @@ public class Unsorted { } if (Class158.paramGameTypeID == 1) { - Class3_Sub24_Sub4.method1177(-1, 1L, (byte) -41, TextCore.emptyJagexString, var28, (short) 36, TextCore.HasFaceHere, var29); + Class3_Sub24_Sub4.method1177(-1, 1L, (byte) -41, RSString.parse(""), var28, (short) 36, TextCore.HasFaceHere, var29); } - Class3_Sub24_Sub4.method1177(-1, 1L, (byte) -125, TextCore.emptyJagexString, var28, (short) 60, TextureOperation32.aClass94_3353, var29); + Class3_Sub24_Sub4.method1177(-1, 1L, (byte) -125, RSString.parse(""), var28, (short) 60, TextureOperation32.aClass94_3353, var29); continue; } @@ -3898,7 +3884,7 @@ public class Unsorted { if (ClientCommands.fpsOverlayEnabled) { var20 = var11.width + var13; var21 = 15 + var14; - FontType.plainFont.drawStringRightAnchor(RSString.stringCombiner(new RSString[]{TextCore.aClass94_3196, RSString.stringAnimator(SequenceDefinition.anInt1862)}), var20, var21, 16776960, -1);//Class72.stringAnimator(SequenceDefinition.anInt1862)}), var20, var21, 16776960, -1); + FontType.plainFont.drawStringRightAnchor(RSString.stringCombiner(new RSString[]{RSString.parse("Fps:"), RSString.stringAnimator(SequenceDefinition.anInt1862)}), var20, var21, 16776960, -1);//Class72.stringAnimator(SequenceDefinition.anInt1862)}), var20, var21, 16776960, -1); var21 += 15; Runtime var57 = Runtime.getRuntime(); var23 = (int) ((var57.totalMemory() + -var57.freeMemory()) / 1024L); @@ -3933,7 +3919,7 @@ public class Unsorted { var29 = 10000 * var26 / var25; var28 = var47 * 100 / var25; - RSString var55 = RSString.stringCombiner(new RSString[]{TextCore.aClass94_436, Class3_Sub23.method407(0, true, 2, var29), TextCore.aClass94_2498, RSString.stringAnimator(var28), TextCore.aClass94_148}); + RSString var55 = RSString.stringCombiner(new RSString[]{TextCore.aClass94_436, Class3_Sub23.method407(0, true, 2, var29), TextCore.aClass94_2498, RSString.stringAnimator(var28), RSString.parse("(U(Y")}); FontType.smallFont.drawStringRightAnchor(var55, var20, var21, var24, -1); aBooleanArray3674[var12] = true; Class163_Sub1_Sub1.aBooleanArray4008[var12] = true; @@ -3994,7 +3980,7 @@ public class Unsorted { menuOptionCount = 1; Class114.anIntArray1578[0] = Class3_Sub28_Sub5.anInt3590; Class140_Sub7.aClass94Array2935[0] = TextCore.HasCancel; - Class163_Sub2_Sub1.aClass94Array4016[0] = TextCore.emptyJagexString; + Class163_Sub2_Sub1.aClass94Array4016[0] = RSString.parse(""); TextureOperation27.aShortArray3095[0] = 1005; } @@ -4030,7 +4016,7 @@ public class Unsorted { menuOptionCount = 1; Class114.anIntArray1578[0] = Class3_Sub28_Sub5.anInt3590; TextureOperation27.aShortArray3095[0] = 1005; - Class163_Sub2_Sub1.aClass94Array4016[0] = TextCore.emptyJagexString; + Class163_Sub2_Sub1.aClass94Array4016[0] = RSString.parse(""); } TextureOperation12.method171(-101, var36.anInt2602, var16, var18, var13, var12, var19, var17, var14); @@ -4163,7 +4149,7 @@ public class Unsorted { } } } else if (3 == var11.type) { - if (Class3_Sub28_Sub12.method609(var11, 26)) { + if (method609(var11, 26)) { var20 = var11.anInt253; if (Class107.aClass11_1453 == var11 && 0 != var11.anInt222) { var20 = var11.anInt222; @@ -4233,7 +4219,7 @@ public class Unsorted { var34 = var11.method868(Sprites.nameIconsSpriteArray); if (var34 != null) { RSString var45 = var11.text; - if (Class3_Sub28_Sub12.method609(var11, 97)) { + if (method609(var11, 97)) { var21 = var11.anInt253; if (Class107.aClass11_1453 == var11 && var11.anInt222 != 0) { var21 = var11.anInt222; @@ -4368,7 +4354,7 @@ public class Unsorted { } } } else { - var37 = var11.method866(Class3_Sub28_Sub12.method609(var11, 69)); + var37 = var11.method866(method609(var11, 69)); if (null != var37) { var37.drawAt(var13, var14); } else if (RSInterface.aBoolean6) { @@ -4378,7 +4364,7 @@ public class Unsorted { } else { ItemDefinition var42; if (var11.type == 6) { - boolean var41 = Class3_Sub28_Sub12.method609(var11, 110); + boolean var41 = method609(var11, 110); Model var38 = null; if (var41) { var21 = var11.secondAnimationId; @@ -4544,7 +4530,7 @@ public class Unsorted { var25 = var43.indexOf(TextCore.aClass94_2598, 62); if (var25 == -1) { var44 = var43; - var43 = TextCore.emptyJagexString; + var43 = RSString.parse(""); } else { var44 = var43.substring(0, var25, 0); var43 = var43.substring(var25 + 4); @@ -4583,7 +4569,7 @@ public class Unsorted { var28 = var43.indexOf(TextCore.aClass94_2598, 86); if (var28 == -1) { var44 = var43; - var43 = TextCore.emptyJagexString; + var43 = RSString.parse(""); } else { var44 = var43.substring(0, var28, 0); var43 = var43.substring(4 + var28); @@ -4790,7 +4776,7 @@ public class Unsorted { } } - public static void method564(Signlink var0) { + public static void parsePreferences(Signlink var0) { try { anInt3625 = 3; Class25.method957(true); @@ -5027,7 +5013,7 @@ public class Unsorted { return -1; } else { for (int var2 = 0; var2 < Class119.aClass131_1624.anInt1720; ++var2) { - if (Class119.aClass131_1624.aClass94Array1721[var2].method1560(TextCore.aClass94_3192, TextCore.aClass94_4066).method1562((byte) -32, var1)) { + if (Class119.aClass131_1624.aClass94Array1721[var2].method1560(RSString.parse(" "), TextCore.aClass94_4066).method1562((byte) -32, var1)) { return var2; } } @@ -5206,4 +5192,37 @@ public class Unsorted { throw ClientErrorException.clientError(var15, "ui.OA(" + -6403 + ',' + var1 + ',' + var2 + ',' + var3 + ',' + var4 + ',' + var5 + ')'); } } + + static boolean method609(RSInterface var0, int var1) { + if (null == var0.anIntArray275) { + return false; + } else { + int var2 = 0; + if (var1 <= 20) { + TextCore.COMMAND_MEMORY_MANAGEMENT = null; + } + + for (; var0.anIntArray275.length > var2; ++var2) { + int var3 = Class164_Sub2.method2247((byte) 119, var2, var0); + int var4 = var0.anIntArray307[var2]; + if (var0.anIntArray275[var2] != 2) { + if (var0.anIntArray275[var2] != 3) { + if (4 == var0.anIntArray275[var2]) { + if (var4 == var3) { + return false; + } + } else if (var3 != var4) { + return false; + } + } else if (var3 <= var4) { + return false; + } + } else if (var3 >= var4) { + return false; + } + } + + return true; + } + } } diff --git a/Client/src/main/java/org/runite/client/WorldListEntry.java b/Client/src/main/java/org/runite/client/WorldListEntry.java index fa9392935..988b04bb8 100644 --- a/Client/src/main/java/org/runite/client/WorldListEntry.java +++ b/Client/src/main/java/org/runite/client/WorldListEntry.java @@ -204,7 +204,7 @@ public final class WorldListEntry extends Class44 { } else { Class3_Sub25 var2 = (Class3_Sub25) Class3_Sub2.aHashTable_2220.get(var0); if (var2 == null) { - return Objects.requireNonNull(Unsorted.method2069(var0)).size; + return Objects.requireNonNull(ConfigInventoryDefinition.retrieveConfigurationInventoryFile(var0)).size; } else { int var3 = 0; @@ -214,7 +214,7 @@ public final class WorldListEntry extends Class44 { } } - var3 += Objects.requireNonNull(Unsorted.method2069(var0)).size + -var2.anIntArray2547.length; + var3 += Objects.requireNonNull(ConfigInventoryDefinition.retrieveConfigurationInventoryFile(var0)).size + -var2.anIntArray2547.length; return var3; } } diff --git a/Client/src/main/java/org/runite/client/WorldMap.java b/Client/src/main/java/org/runite/client/WorldMap.java index d7cd3805b..ef61b4e01 100644 --- a/Client/src/main/java/org/runite/client/WorldMap.java +++ b/Client/src/main/java/org/runite/client/WorldMap.java @@ -98,26 +98,26 @@ final class WorldMap extends Node { } else if (anInt2737 == 20) { if (GameConfig.WORLD_MAP_DEBUG) System.out.println("World Map Debug: World Map Stage 20: String given: " + Unsorted.aClass3_Sub28_Sub3_2600.aClass94_3561.properlyCapitalize().toString()); - Class15.method889(new DataBuffer(aClass153_3210.method2123(TextCore.worldmapUnderlay, Unsorted.aClass3_Sub28_Sub3_2600.aClass94_3561)));//This controls the world map underlay + Class15.method889(new DataBuffer(aClass153_3210.method2123(RSString.parse("underlay"), Unsorted.aClass3_Sub28_Sub3_2600.aClass94_3561)));//This controls the world map underlay anInt2737 = 30; Class163_Sub1.method2210(true); Class75_Sub4.method1355(); } else if (anInt2737 == 30) { if (GameConfig.WORLD_MAP_DEBUG) System.out.println("World Map Debug: World Map Stage 30: String given: " + Unsorted.aClass3_Sub28_Sub3_2600.aClass94_3561.properlyCapitalize().toString()); - Class163_Sub2.method2219(new DataBuffer(aClass153_3210.method2123(TextCore.worldmapOverlay, Unsorted.aClass3_Sub28_Sub3_2600.aClass94_3561)));//This controls the world map overlay (water) + Class163_Sub2.method2219(new DataBuffer(aClass153_3210.method2123(RSString.parse("overlay"), Unsorted.aClass3_Sub28_Sub3_2600.aClass94_3561)));//This controls the world map overlay (water) anInt2737 = 40; Class75_Sub4.method1355(); } else if (anInt2737 == 40) { if (GameConfig.WORLD_MAP_DEBUG) System.out.println("World Map Debug: World Map Stage 40: String given: " + Unsorted.aClass3_Sub28_Sub3_2600.aClass94_3561.properlyCapitalize().toString()); - TextureOperation25.method328(new DataBuffer(aClass153_3210.method2123(TextCore.worldmapOverlay2, Unsorted.aClass3_Sub28_Sub3_2600.aClass94_3561)));//unsure + TextureOperation25.method328(new DataBuffer(aClass153_3210.method2123(RSString.parse("overlay2"), Unsorted.aClass3_Sub28_Sub3_2600.aClass94_3561)));//unsure anInt2737 = 50; Class75_Sub4.method1355(); } else if (anInt2737 == 50) { if (GameConfig.WORLD_MAP_DEBUG) System.out.println("World Map Debug: World Map Stage 50: String given: " + Unsorted.aClass3_Sub28_Sub3_2600.aClass94_3561.properlyCapitalize().toString()); - Class96.method1587(new DataBuffer(aClass153_3210.method2123(TextCore.aClass94_422, Unsorted.aClass3_Sub28_Sub3_2600.aClass94_3561)));//This controls the world map object drawing (buildings etc) + Class96.method1587(new DataBuffer(aClass153_3210.method2123(RSString.parse("loc"), Unsorted.aClass3_Sub28_Sub3_2600.aClass94_3561)));//This controls the world map object drawing (buildings etc) anInt2737 = 60; Class163_Sub1.method2210(true); Class75_Sub4.method1355(); @@ -251,7 +251,7 @@ final class WorldMap extends Node { var13 = 16711680; } - FontType.plainFont.drawStringRightAnchor(RSString.stringCombiner(new RSString[]{TextCore.aClass94_1630, RSString.stringAnimator(var12), TextCore.aClass94_3055}), var9, var10, var13, -1); + FontType.plainFont.drawStringRightAnchor(RSString.stringCombiner(new RSString[]{TextCore.aClass94_1630, RSString.stringAnimator(var12), RSString.parse("k")}), var9, var10, var13, -1); } /* * * * * * * */ diff --git a/Client/src/main/kotlin/org/rs09/client/constants/Parameter.kt b/Client/src/main/kotlin/org/rs09/client/constants/Parameter.kt new file mode 100644 index 000000000..15a5b1a78 --- /dev/null +++ b/Client/src/main/kotlin/org/rs09/client/constants/Parameter.kt @@ -0,0 +1,48 @@ +package org.rs09.client.constants + +object Parameter { + + /** + * Modewhat + * DEFAULT: LIVE_SERVER 0 + */ + const val LIVE_SERVER = 0 + const val RELEASE_CANDIDATE = 1 + const val WORK_IN_PROGRESS = 2 + + /** + * Modewhere + * DEFAULT: LIVE_ENVIRONMENT 0 + */ + const val LIVE_ENVIRONMENT = 0 + const val OFFICE_ENVIRONMENT = 1 + const val LOCAL_ENVIRONMENT = 2 + + /** + * Language + * DEFAULT: LANGUAGE_ENGLISH 0 + */ + const val LANGUAGE_ENGLISH = 0 + const val LANGUAGE_GERMAN = 1 + const val LANGUAGE_FRENCH = 2 + const val LANGUAGE_PORTUGUESE = 3 + + /** + * Game type + * DEFAULT: GAME_TYPE_RUNESCAPE 0 (game0) + * + * Runescape | Game type 0 has always been Runescape (current) + * Mechscape | Assuming this is what the game1 was (2007 - Oct 2009) + * Stellar Dawn | Overhaul of 'Mechscape' (July 2010 - Stuck in corporate hell) + */ + const val GAME_TYPE_RUNESCAPE = 0 + const val GAME_TYPE_MECHSCAPE = 1 + + /** + * Affiliate ID + * DEFAULT: NO_AFFILIATE 0 + */ + const val NO_AFFILIATE = 0 + const val SHARE_DETAILS_AFFILIATE = 99 + +} \ No newline at end of file diff --git a/Client/src/main/kotlin/org/rs09/client/constants/gametype/MechscapeGameAppearance.kt b/Client/src/main/kotlin/org/rs09/client/constants/gametype/MechscapeGameAppearance.kt new file mode 100644 index 000000000..8affc513e --- /dev/null +++ b/Client/src/main/kotlin/org/rs09/client/constants/gametype/MechscapeGameAppearance.kt @@ -0,0 +1,19 @@ +package org.rs09.client.constants.gametype + +object MechscapeGameAppearance { + + val aShortArrayArray1619 = arrayOf(shortArrayOf(10.toShort(), 30.toShort(), 50.toShort(), 70.toShort(), 90.toShort(), 110.toShort(), 310.toShort(), 684.toShort(), 704.toShort(), 556.toShort(), 940.toShort(), 960.toShort(), 6454.toShort(), 6952.toShort(), 6972.toShort(), 2358.toShort(), 2732.toShort(), 2752.toShort(), 10550.toShort(), 10924.toShort(), 10944.toShort(), 10310.toShort(), 10556.toShort(), 10576.toShort(), 14646.toShort(), 15020.toShort(), 15040.toShort(), 19766.toShort(), 20140.toShort(), 20160.toShort(), (-29386).toShort(), (-29012).toShort(), (-28992).toShort(), 31030.toShort(), 31276.toShort(), 31296.toShort(), (-24266).toShort(), (-23892).toShort(), (-23872).toShort(), (-19146).toShort(), (-18772).toShort(), (-18752).toShort(), (-14026).toShort(), (-13652).toShort(), (-13632).toShort(), (-6858).toShort(), (-6484).toShort(), (-6464).toShort(), 522.toShort(), 542.toShort(), 6794.toShort(), 6814.toShort(), 11018.toShort(), 11038.toShort(), 14986.toShort(), 15006.toShort(), 21130.toShort(), 21150.toShort(), (-28918).toShort(), (-28898).toShort(), (-22006).toShort(), (-21986).toShort(), (-12918).toShort(), (-12898).toShort(), 10.toShort(), 30.toShort(), 50.toShort(), 70.toShort(), 90.toShort(), 110.toShort(), 310.toShort(), 684.toShort(), 704.toShort(), 556.toShort(), 940.toShort(), 960.toShort(), 6454.toShort(), 6952.toShort(), 6972.toShort(), 2358.toShort(), 2732.toShort(), 2752.toShort(), 10550.toShort(), 10924.toShort(), 10944.toShort(), 10310.toShort(), 10556.toShort(), 10576.toShort(), 14646.toShort(), 15020.toShort(), 15040.toShort(), 19766.toShort(), 20140.toShort(), 20160.toShort(), (-29386).toShort(), (-29012).toShort(), (-28992).toShort(), 31030.toShort(), 31276.toShort(), 31296.toShort(), (-24266).toShort(), (-23892).toShort(), (-23872).toShort(), (-19146).toShort(), (-18772).toShort(), (-18752).toShort(), (-14026).toShort(), (-13652).toShort(), (-13632).toShort(), (-6858).toShort(), (-6484).toShort(), (-6464).toShort(), 522.toShort(), 542.toShort(), 6794.toShort(), 6814.toShort(), 11018.toShort(), 11038.toShort(), 14986.toShort(), 15006.toShort(), 21130.toShort(), 21150.toShort(), (-28918).toShort(), (-28898).toShort(), (-22006).toShort(), (-21986).toShort(), (-12918).toShort(), (-12898).toShort(), 10.toShort(), 30.toShort(), 50.toShort(), 70.toShort(), 90.toShort(), 110.toShort(), 310.toShort(), 684.toShort(), 704.toShort(), 556.toShort(), 940.toShort(), 960.toShort(), 6454.toShort(), 6952.toShort(), 6972.toShort(), 2358.toShort(), 2732.toShort(), 2752.toShort(), 10550.toShort(), 10924.toShort(), 10944.toShort(), 10310.toShort(), 10556.toShort(), 10576.toShort(), 14646.toShort(), 15020.toShort(), 15040.toShort(), 19766.toShort(), 20140.toShort(), 20160.toShort(), (-29386).toShort(), (-29012).toShort(), (-28992).toShort(), 31030.toShort(), 31276.toShort(), 31296.toShort(), (-24266).toShort(), (-23892).toShort(), (-23872).toShort(), (-19146).toShort(), (-18772).toShort(), (-18752).toShort(), (-14026).toShort(), (-13652).toShort(), (-13632).toShort(), (-6858).toShort(), (-6484).toShort(), (-6464).toShort(), 522.toShort(), 542.toShort(), 6794.toShort(), 6814.toShort(), 11018.toShort(), 11038.toShort(), 14986.toShort(), 15006.toShort(), 21130.toShort(), 21150.toShort(), (-28918).toShort(), (-28898).toShort(), (-22006).toShort(), (-21986).toShort(), (-12918).toShort(), (-12898).toShort(), 10.toShort(), 30.toShort(), 50.toShort(), 70.toShort(), 90.toShort(), 110.toShort(), 310.toShort(), 684.toShort(), 704.toShort(), 556.toShort(), 940.toShort(), 960.toShort(), 6454.toShort(), 6952.toShort(), 6972.toShort(), 2358.toShort(), 2732.toShort(), 2752.toShort(), 10550.toShort(), 10924.toShort(), 10944.toShort(), 10310.toShort(), 10556.toShort(), 10576.toShort(), 14646.toShort(), 15020.toShort(), 15040.toShort(), 19766.toShort(), 20140.toShort(), 20160.toShort(), (-29386).toShort(), (-29012).toShort(), (-28992).toShort(), 31030.toShort(), 31276.toShort(), 31296.toShort(), (-24266).toShort(), (-23892).toShort(), (-23872).toShort(), (-19146).toShort(), (-18772).toShort(), (-18752).toShort(), (-14026).toShort(), (-13652).toShort(), (-13632).toShort(), (-6858).toShort(), (-6484).toShort(), (-6464).toShort(), 522.toShort(), 542.toShort(), 6794.toShort(), 6814.toShort(), 11018.toShort(), 11038.toShort(), 14986.toShort(), 15006.toShort(), 21130.toShort(), 21150.toShort(), (-28918).toShort(), (-28898).toShort(), (-22006).toShort(), (-21986).toShort(), (-12918).toShort(), (-12898).toShort()), shortArrayOf(10.toShort(), 30.toShort(), 50.toShort(), 70.toShort(), 90.toShort(), 110.toShort(), 310.toShort(), 684.toShort(), 704.toShort(), 556.toShort(), 940.toShort(), 960.toShort(), 6454.toShort(), 6952.toShort(), 6972.toShort(), 2358.toShort(), 2732.toShort(), 2752.toShort(), 10550.toShort(), 10924.toShort(), 10944.toShort(), 10310.toShort(), 10556.toShort(), 10576.toShort(), 14646.toShort(), 15020.toShort(), 15040.toShort(), 19766.toShort(), 20140.toShort(), 20160.toShort(), (-29386).toShort(), (-29012).toShort(), (-28992).toShort(), 31030.toShort(), 31276.toShort(), 31296.toShort(), (-24266).toShort(), (-23892).toShort(), (-23872).toShort(), (-19146).toShort(), (-18772).toShort(), (-18752).toShort(), (-14026).toShort(), (-13652).toShort(), (-13632).toShort(), (-6858).toShort(), (-6484).toShort(), (-6464).toShort(), 522.toShort(), 542.toShort(), 6794.toShort(), 6814.toShort(), 11018.toShort(), 11038.toShort(), 14986.toShort(), 15006.toShort(), 21130.toShort(), 21150.toShort(), (-28918).toShort(), (-28898).toShort(), (-22006).toShort(), (-21986).toShort(), (-12918).toShort(), (-12898).toShort(), 10.toShort(), 30.toShort(), 50.toShort(), 70.toShort(), 90.toShort(), 110.toShort(), 310.toShort(), 684.toShort(), 704.toShort(), 556.toShort(), 940.toShort(), 960.toShort(), 6454.toShort(), 6952.toShort(), 6972.toShort(), 2358.toShort(), 2732.toShort(), 2752.toShort(), 10550.toShort(), 10924.toShort(), 10944.toShort(), 10310.toShort(), 10556.toShort(), 10576.toShort(), 14646.toShort(), 15020.toShort(), 15040.toShort(), 19766.toShort(), 20140.toShort(), 20160.toShort(), (-29386).toShort(), (-29012).toShort(), (-28992).toShort(), 31030.toShort(), 31276.toShort(), 31296.toShort(), (-24266).toShort(), (-23892).toShort(), (-23872).toShort(), (-19146).toShort(), (-18772).toShort(), (-18752).toShort(), (-14026).toShort(), (-13652).toShort(), (-13632).toShort(), (-6858).toShort(), (-6484).toShort(), (-6464).toShort(), 522.toShort(), 542.toShort(), 6794.toShort(), 6814.toShort(), 11018.toShort(), 11038.toShort(), 14986.toShort(), 15006.toShort(), 21130.toShort(), 21150.toShort(), (-28918).toShort(), (-28898).toShort(), (-22006).toShort(), (-21986).toShort(), (-12918).toShort(), (-12898).toShort(), 10.toShort(), 30.toShort(), 50.toShort(), 70.toShort(), 90.toShort(), 110.toShort(), 310.toShort(), 684.toShort(), 704.toShort(), 556.toShort(), 940.toShort(), 960.toShort(), 6454.toShort(), 6952.toShort(), 6972.toShort(), 2358.toShort(), 2732.toShort(), 2752.toShort(), 10550.toShort(), 10924.toShort(), 10944.toShort(), 10310.toShort(), 10556.toShort(), 10576.toShort(), 14646.toShort(), 15020.toShort(), 15040.toShort(), 19766.toShort(), 20140.toShort(), 20160.toShort(), (-29386).toShort(), (-29012).toShort(), (-28992).toShort(), 31030.toShort(), 31276.toShort(), 31296.toShort(), (-24266).toShort(), (-23892).toShort(), (-23872).toShort(), (-19146).toShort(), (-18772).toShort(), (-18752).toShort(), (-14026).toShort(), (-13652).toShort(), (-13632).toShort(), (-6858).toShort(), (-6484).toShort(), (-6464).toShort(), 522.toShort(), 542.toShort(), 6794.toShort(), 6814.toShort(), 11018.toShort(), 11038.toShort(), 14986.toShort(), 15006.toShort(), 21130.toShort(), 21150.toShort(), (-28918).toShort(), (-28898).toShort(), (-22006).toShort(), (-21986).toShort(), (-12918).toShort(), (-12898).toShort(), 10347.toShort(), 10582.toShort(), 10429.toShort(), 10407.toShort(), 10359.toShort(), 8414.toShort(), 9540.toShort(), 10456.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort()), shortArrayOf(10.toShort(), 30.toShort(), 50.toShort(), 70.toShort(), 90.toShort(), 110.toShort(), 310.toShort(), 684.toShort(), 704.toShort(), 556.toShort(), 940.toShort(), 960.toShort(), 6454.toShort(), 6952.toShort(), 6972.toShort(), 2358.toShort(), 2732.toShort(), 2752.toShort(), 10550.toShort(), 10924.toShort(), 10944.toShort(), 10310.toShort(), 10556.toShort(), 10576.toShort(), 14646.toShort(), 15020.toShort(), 15040.toShort(), 19766.toShort(), 20140.toShort(), 20160.toShort(), (-29386).toShort(), (-29012).toShort(), (-28992).toShort(), 31030.toShort(), 31276.toShort(), 31296.toShort(), (-24266).toShort(), (-23892).toShort(), (-23872).toShort(), (-19146).toShort(), (-18772).toShort(), (-18752).toShort(), (-14026).toShort(), (-13652).toShort(), (-13632).toShort(), (-6858).toShort(), (-6484).toShort(), (-6464).toShort(), 522.toShort(), 542.toShort(), 6794.toShort(), 6814.toShort(), 11018.toShort(), 11038.toShort(), 14986.toShort(), 15006.toShort(), 21130.toShort(), 21150.toShort(), (-28918).toShort(), (-28898).toShort(), (-22006).toShort(), (-21986).toShort(), (-12918).toShort(), (-12898).toShort(), 10.toShort(), 30.toShort(), 50.toShort(), 70.toShort(), 90.toShort(), 110.toShort(), 310.toShort(), 684.toShort(), 704.toShort(), 556.toShort(), 940.toShort(), 960.toShort(), 6454.toShort(), 6952.toShort(), 6972.toShort(), 2358.toShort(), 2732.toShort(), 2752.toShort(), 10550.toShort(), 10924.toShort(), 10944.toShort(), 10310.toShort(), 10556.toShort(), 10576.toShort(), 14646.toShort(), 15020.toShort(), 15040.toShort(), 19766.toShort(), 20140.toShort(), 20160.toShort(), (-29386).toShort(), (-29012).toShort(), (-28992).toShort(), 31030.toShort(), 31276.toShort(), 31296.toShort(), (-24266).toShort(), (-23892).toShort(), (-23872).toShort(), (-19146).toShort(), (-18772).toShort(), (-18752).toShort(), (-14026).toShort(), (-13652).toShort(), (-13632).toShort(), (-6858).toShort(), (-6484).toShort(), (-6464).toShort(), 522.toShort(), 542.toShort(), 6794.toShort(), 6814.toShort(), 11018.toShort(), 11038.toShort(), 14986.toShort(), 15006.toShort(), 21130.toShort(), 21150.toShort(), (-28918).toShort(), (-28898).toShort(), (-22006).toShort(), (-21986).toShort(), (-12918).toShort(), (-12898).toShort(), 10.toShort(), 30.toShort(), 50.toShort(), 70.toShort(), 90.toShort(), 110.toShort(), 310.toShort(), 684.toShort(), 704.toShort(), 556.toShort(), 940.toShort(), 960.toShort(), 6454.toShort(), 6952.toShort(), 6972.toShort(), 2358.toShort(), 2732.toShort(), 2752.toShort(), 10550.toShort(), 10924.toShort(), 10944.toShort(), 10310.toShort(), 10556.toShort(), 10576.toShort(), 14646.toShort(), 15020.toShort(), 15040.toShort(), 19766.toShort(), 20140.toShort(), 20160.toShort(), (-29386).toShort(), (-29012).toShort(), (-28992).toShort(), 31030.toShort(), 31276.toShort(), 31296.toShort(), (-24266).toShort(), (-23892).toShort(), (-23872).toShort(), (-19146).toShort(), (-18772).toShort(), (-18752).toShort(), (-14026).toShort(), (-13652).toShort(), (-13632).toShort(), (-6858).toShort(), (-6484).toShort(), (-6464).toShort(), 522.toShort(), 542.toShort(), 6794.toShort(), 6814.toShort(), 11018.toShort(), 11038.toShort(), 14986.toShort(), 15006.toShort(), 21130.toShort(), 21150.toShort(), (-28918).toShort(), (-28898).toShort(), (-22006).toShort(), (-21986).toShort(), (-12918).toShort(), (-12898).toShort(), 10.toShort(), 30.toShort(), 50.toShort(), 70.toShort(), 90.toShort(), 110.toShort(), 310.toShort(), 684.toShort(), 704.toShort(), 556.toShort(), 940.toShort(), 960.toShort(), 6454.toShort(), 6952.toShort(), 6972.toShort(), 2358.toShort(), 2732.toShort(), 2752.toShort(), 10550.toShort(), 10924.toShort(), 10944.toShort(), 10310.toShort(), 10556.toShort(), 10576.toShort(), 14646.toShort(), 15020.toShort(), 15040.toShort(), 19766.toShort(), 20140.toShort(), 20160.toShort(), (-29386).toShort(), (-29012).toShort(), (-28992).toShort(), 31030.toShort(), 31276.toShort(), 31296.toShort(), (-24266).toShort(), (-23892).toShort(), (-23872).toShort(), (-19146).toShort(), (-18772).toShort(), (-18752).toShort(), (-14026).toShort(), (-13652).toShort(), (-13632).toShort(), (-6858).toShort(), (-6484).toShort(), (-6464).toShort(), 522.toShort(), 542.toShort(), 6794.toShort(), 6814.toShort(), 11018.toShort(), 11038.toShort(), 14986.toShort(), 15006.toShort(), 21130.toShort(), 21150.toShort(), (-28918).toShort(), (-28898).toShort(), (-22006).toShort(), (-21986).toShort(), (-12918).toShort(), (-12898).toShort()), shortArrayOf(4300.toShort(), 3294.toShort(), 3303.toShort(), 3264.toShort(), 4506.toShort(), 4382.toShort(), 4387.toShort(), 5293.toShort(), 7622.toShort(), 7384.toShort(), 8412.toShort(), 7496.toShort(), 86.toShort(), 123.toShort(), 111.toShort(), 99.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 10.toShort(), 30.toShort(), 50.toShort(), 70.toShort(), 90.toShort(), 110.toShort(), 310.toShort(), 684.toShort(), 704.toShort(), 556.toShort(), 940.toShort(), 960.toShort(), 6454.toShort(), 6952.toShort(), 6972.toShort(), 2358.toShort(), 2732.toShort(), 2752.toShort(), 10550.toShort(), 10924.toShort(), 10944.toShort(), 10310.toShort(), 10556.toShort(), 10576.toShort(), 14646.toShort(), 15020.toShort(), 15040.toShort(), 19766.toShort(), 20140.toShort(), 20160.toShort(), (-29386).toShort(), (-29012).toShort(), (-28992).toShort(), 31030.toShort(), 31276.toShort(), 31296.toShort(), (-24266).toShort(), (-23892).toShort(), (-23872).toShort(), (-19146).toShort(), (-18772).toShort(), (-18752).toShort(), (-14026).toShort(), (-13652).toShort(), (-13632).toShort(), (-6858).toShort(), (-6484).toShort(), (-6464).toShort(), 522.toShort(), 542.toShort(), 6794.toShort(), 6814.toShort(), 11018.toShort(), 11038.toShort(), 14986.toShort(), 15006.toShort(), 21130.toShort(), 21150.toShort(), (-28918).toShort(), (-28898).toShort(), (-22006).toShort(), (-21986).toShort(), (-12918).toShort(), (-12898).toShort(), 10.toShort(), 30.toShort(), 50.toShort(), 70.toShort(), 90.toShort(), 110.toShort(), 310.toShort(), 684.toShort(), 704.toShort(), 556.toShort(), 940.toShort(), 960.toShort(), 6454.toShort(), 6952.toShort(), 6972.toShort(), 2358.toShort(), 2732.toShort(), 2752.toShort(), 10550.toShort(), 10924.toShort(), 10944.toShort(), 10310.toShort(), 10556.toShort(), 10576.toShort(), 14646.toShort(), 15020.toShort(), 15040.toShort(), 19766.toShort(), 20140.toShort(), 20160.toShort(), (-29386).toShort(), (-29012).toShort(), (-28992).toShort(), 31030.toShort(), 31276.toShort(), 31296.toShort(), (-24266).toShort(), (-23892).toShort(), (-23872).toShort(), (-19146).toShort(), (-18772).toShort(), (-18752).toShort(), (-14026).toShort(), (-13652).toShort(), (-13632).toShort(), (-6858).toShort(), (-6484).toShort(), (-6464).toShort(), 522.toShort(), 542.toShort(), 6794.toShort(), 6814.toShort(), 11018.toShort(), 11038.toShort(), 14986.toShort(), 15006.toShort(), 21130.toShort(), 21150.toShort(), (-28918).toShort(), (-28898).toShort(), (-22006).toShort(), (-21986).toShort(), (-12918).toShort(), (-12898).toShort(), 13766.toShort(), 13745.toShort(), 13726.toShort(), 13890.toShort(), 13743.toShort(), 13852.toShort(), 17602.toShort(), 18605.toShort(), 21660.toShort(), 24000.toShort(), 24997.toShort(), 24088.toShort(), 27972.toShort(), 25903.toShort(), 26904.toShort(), 27193.toShort(), 27175.toShort(), 27156.toShort(), 30020.toShort(), 28975.toShort(), 29976.toShort(), 12482.toShort(), 13485.toShort(), 10392.toShort(), 10692.toShort(), 10669.toShort(), 10776.toShort(), 6717.toShort(), 6695.toShort(), 7830.toShort(), 6971.toShort(), 6951.toShort(), 5910.toShort(), 3389.toShort(), 3369.toShort(), 3356.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort()), shortArrayOf(10.toShort(), 30.toShort(), 50.toShort(), 70.toShort(), 90.toShort(), 110.toShort(), 310.toShort(), 684.toShort(), 704.toShort(), 556.toShort(), 940.toShort(), 960.toShort(), 6454.toShort(), 6952.toShort(), 6972.toShort(), 2358.toShort(), 2732.toShort(), 2752.toShort(), 10550.toShort(), 10924.toShort(), 10944.toShort(), 10310.toShort(), 10556.toShort(), 10576.toShort(), 14646.toShort(), 15020.toShort(), 15040.toShort(), 19766.toShort(), 20140.toShort(), 20160.toShort(), (-29386).toShort(), (-29012).toShort(), (-28992).toShort(), 31030.toShort(), 31276.toShort(), 31296.toShort(), (-24266).toShort(), (-23892).toShort(), (-23872).toShort(), (-19146).toShort(), (-18772).toShort(), (-18752).toShort(), (-14026).toShort(), (-13652).toShort(), (-13632).toShort(), (-6858).toShort(), (-6484).toShort(), (-6464).toShort(), 522.toShort(), 542.toShort(), 6794.toShort(), 6814.toShort(), 11018.toShort(), 11038.toShort(), 14986.toShort(), 15006.toShort(), 21130.toShort(), 21150.toShort(), (-28918).toShort(), (-28898).toShort(), (-22006).toShort(), (-21986).toShort(), (-12918).toShort(), (-12898).toShort(), 10.toShort(), 30.toShort(), 50.toShort(), 70.toShort(), 90.toShort(), 110.toShort(), 310.toShort(), 684.toShort(), 704.toShort(), 556.toShort(), 940.toShort(), 960.toShort(), 6454.toShort(), 6952.toShort(), 6972.toShort(), 2358.toShort(), 2732.toShort(), 2752.toShort(), 10550.toShort(), 10924.toShort(), 10944.toShort(), 10310.toShort(), 10556.toShort(), 10576.toShort(), 14646.toShort(), 15020.toShort(), 15040.toShort(), 19766.toShort(), 20140.toShort(), 20160.toShort(), (-29386).toShort(), (-29012).toShort(), (-28992).toShort(), 31030.toShort(), 31276.toShort(), 31296.toShort(), (-24266).toShort(), (-23892).toShort(), (-23872).toShort(), (-19146).toShort(), (-18772).toShort(), (-18752).toShort(), (-14026).toShort(), (-13652).toShort(), (-13632).toShort(), (-6858).toShort(), (-6484).toShort(), (-6464).toShort(), 522.toShort(), 542.toShort(), 6794.toShort(), 6814.toShort(), 11018.toShort(), 11038.toShort(), 14986.toShort(), 15006.toShort(), 21130.toShort(), 21150.toShort(), (-28918).toShort(), (-28898).toShort(), (-22006).toShort(), (-21986).toShort(), (-12918).toShort(), (-12898).toShort(), 10.toShort(), 30.toShort(), 50.toShort(), 70.toShort(), 90.toShort(), 110.toShort(), 310.toShort(), 684.toShort(), 704.toShort(), 556.toShort(), 940.toShort(), 960.toShort(), 6454.toShort(), 6952.toShort(), 6972.toShort(), 2358.toShort(), 2732.toShort(), 2752.toShort(), 10550.toShort(), 10924.toShort(), 10944.toShort(), 10310.toShort(), 10556.toShort(), 10576.toShort(), 14646.toShort(), 15020.toShort(), 15040.toShort(), 19766.toShort(), 20140.toShort(), 20160.toShort(), (-29386).toShort(), (-29012).toShort(), (-28992).toShort(), 31030.toShort(), 31276.toShort(), 31296.toShort(), (-24266).toShort(), (-23892).toShort(), (-23872).toShort(), (-19146).toShort(), (-18772).toShort(), (-18752).toShort(), (-14026).toShort(), (-13652).toShort(), (-13632).toShort(), (-6858).toShort(), (-6484).toShort(), (-6464).toShort(), 522.toShort(), 542.toShort(), 6794.toShort(), 6814.toShort(), 11018.toShort(), 11038.toShort(), 14986.toShort(), 15006.toShort(), 21130.toShort(), 21150.toShort(), (-28918).toShort(), (-28898).toShort(), (-22006).toShort(), (-21986).toShort(), (-12918).toShort(), (-12898).toShort(), 10.toShort(), 30.toShort(), 50.toShort(), 70.toShort(), 90.toShort(), 110.toShort(), 310.toShort(), 684.toShort(), 704.toShort(), 556.toShort(), 940.toShort(), 960.toShort(), 6454.toShort(), 6952.toShort(), 6972.toShort(), 2358.toShort(), 2732.toShort(), 2752.toShort(), 10550.toShort(), 10924.toShort(), 10944.toShort(), 10310.toShort(), 10556.toShort(), 10576.toShort(), 14646.toShort(), 15020.toShort(), 15040.toShort(), 19766.toShort(), 20140.toShort(), 20160.toShort(), (-29386).toShort(), (-29012).toShort(), (-28992).toShort(), 31030.toShort(), 31276.toShort(), 31296.toShort(), (-24266).toShort(), (-23892).toShort(), (-23872).toShort(), (-19146).toShort(), (-18772).toShort(), (-18752).toShort(), (-14026).toShort(), (-13652).toShort(), (-13632).toShort(), (-6858).toShort(), (-6484).toShort(), (-6464).toShort(), 522.toShort(), 542.toShort(), 6794.toShort(), 6814.toShort(), 11018.toShort(), 11038.toShort(), 14986.toShort(), 15006.toShort(), 21130.toShort(), 21150.toShort(), (-28918).toShort(), (-28898).toShort(), (-22006).toShort(), (-21986).toShort(), (-12918).toShort(), (-12898).toShort())) + + val aShortArrayArray2634 = arrayOf(shortArrayOf(0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 4.toShort(), 24.toShort(), 44.toShort(), 64.toShort(), 84.toShort(), 104.toShort(), 304.toShort(), 678.toShort(), 698.toShort(), 550.toShort(), 934.toShort(), 954.toShort(), 6448.toShort(), 6946.toShort(), 6966.toShort(), 2352.toShort(), 2726.toShort(), 2746.toShort(), 10544.toShort(), 10918.toShort(), 10938.toShort(), 10304.toShort(), 10550.toShort(), 10570.toShort(), 14640.toShort(), 15014.toShort(), 15034.toShort(), 19760.toShort(), 20134.toShort(), 20154.toShort(), (-29392).toShort(), (-29018).toShort(), (-28998).toShort(), 31024.toShort(), 31270.toShort(), 31290.toShort(), (-24272).toShort(), (-23898).toShort(), (-23878).toShort(), (-19152).toShort(), (-18778).toShort(), (-18758).toShort(), (-14032).toShort(), (-13658).toShort(), (-13638).toShort(), (-6864).toShort(), (-6490).toShort(), (-6470).toShort(), 516.toShort(), 536.toShort(), 6788.toShort(), 6808.toShort(), 11012.toShort(), 11032.toShort(), 14980.toShort(), 15000.toShort(), 21124.toShort(), 21144.toShort(), (-28924).toShort(), (-28904).toShort(), (-22012).toShort(), (-21992).toShort(), (-12924).toShort(), (-12904).toShort()), shortArrayOf(0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 10339.toShort(), 10574.toShort(), 10425.toShort(), 10398.toShort(), 10345.toShort(), 7512.toShort(), 8507.toShort(), 7378.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort()), shortArrayOf(0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 4.toShort(), 24.toShort(), 44.toShort(), 64.toShort(), 84.toShort(), 104.toShort(), 304.toShort(), 678.toShort(), 698.toShort(), 550.toShort(), 934.toShort(), 954.toShort(), 6448.toShort(), 6946.toShort(), 6966.toShort(), 2352.toShort(), 2726.toShort(), 2746.toShort(), 10544.toShort(), 10918.toShort(), 10938.toShort(), 10304.toShort(), 10550.toShort(), 10570.toShort(), 14640.toShort(), 15014.toShort(), 15034.toShort(), 19760.toShort(), 20134.toShort(), 20154.toShort(), (-29392).toShort(), (-29018).toShort(), (-28998).toShort(), 31024.toShort(), 31270.toShort(), 31290.toShort(), (-24272).toShort(), (-23898).toShort(), (-23878).toShort(), (-19152).toShort(), (-18778).toShort(), (-18758).toShort(), (-14032).toShort(), (-13658).toShort(), (-13638).toShort(), (-6864).toShort(), (-6490).toShort(), (-6470).toShort(), 516.toShort(), 536.toShort(), 6788.toShort(), 6808.toShort(), 11012.toShort(), 11032.toShort(), 14980.toShort(), 15000.toShort(), 21124.toShort(), 21144.toShort(), (-28924).toShort(), (-28904).toShort(), (-22012).toShort(), (-21992).toShort(), (-12924).toShort(), (-12904).toShort()), shortArrayOf(0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 13753.toShort(), 13737.toShort(), 13719.toShort(), 13883.toShort(), 13863.toShort(), 13974.toShort(), 19643.toShort(), 18601.toShort(), 16532.toShort(), 23993.toShort(), 25121.toShort(), 24980.toShort(), 26944.toShort(), 26921.toShort(), 24854.toShort(), 27191.toShort(), 27171.toShort(), 26130.toShort(), 26941.toShort(), 28696.toShort(), 30100.toShort(), 12477.toShort(), 10407.toShort(), 10388.toShort(), 10685.toShort(), 10665.toShort(), 10646.toShort(), 6711.toShort(), 6693.toShort(), 6674.toShort(), 6965.toShort(), 7073.toShort(), 7056.toShort(), 2361.toShort(), 4387.toShort(), 3346.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort()), shortArrayOf(0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 0.toShort(), 4.toShort(), 24.toShort(), 44.toShort(), 64.toShort(), 84.toShort(), 104.toShort(), 304.toShort(), 678.toShort(), 698.toShort(), 550.toShort(), 934.toShort(), 954.toShort(), 6448.toShort(), 6946.toShort(), 6966.toShort(), 2352.toShort(), 2726.toShort(), 2746.toShort(), 10544.toShort(), 10918.toShort(), 10938.toShort(), 10304.toShort(), 10550.toShort(), 10570.toShort(), 14640.toShort(), 15014.toShort(), 15034.toShort(), 19760.toShort(), 20134.toShort(), 20154.toShort(), (-29392).toShort(), (-29018).toShort(), (-28998).toShort(), 31024.toShort(), 31270.toShort(), 31290.toShort(), (-24272).toShort(), (-23898).toShort(), (-23878).toShort(), (-19152).toShort(), (-18778).toShort(), (-18758).toShort(), (-14032).toShort(), (-13658).toShort(), (-13638).toShort(), (-6864).toShort(), (-6490).toShort(), (-6470).toShort(), 516.toShort(), 536.toShort(), 6788.toShort(), 6808.toShort(), 11012.toShort(), 11032.toShort(), 14980.toShort(), 15000.toShort(), 21124.toShort(), 21144.toShort(), (-28924).toShort(), (-28904).toShort(), (-22012).toShort(), (-21992).toShort(), (-12924).toShort(), (-12904).toShort())) + + val aShortArray63 = shortArrayOf( + 960.toShort(), + 957.toShort(), (-21568).toShort(), (-21571).toShort(), 22464.toShort() + ) + + val aShortArray2219 = shortArrayOf( + (-4160).toShort(), + (-4163).toShort(), (-8256).toShort(), (-8259).toShort(), 22461.toShort() + ) + +} \ No newline at end of file diff --git a/Client/src/main/kotlin/org/rs09/client/constants/gametype/RunescapeGameAppearance.kt b/Client/src/main/kotlin/org/rs09/client/constants/gametype/RunescapeGameAppearance.kt new file mode 100644 index 000000000..78e5ef16c --- /dev/null +++ b/Client/src/main/kotlin/org/rs09/client/constants/gametype/RunescapeGameAppearance.kt @@ -0,0 +1,181 @@ +package org.rs09.client.constants.gametype + +object RunescapeGameAppearance { + + /** + * Game type RUNESCAPE appearance values + */ + + val aShortArrayArray3654 = arrayOf( + shortArrayOf( + 6798.toShort(), + 107.toShort(), + 10283.toShort(), + 16.toShort(), + 4797.toShort(), + 7744.toShort(), + 5799.toShort(), + 4634.toShort(), + (-31839).toShort(), + 22433.toShort(), + 2983.toShort(), + (-11343).toShort(), + 8.toShort(), + 5281.toShort(), + 10438.toShort(), + 3650.toShort(), + (-27322).toShort(), + (-21845).toShort(), + 200.toShort(), + 571.toShort(), + 908.toShort(), + 21830.toShort(), + 28946.toShort(), + (-15701).toShort(), + (-14010).toShort() + ), + shortArrayOf( + 8741.toShort(), + 12.toShort(), + (-1506).toShort(), + (-22374).toShort(), + 7735.toShort(), + 8404.toShort(), + 1701.toShort(), + (-27106).toShort(), + 24094.toShort(), + 10153.toShort(), + (-8915).toShort(), + 4783.toShort(), + 1341.toShort(), + 16578.toShort(), + (-30533).toShort(), + 25239.toShort(), + 8.toShort(), + 5281.toShort(), + 10438.toShort(), + 3650.toShort(), + (-27322).toShort(), + (-21845).toShort(), + 200.toShort(), + 571.toShort(), + 908.toShort(), + 21830.toShort(), + 28946.toShort(), + (-15701).toShort(), + (-14010).toShort() + ), + shortArrayOf( + 25238.toShort(), + 8742.toShort(), + 12.toShort(), + (-1506).toShort(), + (-22374).toShort(), + 7735.toShort(), + 8404.toShort(), + 1701.toShort(), + (-27106).toShort(), + 24094.toShort(), + 10153.toShort(), + (-8915).toShort(), + 4783.toShort(), + 1341.toShort(), + 16578.toShort(), + (-30533).toShort(), + 8.toShort(), + 5281.toShort(), + 10438.toShort(), + 3650.toShort(), + (-27322).toShort(), + (-21845).toShort(), + 200.toShort(), + 571.toShort(), + 908.toShort(), + 21830.toShort(), + 28946.toShort(), + (-15701).toShort(), + (-14010).toShort() + ), + shortArrayOf(4626.toShort(), 11146.toShort(), 6439.toShort(), 12.toShort(), 4758.toShort(), 10270.toShort()), + shortArrayOf( + 4550.toShort(), + 4537.toShort(), + 5681.toShort(), + 5673.toShort(), + 5790.toShort(), + 6806.toShort(), + 8076.toShort(), + 4574.toShort() + ) + ) //Appearance Colors + + val aShortArray3349 = shortArrayOf( + (-10304).toShort(), + 9104.toShort(), (-1).toShort(), (-1).toShort(), (-1).toShort() + ) + + val aShortArrayArray435 = arrayOf( + shortArrayOf( + 6554.toShort(), + 115.toShort(), + 10304.toShort(), + 28.toShort(), + 5702.toShort(), + 7756.toShort(), + 5681.toShort(), + 4510.toShort(), + (-31835).toShort(), + 22437.toShort(), + 2859.toShort(), + (-11339).toShort(), + 16.toShort(), + 5157.toShort(), + 10446.toShort(), + 3658.toShort(), + (-27314).toShort(), + (-21965).toShort(), + 472.toShort(), + 580.toShort(), + 784.toShort(), + 21966.toShort(), + 28950.toShort(), + (-15697).toShort(), + (-14002).toShort() + ), shortArrayOf( + 9104.toShort(), + 10275.toShort(), + 7595.toShort(), + 3610.toShort(), + 7975.toShort(), + 8526.toShort(), + 918.toShort(), + (-26734).toShort(), + 24466.toShort(), + 10145.toShort(), + (-6882).toShort(), + 5027.toShort(), + 1457.toShort(), + 16565.toShort(), + (-30545).toShort(), + 25486.toShort(), + 24.toShort(), + 5392.toShort(), + 10429.toShort(), + 3673.toShort(), + (-27335).toShort(), + (-21957).toShort(), + 192.toShort(), + 687.toShort(), + 412.toShort(), + 21821.toShort(), + 28835.toShort(), + (-15460).toShort(), + (-14019).toShort() + ), ShortArray(0), ShortArray(0), ShortArray(0) + ) + + val aShortArray3011 = shortArrayOf( + 6798.toShort(), + 8741.toShort(), 25238.toShort(), 4626.toShort(), 4550.toShort() + ) +} \ No newline at end of file diff --git a/Client/src/main/kotlin/org/rs09/client/constants/login/LoginMessageToDisplay.kt b/Client/src/main/kotlin/org/rs09/client/constants/login/LoginMessageToDisplay.kt new file mode 100644 index 000000000..a33c7330a --- /dev/null +++ b/Client/src/main/kotlin/org/rs09/client/constants/login/LoginMessageToDisplay.kt @@ -0,0 +1,39 @@ +package org.rs09.client.constants.login + +object LoginMessageToDisplay { + + const val CONNECTION_TIMED_OUT = -5 + const val ERROR_CONNECTING_TO_SERVER = -4 + const val PERFORMING_LOGIN = -3 + const val ENTER_USERNAME_AND_PASSWORD = -2 + + const val COULD_NOT_DISPLAY_VIDEO_AD = 1 + const val UNEXPECTED_SERVER_RESPONSE_2 = 2 + const val INVALID_USER_OR_PASSWORD = 3 + const val ACCOUNT_DISABLED = 4 + const val ACCOUNT_STILL_LOGGED_IN = 5 + const val GAME_HAS_UPDATED = 6 + const val WORLD_IS_FULL = 7 + const val LOGIN_SERVER_OFFLINE = 8 + const val TOO_MANY_CONNECTIONS = 9 + const val BAD_SESSION_ID = 10 + const val WEAK_PASSWORD_ALERT = 11 + const val NON_MEMBERS_ACCOUNT = 12 + const val COULD_NOT_COMPLETE_LOGIN = 13 + const val SERVER_BEING_UPDATED_WAIT = 14 + const val UNEXPECTED_SERVER_RESPONSE_15 = 15 + const val MAX_INCORRECT_LOGIN_AMOUNT = 16 + const val FREE_ACCOUNT_IN_MEMBERS_AREA = 17 + const val LOCKED_ACCOUNT_STOLEN = 18 + const val FULLSCREEN_MEMBERS_ONLY = 19 + const val MALFORMED_LOGIN_PACKET = 22 + const val NO_LOGIN_SERVER_REPLY = 23 + const val ERROR_LOADING_PROFILE = 24 + const val MAC_BANNED = 26 + const val SERVICE_UNAVAILABLE = 27 + const val NON_MEMBER_MEMBER_LOGIN = 30 + + //Additive/Specialized responses displayed || LoginServerResponse REQUIREMENT_WORLD (29) + const val PVP_COMBAT_MINIMUM_LEVEL_20 = 0 + const val PVP_CARRYING_LENT_ITEMS = 1 +} \ No newline at end of file diff --git a/Client/src/main/kotlin/org/rs09/client/constants/login/LoginOutgoingOpcode.kt b/Client/src/main/kotlin/org/rs09/client/constants/login/LoginOutgoingOpcode.kt new file mode 100644 index 000000000..9b0a6f63f --- /dev/null +++ b/Client/src/main/kotlin/org/rs09/client/constants/login/LoginOutgoingOpcode.kt @@ -0,0 +1,13 @@ +package org.rs09.client.constants.login + +object LoginOutgoingOpcode { + + /** + * Networking + */ + const val INITIAL_CONNECTION = 14 + const val USER_RECONNECTING_LOGIN = 16 + const val USER_ADVERTISEMENT_FINISHED = 17 + const val USER_NORMAL_LOGIN = 18 + +} \ No newline at end of file diff --git a/Client/src/main/kotlin/org/rs09/client/constants/login/LoginReceivedOpcode.kt b/Client/src/main/kotlin/org/rs09/client/constants/login/LoginReceivedOpcode.kt new file mode 100644 index 000000000..b7f885240 --- /dev/null +++ b/Client/src/main/kotlin/org/rs09/client/constants/login/LoginReceivedOpcode.kt @@ -0,0 +1,15 @@ +package org.rs09.client.constants.login + +object LoginReceivedOpcode { + + /** + * Received server responses + */ + const val SUCCESSFUL_CONNECTION = 0 + const val DISPLAY_ADVERTISEMENT = 1 + const val SUCCESS = 2 + const val PROFILE_TRANSFERRING = 21 + const val NO_LOGIN_SERVER_REPLY = 23 + const val REQUIREMENT_WORLD = 29 + +} \ No newline at end of file diff --git a/Client/src/main/kotlin/org/rs09/client/constants/login/LoginStage.kt b/Client/src/main/kotlin/org/rs09/client/constants/login/LoginStage.kt new file mode 100644 index 000000000..544948e24 --- /dev/null +++ b/Client/src/main/kotlin/org/rs09/client/constants/login/LoginStage.kt @@ -0,0 +1,17 @@ +package org.rs09.client.constants.login + +object LoginStage { + + const val ERROR_CHECK_SET_PORTS = 0 + const val INITIALIZE_SOCKET = 1 + const val INITIATE_USER_LOGIN = 2 + const val SEND_ENCRYPT_USER_CREDENTIALS = 3 + const val RECEIVE_SERVER_RESPONSE = 4 + const val SEND_ADVERTISEMENT_TO_USER = 5 + const val FINISH_DISPLAYING_ADVERTISEMENT = 6 + const val DISPLAY_PROFILE_TRANSFERRING = 7 + const val LOGIN_ACCEPTED_GET_USER_DATA = 8 + const val FINISH_USER_LOGIN_SETUP = 9 + const val DISPLAY_REQUIREMENT_WORLD_RESPONSE = 10 + +} \ No newline at end of file