diff --git a/client/src/main/java/rt4/Cheat.java b/client/src/main/java/rt4/Cheat.java index 045dda7..ab9d8a5 100644 --- a/client/src/main/java/rt4/Cheat.java +++ b/client/src/main/java/rt4/Cheat.java @@ -12,29 +12,29 @@ public class Cheat { @OriginalMember(owner = "client!dg", name = "b", descriptor = "Lclient!na;") public static final JagString aClass100_333 = JagString.parse("Shift)2click ENABLED(Q"); @OriginalMember(owner = "client!nh", name = "hb", descriptor = "Lclient!na;") - public static final JagString aClass100_623 = JagString.parse("::fps "); + public static final JagString COMMAND_FPS = JagString.parse("::fps "); @OriginalMember(owner = "client!nb", name = "e", descriptor = "Lclient!na;") - public static final JagString aClass100_775 = JagString.parse("::breakcon"); + public static final JagString BREAKCON = JagString.parse("::breakcon"); @OriginalMember(owner = "client!wf", name = "s", descriptor = "Lclient!na;") public static final JagString aClass100_943 = JagString.parse("Forced tweening disabled)3"); @OriginalMember(owner = "client!wd", name = "f", descriptor = "Lclient!na;") - public static final JagString aClass100_990 = JagString.parse("::errortest"); + public static final JagString ERROR_TEST = JagString.parse("::errortest"); @OriginalMember(owner = "client!wb", name = "j", descriptor = "Lclient!na;") public static final JagString aClass100_1093 = JagString.parse("Memory after cleanup="); @OriginalMember(owner = "client!th", name = "h", descriptor = "Lclient!na;") - public static final JagString aClass100_1088 = JagString.parse("::setparticles"); + public static final JagString PARTICLES = JagString.parse("::setparticles"); @OriginalMember(owner = "client!rc", name = "K", descriptor = "Lclient!na;") - public static final JagString aClass100_232 = JagString.parse("::rect_debug"); + public static final JagString RECT_DEBUG = JagString.parse("::rect_debug"); @OriginalMember(owner = "client!hh", name = "b", descriptor = "Lclient!na;") public static final JagString aClass100_521 = JagString.parse("::tele "); @OriginalMember(owner = "client!hh", name = "k", descriptor = "Lclient!na;") - public static final JagString aClass100_522 = JagString.parse("::wm0"); + public static final JagString WM0 = JagString.parse("::wm0"); @OriginalMember(owner = "client!tg", name = "i", descriptor = "Lclient!na;") - public static final JagString aClass100_1009 = JagString.parse("::pcachesize"); + public static final JagString PCACHESIZE = JagString.parse("::pcachesize"); @OriginalMember(owner = "client!fh", name = "ab", descriptor = "Lclient!na;") - public static final JagString aClass100_443 = JagString.parse("::noclip"); + public static final JagString NOCLIP = JagString.parse("::noclip"); @OriginalMember(owner = "client!en", name = "e", descriptor = "Lclient!na;") - public static final JagString aClass100_422 = JagString.parse("::fpsoff"); + public static final JagString FPSOFF = JagString.parse("::fpsoff"); @OriginalMember(owner = "client!ja", name = "k", descriptor = "Lclient!na;") public static final JagString DEBUG_FPS = JagString.parse("FPS: "); @OriginalMember(owner = "client!qh", name = "i", descriptor = "Lclient!na;") @@ -51,10 +51,34 @@ public class Cheat { public static final JagString DEBUG_MEM_UNIT = JagString.parse(" MB"); @OriginalMember(owner = "client!q", name = "h", descriptor = "Lclient!na;") public static final JagString DEBUG_CARD = JagString.parse("GPU: "); + @OriginalMember(owner = "client!oi", name = "b", descriptor = "Lclient!na;") + public static final JagString QA_OP_TEST = JagString.parse("::qa_op_test"); + @OriginalMember(owner = "client!jk", name = "F", descriptor = "Lclient!na;") + public static final JagString TWEENING = JagString.parse("::tween"); + @OriginalMember(owner = "client!j", name = "z", descriptor = "Lclient!na;") + public static final JagString SHIFTCLICK = JagString.parse("::shiftclick"); + @OriginalMember(owner = "client!qf", name = "N", descriptor = "Lclient!na;") + public static final JagString CARDMEM = JagString.parse("::cardmem"); + @OriginalMember(owner = "client!e", name = "Ac", descriptor = "Lclient!na;") + public static final JagString aClass100_362 = JagString.parse("Forced tweening ENABLED(Q"); + @OriginalMember(owner = "client!md", name = "T", descriptor = "Lclient!na;") + public static final JagString aClass100_736 = JagString.parse("Shift)2click disabled)3"); + @OriginalMember(owner = "client!wh", name = "o", descriptor = "Lclient!na;") + public static final JagString RECT_DEBUG_EQUALS = JagString.parse("rect_debug="); + @OriginalMember(owner = "client!dh", name = "e", descriptor = "Lclient!na;") + public static final JagString aClass100_335 = JagString.parse("Number of player models in cache:"); + @OriginalMember(owner = "client!qh", name = "c", descriptor = "Lclient!na;") + public static final JagString aClass100_893 = JagString.parse("Memory before cleanup="); + @OriginalMember(owner = "client!qg", name = "Z", descriptor = "Lclient!na;") + public static final JagString aClass100_892 = JagString.parse("mem="); + @OriginalMember(owner = "client!gg", name = "Y", descriptor = "Lclient!na;") + public static final JagString aClass100_476 = JagString.parse("::gc"); @OriginalMember(owner = "client!dg", name = "f", descriptor = "Z") public static boolean displayFps = false; @OriginalMember(owner = "client!nj", name = "a", descriptor = "Z") public static boolean shiftClick = GlobalConfig.USE_SHIFT_CLICK; + @OriginalMember(owner = "client!qc", name = "U", descriptor = "I") + public static int rectDebug = 0; @OriginalMember(owner = "client!en", name = "a", descriptor = "(IIIB)V") public static void teleport(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { @@ -69,24 +93,24 @@ public class Cheat { @Pc(18) int local18; @Pc(38) int local38; @Pc(29) Runtime local29; - if (arg0.equalsIgnoreCase(Static81.aClass100_476)) { + if (arg0.equalsIgnoreCase(aClass100_476)) { client.method2380(); for (local18 = 0; local18 < 10; local18++) { System.gc(); } local29 = Runtime.getRuntime(); local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L); - Chat.add(null, 0, JagString.concatenate(new JagString[] { Static202.aClass100_892, Static123.parseInt(local38), DEBUG_MEM_UNIT})); + Chat.add(null, 0, JagString.concatenate(new JagString[] { aClass100_892, Static123.parseInt(local38), DEBUG_MEM_UNIT})); } @Pc(117) int local117; - if (arg0.equalsIgnoreCase(Static154.aClass100_735)) { + if (arg0.equalsIgnoreCase(Static154.MM)) { client.method2380(); for (local18 = 0; local18 < 10; local18++) { System.gc(); } local29 = Runtime.getRuntime(); local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L); - Chat.add(null, 0, JagString.concatenate(new JagString[] { Static203.aClass100_893, Static123.parseInt(local38), DEBUG_MEM_UNIT})); + Chat.add(null, 0, JagString.concatenate(new JagString[] { aClass100_893, Static123.parseInt(local38), DEBUG_MEM_UNIT})); Static16.method501(); client.method2380(); for (local117 = 0; local117 < 10; local117++) { @@ -95,53 +119,53 @@ public class Cheat { local38 = (int) ((local29.totalMemory() - local29.freeMemory()) / 1024L); Chat.add(null, 0, JagString.concatenate(new JagString[] {aClass100_1093, Static123.parseInt(local38), DEBUG_MEM_UNIT})); } - if (arg0.equalsIgnoreCase(aClass100_1009)) { - Chat.add(null, 0, JagString.concatenate(new JagString[] { Static44.aClass100_335, Static123.parseInt(Static198.method1029()) })); + if (arg0.equalsIgnoreCase(PCACHESIZE)) { + Chat.add(null, 0, JagString.concatenate(new JagString[] { aClass100_335, Static123.parseInt(Static198.method1029()) })); } - if (GlRenderer.enabled && arg0.equalsIgnoreCase(Static201.aClass100_406)) { - System.out.println("oncard_geometry:" + GlCleaner.anInt1945); + if (GlRenderer.enabled && arg0.equalsIgnoreCase(CARDMEM)) { + System.out.println("oncard_geometry:" + GlCleaner.onCardGeometry); System.out.println("oncard_2d:" + GlCleaner.onCard2d); System.out.println("oncard_texture:" + GlCleaner.onCardTexture); } if (arg0.equalsIgnoreCase(CLIENTDROP)) { Static175.method3279(); } - if (arg0.equalsIgnoreCase(Static279.aClass100_1106)) { + if (arg0.equalsIgnoreCase(Static279.JS5DROP)) { client.js5NetQueue.quit(); } if (arg0.equalsIgnoreCase(JS5DROP)) { client.js5NetQueue.method2319(); } - if (arg0.equalsIgnoreCase(aClass100_775)) { + if (arg0.equalsIgnoreCase(BREAKCON)) { GameShell.signLink.breakConnection(); Protocol.socket.breakConnection(); client.js5NetQueue.method2323(); } - if (arg0.equalsIgnoreCase(Static114.aClass100_1100)) { + if (arg0.equalsIgnoreCase(Static114.REPLACECANVAS)) { GameShell.replaceCanvas = true; } - if (arg0.equalsIgnoreCase(Static148.aClass100_677)) { + if (arg0.equalsIgnoreCase(Static148.REBUILD)) { client.setGameState(25); } - if (arg0.equalsIgnoreCase(Static107.aClass100_566)) { + if (arg0.equalsIgnoreCase(Static107.FPSON)) { displayFps = true; } - if (arg0.equalsIgnoreCase(aClass100_422)) { + if (arg0.equalsIgnoreCase(FPSOFF)) { displayFps = false; } - if (arg0.equalsIgnoreCase(aClass100_522)) { + if (arg0.equalsIgnoreCase(WM0)) { Static241.setWindowMode(false, 0, -1, -1); } - if (arg0.equalsIgnoreCase(Static181.aClass100_811)) { + if (arg0.equalsIgnoreCase(Static181.WM1)) { Static241.setWindowMode(false, 1, -1, -1); } - if (arg0.equalsIgnoreCase(Static207.aClass100_904)) { + if (arg0.equalsIgnoreCase(Static207.WM2)) { Static241.setWindowMode(false, 2, -1, -1); } - if (arg0.equalsIgnoreCase(Static99.aClass100_529)) { + if (arg0.equalsIgnoreCase(Static99.WM3)) { Static241.setWindowMode(false, 3, 1024, 768); } - if (arg0.equalsIgnoreCase(aClass100_443)) { + if (arg0.equalsIgnoreCase(NOCLIP)) { for (local18 = 0; local18 < 4; local18++) { for (local38 = 1; local38 < 103; local38++) { for (local117 = 1; local117 < 103; local117++) { @@ -150,36 +174,36 @@ public class Cheat { } } } - if (arg0.startsWith(aClass100_1088)) { + if (arg0.startsWith(PARTICLES)) { Preferences.setParticles(arg0.substring(15).parseInt()); Preferences.write(GameShell.signLink); Preferences.sentToServer = false; } - if (arg0.startsWith(aClass100_623) && client.modeWhere != 0) { + if (arg0.startsWith(COMMAND_FPS) && client.modeWhere != 0) { GameShell.setFpsTarget(arg0.substring(6).parseInt()); } - if (arg0.equalsIgnoreCase(aClass100_990)) { + if (arg0.equalsIgnoreCase(ERROR_TEST)) { throw new RuntimeException(); } - if (arg0.startsWith(aClass100_232)) { - Static199.rectDebug = arg0.substring(12).trim().parseInt(); - Chat.add(null, 0, JagString.concatenate(new JagString[] { Static276.aClass100_1096, Static123.parseInt(Static199.rectDebug) })); + if (arg0.startsWith(RECT_DEBUG)) { + rectDebug = arg0.substring(12).trim().parseInt(); + Chat.add(null, 0, JagString.concatenate(new JagString[] { RECT_DEBUG_EQUALS, Static123.parseInt(rectDebug) })); } - if (arg0.equalsIgnoreCase(Static181.aClass100_810)) { + if (arg0.equalsIgnoreCase(QA_OP_TEST)) { Static121.aBoolean154 = true; } - if (arg0.equalsIgnoreCase(Static124.aClass100_596)) { + if (arg0.equalsIgnoreCase(TWEENING)) { if (client.applyTweening) { client.applyTweening = false; Chat.add(null, 0, aClass100_943); } else { client.applyTweening = true; - Chat.add(null, 0, Static50.aClass100_362); + Chat.add(null, 0, aClass100_362); } } - if (arg0.equalsIgnoreCase(Static114.aClass100_1099)) { + if (arg0.equalsIgnoreCase(SHIFTCLICK)) { if (shiftClick) { - Static154.aClass100_736.print(); + aClass100_736.print(); shiftClick = false; } else { aClass100_333.print(); diff --git a/client/src/main/java/rt4/GlCleaner.java b/client/src/main/java/rt4/GlCleaner.java index 84778bd..8efa92b 100644 --- a/client/src/main/java/rt4/GlCleaner.java +++ b/client/src/main/java/rt4/GlCleaner.java @@ -23,7 +23,7 @@ public final class GlCleaner { public static int onCard2d = 0; @OriginalMember(owner = "client!fa", name = "f", descriptor = "I") - public static int anInt1945 = 0; + public static int onCardGeometry = 0; @OriginalMember(owner = "client!fa", name = "g", descriptor = "Lclient!ih;") private static final LinkedList aClass69_49 = new LinkedList(); @@ -62,7 +62,7 @@ public final class GlCleaner { aClass69_49.clear(); aClass69_50.clear(); aClass69_51.clear(); - anInt1945 = 0; + onCardGeometry = 0; onCard2d = 0; onCardTexture = 0; } @@ -99,7 +99,7 @@ public final class GlCleaner { while (true) { local8 = (IntNode) aClass69_51.removeHead(); if (local8 == null) { - if (anInt1945 + onCard2d + onCardTexture > 100663296 && MonotonicClock.currentTimeMillis() > aLong71 + 60000L) { + if (onCardGeometry + onCard2d + onCardTexture > 100663296 && MonotonicClock.currentTimeMillis() > aLong71 + 60000L) { System.gc(); aLong71 = MonotonicClock.currentTimeMillis(); } @@ -126,7 +126,7 @@ public final class GlCleaner { } } anIntArray151[local3++] = (int) local8.key; - anInt1945 -= local8.value; + onCardGeometry -= local8.value; if (local3 == 1000) { local1.glDeleteBuffers(local3, anIntArray151, 0); local3 = 0; diff --git a/client/src/main/java/rt4/GlVertexBufferObject.java b/client/src/main/java/rt4/GlVertexBufferObject.java index f45fdde..60a7ce8 100644 --- a/client/src/main/java/rt4/GlVertexBufferObject.java +++ b/client/src/main/java/rt4/GlVertexBufferObject.java @@ -72,7 +72,7 @@ public final class GlVertexBufferObject { @Pc(1) GL2 local1 = GlRenderer.gl; local1.glBindBuffer(GL2.GL_ELEMENT_ARRAY_BUFFER, this.anInt5760); local1.glBufferData(GL2.GL_ELEMENT_ARRAY_BUFFER, arg0.limit(), arg0, this.aBoolean300 ? GL2.GL_STREAM_DRAW : GL2.GL_STATIC_DRAW); - GlCleaner.anInt1945 += arg0.limit() - this.anInt5762; + GlCleaner.onCardGeometry += arg0.limit() - this.anInt5762; this.anInt5762 = arg0.limit(); } @@ -87,7 +87,7 @@ public final class GlVertexBufferObject { @Pc(1) GL2 local1 = GlRenderer.gl; local1.glBindBuffer(GL2.GL_ARRAY_BUFFER, this.anInt5760); local1.glBufferData(GL2.GL_ARRAY_BUFFER, arg0.limit(), arg0, this.aBoolean300 ? GL2.GL_STREAM_DRAW : GL2.GL_STATIC_DRAW); - GlCleaner.anInt1945 += arg0.limit() - this.anInt5762; + GlCleaner.onCardGeometry += arg0.limit() - this.anInt5762; this.anInt5762 = arg0.limit(); } } diff --git a/client/src/main/java/rt4/Static107.java b/client/src/main/java/rt4/Static107.java index 4646af1..16c355d 100644 --- a/client/src/main/java/rt4/Static107.java +++ b/client/src/main/java/rt4/Static107.java @@ -14,7 +14,7 @@ public final class Static107 { public static int anInt2875 = -1; @OriginalMember(owner = "client!id", name = "c", descriptor = "Lclient!na;") - public static final JagString aClass100_566 = JagString.parse("::fpson"); + public static final JagString FPSON = JagString.parse("::fpson"); @OriginalMember(owner = "client!id", name = "d", descriptor = "[[[I") public static final int[][][] anIntArrayArrayArray9 = new int[2][][]; diff --git a/client/src/main/java/rt4/Static114.java b/client/src/main/java/rt4/Static114.java index 2bdf117..a273870 100644 --- a/client/src/main/java/rt4/Static114.java +++ b/client/src/main/java/rt4/Static114.java @@ -7,14 +7,11 @@ import org.openrs2.deob.annotation.Pc; public final class Static114 { - @OriginalMember(owner = "client!j", name = "z", descriptor = "Lclient!na;") - public static final JagString aClass100_1099 = JagString.parse("::shiftclick"); - @OriginalMember(owner = "client!j", name = "K", descriptor = "I") public static int anInt5843 = 0; @OriginalMember(owner = "client!j", name = "M", descriptor = "Lclient!na;") - public static final JagString aClass100_1100 = JagString.parse("::replacecanvas"); + public static final JagString REPLACECANVAS = JagString.parse("::replacecanvas"); @OriginalMember(owner = "client!j", name = "O", descriptor = "[I") public static final int[] anIntArray565 = new int[] { 1, -1, -1, 1 }; diff --git a/client/src/main/java/rt4/Static124.java b/client/src/main/java/rt4/Static124.java index 9890fb7..6dd1ccc 100644 --- a/client/src/main/java/rt4/Static124.java +++ b/client/src/main/java/rt4/Static124.java @@ -12,10 +12,7 @@ public final class Static124 { @OriginalMember(owner = "client!jk", name = "y", descriptor = "Z") public static boolean aBoolean156 = false; - @OriginalMember(owner = "client!jk", name = "F", descriptor = "Lclient!na;") - public static final JagString aClass100_596 = JagString.parse("::tween"); - - @OriginalMember(owner = "client!jk", name = "a", descriptor = "(IZ[BII[Lclient!mj;)V") + @OriginalMember(owner = "client!jk", name = "a", descriptor = "(IZ[BII[Lclient!mj;)V") public static void method2437(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) byte[] arg2, @OriginalArg(3) int arg3, @OriginalArg(5) CollisionMap[] arg4) { @Pc(10) Buffer local10 = new Buffer(arg2); @Pc(12) int local12 = -1; diff --git a/client/src/main/java/rt4/Static148.java b/client/src/main/java/rt4/Static148.java index 6e9bfbb..82d80e4 100644 --- a/client/src/main/java/rt4/Static148.java +++ b/client/src/main/java/rt4/Static148.java @@ -16,7 +16,7 @@ public final class Static148 { public static int screenUpperY; @OriginalMember(owner = "client!li", name = "p", descriptor = "Lclient!na;") - public static final JagString aClass100_677 = JagString.parse("::rebuild"); + public static final JagString REBUILD = JagString.parse("::rebuild"); @OriginalMember(owner = "client!li", name = "a", descriptor = "(III)V") public static void method2766(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { diff --git a/client/src/main/java/rt4/Static154.java b/client/src/main/java/rt4/Static154.java index 1d25d4d..c6c9679 100644 --- a/client/src/main/java/rt4/Static154.java +++ b/client/src/main/java/rt4/Static154.java @@ -10,10 +10,7 @@ public final class Static154 { public static int anInt3709; @OriginalMember(owner = "client!md", name = "Q", descriptor = "Lclient!na;") - public static final JagString aClass100_735 = JagString.parse("::mm"); - - @OriginalMember(owner = "client!md", name = "T", descriptor = "Lclient!na;") - public static final JagString aClass100_736 = JagString.parse("Shift)2click disabled)3"); + public static final JagString MM = JagString.parse("::mm"); @OriginalMember(owner = "client!md", name = "a", descriptor = "(Lclient!be;I)Z") public static boolean method2926(@OriginalArg(0) Component arg0) { diff --git a/client/src/main/java/rt4/Static181.java b/client/src/main/java/rt4/Static181.java index 528ffb4..934b22c 100644 --- a/client/src/main/java/rt4/Static181.java +++ b/client/src/main/java/rt4/Static181.java @@ -9,11 +9,8 @@ public final class Static181 { @OriginalMember(owner = "client!oi", name = "h", descriptor = "Lclient!qf;") public static Sprite aClass3_Sub2_Sub1_9; - @OriginalMember(owner = "client!oi", name = "b", descriptor = "Lclient!na;") - public static final JagString aClass100_810 = JagString.parse("::qa_op_test"); - @OriginalMember(owner = "client!oi", name = "j", descriptor = "Lclient!na;") - public static final JagString aClass100_811 = JagString.parse("::wm1"); + public static final JagString WM1 = JagString.parse("::wm1"); @OriginalMember(owner = "client!oi", name = "a", descriptor = "(IIIIIIIIII)V") public static void method3340(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(8) int arg8) { diff --git a/client/src/main/java/rt4/Static199.java b/client/src/main/java/rt4/Static199.java index e1a4247..8b53b35 100644 --- a/client/src/main/java/rt4/Static199.java +++ b/client/src/main/java/rt4/Static199.java @@ -11,10 +11,7 @@ public final class Static199 { @OriginalMember(owner = "client!qc", name = "K", descriptor = "Lclient!sc;") public static HashTable aClass133_20 = new HashTable(16); - @OriginalMember(owner = "client!qc", name = "U", descriptor = "I") - public static int rectDebug = 0; - - @OriginalMember(owner = "client!qc", name = "a", descriptor = "(BI)I") + @OriginalMember(owner = "client!qc", name = "a", descriptor = "(BI)I") public static int method3594(@OriginalArg(1) int arg0) { return arg0 >> 11 & 0x7F; } diff --git a/client/src/main/java/rt4/Static201.java b/client/src/main/java/rt4/Static201.java index 8bec8b8..34fb483 100644 --- a/client/src/main/java/rt4/Static201.java +++ b/client/src/main/java/rt4/Static201.java @@ -12,9 +12,6 @@ public final class Static201 { @OriginalMember(owner = "client!qf", name = "M", descriptor = "I") public static int anInt1862 = 0; - @OriginalMember(owner = "client!qf", name = "N", descriptor = "Lclient!na;") - public static final JagString aClass100_406 = JagString.parse("::cardmem"); - @OriginalMember(owner = "client!qf", name = "Q", descriptor = "Lclient!na;") public static final JagString aClass100_407 = JagString.parse(" )2> "); diff --git a/client/src/main/java/rt4/Static202.java b/client/src/main/java/rt4/Static202.java index 95fbe95..8ec90ba 100644 --- a/client/src/main/java/rt4/Static202.java +++ b/client/src/main/java/rt4/Static202.java @@ -12,10 +12,7 @@ public final class Static202 { @OriginalMember(owner = "client!qg", name = "Y", descriptor = "[I") public static final int[] cameraFrequency = new int[5]; - @OriginalMember(owner = "client!qg", name = "Z", descriptor = "Lclient!na;") - public static final JagString aClass100_892 = JagString.parse("mem="); - - @OriginalMember(owner = "client!qg", name = "a", descriptor = "(Lsignlink!ll;Lclient!wa;IB)V") + @OriginalMember(owner = "client!qg", name = "a", descriptor = "(Lsignlink!ll;Lclient!wa;IB)V") public static void method3654(@OriginalArg(0) SignLink arg0, @OriginalArg(1) Buffer arg1, @OriginalArg(2) int arg2) { @Pc(17) ReflectionCheck local17 = new ReflectionCheck(); local17.anInt1725 = arg1.g1(); diff --git a/client/src/main/java/rt4/Static203.java b/client/src/main/java/rt4/Static203.java index 3f25e21..37ecd5b 100644 --- a/client/src/main/java/rt4/Static203.java +++ b/client/src/main/java/rt4/Static203.java @@ -8,10 +8,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static203 { - @OriginalMember(owner = "client!qh", name = "c", descriptor = "Lclient!na;") - public static final JagString aClass100_893 = JagString.parse("Memory before cleanup="); - - @OriginalMember(owner = "client!qh", name = "a", descriptor = "(Z)V") + @OriginalMember(owner = "client!qh", name = "a", descriptor = "(Z)V") public static void method3662() { @Pc(8) Container local8; if (GameShell.fullScreenFrame != null) { diff --git a/client/src/main/java/rt4/Static207.java b/client/src/main/java/rt4/Static207.java index 1af1375..79fa182 100644 --- a/client/src/main/java/rt4/Static207.java +++ b/client/src/main/java/rt4/Static207.java @@ -10,7 +10,7 @@ public final class Static207 { public static final JagString aClass100_903 = JagString.parse("Hidden)2"); @OriginalMember(owner = "client!ql", name = "i", descriptor = "Lclient!na;") - public static final JagString aClass100_904 = JagString.parse("::wm2"); + public static final JagString WM2 = JagString.parse("::wm2"); @OriginalMember(owner = "client!ql", name = "a", descriptor = "(IFII[[I[[II[[FIBIZLclient!hg;[[FII[[FI)I") public static int method3683(@OriginalArg(0) int arg0, @OriginalArg(1) float arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int[][] arg4, @OriginalArg(5) int[][] arg5, @OriginalArg(6) int arg6, @OriginalArg(7) float[][] arg7, @OriginalArg(8) int arg8, @OriginalArg(10) int arg9, @OriginalArg(11) boolean arg10, @OriginalArg(12) GlTile arg11, @OriginalArg(13) float[][] arg12, @OriginalArg(14) int arg13, @OriginalArg(15) int arg14, @OriginalArg(16) float[][] arg15, @OriginalArg(17) int arg16) { diff --git a/client/src/main/java/rt4/Static276.java b/client/src/main/java/rt4/Static276.java index dd4a97b..b378cdf 100644 --- a/client/src/main/java/rt4/Static276.java +++ b/client/src/main/java/rt4/Static276.java @@ -15,9 +15,6 @@ public final class Static276 { @OriginalMember(owner = "client!wh", name = "m", descriptor = "[I") public static final int[] cameraAmplitude = new int[5]; - @OriginalMember(owner = "client!wh", name = "o", descriptor = "Lclient!na;") - public static final JagString aClass100_1096 = JagString.parse("rect_debug="); - @OriginalMember(owner = "client!wh", name = "u", descriptor = "Lclient!na;") public static final JagString aClass100_1097 = JagString.parse("(U2"); diff --git a/client/src/main/java/rt4/Static279.java b/client/src/main/java/rt4/Static279.java index 690fa24..98f2b15 100644 --- a/client/src/main/java/rt4/Static279.java +++ b/client/src/main/java/rt4/Static279.java @@ -10,7 +10,7 @@ public final class Static279 { public static int[] anIntArray568; @OriginalMember(owner = "client!wk", name = "u", descriptor = "Lclient!na;") - public static final JagString aClass100_1106 = JagString.parse("::clientjs5drop"); + public static final JagString JS5DROP = JagString.parse("::clientjs5drop"); @OriginalMember(owner = "client!wk", name = "x", descriptor = "Lclient!na;") public static final JagString aClass100_1107 = JagString.parse(")4l="); diff --git a/client/src/main/java/rt4/Static44.java b/client/src/main/java/rt4/Static44.java index 02bbf9a..1fcaa65 100644 --- a/client/src/main/java/rt4/Static44.java +++ b/client/src/main/java/rt4/Static44.java @@ -12,10 +12,7 @@ public final class Static44 { @OriginalMember(owner = "client!dh", name = "a", descriptor = "Z") public static boolean aBoolean83 = false; - @OriginalMember(owner = "client!dh", name = "e", descriptor = "Lclient!na;") - public static final JagString aClass100_335 = JagString.parse("Number of player models in cache:"); - - @OriginalMember(owner = "client!dh", name = "i", descriptor = "Lclient!na;") + @OriginalMember(owner = "client!dh", name = "i", descriptor = "Lclient!na;") public static final JagString IMG1 = JagString.parse(""); @OriginalMember(owner = "client!dh", name = "a", descriptor = "(Z)V") diff --git a/client/src/main/java/rt4/Static50.java b/client/src/main/java/rt4/Static50.java index bc8acb4..e5806b9 100644 --- a/client/src/main/java/rt4/Static50.java +++ b/client/src/main/java/rt4/Static50.java @@ -13,10 +13,7 @@ public final class Static50 { @OriginalMember(owner = "client!e", name = "xc", descriptor = "[I") public static int[] anIntArray134 = new int[2]; - @OriginalMember(owner = "client!e", name = "Ac", descriptor = "Lclient!na;") - public static final JagString aClass100_362 = JagString.parse("Forced tweening ENABLED(Q"); - - @OriginalMember(owner = "client!e", name = "Dc", descriptor = "Lclient!na;") + @OriginalMember(owner = "client!e", name = "Dc", descriptor = "Lclient!na;") public static final JagString aClass100_363 = JagString.parse("_labels"); @OriginalMember(owner = "client!e", name = "Tc", descriptor = "Lclient!na;") diff --git a/client/src/main/java/rt4/Static81.java b/client/src/main/java/rt4/Static81.java index 9221532..91a7ca9 100644 --- a/client/src/main/java/rt4/Static81.java +++ b/client/src/main/java/rt4/Static81.java @@ -17,10 +17,7 @@ public final class Static81 { @OriginalMember(owner = "client!gg", name = "W", descriptor = "Lclient!na;") public static final JagString aClass100_475 = JagString.parse("null"); - @OriginalMember(owner = "client!gg", name = "Y", descriptor = "Lclient!na;") - public static final JagString aClass100_476 = JagString.parse("::gc"); - - @OriginalMember(owner = "client!gg", name = "db", descriptor = "I") + @OriginalMember(owner = "client!gg", name = "db", descriptor = "I") public static int anInt2225 = -1; @OriginalMember(owner = "client!gg", name = "c", descriptor = "(II)V") diff --git a/client/src/main/java/rt4/Static87.java b/client/src/main/java/rt4/Static87.java index 8e66fde..18551aa 100644 --- a/client/src/main/java/rt4/Static87.java +++ b/client/src/main/java/rt4/Static87.java @@ -316,7 +316,7 @@ public final class Static87 { local276 += 15; if (GlRenderer.enabled) { color = 16776960; - cardMemory = (GlCleaner.onCardTexture + GlCleaner.anInt1945 + GlCleaner.onCard2d) / 1024 / 1024; + cardMemory = (GlCleaner.onCardTexture + GlCleaner.onCardGeometry + GlCleaner.onCard2d) / 1024 / 1024; if (cardMemory > 64) { color = 16711680; } @@ -393,7 +393,7 @@ public final class Static87 { Rasteriser.prepare(); } } - if (Static223.aBooleanArray116[local57] || Static199.rectDebug > 1) { + if (Static223.aBooleanArray116[local57] || Cheat.rectDebug > 1) { if (local30.type == 0 && !local30.usingScripts && local30.anInt491 > local30.anInt459) { Static74.method1624(local30.scrollY, local30.anInt491, local30.anInt445 + local123, local114, local30.anInt459); } diff --git a/client/src/main/java/rt4/Static89.java b/client/src/main/java/rt4/Static89.java index 0bb5600..4b23cf7 100644 --- a/client/src/main/java/rt4/Static89.java +++ b/client/src/main/java/rt4/Static89.java @@ -176,7 +176,7 @@ public final class Static89 { if (Static187.anInt4422 == 1) { Static187.anInt4422 = 2; } - if (Static199.rectDebug == 3) { + if (Cheat.rectDebug == 3) { for (@Pc(189) int local189 = 0; local189 < InterfaceList.anInt766; local189++) { if (Static223.aBooleanArray116[local189]) { if (GlRenderer.enabled) { diff --git a/client/src/main/java/rt4/Static99.java b/client/src/main/java/rt4/Static99.java index 0d93ce7..4a5a485 100644 --- a/client/src/main/java/rt4/Static99.java +++ b/client/src/main/java/rt4/Static99.java @@ -14,6 +14,6 @@ public final class Static99 { public static final LinkedList aClass69_64 = new LinkedList(); @OriginalMember(owner = "client!hk", name = "db", descriptor = "Lclient!na;") - public static final JagString aClass100_529 = JagString.parse("::wm3"); + public static final JagString WM3 = JagString.parse("::wm3"); } diff --git a/client/src/main/java/rt4/client.java b/client/src/main/java/rt4/client.java index 60049a3..296ec05 100644 --- a/client/src/main/java/rt4/client.java +++ b/client/src/main/java/rt4/client.java @@ -703,7 +703,7 @@ public final class client extends GameShell { } } else { @Pc(388) Graphics local388; - if ((gameState == 30 || gameState == 10) && Static199.rectDebug == 0 && !local158) { + if ((gameState == 30 || gameState == 10) && Cheat.rectDebug == 0 && !local158) { try { local388 = GameShell.canvas.getGraphics(); for (local84 = 0; local84 < InterfaceList.anInt766; local84++) {