diff --git a/09HDscape-client/src/org/runite/jagex/AnimationDefinition.java b/09HDscape-client/src/org/runite/jagex/AnimationDefinition.java index 2dca640fc..a0817efc2 100644 --- a/09HDscape-client/src/org/runite/jagex/AnimationDefinition.java +++ b/09HDscape-client/src/org/runite/jagex/AnimationDefinition.java @@ -524,14 +524,14 @@ final class AnimationDefinition { Class3_Sub13_Sub37.anInt3439 = 0; Class40.anInt674 = 0; Class167.anInt2085 = 0; - Class148.anInt1910 = 0; + KeyboardListener.anInt1910 = 0; Class3_Sub13_Sub12.anInt3144 = 0; Canvas_Sub1.anInt17 = 0; Class120.anInt1633 = 0; Class15.anInt342 = 0; Class143.anInt1873 = 0; Class75_Sub3.anInt2651 = 0; - Class148.anInt1909 = 0; + KeyboardListener.anInt1909 = 0; Class136.anInt1776 = 0; Class23.anInt456 = 0; Class3_Sub6.anInt2290 = 0; @@ -541,7 +541,7 @@ final class AnimationDefinition { Class61.anInt938 = 0; Class19.anInt421 = 0; ItemDefinition.anInt763 = 0; - Class148.anInt1906 = 0; + KeyboardListener.anInt1906 = 0; Class15.anInt348 = 0; Class54.anInt876 = 0; Class56.anInt889 = 0; @@ -683,7 +683,7 @@ final class AnimationDefinition { Class146.anInt1904 = 0; Canvas_Sub2.anInt30 = 0; GraphicDefinition.anInt529 = 0; - Class149.anInt1923 = 0; + MouseListeningClass.anInt1923 = 0; Class3_Sub28_Sub10.anInt3631 = 0; Class163_Sub2_Sub1.anInt4021 = 0; diff --git a/09HDscape-client/src/org/runite/jagex/CS2Script.java b/09HDscape-client/src/org/runite/jagex/CS2Script.java index 4e592b8c6..0e5196e4b 100644 --- a/09HDscape-client/src/org/runite/jagex/CS2Script.java +++ b/09HDscape-client/src/org/runite/jagex/CS2Script.java @@ -141,7 +141,7 @@ final class CS2Script extends Class3 { } var2 = Class157.anInt1996 * 128 - -64; - var1 = Class149.anInt1923 * 128 + 64; + var1 = MouseListeningClass.anInt1923 * 128 + 64; var3 = Class121.method1736(WorldListCountry.localPlane, 1, var1, var2) + -GraphicDefinition.anInt529; int var5 = var3 + -Class7.anInt2162; int var6 = -Class77.anInt1111 + var2; diff --git a/09HDscape-client/src/org/runite/jagex/Class107.java b/09HDscape-client/src/org/runite/jagex/Class107.java index e6bb51091..9bf8c9376 100644 --- a/09HDscape-client/src/org/runite/jagex/Class107.java +++ b/09HDscape-client/src/org/runite/jagex/Class107.java @@ -10,7 +10,7 @@ final class Class107 { static final void method1645(CacheIndex var0, CacheIndex var1, byte var2) { try { - Class148.aClass153_1916 = var1; + KeyboardListener.aClass153_1916 = var1; int var4 = (int)(21.0D * Math.random()) - 10; Class54.aClass153_878 = var0; int var5 = (int)(21.0D * Math.random()) - 10; diff --git a/09HDscape-client/src/org/runite/jagex/Class110.java b/09HDscape-client/src/org/runite/jagex/Class110.java index 4abe01335..7e5d8a2d1 100644 --- a/09HDscape-client/src/org/runite/jagex/Class110.java +++ b/09HDscape-client/src/org/runite/jagex/Class110.java @@ -502,7 +502,7 @@ final class Class110 { } } - } else if(Class148.aBoolean1905 || ~def.anInt1529 != -1 || -2 == ~def.actionCount || def.aBoolean1483) { + } else if(KeyboardListener.aBoolean1905 || ~def.anInt1529 != -1 || -2 == ~def.actionCount || def.aBoolean1483) { if(0 == ~def.animationId && def.anIntArray1524 == null && !def.aBoolean1510) { var28 = def.method1696(var10, var20, var18, 22, var19, var23, var1, (LDIndexedSprite)null, (byte)-126, var26, var21); if(HDToolKit.highDetail && var26) { diff --git a/09HDscape-client/src/org/runite/jagex/Class114.java b/09HDscape-client/src/org/runite/jagex/Class114.java index 17ab6d2d7..890667dac 100644 --- a/09HDscape-client/src/org/runite/jagex/Class114.java +++ b/09HDscape-client/src/org/runite/jagex/Class114.java @@ -38,14 +38,14 @@ final class Class114 { float var2 = Class92.method1514() + Class92.method1505(); int var3 = Class92.method1510(); float var7 = 0.58823526F; - Class149.aFloatArray1919[3] = 1.0F; + MouseListeningClass.aFloatArray1919[3] = 1.0F; float var4 = (float)(var3 >> 16 & 255) / 255.0F; float var5 = (float)(('\uff1e' & var3) >> 8) / 255.0F; - Class149.aFloatArray1919[1] = var2 * (float)Class3_Sub28_Sub15.method633(var0 >> 8, 255) / 255.0F * var5 * var7; - Class149.aFloatArray1919[var1] = var2 * var7 * var4 * ((float)(Class3_Sub28_Sub15.method633(16754958, var0) >> 16) / 255.0F); + MouseListeningClass.aFloatArray1919[1] = var2 * (float)Class3_Sub28_Sub15.method633(var0 >> 8, 255) / 255.0F * var5 * var7; + MouseListeningClass.aFloatArray1919[var1] = var2 * var7 * var4 * ((float)(Class3_Sub28_Sub15.method633(16754958, var0) >> 16) / 255.0F); float var6 = (float)(var3 & 255) / 255.0F; - Class149.aFloatArray1919[2] = (float)Class3_Sub28_Sub15.method633(255, var0) / 255.0F * var6 * var7 * var2; - return Class149.aFloatArray1919; + MouseListeningClass.aFloatArray1919[2] = (float)Class3_Sub28_Sub15.method633(255, var0) / 255.0F * var6 * var7 * var2; + return MouseListeningClass.aFloatArray1919; } catch (RuntimeException var8) { throw Class44.method1067(var8, "pf.F(" + var0 + ',' + var1 + ')'); } diff --git a/09HDscape-client/src/org/runite/jagex/Class115.java b/09HDscape-client/src/org/runite/jagex/Class115.java index 97c79676d..5ea51a73a 100644 --- a/09HDscape-client/src/org/runite/jagex/Class115.java +++ b/09HDscape-client/src/org/runite/jagex/Class115.java @@ -134,7 +134,7 @@ final class Class115 { static final void method1714(byte var0) { try { - Class148.aClass93_1911.method1523((byte)-112); + KeyboardListener.aClass93_1911.method1523((byte)-112); if(var0 != -6) { method1712(-114); } diff --git a/09HDscape-client/src/org/runite/jagex/Class117.java b/09HDscape-client/src/org/runite/jagex/Class117.java index 3a6799d94..7a36409fd 100644 --- a/09HDscape-client/src/org/runite/jagex/Class117.java +++ b/09HDscape-client/src/org/runite/jagex/Class117.java @@ -51,9 +51,9 @@ final class Class117 { boolean var3 = var1 == Class143.loadingStage || ~Class143.loadingStage == -11 || -29 == ~Class143.loadingStage; if(var3 == !var2) { if(var2) { - Class129.anInt1691 = Class148.anInt1912; + Class129.anInt1691 = KeyboardListener.anInt1912; if(Class9.anInt120 != 0) { - Class151.method2099(true, Class148.anInt1912, 0, Class75_Sub2.aClass153_2645, false, 255, 2); + Class151.method2099(true, KeyboardListener.anInt1912, 0, Class75_Sub2.aClass153_2645, false, 255, 2); } else { NodeList.method882(-1, 2); } @@ -81,7 +81,7 @@ final class Class117 { Class129.anIntArray1695 = new int[104]; Class80.anIntArray1138 = new int[104]; Class85.anInt1174 = 99; - Class149.anIntArray1920 = new int[104]; + MouseListeningClass.anIntArray1920 = new int[104]; byte var2; if(var0) { var2 = 1; diff --git a/09HDscape-client/src/org/runite/jagex/Class118.java b/09HDscape-client/src/org/runite/jagex/Class118.java index 1d82e6684..f55dca155 100644 --- a/09HDscape-client/src/org/runite/jagex/Class118.java +++ b/09HDscape-client/src/org/runite/jagex/Class118.java @@ -129,7 +129,7 @@ abstract class Class118 { method1726(-123); } - return Class148.aClass93_1911.method1520(-12623); + return KeyboardListener.aClass93_1911.method1520(-12623); } catch (RuntimeException var2) { throw Class44.method1067(var2, "q.D(" + var0 + ')'); } diff --git a/09HDscape-client/src/org/runite/jagex/Class129.java b/09HDscape-client/src/org/runite/jagex/Class129.java index 85c26a3e9..45a4f8919 100644 --- a/09HDscape-client/src/org/runite/jagex/Class129.java +++ b/09HDscape-client/src/org/runite/jagex/Class129.java @@ -43,9 +43,9 @@ abstract class Class129 { static final void method1768(int var0, int var1, int var2) { try { - if(-1 > ~Class148.anInt1908) { - Class159.method2195(Class148.anInt1908, 0); - Class148.anInt1908 = 0; + if(-1 > ~KeyboardListener.anInt1908) { + Class159.method2195(KeyboardListener.anInt1908, 0); + KeyboardListener.anInt1908 = 0; } short var3 = 256; diff --git a/09HDscape-client/src/org/runite/jagex/Class134.java b/09HDscape-client/src/org/runite/jagex/Class134.java index 61d37c1b0..164cd5ece 100644 --- a/09HDscape-client/src/org/runite/jagex/Class134.java +++ b/09HDscape-client/src/org/runite/jagex/Class134.java @@ -41,9 +41,9 @@ final class Class134 { method1806(-79); } - if(~var1 == -5001 && Class149.anInt1927 > 0) { - var2 = Class9.aByteArrayArray125[--Class149.anInt1927]; - Class9.aByteArrayArray125[Class149.anInt1927] = null; + if(~var1 == -5001 && MouseListeningClass.anInt1927 > 0) { + var2 = Class9.aByteArrayArray125[--MouseListeningClass.anInt1927]; + Class9.aByteArrayArray125[MouseListeningClass.anInt1927] = null; return var2; } else if(-30001 == ~var1 && 0 < Class3_Sub28_Sub18.anInt3766) { var2 = Class140_Sub3.aByteArrayArray2747[--Class3_Sub28_Sub18.anInt3766]; diff --git a/09HDscape-client/src/org/runite/jagex/Class158_Sub1.java b/09HDscape-client/src/org/runite/jagex/Class158_Sub1.java index 6c8f44491..37e3d1def 100644 --- a/09HDscape-client/src/org/runite/jagex/Class158_Sub1.java +++ b/09HDscape-client/src/org/runite/jagex/Class158_Sub1.java @@ -220,7 +220,7 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv Class129.anIntArray1695[var10] = 0; Class80.anIntArray1138[var10] = 0; Class3_Sub31.anIntArray2606[var10] = 0; - Class149.anIntArray1920[var10] = 0; + MouseListeningClass.anIntArray1920[var10] = 0; Class3_Sub18.anIntArray2469[var10] = 0; } @@ -234,7 +234,7 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv Class129.anIntArray1695[var11] += var39.anInt1408; Class80.anIntArray1138[var11] += var39.anInt1406; Class3_Sub31.anIntArray2606[var11] += var39.anInt1417; - Class149.anIntArray1920[var11] += var39.anInt1418; + MouseListeningClass.anIntArray1920[var11] += var39.anInt1418; ++Class3_Sub18.anIntArray2469[var11]; } } @@ -247,7 +247,7 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv Class129.anIntArray1695[var11] -= var42.anInt1408; Class80.anIntArray1138[var11] -= var42.anInt1406; Class3_Sub31.anIntArray2606[var11] -= var42.anInt1417; - Class149.anIntArray1920[var11] -= var42.anInt1418; + MouseListeningClass.anIntArray1920[var11] -= var42.anInt1418; --Class3_Sub18.anIntArray2469[var11]; } } @@ -266,14 +266,14 @@ final class Class158_Sub1 extends Class158 implements ImageProducer, ImageObserv var37 += Class80.anIntArray1138[var44]; var15 += Class3_Sub18.anIntArray2469[var44]; var11 += Class129.anIntArray1695[var44]; - var14 += Class149.anIntArray1920[var44]; + var14 += MouseListeningClass.anIntArray1920[var44]; var13 += Class3_Sub31.anIntArray2606[var44]; } var18 = var16 + -5; if(~var18 <= -1) { var37 -= Class80.anIntArray1138[var18]; - var14 -= Class149.anIntArray1920[var18]; + var14 -= MouseListeningClass.anIntArray1920[var18]; var11 -= Class129.anIntArray1695[var18]; var15 -= Class3_Sub18.anIntArray2469[var18]; var13 -= Class3_Sub31.anIntArray2606[var18]; diff --git a/09HDscape-client/src/org/runite/jagex/Class164_Sub1.java b/09HDscape-client/src/org/runite/jagex/Class164_Sub1.java index 9db4371ed..91214891c 100644 --- a/09HDscape-client/src/org/runite/jagex/Class164_Sub1.java +++ b/09HDscape-client/src/org/runite/jagex/Class164_Sub1.java @@ -31,14 +31,14 @@ class Class164_Sub1 extends Class164 { Class75.anInt1105 = var2; Class157.anInt1996 = var1; Class163_Sub2_Sub1.anInt4014 = var5; - Class149.anInt1923 = var3; + MouseListeningClass.anInt1923 = var3; GraphicDefinition.anInt529 = var0; if(var4 != -21) { aClass94_3013 = (RSString)null; } if(-101 >= ~Class163_Sub2_Sub1.anInt4014) { - int var6 = 64 + 128 * Class149.anInt1923; + int var6 = 64 + 128 * MouseListeningClass.anInt1923; int var7 = 64 + Class157.anInt1996 * 128; int var8 = Class121.method1736(WorldListCountry.localPlane, 1, var6, var7) - GraphicDefinition.anInt529; int var10 = var8 + -Class7.anInt2162; diff --git a/09HDscape-client/src/org/runite/jagex/Class164_Sub2.java b/09HDscape-client/src/org/runite/jagex/Class164_Sub2.java index a203def67..f8fa4d81d 100644 --- a/09HDscape-client/src/org/runite/jagex/Class164_Sub2.java +++ b/09HDscape-client/src/org/runite/jagex/Class164_Sub2.java @@ -188,7 +188,7 @@ class Class164_Sub2 extends Class164 { } if(12 == var8) { - var9 = Class149.anInt1925; + var9 = MouseListeningClass.anInt1925; } if(-14 == ~var8) { diff --git a/09HDscape-client/src/org/runite/jagex/Class166.java b/09HDscape-client/src/org/runite/jagex/Class166.java index 0ab384803..5b55f7860 100644 --- a/09HDscape-client/src/org/runite/jagex/Class166.java +++ b/09HDscape-client/src/org/runite/jagex/Class166.java @@ -97,7 +97,7 @@ final class Class166 { ++IOHandler.anInt1240; } } else { - ++Class148.anInt1910; + ++KeyboardListener.anInt1910; Class3_Sub13_Sub1.outgoingBuffer.putOpcode(180); Class3_Sub13_Sub1.outgoingBuffer.putLEShortA(Class56.localPlayerIndexes[var5]); } diff --git a/09HDscape-client/src/org/runite/jagex/Class168.java b/09HDscape-client/src/org/runite/jagex/Class168.java index cd85ba6cf..e6329ff95 100644 --- a/09HDscape-client/src/org/runite/jagex/Class168.java +++ b/09HDscape-client/src/org/runite/jagex/Class168.java @@ -765,7 +765,7 @@ final class Class168 { } int var8 = -var5 + var3; - Class149.method2091(var3, 4); + MouseListeningClass.method2091(var3, 4); int var7 = 0; if(~var8 > -1) { var8 = 0; diff --git a/09HDscape-client/src/org/runite/jagex/Class2.java b/09HDscape-client/src/org/runite/jagex/Class2.java index ae0fed258..be61069ce 100644 --- a/09HDscape-client/src/org/runite/jagex/Class2.java +++ b/09HDscape-client/src/org/runite/jagex/Class2.java @@ -325,9 +325,9 @@ final class Class2 { if(var3 != null) { return var3; } else { - Class148.aClass153_1916.method2144(0, this.anInt64); + KeyboardListener.aClass153_1916.method2144(0, this.anInt64); int var4 = 125 % ((var2 - -21) / 50); - var3 = RSString.method1539(0, true, this.anInt64, Class148.aClass153_1916); + var3 = RSString.method1539(0, true, this.anInt64, KeyboardListener.aClass153_1916); if(var3 != null) { var3.method1668(Class102.anInt2136, Class46.anInt740, Class158.anInt2015); var3.anInt1469 = var3.anInt1461; diff --git a/09HDscape-client/src/org/runite/jagex/Class21.java b/09HDscape-client/src/org/runite/jagex/Class21.java index 2b0ca6030..115f9a421 100644 --- a/09HDscape-client/src/org/runite/jagex/Class21.java +++ b/09HDscape-client/src/org/runite/jagex/Class21.java @@ -166,7 +166,7 @@ final class Class21 { } try { - return (Class146)Class.forName(Configurations.PACKAGE_JAGEX + ".Class146_Sub1").newInstance(); + return (Class146)Class.forName(Configurations.PACKAGE_JAGEX + ".MouseWheel").newInstance(); } catch (Throwable var2) { return null; } diff --git a/09HDscape-client/src/org/runite/jagex/Class23.java b/09HDscape-client/src/org/runite/jagex/Class23.java index 4efc909ad..cd62b3816 100644 --- a/09HDscape-client/src/org/runite/jagex/Class23.java +++ b/09HDscape-client/src/org/runite/jagex/Class23.java @@ -49,7 +49,7 @@ final class Class23 { var1.putByte((byte)-42, Class3_Sub28_Sub10.anInt3625); var1.putByte((byte)-81, !Class3_Sub28_Sub13.aBoolean3665?0:1); var1.putByte((byte)-57, Class3_Sub28_Sub7.aBoolean3604?1:0); - var1.putByte((byte)-12, Class148.aBoolean1905?1:0); + var1.putByte((byte)-12, KeyboardListener.aBoolean1905?1:0); var1.putByte((byte)-29, Class25.aBoolean488?1:0); var1.putByte((byte)-60, !RSInterface.aBoolean236?0:1); var1.putByte((byte)-78, !WorldListEntry.aBoolean2623?0:1); @@ -83,7 +83,7 @@ final class Class23 { static final void method940(int var0, int var1) { try { if(var0 >= 101) { - Class149 var2 = Class3_Sub28_Sub7_Sub1.aClass149_4047; + MouseListeningClass var2 = Class3_Sub28_Sub7_Sub1.aClass149_4047; synchronized(var2) { Class3_Sub28_Sub7_Sub1.anInt4045 = var1; } diff --git a/09HDscape-client/src/org/runite/jagex/Class24.java b/09HDscape-client/src/org/runite/jagex/Class24.java index 6872f98b7..1bdf87e10 100644 --- a/09HDscape-client/src/org/runite/jagex/Class24.java +++ b/09HDscape-client/src/org/runite/jagex/Class24.java @@ -139,7 +139,7 @@ final class Class24 { int var14 = buffer.getByte((byte)-94) >> 2; if(~var15 < -1 && var16 > 0 && 103 > var15 && 103 > var16) { ObjectDefinition var17 = Class162.getObjectDefinition(4, var7); - if(var14 != 22 || Class148.aBoolean1905 || 0 != var17.anInt1529 || ~var17.actionCount == -2 || var17.aBoolean1483) { + if(var14 != 22 || KeyboardListener.aBoolean1905 || 0 != var17.anInt1529 || ~var17.actionCount == -2 || var17.aBoolean1483) { var10 = true; if(!var17.hasModels(false)) { var5 = false; diff --git a/09HDscape-client/src/org/runite/jagex/Class32.java b/09HDscape-client/src/org/runite/jagex/Class32.java index a4674f018..1c6659214 100644 --- a/09HDscape-client/src/org/runite/jagex/Class32.java +++ b/09HDscape-client/src/org/runite/jagex/Class32.java @@ -109,7 +109,7 @@ final class Class32 { method993(3, 100, -24); } - Class148 var1 = Class3_Sub13_Sub3.aClass148_3049; + KeyboardListener var1 = Class3_Sub13_Sub3.aClass148_3049; synchronized(var1) { Class3_Sub28_Sub9.anInt3620 = Class134.anInt1762; ++Class3_Sub13_Sub33.anInt3398; diff --git a/09HDscape-client/src/org/runite/jagex/Class36.java b/09HDscape-client/src/org/runite/jagex/Class36.java index 6ab4ab589..78e114299 100644 --- a/09HDscape-client/src/org/runite/jagex/Class36.java +++ b/09HDscape-client/src/org/runite/jagex/Class36.java @@ -41,7 +41,7 @@ final class Class36 { var2 = RenderAnimationDefinition.method903(new RSString[]{var2.method1557(var3, 0, 0), Class3_Sub13_Sub22.aClass94_3268, var2.method1556(var3, (byte)-74)}, (byte)-62); } - return var2.length(-50) > 9?RenderAnimationDefinition.method903(new RSString[]{Class148.aClass94_1917, var2.method1557(-8 + var2.length(-50), 0, 0), Class3_Sub13_Sub10.aClass94_3124, Class72.LEFT_PARENTHESES, var2, Class66.aClass94_995}, (byte)-113):(6 < var2.length(-63)?RenderAnimationDefinition.method903(new RSString[]{Class3_Sub13_Sub17.aClass94_3211, var2.method1557(-4 + var2.length(-65), 0, 0), Class3_Sub28_Sub5.aClass94_3586, Class72.LEFT_PARENTHESES, var2, Class66.aClass94_995}, (byte)-112):RenderAnimationDefinition.method903(new RSString[]{Class167.aClass94_2082, var2, Class3_Sub29.aClass94_2584}, (byte)-82)); + return var2.length(-50) > 9?RenderAnimationDefinition.method903(new RSString[]{KeyboardListener.aClass94_1917, var2.method1557(-8 + var2.length(-50), 0, 0), Class3_Sub13_Sub10.aClass94_3124, Class72.LEFT_PARENTHESES, var2, Class66.aClass94_995}, (byte)-113):(6 < var2.length(-63)?RenderAnimationDefinition.method903(new RSString[]{Class3_Sub13_Sub17.aClass94_3211, var2.method1557(-4 + var2.length(-65), 0, 0), Class3_Sub28_Sub5.aClass94_3586, Class72.LEFT_PARENTHESES, var2, Class66.aClass94_995}, (byte)-112):RenderAnimationDefinition.method903(new RSString[]{Class167.aClass94_2082, var2, Class3_Sub29.aClass94_2584}, (byte)-82)); } } catch (RuntimeException var4) { throw Class44.method1067(var4, "fi.D(" + var0 + ',' + var1 + ')'); diff --git a/09HDscape-client/src/org/runite/jagex/Class39.java b/09HDscape-client/src/org/runite/jagex/Class39.java index 5e597dd7b..ef9a34a7d 100644 --- a/09HDscape-client/src/org/runite/jagex/Class39.java +++ b/09HDscape-client/src/org/runite/jagex/Class39.java @@ -639,7 +639,7 @@ final class Class39 { Class3_Sub13_Sub4.anInt3061 = var1.getArchiveForName(Class3_Sub13_Sub38.aClass94_3452, (byte)-30); Class75_Sub1.anInt2633 = var1.getArchiveForName(Class3_Sub13_Sub14.aClass94_3168, (byte)-30); Class40.anInt678 = var1.getArchiveForName(Class113.aClass94_1567, (byte)-30); - Class3_Sub15.anInt2436 = var1.getArchiveForName(Class148.aClass94_1913, (byte)-30); + Class3_Sub15.anInt2436 = var1.getArchiveForName(KeyboardListener.aClass94_1913, (byte)-30); Class3_Sub28_Sub18.anInt3757 = var1.getArchiveForName(Class3_Sub28_Sub4.aClass94_3576, (byte)-30); Class45.anInt735 = var1.getArchiveForName(Class140_Sub2.aClass94_2702, (byte)-30); Class93.anInt1325 = var1.getArchiveForName(Class168.aClass94_2089, (byte)-30); diff --git a/09HDscape-client/src/org/runite/jagex/Class3_Sub13_Sub1.java b/09HDscape-client/src/org/runite/jagex/Class3_Sub13_Sub1.java index bf24fdf0f..c8efb549f 100644 --- a/09HDscape-client/src/org/runite/jagex/Class3_Sub13_Sub1.java +++ b/09HDscape-client/src/org/runite/jagex/Class3_Sub13_Sub1.java @@ -22,7 +22,7 @@ final class Class3_Sub13_Sub1 extends Class3_Sub13 { static final void method167(int var0) { try { if(Class3_Sub13_Sub3.aClass148_3049 != null) { - Class148 var1 = Class3_Sub13_Sub3.aClass148_3049; + KeyboardListener var1 = Class3_Sub13_Sub3.aClass148_3049; synchronized(var1) { Class3_Sub13_Sub3.aClass148_3049 = null; } diff --git a/09HDscape-client/src/org/runite/jagex/Class3_Sub13_Sub13.java b/09HDscape-client/src/org/runite/jagex/Class3_Sub13_Sub13.java index 87a418c11..7fd91a953 100644 --- a/09HDscape-client/src/org/runite/jagex/Class3_Sub13_Sub13.java +++ b/09HDscape-client/src/org/runite/jagex/Class3_Sub13_Sub13.java @@ -444,7 +444,7 @@ final class Class3_Sub13_Sub13 extends Class3_Sub13 { Class163_Sub1_Sub1.method2214(0); if(Class143.loadingStage == 30) { - Class149.method2087((byte)-82); + MouseListeningClass.method2087((byte)-82); Class115.method1713((byte)-91); Class3_Sub8.method132((byte)-92); ++Class3_Sub28_Sub16.anInt3699; @@ -804,7 +804,7 @@ final class Class3_Sub13_Sub13 extends Class3_Sub13 { } if(Class133.anInt1753 == 1) { - Class148.method2086((byte)68); + KeyboardListener.method2086((byte)68); } else if(~Class133.anInt1753 == -3) { CS2Script.method379(1024); } else { diff --git a/09HDscape-client/src/org/runite/jagex/Class3_Sub13_Sub16.java b/09HDscape-client/src/org/runite/jagex/Class3_Sub13_Sub16.java index 340d79605..3dcb1a4ae 100644 --- a/09HDscape-client/src/org/runite/jagex/Class3_Sub13_Sub16.java +++ b/09HDscape-client/src/org/runite/jagex/Class3_Sub13_Sub16.java @@ -81,7 +81,7 @@ final class Class3_Sub13_Sub16 extends Class3_Sub13 { for(int var15 = 0; var15 < Class113.anInt1559; ++var15) { Class3_Sub13_Sub36.anInt3422 = Integer.MAX_VALUE; - Class148.anInt1914 = Integer.MAX_VALUE; + KeyboardListener.anInt1914 = Integer.MAX_VALUE; Class69.anInt1042 = Integer.MAX_VALUE; Class3_Sub28_Sub5.anInt3589 = Integer.MAX_VALUE; int var16 = this.anInt3203 * Class102.anIntArray2125[var15] + 2048; @@ -123,20 +123,20 @@ final class Class3_Sub13_Sub16 extends Class3_Sub13 { if(var12 >= Class3_Sub28_Sub5.anInt3589) { if(~var12 > ~Class69.anInt1042) { - Class3_Sub13_Sub36.anInt3422 = Class148.anInt1914; - Class148.anInt1914 = Class69.anInt1042; + Class3_Sub13_Sub36.anInt3422 = KeyboardListener.anInt1914; + KeyboardListener.anInt1914 = Class69.anInt1042; Class69.anInt1042 = var12; - } else if(Class148.anInt1914 <= var12) { + } else if(KeyboardListener.anInt1914 <= var12) { if(var12 < Class3_Sub13_Sub36.anInt3422) { Class3_Sub13_Sub36.anInt3422 = var12; } } else { - Class3_Sub13_Sub36.anInt3422 = Class148.anInt1914; - Class148.anInt1914 = var12; + Class3_Sub13_Sub36.anInt3422 = KeyboardListener.anInt1914; + KeyboardListener.anInt1914 = var12; } } else { - Class3_Sub13_Sub36.anInt3422 = Class148.anInt1914; - Class148.anInt1914 = Class69.anInt1042; + Class3_Sub13_Sub36.anInt3422 = KeyboardListener.anInt1914; + KeyboardListener.anInt1914 = Class69.anInt1042; Class69.anInt1042 = Class3_Sub28_Sub5.anInt3589; Class3_Sub28_Sub5.anInt3589 = var12; } @@ -148,7 +148,7 @@ final class Class3_Sub13_Sub16 extends Class3_Sub13 { var3[var15] = Class3_Sub28_Sub5.anInt3589; } else if(var19 != 1) { if(-4 == ~var19) { - var3[var15] = Class148.anInt1914; + var3[var15] = KeyboardListener.anInt1914; } else if(var19 == 4) { var3[var15] = Class3_Sub13_Sub36.anInt3422; } else if(-3 == ~var19) { diff --git a/09HDscape-client/src/org/runite/jagex/Class3_Sub13_Sub17.java b/09HDscape-client/src/org/runite/jagex/Class3_Sub13_Sub17.java index 9befd8792..e6eee8efd 100644 --- a/09HDscape-client/src/org/runite/jagex/Class3_Sub13_Sub17.java +++ b/09HDscape-client/src/org/runite/jagex/Class3_Sub13_Sub17.java @@ -38,7 +38,7 @@ final class Class3_Sub13_Sub17 extends Class3_Sub13 { Class115.method1714((byte)-6); Class3_Sub28_Sub6.h((byte)3); Class107.method1650(21); - Class149.method2089((byte)115); + MouseListeningClass.method2089((byte)115); Class3_Sub13_Sub11.aClass93_3130.method1523((byte)-103); Class80.aClass93_1135.method1523((byte)-122); } catch (RuntimeException var2) { diff --git a/09HDscape-client/src/org/runite/jagex/Class3_Sub13_Sub2.java b/09HDscape-client/src/org/runite/jagex/Class3_Sub13_Sub2.java index c77db57d4..0d6407f65 100644 --- a/09HDscape-client/src/org/runite/jagex/Class3_Sub13_Sub2.java +++ b/09HDscape-client/src/org/runite/jagex/Class3_Sub13_Sub2.java @@ -123,7 +123,7 @@ final class Class3_Sub13_Sub2 extends Class3_Sub13 { static final void method175(int var0, int var1, int var2, boolean var3, int var4, int var5, int var6) { try { - Class149.method2091(var5, 4); + MouseListeningClass.method2091(var5, 4); int var8 = var5 - var1; int var7 = 0; if(var8 < 0) { diff --git a/09HDscape-client/src/org/runite/jagex/Class3_Sub13_Sub3.java b/09HDscape-client/src/org/runite/jagex/Class3_Sub13_Sub3.java index 98b783898..5ed877df4 100644 --- a/09HDscape-client/src/org/runite/jagex/Class3_Sub13_Sub3.java +++ b/09HDscape-client/src/org/runite/jagex/Class3_Sub13_Sub3.java @@ -7,7 +7,7 @@ final class Class3_Sub13_Sub3 extends Class3_Sub13 { private int anInt3047 = 4096; private static RSString aClass94_3048 = RSString.createRSString("Hidden"); - static Class148 aClass148_3049 = new Class148(); + static KeyboardListener aClass148_3049 = new KeyboardListener(); private boolean aBoolean3050 = true; static RSString aClass94_3051 = aClass94_3048; static short aShort3052 = 205; @@ -186,7 +186,7 @@ final class Class3_Sub13_Sub3 extends Class3_Sub13 { static final void method183(int var0) { try { if(var0 > -91) { - aClass148_3049 = (Class148)null; + aClass148_3049 = (KeyboardListener)null; } Class41.aClass93_684.method1524(3); diff --git a/09HDscape-client/src/org/runite/jagex/Class3_Sub19.java b/09HDscape-client/src/org/runite/jagex/Class3_Sub19.java index a327f60d6..e7de93238 100644 --- a/09HDscape-client/src/org/runite/jagex/Class3_Sub19.java +++ b/09HDscape-client/src/org/runite/jagex/Class3_Sub19.java @@ -62,7 +62,7 @@ final class Class3_Sub19 extends Class3 { } } - Class149.anInt1924 = 0; + MouseListeningClass.anInt1924 = 0; for(var6 = 0; 104 > var6; ++var6) { for(var7 = 0; 104 > var7; ++var7) { @@ -109,10 +109,10 @@ final class Class3_Sub19 extends Class3 { } } - Class3_Sub28_Sub15.anIntArray3693[Class149.anInt1924] = var10.objectId; - Class84.anIntArray1163[Class149.anInt1924] = -var2 + var12; - Class3_Sub28_Sub7_Sub1.anIntArray4050[Class149.anInt1924] = var21 + -var3; - ++Class149.anInt1924; + Class3_Sub28_Sub15.anIntArray3693[MouseListeningClass.anInt1924] = var10.objectId; + Class84.anIntArray1163[MouseListeningClass.anInt1924] = -var2 + var12; + Class3_Sub28_Sub7_Sub1.anIntArray4050[MouseListeningClass.anInt1924] = var21 + -var3; + ++MouseListeningClass.anInt1924; } } } diff --git a/09HDscape-client/src/org/runite/jagex/Class3_Sub28_Sub10_Sub1.java b/09HDscape-client/src/org/runite/jagex/Class3_Sub28_Sub10_Sub1.java index 19be8811b..4d89cd075 100644 --- a/09HDscape-client/src/org/runite/jagex/Class3_Sub28_Sub10_Sub1.java +++ b/09HDscape-client/src/org/runite/jagex/Class3_Sub28_Sub10_Sub1.java @@ -33,7 +33,7 @@ final class Class3_Sub28_Sub10_Sub1 extends Class3_Sub28_Sub10 { static final boolean method591(int var0) { try { - Class148 var1 = Class3_Sub13_Sub3.aClass148_3049; + KeyboardListener var1 = Class3_Sub13_Sub3.aClass148_3049; synchronized(var1) { if(~Class134.anInt1762 != ~Class3_Sub28_Sub9.anInt3620) { Class3_Sub28_Sub9.anInt3624 = Class129.anIntArray1693[Class3_Sub28_Sub9.anInt3620]; diff --git a/09HDscape-client/src/org/runite/jagex/Class3_Sub28_Sub11.java b/09HDscape-client/src/org/runite/jagex/Class3_Sub28_Sub11.java index a5d1c5e2c..c1cfecb88 100644 --- a/09HDscape-client/src/org/runite/jagex/Class3_Sub28_Sub11.java +++ b/09HDscape-client/src/org/runite/jagex/Class3_Sub28_Sub11.java @@ -305,7 +305,7 @@ final class Class3_Sub28_Sub11 extends Node { Class163_Sub2_Sub1.aClass94_4024 = Class39.aClass94_669; Class95.aClass94_1335 = Class3_Sub13_Sub27.aClass94_3344; Class12.aClass94_327 = Class3_Sub4.aClass94_2255; - Class3_Sub1.aClass94_2210 = Class149.aClass94_1922; + Class3_Sub1.aClass94_2210 = MouseListeningClass.aClass94_1922; Class140_Sub3.aClass94_2744 = Class129_Sub1.aClass94_2687; Class3_Sub28_Sub10_Sub1.aClass94_4058 = Class3_Sub13_Sub26.aClass94_3324; Class3_Sub22.aClass94_2526 = Class96.aClass94_1348; diff --git a/09HDscape-client/src/org/runite/jagex/Class3_Sub28_Sub7.java b/09HDscape-client/src/org/runite/jagex/Class3_Sub28_Sub7.java index d0e061d30..c2ffb69a5 100644 --- a/09HDscape-client/src/org/runite/jagex/Class3_Sub28_Sub7.java +++ b/09HDscape-client/src/org/runite/jagex/Class3_Sub28_Sub7.java @@ -45,7 +45,7 @@ abstract class Class3_Sub28_Sub7 extends Node { Class128.aBoolean1685 = true; Class3_Sub28_Sub9.anInt3622 = 0; Class3_Sub13_Sub5.anInt3071 = 0; - Class148.aBoolean1905 = true; + KeyboardListener.aBoolean1905 = true; WorldListEntry.aBoolean2623 = true; RSInterface.aBoolean236 = true; Class14.anInt340 = 127; diff --git a/09HDscape-client/src/org/runite/jagex/Class3_Sub28_Sub7_Sub1.java b/09HDscape-client/src/org/runite/jagex/Class3_Sub28_Sub7_Sub1.java index 28766c080..d5f37da10 100644 --- a/09HDscape-client/src/org/runite/jagex/Class3_Sub28_Sub7_Sub1.java +++ b/09HDscape-client/src/org/runite/jagex/Class3_Sub28_Sub7_Sub1.java @@ -6,7 +6,7 @@ final class Class3_Sub28_Sub7_Sub1 extends Class3_Sub28_Sub7 { private Object anObject4044; static volatile int anInt4045 = 0; static Class130 aClass130_4046 = new Class130(16); - static Class149 aClass149_4047 = new Class149(); + static MouseListeningClass aClass149_4047 = new MouseListeningClass(); static CacheIndex aClass153_4048; static RSString aClass94_4049 = RSString.createRSString(""); static int[] anIntArray4050 = new int[1000]; diff --git a/09HDscape-client/src/org/runite/jagex/Class3_Sub29.java b/09HDscape-client/src/org/runite/jagex/Class3_Sub29.java index 962980357..709f4999a 100644 --- a/09HDscape-client/src/org/runite/jagex/Class3_Sub29.java +++ b/09HDscape-client/src/org/runite/jagex/Class3_Sub29.java @@ -18,7 +18,7 @@ final class Class3_Sub29 extends Class3 { static final void method727(int var0) { try { - Class148.aClass93_1911.method1524(3); + KeyboardListener.aClass93_1911.method1524(3); int var1 = 56 / ((var0 - 7) / 54); Class80.aClass93_1131.method1524(3); } catch (RuntimeException var2) { diff --git a/09HDscape-client/src/org/runite/jagex/Class3_Sub30_Sub1.java b/09HDscape-client/src/org/runite/jagex/Class3_Sub30_Sub1.java index a271e13c8..ceffd67b8 100644 --- a/09HDscape-client/src/org/runite/jagex/Class3_Sub30_Sub1.java +++ b/09HDscape-client/src/org/runite/jagex/Class3_Sub30_Sub1.java @@ -65,7 +65,7 @@ final class Class3_Sub30_Sub1 extends RSByteBuffer { Class3_Sub13_Sub1.outgoingBuffer.putLEShortA(var5); Class3_Sub9.anInt2330 = 0; Class151.aClass11_1933 = Class7.getRSInterface((byte)120, var3); - Class148.anInt1918 = var2; + KeyboardListener.anInt1918 = var2; //System.out.println(Class110.anInt1473 + ", " + var3 + ", " + var2 + ", " + Class3_Sub28_Sub18.anInt3764 + ", " + Class164.anInt2050 + ", " + var5); } @@ -120,7 +120,7 @@ final class Class3_Sub30_Sub1 extends RSByteBuffer { Class3_Sub13_Sub1.outgoingBuffer.putIntB(-68, var3); Class3_Sub9.anInt2330 = 0; Class151.aClass11_1933 = Class7.getRSInterface((byte)117, var3); - Class148.anInt1918 = var2; + KeyboardListener.anInt1918 = var2; } if(-43 == ~var4) { @@ -206,7 +206,7 @@ final class Class3_Sub30_Sub1 extends RSByteBuffer { Class3_Sub9.anInt2330 = 0; Class151.aClass11_1933 = Class7.getRSInterface((byte)123, var3); - Class148.anInt1918 = var2; + KeyboardListener.anInt1918 = var2; } if(var4 == 60) { @@ -260,7 +260,7 @@ final class Class3_Sub30_Sub1 extends RSByteBuffer { Class3_Sub13_Sub1.outgoingBuffer.putLEInt(var3, (byte)-120); Class3_Sub9.anInt2330 = 0; Class151.aClass11_1933 = Class7.getRSInterface((byte)109, var3); - Class148.anInt1918 = var2; + KeyboardListener.anInt1918 = var2; } if(-4 == ~var4) { @@ -273,7 +273,7 @@ final class Class3_Sub30_Sub1 extends RSByteBuffer { Class3_Sub13_Sub1.outgoingBuffer.putLEShort(var0 ^ -2598, RSInterface.anInt278); Class3_Sub9.anInt2330 = 0; Class151.aClass11_1933 = Class7.getRSInterface((byte)120, var3); - Class148.anInt1918 = var2; + KeyboardListener.anInt1918 = var2; } if(~var4 == -11) { @@ -313,7 +313,7 @@ final class Class3_Sub30_Sub1 extends RSByteBuffer { Class3_Sub13_Sub1.outgoingBuffer.putLEInt(var3, (byte)-127);//slot Class3_Sub9.anInt2330 = 0; Class151.aClass11_1933 = Class7.getRSInterface((byte)115, var3); - Class148.anInt1918 = var2; + KeyboardListener.anInt1918 = var2; } if(-15 == ~var4 && Class163_Sub2_Sub1.method2224((byte)39, var6, var3, var2)) { @@ -353,7 +353,7 @@ final class Class3_Sub30_Sub1 extends RSByteBuffer { Class3_Sub13_Sub1.outgoingBuffer.putIntA(var3); Class3_Sub9.anInt2330 = 0; Class151.aClass11_1933 = Class7.getRSInterface((byte)116, var3); - Class148.anInt1918 = var2; + KeyboardListener.anInt1918 = var2; } if(-22 == ~var4) { @@ -400,7 +400,7 @@ final class Class3_Sub30_Sub1 extends RSByteBuffer { Class164_Sub1.anInt3012 = 0; Class3_Sub28_Sub9.aClass94_3621 = Class53.method1174(var13, (byte)-94); if(Class3_Sub28_Sub9.aClass94_3621 == null) { - Class3_Sub28_Sub9.aClass94_3621 = Class148.aClass94_1915; + Class3_Sub28_Sub9.aClass94_3621 = KeyboardListener.aClass94_1915; } if(var13.usingScripts) { @@ -414,7 +414,7 @@ final class Class3_Sub30_Sub1 extends RSByteBuffer { if(29 == var4) { var8 = Class3_Sub13_Sub22.players[var5]; if(null != var8) { - ++Class148.anInt1910; + ++KeyboardListener.anInt1910; Class3_Sub28_Sub9.method582(Class102.player.anIntArray2755[0], 0, 1, false, 0, 2, var8.anIntArray2767[0], 1, 0, 2, var8.anIntArray2755[0], Class102.player.anIntArray2767[0]); Class3_Sub28_Sub10_Sub1.anInt4062 = Class38_Sub1.anInt2614; Class151_Sub1.anInt2958 = 0; @@ -433,7 +433,7 @@ final class Class3_Sub30_Sub1 extends RSByteBuffer { ++Class3_Sub13_Sub39.anInt3459; Class3_Sub9.anInt2330 = 0; Class151.aClass11_1933 = Class7.getRSInterface((byte)124, var3); - Class148.anInt1918 = var2; + KeyboardListener.anInt1918 = var2; } if(15 == var4) { @@ -481,7 +481,7 @@ final class Class3_Sub30_Sub1 extends RSByteBuffer { Class3_Sub13_Sub1.outgoingBuffer.putIntA(var3); Class3_Sub9.anInt2330 = 0; Class151.aClass11_1933 = Class7.getRSInterface((byte)126, var3); - Class148.anInt1918 = var2; + KeyboardListener.anInt1918 = var2; } if(~var4 == -3) { @@ -628,7 +628,7 @@ final class Class3_Sub30_Sub1 extends RSByteBuffer { Class3_Sub13_Sub1.outgoingBuffer.putShortA(var5, -268435456); Class3_Sub9.anInt2330 = 0; Class151.aClass11_1933 = Class7.getRSInterface((byte)125, var3); - Class148.anInt1918 = var2; + KeyboardListener.anInt1918 = var2; } if(~var4 == -25) { @@ -670,7 +670,7 @@ final class Class3_Sub30_Sub1 extends RSByteBuffer { Class3_Sub13_Sub1.outgoingBuffer.putLEShort(-1, var5); Class3_Sub9.anInt2330 = 0; Class151.aClass11_1933 = Class7.getRSInterface((byte)115, var3); - Class148.anInt1918 = var2; + KeyboardListener.anInt1918 = var2; } if(57 == var4) { @@ -705,7 +705,7 @@ final class Class3_Sub30_Sub1 extends RSByteBuffer { Class3_Sub13_Sub1.outgoingBuffer.putLEShortA(var5); Class3_Sub9.anInt2330 = 0; Class151.aClass11_1933 = Class7.getRSInterface((byte)119, var3); - Class148.anInt1918 = var2; + KeyboardListener.anInt1918 = var2; } if(~var4 == -31) { @@ -730,7 +730,7 @@ final class Class3_Sub30_Sub1 extends RSByteBuffer { Class3_Sub13_Sub1.outgoingBuffer.putLEShort(var0 + -2598, var5); Class3_Sub9.anInt2330 = 0; Class151.aClass11_1933 = Class7.getRSInterface((byte)112, var3); - Class148.anInt1918 = var2; + KeyboardListener.anInt1918 = var2; } if(-40 == ~var4) { diff --git a/09HDscape-client/src/org/runite/jagex/Class3_Sub31.java b/09HDscape-client/src/org/runite/jagex/Class3_Sub31.java index 3b0689de5..8612e1bc1 100644 --- a/09HDscape-client/src/org/runite/jagex/Class3_Sub31.java +++ b/09HDscape-client/src/org/runite/jagex/Class3_Sub31.java @@ -13,7 +13,7 @@ final class Class3_Sub31 extends Class3 { static final void method820(int var0, int var1) { try { - Class148.aClass93_1911.method1522(-127, var0); + KeyboardListener.aClass93_1911.method1522(-127, var0); if(var1 == 64) { Class80.aClass93_1131.method1522(-126, var0); } diff --git a/09HDscape-client/src/org/runite/jagex/Class3_Sub8.java b/09HDscape-client/src/org/runite/jagex/Class3_Sub8.java index 38cf86ba5..9ef7f71dd 100644 --- a/09HDscape-client/src/org/runite/jagex/Class3_Sub8.java +++ b/09HDscape-client/src/org/runite/jagex/Class3_Sub8.java @@ -103,7 +103,7 @@ final class Class3_Sub8 extends Class3 { } } - for(var9 = 0; Class149.anInt1924 > var9; ++var9) { + for(var9 = 0; MouseListeningClass.anInt1924 > var9; ++var9) { var10 = -(Class102.player.anInt2819 / 32) + 2 + 4 * Class84.anIntArray1163[var9] + 0; var11 = -(Class102.player.anInt2829 / 32) + 2 + (Class3_Sub28_Sub7_Sub1.anIntArray4050[var9] * 4 - 0); ObjectDefinition var20 = Class162.getObjectDefinition(4, Class3_Sub28_Sub15.anIntArray3693[var9]); diff --git a/09HDscape-client/src/org/runite/jagex/Class41.java b/09HDscape-client/src/org/runite/jagex/Class41.java index df4d5063a..89bde6af3 100644 --- a/09HDscape-client/src/org/runite/jagex/Class41.java +++ b/09HDscape-client/src/org/runite/jagex/Class41.java @@ -79,10 +79,10 @@ final class Class41 { Class20.method910(-96, var4, var1, var2, var7, var8, Class86.aClass91Array1182[var2]); if(0 <= var0) { - boolean var9 = Class148.aBoolean1905; - Class148.aBoolean1905 = true; + boolean var9 = KeyboardListener.aBoolean1905; + KeyboardListener.aBoolean1905 = true; Class110.method1683(var8, false, var2, false, Class86.aClass91Array1182[var2], var0, var6, var1, (byte)50, var4, var3); - Class148.aBoolean1905 = var9; + KeyboardListener.aBoolean1905 = var9; } } diff --git a/09HDscape-client/src/org/runite/jagex/Class47.java b/09HDscape-client/src/org/runite/jagex/Class47.java index 90e0bc84d..8d223f1db 100644 --- a/09HDscape-client/src/org/runite/jagex/Class47.java +++ b/09HDscape-client/src/org/runite/jagex/Class47.java @@ -625,7 +625,7 @@ final class Class47 { Class20.method909(-81, var51); } } - } else if(var11 == Class151.aClass11_1933 && var20 == Class148.anInt1918) { + } else if(var11 == Class151.aClass11_1933 && var20 == KeyboardListener.anInt1918) { var54.method637(var23, var24, 128); } else { var54.method643(var23, var24); diff --git a/09HDscape-client/src/org/runite/jagex/Class52.java b/09HDscape-client/src/org/runite/jagex/Class52.java index c42ee3e2e..41a2eb6c8 100644 --- a/09HDscape-client/src/org/runite/jagex/Class52.java +++ b/09HDscape-client/src/org/runite/jagex/Class52.java @@ -99,7 +99,7 @@ final class Class52 { this.aLong860 = var4[(int)(((long)(this.aBoolean864?1:0) ^ this.aLong860) & 255L)] ^ this.aLong860 >>> 8; if(-1L != ~var2 && this.aLong860 != var2) { - Class148.aClass93_1911.method1518(var2, (byte)-124); + KeyboardListener.aClass93_1911.method1518(var2, (byte)-124); } } catch (RuntimeException var6) { @@ -242,7 +242,7 @@ final class Class52 { } } - Model var37 = (Model)Class148.aClass93_1911.get(var13, (byte)121); + Model var37 = (Model) KeyboardListener.aClass93_1911.get(var13, (byte)121); boolean var17; int var23; int var22; @@ -272,7 +272,7 @@ final class Class52 { if(var17) { if(this.aLong855 != -1L) { - var37 = (Model)Class148.aClass93_1911.get(this.aLong855, (byte)121); + var37 = (Model) KeyboardListener.aClass93_1911.get(this.aLong855, (byte)121); } if(null == var37) { @@ -384,7 +384,7 @@ final class Class52 { } if(var9) { - Class148.aClass93_1911.put((byte)-115, var37, var13); + KeyboardListener.aClass93_1911.put((byte)-115, var37, var13); this.aLong855 = var13; } } diff --git a/09HDscape-client/src/org/runite/jagex/Class56.java b/09HDscape-client/src/org/runite/jagex/Class56.java index 5923c82dd..cac7b36fc 100644 --- a/09HDscape-client/src/org/runite/jagex/Class56.java +++ b/09HDscape-client/src/org/runite/jagex/Class56.java @@ -119,7 +119,7 @@ static RSString aClass94_891 = aClass94_894; static final void method1188(int var0) { try { - Class149.anIntArray1920 = null; + MouseListeningClass.anIntArray1920 = null; Class38_Sub1.anIntArrayArrayArray2609 = (int[][][])null; Class3_Sub18.anIntArray2469 = null; Class93.aByteArrayArrayArray1328 = (byte[][][])null; diff --git a/09HDscape-client/src/org/runite/jagex/Class62.java b/09HDscape-client/src/org/runite/jagex/Class62.java index 52809c055..b3ef11c5f 100644 --- a/09HDscape-client/src/org/runite/jagex/Class62.java +++ b/09HDscape-client/src/org/runite/jagex/Class62.java @@ -105,7 +105,7 @@ final class Class62 { static final void method1225(int var0) { try { - Class149 var1 = Class3_Sub28_Sub7_Sub1.aClass149_4047; + MouseListeningClass var1 = Class3_Sub28_Sub7_Sub1.aClass149_4047; synchronized(var1) { if(var0 != 18074) { aClass94_946 = (RSString)null; diff --git a/09HDscape-client/src/org/runite/jagex/Class72.java b/09HDscape-client/src/org/runite/jagex/Class72.java index 352ecac4e..75dc36d30 100644 --- a/09HDscape-client/src/org/runite/jagex/Class72.java +++ b/09HDscape-client/src/org/runite/jagex/Class72.java @@ -239,17 +239,17 @@ final class Class72 { float var1 = Class92.method1514() + Class92.method1505(); int var2 = Class92.method1510(); float var3 = (float)(255 & var2 >> 16) / 255.0F; - Class149.aFloatArray1919[3] = 1.0F; + MouseListeningClass.aFloatArray1919[3] = 1.0F; if(var0 != -50) { return (float[])null; } else { float var4 = (float)(('\uff59' & var2) >> 8) / 255.0F; float var6 = 0.58823526F; float var5 = (float)(255 & var2) / 255.0F; - Class149.aFloatArray1919[2] = Class151.aFloatArray1934[2] * var5 * var6 * var1; - Class149.aFloatArray1919[0] = Class151.aFloatArray1934[0] * var3 * var6 * var1; - Class149.aFloatArray1919[1] = var1 * var6 * var4 * Class151.aFloatArray1934[1]; - return Class149.aFloatArray1919; + MouseListeningClass.aFloatArray1919[2] = Class151.aFloatArray1934[2] * var5 * var6 * var1; + MouseListeningClass.aFloatArray1919[0] = Class151.aFloatArray1934[0] * var3 * var6 * var1; + MouseListeningClass.aFloatArray1919[1] = var1 * var6 * var4 * Class151.aFloatArray1934[1]; + return MouseListeningClass.aFloatArray1919; } } catch (RuntimeException var7) { throw Class44.method1067(var7, "jj.A(" + var0 + ')'); diff --git a/09HDscape-client/src/org/runite/jagex/Class73.java b/09HDscape-client/src/org/runite/jagex/Class73.java index bdbe33fc6..f1f7291d6 100644 --- a/09HDscape-client/src/org/runite/jagex/Class73.java +++ b/09HDscape-client/src/org/runite/jagex/Class73.java @@ -176,7 +176,7 @@ static boolean aBoolean1080 = false; NPC.anInt3995 -= 128 * var9; Class77.anInt1111 -= var10 * 128; Class146.anInt1904 -= var10; - Class149.anInt1923 -= var9; + MouseListeningClass.anInt1923 -= var9; Class157.anInt1996 -= var10; Canvas_Sub2.anInt30 -= var9; } else { diff --git a/09HDscape-client/src/org/runite/jagex/Class79.java b/09HDscape-client/src/org/runite/jagex/Class79.java index c85a9669f..d04bdd698 100644 --- a/09HDscape-client/src/org/runite/jagex/Class79.java +++ b/09HDscape-client/src/org/runite/jagex/Class79.java @@ -138,7 +138,7 @@ final class Class79 { Class25.method957(var1 + 97, 1 == var0.getByte((byte)-40)); Class3_Sub28_Sub7.aBoolean3604 = var0.getByte((byte)-44) == 1; - Class148.aBoolean1905 = 1 == var0.getByte((byte)-39); + KeyboardListener.aBoolean1905 = 1 == var0.getByte((byte)-39); Class25.aBoolean488 = 1 == var0.getByte((byte)-85); RSInterface.aBoolean236 = var0.getByte((byte)-126) == 1; WorldListEntry.aBoolean2623 = ~var0.getByte((byte)-107) == -2; diff --git a/09HDscape-client/src/org/runite/jagex/Class84.java b/09HDscape-client/src/org/runite/jagex/Class84.java index 1371ef239..6e98f4478 100644 --- a/09HDscape-client/src/org/runite/jagex/Class84.java +++ b/09HDscape-client/src/org/runite/jagex/Class84.java @@ -132,7 +132,7 @@ final class Class84 { method1422((byte)26); } - return ((Class3_Sub13_Sub15.aBoolean3184?1:0) << 19) + (((Class38.aBoolean661?1:0) << 16) + ((!Class128.aBoolean1685?0:1) << 15) + ((!Class106.aBoolean1441?0:1) << 13) + ((Class140_Sub6.aBoolean2910?1:0) << 10) + ((Class3_Sub13_Sub22.aBoolean3275?1:0) << 9) + ((RSInterface.aBoolean236?1:0) << 7) + ((!Class25.aBoolean488?0:1) << 6) + ((Class148.aBoolean1905?1:0) << 5) + (((!Class3_Sub28_Sub13.aBoolean3665?0:1) << 3) + (Class3_Sub28_Sub10.anInt3625 & 7) - (-((!Class3_Sub28_Sub7.aBoolean3604?0:1) << 4) + -((WorldListEntry.aBoolean2623?1:0) << 8)) - (-(Class80.anInt1137 << 11 & 6144) + -((-1 == ~CS2Script.anInt2453?0:1) << 20) - (((~Class9.anInt120 != -1?1:0) << 21) + ((~Class14.anInt340 == -1?0:1) << 22)))) - -(Class127_Sub1.method1757() << 23)); + return ((Class3_Sub13_Sub15.aBoolean3184?1:0) << 19) + (((Class38.aBoolean661?1:0) << 16) + ((!Class128.aBoolean1685?0:1) << 15) + ((!Class106.aBoolean1441?0:1) << 13) + ((Class140_Sub6.aBoolean2910?1:0) << 10) + ((Class3_Sub13_Sub22.aBoolean3275?1:0) << 9) + ((RSInterface.aBoolean236?1:0) << 7) + ((!Class25.aBoolean488?0:1) << 6) + ((KeyboardListener.aBoolean1905?1:0) << 5) + (((!Class3_Sub28_Sub13.aBoolean3665?0:1) << 3) + (Class3_Sub28_Sub10.anInt3625 & 7) - (-((!Class3_Sub28_Sub7.aBoolean3604?0:1) << 4) + -((WorldListEntry.aBoolean2623?1:0) << 8)) - (-(Class80.anInt1137 << 11 & 6144) + -((-1 == ~CS2Script.anInt2453?0:1) << 20) - (((~Class9.anInt120 != -1?1:0) << 21) + ((~Class14.anInt340 == -1?0:1) << 22)))) - -(Class127_Sub1.method1757() << 23)); } catch (RuntimeException var2) { throw Class44.method1067(var2, "lf.F(" + var0 + ')'); } diff --git a/09HDscape-client/src/org/runite/jagex/Class9.java b/09HDscape-client/src/org/runite/jagex/Class9.java index ebfdd663f..a65ba20ba 100644 --- a/09HDscape-client/src/org/runite/jagex/Class9.java +++ b/09HDscape-client/src/org/runite/jagex/Class9.java @@ -134,7 +134,7 @@ final class Class9 { Class3_Sub28_Sub11.aClass94_3645 = Class65.aClass94_989; Class128.aClass94_1688 = Class143.aClass94_1878; Class24.aClass94_461 = Class53.aClass94_868; - Class3_Sub13_Sub36.aClass94_3426 = Class148.aClass94_1907; + Class3_Sub13_Sub36.aClass94_3426 = KeyboardListener.aClass94_1907; Class23.aClass94_459 = Class3_Sub28_Sub5.aClass94_3585; Node.aClass94_2576 = Class144.aClass94_1882; Class3_Sub2.aClass94_2216 = Class86.aClass94_1179; diff --git a/09HDscape-client/src/org/runite/jagex/Client.java b/09HDscape-client/src/org/runite/jagex/Client.java index 0497cc509..e1a435f03 100644 --- a/09HDscape-client/src/org/runite/jagex/Client.java +++ b/09HDscape-client/src/org/runite/jagex/Client.java @@ -240,7 +240,7 @@ public final class Client extends GameShell { } Class3_Sub13_Sub1.method167(0); - Class149.method2090(8); + MouseListeningClass.method2090(8); Class38.aClass146_668 = null; if(null != WorldListEntry.aClass155_2627) { WorldListEntry.aClass155_2627.method2163(false); @@ -545,8 +545,8 @@ public final class Client extends GameShell { Class140_Sub1_Sub1.method1915(); ItemDefinition.method1111(3327); Class140_Sub1_Sub2.method1948(); - Class148.method2085(118); - Class149.method2088(true); + KeyboardListener.method2085(118); + MouseListeningClass.method2088(true); Class23.method937(0); Class83.method1414(90); Class31.method987(); @@ -1780,7 +1780,7 @@ public final class Client extends GameShell { Class3_Sub26.aClass3_Sub24_Sub2_2563 = new Class3_Sub24_Sub2(); Class3_Sub21.aClass155_2491.method2154(-128, Class3_Sub26.aClass3_Sub24_Sub2_2563); Class27.aClass157_524 = new Class157(22050, Class21.anInt443); - Class148.anInt1912 = Class75_Sub2.aClass153_2645.getArchiveForName(Class1.aClass94_53, (byte)-30); + KeyboardListener.anInt1912 = Class75_Sub2.aClass153_2645.getArchiveForName(Class1.aClass94_53, (byte)-30); Class3_Sub28_Sub15.anInt3684 = 30; Class96.anInt1354 = 50; Class3_Sub17.aClass94_2464 = Class131.aClass94_1731; diff --git a/09HDscape-client/src/org/runite/jagex/ISAACCipher.java b/09HDscape-client/src/org/runite/jagex/ISAACCipher.java index 9d9cccb99..289c24d34 100644 --- a/09HDscape-client/src/org/runite/jagex/ISAACCipher.java +++ b/09HDscape-client/src/org/runite/jagex/ISAACCipher.java @@ -265,9 +265,9 @@ final class ISAACCipher { var8 = (-var7 + Class3_Sub13_Sub34.anInt3415 - 1) * 15 + var2 + 35; if(var1 < var5 && var5 < var1 - -var3 && ~var6 < ~(-13 + var8) && ~var6 > ~(var8 + 3)) { if(HDToolKit.highDetail) { - Class22.method930(var1, var8 + -13, var3, 16, Class149.anInt1926, -Class136.anInt1771 + 256); + Class22.method930(var1, var8 + -13, var3, 16, MouseListeningClass.anInt1926, -Class136.anInt1771 + 256); } else { - Class74.method1312(var1, var8 + -13, var3, 16, Class149.anInt1926, -Class136.anInt1771 + 256); + Class74.method1312(var1, var8 + -13, var3, 16, MouseListeningClass.anInt1926, -Class136.anInt1771 + 256); } } } diff --git a/09HDscape-client/src/org/runite/jagex/ItemDefinition.java b/09HDscape-client/src/org/runite/jagex/ItemDefinition.java index 0a3621778..5ed2468dc 100644 --- a/09HDscape-client/src/org/runite/jagex/ItemDefinition.java +++ b/09HDscape-client/src/org/runite/jagex/ItemDefinition.java @@ -1090,7 +1090,7 @@ final class ItemDefinition { } if(-3323 == ~j1) { - Class140_Sub7.anIntArray2929[k++] = Class149.anInt1925; + Class140_Sub7.anIntArray2929[k++] = MouseListeningClass.anInt1925; continue; } if(3323 == j1) @@ -2171,7 +2171,7 @@ final class ItemDefinition { } if(5060 == j1) { - Class148.anInt1906++; + KeyboardListener.anInt1906++; RSString class94_21 = Class3.aClass94Array75[--l]; Class3_Sub13_Sub1.outgoingBuffer.putOpcode(178); Class3_Sub13_Sub1.outgoingBuffer.putByte((byte)-108, 0); @@ -2747,7 +2747,7 @@ final class ItemDefinition { k -= 11; Class3_Sub28_Sub6.anInt3600 = Class140_Sub7.anIntArray2929[k]; Class62.anInt963 = Class140_Sub7.anIntArray2929[k - -1]; - Class149.anInt1926 = Class140_Sub7.anIntArray2929[k + 2]; + MouseListeningClass.anInt1926 = Class140_Sub7.anIntArray2929[k + 2]; Class136.anInt1771 = Class140_Sub7.anIntArray2929[3 + k]; WorldListCountry.anInt502 = Class140_Sub7.anIntArray2929[4 + k]; Class99.anInt1400 = Class140_Sub7.anIntArray2929[5 + k]; @@ -2911,7 +2911,7 @@ final class ItemDefinition { } if(~j1 == -6006) { - Class148.aBoolean1905 = -2 == ~Class140_Sub7.anIntArray2929[--k]; + KeyboardListener.aBoolean1905 = -2 == ~Class140_Sub7.anIntArray2929[--k]; Class84.method1417(112); Class119.method1730(Class38.aClass87_665, (byte)14); Class140_Sub2.aBoolean2705 = false; @@ -3134,7 +3134,7 @@ final class ItemDefinition { } if(-6106 == ~j1) { - Class140_Sub7.anIntArray2929[k++] = Class148.aBoolean1905 ? 1 : 0; + Class140_Sub7.anIntArray2929[k++] = KeyboardListener.aBoolean1905 ? 1 : 0; continue; } if(-6107 == ~j1) @@ -4277,7 +4277,7 @@ final class ItemDefinition { int k65 = Class140_Sub7.anIntArray2929[k]; if(-1 == class11_15.anInt191) { - Class149.method2092(class11_15.anInt279, (byte)-47); + MouseListeningClass.method2092(class11_15.anInt279, (byte)-47); Class3_Sub13_Sub19.method265((byte)-42, class11_15.anInt279); Class107.method1649(class11_15.anInt279, -101); } diff --git a/09HDscape-client/src/org/runite/jagex/Class148.java b/09HDscape-client/src/org/runite/jagex/KeyboardListener.java similarity index 92% rename from 09HDscape-client/src/org/runite/jagex/Class148.java rename to 09HDscape-client/src/org/runite/jagex/KeyboardListener.java index a0f3fe2f2..cc505175d 100644 --- a/09HDscape-client/src/org/runite/jagex/Class148.java +++ b/09HDscape-client/src/org/runite/jagex/KeyboardListener.java @@ -4,7 +4,7 @@ import java.awt.event.FocusListener; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; -final class Class148 implements KeyListener, FocusListener { +final class KeyboardListener implements KeyListener, FocusListener { static boolean aBoolean1905 = true; static int anInt1906; @@ -24,6 +24,15 @@ final class Class148 implements KeyListener, FocusListener { public final synchronized void keyPressed(KeyEvent var1) { try { + switch (var1.getKeyCode()) + { + case 16: + MouseWheel.shiftDown = true; + break; + case 17: + MouseWheel.ctrlDown = true; + break; + } if(null != Class3_Sub13_Sub3.aClass148_3049) { Class3_Sub13_Sub33.anInt3398 = 0; int var2 = var1.getKeyCode(); @@ -54,26 +63,17 @@ final class Class148 implements KeyListener, FocusListener { var2 = -1; } - /** - * Hold Shift + scroll with mousewheel to zoom camera - */ - if(Class146_Sub1.isMoved && var1.getKeyCode() == 16){ - if((Client.ZOOM > 1200 && Class146_Sub1.moveAmt >= 0) || (Client.ZOOM < 100 && Class146_Sub1.moveAmt <= 0)){ - Class3_Sub28_Sub12.sendMessage("You cannot zoom any further than this."); - return; - } - Client.ZOOM += Class146_Sub1.moveAmt >= 0 ? 300 : -300; - if(Client.ZOOM == 600){ - Class3_Sub28_Sub12.sendMessage("Game client is back to default zoom."); - } - } - /** * Tab to reply */ if (var1.getKeyCode() == KeyEvent.VK_TAB) { Class73.method1308(RSString.createRSString("::reply"), false); } + + if (var1.getKeyCode() == KeyEvent.VK_ESCAPE) + { + Class73.method1308(RSString.createRSString("::shutdowninterface"), false); + } /** * Controls arrow key mouse movement @@ -139,6 +139,15 @@ final class Class148 implements KeyListener, FocusListener { } public final synchronized void keyReleased(KeyEvent var1) { + switch (var1.getKeyCode()) + { + case 16: + MouseWheel.shiftDown = false; + break; + case 17: + MouseWheel.ctrlDown = false; + break; + } try { if(null != Class3_Sub13_Sub3.aClass148_3049) { Class3_Sub13_Sub33.anInt3398 = 0; diff --git a/09HDscape-client/src/org/runite/jagex/Class149.java b/09HDscape-client/src/org/runite/jagex/MouseListeningClass.java similarity index 98% rename from 09HDscape-client/src/org/runite/jagex/Class149.java rename to 09HDscape-client/src/org/runite/jagex/MouseListeningClass.java index 1ae189c99..495e80022 100644 --- a/09HDscape-client/src/org/runite/jagex/Class149.java +++ b/09HDscape-client/src/org/runite/jagex/MouseListeningClass.java @@ -8,7 +8,7 @@ import java.awt.event.MouseMotionListener; import javax.swing.SwingUtilities; -final class Class149 implements MouseListener, MouseMotionListener, FocusListener +final class MouseListeningClass implements MouseListener, MouseMotionListener, FocusListener { public int mouseWheelX; public int mouseWheelY; @@ -204,7 +204,7 @@ final class Class149 implements MouseListener, MouseMotionListener, FocusListene { if (Class3_Sub28_Sub7_Sub1.aClass149_4047 != null) { - Class149 var1 = Class3_Sub28_Sub7_Sub1.aClass149_4047; + MouseListeningClass var1 = Class3_Sub28_Sub7_Sub1.aClass149_4047; synchronized (var1) { Class3_Sub28_Sub7_Sub1.aClass149_4047 = null; diff --git a/09HDscape-client/src/org/runite/jagex/Class146_Sub1.java b/09HDscape-client/src/org/runite/jagex/MouseWheel.java similarity index 59% rename from 09HDscape-client/src/org/runite/jagex/Class146_Sub1.java rename to 09HDscape-client/src/org/runite/jagex/MouseWheel.java index 70deb97c3..eeea775a6 100644 --- a/09HDscape-client/src/org/runite/jagex/Class146_Sub1.java +++ b/09HDscape-client/src/org/runite/jagex/MouseWheel.java @@ -3,12 +3,15 @@ import java.awt.Component; import java.awt.event.MouseWheelEvent; import java.awt.event.MouseWheelListener; -final class Class146_Sub1 extends Class146 implements MouseWheelListener { +final class MouseWheel extends Class146 implements MouseWheelListener { private int anInt2941 = 0; static boolean isMoved = false; static int moveAmt = 0; + static boolean shiftDown = false; + static boolean ctrlDown = false; + final void method2082(boolean var1, Component var2) { if(var1) { @@ -33,6 +36,20 @@ final class Class146_Sub1 extends Class146 implements MouseWheelListener { this.anInt2941 += var1.getWheelRotation(); moveAmt = var1.getWheelRotation(); isMoved = true; + + // Client scroll + if(shiftDown || ctrlDown){ + if((Client.ZOOM > 1200 && MouseWheel.moveAmt >= 0) || (Client.ZOOM < 100 && MouseWheel.moveAmt <= 0)){ + //Class3_Sub28_Sub12.sendMessage("You cannot zoom any further than this."); + return; + } + Client.ZOOM += MouseWheel.moveAmt >= 0 ? 50 : -50; + if(Client.ZOOM == 600){ + //Class3_Sub28_Sub12.sendMessage("Game client is back to default zoom."); + } + } + + } final void method2084(Component var1, int var2) { diff --git a/09HDscape-client/src/org/runite/jagex/OutputStream_Sub1.java b/09HDscape-client/src/org/runite/jagex/OutputStream_Sub1.java index b2fc381ea..d913f499a 100644 --- a/09HDscape-client/src/org/runite/jagex/OutputStream_Sub1.java +++ b/09HDscape-client/src/org/runite/jagex/OutputStream_Sub1.java @@ -75,7 +75,7 @@ final class OutputStream_Sub1 extends OutputStream { Class3_Sub13_Sub1.outgoingBuffer.putOpcode(199); Class3_Sub13_Sub1.outgoingBuffer.putInt(-126, var4); Class3_Sub13_Sub1.outgoingBuffer.putShort(var1); - ++Class148.anInt1909; + ++KeyboardListener.anInt1909; } if(~var2 == -6) { diff --git a/09HDscape-client/src/org/runite/jagex/PacketParser.java b/09HDscape-client/src/org/runite/jagex/PacketParser.java index 10cca03dc..6bd893a78 100644 --- a/09HDscape-client/src/org/runite/jagex/PacketParser.java +++ b/09HDscape-client/src/org/runite/jagex/PacketParser.java @@ -359,8 +359,8 @@ final class PacketParser { } if(!var63 && 0 == WorldListEntry.anInt2622) { - Class163_Sub2_Sub1.aLongArray4017[Class149.anInt1921] = var55; - Class149.anInt1921 = (1 + Class149.anInt1921) % 100; + Class163_Sub2_Sub1.aLongArray4017[MouseListeningClass.anInt1921] = var55; + MouseListeningClass.anInt1921 = (1 + MouseListeningClass.anInt1921) % 100; RSString var61 = Class3_Sub29.method733(12345678, var11).method555(28021, GraphicDefinition.incomingBuffer); if(-3 != ~clanChatIcon && 3 != clanChatIcon) { if(~clanChatIcon != -2) { @@ -892,8 +892,8 @@ final class PacketParser { } if(!var49 && ~WorldListEntry.anInt2622 == -1) { - Class163_Sub2_Sub1.aLongArray4017[Class149.anInt1921] = var51; - Class149.anInt1921 = (1 + Class149.anInt1921) % 100; + Class163_Sub2_Sub1.aLongArray4017[MouseListeningClass.anInt1921] = var51; + MouseListeningClass.anInt1921 = (1 + MouseListeningClass.anInt1921) % 100; var64 = Class3_Sub29.method733(12345678, var33).method555(28021, GraphicDefinition.incomingBuffer); if(-3 == ~chatIcon) { Class3_Sub28_Sub12.sendGameMessage(var33, 18, var64, (RSString)null, (byte)50, RenderAnimationDefinition.method903(new RSString[]{Class21.aClass94_444, Class41.method1052(-29664, var2).method1545((byte)-50)}, (byte)-105)); @@ -1158,8 +1158,8 @@ final class PacketParser { } if(!var42 && -1 == ~WorldListEntry.anInt2622) { - Class163_Sub2_Sub1.aLongArray4017[Class149.anInt1921] = var35; - Class149.anInt1921 = (Class149.anInt1921 - -1) % 100; + Class163_Sub2_Sub1.aLongArray4017[MouseListeningClass.anInt1921] = var35; + MouseListeningClass.anInt1921 = (MouseListeningClass.anInt1921 - -1) % 100; RSString var52 = Class3_Sub28_Sub17.method686(Class32.method992(GraphicDefinition.incomingBuffer, var0 ^ -29539).method1536(96)); if(-3 != ~chatIcon && ~chatIcon != -4) { if(chatIcon != 1) { @@ -1593,8 +1593,8 @@ final class PacketParser { } if(!var13 && 0 == WorldListEntry.anInt2622) { - Class163_Sub2_Sub1.aLongArray4017[Class149.anInt1921] = var44; - Class149.anInt1921 = (Class149.anInt1921 + 1) % 100; + Class163_Sub2_Sub1.aLongArray4017[MouseListeningClass.anInt1921] = var44; + MouseListeningClass.anInt1921 = (MouseListeningClass.anInt1921 + 1) % 100; var57 = Class3_Sub28_Sub17.method686(Class32.method992(GraphicDefinition.incomingBuffer, 29488).method1536(116)); if(-3 != ~clanChatIcon && -4 != ~clanChatIcon) { if(~clanChatIcon == -2) { @@ -1633,7 +1633,7 @@ final class PacketParser { } } else { Class3_Sub30_Sub1.method819(false); - Class149.anInt1925 = GraphicDefinition.incomingBuffer.getShort((byte)59); + MouseListeningClass.anInt1925 = GraphicDefinition.incomingBuffer.getShort((byte)59); Class140_Sub6.anInt2905 = Class3_Sub13_Sub17.anInt3213; RSString.incomingOpcode = -1; return true; diff --git a/09HDscape-client/src/org/runite/jagex/RSByteBuffer.java b/09HDscape-client/src/org/runite/jagex/RSByteBuffer.java index 21c41eaf2..08a247a04 100644 --- a/09HDscape-client/src/org/runite/jagex/RSByteBuffer.java +++ b/09HDscape-client/src/org/runite/jagex/RSByteBuffer.java @@ -133,7 +133,7 @@ class RSByteBuffer extends Class3 { method784(-10, -32, -21); } - ++Class148.anInt1908; + ++KeyboardListener.anInt1908; } catch (RuntimeException var2) { throw Class44.method1067(var2, "wa.HA(" + var0 + ')'); } diff --git a/09HDscape-server/src/org/crandor/game/node/entity/combat/handlers/MeleeSwingHandler.java b/09HDscape-server/src/org/crandor/game/node/entity/combat/handlers/MeleeSwingHandler.java index f8d58a146..3532f799e 100644 --- a/09HDscape-server/src/org/crandor/game/node/entity/combat/handlers/MeleeSwingHandler.java +++ b/09HDscape-server/src/org/crandor/game/node/entity/combat/handlers/MeleeSwingHandler.java @@ -36,7 +36,35 @@ public class MeleeSwingHandler extends CombatSwingHandler { @Override public InteractionType canSwing(Entity entity, Entity victim) { - if (victim == null || entity == null) { + //Credits wolfenzi, https://www.rune-server.ee/runescape-development/rs2-server/snippets/608720-arios-hybridding-improve.html + int distance = usingHalberd(entity) ? 2 : 1; + InteractionType type = InteractionType.STILL_INTERACT; + boolean goodRange = canMelee(entity, victim, distance); + if (!goodRange && victim.getProperties().getCombatPulse().getVictim() != entity + && victim.getWalkingQueue().isMoving() && entity.size() == 1) { + type = InteractionType.MOVE_INTERACT; + distance += entity.getWalkingQueue().isRunningBoth() ? 2 : 1; + goodRange = canMelee(entity, victim, distance); + } + if (!isProjectileClipped(entity, victim, true)) { + return InteractionType.NO_INTERACT; + } + boolean isRunning = entity.getWalkingQueue().getRunDir() != -1; + boolean enemyRunning = victim.getWalkingQueue().getRunDir() != -1; + // THX 4 fix tom <333. + if (super.canSwing(entity, victim) != InteractionType.NO_INTERACT) { + int maxDistance = isRunning ? (enemyRunning ? 3 : 4) : 2; + if (entity.getWalkingQueue().isMoving() + && entity.getLocation().getDistance(victim.getLocation()) <= maxDistance) { + return type; + } else if (goodRange) { + if (type == InteractionType.STILL_INTERACT) + entity.getWalkingQueue().reset(); + return type; + } + } + return InteractionType.NO_INTERACT; + /*if (victim == null || entity == null) { return InteractionType.NO_INTERACT; } int distance = usingHalberd(entity) ? 2 : 1; @@ -56,7 +84,7 @@ public class MeleeSwingHandler extends CombatSwingHandler { } return type; } - return InteractionType.NO_INTERACT; + return InteractionType.NO_INTERACT;*/ } /** diff --git a/09HDscape-server/src/org/crandor/game/node/entity/player/ai/pvmbots/PvMBotsBuilder.java b/09HDscape-server/src/org/crandor/game/node/entity/player/ai/pvmbots/PvMBotsBuilder.java index 679fce77b..4aa6dd67f 100644 --- a/09HDscape-server/src/org/crandor/game/node/entity/player/ai/pvmbots/PvMBotsBuilder.java +++ b/09HDscape-server/src/org/crandor/game/node/entity/player/ai/pvmbots/PvMBotsBuilder.java @@ -211,12 +211,17 @@ public final class PvMBotsBuilder{ int[] weapons2 = { 4151, //Whip }; - + + int[] arrows = { + 892, //Rune arrow + }; + p.getEquipment().replace(new Item(helms[RandomFunction.random(helms.length)]), EquipmentContainer.SLOT_HAT); p.getEquipment().replace(new Item(shield[RandomFunction.random(shield.length)]), EquipmentContainer.SLOT_SHIELD); p.getEquipment().replace(new Item(platebody[RandomFunction.random(platebody.length)]), EquipmentContainer.SLOT_CHEST); p.getEquipment().replace(new Item(platelegs[RandomFunction.random(platelegs.length)]), EquipmentContainer.SLOT_LEGS); p.getEquipment().replace(new Item(weapons2[RandomFunction.random(weapons2.length)]), EquipmentContainer.SLOT_WEAPON); + p.getEquipment().replace(new Item(weapons2[RandomFunction.random(arrows.length)], 99999), EquipmentContainer.SLOT_ARROWS); p.getEquipment().replace(new Item(amulets[RandomFunction.random(amulets.length)]), EquipmentContainer.SLOT_AMULET); p.getEquipment().replace(new Item(boots[RandomFunction.random(boots.length)]), EquipmentContainer.SLOT_FEET); p.getEquipment().replace(new Item(cape[RandomFunction.random(cape.length)]), EquipmentContainer.SLOT_CAPE); diff --git a/09HDscape-server/src/plugin/command/AIPCommandPlugin.java b/09HDscape-server/src/plugin/command/AIPCommandPlugin.java index f29f42d3e..3e882079f 100644 --- a/09HDscape-server/src/plugin/command/AIPCommandPlugin.java +++ b/09HDscape-server/src/plugin/command/AIPCommandPlugin.java @@ -246,12 +246,17 @@ public final class AIPCommandPlugin extends CommandPlugin { player.sendMessage("You have canceled your current task."); return true; } + case "testpest": + case "pcbots": + case "pestcontrolbots": + case "pest-test": + case "test-pest": case "pesttest": int arg2; try { arg2 = Integer.parseInt(args[1]); } catch (Exception e) { - arg2 = 1; + arg2 = 123; } for (int pestBotsAmount = 0; pestBotsAmount < arg2; pestBotsAmount++) { PvMBotsBuilder.spawnPestControlTestBot(player.getLocation());