diff --git a/client/src/main/java/rt4/AnimFrameset.java b/client/src/main/java/rt4/AnimFrameset.java index a214128..3a3561c 100644 --- a/client/src/main/java/rt4/AnimFrameset.java +++ b/client/src/main/java/rt4/AnimFrameset.java @@ -59,7 +59,8 @@ public final class AnimFrameset extends SecondaryNode { } try { return new AnimFrameset(animsArchive, basesArchive, id, false); - } catch (@Pc(84) Exception local84) { + } catch (@Pc(84) Exception ex) { + ex.printStackTrace(); return null; } } diff --git a/client/src/main/java/rt4/AudioChannel.java b/client/src/main/java/rt4/AudioChannel.java index 9852290..fa9f34b 100644 --- a/client/src/main/java/rt4/AudioChannel.java +++ b/client/src/main/java/rt4/AudioChannel.java @@ -100,7 +100,8 @@ public class AudioChannel { thread.channels[arg3] = audioChannel; } return audioChannel; - } catch (@Pc(109) Throwable local109) { + } catch (@Pc(109) Throwable ex1) { + ex1.printStackTrace(); try { @Pc(120) SignLinkAudioChannel local120 = new SignLinkAudioChannel(arg1, arg3); local120.samples = new int[(stereo ? 2 : 1) * 256]; @@ -120,7 +121,8 @@ public class AudioChannel { thread.channels[arg3] = local120; } return local120; - } catch (@Pc(186) Throwable local186) { + } catch (@Pc(186) Throwable ex2) { + ex2.printStackTrace(); return new AudioChannel(); } } @@ -303,7 +305,8 @@ public class AudioChannel { this.consumedSamples = 0; } this.prevBufferSize = local38; - } catch (@Pc(202) Exception local202) { + } catch (@Pc(202) Exception ex) { + ex.printStackTrace(); this.flush(); this.closeUntil = now + 2000L; } @@ -315,7 +318,8 @@ public class AudioChannel { this.skip(); this.time += 256000 / sampleRate; } - } catch (@Pc(247) Exception local247) { + } catch (@Pc(247) Exception ex) { + ex.printStackTrace(); this.time = now; } } @@ -348,7 +352,8 @@ public class AudioChannel { this.skipConsumptionCheck = true; try { this.close(); - } catch (@Pc(10) Exception local10) { + } catch (@Pc(10) Exception ex) { + ex.printStackTrace(); this.flush(); this.closeUntil = MonotonicClock.currentTimeMillis() + 2000L; } diff --git a/client/src/main/java/rt4/AudioThread.java b/client/src/main/java/rt4/AudioThread.java index 8fa1681..349eaba 100644 --- a/client/src/main/java/rt4/AudioThread.java +++ b/client/src/main/java/rt4/AudioThread.java @@ -35,6 +35,7 @@ public final class AudioThread implements Runnable { GameShell.flush(this.signLink, null); } } catch (@Pc(43) Exception ex) { + ex.printStackTrace(); TracingException.report(null, ex); } finally { this.running = false; diff --git a/client/src/main/java/rt4/BufferedFile.java b/client/src/main/java/rt4/BufferedFile.java index 24a2a65..9b7dc71 100644 --- a/client/src/main/java/rt4/BufferedFile.java +++ b/client/src/main/java/rt4/BufferedFile.java @@ -179,6 +179,7 @@ public final class BufferedFile { } } } catch (@Pc(464) IOException ex) { + ex.printStackTrace(); this.physicalPosition = -1L; throw ex; } @@ -276,6 +277,7 @@ public final class BufferedFile { } } } catch (@Pc(414) IOException ex) { + ex.printStackTrace(); this.physicalPosition = -1L; throw ex; } diff --git a/client/src/main/java/rt4/Cache.java b/client/src/main/java/rt4/Cache.java index eab4a2e..2c95a6a 100644 --- a/client/src/main/java/rt4/Cache.java +++ b/client/src/main/java/rt4/Cache.java @@ -110,7 +110,8 @@ public final class Cache { @Pc(297) byte[] local297 = local134; return local297; } - } catch (@Pc(301) IOException local301) { + } catch (@Pc(301) IOException ex) { + ex.printStackTrace(); return null; } } diff --git a/client/src/main/java/rt4/Cheat.java b/client/src/main/java/rt4/Cheat.java index e3b0a5a..4f9ae89 100644 --- a/client/src/main/java/rt4/Cheat.java +++ b/client/src/main/java/rt4/Cheat.java @@ -206,7 +206,7 @@ public class Cheat { Chat.add(null, 0, JagString.concatenate(new JagString[] { RECT_DEBUG_EQUALS, JagString.parseInt(rectDebug) })); } if (arg0.equalsIgnoreCase(QA_OP_TEST)) { - Static121.aBoolean154 = true; + Static121.qaOpTest = true; } if (arg0.equalsIgnoreCase(TWEENING)) { if (SeqType.applyTweening) { diff --git a/client/src/main/java/rt4/ClientProt.java b/client/src/main/java/rt4/ClientProt.java index 6449a14..b6284de 100644 --- a/client/src/main/java/rt4/ClientProt.java +++ b/client/src/main/java/rt4/ClientProt.java @@ -25,7 +25,7 @@ public class ClientProt { ScriptRunner.run(local19); } @Pc(37) boolean local37 = true; - if (local8.anInt453 > 0) { + if (local8.clientCode > 0) { local37 = MiniMenu.method4265(local8); } if (!local37 || !InterfaceList.getServerActiveProperties(local8).method503(arg2 - 1)) { @@ -453,12 +453,12 @@ public class ClientProt { InterfaceList.redraw(Static40.aClass13_14); Static40.anInt4851++; if (Static44.aBoolean83 && Static146.aBoolean174) { - @Pc(30) int local30 = Mouse.anInt4873; + @Pc(30) int local30 = Mouse.lastMouseX; local30 -= Static40.anInt5388; if (Static81.anInt2225 > local30) { local30 = Static81.anInt2225; } - @Pc(41) int local41 = Mouse.anInt5032; + @Pc(41) int local41 = Mouse.lastMouseY; if (Static81.anInt2225 + Static40.aClass13_1.width < local30 - -Static40.aClass13_14.width) { local30 = Static81.anInt2225 + Static40.aClass13_1.width - Static40.aClass13_14.width; } @@ -504,7 +504,7 @@ public class ClientProt { Protocol.outboundBuffer.p4(Static56.aClass13_12.id); Protocol.outboundBuffer.p2le(Static40.aClass13_14.createdComponentId); } - } else if ((Static116.anInt2952 == 1 || MiniMenu.method4640(MiniMenu.size - 1)) && MiniMenu.size > 2) { + } else if ((VarpDomain.anInt2952 == 1 || MiniMenu.method4640(MiniMenu.size - 1)) && MiniMenu.size > 2) { Static226.method3901(); } else if (MiniMenu.size > 0) { Static59.method1372(); diff --git a/client/src/main/java/rt4/ColorImageCache.java b/client/src/main/java/rt4/ColorImageCache.java index efba229..b3241f8 100644 --- a/client/src/main/java/rt4/ColorImageCache.java +++ b/client/src/main/java/rt4/ColorImageCache.java @@ -8,7 +8,9 @@ import org.openrs2.deob.annotation.Pc; @OriginalClass("client!pf") public final class ColorImageCache { - @OriginalMember(owner = "client!pf", name = "d", descriptor = "I") + @OriginalMember(owner = "client!ib", name = "c", descriptor = "Lclient!qi;") + public static final ColorImageCacheEntry VALID = new ColorImageCacheEntry(0, 0); + @OriginalMember(owner = "client!pf", name = "d", descriptor = "I") private int size = 0; @OriginalMember(owner = "client!pf", name = "m", descriptor = "I") @@ -55,7 +57,7 @@ public final class ColorImageCache { public final int[] method3445(@OriginalArg(1) int row) { if (this.height == this.capacity) { this.invalid = this.entries[row] == null; - this.entries[row] = Static105.VALID; + this.entries[row] = VALID; return this.pixels[row]; } else if (this.capacity == 1) { this.invalid = this.singleRow != row; @@ -89,7 +91,7 @@ public final class ColorImageCache { throw new RuntimeException("Can only retrieve a full image cache"); } for (@Pc(24) int local24 = 0; local24 < this.capacity; local24++) { - this.entries[local24] = Static105.VALID; + this.entries[local24] = VALID; } return this.pixels; } diff --git a/client/src/main/java/rt4/Component.java b/client/src/main/java/rt4/Component.java index ce69671..a959449 100644 --- a/client/src/main/java/rt4/Component.java +++ b/client/src/main/java/rt4/Component.java @@ -287,7 +287,7 @@ public final class Component { public boolean textAntiMacro = false; @OriginalMember(owner = "client!be", name = "cb", descriptor = "I") - public int anInt465 = -1; + public int rectangleLoop = -1; @OriginalMember(owner = "client!be", name = "jc", descriptor = "I") public int anInt496 = 1; @@ -296,7 +296,7 @@ public final class Component { public int anInt480 = 0; @OriginalMember(owner = "client!be", name = "Hb", descriptor = "Z") - public boolean usingScripts = false; + public boolean if3 = false; @OriginalMember(owner = "client!di", name = "F", descriptor = "Lclient!bf;") public static final ServerActiveProperties DEFAULT_SERVER_ACTIVE_PROPERTIES = new ServerActiveProperties(0, -1); @@ -431,10 +431,10 @@ public final class Component { public int objCount = 0; @OriginalMember(owner = "client!be", name = "Uc", descriptor = "I") - public int anInt517 = -1; + public int rectangle = -1; @OriginalMember(owner = "client!be", name = "K", descriptor = "I") - public int anInt453 = 0; + public int clientCode = 0; @OriginalMember(owner = "client!be", name = "Oc", descriptor = "I") public int shadowColor = 0; @@ -565,10 +565,10 @@ public final class Component { @OriginalMember(owner = "client!be", name = "a", descriptor = "(ILclient!wa;)V") public final void decodeNoScripts(@OriginalArg(1) Buffer arg0) { - this.usingScripts = false; + this.if3 = false; this.type = arg0.g1(); this.anInt530 = arg0.g1(); - this.anInt453 = arg0.g2(); + this.clientCode = arg0.g2(); this.baseX = arg0.g2s(); this.baseY = arg0.g2s(); this.baseWidth = arg0.g2(); @@ -840,13 +840,14 @@ public final class Component { } @OriginalMember(owner = "client!be", name = "b", descriptor = "(III)V") - public final void swapObjs(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { - @Pc(8) int local8 = this.objTypes[arg1]; - this.objTypes[arg1] = this.objTypes[arg0]; - this.objTypes[arg0] = local8; - @Pc(34) int local34 = this.objCounts[arg1]; - this.objCounts[arg1] = this.objCounts[arg0]; - this.objCounts[arg0] = local34; + public final void swapObjs(@OriginalArg(0) int oldIndex, @OriginalArg(1) int newIndex) { + @Pc(8) int tmpObj = this.objTypes[newIndex]; + this.objTypes[newIndex] = this.objTypes[oldIndex]; + this.objTypes[oldIndex] = tmpObj; + + @Pc(34) int tmpCount = this.objCounts[newIndex]; + this.objCounts[newIndex] = this.objCounts[oldIndex]; + this.objCounts[oldIndex] = tmpCount; } @OriginalMember(owner = "client!be", name = "a", descriptor = "(ILclient!tk;IIIZLclient!hh;)Lclient!ak;") @@ -995,14 +996,14 @@ public final class Component { @OriginalMember(owner = "client!be", name = "c", descriptor = "(ILclient!wa;)V") public final void decodeScriptFormat(@OriginalArg(1) Buffer buffer) { - this.usingScripts = true; + this.if3 = true; buffer.offset++; this.type = buffer.g1(); if ((this.type & 0x80) != 0) { this.type &= 0x7F; buffer.gjstr(); } - this.anInt453 = buffer.g2(); + this.clientCode = buffer.g2(); this.baseX = buffer.g2s(); this.baseY = buffer.g2s(); this.baseWidth = buffer.g2(); diff --git a/client/src/main/java/rt4/DisplayMode.java b/client/src/main/java/rt4/DisplayMode.java index 7910282..b81950a 100644 --- a/client/src/main/java/rt4/DisplayMode.java +++ b/client/src/main/java/rt4/DisplayMode.java @@ -14,6 +14,8 @@ public final class DisplayMode { public static DisplayMode[] aClass114Array1; @OriginalMember(owner = "client!rc", name = "M", descriptor = "Z") public static boolean aBoolean73 = false; + @OriginalMember(owner = "client!jk", name = "y", descriptor = "Z") + public static boolean aBoolean156 = false; @OriginalMember(owner = "client!od", name = "j", descriptor = "I") public int width; @@ -64,9 +66,9 @@ public final class DisplayMode { public static int getWindowMode() { if (GameShell.fullScreenFrame != null) { return 3; - } else if (GlRenderer.enabled && Static124.aBoolean156) { + } else if (GlRenderer.enabled && aBoolean156) { return 2; - } else if (GlRenderer.enabled && !Static124.aBoolean156) { + } else if (GlRenderer.enabled && !aBoolean156) { return 1; } else { return 0; @@ -224,9 +226,9 @@ public final class DisplayMode { client.method2721(); } if (arg1 >= 2) { - Static124.aBoolean156 = true; + aBoolean156 = true; } else { - Static124.aBoolean156 = false; + aBoolean156 = false; } if (InterfaceList.topLevelInterface != -1) { Static210.method3712(true); diff --git a/client/src/main/java/rt4/Flames.java b/client/src/main/java/rt4/Flames.java index 8c7949a..2e06d06 100644 --- a/client/src/main/java/rt4/Flames.java +++ b/client/src/main/java/rt4/Flames.java @@ -10,6 +10,8 @@ public class Flames { public static final JagString RUNES = JagString.parse("runes"); @OriginalMember(owner = "client!km", name = "Yc", descriptor = "I") public static int anInt3443; + @OriginalMember(owner = "client!uf", name = "e", descriptor = "I") + public static int anInt5434 = 0; @OriginalMember(owner = "client!gg", name = "a", descriptor = "(ILclient!ve;)V") public static void init(@OriginalArg(1) Js5 arg0) { @@ -23,6 +25,6 @@ public class Flames { @OriginalMember(owner = "client!wa", name = "a", descriptor = "(Z)V") public static void update() { - Static250.anInt5434++; + anInt5434++; } } diff --git a/client/src/main/java/rt4/GlRenderer.java b/client/src/main/java/rt4/GlRenderer.java index 5934a4a..4c87d39 100644 --- a/client/src/main/java/rt4/GlRenderer.java +++ b/client/src/main/java/rt4/GlRenderer.java @@ -242,7 +242,7 @@ public final class GlRenderer { lightingEnabled = true; depthTestEnabled = true; fogEnabled = true; - Static83.method440(); + resetMaterial(); gl.glActiveTexture(GL2.GL_TEXTURE1); gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_MODE, GL2.GL_COMBINE); gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_RGB, GL2.GL_MODULATE); @@ -811,4 +811,9 @@ public final class GlRenderer { LightingManager.method2401(); MaterialManager.init(); } + + @OriginalMember(owner = "client!gj", name = "b", descriptor = "(I)V") + public static void resetMaterial() { + MaterialManager.setMaterial(0, 0); + } } diff --git a/client/src/main/java/rt4/InterfaceList.java b/client/src/main/java/rt4/InterfaceList.java index 15da22a..a0d3f1c 100644 --- a/client/src/main/java/rt4/InterfaceList.java +++ b/client/src/main/java/rt4/InterfaceList.java @@ -15,8 +15,16 @@ public class InterfaceList { public static final int[] keyCodes = new int[128]; @OriginalMember(owner = "client!rb", name = "b", descriptor = "Lclient!sc;") public static final HashTable properties = new HashTable(512); + @OriginalMember(owner = "client!vh", name = "b", descriptor = "[I") + public static final int[] rectangleX = new int[100]; + @OriginalMember(owner = "client!e", name = "sc", descriptor = "[I") + public static final int[] rectangleY = new int[100]; + @OriginalMember(owner = "client!sd", name = "V", descriptor = "[I") + public static final int[] rectangleWidth = new int[100]; + @OriginalMember(owner = "client!fe", name = "lb", descriptor = "[I") + public static final int[] rectangleHeight = new int[100]; @OriginalMember(owner = "client!bn", name = "V", descriptor = "I") - public static int anInt766 = 0; + public static int rectangles = 0; @OriginalMember(owner = "client!md", name = "W", descriptor = "I") public static int topLevelInterface = -1; @OriginalMember(owner = "client!bm", name = "f", descriptor = "Lclient!ve;") @@ -127,7 +135,7 @@ public class InterfaceList { @Pc(27) int local27; for (local27 = 0; local27 < local25.length; local27++) { if (local25[local27] != null) { - local21 = local25[local27].usingScripts; + local21 = local25[local27].if3; break; } } @@ -144,23 +152,22 @@ public class InterfaceList { @OriginalMember(owner = "client!af", name = "a", descriptor = "(BI)Lclient!be;") public static Component getComponent(@OriginalArg(1) int id) { - // TODO: _why_ are there some interfaces/components that are null! (i.e. banking) try { - @Pc(7) int interfaceId = id >> 16; - @Pc(18) int componentId = id & 0xFFFF; - if (components.length <= interfaceId || interfaceId < 0) { + @Pc(7) int parent = id >> 16; + @Pc(18) int child = id & 0xFFFF; + if (components.length <= parent || parent < 0) { return null; } - if (components[interfaceId] == null || components[interfaceId].length <= componentId || components[interfaceId][componentId] == null) { - @Pc(33) boolean success = load(interfaceId); + if (components[parent] == null || components[parent].length <= child || components[parent][child] == null) { + @Pc(33) boolean success = load(parent); if (!success) { return null; } } - if (components[interfaceId].length <= componentId) { + if (components[parent].length <= child) { return null; } - return components[interfaceId][componentId]; + return components[parent][child]; } catch (Exception ex) { ex.printStackTrace(); return null; @@ -175,8 +182,8 @@ public class InterfaceList { @OriginalMember(owner = "client!dg", name = "a", descriptor = "(ILclient!be;)V") public static void redraw(@OriginalArg(1) Component arg0) { - if (Static182.anInt4311 == arg0.anInt465) { - Static186.aBooleanArray100[arg0.anInt517] = true; + if (Static182.anInt4311 == arg0.rectangleLoop) { + Static186.aBooleanArray100[arg0.rectangle] = true; } } @@ -185,7 +192,7 @@ public class InterfaceList { if (!getServerActiveProperties(arg0).method503(arg1) && arg0.onOptionClick == null) { return null; } else if (arg0.ops == null || arg0.ops.length <= arg1 || arg0.ops[arg1] == null || arg0.ops[arg1].trim().length() == 0) { - return Static121.aBoolean154 ? JagString.concatenate(new JagString[] { Static207.aClass100_903, JagString.parseInt(arg1) }) : null; + return Static121.qaOpTest ? JagString.concatenate(new JagString[] { Static207.aClass100_903, JagString.parseInt(arg1) }) : null; } else { return arg0.ops[arg1]; } diff --git a/client/src/main/java/rt4/LiquidMaterialRenderer.java b/client/src/main/java/rt4/LiquidMaterialRenderer.java index 10f0b8a..583e86d 100644 --- a/client/src/main/java/rt4/LiquidMaterialRenderer.java +++ b/client/src/main/java/rt4/LiquidMaterialRenderer.java @@ -87,9 +87,9 @@ public final class LiquidMaterialRenderer implements MaterialRenderer { local5.glCallList(this.anInt4831); local5.glActiveTexture(GL2.GL_TEXTURE1); local5.glMatrixMode(GL2.GL_TEXTURE); - local5.glTranslatef((float) Static12.anInt406, (float) Static199.anInt4675, (float) Static230.anInt5158); - local5.glRotatef(-((float) Static59.anInt1815 * 360.0F) / 2048.0F, 0.0F, 1.0F, 0.0F); - local5.glRotatef(-((float) Static254.anInt5559 * 360.0F) / 2048.0F, 1.0F, 0.0F, 0.0F); + local5.glTranslatef((float) Static253.anInt406, (float) Static253.anInt4675, (float) Static253.anInt5158); + local5.glRotatef(-((float) Static253.anInt1815 * 360.0F) / 2048.0F, 0.0F, 1.0F, 0.0F); + local5.glRotatef(-((float) Static253.anInt5559 * 360.0F) / 2048.0F, 1.0F, 0.0F, 0.0F); local5.glRotatef(-180.0F, 1.0F, 0.0F, 0.0F); local5.glMatrixMode(GL2.GL_MODELVIEW); if (!Static151.allows3DTextureMapping) { diff --git a/client/src/main/java/rt4/LocType.java b/client/src/main/java/rt4/LocType.java index 1fe311e..cd436db 100644 --- a/client/src/main/java/rt4/LocType.java +++ b/client/src/main/java/rt4/LocType.java @@ -120,7 +120,7 @@ public final class LocType { private int resizeY = 128; @OriginalMember(owner = "client!pb", name = "y", descriptor = "Z") - public boolean aBoolean210 = false; + public boolean breakroutefinding = false; @OriginalMember(owner = "client!pb", name = "kb", descriptor = "I") public int anInt4429 = -1; @@ -514,7 +514,7 @@ public final class LocType { } else if (arg1 == 73) { this.aBoolean206 = true; } else if (arg1 == 74) { - this.aBoolean210 = true; + this.breakroutefinding = true; } else if (arg1 == 75) { this.anInt4438 = arg0.g1(); } else if (arg1 == 77 || arg1 == 92) { diff --git a/client/src/main/java/rt4/LocTypeList.java b/client/src/main/java/rt4/LocTypeList.java index c18aa7c..c5734b5 100644 --- a/client/src/main/java/rt4/LocTypeList.java +++ b/client/src/main/java/rt4/LocTypeList.java @@ -36,7 +36,7 @@ public class LocTypeList { if (!allowMembers && local15.members) { local15.ops = null; } - if (local15.aBoolean210) { + if (local15.breakroutefinding) { local15.anInt4435 = 0; local15.aBoolean207 = false; } diff --git a/client/src/main/java/rt4/LoginManager.java b/client/src/main/java/rt4/LoginManager.java index ac514fa..dd8e1db 100644 --- a/client/src/main/java/rt4/LoginManager.java +++ b/client/src/main/java/rt4/LoginManager.java @@ -774,4 +774,39 @@ public class LoginManager { Static99.aClass69_64.clear(); Static217.aClass69_116.clear(); } + + @OriginalMember(owner = "client!dh", name = "a", descriptor = "(Z)V") + public static void reconnect() { + Protocol.outboundBuffer.offset = 0; + Protocol.opcode3 = -1; + Static40.aBoolean108 = false; + Protocol.length = 0; + mapFlagX = 0; + MiniMenu.size = 0; + Protocol.opcode2 = -1; + MiniMap.state = 0; + Player.rebootTimer = 0; + Protocol.opcode4 = -1; + Protocol.inboundBuffer.offset = 0; + Static201.anInt1862 = 0; + Protocol.opcode = -1; + @Pc(35) int local35; + for (local35 = 0; local35 < PlayerList.players.length; local35++) { + if (PlayerList.players[local35] != null) { + PlayerList.players[local35].faceEntity = -1; + } + } + for (local35 = 0; local35 < NpcList.npcs.length; local35++) { + if (NpcList.npcs[local35] != null) { + NpcList.npcs[local35].faceEntity = -1; + } + } + Inv.method2073(); + Camera.cameraType = 1; + client.setGameState(30); + for (local35 = 0; local35 < 100; local35++) { + Static186.aBooleanArray100[local35] = true; + } + ClientProt.method1373(); + } } diff --git a/client/src/main/java/rt4/MidiPlayer.java b/client/src/main/java/rt4/MidiPlayer.java index afe879f..3fac1c7 100644 --- a/client/src/main/java/rt4/MidiPlayer.java +++ b/client/src/main/java/rt4/MidiPlayer.java @@ -23,26 +23,30 @@ public class MidiPlayer { public static boolean aBoolean116; @OriginalMember(owner = "client!rb", name = "f", descriptor = "Lclient!ve;") public static Js5 aClass153_87; + @OriginalMember(owner = "client!gd", name = "m", descriptor = "Lclient!ve;") + public static Js5 aClass153_32; + @OriginalMember(owner = "client!le", name = "c", descriptor = "Lclient!rf;") + public static Song aClass3_Sub29_1; @OriginalMember(owner = "client!km", name = "c", descriptor = "(Z)Z") public static boolean method2699() { try { if (anInt441 == 2) { - if (Static144.aClass3_Sub29_1 == null) { - Static144.aClass3_Sub29_1 = Song.create(Static172.aClass153_70, anInt5853, Static226.anInt5085); - if (Static144.aClass3_Sub29_1 == null) { + if (aClass3_Sub29_1 == null) { + aClass3_Sub29_1 = Song.create(Static172.aClass153_70, anInt5853, Static226.anInt5085); + if (aClass3_Sub29_1 == null) { return false; } } if (aClass89_1 == null) { - aClass89_1 = new SoundBank(Static78.aClass153_32, aClass153_103); + aClass89_1 = new SoundBank(aClass153_32, aClass153_103); } - if (Static172.midiPcmStream.method4411(Static144.aClass3_Sub29_1, aClass153_87, aClass89_1)) { + if (Static172.midiPcmStream.method4411(aClass3_Sub29_1, aClass153_87, aClass89_1)) { Static172.midiPcmStream.method4412(); Static172.midiPcmStream.method4447(anInt5527); - Static172.midiPcmStream.method4431(aBoolean116, Static144.aClass3_Sub29_1); + Static172.midiPcmStream.method4431(aBoolean116, aClass3_Sub29_1); anInt441 = 0; - Static144.aClass3_Sub29_1 = null; + aClass3_Sub29_1 = null; aClass89_1 = null; Static172.aClass153_70 = null; return true; @@ -52,7 +56,7 @@ public class MidiPlayer { local68.printStackTrace(); Static172.midiPcmStream.method4446(); Static172.aClass153_70 = null; - Static144.aClass3_Sub29_1 = null; + aClass3_Sub29_1 = null; anInt441 = 0; aClass89_1 = null; } @@ -84,7 +88,7 @@ public class MidiPlayer { @OriginalMember(owner = "client!ck", name = "a", descriptor = "(ILclient!va;Lclient!ve;Lclient!ve;Lclient!ve;)Z") public static boolean init(@OriginalArg(1) MidiPcmStream arg0, @OriginalArg(2) Js5 arg1, @OriginalArg(3) Js5 arg2, @OriginalArg(4) Js5 arg3) { aClass153_87 = arg1; - Static78.aClass153_32 = arg3; + aClass153_32 = arg3; aClass153_103 = arg2; Static172.midiPcmStream = arg0; return true; @@ -105,7 +109,7 @@ public class MidiPlayer { } Static172.midiPcmStream.method4446(); Static172.midiPcmStream.method4426(); - Static144.aClass3_Sub29_1 = null; + aClass3_Sub29_1 = null; aClass89_1 = null; if (Static172.aClass153_70 == null) { anInt441 = 0; @@ -117,7 +121,7 @@ public class MidiPlayer { local62.printStackTrace(); Static172.midiPcmStream.method4446(); Static172.aClass153_70 = null; - Static144.aClass3_Sub29_1 = null; + aClass3_Sub29_1 = null; anInt441 = 0; aClass89_1 = null; } diff --git a/client/src/main/java/rt4/MiniMenu.java b/client/src/main/java/rt4/MiniMenu.java index c685025..eed6e26 100644 --- a/client/src/main/java/rt4/MiniMenu.java +++ b/client/src/main/java/rt4/MiniMenu.java @@ -67,6 +67,12 @@ public class MiniMenu { public static final JagString aClass100_1039 = JagString.parse(" x "); @OriginalMember(owner = "client!hd", name = "l", descriptor = "Lclient!na;") public static final JagString NULL = JagString.parse("null"); + @OriginalMember(owner = "client!ib", name = "k", descriptor = "Lclient!na;") + public static final JagString aClass100_561 = JagString.parse(" )2> "); + @OriginalMember(owner = "client!tg", name = "e", descriptor = "Lclient!na;") + public static final JagString aClass100_1008 = JagString.parse(""); + @OriginalMember(owner = "client!uf", name = "q", descriptor = "Lclient!na;") + public static final JagString aClass100_1042 = JagString.parse("Null"); @OriginalMember(owner = "client!ck", name = "D", descriptor = "Lclient!na;") public static JagString aClass100_203 = null; @OriginalMember(owner = "client!hn", name = "W", descriptor = "Lclient!na;") @@ -74,7 +80,7 @@ public class MiniMenu { @OriginalMember(owner = "client!sk", name = "kb", descriptor = "I") public static int size = 0; @OriginalMember(owner = "client!v", name = "b", descriptor = "Lclient!be;") - public static Component aClass13_7; + public static Component pressedInventoryComponent; @OriginalMember(owner = "client!gd", name = "i", descriptor = "Lclient!na;") public static JagString aClass100_466 = null; @OriginalMember(owner = "client!vd", name = "C", descriptor = "I") @@ -101,6 +107,12 @@ public class MiniMenu { public static int anInt1742 = -1; @OriginalMember(owner = "client!jb", name = "p", descriptor = "I") public static int anInt2954 = -1; + @OriginalMember(owner = "client!id", name = "k", descriptor = "I") + public static int anInt2878; + @OriginalMember(owner = "client!u", name = "i", descriptor = "I") + public static int anInt5393; + @OriginalMember(owner = "client!uf", name = "t", descriptor = "I") + public static int anInt5444 = 0; @OriginalMember(owner = "client!va", name = "a", descriptor = "(IZILclient!be;)V") public static void addComponentEntries(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) Component component) { @@ -139,8 +151,8 @@ public class MiniMenu { local195 += component.anIntArray41[local171]; } if (arg1 >= local195 && local202 <= arg0 && local195 + 32 > arg1 && local202 + 32 > arg0) { - Static169.aClass13_18 = component; - Static18.anInt588 = local171; + Static169.mouseOverInventoryInterface = component; + Static18.clickedInventoryIndex = local171; if (component.objTypes[local171] > 0) { @Pc(267) ServerActiveProperties local267 = InterfaceList.getServerActiveProperties(component); @Pc(276) ObjType local276 = ObjTypeList.get(component.objTypes[local171] - 1); @@ -151,7 +163,7 @@ public class MiniMenu { } else if (Static241.aBoolean302 && local267.isObjOpsEnabled()) { @Pc(596) ParamType local596 = Static121.anInt3039 == -1 ? null : ParamTypeList.get(Static121.anInt3039); if ((anInt4999 & 0x10) != 0 && (local596 == null || local276.getParam(local596.defaultInt, Static121.anInt3039) != local596.defaultInt)) { - add(Static246.anInt5393, (long) local276.anInt2354, JagString.concatenate(new JagString[] { aClass100_466, aClass100_947, local276.name}), local171, (short) 3, aClass100_545, component.id); + add(anInt5393, (long) local276.anInt2354, JagString.concatenate(new JagString[] { aClass100_466, aClass100_947, local276.name}), local171, (short) 3, aClass100_545, component.id); } } else { @Pc(296) JagString[] local296 = local276.inventoryOps; @@ -227,7 +239,7 @@ public class MiniMenu { } } } - if (!component.usingScripts) { + if (!component.if3) { return; } if (!Static241.aBoolean302) { @@ -251,7 +263,7 @@ public class MiniMenu { add(-1, 0L, JagString.EMPTY, component.createdComponentId, (short) 41, LocalizedText.CONTINUE, component.id); } } else if (InterfaceList.getServerActiveProperties(component).method508() && (anInt4999 & 0x20) != 0) { - add(Static246.anInt5393, 0L, JagString.concatenate(new JagString[] { aClass100_466, aClass100_408, component.optionBase}), component.createdComponentId, (short) 12, aClass100_545, component.id); + add(anInt5393, 0L, JagString.concatenate(new JagString[] { aClass100_466, aClass100_408, component.optionBase}), component.createdComponentId, (short) 12, aClass100_545, component.id); } } @@ -366,8 +378,8 @@ public class MiniMenu { Protocol.outboundBuffer.p2leadd(anInt4997); Protocol.outboundBuffer.p2leadd(local36); anInt2043 = 0; - aClass13_7 = InterfaceList.getComponent(local19); - Static250.anInt5444 = local15; + pressedInventoryComponent = InterfaceList.getComponent(local19); + anInt5444 = local15; } @Pc(192) Npc local192; if (local23 == 19) { @@ -412,8 +424,8 @@ public class MiniMenu { Protocol.outboundBuffer.p2add(local15); Protocol.outboundBuffer.p4me(local19); anInt2043 = 0; - aClass13_7 = InterfaceList.getComponent(local19); - Static250.anInt5444 = local15; + pressedInventoryComponent = InterfaceList.getComponent(local19); + anInt5444 = local15; } if (local23 == 42) { PathFinder.findPathToLoc(local31, local19, local15); @@ -483,8 +495,8 @@ public class MiniMenu { Chat.add(JagString.EMPTY, 0, JagString.concatenate(new JagString[] { JagString.parseInt(local693.objCounts[local15]), aClass100_1039, ObjTypeList.get(local36).name})); } anInt2043 = 0; - aClass13_7 = InterfaceList.getComponent(local19); - Static250.anInt5444 = local15; + pressedInventoryComponent = InterfaceList.getComponent(local19); + anInt5444 = local15; } if (local23 == 60) { if (local36 == 0) { @@ -494,7 +506,7 @@ public class MiniMenu { Cheat.teleport(Camera.originX + local15, Camera.originZ + local19, Player.level); } else if (PathFinder.findPath(PlayerList.self.movementQueueZ[0], 0, 0, true, 0, local15, 0, 0, 1, local19, PlayerList.self.movementQueueX[0])) { Protocol.outboundBuffer.p1(Static1.anInt5); - Protocol.outboundBuffer.p1(Static107.anInt2878); + Protocol.outboundBuffer.p1(anInt2878); Protocol.outboundBuffer.p2((int)Camera.yawTarget); Protocol.outboundBuffer.p1(57); Protocol.outboundBuffer.p1(MiniMap.anInt1814); @@ -530,8 +542,8 @@ public class MiniMenu { Protocol.outboundBuffer.p2add(local36); Protocol.outboundBuffer.p4le2(local19); anInt2043 = 0; - aClass13_7 = InterfaceList.getComponent(local19); - Static250.anInt5444 = local15; + pressedInventoryComponent = InterfaceList.getComponent(local19); + anInt5444 = local15; } if (local23 == 3) { Protocol.outboundBuffer.p1isaac(253); @@ -541,8 +553,8 @@ public class MiniMenu { Protocol.outboundBuffer.p2add(local36); Protocol.outboundBuffer.p2le(anInt506); anInt2043 = 0; - aClass13_7 = InterfaceList.getComponent(local19); - Static250.anInt5444 = local15; + pressedInventoryComponent = InterfaceList.getComponent(local19); + anInt5444 = local15; } if (local23 == 10) { local43 = PlayerList.players[local36]; @@ -574,8 +586,8 @@ public class MiniMenu { Protocol.outboundBuffer.p2le(local15); Protocol.outboundBuffer.p4le2(local19); anInt2043 = 0; - aClass13_7 = InterfaceList.getComponent(local19); - Static250.anInt5444 = local15; + pressedInventoryComponent = InterfaceList.getComponent(local19); + anInt5444 = local15; } if (local23 == 14 && PathFinder.findPathToLoc(local31, local19, local15)) { Protocol.outboundBuffer.p1isaac(134); @@ -607,8 +619,8 @@ public class MiniMenu { Protocol.outboundBuffer.p2add(local15); Protocol.outboundBuffer.p4rme(local19); anInt2043 = 0; - aClass13_7 = InterfaceList.getComponent(local19); - Static250.anInt5444 = local15; + pressedInventoryComponent = InterfaceList.getComponent(local19); + anInt5444 = local15; } if (local23 == 21) { if (client.game == 1) { @@ -649,9 +661,9 @@ public class MiniMenu { anInt5014 = 0; aClass100_545 = Static97.getTargetVerb(local693); if (aClass100_545 == null) { - aClass100_545 = Static250.aClass100_1042; + aClass100_545 = aClass100_1042; } - if (local693.usingScripts) { + if (local693.if3) { aClass100_466 = JagString.concatenate(new JagString[] { local693.optionBase, COLOR_WHITE}); } else { aClass100_466 = JagString.concatenate(new JagString[] {COLOR_GREEN, local693.aClass100_85, COLOR_WHITE}); @@ -677,8 +689,8 @@ public class MiniMenu { Protocol.outboundBuffer.p2leadd(local36); Protocol.outboundBuffer.p2leadd(local15); anInt2043 = 0; - aClass13_7 = InterfaceList.getComponent(local19); - Static250.anInt5444 = local15; + pressedInventoryComponent = InterfaceList.getComponent(local19); + anInt5444 = local15; } if (local23 == 15) { local43 = PlayerList.players[local36]; @@ -718,8 +730,8 @@ public class MiniMenu { Protocol.outboundBuffer.p2(local36); Protocol.outboundBuffer.p4rme(local19); anInt2043 = 0; - aClass13_7 = InterfaceList.getComponent(local19); - Static250.anInt5444 = local15; + pressedInventoryComponent = InterfaceList.getComponent(local19); + anInt5444 = local15; } if (local23 == 2) { local192 = NpcList.npcs[local36]; @@ -811,7 +823,7 @@ public class MiniMenu { if (local23 == 8) { local693 = InterfaceList.getComponent(local19); @Pc(2287) boolean local2287 = true; - if (local693.anInt453 > 0) { + if (local693.clientCode > 0) { local2287 = method4265(local693); } if (local2287) { @@ -840,8 +852,8 @@ public class MiniMenu { Protocol.outboundBuffer.p2(local15); Protocol.outboundBuffer.p2add(local36); anInt2043 = 0; - aClass13_7 = InterfaceList.getComponent(local19); - Static250.anInt5444 = local15; + pressedInventoryComponent = InterfaceList.getComponent(local19); + anInt5444 = local15; } if (local23 == 24) { if (client.game == 1) { @@ -875,8 +887,8 @@ public class MiniMenu { Protocol.outboundBuffer.p2add(local15); Protocol.outboundBuffer.p2le(local36); anInt2043 = 0; - aClass13_7 = InterfaceList.getComponent(local19); - Static250.anInt5444 = local15; + pressedInventoryComponent = InterfaceList.getComponent(local19); + anInt5444 = local15; } if (local23 == 57) { local43 = PlayerList.players[local36]; @@ -917,8 +929,8 @@ public class MiniMenu { Protocol.outboundBuffer.p4rme(local19); Protocol.outboundBuffer.p2leadd(local36); anInt2043 = 0; - aClass13_7 = InterfaceList.getComponent(local19); - Static250.anInt5444 = local15; + pressedInventoryComponent = InterfaceList.getComponent(local19); + anInt5444 = local15; } if (local23 == 30) { local43 = PlayerList.players[local36]; @@ -938,8 +950,8 @@ public class MiniMenu { Protocol.outboundBuffer.p2le(local15); Protocol.outboundBuffer.p2le(local36); anInt2043 = 0; - aClass13_7 = InterfaceList.getComponent(local19); - Static250.anInt5444 = local15; + pressedInventoryComponent = InterfaceList.getComponent(local19); + anInt5444 = local15; } if (local23 == 39) { local560 = PathFinder.findPath(PlayerList.self.movementQueueZ[0], 0, 0, false, 0, local15, 0, 0, 2, local19, PlayerList.self.movementQueueX[0]); @@ -1025,8 +1037,8 @@ public class MiniMenu { if (Static241.aBoolean302) { Static53.method1294(); } - if (aClass13_7 != null && anInt2043 == 0) { - InterfaceList.redraw(aClass13_7); + if (pressedInventoryComponent != null && anInt2043 == 0) { + InterfaceList.redraw(pressedInventoryComponent); } } @@ -1068,7 +1080,7 @@ public class MiniMenu { if (local61 == null) { Static53.method1294(); } else { - add(Static246.anInt5393, 0L, aClass100_961, local33, (short) 11, aClass100_545, x); + add(anInt5393, 0L, aClass100_961, local33, (short) 11, aClass100_545, x); } } else { if (client.game == 1) { @@ -1100,7 +1112,7 @@ public class MiniMenu { } else if (Static241.aBoolean302) { @Pc(363) ParamType local363 = Static121.anInt3039 == -1 ? null : ParamTypeList.get(Static121.anInt3039); if ((anInt4999 & 0x4) != 0 && (local363 == null || local172.getParam(local363.defaultInt, Static121.anInt3039) != local363.defaultInt)) { - add(Static246.anInt5393, local121, JagString.concatenate(new JagString[] { aClass100_466, aClass100_164, local172.name}), x, (short) 38, aClass100_545, z); + add(anInt5393, local121, JagString.concatenate(new JagString[] { aClass100_466, aClass100_164, local172.name}), x, (short) 38, aClass100_545, z); } } else { @Pc(228) JagString[] local228 = local172.ops; @@ -1133,11 +1145,11 @@ public class MiniMenu { if (local240 == 4) { local254 = 1001; } - add(local268, local121, JagString.concatenate(new JagString[] { Static240.aClass100_1008, local172.name}), x, local254, local228[local240], z); + add(local268, local121, JagString.concatenate(new JagString[] { aClass100_1008, local172.name}), x, local254, local228[local240], z); } } } - add(Static225.anInt5073, (long) local172.id, JagString.concatenate(new JagString[] { Static240.aClass100_1008, local172.name}), x, (short) 1004, LocalizedText.EXAMINE, z); + add(Static225.anInt5073, (long) local172.id, JagString.concatenate(new JagString[] { aClass100_1008, local172.name}), x, (short) 1004, LocalizedText.EXAMINE, z); } } @Pc(514) int local514; @@ -1205,7 +1217,7 @@ public class MiniMenu { } else if (Static241.aBoolean302) { @Pc(1142) ParamType local1142 = Static121.anInt3039 == -1 ? null : ParamTypeList.get(Static121.anInt3039); if ((anInt4999 & 0x1) != 0 && (local1142 == null || local951.getParam(local1142.defaultInt, Static121.anInt3039) != local1142.defaultInt)) { - add(Static246.anInt5393, (long) local240, JagString.concatenate(new JagString[] { aClass100_466, aClass100_947, local951.name }), x, (short) 39, aClass100_545, z); + add(anInt5393, (long) local240, JagString.concatenate(new JagString[] { aClass100_466, aClass100_947, local951.name }), x, (short) 39, aClass100_545, z); } } else { @Pc(997) JagString[] local997 = local951.ops; @@ -1300,7 +1312,7 @@ public class MiniMenu { } else if (Static241.aBoolean302) { @Pc(378) ParamType local378 = Static121.anInt3039 == -1 ? null : ParamTypeList.get(Static121.anInt3039); if ((anInt4999 & 0x2) != 0 && (local378 == null || arg0.getParam(Static121.anInt3039, local378.defaultInt) != local378.defaultInt)) { - add(Static246.anInt5393, (long) arg2, JagString.concatenate(new JagString[] {aClass100_466, aClass100_407, local35 }), arg1, (short) 45, aClass100_545, arg3); + add(anInt5393, (long) arg2, JagString.concatenate(new JagString[] {aClass100_466, aClass100_407, local35 }), arg1, (short) 45, aClass100_545, arg3); } } else { @Pc(129) JagString[] local129 = arg0.ops; @@ -1403,7 +1415,7 @@ public class MiniMenu { } @Pc(275) int local275; if (anInt5014 == 1) { - add(Static169.anInt4075, (long) arg0, JagString.concatenate(new JagString[] {aClass100_203, Static105.aClass100_561, string }), arg3, (short) 1, LocalizedText.USE, arg1); + add(Static169.anInt4075, (long) arg0, JagString.concatenate(new JagString[] {aClass100_203, aClass100_561, string }), arg3, (short) 1, LocalizedText.USE, arg1); } else if (!Static241.aBoolean302) { for (local275 = 7; local275 >= 0; local275--) { if (Player.options[local275] != null) { @@ -1428,7 +1440,7 @@ public class MiniMenu { } } } else if ((anInt4999 & 0x8) != 0) { - add(Static246.anInt5393, (long) arg0, JagString.concatenate(new JagString[] {aClass100_466, Static105.aClass100_561, string }), arg3, (short) 15, aClass100_545, arg1); + add(anInt5393, (long) arg0, JagString.concatenate(new JagString[] {aClass100_466, aClass100_561, string }), arg3, (short) 15, aClass100_545, arg1); } for (local275 = 0; local275 < size; local275++) { if (actions[local275] == 60) { @@ -1473,7 +1485,7 @@ public class MiniMenu { @OriginalMember(owner = "client!ud", name = "a", descriptor = "(ILclient!be;)Z") public static boolean method4265(@OriginalArg(1) Component arg0) { - if (arg0.anInt453 == 205) { + if (arg0.clientCode == 205) { Static267.anInt5775 = 250; return true; } else { diff --git a/client/src/main/java/rt4/Mouse.java b/client/src/main/java/rt4/Mouse.java index 2d77ef4..2b91718 100644 --- a/client/src/main/java/rt4/Mouse.java +++ b/client/src/main/java/rt4/Mouse.java @@ -21,9 +21,9 @@ public final class Mouse implements MouseListener, MouseMotionListener, FocusLis @OriginalMember(owner = "client!em", name = "y", descriptor = "I") public static int clickY = 0; @OriginalMember(owner = "client!sc", name = "v", descriptor = "I") - public static int anInt5032 = 0; + public static int lastMouseY = 0; @OriginalMember(owner = "client!rh", name = "o", descriptor = "I") - public static int anInt4873 = 0; + public static int lastMouseX = 0; @OriginalMember(owner = "client!he", name = "bb", descriptor = "Lclient!ug;") public static Mouse instance = new Mouse(); @OriginalMember(owner = "client!he", name = "Y", descriptor = "I") @@ -76,8 +76,8 @@ public final class Mouse implements MouseListener, MouseMotionListener, FocusLis @Pc(2) Mouse local2 = instance; synchronized (instance) { pressedButton = anInt1759; - anInt4873 = anInt3521; - anInt5032 = anInt4039; + lastMouseX = anInt3521; + lastMouseY = anInt4039; clickButton = anInt1313; clickX = anInt1034; anInt2467++; diff --git a/client/src/main/java/rt4/MouseRecorder.java b/client/src/main/java/rt4/MouseRecorder.java index 8eba383..2ee571d 100644 --- a/client/src/main/java/rt4/MouseRecorder.java +++ b/client/src/main/java/rt4/MouseRecorder.java @@ -35,8 +35,8 @@ public final class MouseRecorder implements Runnable { @Pc(12) Object local12 = this.lock; synchronized (this.lock) { if (this.samples < 500) { - this.x[this.samples] = Mouse.anInt4873; - this.y[this.samples] = Mouse.anInt5032; + this.x[this.samples] = Mouse.lastMouseX; + this.y[this.samples] = Mouse.lastMouseY; this.samples++; } } diff --git a/client/src/main/java/rt4/Player.java b/client/src/main/java/rt4/Player.java index 1e53f62..c027d5f 100644 --- a/client/src/main/java/rt4/Player.java +++ b/client/src/main/java/rt4/Player.java @@ -34,7 +34,9 @@ public final class Player extends PathingEntity { public static long name37; @OriginalMember(owner = "client!sm", name = "k", descriptor = "Lsignlink!im;") public static PrivilegedRequest lastLogAddress; - @OriginalMember(owner = "client!e", name = "Bc", descriptor = "Lclient!hh;") + @OriginalMember(owner = "client!ib", name = "l", descriptor = "I") + public static int anInt2863 = 0; + @OriginalMember(owner = "client!e", name = "Bc", descriptor = "Lclient!hh;") public PlayerAppearance appearance; @OriginalMember(owner = "client!e", name = "Mc", descriptor = "Lclient!na;") @@ -320,13 +322,13 @@ public final class Player extends PathingEntity { @Pc(102) int local102; if (client.modeWhat != 0 && local79 < 50) { local102 = 50 - local79; - while (Static105.anInt2863 < local102) { - Static51.aByteArrayArray8[Static105.anInt2863] = new byte[102400]; - Static105.anInt2863++; + while (anInt2863 < local102) { + Static51.aByteArrayArray8[anInt2863] = new byte[102400]; + anInt2863++; } - while (Static105.anInt2863 > local102) { - Static105.anInt2863--; - Static51.aByteArrayArray8[Static105.anInt2863] = null; + while (anInt2863 > local102) { + anInt2863--; + Static51.aByteArrayArray8[anInt2863] = null; } } if (local76 == null) { diff --git a/client/src/main/java/rt4/Protocol.java b/client/src/main/java/rt4/Protocol.java index bfb81d1..4668adb 100644 --- a/client/src/main/java/rt4/Protocol.java +++ b/client/src/main/java/rt4/Protocol.java @@ -1276,10 +1276,10 @@ public class Protocol { long ptr = (long) slot + ((long) parent << 32); ServerActiveProperties prev = (ServerActiveProperties) InterfaceList.properties.get(ptr); if (prev != null) { - properties = new ServerActiveProperties(prev.accessMask, value); + properties = new ServerActiveProperties(prev.events, value); prev.unlink(); } else if (slot == -1) { - properties = new ServerActiveProperties(InterfaceList.getComponent(parent).properties.accessMask, value); + properties = new ServerActiveProperties(InterfaceList.getComponent(parent).properties.events, value); } else { properties = new ServerActiveProperties(0, value); } @@ -2200,7 +2200,7 @@ public class Protocol { setVerifyId(tracknum); @Pc(5603) Component component = InterfaceList.getComponent(id); @Pc(5615) ObjType objType; - if (component.usingScripts) { + if (component.if3) { DelayedStateChange.method3707(id, slot, itemId); objType = ObjTypeList.get(itemId); DelayedStateChange.updateView(objType.zoom2d, id, objType.yAngle2d, objType.xAngle2d); @@ -2296,15 +2296,17 @@ public class Protocol { public static boolean readPacket() { try { return readPacketInternal(); - } catch (@Pc(14) IOException local14) { + } catch (@Pc(14) IOException ex) { + ex.printStackTrace(); Static175.method3279(); return true; - } catch (@Pc(19) Exception local19) { + } catch (@Pc(19) Exception ex) { + ex.printStackTrace(); @Pc(61) String local61 = "T2 - " + opcode + "," + opcode3 + "," + opcode4 + " - " + length + "," + (Camera.originX + PlayerList.self.movementQueueX[0]) + "," + (PlayerList.self.movementQueueZ[0] + Camera.originZ) + " - "; for (@Pc(63) int local63 = 0; local63 < length && local63 < 50; local63++) { local61 = local61 + inboundBuffer.data[local63] + ","; } - TracingException.report(local61, local19); + TracingException.report(local61, ex); LoginManager.processLogout(); return true; } @@ -2598,16 +2600,16 @@ public class Protocol { InterfaceList.redraw(component); } else if (type == 12) { component = InterfaceList.getComponent(i); - x = change.intArg1; + int scrollY = change.intArg1; if (component != null && component.type == 0) { - if (x > component.scrollMaxV - component.height) { - x = component.scrollMaxV - component.height; + if (scrollY > component.scrollMaxV - component.height) { + scrollY = component.scrollMaxV - component.height; } - if (x < 0) { - x = 0; + if (scrollY < 0) { + scrollY = 0; } - if (x != component.scrollY) { - component.scrollY = x; + if (scrollY != component.scrollY) { + component.scrollY = scrollY; InterfaceList.redraw(component); } } @@ -2624,74 +2626,79 @@ public class Protocol { } } Static178.anInt4247++; - if (MiniMenu.aClass13_7 != null) { + if (MiniMenu.pressedInventoryComponent != null) { MiniMenu.anInt2043++; if (MiniMenu.anInt2043 >= 15) { - InterfaceList.redraw(MiniMenu.aClass13_7); - MiniMenu.aClass13_7 = null; + InterfaceList.redraw(MiniMenu.pressedInventoryComponent); + MiniMenu.pressedInventoryComponent = null; } } - @Pc(1361) Component local1361; - if (Static118.aClass13_15 != null) { - InterfaceList.redraw(Static118.aClass13_15); - if (Static149.anInt3554 + 5 < Mouse.anInt4873 || Mouse.anInt4873 < Static149.anInt3554 - 5 || Static206.anInt4773 + 5 < Mouse.anInt5032 || Static206.anInt4773 - 5 > Mouse.anInt5032) { - Static123.aBoolean155 = true; + + @Pc(1361) Component component; + if (Static118.clickedInventoryComponent != null) { + InterfaceList.redraw(Static118.clickedInventoryComponent); + if (Static149.clickedInventoryComponentX + 5 < Mouse.lastMouseX || Mouse.lastMouseX < Static149.clickedInventoryComponentX - 5 || Static206.clickedInventoryComponentY + 5 < Mouse.lastMouseY || Static206.clickedInventoryComponentY - 5 > Mouse.lastMouseY) { + Static123.draggingClickedInventoryObject = true; } - Static78.anInt2145++; + Static78.clickedInventoryComponentCycle++; + if (Mouse.pressedButton == 0) { - if (Static123.aBoolean155 && Static78.anInt2145 >= 5) { - if (Static118.aClass13_15 == Static169.aClass13_18 && Static4.anInt36 != Static18.anInt588) { - local1361 = Static118.aClass13_15; - @Pc(1363) byte local1363 = 0; - if (Static179.anInt4254 == 1 && local1361.anInt453 == 206) { - local1363 = 1; + if (Static123.draggingClickedInventoryObject && Static78.clickedInventoryComponentCycle >= 5) { + if (Static118.clickedInventoryComponent == Static169.mouseOverInventoryInterface && Static4.mouseOverInventoryObjectIndex != Static18.clickedInventoryIndex) { + component = Static118.clickedInventoryComponent; + @Pc(1363) byte inserting = 0; + + if (VarpDomain.inserting == 1 && component.clientCode == 206) { + inserting = 1; } - if (local1361.objTypes[Static18.anInt588] <= 0) { - local1363 = 0; + + if (component.objTypes[Static18.clickedInventoryIndex] <= 0) { + inserting = 0; } - if (InterfaceList.getServerActiveProperties(local1361).isObjReplaceEnabled()) { - y = Static4.anInt36; - x = Static18.anInt588; - local1361.objTypes[x] = local1361.objTypes[y]; - local1361.objCounts[x] = local1361.objCounts[y]; - local1361.objTypes[y] = -1; - local1361.objCounts[y] = 0; - } else if (local1363 == 1) { - x = Static18.anInt588; - y = Static4.anInt36; - while (x != y) { - if (y > x) { - local1361.swapObjs(y - 1, y); - y--; - } else if (x > y) { - local1361.swapObjs(y + 1, y); - y++; + + if (InterfaceList.getServerActiveProperties(component).isObjReplaceEnabled()) { + int newIndex = Static4.mouseOverInventoryObjectIndex; + int currentIndex = Static18.clickedInventoryIndex; + component.objTypes[currentIndex] = component.objTypes[newIndex]; + component.objCounts[currentIndex] = component.objCounts[newIndex]; + component.objTypes[newIndex] = -1; + component.objCounts[newIndex] = 0; + } else if (inserting == 1) { + int currentIndex = Static18.clickedInventoryIndex; + int newIndex = Static4.mouseOverInventoryObjectIndex; + while (currentIndex != newIndex) { + if (currentIndex > newIndex) { + component.swapObjs(currentIndex - 1, currentIndex); + currentIndex--; + } else { + component.swapObjs(currentIndex + 1, currentIndex); + currentIndex++; } } } else { - local1361.swapObjs(Static18.anInt588, Static4.anInt36); + component.swapObjs(Static18.clickedInventoryIndex, Static4.mouseOverInventoryObjectIndex); } outboundBuffer.p1isaac(231); - outboundBuffer.p2(Static4.anInt36); - outboundBuffer.p4le2(Static118.aClass13_15.id); - outboundBuffer.p2add(Static18.anInt588); - outboundBuffer.p1sub(local1363); + outboundBuffer.p2(Static4.mouseOverInventoryObjectIndex); + outboundBuffer.p4le2(Static118.clickedInventoryComponent.id); + outboundBuffer.p2add(Static18.clickedInventoryIndex); + outboundBuffer.p1sub(inserting); } - } else if ((Static116.anInt2952 == 1 || MiniMenu.method4640(MiniMenu.size - 1)) && MiniMenu.size > 2) { + } else if ((VarpDomain.anInt2952 == 1 || MiniMenu.method4640(MiniMenu.size - 1)) && MiniMenu.size > 2) { Static226.method3901(); } else if (MiniMenu.size > 0) { Static59.method1372(); } Mouse.clickButton = 0; MiniMenu.anInt2043 = 10; - Static118.aClass13_15 = null; + Static118.clickedInventoryComponent = null; } } Static146.aBoolean174 = false; Static56.aClass13_12 = null; Static44.aBoolean83 = false; InterfaceList.keyQueueSize = 0; - local1361 = Static180.aClass13_22; + component = Static180.aClass13_22; Static180.aClass13_22 = null; @Pc(1508) Component local1508 = Static43.aClass13_11; Static43.aClass13_11 = null; @@ -2777,9 +2784,9 @@ public class Protocol { } MiniMenu.anInt1742 = -1; Static7.method843(); - if (Static180.aClass13_22 != local1361) { - if (local1361 != null) { - InterfaceList.redraw(local1361); + if (Static180.aClass13_22 != component) { + if (component != null) { + InterfaceList.redraw(component); } if (Static180.aClass13_22 != null) { InterfaceList.redraw(Static180.aClass13_22); diff --git a/client/src/main/java/rt4/ScriptRunner.java b/client/src/main/java/rt4/ScriptRunner.java index 773f0d8..eac2444 100644 --- a/client/src/main/java/rt4/ScriptRunner.java +++ b/client/src/main/java/rt4/ScriptRunner.java @@ -709,7 +709,7 @@ public final class ScriptRunner { throw new RuntimeException("Gap at:" + (int2 - 1)); } @Pc(1137) Component local1137 = new Component(); - local1137.usingScripts = true; + local1137.if3 = true; local1137.createdComponentId = int2; local1137.layer = local1137.id = local1063.id; local1137.type = int3; @@ -4357,13 +4357,13 @@ public final class ScriptRunner { if (opcode == Cs2Opcodes.toLower) { isp--; int1 = intStack[isp]; - intStack[isp++] = Static231.toLowerCase(int1); + intStack[isp++] = StringUtils.toLowerCase(int1); continue; } if (opcode == Cs2Opcodes.toUpper) { isp--; int1 = intStack[isp]; - intStack[isp++] = Static143.toUpperCase(int1); + intStack[isp++] = StringUtils.toUpperCase(int1); continue; } if (opcode == Cs2Opcodes.formatNumber) { @@ -4371,7 +4371,7 @@ public final class ScriptRunner { local12388 = intStack[isp] != 0; isp--; int3 = intStack[isp]; - stringStack[ssp++] = Static182.formatNumber(client.language, local12388, 0, (long) int3); + stringStack[ssp++] = StringUtils.formatNumber(client.language, local12388, 0, (long) int3); continue; } } diff --git a/client/src/main/java/rt4/ServerActiveProperties.java b/client/src/main/java/rt4/ServerActiveProperties.java index daa761b..eae27a8 100644 --- a/client/src/main/java/rt4/ServerActiveProperties.java +++ b/client/src/main/java/rt4/ServerActiveProperties.java @@ -11,61 +11,61 @@ public final class ServerActiveProperties extends Node { public final int anInt540; @OriginalMember(owner = "client!bf", name = "x", descriptor = "I") - public final int accessMask; + public final int events; @OriginalMember(owner = "client!bf", name = "", descriptor = "(II)V") public ServerActiveProperties(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { this.anInt540 = arg1; - this.accessMask = arg0; + this.events = arg0; } @OriginalMember(owner = "client!bf", name = "a", descriptor = "(IB)Z") public final boolean method503(@OriginalArg(0) int arg0) { - return (this.accessMask >> arg0 + 1 & 0x1) != 0; + return (this.events >> arg0 + 1 & 0x1) != 0; } @OriginalMember(owner = "client!bf", name = "d", descriptor = "(I)Z") public final boolean isObjReplaceEnabled() { - return (this.accessMask >> 29 & 0x1) != 0; + return (this.events >> 29 & 0x1) != 0; } @OriginalMember(owner = "client!bf", name = "e", descriptor = "(B)I") public final int method505() { - return this.accessMask >> 18 & 0x7; + return this.events >> 18 & 0x7; } @OriginalMember(owner = "client!bf", name = "e", descriptor = "(I)Z") public final boolean method506() { - return (this.accessMask & 0x1) != 0; + return (this.events & 0x1) != 0; } @OriginalMember(owner = "client!bf", name = "f", descriptor = "(I)Z") public final boolean method507() { - return (this.accessMask >> 31 & 0x1) != 0; + return (this.events >> 31 & 0x1) != 0; } @OriginalMember(owner = "client!bf", name = "g", descriptor = "(I)Z") public final boolean method508() { - return (this.accessMask >> 22 & 0x1) != 0; + return (this.events >> 22 & 0x1) != 0; } @OriginalMember(owner = "client!bf", name = "a", descriptor = "(Z)Z") public final boolean method509() { - return (this.accessMask >> 21 & 0x1) != 0; + return (this.events >> 21 & 0x1) != 0; } @OriginalMember(owner = "client!bf", name = "h", descriptor = "(I)Z") public final boolean isObjOpsEnabled() { - return (this.accessMask >> 30 & 0x1) != 0; + return (this.events >> 30 & 0x1) != 0; } @OriginalMember(owner = "client!bf", name = "f", descriptor = "(B)Z") public final boolean method511() { - return (this.accessMask >> 28 & 0x1) != 0; + return (this.events >> 28 & 0x1) != 0; } @OriginalMember(owner = "client!bf", name = "i", descriptor = "(I)I") public final int getTargetMask() { - return Static199.method3594(this.accessMask); + return Static199.method3594(this.events); } } diff --git a/client/src/main/java/rt4/Static1.java b/client/src/main/java/rt4/Static1.java index 443ad0a..300f743 100644 --- a/client/src/main/java/rt4/Static1.java +++ b/client/src/main/java/rt4/Static1.java @@ -55,7 +55,7 @@ public final class Static1 { if (local50.anInt5899 == -1) { continue; } - @Pc(61) GlTile local61 = Static243.method4212(local10, local50); + @Pc(61) GlTile local61 = method4212(local10, local50); @Pc(67) byte local67 = arg7[local12][local17]; @Pc(71) int[] local71 = Static228.anIntArrayArray35[local67]; local61.anInt2482 += local71.length / 2; @@ -230,7 +230,7 @@ public final class Static1 { @Pc(1077) boolean[] local1077 = aBooleanArrayArray4[local143 == local777 ? local129 : 0]; local1086 = aBooleanArrayArray4[local190 == local777 ? local168 : 0]; @Pc(1092) FloType local1092 = FloTypeList.method4395(local777 - 1); - @Pc(1097) GlTile local1097 = Static243.method4212(local10, local1092); + @Pc(1097) GlTile local1097 = method4212(local10, local1092); local1097.anInt2482 += 5; local1097.anInt2482 += local1077.length - 2; local1097.anInt2482 += local1055.length - 2; @@ -261,7 +261,7 @@ public final class Static1 { if (local1250.anInt5899 == -1) { continue; } - @Pc(1261) GlTile local1261 = Static243.method4212(local10, local1250); + @Pc(1261) GlTile local1261 = method4212(local10, local1250); @Pc(1267) byte local1267 = arg7[local12][local17]; @Pc(1273) byte local1273 = arg5[local12][local17]; local168 = Static19.method588(local1250.texture, local1250.anInt5899, arg6[local12][local17]); @@ -461,7 +461,7 @@ public final class Static1 { local1086 = aBooleanArrayArray4[local2003 == local190 ? local168 : 0]; @Pc(2318) boolean[] local2318 = aBooleanArrayArray4[local2003 == local180 ? local143 : 0]; @Pc(2324) FloType local2324 = FloTypeList.method4395(local2003 - 1); - @Pc(2329) GlTile local2329 = Static243.method4212(local10, local2324); + @Pc(2329) GlTile local2329 = method4212(local10, local2324); @Pc(2345) int local2345 = Static19.method588(local2324.texture, local2324.anInt5899, arg6[local12][local17]) << 8 | 0xFF; @Pc(2365) int local2365 = Static19.method588(local2324.texture, local2324.anInt5899, arg6[local12 + 1][local17]) << 8 | 0xFF; @Pc(2385) int local2385 = Static19.method588(local2324.texture, local2324.anInt5899, arg6[local12 + 1][local17 + 1]) << 8 | 0xFF; @@ -589,4 +589,15 @@ public final class Static1 { } } } + + @OriginalMember(owner = "client!tk", name = "a", descriptor = "(Lclient!sc;ZLclient!wl;)Lclient!hg;") + public static GlTile method4212(@OriginalArg(0) HashTable arg0, @OriginalArg(2) FloType arg1) { + @Pc(23) long local23 = (long) ((arg1.texture + 1 << 16) + arg1.anInt5885) + ((long) arg1.anInt5897 << 56) + ((long) arg1.anInt5889 << 32); + @Pc(38) GlTile local38 = (GlTile) arg0.get(local23); + if (local38 == null) { + local38 = new GlTile(arg1.texture, (float) arg1.anInt5885, true, false, arg1.anInt5889); + arg0.put(local38, local23); + } + return local38; + } } diff --git a/client/src/main/java/rt4/Static105.java b/client/src/main/java/rt4/Static105.java index 477d564..3e8b45a 100644 --- a/client/src/main/java/rt4/Static105.java +++ b/client/src/main/java/rt4/Static105.java @@ -6,15 +6,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static105 { - @OriginalMember(owner = "client!ib", name = "c", descriptor = "Lclient!qi;") - public static final ColorImageCacheEntry VALID = new ColorImageCacheEntry(0, 0); - - @OriginalMember(owner = "client!ib", name = "k", descriptor = "Lclient!na;") - public static final JagString aClass100_561 = JagString.parse(" )2> "); - - @OriginalMember(owner = "client!ib", name = "l", descriptor = "I") - public static int anInt2863 = 0; - @OriginalMember(owner = "client!ib", name = "a", descriptor = "(IIIIIIIILclient!th;IZJ)Z") public static boolean method2256(@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) Entity arg8, @OriginalArg(9) int arg9, @OriginalArg(10) boolean arg10, @OriginalArg(11) long arg11) { @Pc(6) boolean local6 = SceneGraph.tileHeights == SceneGraph.underwaterTileHeights; diff --git a/client/src/main/java/rt4/Static107.java b/client/src/main/java/rt4/Static107.java index 527f755..fa1da06 100644 --- a/client/src/main/java/rt4/Static107.java +++ b/client/src/main/java/rt4/Static107.java @@ -4,9 +4,6 @@ import org.openrs2.deob.annotation.OriginalMember; public final class Static107 { - @OriginalMember(owner = "client!id", name = "k", descriptor = "I") - public static int anInt2878; - @OriginalMember(owner = "client!id", name = "b", descriptor = "I") public static int anInt2875 = -1; diff --git a/client/src/main/java/rt4/Static110.java b/client/src/main/java/rt4/Static110.java deleted file mode 100644 index 67a1e77..0000000 --- a/client/src/main/java/rt4/Static110.java +++ /dev/null @@ -1,13 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalArg; -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static110 { - - @OriginalMember(owner = "client!ih", name = "a", descriptor = "(I[Lclient!hg;)V") - public static void method2280(@OriginalArg(0) int arg0, @OriginalArg(1) GlTile[] arg1) { - SceneGraph.underwaterHdTiles[arg0] = arg1; - } - -} diff --git a/client/src/main/java/rt4/Static111.java b/client/src/main/java/rt4/Static111.java index 3f404cf..2b0a87f 100644 --- a/client/src/main/java/rt4/Static111.java +++ b/client/src/main/java/rt4/Static111.java @@ -33,7 +33,7 @@ public final class Static111 { } else { arg0.x = arg2 - (arg2 * arg0.baseX >> 14) - arg0.width; } - if (!Static121.aBoolean154 || InterfaceList.getServerActiveProperties(arg0).accessMask == 0 && arg0.type != 0) { + if (!Static121.qaOpTest || InterfaceList.getServerActiveProperties(arg0).events == 0 && arg0.type != 0) { return; } if (arg0.y < 0) { diff --git a/client/src/main/java/rt4/Static112.java b/client/src/main/java/rt4/Static112.java index 3cb5335..5c68768 100644 --- a/client/src/main/java/rt4/Static112.java +++ b/client/src/main/java/rt4/Static112.java @@ -52,8 +52,8 @@ public final class Static112 { } else { SoftwareRaster.fillRectAlpha(local3, local9 + 20, local13, local11 - 20, Static40.anInt1275, 256 - Static40.anInt2910); } - local114 = Mouse.anInt5032; - local112 = Mouse.anInt4873; + local114 = Mouse.lastMouseY; + local112 = Mouse.lastMouseX; @Pc(203) int local203; @Pc(219) int local219; for (local203 = 0; local203 < MiniMenu.size; local203++) { diff --git a/client/src/main/java/rt4/Static116.java b/client/src/main/java/rt4/Static116.java index bcdf668..afebe97 100644 --- a/client/src/main/java/rt4/Static116.java +++ b/client/src/main/java/rt4/Static116.java @@ -1,10 +1,5 @@ package rt4; -import org.openrs2.deob.annotation.OriginalMember; - public final class Static116 { - @OriginalMember(owner = "client!jb", name = "n", descriptor = "I") - public static int anInt2952 = 0; - } diff --git a/client/src/main/java/rt4/Static118.java b/client/src/main/java/rt4/Static118.java index 50f539d..218a060 100644 --- a/client/src/main/java/rt4/Static118.java +++ b/client/src/main/java/rt4/Static118.java @@ -7,15 +7,15 @@ import org.openrs2.deob.annotation.Pc; public final class Static118 { @OriginalMember(owner = "client!jd", name = "i", descriptor = "Lclient!be;") - public static Component aClass13_15; + public static Component clickedInventoryComponent; @OriginalMember(owner = "client!jd", name = "a", descriptor = "(II[Lclient!be;)V") public static void method2354(@OriginalArg(1) int arg0, @OriginalArg(2) Component[] arg1) { for (@Pc(7) int local7 = 0; local7 < arg1.length; local7++) { @Pc(15) Component local15 = arg1[local7]; - if (local15 != null && local15.layer == arg0 && (!local15.usingScripts || !Static36.method947(local15))) { + if (local15 != null && local15.layer == arg0 && (!local15.if3 || !Static36.method947(local15))) { if (local15.type == 0) { - if (!local15.usingScripts && Static36.method947(local15) && local15 != Static180.aClass13_22) { + if (!local15.if3 && Static36.method947(local15) && local15 != Static180.aClass13_22) { continue; } method2354(local15.id, arg1); @@ -61,7 +61,7 @@ public final class Static118 { } } } - if (local15.modelRotationSpeed != 0 && !local15.usingScripts) { + if (local15.modelRotationSpeed != 0 && !local15.if3) { @Pc(239) int local239 = local15.modelRotationSpeed >> 16; @Pc(243) int local243 = local239 * Static178.anInt4247; local105 = local15.modelRotationSpeed << 16 >> 16; diff --git a/client/src/main/java/rt4/Static12.java b/client/src/main/java/rt4/Static12.java deleted file mode 100644 index ec19519..0000000 --- a/client/src/main/java/rt4/Static12.java +++ /dev/null @@ -1,10 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static12 { - - @OriginalMember(owner = "client!bb", name = "M", descriptor = "I") - public static int anInt406; - -} diff --git a/client/src/main/java/rt4/Static121.java b/client/src/main/java/rt4/Static121.java index b395a20..ffd1ce4 100644 --- a/client/src/main/java/rt4/Static121.java +++ b/client/src/main/java/rt4/Static121.java @@ -12,16 +12,13 @@ public final class Static121 { @OriginalMember(owner = "client!jg", name = "b", descriptor = "I") public static int anInt3039; - @OriginalMember(owner = "client!jg", name = "g", descriptor = "I") - public static int anInt3041; - - @OriginalMember(owner = "client!jg", name = "e", descriptor = "Z") - public static boolean aBoolean154 = false; + @OriginalMember(owner = "client!jg", name = "e", descriptor = "Z") + public static boolean qaOpTest = false; @OriginalMember(owner = "client!jg", name = "a", descriptor = "(IBIII)V") public static void method2407(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { - for (@Pc(3) int local3 = 0; local3 < InterfaceList.anInt766; local3++) { - if (arg0 < Static264.anIntArray410[local3] + Static224.anIntArray443[local3] && arg0 + arg3 > Static264.anIntArray410[local3] && Static50.anIntArray133[local3] + Static67.anIntArray320[local3] > arg1 && Static50.anIntArray133[local3] < arg2 + arg1) { + for (@Pc(3) int local3 = 0; local3 < InterfaceList.rectangles; local3++) { + if (arg0 < InterfaceList.rectangleX[local3] + InterfaceList.rectangleWidth[local3] && arg0 + arg3 > InterfaceList.rectangleX[local3] && InterfaceList.rectangleY[local3] + InterfaceList.rectangleHeight[local3] > arg1 && InterfaceList.rectangleY[local3] < arg2 + arg1) { InterfaceList.rectangleRedraw[local3] = true; } } diff --git a/client/src/main/java/rt4/Static123.java b/client/src/main/java/rt4/Static123.java index e505c7b..07286de 100644 --- a/client/src/main/java/rt4/Static123.java +++ b/client/src/main/java/rt4/Static123.java @@ -9,7 +9,7 @@ public final class Static123 { public static int anInt3058 = 0; @OriginalMember(owner = "client!jj", name = "j", descriptor = "Z") - public static boolean aBoolean155 = false; + public static boolean draggingClickedInventoryObject = false; @OriginalMember(owner = "client!ml", name = "K", descriptor = "I") public static int anInt3947; diff --git a/client/src/main/java/rt4/Static124.java b/client/src/main/java/rt4/Static124.java index ab45e93..63fb549 100644 --- a/client/src/main/java/rt4/Static124.java +++ b/client/src/main/java/rt4/Static124.java @@ -1,56 +1,10 @@ package rt4; -import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; public final class Static124 { @OriginalMember(owner = "client!jk", name = "p", descriptor = "I") public static int anInt3075 = -1; - @OriginalMember(owner = "client!jk", name = "y", descriptor = "Z") - public static boolean aBoolean156 = false; - - @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; - while (true) { - @Pc(16) int local16 = local10.gVarSmart(); - if (local16 == 0) { - return; - } - local12 += local16; - @Pc(27) int local27 = 0; - while (true) { - @Pc(31) int local31 = local10.gSmart1or2(); - if (local31 == 0) { - break; - } - local27 += local31 - 1; - @Pc(46) int local46 = local27 & 0x3F; - @Pc(50) int local50 = local27 >> 12; - @Pc(56) int local56 = local27 >> 6 & 0x3F; - @Pc(60) int local60 = local10.g1(); - @Pc(64) int local64 = local60 >> 2; - @Pc(68) int local68 = local60 & 0x3; - @Pc(72) int local72 = arg0 + local56; - @Pc(76) int local76 = local46 + arg3; - if (local72 > 0 && local76 > 0 && local72 < 103 && local76 < 103) { - @Pc(90) CollisionMap local90 = null; - if (!arg1) { - @Pc(95) int local95 = local50; - if ((SceneGraph.tileFlags[1][local72][local76] & 0x2) == 2) { - local95 = local50 - 1; - } - if (local95 >= 0) { - local90 = arg4[local95]; - } - } - Static185.method3397(local50, !arg1, local50, arg1, local90, local12, local64, local72, local76, local68); - } - } - } - } } diff --git a/client/src/main/java/rt4/Static126.java b/client/src/main/java/rt4/Static126.java index ec49164..88f4cde 100644 --- a/client/src/main/java/rt4/Static126.java +++ b/client/src/main/java/rt4/Static126.java @@ -10,7 +10,7 @@ public final class Static126 { if (InterfaceList.topLevelInterface != -1) { Static96.method1949(InterfaceList.topLevelInterface); } - for (@Pc(15) int local15 = 0; local15 < InterfaceList.anInt766; local15++) { + for (@Pc(15) int local15 = 0; local15 < InterfaceList.rectangles; local15++) { if (Static186.aBooleanArray100[local15]) { InterfaceList.rectangleRedraw[local15] = true; } @@ -18,14 +18,14 @@ public final class Static126 { Static186.aBooleanArray100[local15] = false; } Static97.anInt2503 = -1; - Static169.aClass13_18 = null; + Static169.mouseOverInventoryInterface = null; Static182.anInt4311 = client.loop; if (GlRenderer.enabled) { Static263.aBoolean299 = true; } Static214.anInt5574 = -1; if (InterfaceList.topLevelInterface != -1) { - InterfaceList.anInt766 = 0; + InterfaceList.rectangles = 0; Static9.method182(); } if (GlRenderer.enabled) { diff --git a/client/src/main/java/rt4/Static128.java b/client/src/main/java/rt4/Static128.java deleted file mode 100644 index 09a7fea..0000000 --- a/client/src/main/java/rt4/Static128.java +++ /dev/null @@ -1,5 +0,0 @@ -package rt4; - -public final class Static128 { - -} diff --git a/client/src/main/java/rt4/Static133.java b/client/src/main/java/rt4/Static133.java index b552319..59f49eb 100644 --- a/client/src/main/java/rt4/Static133.java +++ b/client/src/main/java/rt4/Static133.java @@ -17,8 +17,8 @@ public final class Static133 { @OriginalMember(owner = "client!kf", name = "a", descriptor = "(IIBII)V") public static void method4012(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3) { - for (@Pc(12) int local12 = 0; local12 < InterfaceList.anInt766; local12++) { - if (Static224.anIntArray443[local12] + Static264.anIntArray410[local12] > arg0 && arg1 + arg0 > Static264.anIntArray410[local12] && arg2 < Static67.anIntArray320[local12] + Static50.anIntArray133[local12] && Static50.anIntArray133[local12] < arg2 + arg3) { + for (@Pc(12) int local12 = 0; local12 < InterfaceList.rectangles; local12++) { + if (InterfaceList.rectangleWidth[local12] + InterfaceList.rectangleX[local12] > arg0 && arg1 + arg0 > InterfaceList.rectangleX[local12] && arg2 < InterfaceList.rectangleHeight[local12] + InterfaceList.rectangleY[local12] && InterfaceList.rectangleY[local12] < arg2 + arg3) { Static186.aBooleanArray100[local12] = true; } } diff --git a/client/src/main/java/rt4/Static143.java b/client/src/main/java/rt4/Static143.java index 0ba9324..3e70874 100644 --- a/client/src/main/java/rt4/Static143.java +++ b/client/src/main/java/rt4/Static143.java @@ -1,6 +1,5 @@ package rt4; -import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; public final class Static143 { @@ -17,25 +16,4 @@ public final class Static143 { @OriginalMember(owner = "client!ld", name = "i", descriptor = "I") public static int anInt3486 = 0; - @OriginalMember(owner = "client!ld", name = "a", descriptor = "(IIIIZI)V") - public static void method2731(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4) { - Static230.anInt5158 = arg1; - Static59.anInt1815 = arg4; - Static254.anInt5559 = arg0; - Static12.anInt406 = arg3; - Static199.anInt4675 = arg2; - } - - @OriginalMember(owner = "client!ld", name = "a", descriptor = "(IB)I") - public static int toUpperCase(@OriginalArg(0) int arg0) { - if (arg0 >= 97 && arg0 <= 122 || arg0 >= 224 && arg0 <= 254 && arg0 != 247) { - return arg0 - 32; - } else if (arg0 == 255) { - return 159; - } else if (arg0 == 156) { - return 140; - } else { - return arg0; - } - } } diff --git a/client/src/main/java/rt4/Static144.java b/client/src/main/java/rt4/Static144.java deleted file mode 100644 index c6c6cba..0000000 --- a/client/src/main/java/rt4/Static144.java +++ /dev/null @@ -1,10 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static144 { - - @OriginalMember(owner = "client!le", name = "c", descriptor = "Lclient!rf;") - public static Song aClass3_Sub29_1; - -} diff --git a/client/src/main/java/rt4/Static145.java b/client/src/main/java/rt4/Static145.java index 0dcf164..0709e0c 100644 --- a/client/src/main/java/rt4/Static145.java +++ b/client/src/main/java/rt4/Static145.java @@ -68,8 +68,8 @@ public final class Static145 { SoftwareRaster.drawRect(local11 + 1, local3 + 18, local9 - 2, local15 + -19, 0); } Fonts.b12Full.renderLeft(LocalizedText.CHOOSE_OPTION, local11 + 3, local3 + 14, 6116423, -1); - @Pc(96) int local96 = Mouse.anInt5032; - @Pc(98) int local98 = Mouse.anInt4873; + @Pc(96) int local96 = Mouse.lastMouseY; + @Pc(98) int local98 = Mouse.lastMouseX; for (@Pc(107) int local107 = 0; local107 < MiniMenu.size; local107++) { @Pc(127) int local127 = (MiniMenu.size - local107 - 1) * 15 + local3 + 31; @Pc(129) int local129 = 16777215; diff --git a/client/src/main/java/rt4/Static149.java b/client/src/main/java/rt4/Static149.java index ca07b63..5e5b7d8 100644 --- a/client/src/main/java/rt4/Static149.java +++ b/client/src/main/java/rt4/Static149.java @@ -8,7 +8,7 @@ public final class Static149 { public static int anInt3555; @OriginalMember(owner = "client!lj", name = "w", descriptor = "I") - public static int anInt3554 = 0; + public static int clickedInventoryComponentX = 0; @OriginalMember(owner = "client!lj", name = "z", descriptor = "[I") public static int[] anIntArray338 = new int[2]; diff --git a/client/src/main/java/rt4/Static150.java b/client/src/main/java/rt4/Static150.java index ec4a2ca..af6c19d 100644 --- a/client/src/main/java/rt4/Static150.java +++ b/client/src/main/java/rt4/Static150.java @@ -45,7 +45,7 @@ public final class Static150 { if (arg2.dynamicHeightValue == 4) { arg2.height = arg2.aspectHeight * arg2.width / arg2.aspectWidth; } - if (Static121.aBoolean154 && (InterfaceList.getServerActiveProperties(arg2).accessMask != 0 || arg2.type == 0)) { + if (Static121.qaOpTest && (InterfaceList.getServerActiveProperties(arg2).events != 0 || arg2.type == 0)) { if (arg2.height < 5 && arg2.width < 5) { arg2.height = 5; arg2.width = 5; @@ -58,7 +58,7 @@ public final class Static150 { } } } - if (arg2.anInt453 == 1337) { + if (arg2.clientCode == 1337) { Static280.aClass13_26 = arg2; } if (arg3 && arg2.onResize != null && (local4 != arg2.width || arg2.height != local7)) { diff --git a/client/src/main/java/rt4/Static169.java b/client/src/main/java/rt4/Static169.java index 1cf54bd..c2bbaad 100644 --- a/client/src/main/java/rt4/Static169.java +++ b/client/src/main/java/rt4/Static169.java @@ -8,7 +8,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static169 { @OriginalMember(owner = "client!nf", name = "h", descriptor = "Lclient!be;") - public static Component aClass13_18; + public static Component mouseOverInventoryInterface; @OriginalMember(owner = "client!nf", name = "i", descriptor = "I") public static int anInt4075 = -1; diff --git a/client/src/main/java/rt4/Static179.java b/client/src/main/java/rt4/Static179.java index 308419f..4c0d21c 100644 --- a/client/src/main/java/rt4/Static179.java +++ b/client/src/main/java/rt4/Static179.java @@ -1,10 +1,5 @@ package rt4; -import org.openrs2.deob.annotation.OriginalMember; - public final class Static179 { - @OriginalMember(owner = "client!oe", name = "b", descriptor = "I") - public static int anInt4254 = 0; - } diff --git a/client/src/main/java/rt4/Static18.java b/client/src/main/java/rt4/Static18.java index a2aaefa..5e67c23 100644 --- a/client/src/main/java/rt4/Static18.java +++ b/client/src/main/java/rt4/Static18.java @@ -7,7 +7,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static18 { @OriginalMember(owner = "client!bh", name = "t", descriptor = "I") - public static int anInt588 = 0; + public static int clickedInventoryIndex = 0; @OriginalMember(owner = "client!bh", name = "C", descriptor = "Lclient!na;") public static final JagString COMPLETE_PERCENT = JagString.parse("
(X100(U(Y"); diff --git a/client/src/main/java/rt4/Static182.java b/client/src/main/java/rt4/Static182.java index b131e12..6b48f52 100644 --- a/client/src/main/java/rt4/Static182.java +++ b/client/src/main/java/rt4/Static182.java @@ -13,65 +13,13 @@ public final class Static182 { @OriginalMember(owner = "client!oj", name = "t", descriptor = "[I") public static int[] anIntArray372; - @OriginalMember(owner = "client!oj", name = "p", descriptor = "I") - public static final int anInt4306 = 2301979; - - @OriginalMember(owner = "client!oj", name = "v", descriptor = "I") + @OriginalMember(owner = "client!oj", name = "v", descriptor = "I") public static int anInt4311 = -2; @OriginalMember(owner = "client!oj", name = "z", descriptor = "[Z") public static final boolean[] aBooleanArray97 = new boolean[] { true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, false }; - @OriginalMember(owner = "client!oj", name = "a", descriptor = "(IZIJI)Lclient!na;") - public static JagString formatNumber(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(3) long arg3) { - @Pc(9) JagString local9 = Static87.allocate(0); - if (arg3 < 0L) { - arg3 = -arg3; - local9.method3113(Static73.aClass100_453); - } - @Pc(26) JagString local26 = aClass100_1017; - @Pc(28) JagString local28 = aClass100_185; - if (arg0 == 1) { - local26 = aClass100_185; - local28 = aClass100_1017; - } - if (arg0 == 2) { - local28 = aClass100_1017; - local26 = Static26.aClass100_160; - } - if (arg0 == 3) { - local26 = aClass100_185; - local28 = aClass100_1017; - } - @Pc(59) JagString local59 = Static87.allocate(0); - @Pc(61) int local61; - for (local61 = 0; local61 < arg2; local61++) { - local59.method3113(JagString.parseInt((int) (arg3 % 10L))); - arg3 /= 10L; - } - local61 = 0; - @Pc(137) JagString local137; - if (arg3 == 0L) { - local137 = Static6.aClass100_17; - } else { - @Pc(95) JagString local95 = Static87.allocate(0); - while (arg3 > 0L) { - if (arg1 && local61 != 0 && local61 % 3 == 0) { - local95.method3113(local26); - } - local95.method3113(JagString.parseInt((int) (arg3 % 10L))); - local61++; - arg3 /= 10L; - } - local137 = local95; - } - if (local59.length() > 0) { - local59.method3113(local28); - } - return JagString.concatenate(new JagString[] { local9, local137.method3124(), local59.method3124() }); - } - - @OriginalMember(owner = "client!oj", name = "a", descriptor = "(IBI[[III)I") + @OriginalMember(owner = "client!oj", name = "a", descriptor = "(IBI[[III)I") public static int method3361(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int[][] arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) { @Pc(25) int local25 = arg0 * arg2[arg3 + 1][arg1] + (128 - arg0) * arg2[arg3][arg1] >> 7; @Pc(52) int local52 = arg2[arg3][arg1 + 1] * (128 - arg0) + arg2[arg3 + 1][arg1 + 1] * arg0 >> 7; diff --git a/client/src/main/java/rt4/Static199.java b/client/src/main/java/rt4/Static199.java index 7fba1e4..cac9171 100644 --- a/client/src/main/java/rt4/Static199.java +++ b/client/src/main/java/rt4/Static199.java @@ -5,9 +5,6 @@ import org.openrs2.deob.annotation.OriginalMember; public final class Static199 { - @OriginalMember(owner = "client!qc", name = "cb", descriptor = "I") - public static int anInt4675; - @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/Static2.java b/client/src/main/java/rt4/Static2.java index 79a8802..63b57a3 100644 --- a/client/src/main/java/rt4/Static2.java +++ b/client/src/main/java/rt4/Static2.java @@ -64,7 +64,7 @@ public final class Static2 { @OriginalMember(owner = "client!aa", name = "a", descriptor = "(BLclient!be;)V") public static void method13(@OriginalArg(1) Component arg0) { - @Pc(16) int local16 = arg0.anInt453; + @Pc(16) int local16 = arg0.clientCode; if (local16 == 324) { if (Static158.anInt3851 == -1) { Static158.anInt3851 = arg0.spriteId; diff --git a/client/src/main/java/rt4/Static206.java b/client/src/main/java/rt4/Static206.java index 4f2c533..d697438 100644 --- a/client/src/main/java/rt4/Static206.java +++ b/client/src/main/java/rt4/Static206.java @@ -16,7 +16,7 @@ public final class Static206 { public static final JagString aClass100_900 = JagString.parse("tbrefresh"); @OriginalMember(owner = "client!qk", name = "f", descriptor = "I") - public static int anInt4773 = 0; + public static int clickedInventoryComponentY = 0; @OriginalMember(owner = "client!qk", name = "h", descriptor = "I") public static int anInt4774 = 0; diff --git a/client/src/main/java/rt4/Static219.java b/client/src/main/java/rt4/Static219.java index af36b27..2c4062d 100644 --- a/client/src/main/java/rt4/Static219.java +++ b/client/src/main/java/rt4/Static219.java @@ -29,10 +29,7 @@ public final class Static219 { @OriginalMember(owner = "client!rl", name = "Y", descriptor = "[Lclient!na;") public static final JagString[] aClass100Array149 = new JagString[] { aClass100_927, aClass100_922, aClass100_926, aClass100_924, aClass100_925, aClass100_923, aClass100_921 }; - @OriginalMember(owner = "client!rl", name = "Z", descriptor = "I") - public static final int anInt4938 = 7759444; - - @OriginalMember(owner = "client!rl", name = "eb", descriptor = "Lclient!na;") + @OriginalMember(owner = "client!rl", name = "eb", descriptor = "Lclient!na;") public static final JagString aClass100_928 = JagString.parse("(U0a )2 in: "); @OriginalMember(owner = "client!rl", name = "i", descriptor = "(I)V") diff --git a/client/src/main/java/rt4/Static221.java b/client/src/main/java/rt4/Static221.java index 175beb4..d8e4834 100644 --- a/client/src/main/java/rt4/Static221.java +++ b/client/src/main/java/rt4/Static221.java @@ -15,9 +15,9 @@ public final class Static221 { @OriginalMember(owner = "client!s", name = "b", descriptor = "(III)V") public static void method3392(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { - if (Static250.anInt5434 > 0) { - Static267.method4528(Static250.anInt5434); - Static250.anInt5434 = 0; + if (Flames.anInt5434 > 0) { + Static267.method4528(Flames.anInt5434); + Flames.anInt5434 = 0; } @Pc(20) int local20 = 0; @Pc(24) int local24 = SoftwareRaster.width * arg1; diff --git a/client/src/main/java/rt4/Static224.java b/client/src/main/java/rt4/Static224.java index 25f5c0e..16d4de1 100644 --- a/client/src/main/java/rt4/Static224.java +++ b/client/src/main/java/rt4/Static224.java @@ -12,9 +12,6 @@ public final class Static224 { @OriginalMember(owner = "client!sd", name = "T", descriptor = "I") public static int anInt5064 = 0; - @OriginalMember(owner = "client!sd", name = "V", descriptor = "[I") - public static final int[] anIntArray443 = new int[100]; - @OriginalMember(owner = "client!sd", name = "c", descriptor = "(II)V") public static void method3884(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { @Pc(7) Tile local7 = SceneGraph.tiles[0][arg0][arg1]; diff --git a/client/src/main/java/rt4/Static227.java b/client/src/main/java/rt4/Static227.java deleted file mode 100644 index 16cef90..0000000 --- a/client/src/main/java/rt4/Static227.java +++ /dev/null @@ -1,10 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static227 { - - @OriginalMember(owner = "client!sg", name = "e", descriptor = "Lclient!na;") - public static final JagString SETTINGS = JagString.parse("settings"); - -} diff --git a/client/src/main/java/rt4/Static230.java b/client/src/main/java/rt4/Static230.java index ddc5a46..ffb966d 100644 --- a/client/src/main/java/rt4/Static230.java +++ b/client/src/main/java/rt4/Static230.java @@ -1,6 +1,5 @@ package rt4; -import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; import org.openrs2.deob.annotation.OriginalArg; @@ -27,10 +26,8 @@ public final class Static230 { public static final JagString aClass100_946 = JagString.parse("(R"); @OriginalMember(owner = "client!fb", name = "i", descriptor = "Lclient!na;") public static final JagString aClass100_431 = JagString.parse("; Max)2Age="); - @OriginalMember(owner = "client!sj", name = "D", descriptor = "I") - public static int anInt5158; - @OriginalMember(owner = "client!sj", name = "p", descriptor = "I") + @OriginalMember(owner = "client!sj", name = "p", descriptor = "I") public static int anInt5150 = 1; @OriginalMember(owner = "client!sj", name = "u", descriptor = "Z") diff --git a/client/src/main/java/rt4/Static231.java b/client/src/main/java/rt4/Static231.java index 2237538..6f31cd8 100644 --- a/client/src/main/java/rt4/Static231.java +++ b/client/src/main/java/rt4/Static231.java @@ -70,17 +70,4 @@ public final class Static231 { } } - @OriginalMember(owner = "client!sk", name = "c", descriptor = "(II)I") - public static int toLowerCase(@OriginalArg(1) int arg0) { - if (arg0 >= 65 && arg0 <= 90 || arg0 >= 192 && arg0 <= 222 && arg0 != 215) { - return arg0 + 32; - } else if (arg0 == 159) { - return 255; - } else if (arg0 == 140) { - return 156; - } else { - return arg0; - } - } - } diff --git a/client/src/main/java/rt4/Static24.java b/client/src/main/java/rt4/Static24.java index a5c3953..9acbeef 100644 --- a/client/src/main/java/rt4/Static24.java +++ b/client/src/main/java/rt4/Static24.java @@ -1,23 +1,10 @@ package rt4; -import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; public final class Static24 { @OriginalMember(owner = "client!bn", name = "O", descriptor = "I") public static int anInt761; - @OriginalMember(owner = "client!bn", name = "a", descriptor = "(III)I") - public static int method667(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { - @Pc(8) int local8 = 0; - while (arg0 > 0) { - local8 = local8 << 1 | arg1 & 0x1; - arg1 >>>= 0x1; - arg0--; - } - return local8; - } - } diff --git a/client/src/main/java/rt4/Static240.java b/client/src/main/java/rt4/Static240.java deleted file mode 100644 index 199d044..0000000 --- a/client/src/main/java/rt4/Static240.java +++ /dev/null @@ -1,10 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static240 { - - @OriginalMember(owner = "client!tg", name = "e", descriptor = "Lclient!na;") - public static final JagString aClass100_1008 = JagString.parse(""); - -} diff --git a/client/src/main/java/rt4/Static243.java b/client/src/main/java/rt4/Static243.java index 7f71599..c024d33 100644 --- a/client/src/main/java/rt4/Static243.java +++ b/client/src/main/java/rt4/Static243.java @@ -1,23 +1,10 @@ package rt4; -import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; -import org.openrs2.deob.annotation.Pc; public final class Static243 { @OriginalMember(owner = "client!tk", name = "K", descriptor = "[I") public static int[] anIntArray476 = new int[2]; - @OriginalMember(owner = "client!tk", name = "a", descriptor = "(Lclient!sc;ZLclient!wl;)Lclient!hg;") - public static GlTile method4212(@OriginalArg(0) HashTable arg0, @OriginalArg(2) FloType arg1) { - @Pc(23) long local23 = (long) ((arg1.texture + 1 << 16) + arg1.anInt5885) + ((long) arg1.anInt5897 << 56) + ((long) arg1.anInt5889 << 32); - @Pc(38) GlTile local38 = (GlTile) arg0.get(local23); - if (local38 == null) { - local38 = new GlTile(arg1.texture, (float) arg1.anInt5885, true, false, arg1.anInt5889); - arg0.put(local38, local23); - } - return local38; - } - } diff --git a/client/src/main/java/rt4/Static246.java b/client/src/main/java/rt4/Static246.java deleted file mode 100644 index d5ee9f8..0000000 --- a/client/src/main/java/rt4/Static246.java +++ /dev/null @@ -1,10 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static246 { - - @OriginalMember(owner = "client!u", name = "i", descriptor = "I") - public static int anInt5393; - -} diff --git a/client/src/main/java/rt4/Static247.java b/client/src/main/java/rt4/Static247.java index d459070..c177392 100644 --- a/client/src/main/java/rt4/Static247.java +++ b/client/src/main/java/rt4/Static247.java @@ -681,7 +681,7 @@ public final class Static247 { MiniMenu.anInt2512 = arg0; MiniMenu.anInt4999 = arg2; Static241.aBoolean302 = true; - Static246.anInt5393 = arg4; + MiniMenu.anInt5393 = arg4; Static35.anInt1092 = arg5; InterfaceList.redraw(local8); } diff --git a/client/src/main/java/rt4/Static250.java b/client/src/main/java/rt4/Static250.java deleted file mode 100644 index c0c2297..0000000 --- a/client/src/main/java/rt4/Static250.java +++ /dev/null @@ -1,19 +0,0 @@ -package rt4; - -import org.openrs2.deob.annotation.OriginalMember; - -public final class Static250 { - - @OriginalMember(owner = "client!uf", name = "p", descriptor = "I") - public static int anInt5443; - - @OriginalMember(owner = "client!uf", name = "e", descriptor = "I") - public static int anInt5434 = 0; - - @OriginalMember(owner = "client!uf", name = "q", descriptor = "Lclient!na;") - public static final JagString aClass100_1042 = JagString.parse("Null"); - - @OriginalMember(owner = "client!uf", name = "t", descriptor = "I") - public static int anInt5444 = 0; - -} diff --git a/client/src/main/java/rt4/Static253.java b/client/src/main/java/rt4/Static253.java index e389725..372822e 100644 --- a/client/src/main/java/rt4/Static253.java +++ b/client/src/main/java/rt4/Static253.java @@ -12,6 +12,16 @@ public final class Static253 { public static int anInt5854 = 0; @OriginalMember(owner = "client!kk", name = "j", descriptor = "I") public static int anInt3325 = 0; + @OriginalMember(owner = "client!sj", name = "D", descriptor = "I") + public static int anInt5158; + @OriginalMember(owner = "client!ej", name = "X", descriptor = "I") + public static int anInt1815; + @OriginalMember(owner = "client!uj", name = "H", descriptor = "I") + public static int anInt5559; + @OriginalMember(owner = "client!bb", name = "M", descriptor = "I") + public static int anInt406; + @OriginalMember(owner = "client!qc", name = "cb", descriptor = "I") + public static int anInt4675; @OriginalMember(owner = "client!ui", name = "a", descriptor = "(IIZIII)V") public static void method4326(@OriginalArg(1) int arg0, @OriginalArg(2) boolean arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4) { @@ -120,12 +130,12 @@ public final class Static253 { } LightingManager.method2394(client.loop, !Preferences.flickeringEffectsOn); GlRenderer.clearColorAndDepthBuffers(local171); - Static143.method2731(Camera.cameraPitch, Camera.renderZ, Static5.anInt40, Camera.renderX, Camera.cameraYaw); + method2731(Camera.cameraPitch, Camera.renderZ, Static5.anInt40, Camera.renderX, Camera.cameraYaw); GlRenderer.anInt5323 = client.loop; Static156.method2954(Camera.renderX, Static5.anInt40, Camera.renderZ, Camera.cameraPitch, Camera.cameraYaw, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Player.level + 1, local387, PlayerList.self.xFine >> 7, PlayerList.self.zFine >> 7); Static263.aBoolean299 = true; LightingManager.method2390(); - Static143.method2731(0, 0, 0, 0, 0); + method2731(0, 0, 0, 0, 0); client.audioLoop(); Static223.method3858(); method2726(arg4, arg3, arg2, Static115.anInt5029, arg0, Static115.anInt5029); @@ -362,7 +372,7 @@ public final class Static253 { Static65.anInt1951 = Static191.anIntArray385[local5]; Static16.anInt548 = Static191.anIntArray392[local5] = local74; @Pc(962) JagString local962 = Static191.aClass100Array132[local5]; - if (Static79.anInt2157 == 0) { + if (VarpDomain.anInt2157 == 0) { local639 = 16776960; if (Static191.anIntArray390[local5] < 6) { local639 = Static16.anIntArray52[Static191.anIntArray390[local5]]; @@ -768,4 +778,13 @@ public final class Static253 { } } } + + @OriginalMember(owner = "client!ld", name = "a", descriptor = "(IIIIZI)V") + public static void method2731(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4) { + anInt5158 = arg1; + anInt1815 = arg4; + anInt5559 = arg0; + anInt406 = arg3; + anInt4675 = arg2; + } } diff --git a/client/src/main/java/rt4/Static254.java b/client/src/main/java/rt4/Static254.java index e7939ae..d192ee5 100644 --- a/client/src/main/java/rt4/Static254.java +++ b/client/src/main/java/rt4/Static254.java @@ -6,10 +6,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static254 { - @OriginalMember(owner = "client!uj", name = "H", descriptor = "I") - public static int anInt5559; - - @OriginalMember(owner = "client!uj", name = "a", descriptor = "(BZII[[[Lclient!bj;I)Z") + @OriginalMember(owner = "client!uj", name = "a", descriptor = "(BZII[[[Lclient!bj;I)Z") public static boolean method4348(@OriginalArg(1) boolean arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) Tile[][][] arg3, @OriginalArg(5) int arg4) { @Pc(14) byte local14 = arg0 ? 1 : (byte) (Static253.anInt3325 & 0xFF); if (local14 == Static266.aByteArrayArrayArray15[Player.level][arg1][arg2]) { diff --git a/client/src/main/java/rt4/Static26.java b/client/src/main/java/rt4/Static26.java index b47aba9..b90d51e 100644 --- a/client/src/main/java/rt4/Static26.java +++ b/client/src/main/java/rt4/Static26.java @@ -27,9 +27,50 @@ public final class Static26 { @Pc(45) int local45 = (LoginManager.regionBitPacked[local25] >> 8) * 64 - Camera.originX; @Pc(56) int local56 = (LoginManager.regionBitPacked[local25] & 0xFF) * 64 - Camera.originZ; client.audioLoop(); - Static124.method2437(local45, arg0, local32, local56, PathFinder.collisionMaps); + method2437(local45, arg0, local32, local56, PathFinder.collisionMaps); } } } + @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; + while (true) { + @Pc(16) int local16 = local10.gVarSmart(); + if (local16 == 0) { + return; + } + local12 += local16; + @Pc(27) int local27 = 0; + while (true) { + @Pc(31) int local31 = local10.gSmart1or2(); + if (local31 == 0) { + break; + } + local27 += local31 - 1; + @Pc(46) int local46 = local27 & 0x3F; + @Pc(50) int local50 = local27 >> 12; + @Pc(56) int local56 = local27 >> 6 & 0x3F; + @Pc(60) int local60 = local10.g1(); + @Pc(64) int local64 = local60 >> 2; + @Pc(68) int local68 = local60 & 0x3; + @Pc(72) int local72 = arg0 + local56; + @Pc(76) int local76 = local46 + arg3; + if (local72 > 0 && local76 > 0 && local72 < 103 && local76 < 103) { + @Pc(90) CollisionMap local90 = null; + if (!arg1) { + @Pc(95) int local95 = local50; + if ((SceneGraph.tileFlags[1][local72][local76] & 0x2) == 2) { + local95 = local50 - 1; + } + if (local95 >= 0) { + local90 = arg4[local95]; + } + } + Static185.method3397(local50, !arg1, local50, arg1, local90, local12, local64, local72, local76, local68); + } + } + } + } } diff --git a/client/src/main/java/rt4/Static264.java b/client/src/main/java/rt4/Static264.java index 643325c..61a8a1d 100644 --- a/client/src/main/java/rt4/Static264.java +++ b/client/src/main/java/rt4/Static264.java @@ -6,10 +6,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static264 { - @OriginalMember(owner = "client!vh", name = "b", descriptor = "[I") - public static final int[] anIntArray410 = new int[100]; - - @OriginalMember(owner = "client!vh", name = "c", descriptor = "Lclient!na;") + @OriginalMember(owner = "client!vh", name = "c", descriptor = "Lclient!na;") public static final JagString COLON = JagString.parse(":"); @OriginalMember(owner = "client!vh", name = "p", descriptor = "[I") diff --git a/client/src/main/java/rt4/Static35.java b/client/src/main/java/rt4/Static35.java index 3102b0e..47bbb56 100644 --- a/client/src/main/java/rt4/Static35.java +++ b/client/src/main/java/rt4/Static35.java @@ -8,9 +8,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static35 { - @OriginalMember(owner = "client!cl", name = "X", descriptor = "I") - public static int anInt1091; - @OriginalMember(owner = "client!cl", name = "K", descriptor = "Ljava/util/Calendar;") public static final Calendar aCalendar1 = Calendar.getInstance(TimeZone.getTimeZone("GMT")); diff --git a/client/src/main/java/rt4/Static36.java b/client/src/main/java/rt4/Static36.java index 9584668..6f1a30f 100644 --- a/client/src/main/java/rt4/Static36.java +++ b/client/src/main/java/rt4/Static36.java @@ -32,7 +32,7 @@ public final class Static36 { public static void method946(@OriginalArg(0) Component[] 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) { for (@Pc(1) int local1 = 0; local1 < arg0.length; local1++) { @Pc(9) Component component = arg0[local1]; - if (component != null && component.layer == arg1 && (!component.usingScripts || component.type == 0 || component.aBoolean25 || InterfaceList.getServerActiveProperties(component).accessMask != 0 || component == Static40.aClass13_1 || component.anInt453 == 1338) && (!component.usingScripts || !method947(component))) { + if (component != null && component.layer == arg1 && (!component.if3 || component.type == 0 || component.aBoolean25 || InterfaceList.getServerActiveProperties(component).events != 0 || component == Static40.aClass13_1 || component.clientCode == 1338) && (!component.if3 || !method947(component))) { @Pc(50) int local50 = component.x + arg6; @Pc(55) int local55 = component.y + arg7; @Pc(61) int local61; @@ -61,12 +61,12 @@ public final class Static36 { Static124.anInt3075 = local50; anInt660 = local55; } - if (!component.usingScripts || local61 < local65 && local63 < local67) { + if (!component.if3 || local61 < local65 && local63 < local67) { if (component.type == 0) { - if (!component.usingScripts && method947(component) && Static180.aClass13_22 != component) { + if (!component.if3 && method947(component) && Static180.aClass13_22 != component) { continue; } - if (component.noClickThrough && Mouse.anInt4873 >= local61 && Mouse.anInt5032 >= local63 && Mouse.anInt4873 < local65 && Mouse.anInt5032 < local67) { + if (component.noClickThrough && Mouse.lastMouseX >= local61 && Mouse.lastMouseY >= local63 && Mouse.lastMouseX < local65 && Mouse.lastMouseY < local67) { for (@Pc(164) HookRequest local164 = (HookRequest) InterfaceList.lowPriorityRequests.head(); local164 != null; local164 = (HookRequest) InterfaceList.lowPriorityRequests.next()) { if (local164.aBoolean158) { local164.unlink(); @@ -80,9 +80,9 @@ public final class Static36 { anInt3337 = 0; } } - if (component.usingScripts) { + if (component.if3) { @Pc(207) boolean local207; - if (Mouse.anInt4873 >= local61 && Mouse.anInt5032 >= local63 && Mouse.anInt4873 < local65 && Mouse.anInt5032 < local67) { + if (Mouse.lastMouseX >= local61 && Mouse.lastMouseY >= local63 && Mouse.lastMouseX < local65 && Mouse.lastMouseY < local67) { local207 = true; } else { local207 = false; @@ -131,7 +131,7 @@ public final class Static36 { Static81.anInt2225 = local50; Static228.anInt5103 = local55; } - if (component.aBoolean25 || component.anInt453 != 0) { + if (component.aBoolean25 || component.clientCode != 0) { @Pc(399) HookRequest request; if (local207 && MouseWheel.wheelRotation != 0 && component.onScroll != null) { request = new HookRequest(); @@ -141,26 +141,26 @@ public final class Static36 { request.arguments = component.onScroll; InterfaceList.lowPriorityRequests.addTail(request); } - if (Static40.aClass13_14 != null || Static118.aClass13_15 != null || Static40.aBoolean108 || component.anInt453 != 1400 && anInt3337 > 0) { + if (Static40.aClass13_14 != null || Static118.clickedInventoryComponent != null || Static40.aBoolean108 || component.clientCode != 1400 && anInt3337 > 0) { local221 = false; local212 = false; local207 = false; } @Pc(508) int skill; - if (component.anInt453 != 0) { - if (component.anInt453 == 1337) { + if (component.clientCode != 0) { + if (component.clientCode == 1337) { Static280.aClass13_26 = component; InterfaceList.redraw(component); continue; } - if (component.anInt453 == 1338) { + if (component.clientCode == 1338) { if (local221) { Static1.anInt5 = Mouse.clickX - local50; - Static107.anInt2878 = Mouse.clickY - local55; + MiniMenu.anInt2878 = Mouse.clickY - local55; } continue; } - if (component.anInt453 == 1400) { + if (component.clientCode == 1400) { WorldMap.component = component; if (local221) { if (Keyboard.pressedKeys[Keyboard.KEY_CTRL] && LoginManager.staffModLevel > 0) { @@ -175,32 +175,32 @@ public final class Static36 { continue; } anInt3337 = 1; - Static40.anInt5388 = Mouse.anInt4873; - Static40.anInt4035 = Mouse.anInt5032; + Static40.anInt5388 = Mouse.lastMouseX; + Static40.anInt4035 = Mouse.lastMouseY; continue; } if (local212 && anInt3337 > 0) { - if (anInt3337 == 1 && (Static40.anInt5388 != Mouse.anInt4873 || Static40.anInt4035 != Mouse.anInt5032)) { + if (anInt3337 == 1 && (Static40.anInt5388 != Mouse.lastMouseX || Static40.anInt4035 != Mouse.lastMouseY)) { Static197.anInt4620 = WorldMap.anInt435; anInt1885 = WorldMap.anInt919; anInt3337 = 2; } if (anInt3337 == 2) { - WorldMap.method1964(Static197.anInt4620 + (int) ((double) (Static40.anInt5388 - Mouse.anInt4873) * 2.0D / (double) WorldMap.targetZoom)); - WorldMap.method4641(anInt1885 + (int) ((double) (Static40.anInt4035 - Mouse.anInt5032) * 2.0D / (double) WorldMap.targetZoom)); + WorldMap.method1964(Static197.anInt4620 + (int) ((double) (Static40.anInt5388 - Mouse.lastMouseX) * 2.0D / (double) WorldMap.targetZoom)); + WorldMap.method4641(anInt1885 + (int) ((double) (Static40.anInt4035 - Mouse.lastMouseY) * 2.0D / (double) WorldMap.targetZoom)); } continue; } anInt3337 = 0; continue; } - if (component.anInt453 == 1401) { + if (component.clientCode == 1401) { if (local212) { - WorldMap.method2387(component.width, Mouse.anInt5032 - local55, Mouse.anInt4873 - local50, component.height); + WorldMap.method2387(component.width, Mouse.lastMouseY - local55, Mouse.lastMouseX - local50, component.height); } continue; } - if (component.anInt453 == 1402) { + if (component.clientCode == 1402) { if (!GlRenderer.enabled) { InterfaceList.redraw(component); } @@ -223,8 +223,8 @@ public final class Static36 { request = new HookRequest(); request.aBoolean158 = true; request.source = component; - request.mouseX = Mouse.anInt4873 - local50; - request.mouseY = Mouse.anInt5032 - local55; + request.mouseX = Mouse.lastMouseX - local50; + request.mouseY = Mouse.lastMouseY - local55; request.arguments = component.onDrag; InterfaceList.lowPriorityRequests.addTail(request); } @@ -234,8 +234,8 @@ public final class Static36 { request = new HookRequest(); request.aBoolean158 = true; request.source = component; - request.mouseX = Mouse.anInt4873 - local50; - request.mouseY = Mouse.anInt5032 - local55; + request.mouseX = Mouse.lastMouseX - local50; + request.mouseY = Mouse.lastMouseY - local55; request.arguments = component.onRelease; Static115.mediumPriorityRequests.addTail(request); } @@ -244,8 +244,8 @@ public final class Static36 { request = new HookRequest(); request.aBoolean158 = true; request.source = component; - request.mouseX = Mouse.anInt4873 - local50; - request.mouseY = Mouse.anInt5032 - local55; + request.mouseX = Mouse.lastMouseX - local50; + request.mouseY = Mouse.lastMouseY - local55; request.arguments = component.onHold; InterfaceList.lowPriorityRequests.addTail(request); } @@ -255,8 +255,8 @@ public final class Static36 { request = new HookRequest(); request.aBoolean158 = true; request.source = component; - request.mouseX = Mouse.anInt4873 - local50; - request.mouseY = Mouse.anInt5032 - local55; + request.mouseX = Mouse.lastMouseX - local50; + request.mouseY = Mouse.lastMouseY - local55; request.arguments = component.onMouseOver; InterfaceList.lowPriorityRequests.addTail(request); } @@ -265,8 +265,8 @@ public final class Static36 { request = new HookRequest(); request.aBoolean158 = true; request.source = component; - request.mouseX = Mouse.anInt4873 - local50; - request.mouseY = Mouse.anInt5032 - local55; + request.mouseX = Mouse.lastMouseX - local50; + request.mouseY = Mouse.lastMouseY - local55; request.arguments = component.onMouseRepeat; InterfaceList.lowPriorityRequests.addTail(request); } @@ -276,8 +276,8 @@ public final class Static36 { request = new HookRequest(); request.aBoolean158 = true; request.source = component; - request.mouseX = Mouse.anInt4873 - local50; - request.mouseY = Mouse.anInt5032 - local55; + request.mouseX = Mouse.lastMouseX - local50; + request.mouseY = Mouse.lastMouseY - local55; request.arguments = component.onMouseLeave; Static115.mediumPriorityRequests.addTail(request); } @@ -450,19 +450,19 @@ public final class Static36 { } } } - if (!component.usingScripts && Static40.aClass13_14 == null && Static118.aClass13_15 == null && !Static40.aBoolean108) { - if ((component.anInt470 >= 0 || component.anInt480 != 0) && Mouse.anInt4873 >= local61 && Mouse.anInt5032 >= local63 && Mouse.anInt4873 < local65 && Mouse.anInt5032 < local67) { + if (!component.if3 && Static40.aClass13_14 == null && Static118.clickedInventoryComponent == null && !Static40.aBoolean108) { + if ((component.anInt470 >= 0 || component.anInt480 != 0) && Mouse.lastMouseX >= local61 && Mouse.lastMouseY >= local63 && Mouse.lastMouseX < local65 && Mouse.lastMouseY < local67) { if (component.anInt470 >= 0) { Static180.aClass13_22 = arg0[component.anInt470]; } else { Static180.aClass13_22 = component; } } - if (component.type == 8 && Mouse.anInt4873 >= local61 && Mouse.anInt5032 >= local63 && Mouse.anInt4873 < local65 && Mouse.anInt5032 < local67) { + if (component.type == 8 && Mouse.lastMouseX >= local61 && Mouse.lastMouseY >= local63 && Mouse.lastMouseX < local65 && Mouse.lastMouseY < local67) { Static43.aClass13_11 = component; } if (component.scrollMaxV > component.height) { - Static236.method4049(Mouse.anInt5032, component.height, component, Mouse.anInt4873, local50 + component.width, local55, component.scrollMaxV); + Static236.method4049(Mouse.lastMouseY, component.height, component, Mouse.lastMouseX, local50 + component.width, local55, component.scrollMaxV); } } if (component.type == 0) { @@ -482,8 +482,8 @@ public final class Static36 { @OriginalMember(owner = "client!client", name = "c", descriptor = "(Lclient!be;)Z") public static boolean method947(@OriginalArg(0) Component arg0) { - if (Static121.aBoolean154) { - if (InterfaceList.getServerActiveProperties(arg0).accessMask != 0) { + if (Static121.qaOpTest) { + if (InterfaceList.getServerActiveProperties(arg0).events != 0) { return false; } if (arg0.type == 0) { diff --git a/client/src/main/java/rt4/Static4.java b/client/src/main/java/rt4/Static4.java index c5528a5..82b2831 100644 --- a/client/src/main/java/rt4/Static4.java +++ b/client/src/main/java/rt4/Static4.java @@ -9,7 +9,7 @@ public final class Static4 { public static final LinkedList highPriorityRequests = new LinkedList(); @OriginalMember(owner = "client!ac", name = "n", descriptor = "I") - public static int anInt36 = 0; + public static int mouseOverInventoryObjectIndex = 0; @OriginalMember(owner = "client!ac", name = "a", descriptor = "(IIII)I") public static int method22(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2) { diff --git a/client/src/main/java/rt4/Static44.java b/client/src/main/java/rt4/Static44.java index 47528d5..c842f8c 100644 --- a/client/src/main/java/rt4/Static44.java +++ b/client/src/main/java/rt4/Static44.java @@ -12,41 +12,6 @@ public final class Static44 { @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") - public static void method1146() { - Protocol.outboundBuffer.offset = 0; - Protocol.opcode3 = -1; - Static40.aBoolean108 = false; - Protocol.length = 0; - LoginManager.mapFlagX = 0; - MiniMenu.size = 0; - Protocol.opcode2 = -1; - MiniMap.state = 0; - Player.rebootTimer = 0; - Protocol.opcode4 = -1; - Protocol.inboundBuffer.offset = 0; - Static201.anInt1862 = 0; - Protocol.opcode = -1; - @Pc(35) int local35; - for (local35 = 0; local35 < PlayerList.players.length; local35++) { - if (PlayerList.players[local35] != null) { - PlayerList.players[local35].faceEntity = -1; - } - } - for (local35 = 0; local35 < NpcList.npcs.length; local35++) { - if (NpcList.npcs[local35] != null) { - NpcList.npcs[local35].faceEntity = -1; - } - } - Inv.method2073(); - Camera.cameraType = 1; - client.setGameState(30); - for (local35 = 0; local35 < 100; local35++) { - Static186.aBooleanArray100[local35] = true; - } - ClientProt.method1373(); - } - @OriginalMember(owner = "client!dh", name = "a", descriptor = "(IIII)Lclient!wk;") public static ComponentPointer method1148(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) { @Pc(9) ComponentPointer local9 = new ComponentPointer(); diff --git a/client/src/main/java/rt4/Static45.java b/client/src/main/java/rt4/Static45.java index c92914a..4bca6cf 100644 --- a/client/src/main/java/rt4/Static45.java +++ b/client/src/main/java/rt4/Static45.java @@ -324,7 +324,7 @@ public final class Static45 { @Pc(2025) GlTile[] local2025; if (underwater) { local2025 = Static193.method3501(SceneGraph.tileFlags, SceneGraph.tileShapes[local152], SceneGraph.tileUnderlays[local152], local146, local1896, Static62.anIntArrayArray11, SceneGraph.tileOverlays[local152], SceneGraph.tileAngles[local152], local1888, local152, local1900, local142, SceneGraph.tileHeights[local152], SceneGraph.surfaceTileHeights[0]); - Static110.method2280(local152, local2025); + method2280(local152, local2025); break; } local2025 = Static193.method3501(SceneGraph.tileFlags, SceneGraph.tileShapes[local152], SceneGraph.tileUnderlays[local152], local146, local1896, null, SceneGraph.tileOverlays[local152], SceneGraph.tileAngles[local152], local1888, local152, local1900, local142, SceneGraph.tileHeights[local152], null); @@ -336,7 +336,7 @@ public final class Static45 { for (local349 = 0; local349 < local2049.length; local349++) { local2057[local2025.length + local349] = local2049[local349]; } - Static110.method2280(local152, local2057); + method2280(local152, local2057); Static221.method3393(local1900, SceneGraph.tileUnderlays[local152], SceneGraph.tileAngles[local152], LightingManager.lights, local152, LightingManager.lightCount, local1896, SceneGraph.tileShapes[local152], SceneGraph.tileOverlays[local152], SceneGraph.tileHeights[local152], local1888); break; } @@ -496,4 +496,9 @@ public final class Static45 { local3.anInt4447 = arg6; SceneGraph.aClass120Array1[SceneGraph.anInt917++] = local3; } + + @OriginalMember(owner = "client!ih", name = "a", descriptor = "(I[Lclient!hg;)V") + public static void method2280(@OriginalArg(0) int arg0, @OriginalArg(1) GlTile[] arg1) { + SceneGraph.underwaterHdTiles[arg0] = arg1; + } } diff --git a/client/src/main/java/rt4/Static50.java b/client/src/main/java/rt4/Static50.java index fa4c298..b79a7a4 100644 --- a/client/src/main/java/rt4/Static50.java +++ b/client/src/main/java/rt4/Static50.java @@ -7,10 +7,7 @@ public final class Static50 { @OriginalMember(owner = "client!e", name = "pc", descriptor = "[I") public static final int[] anIntArray132 = new int[4]; - @OriginalMember(owner = "client!e", name = "sc", descriptor = "[I") - public static final int[] anIntArray133 = new int[100]; - - @OriginalMember(owner = "client!e", name = "xc", descriptor = "[I") + @OriginalMember(owner = "client!e", name = "xc", descriptor = "[I") public static int[] anIntArray134 = new int[2]; @OriginalMember(owner = "client!e", name = "Dc", descriptor = "Lclient!na;") diff --git a/client/src/main/java/rt4/Static53.java b/client/src/main/java/rt4/Static53.java index 9f7d8c0..9365873 100644 --- a/client/src/main/java/rt4/Static53.java +++ b/client/src/main/java/rt4/Static53.java @@ -9,10 +9,7 @@ public final class Static53 { @OriginalMember(owner = "client!ec", name = "d", descriptor = "Lclient!gn;") public static final LruHashTable aClass54_5 = new LruHashTable(16); - @OriginalMember(owner = "client!ec", name = "l", descriptor = "I") - public static final int anInt1704 = 5063219; - - @OriginalMember(owner = "client!ec", name = "B", descriptor = "[[I") + @OriginalMember(owner = "client!ec", name = "B", descriptor = "[[I") public static final int[][] anIntArrayArray8 = new int[][] { new int[0], { 128, 0, 128, 128, 0, 128 }, { 0, 0, 128, 0, 128, 128, 64, 128 }, { 0, 128, 0, 0, 128, 0, 64, 128 }, { 0, 0, 64, 128, 0, 128 }, { 128, 128, 64, 128, 128, 0 }, { 64, 0, 128, 0, 128, 128, 64, 128 }, { 128, 0, 128, 128, 0, 128, 0, 64, 64, 0 }, { 0, 0, 64, 0, 0, 64 }, { 0, 0, 128, 0, 128, 128, 64, 96, 32, 64 }, { 0, 128, 0, 0, 32, 64, 64, 96, 128, 128 }, { 0, 128, 0, 0, 32, 32, 96, 32, 128, 0, 128, 128 } }; @OriginalMember(owner = "client!ec", name = "a", descriptor = "([[IZILclient!hg;[IIIIZ[[FZI[[FIIIZ[[I[[FBI[Z)V") diff --git a/client/src/main/java/rt4/Static59.java b/client/src/main/java/rt4/Static59.java index 90b917c..223172c 100644 --- a/client/src/main/java/rt4/Static59.java +++ b/client/src/main/java/rt4/Static59.java @@ -6,9 +6,6 @@ import org.openrs2.deob.annotation.Pc; public final class Static59 { - @OriginalMember(owner = "client!ej", name = "X", descriptor = "I") - public static int anInt1815; - @OriginalMember(owner = "client!ej", name = "h", descriptor = "(I)V") public static void method1372() { if (Static226.anInt3953 == 2) { diff --git a/client/src/main/java/rt4/Static67.java b/client/src/main/java/rt4/Static67.java index fe97c7b..dfe318b 100644 --- a/client/src/main/java/rt4/Static67.java +++ b/client/src/main/java/rt4/Static67.java @@ -10,7 +10,4 @@ public final class Static67 { @OriginalMember(owner = "client!fe", name = "R", descriptor = "Z") public static boolean prevFocus = true; - @OriginalMember(owner = "client!fe", name = "lb", descriptor = "[I") - public static final int[] anIntArray320 = new int[100]; - } diff --git a/client/src/main/java/rt4/Static7.java b/client/src/main/java/rt4/Static7.java index 98d7629..ddf2c23 100644 --- a/client/src/main/java/rt4/Static7.java +++ b/client/src/main/java/rt4/Static7.java @@ -13,7 +13,7 @@ public final class Static7 { @OriginalMember(owner = "client!ah", name = "b", descriptor = "(I)V") public static void method843() { - if (Static118.aClass13_15 != null || Static40.aClass13_14 != null) { + if (Static118.clickedInventoryComponent != null || Static40.aClass13_14 != null) { return; } @Pc(20) int local20 = Mouse.clickButton; @@ -28,21 +28,21 @@ public final class Static7 { @Pc(103) Component local103 = InterfaceList.getComponent(local99); @Pc(106) ServerActiveProperties local106 = InterfaceList.getServerActiveProperties(local103); if (local106.method511() || local106.isObjReplaceEnabled()) { - Static78.anInt2145 = 0; - Static123.aBoolean155 = false; - if (Static118.aClass13_15 != null) { - InterfaceList.redraw(Static118.aClass13_15); + Static78.clickedInventoryComponentCycle = 0; + Static123.draggingClickedInventoryObject = false; + if (Static118.clickedInventoryComponent != null) { + InterfaceList.redraw(Static118.clickedInventoryComponent); } - Static118.aClass13_15 = InterfaceList.getComponent(local99); - Static149.anInt3554 = Mouse.clickX; - Static206.anInt4773 = Mouse.clickY; - Static4.anInt36 = local93; - InterfaceList.redraw(Static118.aClass13_15); + Static118.clickedInventoryComponent = InterfaceList.getComponent(local99); + Static149.clickedInventoryComponentX = Mouse.clickX; + Static206.clickedInventoryComponentY = Mouse.clickY; + Static4.mouseOverInventoryObjectIndex = local93; + InterfaceList.redraw(Static118.clickedInventoryComponent); return; } } } - if (local20 == 1 && (Static116.anInt2952 == 1 && MiniMenu.size > 2 || MiniMenu.method4640(MiniMenu.size - 1))) { + if (local20 == 1 && (VarpDomain.anInt2952 == 1 && MiniMenu.size > 2 || MiniMenu.method4640(MiniMenu.size - 1))) { local20 = 2; } if (local20 == 2 && MiniMenu.size > 0 || Static226.anInt3953 == 1) { @@ -55,8 +55,8 @@ public final class Static7 { } @Pc(204) int local204; if (local20 != 1) { - local93 = Mouse.anInt5032; - local204 = Mouse.anInt4873; + local93 = Mouse.lastMouseY; + local204 = Mouse.lastMouseX; if (local204 < Static183.anInt4271 - 10 || local204 > Static24.anInt761 + Static183.anInt4271 + 10 || Static229.anInt5138 - 10 > local93 || local93 > Static13.anInt436 + Static229.anInt5138 + 10) { Static40.aBoolean108 = false; Static133.method4012(Static183.anInt4271, Static24.anInt761, Static229.anInt5138, Static13.anInt436); diff --git a/client/src/main/java/rt4/Static74.java b/client/src/main/java/rt4/Static74.java index bafaf31..df67417 100644 --- a/client/src/main/java/rt4/Static74.java +++ b/client/src/main/java/rt4/Static74.java @@ -6,10 +6,7 @@ import org.openrs2.deob.annotation.Pc; public final class Static74 { - @OriginalMember(owner = "client!bj", name = "V", descriptor = "I") - public static final int anInt671 = 3353893; - - @OriginalMember(owner = "client!fn", name = "a", descriptor = "(ZIIIIIII)V") + @OriginalMember(owner = "client!fn", name = "a", descriptor = "(ZIIIIIII)V") public static void method1623(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6) { if (arg3 == arg6) { method2826(arg0, arg2, arg5, arg6, arg1, arg4); diff --git a/client/src/main/java/rt4/Static78.java b/client/src/main/java/rt4/Static78.java index 923a07b..0d96a4b 100644 --- a/client/src/main/java/rt4/Static78.java +++ b/client/src/main/java/rt4/Static78.java @@ -5,17 +5,14 @@ import org.openrs2.deob.annotation.OriginalMember; public final class Static78 { - @OriginalMember(owner = "client!gd", name = "m", descriptor = "Lclient!ve;") - public static Js5 aClass153_32; - - @OriginalMember(owner = "client!gd", name = "b", descriptor = "Lclient!na;") + @OriginalMember(owner = "client!gd", name = "b", descriptor = "Lclient!na;") public static final JagString aClass100_464 = JagString.parse("null"); @OriginalMember(owner = "client!gd", name = "h", descriptor = "[I") public static final int[] anIntArray204 = new int[] { 16, 32, 64, 128 }; @OriginalMember(owner = "client!gd", name = "j", descriptor = "I") - public static int anInt2145 = 0; + public static int clickedInventoryComponentCycle = 0; @OriginalMember(owner = "client!gd", name = "a", descriptor = "(IIBI)I") public static int method1690(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2) { diff --git a/client/src/main/java/rt4/Static79.java b/client/src/main/java/rt4/Static79.java index 1a3f3eb..c19a7e6 100644 --- a/client/src/main/java/rt4/Static79.java +++ b/client/src/main/java/rt4/Static79.java @@ -9,9 +9,6 @@ public final class Static79 { @OriginalMember(owner = "client!ge", name = "k", descriptor = "[I") public static int[] anIntArray205 = new int[2]; - @OriginalMember(owner = "client!ge", name = "m", descriptor = "I") - public static int anInt2157 = 0; - @OriginalMember(owner = "client!ge", name = "a", descriptor = "(IIIZIZZ)V") public static void method1697(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) boolean arg3, @OriginalArg(4) int arg4, @OriginalArg(5) boolean arg5) { if (arg2 <= arg4) { diff --git a/client/src/main/java/rt4/Static83.java b/client/src/main/java/rt4/Static83.java index f79e5d7..0ec413c 100644 --- a/client/src/main/java/rt4/Static83.java +++ b/client/src/main/java/rt4/Static83.java @@ -37,8 +37,4 @@ public final class Static83 { method436(arg0, local20 + 1, arg2, arg3); } - @OriginalMember(owner = "client!gj", name = "b", descriptor = "(I)V") - public static void method440() { - MaterialManager.setMaterial(0, 0); - } } diff --git a/client/src/main/java/rt4/Static87.java b/client/src/main/java/rt4/Static87.java index 546ded6..144e03d 100644 --- a/client/src/main/java/rt4/Static87.java +++ b/client/src/main/java/rt4/Static87.java @@ -6,6 +6,18 @@ import org.openrs2.deob.annotation.Pc; public final class Static87 { + @OriginalMember(owner = "client!bj", name = "V", descriptor = "I") + public static final int anInt671 = 0x332d25; + + @OriginalMember(owner = "client!rl", name = "Z", descriptor = "I") + public static final int anInt4938 = 0x766654; + + @OriginalMember(owner = "client!ec", name = "l", descriptor = "I") + public static final int anInt1704 = 0x4d4233; + + @OriginalMember(owner = "client!oj", name = "p", descriptor = "I") + public static final int anInt4306 = 0x23201b; + @OriginalMember(owner = "client!gn", name = "d", descriptor = "Z") public static boolean aBoolean130 = false; @@ -78,76 +90,76 @@ public final class Static87 { } @OriginalMember(owner = "client!gn", name = "a", descriptor = "(III[Lclient!be;IIIIBI)V") - public static void method1809(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) Component[] arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(9) int arg8) { + public static void method1809(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) Component[] components, @OriginalArg(4) int arg4, @OriginalArg(5) int layer, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(9) int parentRectangle) { if (GlRenderer.enabled) { GlRaster.setClip(arg0, arg6, arg4, arg7); } else { SoftwareRaster.setClip(arg0, arg6, arg4, arg7); Rasteriser.prepare(); } - for (@Pc(18) int local18 = 0; local18 < arg3.length; local18++) { - @Pc(30) Component local30 = arg3[local18]; - if (local30 != null && (local30.layer == arg5 || arg5 == -1412584499 && local30 == Static40.aClass13_14)) { - @Pc(57) int local57; - if (arg8 == -1) { - Static264.anIntArray410[InterfaceList.anInt766] = arg2 + local30.x; - Static50.anIntArray133[InterfaceList.anInt766] = local30.y + arg1; - Static224.anIntArray443[InterfaceList.anInt766] = local30.width; - Static67.anIntArray320[InterfaceList.anInt766] = local30.height; - local57 = InterfaceList.anInt766++; + for (@Pc(18) int i = 0; i < components.length; i++) { + @Pc(30) Component component = components[i]; + if (component != null && (component.layer == layer || layer == 0xabcdabcd && component == Static40.aClass13_14)) { + @Pc(57) int rectangle; + if (parentRectangle == -1) { + InterfaceList.rectangleX[InterfaceList.rectangles] = arg2 + component.x; + InterfaceList.rectangleY[InterfaceList.rectangles] = component.y + arg1; + InterfaceList.rectangleWidth[InterfaceList.rectangles] = component.width; + InterfaceList.rectangleHeight[InterfaceList.rectangles] = component.height; + rectangle = InterfaceList.rectangles++; } else { - local57 = arg8; + rectangle = parentRectangle; } - local30.anInt465 = client.loop; - local30.anInt517 = local57; - if (!local30.usingScripts || !Static36.method947(local30)) { - if (local30.anInt453 > 0) { - Static2.method13(local30); + component.rectangleLoop = client.loop; + component.rectangle = rectangle; + if (!component.if3 || !Static36.method947(component)) { + if (component.clientCode > 0) { + Static2.method13(component); } - @Pc(114) int local114 = arg1 + local30.y; - @Pc(117) int local117 = local30.alpha; - @Pc(123) int local123 = local30.x + arg2; - if (Static121.aBoolean154 && (InterfaceList.getServerActiveProperties(local30).accessMask != 0 || local30.type == 0) && local117 > 127) { - local117 = 127; + @Pc(114) int local114 = arg1 + component.y; + @Pc(117) int alpha = component.alpha; + @Pc(123) int local123 = component.x + arg2; + if (Static121.qaOpTest && (InterfaceList.getServerActiveProperties(component).events != 0 || component.type == 0) && alpha > 127) { + alpha = 127; } @Pc(166) int local166; @Pc(164) int local164; - if (local30 == Static40.aClass13_14) { - if (arg5 != -1412584499 && !local30.dragRenderBehavior) { + if (component == Static40.aClass13_14) { + if (layer != 0xabcdabcd && !component.dragRenderBehavior) { Static80.anInt4696 = arg2; Static127.anInt3126 = arg1; - Static241.aClass13Array13 = arg3; + Static241.aClass13Array13 = components; continue; } if (Static40.aBoolean172 && Static146.aBoolean174) { - local164 = Mouse.anInt5032; - local166 = Mouse.anInt4873; + local164 = Mouse.lastMouseY; + local166 = Mouse.lastMouseX; local164 -= Static40.anInt4035; if (local164 < Static228.anInt5103) { local164 = Static228.anInt5103; } - if (local164 + local30.height > Static40.aClass13_1.height + Static228.anInt5103) { - local164 = Static40.aClass13_1.height + Static228.anInt5103 - local30.height; + if (local164 + component.height > Static40.aClass13_1.height + Static228.anInt5103) { + local164 = Static40.aClass13_1.height + Static228.anInt5103 - component.height; } local114 = local164; local166 -= Static40.anInt5388; if (Static81.anInt2225 > local166) { local166 = Static81.anInt2225; } - if (Static40.aClass13_1.width + Static81.anInt2225 < local30.width + local166) { - local166 = Static40.aClass13_1.width + Static81.anInt2225 - local30.width; + if (Static40.aClass13_1.width + Static81.anInt2225 < component.width + local166) { + local166 = Static40.aClass13_1.width + Static81.anInt2225 - component.width; } local123 = local166; } - if (!local30.dragRenderBehavior) { - local117 = 128; + if (!component.dragRenderBehavior) { + alpha = 128; } } @Pc(302) int local302; @Pc(291) int local291; @Pc(270) int local270; @Pc(276) int local276; - if (local30.type == 2) { + if (component.type == 2) { local291 = arg7; local302 = arg4; local164 = arg6; @@ -155,16 +167,16 @@ public final class Static87 { } else { local164 = local114 > arg6 ? local114 : arg6; local166 = arg0 < local123 ? local123 : arg0; - local270 = local30.width + local123; - local276 = local114 + local30.height; - if (local30.type == 9) { + local270 = component.width + local123; + local276 = local114 + component.height; + if (component.type == 9) { local276++; local270++; } local291 = arg7 <= local276 ? arg7 : local276; local302 = local270 >= arg4 ? arg4 : local270; } - if (!local30.usingScripts || local302 > local166 && local164 < local291) { + if (!component.if3 || local302 > local166 && local164 < local291) { @Pc(468) int local468; @Pc(503) int memory; @Pc(514) int color; @@ -173,12 +185,12 @@ public final class Static87 { @Pc(563) int local563; @Pc(571) int local571; @Pc(545) int objId; - if (local30.anInt453 != 0) { - if (local30.anInt453 == 1337 || local30.anInt453 == 1403 && GlRenderer.enabled) { - Static280.aClass13_26 = local30; + if (component.clientCode != 0) { + if (component.clientCode == 1337 || component.clientCode == 1403 && GlRenderer.enabled) { + Static280.aClass13_26 = component; Static214.anInt5574 = local114; Static97.anInt2503 = local123; - Static253.method4326(local30.height, local30.anInt453 == 1403, local123, local30.width, local114); + Static253.method4326(component.height, component.clientCode == 1403, local123, component.width, local114); if (GlRenderer.enabled) { GlRaster.setClip(arg0, arg6, arg4, arg7); } else { @@ -186,11 +198,11 @@ public final class Static87 { } continue; } - if (local30.anInt453 == 1338) { - if (!local30.method478()) { + if (component.clientCode == 1338) { + if (!component.method478()) { continue; } - MiniMap.render(local57, local114, local123, local30); + MiniMap.render(rectangle, local114, local123, component); if (GlRenderer.enabled) { GlRaster.setClip(arg0, arg6, arg4, arg7); } else { @@ -201,13 +213,13 @@ public final class Static87 { } local270 = Static155.anInt3751 - local123; local276 = Static60.anInt1892 - local114; - local468 = local30.anIntArray37[local276]; - if (local270 < local468 || local270 > local468 + local30.anIntArray45[local276]) { + local468 = component.anIntArray37[local276]; + if (local270 < local468 || local270 > local468 + component.anIntArray45[local276]) { continue; } - local276 -= local30.height / 2; + local276 -= component.height / 2; memory = (int)Camera.yawTarget + MiniMap.anInt1814 & 0x7FF; - local270 -= local30.width / 2; + local270 -= component.width / 2; color = MathUtils.sin[memory]; cardMemory = MathUtils.cos[memory]; color = (MiniMap.anInt4130 + 256) * color >> 8; @@ -221,7 +233,7 @@ public final class Static87 { if (local583 == null) { Static53.method1294(); } else { - MiniMenu.add(Static246.anInt5393, 1L, MiniMenu.aClass100_961, local563, (short) 11, MiniMenu.aClass100_545, local571); + MiniMenu.add(MiniMenu.anInt5393, 1L, MiniMenu.aClass100_961, local563, (short) 11, MiniMenu.aClass100_545, local571); } continue; } @@ -231,9 +243,9 @@ public final class Static87 { MiniMenu.add(-1, 1L, JagString.EMPTY, local563, (short) 60, Static195.walkText, local571); continue; } - if (local30.anInt453 == 1339) { - if (local30.method478()) { - Static160.method3047(local123, local114, local30, local57); + if (component.clientCode == 1339) { + if (component.method478()) { + Static160.method3047(local123, local114, component, rectangle); if (GlRenderer.enabled) { GlRaster.setClip(arg0, arg6, arg4, arg7); } else { @@ -242,10 +254,10 @@ public final class Static87 { } continue; } - if (local30.anInt453 == 1400) { - Static269.method2225(local123, local114, local30.height, local30.width); - Static186.aBooleanArray100[local57] = true; - InterfaceList.rectangleRedraw[local57] = true; + if (component.clientCode == 1400) { + Static269.method2225(local123, local114, component.height, component.width); + Static186.aBooleanArray100[rectangle] = true; + InterfaceList.rectangleRedraw[rectangle] = true; if (GlRenderer.enabled) { GlRaster.setClip(arg0, arg6, arg4, arg7); } else { @@ -253,10 +265,10 @@ public final class Static87 { } continue; } - if (local30.anInt453 == 1401) { - Static1.method4(local123, local30.height, local30.width, local114); - Static186.aBooleanArray100[local57] = true; - InterfaceList.rectangleRedraw[local57] = true; + if (component.clientCode == 1401) { + Static1.method4(local123, component.height, component.width, local114); + Static186.aBooleanArray100[rectangle] = true; + InterfaceList.rectangleRedraw[rectangle] = true; if (GlRenderer.enabled) { GlRaster.setClip(arg0, arg6, arg4, arg7); } else { @@ -264,19 +276,19 @@ public final class Static87 { } continue; } - if (local30.anInt453 == 1402) { + if (component.clientCode == 1402) { if (!GlRenderer.enabled) { Static221.method3392(local123, local114); - Static186.aBooleanArray100[local57] = true; - InterfaceList.rectangleRedraw[local57] = true; + Static186.aBooleanArray100[rectangle] = true; + InterfaceList.rectangleRedraw[rectangle] = true; } continue; } - if (local30.anInt453 == 1405) { + if (component.clientCode == 1405) { if (!Cheat.displayFps) { continue; } - local270 = local30.width + local123; + local270 = component.width + local123; local276 = local114 + 15; Fonts.p12Full.renderRight(JagString.concatenate(new JagString[] { Cheat.DEBUG_FPS2, JagString.parseInt((int)GameShell.framesPerSecond) }), local270, local276, 16776960, 0); local276 += 15; @@ -307,22 +319,22 @@ public final class Static87 { } local571 = local556 * 10000 / cardMemory; local563 = objId * 100 / cardMemory; - @Pc(968) JagString local968 = JagString.concatenate(new JagString[] { Cheat.DEBUG_CAHE, Static182.formatNumber(0, true, 2, (long) local571), Static147.aClass100_672, JagString.parseInt(local563), Static14.aClass100_80 }); + @Pc(968) JagString local968 = JagString.concatenate(new JagString[] { Cheat.DEBUG_CAHE, StringUtils.formatNumber(0, true, 2, (long) local571), Static147.aClass100_672, JagString.parseInt(local563), Static14.aClass100_80 }); Fonts.p11Full.renderRight(local968, local270, local276, 16776960, 0); local276 += 12; - Static186.aBooleanArray100[local57] = true; - InterfaceList.rectangleRedraw[local57] = true; + Static186.aBooleanArray100[rectangle] = true; + InterfaceList.rectangleRedraw[rectangle] = true; continue; } - if (local30.anInt453 == 1406) { + if (component.clientCode == 1406) { Static143.anInt3484 = local114; - Static201.aClass13_13 = local30; + Static201.aClass13_13 = component; Static131.anInt3260 = local123; continue; } } if (!Static40.aBoolean108) { - if (local30.type == 0 && local30.noClickThrough && Static155.anInt3751 >= local166 && Static60.anInt1892 >= local164 && Static155.anInt3751 < local302 && local291 > Static60.anInt1892 && !Static121.aBoolean154) { + if (component.type == 0 && component.noClickThrough && Static155.anInt3751 >= local166 && Static60.anInt1892 >= local164 && Static155.anInt3751 < local302 && local291 > Static60.anInt1892 && !Static121.qaOpTest) { MiniMenu.size = 1; MiniMenu.cursors[0] = Static35.anInt1092; MiniMenu.ops[0] = LocalizedText.CANCEL; @@ -330,35 +342,35 @@ public final class Static87 { MiniMenu.actions[0] = 1005; } if (local166 <= Static155.anInt3751 && local164 <= Static60.anInt1892 && local302 > Static155.anInt3751 && local291 > Static60.anInt1892) { - MiniMenu.addComponentEntries(Static60.anInt1892 - local114, -local123 + Static155.anInt3751, local30); + MiniMenu.addComponentEntries(Static60.anInt1892 - local114, -local123 + Static155.anInt3751, component); } } - if (local30.type == 0) { - if (!local30.usingScripts && Static36.method947(local30) && Static180.aClass13_22 != local30) { + if (component.type == 0) { + if (!component.if3 && Static36.method947(component) && Static180.aClass13_22 != component) { continue; } - if (!local30.usingScripts) { - if (local30.scrollMaxV - local30.height < local30.scrollY) { - local30.scrollY = local30.scrollMaxV - local30.height; + if (!component.if3) { + if (component.scrollMaxV - component.height < component.scrollY) { + component.scrollY = component.scrollMaxV - component.height; } - if (local30.scrollY < 0) { - local30.scrollY = 0; + if (component.scrollY < 0) { + component.scrollY = 0; } } - method1809(local166, local114 - local30.scrollY, -local30.scrollX + local123, arg3, local302, local30.id, local164, local291, local57); - if (local30.createdComponents != null) { - method1809(local166, local114 - local30.scrollY, -local30.scrollX + local123, local30.createdComponents, local302, local30.id, local164, local291, local57); + method1809(local166, local114 - component.scrollY, -component.scrollX + local123, components, local302, component.id, local164, local291, rectangle); + if (component.createdComponents != null) { + method1809(local166, local114 - component.scrollY, -component.scrollX + local123, component.createdComponents, local302, component.id, local164, local291, rectangle); } - @Pc(1186) ComponentPointer local1186 = (ComponentPointer) InterfaceList.openInterfaces.get((long) local30.id); + @Pc(1186) ComponentPointer local1186 = (ComponentPointer) InterfaceList.openInterfaces.get((long) component.id); if (local1186 != null) { - if (local1186.anInt5879 == 0 && !Static40.aBoolean108 && Static155.anInt3751 >= local166 && local164 <= Static60.anInt1892 && local302 > Static155.anInt3751 && Static60.anInt1892 < local291 && !Static121.aBoolean154) { + if (local1186.anInt5879 == 0 && !Static40.aBoolean108 && Static155.anInt3751 >= local166 && local164 <= Static60.anInt1892 && local302 > Static155.anInt3751 && Static60.anInt1892 < local291 && !Static121.qaOpTest) { MiniMenu.ops[0] = LocalizedText.CANCEL; MiniMenu.size = 1; MiniMenu.cursors[0] = Static35.anInt1092; MiniMenu.actions[0] = 1005; MiniMenu.opBases[0] = JagString.EMPTY; } - Static6.method86(local1186.anInt5878, local166, local302, local123, local57, local291, local164, local114); + Static6.method86(local1186.anInt5878, local166, local302, local123, rectangle, local291, local164, local114); } if (GlRenderer.enabled) { GlRaster.setClip(arg0, arg6, arg4, arg7); @@ -367,42 +379,43 @@ public final class Static87 { Rasteriser.prepare(); } } - if (Static223.aBooleanArray116[local57] || Cheat.rectDebug > 1) { - if (local30.type == 0 && !local30.usingScripts && local30.scrollMaxV > local30.height) { - method1624(local30.scrollY, local30.scrollMaxV, local30.width + local123, local114, local30.height); + if (Static223.aBooleanArray116[rectangle] || Cheat.rectDebug > 1) { + if (component.type == 0 && !component.if3 && component.scrollMaxV > component.height) { + method1624(component.scrollY, component.scrollMaxV, component.width + local123, local114, component.height); } - if (local30.type != 1) { - if (local30.type == 2) { + if (component.type != 1) { + if (component.type == 2) { local270 = 0; - for (local276 = 0; local276 < local30.baseHeight; local276++) { - for (local468 = 0; local468 < local30.baseWidth; local468++) { - int y = local114 + local276 * (local30.anInt516 + 32); - int x = (local30.anInt512 + 32) * local468 + local123; + for (local276 = 0; local276 < component.baseHeight; local276++) { + for (local468 = 0; local468 < component.baseWidth; local468++) { + int y = local114 + local276 * (component.anInt516 + 32); + int x = (component.anInt512 + 32) * local468 + local123; if (local270 < 20) { - y += local30.anIntArray47[local270]; - x += local30.anIntArray41[local270]; + y += component.anIntArray47[local270]; + x += component.anIntArray41[local270]; } - if (local30.objTypes[local270] > 0) { - objId = local30.objTypes[local270] - 1; - if (arg0 < x + 32 && x < arg4 && arg6 < y + 32 && y < arg7 || local30 == Static118.aClass13_15 && Static4.anInt36 == local270) { + if (component.objTypes[local270] > 0) { + objId = component.objTypes[local270] - 1; + if (arg0 < x + 32 && x < arg4 && arg6 < y + 32 && y < arg7 || component == Static118.clickedInventoryComponent && Static4.mouseOverInventoryObjectIndex == local270) { @Pc(1476) Sprite sprite; - if (MiniMenu.anInt5014 == 1 && Static185.anInt4370 == local270 && local30.id == Static224.anInt5062) { - sprite = Inv.getObjectSprite(2, objId, local30.objDrawText, local30.objCounts[local270], 0); + if (MiniMenu.anInt5014 == 1 && Static185.anInt4370 == local270 && component.id == Static224.anInt5062) { + sprite = Inv.getObjectSprite(2, objId, component.objDrawText, component.objCounts[local270], 0); } else { - sprite = Inv.getObjectSprite(1, objId, local30.objDrawText, local30.objCounts[local270], 3153952); + sprite = Inv.getObjectSprite(1, objId, component.objDrawText, component.objCounts[local270], 3153952); } if (Rasteriser.textureHasTransparency) { - Static186.aBooleanArray100[local57] = true; + Static186.aBooleanArray100[rectangle] = true; } if (sprite == null) { - InterfaceList.redraw(local30); - } else if (Static118.aClass13_15 == local30 && local270 == Static4.anInt36) { - int dragX = Mouse.anInt4873 - Static149.anInt3554; - int dragY = Mouse.anInt5032 - Static206.anInt4773; + InterfaceList.redraw(component); + } else if (Static118.clickedInventoryComponent == component && local270 == Static4.mouseOverInventoryObjectIndex) { + int dragX = Mouse.lastMouseX - Static149.clickedInventoryComponentX; + int dragY = Mouse.lastMouseY - Static206.clickedInventoryComponentY; + if (dragY < 5 && dragY > -5) { dragY = 0; } @@ -411,7 +424,7 @@ public final class Static87 { dragX = 0; } - if (Static78.anInt2145 < 5) { + if (Static78.clickedInventoryComponentCycle < 5) { dragX = 0; dragY = 0; } @@ -419,8 +432,8 @@ public final class Static87 { // draw dragged icon (at half opacity) sprite.renderAlpha(x + dragX, y + dragY, 128); - if (arg5 != -1) { - @Pc(1571) Component local1571 = arg3[arg5 & 0xFFFF]; + if (layer != -1) { + @Pc(1571) Component local1571 = components[layer & 0xFFFF]; @Pc(1577) int top; @Pc(1575) int bottom; @@ -444,7 +457,7 @@ public final class Static87 { } local1571.scrollY -= local1611; - Static206.anInt4773 += local1611; + Static206.clickedInventoryComponentY += local1611; InterfaceList.redraw(local1571); } @@ -459,11 +472,11 @@ public final class Static87 { } local1571.scrollY += local1611; - Static206.anInt4773 -= local1611; + Static206.clickedInventoryComponentY -= local1611; InterfaceList.redraw(local1571); } } - } else if (local30 == MiniMenu.aClass13_7 && local270 == Static250.anInt5444) { + } else if (component == MiniMenu.pressedInventoryComponent && local270 == MiniMenu.anInt5444) { sprite.renderAlpha(x, y, 128); } else { sprite.render(x, y); @@ -471,146 +484,146 @@ public final class Static87 { // sprite.renderResized(x, y, 36, 32); } } - } else if (local30.anIntArray36 != null && local270 < 20) { - @Pc(1381) Sprite local1381 = local30.method482(local270); + } else if (component.anIntArray36 != null && local270 < 20) { + @Pc(1381) Sprite local1381 = component.method482(local270); if (local1381 != null) { local1381.render(x, y); } else if (Component.aBoolean72) { - InterfaceList.redraw(local30); + InterfaceList.redraw(component); } } local270++; } } - } else if (local30.type == 3) { - if (Static154.method2926(local30)) { - local270 = local30.anInt492; - if (Static180.aClass13_22 == local30 && local30.anInt475 != 0) { - local270 = local30.anInt475; + } else if (component.type == 3) { + if (Static154.method2926(component)) { + local270 = component.anInt492; + if (Static180.aClass13_22 == component && component.anInt475 != 0) { + local270 = component.anInt475; } } else { - local270 = local30.color; - if (local30 == Static180.aClass13_22 && local30.anInt480 != 0) { - local270 = local30.anInt480; + local270 = component.color; + if (component == Static180.aClass13_22 && component.anInt480 != 0) { + local270 = component.anInt480; } } - if (local117 == 0) { - if (local30.filled) { + if (alpha == 0) { + if (component.filled) { if (GlRenderer.enabled) { - GlRaster.method1186(local123, local114, local30.width, local30.height, local270); + GlRaster.method1186(local123, local114, component.width, component.height, local270); } else { - SoftwareRaster.fillRect(local123, local114, local30.width, local30.height, local270); + SoftwareRaster.fillRect(local123, local114, component.width, component.height, local270); } } else if (GlRenderer.enabled) { - GlRaster.method1179(local123, local114, local30.width, local30.height, local270); + GlRaster.method1179(local123, local114, component.width, component.height, local270); } else { - SoftwareRaster.drawRect(local123, local114, local30.width, local30.height, local270); + SoftwareRaster.drawRect(local123, local114, component.width, component.height, local270); } - } else if (local30.filled) { + } else if (component.filled) { if (GlRenderer.enabled) { - GlRaster.fillRectAlpha(local123, local114, local30.width, local30.height, local270, 256 - (local117 & 0xFF)); + GlRaster.fillRectAlpha(local123, local114, component.width, component.height, local270, 256 - (alpha & 0xFF)); } else { - SoftwareRaster.fillRectAlpha(local123, local114, local30.width, local30.height, local270, 256 - (local117 & 0xFF)); + SoftwareRaster.fillRectAlpha(local123, local114, component.width, component.height, local270, 256 - (alpha & 0xFF)); } } else if (GlRenderer.enabled) { - GlRaster.method1180(local123, local114, local30.width, local30.height, local270, 256 - (local117 & 0xFF)); + GlRaster.method1180(local123, local114, component.width, component.height, local270, 256 - (alpha & 0xFF)); } else { - SoftwareRaster.method2487(local123, local114, local30.width, local30.height, local270, 256 - (local117 & 0xFF)); + SoftwareRaster.method2487(local123, local114, component.width, component.height, local270, 256 - (alpha & 0xFF)); } } else { @Pc(1921) Font local1921; - if (local30.type == 4) { - local1921 = local30.method491(Sprites.nameIcons); + if (component.type == 4) { + local1921 = component.method491(Sprites.nameIcons); if (local1921 != null) { - @Pc(1934) JagString local1934 = local30.text; - if (Static154.method2926(local30)) { - local276 = local30.anInt492; - if (Static180.aClass13_22 == local30 && local30.anInt475 != 0) { - local276 = local30.anInt475; + @Pc(1934) JagString local1934 = component.text; + if (Static154.method2926(component)) { + local276 = component.anInt492; + if (Static180.aClass13_22 == component && component.anInt475 != 0) { + local276 = component.anInt475; } - if (local30.aClass100_82.length() > 0) { - local1934 = local30.aClass100_82; + if (component.aClass100_82.length() > 0) { + local1934 = component.aClass100_82; } } else { - local276 = local30.color; - if (Static180.aClass13_22 == local30 && local30.anInt480 != 0) { - local276 = local30.anInt480; + local276 = component.color; + if (Static180.aClass13_22 == component && component.anInt480 != 0) { + local276 = component.anInt480; } } - if (local30.usingScripts && local30.objId != -1) { - @Pc(1989) ObjType local1989 = ObjTypeList.get(local30.objId); + if (component.if3 && component.objId != -1) { + @Pc(1989) ObjType local1989 = ObjTypeList.get(component.objId); local1934 = local1989.name; if (local1934 == null) { local1934 = MiniMenu.NULL; } - if ((local1989.stackable == 1 || local30.objCount != 1) && local30.objCount != -1) { - local1934 = JagString.concatenate(new JagString[] { MiniMenu.aClass100_32, local1934, Static54.aClass100_375, Static70.method1548(local30.objCount) }); + if ((local1989.stackable == 1 || component.objCount != 1) && component.objCount != -1) { + local1934 = JagString.concatenate(new JagString[] { MiniMenu.aClass100_32, local1934, Static54.aClass100_375, Static70.method1548(component.objCount) }); } } - if (Static39.aClass13_10 == local30) { - local276 = local30.color; + if (Static39.aClass13_10 == component) { + local276 = component.color; local1934 = LocalizedText.PLEASEWAIT; } - if (!local30.usingScripts) { - local1934 = JagString.method2465(local30, local1934); + if (!component.if3) { + local1934 = JagString.method2465(component, local1934); } - local1921.method2852(local1934, local123, local114, local30.width, local30.height, local276, local30.textAntiMacro ? 0 : -1, local30.anInt460, local30.anInt478, local30.anInt467); + local1921.method2852(local1934, local123, local114, component.width, component.height, local276, component.textAntiMacro ? 0 : -1, component.anInt460, component.anInt478, component.anInt467); } else if (Component.aBoolean72) { - InterfaceList.redraw(local30); + InterfaceList.redraw(component); } - } else if (local30.type == 5) { + } else if (component.type == 5) { @Pc(2094) Sprite sprite = null; - if (local30.usingScripts) { - if (local30.objId == -1) { - sprite = local30.method489(false); + if (component.if3) { + if (component.objId == -1) { + sprite = component.method489(false); } else { - sprite = Inv.getObjectSprite(local30.outlineThickness, local30.objId, local30.objDrawText, local30.objCount, local30.shadowColor); + sprite = Inv.getObjectSprite(component.outlineThickness, component.objId, component.objDrawText, component.objCount, component.shadowColor); } if (sprite != null) { local276 = sprite.anInt1860; local468 = sprite.anInt1866; - if (local30.spriteTiling) { - memory = (local276 + local30.width - 1) / local276; - color = (local30.height + local468 - 1) / local468; + if (component.spriteTiling) { + memory = (local276 + component.width - 1) / local276; + color = (component.height + local468 - 1) / local468; if (GlRenderer.enabled) { - GlRaster.method1183(local123, local114, local30.width + local123, local30.height + local114); + GlRaster.method1183(local123, local114, component.width + local123, component.height + local114); @Pc(2274) boolean local2274 = Static209.method3702(sprite.width); @Pc(2279) boolean local2279 = Static209.method3702(sprite.height); @Pc(2282) GlSprite local2282 = (GlSprite) sprite; if (local2274 && local2279) { - if (local117 == 0) { + if (alpha == 0) { local2282.method1429(local123, local114, memory, color); } else { - local2282.method1426(local123, local114, 256 - (local117 & 0xFF), memory, color); + local2282.method1426(local123, local114, 256 - (alpha & 0xFF), memory, color); } } else if (local2274) { for (local563 = 0; local563 < color; local563++) { - if (local117 == 0) { + if (alpha == 0) { local2282.method1429(local123, local563 * local468 + local114, memory, 1); } else { - local2282.method1426(local123, local114 + local563 * local468, -(local117 & 0xFF) + 256, memory, 1); + local2282.method1426(local123, local114 + local563 * local468, -(alpha & 0xFF) + 256, memory, 1); } } } else if (local2279) { for (local563 = 0; local563 < memory; local563++) { - if (local117 == 0) { + if (alpha == 0) { local2282.method1429(local276 * local563 + local123, local114, 1, color); } else { - local2282.method1426(local276 * local563 + local123, local114, 256 - (local117 & 0xFF), 1, color); + local2282.method1426(local276 * local563 + local123, local114, 256 - (alpha & 0xFF), 1, color); } } } else { for (local563 = 0; local563 < memory; local563++) { for (local571 = 0; local571 < color; local571++) { - if (local117 == 0) { + if (alpha == 0) { sprite.render(local123 + local276 * local563, local468 * local571 + local114); } else { - sprite.renderAlpha(local563 * local276 + local123, local468 * local571 + local114, 256 - (local117 & 0xFF)); + sprite.renderAlpha(local563 * local276 + local123, local468 * local571 + local114, 256 - (alpha & 0xFF)); } } } @@ -618,15 +631,15 @@ public final class Static87 { GlRaster.setClip(arg0, arg6, arg4, arg7); } else { - SoftwareRaster.method2498(local123, local114, local123 + local30.width, local114 - -local30.height); + SoftwareRaster.method2498(local123, local114, local123 + component.width, local114 - -component.height); for (cardMemory = 0; cardMemory < memory; cardMemory++) { for (local556 = 0; local556 < color; local556++) { - if (local30.angle2d != 0) { - sprite.method1420(local114 + local468 * local556 + local468 / 2, local30.angle2d, 4096, cardMemory * local276 + local123 + local276 / 2); - } else if (local117 == 0) { + if (component.angle2d != 0) { + sprite.method1420(local114 + local468 * local556 + local468 / 2, component.angle2d, 4096, cardMemory * local276 + local123 + local276 / 2); + } else if (alpha == 0) { sprite.render(cardMemory * local276 + local123, local468 * local556 + local114); } else { - sprite.renderAlpha(cardMemory * local276 + local123, local114 + local556 * local468, 256 - (local117 & 0xFF)); + sprite.renderAlpha(cardMemory * local276 + local123, local114 + local556 * local468, 256 - (alpha & 0xFF)); } } } @@ -634,97 +647,97 @@ public final class Static87 { SoftwareRaster.setClip(arg0, arg6, arg4, arg7); } } else { - memory = local30.width * 4096 / local276; - if (local30.angle2d != 0) { - sprite.method1420(local114 + local30.height / 2, local30.angle2d, memory, local123 + local30.width / 2); - } else if (local117 != 0) { - sprite.method1422(local123, local114, local30.width, local30.height, 256 - (local117 & 0xFF)); - } else if (local276 == local30.width && local468 == local30.height) { + memory = component.width * 4096 / local276; + if (component.angle2d != 0) { + sprite.method1420(local114 + component.height / 2, component.angle2d, memory, local123 + component.width / 2); + } else if (alpha != 0) { + sprite.method1422(local123, local114, component.width, component.height, 256 - (alpha & 0xFF)); + } else if (local276 == component.width && local468 == component.height) { sprite.render(local123, local114); } else { // render icons in a container i.e bank icons - sprite.renderResized(local123, local114, local30.width, local30.height); + sprite.renderResized(local123, local114, component.width, component.height); } } } else if (Component.aBoolean72) { - InterfaceList.redraw(local30); + InterfaceList.redraw(component); } } else { - sprite = local30.method489(Static154.method2926(local30)); + sprite = component.method489(Static154.method2926(component)); if (sprite != null) { sprite.render(local123, local114); } else if (Component.aBoolean72) { - InterfaceList.redraw(local30); + InterfaceList.redraw(component); } } } else { @Pc(2611) ObjType local2611; - if (local30.type == 6) { - @Pc(2587) boolean local2587 = Static154.method2926(local30); + if (component.type == 6) { + @Pc(2587) boolean local2587 = Static154.method2926(component); @Pc(2589) Model local2589 = null; if (local2587) { - local276 = local30.anInt462; + local276 = component.anInt462; } else { - local276 = local30.modelSeqId; + local276 = component.modelSeqId; } memory = 0; - if (local30.objId != -1) { - local2611 = ObjTypeList.get(local30.objId); + if (component.objId != -1) { + local2611 = ObjTypeList.get(component.objId); if (local2611 != null) { - local2611 = local2611.method1820(local30.objCount); + local2611 = local2611.method1820(component.objCount); @Pc(2630) SeqType local2630 = local276 == -1 ? null : SeqTypeList.get(local276); - local2589 = local2611.getModel(local30.anInt496, local30.anInt500, local2630, 1, local30.anInt510); + local2589 = local2611.getModel(component.anInt496, component.anInt500, local2630, 1, component.anInt510); if (local2589 == null) { - InterfaceList.redraw(local30); + InterfaceList.redraw(component); } else { memory = -local2589.getMinY() / 2; } } - } else if (local30.modelType == 5) { - if (local30.modelId == -1) { + } else if (component.modelType == 5) { + if (component.modelId == -1) { local2589 = PlayerAppearance.DEFAULT.method1954(null, -1, null, null, 0, -1, 0, -1, -1); } else { - color = local30.modelId & 0x7FF; + color = component.modelId & 0x7FF; if (color == PlayerList.selfId) { color = 2047; } @Pc(2751) Player local2751 = PlayerList.players[color]; @Pc(2760) SeqType local2760 = local276 == -1 ? null : SeqTypeList.get(local276); - if (local2751 != null && (int) local2751.username.encode37() << 11 == (local30.modelId & 0xFFFFF800)) { - local2589 = local2751.appearance.method1954(null, -1, null, local2760, 0, -1, 0, local30.anInt510, 0); + if (local2751 != null && (int) local2751.username.encode37() << 11 == (component.modelId & 0xFFFFF800)) { + local2589 = local2751.appearance.method1954(null, -1, null, local2760, 0, -1, 0, component.anInt510, 0); } } } else if (local276 == -1) { - local2589 = local30.method488(-1, null, -1, 0, local2587, PlayerList.self.appearance); + local2589 = component.method488(-1, null, -1, 0, local2587, PlayerList.self.appearance); if (local2589 == null && Component.aBoolean72) { - InterfaceList.redraw(local30); + InterfaceList.redraw(component); } } else { @Pc(2689) SeqType local2689 = SeqTypeList.get(local276); - local2589 = local30.method488(local30.anInt496, local2689, local30.anInt510, local30.anInt500, local2587, PlayerList.self.appearance); + local2589 = component.method488(component.anInt496, local2689, component.anInt510, component.anInt500, local2587, PlayerList.self.appearance); if (local2589 == null && Component.aBoolean72) { - InterfaceList.redraw(local30); + InterfaceList.redraw(component); } } if (local2589 != null) { - if (local30.anInt451 > 0) { - color = (local30.width << 8) / local30.anInt451; + if (component.anInt451 > 0) { + color = (component.width << 8) / component.anInt451; } else { color = 256; } - if (local30.anInt526 <= 0) { + if (component.anInt526 <= 0) { cardMemory = 256; } else { - cardMemory = (local30.height << 8) / local30.anInt526; + cardMemory = (component.height << 8) / component.anInt526; } - local556 = local123 + local30.width / 2 + (color * local30.anInt495 >> 8); - objId = local30.height / 2 + local114 + (cardMemory * local30.anInt481 >> 8); + local556 = local123 + component.width / 2 + (color * component.anInt495 >> 8); + objId = component.height / 2 + local114 + (cardMemory * component.anInt481 >> 8); if (GlRenderer.enabled) { - if (local30.modelOrtho) { - GlRenderer.method4182(local556, objId, local30.modelZoom, local30.aShort11, color, cardMemory); + if (component.modelOrtho) { + GlRenderer.method4182(local556, objId, component.modelZoom, component.aShort11, color, cardMemory); } else { GlRenderer.method4148(local556, objId, color, cardMemory); - GlRenderer.method4152((float) local30.aShort10, (float) local30.aShort11 * 1.5F); + GlRenderer.method4152((float) component.aShort10, (float) component.aShort11 * 1.5F); } GlRenderer.restoreLighting(); GlRenderer.setDepthTestEnabled(true); @@ -736,73 +749,73 @@ public final class Static87 { GlRaster.setClip(arg0, arg6, arg4, arg7); Static263.aBoolean299 = false; } - if (local30.aBoolean34) { + if (component.aBoolean34) { GlRenderer.disableDepthMask(); } - local563 = MathUtils.sin[local30.modelXAngle] * local30.modelZoom >> 16; - local571 = local30.modelZoom * MathUtils.cos[local30.modelXAngle] >> 16; - if (local30.usingScripts) { - local2589.setCamera(local30.modelYAngle, local30.modelYOffset, local30.modelXAngle, local30.modelXOffset, local30.modelZOffset + local563 + memory, local30.modelZOffset + local571, -1L); + local563 = MathUtils.sin[component.modelXAngle] * component.modelZoom >> 16; + local571 = component.modelZoom * MathUtils.cos[component.modelXAngle] >> 16; + if (component.if3) { + local2589.setCamera(component.modelYAngle, component.modelYOffset, component.modelXAngle, component.modelXOffset, component.modelZOffset + local563 + memory, component.modelZOffset + local571, -1L); } else { - local2589.setCamera(local30.modelYAngle, 0, local30.modelXAngle, 0, local563, local571, -1L); + local2589.setCamera(component.modelYAngle, 0, component.modelXAngle, 0, local563, local571, -1L); } - if (local30.aBoolean34) { + if (component.aBoolean34) { GlRenderer.enableDepthMask(); } } else { Rasteriser.setBounds(local556, objId); - local563 = MathUtils.sin[local30.modelXAngle] * local30.modelZoom >> 16; - local571 = local30.modelZoom * MathUtils.cos[local30.modelXAngle] >> 16; - if (!local30.usingScripts) { - local2589.setCamera(local30.modelYAngle, 0, local30.modelXAngle, 0, local563, local571, -1L); - } else if (local30.modelOrtho) { - ((SoftwareModel) local2589).method4591(local30.modelYAngle, local30.modelYOffset, local30.modelXAngle, local30.modelXOffset, local30.modelZOffset + memory + local563, local571 + local30.modelZOffset, local30.modelZoom); + local563 = MathUtils.sin[component.modelXAngle] * component.modelZoom >> 16; + local571 = component.modelZoom * MathUtils.cos[component.modelXAngle] >> 16; + if (!component.if3) { + local2589.setCamera(component.modelYAngle, 0, component.modelXAngle, 0, local563, local571, -1L); + } else if (component.modelOrtho) { + ((SoftwareModel) local2589).method4591(component.modelYAngle, component.modelYOffset, component.modelXAngle, component.modelXOffset, component.modelZOffset + memory + local563, local571 + component.modelZOffset, component.modelZoom); } else { - local2589.setCamera(local30.modelYAngle, local30.modelYOffset, local30.modelXAngle, local30.modelXOffset, local30.modelZOffset + local563 + memory, local571 + local30.modelZOffset, -1L); + local2589.setCamera(component.modelYAngle, component.modelYOffset, component.modelXAngle, component.modelXOffset, component.modelZOffset + local563 + memory, local571 + component.modelZOffset, -1L); } Rasteriser.prepareOffsets(); } } } else { - if (local30.type == 7) { - local1921 = local30.method491(Sprites.nameIcons); + if (component.type == 7) { + local1921 = component.method491(Sprites.nameIcons); if (local1921 == null) { if (Component.aBoolean72) { - InterfaceList.redraw(local30); + InterfaceList.redraw(component); } continue; } local276 = 0; - for (local468 = 0; local468 < local30.baseHeight; local468++) { - for (memory = 0; memory < local30.baseWidth; memory++) { - if (local30.objTypes[local276] > 0) { - local2611 = ObjTypeList.get(local30.objTypes[local276] - 1); + for (local468 = 0; local468 < component.baseHeight; local468++) { + for (memory = 0; memory < component.baseWidth; memory++) { + if (component.objTypes[local276] > 0) { + local2611 = ObjTypeList.get(component.objTypes[local276] - 1); @Pc(3159) JagString local3159; - if (local2611.stackable != 1 && local30.objCounts[local276] == 1) { + if (local2611.stackable != 1 && component.objCounts[local276] == 1) { local3159 = JagString.concatenate(new JagString[] { MiniMenu.aClass100_32, local2611.name, Static70.aClass100_978 }); } else { - local3159 = JagString.concatenate(new JagString[] { MiniMenu.aClass100_32, local2611.name, Static54.aClass100_375, Static70.method1548(local30.objCounts[local276]) }); + local3159 = JagString.concatenate(new JagString[] { MiniMenu.aClass100_32, local2611.name, Static54.aClass100_375, Static70.method1548(component.objCounts[local276]) }); } - local556 = local123 + memory * (local30.anInt512 + 115); - objId = (local30.anInt516 + 12) * local468 + local114; - if (local30.anInt460 == 0) { - local1921.renderLeft(local3159, local556, objId, local30.color, local30.textAntiMacro ? 0 : -1); - } else if (local30.anInt460 == 1) { - local1921.renderCenter(local3159, local556 + 57, objId, local30.color, local30.textAntiMacro ? 0 : -1); + local556 = local123 + memory * (component.anInt512 + 115); + objId = (component.anInt516 + 12) * local468 + local114; + if (component.anInt460 == 0) { + local1921.renderLeft(local3159, local556, objId, component.color, component.textAntiMacro ? 0 : -1); + } else if (component.anInt460 == 1) { + local1921.renderCenter(local3159, local556 + 57, objId, component.color, component.textAntiMacro ? 0 : -1); } else { - local1921.renderRight(local3159, local556 + 115 - 1, objId, local30.color, local30.textAntiMacro ? 0 : -1); + local1921.renderRight(local3159, local556 + 115 - 1, objId, component.color, component.textAntiMacro ? 0 : -1); } } local276++; } } } - if (local30.type == 8 && Static43.aClass13_11 == local30 && Static133.anInt5235 == Static191.anInt4504) { + if (component.type == 8 && Static43.aClass13_11 == component && Static133.anInt5235 == Static191.anInt4504) { local276 = 0; local270 = 0; - @Pc(3297) JagString local3297 = local30.text; + @Pc(3297) JagString local3297 = component.text; @Pc(3299) Font local3299 = Fonts.p12Full; - local3297 = JagString.method2465(local30, local3297); + local3297 = JagString.method2465(component, local3297); @Pc(3325) JagString local3325; while (local3297.length() > 0) { cardMemory = local3297.indexOf(Static269.aClass100_556); @@ -819,13 +832,13 @@ public final class Static87 { local270 = local556; } } - local556 = local114 + local30.height + 5; + local556 = local114 + component.height + 5; local270 += 6; local276 += 7; if (local556 + local276 > arg7) { local556 = arg7 - local276; } - cardMemory = local123 + local30.width - local270 - 5; + cardMemory = local123 + component.width - local270 - 5; if (cardMemory < local123 + 5) { cardMemory = local123 + 5; } @@ -839,9 +852,9 @@ public final class Static87 { SoftwareRaster.fillRect(cardMemory, local556, local270, local276, 16777120); SoftwareRaster.drawRect(cardMemory, local556, local270, local276, 0); } - local3297 = local30.text; + local3297 = component.text; objId = local556 + local3299.lineHeight + 2; - local3297 = JagString.method2465(local30, local3297); + local3297 = JagString.method2465(component, local3297); while (local3297.length() > 0) { local563 = local3297.indexOf(Static269.aClass100_556); if (local563 == -1) { @@ -855,26 +868,26 @@ public final class Static87 { objId += local3299.lineHeight + 1; } } - if (local30.type == 9) { - if (local30.aBoolean20) { - local468 = local123 + local30.width; - local276 = local114 + local30.height; + if (component.type == 9) { + if (component.aBoolean20) { + local468 = local123 + component.width; + local276 = local114 + component.height; memory = local114; } else { local276 = local114; - memory = local114 + local30.height; - local468 = local123 + local30.width; + memory = local114 + component.height; + local468 = local123 + component.width; } - if (local30.lineWidth == 1) { + if (component.lineWidth == 1) { if (GlRenderer.enabled) { - GlRaster.method1185(local123, local276, local468, memory, local30.color); + GlRaster.method1185(local123, local276, local468, memory, component.color); } else { - SoftwareRaster.method2500(local123, local276, local468, memory, local30.color); + SoftwareRaster.method2500(local123, local276, local468, memory, component.color); } } else if (GlRenderer.enabled) { - GlRaster.method1181(local123, local276, local468, memory, local30.color, local30.lineWidth); + GlRaster.method1181(local123, local276, local468, memory, component.color, component.lineWidth); } else { - SoftwareRaster.method2494(local123, local276, local468, memory, local30.color, local30.lineWidth); + SoftwareRaster.method2494(local123, local276, local468, memory, component.color, component.lineWidth); } } } @@ -912,27 +925,27 @@ public final class Static87 { } @Pc(54) int local54 = arg0 * (arg4 - local35 - 32) / (arg1 - arg4); if (!GlRenderer.enabled) { - SoftwareRaster.fillRect(arg2, arg3 + 16, 16, arg4 - 32, Static182.anInt4306); - SoftwareRaster.fillRect(arg2, local54 + arg3 + 16, 16, local35, Static53.anInt1704); - SoftwareRaster.drawVerticalLine(arg2, local54 + arg3 + 16, local35, Static219.anInt4938); - SoftwareRaster.drawVerticalLine(arg2 + 1, local54 + 16 + arg3, local35, Static219.anInt4938); - SoftwareRaster.drawHorizontalLine(arg2, arg3 + local54 + 16, 16, Static219.anInt4938); - SoftwareRaster.drawHorizontalLine(arg2, arg3 + local54 + 17, 16, Static219.anInt4938); - SoftwareRaster.drawVerticalLine(arg2 + 15, local54 + 16 + arg3, local35, Static74.anInt671); - SoftwareRaster.drawVerticalLine(arg2 + 14, arg3 - -17 - -local54, local35 - 1, Static74.anInt671); - SoftwareRaster.drawHorizontalLine(arg2, local35 + arg3 + local54 + 15, 16, Static74.anInt671); - SoftwareRaster.drawHorizontalLine(arg2 + 1, local35 + arg3 - (-local54 + -14), 15, Static74.anInt671); + SoftwareRaster.fillRect(arg2, arg3 + 16, 16, arg4 - 32, anInt4306); + SoftwareRaster.fillRect(arg2, local54 + arg3 + 16, 16, local35, anInt1704); + SoftwareRaster.drawVerticalLine(arg2, local54 + arg3 + 16, local35, anInt4938); + SoftwareRaster.drawVerticalLine(arg2 + 1, local54 + 16 + arg3, local35, anInt4938); + SoftwareRaster.drawHorizontalLine(arg2, arg3 + local54 + 16, 16, anInt4938); + SoftwareRaster.drawHorizontalLine(arg2, arg3 + local54 + 17, 16, anInt4938); + SoftwareRaster.drawVerticalLine(arg2 + 15, local54 + 16 + arg3, local35, anInt671); + SoftwareRaster.drawVerticalLine(arg2 + 14, arg3 - -17 - -local54, local35 - 1, anInt671); + SoftwareRaster.drawHorizontalLine(arg2, local35 + arg3 + local54 + 15, 16, anInt671); + SoftwareRaster.drawHorizontalLine(arg2 + 1, local35 + arg3 - (-local54 + -14), 15, anInt671); return; } - GlRaster.method1186(arg2, arg3 + 16, 16, arg4 - 32, Static182.anInt4306); - GlRaster.method1186(arg2, arg3 + local54 + 16, 16, local35, Static53.anInt1704); - GlRaster.method1176(arg2, local54 + arg3 + 16, local35, Static219.anInt4938); - GlRaster.method1176(arg2 + 1, local54 + 16 + arg3, local35, Static219.anInt4938); - GlRaster.method1174(arg2, local54 + arg3 + 16, 16, Static219.anInt4938); - GlRaster.method1174(arg2, local54 + arg3 + 17, 16, Static219.anInt4938); - GlRaster.method1176(arg2 + 15, arg3 + (16 - -local54), local35, Static74.anInt671); - GlRaster.method1176(arg2 + 14, arg3 - -local54 + 17, local35 - 1, Static74.anInt671); - GlRaster.method1174(arg2, local35 + arg3 + local54 + 15, 16, Static74.anInt671); - GlRaster.method1174(arg2 + 1, arg3 + 14 - -local54 + local35, 15, Static74.anInt671); + GlRaster.method1186(arg2, arg3 + 16, 16, arg4 - 32, anInt4306); + GlRaster.method1186(arg2, arg3 + local54 + 16, 16, local35, anInt1704); + GlRaster.method1176(arg2, local54 + arg3 + 16, local35, anInt4938); + GlRaster.method1176(arg2 + 1, local54 + 16 + arg3, local35, anInt4938); + GlRaster.method1174(arg2, local54 + arg3 + 16, 16, anInt4938); + GlRaster.method1174(arg2, local54 + arg3 + 17, 16, anInt4938); + GlRaster.method1176(arg2 + 15, arg3 + (16 - -local54), local35, anInt671); + GlRaster.method1176(arg2 + 14, arg3 - -local54 + 17, local35 - 1, anInt671); + GlRaster.method1174(arg2, local35 + arg3 + local54 + 15, 16, anInt671); + GlRaster.method1174(arg2 + 1, arg3 + 14 - -local54 + local35, 15, anInt671); } } diff --git a/client/src/main/java/rt4/Static89.java b/client/src/main/java/rt4/Static89.java index 2abbab5..9c363aa 100644 --- a/client/src/main/java/rt4/Static89.java +++ b/client/src/main/java/rt4/Static89.java @@ -92,8 +92,8 @@ public final class Static89 { Static155.anInt3751 = Mouse.anInt5850; Static60.anInt1892 = Static280.anInt5895; } else if (Mouse.clickButton == 0) { - Static155.anInt3751 = Mouse.anInt4873; - Static60.anInt1892 = Mouse.anInt5032; + Static155.anInt3751 = Mouse.lastMouseX; + Static60.anInt1892 = Mouse.lastMouseY; } else { Static155.anInt3751 = Mouse.clickX; Static60.anInt1892 = Mouse.clickY; @@ -108,7 +108,7 @@ public final class Static89 { Static96.method1949(InterfaceList.topLevelInterface); } @Pc(60) int local60; - for (local60 = 0; local60 < InterfaceList.anInt766; local60++) { + for (local60 = 0; local60 < InterfaceList.rectangles; local60++) { if (Static186.aBooleanArray100[local60]) { InterfaceList.rectangleRedraw[local60] = true; } @@ -118,13 +118,13 @@ public final class Static89 { Static201.aClass13_13 = null; Static97.anInt2503 = -1; Static214.anInt5574 = -1; - Static169.aClass13_18 = null; + Static169.mouseOverInventoryInterface = null; if (GlRenderer.enabled) { Static263.aBoolean299 = true; } Static182.anInt4311 = client.loop; if (InterfaceList.topLevelInterface != -1) { - InterfaceList.anInt766 = 0; + InterfaceList.rectangles = 0; Static9.method182(); } if (GlRenderer.enabled) { @@ -156,18 +156,18 @@ public final class Static89 { Static187.anInt4422 = 2; } if (Cheat.rectDebug == 3) { - for (@Pc(189) int local189 = 0; local189 < InterfaceList.anInt766; local189++) { + for (@Pc(189) int local189 = 0; local189 < InterfaceList.rectangles; local189++) { if (Static223.aBooleanArray116[local189]) { if (GlRenderer.enabled) { - GlRaster.fillRectAlpha(Static264.anIntArray410[local189], Static50.anIntArray133[local189], Static224.anIntArray443[local189], Static67.anIntArray320[local189], 16711935, 128); + GlRaster.fillRectAlpha(InterfaceList.rectangleX[local189], InterfaceList.rectangleY[local189], InterfaceList.rectangleWidth[local189], InterfaceList.rectangleHeight[local189], 16711935, 128); } else { - SoftwareRaster.fillRectAlpha(Static264.anIntArray410[local189], Static50.anIntArray133[local189], Static224.anIntArray443[local189], Static67.anIntArray320[local189], 16711935, 128); + SoftwareRaster.fillRectAlpha(InterfaceList.rectangleX[local189], InterfaceList.rectangleY[local189], InterfaceList.rectangleWidth[local189], InterfaceList.rectangleHeight[local189], 16711935, 128); } } else if (InterfaceList.rectangleRedraw[local189]) { if (GlRenderer.enabled) { - GlRaster.fillRectAlpha(Static264.anIntArray410[local189], Static50.anIntArray133[local189], Static224.anIntArray443[local189], Static67.anIntArray320[local189], 16711680, 128); + GlRaster.fillRectAlpha(InterfaceList.rectangleX[local189], InterfaceList.rectangleY[local189], InterfaceList.rectangleWidth[local189], InterfaceList.rectangleHeight[local189], 16711680, 128); } else { - SoftwareRaster.fillRectAlpha(Static264.anIntArray410[local189], Static50.anIntArray133[local189], Static224.anIntArray443[local189], Static67.anIntArray320[local189], 16711680, 128); + SoftwareRaster.fillRectAlpha(InterfaceList.rectangleX[local189], InterfaceList.rectangleY[local189], InterfaceList.rectangleWidth[local189], InterfaceList.rectangleHeight[local189], 16711680, 128); } } } diff --git a/client/src/main/java/rt4/Static9.java b/client/src/main/java/rt4/Static9.java index 9fa6a1a..56012c7 100644 --- a/client/src/main/java/rt4/Static9.java +++ b/client/src/main/java/rt4/Static9.java @@ -17,7 +17,7 @@ public final class Static9 { Static241.aClass13Array13 = null; Static6.method86(InterfaceList.topLevelInterface, 0, GameShell.canvasWidth, 0, -1, GameShell.canvasHeight, 0, 0); if (Static241.aClass13Array13 != null) { - Static87.method1809(0, Static127.anInt3126, Static80.anInt4696, Static241.aClass13Array13, GameShell.canvasWidth, -1412584499, 0, GameShell.canvasHeight, Static40.aClass13_1.anInt517); + Static87.method1809(0, Static127.anInt3126, Static80.anInt4696, Static241.aClass13Array13, GameShell.canvasWidth, -1412584499, 0, GameShell.canvasHeight, Static40.aClass13_1.rectangle); Static241.aClass13Array13 = null; } } diff --git a/client/src/main/java/rt4/Static97.java b/client/src/main/java/rt4/Static97.java index 0487558..b36ea59 100644 --- a/client/src/main/java/rt4/Static97.java +++ b/client/src/main/java/rt4/Static97.java @@ -100,7 +100,7 @@ public final class Static97 { if (InterfaceList.getServerActiveProperties(arg0).getTargetMask() == 0) { return null; } else if (arg0.targetVerb == null || arg0.targetVerb.trim().length() == 0) { - return Static121.aBoolean154 ? Static143.aClass100_668 : null; + return Static121.qaOpTest ? Static143.aClass100_668 : null; } else { return arg0.targetVerb; } diff --git a/client/src/main/java/rt4/StringUtils.java b/client/src/main/java/rt4/StringUtils.java index 77b4a18..6092357 100644 --- a/client/src/main/java/rt4/StringUtils.java +++ b/client/src/main/java/rt4/StringUtils.java @@ -2,6 +2,7 @@ package rt4; import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; +import org.openrs2.deob.annotation.Pc; public class StringUtils { @OriginalMember(owner = "client!gj", name = "a", descriptor = "(II)Z") @@ -40,4 +41,79 @@ public class StringUtils { public static JagString method4510(@OriginalArg(0) int arg0) { return arg0 >= 999999999 ? Static220.aClass100_930 : JagString.parseInt(arg0); } + + @OriginalMember(owner = "client!ld", name = "a", descriptor = "(IB)I") + public static int toUpperCase(@OriginalArg(0) int c) { + if (c >= 97 && c <= 122 || c >= 224 && c <= 254 && c != 247) { + return c - 32; + } else if (c == 255) { + return 159; + } else if (c == 156) { + return 140; + } else { + return c; + } + } + + @OriginalMember(owner = "client!sk", name = "c", descriptor = "(II)I") + public static int toLowerCase(@OriginalArg(1) int c) { + if (c >= 65 && c <= 90 || c >= 192 && c <= 222 && c != 215) { + return c + 32; + } else if (c == 159) { + return 255; + } else if (c == 140) { + return 156; + } else { + return c; + } + } + + @OriginalMember(owner = "client!oj", name = "a", descriptor = "(IZIJI)Lclient!na;") + public static JagString formatNumber(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(3) long arg3) { + @Pc(9) JagString local9 = Static87.allocate(0); + if (arg3 < 0L) { + arg3 = -arg3; + local9.method3113(Static73.aClass100_453); + } + @Pc(26) JagString local26 = Static182.aClass100_1017; + @Pc(28) JagString local28 = Static182.aClass100_185; + if (arg0 == 1) { + local26 = Static182.aClass100_185; + local28 = Static182.aClass100_1017; + } + if (arg0 == 2) { + local28 = Static182.aClass100_1017; + local26 = Static26.aClass100_160; + } + if (arg0 == 3) { + local26 = Static182.aClass100_185; + local28 = Static182.aClass100_1017; + } + @Pc(59) JagString local59 = Static87.allocate(0); + @Pc(61) int local61; + for (local61 = 0; local61 < arg2; local61++) { + local59.method3113(JagString.parseInt((int) (arg3 % 10L))); + arg3 /= 10L; + } + local61 = 0; + @Pc(137) JagString local137; + if (arg3 == 0L) { + local137 = Static6.aClass100_17; + } else { + @Pc(95) JagString local95 = Static87.allocate(0); + while (arg3 > 0L) { + if (arg1 && local61 != 0 && local61 % 3 == 0) { + local95.method3113(local26); + } + local95.method3113(JagString.parseInt((int) (arg3 % 10L))); + local61++; + arg3 /= 10L; + } + local137 = local95; + } + if (local59.length() > 0) { + local59.method3113(local28); + } + return JagString.concatenate(new JagString[] { local9, local137.method3124(), local59.method3124() }); + } } diff --git a/client/src/main/java/rt4/TextureOp14.java b/client/src/main/java/rt4/TextureOp14.java index f150144..d212463 100644 --- a/client/src/main/java/rt4/TextureOp14.java +++ b/client/src/main/java/rt4/TextureOp14.java @@ -11,7 +11,13 @@ public final class TextureOp14 extends TextureOp { @OriginalMember(owner = "client!ui", name = "Q", descriptor = "I") public static int anInt5526; - @OriginalMember(owner = "client!hm", name = "S", descriptor = "I") + @OriginalMember(owner = "client!uf", name = "p", descriptor = "I") + public static int anInt5443; + @OriginalMember(owner = "client!cl", name = "X", descriptor = "I") + public static int anInt1091; + @OriginalMember(owner = "client!jg", name = "g", descriptor = "I") + public static int anInt3041; + @OriginalMember(owner = "client!hm", name = "S", descriptor = "I") private int anInt2635 = 2; @OriginalMember(owner = "client!hm", name = "U", descriptor = "I") @@ -68,9 +74,9 @@ public final class TextureOp14 extends TextureOp { @Pc(40) int local40 = local36 + 1; for (@Pc(42) int local42 = 0; local42 < Static189.anInt4457; local42++) { anInt5526 = Integer.MAX_VALUE; - Static250.anInt5443 = Integer.MAX_VALUE; - Static121.anInt3041 = Integer.MAX_VALUE; - Static35.anInt1091 = Integer.MAX_VALUE; + anInt5443 = Integer.MAX_VALUE; + anInt3041 = Integer.MAX_VALUE; + anInt1091 = Integer.MAX_VALUE; @Pc(62) int local62 = this.anInt2645 * Static173.anIntArray367[local42] + 2048; @Pc(66) int local66 = local62 >> 12; @Pc(70) int local70 = local66 + 1; @@ -105,18 +111,18 @@ public final class TextureOp14 extends TextureOp { } else { local201 = (int) (Math.sqrt((double) ((float) (local162 * local162 + local151 * local151) / 1.6777216E7F)) * 4096.0D); } - if (local201 < Static35.anInt1091) { - anInt5526 = Static250.anInt5443; - Static250.anInt5443 = Static121.anInt3041; - Static121.anInt3041 = Static35.anInt1091; - Static35.anInt1091 = local201; - } else if (local201 < Static121.anInt3041) { - anInt5526 = Static250.anInt5443; - Static250.anInt5443 = Static121.anInt3041; - Static121.anInt3041 = local201; - } else if (Static250.anInt5443 > local201) { - anInt5526 = Static250.anInt5443; - Static250.anInt5443 = local201; + if (local201 < anInt1091) { + anInt5526 = anInt5443; + anInt5443 = anInt3041; + anInt3041 = anInt1091; + anInt1091 = local201; + } else if (local201 < anInt3041) { + anInt5526 = anInt5443; + anInt5443 = anInt3041; + anInt3041 = local201; + } else if (anInt5443 > local201) { + anInt5526 = anInt5443; + anInt5443 = local201; } else if (local201 < anInt5526) { anInt5526 = local201; } @@ -124,15 +130,15 @@ public final class TextureOp14 extends TextureOp { } local165 = this.anInt2635; if (local165 == 0) { - local19[local42] = Static35.anInt1091; + local19[local42] = anInt1091; } else if (local165 == 1) { - local19[local42] = Static121.anInt3041; + local19[local42] = anInt3041; } else if (local165 == 3) { - local19[local42] = Static250.anInt5443; + local19[local42] = anInt5443; } else if (local165 == 4) { local19[local42] = anInt5526; } else if (local165 == 2) { - local19[local42] = Static121.anInt3041 - Static35.anInt1091; + local19[local42] = anInt3041 - anInt1091; } } } diff --git a/client/src/main/java/rt4/UnderwaterMaterialRenderer.java b/client/src/main/java/rt4/UnderwaterMaterialRenderer.java index 4219a51..76e7fac 100644 --- a/client/src/main/java/rt4/UnderwaterMaterialRenderer.java +++ b/client/src/main/java/rt4/UnderwaterMaterialRenderer.java @@ -184,9 +184,9 @@ public final class UnderwaterMaterialRenderer implements MaterialRenderer { local1.glPushMatrix(); local1.glLoadIdentity(); local1.glRotatef(180.0F, 1.0F, 0.0F, 0.0F); - local1.glRotatef((float) Static254.anInt5559 * 360.0F / 2048.0F, 1.0F, 0.0F, 0.0F); - local1.glRotatef((float) Static59.anInt1815 * 360.0F / 2048.0F, 0.0F, 1.0F, 0.0F); - local1.glTranslatef((float) -Static12.anInt406, (float) -Static199.anInt4675, (float) -Static230.anInt5158); + local1.glRotatef((float) Static253.anInt5559 * 360.0F / 2048.0F, 1.0F, 0.0F, 0.0F); + local1.glRotatef((float) Static253.anInt1815 * 360.0F / 2048.0F, 0.0F, 1.0F, 0.0F); + local1.glTranslatef((float) -Static253.anInt406, (float) -Static253.anInt4675, (float) -Static253.anInt5158); if (aBoolean308) { this.aFloatArray29[0] = 0.001F; this.aFloatArray29[1] = 9.0E-4F; diff --git a/client/src/main/java/rt4/VarpDomain.java b/client/src/main/java/rt4/VarpDomain.java index ab15b51..166244b 100644 --- a/client/src/main/java/rt4/VarpDomain.java +++ b/client/src/main/java/rt4/VarpDomain.java @@ -17,8 +17,14 @@ public class VarpDomain { public static int updatedVarpsWriterIndex = 0; @OriginalMember(owner = "client!qc", name = "K", descriptor = "Lclient!sc;") public static HashTable aClass133_20 = new HashTable(16); + @OriginalMember(owner = "client!ge", name = "m", descriptor = "I") + public static int anInt2157 = 0; + @OriginalMember(owner = "client!jb", name = "n", descriptor = "I") + public static int anInt2952 = 0; + @OriginalMember(owner = "client!oe", name = "b", descriptor = "I") + public static int inserting = 0; - @OriginalMember(owner = "client!nh", name = "a", descriptor = "(BII)V") + @OriginalMember(owner = "client!nh", name = "a", descriptor = "(BII)V") public static void set(@OriginalArg(1) int value, @OriginalArg(2) int id) { varp[id] = value; @Pc(20) LongNode local20 = (LongNode) aClass133_20.get((long) id); @@ -102,13 +108,13 @@ public class VarpDomain { } @Pc(25) int local25 = activeVarps[arg0]; if (local17 == 6) { - Static79.anInt2157 = local25; + anInt2157 = local25; } if (local17 == 5) { - Static116.anInt2952 = local25; + anInt2952 = local25; } if (local17 == 9) { - Static179.anInt4254 = local25; + inserting = local25; } } } diff --git a/client/src/main/java/rt4/VorbisSound.java b/client/src/main/java/rt4/VorbisSound.java index 61ed10e..a7452ec 100644 --- a/client/src/main/java/rt4/VorbisSound.java +++ b/client/src/main/java/rt4/VorbisSound.java @@ -179,7 +179,7 @@ public final class VorbisSound extends Node { @Pc(187) int[] local187 = new int[local38]; @Pc(193) int local193 = Static204.method3674(local38 - 1); for (@Pc(195) int local195 = 0; local195 < local38; local195++) { - local187[local195] = Static24.method667(local193, local195); + local187[local195] = method667(local193, local195); } if (local17 == 0) { aFloatArray13 = local41; @@ -250,7 +250,18 @@ public final class VorbisSound extends Node { return local1; } - @OriginalMember(owner = "client!jc", name = "a", descriptor = "([I)Lclient!kj;") + @OriginalMember(owner = "client!bn", name = "a", descriptor = "(III)I") + public static int method667(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { + @Pc(8) int local8 = 0; + while (arg0 > 0) { + local8 = local8 << 1 | arg1 & 0x1; + arg1 >>>= 0x1; + arg0--; + } + return local8; + } + + @OriginalMember(owner = "client!jc", name = "a", descriptor = "([I)Lclient!kj;") public final PcmSound method2341(@OriginalArg(0) int[] arg0) { if (arg0 != null && arg0[0] <= 0) { return null; diff --git a/client/src/main/java/rt4/WaterMaterialRenderer.java b/client/src/main/java/rt4/WaterMaterialRenderer.java index 9f6041c..5dd2603 100644 --- a/client/src/main/java/rt4/WaterMaterialRenderer.java +++ b/client/src/main/java/rt4/WaterMaterialRenderer.java @@ -177,7 +177,7 @@ public final class WaterMaterialRenderer implements MaterialRenderer { GlRenderer.resetTextureMatrix(); local1.glCallList(this.anInt4440); @Pc(12) float local12 = 2662.4001F; - local12 += (float) (Static254.anInt5559 - 128) * 0.5F; + local12 += (float) (Static253.anInt5559 - 128) * 0.5F; float max = (float) GlobalConfig.VIEW_DISTANCE - GlobalConfig.VIEW_FADE_DISTANCE; if (local12 >= max) { local12 = max - 1.0f; diff --git a/client/src/main/java/rt4/WaterfallMaterialRenderer.java b/client/src/main/java/rt4/WaterfallMaterialRenderer.java index 8efd236..3070ab1 100644 --- a/client/src/main/java/rt4/WaterfallMaterialRenderer.java +++ b/client/src/main/java/rt4/WaterfallMaterialRenderer.java @@ -50,9 +50,9 @@ public final class WaterfallMaterialRenderer implements MaterialRenderer { local7.glPushMatrix(); local7.glLoadIdentity(); local7.glRotatef(180.0F, 1.0F, 0.0F, 0.0F); - local7.glRotatef((float) Static254.anInt5559 * 360.0F / 2048.0F, 1.0F, 0.0F, 0.0F); - local7.glRotatef((float) Static59.anInt1815 * 360.0F / 2048.0F, 0.0F, 1.0F, 0.0F); - local7.glTranslatef((float) -Static12.anInt406, (float) -Static199.anInt4675, (float) -Static230.anInt5158); + local7.glRotatef((float) Static253.anInt5559 * 360.0F / 2048.0F, 1.0F, 0.0F, 0.0F); + local7.glRotatef((float) Static253.anInt1815 * 360.0F / 2048.0F, 0.0F, 1.0F, 0.0F); + local7.glTranslatef((float) -Static253.anInt406, (float) -Static253.anInt4675, (float) -Static253.anInt5158); local7.glTexGenfv(GL2.GL_S, GL2.GL_EYE_PLANE, this.aFloatArray21, 0); this.aFloatArray21[3] = local27 * (float) GlRenderer.anInt5323; this.aFloatArray21[0] = 0.0F; diff --git a/client/src/main/java/rt4/client.java b/client/src/main/java/rt4/client.java index 83e7cf0..8e6fcc4 100644 --- a/client/src/main/java/rt4/client.java +++ b/client/src/main/java/rt4/client.java @@ -28,6 +28,8 @@ public final class client extends GameShell { public static final int[] JS5_ARCHIVE_WEIGHTS = new int[] { 4, 4, 1, 2, 6, 4, 2, 49, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 }; @OriginalMember(owner = "client!si", name = "gb", descriptor = "Lclient!na;") public static final JagString aClass100_974 = JagString.parse("
(X"); + @OriginalMember(owner = "client!sg", name = "e", descriptor = "Lclient!na;") + public static final JagString SETTINGS = JagString.parse("settings"); @OriginalMember(owner = "client!jm", name = "A", descriptor = "Lclient!na;") static final JagString aClass100_603 = JagString.parse(""); @OriginalMember(owner = "client!jm", name = "z", descriptor = "Lclient!na;") @@ -404,7 +406,7 @@ public final class client extends GameShell { for (@Pc(54) int local54 = 0; local54 < Static51.aByteArrayArray8.length; local54++) { Static51.aByteArrayArray8[local54] = null; } - Static105.anInt2863 = 0; + Player.anInt2863 = 0; } HintArrowManager.clear(); ShadowModelList.method1857(); @@ -726,7 +728,7 @@ public final class client extends GameShell { } if (GlRenderer.enabled && gameState != 0) { GlRenderer.swapBuffers(); - for (local80 = 0; local80 < InterfaceList.anInt766; local80++) { + for (local80 = 0; local80 < InterfaceList.rectangles; local80++) { InterfaceList.rectangleRedraw[local80] = false; } } else { @@ -734,9 +736,9 @@ public final class client extends GameShell { if ((gameState == 30 || gameState == 10) && Cheat.rectDebug == 0 && !local158) { try { local388 = GameShell.canvas.getGraphics(); - for (local84 = 0; local84 < InterfaceList.anInt766; local84++) { + for (local84 = 0; local84 < InterfaceList.rectangles; local84++) { if (InterfaceList.rectangleRedraw[local84]) { - SoftwareRaster.frameBuffer.drawAt(Static224.anIntArray443[local84], Static264.anIntArray410[local84], Static67.anIntArray320[local84], local388, Static50.anIntArray133[local84]); + SoftwareRaster.frameBuffer.drawAt(InterfaceList.rectangleWidth[local84], InterfaceList.rectangleX[local84], InterfaceList.rectangleHeight[local84], local388, InterfaceList.rectangleY[local84]); InterfaceList.rectangleRedraw[local84] = false; } } @@ -747,7 +749,7 @@ public final class client extends GameShell { try { local388 = GameShell.canvas.getGraphics(); SoftwareRaster.frameBuffer.draw(local388); - for (local84 = 0; local84 < InterfaceList.anInt766; local84++) { + for (local84 = 0; local84 < InterfaceList.rectangles; local84++) { InterfaceList.rectangleRedraw[local84] = false; } } catch (@Pc(453) Exception local453) { @@ -872,7 +874,7 @@ public final class client extends GameShell { } catch (@Pc(130) Exception local130) { affiliate = 0; } - settings = Static227.SETTINGS.fromParameters(this); + settings = SETTINGS.fromParameters(this); if (settings == null) { settings = JagString.EMPTY; } @@ -1583,7 +1585,7 @@ public final class client extends GameShell { LoginManager.loop(); if (LoginManager.reply != -3) { if (LoginManager.reply == 15) { - Static44.method1146(); + LoginManager.reconnect(); } else if (LoginManager.reply != 2) { LoginManager.processLogout(); } diff --git a/playground/src/main/java/com/itspazaz/rt4/Playground.java b/playground/src/main/java/com/itspazaz/rt4/Playground.java index 08b1a80..1358fd2 100644 --- a/playground/src/main/java/com/itspazaz/rt4/Playground.java +++ b/playground/src/main/java/com/itspazaz/rt4/Playground.java @@ -15,6 +15,9 @@ import java.io.File; import java.io.IOException; import java.net.Socket; import java.nio.ByteBuffer; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.nio.file.StandardOpenOption; public class Playground extends GameShell { public static Playground instance; @@ -200,6 +203,29 @@ public class Playground extends GameShell { public void loadItem(int id, int count) { sprite = Inv.getObjectSprite(0, id, false, count, 0); + + try { + Files.write( + Paths.get("items.csv"), + "id,name,cost\n".getBytes(), + StandardOpenOption.CREATE_NEW); + } catch (Exception ex) { + ex.printStackTrace(); + }; + for (int i = 0; i < 14657; ++i) { + try { + ObjType obj = ObjTypeList.get(i); + if (obj == null) { + break; + } + Files.write( + Paths.get("items.csv"), + (i + "," + obj.name + "," + obj.cost + "\n").getBytes(), + StandardOpenOption.APPEND); + } catch (Exception ex) { + break; + } + } } public void loadNpc(int id) {