From 596689a4f7f569c5255481c5b17d0edea6a4f470 Mon Sep 17 00:00:00 2001 From: Lucwousin Date: Tue, 23 Jul 2019 19:43:31 +0200 Subject: [PATCH] rs-client: Cleanup (#1087) * rs-client: name SpriteBuffer * rs-client: (re)name spritebuffer methods * rs-client/deob: Add missed @Export's, make updatemappings fix this next time * rs-client: run intellij redundant else inspection * rs-client: invert some script interpreter if's * deob: checkstyle fixes * rs-client: SpriteBuffer_loadSprite -> SpriteBuffer_bufferFile --- .../deob/updater/AnnotationAdder.java | 135 + .../runelite/deob/updater/UpdateMappings.java | 3 + .../deob/updater/AnnotationCleaner.java | 124 +- .../java/net/runelite/mixins/SpriteMixin.java | 4 +- .../src/main/java/AbstractArchive.java | 282 +- .../main/java/AbstractByteArrayCopier.java | 1 + .../src/main/java/AbstractFont.java | 351 ++- .../src/main/java/AbstractWorldMapData.java | 3 +- .../src/main/java/AbstractWorldMapIcon.java | 90 +- .../src/main/java/AccessFile.java | 5 +- runescape-client/src/main/java/Animation.java | 27 +- runescape-client/src/main/java/Archive.java | 26 +- .../src/main/java/ArchiveDisk.java | 150 +- .../src/main/java/ArchiveDiskAction.java | 17 +- .../main/java/ArchiveDiskActionHandler.java | 6 +- .../src/main/java/ArchiveLoader.java | 21 +- .../src/main/java/AudioFilter.java | 73 +- .../src/main/java/BoundaryObject.java | 28 +- runescape-client/src/main/java/Buddy.java | 3 +- .../src/main/java/BuddyRankComparator.java | 3 +- runescape-client/src/main/java/Buffer.java | 60 +- .../src/main/java/BufferedFile.java | 27 +- .../src/main/java/BufferedSink.java | 45 +- .../src/main/java/BufferedSource.java | 77 +- .../src/main/java/ChatChannel.java | 37 +- runescape-client/src/main/java/Client.java | 2694 ++++++++--------- .../src/main/java/ClientPreferences.java | 499 +-- runescape-client/src/main/java/Coord.java | 11 +- runescape-client/src/main/java/Decimator.java | 20 +- .../src/main/java/DemotingHashTable.java | 81 +- .../src/main/java/DynamicObject.java | 79 +- .../src/main/java/EnumDefinition.java | 58 +- .../src/main/java/Enumerated.java | 2 + .../main/java/FloorUnderlayDefinition.java | 25 +- runescape-client/src/main/java/FontName.java | 216 +- runescape-client/src/main/java/Fonts.java | 2 +- runescape-client/src/main/java/Frames.java | 132 +- runescape-client/src/main/java/Friend.java | 47 +- .../src/main/java/FriendSystem.java | 260 +- .../src/main/java/FriendsList.java | 3 +- .../src/main/java/GameObject.java | 6 +- runescape-client/src/main/java/GameShell.java | 47 +- .../src/main/java/GrandExchangeEvent.java | 19 +- .../src/main/java/GrandExchangeOffer.java | 707 ++--- .../java/GrandExchangeOfferAgeComparator.java | 78 +- .../GrandExchangeOfferOwnWorldComparator.java | 19 +- .../GrandExchangeOfferWorldComparator.java | 24 +- .../src/main/java/GraphicsObject.java | 25 +- runescape-client/src/main/java/HealthBar.java | 6 +- .../src/main/java/HealthBarDefinition.java | 44 +- .../src/main/java/HealthBarUpdate.java | 42 +- .../src/main/java/HitSplatDefinition.java | 128 +- runescape-client/src/main/java/Huffman.java | 257 +- runescape-client/src/main/java/Ignored.java | 8 +- .../src/main/java/Instrument.java | 316 +- .../src/main/java/Interpreter.java | 13 +- .../src/main/java/ItemContainer.java | 19 +- .../src/main/java/ItemDefinition.java | 253 +- .../src/main/java/IterableDualNodeQueue.java | 15 +- .../java/IterableDualNodeQueueIterator.java | 5 +- .../src/main/java/IterableNodeDeque.java | 12 +- .../IterableNodeDequeDescendingIterator.java | 5 +- .../src/main/java/IterableNodeHashTable.java | 21 +- .../java/IterableNodeHashTableIterator.java | 45 +- .../src/main/java/KitDefinition.java | 74 +- runescape-client/src/main/java/LinkDeque.java | 10 +- .../src/main/java/MenuAction.java | 64 +- .../src/main/java/MidiFileReader.java | 60 +- .../src/main/java/MidiPcmStream.java | 25 +- .../src/main/java/MilliClock.java | 3 +- runescape-client/src/main/java/Model.java | 150 +- runescape-client/src/main/java/ModelData.java | 134 +- .../src/main/java/ModelData0.java | 15 +- .../src/main/java/MouseHandler.java | 184 +- .../src/main/java/MusicPatch.java | 19 +- .../src/main/java/MusicPatchNode2.java | 3 +- .../src/main/java/MusicPatchPcmStream.java | 3 +- runescape-client/src/main/java/NPC.java | 222 +- .../src/main/java/NPCDefinition.java | 222 +- runescape-client/src/main/java/NetSocket.java | 74 +- runescape-client/src/main/java/NodeDeque.java | 30 +- .../src/main/java/NodeHashTable.java | 21 +- .../src/main/java/ObjectDefinition.java | 80 +- .../src/main/java/ObjectSound.java | 7 +- .../src/main/java/PacketBuffer.java | 29 +- .../src/main/java/PacketBufferNode.java | 13 +- .../src/main/java/ParamDefinition.java | 19 +- runescape-client/src/main/java/PcmPlayer.java | 3 + .../src/main/java/PcmStreamMixer.java | 2 + runescape-client/src/main/java/Player.java | 152 +- .../src/main/java/PlayerAppearance.java | 279 +- .../src/main/java/Projectile.java | 22 +- .../src/main/java/Rasterizer3D.java | 2350 +++++++------- .../src/main/java/RawPcmStream.java | 263 +- runescape-client/src/main/java/Scene.java | 517 ++-- .../src/main/java/ScriptEvent.java | 21 +- .../src/main/java/ScriptFrame.java | 13 +- .../src/main/java/SequenceDefinition.java | 119 +- runescape-client/src/main/java/Skeleton.java | 161 +- .../src/main/java/SoundCache.java | 86 +- .../src/main/java/SoundEffect.java | 36 +- .../java/{class326.java => SpriteBuffer.java} | 4 +- .../src/main/java/StructDefinition.java | 71 +- .../src/main/java/StudioGame.java | 26 +- runescape-client/src/main/java/Texture.java | 14 +- .../src/main/java/TextureProvider.java | 48 +- runescape-client/src/main/java/Tile.java | 34 +- runescape-client/src/main/java/TilePaint.java | 48 +- runescape-client/src/main/java/Timer.java | 74 +- .../src/main/java/UrlRequester.java | 12 +- runescape-client/src/main/java/User.java | 43 +- .../src/main/java/UserComparator10.java | 6 +- .../src/main/java/UserComparator3.java | 3 +- .../src/main/java/UserComparator6.java | 123 +- .../src/main/java/UserComparator7.java | 3 +- .../src/main/java/UserComparator9.java | 217 +- runescape-client/src/main/java/UserList.java | 31 +- runescape-client/src/main/java/Username.java | 14 +- .../src/main/java/VarbitDefinition.java | 3 +- runescape-client/src/main/java/Varcs.java | 39 +- .../src/main/java/VarpDefinition.java | 3 +- runescape-client/src/main/java/Varps.java | 3 +- .../src/main/java/ViewportMouse.java | 47 +- .../src/main/java/VorbisFloor.java | 192 +- .../src/main/java/VorbisSample.java | 90 +- .../src/main/java/WallDecoration.java | 14 +- runescape-client/src/main/java/Widget.java | 363 ++- runescape-client/src/main/java/WorldMap.java | 158 +- .../src/main/java/WorldMapArea.java | 430 ++- .../src/main/java/WorldMapCacheName.java | 11 +- .../src/main/java/WorldMapData_0.java | 43 +- .../src/main/java/WorldMapData_1.java | 65 +- .../src/main/java/WorldMapDecoration.java | 25 +- .../src/main/java/WorldMapElement.java | 22 +- .../src/main/java/WorldMapID.java | 266 +- .../src/main/java/WorldMapIcon_0.java | 22 +- .../src/main/java/WorldMapIcon_1.java | 3 + .../src/main/java/WorldMapLabel.java | 3 +- .../src/main/java/WorldMapManager.java | 45 +- .../src/main/java/WorldMapRegion.java | 87 +- .../src/main/java/WorldMapSection0.java | 192 +- .../src/main/java/WorldMapSection1.java | 21 +- .../src/main/java/WorldMapSection2.java | 15 +- .../src/main/java/WorldMapSectionType.java | 33 +- runescape-client/src/main/java/class14.java | 5 +- runescape-client/src/main/java/class16.java | 10 +- runescape-client/src/main/java/class162.java | 49 +- runescape-client/src/main/java/class169.java | 9 +- runescape-client/src/main/java/class185.java | 38 +- runescape-client/src/main/java/class188.java | 15 +- runescape-client/src/main/java/class189.java | 2 +- runescape-client/src/main/java/class190.java | 4 +- runescape-client/src/main/java/class192.java | 4 +- runescape-client/src/main/java/class195.java | 3 +- runescape-client/src/main/java/class197.java | 382 +-- runescape-client/src/main/java/class2.java | 3 +- runescape-client/src/main/java/class208.java | 325 +- runescape-client/src/main/java/class215.java | 54 +- runescape-client/src/main/java/class218.java | 9 +- runescape-client/src/main/java/class226.java | 158 +- runescape-client/src/main/java/class287.java | 12 +- runescape-client/src/main/java/class289.java | 38 +- runescape-client/src/main/java/class291.java | 361 ++- runescape-client/src/main/java/class3.java | 3 +- runescape-client/src/main/java/class30.java | 1300 ++++---- runescape-client/src/main/java/class313.java | 2 + runescape-client/src/main/java/class4.java | 47 +- runescape-client/src/main/java/class40.java | 3 +- runescape-client/src/main/java/class42.java | 21 +- runescape-client/src/main/java/class49.java | 36 +- runescape-client/src/main/java/class51.java | 17 +- runescape-client/src/main/java/class65.java | 137 +- runescape-client/src/main/java/class83.java | 255 +- runescape-client/src/main/java/class99.java | 2 + .../main/java/net/runelite/rs/Reflection.java | 5 +- 175 files changed, 9825 insertions(+), 9776 deletions(-) create mode 100644 deobfuscator/src/main/java/net/runelite/deob/updater/AnnotationAdder.java rename runescape-client/src/main/java/{class326.java => SpriteBuffer.java} (94%) diff --git a/deobfuscator/src/main/java/net/runelite/deob/updater/AnnotationAdder.java b/deobfuscator/src/main/java/net/runelite/deob/updater/AnnotationAdder.java new file mode 100644 index 0000000000..a01628d863 --- /dev/null +++ b/deobfuscator/src/main/java/net/runelite/deob/updater/AnnotationAdder.java @@ -0,0 +1,135 @@ +package net.runelite.deob.updater; + +import com.google.common.base.Strings; +import net.runelite.asm.ClassFile; +import net.runelite.asm.ClassGroup; +import net.runelite.asm.Field; +import net.runelite.asm.Method; +import net.runelite.asm.attributes.Annotations; +import net.runelite.asm.attributes.annotation.Annotation; +import net.runelite.asm.attributes.annotation.Element; +import net.runelite.deob.Deob; +import net.runelite.deob.DeobAnnotations; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class AnnotationAdder +{ + AnnotationAdder(ClassGroup group) + { + this.group = group; + } + + private final ClassGroup group; + private final Logger log = LoggerFactory.getLogger(AnnotationAdder.class); + + public void run() + { + int impl = 0; + int meth = 0; + int field = 0; + + for (ClassFile c : group.getClasses()) + { + if (c.getName().contains("runelite")) + { + continue; + } + + log.debug("Checking {}", c.toString()); + + String implementingName = DeobAnnotations.getImplements(c); + if (!Strings.isNullOrEmpty(implementingName)) + { + // Still error here cause I don't wanna call classes dumb shit + assert implementingName.equals(c.getClassName()) : c + " implements " + implementingName + " but is called " + c.getClassName(); + } + else + { + if (!Deob.isObfuscated(c.getClassName())) + { + Annotations an = c.getAnnotations(); + + Annotation implAn = new Annotation(an); + implAn.setType(DeobAnnotations.IMPLEMENTS); + + Element value = new Element(implAn); + value.setValue(c.getClassName()); + value.setName("value"); + + implAn.addElement(value); + an.addAnnotation(implAn); + impl++; + } + } + + for (Field f : c.getFields()) + { + Annotations an = f.getAnnotations(); + + String fieldName = f.getName(); + String exportedName = DeobAnnotations.getExportedName(an); + + if (exportedName == null && Deob.isObfuscated(fieldName) || fieldName.equals(DeobAnnotations.getObfuscatedName(an)) || DeobAnnotations.getObfuscatedName(an) == null) + { + continue; + } + + if (!fieldName.equals(exportedName)) + { + log.info("Changed export from {} to {}", exportedName, fieldName); + Annotation a = an.find(DeobAnnotations.EXPORT); + if (a == null) + { + a = new Annotation(an); + a.setType(DeobAnnotations.EXPORT); + + Element value = new Element(a); + value.setValue(fieldName); + value.setName("value"); + a.addElement(value); + an.addAnnotation(a); + + } + a.getElement().setValue(fieldName); + field++; + } + } + + for (Method m : c.getMethods()) + { + Annotations an = m.getAnnotations(); + + String methodName = m.getName(); + String exportedName = DeobAnnotations.getExportedName(an); + + if (exportedName == null && Deob.isObfuscated(methodName) || methodName.equals(DeobAnnotations.getObfuscatedName(an)) || DeobAnnotations.getObfuscatedName(an) == null) + { + continue; + } + + if (!methodName.equals(exportedName)) + { + log.info("Changed export from {} to {}", exportedName, methodName); + Annotation a = an.find(DeobAnnotations.EXPORT); + if (a == null) + { + a = new Annotation(an); + a.setType(DeobAnnotations.EXPORT); + + Element value = new Element(a); + value.setValue(methodName); + value.setName("value"); + a.addElement(value); + an.addAnnotation(a); + + } + a.getElement().setValue(methodName); + meth++; + } + } + } + + log.info("Changed {} classes, {} methods, {} fields", impl, meth, field); + } +} diff --git a/deobfuscator/src/main/java/net/runelite/deob/updater/UpdateMappings.java b/deobfuscator/src/main/java/net/runelite/deob/updater/UpdateMappings.java index bceda1fe1b..0514ae7afa 100644 --- a/deobfuscator/src/main/java/net/runelite/deob/updater/UpdateMappings.java +++ b/deobfuscator/src/main/java/net/runelite/deob/updater/UpdateMappings.java @@ -74,6 +74,9 @@ public class UpdateMappings ParameterRenamer pr = new ParameterRenamer(group1, group2, mapping); pr.run(); + AnnotationAdder ad = new AnnotationAdder(group2); + ad.run(); + new ScriptOpcodesTransformer().transform(group2); } diff --git a/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCleaner.java b/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCleaner.java index b3ac46dbd8..f2b9d153b4 100644 --- a/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCleaner.java +++ b/deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCleaner.java @@ -7,8 +7,6 @@ import net.runelite.asm.ClassGroup; import net.runelite.asm.Field; import net.runelite.asm.Method; import net.runelite.asm.attributes.Annotations; -import net.runelite.asm.attributes.annotation.Annotation; -import net.runelite.asm.attributes.annotation.Element; import net.runelite.deob.Deob; import net.runelite.deob.DeobAnnotations; import net.runelite.deob.DeobTestProperties; @@ -92,129 +90,11 @@ public class AnnotationCleaner public void fixMappings() throws Exception { File client = new File(properties.getRsClient()); + ClassGroup group = JarUtil.loadJar(client); - int impl = 0, - meth = 0, - field = 0; - for (ClassFile c : group.getClasses()) - { - if (c.getName().contains("runelite")) - { - continue; - } + new AnnotationAdder(group).run(); - log.debug("Checking {}", c.toString()); - - String implementingName = DeobAnnotations.getImplements(c); - if (!Strings.isNullOrEmpty(implementingName)) - { - // Still error here cause I don't wanna call classes dumb shit - assertEquals(c + " implements " + implementingName + " but is called " + c.getClassName(), implementingName, c.getClassName()); - } - else - { - if (!Deob.isObfuscated(c.getClassName())) - { - Annotations an = c.getAnnotations(); - - Annotation implAn = new Annotation(an); - implAn.setType(DeobAnnotations.IMPLEMENTS); - - Element value = new Element(implAn); - value.setValue(c.getClassName()); - value.setName("value"); - - implAn.addElement(value); - an.addAnnotation(implAn); - impl++; - } - } - - for (Field f : c.getFields()) - { - Annotations an = f.getAnnotations(); - - String fieldName = f.getName(); - String exportedName = DeobAnnotations.getExportedName(an); - - if (exportedName == null && Deob.isObfuscated(fieldName) || fieldName.equals(DeobAnnotations.getObfuscatedName(an)) || DeobAnnotations.getObfuscatedName(an) == null) - { - //Annotation exp = new Annotation(an); - //exp.setType(DeobAnnotations.EXPORT); -// - //Element ele = new Element(exp); - //ele.setValue(fieldName); -// - //log.info("Added export on {}", fieldName); - //field++; - continue; - } - - if (!fieldName.equals(exportedName)) - { - log.info("Changed export from {} to {}", exportedName, fieldName); - Annotation a = an.find(DeobAnnotations.EXPORT); - if (a == null) - { - a = new Annotation(an); - a.setType(DeobAnnotations.EXPORT); - - Element value = new Element(a); - value.setValue(fieldName); - value.setName("value"); - a.addElement(value); - an.addAnnotation(a); - - } - a.getElement().setValue(fieldName); - field++; - } - } - - for (Method m : c.getMethods()) - { - Annotations an = m.getAnnotations(); - - String fieldName = m.getName(); - String exportedName = DeobAnnotations.getExportedName(an); - - if (exportedName == null && Deob.isObfuscated(fieldName) || fieldName.equals(DeobAnnotations.getObfuscatedName(an)) || DeobAnnotations.getObfuscatedName(an) == null) - { - continue; - // Annotation exp = new Annotation(an); - // exp.setType(DeobAnnotations.EXPORT); -// - // Element ele = new Element(exp); - // ele.setValue(fieldName); -// - // log.info("Added export on {}", fieldName); - // meth++; - } - - if (!fieldName.equals(exportedName)) - { - log.info("Changed export from {} to {}", exportedName, fieldName); - Annotation a = an.find(DeobAnnotations.EXPORT); - if (a == null) - { - a = new Annotation(an); - a.setType(DeobAnnotations.EXPORT); - - Element value = new Element(a); - value.setValue(fieldName); - value.setName("value"); - a.addElement(value); - an.addAnnotation(a); - - } - a.getElement().setValue(fieldName); - meth++; - } - } - } - - log.info("Changed {} classes, {} methods, {} fields", impl, meth, field); JarUtil.saveJar(group, new File("C:/Users/Lucas/Desktop/niec.jar")); } } diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/SpriteMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/SpriteMixin.java index 78bf89adac..df5e6acd38 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/SpriteMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/SpriteMixin.java @@ -35,13 +35,13 @@ public abstract class SpriteMixin implements RSClient return widgetSpriteOverrides; } - @Copy("loadSprite") + @Copy("SpriteBuffer_getSprite") public static RSSprite rs$loadSprite(RSAbstractArchive var0, int var1, int var2) { throw new RuntimeException(); } - @Replace("loadSprite") + @Replace("SpriteBuffer_getSprite") public static RSSprite rl$loadSprite(RSAbstractArchive var0, int var1, int var2) { Sprite sprite = spriteOverrides.get(var1); diff --git a/runescape-client/src/main/java/AbstractArchive.java b/runescape-client/src/main/java/AbstractArchive.java index 5cf438c5d2..42bba6bc05 100644 --- a/runescape-client/src/main/java/AbstractArchive.java +++ b/runescape-client/src/main/java/AbstractArchive.java @@ -266,9 +266,8 @@ public abstract class AbstractArchive { } return var5; - } else { - return null; } + return null; } @ObfuscatedName("k") @@ -281,15 +280,14 @@ public abstract class AbstractArchive { if (var1 >= 0 && var1 < this.files.length && this.files[var1] != null && var2 >= 0 && var2 < this.files[var1].length) { if (this.files[var1][var2] != null) { return true; - } else if (this.groups[var1] != null) { - return true; - } else { - this.loadGroup(var1); - return this.groups[var1] != null; } - } else { - return false; + if (this.groups[var1] != null) { + return true; + } + this.loadGroup(var1); + return this.groups[var1] != null; } + return false; } @ObfuscatedName("l") @@ -300,11 +298,11 @@ public abstract class AbstractArchive { public boolean method4147(int var1) { if (this.files.length == 1) { return this.tryLoadFile(0, var1); - } else if (this.files[var1].length == 1) { - return this.tryLoadFile(var1, 0); - } else { - throw new RuntimeException(); } + if (this.files[var1].length == 1) { + return this.tryLoadFile(var1, 0); + } + throw new RuntimeException(); } @ObfuscatedName("b") @@ -316,10 +314,9 @@ public abstract class AbstractArchive { public boolean tryLoadGroup(int var1) { if (this.groups[var1] != null) { return true; - } else { - this.loadGroup(var1); - return this.groups[var1] != null; } + this.loadGroup(var1); + return this.groups[var1] != null; } @ObfuscatedName("i") @@ -363,11 +360,11 @@ public abstract class AbstractArchive { public byte[] takeFileFlat(int var1) { if (this.files.length == 1) { return this.takeFile(0, var1); - } else if (this.files[var1].length == 1) { - return this.takeFile(var1, 0); - } else { - throw new RuntimeException(); } + if (this.files[var1].length == 1) { + return this.takeFile(var1, 0); + } + throw new RuntimeException(); } @ObfuscatedName("x") @@ -391,9 +388,8 @@ public abstract class AbstractArchive { byte[] var4 = ArchiveDisk.byteArrayFromObject(this.files[var1][var2], false); return var4; - } else { - return null; } + return null; } @ObfuscatedName("r") @@ -405,11 +401,11 @@ public abstract class AbstractArchive { public byte[] getFileFlat(int var1) { if (this.files.length == 1) { return this.getFile(0, var1); - } else if (this.files[var1].length == 1) { - return this.getFile(var1, 0); - } else { - throw new RuntimeException(); } + if (this.files[var1].length == 1) { + return this.getFile(var1, 0); + } + throw new RuntimeException(); } @ObfuscatedName("v") @@ -503,120 +499,118 @@ public abstract class AbstractArchive { boolean buildFiles(int var1, int[] var2) { if (this.groups[var1] == null) { return false; - } else { - int var3 = this.fileCounts[var1]; - int[] var4 = this.fileIds[var1]; - Object[] var5 = this.files[var1]; - boolean var6 = true; + } + int var3 = this.fileCounts[var1]; + int[] var4 = this.fileIds[var1]; + Object[] var5 = this.files[var1]; + boolean var6 = true; - for (int var7 = 0; var7 < var3; ++var7) { - if (var5[var4[var7]] == null) { - var6 = false; - break; - } - } - - if (var6) { - return true; - } else { - byte[] var21; - if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) { - var21 = ArchiveDisk.byteArrayFromObject(this.groups[var1], false); - } else { - var21 = ArchiveDisk.byteArrayFromObject(this.groups[var1], true); - Buffer var8 = new Buffer(var21); - var8.xteaDecrypt(var2, 5, var8.array.length); - } - - byte[] var25 = HealthBarUpdate.decompressBytes(var21); - if (this.releaseGroups) { - this.groups[var1] = null; - } - - int var10; - if (var3 > 1) { - int var9 = var25.length; - --var9; - var10 = var25[var9] & 255; - var9 -= var10 * var3 * 4; - Buffer var11 = new Buffer(var25); - int[] var12 = new int[var3]; - var11.offset = var9; - - int var14; - int var15; - for (int var13 = 0; var13 < var10; ++var13) { - var14 = 0; - - for (var15 = 0; var15 < var3; ++var15) { - var14 += var11.readInt(); - var12[var15] += var14; - } - } - - byte[][] var23 = new byte[var3][]; - - for (var14 = 0; var14 < var3; ++var14) { - var23[var14] = new byte[var12[var14]]; - var12[var14] = 0; - } - - var11.offset = var9; - var14 = 0; - - int var17; - for (var15 = 0; var15 < var10; ++var15) { - int var16 = 0; - - for (var17 = 0; var17 < var3; ++var17) { - var16 += var11.readInt(); - System.arraycopy(var25, var14, var23[var17], var12[var17], var16); - var12[var17] += var16; - var14 += var16; - } - } - - for (var15 = 0; var15 < var3; ++var15) { - if (!this.shallowFiles) { - var17 = var4[var15]; - byte[] var19 = var23[var15]; - Object var18; - if (var19 == null) { - var18 = null; - } else if (var19.length > 136) { - DirectByteArrayCopier var20 = new DirectByteArrayCopier(); - var20.set(var19); - var18 = var20; - } else { - var18 = var19; - } - - var5[var17] = var18; - } else { - var5[var4[var15]] = var23[var15]; - } - } - } else if (!this.shallowFiles) { - var10 = var4[0]; - Object var26; - if (var25 == null) { - var26 = null; - } else if (var25.length > 136) { - DirectByteArrayCopier var27 = new DirectByteArrayCopier(); - var27.set(var25); - var26 = var27; - } else { - var26 = var25; - } - - var5[var10] = var26; - } else { - var5[var4[0]] = var25; - } - - return true; + for (int var7 = 0; var7 < var3; ++var7) { + if (var5[var4[var7]] == null) { + var6 = false; + break; } } + + if (var6) { + return true; + } + byte[] var21; + if (var2 == null || var2[0] == 0 && var2[1] == 0 && var2[2] == 0 && var2[3] == 0) { + var21 = ArchiveDisk.byteArrayFromObject(this.groups[var1], false); + } else { + var21 = ArchiveDisk.byteArrayFromObject(this.groups[var1], true); + Buffer var8 = new Buffer(var21); + var8.xteaDecrypt(var2, 5, var8.array.length); + } + + byte[] var25 = HealthBarUpdate.decompressBytes(var21); + if (this.releaseGroups) { + this.groups[var1] = null; + } + + int var10; + if (var3 > 1) { + int var9 = var25.length; + --var9; + var10 = var25[var9] & 255; + var9 -= var10 * var3 * 4; + Buffer var11 = new Buffer(var25); + int[] var12 = new int[var3]; + var11.offset = var9; + + int var14; + int var15; + for (int var13 = 0; var13 < var10; ++var13) { + var14 = 0; + + for (var15 = 0; var15 < var3; ++var15) { + var14 += var11.readInt(); + var12[var15] += var14; + } + } + + byte[][] var23 = new byte[var3][]; + + for (var14 = 0; var14 < var3; ++var14) { + var23[var14] = new byte[var12[var14]]; + var12[var14] = 0; + } + + var11.offset = var9; + var14 = 0; + + int var17; + for (var15 = 0; var15 < var10; ++var15) { + int var16 = 0; + + for (var17 = 0; var17 < var3; ++var17) { + var16 += var11.readInt(); + System.arraycopy(var25, var14, var23[var17], var12[var17], var16); + var12[var17] += var16; + var14 += var16; + } + } + + for (var15 = 0; var15 < var3; ++var15) { + if (!this.shallowFiles) { + var17 = var4[var15]; + byte[] var19 = var23[var15]; + Object var18; + if (var19 == null) { + var18 = null; + } else if (var19.length > 136) { + DirectByteArrayCopier var20 = new DirectByteArrayCopier(); + var20.set(var19); + var18 = var20; + } else { + var18 = var19; + } + + var5[var17] = var18; + } else { + var5[var4[var15]] = var23[var15]; + } + } + } else if (!this.shallowFiles) { + var10 = var4[0]; + Object var26; + if (var25 == null) { + var26 = null; + } else if (var25.length > 136) { + DirectByteArrayCopier var27 = new DirectByteArrayCopier(); + var27.set(var25); + var26 = var27; + } else { + var26 = var25; + } + + var5[var10] = var26; + } else { + var5[var4[0]] = var25; + } + + return true; } @ObfuscatedName("z") @@ -653,10 +647,9 @@ public abstract class AbstractArchive { int var3 = this.groupNameHashTable.get(GrandExchangeOfferAgeComparator.hashString(var1)); if (var3 < 0) { return false; - } else { - int var4 = this.fileNameHashTables[var3].get(GrandExchangeOfferAgeComparator.hashString(var2)); - return var4 >= 0; } + int var4 = this.fileNameHashTables[var3].get(GrandExchangeOfferAgeComparator.hashString(var2)); + return var4 >= 0; } @ObfuscatedName("as") @@ -744,15 +737,16 @@ public abstract class AbstractArchive { HealthBarUpdate.Interpreter_intStackSize -= 3; class81.queueSoundEffect(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize], Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2]); return 1; - } else if (var0 == ScriptOpcodes.SOUND_SONG) { + } + if (var0 == ScriptOpcodes.SOUND_SONG) { GrandExchangeOfferTotalQuantityComparator.method93(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); return 1; - } else if (var0 == ScriptOpcodes.SOUND_JINGLE) { + } + if (var0 == ScriptOpcodes.SOUND_JINGLE) { HealthBarUpdate.Interpreter_intStackSize -= 2; WorldMapLabelSize.method188(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize], Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]); return 1; - } else { - return 2; } + return 2; } } diff --git a/runescape-client/src/main/java/AbstractByteArrayCopier.java b/runescape-client/src/main/java/AbstractByteArrayCopier.java index ebffc10c0d..2fed23489b 100644 --- a/runescape-client/src/main/java/AbstractByteArrayCopier.java +++ b/runescape-client/src/main/java/AbstractByteArrayCopier.java @@ -22,6 +22,7 @@ public abstract class AbstractByteArrayCopier { signature = "([BI)V", garbageValue = "594076777" ) + @Export("set") public abstract void set(byte[] var1); @ObfuscatedName("l") diff --git a/runescape-client/src/main/java/AbstractFont.java b/runescape-client/src/main/java/AbstractFont.java index 8dd0229682..cb8fba29c0 100644 --- a/runescape-client/src/main/java/AbstractFont.java +++ b/runescape-client/src/main/java/AbstractFont.java @@ -219,55 +219,54 @@ public abstract class AbstractFont extends Rasterizer2D { public int stringWidth(String var1) { if (var1 == null) { return 0; - } else { - int var2 = -1; - int var3 = -1; - int var4 = 0; + } + int var2 = -1; + int var3 = -1; + int var4 = 0; - for (int var5 = 0; var5 < var1.length(); ++var5) { - char var6 = var1.charAt(var5); - if (var6 == '<') { - var2 = var5; - } else { - if (var6 == '>' && var2 != -1) { - String var7 = var1.substring(var2 + 1, var5); - var2 = -1; - if (var7.equals("lt")) { - var6 = '<'; - } else { - if (!var7.equals("gt")) { - if (var7.startsWith("img=")) { - try { - int var8 = class3.parseInt(var7.substring(4)); - var4 += AbstractFont_modIconSprites[var8].width; - var3 = -1; - } catch (Exception var10) { - } + for (int var5 = 0; var5 < var1.length(); ++var5) { + char var6 = var1.charAt(var5); + if (var6 == '<') { + var2 = var5; + } else { + if (var6 == '>' && var2 != -1) { + String var7 = var1.substring(var2 + 1, var5); + var2 = -1; + if (var7.equals("lt")) { + var6 = '<'; + } else { + if (!var7.equals("gt")) { + if (var7.startsWith("img=")) { + try { + int var8 = class3.parseInt(var7.substring(4)); + var4 += AbstractFont_modIconSprites[var8].width; + var3 = -1; + } catch (Exception var10) { } - continue; } - - var6 = '>'; - } - } - - if (var6 == 160) { - var6 = ' '; - } - - if (var2 == -1) { - var4 += this.advances[(char)(ItemDefinition.charToByteCp1252(var6) & 255)]; - if (this.kerning != null && var3 != -1) { - var4 += this.kerning[var6 + (var3 << 8)]; + continue; } - var3 = var6; + var6 = '>'; } } - } - return var4; + if (var6 == 160) { + var6 = ' '; + } + + if (var2 == -1) { + var4 += this.advances[(char)(ItemDefinition.charToByteCp1252(var6) & 255)]; + if (this.kerning != null && var3 != -1) { + var4 += this.kerning[var6 + (var3 << 8)]; + } + + var3 = var6; + } + } } + + return var4; } @ObfuscatedName("v") @@ -275,104 +274,103 @@ public abstract class AbstractFont extends Rasterizer2D { public int breakLines(String var1, int[] var2, String[] var3) { if (var1 == null) { return 0; - } else { - int var4 = 0; - int var5 = 0; - StringBuilder var6 = new StringBuilder(100); - int var7 = -1; - int var8 = 0; - byte var9 = 0; - int var10 = -1; - char var11 = 0; - int var12 = 0; - int var13 = var1.length(); + } + int var4 = 0; + int var5 = 0; + StringBuilder var6 = new StringBuilder(100); + int var7 = -1; + int var8 = 0; + byte var9 = 0; + int var10 = -1; + char var11 = 0; + int var12 = 0; + int var13 = var1.length(); - for (int var14 = 0; var14 < var13; ++var14) { - char var15 = var1.charAt(var14); - if (var15 == '<') { - var10 = var14; - } else { - if (var15 == '>' && var10 != -1) { - String var16 = var1.substring(var10 + 1, var14); - var10 = -1; - var6.append('<'); - var6.append(var16); - var6.append('>'); - if (var16.equals("br")) { - var3[var12] = var6.toString().substring(var5, var6.length()); - ++var12; - var5 = var6.length(); - var4 = 0; - var7 = -1; - var11 = 0; - } else if (var16.equals("lt")) { - var4 += this.charWidth('<'); - if (this.kerning != null && var11 != -1) { - var4 += this.kerning[(var11 << '\b') + 60]; - } - - var11 = '<'; - } else if (var16.equals("gt")) { - var4 += this.charWidth('>'); - if (this.kerning != null && var11 != -1) { - var4 += this.kerning[(var11 << '\b') + 62]; - } - - var11 = '>'; - } else if (var16.startsWith("img=")) { - try { - int var17 = class3.parseInt(var16.substring(4)); - var4 += AbstractFont_modIconSprites[var17].width; - var11 = 0; - } catch (Exception var20) { - } + for (int var14 = 0; var14 < var13; ++var14) { + char var15 = var1.charAt(var14); + if (var15 == '<') { + var10 = var14; + } else { + if (var15 == '>' && var10 != -1) { + String var16 = var1.substring(var10 + 1, var14); + var10 = -1; + var6.append('<'); + var6.append(var16); + var6.append('>'); + if (var16.equals("br")) { + var3[var12] = var6.toString().substring(var5, var6.length()); + ++var12; + var5 = var6.length(); + var4 = 0; + var7 = -1; + var11 = 0; + } else if (var16.equals("lt")) { + var4 += this.charWidth('<'); + if (this.kerning != null && var11 != -1) { + var4 += this.kerning[(var11 << '\b') + 60]; } - var15 = 0; + var11 = '<'; + } else if (var16.equals("gt")) { + var4 += this.charWidth('>'); + if (this.kerning != null && var11 != -1) { + var4 += this.kerning[(var11 << '\b') + 62]; + } + + var11 = '>'; + } else if (var16.startsWith("img=")) { + try { + int var17 = class3.parseInt(var16.substring(4)); + var4 += AbstractFont_modIconSprites[var17].width; + var11 = 0; + } catch (Exception var20) { + } } - if (var10 == -1) { - if (var15 != 0) { - var6.append(var15); - var4 += this.charWidth(var15); - if (this.kerning != null && var11 != -1) { - var4 += this.kerning[var15 + (var11 << '\b')]; - } + var15 = 0; + } - var11 = var15; + if (var10 == -1) { + if (var15 != 0) { + var6.append(var15); + var4 += this.charWidth(var15); + if (this.kerning != null && var11 != -1) { + var4 += this.kerning[var15 + (var11 << '\b')]; } - if (var15 == ' ') { - var7 = var6.length(); - var8 = var4; - var9 = 1; - } + var11 = var15; + } - if (var2 != null && var4 > var2[var12 < var2.length ? var12 : var2.length - 1] && var7 >= 0) { - var3[var12] = var6.toString().substring(var5, var7 - var9); - ++var12; - var5 = var7; - var7 = -1; - var4 -= var8; - var11 = 0; - } + if (var15 == ' ') { + var7 = var6.length(); + var8 = var4; + var9 = 1; + } - if (var15 == '-') { - var7 = var6.length(); - var8 = var4; - var9 = 0; - } + if (var2 != null && var4 > var2[var12 < var2.length ? var12 : var2.length - 1] && var7 >= 0) { + var3[var12] = var6.toString().substring(var5, var7 - var9); + ++var12; + var5 = var7; + var7 = -1; + var4 -= var8; + var11 = 0; + } + + if (var15 == '-') { + var7 = var6.length(); + var8 = var4; + var9 = 0; } } } - - String var19 = var6.toString(); - if (var19.length() > var5) { - var3[var12++] = var19.substring(var5, var19.length()); - } - - return var12; } + + String var19 = var6.toString(); + if (var19.length() > var5) { + var3[var12++] = var19.substring(var5, var19.length()); + } + + return var12; } @ObfuscatedName("y") @@ -439,60 +437,59 @@ public abstract class AbstractFont extends Rasterizer2D { public int drawLines(String var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10) { if (var1 == null) { return 0; - } else { - this.reset(var6, var7); - if (var10 == 0) { - var10 = this.ascent; - } - - int[] var11 = new int[]{var4}; - if (var5 < var10 + this.maxAscent + this.maxDescent && var5 < var10 + var10) { - var11 = null; - } - - int var12 = this.breakLines(var1, var11, AbstractFont_lines); - if (var9 == 3 && var12 == 1) { - var9 = 1; - } - - int var13; - int var14; - if (var9 == 0) { - var13 = var3 + this.maxAscent; - } else if (var9 == 1) { - var13 = var3 + (var5 - this.maxAscent - this.maxDescent - var10 * (var12 - 1)) / 2 + this.maxAscent; - } else if (var9 == 2) { - var13 = var3 + var5 - this.maxDescent - var10 * (var12 - 1); - } else { - var14 = (var5 - this.maxAscent - this.maxDescent - var10 * (var12 - 1)) / (var12 + 1); - if (var14 < 0) { - var14 = 0; - } - - var13 = var3 + var14 + this.maxAscent; - var10 += var14; - } - - for (var14 = 0; var14 < var12; ++var14) { - if (var8 == 0) { - this.draw0(AbstractFont_lines[var14], var2, var13); - } else if (var8 == 1) { - this.draw0(AbstractFont_lines[var14], var2 + (var4 - this.stringWidth(AbstractFont_lines[var14])) / 2, var13); - } else if (var8 == 2) { - this.draw0(AbstractFont_lines[var14], var2 + var4 - this.stringWidth(AbstractFont_lines[var14]), var13); - } else if (var14 == var12 - 1) { - this.draw0(AbstractFont_lines[var14], var2, var13); - } else { - this.calculateLineJustification(AbstractFont_lines[var14], var4); - this.draw0(AbstractFont_lines[var14], var2, var13); - AbstractFont_justificationTotal = 0; - } - - var13 += var10; - } - - return var12; } + this.reset(var6, var7); + if (var10 == 0) { + var10 = this.ascent; + } + + int[] var11 = new int[]{var4}; + if (var5 < var10 + this.maxAscent + this.maxDescent && var5 < var10 + var10) { + var11 = null; + } + + int var12 = this.breakLines(var1, var11, AbstractFont_lines); + if (var9 == 3 && var12 == 1) { + var9 = 1; + } + + int var13; + int var14; + if (var9 == 0) { + var13 = var3 + this.maxAscent; + } else if (var9 == 1) { + var13 = var3 + (var5 - this.maxAscent - this.maxDescent - var10 * (var12 - 1)) / 2 + this.maxAscent; + } else if (var9 == 2) { + var13 = var3 + var5 - this.maxDescent - var10 * (var12 - 1); + } else { + var14 = (var5 - this.maxAscent - this.maxDescent - var10 * (var12 - 1)) / (var12 + 1); + if (var14 < 0) { + var14 = 0; + } + + var13 = var3 + var14 + this.maxAscent; + var10 += var14; + } + + for (var14 = 0; var14 < var12; ++var14) { + if (var8 == 0) { + this.draw0(AbstractFont_lines[var14], var2, var13); + } else if (var8 == 1) { + this.draw0(AbstractFont_lines[var14], var2 + (var4 - this.stringWidth(AbstractFont_lines[var14])) / 2, var13); + } else if (var8 == 2) { + this.draw0(AbstractFont_lines[var14], var2 + var4 - this.stringWidth(AbstractFont_lines[var14]), var13); + } else if (var14 == var12 - 1) { + this.draw0(AbstractFont_lines[var14], var2, var13); + } else { + this.calculateLineJustification(AbstractFont_lines[var14], var4); + this.draw0(AbstractFont_lines[var14], var2, var13); + AbstractFont_justificationTotal = 0; + } + + var13 += var10; + } + + return var12; } @ObfuscatedName("al") diff --git a/runescape-client/src/main/java/AbstractWorldMapData.java b/runescape-client/src/main/java/AbstractWorldMapData.java index 64ca185bdc..ce2314d09f 100644 --- a/runescape-client/src/main/java/AbstractWorldMapData.java +++ b/runescape-client/src/main/java/AbstractWorldMapData.java @@ -247,9 +247,8 @@ public abstract class AbstractWorldMapData { ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); if (var2 == null) { return -1; - } else { - return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; } + return var1 >= 0 && var1 < var2.ids.length ? var2.ids[var1] : -1; } @ObfuscatedName("gj") diff --git a/runescape-client/src/main/java/AbstractWorldMapIcon.java b/runescape-client/src/main/java/AbstractWorldMapIcon.java index 14fe40941b..4c2d8e0350 100644 --- a/runescape-client/src/main/java/AbstractWorldMapIcon.java +++ b/runescape-client/src/main/java/AbstractWorldMapIcon.java @@ -81,9 +81,8 @@ public abstract class AbstractWorldMapIcon { boolean fitsScreen(int var1, int var2) { if (this.elementFitsScreen(var1, var2)) { return true; - } else { - return this.labelFitsScreen(var1, var2); } + return this.labelFitsScreen(var1, var2); } @ObfuscatedName("d") @@ -105,47 +104,46 @@ public abstract class AbstractWorldMapIcon { boolean elementFitsScreen(int var1, int var2) { if (!this.hasValidElement()) { return false; - } else { - WorldMapElement var3 = class222.getWorldMapElement(this.getElement()); - int var4 = this.getSubWidth(); - int var5 = this.getSubHeight(); - switch(var3.horizontalAlignment.value) { - case 0: - if (var1 <= this.screenX - var4 || var1 > this.screenX) { - return false; - } - break; - case 1: - if (var1 >= this.screenX && var1 < var4 + this.screenX) { - break; - } - - return false; - case 2: - if (var1 < this.screenX - var4 / 2 || var1 > var4 / 2 + this.screenX) { - return false; - } - } - - switch(var3.verticalAlignment.value) { - case 0: - if (var2 < this.screenY - var5 / 2 || var2 > var5 / 2 + this.screenY) { - return false; - } - break; - case 1: - if (var2 <= this.screenY - var5 || var2 > this.screenY) { - return false; - } - break; - case 2: - if (var2 < this.screenY || var2 >= var5 + this.screenY) { - return false; - } - } - - return true; } + WorldMapElement var3 = class222.getWorldMapElement(this.getElement()); + int var4 = this.getSubWidth(); + int var5 = this.getSubHeight(); + switch(var3.horizontalAlignment.value) { + case 0: + if (var1 <= this.screenX - var4 || var1 > this.screenX) { + return false; + } + break; + case 1: + if (var1 >= this.screenX && var1 < var4 + this.screenX) { + break; + } + + return false; + case 2: + if (var1 < this.screenX - var4 / 2 || var1 > var4 / 2 + this.screenX) { + return false; + } + } + + switch(var3.verticalAlignment.value) { + case 0: + if (var2 < this.screenY - var5 / 2 || var2 > var5 / 2 + this.screenY) { + return false; + } + break; + case 1: + if (var2 <= this.screenY - var5 || var2 > this.screenY) { + return false; + } + break; + case 2: + if (var2 < this.screenY || var2 >= var5 + this.screenY) { + return false; + } + } + + return true; } @ObfuscatedName("z") @@ -158,11 +156,11 @@ public abstract class AbstractWorldMapIcon { WorldMapLabel var3 = this.getLabel(); if (var3 == null) { return false; - } else if (var1 >= this.screenX - var3.width / 2 && var1 <= var3.width / 2 + this.screenX) { - return var2 >= this.screenY && var2 <= this.screenY + var3.height; - } else { - return false; } + if (var1 >= this.screenX - var3.width / 2 && var1 <= var3.width / 2 + this.screenX) { + return var2 >= this.screenY && var2 <= this.screenY + var3.height; + } + return false; } @ObfuscatedName("r") diff --git a/runescape-client/src/main/java/AccessFile.java b/runescape-client/src/main/java/AccessFile.java index 0b56f927e9..908d3174a3 100644 --- a/runescape-client/src/main/java/AccessFile.java +++ b/runescape-client/src/main/java/AccessFile.java @@ -67,10 +67,9 @@ public final class AccessFile { this.file.seek(this.maxSize); this.file.write(1); throw new EOFException(); - } else { - this.file.write(var1, var2, var3); - this.offset += (long)var3; } + this.file.write(var1, var2, var3); + this.offset += (long)var3; } @ObfuscatedName("e") diff --git a/runescape-client/src/main/java/Animation.java b/runescape-client/src/main/java/Animation.java index f9b4f38eab..2e2adab037 100644 --- a/runescape-client/src/main/java/Animation.java +++ b/runescape-client/src/main/java/Animation.java @@ -113,20 +113,19 @@ public class Animation { if (var1.length != var4.offset) { throw new RuntimeException(); - } else { - this.transformCount = var7; - this.transformSkeletonLabels = new int[var7]; - this.transformXs = new int[var7]; - this.transformYs = new int[var7]; - this.transformZs = new int[var7]; - - for (var8 = 0; var8 < var7; ++var8) { - this.transformSkeletonLabels[var8] = field1638[var8]; - this.transformXs[var8] = field1639[var8]; - this.transformYs[var8] = field1636[var8]; - this.transformZs[var8] = field1635[var8]; - } - } + this.transformCount = var7; + this.transformSkeletonLabels = new int[var7]; + this.transformXs = new int[var7]; + this.transformYs = new int[var7]; + this.transformZs = new int[var7]; + + for (var8 = 0; var8 < var7; ++var8) { + this.transformSkeletonLabels[var8] = field1638[var8]; + this.transformXs[var8] = field1639[var8]; + this.transformYs[var8] = field1636[var8]; + this.transformZs[var8] = field1635[var8]; + } + } } diff --git a/runescape-client/src/main/java/Archive.java b/runescape-client/src/main/java/Archive.java index 3d2943c1a8..9080902fe4 100644 --- a/runescape-client/src/main/java/Archive.java +++ b/runescape-client/src/main/java/Archive.java @@ -102,9 +102,8 @@ public class Archive extends AbstractArchive { int groupLoadPercent(int var1) { if (super.groups[var1] != null) { return 100; - } else { - return this.validGroups[var1] ? 100 : Huffman.method3948(this.index, var1); } + return this.validGroups[var1] ? 100 : Huffman.method3948(this.index, var1); } @ObfuscatedName("v") @@ -140,16 +139,16 @@ public class Archive extends AbstractArchive { public int percentage() { if (this.field3155) { return 100; - } else if (super.groups != null) { - return 99; - } else { - int var1 = Huffman.method3948(255, this.index); - if (var1 >= 100) { - var1 = 99; - } - - return var1; } + if (super.groups != null) { + return 99; + } + int var1 = Huffman.method3948(255, this.index); + if (var1 >= 100) { + var1 = 99; + } + + return var1; } @ObfuscatedName("dt") @@ -396,10 +395,9 @@ public class Archive extends AbstractArchive { if (var1 == 0) { return 100; - } else { - var3 = var2 * 100 / var1; - return var3; } + var3 = var2 * 100 / var1; + return var3; } @ObfuscatedName("q") diff --git a/runescape-client/src/main/java/ArchiveDisk.java b/runescape-client/src/main/java/ArchiveDisk.java index d5121aca35..9b2508460d 100644 --- a/runescape-client/src/main/java/ArchiveDisk.java +++ b/runescape-client/src/main/java/ArchiveDisk.java @@ -67,81 +67,80 @@ public final class ArchiveDisk { if (this.idxFile.length() < (long)(var1 * 6 + 6)) { var10000 = null; return (byte[])var10000; - } else { - this.idxFile.seek((long)(var1 * 6)); - this.idxFile.read(ArchiveDisk_buffer, 0, 6); - int var3 = ((ArchiveDisk_buffer[0] & 255) << 16) + (ArchiveDisk_buffer[2] & 255) + ((ArchiveDisk_buffer[1] & 255) << 8); - int var4 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[3] & 255) << 16) + ((ArchiveDisk_buffer[4] & 255) << 8); - if (var3 < 0 || var3 > this.maxEntrySize) { + } + this.idxFile.seek((long)(var1 * 6)); + this.idxFile.read(ArchiveDisk_buffer, 0, 6); + int var3 = ((ArchiveDisk_buffer[0] & 255) << 16) + (ArchiveDisk_buffer[2] & 255) + ((ArchiveDisk_buffer[1] & 255) << 8); + int var4 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[3] & 255) << 16) + ((ArchiveDisk_buffer[4] & 255) << 8); + if (var3 < 0 || var3 > this.maxEntrySize) { + var10000 = null; + return (byte[])var10000; + } + if (var4 <= 0 || (long)var4 > this.datFile.length() / 520L) { + var10000 = null; + return (byte[])var10000; + } + byte[] var5 = new byte[var3]; + int var6 = 0; + + for (int var7 = 0; var6 < var3; ++var7) { + if (var4 == 0) { var10000 = null; return (byte[])var10000; - } else if (var4 <= 0 || (long)var4 > this.datFile.length() / 520L) { - var10000 = null; - return (byte[])var10000; - } else { - byte[] var5 = new byte[var3]; - int var6 = 0; + } - for (int var7 = 0; var6 < var3; ++var7) { - if (var4 == 0) { - var10000 = null; - return (byte[])var10000; - } - - this.datFile.seek(520L * (long)var4); - int var8 = var3 - var6; - int var9; - int var10; - int var11; - int var12; - byte var13; - if (var1 > 65535) { - if (var8 > 510) { - var8 = 510; - } - - var13 = 10; - this.datFile.read(ArchiveDisk_buffer, 0, var8 + var13); - var9 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); - var10 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[4] & 255) << 8); - var11 = (ArchiveDisk_buffer[8] & 255) + ((ArchiveDisk_buffer[7] & 255) << 8) + ((ArchiveDisk_buffer[6] & 255) << 16); - var12 = ArchiveDisk_buffer[9] & 255; - } else { - if (var8 > 512) { - var8 = 512; - } - - var13 = 8; - this.datFile.read(ArchiveDisk_buffer, 0, var13 + var8); - var9 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); - var10 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); - var11 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255); - var12 = ArchiveDisk_buffer[7] & 255; - } - - if (var9 != var1 || var7 != var10 || var12 != this.archive) { - var10000 = null; - return (byte[])var10000; - } - - if (var11 < 0 || (long)var11 > this.datFile.length() / 520L) { - var10000 = null; - return (byte[])var10000; - } - - int var14 = var8 + var13; - - for (int var15 = var13; var15 < var14; ++var15) { - var5[var6++] = ArchiveDisk_buffer[var15]; - } - - var4 = var11; + this.datFile.seek(520L * (long)var4); + int var8 = var3 - var6; + int var9; + int var10; + int var11; + int var12; + byte var13; + if (var1 > 65535) { + if (var8 > 510) { + var8 = 510; } - byte[] var20 = var5; - return var20; + var13 = 10; + this.datFile.read(ArchiveDisk_buffer, 0, var8 + var13); + var9 = ((ArchiveDisk_buffer[1] & 255) << 16) + ((ArchiveDisk_buffer[0] & 255) << 24) + (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); + var10 = (ArchiveDisk_buffer[5] & 255) + ((ArchiveDisk_buffer[4] & 255) << 8); + var11 = (ArchiveDisk_buffer[8] & 255) + ((ArchiveDisk_buffer[7] & 255) << 8) + ((ArchiveDisk_buffer[6] & 255) << 16); + var12 = ArchiveDisk_buffer[9] & 255; + } else { + if (var8 > 512) { + var8 = 512; + } + + var13 = 8; + this.datFile.read(ArchiveDisk_buffer, 0, var13 + var8); + var9 = (ArchiveDisk_buffer[1] & 255) + ((ArchiveDisk_buffer[0] & 255) << 8); + var10 = (ArchiveDisk_buffer[3] & 255) + ((ArchiveDisk_buffer[2] & 255) << 8); + var11 = ((ArchiveDisk_buffer[5] & 255) << 8) + ((ArchiveDisk_buffer[4] & 255) << 16) + (ArchiveDisk_buffer[6] & 255); + var12 = ArchiveDisk_buffer[7] & 255; } + + if (var9 != var1 || var7 != var10 || var12 != this.archive) { + var10000 = null; + return (byte[])var10000; + } + + if (var11 < 0 || (long)var11 > this.datFile.length() / 520L) { + var10000 = null; + return (byte[])var10000; + } + + int var14 = var8 + var13; + + for (int var15 = var13; var15 < var14; ++var15) { + var5[var6++] = ArchiveDisk_buffer[var15]; + } + + var4 = var11; } + + byte[] var20 = var5; + return var20; } catch (IOException var18) { return null; } @@ -163,9 +162,8 @@ public final class ArchiveDisk { } return var5; - } else { - throw new IllegalArgumentException("" + this.archive + ',' + var1 + ',' + var3); } + throw new IllegalArgumentException("" + this.archive + ',' + var1 + ',' + var3); } } @@ -343,21 +341,21 @@ public final class ArchiveDisk { public static byte[] byteArrayFromObject(Object var0, boolean var1) { if (var0 == null) { return null; - } else if (var0 instanceof byte[]) { + } + if (var0 instanceof byte[]) { byte[] var6 = (byte[])((byte[])var0); if (var1) { int var4 = var6.length; byte[] var5 = new byte[var4]; System.arraycopy(var6, 0, var5, 0, var4); return var5; - } else { - return var6; } - } else if (var0 instanceof AbstractByteArrayCopier) { + return var6; + } + if (var0 instanceof AbstractByteArrayCopier) { AbstractByteArrayCopier var2 = (AbstractByteArrayCopier)var0; return var2.get(); - } else { - throw new IllegalArgumentException(); } + throw new IllegalArgumentException(); } } diff --git a/runescape-client/src/main/java/ArchiveDiskAction.java b/runescape-client/src/main/java/ArchiveDiskAction.java index e505e2f11e..06f44b94db 100644 --- a/runescape-client/src/main/java/ArchiveDiskAction.java +++ b/runescape-client/src/main/java/ArchiveDiskAction.java @@ -42,15 +42,14 @@ public class ArchiveDiskAction extends Node { KitDefinition var1 = (KitDefinition)KitDefinition.KitDefinition_cached.get((long)var0); if (var1 != null) { return var1; - } else { - byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); - var1 = new KitDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - KitDefinition.KitDefinition_cached.put(var1, (long)var0); - return var1; } + byte[] var2 = KitDefinition.KitDefinition_archive.takeFile(3, var0); + var1 = new KitDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + KitDefinition.KitDefinition_cached.put(var1, (long)var0); + return var1; } } diff --git a/runescape-client/src/main/java/ArchiveDiskActionHandler.java b/runescape-client/src/main/java/ArchiveDiskActionHandler.java index a1685b2890..0fd358b9dd 100644 --- a/runescape-client/src/main/java/ArchiveDiskActionHandler.java +++ b/runescape-client/src/main/java/ArchiveDiskActionHandler.java @@ -99,7 +99,8 @@ public class ArchiveDiskActionHandler implements Runnable { public static final PcmPlayer method4256(TaskHandler var0, int var1, int var2) { if (CollisionMap.PcmPlayer_sampleRate == 0) { throw new IllegalStateException(); - } else if (var1 >= 0 && var1 < 2) { + } + if (var1 >= 0 && var1 < 2) { if (var2 < 256) { var2 = 256; } @@ -133,8 +134,7 @@ public class ArchiveDiskActionHandler implements Runnable { } catch (Throwable var4) { return new PcmPlayer(); } - } else { - throw new IllegalArgumentException(); } + throw new IllegalArgumentException(); } } diff --git a/runescape-client/src/main/java/ArchiveLoader.java b/runescape-client/src/main/java/ArchiveLoader.java index feb947d56e..75bd235e5f 100644 --- a/runescape-client/src/main/java/ArchiveLoader.java +++ b/runescape-client/src/main/java/ArchiveLoader.java @@ -91,19 +91,18 @@ public class ArchiveLoader { if (var0 == ScriptOpcodes.CC_CALLONRESIZE) { if (Interpreter.field1106 >= 10) { throw new RuntimeException(); - } else if (var3.onResize == null) { - return 0; - } else { - ScriptEvent var4 = new ScriptEvent(); - var4.widget = var3; - var4.args = var3.onResize; - var4.field583 = Interpreter.field1106 + 1; - Client.scriptEvents.addFirst(var4); - return 1; } - } else { - return 2; + if (var3.onResize == null) { + return 0; + } + ScriptEvent var4 = new ScriptEvent(); + var4.widget = var3; + var4.args = var3.onResize; + var4.field583 = Interpreter.field1106 + 1; + Client.scriptEvents.addFirst(var4); + return 1; } + return 2; } @ObfuscatedName("jk") diff --git a/runescape-client/src/main/java/AudioFilter.java b/runescape-client/src/main/java/AudioFilter.java index 8beec7b479..ae77f9c021 100644 --- a/runescape-client/src/main/java/AudioFilter.java +++ b/runescape-client/src/main/java/AudioFilter.java @@ -65,44 +65,43 @@ public class AudioFilter { if (this.pairs[var1] == 0) { return 0; - } else { - var3 = this.method2668(var1, 0, var2); - field1488[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method2683(var1, 0, var2)); - field1488[var1][1] = var3 * var3; - - float[] var10000; - int var4; - for (var4 = 1; var4 < this.pairs[var1]; ++var4) { - var3 = this.method2668(var1, var4, var2); - float var5 = -2.0F * var3 * (float)Math.cos((double)this.method2683(var1, var4, var2)); - float var6 = var3 * var3; - field1488[var1][var4 * 2 + 1] = field1488[var1][var4 * 2 - 1] * var6; - field1488[var1][var4 * 2] = field1488[var1][var4 * 2 - 1] * var5 + field1488[var1][var4 * 2 - 2] * var6; - - for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) { - var10000 = field1488[var1]; - var10000[var7] += field1488[var1][var7 - 1] * var5 + field1488[var1][var7 - 2] * var6; - } - - var10000 = field1488[var1]; - var10000[1] += field1488[var1][0] * var5 + var6; - var10000 = field1488[var1]; - var10000[0] += var5; - } - - if (var1 == 0) { - for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) { - var10000 = field1488[0]; - var10000[var4] *= field1491; - } - } - - for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) { - coefficients[var1][var4] = (int)(field1488[var1][var4] * 65536.0F); - } - - return this.pairs[var1] * 2; } + var3 = this.method2668(var1, 0, var2); + field1488[var1][0] = -2.0F * var3 * (float)Math.cos((double)this.method2683(var1, 0, var2)); + field1488[var1][1] = var3 * var3; + + float[] var10000; + int var4; + for (var4 = 1; var4 < this.pairs[var1]; ++var4) { + var3 = this.method2668(var1, var4, var2); + float var5 = -2.0F * var3 * (float)Math.cos((double)this.method2683(var1, var4, var2)); + float var6 = var3 * var3; + field1488[var1][var4 * 2 + 1] = field1488[var1][var4 * 2 - 1] * var6; + field1488[var1][var4 * 2] = field1488[var1][var4 * 2 - 1] * var5 + field1488[var1][var4 * 2 - 2] * var6; + + for (int var7 = var4 * 2 - 1; var7 >= 2; --var7) { + var10000 = field1488[var1]; + var10000[var7] += field1488[var1][var7 - 1] * var5 + field1488[var1][var7 - 2] * var6; + } + + var10000 = field1488[var1]; + var10000[1] += field1488[var1][0] * var5 + var6; + var10000 = field1488[var1]; + var10000[0] += var5; + } + + if (var1 == 0) { + for (var4 = 0; var4 < this.pairs[0] * 2; ++var4) { + var10000 = field1488[0]; + var10000[var4] *= field1491; + } + } + + for (var4 = 0; var4 < this.pairs[var1] * 2; ++var4) { + coefficients[var1][var4] = (int)(field1488[var1][var4] * 65536.0F); + } + + return this.pairs[var1] * 2; } @ObfuscatedName("k") diff --git a/runescape-client/src/main/java/BoundaryObject.java b/runescape-client/src/main/java/BoundaryObject.java index 624ba45267..28c6a3329f 100644 --- a/runescape-client/src/main/java/BoundaryObject.java +++ b/runescape-client/src/main/java/BoundaryObject.java @@ -103,12 +103,11 @@ public final class BoundaryObject { if (!var4) { return null; - } else { - try { - return new Frames(var0, var1, var2, var3); - } catch (Exception var11) { - return null; - } + } + try { + return new Frames(var0, var1, var2, var3); + } catch (Exception var11) { + return null; } } @@ -122,15 +121,14 @@ public final class BoundaryObject { EnumDefinition var1 = (EnumDefinition)EnumDefinition.EnumDefinition_cached.get((long)var0); if (var1 != null) { return var1; - } else { - byte[] var2 = EnumDefinition.EnumDefinition_archive.takeFile(8, var0); - var1 = new EnumDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - EnumDefinition.EnumDefinition_cached.put(var1, (long)var0); - return var1; } + byte[] var2 = EnumDefinition.EnumDefinition_archive.takeFile(8, var0); + var1 = new EnumDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + EnumDefinition.EnumDefinition_cached.put(var1, (long)var0); + return var1; } } diff --git a/runescape-client/src/main/java/Buddy.java b/runescape-client/src/main/java/Buddy.java index 33eab5dd66..b28f73cc01 100644 --- a/runescape-client/src/main/java/Buddy.java +++ b/runescape-client/src/main/java/Buddy.java @@ -91,8 +91,7 @@ public class Buddy extends User { } return var0 * 10000 / Client.field927; - } else { - return 10000; } + return 10000; } } diff --git a/runescape-client/src/main/java/BuddyRankComparator.java b/runescape-client/src/main/java/BuddyRankComparator.java index a1bb434603..b0013f11c4 100644 --- a/runescape-client/src/main/java/BuddyRankComparator.java +++ b/runescape-client/src/main/java/BuddyRankComparator.java @@ -31,9 +31,8 @@ public class BuddyRankComparator extends AbstractUserComparator { int compareBuddy(Buddy var1, Buddy var2) { if (var2.rank != var1.rank) { return this.reversed ? var1.rank - var2.rank : var2.rank - var1.rank; - } else { - return this.compareUser(var1, var2); } + return this.compareUser(var1, var2); } public int compare(Object var1, Object var2) { diff --git a/runescape-client/src/main/java/Buffer.java b/runescape-client/src/main/java/Buffer.java index d8b066ffff..67e2b1291b 100644 --- a/runescape-client/src/main/java/Buffer.java +++ b/runescape-client/src/main/java/Buffer.java @@ -173,10 +173,9 @@ public class Buffer extends Node { int var2 = var1.indexOf(0); if (var2 >= 0) { throw new IllegalArgumentException(""); - } else { - this.offset += WorldMapSection0.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); - this.array[++this.offset - 1] = 0; } + this.offset += WorldMapSection0.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); + this.array[++this.offset - 1] = 0; } @ObfuscatedName("bg") @@ -189,11 +188,10 @@ public class Buffer extends Node { int var2 = var1.indexOf(0); if (var2 >= 0) { throw new IllegalArgumentException(""); - } else { - this.array[++this.offset - 1] = 0; - this.offset += WorldMapSection0.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); - this.array[++this.offset - 1] = 0; } + this.array[++this.offset - 1] = 0; + this.offset += WorldMapSection0.encodeStringCp1252(var1, 0, var1.length(), this.array, this.offset); + this.array[++this.offset - 1] = 0; } @ObfuscatedName("bh") @@ -244,12 +242,11 @@ public class Buffer extends Node { public void writeLengthInt(int var1) { if (var1 < 0) { throw new IllegalArgumentException(); - } else { - this.array[this.offset - var1 - 4] = (byte)(var1 >> 24); - this.array[this.offset - var1 - 3] = (byte)(var1 >> 16); - this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); - this.array[this.offset - var1 - 1] = (byte)var1; } + this.array[this.offset - var1 - 4] = (byte)(var1 >> 24); + this.array[this.offset - var1 - 3] = (byte)(var1 >> 16); + this.array[this.offset - var1 - 2] = (byte)(var1 >> 8); + this.array[this.offset - var1 - 1] = (byte)var1; } @ObfuscatedName("bc") @@ -424,9 +421,8 @@ public class Buffer extends Node { if (this.array[this.offset] == 0) { ++this.offset; return null; - } else { - return this.readStringCp1252NullTerminated(); } + return this.readStringCp1252NullTerminated(); } @ObfuscatedName("br") @@ -455,15 +451,14 @@ public class Buffer extends Node { byte var1 = this.array[++this.offset - 1]; if (var1 != 0) { throw new IllegalStateException(""); - } else { - int var2 = this.offset; - - while (this.array[++this.offset - 1] != 0) { - } - - int var3 = this.offset - var2 - 1; - return var3 == 0 ? "" : FriendSystem.decodeStringCp1252(this.array, var2, var3); } + int var2 = this.offset; + + while (this.array[++this.offset - 1] != 0) { + } + + int var3 = this.offset - var2 - 1; + return var3 == 0 ? "" : FriendSystem.decodeStringCp1252(this.array, var2, var3); } @ObfuscatedName("bf") @@ -476,16 +471,14 @@ public class Buffer extends Node { byte var1 = this.array[++this.offset - 1]; if (var1 != 0) { throw new IllegalStateException(""); - } else { - int var2 = this.readVarInt(); - if (var2 + this.offset > this.array.length) { - throw new IllegalStateException(""); - } else { - String var3 = ClientPreferences.method1755(this.array, this.offset, var2); - this.offset += var2; - return var3; - } } + int var2 = this.readVarInt(); + if (var2 + this.offset > this.array.length) { + throw new IllegalStateException(""); + } + String var3 = ClientPreferences.method1755(this.array, this.offset, var2); + this.offset += var2; + return var3; } @ObfuscatedName("bv") @@ -557,10 +550,9 @@ public class Buffer extends Node { public int method5511() { if (this.array[this.offset] < 0) { return this.readInt() & Integer.MAX_VALUE; - } else { - int var1 = this.readUnsignedShort(); - return var1 == 32767 ? -1 : var1; } + int var1 = this.readUnsignedShort(); + return var1 == 32767 ? -1 : var1; } @ObfuscatedName("cl") diff --git a/runescape-client/src/main/java/BufferedFile.java b/runescape-client/src/main/java/BufferedFile.java index c52d631d60..803c688bd7 100644 --- a/runescape-client/src/main/java/BufferedFile.java +++ b/runescape-client/src/main/java/BufferedFile.java @@ -100,9 +100,8 @@ public class BufferedFile { public void seek(long var1) throws IOException { if (var1 < 0L) { throw new IOException(""); - } else { - this.offset = var1; } + this.offset = var1; } @ObfuscatedName("e") @@ -392,18 +391,18 @@ public class BufferedFile { ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); if (var2 == null) { return 0; - } else if (var1 == -1) { - return 0; - } else { - int var3 = 0; - - for (int var4 = 0; var4 < var2.quantities.length; ++var4) { - if (var2.ids[var4] == var1) { - var3 += var2.quantities[var4]; - } - } - - return var3; } + if (var1 == -1) { + return 0; + } + int var3 = 0; + + for (int var4 = 0; var4 < var2.quantities.length; ++var4) { + if (var2.ids[var4] == var1) { + var3 += var2.quantities[var4]; + } + } + + return var3; } } diff --git a/runescape-client/src/main/java/BufferedSink.java b/runescape-client/src/main/java/BufferedSink.java index d120068db0..a77023b182 100644 --- a/runescape-client/src/main/java/BufferedSink.java +++ b/runescape-client/src/main/java/BufferedSink.java @@ -74,9 +74,8 @@ public class BufferedSink implements Runnable { } return true; - } else { - return false; } + return false; } @ObfuscatedName("w") @@ -90,29 +89,27 @@ public class BufferedSink implements Runnable { synchronized(this) { if (this.exception != null) { throw new IOException(this.exception.toString()); - } else { - int var5; - if (this.position <= this.limit) { - var5 = this.capacity - this.limit + this.position - 1; - } else { - var5 = this.position - this.limit - 1; - } - - if (var5 < var3) { - throw new IOException(""); - } else { - if (var3 + this.limit <= this.capacity) { - System.arraycopy(var1, var2, this.buffer, this.limit, var3); - } else { - int var6 = this.capacity - this.limit; - System.arraycopy(var1, var2, this.buffer, this.limit, var6); - System.arraycopy(var1, var6 + var2, this.buffer, 0, var3 - var6); - } - - this.limit = (var3 + this.limit) % this.capacity; - this.notifyAll(); - } } + int var5; + if (this.position <= this.limit) { + var5 = this.capacity - this.limit + this.position - 1; + } else { + var5 = this.position - this.limit - 1; + } + + if (var5 < var3) { + throw new IOException(""); + } + if (var3 + this.limit <= this.capacity) { + System.arraycopy(var1, var2, this.buffer, this.limit, var3); + } else { + int var6 = this.capacity - this.limit; + System.arraycopy(var1, var2, this.buffer, this.limit, var6); + System.arraycopy(var1, var6 + var2, this.buffer, 0, var3 - var6); + } + + this.limit = (var3 + this.limit) % this.capacity; + this.notifyAll(); } } else { throw new IOException(); diff --git a/runescape-client/src/main/java/BufferedSource.java b/runescape-client/src/main/java/BufferedSource.java index 3e2726890e..7575a2fa1b 100644 --- a/runescape-client/src/main/java/BufferedSource.java +++ b/runescape-client/src/main/java/BufferedSource.java @@ -61,7 +61,8 @@ public class BufferedSource implements Runnable { boolean isAvailable(int var1) throws IOException { if (var1 == 0) { return true; - } else if (var1 > 0 && var1 < this.capacity) { + } + if (var1 > 0 && var1 < this.capacity) { synchronized(this) { int var3; if (this.position <= this.limit) { @@ -73,17 +74,14 @@ public class BufferedSource implements Runnable { if (var3 < var1) { if (this.exception != null) { throw new IOException(this.exception.toString()); - } else { - this.notifyAll(); - return false; } - } else { - return true; + this.notifyAll(); + return false; } + return true; } - } else { - throw new IOException(); } + throw new IOException(); } @ObfuscatedName("w") @@ -103,10 +101,9 @@ public class BufferedSource implements Runnable { if (var2 <= 0 && this.exception != null) { throw new IOException(this.exception.toString()); - } else { - this.notifyAll(); - return var2; } + this.notifyAll(); + return var2; } } @@ -121,15 +118,13 @@ public class BufferedSource implements Runnable { if (this.limit == this.position) { if (this.exception != null) { throw new IOException(this.exception.toString()); - } else { - return -1; } - } else { - int var2 = this.buffer[this.position] & 255; - this.position = (this.position + 1) % this.capacity; - this.notifyAll(); - return var2; + return -1; } + int var2 = this.buffer[this.position] & 255; + this.position = (this.position + 1) % this.capacity; + this.notifyAll(); + return var2; } } @@ -155,23 +150,21 @@ public class BufferedSource implements Runnable { if (var3 == 0 && this.exception != null) { throw new IOException(this.exception.toString()); - } else { - if (var3 + this.position <= this.capacity) { - System.arraycopy(this.buffer, this.position, var1, var2, var3); - } else { - int var6 = this.capacity - this.position; - System.arraycopy(this.buffer, this.position, var1, var2, var6); - System.arraycopy(this.buffer, 0, var1, var6 + var2, var3 - var6); - } - - this.position = (var3 + this.position) % this.capacity; - this.notifyAll(); - return var3; } + if (var3 + this.position <= this.capacity) { + System.arraycopy(this.buffer, this.position, var1, var2, var3); + } else { + int var6 = this.capacity - this.position; + System.arraycopy(this.buffer, this.position, var1, var2, var6); + System.arraycopy(this.buffer, 0, var1, var6 + var2, var3 - var6); + } + + this.position = (var3 + this.position) % this.capacity; + this.notifyAll(); + return var3; } - } else { - throw new IOException(); } + throw new IOException(); } @ObfuscatedName("k") @@ -262,25 +255,25 @@ public class BufferedSource implements Runnable { GrandExchangeOfferWorldComparator.leftTitleSprite = BuddyRankComparator.convertJpgToSprite(var4); NPC.rightTitleSprite = GrandExchangeOfferWorldComparator.leftTitleSprite.mirrorHorizontally(); if ((Client.worldProperties & 536870912) != 0) { - GroundItem.logoSprite = class215.loadIndexedSpriteByName(var1, "logo_deadman_mode", ""); + GroundItem.logoSprite = class215.SpriteBuffer_getIndexedSpriteByName(var1, "logo_deadman_mode", ""); } else { - GroundItem.logoSprite = class215.loadIndexedSpriteByName(var1, "logo", ""); + GroundItem.logoSprite = class215.SpriteBuffer_getIndexedSpriteByName(var1, "logo", ""); } - Login.titleboxSprite = class215.loadIndexedSpriteByName(var1, "titlebox", ""); - VarpDefinition.titlebuttonSprite = class215.loadIndexedSpriteByName(var1, "titlebutton", ""); + Login.titleboxSprite = class215.SpriteBuffer_getIndexedSpriteByName(var1, "titlebox", ""); + VarpDefinition.titlebuttonSprite = class215.SpriteBuffer_getIndexedSpriteByName(var1, "titlebutton", ""); int var6 = var1.getGroupId("runes"); int var7 = var1.getFileId(var6, ""); - IndexedSprite[] var5 = class289.method5281(var1, var6, var7); + IndexedSprite[] var5 = class289.SpriteBuffer_getIndexedSpriteArray(var1, var6, var7); Login.runesSprite = var5; var7 = var1.getGroupId("title_mute"); int var8 = var1.getFileId(var7, ""); - IndexedSprite[] var9 = class289.method5281(var1, var7, var8); + IndexedSprite[] var9 = class289.SpriteBuffer_getIndexedSpriteArray(var1, var7, var8); Login.title_muteSprite = var9; - Login.options_buttons_0Sprite = class215.loadIndexedSpriteByName(var1, "options_radio_buttons,0", ""); - Message.field606 = class215.loadIndexedSpriteByName(var1, "options_radio_buttons,4", ""); - Decimator.options_buttons_2Sprite = class215.loadIndexedSpriteByName(var1, "options_radio_buttons,2", ""); - Login.field1185 = class215.loadIndexedSpriteByName(var1, "options_radio_buttons,6", ""); + Login.options_buttons_0Sprite = class215.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,0", ""); + Message.field606 = class215.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,4", ""); + Decimator.options_buttons_2Sprite = class215.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,2", ""); + Login.field1185 = class215.SpriteBuffer_getIndexedSpriteByName(var1, "options_radio_buttons,6", ""); class237.field3191 = Login.options_buttons_0Sprite.subWidth; WorldMapDecoration.field212 = Login.options_buttons_0Sprite.subHeight; Ignored.loginScreenRunesAnimation = new LoginScreenAnimation(Login.runesSprite); diff --git a/runescape-client/src/main/java/ChatChannel.java b/runescape-client/src/main/java/ChatChannel.java index b1ff84efea..fbf3ee2a03 100644 --- a/runescape-client/src/main/java/ChatChannel.java +++ b/runescape-client/src/main/java/ChatChannel.java @@ -234,28 +234,27 @@ public class ChatChannel { static final boolean runCs1(Widget var0) { if (var0.cs1Comparisons == null) { return false; - } else { - for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { - int var2 = Varps.method3969(var0, var1); - int var3 = var0.cs1ComparisonValues[var1]; - if (var0.cs1Comparisons[var1] == 2) { - if (var2 >= var3) { - return false; - } - } else if (var0.cs1Comparisons[var1] == 3) { - if (var2 <= var3) { - return false; - } - } else if (var0.cs1Comparisons[var1] == 4) { - if (var2 == var3) { - return false; - } - } else if (var2 != var3) { + } + for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) { + int var2 = Varps.method3969(var0, var1); + int var3 = var0.cs1ComparisonValues[var1]; + if (var0.cs1Comparisons[var1] == 2) { + if (var2 >= var3) { return false; } + } else if (var0.cs1Comparisons[var1] == 3) { + if (var2 <= var3) { + return false; + } + } else if (var0.cs1Comparisons[var1] == 4) { + if (var2 == var3) { + return false; + } + } else if (var2 != var3) { + return false; } - - return true; } + + return true; } } diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index 2f6afc39d2..0b284fe927 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -3596,1368 +3596,1367 @@ public final class Client extends GameShell implements Usernamed { PacketBuffer var3 = var1.packetBuffer; if (var2 == null) { return false; - } else { - int var17; - String var18; - try { - int var5; - if (var1.serverPacket == null) { - if (var1.field1322) { - if (!var2.isAvailable(1)) { - return false; - } - - var2.read(var1.packetBuffer.array, 0, 1); - var1.field1318 = 0; - var1.field1322 = false; - } - - var3.offset = 0; - if (var3.method5441()) { - if (!var2.isAvailable(1)) { - return false; - } - - var2.read(var1.packetBuffer.array, 1, 1); - var1.field1318 = 0; - } - - var1.field1322 = true; - ServerPacket[] var4 = Interpreter.ServerPacket_values(); - var5 = var3.readSmartByteShortIsaac(); - if (var5 < 0 || var5 >= var4.length) { - throw new IOException(var5 + " " + var3.offset); - } - - var1.serverPacket = var4[var5]; - var1.serverPacketLength = var1.serverPacket.length; - } - - if (var1.serverPacketLength == -1) { + } + int var17; + String var18; + try { + int var5; + if (var1.serverPacket == null) { + if (var1.field1322) { if (!var2.isAvailable(1)) { return false; } - var1.getSocket().read(var3.array, 0, 1); - var1.serverPacketLength = var3.array[0] & 255; - } - - if (var1.serverPacketLength == -2) { - if (!var2.isAvailable(2)) { - return false; - } - - var1.getSocket().read(var3.array, 0, 2); - var3.offset = 0; - var1.serverPacketLength = var3.readUnsignedShort(); - } - - if (!var2.isAvailable(var1.serverPacketLength)) { - return false; + var2.read(var1.packetBuffer.array, 0, 1); + var1.field1318 = 0; + var1.field1322 = false; } var3.offset = 0; - var2.read(var3.array, 0, var1.serverPacketLength); - var1.field1318 = 0; - timer.method5005(); - var1.field1317 = var1.field1321; - var1.field1321 = var1.field1309; - var1.field1309 = var1.serverPacket; - Widget var6; - int var16; - boolean var47; - if (ServerPacket.field2136 == var1.serverPacket) { - var16 = var3.readInt(); - var47 = var3.readUnsignedByte() == 1; - var6 = class80.getWidget(var16); - if (var47 != var6.isHidden) { - var6.isHidden = var47; - Strings.method4120(var6); + if (var3.method5441()) { + if (!var2.isAvailable(1)) { + return false; } - var1.serverPacket = null; - return true; + var2.read(var1.packetBuffer.array, 1, 1); + var1.field1318 = 0; } - if (ServerPacket.field2115 == var1.serverPacket) { - minimapState = var3.readUnsignedByte(); - var1.serverPacket = null; - return true; + var1.field1322 = true; + ServerPacket[] var4 = Interpreter.ServerPacket_values(); + var5 = var3.readSmartByteShortIsaac(); + if (var5 < 0 || var5 >= var4.length) { + throw new IOException(var5 + " " + var3.offset); } - if (ServerPacket.field2200 == var1.serverPacket) { - var16 = var3.readUnsignedByte(); - SoundCache.method2491(var16); - var1.serverPacket = null; - return false; - } - - if (ServerPacket.field2128 == var1.serverPacket) { - class1.method10(class185.field2320); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2168 == var1.serverPacket) { - byte var60 = var3.method5694(); - var5 = var3.method5518(); - Varps.Varps_temp[var5] = var60; - if (Varps.Varps_main[var5] != var60) { - Varps.Varps_main[var5] = var60; - } - - GrandExchangeOfferUnitPriceComparator.method124(var5); - field863[++field806 - 1 & 31] = var5; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2179 == var1.serverPacket) { - DefaultsGroup.field3819 = var3.readUnsignedByteNegate(); - ChatChannel.field1306 = var3.method5525(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2161 == var1.serverPacket) { - var16 = var3.method5532(); - GroundItemPile.method2764(var16); - field888[++field671 - 1 & 31] = var16 & 32767; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2149 == var1.serverPacket) { - var16 = var3.readUnsignedByte(); - class192.method3675(var16); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2137 == var1.serverPacket) { - class1.method10(class185.field2315); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2187 == var1.serverPacket) { - rebootTimer = var3.readUnsignedShort() * 30; - field844 = cycleCntr; - var1.serverPacket = null; - return true; - } - - int var7; - Widget var8; - if (ServerPacket.field2123 == var1.serverPacket) { - var16 = var3.method5534(); - var5 = var3.method5534(); - var17 = var3.method5534(); - var7 = var3.method5543(); - var8 = class80.getWidget(var7); - if (var16 != var8.modelAngleX || var17 != var8.modelAngleY || var5 != var8.modelZoom) { - var8.modelAngleX = var16; - var8.modelAngleY = var17; - var8.modelZoom = var5; - Strings.method4120(var8); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2120 == var1.serverPacket) { - ChatChannel.field1306 = var3.method5525(); - DefaultsGroup.field3819 = var3.readUnsignedByteNegate(); - - while (var3.offset < var1.serverPacketLength) { - var16 = var3.readUnsignedByte(); - class185 var58 = GrandExchangeEvents.method70()[var16]; - class1.method10(var58); - } - - var1.serverPacket = null; - return true; - } - - Widget var19; - if (ServerPacket.field2125 == var1.serverPacket) { - var16 = var3.readInt(); - var5 = var3.readUnsignedShort(); - if (var5 == 65535) { - var5 = -1; - } - - var17 = var3.method5543(); - var19 = class80.getWidget(var16); - ItemDefinition var43; - if (!var19.isIf3) { - if (var5 == -1) { - var19.modelType = 0; - var1.serverPacket = null; - return true; - } - - var43 = WorldMapArea.getItemDefinition(var5); - var19.modelType = 4; - var19.modelId = var5; - var19.modelAngleX = var43.xan2d; - var19.modelAngleY = var43.yan2d; - var19.modelZoom = var43.zoom2d * 100 / var17; - Strings.method4120(var19); - } else { - var19.itemId = var5; - var19.itemQuantity = var17; - var43 = WorldMapArea.getItemDefinition(var5); - var19.modelAngleX = var43.xan2d; - var19.modelAngleY = var43.yan2d; - var19.modelAngleZ = var43.zan2d; - var19.modelOffsetX = var43.offsetX2d; - var19.modelOffsetY = var43.offsetY2d; - var19.modelZoom = var43.zoom2d; - if (var43.isStackable == 1) { - var19.itemQuantityMode = 1; - } else { - var19.itemQuantityMode = 2; - } - - if (var19.field2619 > 0) { - var19.modelZoom = var19.modelZoom * 32 / var19.field2619; - } else if (var19.rawWidth > 0) { - var19.modelZoom = var19.modelZoom * 32 / var19.rawWidth; - } - - Strings.method4120(var19); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2158 == var1.serverPacket) { - var16 = var3.readUnsignedShort(); - var5 = var3.readUnsignedByte(); - var17 = var3.readUnsignedShort(); - class81.queueSoundEffect(var16, var5, var17); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2154 == var1.serverPacket) { - var16 = var3.readUnsignedByte(); - var5 = var3.readUnsignedByte(); - var17 = var3.readUnsignedByte(); - var7 = var3.readUnsignedByte(); - field886[var16] = true; - field901[var16] = var5; - field902[var16] = var17; - field903[var16] = var7; - field904[var16] = 0; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2166 == var1.serverPacket) { - Tiles.loadRegions(true, var1.packetBuffer); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2194 == var1.serverPacket) { - InterfaceParent.updatePlayers(var3, var1.serverPacketLength); - ObjectSound.method1827(); - var1.serverPacket = null; - return true; - } - - int var9; - int var10; - int var20; - if (ServerPacket.field2198 == var1.serverPacket) { - isCameraLocked = true; - HealthBarUpdate.field1017 = var3.readUnsignedByte() * 128; - class30.field259 = var3.readUnsignedByte() * 128; - WorldMapID.field268 = var3.readUnsignedShort(); - ScriptFrame.field526 = var3.readUnsignedByte(); - Tiles.field501 = var3.readUnsignedByte(); - if (Tiles.field501 >= 100) { - var16 = HealthBarUpdate.field1017 * 16384 + 64; - var5 = class30.field259 * 16384 + 64; - var17 = ScriptEvent.getTileHeight(var16, var5, class42.plane) - WorldMapID.field268; - var7 = var16 - PacketBuffer.cameraX; - var20 = var17 - class43.cameraY; - var9 = var5 - class1.cameraZ; - var10 = (int)Math.sqrt((double)(var9 * var9 + var7 * var7)); - GrandExchangeOfferNameComparator.cameraPitch = (int)(Math.atan2((double)var20, (double)var10) * 325.949D) & 2047; - Interpreter.cameraYaw = (int)(Math.atan2((double)var7, (double)var9) * -325.949D) & 2047; - if (GrandExchangeOfferNameComparator.cameraPitch < 128) { - GrandExchangeOfferNameComparator.cameraPitch = 128; - } - - if (GrandExchangeOfferNameComparator.cameraPitch > 383) { - GrandExchangeOfferNameComparator.cameraPitch = 383; - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2116 == var1.serverPacket) { - RouteStrategy.method3593(); - var1.serverPacket = null; - return false; - } - - if (ServerPacket.field2150 == var1.serverPacket) { - World var40 = new World(); - var40.host = var3.readStringCp1252NullTerminated(); - var40.id = var3.readUnsignedShort(); - var5 = var3.readInt(); - var40.properties = var5; - class96.updateGameState(45); - var2.close(); - var2 = null; - MusicPatchPcmStream.changeWorld(var40); - var1.serverPacket = null; - return false; - } - - if (ServerPacket.field2157 == var1.serverPacket) { - class1.method10(class185.field2318); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2164 == var1.serverPacket) { - class1.method10(class185.field2324); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2145 == var1.serverPacket) { - var16 = var3.method5543(); - var5 = var3.method5534(); - var6 = class80.getWidget(var16); - if (var6 != null && var6.type == 0) { - if (var5 > var6.scrollHeight - var6.height) { - var5 = var6.scrollHeight - var6.height; - } - - if (var5 < 0) { - var5 = 0; - } - - if (var5 != var6.scrollY) { - var6.scrollY = var5; - Strings.method4120(var6); - } - } - - var1.serverPacket = null; - return true; - } - - long var21; - if (ServerPacket.field2163 == var1.serverPacket) { - var16 = var3.method5541(); - var5 = var3.method5518(); - if (var5 == 65535) { - var5 = -1; - } - - var17 = var3.method5543(); - var7 = var3.readUnsignedShort(); - if (var7 == 65535) { - var7 = -1; - } - - for (var20 = var7; var20 <= var5; ++var20) { - var21 = (long)var20 + ((long)var17 << 32); - Node var46 = widgetClickMasks.get(var21); - if (var46 != null) { - var46.remove(); - } - - widgetClickMasks.put(new IntegerNode(var16), var21); - } - - var1.serverPacket = null; - return true; - } - - Widget var53; - if (ServerPacket.field2122 == var1.serverPacket) { - var16 = var3.method5542(); - var53 = class80.getWidget(var16); - - for (var17 = 0; var17 < var53.itemIds.length; ++var17) { - var53.itemIds[var17] = -1; - var53.itemIds[var17] = 0; - } - - Strings.method4120(var53); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2165 == var1.serverPacket) { - var16 = var3.readInt(); - if (var16 != field855) { - field855 = var16; - Actor.method1670(); - } - - var1.serverPacket = null; - return true; - } - - InterfaceParent var52; - if (ServerPacket.field2192 == var1.serverPacket) { - var16 = var3.method5722(); - var5 = var3.method5542(); - var17 = var3.method5534(); - var52 = (InterfaceParent)interfaceParents.get((long)var5); - if (var52 != null) { - class197.closeInterface(var52, var17 != var52.group); - } - - PendingSpawn.method1652(var5, var17, var16); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2183 == var1.serverPacket) { - class226.field3072 = NetSocket.method3530(var3.readUnsignedByte()); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2138 == var1.serverPacket) { - var16 = var3.method5534(); - if (var16 == 65535) { - var16 = -1; - } - - GrandExchangeOfferTotalQuantityComparator.method93(var16); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2155 == var1.serverPacket) { - var16 = var3.method5591(); - var5 = var3.method5518(); - if (var5 == 65535) { - var5 = -1; - } - - WorldMapLabelSize.method188(var5, var16); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2124 == var1.serverPacket) { - var16 = var3.readShort(); - var5 = var3.method5543(); - var6 = class80.getWidget(var5); - if (var16 != var6.sequenceId || var16 == -1) { - var6.sequenceId = var16; - var6.modelFrame = 0; - var6.modelFrameCycle = 0; - Strings.method4120(var6); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2147 == var1.serverPacket) { - ArchiveLoader.friendSystem.ignoreList.read(var3, var1.serverPacketLength); - class2.method28(); - field672 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2196 == var1.serverPacket) { - ScriptFrame.updateNpcs(true, var3); - var1.serverPacket = null; - return true; - } - - long var12; - long var23; - long var25; - String var37; - if (ServerPacket.field2142 == var1.serverPacket) { - var37 = var3.readStringCp1252NullTerminated(); - var23 = var3.readLong(); - var25 = (long)var3.readUnsignedShort(); - var21 = (long)var3.readMedium(); - PlayerType var11 = (PlayerType)SoundSystem.findEnumerated(UserComparator5.PlayerType_values(), var3.readUnsignedByte()); - var12 = (var25 << 32) + var21; - boolean var49 = false; - - for (int var15 = 0; var15 < 100; ++var15) { - if (field922[var15] == var12) { - var49 = true; - break; - } - } - - if (var11.isUser && ArchiveLoader.friendSystem.isIgnored(new Username(var37, class40.loginType))) { - var49 = true; - } - - if (!var49 && field767 == 0) { - field922[field875] = var12; - field875 = (field875 + 1) % 100; - String var27 = AbstractFont.escapeBrackets(class1.method17(DefaultsGroup.method5898(var3))); - if (var11.modIcon != -1) { - class14.addChatMessage(9, WorldMapSection1.getModIconString(var11.modIcon) + var37, var27, class215.method4023(var23)); - } else { - class14.addChatMessage(9, var37, var27, class215.method4023(var23)); - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2177 == var1.serverPacket) { - var37 = var3.readStringCp1252NullTerminated(); - Object[] var57 = new Object[var37.length() + 1]; - - for (var17 = var37.length() - 1; var17 >= 0; --var17) { - if (var37.charAt(var17) == 's') { - var57[var17 + 1] = var3.readStringCp1252NullTerminated(); - } else { - var57[var17 + 1] = new Integer(var3.readInt()); - } - } - - var57[0] = new Integer(var3.readInt()); - ScriptEvent var48 = new ScriptEvent(); - var48.args = var57; - LoginPacket.runScriptEvent(var48); - var1.serverPacket = null; - return true; - } - - String var44; - if (ServerPacket.field2133 == var1.serverPacket) { - byte[] var39 = new byte[var1.serverPacketLength]; - var3.method5443(var39, 0, var39.length); - Buffer var55 = new Buffer(var39); - var44 = var55.readStringCp1252NullTerminated(); - GrandExchangeOfferWorldComparator.openURL(var44, true, false); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2162 == var1.serverPacket) { - if (var1.serverPacketLength == 0) { - DevicePcmPlayerProvider.clanChat = null; - } else { - if (DevicePcmPlayerProvider.clanChat == null) { - DevicePcmPlayerProvider.clanChat = new ClanChat(class40.loginType, WorldMapSprite.client); - } - - DevicePcmPlayerProvider.clanChat.readUpdate(var3); - } - - class267.method4986(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2143 == var1.serverPacket) { - for (var16 = 0; var16 < players.length; ++var16) { - if (players[var16] != null) { - players[var16].sequence = -1; - } - } - - for (var16 = 0; var16 < npcs.length; ++var16) { - if (npcs[var16] != null) { - npcs[var16].sequence = -1; - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2189 == var1.serverPacket) { - if (DevicePcmPlayerProvider.clanChat != null) { - DevicePcmPlayerProvider.clanChat.method5234(var3); - } - - class267.method4986(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2121 == var1.serverPacket) { - isCameraLocked = true; - DevicePcmPlayerProvider.field412 = var3.readUnsignedByte() * 128; - class210.field2516 = var3.readUnsignedByte() * 128; - class190.field2345 = var3.readUnsignedShort(); - class83.field1166 = var3.readUnsignedByte(); - class96.field1327 = var3.readUnsignedByte(); - if (class96.field1327 >= 100) { - PacketBuffer.cameraX = DevicePcmPlayerProvider.field412 * 16384 + 64; - class1.cameraZ = class210.field2516 * 16384 + 64; - class43.cameraY = ScriptEvent.getTileHeight(PacketBuffer.cameraX, class1.cameraZ, class42.plane) - class190.field2345; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2117 == var1.serverPacket) { - isCameraLocked = false; - - for (var16 = 0; var16 < 5; ++var16) { - field886[var16] = false; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2127 == var1.serverPacket) { - class1.method10(class185.field2319); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2144 == var1.serverPacket) { - ArchiveLoader.friendSystem.method1760(); - field672 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2191 == var1.serverPacket) { - class65.method1176(); - var16 = var3.method5541(); - var5 = var3.readUnsignedByteNegate(); - var17 = var3.readUnsignedByte(); - experience[var5] = var16; - currentLevels[var5] = var17; - levels[var5] = 1; - - for (var7 = 0; var7 < 98; ++var7) { - if (var16 >= Skills.Skills_experienceTable[var7]) { - levels[var5] = var7 + 2; - } - } - - changedSkills[++changedSkillsCount - 1 & 31] = var5; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2190 == var1.serverPacket) { - class1.method10(class185.field2317); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2129 == var1.serverPacket) { - class1.method10(class185.field2321); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2130 == var1.serverPacket) { - class1.method10(class185.field2322); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2173 == var1.serverPacket) { - var16 = var3.method5722(); - var5 = var3.method5722(); - var44 = var3.readStringCp1252NullTerminated(); - if (var5 >= 1 && var5 <= 8) { - if (var44.equalsIgnoreCase("null")) { - var44 = null; - } - - playerMenuActions[var5 - 1] = var44; - playerOptionsPriorities[var5 - 1] = var16 == 0; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2176 == var1.serverPacket) { - var16 = var3.readInt(); - InterfaceParent var54 = (InterfaceParent)interfaceParents.get((long)var16); - if (var54 != null) { - class197.closeInterface(var54, true); - } - - if (field850 != null) { - Strings.method4120(field850); - field850 = null; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2170 == var1.serverPacket) { - var16 = var3.readUnsignedByte(); - if (var3.readUnsignedByte() == 0) { - grandExchangeOffers[var16] = new GrandExchangeOffer(); - var3.offset += 18; - } else { - --var3.offset; - grandExchangeOffers[var16] = new GrandExchangeOffer(var3, false); - } - - field915 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2188 == var1.serverPacket) { - for (var16 = 0; var16 < Varps.Varps_main.length; ++var16) { - if (Varps.Varps_temp[var16] != Varps.Varps_main[var16]) { - Varps.Varps_main[var16] = Varps.Varps_temp[var16]; - GrandExchangeOfferUnitPriceComparator.method124(var16); - field863[++field806 - 1 & 31] = var16; - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2118 == var1.serverPacket) { - var16 = var3.method5534(); - var5 = var3.method5543(); - var6 = class80.getWidget(var5); - if (var6.modelType != 2 || var16 != var6.modelId) { - var6.modelType = 2; - var6.modelId = var16; - Strings.method4120(var6); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2174 == var1.serverPacket) { - var16 = var3.method5542(); - var5 = var3.method5500(); - var17 = var3.method5535(); - var19 = class80.getWidget(var16); - if (var17 != var19.rawX || var5 != var19.rawY || var19.xAlignment != 0 || var19.yAlignment != 0) { - var19.rawX = var17; - var19.rawY = var5; - var19.xAlignment = 0; - var19.yAlignment = 0; - Strings.method4120(var19); - this.alignWidget(var19); - if (var19.type == 0) { - WorldMapSprite.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var16 >> 16], var19, false); - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2160 == var1.serverPacket) { - Tiles.loadRegions(false, var1.packetBuffer); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2152 == var1.serverPacket) { - var16 = var3.readUShortSmart(); - var47 = var3.readUnsignedByte() == 1; - var44 = ""; - boolean var45 = false; - if (var47) { - var44 = var3.readStringCp1252NullTerminated(); - if (ArchiveLoader.friendSystem.isIgnored(new Username(var44, class40.loginType))) { - var45 = true; - } - } - - String var42 = var3.readStringCp1252NullTerminated(); - if (!var45) { - ScriptEvent.addGameMessage(var16, var44, var42); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2119 == var1.serverPacket) { - var16 = var3.readUnsignedShort(); - var5 = var3.readInt(); - Varps.Varps_temp[var16] = var5; - if (Varps.Varps_main[var16] != var5) { - Varps.Varps_main[var16] = var5; - } - - GrandExchangeOfferUnitPriceComparator.method124(var16); - field863[++field806 - 1 & 31] = var16; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2140 == var1.serverPacket) { - ChatChannel.field1306 = var3.readUnsignedByteNegate(); - DefaultsGroup.field3819 = var3.readUnsignedByte(); - - for (var16 = DefaultsGroup.field3819; var16 < DefaultsGroup.field3819 + 8; ++var16) { - for (var5 = ChatChannel.field1306; var5 < ChatChannel.field1306 + 8; ++var5) { - if (groundItems[class42.plane][var16][var5] != null) { - groundItems[class42.plane][var16][var5] = null; - GrandExchangeOfferWorldComparator.updateItemPile(var16, var5); - } - } - } - - for (PendingSpawn var38 = (PendingSpawn)pendingSpawns.last(); var38 != null; var38 = (PendingSpawn)pendingSpawns.previous()) { - if (var38.x >= DefaultsGroup.field3819 && var38.x < DefaultsGroup.field3819 + 8 && var38.y >= ChatChannel.field1306 && var38.y < ChatChannel.field1306 + 8 && var38.plane == class42.plane) { - var38.hitpoints = 0; - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2184 == var1.serverPacket) { - var16 = var3.readInt(); - var5 = var3.readInt(); - var17 = SoundSystem.method2479(); - PacketBufferNode var56 = Archive.method4265(ClientPacket.field2236, packetWriter.isaacCipher); - var56.packetBuffer.method5521(var17); - var56.packetBuffer.writeByte(GameShell.fps); - var56.packetBuffer.writeIntME(var16); - var56.packetBuffer.writeIntLE(var5); - packetWriter.method2219(var56); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2199 == var1.serverPacket) { - var16 = var3.method5534(); - rootInterface = var16; - this.resizeRoot(false); - GrandExchangeOfferAgeComparator.method146(var16); - Canvas.runWidgetOnLoadListener(rootInterface); - - for (var5 = 0; var5 < 100; ++var5) { - field843[var5] = true; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2181 == var1.serverPacket) { - var16 = var3.method5543(); - var53 = class80.getWidget(var16); - var53.modelType = 3; - var53.modelId = localPlayer.appearance.getChatHeadId(); - Strings.method4120(var53); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2180 == var1.serverPacket) { - var37 = var3.readStringCp1252NullTerminated(); - var18 = AbstractFont.escapeBrackets(class1.method17(DefaultsGroup.method5898(var3))); - ScriptEvent.addGameMessage(6, var37, var18); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2153 == var1.serverPacket) { - ChatChannel.method2213(var3, var1.serverPacketLength); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2151 == var1.serverPacket) { - hintArrowType = var3.readUnsignedByte(); - if (hintArrowType == 1) { - hintArrowNpcIndex = var3.readUnsignedShort(); - } - - if (hintArrowType >= 2 && hintArrowType <= 6) { - if (hintArrowType == 2) { - hintArrowSubX = 4096; - hintArrowSubY = 64; - } - - if (hintArrowType == 3) { - hintArrowSubX = 0; - hintArrowSubY = 64; - } - - if (hintArrowType == 4) { - hintArrowSubX = 8192; - hintArrowSubY = 64; - } - - if (hintArrowType == 5) { - hintArrowSubX = 4096; - hintArrowSubY = 0; - } - - if (hintArrowType == 6) { - hintArrowSubX = 4096; - hintArrowSubY = 128; - } - - hintArrowType = 2; - hintArrowX = var3.readUnsignedShort(); - hintArrowY = var3.readUnsignedShort(); - hintArrowHeight = var3.readUnsignedByte() * 2; - } - - if (hintArrowType == 10) { - hintArrowPlayerIndex = var3.readUnsignedShort(); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2178 == var1.serverPacket) { - class1.method10(class185.field2323); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2193 == var1.serverPacket) { - for (var16 = 0; var16 < VarpDefinition.VarpDefinition_fileCount; ++var16) { - VarpDefinition var51 = GrandExchangeOfferWorldComparator.method61(var16); - if (var51 != null) { - Varps.Varps_temp[var16] = 0; - Varps.Varps_main[var16] = 0; - } - } - - class65.method1176(); - field806 += 32; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2171 == var1.serverPacket) { - var16 = var3.offset + var1.serverPacketLength; - var5 = var3.readUnsignedShort(); - var17 = var3.readUnsignedShort(); - if (var5 != rootInterface) { - rootInterface = var5; - this.resizeRoot(false); - GrandExchangeOfferAgeComparator.method146(rootInterface); - Canvas.runWidgetOnLoadListener(rootInterface); - - for (var7 = 0; var7 < 100; ++var7) { - field843[var7] = true; - } - } - - InterfaceParent var59; - for (; var17-- > 0; var59.field567 = true) { - var7 = var3.readInt(); - var20 = var3.readUnsignedShort(); - var9 = var3.readUnsignedByte(); - var59 = (InterfaceParent)interfaceParents.get((long)var7); - if (var59 != null && var20 != var59.group) { - class197.closeInterface(var59, true); - var59 = null; - } - - if (var59 == null) { - var59 = PendingSpawn.method1652(var7, var20, var9); - } - } - - for (var52 = (InterfaceParent)interfaceParents.first(); var52 != null; var52 = (InterfaceParent)interfaceParents.next()) { - if (var52.field567) { - var52.field567 = false; - } else { - class197.closeInterface(var52, true); - } - } - - widgetClickMasks = new NodeHashTable(512); - - while (var3.offset < var16) { - var7 = var3.readInt(); - var20 = var3.readUnsignedShort(); - var9 = var3.readUnsignedShort(); - var10 = var3.readInt(); - - for (int var29 = var20; var29 <= var9; ++var29) { - var12 = ((long)var7 << 32) + (long)var29; - widgetClickMasks.put(new IntegerNode(var10), var12); - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2185 == var1.serverPacket) { - var16 = var3.readInt(); - var5 = var3.readUnsignedShort(); - if (var16 < -70000) { - var5 += 32768; - } - - if (var16 >= 0) { - var6 = class80.getWidget(var16); - } else { - var6 = null; - } - - if (var6 != null) { - for (var7 = 0; var7 < var6.itemIds.length; ++var7) { - var6.itemIds[var7] = 0; - var6.itemQuantities[var7] = 0; - } - } - - GrandExchangeOfferAgeComparator.clearItemContainer(var5); - var7 = var3.readUnsignedShort(); - - for (var20 = 0; var20 < var7; ++var20) { - var9 = var3.readUnsignedShort(); - var10 = var3.readUnsignedByte(); - if (var10 == 255) { - var10 = var3.method5543(); - } - - if (var6 != null && var20 < var6.itemIds.length) { - var6.itemIds[var20] = var9; - var6.itemQuantities[var20] = var10; - } - - GrandExchangeOfferAgeComparator.itemContainerSetItem(var5, var20, var9 - 1, var10); - } - - if (var6 != null) { - Strings.method4120(var6); - } - - class65.method1176(); - field888[++field671 - 1 & 31] = var5 & 32767; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2182 == var1.serverPacket) { - destinationX = var3.readUnsignedByte(); - if (destinationX == 255) { - destinationX = 0; - } - - destinationY = var3.readUnsignedByte(); - if (destinationY == 255) { - destinationY = 0; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2186 == var1.serverPacket) { - class65.method1176(); - weight = var3.readShort(); - field844 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2195 == var1.serverPacket) { - field872 = var3.readUnsignedByteNegate(); - publicChatMode = var3.readUnsignedByteNegate(); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2134 == var1.serverPacket) { - var16 = var3.readInt(); - var18 = var3.readStringCp1252NullTerminated(); - var6 = class80.getWidget(var16); - if (!var18.equals(var6.text)) { - var6.text = var18; - Strings.method4120(var6); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2167 == var1.serverPacket) { - if (rootInterface != -1) { - WorldMapLabelSize.method175(rootInterface, 0); - } - - var1.serverPacket = null; - return true; - } - - boolean var50; - if (ServerPacket.field2131 == var1.serverPacket) { - var50 = var3.readBoolean(); - if (var50) { - if (PendingSpawn.field944 == null) { - PendingSpawn.field944 = new class237(); - } - } else { - PendingSpawn.field944 = null; - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2135 == var1.serverPacket) { - var50 = var3.readUnsignedByte() == 1; - if (var50) { - Buddy.field3632 = DirectByteArrayCopier.currentTimeMs() - var3.readLong(); - PendingSpawn.grandExchangeEvents = new GrandExchangeEvents(var3, true); - } else { - PendingSpawn.grandExchangeEvents = null; - } - - field851 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2139 == var1.serverPacket) { - var16 = var3.method5542(); - var5 = var3.method5518(); - var17 = var5 >> 10 & 31; - var7 = var5 >> 5 & 31; - var20 = var5 & 31; - var9 = (var7 << 11) + (var17 << 19) + (var20 << 3); - Widget var28 = class80.getWidget(var16); - if (var9 != var28.color) { - var28.color = var9; - Strings.method4120(var28); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2172 == var1.serverPacket) { - var3.offset += 28; - if (var3.checkCrc()) { - WorldMapSprite.method407(var3, var3.offset - 28); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2126 == var1.serverPacket) { - class1.method10(class185.field2316); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2197 == var1.serverPacket) { - var16 = var3.readInt(); - var5 = var3.readInt(); - InterfaceParent var41 = (InterfaceParent)interfaceParents.get((long)var5); - var52 = (InterfaceParent)interfaceParents.get((long)var16); - if (var52 != null) { - class197.closeInterface(var52, var41 == null || var41.group != var52.group); - } - - if (var41 != null) { - var41.remove(); - interfaceParents.put(var41, (long)var16); - } - - var8 = class80.getWidget(var5); - if (var8 != null) { - Strings.method4120(var8); - } - - var8 = class80.getWidget(var16); - if (var8 != null) { - Strings.method4120(var8); - WorldMapSprite.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var8.id >>> 16], var8, true); - } - - if (rootInterface != -1) { - WorldMapLabelSize.method175(rootInterface, 1); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2141 == var1.serverPacket) { - var37 = var3.readStringCp1252NullTerminated(); - var23 = (long)var3.readUnsignedShort(); - var25 = (long)var3.readMedium(); - PlayerType var30 = (PlayerType)SoundSystem.findEnumerated(UserComparator5.PlayerType_values(), var3.readUnsignedByte()); - long var31 = (var23 << 32) + var25; - boolean var33 = false; - - for (int var13 = 0; var13 < 100; ++var13) { - if (var31 == field922[var13]) { - var33 = true; - break; - } - } - - if (ArchiveLoader.friendSystem.isIgnored(new Username(var37, class40.loginType))) { - var33 = true; - } - - if (!var33 && field767 == 0) { - field922[field875] = var31; - field875 = (field875 + 1) % 100; - String var34 = AbstractFont.escapeBrackets(class1.method17(DefaultsGroup.method5898(var3))); - byte var14; - if (var30.isPrivileged) { - var14 = 7; - } else { - var14 = 3; - } - - if (var30.modIcon != -1) { - ScriptEvent.addGameMessage(var14, WorldMapSection1.getModIconString(var30.modIcon) + var37, var34); - } else { - ScriptEvent.addGameMessage(var14, var37, var34); - } - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2148 == var1.serverPacket) { - ScriptFrame.updateNpcs(false, var3); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2156 == var1.serverPacket) { - var16 = var3.method5518(); - var5 = var3.method5532(); - var17 = var3.method5542(); - var19 = class80.getWidget(var17); - var19.field2575 = var16 + (var5 << 16); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2132 == var1.serverPacket) { - ArchiveLoader.friendSystem.method1805(var3, var1.serverPacketLength); - field672 = cycleCntr; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2175 == var1.serverPacket) { - var16 = var3.method5543(); - var5 = var3.method5534(); - var6 = class80.getWidget(var16); - if (var6.modelType != 1 || var5 != var6.modelId) { - var6.modelType = 1; - var6.modelId = var5; - Strings.method4120(var6); - } - - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2159 == var1.serverPacket) { - var16 = var3.readInt(); - var5 = var3.readUnsignedShort(); - if (var16 < -70000) { - var5 += 32768; - } - - if (var16 >= 0) { - var6 = class80.getWidget(var16); - } else { - var6 = null; - } - - for (; var3.offset < var1.serverPacketLength; GrandExchangeOfferAgeComparator.itemContainerSetItem(var5, var7, var20 - 1, var9)) { - var7 = var3.readUShortSmart(); - var20 = var3.readUnsignedShort(); - var9 = 0; - if (var20 != 0) { - var9 = var3.readUnsignedByte(); - if (var9 == 255) { - var9 = var3.readInt(); - } - } - - if (var6 != null && var7 >= 0 && var7 < var6.itemIds.length) { - var6.itemIds[var7] = var20; - var6.itemQuantities[var7] = var9; - } - } - - if (var6 != null) { - Strings.method4120(var6); - } - - class65.method1176(); - field888[++field671 - 1 & 31] = var5 & 32767; - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2202 == var1.serverPacket) { - class14.method155(var3.readStringCp1252NullTerminated()); - var1.serverPacket = null; - return true; - } - - if (ServerPacket.field2169 == var1.serverPacket) { - class65.method1176(); - runEnergy = var3.readUnsignedByte(); - field844 = cycleCntr; - var1.serverPacket = null; - return true; - } - - HitSplatDefinition.sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id : -1) + "," + (var1.field1321 != null ? var1.field1321.id : -1) + "," + (var1.field1317 != null ? var1.field1317.id : -1) + "," + var1.serverPacketLength, (Throwable)null); - RouteStrategy.method3593(); - } catch (IOException var35) { - ScriptFrame.method1090(); - } catch (Exception var36) { - var18 = "" + (var1.serverPacket != null ? var1.serverPacket.id : -1) + "," + (var1.field1321 != null ? var1.field1321.id : -1) + "," + (var1.field1317 != null ? var1.field1317.id : -1) + "," + var1.serverPacketLength + "," + (localPlayer.pathX[0] + MusicPatchNode2.baseX * 64) + "," + (localPlayer.pathY[0] + class1.baseY * 64) + ","; - - for (var17 = 0; var17 < var1.serverPacketLength && var17 < 50; ++var17) { - var18 = var18 + var3.array[var17] + ","; - } - - HitSplatDefinition.sendStackTrace(var18, var36); - RouteStrategy.method3593(); + var1.serverPacket = var4[var5]; + var1.serverPacketLength = var1.serverPacket.length; } - return true; + if (var1.serverPacketLength == -1) { + if (!var2.isAvailable(1)) { + return false; + } + + var1.getSocket().read(var3.array, 0, 1); + var1.serverPacketLength = var3.array[0] & 255; + } + + if (var1.serverPacketLength == -2) { + if (!var2.isAvailable(2)) { + return false; + } + + var1.getSocket().read(var3.array, 0, 2); + var3.offset = 0; + var1.serverPacketLength = var3.readUnsignedShort(); + } + + if (!var2.isAvailable(var1.serverPacketLength)) { + return false; + } + + var3.offset = 0; + var2.read(var3.array, 0, var1.serverPacketLength); + var1.field1318 = 0; + timer.method5005(); + var1.field1317 = var1.field1321; + var1.field1321 = var1.field1309; + var1.field1309 = var1.serverPacket; + Widget var6; + int var16; + boolean var47; + if (ServerPacket.field2136 == var1.serverPacket) { + var16 = var3.readInt(); + var47 = var3.readUnsignedByte() == 1; + var6 = class80.getWidget(var16); + if (var47 != var6.isHidden) { + var6.isHidden = var47; + Strings.method4120(var6); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2115 == var1.serverPacket) { + minimapState = var3.readUnsignedByte(); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2200 == var1.serverPacket) { + var16 = var3.readUnsignedByte(); + SoundCache.method2491(var16); + var1.serverPacket = null; + return false; + } + + if (ServerPacket.field2128 == var1.serverPacket) { + class1.method10(class185.field2320); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2168 == var1.serverPacket) { + byte var60 = var3.method5694(); + var5 = var3.method5518(); + Varps.Varps_temp[var5] = var60; + if (Varps.Varps_main[var5] != var60) { + Varps.Varps_main[var5] = var60; + } + + GrandExchangeOfferUnitPriceComparator.method124(var5); + field863[++field806 - 1 & 31] = var5; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2179 == var1.serverPacket) { + DefaultsGroup.field3819 = var3.readUnsignedByteNegate(); + ChatChannel.field1306 = var3.method5525(); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2161 == var1.serverPacket) { + var16 = var3.method5532(); + GroundItemPile.method2764(var16); + field888[++field671 - 1 & 31] = var16 & 32767; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2149 == var1.serverPacket) { + var16 = var3.readUnsignedByte(); + class192.method3675(var16); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2137 == var1.serverPacket) { + class1.method10(class185.field2315); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2187 == var1.serverPacket) { + rebootTimer = var3.readUnsignedShort() * 30; + field844 = cycleCntr; + var1.serverPacket = null; + return true; + } + + int var7; + Widget var8; + if (ServerPacket.field2123 == var1.serverPacket) { + var16 = var3.method5534(); + var5 = var3.method5534(); + var17 = var3.method5534(); + var7 = var3.method5543(); + var8 = class80.getWidget(var7); + if (var16 != var8.modelAngleX || var17 != var8.modelAngleY || var5 != var8.modelZoom) { + var8.modelAngleX = var16; + var8.modelAngleY = var17; + var8.modelZoom = var5; + Strings.method4120(var8); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2120 == var1.serverPacket) { + ChatChannel.field1306 = var3.method5525(); + DefaultsGroup.field3819 = var3.readUnsignedByteNegate(); + + while (var3.offset < var1.serverPacketLength) { + var16 = var3.readUnsignedByte(); + class185 var58 = GrandExchangeEvents.method70()[var16]; + class1.method10(var58); + } + + var1.serverPacket = null; + return true; + } + + Widget var19; + if (ServerPacket.field2125 == var1.serverPacket) { + var16 = var3.readInt(); + var5 = var3.readUnsignedShort(); + if (var5 == 65535) { + var5 = -1; + } + + var17 = var3.method5543(); + var19 = class80.getWidget(var16); + ItemDefinition var43; + if (!var19.isIf3) { + if (var5 == -1) { + var19.modelType = 0; + var1.serverPacket = null; + return true; + } + + var43 = WorldMapArea.getItemDefinition(var5); + var19.modelType = 4; + var19.modelId = var5; + var19.modelAngleX = var43.xan2d; + var19.modelAngleY = var43.yan2d; + var19.modelZoom = var43.zoom2d * 100 / var17; + Strings.method4120(var19); + } else { + var19.itemId = var5; + var19.itemQuantity = var17; + var43 = WorldMapArea.getItemDefinition(var5); + var19.modelAngleX = var43.xan2d; + var19.modelAngleY = var43.yan2d; + var19.modelAngleZ = var43.zan2d; + var19.modelOffsetX = var43.offsetX2d; + var19.modelOffsetY = var43.offsetY2d; + var19.modelZoom = var43.zoom2d; + if (var43.isStackable == 1) { + var19.itemQuantityMode = 1; + } else { + var19.itemQuantityMode = 2; + } + + if (var19.field2619 > 0) { + var19.modelZoom = var19.modelZoom * 32 / var19.field2619; + } else if (var19.rawWidth > 0) { + var19.modelZoom = var19.modelZoom * 32 / var19.rawWidth; + } + + Strings.method4120(var19); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2158 == var1.serverPacket) { + var16 = var3.readUnsignedShort(); + var5 = var3.readUnsignedByte(); + var17 = var3.readUnsignedShort(); + class81.queueSoundEffect(var16, var5, var17); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2154 == var1.serverPacket) { + var16 = var3.readUnsignedByte(); + var5 = var3.readUnsignedByte(); + var17 = var3.readUnsignedByte(); + var7 = var3.readUnsignedByte(); + field886[var16] = true; + field901[var16] = var5; + field902[var16] = var17; + field903[var16] = var7; + field904[var16] = 0; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2166 == var1.serverPacket) { + Tiles.loadRegions(true, var1.packetBuffer); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2194 == var1.serverPacket) { + InterfaceParent.updatePlayers(var3, var1.serverPacketLength); + ObjectSound.method1827(); + var1.serverPacket = null; + return true; + } + + int var9; + int var10; + int var20; + if (ServerPacket.field2198 == var1.serverPacket) { + isCameraLocked = true; + HealthBarUpdate.field1017 = var3.readUnsignedByte() * 128; + class30.field259 = var3.readUnsignedByte() * 128; + WorldMapID.field268 = var3.readUnsignedShort(); + ScriptFrame.field526 = var3.readUnsignedByte(); + Tiles.field501 = var3.readUnsignedByte(); + if (Tiles.field501 >= 100) { + var16 = HealthBarUpdate.field1017 * 16384 + 64; + var5 = class30.field259 * 16384 + 64; + var17 = ScriptEvent.getTileHeight(var16, var5, class42.plane) - WorldMapID.field268; + var7 = var16 - PacketBuffer.cameraX; + var20 = var17 - class43.cameraY; + var9 = var5 - class1.cameraZ; + var10 = (int)Math.sqrt((double)(var9 * var9 + var7 * var7)); + GrandExchangeOfferNameComparator.cameraPitch = (int)(Math.atan2((double)var20, (double)var10) * 325.949D) & 2047; + Interpreter.cameraYaw = (int)(Math.atan2((double)var7, (double)var9) * -325.949D) & 2047; + if (GrandExchangeOfferNameComparator.cameraPitch < 128) { + GrandExchangeOfferNameComparator.cameraPitch = 128; + } + + if (GrandExchangeOfferNameComparator.cameraPitch > 383) { + GrandExchangeOfferNameComparator.cameraPitch = 383; + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2116 == var1.serverPacket) { + RouteStrategy.method3593(); + var1.serverPacket = null; + return false; + } + + if (ServerPacket.field2150 == var1.serverPacket) { + World var40 = new World(); + var40.host = var3.readStringCp1252NullTerminated(); + var40.id = var3.readUnsignedShort(); + var5 = var3.readInt(); + var40.properties = var5; + class96.updateGameState(45); + var2.close(); + var2 = null; + MusicPatchPcmStream.changeWorld(var40); + var1.serverPacket = null; + return false; + } + + if (ServerPacket.field2157 == var1.serverPacket) { + class1.method10(class185.field2318); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2164 == var1.serverPacket) { + class1.method10(class185.field2324); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2145 == var1.serverPacket) { + var16 = var3.method5543(); + var5 = var3.method5534(); + var6 = class80.getWidget(var16); + if (var6 != null && var6.type == 0) { + if (var5 > var6.scrollHeight - var6.height) { + var5 = var6.scrollHeight - var6.height; + } + + if (var5 < 0) { + var5 = 0; + } + + if (var5 != var6.scrollY) { + var6.scrollY = var5; + Strings.method4120(var6); + } + } + + var1.serverPacket = null; + return true; + } + + long var21; + if (ServerPacket.field2163 == var1.serverPacket) { + var16 = var3.method5541(); + var5 = var3.method5518(); + if (var5 == 65535) { + var5 = -1; + } + + var17 = var3.method5543(); + var7 = var3.readUnsignedShort(); + if (var7 == 65535) { + var7 = -1; + } + + for (var20 = var7; var20 <= var5; ++var20) { + var21 = (long)var20 + ((long)var17 << 32); + Node var46 = widgetClickMasks.get(var21); + if (var46 != null) { + var46.remove(); + } + + widgetClickMasks.put(new IntegerNode(var16), var21); + } + + var1.serverPacket = null; + return true; + } + + Widget var53; + if (ServerPacket.field2122 == var1.serverPacket) { + var16 = var3.method5542(); + var53 = class80.getWidget(var16); + + for (var17 = 0; var17 < var53.itemIds.length; ++var17) { + var53.itemIds[var17] = -1; + var53.itemIds[var17] = 0; + } + + Strings.method4120(var53); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2165 == var1.serverPacket) { + var16 = var3.readInt(); + if (var16 != field855) { + field855 = var16; + Actor.method1670(); + } + + var1.serverPacket = null; + return true; + } + + InterfaceParent var52; + if (ServerPacket.field2192 == var1.serverPacket) { + var16 = var3.method5722(); + var5 = var3.method5542(); + var17 = var3.method5534(); + var52 = (InterfaceParent)interfaceParents.get((long)var5); + if (var52 != null) { + class197.closeInterface(var52, var17 != var52.group); + } + + PendingSpawn.method1652(var5, var17, var16); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2183 == var1.serverPacket) { + class226.field3072 = NetSocket.method3530(var3.readUnsignedByte()); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2138 == var1.serverPacket) { + var16 = var3.method5534(); + if (var16 == 65535) { + var16 = -1; + } + + GrandExchangeOfferTotalQuantityComparator.method93(var16); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2155 == var1.serverPacket) { + var16 = var3.method5591(); + var5 = var3.method5518(); + if (var5 == 65535) { + var5 = -1; + } + + WorldMapLabelSize.method188(var5, var16); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2124 == var1.serverPacket) { + var16 = var3.readShort(); + var5 = var3.method5543(); + var6 = class80.getWidget(var5); + if (var16 != var6.sequenceId || var16 == -1) { + var6.sequenceId = var16; + var6.modelFrame = 0; + var6.modelFrameCycle = 0; + Strings.method4120(var6); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2147 == var1.serverPacket) { + ArchiveLoader.friendSystem.ignoreList.read(var3, var1.serverPacketLength); + class2.method28(); + field672 = cycleCntr; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2196 == var1.serverPacket) { + ScriptFrame.updateNpcs(true, var3); + var1.serverPacket = null; + return true; + } + + long var12; + long var23; + long var25; + String var37; + if (ServerPacket.field2142 == var1.serverPacket) { + var37 = var3.readStringCp1252NullTerminated(); + var23 = var3.readLong(); + var25 = (long)var3.readUnsignedShort(); + var21 = (long)var3.readMedium(); + PlayerType var11 = (PlayerType)SoundSystem.findEnumerated(UserComparator5.PlayerType_values(), var3.readUnsignedByte()); + var12 = (var25 << 32) + var21; + boolean var49 = false; + + for (int var15 = 0; var15 < 100; ++var15) { + if (field922[var15] == var12) { + var49 = true; + break; + } + } + + if (var11.isUser && ArchiveLoader.friendSystem.isIgnored(new Username(var37, class40.loginType))) { + var49 = true; + } + + if (!var49 && field767 == 0) { + field922[field875] = var12; + field875 = (field875 + 1) % 100; + String var27 = AbstractFont.escapeBrackets(class1.method17(DefaultsGroup.method5898(var3))); + if (var11.modIcon != -1) { + class14.addChatMessage(9, WorldMapSection1.getModIconString(var11.modIcon) + var37, var27, class215.method4023(var23)); + } else { + class14.addChatMessage(9, var37, var27, class215.method4023(var23)); + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2177 == var1.serverPacket) { + var37 = var3.readStringCp1252NullTerminated(); + Object[] var57 = new Object[var37.length() + 1]; + + for (var17 = var37.length() - 1; var17 >= 0; --var17) { + if (var37.charAt(var17) == 's') { + var57[var17 + 1] = var3.readStringCp1252NullTerminated(); + } else { + var57[var17 + 1] = new Integer(var3.readInt()); + } + } + + var57[0] = new Integer(var3.readInt()); + ScriptEvent var48 = new ScriptEvent(); + var48.args = var57; + LoginPacket.runScriptEvent(var48); + var1.serverPacket = null; + return true; + } + + String var44; + if (ServerPacket.field2133 == var1.serverPacket) { + byte[] var39 = new byte[var1.serverPacketLength]; + var3.method5443(var39, 0, var39.length); + Buffer var55 = new Buffer(var39); + var44 = var55.readStringCp1252NullTerminated(); + GrandExchangeOfferWorldComparator.openURL(var44, true, false); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2162 == var1.serverPacket) { + if (var1.serverPacketLength == 0) { + DevicePcmPlayerProvider.clanChat = null; + } else { + if (DevicePcmPlayerProvider.clanChat == null) { + DevicePcmPlayerProvider.clanChat = new ClanChat(class40.loginType, WorldMapSprite.client); + } + + DevicePcmPlayerProvider.clanChat.readUpdate(var3); + } + + class267.method4986(); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2143 == var1.serverPacket) { + for (var16 = 0; var16 < players.length; ++var16) { + if (players[var16] != null) { + players[var16].sequence = -1; + } + } + + for (var16 = 0; var16 < npcs.length; ++var16) { + if (npcs[var16] != null) { + npcs[var16].sequence = -1; + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2189 == var1.serverPacket) { + if (DevicePcmPlayerProvider.clanChat != null) { + DevicePcmPlayerProvider.clanChat.method5234(var3); + } + + class267.method4986(); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2121 == var1.serverPacket) { + isCameraLocked = true; + DevicePcmPlayerProvider.field412 = var3.readUnsignedByte() * 128; + class210.field2516 = var3.readUnsignedByte() * 128; + class190.field2345 = var3.readUnsignedShort(); + class83.field1166 = var3.readUnsignedByte(); + class96.field1327 = var3.readUnsignedByte(); + if (class96.field1327 >= 100) { + PacketBuffer.cameraX = DevicePcmPlayerProvider.field412 * 16384 + 64; + class1.cameraZ = class210.field2516 * 16384 + 64; + class43.cameraY = ScriptEvent.getTileHeight(PacketBuffer.cameraX, class1.cameraZ, class42.plane) - class190.field2345; + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2117 == var1.serverPacket) { + isCameraLocked = false; + + for (var16 = 0; var16 < 5; ++var16) { + field886[var16] = false; + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2127 == var1.serverPacket) { + class1.method10(class185.field2319); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2144 == var1.serverPacket) { + ArchiveLoader.friendSystem.method1760(); + field672 = cycleCntr; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2191 == var1.serverPacket) { + class65.method1176(); + var16 = var3.method5541(); + var5 = var3.readUnsignedByteNegate(); + var17 = var3.readUnsignedByte(); + experience[var5] = var16; + currentLevels[var5] = var17; + levels[var5] = 1; + + for (var7 = 0; var7 < 98; ++var7) { + if (var16 >= Skills.Skills_experienceTable[var7]) { + levels[var5] = var7 + 2; + } + } + + changedSkills[++changedSkillsCount - 1 & 31] = var5; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2190 == var1.serverPacket) { + class1.method10(class185.field2317); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2129 == var1.serverPacket) { + class1.method10(class185.field2321); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2130 == var1.serverPacket) { + class1.method10(class185.field2322); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2173 == var1.serverPacket) { + var16 = var3.method5722(); + var5 = var3.method5722(); + var44 = var3.readStringCp1252NullTerminated(); + if (var5 >= 1 && var5 <= 8) { + if (var44.equalsIgnoreCase("null")) { + var44 = null; + } + + playerMenuActions[var5 - 1] = var44; + playerOptionsPriorities[var5 - 1] = var16 == 0; + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2176 == var1.serverPacket) { + var16 = var3.readInt(); + InterfaceParent var54 = (InterfaceParent)interfaceParents.get((long)var16); + if (var54 != null) { + class197.closeInterface(var54, true); + } + + if (field850 != null) { + Strings.method4120(field850); + field850 = null; + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2170 == var1.serverPacket) { + var16 = var3.readUnsignedByte(); + if (var3.readUnsignedByte() == 0) { + grandExchangeOffers[var16] = new GrandExchangeOffer(); + var3.offset += 18; + } else { + --var3.offset; + grandExchangeOffers[var16] = new GrandExchangeOffer(var3, false); + } + + field915 = cycleCntr; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2188 == var1.serverPacket) { + for (var16 = 0; var16 < Varps.Varps_main.length; ++var16) { + if (Varps.Varps_temp[var16] != Varps.Varps_main[var16]) { + Varps.Varps_main[var16] = Varps.Varps_temp[var16]; + GrandExchangeOfferUnitPriceComparator.method124(var16); + field863[++field806 - 1 & 31] = var16; + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2118 == var1.serverPacket) { + var16 = var3.method5534(); + var5 = var3.method5543(); + var6 = class80.getWidget(var5); + if (var6.modelType != 2 || var16 != var6.modelId) { + var6.modelType = 2; + var6.modelId = var16; + Strings.method4120(var6); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2174 == var1.serverPacket) { + var16 = var3.method5542(); + var5 = var3.method5500(); + var17 = var3.method5535(); + var19 = class80.getWidget(var16); + if (var17 != var19.rawX || var5 != var19.rawY || var19.xAlignment != 0 || var19.yAlignment != 0) { + var19.rawX = var17; + var19.rawY = var5; + var19.xAlignment = 0; + var19.yAlignment = 0; + Strings.method4120(var19); + this.alignWidget(var19); + if (var19.type == 0) { + WorldMapSprite.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var16 >> 16], var19, false); + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2160 == var1.serverPacket) { + Tiles.loadRegions(false, var1.packetBuffer); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2152 == var1.serverPacket) { + var16 = var3.readUShortSmart(); + var47 = var3.readUnsignedByte() == 1; + var44 = ""; + boolean var45 = false; + if (var47) { + var44 = var3.readStringCp1252NullTerminated(); + if (ArchiveLoader.friendSystem.isIgnored(new Username(var44, class40.loginType))) { + var45 = true; + } + } + + String var42 = var3.readStringCp1252NullTerminated(); + if (!var45) { + ScriptEvent.addGameMessage(var16, var44, var42); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2119 == var1.serverPacket) { + var16 = var3.readUnsignedShort(); + var5 = var3.readInt(); + Varps.Varps_temp[var16] = var5; + if (Varps.Varps_main[var16] != var5) { + Varps.Varps_main[var16] = var5; + } + + GrandExchangeOfferUnitPriceComparator.method124(var16); + field863[++field806 - 1 & 31] = var16; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2140 == var1.serverPacket) { + ChatChannel.field1306 = var3.readUnsignedByteNegate(); + DefaultsGroup.field3819 = var3.readUnsignedByte(); + + for (var16 = DefaultsGroup.field3819; var16 < DefaultsGroup.field3819 + 8; ++var16) { + for (var5 = ChatChannel.field1306; var5 < ChatChannel.field1306 + 8; ++var5) { + if (groundItems[class42.plane][var16][var5] != null) { + groundItems[class42.plane][var16][var5] = null; + GrandExchangeOfferWorldComparator.updateItemPile(var16, var5); + } + } + } + + for (PendingSpawn var38 = (PendingSpawn)pendingSpawns.last(); var38 != null; var38 = (PendingSpawn)pendingSpawns.previous()) { + if (var38.x >= DefaultsGroup.field3819 && var38.x < DefaultsGroup.field3819 + 8 && var38.y >= ChatChannel.field1306 && var38.y < ChatChannel.field1306 + 8 && var38.plane == class42.plane) { + var38.hitpoints = 0; + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2184 == var1.serverPacket) { + var16 = var3.readInt(); + var5 = var3.readInt(); + var17 = SoundSystem.method2479(); + PacketBufferNode var56 = Archive.method4265(ClientPacket.field2236, packetWriter.isaacCipher); + var56.packetBuffer.method5521(var17); + var56.packetBuffer.writeByte(GameShell.fps); + var56.packetBuffer.writeIntME(var16); + var56.packetBuffer.writeIntLE(var5); + packetWriter.method2219(var56); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2199 == var1.serverPacket) { + var16 = var3.method5534(); + rootInterface = var16; + this.resizeRoot(false); + GrandExchangeOfferAgeComparator.method146(var16); + Canvas.runWidgetOnLoadListener(rootInterface); + + for (var5 = 0; var5 < 100; ++var5) { + field843[var5] = true; + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2181 == var1.serverPacket) { + var16 = var3.method5543(); + var53 = class80.getWidget(var16); + var53.modelType = 3; + var53.modelId = localPlayer.appearance.getChatHeadId(); + Strings.method4120(var53); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2180 == var1.serverPacket) { + var37 = var3.readStringCp1252NullTerminated(); + var18 = AbstractFont.escapeBrackets(class1.method17(DefaultsGroup.method5898(var3))); + ScriptEvent.addGameMessage(6, var37, var18); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2153 == var1.serverPacket) { + ChatChannel.method2213(var3, var1.serverPacketLength); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2151 == var1.serverPacket) { + hintArrowType = var3.readUnsignedByte(); + if (hintArrowType == 1) { + hintArrowNpcIndex = var3.readUnsignedShort(); + } + + if (hintArrowType >= 2 && hintArrowType <= 6) { + if (hintArrowType == 2) { + hintArrowSubX = 4096; + hintArrowSubY = 64; + } + + if (hintArrowType == 3) { + hintArrowSubX = 0; + hintArrowSubY = 64; + } + + if (hintArrowType == 4) { + hintArrowSubX = 8192; + hintArrowSubY = 64; + } + + if (hintArrowType == 5) { + hintArrowSubX = 4096; + hintArrowSubY = 0; + } + + if (hintArrowType == 6) { + hintArrowSubX = 4096; + hintArrowSubY = 128; + } + + hintArrowType = 2; + hintArrowX = var3.readUnsignedShort(); + hintArrowY = var3.readUnsignedShort(); + hintArrowHeight = var3.readUnsignedByte() * 2; + } + + if (hintArrowType == 10) { + hintArrowPlayerIndex = var3.readUnsignedShort(); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2178 == var1.serverPacket) { + class1.method10(class185.field2323); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2193 == var1.serverPacket) { + for (var16 = 0; var16 < VarpDefinition.VarpDefinition_fileCount; ++var16) { + VarpDefinition var51 = GrandExchangeOfferWorldComparator.method61(var16); + if (var51 != null) { + Varps.Varps_temp[var16] = 0; + Varps.Varps_main[var16] = 0; + } + } + + class65.method1176(); + field806 += 32; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2171 == var1.serverPacket) { + var16 = var3.offset + var1.serverPacketLength; + var5 = var3.readUnsignedShort(); + var17 = var3.readUnsignedShort(); + if (var5 != rootInterface) { + rootInterface = var5; + this.resizeRoot(false); + GrandExchangeOfferAgeComparator.method146(rootInterface); + Canvas.runWidgetOnLoadListener(rootInterface); + + for (var7 = 0; var7 < 100; ++var7) { + field843[var7] = true; + } + } + + InterfaceParent var59; + for (; var17-- > 0; var59.field567 = true) { + var7 = var3.readInt(); + var20 = var3.readUnsignedShort(); + var9 = var3.readUnsignedByte(); + var59 = (InterfaceParent)interfaceParents.get((long)var7); + if (var59 != null && var20 != var59.group) { + class197.closeInterface(var59, true); + var59 = null; + } + + if (var59 == null) { + var59 = PendingSpawn.method1652(var7, var20, var9); + } + } + + for (var52 = (InterfaceParent)interfaceParents.first(); var52 != null; var52 = (InterfaceParent)interfaceParents.next()) { + if (var52.field567) { + var52.field567 = false; + } else { + class197.closeInterface(var52, true); + } + } + + widgetClickMasks = new NodeHashTable(512); + + while (var3.offset < var16) { + var7 = var3.readInt(); + var20 = var3.readUnsignedShort(); + var9 = var3.readUnsignedShort(); + var10 = var3.readInt(); + + for (int var29 = var20; var29 <= var9; ++var29) { + var12 = ((long)var7 << 32) + (long)var29; + widgetClickMasks.put(new IntegerNode(var10), var12); + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2185 == var1.serverPacket) { + var16 = var3.readInt(); + var5 = var3.readUnsignedShort(); + if (var16 < -70000) { + var5 += 32768; + } + + if (var16 >= 0) { + var6 = class80.getWidget(var16); + } else { + var6 = null; + } + + if (var6 != null) { + for (var7 = 0; var7 < var6.itemIds.length; ++var7) { + var6.itemIds[var7] = 0; + var6.itemQuantities[var7] = 0; + } + } + + GrandExchangeOfferAgeComparator.clearItemContainer(var5); + var7 = var3.readUnsignedShort(); + + for (var20 = 0; var20 < var7; ++var20) { + var9 = var3.readUnsignedShort(); + var10 = var3.readUnsignedByte(); + if (var10 == 255) { + var10 = var3.method5543(); + } + + if (var6 != null && var20 < var6.itemIds.length) { + var6.itemIds[var20] = var9; + var6.itemQuantities[var20] = var10; + } + + GrandExchangeOfferAgeComparator.itemContainerSetItem(var5, var20, var9 - 1, var10); + } + + if (var6 != null) { + Strings.method4120(var6); + } + + class65.method1176(); + field888[++field671 - 1 & 31] = var5 & 32767; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2182 == var1.serverPacket) { + destinationX = var3.readUnsignedByte(); + if (destinationX == 255) { + destinationX = 0; + } + + destinationY = var3.readUnsignedByte(); + if (destinationY == 255) { + destinationY = 0; + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2186 == var1.serverPacket) { + class65.method1176(); + weight = var3.readShort(); + field844 = cycleCntr; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2195 == var1.serverPacket) { + field872 = var3.readUnsignedByteNegate(); + publicChatMode = var3.readUnsignedByteNegate(); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2134 == var1.serverPacket) { + var16 = var3.readInt(); + var18 = var3.readStringCp1252NullTerminated(); + var6 = class80.getWidget(var16); + if (!var18.equals(var6.text)) { + var6.text = var18; + Strings.method4120(var6); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2167 == var1.serverPacket) { + if (rootInterface != -1) { + WorldMapLabelSize.method175(rootInterface, 0); + } + + var1.serverPacket = null; + return true; + } + + boolean var50; + if (ServerPacket.field2131 == var1.serverPacket) { + var50 = var3.readBoolean(); + if (var50) { + if (PendingSpawn.field944 == null) { + PendingSpawn.field944 = new class237(); + } + } else { + PendingSpawn.field944 = null; + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2135 == var1.serverPacket) { + var50 = var3.readUnsignedByte() == 1; + if (var50) { + Buddy.field3632 = DirectByteArrayCopier.currentTimeMs() - var3.readLong(); + PendingSpawn.grandExchangeEvents = new GrandExchangeEvents(var3, true); + } else { + PendingSpawn.grandExchangeEvents = null; + } + + field851 = cycleCntr; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2139 == var1.serverPacket) { + var16 = var3.method5542(); + var5 = var3.method5518(); + var17 = var5 >> 10 & 31; + var7 = var5 >> 5 & 31; + var20 = var5 & 31; + var9 = (var7 << 11) + (var17 << 19) + (var20 << 3); + Widget var28 = class80.getWidget(var16); + if (var9 != var28.color) { + var28.color = var9; + Strings.method4120(var28); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2172 == var1.serverPacket) { + var3.offset += 28; + if (var3.checkCrc()) { + WorldMapSprite.method407(var3, var3.offset - 28); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2126 == var1.serverPacket) { + class1.method10(class185.field2316); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2197 == var1.serverPacket) { + var16 = var3.readInt(); + var5 = var3.readInt(); + InterfaceParent var41 = (InterfaceParent)interfaceParents.get((long)var5); + var52 = (InterfaceParent)interfaceParents.get((long)var16); + if (var52 != null) { + class197.closeInterface(var52, var41 == null || var41.group != var52.group); + } + + if (var41 != null) { + var41.remove(); + interfaceParents.put(var41, (long)var16); + } + + var8 = class80.getWidget(var5); + if (var8 != null) { + Strings.method4120(var8); + } + + var8 = class80.getWidget(var16); + if (var8 != null) { + Strings.method4120(var8); + WorldMapSprite.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var8.id >>> 16], var8, true); + } + + if (rootInterface != -1) { + WorldMapLabelSize.method175(rootInterface, 1); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2141 == var1.serverPacket) { + var37 = var3.readStringCp1252NullTerminated(); + var23 = (long)var3.readUnsignedShort(); + var25 = (long)var3.readMedium(); + PlayerType var30 = (PlayerType)SoundSystem.findEnumerated(UserComparator5.PlayerType_values(), var3.readUnsignedByte()); + long var31 = (var23 << 32) + var25; + boolean var33 = false; + + for (int var13 = 0; var13 < 100; ++var13) { + if (var31 == field922[var13]) { + var33 = true; + break; + } + } + + if (ArchiveLoader.friendSystem.isIgnored(new Username(var37, class40.loginType))) { + var33 = true; + } + + if (!var33 && field767 == 0) { + field922[field875] = var31; + field875 = (field875 + 1) % 100; + String var34 = AbstractFont.escapeBrackets(class1.method17(DefaultsGroup.method5898(var3))); + byte var14; + if (var30.isPrivileged) { + var14 = 7; + } else { + var14 = 3; + } + + if (var30.modIcon != -1) { + ScriptEvent.addGameMessage(var14, WorldMapSection1.getModIconString(var30.modIcon) + var37, var34); + } else { + ScriptEvent.addGameMessage(var14, var37, var34); + } + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2148 == var1.serverPacket) { + ScriptFrame.updateNpcs(false, var3); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2156 == var1.serverPacket) { + var16 = var3.method5518(); + var5 = var3.method5532(); + var17 = var3.method5542(); + var19 = class80.getWidget(var17); + var19.field2575 = var16 + (var5 << 16); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2132 == var1.serverPacket) { + ArchiveLoader.friendSystem.method1805(var3, var1.serverPacketLength); + field672 = cycleCntr; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2175 == var1.serverPacket) { + var16 = var3.method5543(); + var5 = var3.method5534(); + var6 = class80.getWidget(var16); + if (var6.modelType != 1 || var5 != var6.modelId) { + var6.modelType = 1; + var6.modelId = var5; + Strings.method4120(var6); + } + + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2159 == var1.serverPacket) { + var16 = var3.readInt(); + var5 = var3.readUnsignedShort(); + if (var16 < -70000) { + var5 += 32768; + } + + if (var16 >= 0) { + var6 = class80.getWidget(var16); + } else { + var6 = null; + } + + for (; var3.offset < var1.serverPacketLength; GrandExchangeOfferAgeComparator.itemContainerSetItem(var5, var7, var20 - 1, var9)) { + var7 = var3.readUShortSmart(); + var20 = var3.readUnsignedShort(); + var9 = 0; + if (var20 != 0) { + var9 = var3.readUnsignedByte(); + if (var9 == 255) { + var9 = var3.readInt(); + } + } + + if (var6 != null && var7 >= 0 && var7 < var6.itemIds.length) { + var6.itemIds[var7] = var20; + var6.itemQuantities[var7] = var9; + } + } + + if (var6 != null) { + Strings.method4120(var6); + } + + class65.method1176(); + field888[++field671 - 1 & 31] = var5 & 32767; + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2202 == var1.serverPacket) { + class14.method155(var3.readStringCp1252NullTerminated()); + var1.serverPacket = null; + return true; + } + + if (ServerPacket.field2169 == var1.serverPacket) { + class65.method1176(); + runEnergy = var3.readUnsignedByte(); + field844 = cycleCntr; + var1.serverPacket = null; + return true; + } + + HitSplatDefinition.sendStackTrace("" + (var1.serverPacket != null ? var1.serverPacket.id : -1) + "," + (var1.field1321 != null ? var1.field1321.id : -1) + "," + (var1.field1317 != null ? var1.field1317.id : -1) + "," + var1.serverPacketLength, (Throwable)null); + RouteStrategy.method3593(); + } catch (IOException var35) { + ScriptFrame.method1090(); + } catch (Exception var36) { + var18 = "" + (var1.serverPacket != null ? var1.serverPacket.id : -1) + "," + (var1.field1321 != null ? var1.field1321.id : -1) + "," + (var1.field1317 != null ? var1.field1317.id : -1) + "," + var1.serverPacketLength + "," + (localPlayer.pathX[0] + MusicPatchNode2.baseX * 64) + "," + (localPlayer.pathY[0] + class1.baseY * 64) + ","; + + for (var17 = 0; var17 < var1.serverPacketLength && var17 < 50; ++var17) { + var18 = var18 + var3.array[var17] + ","; + } + + HitSplatDefinition.sendStackTrace(var18, var36); + RouteStrategy.method3593(); } + + return true; } @ObfuscatedName("hy") @@ -5313,9 +5312,8 @@ public final class Client extends GameShell implements Usernamed { Widget var2 = class80.getWidget(var0); if (var1 == -1) { return var2; - } else { - return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; } + return var2 != null && var2.children != null && var1 < var2.children.length ? var2.children[var1] : null; } @ObfuscatedName("e") diff --git a/runescape-client/src/main/java/ClientPreferences.java b/runescape-client/src/main/java/ClientPreferences.java index 58ad6c0134..079e2eb302 100644 --- a/runescape-client/src/main/java/ClientPreferences.java +++ b/runescape-client/src/main/java/ClientPreferences.java @@ -229,7 +229,8 @@ public class ClientPreferences { if (var0 == ScriptOpcodes.CHAT_GETFILTER_PUBLIC) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.publicChatMode; return 1; - } else if (var0 == ScriptOpcodes.CHAT_SETFILTER) { + } + if (var0 == ScriptOpcodes.CHAT_SETFILTER) { HealthBarUpdate.Interpreter_intStackSize -= 3; Client.publicChatMode = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; class226.field3072 = NetSocket.method3530(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]); @@ -244,256 +245,264 @@ public class ClientPreferences { var18.packetBuffer.writeByte(Client.field872); Client.packetWriter.method2219(var18); return 1; - } else { - String var3; - int var4; - if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { - var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - HealthBarUpdate.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - int var5 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - PacketBufferNode var6 = Archive.method4265(ClientPacket.field2205, Client.packetWriter.isaacCipher); - var6.packetBuffer.writeByte(Huffman.stringCp1252NullTerminatedByteSize(var3) + 2); - var6.packetBuffer.writeStringCp1252NullTerminated(var3); - var6.packetBuffer.writeByte(var4 - 1); - var6.packetBuffer.writeByte(var5); - Client.packetWriter.method2219(var6); - return 1; + } + String var3; + int var4; + if (var0 == ScriptOpcodes.CHAT_SENDABUSEREPORT) { + var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; + HealthBarUpdate.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; + int var5 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; + PacketBufferNode var6 = Archive.method4265(ClientPacket.field2205, Client.packetWriter.isaacCipher); + var6.packetBuffer.writeByte(Huffman.stringCp1252NullTerminatedByteSize(var3) + 2); + var6.packetBuffer.writeStringCp1252NullTerminated(var3); + var6.packetBuffer.writeByte(var4 - 1); + var6.packetBuffer.writeByte(var5); + Client.packetWriter.method2219(var6); + return 1; + } + int var10; + if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { + HealthBarUpdate.Interpreter_intStackSize -= 2; + var10 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; + Message var15 = GroundItem.method2049(var10, var4); + if (var15 != null) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var15.count; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var15.cycle; + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var15.sender != null ? var15.sender : ""; + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var15.prefix != null ? var15.prefix : ""; + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var15.text != null ? var15.text : ""; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var15.isFromFriend() ? 1 : (var15.isFromIgnored() ? 2 : 0); } else { - int var10; - if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYTYPEANDLINE) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var10 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - Message var15 = GroundItem.method2049(var10, var4); - if (var15 != null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var15.count; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var15.cycle; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var15.sender != null ? var15.sender : ""; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var15.prefix != null ? var15.prefix : ""; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var15.text != null ? var15.text : ""; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var15.isFromFriend() ? 1 : (var15.isFromIgnored() ? 2 : 0); - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - } + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + } - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { - var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Message var16 = WorldMapIcon_1.method297(var10); - if (var16 != null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var16.type; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var16.cycle; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var16.sender != null ? var16.sender : ""; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var16.prefix != null ? var16.prefix : ""; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var16.text != null ? var16.text : ""; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var16.isFromFriend() ? 1 : (var16.isFromIgnored() ? 2 : 0); - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - } + return 1; + } + if (var0 == ScriptOpcodes.CHAT_GETHISTORY_BYUID) { + var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + Message var16 = WorldMapIcon_1.method297(var10); + if (var16 != null) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var16.type; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var16.cycle; + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var16.sender != null ? var16.sender : ""; + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var16.prefix != null ? var16.prefix : ""; + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var16.text != null ? var16.text : ""; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var16.isFromFriend() ? 1 : (var16.isFromIgnored() ? 2 : 0); + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + } - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { - if (class226.field3072 == null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = class226.field3072.field3815; - } + return 1; + } + if (var0 == ScriptOpcodes.CHAT_GETFILTER_PRIVATE) { + if (class226.field3072 == null) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = class226.field3072.field3815; + } - return 1; - } else if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { - var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - String var14 = var3.toLowerCase(); - byte var17 = 0; - if (var14.startsWith("yellow:")) { - var17 = 0; - var3 = var3.substring("yellow:".length()); - } else if (var14.startsWith("red:")) { - var17 = 1; - var3 = var3.substring("red:".length()); - } else if (var14.startsWith("green:")) { - var17 = 2; - var3 = var3.substring("green:".length()); - } else if (var14.startsWith("cyan:")) { - var17 = 3; - var3 = var3.substring("cyan:".length()); - } else if (var14.startsWith("purple:")) { - var17 = 4; - var3 = var3.substring("purple:".length()); - } else if (var14.startsWith("white:")) { - var17 = 5; - var3 = var3.substring("white:".length()); - } else if (var14.startsWith("flash1:")) { - var17 = 6; - var3 = var3.substring("flash1:".length()); - } else if (var14.startsWith("flash2:")) { - var17 = 7; - var3 = var3.substring("flash2:".length()); - } else if (var14.startsWith("flash3:")) { - var17 = 8; - var3 = var3.substring("flash3:".length()); - } else if (var14.startsWith("glow1:")) { - var17 = 9; - var3 = var3.substring("glow1:".length()); - } else if (var14.startsWith("glow2:")) { - var17 = 10; - var3 = var3.substring("glow2:".length()); - } else if (var14.startsWith("glow3:")) { - var17 = 11; - var3 = var3.substring("glow3:".length()); - } else if (ScriptFrame.field528 != class190.field2348) { - if (var14.startsWith("yellow:")) { - var17 = 0; - var3 = var3.substring("yellow:".length()); - } else if (var14.startsWith("red:")) { - var17 = 1; - var3 = var3.substring("red:".length()); - } else if (var14.startsWith("green:")) { - var17 = 2; - var3 = var3.substring("green:".length()); - } else if (var14.startsWith("cyan:")) { - var17 = 3; - var3 = var3.substring("cyan:".length()); - } else if (var14.startsWith("purple:")) { - var17 = 4; - var3 = var3.substring("purple:".length()); - } else if (var14.startsWith("white:")) { - var17 = 5; - var3 = var3.substring("white:".length()); - } else if (var14.startsWith("flash1:")) { - var17 = 6; - var3 = var3.substring("flash1:".length()); - } else if (var14.startsWith("flash2:")) { - var17 = 7; - var3 = var3.substring("flash2:".length()); - } else if (var14.startsWith("flash3:")) { - var17 = 8; - var3 = var3.substring("flash3:".length()); - } else if (var14.startsWith("glow1:")) { - var17 = 9; - var3 = var3.substring("glow1:".length()); - } else if (var14.startsWith("glow2:")) { - var17 = 10; - var3 = var3.substring("glow2:".length()); - } else if (var14.startsWith("glow3:")) { - var17 = 11; - var3 = var3.substring("glow3:".length()); - } - } - - var14 = var3.toLowerCase(); - byte var7 = 0; - if (var14.startsWith("wave:")) { - var7 = 1; - var3 = var3.substring("wave:".length()); - } else if (var14.startsWith("wave2:")) { - var7 = 2; - var3 = var3.substring("wave2:".length()); - } else if (var14.startsWith("shake:")) { - var7 = 3; - var3 = var3.substring("shake:".length()); - } else if (var14.startsWith("scroll:")) { - var7 = 4; - var3 = var3.substring("scroll:".length()); - } else if (var14.startsWith("slide:")) { - var7 = 5; - var3 = var3.substring("slide:".length()); - } else if (class190.field2348 != ScriptFrame.field528) { - if (var14.startsWith("wave:")) { - var7 = 1; - var3 = var3.substring("wave:".length()); - } else if (var14.startsWith("wave2:")) { - var7 = 2; - var3 = var3.substring("wave2:".length()); - } else if (var14.startsWith("shake:")) { - var7 = 3; - var3 = var3.substring("shake:".length()); - } else if (var14.startsWith("scroll:")) { - var7 = 4; - var3 = var3.substring("scroll:".length()); - } else if (var14.startsWith("slide:")) { - var7 = 5; - var3 = var3.substring("slide:".length()); - } - } - - PacketBufferNode var8 = Archive.method4265(ClientPacket.field2258, Client.packetWriter.isaacCipher); - var8.packetBuffer.writeByte(0); - int var9 = var8.packetBuffer.offset; - var8.packetBuffer.writeByte(var4); - var8.packetBuffer.writeByte(var17); - var8.packetBuffer.writeByte(var7); - Skeleton.method3063(var8.packetBuffer, var3); - var8.packetBuffer.writeLengthByte(var8.packetBuffer.offset - var9); - Client.packetWriter.method2219(var8); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { - Skills.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize]; - String var12 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize + 1]; - PacketBufferNode var11 = Archive.method4265(ClientPacket.field2228, Client.packetWriter.isaacCipher); - var11.packetBuffer.writeShort(0); - int var13 = var11.packetBuffer.offset; - var11.packetBuffer.writeStringCp1252NullTerminated(var3); - Skeleton.method3063(var11.packetBuffer, var12); - var11.packetBuffer.writeLengthShort(var11.packetBuffer.offset - var13); - Client.packetWriter.method2219(var11); - return 1; - } else if (var0 != ScriptOpcodes.CHAT_PLAYERNAME) { - if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.field872; - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { - var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = LoginScreenAnimation.method1744(var10); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { - var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = MusicPatchNode2.method3686(var10); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { - var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = class192.method3669(var10); - return 1; - } else if (var0 == ScriptOpcodes.DOCHEAT) { - var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - UserComparator1.doCheat(var3); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { - Client.field762 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize].toLowerCase().trim(); - return 1; - } else if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = Client.field762; - return 1; - } else if (var0 == 5023) { - var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - System.out.println(var3); - return 1; - } else { - return 2; - } - } else { - if (Client.localPlayer != null && Client.localPlayer.username != null) { - var3 = Client.localPlayer.username.getName(); - } else { - var3 = ""; - } - - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3; - return 1; + return 1; + } + if (var0 == ScriptOpcodes.CHAT_SENDPUBLIC) { + var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + String var14 = var3.toLowerCase(); + byte var17 = 0; + if (var14.startsWith("yellow:")) { + var17 = 0; + var3 = var3.substring("yellow:".length()); + } else if (var14.startsWith("red:")) { + var17 = 1; + var3 = var3.substring("red:".length()); + } else if (var14.startsWith("green:")) { + var17 = 2; + var3 = var3.substring("green:".length()); + } else if (var14.startsWith("cyan:")) { + var17 = 3; + var3 = var3.substring("cyan:".length()); + } else if (var14.startsWith("purple:")) { + var17 = 4; + var3 = var3.substring("purple:".length()); + } else if (var14.startsWith("white:")) { + var17 = 5; + var3 = var3.substring("white:".length()); + } else if (var14.startsWith("flash1:")) { + var17 = 6; + var3 = var3.substring("flash1:".length()); + } else if (var14.startsWith("flash2:")) { + var17 = 7; + var3 = var3.substring("flash2:".length()); + } else if (var14.startsWith("flash3:")) { + var17 = 8; + var3 = var3.substring("flash3:".length()); + } else if (var14.startsWith("glow1:")) { + var17 = 9; + var3 = var3.substring("glow1:".length()); + } else if (var14.startsWith("glow2:")) { + var17 = 10; + var3 = var3.substring("glow2:".length()); + } else if (var14.startsWith("glow3:")) { + var17 = 11; + var3 = var3.substring("glow3:".length()); + } else if (ScriptFrame.field528 != class190.field2348) { + if (var14.startsWith("yellow:")) { + var17 = 0; + var3 = var3.substring("yellow:".length()); + } else if (var14.startsWith("red:")) { + var17 = 1; + var3 = var3.substring("red:".length()); + } else if (var14.startsWith("green:")) { + var17 = 2; + var3 = var3.substring("green:".length()); + } else if (var14.startsWith("cyan:")) { + var17 = 3; + var3 = var3.substring("cyan:".length()); + } else if (var14.startsWith("purple:")) { + var17 = 4; + var3 = var3.substring("purple:".length()); + } else if (var14.startsWith("white:")) { + var17 = 5; + var3 = var3.substring("white:".length()); + } else if (var14.startsWith("flash1:")) { + var17 = 6; + var3 = var3.substring("flash1:".length()); + } else if (var14.startsWith("flash2:")) { + var17 = 7; + var3 = var3.substring("flash2:".length()); + } else if (var14.startsWith("flash3:")) { + var17 = 8; + var3 = var3.substring("flash3:".length()); + } else if (var14.startsWith("glow1:")) { + var17 = 9; + var3 = var3.substring("glow1:".length()); + } else if (var14.startsWith("glow2:")) { + var17 = 10; + var3 = var3.substring("glow2:".length()); + } else if (var14.startsWith("glow3:")) { + var17 = 11; + var3 = var3.substring("glow3:".length()); } } + + var14 = var3.toLowerCase(); + byte var7 = 0; + if (var14.startsWith("wave:")) { + var7 = 1; + var3 = var3.substring("wave:".length()); + } else if (var14.startsWith("wave2:")) { + var7 = 2; + var3 = var3.substring("wave2:".length()); + } else if (var14.startsWith("shake:")) { + var7 = 3; + var3 = var3.substring("shake:".length()); + } else if (var14.startsWith("scroll:")) { + var7 = 4; + var3 = var3.substring("scroll:".length()); + } else if (var14.startsWith("slide:")) { + var7 = 5; + var3 = var3.substring("slide:".length()); + } else if (class190.field2348 != ScriptFrame.field528) { + if (var14.startsWith("wave:")) { + var7 = 1; + var3 = var3.substring("wave:".length()); + } else if (var14.startsWith("wave2:")) { + var7 = 2; + var3 = var3.substring("wave2:".length()); + } else if (var14.startsWith("shake:")) { + var7 = 3; + var3 = var3.substring("shake:".length()); + } else if (var14.startsWith("scroll:")) { + var7 = 4; + var3 = var3.substring("scroll:".length()); + } else if (var14.startsWith("slide:")) { + var7 = 5; + var3 = var3.substring("slide:".length()); + } + } + + PacketBufferNode var8 = Archive.method4265(ClientPacket.field2258, Client.packetWriter.isaacCipher); + var8.packetBuffer.writeByte(0); + int var9 = var8.packetBuffer.offset; + var8.packetBuffer.writeByte(var4); + var8.packetBuffer.writeByte(var17); + var8.packetBuffer.writeByte(var7); + Skeleton.method3063(var8.packetBuffer, var3); + var8.packetBuffer.writeLengthByte(var8.packetBuffer.offset - var9); + Client.packetWriter.method2219(var8); + return 1; } + if (var0 == ScriptOpcodes.CHAT_SENDPRIVATE) { + Skills.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize]; + String var12 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize + 1]; + PacketBufferNode var11 = Archive.method4265(ClientPacket.field2228, Client.packetWriter.isaacCipher); + var11.packetBuffer.writeShort(0); + int var13 = var11.packetBuffer.offset; + var11.packetBuffer.writeStringCp1252NullTerminated(var3); + Skeleton.method3063(var11.packetBuffer, var12); + var11.packetBuffer.writeLengthShort(var11.packetBuffer.offset - var13); + Client.packetWriter.method2219(var11); + return 1; + } + if (var0 == ScriptOpcodes.CHAT_PLAYERNAME) { + if (Client.localPlayer != null && Client.localPlayer.username != null) { + var3 = Client.localPlayer.username.getName(); + } else { + var3 = ""; + } + + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3; + return 1; + } + if (var0 == ScriptOpcodes.CHAT_GETFILTER_TRADE) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.field872; + return 1; + } + if (var0 == ScriptOpcodes.CHAT_GETHISTORYLENGTH) { + var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = LoginScreenAnimation.method1744(var10); + return 1; + } + if (var0 == ScriptOpcodes.CHAT_GETNEXTUID) { + var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = MusicPatchNode2.method3686(var10); + return 1; + } + if (var0 == ScriptOpcodes.CHAT_GETPREVUID) { + var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = class192.method3669(var10); + return 1; + } + if (var0 == ScriptOpcodes.DOCHEAT) { + var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; + UserComparator1.doCheat(var3); + return 1; + } + if (var0 == ScriptOpcodes.CHAT_SETMESSAGEFILTER) { + Client.field762 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize].toLowerCase().trim(); + return 1; + } + if (var0 == ScriptOpcodes.CHAT_GETMESSAGEFILTER) { + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = Client.field762; + return 1; + } + if (var0 == 5023) { + var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; + System.out.println(var3); + return 1; + } + return 2; } } diff --git a/runescape-client/src/main/java/Coord.java b/runescape-client/src/main/java/Coord.java index af93ca4c6b..67e0cb4aea 100644 --- a/runescape-client/src/main/java/Coord.java +++ b/runescape-client/src/main/java/Coord.java @@ -77,11 +77,11 @@ public class Coord { boolean equalsCoord(Coord var1) { if (this.plane != var1.plane) { return false; - } else if (this.x != var1.x) { - return false; - } else { - return this.y == var1.y; } + if (this.x != var1.x) { + return false; + } + return this.y == var1.y; } @ObfuscatedName("e") @@ -101,9 +101,8 @@ public class Coord { public boolean equals(Object var1) { if (this == var1) { return true; - } else { - return !(var1 instanceof Coord) ? false : this.equalsCoord((Coord)var1); } + return !(var1 instanceof Coord) ? false : this.equalsCoord((Coord)var1); } public String toString() { diff --git a/runescape-client/src/main/java/Decimator.java b/runescape-client/src/main/java/Decimator.java index ebe5355063..c8891a477f 100644 --- a/runescape-client/src/main/java/Decimator.java +++ b/runescape-client/src/main/java/Decimator.java @@ -148,7 +148,8 @@ public class Decimator { static final int method2517(int var0, int var1) { if (var0 == -2) { return 12345678; - } else if (var0 == -1) { + } + if (var0 == -1) { if (var1 < 2) { var1 = 2; } else if (var1 > 126) { @@ -156,16 +157,15 @@ public class Decimator { } return var1; - } else { - var1 = (var0 & 127) * var1 / 128; - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; - } - - return (var0 & 65408) + var1; } + var1 = (var0 & 127) * var1 / 128; + if (var1 < 2) { + var1 = 2; + } else if (var1 > 126) { + var1 = 126; + } + + return (var0 & 65408) + var1; } @ObfuscatedName("ge") diff --git a/runescape-client/src/main/java/DemotingHashTable.java b/runescape-client/src/main/java/DemotingHashTable.java index 10663458e9..435c7849c9 100644 --- a/runescape-client/src/main/java/DemotingHashTable.java +++ b/runescape-client/src/main/java/DemotingHashTable.java @@ -48,29 +48,27 @@ public final class DemotingHashTable { Wrapper var3 = (Wrapper)this.hashTable.get(var1); if (var3 == null) { return null; - } else { - Object var4 = var3.get(); - if (var4 == null) { - var3.remove(); - var3.removeDual(); - this.remaining += var3.size; - return null; - } else { - if (var3.isSoft()) { - DirectWrapper var5 = new DirectWrapper(var4, var3.size); - this.hashTable.put(var5, var3.key); - this.queue.add(var5); - var5.keyDual = 0L; - var3.remove(); - var3.removeDual(); - } else { - this.queue.add(var3); - var3.keyDual = 0L; - } - - return var4; - } } + Object var4 = var3.get(); + if (var4 == null) { + var3.remove(); + var3.removeDual(); + this.remaining += var3.size; + return null; + } + if (var3.isSoft()) { + DirectWrapper var5 = new DirectWrapper(var4, var3.size); + this.hashTable.put(var5, var3.key); + this.queue.add(var5); + var5.keyDual = 0L; + var3.remove(); + var3.removeDual(); + } else { + this.queue.add(var3); + var3.keyDual = 0L; + } + + return var4; } @ObfuscatedName("w") @@ -99,30 +97,29 @@ public final class DemotingHashTable { public void put(Object var1, long var2, int var4) { if (var4 > this.capacity) { throw new IllegalStateException(); - } else { - this.remove(var2); - this.remaining -= var4; + } + this.remove(var2); + this.remaining -= var4; - while (this.remaining < 0) { - Wrapper var5 = (Wrapper)this.queue.removeLast(); - if (var5 == null) { - throw new RuntimeException(""); - } - - if (!var5.isSoft()) { - } - - this.removeWrapper(var5); - if (this.field1966 != null) { - this.field1966.method3338(var5.get()); - } + while (this.remaining < 0) { + Wrapper var5 = (Wrapper)this.queue.removeLast(); + if (var5 == null) { + throw new RuntimeException(""); } - DirectWrapper var6 = new DirectWrapper(var1, var4); - this.hashTable.put(var6, var2); - this.queue.add(var6); - var6.keyDual = 0L; + if (!var5.isSoft()) { + } + + this.removeWrapper(var5); + if (this.field1966 != null) { + this.field1966.method3338(var5.get()); + } } + + DirectWrapper var6 = new DirectWrapper(var1, var4); + this.hashTable.put(var6, var2); + this.queue.add(var6); + var6.keyDual = 0L; } @ObfuscatedName("k") diff --git a/runescape-client/src/main/java/DynamicObject.java b/runescape-client/src/main/java/DynamicObject.java index 7aa1512f23..5b71f767c1 100644 --- a/runescape-client/src/main/java/DynamicObject.java +++ b/runescape-client/src/main/java/DynamicObject.java @@ -136,27 +136,26 @@ public class DynamicObject extends Entity { if (var12 == null) { return null; - } else { - int var2; - int var3; - if (this.orientation != 1 && this.orientation != 3) { - var2 = var12.sizeX; - var3 = var12.sizeY; - } else { - var2 = var12.sizeY; - var3 = var12.sizeX; - } - - int var4 = (var2 >> 1) + this.x; - int var5 = (var2 + 1 >> 1) + this.x; - int var6 = (var3 >> 1) + this.y; - int var7 = (var3 + 1 >> 1) + this.y; - int[][] var8 = Tiles.Tiles_heights[this.plane]; - int var9 = var8[var4][var6] + var8[var5][var6] + var8[var4][var7] + var8[var5][var7] >> 2; - int var10 = (this.x << 7) + (var2 << 6); - int var11 = (this.y << 7) + (var3 << 6); - return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame); } + int var2; + int var3; + if (this.orientation != 1 && this.orientation != 3) { + var2 = var12.sizeX; + var3 = var12.sizeY; + } else { + var2 = var12.sizeY; + var3 = var12.sizeX; + } + + int var4 = (var2 >> 1) + this.x; + int var5 = (var2 + 1 >> 1) + this.x; + int var6 = (var3 >> 1) + this.y; + int var7 = (var3 + 1 >> 1) + this.y; + int[][] var8 = Tiles.Tiles_heights[this.plane]; + int var9 = var8[var4][var6] + var8[var5][var6] + var8[var4][var7] + var8[var5][var7] >> 2; + int var10 = (this.x << 7) + (var2 << 6); + int var11 = (this.y << 7) + (var3 << 6); + return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame); } @ObfuscatedName("w") @@ -261,31 +260,35 @@ public class DynamicObject extends Entity { } return var4 - var5; - } else if (var2 == 2) { + } + if (var2 == 2) { return var0.location - var1.location; - } else if (var2 == 3) { + } + if (var2 == 3) { if (var0.activity.equals("-")) { if (var1.activity.equals("-")) { return 0; - } else { - return var3 ? -1 : 1; } - } else if (var1.activity.equals("-")) { - return var3 ? 1 : -1; - } else { - return var0.activity.compareTo(var1.activity); + return var3 ? -1 : 1; } - } else if (var2 == 4) { - return var0.method1698() ? (var1.method1698() ? 0 : 1) : (var1.method1698() ? -1 : 0); - } else if (var2 == 5) { - return var0.method1682() ? (var1.method1682() ? 0 : 1) : (var1.method1682() ? -1 : 0); - } else if (var2 == 6) { - return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0); - } else if (var2 == 7) { - return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0); - } else { - return var0.id - var1.id; + if (var1.activity.equals("-")) { + return var3 ? 1 : -1; + } + return var0.activity.compareTo(var1.activity); } + if (var2 == 4) { + return var0.method1698() ? (var1.method1698() ? 0 : 1) : (var1.method1698() ? -1 : 0); + } + if (var2 == 5) { + return var0.method1682() ? (var1.method1682() ? 0 : 1) : (var1.method1682() ? -1 : 0); + } + if (var2 == 6) { + return var0.isPvp() ? (var1.isPvp() ? 0 : 1) : (var1.isPvp() ? -1 : 0); + } + if (var2 == 7) { + return var0.isMembersOnly() ? (var1.isMembersOnly() ? 0 : 1) : (var1.isMembersOnly() ? -1 : 0); + } + return var0.id - var1.id; } @ObfuscatedName("b") diff --git a/runescape-client/src/main/java/EnumDefinition.java b/runescape-client/src/main/java/EnumDefinition.java index de88296796..3ce92fecda 100644 --- a/runescape-client/src/main/java/EnumDefinition.java +++ b/runescape-client/src/main/java/EnumDefinition.java @@ -171,33 +171,39 @@ public class EnumDefinition extends DualNode { var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var4 + var3; return 1; - } else if (var0 == ScriptOpcodes.SUB) { + } + if (var0 == ScriptOpcodes.SUB) { HealthBarUpdate.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 - var4; return 1; - } else if (var0 == ScriptOpcodes.MULTIPLY) { + } + if (var0 == ScriptOpcodes.MULTIPLY) { HealthBarUpdate.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 * var4; return 1; - } else if (var0 == ScriptOpcodes.DIV) { + } + if (var0 == ScriptOpcodes.DIV) { HealthBarUpdate.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 / var4; return 1; - } else if (var0 == ScriptOpcodes.RANDOM) { + } + if (var0 == ScriptOpcodes.RANDOM) { var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)var3); return 1; - } else if (var0 == ScriptOpcodes.RANDOMINC) { + } + if (var0 == ScriptOpcodes.RANDOMINC) { var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (int)(Math.random() * (double)(var3 + 1)); return 1; - } else if (var0 == ScriptOpcodes.INTERPOLATE) { + } + if (var0 == ScriptOpcodes.INTERPOLATE) { HealthBarUpdate.Interpreter_intStackSize -= 5; var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; @@ -206,37 +212,43 @@ public class EnumDefinition extends DualNode { int var7 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 4]; Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 + (var7 - var5) * (var4 - var3) / (var6 - var5); return 1; - } else if (var0 == ScriptOpcodes.ADDPERCENT) { + } + if (var0 == ScriptOpcodes.ADDPERCENT) { HealthBarUpdate.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 + var4 * var3 / 100; return 1; - } else if (var0 == ScriptOpcodes.SETBIT) { + } + if (var0 == ScriptOpcodes.SETBIT) { HealthBarUpdate.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 | 1 << var4; return 1; - } else if (var0 == ScriptOpcodes.CLEARBIT) { + } + if (var0 == ScriptOpcodes.CLEARBIT) { HealthBarUpdate.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 & -1 - (1 << var4); return 1; - } else if (var0 == ScriptOpcodes.TESTBIT) { + } + if (var0 == ScriptOpcodes.TESTBIT) { HealthBarUpdate.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (var3 & 1 << var4) != 0 ? 1 : 0; return 1; - } else if (var0 == ScriptOpcodes.MOD) { + } + if (var0 == ScriptOpcodes.MOD) { HealthBarUpdate.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 % var4; return 1; - } else if (var0 == ScriptOpcodes.POW) { + } + if (var0 == ScriptOpcodes.POW) { HealthBarUpdate.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; @@ -247,15 +259,16 @@ public class EnumDefinition extends DualNode { } return 1; - } else if (var0 == ScriptOpcodes.INVPOW) { + } + if (var0 == ScriptOpcodes.INVPOW) { HealthBarUpdate.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; if (var3 == 0) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; return 1; - } else { - switch(var4) { + } + switch(var4) { case 0: Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Integer.MAX_VALUE; break; @@ -275,29 +288,30 @@ public class EnumDefinition extends DualNode { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (int)Math.pow((double)var3, 1.0D / (double)var4); } - return 1; - } - } else if (var0 == ScriptOpcodes.AND) { + return 1; + } + if (var0 == ScriptOpcodes.AND) { HealthBarUpdate.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 & var4; return 1; - } else if (var0 == ScriptOpcodes.OR) { + } + if (var0 == ScriptOpcodes.OR) { HealthBarUpdate.Interpreter_intStackSize -= 2; var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 | var4; return 1; - } else if (var0 == ScriptOpcodes.SCALE) { + } + if (var0 == ScriptOpcodes.SCALE) { HealthBarUpdate.Interpreter_intStackSize -= 3; long var9 = (long)Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; long var11 = (long)Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; long var13 = (long)Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2]; Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (int)(var13 * var9 / var11); return 1; - } else { - return 2; } + return 2; } } diff --git a/runescape-client/src/main/java/Enumerated.java b/runescape-client/src/main/java/Enumerated.java index a6314ed7fd..b31363c567 100644 --- a/runescape-client/src/main/java/Enumerated.java +++ b/runescape-client/src/main/java/Enumerated.java @@ -1,3 +1,4 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -10,5 +11,6 @@ public interface Enumerated { signature = "(I)I", garbageValue = "320353268" ) + @Export("rsOrdinal") int rsOrdinal(); } diff --git a/runescape-client/src/main/java/FloorUnderlayDefinition.java b/runescape-client/src/main/java/FloorUnderlayDefinition.java index aa6d4adb82..6258939616 100644 --- a/runescape-client/src/main/java/FloorUnderlayDefinition.java +++ b/runescape-client/src/main/java/FloorUnderlayDefinition.java @@ -186,19 +186,8 @@ public class FloorUnderlayDefinition extends DualNode { if (var0 == ScriptOpcodes.IF_GETTARGETMASK) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = HealthBar.method1957(class268.getWidgetClickMask(var3)); return 1; - } else if (var0 != ScriptOpcodes.IF_GETOP) { - if (var0 == ScriptOpcodes.IF_GETOPBASE) { - if (var3.dataText == null) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.dataText; - } - - return 1; - } else { - return 2; - } - } else { + } + if (var0 == ScriptOpcodes.IF_GETOP) { int var4 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; --var4; if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { @@ -209,5 +198,15 @@ public class FloorUnderlayDefinition extends DualNode { return 1; } + if (var0 == ScriptOpcodes.IF_GETOPBASE) { + if (var3.dataText == null) { + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.dataText; + } + + return 1; + } + return 2; } } diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java index 0e5b9d0e59..0efca21d4c 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -80,111 +80,116 @@ public class FontName { var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = WorldMapArea.getItemDefinition(var3).name; return 1; - } else { - int var4; - ItemDefinition var5; - if (var0 == ScriptOpcodes.OC_OP) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - var5 = WorldMapArea.getItemDefinition(var3); - if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; - } else { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_IOP) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - var5 = WorldMapArea.getItemDefinition(var3); - if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; - } else { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_COST) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapArea.getItemDefinition(var3).price; - return 1; - } else if (var0 == ScriptOpcodes.OC_STACKABLE) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapArea.getItemDefinition(var3).isStackable == 1 ? 1 : 0; - return 1; - } else { - ItemDefinition var6; - if (var0 == ScriptOpcodes.OC_CERT) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var6 = WorldMapArea.getItemDefinition(var3); - if (var6.noteTemplate == -1 && var6.note >= 0) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.note; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_UNCERT) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var6 = WorldMapArea.getItemDefinition(var3); - if (var6.noteTemplate >= 0 && var6.note >= 0) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.note; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_MEMBERS) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapArea.getItemDefinition(var3).isMembersOnly ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var6 = WorldMapArea.getItemDefinition(var3); - if (var6.placeholderTemplate == -1 && var6.placeholder >= 0) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.placeholder; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var6 = WorldMapArea.getItemDefinition(var3); - if (var6.placeholderTemplate >= 0 && var6.placeholder >= 0) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.placeholder; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3; - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_FIND) { - String var7 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - WorldMapDecoration.findItemDefinitions(var7, var4 == 1); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = FloorOverlayDefinition.foundItemIdCount; - return 1; - } else if (var0 != ScriptOpcodes.OC_FINDNEXT) { - if (var0 == ScriptOpcodes.OC_FINDRESET) { - class32.foundItemIndex = 0; - return 1; - } else { - return 2; - } - } else { - if (WorldMapData_1.foundItemIds != null && class32.foundItemIndex < FloorOverlayDefinition.foundItemIdCount) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapData_1.foundItemIds[++class32.foundItemIndex - 1] & '\uffff'; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - } - - return 1; - } - } } + int var4; + ItemDefinition var5; + if (var0 == ScriptOpcodes.OC_OP) { + HealthBarUpdate.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; + var5 = WorldMapArea.getItemDefinition(var3); + if (var4 >= 1 && var4 <= 5 && var5.groundActions[var4 - 1] != null) { + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var5.groundActions[var4 - 1]; + } else { + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } + if (var0 == ScriptOpcodes.OC_IOP) { + HealthBarUpdate.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; + var5 = WorldMapArea.getItemDefinition(var3); + if (var4 >= 1 && var4 <= 5 && var5.inventoryActions[var4 - 1] != null) { + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var5.inventoryActions[var4 - 1]; + } else { + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } + if (var0 == ScriptOpcodes.OC_COST) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapArea.getItemDefinition(var3).price; + return 1; + } + if (var0 == ScriptOpcodes.OC_STACKABLE) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapArea.getItemDefinition(var3).isStackable == 1 ? 1 : 0; + return 1; + } + ItemDefinition var6; + if (var0 == ScriptOpcodes.OC_CERT) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + var6 = WorldMapArea.getItemDefinition(var3); + if (var6.noteTemplate == -1 && var6.note >= 0) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.note; + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } + if (var0 == ScriptOpcodes.OC_UNCERT) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + var6 = WorldMapArea.getItemDefinition(var3); + if (var6.noteTemplate >= 0 && var6.note >= 0) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.note; + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } + if (var0 == ScriptOpcodes.OC_MEMBERS) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapArea.getItemDefinition(var3).isMembersOnly ? 1 : 0; + return 1; + } + if (var0 == ScriptOpcodes.OC_PLACEHOLDER) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + var6 = WorldMapArea.getItemDefinition(var3); + if (var6.placeholderTemplate == -1 && var6.placeholder >= 0) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.placeholder; + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } + if (var0 == ScriptOpcodes.OC_UNPLACEHOLDER) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + var6 = WorldMapArea.getItemDefinition(var3); + if (var6.placeholderTemplate >= 0 && var6.placeholder >= 0) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.placeholder; + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3; + } + + return 1; + } + if (var0 == ScriptOpcodes.OC_FIND) { + String var7 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + WorldMapDecoration.findItemDefinitions(var7, var4 == 1); + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = FloorOverlayDefinition.foundItemIdCount; + return 1; + } + if (var0 == ScriptOpcodes.OC_FINDNEXT) { + if (WorldMapData_1.foundItemIds != null && class32.foundItemIndex < FloorOverlayDefinition.foundItemIdCount) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapData_1.foundItemIds[++class32.foundItemIndex - 1] & '\uffff'; + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; + } + + return 1; + } + if (var0 == ScriptOpcodes.OC_FINDRESET) { + class32.foundItemIndex = 0; + return 1; + } + return 2; } @ObfuscatedName("ii") @@ -826,8 +831,7 @@ public class FontName { static String method5318(Widget var0) { if (HealthBar.method1957(class268.getWidgetClickMask(var0)) == 0) { return null; - } else { - return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; } + return var0.spellActionName != null && var0.spellActionName.trim().length() != 0 ? var0.spellActionName : null; } } diff --git a/runescape-client/src/main/java/Fonts.java b/runescape-client/src/main/java/Fonts.java index e9fac31b4b..14a0192063 100644 --- a/runescape-client/src/main/java/Fonts.java +++ b/runescape-client/src/main/java/Fonts.java @@ -49,7 +49,7 @@ public class Fonts { if (this.map.containsKey(var5)) { var2.put(var5, this.map.get(var5)); } else { - Font var6 = class287.method5258(this.spritesArchive, this.fontsArchive, var5.name, ""); + Font var6 = class287.SpriteBuffer_getFontByName(this.spritesArchive, this.fontsArchive, var5.name, ""); if (var6 != null) { this.map.put(var5, var6); var2.put(var5, var6); diff --git a/runescape-client/src/main/java/Frames.java b/runescape-client/src/main/java/Frames.java index a7c0cd0b1f..0f965d0a15 100644 --- a/runescape-client/src/main/java/Frames.java +++ b/runescape-client/src/main/java/Frames.java @@ -181,71 +181,73 @@ public class Frames extends DualNode { boolean var4 = ViewportMouse.ViewportMouse_isInViewport; if (!var4) { return false; - } else { - int var5; - int var6; - int var7; - int var8; - int var11; - int var12; - int var13; - int var16; - int var17; - if (!ViewportMouse.ViewportMouse_false0) { - var5 = Scene.Scene_cameraPitchSine; - var6 = Scene.Scene_cameraPitchCosine; - var7 = Scene.Scene_cameraYawSine; - var8 = Scene.Scene_cameraYawCosine; - byte var9 = 50; - short var10 = 3500; - var11 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var9 / Rasterizer3D.Rasterizer3D_zoom; - var12 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var9 / Rasterizer3D.Rasterizer3D_zoom; - var13 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var10 / Rasterizer3D.Rasterizer3D_zoom; - int var14 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var10 / Rasterizer3D.Rasterizer3D_zoom; - int var15 = Rasterizer3D.rot1(var12, var9, var6, var5); - var16 = Rasterizer3D.rot2(var12, var9, var6, var5); - var12 = var15; - var15 = Rasterizer3D.rot1(var14, var10, var6, var5); - var17 = Rasterizer3D.rot2(var14, var10, var6, var5); - var14 = var15; - var15 = Rasterizer3D.rot3(var11, var16, var8, var7); - var16 = Rasterizer3D.rot4(var11, var16, var8, var7); - var11 = var15; - var15 = Rasterizer3D.rot3(var13, var17, var8, var7); - var17 = Rasterizer3D.rot4(var13, var17, var8, var7); - ModelData0.field1871 = (var11 + var15) / 2; - ViewportMouse.field1745 = (var12 + var14) / 2; - ViewportMouse.field1746 = (var16 + var17) / 2; - GroundItem.field1242 = (var15 - var11) / 2; - GrandExchangeEvent.field48 = (var14 - var12) / 2; - Canvas.field422 = (var17 - var16) / 2; - ScriptFrame.field527 = Math.abs(GroundItem.field1242); - ViewportMouse.field1741 = Math.abs(GrandExchangeEvent.field48); - MenuAction.field1160 = Math.abs(Canvas.field422); - } - - var5 = var0.xMid + var1; - var6 = var2 + var0.yMid; - var7 = var3 + var0.zMid; - var8 = var0.xMidOffset; - var16 = var0.yMidOffset; - var17 = var0.zMidOffset; - var11 = ModelData0.field1871 - var5; - var12 = ViewportMouse.field1745 - var6; - var13 = ViewportMouse.field1746 - var7; - if (Math.abs(var11) > var8 + ScriptFrame.field527) { - return false; - } else if (Math.abs(var12) > var16 + ViewportMouse.field1741) { - return false; - } else if (Math.abs(var13) > var17 + MenuAction.field1160) { - return false; - } else if (Math.abs(var13 * GrandExchangeEvent.field48 - var12 * Canvas.field422) > var17 * ViewportMouse.field1741 + var16 * MenuAction.field1160) { - return false; - } else if (Math.abs(var11 * Canvas.field422 - var13 * GroundItem.field1242) > var8 * MenuAction.field1160 + var17 * ScriptFrame.field527) { - return false; - } else { - return Math.abs(var12 * GroundItem.field1242 - var11 * GrandExchangeEvent.field48) <= var16 * ScriptFrame.field527 + var8 * ViewportMouse.field1741; - } } + int var5; + int var6; + int var7; + int var8; + int var11; + int var12; + int var13; + int var16; + int var17; + if (!ViewportMouse.ViewportMouse_false0) { + var5 = Scene.Scene_cameraPitchSine; + var6 = Scene.Scene_cameraPitchCosine; + var7 = Scene.Scene_cameraYawSine; + var8 = Scene.Scene_cameraYawCosine; + byte var9 = 50; + short var10 = 3500; + var11 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var9 / Rasterizer3D.Rasterizer3D_zoom; + var12 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var9 / Rasterizer3D.Rasterizer3D_zoom; + var13 = (ViewportMouse.ViewportMouse_x - Rasterizer3D.Rasterizer3D_clipMidX) * var10 / Rasterizer3D.Rasterizer3D_zoom; + int var14 = (ViewportMouse.ViewportMouse_y - Rasterizer3D.Rasterizer3D_clipMidY) * var10 / Rasterizer3D.Rasterizer3D_zoom; + int var15 = Rasterizer3D.rot1(var12, var9, var6, var5); + var16 = Rasterizer3D.rot2(var12, var9, var6, var5); + var12 = var15; + var15 = Rasterizer3D.rot1(var14, var10, var6, var5); + var17 = Rasterizer3D.rot2(var14, var10, var6, var5); + var14 = var15; + var15 = Rasterizer3D.rot3(var11, var16, var8, var7); + var16 = Rasterizer3D.rot4(var11, var16, var8, var7); + var11 = var15; + var15 = Rasterizer3D.rot3(var13, var17, var8, var7); + var17 = Rasterizer3D.rot4(var13, var17, var8, var7); + ModelData0.field1871 = (var11 + var15) / 2; + ViewportMouse.field1745 = (var12 + var14) / 2; + ViewportMouse.field1746 = (var16 + var17) / 2; + GroundItem.field1242 = (var15 - var11) / 2; + GrandExchangeEvent.field48 = (var14 - var12) / 2; + Canvas.field422 = (var17 - var16) / 2; + ScriptFrame.field527 = Math.abs(GroundItem.field1242); + ViewportMouse.field1741 = Math.abs(GrandExchangeEvent.field48); + MenuAction.field1160 = Math.abs(Canvas.field422); + } + + var5 = var0.xMid + var1; + var6 = var2 + var0.yMid; + var7 = var3 + var0.zMid; + var8 = var0.xMidOffset; + var16 = var0.yMidOffset; + var17 = var0.zMidOffset; + var11 = ModelData0.field1871 - var5; + var12 = ViewportMouse.field1745 - var6; + var13 = ViewportMouse.field1746 - var7; + if (Math.abs(var11) > var8 + ScriptFrame.field527) { + return false; + } + if (Math.abs(var12) > var16 + ViewportMouse.field1741) { + return false; + } + if (Math.abs(var13) > var17 + MenuAction.field1160) { + return false; + } + if (Math.abs(var13 * GrandExchangeEvent.field48 - var12 * Canvas.field422) > var17 * ViewportMouse.field1741 + var16 * MenuAction.field1160) { + return false; + } + if (Math.abs(var11 * Canvas.field422 - var13 * GroundItem.field1242) > var8 * MenuAction.field1160 + var17 * ScriptFrame.field527) { + return false; + } + return Math.abs(var12 * GroundItem.field1242 - var11 * GrandExchangeEvent.field48) <= var16 * ScriptFrame.field527 + var8 * ViewportMouse.field1741; } } diff --git a/runescape-client/src/main/java/Friend.java b/runescape-client/src/main/java/Friend.java index feb55b9984..66dbfa45c7 100644 --- a/runescape-client/src/main/java/Friend.java +++ b/runescape-client/src/main/java/Friend.java @@ -23,23 +23,29 @@ public class Friend extends Buddy { int compareToFriend(Friend var1) { if (super.world == Client.worldId && Client.worldId != var1.world) { return -1; - } else if (Client.worldId == var1.world && super.world != Client.worldId) { - return 1; - } else if (super.world != 0 && var1.world == 0) { - return -1; - } else if (var1.world != 0 && super.world == 0) { - return 1; - } else if (this.field3650 && !var1.field3650) { - return -1; - } else if (!this.field3650 && var1.field3650) { - return 1; - } else if (this.field3651 && !var1.field3651) { - return -1; - } else if (!this.field3651 && var1.field3651) { - return 1; - } else { - return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2; } + if (Client.worldId == var1.world && super.world != Client.worldId) { + return 1; + } + if (super.world != 0 && var1.world == 0) { + return -1; + } + if (var1.world != 0 && super.world == 0) { + return 1; + } + if (this.field3650 && !var1.field3650) { + return -1; + } + if (!this.field3650 && var1.field3650) { + return 1; + } + if (this.field3651 && !var1.field3651) { + return -1; + } + if (!this.field3651 && var1.field3651) { + return 1; + } + return super.world != 0 ? super.int2 - var1.int2 : var1.int2 - super.int2; } @ObfuscatedName("ax") @@ -61,15 +67,14 @@ public class Friend extends Buddy { signature = "(Lhp;IIB)Z", garbageValue = "-3" ) - @Export("doesSpriteExist") - public static boolean doesSpriteExist(AbstractArchive var0, int var1, int var2) { + @Export("SpriteBuffer_bufferFile") + public static boolean SpriteBuffer_bufferFile(AbstractArchive var0, int var1, int var2) { byte[] var3 = var0.takeFile(var1, var2); if (var3 == null) { return false; - } else { - class185.SpriteBuffer_decode(var3); - return true; } + class185.SpriteBuffer_decode(var3); + return true; } @ObfuscatedName("fv") diff --git a/runescape-client/src/main/java/FriendSystem.java b/runescape-client/src/main/java/FriendSystem.java index 7639a44560..2f5c526593 100644 --- a/runescape-client/src/main/java/FriendSystem.java +++ b/runescape-client/src/main/java/FriendSystem.java @@ -122,11 +122,11 @@ public class FriendSystem { final boolean isFriended(Username var1, boolean var2) { if (var1 == null) { return false; - } else if (var1.equals(Client.localPlayer.username)) { - return true; - } else { - return this.friendsList.isFriended(var1, var2); } + if (var1.equals(Client.localPlayer.username)) { + return true; + } + return this.friendsList.isFriended(var1, var2); } @ObfuscatedName("b") @@ -138,9 +138,8 @@ public class FriendSystem { final boolean isIgnored(Username var1) { if (var1 == null) { return false; - } else { - return this.ignoreList.contains(var1); } + return this.ignoreList.contains(var1); } @ObfuscatedName("i") @@ -357,138 +356,153 @@ public class FriendSystem { var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].type(); return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { + } + if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERITEM) { var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].id; return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { + } + if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERPRICE) { var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].unitPrice; return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { + } + if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOUNT) { var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].totalQuantity; return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { + } + if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDCOUNT) { var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentQuantity; return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { + } + if (var0 == ScriptOpcodes.STOCKMARKET_GETOFFERCOMPLETEDGOLD) { var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.grandExchangeOffers[var3].currentPrice; return 1; - } else { - int var12; - if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var12 == 0 ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var12 == 2 ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var12 == 5 ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var12 = Client.grandExchangeOffers[var3].status(); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var12 == 1 ? 1 : 0; - return 1; - } else { - boolean var13; - if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { - var13 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - if (PendingSpawn.grandExchangeEvents != null) { - PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var13); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { - var13 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - if (PendingSpawn.grandExchangeEvents != null) { - PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var13); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var13 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize] == 1; - boolean var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1] == 1; - if (PendingSpawn.grandExchangeEvents != null) { - Client.GrandExchangeEvents_worldComparator.filterWorlds = var4; - PendingSpawn.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var13); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { - var13 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - if (PendingSpawn.grandExchangeEvents != null) { - PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var13); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { - var13 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - if (PendingSpawn.grandExchangeEvents != null) { - PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var13); - } - - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = PendingSpawn.grandExchangeEvents == null ? 0 : PendingSpawn.grandExchangeEvents.events.size(); - return 1; - } else { - GrandExchangeEvent var11; - if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.world; - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var11.getOfferName(); - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var11.getPreviousOfferName(); - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3); - long var5 = DirectByteArrayCopier.currentTimeMs() - Buddy.field3632 - var11.age; - int var7 = (int)(var5 / 3600000L); - int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); - int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); - String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var10; - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.totalQuantity; - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.unitPrice; - return 1; - } else if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.id; - return 1; - } else { - return 2; - } - } - } } + int var12; + if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFEREMPTY) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + var12 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var12 == 0 ? 1 : 0; + return 1; + } + if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERSTABLE) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + var12 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var12 == 2 ? 1 : 0; + return 1; + } + if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERFINISHED) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + var12 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var12 == 5 ? 1 : 0; + return 1; + } + if (var0 == ScriptOpcodes.STOCKMARKET_ISOFFERADDING) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + var12 = Client.grandExchangeOffers[var3].status(); + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var12 == 1 ? 1 : 0; + return 1; + } + boolean var13; + if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_NAME) { + var13 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + if (PendingSpawn.grandExchangeEvents != null) { + PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_nameComparator, var13); + } + + return 1; + } + if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_PRICE) { + var13 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + if (PendingSpawn.grandExchangeEvents != null) { + PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_priceComparator, var13); + } + + return 1; + } + if (var0 == ScriptOpcodes.TRADINGPOST_SORTFILTERBY_WORLD) { + HealthBarUpdate.Interpreter_intStackSize -= 2; + var13 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize] == 1; + boolean var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1] == 1; + if (PendingSpawn.grandExchangeEvents != null) { + Client.GrandExchangeEvents_worldComparator.filterWorlds = var4; + PendingSpawn.grandExchangeEvents.sort(Client.GrandExchangeEvents_worldComparator, var13); + } + + return 1; + } + if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_AGE) { + var13 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + if (PendingSpawn.grandExchangeEvents != null) { + PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_ageComparator, var13); + } + + return 1; + } + if (var0 == ScriptOpcodes.TRADINGPOST_SORTBY_COUNT) { + var13 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + if (PendingSpawn.grandExchangeEvents != null) { + PendingSpawn.grandExchangeEvents.sort(GrandExchangeEvents.GrandExchangeEvents_quantityComparator, var13); + } + + return 1; + } + if (var0 == ScriptOpcodes.TRADINGPOST_GETTOTALOFFERS) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = PendingSpawn.grandExchangeEvents == null ? 0 : PendingSpawn.grandExchangeEvents.events.size(); + return 1; + } + GrandExchangeEvent var11; + if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERWORLD) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.world; + return 1; + } + if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERNAME) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var11.getOfferName(); + return 1; + } + if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPREVIOUSNAME) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var11.getPreviousOfferName(); + return 1; + } + if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERAGE) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3); + long var5 = DirectByteArrayCopier.currentTimeMs() - Buddy.field3632 - var11.age; + int var7 = (int)(var5 / 3600000L); + int var8 = (int)((var5 - (long)(var7 * 3600000)) / 60000L); + int var9 = (int)((var5 - (long)(var7 * 3600000) - (long)(var8 * 60000)) / 1000L); + String var10 = var7 + ":" + var8 / 10 + var8 % 10 + ":" + var9 / 10 + var9 % 10; + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var10; + return 1; + } + if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERCOUNT) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.totalQuantity; + return 1; + } + if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERPRICE) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.unitPrice; + return 1; + } + if (var0 == ScriptOpcodes.TRADINGPOST_GETOFFERITEM) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + var11 = (GrandExchangeEvent)PendingSpawn.grandExchangeEvents.events.get(var3); + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.grandExchangeOffer.id; + return 1; + } + return 2; } } diff --git a/runescape-client/src/main/java/FriendsList.java b/runescape-client/src/main/java/FriendsList.java index feaf9d0bc1..bc64f626d7 100644 --- a/runescape-client/src/main/java/FriendsList.java +++ b/runescape-client/src/main/java/FriendsList.java @@ -65,9 +65,8 @@ public class FriendsList extends UserList { Friend var3 = (Friend)this.getByUsername(var1); if (var3 == null) { return false; - } else { - return !var2 || var3.world != 0; } + return !var2 || var3.world != 0; } @ObfuscatedName("c") diff --git a/runescape-client/src/main/java/GameObject.java b/runescape-client/src/main/java/GameObject.java index 4af5cf4946..998d380936 100644 --- a/runescape-client/src/main/java/GameObject.java +++ b/runescape-client/src/main/java/GameObject.java @@ -101,8 +101,8 @@ public final class GameObject { signature = "(Lhp;Lhp;III)Lke;", garbageValue = "-1252480817" ) - @Export("loadFont") - public static Font loadFont(AbstractArchive var0, AbstractArchive var1, int var2, int var3) { - return !Friend.doesSpriteExist(var0, var2, var3) ? null : WallDecoration.getWorldMapSprite(var1.takeFile(var2, var3)); + @Export("SpriteBuffer_getFont") + public static Font SpriteBuffer_getFont(AbstractArchive var0, AbstractArchive var1, int var2, int var3) { + return !Friend.SpriteBuffer_bufferFile(var0, var2, var3) ? null : WallDecoration.SpriteBuffer_createFont(var1.takeFile(var2, var3)); } } diff --git a/runescape-client/src/main/java/GameShell.java b/runescape-client/src/main/java/GameShell.java index af9ff53b65..3f1bbe4880 100644 --- a/runescape-client/src/main/java/GameShell.java +++ b/runescape-client/src/main/java/GameShell.java @@ -557,24 +557,20 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene if (!var1.equals("runescape.com") && !var1.endsWith(".runescape.com")) { if (var1.endsWith("127.0.0.1")) { return true; - } else { - while (var1.length() > 0 && var1.charAt(var1.length() - 1) >= '0' && var1.charAt(var1.length() - 1) <= '9') { - var1 = var1.substring(0, var1.length() - 1); - } - - if (var1.endsWith("192.168.1.")) { - return true; - } else { - this.error("invalidhost"); - return false; - } } - } else { - return true; + while (var1.length() > 0 && var1.charAt(var1.length() - 1) >= '0' && var1.charAt(var1.length() - 1) <= '9') { + var1 = var1.substring(0, var1.length() - 1); + } + + if (var1.endsWith("192.168.1.")) { + return true; + } + this.error("invalidhost"); + return false; } - } else { return true; } + return true; } @ObfuscatedName("j") @@ -713,6 +709,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene signature = "(B)V", garbageValue = "-3" ) + @Export("doCycle") protected abstract void doCycle(); @ObfuscatedName("ag") @@ -720,6 +717,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene signature = "(ZB)V", garbageValue = "-5" ) + @Export("draw") protected abstract void draw(boolean var1); @ObfuscatedName("ar") @@ -992,17 +990,16 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene NPCDefinition var1 = (NPCDefinition)NPCDefinition.NpcDefinition_cached.get((long)var0); if (var1 != null) { return var1; - } else { - byte[] var2 = NPCDefinition.NpcDefinition_archive.takeFile(9, var0); - var1 = new NPCDefinition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); - NPCDefinition.NpcDefinition_cached.put(var1, (long)var0); - return var1; } + byte[] var2 = NPCDefinition.NpcDefinition_archive.takeFile(9, var0); + var1 = new NPCDefinition(); + var1.id = var0; + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); + NPCDefinition.NpcDefinition_cached.put(var1, (long)var0); + return var1; } } diff --git a/runescape-client/src/main/java/GrandExchangeEvent.java b/runescape-client/src/main/java/GrandExchangeEvent.java index af1896bd49..5b279ec280 100644 --- a/runescape-client/src/main/java/GrandExchangeEvent.java +++ b/runescape-client/src/main/java/GrandExchangeEvent.java @@ -95,17 +95,16 @@ public class GrandExchangeEvent { SequenceDefinition var1 = (SequenceDefinition)SequenceDefinition.SequenceDefinition_cached.get((long)var0); if (var1 != null) { return var1; - } else { - byte[] var2 = SequenceDefinition.SequenceDefinition_archive.takeFile(12, var0); - var1 = new SequenceDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); - SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); - return var1; } + byte[] var2 = SequenceDefinition.SequenceDefinition_archive.takeFile(12, var0); + var1 = new SequenceDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); + SequenceDefinition.SequenceDefinition_cached.put(var1, (long)var0); + return var1; } @ObfuscatedName("jj") diff --git a/runescape-client/src/main/java/GrandExchangeOffer.java b/runescape-client/src/main/java/GrandExchangeOffer.java index f4fc38c8f6..2e6a09fd34 100644 --- a/runescape-client/src/main/java/GrandExchangeOffer.java +++ b/runescape-client/src/main/java/GrandExchangeOffer.java @@ -207,348 +207,373 @@ public class GrandExchangeOffer { int var5 = class1.baseY * 64 + (Client.localPlayer.y >> 7); WorldMapID.getWorldMap().method6309(var3, var9, var5, true); return 1; - } else { - WorldMapArea var11; - if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - String var16 = ""; - var11 = WorldMapID.getWorldMap().getMapArea(var3); - if (var11 != null) { - var16 = var11.getExternalName(); - } - - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var16; - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - WorldMapID.getWorldMap().setCurrentMapAreaId(var3); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getZoomLevel(); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - WorldMapID.getWorldMap().setZoomPercentage(var3); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().isCacheLoaded() ? 1 : 0; - return 1; - } else { - Coord var15; - if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { - var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); - WorldMapID.getWorldMap().setWorldMapPositionTarget(var15.x, var15.y); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { - var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); - WorldMapID.getWorldMap().setWorldMapPositionTargetInstant(var15.x, var15.y); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { - var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); - WorldMapID.getWorldMap().jumpToSourceCoord(var15.plane, var15.x, var15.y); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { - var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); - WorldMapID.getWorldMap().jumpToSourceCoordInstant(var15.plane, var15.x, var15.y); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getDisplayX(); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getDisplayY(); - return 1; - } else { - WorldMapArea var13; - if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var13 = WorldMapID.getWorldMap().getMapArea(var3); - if (var13 == null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getOrigin().packed(); - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var13 = WorldMapID.getWorldMap().getMapArea(var3); - if (var13 == null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (var13.getRegionHighX() - var13.getRegionLowX() + 1) * 64; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (var13.getRegionHighY() - var13.getRegionLowY() + 1) * 64; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var13 = WorldMapID.getWorldMap().getMapArea(var3); - if (var13 == null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getRegionLowX() * 64; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getRegionLowY() * 64; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getRegionHighX() * 64 + 64 - 1; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getRegionHighY() * 64 + 64 - 1; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var13 = WorldMapID.getWorldMap().getMapArea(var3); - if (var13 == null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getZoom(); - } - - return 1; - } else if (var0 == 6615) { - var15 = WorldMapID.getWorldMap().getDisplayCoord(); - if (var15 == null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var15.x; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var15.y; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().currentMapAreaId(); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { - var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); - var13 = WorldMapID.getWorldMap().getCurrentMapArea(); - if (var13 == null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - return 1; - } else { - int[] var14 = var13.position(var15.plane, var15.x, var15.y); - if (var14 == null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var14[0]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var14[1]; - } - - return 1; - } - } else { - Coord var7; - if (var0 == 6618) { - var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); - var13 = WorldMapID.getWorldMap().getCurrentMapArea(); - if (var13 == null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - return 1; - } else { - var7 = var13.coord(var15.x, var15.y); - if (var7 == null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var7.packed(); - } - - return 1; - } - } else { - Coord var12; - if (var0 == 6619) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var12 = new Coord(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]); - ObjectSound.method1824(var3, var12, false); - return 1; - } else if (var0 == 6620) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var12 = new Coord(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]); - ObjectSound.method1824(var3, var12, true); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var12 = new Coord(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]); - var11 = WorldMapID.getWorldMap().getMapArea(var3); - if (var11 == null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - return 1; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.containsCoord(var12.plane, var12.x, var12.y) ? 1 : 0; - return 1; - } - } else if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getDisplayWith(); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getDisplayHeight(); - return 1; - } else if (var0 == 6623) { - var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); - var13 = WorldMapID.getWorldMap().mapAreaAtCoord(var15.plane, var15.x, var15.y); - if (var13 == null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getId(); - } - - return 1; - } else if (var0 == 6624) { - WorldMapID.getWorldMap().method6337(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); - return 1; - } else if (var0 == 6625) { - WorldMapID.getWorldMap().method6338(); - return 1; - } else if (var0 == 6626) { - WorldMapID.getWorldMap().method6339(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); - return 1; - } else if (var0 == 6627) { - WorldMapID.getWorldMap().method6340(); - return 1; - } else { - boolean var10; - if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { - var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - WorldMapID.getWorldMap().setPerpetualFlash(var10); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - WorldMapID.getWorldMap().flashElement(var3); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - WorldMapID.getWorldMap().flashCategory(var3); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { - WorldMapID.getWorldMap().stopCurrentFlashes(); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { - var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - WorldMapID.getWorldMap().setElementsDisabled(var10); - return 1; - } else { - boolean var4; - if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1] == 1; - WorldMapID.getWorldMap().disableElement(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1] == 1; - WorldMapID.getWorldMap().setCategoryDisabled(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getElementsDisabled() ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().isElementDisabled(var3) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; - return 1; - } else if (var0 == 6638) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var12 = new Coord(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]); - var7 = WorldMapID.getWorldMap().method6352(var3, var12); - if (var7 == null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var7.packed(); - } - - return 1; - } else { - AbstractWorldMapIcon var8; - if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { - var8 = WorldMapID.getWorldMap().iconStart(); - if (var8 == null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var8.getElement(); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var8.coord2.packed(); - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { - var8 = WorldMapID.getWorldMap().iconNext(); - if (var8 == null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var8.getElement(); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var8.coord2.packed(); - } - - return 1; - } else { - WorldMapElement var6; - if (var0 == ScriptOpcodes.MEC_TEXT) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var6 = class222.getWorldMapElement(var3); - if (var6.name == null) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var6.name; - } - - return 1; - } else if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var6 = class222.getWorldMapElement(var3); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.textSize; - return 1; - } else if (var0 == ScriptOpcodes.MEC_CATEGORY) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var6 = class222.getWorldMapElement(var3); - if (var6 == null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.category; - } - - return 1; - } else if (var0 == ScriptOpcodes.MEC_SPRITE) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var6 = class222.getWorldMapElement(var3); - if (var6 == null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.sprite1; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapIcon_0.worldMapEvent.mapElement; - return 1; - } else if (var0 == 6698) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapIcon_0.worldMapEvent.coord1.packed(); - return 1; - } else if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapIcon_0.worldMapEvent.coord2.packed(); - return 1; - } else { - return 2; - } - } - } - } - } - } - } - } - } } + WorldMapArea var11; + if (var0 == ScriptOpcodes.WORLDMAP_GETMAPNAME) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + String var16 = ""; + var11 = WorldMapID.getWorldMap().getMapArea(var3); + if (var11 != null) { + var16 = var11.getExternalName(); + } + + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var16; + return 1; + } + if (var0 == ScriptOpcodes.WORLDMAP_SETMAP) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + WorldMapID.getWorldMap().setCurrentMapAreaId(var3); + return 1; + } + if (var0 == ScriptOpcodes.WORLDMAP_GETZOOM) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getZoomLevel(); + return 1; + } + if (var0 == ScriptOpcodes.WORLDMAP_SETZOOM) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + WorldMapID.getWorldMap().setZoomPercentage(var3); + return 1; + } + if (var0 == ScriptOpcodes.WORLDMAP_ISLOADED) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().isCacheLoaded() ? 1 : 0; + return 1; + } + Coord var15; + if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD) { + var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); + WorldMapID.getWorldMap().setWorldMapPositionTarget(var15.x, var15.y); + return 1; + } + if (var0 == ScriptOpcodes.WORLDMAP_JUMPTODISPLAYCOORD_INSTANT) { + var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); + WorldMapID.getWorldMap().setWorldMapPositionTargetInstant(var15.x, var15.y); + return 1; + } + if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD) { + var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); + WorldMapID.getWorldMap().jumpToSourceCoord(var15.plane, var15.x, var15.y); + return 1; + } + if (var0 == ScriptOpcodes.WORLDMAP_JUMPTOSOURCECOORD_INSTANT) { + var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); + WorldMapID.getWorldMap().jumpToSourceCoordInstant(var15.plane, var15.x, var15.y); + return 1; + } + if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYPOSITION) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getDisplayX(); + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getDisplayY(); + return 1; + } + WorldMapArea var13; + if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGORIGIN) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + var13 = WorldMapID.getWorldMap().getMapArea(var3); + if (var13 == null) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getOrigin().packed(); + } + + return 1; + } + if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGSIZE) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + var13 = WorldMapID.getWorldMap().getMapArea(var3); + if (var13 == null) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (var13.getRegionHighX() - var13.getRegionLowX() + 1) * 64; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (var13.getRegionHighY() - var13.getRegionLowY() + 1) * 64; + } + + return 1; + } + if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGBOUNDS) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + var13 = WorldMapID.getWorldMap().getMapArea(var3); + if (var13 == null) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getRegionLowX() * 64; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getRegionLowY() * 64; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getRegionHighX() * 64 + 64 - 1; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getRegionHighY() * 64 + 64 - 1; + } + + return 1; + } + if (var0 == ScriptOpcodes.WORLDMAP_GETCONFIGZOOM) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + var13 = WorldMapID.getWorldMap().getMapArea(var3); + if (var13 == null) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getZoom(); + } + + return 1; + } + if (var0 == 6615) { + var15 = WorldMapID.getWorldMap().getDisplayCoord(); + if (var15 == null) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var15.x; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var15.y; + } + + return 1; + } + if (var0 == ScriptOpcodes.WORLDMAP_GETCURRENTMAP) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().currentMapAreaId(); + return 1; + } + if (var0 == ScriptOpcodes.WORLDMAP_GETDISPLAYCOORD) { + var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); + var13 = WorldMapID.getWorldMap().getCurrentMapArea(); + if (var13 == null) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; + return 1; + } + int[] var14 = var13.position(var15.plane, var15.x, var15.y); + if (var14 == null) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var14[0]; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var14[1]; + } + + return 1; + } + Coord var7; + if (var0 == 6618) { + var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); + var13 = WorldMapID.getWorldMap().getCurrentMapArea(); + if (var13 == null) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; + return 1; + } + var7 = var13.coord(var15.x, var15.y); + if (var7 == null) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var7.packed(); + } + + return 1; + } + Coord var12; + if (var0 == 6619) { + HealthBarUpdate.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; + var12 = new Coord(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]); + ObjectSound.method1824(var3, var12, false); + return 1; + } + if (var0 == 6620) { + HealthBarUpdate.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; + var12 = new Coord(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]); + ObjectSound.method1824(var3, var12, true); + return 1; + } + if (var0 == ScriptOpcodes.WORLDMAP_COORDINMAP) { + HealthBarUpdate.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; + var12 = new Coord(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]); + var11 = WorldMapID.getWorldMap().getMapArea(var3); + if (var11 == null) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + return 1; + } + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var11.containsCoord(var12.plane, var12.x, var12.y) ? 1 : 0; + return 1; + } + if (var0 == ScriptOpcodes.WORLDMAP_GETSIZE) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getDisplayWith(); + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getDisplayHeight(); + return 1; + } + if (var0 == 6623) { + var15 = new Coord(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); + var13 = WorldMapID.getWorldMap().mapAreaAtCoord(var15.plane, var15.x, var15.y); + if (var13 == null) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var13.getId(); + } + + return 1; + } + if (var0 == 6624) { + WorldMapID.getWorldMap().method6337(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); + return 1; + } + if (var0 == 6625) { + WorldMapID.getWorldMap().method6338(); + return 1; + } + if (var0 == 6626) { + WorldMapID.getWorldMap().method6339(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); + return 1; + } + if (var0 == 6627) { + WorldMapID.getWorldMap().method6340(); + return 1; + } + boolean var10; + if (var0 == ScriptOpcodes.WORLDMAP_PERPETUALFLASH) { + var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + WorldMapID.getWorldMap().setPerpetualFlash(var10); + return 1; + } + if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENT) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + WorldMapID.getWorldMap().flashElement(var3); + return 1; + } + if (var0 == ScriptOpcodes.WORLDMAP_FLASHELEMENTCATEGORY) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + WorldMapID.getWorldMap().flashCategory(var3); + return 1; + } + if (var0 == ScriptOpcodes.WORLDMAP_STOPCURRENTFLASHES) { + WorldMapID.getWorldMap().stopCurrentFlashes(); + return 1; + } + if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTS) { + var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + WorldMapID.getWorldMap().setElementsDisabled(var10); + return 1; + } + boolean var4; + if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENT) { + HealthBarUpdate.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1] == 1; + WorldMapID.getWorldMap().disableElement(var3, var4); + return 1; + } + if (var0 == ScriptOpcodes.WORLDMAP_DISABLEELEMENTCATEGORY) { + HealthBarUpdate.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1] == 1; + WorldMapID.getWorldMap().setCategoryDisabled(var3, var4); + return 1; + } + if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTS) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().getElementsDisabled() ? 1 : 0; + return 1; + } + if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENT) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().isElementDisabled(var3) ? 1 : 0; + return 1; + } + if (var0 == ScriptOpcodes.WORLDMAP_GETDISABLEELEMENTCATEGORY) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapID.getWorldMap().isCategoryDisabled(var3) ? 1 : 0; + return 1; + } + if (var0 == 6638) { + HealthBarUpdate.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; + var12 = new Coord(Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]); + var7 = WorldMapID.getWorldMap().method6352(var3, var12); + if (var7 == null) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var7.packed(); + } + + return 1; + } + AbstractWorldMapIcon var8; + if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_START) { + var8 = WorldMapID.getWorldMap().iconStart(); + if (var8 == null) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var8.getElement(); + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var8.coord2.packed(); + } + + return 1; + } + if (var0 == ScriptOpcodes.WORLDMAP_LISTELEMENT_NEXT) { + var8 = WorldMapID.getWorldMap().iconNext(); + if (var8 == null) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var8.getElement(); + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var8.coord2.packed(); + } + + return 1; + } + WorldMapElement var6; + if (var0 == ScriptOpcodes.MEC_TEXT) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + var6 = class222.getWorldMapElement(var3); + if (var6.name == null) { + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var6.name; + } + + return 1; + } + if (var0 == ScriptOpcodes.MEC_TEXTSIZE) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + var6 = class222.getWorldMapElement(var3); + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.textSize; + return 1; + } + if (var0 == ScriptOpcodes.MEC_CATEGORY) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + var6 = class222.getWorldMapElement(var3); + if (var6 == null) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.category; + } + + return 1; + } + if (var0 == ScriptOpcodes.MEC_SPRITE) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + var6 = class222.getWorldMapElement(var3); + if (var6 == null) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var6.sprite1; + } + + return 1; + } + if (var0 == ScriptOpcodes.WORLDMAP_ELEMENT) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapIcon_0.worldMapEvent.mapElement; + return 1; + } + if (var0 == 6698) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapIcon_0.worldMapEvent.coord1.packed(); + return 1; + } + if (var0 == ScriptOpcodes.WORLDMAP_ELEMENTCOORD) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapIcon_0.worldMapEvent.coord2.packed(); + return 1; + } + return 2; } @ObfuscatedName("fk") diff --git a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java index a9ab96bad8..d0ce0c6828 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferAgeComparator.java @@ -116,24 +116,28 @@ final class GrandExchangeOfferAgeComparator implements Comparator { if (var0 == ScriptOpcodes.CC_GETX) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.x; return 1; - } else if (var0 == ScriptOpcodes.CC_GETY) { + } + if (var0 == ScriptOpcodes.CC_GETY) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.y; return 1; - } else if (var0 == ScriptOpcodes.CC_GETWIDTH) { + } + if (var0 == ScriptOpcodes.CC_GETWIDTH) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.width; return 1; - } else if (var0 == ScriptOpcodes.CC_GETHEIGHT) { + } + if (var0 == ScriptOpcodes.CC_GETHEIGHT) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.height; return 1; - } else if (var0 == ScriptOpcodes.CC_GETHIDE) { + } + if (var0 == ScriptOpcodes.CC_GETHIDE) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; return 1; - } else if (var0 == ScriptOpcodes.CC_GETLAYER) { + } + if (var0 == ScriptOpcodes.CC_GETLAYER) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.parentId; return 1; - } else { - return 2; } + return 2; } @ObfuscatedName("hb") @@ -175,37 +179,35 @@ final class GrandExchangeOfferAgeComparator implements Comparator { if (var1 == 205) { Client.field700 = 250; return true; - } else { - int var2; - int var3; - if (var1 >= 300 && var1 <= 313) { - var2 = (var1 - 300) / 2; - var3 = var1 & 1; - Client.playerAppearance.method3992(var2, var3 == 1); - } - - if (var1 >= 314 && var1 <= 323) { - var2 = (var1 - 314) / 2; - var3 = var1 & 1; - Client.playerAppearance.method3993(var2, var3 == 1); - } - - if (var1 == 324) { - Client.playerAppearance.method4006(false); - } - - if (var1 == 325) { - Client.playerAppearance.method4006(true); - } - - if (var1 == 326) { - PacketBufferNode var4 = Archive.method4265(ClientPacket.field2215, Client.packetWriter.isaacCipher); - Client.playerAppearance.method3995(var4.packetBuffer); - Client.packetWriter.method2219(var4); - return true; - } else { - return false; - } } + int var2; + int var3; + if (var1 >= 300 && var1 <= 313) { + var2 = (var1 - 300) / 2; + var3 = var1 & 1; + Client.playerAppearance.method3992(var2, var3 == 1); + } + + if (var1 >= 314 && var1 <= 323) { + var2 = (var1 - 314) / 2; + var3 = var1 & 1; + Client.playerAppearance.method3993(var2, var3 == 1); + } + + if (var1 == 324) { + Client.playerAppearance.method4006(false); + } + + if (var1 == 325) { + Client.playerAppearance.method4006(true); + } + + if (var1 == 326) { + PacketBufferNode var4 = Archive.method4265(ClientPacket.field2215, Client.packetWriter.isaacCipher); + Client.playerAppearance.method3995(var4.packetBuffer); + Client.packetWriter.method2219(var4); + return true; + } + return false; } } diff --git a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java index b595614a81..65097c1db6 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java @@ -31,19 +31,18 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator { int compare_bridged(GrandExchangeEvent var1, GrandExchangeEvent var2) { if (var2.world == var1.world) { return 0; - } else { - if (this.filterWorlds) { - if (Client.worldId == var1.world) { - return -1; - } - - if (var2.world == Client.worldId) { - return 1; - } + } + if (this.filterWorlds) { + if (Client.worldId == var1.world) { + return -1; } - return var1.world < var2.world ? -1 : 1; + if (var2.world == Client.worldId) { + return 1; + } } + + return var1.world < var2.world ? -1 : 1; } public boolean equals(Object var1) { diff --git a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java index b9491ac68f..c9c90bc6d5 100644 --- a/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java +++ b/runescape-client/src/main/java/GrandExchangeOfferWorldComparator.java @@ -95,10 +95,9 @@ final class GrandExchangeOfferWorldComparator implements Comparator { static String method54(IterableNodeHashTable var0, int var1, String var2) { if (var0 == null) { return var2; - } else { - ObjectNode var3 = (ObjectNode)var0.get((long)var1); - return var3 == null ? var2 : (String)var3.obj; } + ObjectNode var3 = (ObjectNode)var0.get((long)var1); + return var3 == null ? var2 : (String)var3.obj; } @ObfuscatedName("w") @@ -110,16 +109,15 @@ final class GrandExchangeOfferWorldComparator implements Comparator { VarpDefinition var1 = (VarpDefinition)VarpDefinition.VarpDefinition_cached.get((long)var0); if (var1 != null) { return var1; - } else { - byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0); - var1 = new VarpDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); - return var1; } + byte[] var2 = VarpDefinition.VarpDefinition_archive.takeFile(16, var0); + var1 = new VarpDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + VarpDefinition.VarpDefinition_cached.put(var1, (long)var0); + return var1; } @ObfuscatedName("w") @@ -129,7 +127,7 @@ final class GrandExchangeOfferWorldComparator implements Comparator { ) @Export("openURL") public static void openURL(String var0, boolean var1, boolean var2) { - class326.method6243(var0, var1, "openjs", var2); + SpriteBuffer.method6243(var0, var1, "openjs", var2); } @ObfuscatedName("gn") diff --git a/runescape-client/src/main/java/GraphicsObject.java b/runescape-client/src/main/java/GraphicsObject.java index 2f38c89e6c..7583e19792 100644 --- a/runescape-client/src/main/java/GraphicsObject.java +++ b/runescape-client/src/main/java/GraphicsObject.java @@ -225,12 +225,10 @@ public final class GraphicsObject extends Entity { var3.onStockTransmit = var8; } else if (var0 == 1426) { var3.field2681 = var8; - } else { - if (var0 != ScriptOpcodes.CC_SETONRESIZE) { - return 2; - } - + } else if (var0 == ScriptOpcodes.CC_SETONRESIZE) { var3.onResize = var8; + } else { + return 2; } var3.hasListener = true; @@ -245,16 +243,15 @@ public final class GraphicsObject extends Entity { static final int method1948(int var0, int var1) { if (var0 == -1) { return 12345678; - } else { - var1 = (var0 & 127) * var1 / 128; - if (var1 < 2) { - var1 = 2; - } else if (var1 > 126) { - var1 = 126; - } - - return (var0 & 65408) + var1; } + var1 = (var0 & 127) * var1 / 128; + if (var1 < 2) { + var1 = 2; + } else if (var1 > 126) { + var1 = 126; + } + + return (var0 & 65408) + var1; } @ObfuscatedName("az") diff --git a/runescape-client/src/main/java/HealthBar.java b/runescape-client/src/main/java/HealthBar.java index 660afcbddf..a57a51fa41 100644 --- a/runescape-client/src/main/java/HealthBar.java +++ b/runescape-client/src/main/java/HealthBar.java @@ -85,13 +85,11 @@ public class HealthBar extends Node { if (this.definition.int5 + var2.cycle + var2.cycleOffset > var1) { return var2; - } else { - var2.remove(); - return null; } - } else { + var2.remove(); return null; } + return null; } @ObfuscatedName("e") diff --git a/runescape-client/src/main/java/HealthBarDefinition.java b/runescape-client/src/main/java/HealthBarDefinition.java index a4c3723563..9e65c89e45 100644 --- a/runescape-client/src/main/java/HealthBarDefinition.java +++ b/runescape-client/src/main/java/HealthBarDefinition.java @@ -167,19 +167,17 @@ public class HealthBarDefinition extends DualNode { public Sprite getFrontSprite() { if (this.frontSpriteID < 0) { return null; - } else { - Sprite var1 = (Sprite)HealthBarDefinition_cachedSprites.get((long)this.frontSpriteID); - if (var1 != null) { - return var1; - } else { - var1 = class65.loadSprite(HealthBarDefinition_spritesArchive, this.frontSpriteID, 0); - if (var1 != null) { - HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID); - } - - return var1; - } } + Sprite var1 = (Sprite)HealthBarDefinition_cachedSprites.get((long)this.frontSpriteID); + if (var1 != null) { + return var1; + } + var1 = class65.SpriteBuffer_getSprite(HealthBarDefinition_spritesArchive, this.frontSpriteID, 0); + if (var1 != null) { + HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID); + } + + return var1; } @ObfuscatedName("k") @@ -191,18 +189,16 @@ public class HealthBarDefinition extends DualNode { public Sprite getBackSprite() { if (this.backSpriteID < 0) { return null; - } else { - Sprite var1 = (Sprite)HealthBarDefinition_cachedSprites.get((long)this.backSpriteID); - if (var1 != null) { - return var1; - } else { - var1 = class65.loadSprite(HealthBarDefinition_spritesArchive, this.backSpriteID, 0); - if (var1 != null) { - HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID); - } - - return var1; - } } + Sprite var1 = (Sprite)HealthBarDefinition_cachedSprites.get((long)this.backSpriteID); + if (var1 != null) { + return var1; + } + var1 = class65.SpriteBuffer_getSprite(HealthBarDefinition_spritesArchive, this.backSpriteID, 0); + if (var1 != null) { + HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID); + } + + return var1; } } diff --git a/runescape-client/src/main/java/HealthBarUpdate.java b/runescape-client/src/main/java/HealthBarUpdate.java index 4d1b227693..8e8476d104 100644 --- a/runescape-client/src/main/java/HealthBarUpdate.java +++ b/runescape-client/src/main/java/HealthBarUpdate.java @@ -89,13 +89,12 @@ public class HealthBarUpdate extends Node { static boolean method1676(String var0) { if (var0 == null) { return false; - } else { - try { - new URL(var0); - return true; - } catch (MalformedURLException var2) { - return false; - } + } + try { + new URL(var0); + return true; + } catch (MalformedURLException var2) { + return false; } } @@ -210,25 +209,24 @@ public class HealthBarUpdate extends Node { int var3 = var1.readInt(); if (var3 < 0 || AbstractArchive.field3143 != 0 && var3 > AbstractArchive.field3143) { throw new RuntimeException(); - } else if (var2 == 0) { + } + if (var2 == 0) { byte[] var4 = new byte[var3]; var1.readBytes(var4, 0, var3); return var4; - } else { - int var6 = var1.readInt(); - if (var6 < 0 || AbstractArchive.field3143 != 0 && var6 > AbstractArchive.field3143) { - throw new RuntimeException(); - } else { - byte[] var5 = new byte[var6]; - if (var2 == 1) { - BZip2Decompressor.BZip2Decompressor_decompress(var5, var6, var0, var3, 9); - } else { - AbstractArchive.gzipDecompressor.decompress(var1, var5); - } - - return var5; - } } + int var6 = var1.readInt(); + if (var6 < 0 || AbstractArchive.field3143 != 0 && var6 > AbstractArchive.field3143) { + throw new RuntimeException(); + } + byte[] var5 = new byte[var6]; + if (var2 == 1) { + BZip2Decompressor.BZip2Decompressor_decompress(var5, var6, var0, var3, 9); + } else { + AbstractArchive.gzipDecompressor.decompress(var1, var5); + } + + return var5; } @ObfuscatedName("fd") diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java index 06745eeb1c..24b9f93fb7 100644 --- a/runescape-client/src/main/java/HitSplatDefinition.java +++ b/runescape-client/src/main/java/HitSplatDefinition.java @@ -285,19 +285,17 @@ public class HitSplatDefinition extends DualNode { public Sprite method4551() { if (this.field3334 < 0) { return null; - } else { - Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3334); - if (var1 != null) { - return var1; - } else { - var1 = class65.loadSprite(HitSplatDefinition_spritesArchive, this.field3334, 0); - if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3334); - } - - return var1; - } } + Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3334); + if (var1 != null) { + return var1; + } + var1 = class65.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.field3334, 0); + if (var1 != null) { + HitSplatDefinition_cachedSprites.put(var1, (long)this.field3334); + } + + return var1; } @ObfuscatedName("b") @@ -308,19 +306,17 @@ public class HitSplatDefinition extends DualNode { public Sprite method4557() { if (this.field3336 < 0) { return null; - } else { - Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3336); - if (var1 != null) { - return var1; - } else { - var1 = class65.loadSprite(HitSplatDefinition_spritesArchive, this.field3336, 0); - if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3336); - } - - return var1; - } } + Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3336); + if (var1 != null) { + return var1; + } + var1 = class65.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.field3336, 0); + if (var1 != null) { + HitSplatDefinition_cachedSprites.put(var1, (long)this.field3336); + } + + return var1; } @ObfuscatedName("i") @@ -331,19 +327,17 @@ public class HitSplatDefinition extends DualNode { public Sprite method4558() { if (this.field3337 < 0) { return null; - } else { - Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3337); - if (var1 != null) { - return var1; - } else { - var1 = class65.loadSprite(HitSplatDefinition_spritesArchive, this.field3337, 0); - if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3337); - } - - return var1; - } } + Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3337); + if (var1 != null) { + return var1; + } + var1 = class65.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.field3337, 0); + if (var1 != null) { + HitSplatDefinition_cachedSprites.put(var1, (long)this.field3337); + } + + return var1; } @ObfuscatedName("c") @@ -354,19 +348,17 @@ public class HitSplatDefinition extends DualNode { public Sprite method4583() { if (this.field3338 < 0) { return null; - } else { - Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3338); - if (var1 != null) { - return var1; - } else { - var1 = class65.loadSprite(HitSplatDefinition_spritesArchive, this.field3338, 0); - if (var1 != null) { - HitSplatDefinition_cachedSprites.put(var1, (long)this.field3338); - } - - return var1; - } } + Sprite var1 = (Sprite)HitSplatDefinition_cachedSprites.get((long)this.field3338); + if (var1 != null) { + return var1; + } + var1 = class65.SpriteBuffer_getSprite(HitSplatDefinition_spritesArchive, this.field3338, 0); + if (var1 != null) { + HitSplatDefinition_cachedSprites.put(var1, (long)this.field3338); + } + + return var1; } @ObfuscatedName("u") @@ -378,28 +370,26 @@ public class HitSplatDefinition extends DualNode { public Font getFont() { if (this.fontId == -1) { return null; - } else { - Font var1 = (Font)HitSplatDefinition_cachedFonts.get((long)this.fontId); - if (var1 != null) { - return var1; - } else { - AbstractArchive var3 = HitSplatDefinition_spritesArchive; - AbstractArchive var4 = HitSplatDefinition_fontsArchive; - int var5 = this.fontId; - Font var2; - if (!Friend.doesSpriteExist(var3, var5, 0)) { - var2 = null; - } else { - var2 = WallDecoration.getWorldMapSprite(var4.takeFile(var5, 0)); - } - - if (var2 != null) { - HitSplatDefinition_cachedFonts.put(var2, (long)this.fontId); - } - - return var2; - } } + Font var1 = (Font)HitSplatDefinition_cachedFonts.get((long)this.fontId); + if (var1 != null) { + return var1; + } + AbstractArchive var3 = HitSplatDefinition_spritesArchive; + AbstractArchive var4 = HitSplatDefinition_fontsArchive; + int var5 = this.fontId; + Font var2; + if (!Friend.SpriteBuffer_bufferFile(var3, var5, 0)) { + var2 = null; + } else { + var2 = WallDecoration.SpriteBuffer_createFont(var4.takeFile(var5, 0)); + } + + if (var2 != null) { + HitSplatDefinition_cachedFonts.put(var2, (long)this.fontId); + } + + return var2; } @ObfuscatedName("q") diff --git a/runescape-client/src/main/java/Huffman.java b/runescape-client/src/main/java/Huffman.java index e81ee9a0ba..6e2c166adb 100644 --- a/runescape-client/src/main/java/Huffman.java +++ b/runescape-client/src/main/java/Huffman.java @@ -159,139 +159,138 @@ public class Huffman { int decompress(byte[] var1, int var2, byte[] var3, int var4, int var5) { if (var5 == 0) { return 0; - } else { - int var6 = 0; - var5 += var4; - int var7 = var2; + } + int var6 = 0; + var5 += var4; + int var7 = var2; - while (true) { - byte var8 = var1[var7]; - if (var8 < 0) { - var6 = this.keys[var6]; - } else { - ++var6; - } - - int var9; - if ((var9 = this.keys[var6]) < 0) { - var3[var4++] = (byte)(~var9); - if (var4 >= var5) { - break; - } - - var6 = 0; - } - - if ((var8 & 64) != 0) { - var6 = this.keys[var6]; - } else { - ++var6; - } - - if ((var9 = this.keys[var6]) < 0) { - var3[var4++] = (byte)(~var9); - if (var4 >= var5) { - break; - } - - var6 = 0; - } - - if ((var8 & 32) != 0) { - var6 = this.keys[var6]; - } else { - ++var6; - } - - if ((var9 = this.keys[var6]) < 0) { - var3[var4++] = (byte)(~var9); - if (var4 >= var5) { - break; - } - - var6 = 0; - } - - if ((var8 & 16) != 0) { - var6 = this.keys[var6]; - } else { - ++var6; - } - - if ((var9 = this.keys[var6]) < 0) { - var3[var4++] = (byte)(~var9); - if (var4 >= var5) { - break; - } - - var6 = 0; - } - - if ((var8 & 8) != 0) { - var6 = this.keys[var6]; - } else { - ++var6; - } - - if ((var9 = this.keys[var6]) < 0) { - var3[var4++] = (byte)(~var9); - if (var4 >= var5) { - break; - } - - var6 = 0; - } - - if ((var8 & 4) != 0) { - var6 = this.keys[var6]; - } else { - ++var6; - } - - if ((var9 = this.keys[var6]) < 0) { - var3[var4++] = (byte)(~var9); - if (var4 >= var5) { - break; - } - - var6 = 0; - } - - if ((var8 & 2) != 0) { - var6 = this.keys[var6]; - } else { - ++var6; - } - - if ((var9 = this.keys[var6]) < 0) { - var3[var4++] = (byte)(~var9); - if (var4 >= var5) { - break; - } - - var6 = 0; - } - - if ((var8 & 1) != 0) { - var6 = this.keys[var6]; - } else { - ++var6; - } - - if ((var9 = this.keys[var6]) < 0) { - var3[var4++] = (byte)(~var9); - if (var4 >= var5) { - break; - } - - var6 = 0; - } - - ++var7; + while (true) { + byte var8 = var1[var7]; + if (var8 < 0) { + var6 = this.keys[var6]; + } else { + ++var6; } - return var7 + 1 - var2; + int var9; + if ((var9 = this.keys[var6]) < 0) { + var3[var4++] = (byte)(~var9); + if (var4 >= var5) { + break; + } + + var6 = 0; + } + + if ((var8 & 64) != 0) { + var6 = this.keys[var6]; + } else { + ++var6; + } + + if ((var9 = this.keys[var6]) < 0) { + var3[var4++] = (byte)(~var9); + if (var4 >= var5) { + break; + } + + var6 = 0; + } + + if ((var8 & 32) != 0) { + var6 = this.keys[var6]; + } else { + ++var6; + } + + if ((var9 = this.keys[var6]) < 0) { + var3[var4++] = (byte)(~var9); + if (var4 >= var5) { + break; + } + + var6 = 0; + } + + if ((var8 & 16) != 0) { + var6 = this.keys[var6]; + } else { + ++var6; + } + + if ((var9 = this.keys[var6]) < 0) { + var3[var4++] = (byte)(~var9); + if (var4 >= var5) { + break; + } + + var6 = 0; + } + + if ((var8 & 8) != 0) { + var6 = this.keys[var6]; + } else { + ++var6; + } + + if ((var9 = this.keys[var6]) < 0) { + var3[var4++] = (byte)(~var9); + if (var4 >= var5) { + break; + } + + var6 = 0; + } + + if ((var8 & 4) != 0) { + var6 = this.keys[var6]; + } else { + ++var6; + } + + if ((var9 = this.keys[var6]) < 0) { + var3[var4++] = (byte)(~var9); + if (var4 >= var5) { + break; + } + + var6 = 0; + } + + if ((var8 & 2) != 0) { + var6 = this.keys[var6]; + } else { + ++var6; + } + + if ((var9 = this.keys[var6]) < 0) { + var3[var4++] = (byte)(~var9); + if (var4 >= var5) { + break; + } + + var6 = 0; + } + + if ((var8 & 1) != 0) { + var6 = this.keys[var6]; + } else { + ++var6; + } + + if ((var9 = this.keys[var6]) < 0) { + var3[var4++] = (byte)(~var9); + if (var4 >= var5) { + break; + } + + var6 = 0; + } + + ++var7; } + + return var7 + 1 - var2; } @ObfuscatedName("k") diff --git a/runescape-client/src/main/java/Ignored.java b/runescape-client/src/main/java/Ignored.java index e844e8e621..5a236d32f5 100644 --- a/runescape-client/src/main/java/Ignored.java +++ b/runescape-client/src/main/java/Ignored.java @@ -62,10 +62,10 @@ public class Ignored extends User { public static boolean isCharPrintable(char var0) { if (var0 >= ' ' && var0 <= '~') { return true; - } else if (var0 >= 160 && var0 <= 255) { - return true; - } else { - return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; } + if (var0 >= 160 && var0 <= 255) { + return true; + } + return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376; } } diff --git a/runescape-client/src/main/java/Instrument.java b/runescape-client/src/main/java/Instrument.java index 112efbac13..38018585f5 100644 --- a/runescape-client/src/main/java/Instrument.java +++ b/runescape-client/src/main/java/Instrument.java @@ -152,155 +152,172 @@ public class Instrument { class301.clearIntArray(Instrument_samples, 0, var1); if (var2 < 10) { return Instrument_samples; - } else { - double var3 = (double)var1 / ((double)var2 + 0.0D); - this.pitch.reset(); - this.volume.reset(); - int var5 = 0; - int var6 = 0; - int var7 = 0; + } + double var3 = (double)var1 / ((double)var2 + 0.0D); + this.pitch.reset(); + this.volume.reset(); + int var5 = 0; + int var6 = 0; + int var7 = 0; + if (this.pitchModifier != null) { + this.pitchModifier.reset(); + this.pitchModifierAmplitude.reset(); + var5 = (int)((double)(this.pitchModifier.end - this.pitchModifier.start) * 32.768D / var3); + var6 = (int)((double)this.pitchModifier.start * 32.768D / var3); + } + + int var8 = 0; + int var9 = 0; + int var10 = 0; + if (this.volumeMultiplier != null) { + this.volumeMultiplier.reset(); + this.volumeMultiplierAmplitude.reset(); + var8 = (int)((double)(this.volumeMultiplier.end - this.volumeMultiplier.start) * 32.768D / var3); + var9 = (int)((double)this.volumeMultiplier.start * 32.768D / var3); + } + + int var11; + for (var11 = 0; var11 < 5; ++var11) { + if (this.oscillatorVolume[var11] != 0) { + Instrument_phases[var11] = 0; + Instrument_delays[var11] = (int)((double)this.oscillatorDelays[var11] * var3); + Instrument_volumeSteps[var11] = (this.oscillatorVolume[var11] << 14) / 100; + Instrument_pitchSteps[var11] = (int)((double)(this.pitch.end - this.pitch.start) * 32.768D * Math.pow(1.0057929410678534D, (double)this.oscillatorPitch[var11]) / var3); + Instrument_pitchBaseSteps[var11] = (int)((double)this.pitch.start * 32.768D / var3); + } + } + + int var12; + int var13; + int var14; + int var15; + int[] var10000; + for (var11 = 0; var11 < var1; ++var11) { + var12 = this.pitch.doStep(var1); + var13 = this.volume.doStep(var1); if (this.pitchModifier != null) { - this.pitchModifier.reset(); - this.pitchModifierAmplitude.reset(); - var5 = (int)((double)(this.pitchModifier.end - this.pitchModifier.start) * 32.768D / var3); - var6 = (int)((double)this.pitchModifier.start * 32.768D / var3); + var14 = this.pitchModifier.doStep(var1); + var15 = this.pitchModifierAmplitude.doStep(var1); + var12 += this.evaluateWave(var7, var15, this.pitchModifier.form) >> 1; + var7 = var7 + var6 + (var14 * var5 >> 16); } - int var8 = 0; - int var9 = 0; - int var10 = 0; if (this.volumeMultiplier != null) { - this.volumeMultiplier.reset(); - this.volumeMultiplierAmplitude.reset(); - var8 = (int)((double)(this.volumeMultiplier.end - this.volumeMultiplier.start) * 32.768D / var3); - var9 = (int)((double)this.volumeMultiplier.start * 32.768D / var3); + var14 = this.volumeMultiplier.doStep(var1); + var15 = this.volumeMultiplierAmplitude.doStep(var1); + var13 = var13 * ((this.evaluateWave(var10, var15, this.volumeMultiplier.form) >> 1) + 32768) >> 15; + var10 = var10 + var9 + (var14 * var8 >> 16); } - int var11; - for (var11 = 0; var11 < 5; ++var11) { - if (this.oscillatorVolume[var11] != 0) { - Instrument_phases[var11] = 0; - Instrument_delays[var11] = (int)((double)this.oscillatorDelays[var11] * var3); - Instrument_volumeSteps[var11] = (this.oscillatorVolume[var11] << 14) / 100; - Instrument_pitchSteps[var11] = (int)((double)(this.pitch.end - this.pitch.start) * 32.768D * Math.pow(1.0057929410678534D, (double)this.oscillatorPitch[var11]) / var3); - Instrument_pitchBaseSteps[var11] = (int)((double)this.pitch.start * 32.768D / var3); - } - } - - int var12; - int var13; - int var14; - int var15; - int[] var10000; - for (var11 = 0; var11 < var1; ++var11) { - var12 = this.pitch.doStep(var1); - var13 = this.volume.doStep(var1); - if (this.pitchModifier != null) { - var14 = this.pitchModifier.doStep(var1); - var15 = this.pitchModifierAmplitude.doStep(var1); - var12 += this.evaluateWave(var7, var15, this.pitchModifier.form) >> 1; - var7 = var7 + var6 + (var14 * var5 >> 16); - } - - if (this.volumeMultiplier != null) { - var14 = this.volumeMultiplier.doStep(var1); - var15 = this.volumeMultiplierAmplitude.doStep(var1); - var13 = var13 * ((this.evaluateWave(var10, var15, this.volumeMultiplier.form) >> 1) + 32768) >> 15; - var10 = var10 + var9 + (var14 * var8 >> 16); - } - - for (var14 = 0; var14 < 5; ++var14) { - if (this.oscillatorVolume[var14] != 0) { - var15 = Instrument_delays[var14] + var11; - if (var15 < var1) { - var10000 = Instrument_samples; - var10000[var15] += this.evaluateWave(Instrument_phases[var14], var13 * Instrument_volumeSteps[var14] >> 15, this.pitch.form); - var10000 = Instrument_phases; - var10000[var14] += (var12 * Instrument_pitchSteps[var14] >> 16) + Instrument_pitchBaseSteps[var14]; - } + for (var14 = 0; var14 < 5; ++var14) { + if (this.oscillatorVolume[var14] != 0) { + var15 = Instrument_delays[var14] + var11; + if (var15 < var1) { + var10000 = Instrument_samples; + var10000[var15] += this.evaluateWave(Instrument_phases[var14], var13 * Instrument_volumeSteps[var14] >> 15, this.pitch.form); + var10000 = Instrument_phases; + var10000[var14] += (var12 * Instrument_pitchSteps[var14] >> 16) + Instrument_pitchBaseSteps[var14]; } } } + } - int var16; - if (this.release != null) { - this.release.reset(); - this.attack.reset(); - var11 = 0; - boolean var19 = false; - boolean var20 = true; + int var16; + if (this.release != null) { + this.release.reset(); + this.attack.reset(); + var11 = 0; + boolean var19 = false; + boolean var20 = true; - for (var14 = 0; var14 < var1; ++var14) { - var15 = this.release.doStep(var1); - var16 = this.attack.doStep(var1); - if (var20) { - var12 = (var15 * (this.release.end - this.release.start) >> 8) + this.release.start; - } else { - var12 = (var16 * (this.release.end - this.release.start) >> 8) + this.release.start; - } + for (var14 = 0; var14 < var1; ++var14) { + var15 = this.release.doStep(var1); + var16 = this.attack.doStep(var1); + if (var20) { + var12 = (var15 * (this.release.end - this.release.start) >> 8) + this.release.start; + } else { + var12 = (var16 * (this.release.end - this.release.start) >> 8) + this.release.start; + } - var11 += 256; - if (var11 >= var12) { - var11 = 0; - var20 = !var20; - } + var11 += 256; + if (var11 >= var12) { + var11 = 0; + var20 = !var20; + } - if (var20) { - Instrument_samples[var14] = 0; - } + if (var20) { + Instrument_samples[var14] = 0; } } + } - if (this.delayTime > 0 && this.delayDecay > 0) { - var11 = (int)((double)this.delayTime * var3); + if (this.delayTime > 0 && this.delayDecay > 0) { + var11 = (int)((double)this.delayTime * var3); - for (var12 = var11; var12 < var1; ++var12) { - var10000 = Instrument_samples; - var10000[var12] += Instrument_samples[var12 - var11] * this.delayDecay / 100; - } + for (var12 = var11; var12 < var1; ++var12) { + var10000 = Instrument_samples; + var10000[var12] += Instrument_samples[var12 - var11] * this.delayDecay / 100; } + } - if (this.filter.pairs[0] > 0 || this.filter.pairs[1] > 0) { - this.filterEnvelope.reset(); - var11 = this.filterEnvelope.doStep(var1 + 1); - var12 = this.filter.compute(0, (float)var11 / 65536.0F); - var13 = this.filter.compute(1, (float)var11 / 65536.0F); - if (var1 >= var12 + var13) { - var14 = 0; - var15 = var13; - if (var13 > var1 - var12) { + if (this.filter.pairs[0] > 0 || this.filter.pairs[1] > 0) { + this.filterEnvelope.reset(); + var11 = this.filterEnvelope.doStep(var1 + 1); + var12 = this.filter.compute(0, (float)var11 / 65536.0F); + var13 = this.filter.compute(1, (float)var11 / 65536.0F); + if (var1 >= var12 + var13) { + var14 = 0; + var15 = var13; + if (var13 > var1 - var12) { + var15 = var1 - var12; + } + + int var17; + while (var14 < var15) { + var16 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.forwardMultiplier >> 16); + + for (var17 = 0; var17 < var12; ++var17) { + var16 += (int)((long)Instrument_samples[var14 + var12 - 1 - var17] * (long)AudioFilter.coefficients[0][var17] >> 16); + } + + for (var17 = 0; var17 < var14; ++var17) { + var16 -= (int)((long)Instrument_samples[var14 - 1 - var17] * (long)AudioFilter.coefficients[1][var17] >> 16); + } + + Instrument_samples[var14] = var16; + var11 = this.filterEnvelope.doStep(var1 + 1); + ++var14; + } + + var15 = 128; + + while (true) { + if (var15 > var1 - var12) { var15 = var1 - var12; } - int var17; + int var18; while (var14 < var15) { - var16 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.forwardMultiplier >> 16); + var17 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.forwardMultiplier >> 16); - for (var17 = 0; var17 < var12; ++var17) { - var16 += (int)((long)Instrument_samples[var14 + var12 - 1 - var17] * (long)AudioFilter.coefficients[0][var17] >> 16); + for (var18 = 0; var18 < var12; ++var18) { + var17 += (int)((long)Instrument_samples[var14 + var12 - 1 - var18] * (long)AudioFilter.coefficients[0][var18] >> 16); } - for (var17 = 0; var17 < var14; ++var17) { - var16 -= (int)((long)Instrument_samples[var14 - 1 - var17] * (long)AudioFilter.coefficients[1][var17] >> 16); + for (var18 = 0; var18 < var13; ++var18) { + var17 -= (int)((long)Instrument_samples[var14 - 1 - var18] * (long)AudioFilter.coefficients[1][var18] >> 16); } - Instrument_samples[var14] = var16; + Instrument_samples[var14] = var17; var11 = this.filterEnvelope.doStep(var1 + 1); ++var14; } - var15 = 128; + if (var14 >= var1 - var12) { + while (var14 < var1) { + var17 = 0; - while (true) { - if (var15 > var1 - var12) { - var15 = var1 - var12; - } - - int var18; - while (var14 < var15) { - var17 = (int)((long)Instrument_samples[var14 + var12] * (long)AudioFilter.forwardMultiplier >> 16); - - for (var18 = 0; var18 < var12; ++var18) { + for (var18 = var14 + var12 - var1; var18 < var12; ++var18) { var17 += (int)((long)Instrument_samples[var14 + var12 - 1 - var18] * (long)AudioFilter.coefficients[0][var18] >> 16); } @@ -309,48 +326,30 @@ public class Instrument { } Instrument_samples[var14] = var17; - var11 = this.filterEnvelope.doStep(var1 + 1); + this.filterEnvelope.doStep(var1 + 1); ++var14; } - - if (var14 >= var1 - var12) { - while (var14 < var1) { - var17 = 0; - - for (var18 = var14 + var12 - var1; var18 < var12; ++var18) { - var17 += (int)((long)Instrument_samples[var14 + var12 - 1 - var18] * (long)AudioFilter.coefficients[0][var18] >> 16); - } - - for (var18 = 0; var18 < var13; ++var18) { - var17 -= (int)((long)Instrument_samples[var14 - 1 - var18] * (long)AudioFilter.coefficients[1][var18] >> 16); - } - - Instrument_samples[var14] = var17; - this.filterEnvelope.doStep(var1 + 1); - ++var14; - } - break; - } - - var12 = this.filter.compute(0, (float)var11 / 65536.0F); - var13 = this.filter.compute(1, (float)var11 / 65536.0F); - var15 += 128; + break; } + + var12 = this.filter.compute(0, (float)var11 / 65536.0F); + var13 = this.filter.compute(1, (float)var11 / 65536.0F); + var15 += 128; } } - - for (var11 = 0; var11 < var1; ++var11) { - if (Instrument_samples[var11] < -32768) { - Instrument_samples[var11] = -32768; - } - - if (Instrument_samples[var11] > 32767) { - Instrument_samples[var11] = 32767; - } - } - - return Instrument_samples; } + + for (var11 = 0; var11 < var1; ++var11) { + if (Instrument_samples[var11] < -32768) { + Instrument_samples[var11] = -32768; + } + + if (Instrument_samples[var11] > 32767) { + Instrument_samples[var11] = 32767; + } + } + + return Instrument_samples; } @ObfuscatedName("w") @@ -358,13 +357,14 @@ public class Instrument { final int evaluateWave(int var1, int var2, int var3) { if (var3 == 1) { return (var1 & 32767) < 16384 ? var2 : -var2; - } else if (var3 == 2) { - return Instrument_sine[var1 & 32767] * var2 >> 14; - } else if (var3 == 3) { - return (var2 * (var1 & 32767) >> 14) - var2; - } else { - return var3 == 4 ? var2 * Instrument_noise[var1 / 2607 & 32767] : 0; } + if (var3 == 2) { + return Instrument_sine[var1 & 32767] * var2 >> 14; + } + if (var3 == 3) { + return (var2 * (var1 & 32767) >> 14) - var2; + } + return var3 == 4 ? var2 * Instrument_noise[var1 / 2607 & 32767] : 0; } @ObfuscatedName("e") diff --git a/runescape-client/src/main/java/Interpreter.java b/runescape-client/src/main/java/Interpreter.java index e12727e900..6793335efb 100644 --- a/runescape-client/src/main/java/Interpreter.java +++ b/runescape-client/src/main/java/Interpreter.java @@ -102,14 +102,13 @@ public class Interpreter { static final boolean method1936(int var0) { if (var0 < 0) { return false; - } else { - int var1 = Client.menuOpcodes[var0]; - if (var1 >= 2000) { - var1 -= 2000; - } - - return var1 == 1007; } + int var1 = Client.menuOpcodes[var0]; + if (var1 >= 2000) { + var1 -= 2000; + } + + return var1 == 1007; } @ObfuscatedName("jo") diff --git a/runescape-client/src/main/java/ItemContainer.java b/runescape-client/src/main/java/ItemContainer.java index 91dfcad439..c2f9a67ba1 100644 --- a/runescape-client/src/main/java/ItemContainer.java +++ b/runescape-client/src/main/java/ItemContainer.java @@ -42,17 +42,16 @@ public class ItemContainer extends Node { FloorUnderlayDefinition var1 = (FloorUnderlayDefinition)FloorUnderlayDefinition.FloorUnderlayDefinition_cached.get((long)var0); if (var1 != null) { return var1; - } else { - byte[] var2 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var0); - var1 = new FloorUnderlayDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2), var0); - } - - var1.postDecode(); - FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0); - return var1; } + byte[] var2 = FloorUnderlayDefinition.FloorUnderlayDefinition_archive.takeFile(1, var0); + var1 = new FloorUnderlayDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2), var0); + } + + var1.postDecode(); + FloorUnderlayDefinition.FloorUnderlayDefinition_cached.put(var1, (long)var0); + return var1; } @ObfuscatedName("ac") diff --git a/runescape-client/src/main/java/ItemDefinition.java b/runescape-client/src/main/java/ItemDefinition.java index 4dbbb7ac5d..5c481e43c1 100644 --- a/runescape-client/src/main/java/ItemDefinition.java +++ b/runescape-client/src/main/java/ItemDefinition.java @@ -611,25 +611,24 @@ public class ItemDefinition extends DualNode { ModelData var4 = ModelData.method2769(ItemDefinition_modelArchive, this.model, 0); if (var4 == null) { return null; - } else { - if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { - var4.method2786(this.resizeX, this.resizeY, this.resizeZ); - } - - if (this.recolorFrom != null) { - for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { - var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); - } - } - - if (this.retextureFrom != null) { - for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { - var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); - } - } - - return var4; } + if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { + var4.method2786(this.resizeX, this.resizeY, this.resizeZ); + } + + if (this.recolorFrom != null) { + for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { + var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); + } + } + + if (this.retextureFrom != null) { + for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { + var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); + } + } + + return var4; } @ObfuscatedName("c") @@ -656,34 +655,32 @@ public class ItemDefinition extends DualNode { Model var5 = (Model)ItemDefinition_cachedModels.get((long)this.id); if (var5 != null) { return var5; - } else { - ModelData var6 = ModelData.method2769(ItemDefinition_modelArchive, this.model, 0); - if (var6 == null) { - return null; - } else { - if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { - var6.method2786(this.resizeX, this.resizeY, this.resizeZ); - } + } + ModelData var6 = ModelData.method2769(ItemDefinition_modelArchive, this.model, 0); + if (var6 == null) { + return null; + } + if (this.resizeX != 128 || this.resizeY != 128 || this.resizeZ != 128) { + var6.method2786(this.resizeX, this.resizeY, this.resizeZ); + } - int var4; - if (this.recolorFrom != null) { - for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { - var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); - } - } - - if (this.retextureFrom != null) { - for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { - var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); - } - } - - var5 = var6.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); - var5.isSingleTile = true; - ItemDefinition_cachedModels.put(var5, (long)this.id); - return var5; + int var4; + if (this.recolorFrom != null) { + for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { + var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); } } + + if (this.retextureFrom != null) { + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { + var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); + } + } + + var5 = var6.toModel(this.ambient + 64, this.contrast + 768, -50, -10, -50); + var5.isSingleTile = true; + ItemDefinition_cachedModels.put(var5, (long)this.id); + return var5; } @ObfuscatedName("u") @@ -727,22 +724,21 @@ public class ItemDefinition extends DualNode { if (var2 == -1) { return true; - } else { - boolean var5 = true; - if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { - var5 = false; - } - - if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { - var5 = false; - } - - if (var4 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { - var5 = false; - } - - return var5; } + boolean var5 = true; + if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { + var5 = false; + } + + if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { + var5 = false; + } + + if (var4 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var4, 0)) { + var5 = false; + } + + return var5; } @ObfuscatedName("v") @@ -762,43 +758,42 @@ public class ItemDefinition extends DualNode { if (var2 == -1) { return null; - } else { - ModelData var5 = ModelData.method2769(ItemDefinition_modelArchive, var2, 0); - if (var3 != -1) { - ModelData var6 = ModelData.method2769(ItemDefinition_modelArchive, var3, 0); - if (var4 != -1) { - ModelData var7 = ModelData.method2769(ItemDefinition_modelArchive, var4, 0); - ModelData[] var8 = new ModelData[]{var5, var6, var7}; - var5 = new ModelData(var8, 3); - } else { - ModelData[] var10 = new ModelData[]{var5, var6}; - var5 = new ModelData(var10, 2); - } - } - - if (!var1 && this.maleOffset != 0) { - var5.method2782(0, this.maleOffset, 0); - } - - if (var1 && this.femaleOffset != 0) { - var5.method2782(0, this.femaleOffset, 0); - } - - int var9; - if (this.recolorFrom != null) { - for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { - var5.recolor(this.recolorFrom[var9], this.recolorTo[var9]); - } - } - - if (this.retextureFrom != null) { - for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { - var5.retexture(this.retextureFrom[var9], this.retextureTo[var9]); - } - } - - return var5; } + ModelData var5 = ModelData.method2769(ItemDefinition_modelArchive, var2, 0); + if (var3 != -1) { + ModelData var6 = ModelData.method2769(ItemDefinition_modelArchive, var3, 0); + if (var4 != -1) { + ModelData var7 = ModelData.method2769(ItemDefinition_modelArchive, var4, 0); + ModelData[] var8 = new ModelData[]{var5, var6, var7}; + var5 = new ModelData(var8, 3); + } else { + ModelData[] var10 = new ModelData[]{var5, var6}; + var5 = new ModelData(var10, 2); + } + } + + if (!var1 && this.maleOffset != 0) { + var5.method2782(0, this.maleOffset, 0); + } + + if (var1 && this.femaleOffset != 0) { + var5.method2782(0, this.femaleOffset, 0); + } + + int var9; + if (this.recolorFrom != null) { + for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { + var5.recolor(this.recolorFrom[var9], this.recolorTo[var9]); + } + } + + if (this.retextureFrom != null) { + for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { + var5.retexture(this.retextureFrom[var9], this.retextureTo[var9]); + } + } + + return var5; } @ObfuscatedName("y") @@ -816,18 +811,17 @@ public class ItemDefinition extends DualNode { if (var2 == -1) { return true; - } else { - boolean var4 = true; - if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { - var4 = false; - } - - if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { - var4 = false; - } - - return var4; } + boolean var4 = true; + if (!ItemDefinition_modelArchive.tryLoadFile(var2, 0)) { + var4 = false; + } + + if (var3 != -1 && !ItemDefinition_modelArchive.tryLoadFile(var3, 0)) { + var4 = false; + } + + return var4; } @ObfuscatedName("g") @@ -845,29 +839,28 @@ public class ItemDefinition extends DualNode { if (var2 == -1) { return null; - } else { - ModelData var4 = ModelData.method2769(ItemDefinition_modelArchive, var2, 0); - if (var3 != -1) { - ModelData var5 = ModelData.method2769(ItemDefinition_modelArchive, var3, 0); - ModelData[] var6 = new ModelData[]{var4, var5}; - var4 = new ModelData(var6, 2); - } - - int var7; - if (this.recolorFrom != null) { - for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { - var4.recolor(this.recolorFrom[var7], this.recolorTo[var7]); - } - } - - if (this.retextureFrom != null) { - for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { - var4.retexture(this.retextureFrom[var7], this.retextureTo[var7]); - } - } - - return var4; } + ModelData var4 = ModelData.method2769(ItemDefinition_modelArchive, var2, 0); + if (var3 != -1) { + ModelData var5 = ModelData.method2769(ItemDefinition_modelArchive, var3, 0); + ModelData[] var6 = new ModelData[]{var4, var5}; + var4 = new ModelData(var6, 2); + } + + int var7; + if (this.recolorFrom != null) { + for (var7 = 0; var7 < this.recolorFrom.length; ++var7) { + var4.recolor(this.recolorFrom[var7], this.recolorTo[var7]); + } + } + + if (this.retextureFrom != null) { + for (var7 = 0; var7 < this.retextureFrom.length; ++var7) { + var4.retexture(this.retextureFrom[var7], this.retextureTo[var7]); + } + } + + return var4; } @ObfuscatedName("a") @@ -913,12 +906,10 @@ public class ItemDefinition extends DualNode { if (this.shiftClickIndex != -1 && this.inventoryActions != null) { if (this.shiftClickIndex >= 0) { return this.inventoryActions[this.shiftClickIndex] != null ? this.shiftClickIndex : -1; - } else { - return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1; } - } else { - return -1; + return "Drop".equalsIgnoreCase(this.inventoryActions[4]) ? 4 : -1; } + return -1; } @ObfuscatedName("q") diff --git a/runescape-client/src/main/java/IterableDualNodeQueue.java b/runescape-client/src/main/java/IterableDualNodeQueue.java index 272ae2f043..4e50989541 100644 --- a/runescape-client/src/main/java/IterableDualNodeQueue.java +++ b/runescape-client/src/main/java/IterableDualNodeQueue.java @@ -60,10 +60,9 @@ public class IterableDualNodeQueue implements Iterable { DualNode var1 = this.sentinel.previousDual; if (var1 == this.sentinel) { return null; - } else { - var1.removeDual(); - return var1; } + var1.removeDual(); + return var1; } @ObfuscatedName("k") @@ -91,10 +90,9 @@ public class IterableDualNodeQueue implements Iterable { if (var2 == this.sentinel) { this.head = null; return null; - } else { - this.head = var2.previousDual; - return var2; } + this.head = var2.previousDual; + return var2; } @ObfuscatedName("b") @@ -107,10 +105,9 @@ public class IterableDualNodeQueue implements Iterable { if (var1 == this.sentinel) { this.head = null; return null; - } else { - this.head = var1.previousDual; - return var1; } + this.head = var1.previousDual; + return var1; } public Iterator iterator() { diff --git a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java index 32fc0b849b..b5aea42027 100644 --- a/runescape-client/src/main/java/IterableDualNodeQueueIterator.java +++ b/runescape-client/src/main/java/IterableDualNodeQueueIterator.java @@ -56,9 +56,8 @@ public class IterableDualNodeQueueIterator implements Iterator { public void remove() { if (this.last == null) { throw new IllegalStateException(); - } else { - this.last.removeDual(); - this.last = null; } + this.last.removeDual(); + this.last = null; } } diff --git a/runescape-client/src/main/java/IterableNodeDeque.java b/runescape-client/src/main/java/IterableNodeDeque.java index a2713e7599..919cd71d1a 100644 --- a/runescape-client/src/main/java/IterableNodeDeque.java +++ b/runescape-client/src/main/java/IterableNodeDeque.java @@ -91,10 +91,9 @@ public class IterableNodeDeque implements Iterable, Collection { if (var2 == this.sentinel) { this.field3538 = null; return null; - } else { - this.field3538 = var2.previous; - return var2; } + this.field3538 = var2.previous; + return var2; } @ObfuscatedName("b") @@ -107,10 +106,9 @@ public class IterableNodeDeque implements Iterable, Collection { if (var1 == this.sentinel) { this.field3538 = null; return null; - } else { - this.field3538 = var1.previous; - return var1; } + this.field3538 = var1.previous; + return var1; } @ObfuscatedName("i") @@ -125,7 +123,7 @@ public class IterableNodeDeque implements Iterable, Collection { } @ObfuscatedName("c") - @Export("isEmpty") + @Export("rsIsEmpty") public boolean rsIsEmpty() { return this.sentinel.previous == this.sentinel; } diff --git a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java index 0cc60b5504..05f683e5cd 100644 --- a/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java +++ b/runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java @@ -53,10 +53,9 @@ public class IterableNodeDequeDescendingIterator implements Iterator { public void remove() { if (this.last == null) { throw new IllegalStateException(); - } else { - this.last.remove(); - this.last = null; } + this.last.remove(); + this.last = null; } public Object next() { diff --git a/runescape-client/src/main/java/IterableNodeHashTable.java b/runescape-client/src/main/java/IterableNodeHashTable.java index 4a511363a9..46e0c1ab2b 100644 --- a/runescape-client/src/main/java/IterableNodeHashTable.java +++ b/runescape-client/src/main/java/IterableNodeHashTable.java @@ -122,20 +122,19 @@ public final class IterableNodeHashTable implements Iterable { Node var1; if (this.index > 0 && this.buckets[this.index - 1] != this.current) { var1 = this.current; - this.current = var1.previous; - return var1; - } else { - do { - if (this.index >= this.size) { - return null; - } - - var1 = this.buckets[this.index++].previous; - } while(var1 == this.buckets[this.index - 1]); - this.current = var1.previous; return var1; } + do { + if (this.index >= this.size) { + return null; + } + + var1 = this.buckets[this.index++].previous; + } while(var1 == this.buckets[this.index - 1]); + + this.current = var1.previous; + return var1; } public Iterator iterator() { diff --git a/runescape-client/src/main/java/IterableNodeHashTableIterator.java b/runescape-client/src/main/java/IterableNodeHashTableIterator.java index 8e327771fa..72fcfeb640 100644 --- a/runescape-client/src/main/java/IterableNodeHashTableIterator.java +++ b/runescape-client/src/main/java/IterableNodeHashTableIterator.java @@ -49,48 +49,45 @@ public class IterableNodeHashTableIterator implements Iterator { public boolean hasNext() { if (this.hashTable.buckets[this.index - 1] != this.head) { return true; - } else { - while (this.index < this.hashTable.size) { - if (this.hashTable.buckets[this.index++].previous != this.hashTable.buckets[this.index - 1]) { - this.head = this.hashTable.buckets[this.index - 1].previous; - return true; - } - - this.head = this.hashTable.buckets[this.index - 1]; + } + while (this.index < this.hashTable.size) { + if (this.hashTable.buckets[this.index++].previous != this.hashTable.buckets[this.index - 1]) { + this.head = this.hashTable.buckets[this.index - 1].previous; + return true; } - return false; + this.head = this.hashTable.buckets[this.index - 1]; } + + return false; } public Object next() { Node var1; if (this.hashTable.buckets[this.index - 1] != this.head) { var1 = this.head; - this.head = var1.previous; - this.last = var1; - return var1; - } else { - do { - if (this.index >= this.hashTable.size) { - return null; - } - - var1 = this.hashTable.buckets[this.index++].previous; - } while(var1 == this.hashTable.buckets[this.index - 1]); - this.head = var1.previous; this.last = var1; return var1; } + do { + if (this.index >= this.hashTable.size) { + return null; + } + + var1 = this.hashTable.buckets[this.index++].previous; + } while(var1 == this.hashTable.buckets[this.index - 1]); + + this.head = var1.previous; + this.last = var1; + return var1; } public void remove() { if (this.last == null) { throw new IllegalStateException(); - } else { - this.last.remove(); - this.last = null; } + this.last.remove(); + this.last = null; } } diff --git a/runescape-client/src/main/java/KitDefinition.java b/runescape-client/src/main/java/KitDefinition.java index 3157f0e4c4..c9b7e9320e 100644 --- a/runescape-client/src/main/java/KitDefinition.java +++ b/runescape-client/src/main/java/KitDefinition.java @@ -135,17 +135,16 @@ public class KitDefinition extends DualNode { public boolean ready() { if (this.models2 == null) { return true; - } else { - boolean var1 = true; - - for (int var2 = 0; var2 < this.models2.length; ++var2) { - if (!class288.KitDefinition_modelsArchive.tryLoadFile(this.models2[var2], 0)) { - var1 = false; - } - } - - return var1; } + boolean var1 = true; + + for (int var2 = 0; var2 < this.models2.length; ++var2) { + if (!class288.KitDefinition_modelsArchive.tryLoadFile(this.models2[var2], 0)) { + var1 = false; + } + } + + return var1; } @ObfuscatedName("l") @@ -157,35 +156,34 @@ public class KitDefinition extends DualNode { public ModelData getModelData() { if (this.models2 == null) { return null; - } else { - ModelData[] var1 = new ModelData[this.models2.length]; - - for (int var2 = 0; var2 < this.models2.length; ++var2) { - var1[var2] = ModelData.method2769(class288.KitDefinition_modelsArchive, this.models2[var2], 0); - } - - ModelData var4; - if (var1.length == 1) { - var4 = var1[0]; - } else { - var4 = new ModelData(var1, var1.length); - } - - int var3; - if (this.recolorFrom != null) { - for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { - var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); - } - } - - if (this.retextureFrom != null) { - for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { - var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); - } - } - - return var4; } + ModelData[] var1 = new ModelData[this.models2.length]; + + for (int var2 = 0; var2 < this.models2.length; ++var2) { + var1[var2] = ModelData.method2769(class288.KitDefinition_modelsArchive, this.models2[var2], 0); + } + + ModelData var4; + if (var1.length == 1) { + var4 = var1[0]; + } else { + var4 = new ModelData(var1, var1.length); + } + + int var3; + if (this.recolorFrom != null) { + for (var3 = 0; var3 < this.recolorFrom.length; ++var3) { + var4.recolor(this.recolorFrom[var3], this.recolorTo[var3]); + } + } + + if (this.retextureFrom != null) { + for (var3 = 0; var3 < this.retextureFrom.length; ++var3) { + var4.retexture(this.retextureFrom[var3], this.retextureTo[var3]); + } + } + + return var4; } @ObfuscatedName("b") diff --git a/runescape-client/src/main/java/LinkDeque.java b/runescape-client/src/main/java/LinkDeque.java index 8e792772d1..0edbdbf4b1 100644 --- a/runescape-client/src/main/java/LinkDeque.java +++ b/runescape-client/src/main/java/LinkDeque.java @@ -51,10 +51,9 @@ public class LinkDeque { if (var1 == this.sentinel) { this.current = null; return null; - } else { - this.current = var1.previous; - return var1; } + this.current = var1.previous; + return var1; } @ObfuscatedName("e") @@ -67,9 +66,8 @@ public class LinkDeque { if (var1 == this.sentinel) { this.current = null; return null; - } else { - this.current = var1.previous; - return var1; } + this.current = var1.previous; + return var1; } } diff --git a/runescape-client/src/main/java/MenuAction.java b/runescape-client/src/main/java/MenuAction.java index 4e5321db2e..13f79ce53a 100644 --- a/runescape-client/src/main/java/MenuAction.java +++ b/runescape-client/src/main/java/MenuAction.java @@ -152,17 +152,16 @@ public class MenuAction { var17 = var3 - var4; if (var17 != 0) { return var17; - } else { - for (int var19 = 0; var19 < var16; ++var19) { - var20 = var0.charAt(var19); - char var13 = var1.charAt(var19); - if (var13 != var20) { - return WorldMapArea.method387(var20, var2) - WorldMapArea.method387(var13, var2); - } - } - - return 0; } + for (int var19 = 0; var19 < var16; ++var19) { + var20 = var0.charAt(var19); + char var13 = var1.charAt(var19); + if (var13 != var20) { + return WorldMapArea.method387(var20, var2) - WorldMapArea.method387(var13, var2); + } + } + + return 0; } @ObfuscatedName("q") @@ -185,50 +184,63 @@ public class MenuAction { if (var0 == ScriptOpcodes.CC_GETSCROLLX) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.scrollX; return 1; - } else if (var0 == ScriptOpcodes.CC_GETSCROLLY) { + } + if (var0 == ScriptOpcodes.CC_GETSCROLLY) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.scrollY; return 1; - } else if (var0 == ScriptOpcodes.CC_GETTEXT) { + } + if (var0 == ScriptOpcodes.CC_GETTEXT) { Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.text; return 1; - } else if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { + } + if (var0 == ScriptOpcodes.CC_GETSCROLLWIDTH) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.scrollWidth; return 1; - } else if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { + } + if (var0 == ScriptOpcodes.CC_GETSCROLLHEIGHT) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.scrollHeight; return 1; - } else if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { + } + if (var0 == ScriptOpcodes.CC_GETMODELZOOM) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.modelZoom; return 1; - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { + } + if (var0 == ScriptOpcodes.CC_GETMODELANGLE_X) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.modelAngleX; return 1; - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { + } + if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Z) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.modelAngleZ; return 1; - } else if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { + } + if (var0 == ScriptOpcodes.CC_GETMODELANGLE_Y) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.modelAngleY; return 1; - } else if (var0 == ScriptOpcodes.CC_GETTRANSTOP) { + } + if (var0 == ScriptOpcodes.CC_GETTRANSTOP) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.transparencyTop; return 1; - } else if (var0 == ScriptOpcodes.CC_GETTRANSBOT) { + } + if (var0 == ScriptOpcodes.CC_GETTRANSBOT) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.transparencyBot; return 1; - } else if (var0 == ScriptOpcodes.CC_GETCOLOUR) { + } + if (var0 == ScriptOpcodes.CC_GETCOLOUR) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.color; return 1; - } else if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { + } + if (var0 == ScriptOpcodes.CC_GETFILLCOLOUR) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.color2; return 1; - } else if (var0 == ScriptOpcodes.CC_GETFILLMODE) { + } + if (var0 == ScriptOpcodes.CC_GETFILLMODE) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); return 1; - } else if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { + } + if (var0 == ScriptOpcodes.CC_GETMODELTRANSPARENT) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; return 1; - } else { - return 2; } + return 2; } } diff --git a/runescape-client/src/main/java/MidiFileReader.java b/runescape-client/src/main/java/MidiFileReader.java index 3024477450..4cc456bd70 100644 --- a/runescape-client/src/main/java/MidiFileReader.java +++ b/runescape-client/src/main/java/MidiFileReader.java @@ -151,21 +151,20 @@ public class MidiFileReader { if (var5 != 240 && var5 != 247) { return this.method3840(var1, var5); - } else { - int var3 = this.buffer.readVarInt(); - if (var5 == 247 && var3 > 0) { - int var4 = this.buffer.array[this.buffer.offset] & 255; - if (var4 >= 241 && var4 <= 243 || var4 == 246 || var4 == 248 || var4 >= 250 && var4 <= 252 || var4 == 254) { - ++this.buffer.offset; - this.field2464[var1] = var4; - return this.method3840(var1, var4); - } - } - - Buffer var10000 = this.buffer; - var10000.offset += var3; - return 0; } + int var3 = this.buffer.readVarInt(); + if (var5 == 247 && var3 > 0) { + int var4 = this.buffer.array[this.buffer.offset] & 255; + if (var4 >= 241 && var4 <= 243 || var4 == 246 || var4 == 248 || var4 >= 250 && var4 <= 252 || var4 == 254) { + ++this.buffer.offset; + this.field2464[var1] = var4; + return this.method3840(var1, var4); + } + } + + Buffer var10000 = this.buffer; + var10000.offset += var3; + return 0; } @ObfuscatedName("x") @@ -179,7 +178,8 @@ public class MidiFileReader { var10000 = this.buffer; var10000.offset += var4; return 1; - } else if (var7 == 81) { + } + if (var7 == 81) { int var5 = this.buffer.readMedium(); var4 -= 3; int var6 = this.trackLengths[var1]; @@ -188,24 +188,22 @@ public class MidiFileReader { var10000 = this.buffer; var10000.offset += var4; return 2; - } else { - var10000 = this.buffer; - var10000.offset += var4; - return 3; } - } else { - byte var3 = field2468[var2 - 128]; - var4 = var2; - if (var3 >= 1) { - var4 = var2 | this.buffer.readUnsignedByte() << 8; - } - - if (var3 >= 2) { - var4 |= this.buffer.readUnsignedByte() << 16; - } - - return var4; + var10000 = this.buffer; + var10000.offset += var4; + return 3; } + byte var3 = field2468[var2 - 128]; + var4 = var2; + if (var3 >= 1) { + var4 = var2 | this.buffer.readUnsignedByte() << 8; + } + + if (var3 >= 2) { + var4 |= this.buffer.readUnsignedByte() << 16; + } + + return var4; } @ObfuscatedName("r") diff --git a/runescape-client/src/main/java/MidiPcmStream.java b/runescape-client/src/main/java/MidiPcmStream.java index af2c8b8264..67667bf3d5 100644 --- a/runescape-client/src/main/java/MidiPcmStream.java +++ b/runescape-client/src/main/java/MidiPcmStream.java @@ -221,6 +221,7 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedSignature( signature = "()Ldx;" ) + @Export("firstSubStream") protected synchronized PcmStream firstSubStream() { return this.patchStream; } @@ -229,6 +230,7 @@ public class MidiPcmStream extends PcmStream { @ObfuscatedSignature( signature = "()Ldx;" ) + @Export("nextSubStream") protected synchronized PcmStream nextSubStream() { return null; } @@ -976,9 +978,8 @@ public class MidiPcmStream extends PcmStream { } return true; - } else { - return false; } + return false; } @ObfuscatedName("bp") @@ -1066,19 +1067,17 @@ public class MidiPcmStream extends PcmStream { } return true; - } else { - var1.stream.method2536(var1.field2455, this.method3731(var1), this.method3732(var1)); - return false; } - } else { - var1.method3826(); - var1.remove(); - if (var1.field2438 > 0 && var1 == this.field2428[var1.field2440][var1.field2438]) { - this.field2428[var1.field2440][var1.field2438] = null; - } - - return true; + var1.stream.method2536(var1.field2455, this.method3731(var1), this.method3732(var1)); + return false; } + var1.method3826(); + var1.remove(); + if (var1.field2438 > 0 && var1 == this.field2428[var1.field2440][var1.field2438]) { + this.field2428[var1.field2440][var1.field2438] = null; + } + + return true; } @ObfuscatedName("w") diff --git a/runescape-client/src/main/java/MilliClock.java b/runescape-client/src/main/java/MilliClock.java index e7240f34fb..0950c0e505 100644 --- a/runescape-client/src/main/java/MilliClock.java +++ b/runescape-client/src/main/java/MilliClock.java @@ -126,8 +126,7 @@ public class MilliClock extends Clock { static int method3468(int var0, int var1, int var2) { if ((Tiles.Tiles_renderFlags[var0][var1][var2] & 8) != 0) { return 0; - } else { - return var0 > 0 && (Tiles.Tiles_renderFlags[1][var1][var2] & 2) != 0 ? var0 - 1 : var0; } + return var0 > 0 && (Tiles.Tiles_renderFlags[1][var1][var2] & 2) != 0 ? var0 - 1 : var0; } } diff --git a/runescape-client/src/main/java/Model.java b/runescape-client/src/main/java/Model.java index f028cbe96b..7ca9d24542 100644 --- a/runescape-client/src/main/java/Model.java +++ b/runescape-client/src/main/java/Model.java @@ -381,84 +381,82 @@ public class Model extends Entity { var10 = var10 + 127 >> 7; if (var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) { return this; - } else { - Model var11; - if (var5) { - var11 = new Model(); - var11.verticesCount = this.verticesCount; - var11.indicesCount = this.indicesCount; - var11.field1691 = this.field1691; - var11.verticesX = this.verticesX; - var11.verticesZ = this.verticesZ; - var11.indices1 = this.indices1; - var11.indices2 = this.indices2; - var11.indices3 = this.indices3; - var11.faceColors1 = this.faceColors1; - var11.faceColors2 = this.faceColors2; - var11.faceColors3 = this.faceColors3; - var11.faceRenderPriorities = this.faceRenderPriorities; - var11.faceAlphas = this.faceAlphas; - var11.field1688 = this.field1688; - var11.faceTextures = this.faceTextures; - var11.field1690 = this.field1690; - var11.field1692 = this.field1692; - var11.field1693 = this.field1693; - var11.field1694 = this.field1694; - var11.vertexLabels = this.vertexLabels; - var11.faceLabelsAlpha = this.faceLabelsAlpha; - var11.isSingleTile = this.isSingleTile; - var11.verticesY = new int[var11.verticesCount]; - } else { - var11 = this; - } - - int var12; - int var13; - int var14; - int var15; - int var16; - int var17; - int var18; - int var19; - int var20; - int var21; - if (var6 == 0) { - for (var12 = 0; var12 < var11.verticesCount; ++var12) { - var13 = var2 + this.verticesX[var12]; - var14 = var4 + this.verticesZ[var12]; - var15 = var13 & 127; - var16 = var14 & 127; - var17 = var13 >> 7; - var18 = var14 >> 7; - var19 = var1[var17][var18] * (128 - var15) + var1[var17 + 1][var18] * var15 >> 7; - var20 = var1[var17][var18 + 1] * (128 - var15) + var15 * var1[var17 + 1][var18 + 1] >> 7; - var21 = var19 * (128 - var16) + var20 * var16 >> 7; - var11.verticesY[var12] = var21 + this.verticesY[var12] - var3; - } - } else { - for (var12 = 0; var12 < var11.verticesCount; ++var12) { - var13 = (-this.verticesY[var12] << 16) / super.height; - if (var13 < var6) { - var14 = var2 + this.verticesX[var12]; - var15 = var4 + this.verticesZ[var12]; - var16 = var14 & 127; - var17 = var15 & 127; - var18 = var14 >> 7; - var19 = var15 >> 7; - var20 = var1[var18][var19] * (128 - var16) + var1[var18 + 1][var19] * var16 >> 7; - var21 = var1[var18][var19 + 1] * (128 - var16) + var16 * var1[var18 + 1][var19 + 1] >> 7; - int var22 = var20 * (128 - var17) + var21 * var17 >> 7; - var11.verticesY[var12] = (var6 - var13) * (var22 - var3) / var6 + this.verticesY[var12]; - } - } - } - - var11.resetBounds(); - return var11; } - } else { - return this; + Model var11; + if (var5) { + var11 = new Model(); + var11.verticesCount = this.verticesCount; + var11.indicesCount = this.indicesCount; + var11.field1691 = this.field1691; + var11.verticesX = this.verticesX; + var11.verticesZ = this.verticesZ; + var11.indices1 = this.indices1; + var11.indices2 = this.indices2; + var11.indices3 = this.indices3; + var11.faceColors1 = this.faceColors1; + var11.faceColors2 = this.faceColors2; + var11.faceColors3 = this.faceColors3; + var11.faceRenderPriorities = this.faceRenderPriorities; + var11.faceAlphas = this.faceAlphas; + var11.field1688 = this.field1688; + var11.faceTextures = this.faceTextures; + var11.field1690 = this.field1690; + var11.field1692 = this.field1692; + var11.field1693 = this.field1693; + var11.field1694 = this.field1694; + var11.vertexLabels = this.vertexLabels; + var11.faceLabelsAlpha = this.faceLabelsAlpha; + var11.isSingleTile = this.isSingleTile; + var11.verticesY = new int[var11.verticesCount]; + } else { + var11 = this; + } + + int var12; + int var13; + int var14; + int var15; + int var16; + int var17; + int var18; + int var19; + int var20; + int var21; + if (var6 == 0) { + for (var12 = 0; var12 < var11.verticesCount; ++var12) { + var13 = var2 + this.verticesX[var12]; + var14 = var4 + this.verticesZ[var12]; + var15 = var13 & 127; + var16 = var14 & 127; + var17 = var13 >> 7; + var18 = var14 >> 7; + var19 = var1[var17][var18] * (128 - var15) + var1[var17 + 1][var18] * var15 >> 7; + var20 = var1[var17][var18 + 1] * (128 - var15) + var15 * var1[var17 + 1][var18 + 1] >> 7; + var21 = var19 * (128 - var16) + var20 * var16 >> 7; + var11.verticesY[var12] = var21 + this.verticesY[var12] - var3; + } + } else { + for (var12 = 0; var12 < var11.verticesCount; ++var12) { + var13 = (-this.verticesY[var12] << 16) / super.height; + if (var13 < var6) { + var14 = var2 + this.verticesX[var12]; + var15 = var4 + this.verticesZ[var12]; + var16 = var14 & 127; + var17 = var15 & 127; + var18 = var14 >> 7; + var19 = var15 >> 7; + var20 = var1[var18][var19] * (128 - var16) + var1[var18 + 1][var19] * var16 >> 7; + var21 = var1[var18][var19 + 1] * (128 - var16) + var16 * var1[var18 + 1][var19 + 1] >> 7; + int var22 = var20 * (128 - var17) + var21 * var17 >> 7; + var11.verticesY[var12] = (var6 - var13) * (var22 - var3) / var6 + this.verticesY[var12]; + } + } + } + + var11.resetBounds(); + return var11; } + return this; } @ObfuscatedName("w") diff --git a/runescape-client/src/main/java/ModelData.java b/runescape-client/src/main/java/ModelData.java index 0c49a91bff..1feef7bf5f 100644 --- a/runescape-client/src/main/java/ModelData.java +++ b/runescape-client/src/main/java/ModelData.java @@ -1046,81 +1046,79 @@ public class ModelData extends Entity { var10 = var10 + 127 >> 7; if (var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) { return this; + } + ModelData var11 = new ModelData(); + var11.verticesCount = this.verticesCount; + var11.faceCount = this.faceCount; + var11.field1555 = this.field1555; + var11.verticesX = this.verticesX; + var11.verticesZ = this.verticesZ; + var11.indices1 = this.indices1; + var11.indices2 = this.indices2; + var11.indices3 = this.indices3; + var11.field1557 = this.field1557; + var11.field1559 = this.field1559; + var11.faceAlphas = this.faceAlphas; + var11.textureCoords = this.textureCoords; + var11.faceColors = this.faceColors; + var11.faceTextures = this.faceTextures; + var11.field1563 = this.field1563; + var11.textureRenderTypes = this.textureRenderTypes; + var11.texTriangleX = this.texTriangleX; + var11.texTriangleY = this.texTriangleY; + var11.texTriangleZ = this.texTriangleZ; + var11.field1569 = this.field1569; + var11.field1553 = this.field1553; + var11.vertexLabels = this.vertexLabels; + var11.faceLabelsAlpha = this.faceLabelsAlpha; + var11.field1580 = this.field1580; + var11.field1577 = this.field1577; + var11.verticesY = new int[var11.verticesCount]; + int var12; + int var13; + int var14; + int var15; + int var16; + int var17; + int var18; + int var19; + int var20; + int var21; + if (var6 == 0) { + for (var12 = 0; var12 < var11.verticesCount; ++var12) { + var13 = var2 + this.verticesX[var12]; + var14 = var4 + this.verticesZ[var12]; + var15 = var13 & 127; + var16 = var14 & 127; + var17 = var13 >> 7; + var18 = var14 >> 7; + var19 = var1[var17][var18] * (128 - var15) + var1[var17 + 1][var18] * var15 >> 7; + var20 = var1[var17][var18 + 1] * (128 - var15) + var15 * var1[var17 + 1][var18 + 1] >> 7; + var21 = var19 * (128 - var16) + var20 * var16 >> 7; + var11.verticesY[var12] = var21 + this.verticesY[var12] - var3; + } } else { - ModelData var11 = new ModelData(); - var11.verticesCount = this.verticesCount; - var11.faceCount = this.faceCount; - var11.field1555 = this.field1555; - var11.verticesX = this.verticesX; - var11.verticesZ = this.verticesZ; - var11.indices1 = this.indices1; - var11.indices2 = this.indices2; - var11.indices3 = this.indices3; - var11.field1557 = this.field1557; - var11.field1559 = this.field1559; - var11.faceAlphas = this.faceAlphas; - var11.textureCoords = this.textureCoords; - var11.faceColors = this.faceColors; - var11.faceTextures = this.faceTextures; - var11.field1563 = this.field1563; - var11.textureRenderTypes = this.textureRenderTypes; - var11.texTriangleX = this.texTriangleX; - var11.texTriangleY = this.texTriangleY; - var11.texTriangleZ = this.texTriangleZ; - var11.field1569 = this.field1569; - var11.field1553 = this.field1553; - var11.vertexLabels = this.vertexLabels; - var11.faceLabelsAlpha = this.faceLabelsAlpha; - var11.field1580 = this.field1580; - var11.field1577 = this.field1577; - var11.verticesY = new int[var11.verticesCount]; - int var12; - int var13; - int var14; - int var15; - int var16; - int var17; - int var18; - int var19; - int var20; - int var21; - if (var6 == 0) { - for (var12 = 0; var12 < var11.verticesCount; ++var12) { - var13 = var2 + this.verticesX[var12]; - var14 = var4 + this.verticesZ[var12]; - var15 = var13 & 127; + for (var12 = 0; var12 < var11.verticesCount; ++var12) { + var13 = (-this.verticesY[var12] << 16) / super.height; + if (var13 < var6) { + var14 = var2 + this.verticesX[var12]; + var15 = var4 + this.verticesZ[var12]; var16 = var14 & 127; - var17 = var13 >> 7; + var17 = var15 & 127; var18 = var14 >> 7; - var19 = var1[var17][var18] * (128 - var15) + var1[var17 + 1][var18] * var15 >> 7; - var20 = var1[var17][var18 + 1] * (128 - var15) + var15 * var1[var17 + 1][var18 + 1] >> 7; - var21 = var19 * (128 - var16) + var20 * var16 >> 7; - var11.verticesY[var12] = var21 + this.verticesY[var12] - var3; - } - } else { - for (var12 = 0; var12 < var11.verticesCount; ++var12) { - var13 = (-this.verticesY[var12] << 16) / super.height; - if (var13 < var6) { - var14 = var2 + this.verticesX[var12]; - var15 = var4 + this.verticesZ[var12]; - var16 = var14 & 127; - var17 = var15 & 127; - var18 = var14 >> 7; - var19 = var15 >> 7; - var20 = var1[var18][var19] * (128 - var16) + var1[var18 + 1][var19] * var16 >> 7; - var21 = var1[var18][var19 + 1] * (128 - var16) + var16 * var1[var18 + 1][var19 + 1] >> 7; - int var22 = var20 * (128 - var17) + var21 * var17 >> 7; - var11.verticesY[var12] = (var6 - var13) * (var22 - var3) / var6 + this.verticesY[var12]; - } + var19 = var15 >> 7; + var20 = var1[var18][var19] * (128 - var16) + var1[var18 + 1][var19] * var16 >> 7; + var21 = var1[var18][var19 + 1] * (128 - var16) + var16 * var1[var18 + 1][var19 + 1] >> 7; + int var22 = var20 * (128 - var17) + var21 * var17 >> 7; + var11.verticesY[var12] = (var6 - var13) * (var22 - var3) / var6 + this.verticesY[var12]; } } - - var11.invalidate(); - return var11; } - } else { - return this; + + var11.invalidate(); + return var11; } + return this; } @ObfuscatedName("b") diff --git a/runescape-client/src/main/java/ModelData0.java b/runescape-client/src/main/java/ModelData0.java index 376c72ecf9..e39243a12b 100644 --- a/runescape-client/src/main/java/ModelData0.java +++ b/runescape-client/src/main/java/ModelData0.java @@ -88,7 +88,8 @@ public class ModelData0 { } return 1; - } else if (var0 == ScriptOpcodes.CC_SETSIZE) { + } + if (var0 == ScriptOpcodes.CC_SETSIZE) { HealthBarUpdate.Interpreter_intStackSize -= 4; var4.rawWidth = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; var4.rawHeight = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; @@ -101,7 +102,8 @@ public class ModelData0 { } return 1; - } else if (var0 == ScriptOpcodes.CC_SETHIDE) { + } + if (var0 == ScriptOpcodes.CC_SETHIDE) { boolean var5 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; if (var5 != var4.isHidden) { var4.isHidden = var5; @@ -109,14 +111,15 @@ public class ModelData0 { } return 1; - } else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { + } + if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) { var4.noClickThrough = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; return 1; - } else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { + } + if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) { var4.noScrollThrough = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; return 1; - } else { - return 2; } + return 2; } } diff --git a/runescape-client/src/main/java/MouseHandler.java b/runescape-client/src/main/java/MouseHandler.java index 3f02016f0f..82b704083b 100644 --- a/runescape-client/src/main/java/MouseHandler.java +++ b/runescape-client/src/main/java/MouseHandler.java @@ -161,9 +161,8 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi int var2 = var1.getButton(); if (!var1.isAltDown() && var2 != 2) { return !var1.isMetaDown() && var2 != 3 ? 1 : 2; - } else { - return 4; } + return 4; } public final synchronized void mouseMoved(MouseEvent var1) { @@ -258,9 +257,8 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi if (var1 == 1) { return var0 * var2; - } else { - return var2; } + return var2; } @ObfuscatedName("e") @@ -299,105 +297,101 @@ public class MouseHandler implements MouseListener, MouseMotionListener, FocusLi var0.exportIndex(); if (var1 != 0) { throw new RuntimeException(); - } else { - var0.importIndex(); + } + var0.importIndex(); - for (var2 = 0; var2 < Players.Players_count; ++var2) { - var3 = Players.Players_indices[var2]; - if ((Players.field1252[var3] & 1) != 0) { - if (var1 > 0) { - --var1; + for (var2 = 0; var2 < Players.Players_count; ++var2) { + var3 = Players.Players_indices[var2]; + if ((Players.field1252[var3] & 1) != 0) { + if (var1 > 0) { + --var1; + var10000 = Players.field1252; + var10000[var3] = (byte)(var10000[var3] | 2); + } else { + var4 = var0.readBits(1); + if (var4 == 0) { + var1 = World.method1686(var0); var10000 = Players.field1252; var10000[var3] = (byte)(var10000[var3] | 2); } else { - var4 = var0.readBits(1); - if (var4 == 0) { - var1 = World.method1686(var0); - var10000 = Players.field1252; - var10000[var3] = (byte)(var10000[var3] | 2); - } else { - WorldMapIcon_0.method210(var0, var3); - } - } - } - } - - var0.exportIndex(); - if (var1 != 0) { - throw new RuntimeException(); - } else { - var0.importIndex(); - - for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { - var3 = Players.Players_emptyIndices[var2]; - if ((Players.field1252[var3] & 1) != 0) { - if (var1 > 0) { - --var1; - var10000 = Players.field1252; - var10000[var3] = (byte)(var10000[var3] | 2); - } else { - var4 = var0.readBits(1); - if (var4 == 0) { - var1 = World.method1686(var0); - var10000 = Players.field1252; - var10000[var3] = (byte)(var10000[var3] | 2); - } else if (class226.updateExternalPlayer(var0, var3)) { - var10000 = Players.field1252; - var10000[var3] = (byte)(var10000[var3] | 2); - } - } - } - } - - var0.exportIndex(); - if (var1 != 0) { - throw new RuntimeException(); - } else { - var0.importIndex(); - - for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { - var3 = Players.Players_emptyIndices[var2]; - if ((Players.field1252[var3] & 1) == 0) { - if (var1 > 0) { - --var1; - var10000 = Players.field1252; - var10000[var3] = (byte)(var10000[var3] | 2); - } else { - var4 = var0.readBits(1); - if (var4 == 0) { - var1 = World.method1686(var0); - var10000 = Players.field1252; - var10000[var3] = (byte)(var10000[var3] | 2); - } else if (class226.updateExternalPlayer(var0, var3)) { - var10000 = Players.field1252; - var10000[var3] = (byte)(var10000[var3] | 2); - } - } - } - } - - var0.exportIndex(); - if (var1 != 0) { - throw new RuntimeException(); - } else { - Players.Players_count = 0; - Players.Players_emptyIdxCount = 0; - - for (var2 = 1; var2 < 2048; ++var2) { - var10000 = Players.field1252; - var10000[var2] = (byte)(var10000[var2] >> 1); - Player var5 = Client.players[var2]; - if (var5 != null) { - Players.Players_indices[++Players.Players_count - 1] = var2; - } else { - Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var2; - } - } - + WorldMapIcon_0.method210(var0, var3); } } } } + + var0.exportIndex(); + if (var1 != 0) { + throw new RuntimeException(); + } + var0.importIndex(); + + for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { + var3 = Players.Players_emptyIndices[var2]; + if ((Players.field1252[var3] & 1) != 0) { + if (var1 > 0) { + --var1; + var10000 = Players.field1252; + var10000[var3] = (byte)(var10000[var3] | 2); + } else { + var4 = var0.readBits(1); + if (var4 == 0) { + var1 = World.method1686(var0); + var10000 = Players.field1252; + var10000[var3] = (byte)(var10000[var3] | 2); + } else if (class226.updateExternalPlayer(var0, var3)) { + var10000 = Players.field1252; + var10000[var3] = (byte)(var10000[var3] | 2); + } + } + } + } + + var0.exportIndex(); + if (var1 != 0) { + throw new RuntimeException(); + } + var0.importIndex(); + + for (var2 = 0; var2 < Players.Players_emptyIdxCount; ++var2) { + var3 = Players.Players_emptyIndices[var2]; + if ((Players.field1252[var3] & 1) == 0) { + if (var1 > 0) { + --var1; + var10000 = Players.field1252; + var10000[var3] = (byte)(var10000[var3] | 2); + } else { + var4 = var0.readBits(1); + if (var4 == 0) { + var1 = World.method1686(var0); + var10000 = Players.field1252; + var10000[var3] = (byte)(var10000[var3] | 2); + } else if (class226.updateExternalPlayer(var0, var3)) { + var10000 = Players.field1252; + var10000[var3] = (byte)(var10000[var3] | 2); + } + } + } + } + + var0.exportIndex(); + if (var1 != 0) { + throw new RuntimeException(); + } + Players.Players_count = 0; + Players.Players_emptyIdxCount = 0; + + for (var2 = 1; var2 < 2048; ++var2) { + var10000 = Players.field1252; + var10000[var2] = (byte)(var10000[var2] >> 1); + Player var5 = Client.players[var2]; + if (var5 != null) { + Players.Players_indices[++Players.Players_count - 1] = var2; + } else { + Players.Players_emptyIndices[++Players.Players_emptyIdxCount - 1] = var2; + } + } + } @ObfuscatedName("v") diff --git a/runescape-client/src/main/java/MusicPatch.java b/runescape-client/src/main/java/MusicPatch.java index 8c05cd130a..d50a539aad 100644 --- a/runescape-client/src/main/java/MusicPatch.java +++ b/runescape-client/src/main/java/MusicPatch.java @@ -536,17 +536,16 @@ public class MusicPatch extends Node { SpotAnimationDefinition var1 = (SpotAnimationDefinition)SpotAnimationDefinition.SpotAnimationDefinition_cached.get((long)var0); if (var1 != null) { return var1; - } else { - byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); - var1 = new SpotAnimationDefinition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); - return var1; } + byte[] var2 = SpotAnimationDefinition.SpotAnimationDefinition_archive.takeFile(13, var0); + var1 = new SpotAnimationDefinition(); + var1.id = var0; + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + SpotAnimationDefinition.SpotAnimationDefinition_cached.put(var1, (long)var0); + return var1; } @ObfuscatedName("e") diff --git a/runescape-client/src/main/java/MusicPatchNode2.java b/runescape-client/src/main/java/MusicPatchNode2.java index af663807ce..1f08f2c389 100644 --- a/runescape-client/src/main/java/MusicPatchNode2.java +++ b/runescape-client/src/main/java/MusicPatchNode2.java @@ -65,8 +65,7 @@ public class MusicPatchNode2 { Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); if (var1 == null) { return -1; - } else { - return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; } + return var1.previousDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.previousDual).count; } } diff --git a/runescape-client/src/main/java/MusicPatchPcmStream.java b/runescape-client/src/main/java/MusicPatchPcmStream.java index 2e2e973cab..1146fb3442 100644 --- a/runescape-client/src/main/java/MusicPatchPcmStream.java +++ b/runescape-client/src/main/java/MusicPatchPcmStream.java @@ -128,9 +128,8 @@ public class MusicPatchPcmStream extends PcmStream { MusicPatchNode var1 = (MusicPatchNode)this.queue.last(); if (var1 == null) { return null; - } else { - return (PcmStream)(var1.stream != null ? var1.stream : this.nextSubStream()); } + return (PcmStream)(var1.stream != null ? var1.stream : this.nextSubStream()); } @ObfuscatedName("b") diff --git a/runescape-client/src/main/java/NPC.java b/runescape-client/src/main/java/NPC.java index a7d57a5786..67b925c76c 100644 --- a/runescape-client/src/main/java/NPC.java +++ b/runescape-client/src/main/java/NPC.java @@ -134,31 +134,29 @@ public final class NPC extends Actor { protected final Model getModel() { if (this.definition == null) { return null; - } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? GrandExchangeEvent.getSequenceDefinition(super.sequence) : null; - SequenceDefinition var2 = super.movementSequence != -1 && (super.readySequence != super.movementSequence || var1 == null) ? GrandExchangeEvent.getSequenceDefinition(super.movementSequence) : null; - Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame); - if (var3 == null) { - return null; - } else { - var3.calculateBoundsCylinder(); - super.defaultHeight = var3.height; - if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) { - Model var4 = MusicPatch.getSpotAnimationDefinition(super.spotAnimation).getModel(super.spotAnimationFrame); - if (var4 != null) { - var4.offsetBy(0, -super.heightOffset, 0); - Model[] var5 = new Model[]{var3, var4}; - var3 = new Model(var5, 2); - } - } - - if (this.definition.size == 1) { - var3.isSingleTile = true; - } - - return var3; + } + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? GrandExchangeEvent.getSequenceDefinition(super.sequence) : null; + SequenceDefinition var2 = super.movementSequence != -1 && (super.readySequence != super.movementSequence || var1 == null) ? GrandExchangeEvent.getSequenceDefinition(super.movementSequence) : null; + Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame); + if (var3 == null) { + return null; + } + var3.calculateBoundsCylinder(); + super.defaultHeight = var3.height; + if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) { + Model var4 = MusicPatch.getSpotAnimationDefinition(super.spotAnimation).getModel(super.spotAnimationFrame); + if (var4 != null) { + var4.offsetBy(0, -super.heightOffset, 0); + Model[] var5 = new Model[]{var3, var4}; + var3 = new Model(var5, 2); } } + + if (this.definition.size == 1) { + var3.isSingleTile = true; + } + + return var3; } @ObfuscatedName("v") @@ -179,78 +177,112 @@ public final class NPC extends Actor { static int method1977(int var0, Script var1, boolean var2) { if (var0 < 1000) { return Skeleton.method3064(var0, var1, var2); - } else if (var0 < 1100) { - return ModelData0.method3250(var0, var1, var2); - } else if (var0 < 1200) { - return class83.method1994(var0, var1, var2); - } else if (var0 < 1300) { - return WorldMapDecoration.method324(var0, var1, var2); - } else if (var0 < 1400) { - return UserComparator9.method3389(var0, var1, var2); - } else if (var0 < 1500) { - return GraphicsObject.method1943(var0, var1, var2); - } else if (var0 < 1600) { - return GrandExchangeOfferAgeComparator.method147(var0, var1, var2); - } else if (var0 < 1700) { - return MenuAction.method1992(var0, var1, var2); - } else if (var0 < 1800) { - return class169.method3501(var0, var1, var2); - } else if (var0 < 1900) { - return StudioGame.method4137(var0, var1, var2); - } else if (var0 < 2000) { - return ArchiveLoader.method1100(var0, var1, var2); - } else if (var0 < 2100) { - return ModelData0.method3250(var0, var1, var2); - } else if (var0 < 2200) { - return class83.method1994(var0, var1, var2); - } else if (var0 < 2300) { - return WorldMapDecoration.method324(var0, var1, var2); - } else if (var0 < 2400) { - return UserComparator9.method3389(var0, var1, var2); - } else if (var0 < 2500) { - return GraphicsObject.method1943(var0, var1, var2); - } else if (var0 < 2600) { - return ScriptEvent.method1127(var0, var1, var2); - } else if (var0 < 2700) { - return TextureProvider.method2743(var0, var1, var2); - } else if (var0 < 2800) { - return UrlRequester.method3306(var0, var1, var2); - } else if (var0 < 2900) { - return FloorUnderlayDefinition.method4433(var0, var1, var2); - } else if (var0 < 3000) { - return ArchiveLoader.method1100(var0, var1, var2); - } else if (var0 < 3200) { - return class30.method536(var0, var1, var2); - } else if (var0 < 3300) { - return AbstractArchive.method4172(var0, var1, var2); - } else if (var0 < 3400) { - return WorldMapID.method540(var0, var1, var2); - } else if (var0 < 3500) { - return class65.method1175(var0, var1, var2); - } else if (var0 < 3700) { - return class30.method535(var0, var1, var2); - } else if (var0 < 4000) { - return FriendSystem.method1817(var0, var1, var2); - } else if (var0 < 4100) { - return EnumDefinition.method4532(var0, var1, var2); - } else if (var0 < 4200) { - return class208.method3941(var0, var1, var2); - } else if (var0 < 4300) { - return FontName.method5316(var0, var1, var2); - } else if (var0 < 5100) { - return ClientPreferences.method1753(var0, var1, var2); - } else if (var0 < 5400) { - return UserComparator6.method3436(var0, var1, var2); - } else if (var0 < 5600) { - return WorldMapSectionType.method239(var0, var1, var2); - } else if (var0 < 5700) { - return WorldMapData_1.method696(var0, var1, var2); - } else if (var0 < 6300) { - return WorldMapSectionType.method242(var0, var1, var2); - } else if (var0 < 6600) { - return class197.method3703(var0, var1, var2); - } else { - return var0 < 6700 ? GrandExchangeOffer.method114(var0, var1, var2) : 2; } + if (var0 < 1100) { + return ModelData0.method3250(var0, var1, var2); + } + if (var0 < 1200) { + return class83.method1994(var0, var1, var2); + } + if (var0 < 1300) { + return WorldMapDecoration.method324(var0, var1, var2); + } + if (var0 < 1400) { + return UserComparator9.method3389(var0, var1, var2); + } + if (var0 < 1500) { + return GraphicsObject.method1943(var0, var1, var2); + } + if (var0 < 1600) { + return GrandExchangeOfferAgeComparator.method147(var0, var1, var2); + } + if (var0 < 1700) { + return MenuAction.method1992(var0, var1, var2); + } + if (var0 < 1800) { + return class169.method3501(var0, var1, var2); + } + if (var0 < 1900) { + return StudioGame.method4137(var0, var1, var2); + } + if (var0 < 2000) { + return ArchiveLoader.method1100(var0, var1, var2); + } + if (var0 < 2100) { + return ModelData0.method3250(var0, var1, var2); + } + if (var0 < 2200) { + return class83.method1994(var0, var1, var2); + } + if (var0 < 2300) { + return WorldMapDecoration.method324(var0, var1, var2); + } + if (var0 < 2400) { + return UserComparator9.method3389(var0, var1, var2); + } + if (var0 < 2500) { + return GraphicsObject.method1943(var0, var1, var2); + } + if (var0 < 2600) { + return ScriptEvent.method1127(var0, var1, var2); + } + if (var0 < 2700) { + return TextureProvider.method2743(var0, var1, var2); + } + if (var0 < 2800) { + return UrlRequester.method3306(var0, var1, var2); + } + if (var0 < 2900) { + return FloorUnderlayDefinition.method4433(var0, var1, var2); + } + if (var0 < 3000) { + return ArchiveLoader.method1100(var0, var1, var2); + } + if (var0 < 3200) { + return class30.method536(var0, var1, var2); + } + if (var0 < 3300) { + return AbstractArchive.method4172(var0, var1, var2); + } + if (var0 < 3400) { + return WorldMapID.method540(var0, var1, var2); + } + if (var0 < 3500) { + return class65.method1175(var0, var1, var2); + } + if (var0 < 3700) { + return class30.method535(var0, var1, var2); + } + if (var0 < 4000) { + return FriendSystem.method1817(var0, var1, var2); + } + if (var0 < 4100) { + return EnumDefinition.method4532(var0, var1, var2); + } + if (var0 < 4200) { + return class208.method3941(var0, var1, var2); + } + if (var0 < 4300) { + return FontName.method5316(var0, var1, var2); + } + if (var0 < 5100) { + return ClientPreferences.method1753(var0, var1, var2); + } + if (var0 < 5400) { + return UserComparator6.method3436(var0, var1, var2); + } + if (var0 < 5600) { + return WorldMapSectionType.method239(var0, var1, var2); + } + if (var0 < 5700) { + return WorldMapData_1.method696(var0, var1, var2); + } + if (var0 < 6300) { + return WorldMapSectionType.method242(var0, var1, var2); + } + if (var0 < 6600) { + return class197.method3703(var0, var1, var2); + } + return var0 < 6700 ? GrandExchangeOffer.method114(var0, var1, var2) : 2; } } diff --git a/runescape-client/src/main/java/NPCDefinition.java b/runescape-client/src/main/java/NPCDefinition.java index b07ab1ea26..3e4e43ea3a 100644 --- a/runescape-client/src/main/java/NPCDefinition.java +++ b/runescape-client/src/main/java/NPCDefinition.java @@ -389,68 +389,67 @@ public class NPCDefinition extends DualNode { if (this.transforms != null) { NPCDefinition var12 = this.transform(); return var12 == null ? null : var12.getModel(var1, var2, var3, var4); - } else { - Model var5 = (Model)NpcDefinition_cachedModels.get((long)this.id); - if (var5 == null) { - boolean var6 = false; - - for (int var7 = 0; var7 < this.models.length; ++var7) { - if (!NpcDefinition_modelArchive.tryLoadFile(this.models[var7], 0)) { - var6 = true; - } - } - - if (var6) { - return null; - } - - ModelData[] var8 = new ModelData[this.models.length]; - - int var9; - for (var9 = 0; var9 < this.models.length; ++var9) { - var8[var9] = ModelData.method2769(NpcDefinition_modelArchive, this.models[var9], 0); - } - - ModelData var11; - if (var8.length == 1) { - var11 = var8[0]; - } else { - var11 = new ModelData(var8, var8.length); - } - - if (this.recolorFrom != null) { - for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { - var11.recolor(this.recolorFrom[var9], this.recolorTo[var9]); - } - } - - if (this.retextureFrom != null) { - for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { - var11.retexture(this.retextureFrom[var9], this.retextureTo[var9]); - } - } - - var5 = var11.toModel(this.field3489 + 64, this.field3477 + 850, -30, -50, -30); - NpcDefinition_cachedModels.put(var5, (long)this.id); - } - - Model var10; - if (var1 != null && var3 != null) { - var10 = var1.applyTransformations(var5, var2, var3, var4); - } else if (var1 != null) { - var10 = var1.transformActorModel(var5, var2); - } else if (var3 != null) { - var10 = var3.transformActorModel(var5, var4); - } else { - var10 = var5.toSharedSequenceModel(true); - } - - if (this.widthScale != 128 || this.heightScale != 128) { - var10.scale(this.widthScale, this.heightScale, this.widthScale); - } - - return var10; } + Model var5 = (Model)NpcDefinition_cachedModels.get((long)this.id); + if (var5 == null) { + boolean var6 = false; + + for (int var7 = 0; var7 < this.models.length; ++var7) { + if (!NpcDefinition_modelArchive.tryLoadFile(this.models[var7], 0)) { + var6 = true; + } + } + + if (var6) { + return null; + } + + ModelData[] var8 = new ModelData[this.models.length]; + + int var9; + for (var9 = 0; var9 < this.models.length; ++var9) { + var8[var9] = ModelData.method2769(NpcDefinition_modelArchive, this.models[var9], 0); + } + + ModelData var11; + if (var8.length == 1) { + var11 = var8[0]; + } else { + var11 = new ModelData(var8, var8.length); + } + + if (this.recolorFrom != null) { + for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { + var11.recolor(this.recolorFrom[var9], this.recolorTo[var9]); + } + } + + if (this.retextureFrom != null) { + for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { + var11.retexture(this.retextureFrom[var9], this.retextureTo[var9]); + } + } + + var5 = var11.toModel(this.field3489 + 64, this.field3477 + 850, -30, -50, -30); + NpcDefinition_cachedModels.put(var5, (long)this.id); + } + + Model var10; + if (var1 != null && var3 != null) { + var10 = var1.applyTransformations(var5, var2, var3, var4); + } else if (var1 != null) { + var10 = var1.transformActorModel(var5, var2); + } else if (var3 != null) { + var10 = var3.transformActorModel(var5, var4); + } else { + var10 = var5.toSharedSequenceModel(true); + } + + if (this.widthScale != 128 || this.heightScale != 128) { + var10.scale(this.widthScale, this.heightScale, this.widthScale); + } + + return var10; } @ObfuscatedName("b") @@ -463,49 +462,48 @@ public class NPCDefinition extends DualNode { if (this.transforms != null) { NPCDefinition var1 = this.transform(); return var1 == null ? null : var1.getModelData(); - } else if (this.field3463 == null) { + } + if (this.field3463 == null) { return null; - } else { - boolean var5 = false; + } + boolean var5 = false; - for (int var2 = 0; var2 < this.field3463.length; ++var2) { - if (!NpcDefinition_modelArchive.tryLoadFile(this.field3463[var2], 0)) { - var5 = true; - } - } - - if (var5) { - return null; - } else { - ModelData[] var6 = new ModelData[this.field3463.length]; - - for (int var3 = 0; var3 < this.field3463.length; ++var3) { - var6[var3] = ModelData.method2769(NpcDefinition_modelArchive, this.field3463[var3], 0); - } - - ModelData var7; - if (var6.length == 1) { - var7 = var6[0]; - } else { - var7 = new ModelData(var6, var6.length); - } - - int var4; - if (this.recolorFrom != null) { - for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { - var7.recolor(this.recolorFrom[var4], this.recolorTo[var4]); - } - } - - if (this.retextureFrom != null) { - for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { - var7.retexture(this.retextureFrom[var4], this.retextureTo[var4]); - } - } - - return var7; + for (int var2 = 0; var2 < this.field3463.length; ++var2) { + if (!NpcDefinition_modelArchive.tryLoadFile(this.field3463[var2], 0)) { + var5 = true; } } + + if (var5) { + return null; + } + ModelData[] var6 = new ModelData[this.field3463.length]; + + for (int var3 = 0; var3 < this.field3463.length; ++var3) { + var6[var3] = ModelData.method2769(NpcDefinition_modelArchive, this.field3463[var3], 0); + } + + ModelData var7; + if (var6.length == 1) { + var7 = var6[0]; + } else { + var7 = new ModelData(var6, var6.length); + } + + int var4; + if (this.recolorFrom != null) { + for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { + var7.recolor(this.recolorFrom[var4], this.recolorTo[var4]); + } + } + + if (this.retextureFrom != null) { + for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { + var7.retexture(this.retextureFrom[var4], this.retextureTo[var4]); + } + } + + return var7; } @ObfuscatedName("i") @@ -541,20 +539,18 @@ public class NPCDefinition extends DualNode { public boolean transformIsVisible() { if (this.transforms == null) { return true; - } else { - int var1 = -1; - if (this.transformVarbit != -1) { - var1 = GrandExchangeOfferOwnWorldComparator.getVarbit(this.transformVarbit); - } else if (this.transformVarp != -1) { - var1 = Varps.Varps_main[this.transformVarp]; - } - - if (var1 >= 0 && var1 < this.transforms.length) { - return this.transforms[var1] != -1; - } else { - return this.transforms[this.transforms.length - 1] != -1; - } } + int var1 = -1; + if (this.transformVarbit != -1) { + var1 = GrandExchangeOfferOwnWorldComparator.getVarbit(this.transformVarbit); + } else if (this.transformVarp != -1) { + var1 = Varps.Varps_main[this.transformVarp]; + } + + if (var1 >= 0 && var1 < this.transforms.length) { + return this.transforms[var1] != -1; + } + return this.transforms[this.transforms.length - 1] != -1; } @ObfuscatedName("u") diff --git a/runescape-client/src/main/java/NetSocket.java b/runescape-client/src/main/java/NetSocket.java index e1f4fb4680..8d5986c1a9 100644 --- a/runescape-client/src/main/java/NetSocket.java +++ b/runescape-client/src/main/java/NetSocket.java @@ -146,9 +146,8 @@ public final class NetSocket extends AbstractSocket implements Runnable { public boolean isAvailable(int var1) throws IOException { if (this.isClosed) { return false; - } else { - return this.inputStream.available() >= var1; } + return this.inputStream.available() >= var1; } @ObfuscatedName("k") @@ -160,20 +159,19 @@ public final class NetSocket extends AbstractSocket implements Runnable { public int read(byte[] var1, int var2, int var3) throws IOException { if (this.isClosed) { return 0; - } else { - int var4; - int var5; - for (var4 = var3; var3 > 0; var3 -= var5) { - var5 = this.inputStream.read(var1, var2, var3); - if (var5 <= 0) { - throw new EOFException(); - } - - var2 += var5; + } + int var4; + int var5; + for (var4 = var3; var3 > 0; var3 -= var5) { + var5 = this.inputStream.read(var1, var2, var3); + if (var5 <= 0) { + throw new EOFException(); } - return var4; + var2 += var5; } + + return var4; } @ObfuscatedName("l") @@ -187,26 +185,25 @@ public final class NetSocket extends AbstractSocket implements Runnable { if (this.exceptionWriting) { this.exceptionWriting = false; throw new IOException(); - } else { - if (this.outBuffer == null) { - this.outBuffer = new byte[this.bufferLength]; + } + if (this.outBuffer == null) { + this.outBuffer = new byte[this.bufferLength]; + } + + synchronized(this) { + for (int var5 = 0; var5 < var3; ++var5) { + this.outBuffer[this.outOffset] = var1[var5 + var2]; + this.outOffset = (this.outOffset + 1) % this.bufferLength; + if ((this.outLength + this.maxPacketLength) % this.bufferLength == this.outOffset) { + throw new IOException(); + } } - synchronized(this) { - for (int var5 = 0; var5 < var3; ++var5) { - this.outBuffer[this.outOffset] = var1[var5 + var2]; - this.outOffset = (this.outOffset + 1) % this.bufferLength; - if ((this.outLength + this.maxPacketLength) % this.bufferLength == this.outOffset) { - throw new IOException(); - } - } - - if (this.task == null) { - this.task = this.taskHandler.newThreadTask(this, 3); - } - - this.notifyAll(); + if (this.task == null) { + this.task = this.taskHandler.newThreadTask(this, 3); } + + this.notifyAll(); } } } @@ -358,16 +355,15 @@ public final class NetSocket extends AbstractSocket implements Runnable { InvDefinition var1 = (InvDefinition)InvDefinition.InvDefinition_cached.get((long)var0); if (var1 != null) { return var1; - } else { - byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0); - var1 = new InvDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - InvDefinition.InvDefinition_cached.put(var1, (long)var0); - return var1; } + byte[] var2 = InvDefinition.InvDefinition_archive.takeFile(5, var0); + var1 = new InvDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + InvDefinition.InvDefinition_cached.put(var1, (long)var0); + return var1; } @ObfuscatedName("p") diff --git a/runescape-client/src/main/java/NodeDeque.java b/runescape-client/src/main/java/NodeDeque.java index a75aa89b33..6a11f1c7ba 100644 --- a/runescape-client/src/main/java/NodeDeque.java +++ b/runescape-client/src/main/java/NodeDeque.java @@ -80,10 +80,9 @@ public class NodeDeque { Node var1 = this.sentinel.previous; if (var1 == this.sentinel) { return null; - } else { - var1.remove(); - return var1; } + var1.remove(); + return var1; } @ObfuscatedName("l") @@ -95,10 +94,9 @@ public class NodeDeque { Node var1 = this.sentinel.next; if (var1 == this.sentinel) { return null; - } else { - var1.remove(); - return var1; } + var1.remove(); + return var1; } @ObfuscatedName("b") @@ -111,10 +109,9 @@ public class NodeDeque { if (var1 == this.sentinel) { this.current = null; return null; - } else { - this.current = var1.previous; - return var1; } + this.current = var1.previous; + return var1; } @ObfuscatedName("i") @@ -127,10 +124,9 @@ public class NodeDeque { if (var1 == this.sentinel) { this.current = null; return null; - } else { - this.current = var1.next; - return var1; } + this.current = var1.next; + return var1; } @ObfuscatedName("c") @@ -143,10 +139,9 @@ public class NodeDeque { if (var1 == this.sentinel) { this.current = null; return null; - } else { - this.current = var1.previous; - return var1; } + this.current = var1.previous; + return var1; } @ObfuscatedName("u") @@ -159,10 +154,9 @@ public class NodeDeque { if (var1 == this.sentinel) { this.current = null; return null; - } else { - this.current = var1.next; - return var1; } + this.current = var1.next; + return var1; } @ObfuscatedName("p") diff --git a/runescape-client/src/main/java/NodeHashTable.java b/runescape-client/src/main/java/NodeHashTable.java index f90341dbb1..842092e808 100644 --- a/runescape-client/src/main/java/NodeHashTable.java +++ b/runescape-client/src/main/java/NodeHashTable.java @@ -101,19 +101,18 @@ public final class NodeHashTable { Node var1; if (this.index > 0 && this.buckets[this.index - 1] != this.current) { var1 = this.current; - this.current = var1.previous; - return var1; - } else { - do { - if (this.index >= this.size) { - return null; - } - - var1 = this.buckets[this.index++].previous; - } while(var1 == this.buckets[this.index - 1]); - this.current = var1.previous; return var1; } + do { + if (this.index >= this.size) { + return null; + } + + var1 = this.buckets[this.index++].previous; + } while(var1 == this.buckets[this.index - 1]); + + this.current = var1.previous; + return var1; } } diff --git a/runescape-client/src/main/java/ObjectDefinition.java b/runescape-client/src/main/java/ObjectDefinition.java index 390afe0301..f67a371a01 100644 --- a/runescape-client/src/main/java/ObjectDefinition.java +++ b/runescape-client/src/main/java/ObjectDefinition.java @@ -532,19 +532,20 @@ public class ObjectDefinition extends DualNode { } return true; - } else if (this.field3362 == null) { - return true; - } else if (var1 != 10) { - return true; - } else { - boolean var2 = true; - - for (int var3 = 0; var3 < this.field3362.length; ++var3) { - var2 &= ObjectDefinition_modelsArchive.tryLoadFile(this.field3362[var3] & 65535, 0); - } - - return var2; } + if (this.field3362 == null) { + return true; + } + if (var1 != 10) { + return true; + } + boolean var2 = true; + + for (int var3 = 0; var3 < this.field3362.length; ++var3) { + var2 &= ObjectDefinition_modelsArchive.tryLoadFile(this.field3362[var3] & 65535, 0); + } + + return var2; } @ObfuscatedName("l") @@ -555,15 +556,14 @@ public class ObjectDefinition extends DualNode { public final boolean method4608() { if (this.field3362 == null) { return true; - } else { - boolean var1 = true; - - for (int var2 = 0; var2 < this.field3362.length; ++var2) { - var1 &= ObjectDefinition_modelsArchive.tryLoadFile(this.field3362[var2] & 65535, 0); - } - - return var1; } + boolean var1 = true; + + for (int var2 = 0; var2 < this.field3362.length; ++var2) { + var1 &= ObjectDefinition_modelsArchive.tryLoadFile(this.field3362[var2] & 65535, 0); + } + + return var1; } @ObfuscatedName("b") @@ -671,20 +671,19 @@ public class ObjectDefinition extends DualNode { } if (var7 == null && this.clipType * 256 == -1) { - return var11; - } else { - if (var7 != null) { - var11 = var7.transformObjectModel(var11, var8, var2); - } else { - var11 = var11.toSharedSequenceModel(true); - } - - if (this.clipType * 256 >= 0) { - var11 = var11.contourGround(var3, var4, var5, var6, false, this.clipType * 256); - } - return var11; } + if (var7 != null) { + var11 = var7.transformObjectModel(var11, var8, var2); + } else { + var11 = var11.toSharedSequenceModel(true); + } + + if (this.clipType * 256 >= 0) { + var11 = var11.contourGround(var3, var4, var5, var6, false, this.clipType * 256); + } + + return var11; } @ObfuscatedName("u") @@ -893,17 +892,16 @@ public class ObjectDefinition extends DualNode { public boolean method4598() { if (this.transforms == null) { return this.ambientSoundId != -1 || this.field3367 != null; - } else { - for (int var1 = 0; var1 < this.transforms.length; ++var1) { - if (this.transforms[var1] != -1) { - ObjectDefinition var2 = ViewportMouse.getObjectDefinition(this.transforms[var1]); - if (var2.ambientSoundId != -1 || var2.field3367 != null) { - return true; - } + } + for (int var1 = 0; var1 < this.transforms.length; ++var1) { + if (this.transforms[var1] != -1) { + ObjectDefinition var2 = ViewportMouse.getObjectDefinition(this.transforms[var1]); + if (var2.ambientSoundId != -1 || var2.field3367 != null) { + return true; } } - - return false; } + + return false; } } diff --git a/runescape-client/src/main/java/ObjectSound.java b/runescape-client/src/main/java/ObjectSound.java index 578998b1fd..f93c33fcce 100644 --- a/runescape-client/src/main/java/ObjectSound.java +++ b/runescape-client/src/main/java/ObjectSound.java @@ -140,11 +140,10 @@ public final class ObjectSound extends Node { Script var5 = class49.getWorldMapScript(var3, var0); if (var5 != null) { return var5; - } else { - int var4 = GraphicsDefaults.getWorldMapScriptIdCategory(var2, var0); - var5 = class49.getWorldMapScript(var4, var0); - return var5 != null ? var5 : null; } + int var4 = GraphicsDefaults.getWorldMapScriptIdCategory(var2, var0); + var5 = class49.getWorldMapScript(var4, var0); + return var5 != null ? var5 : null; } @ObfuscatedName("ai") diff --git a/runescape-client/src/main/java/PacketBuffer.java b/runescape-client/src/main/java/PacketBuffer.java index 77a0c37783..2b5f10bf61 100644 --- a/runescape-client/src/main/java/PacketBuffer.java +++ b/runescape-client/src/main/java/PacketBuffer.java @@ -169,22 +169,21 @@ public class PacketBuffer extends Buffer { signature = "(Lhp;III)Llx;", garbageValue = "-1232611828" ) - @Export("loadIndexedSprite") - static IndexedSprite loadIndexedSprite(AbstractArchive var0, int var1, int var2) { - if (!Friend.doesSpriteExist(var0, var1, var2)) { + @Export("SpriteBuffer_getIndexedSprite") + static IndexedSprite SpriteBuffer_getIndexedSprite(AbstractArchive var0, int var1, int var2) { + if (!Friend.SpriteBuffer_bufferFile(var0, var1, var2)) { return null; - } else { - IndexedSprite var4 = new IndexedSprite(); - var4.width = class326.SpriteBuffer_spriteWidth; - var4.height = class326.SpriteBuffer_spriteHeight; - var4.xOffset = Varps.SpriteBuffer_xOffsets[0]; - var4.yOffset = class326.SpriteBuffer_yOffsets[0]; - var4.subWidth = class326.SpriteBuffer_spriteWidths[0]; - var4.subHeight = class216.SpriteBuffer_spriteHeights[0]; - var4.palette = Frames.SpriteBuffer_spritePalette; - var4.pixels = class326.SpriteBuffer_pixels[0]; - class16.method174(); - return var4; } + IndexedSprite var4 = new IndexedSprite(); + var4.width = SpriteBuffer.SpriteBuffer_spriteWidth; + var4.height = SpriteBuffer.SpriteBuffer_spriteHeight; + var4.xOffset = Varps.SpriteBuffer_xOffsets[0]; + var4.yOffset = SpriteBuffer.SpriteBuffer_yOffsets[0]; + var4.subWidth = SpriteBuffer.SpriteBuffer_spriteWidths[0]; + var4.subHeight = class216.SpriteBuffer_spriteHeights[0]; + var4.palette = Frames.SpriteBuffer_spritePalette; + var4.pixels = SpriteBuffer.SpriteBuffer_pixels[0]; + class16.SpriteBuffer_clear(); + return var4; } } diff --git a/runescape-client/src/main/java/PacketBufferNode.java b/runescape-client/src/main/java/PacketBufferNode.java index 2f672eed05..c0ffd3c04a 100644 --- a/runescape-client/src/main/java/PacketBufferNode.java +++ b/runescape-client/src/main/java/PacketBufferNode.java @@ -153,13 +153,14 @@ public class PacketBufferNode extends Node { if (var0 == 338) { return 'O'; - } else if (var0 == 339) { - return 'o'; - } else if (var0 == 376) { - return 'Y'; - } else { - return var0; } + if (var0 == 339) { + return 'o'; + } + if (var0 == 376) { + return 'Y'; + } + return var0; } @ObfuscatedName("gi") diff --git a/runescape-client/src/main/java/ParamDefinition.java b/runescape-client/src/main/java/ParamDefinition.java index 4b4b7ce650..93f417a73a 100644 --- a/runescape-client/src/main/java/ParamDefinition.java +++ b/runescape-client/src/main/java/ParamDefinition.java @@ -130,16 +130,15 @@ public class ParamDefinition extends DualNode { StructDefinition var1 = (StructDefinition)StructDefinition.StructDefinition_cached.get((long)var0); if (var1 != null) { return var1; - } else { - byte[] var2 = StructDefinition.StructDefinition_archive.takeFile(34, var0); - var1 = new StructDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); - StructDefinition.StructDefinition_cached.put(var1, (long)var0); - return var1; } + byte[] var2 = StructDefinition.StructDefinition_archive.takeFile(34, var0); + var1 = new StructDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); + StructDefinition.StructDefinition_cached.put(var1, (long)var0); + return var1; } } diff --git a/runescape-client/src/main/java/PcmPlayer.java b/runescape-client/src/main/java/PcmPlayer.java index 41ec0aadd4..e1d0a9a97f 100644 --- a/runescape-client/src/main/java/PcmPlayer.java +++ b/runescape-client/src/main/java/PcmPlayer.java @@ -111,6 +111,7 @@ public class PcmPlayer { signature = "(I)V", garbageValue = "-1518489339" ) + @Export("init") protected void init() throws Exception { } @@ -119,6 +120,7 @@ public class PcmPlayer { signature = "(IB)V", garbageValue = "2" ) + @Export("open") protected void open(int var1) throws Exception { } @@ -133,6 +135,7 @@ public class PcmPlayer { } @ObfuscatedName("p") + @Export("write") protected void write() throws Exception { } diff --git a/runescape-client/src/main/java/PcmStreamMixer.java b/runescape-client/src/main/java/PcmStreamMixer.java index 5485f33091..b1ea96aae0 100644 --- a/runescape-client/src/main/java/PcmStreamMixer.java +++ b/runescape-client/src/main/java/PcmStreamMixer.java @@ -93,6 +93,7 @@ public class PcmStreamMixer extends PcmStream { @ObfuscatedSignature( signature = "()Ldx;" ) + @Export("firstSubStream") protected PcmStream firstSubStream() { return (PcmStream)this.subStreams.last(); } @@ -101,6 +102,7 @@ public class PcmStreamMixer extends PcmStream { @ObfuscatedSignature( signature = "()Ldx;" ) + @Export("nextSubStream") protected PcmStream nextSubStream() { return (PcmStream)this.subStreams.previous(); } diff --git a/runescape-client/src/main/java/Player.java b/runescape-client/src/main/java/Player.java index 7955bfecad..2cd0df189c 100644 --- a/runescape-client/src/main/java/Player.java +++ b/runescape-client/src/main/java/Player.java @@ -374,66 +374,64 @@ public final class Player extends Actor { protected final Model getModel() { if (this.appearance == null) { return null; - } else { - SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? GrandExchangeEvent.getSequenceDefinition(super.sequence) : null; - SequenceDefinition var2 = super.movementSequence != -1 && !this.isUnanimated && (super.movementSequence != super.readySequence || var1 == null) ? GrandExchangeEvent.getSequenceDefinition(super.movementSequence) : null; - Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); - if (var3 == null) { - return null; - } else { - var3.calculateBoundsCylinder(); - super.defaultHeight = var3.height; - Model var4; - Model[] var5; - if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) { - var4 = MusicPatch.getSpotAnimationDefinition(super.spotAnimation).getModel(super.spotAnimationFrame); - if (var4 != null) { - var4.offsetBy(0, -super.heightOffset, 0); - var5 = new Model[]{var3, var4}; - var3 = new Model(var5, 2); - } - } - - if (!this.isUnanimated && this.model0 != null) { - if (Client.cycle >= this.animationCycleEnd) { - this.model0 = null; - } - - if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) { - var4 = this.model0; - var4.offsetBy(this.field633 * 4096 - super.x, this.tileHeight2 - this.tileHeight, this.field620 * 4096 - super.y); - if (super.orientation == 512) { - var4.rotateY90Ccw(); - var4.rotateY90Ccw(); - var4.rotateY90Ccw(); - } else if (super.orientation == 1024) { - var4.rotateY90Ccw(); - var4.rotateY90Ccw(); - } else if (super.orientation == 1536) { - var4.rotateY90Ccw(); - } - - var5 = new Model[]{var3, var4}; - var3 = new Model(var5, 2); - if (super.orientation == 512) { - var4.rotateY90Ccw(); - } else if (super.orientation == 1024) { - var4.rotateY90Ccw(); - var4.rotateY90Ccw(); - } else if (super.orientation == 1536) { - var4.rotateY90Ccw(); - var4.rotateY90Ccw(); - var4.rotateY90Ccw(); - } - - var4.offsetBy(super.x - this.field633 * 4096, this.tileHeight - this.tileHeight2, super.y - this.field620 * 4096); - } - } - - var3.isSingleTile = true; - return var3; + } + SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? GrandExchangeEvent.getSequenceDefinition(super.sequence) : null; + SequenceDefinition var2 = super.movementSequence != -1 && !this.isUnanimated && (super.movementSequence != super.readySequence || var1 == null) ? GrandExchangeEvent.getSequenceDefinition(super.movementSequence) : null; + Model var3 = this.appearance.getModel(var1, super.sequenceFrame, var2, super.movementFrame); + if (var3 == null) { + return null; + } + var3.calculateBoundsCylinder(); + super.defaultHeight = var3.height; + Model var4; + Model[] var5; + if (!this.isUnanimated && super.spotAnimation != -1 && super.spotAnimationFrame != -1) { + var4 = MusicPatch.getSpotAnimationDefinition(super.spotAnimation).getModel(super.spotAnimationFrame); + if (var4 != null) { + var4.offsetBy(0, -super.heightOffset, 0); + var5 = new Model[]{var3, var4}; + var3 = new Model(var5, 2); } } + + if (!this.isUnanimated && this.model0 != null) { + if (Client.cycle >= this.animationCycleEnd) { + this.model0 = null; + } + + if (Client.cycle >= this.animationCycleStart && Client.cycle < this.animationCycleEnd) { + var4 = this.model0; + var4.offsetBy(this.field633 * 4096 - super.x, this.tileHeight2 - this.tileHeight, this.field620 * 4096 - super.y); + if (super.orientation == 512) { + var4.rotateY90Ccw(); + var4.rotateY90Ccw(); + var4.rotateY90Ccw(); + } else if (super.orientation == 1024) { + var4.rotateY90Ccw(); + var4.rotateY90Ccw(); + } else if (super.orientation == 1536) { + var4.rotateY90Ccw(); + } + + var5 = new Model[]{var3, var4}; + var3 = new Model(var5, 2); + if (super.orientation == 512) { + var4.rotateY90Ccw(); + } else if (super.orientation == 1024) { + var4.rotateY90Ccw(); + var4.rotateY90Ccw(); + } else if (super.orientation == 1536) { + var4.rotateY90Ccw(); + var4.rotateY90Ccw(); + var4.rotateY90Ccw(); + } + + var4.offsetBy(super.x - this.field633 * 4096, this.tileHeight - this.tileHeight2, super.y - this.field620 * 4096); + } + } + + var3.isSingleTile = true; + return var3; } @ObfuscatedName("u") @@ -521,38 +519,41 @@ public final class Player extends Actor { try { if (!class51.field434.startsWith("win")) { throw new Exception(); - } else if (!var0.startsWith("http://") && !var0.startsWith("https://")) { - throw new Exception(); - } else { - String var11 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; - - for (int var4 = 0; var4 < var0.length(); ++var4) { - if (var11.indexOf(var0.charAt(var4)) == -1) { - throw new Exception(); - } - } - - Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); - return true; } + if (!var0.startsWith("http://") && !var0.startsWith("https://")) { + throw new Exception(); + } + String var11 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789?&=,.%+-_#:/*"; + + for (int var4 = 0; var4 < var0.length(); ++var4) { + if (var11.indexOf(var0.charAt(var4)) == -1) { + throw new Exception(); + } + } + + Runtime.getRuntime().exec("cmd /c start \"j\" \"" + var0 + "\""); + return true; } catch (Throwable var5) { return false; } - } else if (var1 == 1) { + } + if (var1 == 1) { try { Object var10 = class47.method806(class51.applet, var2, new Object[]{(new URL(class51.applet.getCodeBase(), var0)).toString()}); return var10 != null; } catch (Throwable var6) { return false; } - } else if (var1 == 2) { + } + if (var1 == 2) { try { class51.applet.getAppletContext().showDocument(new URL(class51.applet.getCodeBase(), var0), "_blank"); return true; } catch (Exception var7) { return false; } - } else if (var1 == 3) { + } + if (var1 == 3) { try { Applet var3 = class51.applet; JSObject.getWindow(var3).call("loggedout", (Object[])null); @@ -565,9 +566,8 @@ public final class Player extends Actor { } catch (Exception var8) { return false; } - } else { - throw new IllegalArgumentException(); } + throw new IllegalArgumentException(); } @ObfuscatedName("ff") diff --git a/runescape-client/src/main/java/PlayerAppearance.java b/runescape-client/src/main/java/PlayerAppearance.java index 1ca86c2bcf..39a68c4736 100644 --- a/runescape-client/src/main/java/PlayerAppearance.java +++ b/runescape-client/src/main/java/PlayerAppearance.java @@ -238,109 +238,107 @@ public class PlayerAppearance { public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) { if (this.npcTransformId != -1) { return GameShell.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); - } else { - long var5 = this.field2539; - int[] var7 = this.equipment; - if (var1 != null && (var1.shield >= 0 || var1.weapon >= 0)) { - var7 = new int[12]; + } + long var5 = this.field2539; + int[] var7 = this.equipment; + if (var1 != null && (var1.shield >= 0 || var1.weapon >= 0)) { + var7 = new int[12]; - for (int var15 = 0; var15 < 12; ++var15) { - var7[var15] = this.equipment[var15]; + for (int var15 = 0; var15 < 12; ++var15) { + var7[var15] = this.equipment[var15]; + } + + if (var1.shield >= 0) { + var5 += (long)(var1.shield - this.equipment[5] << 40); + var7[5] = var1.shield; + } + + if (var1.weapon >= 0) { + var5 += (long)(var1.weapon - this.equipment[3] << 48); + var7[3] = var1.weapon; + } + } + + Model var8 = (Model)PlayerAppearance_cachedModels.get(var5); + if (var8 == null) { + boolean var9 = false; + + int var11; + for (int var10 = 0; var10 < 12; ++var10) { + var11 = var7[var10]; + if (var11 >= 256 && var11 < 512 && !ArchiveDiskAction.getKitDefinition(var11 - 256).ready()) { + var9 = true; } - if (var1.shield >= 0) { - var5 += (long)(var1.shield - this.equipment[5] << 40); - var7[5] = var1.shield; - } - - if (var1.weapon >= 0) { - var5 += (long)(var1.weapon - this.equipment[3] << 48); - var7[3] = var1.weapon; + if (var11 >= 512 && !WorldMapArea.getItemDefinition(var11 - 512).method4646(this.isFemale)) { + var9 = true; } } - Model var8 = (Model)PlayerAppearance_cachedModels.get(var5); - if (var8 == null) { - boolean var9 = false; - - int var11; - for (int var10 = 0; var10 < 12; ++var10) { - var11 = var7[var10]; - if (var11 >= 256 && var11 < 512 && !ArchiveDiskAction.getKitDefinition(var11 - 256).ready()) { - var9 = true; - } - - if (var11 >= 512 && !WorldMapArea.getItemDefinition(var11 - 512).method4646(this.isFemale)) { - var9 = true; - } - } - - if (var9) { - if (-1L != this.field2537) { - var8 = (Model)PlayerAppearance_cachedModels.get(this.field2537); - } - - if (var8 == null) { - return null; - } + if (var9) { + if (-1L != this.field2537) { + var8 = (Model)PlayerAppearance_cachedModels.get(this.field2537); } if (var8 == null) { - ModelData[] var16 = new ModelData[12]; - var11 = 0; - - int var13; - for (int var12 = 0; var12 < 12; ++var12) { - var13 = var7[var12]; - ModelData var14; - if (var13 >= 256 && var13 < 512) { - var14 = ArchiveDiskAction.getKitDefinition(var13 - 256).getModelData(); - if (var14 != null) { - var16[var11++] = var14; - } - } - - if (var13 >= 512) { - var14 = WorldMapArea.getItemDefinition(var13 - 512).method4694(this.isFemale); - if (var14 != null) { - var16[var11++] = var14; - } - } - } - - ModelData var17 = new ModelData(var16, var11); - - for (var13 = 0; var13 < 5; ++var13) { - if (this.bodyColors[var13] < class247.field3291[var13].length) { - var17.recolor(ModelData0.field1870[var13], class247.field3291[var13][this.bodyColors[var13]]); - } - - if (this.bodyColors[var13] < Message.field604[var13].length) { - var17.recolor(WorldMapCacheName.field309[var13], Message.field604[var13][this.bodyColors[var13]]); - } - } - - var8 = var17.toModel(64, 850, -30, -50, -30); - PlayerAppearance_cachedModels.put(var8, var5); - this.field2537 = var5; + return null; } } - if (var1 == null && var3 == null) { - return var8; - } else { - Model var18; - if (var1 != null && var3 != null) { - var18 = var1.applyTransformations(var8, var2, var3, var4); - } else if (var1 != null) { - var18 = var1.transformActorModel(var8, var2); - } else { - var18 = var3.transformActorModel(var8, var4); + if (var8 == null) { + ModelData[] var16 = new ModelData[12]; + var11 = 0; + + int var13; + for (int var12 = 0; var12 < 12; ++var12) { + var13 = var7[var12]; + ModelData var14; + if (var13 >= 256 && var13 < 512) { + var14 = ArchiveDiskAction.getKitDefinition(var13 - 256).getModelData(); + if (var14 != null) { + var16[var11++] = var14; + } + } + + if (var13 >= 512) { + var14 = WorldMapArea.getItemDefinition(var13 - 512).method4694(this.isFemale); + if (var14 != null) { + var16[var11++] = var14; + } + } } - return var18; + ModelData var17 = new ModelData(var16, var11); + + for (var13 = 0; var13 < 5; ++var13) { + if (this.bodyColors[var13] < class247.field3291[var13].length) { + var17.recolor(ModelData0.field1870[var13], class247.field3291[var13][this.bodyColors[var13]]); + } + + if (this.bodyColors[var13] < Message.field604[var13].length) { + var17.recolor(WorldMapCacheName.field309[var13], Message.field604[var13][this.bodyColors[var13]]); + } + } + + var8 = var17.toModel(64, 850, -30, -50, -30); + PlayerAppearance_cachedModels.put(var8, var5); + this.field2537 = var5; } } + + if (var1 == null && var3 == null) { + return var8; + } + Model var18; + if (var1 != null && var3 != null) { + var18 = var1.applyTransformations(var8, var2, var3, var4); + } else if (var1 != null) { + var18 = var1.transformActorModel(var8, var2); + } else { + var18 = var3.transformActorModel(var8, var4); + } + + return var18; } @ObfuscatedName("i") @@ -352,61 +350,59 @@ public class PlayerAppearance { ModelData getModelData() { if (this.npcTransformId != -1) { return GameShell.getNpcDefinition(this.npcTransformId).getModelData(); - } else { - boolean var1 = false; + } + boolean var1 = false; - int var3; - for (int var2 = 0; var2 < 12; ++var2) { - var3 = this.equipment[var2]; - if (var3 >= 256 && var3 < 512 && !ArchiveDiskAction.getKitDefinition(var3 - 256).method4445()) { - var1 = true; - } - - if (var3 >= 512 && !WorldMapArea.getItemDefinition(var3 - 512).method4683(this.isFemale)) { - var1 = true; - } + int var3; + for (int var2 = 0; var2 < 12; ++var2) { + var3 = this.equipment[var2]; + if (var3 >= 256 && var3 < 512 && !ArchiveDiskAction.getKitDefinition(var3 - 256).method4445()) { + var1 = true; } - if (var1) { - return null; - } else { - ModelData[] var7 = new ModelData[12]; - var3 = 0; - - int var5; - for (int var4 = 0; var4 < 12; ++var4) { - var5 = this.equipment[var4]; - ModelData var6; - if (var5 >= 256 && var5 < 512) { - var6 = ArchiveDiskAction.getKitDefinition(var5 - 256).method4441(); - if (var6 != null) { - var7[var3++] = var6; - } - } - - if (var5 >= 512) { - var6 = WorldMapArea.getItemDefinition(var5 - 512).method4649(this.isFemale); - if (var6 != null) { - var7[var3++] = var6; - } - } - } - - ModelData var8 = new ModelData(var7, var3); - - for (var5 = 0; var5 < 5; ++var5) { - if (this.bodyColors[var5] < class247.field3291[var5].length) { - var8.recolor(ModelData0.field1870[var5], class247.field3291[var5][this.bodyColors[var5]]); - } - - if (this.bodyColors[var5] < Message.field604[var5].length) { - var8.recolor(WorldMapCacheName.field309[var5], Message.field604[var5][this.bodyColors[var5]]); - } - } - - return var8; + if (var3 >= 512 && !WorldMapArea.getItemDefinition(var3 - 512).method4683(this.isFemale)) { + var1 = true; } } + + if (var1) { + return null; + } + ModelData[] var7 = new ModelData[12]; + var3 = 0; + + int var5; + for (int var4 = 0; var4 < 12; ++var4) { + var5 = this.equipment[var4]; + ModelData var6; + if (var5 >= 256 && var5 < 512) { + var6 = ArchiveDiskAction.getKitDefinition(var5 - 256).method4441(); + if (var6 != null) { + var7[var3++] = var6; + } + } + + if (var5 >= 512) { + var6 = WorldMapArea.getItemDefinition(var5 - 512).method4649(this.isFemale); + if (var6 != null) { + var7[var3++] = var6; + } + } + } + + ModelData var8 = new ModelData(var7, var3); + + for (var5 = 0; var5 < 5; ++var5) { + if (this.bodyColors[var5] < class247.field3291[var5].length) { + var8.recolor(ModelData0.field1870[var5], class247.field3291[var5][this.bodyColors[var5]]); + } + + if (this.bodyColors[var5] < Message.field604[var5].length) { + var8.recolor(WorldMapCacheName.field309[var5], Message.field604[var5][this.bodyColors[var5]]); + } + } + + return var8; } @ObfuscatedName("c") @@ -424,14 +420,13 @@ public class PlayerAppearance { signature = "(Lhp;II)Z", garbageValue = "-435811450" ) - @Export("SpriteBuffer_loadSpriteFlat") - public static boolean SpriteBuffer_loadSpriteFlat(AbstractArchive var0, int var1) { + @Export("SpriteBuffer_bufferFileFlat") + public static boolean SpriteBuffer_bufferFileFlat(AbstractArchive var0, int var1) { byte[] var2 = var0.takeFileFlat(var1); if (var2 == null) { return false; - } else { - class185.SpriteBuffer_decode(var2); - return true; } + class185.SpriteBuffer_decode(var2); + return true; } } diff --git a/runescape-client/src/main/java/Projectile.java b/runescape-client/src/main/java/Projectile.java index 2d462aafff..34da63020c 100644 --- a/runescape-client/src/main/java/Projectile.java +++ b/runescape-client/src/main/java/Projectile.java @@ -231,10 +231,9 @@ public final class Projectile extends Entity { Model var2 = var1.getModel(this.frame); if (var2 == null) { return null; - } else { - var2.rotateZ(this.pitch); - return var2; } + var2.rotateZ(this.pitch); + return var2; } @ObfuscatedName("q") @@ -247,15 +246,14 @@ public final class Projectile extends Entity { HitSplatDefinition var1 = (HitSplatDefinition)HitSplatDefinition.HitSplatDefinition_cached.get((long)var0); if (var1 != null) { return var1; - } else { - byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0); - var1 = new HitSplatDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); - return var1; } + byte[] var2 = HitSplatDefinition.HitSplatDefinition_archive.takeFile(32, var0); + var1 = new HitSplatDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + HitSplatDefinition.HitSplatDefinition_cached.put(var1, (long)var0); + return var1; } } diff --git a/runescape-client/src/main/java/Rasterizer3D.java b/runescape-client/src/main/java/Rasterizer3D.java index f1968c745f..fe34559f86 100644 --- a/runescape-client/src/main/java/Rasterizer3D.java +++ b/runescape-client/src/main/java/Rasterizer3D.java @@ -358,107 +358,104 @@ public class Rasterizer3D extends Rasterizer2D { var6 += var20; var0 += Rasterizer2D.Rasterizer2D_width; } - } else { - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + } + var2 -= var1; + var1 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var4 >> 14, var6, var19); + var5 += var17; + var4 += var15; + var6 += var20; + var0 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19); + var5 += var17; + var3 += var16; + var6 += var20; + var0 += Rasterizer2D.Rasterizer2D_width; + } + } + var4 = var3 <<= 14; + if (var0 < 0) { + var4 -= var0 * var17; + var3 -= var0 * var16; + var6 -= var0 * var20; + var0 = 0; + } + + var5 <<= 14; + if (var2 < 0) { + var5 -= var15 * var2; + var2 = 0; + } + + if (var0 != var2 && var17 < var16 || var0 == var2 && var15 > var16) { + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19); + var5 += var15; + var3 += var16; + var6 += var20; + var0 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var3 >> 14, var6, var19); + var4 += var17; + var3 += var16; + var6 += var20; + var0 += Rasterizer2D.Rasterizer2D_width; + } + } + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; + + while (true) { + --var2; + if (var2 < 0) { while (true) { --var1; if (var1 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var4 >> 14, var6, var19); - var5 += var17; - var4 += var15; - var6 += var20; - var0 += Rasterizer2D.Rasterizer2D_width; - } + return; } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19); - var5 += var17; + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19); + var5 += var15; var3 += var16; var6 += var20; var0 += Rasterizer2D.Rasterizer2D_width; } } - } else { - var4 = var3 <<= 14; - if (var0 < 0) { - var4 -= var0 * var17; - var3 -= var0 * var16; - var6 -= var0 * var20; - var0 = 0; - } - var5 <<= 14; - if (var2 < 0) { - var5 -= var15 * var2; - var2 = 0; - } - - if (var0 != var2 && var17 < var16 || var0 == var2 && var15 > var16) { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var1; - if (var1 < 0) { - return; - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var5 >> 14, var3 >> 14, var6, var19); - var5 += var15; - var3 += var16; - var6 += var20; - var0 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var4 >> 14, var3 >> 14, var6, var19); - var4 += var17; - var3 += var16; - var6 += var20; - var0 += Rasterizer2D.Rasterizer2D_width; - } - } else { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var1; - if (var1 < 0) { - return; - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var5 >> 14, var6, var19); - var5 += var15; - var3 += var16; - var6 += var20; - var0 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var4 >> 14, var6, var19); - var4 += var17; - var3 += var16; - var6 += var20; - var0 += Rasterizer2D.Rasterizer2D_width; - } - } + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, 0, 0, var3 >> 14, var4 >> 14, var6, var19); + var4 += var17; + var3 += var16; + var6 += var20; + var0 += Rasterizer2D.Rasterizer2D_width; } } } else if (var1 <= var2) { @@ -515,107 +512,104 @@ public class Rasterizer3D extends Rasterizer2D { var7 += var20; var1 += Rasterizer2D.Rasterizer2D_width; } - } else { - var0 -= var2; - var2 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + } + var0 -= var2; + var2 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var0; + if (var0 < 0) { + return; + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var5 >> 14, var7, var19); + var3 += var16; + var5 += var17; + var7 += var20; + var1 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var4 >> 14, var7, var19); + var3 += var16; + var4 += var15; + var7 += var20; + var1 += Rasterizer2D.Rasterizer2D_width; + } + } + var5 = var4 <<= 14; + if (var1 < 0) { + var5 -= var16 * var1; + var4 -= var15 * var1; + var7 -= var20 * var1; + var1 = 0; + } + + var3 <<= 14; + if (var0 < 0) { + var3 -= var0 * var17; + var0 = 0; + } + + if (var16 < var15) { + var2 -= var0; + var0 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; + + while (true) { + --var0; + if (var0 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var4 >> 14, var7, var19); + var3 += var17; + var4 += var15; + var7 += var20; + var1 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var4 >> 14, var7, var19); + var5 += var16; + var4 += var15; + var7 += var20; + var1 += Rasterizer2D.Rasterizer2D_width; + } + } + var2 -= var0; + var0 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; + + while (true) { + --var0; + if (var0 < 0) { while (true) { --var2; if (var2 < 0) { - while (true) { - --var0; - if (var0 < 0) { - return; - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var5 >> 14, var7, var19); - var3 += var16; - var5 += var17; - var7 += var20; - var1 += Rasterizer2D.Rasterizer2D_width; - } + return; } - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var4 >> 14, var7, var19); - var3 += var16; + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19); + var3 += var17; var4 += var15; var7 += var20; var1 += Rasterizer2D.Rasterizer2D_width; } } - } else { - var5 = var4 <<= 14; - if (var1 < 0) { - var5 -= var16 * var1; - var4 -= var15 * var1; - var7 -= var20 * var1; - var1 = 0; - } - var3 <<= 14; - if (var0 < 0) { - var3 -= var0 * var17; - var0 = 0; - } - - if (var16 < var15) { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; - - while (true) { - --var0; - if (var0 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var3 >> 14, var4 >> 14, var7, var19); - var3 += var17; - var4 += var15; - var7 += var20; - var1 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var5 >> 14, var4 >> 14, var7, var19); - var5 += var16; - var4 += var15; - var7 += var20; - var1 += Rasterizer2D.Rasterizer2D_width; - } - } else { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; - - while (true) { - --var0; - if (var0 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var3 >> 14, var7, var19); - var3 += var17; - var4 += var15; - var7 += var20; - var1 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var5 >> 14, var7, var19); - var5 += var16; - var4 += var15; - var7 += var20; - var1 += Rasterizer2D.Rasterizer2D_width; - } - } + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, 0, 0, var4 >> 14, var5 >> 14, var7, var19); + var5 += var16; + var4 += var15; + var7 += var20; + var1 += Rasterizer2D.Rasterizer2D_width; } } } else if (var2 < Rasterizer3D_clipHeight) { @@ -671,107 +665,104 @@ public class Rasterizer3D extends Rasterizer2D { var8 += var20; var2 += Rasterizer2D.Rasterizer2D_width; } - } else { - var1 -= var0; - var0 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + } + var1 -= var0; + var0 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; + while (true) { + --var0; + if (var0 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var4 >> 14, var8, var19); + var4 += var15; + var3 += var16; + var8 += var20; + var2 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19); + var4 += var15; + var5 += var17; + var8 += var20; + var2 += Rasterizer2D.Rasterizer2D_width; + } + } + var3 = var5 <<= 14; + if (var2 < 0) { + var3 -= var15 * var2; + var5 -= var17 * var2; + var8 -= var20 * var2; + var2 = 0; + } + + var4 <<= 14; + if (var1 < 0) { + var4 -= var16 * var1; + var1 = 0; + } + + if (var15 < var17) { + var0 -= var1; + var1 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var0; + if (var0 < 0) { + return; + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var8, var19); + var4 += var16; + var5 += var17; + var8 += var20; + var2 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var5 >> 14, var8, var19); + var3 += var15; + var5 += var17; + var8 += var20; + var2 += Rasterizer2D.Rasterizer2D_width; + } + } + var0 -= var1; + var1 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; + + while (true) { + --var1; + if (var1 < 0) { while (true) { --var0; if (var0 < 0) { - while (true) { - --var1; - if (var1 < 0) { - return; - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var4 >> 14, var8, var19); - var4 += var15; - var3 += var16; - var8 += var20; - var2 += Rasterizer2D.Rasterizer2D_width; - } + return; } Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19); - var4 += var15; + var4 += var16; var5 += var17; var8 += var20; var2 += Rasterizer2D.Rasterizer2D_width; } } - } else { - var3 = var5 <<= 14; - if (var2 < 0) { - var3 -= var15 * var2; - var5 -= var17 * var2; - var8 -= var20 * var2; - var2 = 0; - } - var4 <<= 14; - if (var1 < 0) { - var4 -= var16 * var1; - var1 = 0; - } - - if (var15 < var17) { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; - - while (true) { - --var1; - if (var1 < 0) { - while (true) { - --var0; - if (var0 < 0) { - return; - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var4 >> 14, var5 >> 14, var8, var19); - var4 += var16; - var5 += var17; - var8 += var20; - var2 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var3 >> 14, var5 >> 14, var8, var19); - var3 += var15; - var5 += var17; - var8 += var20; - var2 += Rasterizer2D.Rasterizer2D_width; - } - } else { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; - - while (true) { - --var1; - if (var1 < 0) { - while (true) { - --var0; - if (var0 < 0) { - return; - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var4 >> 14, var8, var19); - var4 += var16; - var5 += var17; - var8 += var20; - var2 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var3 >> 14, var8, var19); - var3 += var15; - var5 += var17; - var8 += var20; - var2 += Rasterizer2D.Rasterizer2D_width; - } - } + Rasterizer3D_vertAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, 0, 0, var5 >> 14, var3 >> 14, var8, var19); + var3 += var15; + var5 += var17; + var8 += var20; + var2 += Rasterizer2D.Rasterizer2D_width; } } } @@ -947,100 +938,97 @@ public class Rasterizer3D extends Rasterizer2D { var3 += var7; var0 += Rasterizer2D.Rasterizer2D_width; } - } else { - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + } + var2 -= var1; + var1 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var5 >> 14); + var5 += var9; + var4 += var8; + var0 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); + var5 += var9; + var3 += var7; + var0 += Rasterizer2D.Rasterizer2D_width; + } + } + var4 = var3 <<= 14; + if (var0 < 0) { + var4 -= var0 * var9; + var3 -= var0 * var7; + var0 = 0; + } + + var5 <<= 14; + if (var2 < 0) { + var5 -= var8 * var2; + var2 = 0; + } + + if ((var0 == var2 || var9 >= var7) && (var0 != var2 || var8 <= var7)) { + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); + var5 += var8; + var3 += var7; + var0 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var4 >> 14); + var4 += var9; + var3 += var7; + var0 += Rasterizer2D.Rasterizer2D_width; + } + } + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; + + while (true) { + --var2; + if (var2 < 0) { while (true) { --var1; if (var1 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var5 >> 14); - var5 += var9; - var4 += var8; - var0 += Rasterizer2D.Rasterizer2D_width; - } + return; } - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); - var5 += var9; + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14); + var5 += var8; var3 += var7; var0 += Rasterizer2D.Rasterizer2D_width; } } - } else { - var4 = var3 <<= 14; - if (var0 < 0) { - var4 -= var0 * var9; - var3 -= var0 * var7; - var0 = 0; - } - var5 <<= 14; - if (var2 < 0) { - var5 -= var8 * var2; - var2 = 0; - } - - if ((var0 == var2 || var9 >= var7) && (var0 != var2 || var8 <= var7)) { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var1; - if (var1 < 0) { - return; - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var5 >> 14); - var5 += var8; - var3 += var7; - var0 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var3 >> 14, var4 >> 14); - var4 += var9; - var3 += var7; - var0 += Rasterizer2D.Rasterizer2D_width; - } - } else { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var1; - if (var1 < 0) { - return; - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var5 >> 14, var3 >> 14); - var5 += var8; - var3 += var7; - var0 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var3 >> 14); - var4 += var9; - var3 += var7; - var0 += Rasterizer2D.Rasterizer2D_width; - } - } + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var0, var6, 0, var4 >> 14, var3 >> 14); + var4 += var9; + var3 += var7; + var0 += Rasterizer2D.Rasterizer2D_width; } } } else if (var1 <= var2) { @@ -1093,100 +1081,97 @@ public class Rasterizer3D extends Rasterizer2D { var4 += var8; var1 += Rasterizer2D.Rasterizer2D_width; } - } else { - var0 -= var2; - var2 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + } + var0 -= var2; + var2 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var0; + if (var0 < 0) { + return; + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var3 >> 14); + var3 += var7; + var5 += var9; + var1 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14); + var3 += var7; + var4 += var8; + var1 += Rasterizer2D.Rasterizer2D_width; + } + } + var5 = var4 <<= 14; + if (var1 < 0) { + var5 -= var7 * var1; + var4 -= var8 * var1; + var1 = 0; + } + + var3 <<= 14; + if (var0 < 0) { + var3 -= var0 * var9; + var0 = 0; + } + + if (var7 < var8) { + var2 -= var0; + var0 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; + + while (true) { + --var0; + if (var0 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14); + var3 += var9; + var4 += var8; + var1 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var4 >> 14); + var5 += var7; + var4 += var8; + var1 += Rasterizer2D.Rasterizer2D_width; + } + } + var2 -= var0; + var0 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; + + while (true) { + --var0; + if (var0 < 0) { while (true) { --var2; if (var2 < 0) { - while (true) { - --var0; - if (var0 < 0) { - return; - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var3 >> 14); - var3 += var7; - var5 += var9; - var1 += Rasterizer2D.Rasterizer2D_width; - } + return; } Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14); - var3 += var7; + var3 += var9; var4 += var8; var1 += Rasterizer2D.Rasterizer2D_width; } } - } else { - var5 = var4 <<= 14; - if (var1 < 0) { - var5 -= var7 * var1; - var4 -= var8 * var1; - var1 = 0; - } - var3 <<= 14; - if (var0 < 0) { - var3 -= var0 * var9; - var0 = 0; - } - - if (var7 < var8) { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; - - while (true) { - --var0; - if (var0 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var3 >> 14, var4 >> 14); - var3 += var9; - var4 += var8; - var1 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var5 >> 14, var4 >> 14); - var5 += var7; - var4 += var8; - var1 += Rasterizer2D.Rasterizer2D_width; - } - } else { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; - - while (true) { - --var0; - if (var0 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var3 >> 14); - var3 += var9; - var4 += var8; - var1 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var5 >> 14); - var5 += var7; - var4 += var8; - var1 += Rasterizer2D.Rasterizer2D_width; - } - } + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var1, var6, 0, var4 >> 14, var5 >> 14); + var5 += var7; + var4 += var8; + var1 += Rasterizer2D.Rasterizer2D_width; } } } else if (var2 < Rasterizer3D_clipHeight) { @@ -1238,100 +1223,97 @@ public class Rasterizer3D extends Rasterizer2D { var5 += var9; var2 += Rasterizer2D.Rasterizer2D_width; } - } else { - var1 -= var0; - var0 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + } + var1 -= var0; + var0 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; + while (true) { + --var0; + if (var0 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var4 >> 14); + var4 += var8; + var3 += var7; + var2 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14); + var4 += var8; + var5 += var9; + var2 += Rasterizer2D.Rasterizer2D_width; + } + } + var3 = var5 <<= 14; + if (var2 < 0) { + var3 -= var8 * var2; + var5 -= var9 * var2; + var2 = 0; + } + + var4 <<= 14; + if (var1 < 0) { + var4 -= var7 * var1; + var1 = 0; + } + + if (var8 < var9) { + var0 -= var1; + var1 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var0; + if (var0 < 0) { + return; + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var5 >> 14); + var4 += var7; + var5 += var9; + var2 += Rasterizer2D.Rasterizer2D_width; + } + } + + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var5 >> 14); + var3 += var8; + var5 += var9; + var2 += Rasterizer2D.Rasterizer2D_width; + } + } + var0 -= var1; + var1 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; + + while (true) { + --var1; + if (var1 < 0) { while (true) { --var0; if (var0 < 0) { - while (true) { - --var1; - if (var1 < 0) { - return; - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var4 >> 14); - var4 += var8; - var3 += var7; - var2 += Rasterizer2D.Rasterizer2D_width; - } + return; } Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14); - var4 += var8; + var4 += var7; var5 += var9; var2 += Rasterizer2D.Rasterizer2D_width; } } - } else { - var3 = var5 <<= 14; - if (var2 < 0) { - var3 -= var8 * var2; - var5 -= var9 * var2; - var2 = 0; - } - var4 <<= 14; - if (var1 < 0) { - var4 -= var7 * var1; - var1 = 0; - } - - if (var8 < var9) { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; - - while (true) { - --var1; - if (var1 < 0) { - while (true) { - --var0; - if (var0 < 0) { - return; - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var4 >> 14, var5 >> 14); - var4 += var7; - var5 += var9; - var2 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var3 >> 14, var5 >> 14); - var3 += var8; - var5 += var9; - var2 += Rasterizer2D.Rasterizer2D_width; - } - } else { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; - - while (true) { - --var1; - if (var1 < 0) { - while (true) { - --var0; - if (var0 < 0) { - return; - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var4 >> 14); - var4 += var7; - var5 += var9; - var2 += Rasterizer2D.Rasterizer2D_width; - } - } - - Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var3 >> 14); - var3 += var8; - var5 += var9; - var2 += Rasterizer2D.Rasterizer2D_width; - } - } + Rasterizer3D_horizAlpha(Rasterizer2D.Rasterizer2D_pixels, var2, var6, 0, var5 >> 14, var3 >> 14); + var3 += var8; + var5 += var9; + var2 += Rasterizer2D.Rasterizer2D_width; } } } @@ -1374,41 +1356,14 @@ public class Rasterizer3D extends Rasterizer2D { var0[var1++] = var0[var1]; var0[var1++] = var0[var1]; } - } else { - int var6 = Rasterizer3D_alpha; - int var7 = 256 - Rasterizer3D_alpha; - var2 = (var7 * (var2 & 65280) >> 8 & 65280) + (var7 * (var2 & 16711935) >> 8 & 16711935); - - while (true) { - --var3; - int var8; - if (var3 < 0) { - var3 = var5 - var4 & 3; - - while (true) { - --var3; - if (var3 < 0) { - return; - } - - var8 = var0[var1]; - var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); - } - } - - var8 = var0[var1]; - var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); - var8 = var0[var1]; - var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); - var8 = var0[var1]; - var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); - var8 = var0[var1]; - var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); - } } - } else { + int var6 = Rasterizer3D_alpha; + int var7 = 256 - Rasterizer3D_alpha; + var2 = (var7 * (var2 & 65280) >> 8 & 65280) + (var7 * (var2 & 16711935) >> 8 & 16711935); + while (true) { --var3; + int var8; if (var3 < 0) { var3 = var5 - var4 & 3; @@ -1418,16 +1373,41 @@ public class Rasterizer3D extends Rasterizer2D { return; } - var0[var1++] = var2; + var8 = var0[var1]; + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); } } - var0[var1++] = var2; - var0[var1++] = var2; - var0[var1++] = var2; - var0[var1++] = var2; + var8 = var0[var1]; + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); + var8 = var0[var1]; + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); + var8 = var0[var1]; + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); + var8 = var0[var1]; + var0[var1++] = ((var8 & 16711935) * var6 >> 8 & 16711935) + var2 + (var6 * (var8 & 65280) >> 8 & 65280); } } + while (true) { + --var3; + if (var3 < 0) { + var3 = var5 - var4 & 3; + + while (true) { + --var3; + if (var3 < 0) { + return; + } + + var0[var1++] = var2; + } + } + + var0[var1++] = var2; + var0[var1++] = var2; + var0[var1++] = var2; + var0[var1++] = var2; + } } } @@ -1546,33 +1526,109 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; var38 += var40; } - } else { - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + } + var2 -= var1; + var1 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var28; + var4 += var27; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var28; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + var4 = var3 <<= 14; + if (var0 < 0) { + var4 -= var0 * var28; + var3 -= var0 * var26; + var6 -= var0 * var31; + var0 = 0; + } + + var5 <<= 14; + if (var2 < 0) { + var5 -= var27 * var2; + var2 = 0; + } + + var41 = var0 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if (var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) { + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var27; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var4 += var28; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; + + while (true) { + --var2; + if (var2 < 0) { while (true) { --var1; if (var1 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var28; - var4 += var27; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } + return; } Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var28; + var5 += var27; var3 += var26; var6 += var31; var0 += Rasterizer2D.Rasterizer2D_width; @@ -1581,94 +1637,15 @@ public class Rasterizer3D extends Rasterizer2D { var38 += var40; } } - } else { - var4 = var3 <<= 14; - if (var0 < 0) { - var4 -= var0 * var28; - var3 -= var0 * var26; - var6 -= var0 * var31; - var0 = 0; - } - var5 <<= 14; - if (var2 < 0) { - var5 -= var27 * var2; - var2 = 0; - } - - var41 = var0 - Rasterizer3D_clipMidY; - var32 += var34 * var41; - var35 += var37 * var41; - var38 += var40 * var41; - if (var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var1; - if (var1 < 0) { - return; - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var27; - var3 += var26; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var4 += var28; - var3 += var26; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } else { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var1; - if (var1 < 0) { - return; - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var27; - var3 += var26; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var4 += var28; - var3 += var26; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var4 += var28; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } } else if (var1 <= var2) { @@ -1735,33 +1712,109 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; var38 += var40; } - } else { - var0 -= var2; - var2 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + } + var0 -= var2; + var2 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var0; + if (var0 < 0) { + return; + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var26; + var5 += var28; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var26; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + var5 = var4 <<= 14; + if (var1 < 0) { + var5 -= var26 * var1; + var4 -= var27 * var1; + var7 -= var31 * var1; + var1 = 0; + } + + var3 <<= 14; + if (var0 < 0) { + var3 -= var0 * var28; + var0 = 0; + } + + var41 = var1 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if (var26 < var27) { + var2 -= var0; + var0 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; + + while (true) { + --var0; + if (var0 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var28; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var5 += var26; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + var2 -= var0; + var0 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; + + while (true) { + --var0; + if (var0 < 0) { while (true) { --var2; if (var2 < 0) { - while (true) { - --var0; - if (var0 < 0) { - return; - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var26; - var5 += var28; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } + return; } Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var26; + var3 += var28; var4 += var27; var7 += var31; var1 += Rasterizer2D.Rasterizer2D_width; @@ -1770,94 +1823,15 @@ public class Rasterizer3D extends Rasterizer2D { var38 += var40; } } - } else { - var5 = var4 <<= 14; - if (var1 < 0) { - var5 -= var26 * var1; - var4 -= var27 * var1; - var7 -= var31 * var1; - var1 = 0; - } - var3 <<= 14; - if (var0 < 0) { - var3 -= var0 * var28; - var0 = 0; - } - - var41 = var1 - Rasterizer3D_clipMidY; - var32 += var34 * var41; - var35 += var37 * var41; - var38 += var40 * var41; - if (var26 < var27) { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; - - while (true) { - --var0; - if (var0 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var28; - var4 += var27; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var5 += var26; - var4 += var27; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } else { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; - - while (true) { - --var0; - if (var0 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var28; - var4 += var27; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var5 += var26; - var4 += var27; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var5 += var26; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } } else if (var2 < Rasterizer3D_clipHeight) { @@ -1923,33 +1897,109 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; var38 += var40; } - } else { - var1 -= var0; - var0 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + } + var1 -= var0; + var0 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; + while (true) { + --var0; + if (var0 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var27; + var3 += var26; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var27; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + var3 = var5 <<= 14; + if (var2 < 0) { + var3 -= var27 * var2; + var5 -= var28 * var2; + var8 -= var31 * var2; + var2 = 0; + } + + var4 <<= 14; + if (var1 < 0) { + var4 -= var26 * var1; + var1 = 0; + } + + var41 = var2 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if (var27 < var28) { + var0 -= var1; + var1 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var0; + if (var0 < 0) { + return; + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var26; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var3 += var27; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + var0 -= var1; + var1 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; + + while (true) { + --var1; + if (var1 < 0) { while (true) { --var0; if (var0 < 0) { - while (true) { - --var1; - if (var1 < 0) { - return; - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var27; - var3 += var26; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } + return; } Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var27; + var4 += var26; var5 += var28; var8 += var31; var2 += Rasterizer2D.Rasterizer2D_width; @@ -1958,94 +2008,15 @@ public class Rasterizer3D extends Rasterizer2D { var38 += var40; } } - } else { - var3 = var5 <<= 14; - if (var2 < 0) { - var3 -= var27 * var2; - var5 -= var28 * var2; - var8 -= var31 * var2; - var2 = 0; - } - var4 <<= 14; - if (var1 < 0) { - var4 -= var26 * var1; - var1 = 0; - } - - var41 = var2 - Rasterizer3D_clipMidY; - var32 += var34 * var41; - var35 += var37 * var41; - var38 += var40 * var41; - if (var27 < var28) { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; - - while (true) { - --var1; - if (var1 < 0) { - while (true) { - --var0; - if (var0 < 0) { - return; - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var26; - var5 += var28; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var3 += var27; - var5 += var28; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } else { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; - - while (true) { - --var1; - if (var1 < 0) { - while (true) { - --var0; - if (var0 < 0) { - return; - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var26; - var5 += var28; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var3 += var27; - var5 += var28; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } + Rasterizer3D_iDontKnow(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var3 += var27; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } } @@ -2588,33 +2559,109 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; var38 += var40; } - } else { - var2 -= var1; - var1 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; + } + var2 -= var1; + var1 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var28; + var4 += var27; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var28; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + var4 = var3 <<= 14; + if (var0 < 0) { + var4 -= var0 * var28; + var3 -= var0 * var26; + var6 -= var0 * var31; + var0 = 0; + } + + var5 <<= 14; + if (var2 < 0) { + var5 -= var27 * var2; + var2 = 0; + } + + var41 = var0 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if (var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) { + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; + + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var27; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var4 += var28; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + var1 -= var2; + var2 -= var0; + var0 = Rasterizer3D_rowOffsets[var0]; + + while (true) { + --var2; + if (var2 < 0) { while (true) { --var1; if (var1 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var28; - var4 += var27; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } + return; } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var28; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var5 += var27; var3 += var26; var6 += var31; var0 += Rasterizer2D.Rasterizer2D_width; @@ -2623,94 +2670,15 @@ public class Rasterizer3D extends Rasterizer2D { var38 += var40; } } - } else { - var4 = var3 <<= 14; - if (var0 < 0) { - var4 -= var0 * var28; - var3 -= var0 * var26; - var6 -= var0 * var31; - var0 = 0; - } - var5 <<= 14; - if (var2 < 0) { - var5 -= var27 * var2; - var2 = 0; - } - - var41 = var0 - Rasterizer3D_clipMidY; - var32 += var34 * var41; - var35 += var37 * var41; - var38 += var40 * var41; - if (var0 != var2 && var28 < var26 || var0 == var2 && var27 > var26) { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var1; - if (var1 < 0) { - return; - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var5 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var27; - var3 += var26; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var4 >> 14, var3 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var4 += var28; - var3 += var26; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } else { - var1 -= var2; - var2 -= var0; - var0 = Rasterizer3D_rowOffsets[var0]; - - while (true) { - --var2; - if (var2 < 0) { - while (true) { - --var1; - if (var1 < 0) { - return; - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var5 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var5 += var27; - var3 += var26; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); - var4 += var28; - var3 += var26; - var6 += var31; - var0 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var0, var3 >> 14, var4 >> 14, var6, var30, var32, var35, var38, var33, var36, var39); + var4 += var28; + var3 += var26; + var6 += var31; + var0 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } } else if (var1 <= var2) { @@ -2777,33 +2745,109 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; var38 += var40; } - } else { - var0 -= var2; - var2 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; + } + var0 -= var2; + var2 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; + while (true) { + --var2; + if (var2 < 0) { + while (true) { + --var0; + if (var0 < 0) { + return; + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var26; + var5 += var28; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var26; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + var5 = var4 <<= 14; + if (var1 < 0) { + var5 -= var26 * var1; + var4 -= var27 * var1; + var7 -= var31 * var1; + var1 = 0; + } + + var3 <<= 14; + if (var0 < 0) { + var3 -= var0 * var28; + var0 = 0; + } + + var41 = var1 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if (var26 < var27) { + var2 -= var0; + var0 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; + + while (true) { + --var0; + if (var0 < 0) { + while (true) { + --var2; + if (var2 < 0) { + return; + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var28; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var5 += var26; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + var2 -= var0; + var0 -= var1; + var1 = Rasterizer3D_rowOffsets[var1]; + + while (true) { + --var0; + if (var0 < 0) { while (true) { --var2; if (var2 < 0) { - while (true) { - --var0; - if (var0 < 0) { - return; - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var26; - var5 += var28; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } + return; } - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var26; + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var3 += var28; var4 += var27; var7 += var31; var1 += Rasterizer2D.Rasterizer2D_width; @@ -2812,94 +2856,15 @@ public class Rasterizer3D extends Rasterizer2D { var38 += var40; } } - } else { - var5 = var4 <<= 14; - if (var1 < 0) { - var5 -= var26 * var1; - var4 -= var27 * var1; - var7 -= var31 * var1; - var1 = 0; - } - var3 <<= 14; - if (var0 < 0) { - var3 -= var0 * var28; - var0 = 0; - } - - var41 = var1 - Rasterizer3D_clipMidY; - var32 += var34 * var41; - var35 += var37 * var41; - var38 += var40 * var41; - if (var26 < var27) { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; - - while (true) { - --var0; - if (var0 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var3 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var28; - var4 += var27; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var5 >> 14, var4 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var5 += var26; - var4 += var27; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } else { - var2 -= var0; - var0 -= var1; - var1 = Rasterizer3D_rowOffsets[var1]; - - while (true) { - --var0; - if (var0 < 0) { - while (true) { - --var2; - if (var2 < 0) { - return; - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var3 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var3 += var28; - var4 += var27; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); - var5 += var26; - var4 += var27; - var7 += var31; - var1 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var1, var4 >> 14, var5 >> 14, var7, var30, var32, var35, var38, var33, var36, var39); + var5 += var26; + var4 += var27; + var7 += var31; + var1 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } } else if (var2 < Rasterizer3D_clipHeight) { @@ -2965,33 +2930,109 @@ public class Rasterizer3D extends Rasterizer2D { var35 += var37; var38 += var40; } - } else { - var1 -= var0; - var0 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; + } + var1 -= var0; + var0 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; + while (true) { + --var0; + if (var0 < 0) { + while (true) { + --var1; + if (var1 < 0) { + return; + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var27; + var3 += var26; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var27; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + var3 = var5 <<= 14; + if (var2 < 0) { + var3 -= var27 * var2; + var5 -= var28 * var2; + var8 -= var31 * var2; + var2 = 0; + } + + var4 <<= 14; + if (var1 < 0) { + var4 -= var26 * var1; + var1 = 0; + } + + var41 = var2 - Rasterizer3D_clipMidY; + var32 += var34 * var41; + var35 += var37 * var41; + var38 += var40 * var41; + if (var27 < var28) { + var0 -= var1; + var1 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; + + while (true) { + --var1; + if (var1 < 0) { + while (true) { + --var0; + if (var0 < 0) { + return; + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var4 += var26; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var3 += var27; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; + } + } + var0 -= var1; + var1 -= var2; + var2 = Rasterizer3D_rowOffsets[var2]; + + while (true) { + --var1; + if (var1 < 0) { while (true) { --var0; if (var0 < 0) { - while (true) { - --var1; - if (var1 < 0) { - return; - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var27; - var3 += var26; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } + return; } Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var27; + var4 += var26; var5 += var28; var8 += var31; var2 += Rasterizer2D.Rasterizer2D_width; @@ -3000,94 +3041,15 @@ public class Rasterizer3D extends Rasterizer2D { var38 += var40; } } - } else { - var3 = var5 <<= 14; - if (var2 < 0) { - var3 -= var27 * var2; - var5 -= var28 * var2; - var8 -= var31 * var2; - var2 = 0; - } - var4 <<= 14; - if (var1 < 0) { - var4 -= var26 * var1; - var1 = 0; - } - - var41 = var2 - Rasterizer3D_clipMidY; - var32 += var34 * var41; - var35 += var37 * var41; - var38 += var40 * var41; - if (var27 < var28) { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; - - while (true) { - --var1; - if (var1 < 0) { - while (true) { - --var0; - if (var0 < 0) { - return; - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var4 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var26; - var5 += var28; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var3 >> 14, var5 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var3 += var27; - var5 += var28; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } else { - var0 -= var1; - var1 -= var2; - var2 = Rasterizer3D_rowOffsets[var2]; - - while (true) { - --var1; - if (var1 < 0) { - while (true) { - --var0; - if (var0 < 0) { - return; - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var4 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var4 += var26; - var5 += var28; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } - - Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); - var3 += var27; - var5 += var28; - var8 += var31; - var2 += Rasterizer2D.Rasterizer2D_width; - var32 += var34; - var35 += var37; - var38 += var40; - } - } + Rasterizer3D_textureAlpha(Rasterizer2D.Rasterizer2D_pixels, var19, 0, 0, var2, var5 >> 14, var3 >> 14, var8, var30, var32, var35, var38, var33, var36, var39); + var3 += var27; + var5 += var28; + var8 += var31; + var2 += Rasterizer2D.Rasterizer2D_width; + var32 += var34; + var35 += var37; + var38 += var40; } } } diff --git a/runescape-client/src/main/java/RawPcmStream.java b/runescape-client/src/main/java/RawPcmStream.java index dba81d4745..477cdba031 100644 --- a/runescape-client/src/main/java/RawPcmStream.java +++ b/runescape-client/src/main/java/RawPcmStream.java @@ -81,6 +81,7 @@ public class RawPcmStream extends PcmStream { @ObfuscatedSignature( signature = "()Ldx;" ) + @Export("firstSubStream") protected PcmStream firstSubStream() { return null; } @@ -89,6 +90,7 @@ public class RawPcmStream extends PcmStream { @ObfuscatedSignature( signature = "()Ldx;" ) + @Export("nextSubStream") protected PcmStream nextSubStream() { return null; } @@ -163,7 +165,8 @@ public class RawPcmStream extends PcmStream { this.field1471 = var5 + var5 - 1 - this.field1471; this.field1469 = -this.field1469; } - } else if (this.field1469 < 0) { + } + if (this.field1469 < 0) { while (true) { var9 = this.method2641(var1, var9, var5, var3, var4.samples[this.end - 1]); if (this.field1471 >= var5) { @@ -172,111 +175,109 @@ public class RawPcmStream extends PcmStream { this.field1471 = var6 - 1 - (var6 - 1 - this.field1471) % var8; } - } else { - while (true) { - var9 = this.method2543(var1, var9, var6, var3, var4.samples[this.start]); - if (this.field1471 < var6) { - return; - } - - this.field1471 = var5 + (this.field1471 - var5) % var8; - } } - } else { - if (this.numLoops > 0) { - if (this.field1478) { - label119: { - if (this.field1469 < 0) { - var9 = this.method2641(var1, var2, var5, var3, var4.samples[this.start]); - if (this.field1471 >= var5) { - return; - } + while (true) { + var9 = this.method2543(var1, var9, var6, var3, var4.samples[this.start]); + if (this.field1471 < var6) { + return; + } - this.field1471 = var5 + var5 - 1 - this.field1471; - this.field1469 = -this.field1469; - if (--this.numLoops == 0) { - break label119; - } + this.field1471 = var5 + (this.field1471 - var5) % var8; + } + } + if (this.numLoops > 0) { + if (this.field1478) { + label119: { + if (this.field1469 < 0) { + var9 = this.method2641(var1, var2, var5, var3, var4.samples[this.start]); + if (this.field1471 >= var5) { + return; } - do { - var9 = this.method2543(var1, var9, var6, var3, var4.samples[this.end - 1]); - if (this.field1471 < var6) { - return; - } + this.field1471 = var5 + var5 - 1 - this.field1471; + this.field1469 = -this.field1469; + if (--this.numLoops == 0) { + break label119; + } + } - this.field1471 = var6 + var6 - 1 - this.field1471; - this.field1469 = -this.field1469; - if (--this.numLoops == 0) { - break; - } + do { + var9 = this.method2543(var1, var9, var6, var3, var4.samples[this.end - 1]); + if (this.field1471 < var6) { + return; + } - var9 = this.method2641(var1, var9, var5, var3, var4.samples[this.start]); - if (this.field1471 >= var5) { - return; - } + this.field1471 = var6 + var6 - 1 - this.field1471; + this.field1469 = -this.field1469; + if (--this.numLoops == 0) { + break; + } - this.field1471 = var5 + var5 - 1 - this.field1471; - this.field1469 = -this.field1469; - } while(--this.numLoops != 0); + var9 = this.method2641(var1, var9, var5, var3, var4.samples[this.start]); + if (this.field1471 >= var5) { + return; + } + + this.field1471 = var5 + var5 - 1 - this.field1471; + this.field1469 = -this.field1469; + } while(--this.numLoops != 0); + } + } else { + int var10; + if (this.field1469 < 0) { + while (true) { + var9 = this.method2641(var1, var9, var5, var3, var4.samples[this.end - 1]); + if (this.field1471 >= var5) { + return; + } + + var10 = (var6 - 1 - this.field1471) / var8; + if (var10 >= this.numLoops) { + this.field1471 += var8 * this.numLoops; + this.numLoops = 0; + break; + } + + this.field1471 += var8 * var10; + this.numLoops -= var10; } } else { - int var10; - if (this.field1469 < 0) { - while (true) { - var9 = this.method2641(var1, var9, var5, var3, var4.samples[this.end - 1]); - if (this.field1471 >= var5) { - return; - } - - var10 = (var6 - 1 - this.field1471) / var8; - if (var10 >= this.numLoops) { - this.field1471 += var8 * this.numLoops; - this.numLoops = 0; - break; - } - - this.field1471 += var8 * var10; - this.numLoops -= var10; + while (true) { + var9 = this.method2543(var1, var9, var6, var3, var4.samples[this.start]); + if (this.field1471 < var6) { + return; } - } else { - while (true) { - var9 = this.method2543(var1, var9, var6, var3, var4.samples[this.start]); - if (this.field1471 < var6) { - return; - } - var10 = (this.field1471 - var5) / var8; - if (var10 >= this.numLoops) { - this.field1471 -= var8 * this.numLoops; - this.numLoops = 0; - break; - } - - this.field1471 -= var8 * var10; - this.numLoops -= var10; + var10 = (this.field1471 - var5) / var8; + if (var10 >= this.numLoops) { + this.field1471 -= var8 * this.numLoops; + this.numLoops = 0; + break; } + + this.field1471 -= var8 * var10; + this.numLoops -= var10; } } } - - if (this.field1469 < 0) { - this.method2641(var1, var9, 0, var3, 0); - if (this.field1471 < 0) { - this.field1471 = -1; - this.method2647(); - this.remove(); - } - } else { - this.method2543(var1, var9, var7, var3, 0); - if (this.field1471 >= var7) { - this.field1471 = var7; - this.method2647(); - this.remove(); - } - } - } + + if (this.field1469 < 0) { + this.method2641(var1, var9, 0, var3, 0); + if (this.field1471 < 0) { + this.field1471 = -1; + this.method2647(); + this.remove(); + } + } else { + this.method2543(var1, var9, var7, var3, 0); + if (this.field1471 >= var7) { + this.field1471 = var7; + this.method2647(); + this.remove(); + } + } + } } @@ -768,51 +769,49 @@ public class RawPcmStream extends PcmStream { this.field1472 = 0; this.remove(); return true; - } else { - this.method2525(); - return false; } - } else { - if (this.field1472 < var1) { - this.field1480 = 1; - this.field1479 = var1 - this.field1472; - } else if (this.field1472 > var1) { - this.field1480 = -1; - this.field1479 = this.field1472 - var1; - } else { - this.field1480 = 0; - } - - if (this.field1482 < var2) { - this.field1481 = 1; - if (this.field1479 == 0 || this.field1479 > var2 - this.field1482) { - this.field1479 = var2 - this.field1482; - } - } else if (this.field1482 > var2) { - this.field1481 = -1; - if (this.field1479 == 0 || this.field1479 > this.field1482 - var2) { - this.field1479 = this.field1482 - var2; - } - } else { - this.field1481 = 0; - } - - if (this.field1474 < var3) { - this.field1468 = 1; - if (this.field1479 == 0 || this.field1479 > var3 - this.field1474) { - this.field1479 = var3 - this.field1474; - } - } else if (this.field1474 > var3) { - this.field1468 = -1; - if (this.field1479 == 0 || this.field1479 > this.field1474 - var3) { - this.field1479 = this.field1474 - var3; - } - } else { - this.field1468 = 0; - } - + this.method2525(); return false; } + if (this.field1472 < var1) { + this.field1480 = 1; + this.field1479 = var1 - this.field1472; + } else if (this.field1472 > var1) { + this.field1480 = -1; + this.field1479 = this.field1472 - var1; + } else { + this.field1480 = 0; + } + + if (this.field1482 < var2) { + this.field1481 = 1; + if (this.field1479 == 0 || this.field1479 > var2 - this.field1482) { + this.field1479 = var2 - this.field1482; + } + } else if (this.field1482 > var2) { + this.field1481 = -1; + if (this.field1479 == 0 || this.field1479 > this.field1482 - var2) { + this.field1479 = this.field1482 - var2; + } + } else { + this.field1481 = 0; + } + + if (this.field1474 < var3) { + this.field1468 = 1; + if (this.field1479 == 0 || this.field1479 > var3 - this.field1474) { + this.field1479 = var3 - this.field1474; + } + } else if (this.field1474 > var3) { + this.field1468 = -1; + if (this.field1479 == 0 || this.field1479 > this.field1474 - var3) { + this.field1479 = this.field1474 - var3; + } + } else { + this.field1468 = 0; + } + + return false; } @ObfuscatedName("ay") diff --git a/runescape-client/src/main/java/Scene.java b/runescape-client/src/main/java/Scene.java index 2e797275db..93ae0a768d 100644 --- a/runescape-client/src/main/java/Scene.java +++ b/runescape-client/src/main/java/Scene.java @@ -478,11 +478,10 @@ public class Scene { public boolean method3076(int var1, int var2, int var3, int var4, int var5, int var6, Entity var7, int var8, long var9, int var11) { if (var7 == null) { return true; - } else { - int var12 = var5 * 64 + var2 * 128; - int var13 = var6 * 64 + var3 * 128; - return this.newGameObject(var1, var2, var3, var5, var6, var12, var13, var4, var7, var8, false, var9, var11); } + int var12 = var5 * 64 + var2 * 128; + int var13 = var6 * 64 + var3 * 128; + return this.newGameObject(var1, var2, var3, var5, var6, var12, var13, var4, var7, var8, false, var9, var11); } @ObfuscatedName("r") @@ -493,35 +492,34 @@ public class Scene { public boolean drawEntity(int var1, int var2, int var3, int var4, int var5, Entity var6, int var7, long var8, boolean var10) { if (var6 == null) { return true; - } else { - int var11 = var2 - var5; - int var12 = var3 - var5; - int var13 = var5 + var2; - int var14 = var3 + var5; - if (var10) { - if (var7 > 640 && var7 < 1408) { - var14 += 128; - } - - if (var7 > 1152 && var7 < 1920) { - var13 += 128; - } - - if (var7 > 1664 || var7 < 384) { - var12 -= 128; - } - - if (var7 > 128 && var7 < 896) { - var11 -= 128; - } + } + int var11 = var2 - var5; + int var12 = var3 - var5; + int var13 = var5 + var2; + int var14 = var3 + var5; + if (var10) { + if (var7 > 640 && var7 < 1408) { + var14 += 128; } - var11 /= 128; - var12 /= 128; - var13 /= 128; - var14 /= 128; - return this.newGameObject(var1, var11, var12, var13 - var11 + 1, var14 - var12 + 1, var2, var3, var4, var6, var7, true, var8, 0); + if (var7 > 1152 && var7 < 1920) { + var13 += 128; + } + + if (var7 > 1664 || var7 < 384) { + var12 -= 128; + } + + if (var7 > 128 && var7 < 896) { + var11 -= 128; + } } + + var11 /= 128; + var12 /= 128; + var13 /= 128; + var14 /= 128; + return this.newGameObject(var1, var11, var12, var13 - var11 + 1, var14 - var12 + 1, var2, var3, var4, var6, var7, true, var8, 0); } @ObfuscatedName("v") @@ -744,19 +742,18 @@ public class Scene { public GameObject method3195(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; if (var4 == null) { - return null; - } else { - for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { - GameObject var6 = var4.gameObjects[var5]; - long var8 = var6.tag; - boolean var7 = WorldMapLabel.method420(var8) == 2; - if (var7 && var2 == var6.startX && var3 == var6.startY) { - return var6; - } - } - return null; } + for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { + GameObject var6 = var4.gameObjects[var5]; + long var8 = var6.tag; + boolean var7 = WorldMapLabel.method420(var8) == 2; + if (var7 && var2 == var6.startX && var3 == var6.startY) { + return var6; + } + } + + return null; } @ObfuscatedName("ad") @@ -788,19 +785,18 @@ public class Scene { public long getGameObjectTag(int var1, int var2, int var3) { Tile var4 = this.tiles[var1][var2][var3]; if (var4 == null) { - return 0L; - } else { - for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { - GameObject var6 = var4.gameObjects[var5]; - long var8 = var6.tag; - boolean var7 = WorldMapLabel.method420(var8) == 2; - if (var7 && var2 == var6.startX && var3 == var6.startY) { - return var6.tag; - } - } - return 0L; } + for (int var5 = 0; var5 < var4.gameObjectsCount; ++var5) { + GameObject var6 = var4.gameObjects[var5]; + long var8 = var6.tag; + boolean var7 = WorldMapLabel.method420(var8) == 2; + if (var7 && var2 == var6.startX && var3 == var6.startY) { + return var6.tag; + } + } + + return 0L; } @ObfuscatedName("az") @@ -815,22 +811,24 @@ public class Scene { public int getObjectFlags(int var1, int var2, int var3, long var4) { Tile var6 = this.tiles[var1][var2][var3]; if (var6 == null) { - return -1; - } else if (var6.boundaryObject != null && var6.boundaryObject.tag == var4) { - return var6.boundaryObject.flags & 255; - } else if (var6.wallDecoration != null && var6.wallDecoration.tag == var4) { - return var6.wallDecoration.flags & 255; - } else if (var6.floorDecoration != null && var6.floorDecoration.tag == var4) { - return var6.floorDecoration.flags & 255; - } else { - for (int var7 = 0; var7 < var6.gameObjectsCount; ++var7) { - if (var6.gameObjects[var7].tag == var4) { - return var6.gameObjects[var7].flags & 255; - } - } - return -1; } + if (var6.boundaryObject != null && var6.boundaryObject.tag == var4) { + return var6.boundaryObject.flags & 255; + } + if (var6.wallDecoration != null && var6.wallDecoration.tag == var4) { + return var6.wallDecoration.flags & 255; + } + if (var6.floorDecoration != null && var6.floorDecoration.tag == var4) { + return var6.floorDecoration.flags & 255; + } + for (int var7 = 0; var7 < var6.gameObjectsCount; ++var7) { + if (var6.gameObjects[var7].tag == var4) { + return var6.gameObjects[var7].flags & 255; + } + } + + return -1; } @ObfuscatedName("ao") @@ -2129,187 +2127,187 @@ public class Scene { int var4 = this.field1810[var1][var2][var3]; if (var4 == -Scene_drawnCount) { return false; - } else if (var4 == Scene_drawnCount) { - return true; - } else { - int var5 = var2 << 7; - int var6 = var3 << 7; - if (this.method3102(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method3102(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method3102(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method3102(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { - this.field1810[var1][var2][var3] = Scene_drawnCount; - return true; - } else { - this.field1810[var1][var2][var3] = -Scene_drawnCount; - return false; - } } + if (var4 == Scene_drawnCount) { + return true; + } + int var5 = var2 << 7; + int var6 = var3 << 7; + if (this.method3102(var5 + 1, this.tileHeights[var1][var2][var3], var6 + 1) && this.method3102(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3], var6 + 1) && this.method3102(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1], var6 + 128 - 1) && this.method3102(var5 + 1, this.tileHeights[var1][var2][var3 + 1], var6 + 128 - 1)) { + this.field1810[var1][var2][var3] = Scene_drawnCount; + return true; + } + this.field1810[var1][var2][var3] = -Scene_drawnCount; + return false; } @ObfuscatedName("bi") boolean method3194(int var1, int var2, int var3, int var4) { if (!this.method3181(var1, var2, var3)) { return false; - } else { - int var5 = var2 << 7; - int var6 = var3 << 7; - int var7 = this.tileHeights[var1][var2][var3] - 1; - int var8 = var7 - 120; - int var9 = var7 - 230; - int var10 = var7 - 238; - if (var4 < 16) { - if (var4 == 1) { - if (var5 > Scene_cameraX) { - if (!this.method3102(var5, var7, var6)) { - return false; - } - - if (!this.method3102(var5, var7, var6 + 128)) { - return false; - } - } - - if (var1 > 0) { - if (!this.method3102(var5, var8, var6)) { - return false; - } - - if (!this.method3102(var5, var8, var6 + 128)) { - return false; - } - } - - if (!this.method3102(var5, var9, var6)) { + } + int var5 = var2 << 7; + int var6 = var3 << 7; + int var7 = this.tileHeights[var1][var2][var3] - 1; + int var8 = var7 - 120; + int var9 = var7 - 230; + int var10 = var7 - 238; + if (var4 < 16) { + if (var4 == 1) { + if (var5 > Scene_cameraX) { + if (!this.method3102(var5, var7, var6)) { return false; } - if (!this.method3102(var5, var9, var6 + 128)) { + if (!this.method3102(var5, var7, var6 + 128)) { return false; } - - return true; } - if (var4 == 2) { - if (var6 < Scene_cameraZ) { - if (!this.method3102(var5, var7, var6 + 128)) { - return false; - } - - if (!this.method3102(var5 + 128, var7, var6 + 128)) { - return false; - } - } - - if (var1 > 0) { - if (!this.method3102(var5, var8, var6 + 128)) { - return false; - } - - if (!this.method3102(var5 + 128, var8, var6 + 128)) { - return false; - } - } - - if (!this.method3102(var5, var9, var6 + 128)) { + if (var1 > 0) { + if (!this.method3102(var5, var8, var6)) { return false; } - if (!this.method3102(var5 + 128, var9, var6 + 128)) { + if (!this.method3102(var5, var8, var6 + 128)) { return false; } - - return true; } - if (var4 == 4) { - if (var5 < Scene_cameraX) { - if (!this.method3102(var5 + 128, var7, var6)) { - return false; - } - - if (!this.method3102(var5 + 128, var7, var6 + 128)) { - return false; - } - } - - if (var1 > 0) { - if (!this.method3102(var5 + 128, var8, var6)) { - return false; - } - - if (!this.method3102(var5 + 128, var8, var6 + 128)) { - return false; - } - } - - if (!this.method3102(var5 + 128, var9, var6)) { - return false; - } - - if (!this.method3102(var5 + 128, var9, var6 + 128)) { - return false; - } - - return true; + if (!this.method3102(var5, var9, var6)) { + return false; } - if (var4 == 8) { - if (var6 > Scene_cameraZ) { - if (!this.method3102(var5, var7, var6)) { - return false; - } - - if (!this.method3102(var5 + 128, var7, var6)) { - return false; - } - } - - if (var1 > 0) { - if (!this.method3102(var5, var8, var6)) { - return false; - } - - if (!this.method3102(var5 + 128, var8, var6)) { - return false; - } - } - - if (!this.method3102(var5, var9, var6)) { - return false; - } - - if (!this.method3102(var5 + 128, var9, var6)) { - return false; - } - - return true; + if (!this.method3102(var5, var9, var6 + 128)) { + return false; } + + return true; } - if (!this.method3102(var5 + 64, var10, var6 + 64)) { - return false; - } else if (var4 == 16) { - return this.method3102(var5, var9, var6 + 128); - } else if (var4 == 32) { - return this.method3102(var5 + 128, var9, var6 + 128); - } else if (var4 == 64) { - return this.method3102(var5 + 128, var9, var6); - } else if (var4 == 128) { - return this.method3102(var5, var9, var6); - } else { + if (var4 == 2) { + if (var6 < Scene_cameraZ) { + if (!this.method3102(var5, var7, var6 + 128)) { + return false; + } + + if (!this.method3102(var5 + 128, var7, var6 + 128)) { + return false; + } + } + + if (var1 > 0) { + if (!this.method3102(var5, var8, var6 + 128)) { + return false; + } + + if (!this.method3102(var5 + 128, var8, var6 + 128)) { + return false; + } + } + + if (!this.method3102(var5, var9, var6 + 128)) { + return false; + } + + if (!this.method3102(var5 + 128, var9, var6 + 128)) { + return false; + } + + return true; + } + + if (var4 == 4) { + if (var5 < Scene_cameraX) { + if (!this.method3102(var5 + 128, var7, var6)) { + return false; + } + + if (!this.method3102(var5 + 128, var7, var6 + 128)) { + return false; + } + } + + if (var1 > 0) { + if (!this.method3102(var5 + 128, var8, var6)) { + return false; + } + + if (!this.method3102(var5 + 128, var8, var6 + 128)) { + return false; + } + } + + if (!this.method3102(var5 + 128, var9, var6)) { + return false; + } + + if (!this.method3102(var5 + 128, var9, var6 + 128)) { + return false; + } + + return true; + } + + if (var4 == 8) { + if (var6 > Scene_cameraZ) { + if (!this.method3102(var5, var7, var6)) { + return false; + } + + if (!this.method3102(var5 + 128, var7, var6)) { + return false; + } + } + + if (var1 > 0) { + if (!this.method3102(var5, var8, var6)) { + return false; + } + + if (!this.method3102(var5 + 128, var8, var6)) { + return false; + } + } + + if (!this.method3102(var5, var9, var6)) { + return false; + } + + if (!this.method3102(var5 + 128, var9, var6)) { + return false; + } + return true; } } + + if (!this.method3102(var5 + 64, var10, var6 + 64)) { + return false; + } + if (var4 == 16) { + return this.method3102(var5, var9, var6 + 128); + } + if (var4 == 32) { + return this.method3102(var5 + 128, var9, var6 + 128); + } + if (var4 == 64) { + return this.method3102(var5 + 128, var9, var6); + } + if (var4 == 128) { + return this.method3102(var5, var9, var6); + } + return true; } @ObfuscatedName("bg") boolean method3116(int var1, int var2, int var3, int var4) { if (!this.method3181(var1, var2, var3)) { return false; - } else { - int var5 = var2 << 7; - int var6 = var3 << 7; - return this.method3102(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method3102(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method3102(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method3102(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); } + int var5 = var2 << 7; + int var6 = var3 << 7; + return this.method3102(var5 + 1, this.tileHeights[var1][var2][var3] - var4, var6 + 1) && this.method3102(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3] - var4, var6 + 1) && this.method3102(var5 + 128 - 1, this.tileHeights[var1][var2 + 1][var3 + 1] - var4, var6 + 128 - 1) && this.method3102(var5 + 1, this.tileHeights[var1][var2][var3 + 1] - var4, var6 + 128 - 1); } @ObfuscatedName("bh") @@ -2319,41 +2317,37 @@ public class Scene { if (var3 == var2 && var5 == var4) { if (!this.method3181(var1, var2, var4)) { return false; - } else { - var7 = var2 << 7; - var8 = var4 << 7; - return this.method3102(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method3102(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method3102(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method3102(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); } - } else { - for (var7 = var2; var7 <= var3; ++var7) { - for (var8 = var4; var8 <= var5; ++var8) { - if (this.field1810[var1][var7][var8] == -Scene_drawnCount) { - return false; - } - } - } - - var7 = (var2 << 7) + 1; - var8 = (var4 << 7) + 2; - int var9 = this.tileHeights[var1][var2][var4] - var6; - if (!this.method3102(var7, var9, var8)) { - return false; - } else { - int var10 = (var3 << 7) - 1; - if (!this.method3102(var10, var9, var8)) { + var7 = var2 << 7; + var8 = var4 << 7; + return this.method3102(var7 + 1, this.tileHeights[var1][var2][var4] - var6, var8 + 1) && this.method3102(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4] - var6, var8 + 1) && this.method3102(var7 + 128 - 1, this.tileHeights[var1][var2 + 1][var4 + 1] - var6, var8 + 128 - 1) && this.method3102(var7 + 1, this.tileHeights[var1][var2][var4 + 1] - var6, var8 + 128 - 1); + } + for (var7 = var2; var7 <= var3; ++var7) { + for (var8 = var4; var8 <= var5; ++var8) { + if (this.field1810[var1][var7][var8] == -Scene_drawnCount) { return false; - } else { - int var11 = (var5 << 7) - 1; - if (!this.method3102(var7, var9, var11)) { - return false; - } else if (!this.method3102(var10, var9, var11)) { - return false; - } else { - return true; - } } } } + + var7 = (var2 << 7) + 1; + var8 = (var4 << 7) + 2; + int var9 = this.tileHeights[var1][var2][var4] - var6; + if (!this.method3102(var7, var9, var8)) { + return false; + } + int var10 = (var3 << 7) - 1; + if (!this.method3102(var10, var9, var8)) { + return false; + } + int var11 = (var5 << 7) - 1; + if (!this.method3102(var7, var9, var11)) { + return false; + } + if (!this.method3102(var10, var9, var11)) { + return false; + } + return true; } @ObfuscatedName("bm") @@ -2538,9 +2532,8 @@ public class Scene { int var7 = var3 * 128 / var5 + Scene_viewportXCenter; int var8 = var6 * 128 / var5 + Scene_viewportYCenter; return var7 >= Scene_viewportXMin && var7 <= Scene_viewportXMax && var8 >= Scene_viewportYMin && var8 <= Scene_viewportYMax; - } else { - return false; } + return false; } @ObfuscatedName("au") @@ -2571,25 +2564,25 @@ public class Scene { static boolean containsBounds(int var0, int var1, int var2, int var3, int var4, int var5, int var6, int var7) { if (var1 < var2 && var1 < var3 && var1 < var4) { return false; - } else if (var1 > var2 && var1 > var3 && var1 > var4) { - return false; - } else if (var0 < var5 && var0 < var6 && var0 < var7) { - return false; - } else if (var0 > var5 && var0 > var6 && var0 > var7) { - return false; - } else { - int var8 = (var1 - var2) * (var6 - var5) - (var0 - var5) * (var3 - var2); - int var9 = (var7 - var6) * (var1 - var3) - (var0 - var6) * (var4 - var3); - int var10 = (var5 - var7) * (var1 - var4) - (var2 - var4) * (var0 - var7); - if (var8 == 0) { - if (var9 != 0) { - return var9 < 0 ? var10 <= 0 : var10 >= 0; - } else { - return true; - } - } else { - return var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0; - } } + if (var1 > var2 && var1 > var3 && var1 > var4) { + return false; + } + if (var0 < var5 && var0 < var6 && var0 < var7) { + return false; + } + if (var0 > var5 && var0 > var6 && var0 > var7) { + return false; + } + int var8 = (var1 - var2) * (var6 - var5) - (var0 - var5) * (var3 - var2); + int var9 = (var7 - var6) * (var1 - var3) - (var0 - var6) * (var4 - var3); + int var10 = (var5 - var7) * (var1 - var4) - (var2 - var4) * (var0 - var7); + if (var8 == 0) { + if (var9 != 0) { + return var9 < 0 ? var10 <= 0 : var10 >= 0; + } + return true; + } + return var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0; } } diff --git a/runescape-client/src/main/java/ScriptEvent.java b/runescape-client/src/main/java/ScriptEvent.java index 5b5feb90b9..1616b43c13 100644 --- a/runescape-client/src/main/java/ScriptEvent.java +++ b/runescape-client/src/main/java/ScriptEvent.java @@ -138,24 +138,28 @@ public class ScriptEvent extends Node { if (var0 == ScriptOpcodes.IF_GETX) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.x; return 1; - } else if (var0 == ScriptOpcodes.IF_GETY) { + } + if (var0 == ScriptOpcodes.IF_GETY) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.y; return 1; - } else if (var0 == ScriptOpcodes.IF_GETWIDTH) { + } + if (var0 == ScriptOpcodes.IF_GETWIDTH) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.width; return 1; - } else if (var0 == ScriptOpcodes.IF_GETHEIGHT) { + } + if (var0 == ScriptOpcodes.IF_GETHEIGHT) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.height; return 1; - } else if (var0 == ScriptOpcodes.IF_GETHIDE) { + } + if (var0 == ScriptOpcodes.IF_GETHIDE) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.isHidden ? 1 : 0; return 1; - } else if (var0 == ScriptOpcodes.IF_GETLAYER) { + } + if (var0 == ScriptOpcodes.IF_GETLAYER) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.parentId; return 1; - } else { - return 2; } + return 2; } @ObfuscatedName("go") @@ -178,9 +182,8 @@ public class ScriptEvent extends Node { int var8 = (128 - var6) * Tiles.Tiles_heights[var5][var3][var4] + Tiles.Tiles_heights[var5][var3 + 1][var4] * var6 >> 7; int var9 = Tiles.Tiles_heights[var5][var3 + 1][var4 + 1] * var6 + Tiles.Tiles_heights[var5][var3][var4 + 1] * (128 - var6) >> 7; return var7 * var9 + var8 * (128 - var7) >> 7; - } else { - return 0; } + return 0; } @ObfuscatedName("iq") diff --git a/runescape-client/src/main/java/ScriptFrame.java b/runescape-client/src/main/java/ScriptFrame.java index 747056253b..9c4a0ec19e 100644 --- a/runescape-client/src/main/java/ScriptFrame.java +++ b/runescape-client/src/main/java/ScriptFrame.java @@ -338,14 +338,13 @@ public class ScriptFrame { if (var1.offset != Client.packetWriter.serverPacketLength) { throw new RuntimeException(var1.offset + "," + Client.packetWriter.serverPacketLength); - } else { - for (var2 = 0; var2 < Client.npcCount; ++var2) { - if (Client.npcs[Client.npcIndices[var2]] == null) { - throw new RuntimeException(var2 + "," + Client.npcCount); - } - } - } + for (var2 = 0; var2 < Client.npcCount; ++var2) { + if (Client.npcs[Client.npcIndices[var2]] == null) { + throw new RuntimeException(var2 + "," + Client.npcCount); + } + } + } @ObfuscatedName("hf") diff --git a/runescape-client/src/main/java/SequenceDefinition.java b/runescape-client/src/main/java/SequenceDefinition.java index 43c1c4743a..fa0e04fe26 100644 --- a/runescape-client/src/main/java/SequenceDefinition.java +++ b/runescape-client/src/main/java/SequenceDefinition.java @@ -249,11 +249,10 @@ public class SequenceDefinition extends DualNode { var2 &= 65535; if (var3 == null) { return var1.toSharedSequenceModel(true); - } else { - Model var4 = var1.toSharedSequenceModel(!var3.hasAlphaTransform(var2)); - var4.animate(var3, var2); - return var4; } + Model var4 = var1.toSharedSequenceModel(!var3.hasAlphaTransform(var2)); + var4.animate(var3, var2); + return var4; } @ObfuscatedName("l") @@ -268,28 +267,27 @@ public class SequenceDefinition extends DualNode { var2 &= 65535; if (var4 == null) { return var1.toSharedSequenceModel(true); - } else { - Model var5 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var2)); - var3 &= 3; - if (var3 == 1) { - var5.rotateY270Ccw(); - } else if (var3 == 2) { - var5.rotateY180(); - } else if (var3 == 3) { - var5.rotateY90Ccw(); - } - - var5.animate(var4, var2); - if (var3 == 1) { - var5.rotateY90Ccw(); - } else if (var3 == 2) { - var5.rotateY180(); - } else if (var3 == 3) { - var5.rotateY270Ccw(); - } - - return var5; } + Model var5 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var2)); + var3 &= 3; + if (var3 == 1) { + var5.rotateY270Ccw(); + } else if (var3 == 2) { + var5.rotateY180(); + } else if (var3 == 3) { + var5.rotateY90Ccw(); + } + + var5.animate(var4, var2); + if (var3 == 1) { + var5.rotateY90Ccw(); + } else if (var3 == 2) { + var5.rotateY180(); + } else if (var3 == 3) { + var5.rotateY270Ccw(); + } + + return var5; } @ObfuscatedName("b") @@ -304,11 +302,10 @@ public class SequenceDefinition extends DualNode { var2 &= 65535; if (var3 == null) { return var1.toSharedSpotAnimationModel(true); - } else { - Model var4 = var1.toSharedSpotAnimationModel(!var3.hasAlphaTransform(var2)); - var4.animate(var3, var2); - return var4; } + Model var4 = var1.toSharedSpotAnimationModel(!var3.hasAlphaTransform(var2)); + var4.animate(var3, var2); + return var4; } @ObfuscatedName("i") @@ -323,21 +320,19 @@ public class SequenceDefinition extends DualNode { var2 &= 65535; if (var5 == null) { return var3.transformActorModel(var1, var4); - } else { - var4 = var3.frameIds[var4]; - Frames var6 = class30.getFrames(var4 >> 16); - var4 &= 65535; - Model var7; - if (var6 == null) { - var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2)); - var7.animate(var5, var2); - return var7; - } else { - var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2) & !var6.hasAlphaTransform(var4)); - var7.animate2(var5, var2, var6, var4, this.field3518); - return var7; - } } + var4 = var3.frameIds[var4]; + Frames var6 = class30.getFrames(var4 >> 16); + var4 &= 65535; + Model var7; + if (var6 == null) { + var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2)); + var7.animate(var5, var2); + return var7; + } + var7 = var1.toSharedSequenceModel(!var5.hasAlphaTransform(var2) & !var6.hasAlphaTransform(var4)); + var7.animate2(var5, var2, var6, var4, this.field3518); + return var7; } @ObfuscatedName("c") @@ -352,26 +347,24 @@ public class SequenceDefinition extends DualNode { var3 &= 65535; if (var4 == null) { return var1.toSharedSequenceModel(true); - } else { - Frames var5 = null; - int var6 = 0; - if (this.chatFrameIds != null && var2 < this.chatFrameIds.length) { - var6 = this.chatFrameIds[var2]; - var5 = class30.getFrames(var6 >> 16); - var6 &= 65535; - } - - Model var7; - if (var5 != null && var6 != 65535) { - var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3) & !var5.hasAlphaTransform(var6)); - var7.animate(var4, var3); - var7.animate(var5, var6); - return var7; - } else { - var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3)); - var7.animate(var4, var3); - return var7; - } } + Frames var5 = null; + int var6 = 0; + if (this.chatFrameIds != null && var2 < this.chatFrameIds.length) { + var6 = this.chatFrameIds[var2]; + var5 = class30.getFrames(var6 >> 16); + var6 &= 65535; + } + + Model var7; + if (var5 != null && var6 != 65535) { + var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3) & !var5.hasAlphaTransform(var6)); + var7.animate(var4, var3); + var7.animate(var5, var6); + return var7; + } + var7 = var1.toSharedSequenceModel(!var4.hasAlphaTransform(var3)); + var7.animate(var4, var3); + return var7; } } diff --git a/runescape-client/src/main/java/Skeleton.java b/runescape-client/src/main/java/Skeleton.java index f8a7d1d2b2..05e95d6a64 100644 --- a/runescape-client/src/main/java/Skeleton.java +++ b/runescape-client/src/main/java/Skeleton.java @@ -150,90 +150,87 @@ public class Skeleton extends Node { int var5 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2]; if (var4 == 0) { throw new RuntimeException(); - } else { - Widget var6 = class80.getWidget(var3); - if (var6.children == null) { - var6.children = new Widget[var5 + 1]; - } - - if (var6.children.length <= var5) { - Widget[] var7 = new Widget[var5 + 1]; - - for (int var8 = 0; var8 < var6.children.length; ++var8) { - var7[var8] = var6.children[var8]; - } - - var6.children = var7; - } - - if (var5 > 0 && var6.children[var5 - 1] == null) { - throw new RuntimeException("" + (var5 - 1)); - } else { - Widget var12 = new Widget(); - var12.type = var4; - var12.parentId = var12.id = var6.id; - var12.childIndex = var5; - var12.isIf3 = true; - var6.children[var5] = var12; - if (var2) { - Interpreter.field1111 = var12; - } else { - Calendar.field2507 = var12; - } - - Strings.method4120(var6); - return 1; - } } - } else { - Widget var9; - if (var0 == ScriptOpcodes.CC_DELETE) { - var9 = var2 ? Interpreter.field1111 : Calendar.field2507; - Widget var10 = class80.getWidget(var9.id); - var10.children[var9.childIndex] = null; - Strings.method4120(var10); - return 1; - } else if (var0 == ScriptOpcodes.CC_DELETEALL) { - var9 = class80.getWidget(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); - var9.children = null; - Strings.method4120(var9); - return 1; - } else if (var0 != ScriptOpcodes.CC_FIND) { - if (var0 == ScriptOpcodes.IF_FIND) { - var9 = class80.getWidget(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); - if (var9 != null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 1; - if (var2) { - Interpreter.field1111 = var9; - } else { - Calendar.field2507 = var9; - } - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else { - return 2; - } - } else { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - Widget var11 = Client.getWidgetChild(var3, var4); - if (var11 != null && var4 != -1) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 1; - if (var2) { - Interpreter.field1111 = var11; - } else { - Calendar.field2507 = var11; - } - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - } - - return 1; + Widget var6 = class80.getWidget(var3); + if (var6.children == null) { + var6.children = new Widget[var5 + 1]; } + + if (var6.children.length <= var5) { + Widget[] var7 = new Widget[var5 + 1]; + + for (int var8 = 0; var8 < var6.children.length; ++var8) { + var7[var8] = var6.children[var8]; + } + + var6.children = var7; + } + + if (var5 > 0 && var6.children[var5 - 1] == null) { + throw new RuntimeException("" + (var5 - 1)); + } + Widget var12 = new Widget(); + var12.type = var4; + var12.parentId = var12.id = var6.id; + var12.childIndex = var5; + var12.isIf3 = true; + var6.children[var5] = var12; + if (var2) { + Interpreter.field1111 = var12; + } else { + Calendar.field2507 = var12; + } + + Strings.method4120(var6); + return 1; } + Widget var9; + if (var0 == ScriptOpcodes.CC_DELETE) { + var9 = var2 ? Interpreter.field1111 : Calendar.field2507; + Widget var10 = class80.getWidget(var9.id); + var10.children[var9.childIndex] = null; + Strings.method4120(var10); + return 1; + } + if (var0 == ScriptOpcodes.CC_DELETEALL) { + var9 = class80.getWidget(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); + var9.children = null; + Strings.method4120(var9); + return 1; + } + if (var0 == ScriptOpcodes.CC_FIND) { + HealthBarUpdate.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; + Widget var11 = Client.getWidgetChild(var3, var4); + if (var11 != null && var4 != -1) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 1; + if (var2) { + Interpreter.field1111 = var11; + } else { + Calendar.field2507 = var11; + } + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } + if (var0 == ScriptOpcodes.IF_FIND) { + var9 = class80.getWidget(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); + if (var9 != null) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 1; + if (var2) { + Interpreter.field1111 = var9; + } else { + Calendar.field2507 = var9; + } + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } + return 2; } } diff --git a/runescape-client/src/main/java/SoundCache.java b/runescape-client/src/main/java/SoundCache.java index c1e2e171a7..cf2842a506 100644 --- a/runescape-client/src/main/java/SoundCache.java +++ b/runescape-client/src/main/java/SoundCache.java @@ -60,22 +60,21 @@ public class SoundCache { RawSound var7 = (RawSound)this.rawSounds.get(var5); if (var7 != null) { return var7; - } else if (var3 != null && var3[0] <= 0) { - return null; - } else { - SoundEffect var8 = SoundEffect.readSoundEffect(this.soundEffectIndex, var1, var2); - if (var8 == null) { - return null; - } else { - var7 = var8.toRawSound(); - this.rawSounds.put(var7, var5); - if (var3 != null) { - var3[0] -= var7.samples.length; - } - - return var7; - } } + if (var3 != null && var3[0] <= 0) { + return null; + } + SoundEffect var8 = SoundEffect.readSoundEffect(this.soundEffectIndex, var1, var2); + if (var8 == null) { + return null; + } + var7 = var8.toRawSound(); + this.rawSounds.put(var7, var5); + if (var3 != null) { + var3[0] -= var7.samples.length; + } + + return var7; } @ObfuscatedName("w") @@ -91,28 +90,27 @@ public class SoundCache { RawSound var7 = (RawSound)this.rawSounds.get(var5); if (var7 != null) { return var7; - } else if (var3 != null && var3[0] <= 0) { - return null; - } else { - VorbisSample var8 = (VorbisSample)this.musicSamples.get(var5); - if (var8 == null) { - var8 = VorbisSample.readMusicSample(this.musicSampleIndex, var1, var2); - if (var8 == null) { - return null; - } - - this.musicSamples.put(var8, var5); - } - - var7 = var8.toRawSound(var3); - if (var7 == null) { - return null; - } else { - var8.remove(); - this.rawSounds.put(var7, var5); - return var7; - } } + if (var3 != null && var3[0] <= 0) { + return null; + } + VorbisSample var8 = (VorbisSample)this.musicSamples.get(var5); + if (var8 == null) { + var8 = VorbisSample.readMusicSample(this.musicSampleIndex, var1, var2); + if (var8 == null) { + return null; + } + + this.musicSamples.put(var8, var5); + } + + var7 = var8.toRawSound(var3); + if (var7 == null) { + return null; + } + var8.remove(); + this.rawSounds.put(var7, var5); + return var7; } @ObfuscatedName("e") @@ -124,11 +122,11 @@ public class SoundCache { public RawSound getSoundEffect(int var1, int[] var2) { if (this.soundEffectIndex.getGroupCount() == 1) { return this.getSoundEffect0(0, var1, var2); - } else if (this.soundEffectIndex.getGroupFileCount(var1) == 1) { - return this.getSoundEffect0(var1, 0, var2); - } else { - throw new RuntimeException(); } + if (this.soundEffectIndex.getGroupFileCount(var1) == 1) { + return this.getSoundEffect0(var1, 0, var2); + } + throw new RuntimeException(); } @ObfuscatedName("p") @@ -140,11 +138,11 @@ public class SoundCache { public RawSound getMusicSample(int var1, int[] var2) { if (this.musicSampleIndex.getGroupCount() == 1) { return this.getMusicSample0(0, var1, var2); - } else if (this.musicSampleIndex.getGroupFileCount(var1) == 1) { - return this.getMusicSample0(var1, 0, var2); - } else { - throw new RuntimeException(); } + if (this.musicSampleIndex.getGroupFileCount(var1) == 1) { + return this.getMusicSample0(var1, 0, var2); + } + throw new RuntimeException(); } @ObfuscatedName("eb") diff --git a/runescape-client/src/main/java/SoundEffect.java b/runescape-client/src/main/java/SoundEffect.java index b0ac78647f..7ea5afa018 100644 --- a/runescape-client/src/main/java/SoundEffect.java +++ b/runescape-client/src/main/java/SoundEffect.java @@ -78,9 +78,8 @@ public class SoundEffect { } return var1; - } else { - return 0; } + return 0; } @ObfuscatedName("p") @@ -97,29 +96,28 @@ public class SoundEffect { if (var1 == 0) { return new byte[0]; - } else { - var2 = var1 * 22050 / 1000; - byte[] var3 = new byte[var2]; + } + var2 = var1 * 22050 / 1000; + byte[] var3 = new byte[var2]; - for (int var4 = 0; var4 < 10; ++var4) { - if (this.instruments[var4] != null) { - int var5 = this.instruments[var4].duration * 22050 / 1000; - int var6 = this.instruments[var4].offset * 22050 / 1000; - int[] var7 = this.instruments[var4].synthesize(var5, this.instruments[var4].duration); + for (int var4 = 0; var4 < 10; ++var4) { + if (this.instruments[var4] != null) { + int var5 = this.instruments[var4].duration * 22050 / 1000; + int var6 = this.instruments[var4].offset * 22050 / 1000; + int[] var7 = this.instruments[var4].synthesize(var5, this.instruments[var4].duration); - for (int var8 = 0; var8 < var5; ++var8) { - int var9 = (var7[var8] >> 8) + var3[var8 + var6]; - if ((var9 + 128 & -256) != 0) { - var9 = var9 >> 31 ^ 127; - } - - var3[var8 + var6] = (byte)var9; + for (int var8 = 0; var8 < var5; ++var8) { + int var9 = (var7[var8] >> 8) + var3[var8 + var6]; + if ((var9 + 128 & -256) != 0) { + var9 = var9 >> 31 ^ 127; } + + var3[var8 + var6] = (byte)var9; } } - - return var3; } + + return var3; } @ObfuscatedName("q") diff --git a/runescape-client/src/main/java/class326.java b/runescape-client/src/main/java/SpriteBuffer.java similarity index 94% rename from runescape-client/src/main/java/class326.java rename to runescape-client/src/main/java/SpriteBuffer.java index a9d698876b..0c2c1a29c3 100644 --- a/runescape-client/src/main/java/class326.java +++ b/runescape-client/src/main/java/SpriteBuffer.java @@ -2,12 +2,14 @@ import java.awt.Desktop; import java.awt.Desktop.Action; import java.net.URI; import net.runelite.mapping.Export; +import net.runelite.mapping.Implements; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @ObfuscatedName("lm") -public class class326 { +@Implements("SpriteBuffer") +public class SpriteBuffer { @ObfuscatedName("q") @ObfuscatedGetter( intValue = -180195353 diff --git a/runescape-client/src/main/java/StructDefinition.java b/runescape-client/src/main/java/StructDefinition.java index 5fd0f71a03..df093d77e1 100644 --- a/runescape-client/src/main/java/StructDefinition.java +++ b/runescape-client/src/main/java/StructDefinition.java @@ -427,52 +427,51 @@ public class StructDefinition extends DualNode { if (var1 > Client.npcCount) { throw new RuntimeException(""); - } else { - Client.npcCount = 0; + } + Client.npcCount = 0; - for (var2 = 0; var2 < var1; ++var2) { - int var3 = Client.npcIndices[var2]; - NPC var4 = Client.npcs[var3]; - int var5 = var0.readBits(1); - if (var5 == 0) { + for (var2 = 0; var2 < var1; ++var2) { + int var3 = Client.npcIndices[var2]; + NPC var4 = Client.npcs[var3]; + int var5 = var0.readBits(1); + if (var5 == 0) { + Client.npcIndices[++Client.npcCount - 1] = var3; + var4.npcCycle = Client.cycle; + } else { + int var6 = var0.readBits(2); + if (var6 == 0) { Client.npcIndices[++Client.npcCount - 1] = var3; var4.npcCycle = Client.cycle; + Client.field859[++Client.field697 - 1] = var3; } else { - int var6 = var0.readBits(2); - if (var6 == 0) { + int var7; + int var8; + if (var6 == 1) { Client.npcIndices[++Client.npcCount - 1] = var3; var4.npcCycle = Client.cycle; - Client.field859[++Client.field697 - 1] = var3; - } else { - int var7; - int var8; - if (var6 == 1) { - Client.npcIndices[++Client.npcCount - 1] = var3; - var4.npcCycle = Client.cycle; - var7 = var0.readBits(3); - var4.method1974(var7, (byte)1); - var8 = var0.readBits(1); - if (var8 == 1) { - Client.field859[++Client.field697 - 1] = var3; - } - } else if (var6 == 2) { - Client.npcIndices[++Client.npcCount - 1] = var3; - var4.npcCycle = Client.cycle; - var7 = var0.readBits(3); - var4.method1974(var7, (byte)2); - var8 = var0.readBits(3); - var4.method1974(var8, (byte)2); - int var9 = var0.readBits(1); - if (var9 == 1) { - Client.field859[++Client.field697 - 1] = var3; - } - } else if (var6 == 3) { - Client.field776[++Client.field775 - 1] = var3; + var7 = var0.readBits(3); + var4.method1974(var7, (byte)1); + var8 = var0.readBits(1); + if (var8 == 1) { + Client.field859[++Client.field697 - 1] = var3; } + } else if (var6 == 2) { + Client.npcIndices[++Client.npcCount - 1] = var3; + var4.npcCycle = Client.cycle; + var7 = var0.readBits(3); + var4.method1974(var7, (byte)2); + var8 = var0.readBits(3); + var4.method1974(var8, (byte)2); + int var9 = var0.readBits(1); + if (var9 == 1) { + Client.field859[++Client.field697 - 1] = var3; + } + } else if (var6 == 3) { + Client.field776[++Client.field775 - 1] = var3; } } } - } + } } diff --git a/runescape-client/src/main/java/StudioGame.java b/runescape-client/src/main/java/StudioGame.java index 04cf155aa8..6c37321070 100644 --- a/runescape-client/src/main/java/StudioGame.java +++ b/runescape-client/src/main/java/StudioGame.java @@ -74,19 +74,8 @@ public enum StudioGame implements Enumerated { if (var0 == ScriptOpcodes.CC_GETTARGETMASK) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = HealthBar.method1957(class268.getWidgetClickMask(var3)); return 1; - } else if (var0 != ScriptOpcodes.CC_GETOP) { - if (var0 == ScriptOpcodes.CC_GETOPBASE) { - if (var3.dataText == null) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - } else { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.dataText; - } - - return 1; - } else { - return 2; - } - } else { + } + if (var0 == ScriptOpcodes.CC_GETOP) { int var4 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; --var4; if (var3.actions != null && var4 < var3.actions.length && var3.actions[var4] != null) { @@ -97,5 +86,16 @@ public enum StudioGame implements Enumerated { return 1; } + if (var0 == ScriptOpcodes.CC_GETOPBASE) { + if (var3.dataText == null) { + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; + } else { + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.dataText; + } + + return 1; + } + + return 2; } } diff --git a/runescape-client/src/main/java/Texture.java b/runescape-client/src/main/java/Texture.java index d0878bf1e0..bd765f3869 100644 --- a/runescape-client/src/main/java/Texture.java +++ b/runescape-client/src/main/java/Texture.java @@ -100,19 +100,19 @@ public class Texture extends Node { for (int var6 = 0; var6 < this.records.length; ++var6) { int var8 = this.records[var6]; IndexedSprite var7; - if (!PlayerAppearance.SpriteBuffer_loadSpriteFlat(var4, var8)) { + if (!PlayerAppearance.SpriteBuffer_bufferFileFlat(var4, var8)) { var7 = null; } else { IndexedSprite var10 = new IndexedSprite(); - var10.width = class326.SpriteBuffer_spriteWidth; - var10.height = class326.SpriteBuffer_spriteHeight; + var10.width = SpriteBuffer.SpriteBuffer_spriteWidth; + var10.height = SpriteBuffer.SpriteBuffer_spriteHeight; var10.xOffset = Varps.SpriteBuffer_xOffsets[0]; - var10.yOffset = class326.SpriteBuffer_yOffsets[0]; - var10.subWidth = class326.SpriteBuffer_spriteWidths[0]; + var10.yOffset = SpriteBuffer.SpriteBuffer_yOffsets[0]; + var10.subWidth = SpriteBuffer.SpriteBuffer_spriteWidths[0]; var10.subHeight = class216.SpriteBuffer_spriteHeights[0]; var10.palette = Frames.SpriteBuffer_spritePalette; - var10.pixels = class326.SpriteBuffer_pixels[0]; - class16.method174(); + var10.pixels = SpriteBuffer.SpriteBuffer_pixels[0]; + class16.SpriteBuffer_clear(); var7 = var10; } diff --git a/runescape-client/src/main/java/TextureProvider.java b/runescape-client/src/main/java/TextureProvider.java index 2b6295ba2a..e3bc0c9448 100644 --- a/runescape-client/src/main/java/TextureProvider.java +++ b/runescape-client/src/main/java/TextureProvider.java @@ -107,9 +107,8 @@ public class TextureProvider implements TextureLoader { if (var1 == 0) { return 0; - } else { - return var2 * 100 / var1; } + return var2 * 100 / var1; } @ObfuscatedName("w") @@ -380,50 +379,63 @@ public class TextureProvider implements TextureLoader { if (var0 == ScriptOpcodes.IF_GETSCROLLX) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.scrollX; return 1; - } else if (var0 == ScriptOpcodes.IF_GETSCROLLY) { + } + if (var0 == ScriptOpcodes.IF_GETSCROLLY) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.scrollY; return 1; - } else if (var0 == ScriptOpcodes.IF_GETTEXT) { + } + if (var0 == ScriptOpcodes.IF_GETTEXT) { Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.text; return 1; - } else if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { + } + if (var0 == ScriptOpcodes.IF_GETSCROLLWIDTH) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.scrollWidth; return 1; - } else if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { + } + if (var0 == ScriptOpcodes.IF_GETSCROLLHEIGHT) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.scrollHeight; return 1; - } else if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { + } + if (var0 == ScriptOpcodes.IF_GETMODELZOOM) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.modelZoom; return 1; - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { + } + if (var0 == ScriptOpcodes.IF_GETMODELANGLE_X) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.modelAngleX; return 1; - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { + } + if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Z) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.modelAngleZ; return 1; - } else if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { + } + if (var0 == ScriptOpcodes.IF_GETMODELANGLE_Y) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.modelAngleY; return 1; - } else if (var0 == ScriptOpcodes.IF_GETTRANSTOP) { + } + if (var0 == ScriptOpcodes.IF_GETTRANSTOP) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.transparencyTop; return 1; - } else if (var0 == ScriptOpcodes.IF_GETTRANSBOT) { + } + if (var0 == ScriptOpcodes.IF_GETTRANSBOT) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.transparencyBot; return 1; - } else if (var0 == ScriptOpcodes.IF_GETCOLOUR) { + } + if (var0 == ScriptOpcodes.IF_GETCOLOUR) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.color; return 1; - } else if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { + } + if (var0 == ScriptOpcodes.IF_GETFILLCOLOUR) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.color2; return 1; - } else if (var0 == ScriptOpcodes.IF_GETFILLMODE) { + } + if (var0 == ScriptOpcodes.IF_GETFILLMODE) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.fillMode.rsOrdinal(); return 1; - } else if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { + } + if (var0 == ScriptOpcodes.IF_GETMODELTRANSPARENT) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.modelTransparency ? 1 : 0; return 1; - } else { - return 2; } + return 2; } } diff --git a/runescape-client/src/main/java/Tile.java b/runescape-client/src/main/java/Tile.java index a37b358fa7..b9af45976b 100644 --- a/runescape-client/src/main/java/Tile.java +++ b/runescape-client/src/main/java/Tile.java @@ -151,26 +151,24 @@ public final class Tile extends Node { if (var0 > 0L && var0 < 6582952005840035281L) { if (0L == var0 % 37L) { return null; - } else { - int var2 = 0; - - for (long var3 = var0; var3 != 0L; var3 /= 37L) { - ++var2; - } - - StringBuilder var5 = new StringBuilder(var2); - - while (var0 != 0L) { - long var6 = var0; - var0 /= 37L; - var5.append(class289.base37Table[(int)(var6 - var0 * 37L)]); - } - - return var5.reverse().toString(); } - } else { - return null; + int var2 = 0; + + for (long var3 = var0; var3 != 0L; var3 /= 37L) { + ++var2; + } + + StringBuilder var5 = new StringBuilder(var2); + + while (var0 != 0L) { + long var6 = var0; + var0 /= 37L; + var5.append(class289.base37Table[(int)(var6 - var0 * 37L)]); + } + + return var5.reverse().toString(); } + return null; } @ObfuscatedName("b") diff --git a/runescape-client/src/main/java/TilePaint.java b/runescape-client/src/main/java/TilePaint.java index f883e9d16a..f63f7de02c 100644 --- a/runescape-client/src/main/java/TilePaint.java +++ b/runescape-client/src/main/java/TilePaint.java @@ -63,31 +63,31 @@ public final class TilePaint { signature = "(Lhp;III)[Lly;", garbageValue = "1591290793" ) - public static Sprite[] method3062(AbstractArchive var0, int var1, int var2) { - if (!Friend.doesSpriteExist(var0, var1, var2)) { + @Export("SpriteBuffer_getSpriteArray") + public static Sprite[] SpriteBuffer_getSpriteArray(AbstractArchive var0, int var1, int var2) { + if (!Friend.SpriteBuffer_bufferFile(var0, var1, var2)) { return null; - } else { - Sprite[] var4 = new Sprite[class326.SpriteBuffer_spriteCount]; - - for (int var5 = 0; var5 < class326.SpriteBuffer_spriteCount; ++var5) { - Sprite var6 = var4[var5] = new Sprite(); - var6.width = class326.SpriteBuffer_spriteWidth; - var6.height = class326.SpriteBuffer_spriteHeight; - var6.yOffset = Varps.SpriteBuffer_xOffsets[var5]; - var6.xOffset = class326.SpriteBuffer_yOffsets[var5]; - var6.subWidth = class326.SpriteBuffer_spriteWidths[var5]; - var6.subHeight = class216.SpriteBuffer_spriteHeights[var5]; - int var7 = var6.subHeight * var6.subWidth; - byte[] var8 = class326.SpriteBuffer_pixels[var5]; - var6.pixels = new int[var7]; - - for (int var9 = 0; var9 < var7; ++var9) { - var6.pixels[var9] = Frames.SpriteBuffer_spritePalette[var8[var9] & 255]; - } - } - - class16.method174(); - return var4; } + Sprite[] var4 = new Sprite[SpriteBuffer.SpriteBuffer_spriteCount]; + + for (int var5 = 0; var5 < SpriteBuffer.SpriteBuffer_spriteCount; ++var5) { + Sprite var6 = var4[var5] = new Sprite(); + var6.width = SpriteBuffer.SpriteBuffer_spriteWidth; + var6.height = SpriteBuffer.SpriteBuffer_spriteHeight; + var6.yOffset = Varps.SpriteBuffer_xOffsets[var5]; + var6.xOffset = SpriteBuffer.SpriteBuffer_yOffsets[var5]; + var6.subWidth = SpriteBuffer.SpriteBuffer_spriteWidths[var5]; + var6.subHeight = class216.SpriteBuffer_spriteHeights[var5]; + int var7 = var6.subHeight * var6.subWidth; + byte[] var8 = SpriteBuffer.SpriteBuffer_pixels[var5]; + var6.pixels = new int[var7]; + + for (int var9 = 0; var9 < var7; ++var9) { + var6.pixels[var9] = Frames.SpriteBuffer_spritePalette[var8[var9] & 255]; + } + } + + class16.SpriteBuffer_clear(); + return var4; } } diff --git a/runescape-client/src/main/java/Timer.java b/runescape-client/src/main/java/Timer.java index ad1070f05d..a829ff3a40 100644 --- a/runescape-client/src/main/java/Timer.java +++ b/runescape-client/src/main/java/Timer.java @@ -182,35 +182,35 @@ public class Timer { public static String method5015(CharSequence[] var0, int var1, int var2) { if (var2 == 0) { return ""; - } else if (var2 == 1) { + } + if (var2 == 1) { CharSequence var3 = var0[var1]; return var3 == null ? "null" : var3.toString(); - } else { - int var8 = var2 + var1; - int var4 = 0; - - for (int var5 = var1; var5 < var8; ++var5) { - CharSequence var6 = var0[var5]; - if (var6 == null) { - var4 += 4; - } else { - var4 += var6.length(); - } - } - - StringBuilder var9 = new StringBuilder(var4); - - for (int var10 = var1; var10 < var8; ++var10) { - CharSequence var7 = var0[var10]; - if (var7 == null) { - var9.append("null"); - } else { - var9.append(var7); - } - } - - return var9.toString(); } + int var8 = var2 + var1; + int var4 = 0; + + for (int var5 = var1; var5 < var8; ++var5) { + CharSequence var6 = var0[var5]; + if (var6 == null) { + var4 += 4; + } else { + var4 += var6.length(); + } + } + + StringBuilder var9 = new StringBuilder(var4); + + for (int var10 = var1; var10 < var8; ++var10) { + CharSequence var7 = var0[var10]; + if (var7 == null) { + var9.append("null"); + } else { + var9.append(var7); + } + } + + return var9.toString(); } @ObfuscatedName("ed") @@ -491,67 +491,67 @@ public class Timer { } else if (Client.titleLoadingStage == 80) { var0 = 0; if (Message.compass == null) { - Message.compass = class65.loadSprite(Client.archive8, UserComparator6.spriteIds.compass, 0); + Message.compass = class65.SpriteBuffer_getSprite(Client.archive8, UserComparator6.spriteIds.compass, 0); } else { ++var0; } if (UserComparator4.redHintArrowSprite == null) { - UserComparator4.redHintArrowSprite = class65.loadSprite(Client.archive8, UserComparator6.spriteIds.field3823, 0); + UserComparator4.redHintArrowSprite = class65.SpriteBuffer_getSprite(Client.archive8, UserComparator6.spriteIds.field3823, 0); } else { ++var0; } if (ClanChat.mapSceneSprites == null) { - ClanChat.mapSceneSprites = class289.method5281(Client.archive8, UserComparator6.spriteIds.mapScenes, 0); + ClanChat.mapSceneSprites = class289.SpriteBuffer_getIndexedSpriteArray(Client.archive8, UserComparator6.spriteIds.mapScenes, 0); } else { ++var0; } if (UserComparator3.headIconPkSprites == null) { - UserComparator3.headIconPkSprites = TilePaint.method3062(Client.archive8, UserComparator6.spriteIds.headIconsPk, 0); + UserComparator3.headIconPkSprites = TilePaint.SpriteBuffer_getSpriteArray(Client.archive8, UserComparator6.spriteIds.headIconsPk, 0); } else { ++var0; } if (SoundCache.headIconPrayerSprites == null) { - SoundCache.headIconPrayerSprites = TilePaint.method3062(Client.archive8, UserComparator6.spriteIds.field3830, 0); + SoundCache.headIconPrayerSprites = TilePaint.SpriteBuffer_getSpriteArray(Client.archive8, UserComparator6.spriteIds.field3830, 0); } else { ++var0; } if (class173.headIconHintSprites == null) { - class173.headIconHintSprites = TilePaint.method3062(Client.archive8, UserComparator6.spriteIds.field3827, 0); + class173.headIconHintSprites = TilePaint.SpriteBuffer_getSpriteArray(Client.archive8, UserComparator6.spriteIds.field3827, 0); } else { ++var0; } if (WorldMapData_1.mapMarkerSprites == null) { - WorldMapData_1.mapMarkerSprites = TilePaint.method3062(Client.archive8, UserComparator6.spriteIds.field3828, 0); + WorldMapData_1.mapMarkerSprites = TilePaint.SpriteBuffer_getSpriteArray(Client.archive8, UserComparator6.spriteIds.field3828, 0); } else { ++var0; } if (Occluder.crossSprites == null) { - Occluder.crossSprites = TilePaint.method3062(Client.archive8, UserComparator6.spriteIds.field3829, 0); + Occluder.crossSprites = TilePaint.SpriteBuffer_getSpriteArray(Client.archive8, UserComparator6.spriteIds.field3829, 0); } else { ++var0; } if (Skills.mapDotSprites == null) { - Skills.mapDotSprites = TilePaint.method3062(Client.archive8, UserComparator6.spriteIds.field3832, 0); + Skills.mapDotSprites = TilePaint.SpriteBuffer_getSpriteArray(Client.archive8, UserComparator6.spriteIds.field3832, 0); } else { ++var0; } if (GrandExchangeOfferAgeComparator.scrollBarSprites == null) { - GrandExchangeOfferAgeComparator.scrollBarSprites = class289.method5281(Client.archive8, UserComparator6.spriteIds.field3831, 0); + GrandExchangeOfferAgeComparator.scrollBarSprites = class289.SpriteBuffer_getIndexedSpriteArray(Client.archive8, UserComparator6.spriteIds.field3831, 0); } else { ++var0; } if (GrandExchangeOfferNameComparator.modIconSprites == null) { - GrandExchangeOfferNameComparator.modIconSprites = class289.method5281(Client.archive8, UserComparator6.spriteIds.field3822, 0); + GrandExchangeOfferNameComparator.modIconSprites = class289.SpriteBuffer_getIndexedSpriteArray(Client.archive8, UserComparator6.spriteIds.field3822, 0); } else { ++var0; } diff --git a/runescape-client/src/main/java/UrlRequester.java b/runescape-client/src/main/java/UrlRequester.java index f195964ec6..7e87c9d1ba 100644 --- a/runescape-client/src/main/java/UrlRequester.java +++ b/runescape-client/src/main/java/UrlRequester.java @@ -147,7 +147,8 @@ public class UrlRequester implements Runnable { var3 = class80.getWidget(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.itemId; return 1; - } else if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { + } + if (var0 == ScriptOpcodes.IF_GETINVCOUNT) { var3 = class80.getWidget(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]); if (var3.itemId != -1) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.itemQuantity; @@ -156,7 +157,8 @@ public class UrlRequester implements Runnable { } return 1; - } else if (var0 == ScriptOpcodes.IF_HASSUB) { + } + if (var0 == ScriptOpcodes.IF_HASSUB) { int var5 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; InterfaceParent var4 = (InterfaceParent)Client.interfaceParents.get((long)var5); if (var4 != null) { @@ -166,11 +168,11 @@ public class UrlRequester implements Runnable { } return 1; - } else if (var0 == ScriptOpcodes.IF_GETTOP) { + } + if (var0 == ScriptOpcodes.IF_GETTOP) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.rootInterface; return 1; - } else { - return 2; } + return 2; } } diff --git a/runescape-client/src/main/java/User.java b/runescape-client/src/main/java/User.java index 332ad53fd4..18012e99d4 100644 --- a/runescape-client/src/main/java/User.java +++ b/runescape-client/src/main/java/User.java @@ -62,10 +62,9 @@ public class User implements Comparable { void set(Username var1, Username var2) { if (var1 == null) { throw new NullPointerException(); - } else { - this.username = var1; - this.previousUsername = var2; } + this.username = var1; + this.previousUsername = var2; } @ObfuscatedName("ax") @@ -91,22 +90,28 @@ public class User implements Comparable { static Class loadClassFromDescriptor(String var0) throws ClassNotFoundException { if (var0.equals("B")) { return Byte.TYPE; - } else if (var0.equals("I")) { - return Integer.TYPE; - } else if (var0.equals("S")) { - return Short.TYPE; - } else if (var0.equals("J")) { - return Long.TYPE; - } else if (var0.equals("Z")) { - return Boolean.TYPE; - } else if (var0.equals("F")) { - return Float.TYPE; - } else if (var0.equals("D")) { - return Double.TYPE; - } else if (var0.equals("C")) { - return Character.TYPE; - } else { - return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); } + if (var0.equals("I")) { + return Integer.TYPE; + } + if (var0.equals("S")) { + return Short.TYPE; + } + if (var0.equals("J")) { + return Long.TYPE; + } + if (var0.equals("Z")) { + return Boolean.TYPE; + } + if (var0.equals("F")) { + return Float.TYPE; + } + if (var0.equals("D")) { + return Double.TYPE; + } + if (var0.equals("C")) { + return Character.TYPE; + } + return var0.equals("void") ? Void.TYPE : Reflection.findClass(var0); } } diff --git a/runescape-client/src/main/java/UserComparator10.java b/runescape-client/src/main/java/UserComparator10.java index 6564fe7906..dea642c5f6 100644 --- a/runescape-client/src/main/java/UserComparator10.java +++ b/runescape-client/src/main/java/UserComparator10.java @@ -36,9 +36,8 @@ public class UserComparator10 extends AbstractUserComparator { int compareBuddy(Buddy var1, Buddy var2) { if (Client.worldId == var1.world && var2.world == Client.worldId) { return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; - } else { - return this.compareUser(var1, var2); } + return this.compareUser(var1, var2); } public int compare(Object var1, Object var2) { @@ -278,8 +277,7 @@ public class UserComparator10 extends AbstractUserComparator { boolean var2 = (var3 >> var1 + 1 & 1) != 0; if (!var2 && var0.onOp == null) { return null; - } else { - return var0.actions != null && var0.actions.length > var1 && var0.actions[var1] != null && var0.actions[var1].trim().length() != 0 ? var0.actions[var1] : null; } + return var0.actions != null && var0.actions.length > var1 && var0.actions[var1] != null && var0.actions[var1].trim().length() != 0 ? var0.actions[var1] : null; } } diff --git a/runescape-client/src/main/java/UserComparator3.java b/runescape-client/src/main/java/UserComparator3.java index d50e5701f6..03e6972fb5 100644 --- a/runescape-client/src/main/java/UserComparator3.java +++ b/runescape-client/src/main/java/UserComparator3.java @@ -30,9 +30,8 @@ public class UserComparator3 extends AbstractUserComparator { int compareBuddy(Buddy var1, Buddy var2) { if (var2.world != var1.world) { return this.reversed ? var1.world - var2.world : var2.world - var1.world; - } else { - return this.compareUser(var1, var2); } + return this.compareUser(var1, var2); } public int compare(Object var1, Object var2) { diff --git a/runescape-client/src/main/java/UserComparator6.java b/runescape-client/src/main/java/UserComparator6.java index f6f50c0a0f..22ddfae758 100644 --- a/runescape-client/src/main/java/UserComparator6.java +++ b/runescape-client/src/main/java/UserComparator6.java @@ -33,9 +33,8 @@ public class UserComparator6 extends AbstractUserComparator { int compareBuddy(Buddy var1, Buddy var2) { if (var1.world != 0 && var2.world != 0) { return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); - } else { - return this.compareUser(var1, var2); } + return this.compareUser(var1, var2); } public int compare(Object var1, Object var2) { @@ -126,47 +125,46 @@ public class UserComparator6 extends AbstractUserComparator { class169.field2050 = var4; if (!class169.field2050.exists()) { throw new RuntimeException(""); - } else { - class169.field2055 = true; + } + class169.field2055 = true; - try { - File var16 = new File(PlayerType.userHomeDirectory, "random.dat"); - if (var16.exists()) { - class167.randomDat = new BufferedFile(new AccessFile(var16, "rw", 25L), 24, 0); - } else { - label115: - for (int var10 = 0; var10 < LoginPacket.field2309.length; ++var10) { - for (var7 = 0; var7 < class167.field2043.length; ++var7) { - var8 = new File(class167.field2043[var7] + LoginPacket.field2309[var10] + File.separatorChar + "random.dat"); - if (var8.exists()) { - class167.randomDat = new BufferedFile(new AccessFile(var8, "rw", 25L), 24, 0); - break label115; - } + try { + File var16 = new File(PlayerType.userHomeDirectory, "random.dat"); + if (var16.exists()) { + class167.randomDat = new BufferedFile(new AccessFile(var16, "rw", 25L), 24, 0); + } else { + label115: + for (int var10 = 0; var10 < LoginPacket.field2309.length; ++var10) { + for (var7 = 0; var7 < class167.field2043.length; ++var7) { + var8 = new File(class167.field2043[var7] + LoginPacket.field2309[var10] + File.separatorChar + "random.dat"); + if (var8.exists()) { + class167.randomDat = new BufferedFile(new AccessFile(var8, "rw", 25L), 24, 0); + break label115; } } } - - if (class167.randomDat == null) { - RandomAccessFile var17 = new RandomAccessFile(var16, "rw"); - var7 = var17.read(); - var17.seek(0L); - var17.write(var7); - var17.seek(0L); - var17.close(); - class167.randomDat = new BufferedFile(new AccessFile(var16, "rw", 25L), 24, 0); - } - } catch (IOException var15) { } - class167.dat2File = new BufferedFile(new AccessFile(class65.method1177("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); - class167.idx255File = new BufferedFile(new AccessFile(class65.method1177("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); - class167.idxFiles = new BufferedFile[class40.idxCount]; - - for (int var11 = 0; var11 < class40.idxCount; ++var11) { - class167.idxFiles[var11] = new BufferedFile(new AccessFile(class65.method1177("main_file_cache.idx" + var11), "rw", 1048576L), 6000, 0); + if (class167.randomDat == null) { + RandomAccessFile var17 = new RandomAccessFile(var16, "rw"); + var7 = var17.read(); + var17.seek(0L); + var17.write(var7); + var17.seek(0L); + var17.close(); + class167.randomDat = new BufferedFile(new AccessFile(var16, "rw", 25L), 24, 0); } - + } catch (IOException var15) { } + + class167.dat2File = new BufferedFile(new AccessFile(class65.method1177("main_file_cache.dat2"), "rw", 1048576000L), 5200, 0); + class167.idx255File = new BufferedFile(new AccessFile(class65.method1177("main_file_cache.idx255"), "rw", 1048576L), 6000, 0); + class167.idxFiles = new BufferedFile[class40.idxCount]; + + for (int var11 = 0; var11 < class40.idxCount; ++var11) { + class167.idxFiles[var11] = new BufferedFile(new AccessFile(class65.method1177("main_file_cache.idx" + var11), "rw", 1048576L), 6000, 0); + } + } @ObfuscatedName("ao") @@ -178,34 +176,33 @@ public class UserComparator6 extends AbstractUserComparator { if (var0 == ScriptOpcodes.GETWINDOWMODE) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = AbstractWorldMapIcon.getWindowedMode(); return 1; - } else { - int var3; - if (var0 == ScriptOpcodes.SETWINDOWMODE) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - if (var3 == 1 || var3 == 2) { - Clock.setWindowedMode(var3); - } - - return 1; - } else if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapLabelSize.clientPreferences.windowMode; - return 1; - } else if (var0 != ScriptOpcodes.SETDEFAULTWINDOWMODE) { - if (var0 == 5310) { - --HealthBarUpdate.Interpreter_intStackSize; - return 1; - } else { - return 2; - } - } else { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - if (var3 == 1 || var3 == 2) { - WorldMapLabelSize.clientPreferences.windowMode = var3; - ReflectionCheck.savePreferences(); - } - - return 1; - } } + int var3; + if (var0 == ScriptOpcodes.SETWINDOWMODE) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + if (var3 == 1 || var3 == 2) { + Clock.setWindowedMode(var3); + } + + return 1; + } + if (var0 == ScriptOpcodes.GETDEFAULTWINDOWMODE) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapLabelSize.clientPreferences.windowMode; + return 1; + } + if (var0 == ScriptOpcodes.SETDEFAULTWINDOWMODE) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + if (var3 == 1 || var3 == 2) { + WorldMapLabelSize.clientPreferences.windowMode = var3; + ReflectionCheck.savePreferences(); + } + + return 1; + } + if (var0 == 5310) { + --HealthBarUpdate.Interpreter_intStackSize; + return 1; + } + return 2; } } diff --git a/runescape-client/src/main/java/UserComparator7.java b/runescape-client/src/main/java/UserComparator7.java index e9a3a29d7d..fbb2ef21b4 100644 --- a/runescape-client/src/main/java/UserComparator7.java +++ b/runescape-client/src/main/java/UserComparator7.java @@ -23,9 +23,8 @@ public class UserComparator7 extends AbstractUserComparator { int compareBuddy(Buddy var1, Buddy var2) { if (var1.world != 0 && var2.world != 0) { return this.reversed ? var1.int2 - var2.int2 : var2.int2 - var1.int2; - } else { - return this.compareUser(var1, var2); } + return this.compareUser(var1, var2); } public int compare(Object var1, Object var2) { diff --git a/runescape-client/src/main/java/UserComparator9.java b/runescape-client/src/main/java/UserComparator9.java index 7a8ef68a8b..a0fe893220 100644 --- a/runescape-client/src/main/java/UserComparator9.java +++ b/runescape-client/src/main/java/UserComparator9.java @@ -24,9 +24,8 @@ public class UserComparator9 extends AbstractUserComparator { int compareBuddy(Buddy var1, Buddy var2) { if (Client.worldId == var1.world && var2.world == Client.worldId) { return this.reversed ? var1.getUsername().compareToTyped(var2.getUsername()) : var2.getUsername().compareToTyped(var1.getUsername()); - } else { - return this.compareUser(var1, var2); } + return this.compareUser(var1, var2); } public int compare(Object var1, Object var2) { @@ -80,117 +79,123 @@ public class UserComparator9 extends AbstractUserComparator { if (var11 >= 0 && var11 <= 9) { var4.setAction(var11, Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]); return 1; - } else { - --Skills.Interpreter_stringStackSize; - return 1; } - } else { - int var6; - if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var11 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var6 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - var4.parent = Client.getWidgetChild(var11, var6); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { - var4.isScrollBar = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { - var4.dragZoneSize = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { - var4.dragThreshold = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETOPBASE) { - var4.dataText = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { - var4.spellActionName = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - return 1; - } else if (var0 == ScriptOpcodes.CC_CLEAROPS) { - var4.actions = null; - return 1; - } else if (var0 == 1308) { - var4.field2691 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - return 1; - } else { - int var7; - byte[] var9; - if (var0 != ScriptOpcodes.CC_SETOPKEY) { - byte var5; - if (var0 == ScriptOpcodes.CC_SETOPTKEY) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var5 = 10; - var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]}; - byte[] var10 = new byte[]{(byte)Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]}; - FloorOverlayDefinition.method4756(var4, var5, var9, var10); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { - HealthBarUpdate.Interpreter_intStackSize -= 3; - var11 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize] - 1; - var6 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - var7 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2]; - if (var11 >= 0 && var11 <= 9) { - class14.method153(var4, var11, var6, var7); - return 1; - } else { - throw new RuntimeException(); - } - } else if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { - var5 = 10; - var6 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - class14.method153(var4, var5, var6, var7); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { - --HealthBarUpdate.Interpreter_intStackSize; - var11 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize] - 1; - if (var11 >= 0 && var11 <= 9) { - WorldMapCacheName.method600(var4, var11); - return 1; - } else { - throw new RuntimeException(); - } - } else if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { - var5 = 10; - WorldMapCacheName.method600(var4, var5); - return 1; - } else { - return 2; - } - } else { - byte[] var8 = null; - var9 = null; - if (var3) { - HealthBarUpdate.Interpreter_intStackSize -= 10; + --Skills.Interpreter_stringStackSize; + return 1; + } + int var6; + if (var0 == ScriptOpcodes.CC_SETDRAGGABLE) { + HealthBarUpdate.Interpreter_intStackSize -= 2; + var11 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; + var6 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; + var4.parent = Client.getWidgetChild(var11, var6); + return 1; + } + if (var0 == ScriptOpcodes.CC_SETDRAGGABLEBEHAVIOR) { + var4.isScrollBar = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + return 1; + } + if (var0 == ScriptOpcodes.CC_SETDRAGDEADZONE) { + var4.dragZoneSize = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + return 1; + } + if (var0 == ScriptOpcodes.CC_SETDRAGDEADTIME) { + var4.dragThreshold = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + return 1; + } + if (var0 == ScriptOpcodes.CC_SETOPBASE) { + var4.dataText = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; + return 1; + } + if (var0 == ScriptOpcodes.CC_SETTARGETVERB) { + var4.spellActionName = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; + return 1; + } + if (var0 == ScriptOpcodes.CC_CLEAROPS) { + var4.actions = null; + return 1; + } + if (var0 == 1308) { + var4.field2691 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + return 1; + } + int var7; + byte[] var9; + if (var0 == ScriptOpcodes.CC_SETOPKEY) { + byte[] var8 = null; + var9 = null; + if (var3) { + HealthBarUpdate.Interpreter_intStackSize -= 10; - for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + HealthBarUpdate.Interpreter_intStackSize] >= 0; var7 += 2) { - } + for (var7 = 0; var7 < 10 && Interpreter.Interpreter_intStack[var7 + HealthBarUpdate.Interpreter_intStackSize] >= 0; var7 += 2) { + } - if (var7 > 0) { - var8 = new byte[var7 / 2]; - var9 = new byte[var7 / 2]; + if (var7 > 0) { + var8 = new byte[var7 / 2]; + var9 = new byte[var7 / 2]; - for (var7 -= 2; var7 >= 0; var7 -= 2) { - var8[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + HealthBarUpdate.Interpreter_intStackSize]; - var9[var7 / 2] = (byte)Interpreter.Interpreter_intStack[var7 + HealthBarUpdate.Interpreter_intStackSize + 1]; - } - } - } else { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var8 = new byte[]{(byte)Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]}; - var9 = new byte[]{(byte)Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]}; - } - - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] - 1; - if (var7 >= 0 && var7 <= 9) { - FloorOverlayDefinition.method4756(var4, var7, var8, var9); - return 1; - } else { - throw new RuntimeException(); + for (var7 -= 2; var7 >= 0; var7 -= 2) { + var8[var7 / 2] = (byte) Interpreter.Interpreter_intStack[var7 + HealthBarUpdate.Interpreter_intStackSize]; + var9[var7 / 2] = (byte) Interpreter.Interpreter_intStack[var7 + HealthBarUpdate.Interpreter_intStackSize + 1]; } } + } else { + HealthBarUpdate.Interpreter_intStackSize -= 2; + var8 = new byte[]{(byte) Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]}; + var9 = new byte[]{(byte) Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]}; } + + var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] - 1; + if (var7 < 0 || var7 > 9) { + throw new RuntimeException(); + } + + FloorOverlayDefinition.method4756(var4, var7, var8, var9); + return 1; } + byte var5; + if (var0 == ScriptOpcodes.CC_SETOPTKEY) { + HealthBarUpdate.Interpreter_intStackSize -= 2; + var5 = 10; + var9 = new byte[]{(byte) Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]}; + byte[] var10 = new byte[]{(byte) Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]}; + FloorOverlayDefinition.method4756(var4, var5, var9, var10); + return 1; + } + if (var0 == ScriptOpcodes.CC_SETOPKEYRATE) { + HealthBarUpdate.Interpreter_intStackSize -= 3; + var11 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize] - 1; + var6 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; + var7 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2]; + if (var11 >= 0 && var11 <= 9) { + class14.method153(var4, var11, var6, var7); + return 1; + } + throw new RuntimeException(); + } + if (var0 == ScriptOpcodes.CC_SETOPTKEYRATE) { + var5 = 10; + var6 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + class14.method153(var4, var5, var6, var7); + return 1; + } + if (var0 == ScriptOpcodes.CC_SETOPKEYIGNOREHELD) { + --HealthBarUpdate.Interpreter_intStackSize; + var11 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize] - 1; + if (var11 < 0 || var11 > 9) { + throw new RuntimeException(); + } + + WorldMapCacheName.method600(var4, var11); + return 1; + } + if (var0 == ScriptOpcodes.CC_SETOPTKEYIGNOREHELD) { + var5 = 10; + WorldMapCacheName.method600(var4, var5); + return 1; + } + + return 2; } } diff --git a/runescape-client/src/main/java/UserList.java b/runescape-client/src/main/java/UserList.java index 608d46da75..1be4d52243 100644 --- a/runescape-client/src/main/java/UserList.java +++ b/runescape-client/src/main/java/UserList.java @@ -105,9 +105,8 @@ public abstract class UserList { public boolean contains(Username var1) { if (!var1.hasCleanName()) { return false; - } else { - return this.usernamesMap.containsKey(var1) ? true : this.previousUsernamesMap.containsKey(var1); } + return this.usernamesMap.containsKey(var1) ? true : this.previousUsernamesMap.containsKey(var1); } @ObfuscatedName("g") @@ -151,10 +150,9 @@ public abstract class UserList { User var2 = this.getByCurrentUsername(var1); if (var2 == null) { return false; - } else { - this.remove(var2); - return true; } + this.remove(var2); + return true; } @ObfuscatedName("d") @@ -190,13 +188,12 @@ public abstract class UserList { User addLast(Username var1, Username var2) { if (this.getByCurrentUsername(var1) != null) { throw new IllegalStateException(); - } else { - User var3 = this.newInstance(); - var3.set(var1, var2); - this.arrayAddLast(var3); - this.mapPut(var3); - return var3; } + User var3 = this.newInstance(); + var3.set(var1, var2); + this.arrayAddLast(var3); + this.mapPut(var3); + return var3; } @ObfuscatedName("al") @@ -208,9 +205,8 @@ public abstract class UserList { public final User get(int var1) { if (var1 >= 0 && var1 < this.size) { return this.array[var1]; - } else { - throw new ArrayIndexOutOfBoundsException(var1); } + throw new ArrayIndexOutOfBoundsException(var1); } @ObfuscatedName("av") @@ -265,12 +261,11 @@ public abstract class UserList { final void mapRemove(User var1) { if (this.usernamesMap.remove(var1.username) == null) { throw new IllegalStateException(); - } else { - if (var1.previousUsername != null) { - this.previousUsernamesMap.remove(var1.previousUsername); - } - } + if (var1.previousUsername != null) { + this.previousUsernamesMap.remove(var1.previousUsername); + } + } @ObfuscatedName("ag") diff --git a/runescape-client/src/main/java/Username.java b/runescape-client/src/main/java/Username.java index a985ee1a5b..c4bd4ef988 100644 --- a/runescape-client/src/main/java/Username.java +++ b/runescape-client/src/main/java/Username.java @@ -50,9 +50,8 @@ public class Username implements Comparable { public int compareToTyped(Username var1) { if (this.cleanName == null) { return var1.cleanName == null ? 0 : 1; - } else { - return var1.cleanName == null ? -1 : this.cleanName.compareTo(var1.cleanName); } + return var1.cleanName == null ? -1 : this.cleanName.compareTo(var1.cleanName); } public boolean equals(Object var1) { @@ -60,14 +59,13 @@ public class Username implements Comparable { Username var2 = (Username)var1; if (this.cleanName == null) { return var2.cleanName == null; - } else if (var2.cleanName == null) { - return false; - } else { - return this.hashCode() != var2.hashCode() ? false : this.cleanName.equals(var2.cleanName); } - } else { - return false; + if (var2.cleanName == null) { + return false; + } + return this.hashCode() != var2.hashCode() ? false : this.cleanName.equals(var2.cleanName); } + return false; } public int hashCode() { diff --git a/runescape-client/src/main/java/VarbitDefinition.java b/runescape-client/src/main/java/VarbitDefinition.java index 0f2c7162b7..d5f98fdc86 100644 --- a/runescape-client/src/main/java/VarbitDefinition.java +++ b/runescape-client/src/main/java/VarbitDefinition.java @@ -466,7 +466,8 @@ public class VarbitDefinition extends DualNode { return; } - } else if (Login.loginIndex == 3) { + } + if (Login.loginIndex == 3) { var18 = Login.loginBoxX + 180; var20 = 276; if (var3 == 1 && var15 >= var18 - 75 && var15 <= var18 + 75 && var16 >= var20 - 20 && var16 <= var20 + 20) { diff --git a/runescape-client/src/main/java/Varcs.java b/runescape-client/src/main/java/Varcs.java index 0552e1ad92..f1fc18295d 100644 --- a/runescape-client/src/main/java/Varcs.java +++ b/runescape-client/src/main/java/Varcs.java @@ -304,29 +304,28 @@ public class Varcs { ++var7; } - } else { - var17 = var15.readUnsignedShort(); + } + var17 = var15.readUnsignedShort(); - for (var7 = 0; var7 < var17; ++var7) { - var8 = var15.readUnsignedShort(); - var9 = var15.readInt(); - if (this.intsPersistence[var8]) { - this.map.put(var8, var9); - } + for (var7 = 0; var7 < var17; ++var7) { + var8 = var15.readUnsignedShort(); + var9 = var15.readInt(); + if (this.intsPersistence[var8]) { + this.map.put(var8, var9); + } + } + + var7 = var15.readUnsignedShort(); + var8 = 0; + + while (true) { + if (var8 >= var7) { + break label226; } - var7 = var15.readUnsignedShort(); - var8 = 0; - - while (true) { - if (var8 >= var7) { - break label226; - } - - var15.readUnsignedShort(); - var15.readStringCp1252NullTerminated(); - ++var8; - } + var15.readUnsignedShort(); + var15.readStringCp1252NullTerminated(); + ++var8; } } diff --git a/runescape-client/src/main/java/VarpDefinition.java b/runescape-client/src/main/java/VarpDefinition.java index 56b6d41d5b..c5bfdbf263 100644 --- a/runescape-client/src/main/java/VarpDefinition.java +++ b/runescape-client/src/main/java/VarpDefinition.java @@ -101,8 +101,7 @@ public class VarpDefinition extends DualNode { } return false; - } else { - return true; } + return true; } } diff --git a/runescape-client/src/main/java/Varps.java b/runescape-client/src/main/java/Varps.java index 5042b3638f..577e48c255 100644 --- a/runescape-client/src/main/java/Varps.java +++ b/runescape-client/src/main/java/Varps.java @@ -190,8 +190,7 @@ public class Varps { } catch (Exception var14) { return -1; } - } else { - return -2; } + return -2; } } diff --git a/runescape-client/src/main/java/ViewportMouse.java b/runescape-client/src/main/java/ViewportMouse.java index db305b43e4..334c37f412 100644 --- a/runescape-client/src/main/java/ViewportMouse.java +++ b/runescape-client/src/main/java/ViewportMouse.java @@ -83,23 +83,22 @@ public class ViewportMouse { ObjectDefinition var1 = (ObjectDefinition)ObjectDefinition.ObjectDefinition_cached.get((long)var0); if (var1 != null) { return var1; - } else { - byte[] var2 = ObjectDefinition.ObjectDefinition_archive.takeFile(6, var0); - var1 = new ObjectDefinition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); - if (var1.isSolid) { - var1.interactType = 0; - var1.boolean1 = false; - } - - ObjectDefinition.ObjectDefinition_cached.put(var1, (long)var0); - return var1; } + byte[] var2 = ObjectDefinition.ObjectDefinition_archive.takeFile(6, var0); + var1 = new ObjectDefinition(); + var1.id = var0; + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); + if (var1.isSolid) { + var1.interactType = 0; + var1.boolean1 = false; + } + + ObjectDefinition.ObjectDefinition_cached.put(var1, (long)var0); + return var1; } @ObfuscatedName("q") @@ -112,16 +111,14 @@ public class ViewportMouse { Script var1 = (Script)Script.Script_cached.get((long)var0); if (var1 != null) { return var1; - } else { - byte[] var2 = UserComparator4.archive12.takeFile(var0, 0); - if (var2 == null) { - return null; - } else { - var1 = World.newScript(var2); - Script.Script_cached.put(var1, (long)var0); - return var1; - } } + byte[] var2 = UserComparator4.archive12.takeFile(var0, 0); + if (var2 == null) { + return null; + } + var1 = World.newScript(var2); + Script.Script_cached.put(var1, (long)var0); + return var1; } @ObfuscatedName("e") diff --git a/runescape-client/src/main/java/VorbisFloor.java b/runescape-client/src/main/java/VorbisFloor.java index 805f397d54..0f19930986 100644 --- a/runescape-client/src/main/java/VorbisFloor.java +++ b/runescape-client/src/main/java/VorbisFloor.java @@ -46,72 +46,71 @@ public class VorbisFloor { int var1 = VorbisSample.readBits(16); if (var1 != 1) { throw new RuntimeException(); - } else { - int var2 = VorbisSample.readBits(5); - int var3 = 0; - this.partitionClassList = new int[var2]; - - int var4; - int var5; - for (var4 = 0; var4 < var2; ++var4) { - var5 = VorbisSample.readBits(4); - this.partitionClassList[var4] = var5; - if (var5 >= var3) { - var3 = var5 + 1; - } - } - - this.classDimensions = new int[var3]; - this.classSubClasses = new int[var3]; - this.classMasterbooks = new int[var3]; - this.subclassBooks = new int[var3][]; - - int var7; - for (var4 = 0; var4 < var3; ++var4) { - this.classDimensions[var4] = VorbisSample.readBits(3) + 1; - var5 = this.classSubClasses[var4] = VorbisSample.readBits(2); - if (var5 != 0) { - this.classMasterbooks[var4] = VorbisSample.readBits(8); - } - - var5 = 1 << var5; - int[] var6 = new int[var5]; - this.subclassBooks[var4] = var6; - - for (var7 = 0; var7 < var5; ++var7) { - var6[var7] = VorbisSample.readBits(8) - 1; - } - } - - this.multiplier = VorbisSample.readBits(2) + 1; - var4 = VorbisSample.readBits(4); - var5 = 2; - - int var9; - for (var9 = 0; var9 < var2; ++var9) { - var5 += this.classDimensions[this.partitionClassList[var9]]; - } - - this.field1396 = new int[var5]; - this.field1396[0] = 0; - this.field1396[1] = 1 << var4; - var5 = 2; - - for (var9 = 0; var9 < var2; ++var9) { - var7 = this.partitionClassList[var9]; - - for (int var8 = 0; var8 < this.classDimensions[var7]; ++var8) { - this.field1396[var5++] = VorbisSample.readBits(var4); - } - } - - if (field1403 == null || field1403.length < var5) { - field1403 = new int[var5]; - field1404 = new int[var5]; - field1405 = new boolean[var5]; - } - } + int var2 = VorbisSample.readBits(5); + int var3 = 0; + this.partitionClassList = new int[var2]; + + int var4; + int var5; + for (var4 = 0; var4 < var2; ++var4) { + var5 = VorbisSample.readBits(4); + this.partitionClassList[var4] = var5; + if (var5 >= var3) { + var3 = var5 + 1; + } + } + + this.classDimensions = new int[var3]; + this.classSubClasses = new int[var3]; + this.classMasterbooks = new int[var3]; + this.subclassBooks = new int[var3][]; + + int var7; + for (var4 = 0; var4 < var3; ++var4) { + this.classDimensions[var4] = VorbisSample.readBits(3) + 1; + var5 = this.classSubClasses[var4] = VorbisSample.readBits(2); + if (var5 != 0) { + this.classMasterbooks[var4] = VorbisSample.readBits(8); + } + + var5 = 1 << var5; + int[] var6 = new int[var5]; + this.subclassBooks[var4] = var6; + + for (var7 = 0; var7 < var5; ++var7) { + var6[var7] = VorbisSample.readBits(8) - 1; + } + } + + this.multiplier = VorbisSample.readBits(2) + 1; + var4 = VorbisSample.readBits(4); + var5 = 2; + + int var9; + for (var9 = 0; var9 < var2; ++var9) { + var5 += this.classDimensions[this.partitionClassList[var9]]; + } + + this.field1396 = new int[var5]; + this.field1396[0] = 0; + this.field1396[1] = 1 << var4; + var5 = 2; + + for (var9 = 0; var9 < var2; ++var9) { + var7 = this.partitionClassList[var9]; + + for (int var8 = 0; var8 < this.classDimensions[var7]; ++var8) { + this.field1396[var5++] = VorbisSample.readBits(var4); + } + } + + if (field1403 == null || field1403.length < var5) { + field1403 = new int[var5]; + field1404 = new int[var5]; + field1405 = new boolean[var5]; + } + } @ObfuscatedName("e") @@ -189,39 +188,38 @@ public class VorbisFloor { boolean var1 = VorbisSample.readBit() != 0; if (!var1) { return false; - } else { - int var2 = this.field1396.length; - - int var3; - for (var3 = 0; var3 < var2; ++var3) { - field1403[var3] = this.field1396[var3]; - } - - var3 = field1402[this.multiplier - 1]; - int var4 = UrlRequest.iLog(var3 - 1); - field1404[0] = VorbisSample.readBits(var4); - field1404[1] = VorbisSample.readBits(var4); - int var5 = 2; - - for (int var6 = 0; var6 < this.partitionClassList.length; ++var6) { - int var7 = this.partitionClassList[var6]; - int var8 = this.classDimensions[var7]; - int var9 = this.classSubClasses[var7]; - int var10 = (1 << var9) - 1; - int var11 = 0; - if (var9 > 0) { - var11 = VorbisSample.VorbisSample_codebooks[this.classMasterbooks[var7]].method2325(); - } - - for (int var12 = 0; var12 < var8; ++var12) { - int var13 = this.subclassBooks[var7][var11 & var10]; - var11 >>>= var9; - field1404[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method2325() : 0; - } - } - - return true; } + int var2 = this.field1396.length; + + int var3; + for (var3 = 0; var3 < var2; ++var3) { + field1403[var3] = this.field1396[var3]; + } + + var3 = field1402[this.multiplier - 1]; + int var4 = UrlRequest.iLog(var3 - 1); + field1404[0] = VorbisSample.readBits(var4); + field1404[1] = VorbisSample.readBits(var4); + int var5 = 2; + + for (int var6 = 0; var6 < this.partitionClassList.length; ++var6) { + int var7 = this.partitionClassList[var6]; + int var8 = this.classDimensions[var7]; + int var9 = this.classSubClasses[var7]; + int var10 = (1 << var9) - 1; + int var11 = 0; + if (var9 > 0) { + var11 = VorbisSample.VorbisSample_codebooks[this.classMasterbooks[var7]].method2325(); + } + + for (int var12 = 0; var12 < var8; ++var12) { + int var13 = this.subclassBooks[var7][var11 & var10]; + var11 >>>= var9; + field1404[var5++] = var13 >= 0 ? VorbisSample.VorbisSample_codebooks[var13].method2325() : 0; + } + } + + return true; } @ObfuscatedName("b") diff --git a/runescape-client/src/main/java/VorbisSample.java b/runescape-client/src/main/java/VorbisSample.java index ef3442810d..7d679170a5 100644 --- a/runescape-client/src/main/java/VorbisSample.java +++ b/runescape-client/src/main/java/VorbisSample.java @@ -405,50 +405,49 @@ public class VorbisSample extends Node { RawSound toRawSound(int[] var1) { if (var1 != null && var1[0] <= 0) { return null; - } else { - if (this.samples == null) { - this.field1374 = 0; - this.field1382 = new float[VorbisSample_blockSize1]; - this.samples = new byte[this.sampleCount]; - this.field1387 = 0; - this.field1381 = 0; - } - - for (; this.field1381 < this.field1366.length; ++this.field1381) { - if (var1 != null && var1[0] <= 0) { - return null; - } - - float[] var2 = this.method2348(this.field1381); - if (var2 != null) { - int var3 = this.field1387; - int var4 = var2.length; - if (var4 > this.sampleCount - var3) { - var4 = this.sampleCount - var3; - } - - for (int var5 = 0; var5 < var4; ++var5) { - int var6 = (int)(128.0F + var2[var5] * 128.0F); - if ((var6 & -256) != 0) { - var6 = ~var6 >> 31; - } - - this.samples[var3++] = (byte)(var6 - 128); - } - - if (var1 != null) { - var1[0] -= var3 - this.field1387; - } - - this.field1387 = var3; - } - } - - this.field1382 = null; - byte[] var7 = this.samples; - this.samples = null; - return new RawSound(this.sampleRate, var7, this.start, this.end, this.field1364); } + if (this.samples == null) { + this.field1374 = 0; + this.field1382 = new float[VorbisSample_blockSize1]; + this.samples = new byte[this.sampleCount]; + this.field1387 = 0; + this.field1381 = 0; + } + + for (; this.field1381 < this.field1366.length; ++this.field1381) { + if (var1 != null && var1[0] <= 0) { + return null; + } + + float[] var2 = this.method2348(this.field1381); + if (var2 != null) { + int var3 = this.field1387; + int var4 = var2.length; + if (var4 > this.sampleCount - var3) { + var4 = this.sampleCount - var3; + } + + for (int var5 = 0; var5 < var4; ++var5) { + int var6 = (int)(128.0F + var2[var5] * 128.0F); + if ((var6 & -256) != 0) { + var6 = ~var6 >> 31; + } + + this.samples[var3++] = (byte)(var6 - 128); + } + + if (var1 != null) { + var1[0] -= var3 - this.field1387; + } + + this.field1387 = var3; + } + } + + this.field1382 = null; + byte[] var7 = this.samples; + this.samples = null; + return new RawSound(this.sampleRate, var7, this.start, this.end, this.field1364); } @ObfuscatedName("q") @@ -639,9 +638,8 @@ public class VorbisSample extends Node { if (!method2349(var0)) { var0.tryLoadFile(var1, var2); return null; - } else { - byte[] var3 = var0.takeFile(var1, var2); - return var3 == null ? null : new VorbisSample(var3); } + byte[] var3 = var0.takeFile(var1, var2); + return var3 == null ? null : new VorbisSample(var3); } } diff --git a/runescape-client/src/main/java/WallDecoration.java b/runescape-client/src/main/java/WallDecoration.java index 012dec189d..bca75ad42e 100644 --- a/runescape-client/src/main/java/WallDecoration.java +++ b/runescape-client/src/main/java/WallDecoration.java @@ -84,15 +84,14 @@ public final class WallDecoration { signature = "([BI)Lke;", garbageValue = "107452813" ) - @Export("getWorldMapSprite") - public static Font getWorldMapSprite(byte[] var0) { + @Export("SpriteBuffer_createFont") + public static Font SpriteBuffer_createFont(byte[] var0) { if (var0 == null) { return null; - } else { - Font var1 = new Font(var0, Varps.SpriteBuffer_xOffsets, class326.SpriteBuffer_yOffsets, class326.SpriteBuffer_spriteWidths, class216.SpriteBuffer_spriteHeights, Frames.SpriteBuffer_spritePalette, class326.SpriteBuffer_pixels); - class16.method174(); - return var1; } + Font var1 = new Font(var0, Varps.SpriteBuffer_xOffsets, SpriteBuffer.SpriteBuffer_yOffsets, SpriteBuffer.SpriteBuffer_spriteWidths, class216.SpriteBuffer_spriteHeights, Frames.SpriteBuffer_spritePalette, SpriteBuffer.SpriteBuffer_pixels); + class16.SpriteBuffer_clear(); + return var1; } @ObfuscatedName("g") @@ -103,9 +102,8 @@ public final class WallDecoration { public static int method3292(int var0) { if (var0 > 0) { return 1; - } else { - return var0 < 0 ? -1 : 0; } + return var0 < 0 ? -1 : 0; } @ObfuscatedName("as") diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index f926090468..425d769958 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -1195,21 +1195,20 @@ public class Widget extends Node { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return null; - } else { - Object[] var3 = new Object[var2]; - - for (int var4 = 0; var4 < var2; ++var4) { - int var5 = var1.readUnsignedByte(); - if (var5 == 0) { - var3[var4] = new Integer(var1.readInt()); - } else if (var5 == 1) { - var3[var4] = var1.readStringCp1252NullTerminated(); - } - } - - this.hasListener = true; - return var3; } + Object[] var3 = new Object[var2]; + + for (int var4 = 0; var4 < var2; ++var4) { + int var5 = var1.readUnsignedByte(); + if (var5 == 0) { + var3[var4] = new Integer(var1.readInt()); + } else if (var5 == 1) { + var3[var4] = var1.readStringCp1252NullTerminated(); + } + } + + this.hasListener = true; + return var3; } @ObfuscatedName("i") @@ -1222,15 +1221,14 @@ public class Widget extends Node { int var2 = var1.readUnsignedByte(); if (var2 == 0) { return null; - } else { - int[] var3 = new int[var2]; - - for (int var4 = 0; var4 < var2; ++var4) { - var3[var4] = var1.readInt(); - } - - return var3; } + int[] var3 = new int[var2]; + + for (int var4 = 0; var4 < var2; ++var4) { + var3[var4] = var1.readInt(); + } + + return var3; } @ObfuscatedName("c") @@ -1265,46 +1263,43 @@ public class Widget extends Node { if (var2 == -1) { return null; - } else { - long var3 = ((this.spriteFlipV ? 1L : 0L) << 38) + ((long)this.outline << 36) + (long)var2 + ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.spriteShadow << 40); - Sprite var5 = (Sprite)Widget_cachedSprites.get(var3); - if (var5 != null) { - return var5; - } else { - var5 = class65.loadSprite(class216.Widget_spritesArchive, var2, 0); - if (var5 == null) { - field2562 = true; - return null; - } else { - if (this.spriteFlipV) { - var5.method6128(); - } - - if (this.spriteFlipH) { - var5.method6117(); - } - - if (this.outline > 0) { - var5.method6115(this.outline); - } - - if (this.outline >= 1) { - var5.outline(1); - } - - if (this.outline >= 2) { - var5.outline(16777215); - } - - if (this.spriteShadow != 0) { - var5.shadow(this.spriteShadow); - } - - Widget_cachedSprites.put(var5, var3); - return var5; - } - } } + long var3 = ((this.spriteFlipV ? 1L : 0L) << 38) + ((long)this.outline << 36) + (long)var2 + ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.spriteShadow << 40); + Sprite var5 = (Sprite)Widget_cachedSprites.get(var3); + if (var5 != null) { + return var5; + } + var5 = class65.SpriteBuffer_getSprite(class216.Widget_spritesArchive, var2, 0); + if (var5 == null) { + field2562 = true; + return null; + } + if (this.spriteFlipV) { + var5.method6128(); + } + + if (this.spriteFlipH) { + var5.method6117(); + } + + if (this.outline > 0) { + var5.method6115(this.outline); + } + + if (this.outline >= 1) { + var5.outline(1); + } + + if (this.outline >= 2) { + var5.outline(16777215); + } + + if (this.spriteShadow != 0) { + var5.shadow(this.spriteShadow); + } + + Widget_cachedSprites.put(var5, var3); + return var5; } @ObfuscatedName("x") @@ -1317,21 +1312,19 @@ public class Widget extends Node { field2562 = false; if (this.fontId == -1) { return null; - } else { - Font var1 = (Font)Widget_cachedFonts.get((long)this.fontId); - if (var1 != null) { - return var1; - } else { - var1 = GameObject.loadFont(class216.Widget_spritesArchive, DirectByteArrayCopier.Widget_fontsArchive, this.fontId, 0); - if (var1 != null) { - Widget_cachedFonts.put(var1, (long)this.fontId); - } else { - field2562 = true; - } - - return var1; - } } + Font var1 = (Font)Widget_cachedFonts.get((long)this.fontId); + if (var1 != null) { + return var1; + } + var1 = GameObject.SpriteBuffer_getFont(class216.Widget_spritesArchive, DirectByteArrayCopier.Widget_fontsArchive, this.fontId, 0); + if (var1 != null) { + Widget_cachedFonts.put(var1, (long)this.fontId); + } else { + field2562 = true; + } + + return var1; } @ObfuscatedName("r") @@ -1346,24 +1339,21 @@ public class Widget extends Node { int var2 = this.inventorySprites[var1]; if (var2 == -1) { return null; - } else { - Sprite var3 = (Sprite)Widget_cachedSprites.get((long)var2); - if (var3 != null) { - return var3; - } else { - var3 = class65.loadSprite(class216.Widget_spritesArchive, var2, 0); - if (var3 != null) { - Widget_cachedSprites.put(var3, (long)var2); - } else { - field2562 = true; - } - - return var3; - } } - } else { - return null; + Sprite var3 = (Sprite)Widget_cachedSprites.get((long)var2); + if (var3 != null) { + return var3; + } + var3 = class65.SpriteBuffer_getSprite(class216.Widget_spritesArchive, var2, 0); + if (var3 != null) { + Widget_cachedSprites.put(var3, (long)var2); + } else { + field2562 = true; + } + + return var3; } + return null; } @ObfuscatedName("v") @@ -1386,66 +1376,66 @@ public class Widget extends Node { if (var5 == 0) { return null; - } else if (var5 == 1 && var6 == -1) { - return null; - } else { - Model var7 = (Model)Widget_cachedModels.get((long)(var6 + (var5 << 16))); - if (var7 == null) { - ModelData var8; - if (var5 == 1) { - var8 = ModelData.method2769(ViewportMouse.Widget_modelsArchive, var6, 0); - if (var8 == null) { - field2562 = true; - return null; - } - - var7 = var8.toModel(64, 768, -50, -10, -50); - } - - if (var5 == 2) { - var8 = GameShell.getNpcDefinition(var6).getModelData(); - if (var8 == null) { - field2562 = true; - return null; - } - - var7 = var8.toModel(64, 768, -50, -10, -50); - } - - if (var5 == 3) { - if (var4 == null) { - return null; - } - - var8 = var4.getModelData(); - if (var8 == null) { - field2562 = true; - return null; - } - - var7 = var8.toModel(64, 768, -50, -10, -50); - } - - if (var5 == 4) { - ItemDefinition var9 = WorldMapArea.getItemDefinition(var6); - var8 = var9.method4643(10); - if (var8 == null) { - field2562 = true; - return null; - } - - var7 = var8.toModel(var9.ambient + 64, var9.contrast + 768, -50, -10, -50); - } - - Widget_cachedModels.put(var7, (long)(var6 + (var5 << 16))); - } - - if (var1 != null) { - var7 = var1.transformWidgetModel(var7, var2); - } - - return var7; } + if (var5 == 1 && var6 == -1) { + return null; + } + Model var7 = (Model)Widget_cachedModels.get((long)(var6 + (var5 << 16))); + if (var7 == null) { + ModelData var8; + if (var5 == 1) { + var8 = ModelData.method2769(ViewportMouse.Widget_modelsArchive, var6, 0); + if (var8 == null) { + field2562 = true; + return null; + } + + var7 = var8.toModel(64, 768, -50, -10, -50); + } + + if (var5 == 2) { + var8 = GameShell.getNpcDefinition(var6).getModelData(); + if (var8 == null) { + field2562 = true; + return null; + } + + var7 = var8.toModel(64, 768, -50, -10, -50); + } + + if (var5 == 3) { + if (var4 == null) { + return null; + } + + var8 = var4.getModelData(); + if (var8 == null) { + field2562 = true; + return null; + } + + var7 = var8.toModel(64, 768, -50, -10, -50); + } + + if (var5 == 4) { + ItemDefinition var9 = WorldMapArea.getItemDefinition(var6); + var8 = var9.method4643(10); + if (var8 == null) { + field2562 = true; + return null; + } + + var7 = var8.toModel(var9.ambient + 64, var9.contrast + 768, -50, -10, -50); + } + + Widget_cachedModels.put(var7, (long)(var6 + (var5 << 16))); + } + + if (var1 != null) { + var7 = var1.transformWidgetModel(var7, var2); + } + + return var7; } @ObfuscatedName("y") @@ -1462,49 +1452,46 @@ public class Widget extends Node { int var2 = var1 ? this.spriteId : this.spriteId2; if (var2 == -1) { return null; - } else { - long var3 = ((this.spriteFlipV ? 1L : 0L) << 38) + (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.spriteShadow << 40); - SpriteMask var5 = (SpriteMask)Widget_cachedSpriteMasks.get(var3); - if (var5 != null) { - return var5; - } else { - Sprite var6 = this.getSprite(var1); - if (var6 == null) { - return null; - } else { - Sprite var7 = var6.copyNormalized(); - int[] var8 = new int[var7.subHeight]; - int[] var9 = new int[var7.subHeight]; + } + long var3 = ((this.spriteFlipV ? 1L : 0L) << 38) + (long)var2 + ((long)this.outline << 36) + ((this.spriteFlipH ? 1L : 0L) << 39) + ((long)this.spriteShadow << 40); + SpriteMask var5 = (SpriteMask)Widget_cachedSpriteMasks.get(var3); + if (var5 != null) { + return var5; + } + Sprite var6 = this.getSprite(var1); + if (var6 == null) { + return null; + } + Sprite var7 = var6.copyNormalized(); + int[] var8 = new int[var7.subHeight]; + int[] var9 = new int[var7.subHeight]; - for (int var10 = 0; var10 < var7.subHeight; ++var10) { - int var11 = 0; - int var12 = var7.subWidth; + for (int var10 = 0; var10 < var7.subHeight; ++var10) { + int var11 = 0; + int var12 = var7.subWidth; - int var13; - for (var13 = 0; var13 < var7.subWidth; ++var13) { - if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { - var11 = var13; - break; - } - } - - for (var13 = var7.subWidth - 1; var13 >= var11; --var13) { - if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { - var12 = var13 + 1; - break; - } - } - - var8[var10] = var11; - var9[var10] = var12 - var11; - } - - var5 = new SpriteMask(var7.subWidth, var7.subHeight, var9, var8, var2); - Widget_cachedSpriteMasks.put(var5, var3); - return var5; + int var13; + for (var13 = 0; var13 < var7.subWidth; ++var13) { + if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { + var11 = var13; + break; } } + + for (var13 = var7.subWidth - 1; var13 >= var11; --var13) { + if (var7.pixels[var13 + var10 * var7.subWidth] == 0) { + var12 = var13 + 1; + break; + } + } + + var8[var10] = var11; + var9[var10] = var12 - var11; } + + var5 = new SpriteMask(var7.subWidth, var7.subHeight, var9, var8, var2); + Widget_cachedSpriteMasks.put(var5, var3); + return var5; } @ObfuscatedName("a") diff --git a/runescape-client/src/main/java/WorldMap.java b/runescape-client/src/main/java/WorldMap.java index 0a5139c96b..df6336903f 100644 --- a/runescape-client/src/main/java/WorldMap.java +++ b/runescape-client/src/main/java/WorldMap.java @@ -793,19 +793,20 @@ public class WorldMap { boolean method6318(int var1, int var2, int var3, int var4, int var5, int var6) { if (this.sprite == null) { return true; - } else if (this.sprite.subWidth == var1 && this.sprite.subHeight == var2) { + } + if (this.sprite.subWidth == var1 && this.sprite.subHeight == var2) { if (this.worldMapManager.pixelsPerTile != this.cachedPixelsPerTile) { return true; - } else if (this.field4030 != Client.field924) { - return true; - } else if (var3 <= 0 && var4 <= 0) { - return var3 + var1 < var5 || var2 + var4 < var6; - } else { + } + if (this.field4030 != Client.field924) { return true; } - } else { + if (var3 <= 0 && var4 <= 0) { + return var3 + var1 < var5 || var2 + var4 < var6; + } return true; } + return true; } @ObfuscatedName("al") @@ -905,15 +906,17 @@ public class WorldMap { float getZoomFromPercentage(int var1) { if (var1 == 25) { return 1.0F; - } else if (var1 == 37) { - return 1.5F; - } else if (var1 == 50) { - return 2.0F; - } else if (var1 == 75) { - return 3.0F; - } else { - return var1 == 100 ? 4.0F : 8.0F; } + if (var1 == 37) { + return 1.5F; + } + if (var1 == 50) { + return 2.0F; + } + if (var1 == 75) { + return 3.0F; + } + return var1 == 100 ? 4.0F : 8.0F; } @ObfuscatedName("ag") @@ -925,15 +928,17 @@ public class WorldMap { public int getZoomLevel() { if ((double)this.zoomTarget == 1.0D) { return 25; - } else if (1.5D == (double)this.zoomTarget) { - return 37; - } else if (2.0D == (double)this.zoomTarget) { - return 50; - } else if ((double)this.zoomTarget == 3.0D) { - return 75; - } else { - return 4.0D == (double)this.zoomTarget ? 100 : 200; } + if (1.5D == (double)this.zoomTarget) { + return 37; + } + if (2.0D == (double)this.zoomTarget) { + return 50; + } + if ((double)this.zoomTarget == 3.0D) { + return 75; + } + return 4.0D == (double)this.zoomTarget ? 100 : 200; } @ObfuscatedName("ar") @@ -1317,42 +1322,42 @@ public class WorldMap { public Coord method6352(int var1, Coord var2) { if (!this.cacheLoader.getIsLoaded()) { return null; - } else if (!this.worldMapManager.isLoaded()) { + } + if (!this.worldMapManager.isLoaded()) { return null; - } else if (!this.currentMapArea.containsPosition(var2.x, var2.y)) { + } + if (!this.currentMapArea.containsPosition(var2.x, var2.y)) { return null; - } else { - HashMap var3 = this.worldMapManager.buildIcons(); - List var4 = (List)var3.get(var1); - if (var4 != null && !var4.isEmpty()) { - AbstractWorldMapIcon var5 = null; - int var6 = -1; - Iterator var7 = var4.iterator(); + } + HashMap var3 = this.worldMapManager.buildIcons(); + List var4 = (List)var3.get(var1); + if (var4 != null && !var4.isEmpty()) { + AbstractWorldMapIcon var5 = null; + int var6 = -1; + Iterator var7 = var4.iterator(); - while (true) { - AbstractWorldMapIcon var8; - int var11; - do { - if (!var7.hasNext()) { - return var5.coord2; - } + while (true) { + AbstractWorldMapIcon var8; + int var11; + do { + if (!var7.hasNext()) { + return var5.coord2; + } - var8 = (AbstractWorldMapIcon)var7.next(); - int var9 = var8.coord2.x - var2.x; - int var10 = var8.coord2.y - var2.y; - var11 = var9 * var9 + var10 * var10; - if (var11 == 0) { - return var8.coord2; - } - } while(var11 >= var6 && var5 != null); + var8 = (AbstractWorldMapIcon)var7.next(); + int var9 = var8.coord2.x - var2.x; + int var10 = var8.coord2.y - var2.y; + var11 = var9 * var9 + var10 * var10; + if (var11 == 0) { + return var8.coord2; + } + } while(var11 >= var6 && var5 != null); - var5 = var8; - var6 = var11; - } - } else { - return null; + var5 = var8; + var6 = var11; } } + return null; } @ObfuscatedName("bo") @@ -1394,21 +1399,21 @@ public class WorldMap { public AbstractWorldMapIcon iconStart() { if (!this.cacheLoader.getIsLoaded()) { return null; - } else if (!this.worldMapManager.isLoaded()) { - return null; - } else { - HashMap var1 = this.worldMapManager.buildIcons(); - this.field3972 = new LinkedList(); - Iterator var2 = var1.values().iterator(); - - while (var2.hasNext()) { - List var3 = (List)var2.next(); - this.field3972.addAll(var3); - } - - this.iconIterator = this.field3972.iterator(); - return this.iconNext(); } + if (!this.worldMapManager.isLoaded()) { + return null; + } + HashMap var1 = this.worldMapManager.buildIcons(); + this.field3972 = new LinkedList(); + Iterator var2 = var1.values().iterator(); + + while (var2.hasNext()) { + List var3 = (List)var2.next(); + this.field3972.addAll(var3); + } + + this.iconIterator = this.field3972.iterator(); + return this.iconNext(); } @ObfuscatedName("bs") @@ -1420,17 +1425,16 @@ public class WorldMap { public AbstractWorldMapIcon iconNext() { if (this.iconIterator == null) { return null; - } else { - AbstractWorldMapIcon var1; - do { - if (!this.iconIterator.hasNext()) { - return null; - } - - var1 = (AbstractWorldMapIcon)this.iconIterator.next(); - } while(var1.getElement() == -1); - - return var1; } + AbstractWorldMapIcon var1; + do { + if (!this.iconIterator.hasNext()) { + return null; + } + + var1 = (AbstractWorldMapIcon)this.iconIterator.next(); + } while(var1.getElement() == -1); + + return var1; } } diff --git a/runescape-client/src/main/java/WorldMapArea.java b/runescape-client/src/main/java/WorldMapArea.java index 03398b71a8..f19892608c 100644 --- a/runescape-client/src/main/java/WorldMapArea.java +++ b/runescape-client/src/main/java/WorldMapArea.java @@ -192,12 +192,10 @@ public class WorldMapArea { } while(!var6.containsPosition(var1, var2)); return true; - } else { - return false; } - } else { return false; } + return false; } @ObfuscatedName("k") @@ -408,55 +406,54 @@ public class WorldMapArea { ItemDefinition var1 = (ItemDefinition)ItemDefinition.ItemDefinition_cached.get((long)var0); if (var1 != null) { return var1; - } else { - byte[] var2 = Messages.ItemDefinition_archive.takeFile(10, var0); - var1 = new ItemDefinition(); - var1.id = var0; - if (var2 != null) { - var1.decode(new Buffer(var2)); - } + } + byte[] var2 = Messages.ItemDefinition_archive.takeFile(10, var0); + var1 = new ItemDefinition(); + var1.id = var0; + if (var2 != null) { + var1.decode(new Buffer(var2)); + } - var1.post(); - if (var1.noteTemplate != -1) { - var1.genCert(getItemDefinition(var1.noteTemplate), getItemDefinition(var1.note)); - } + var1.post(); + if (var1.noteTemplate != -1) { + var1.genCert(getItemDefinition(var1.noteTemplate), getItemDefinition(var1.note)); + } - if (var1.notedId != -1) { - var1.genBought(getItemDefinition(var1.notedId), getItemDefinition(var1.unnotedId)); - } + if (var1.notedId != -1) { + var1.genBought(getItemDefinition(var1.notedId), getItemDefinition(var1.unnotedId)); + } - if (var1.placeholderTemplate != -1) { - var1.genPlaceholder(getItemDefinition(var1.placeholderTemplate), getItemDefinition(var1.placeholder)); - } + if (var1.placeholderTemplate != -1) { + var1.genPlaceholder(getItemDefinition(var1.placeholderTemplate), getItemDefinition(var1.placeholder)); + } - if (!ModelData0.inMembersWorld && var1.isMembersOnly) { - var1.name = "Members object"; - var1.isTradable = false; - var1.groundActions = null; - var1.inventoryActions = null; - var1.shiftClickIndex = -1; - var1.team = 0; - if (var1.params != null) { - boolean var3 = false; + if (!ModelData0.inMembersWorld && var1.isMembersOnly) { + var1.name = "Members object"; + var1.isTradable = false; + var1.groundActions = null; + var1.inventoryActions = null; + var1.shiftClickIndex = -1; + var1.team = 0; + if (var1.params != null) { + boolean var3 = false; - for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { - ParamDefinition var5 = WorldMapIcon_0.getParamDefinition((int)var4.key); - if (var5.autoDisable) { - var4.remove(); - } else { - var3 = true; - } - } - - if (!var3) { - var1.params = null; + for (Node var4 = var1.params.first(); var4 != null; var4 = var1.params.next()) { + ParamDefinition var5 = WorldMapIcon_0.getParamDefinition((int)var4.key); + if (var5.autoDisable) { + var4.remove(); + } else { + var3 = true; } } - } - ItemDefinition.ItemDefinition_cached.put(var1, (long)var0); - return var1; + if (!var3) { + var1.params = null; + } + } } + + ItemDefinition.ItemDefinition_cached.put(var1, (long)var0); + return var1; } @ObfuscatedName("q") @@ -475,206 +472,205 @@ public class WorldMapArea { NetCache.field3163 += var2; if (NetCache.NetCache_pendingResponsesCount == 0 && NetCache.NetCache_pendingPriorityResponsesCount == 0 && NetCache.NetCache_pendingWritesCount == 0 && NetCache.NetCache_pendingPriorityWritesCount == 0) { return true; - } else if (NetCache.NetCache_socket == null) { + } + if (NetCache.NetCache_socket == null) { return false; - } else { - try { - if (NetCache.field3163 > 30000) { - throw new IOException(); - } else { - NetFileRequest var3; - Buffer var4; - while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { - var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first(); - var4 = new Buffer(4); - var4.writeByte(1); - var4.writeMedium((int)var3.key); - NetCache.NetCache_socket.write(var4.array, 0, 4); - NetCache.NetCache_pendingPriorityResponses.put(var3, var3.key); - --NetCache.NetCache_pendingPriorityWritesCount; - ++NetCache.NetCache_pendingPriorityResponsesCount; + } + try { + if (NetCache.field3163 > 30000) { + throw new IOException(); + } + NetFileRequest var3; + Buffer var4; + while (NetCache.NetCache_pendingPriorityResponsesCount < 200 && NetCache.NetCache_pendingPriorityWritesCount > 0) { + var3 = (NetFileRequest)NetCache.NetCache_pendingPriorityWrites.first(); + var4 = new Buffer(4); + var4.writeByte(1); + var4.writeMedium((int)var3.key); + NetCache.NetCache_socket.write(var4.array, 0, 4); + NetCache.NetCache_pendingPriorityResponses.put(var3, var3.key); + --NetCache.NetCache_pendingPriorityWritesCount; + ++NetCache.NetCache_pendingPriorityResponsesCount; + } + + while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { + var3 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.removeLast(); + var4 = new Buffer(4); + var4.writeByte(0); + var4.writeMedium((int)var3.key); + NetCache.NetCache_socket.write(var4.array, 0, 4); + var3.removeDual(); + NetCache.NetCache_pendingResponses.put(var3, var3.key); + --NetCache.NetCache_pendingWritesCount; + ++NetCache.NetCache_pendingResponsesCount; + } + + for (int var15 = 0; var15 < 100; ++var15) { + int var16 = NetCache.NetCache_socket.available(); + if (var16 < 0) { + throw new IOException(); } - while (NetCache.NetCache_pendingResponsesCount < 200 && NetCache.NetCache_pendingWritesCount > 0) { - var3 = (NetFileRequest)NetCache.NetCache_pendingWritesQueue.removeLast(); - var4 = new Buffer(4); - var4.writeByte(0); - var4.writeMedium((int)var3.key); - NetCache.NetCache_socket.write(var4.array, 0, 4); - var3.removeDual(); - NetCache.NetCache_pendingResponses.put(var3, var3.key); - --NetCache.NetCache_pendingWritesCount; - ++NetCache.NetCache_pendingResponsesCount; + if (var16 == 0) { + break; } - for (int var15 = 0; var15 < 100; ++var15) { - int var16 = NetCache.NetCache_socket.available(); - if (var16 < 0) { - throw new IOException(); + NetCache.field3163 = 0; + byte var5 = 0; + if (class226.NetCache_currentResponse == null) { + var5 = 8; + } else if (NetCache.field3175 == 0) { + var5 = 1; + } + + int var6; + int var7; + int var8; + int var10; + byte[] var10000; + int var10001; + Buffer var22; + if (var5 > 0) { + var6 = var5 - NetCache.NetCache_responseHeaderBuffer.offset; + if (var6 > var16) { + var6 = var16; } - if (var16 == 0) { + NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.offset, var6); + if (NetCache.field3181 != 0) { + for (var7 = 0; var7 < var6; ++var7) { + var10000 = NetCache.NetCache_responseHeaderBuffer.array; + var10001 = var7 + NetCache.NetCache_responseHeaderBuffer.offset; + var10000[var10001] ^= NetCache.field3181; + } + } + + var22 = NetCache.NetCache_responseHeaderBuffer; + var22.offset += var6; + if (NetCache.NetCache_responseHeaderBuffer.offset < var5) { break; } - NetCache.field3163 = 0; - byte var5 = 0; if (class226.NetCache_currentResponse == null) { - var5 = 8; + NetCache.NetCache_responseHeaderBuffer.offset = 0; + var7 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); + var8 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); + int var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); + var10 = NetCache.NetCache_responseHeaderBuffer.readInt(); + long var11 = (long)(var8 + (var7 << 16)); + NetFileRequest var13 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var11); + class215.field2545 = true; + if (var13 == null) { + var13 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var11); + class215.field2545 = false; + } + + if (var13 == null) { + throw new IOException(); + } + + int var14 = var9 == 0 ? 5 : 9; + class226.NetCache_currentResponse = var13; + VarpDefinition.NetCache_responseArchiveBuffer = new Buffer(var14 + var10 + class226.NetCache_currentResponse.padding); + VarpDefinition.NetCache_responseArchiveBuffer.writeByte(var9); + VarpDefinition.NetCache_responseArchiveBuffer.writeInt(var10); + NetCache.field3175 = 8; + NetCache.NetCache_responseHeaderBuffer.offset = 0; } else if (NetCache.field3175 == 0) { - var5 = 1; + if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { + NetCache.field3175 = 1; + NetCache.NetCache_responseHeaderBuffer.offset = 0; + } else { + class226.NetCache_currentResponse = null; + } + } + } else { + var6 = VarpDefinition.NetCache_responseArchiveBuffer.array.length - class226.NetCache_currentResponse.padding; + var7 = 512 - NetCache.field3175; + if (var7 > var6 - VarpDefinition.NetCache_responseArchiveBuffer.offset) { + var7 = var6 - VarpDefinition.NetCache_responseArchiveBuffer.offset; } - int var6; - int var7; - int var8; - int var10; - byte[] var10000; - int var10001; - Buffer var22; - if (var5 > 0) { - var6 = var5 - NetCache.NetCache_responseHeaderBuffer.offset; - if (var6 > var16) { - var6 = var16; - } + if (var7 > var16) { + var7 = var16; + } - NetCache.NetCache_socket.read(NetCache.NetCache_responseHeaderBuffer.array, NetCache.NetCache_responseHeaderBuffer.offset, var6); - if (NetCache.field3181 != 0) { - for (var7 = 0; var7 < var6; ++var7) { - var10000 = NetCache.NetCache_responseHeaderBuffer.array; - var10001 = var7 + NetCache.NetCache_responseHeaderBuffer.offset; - var10000[var10001] ^= NetCache.field3181; + NetCache.NetCache_socket.read(VarpDefinition.NetCache_responseArchiveBuffer.array, VarpDefinition.NetCache_responseArchiveBuffer.offset, var7); + if (NetCache.field3181 != 0) { + for (var8 = 0; var8 < var7; ++var8) { + var10000 = VarpDefinition.NetCache_responseArchiveBuffer.array; + var10001 = VarpDefinition.NetCache_responseArchiveBuffer.offset + var8; + var10000[var10001] ^= NetCache.field3181; + } + } + + var22 = VarpDefinition.NetCache_responseArchiveBuffer; + var22.offset += var7; + NetCache.field3175 += var7; + if (var6 == VarpDefinition.NetCache_responseArchiveBuffer.offset) { + if (16711935L == class226.NetCache_currentResponse.key) { + AbstractRasterProvider.NetCache_reference = VarpDefinition.NetCache_responseArchiveBuffer; + + for (var8 = 0; var8 < 256; ++var8) { + Archive var17 = NetCache.NetCache_archives[var8]; + if (var17 != null) { + AbstractRasterProvider.NetCache_reference.offset = var8 * 8 + 5; + var10 = AbstractRasterProvider.NetCache_reference.readInt(); + int var18 = AbstractRasterProvider.NetCache_reference.readInt(); + var17.loadIndex(var10, var18); + } } + } else { + NetCache.NetCache_crc.reset(); + NetCache.NetCache_crc.update(VarpDefinition.NetCache_responseArchiveBuffer.array, 0, var6); + var8 = (int)NetCache.NetCache_crc.getValue(); + if (var8 != class226.NetCache_currentResponse.crc) { + try { + NetCache.NetCache_socket.close(); + } catch (Exception var20) { + } + + ++NetCache.NetCache_crcMismatches; + NetCache.NetCache_socket = null; + NetCache.field3181 = (byte)((int)(Math.random() * 255.0D + 1.0D)); + return false; + } + + NetCache.NetCache_crcMismatches = 0; + NetCache.NetCache_ioExceptions = 0; + class226.NetCache_currentResponse.archive.write((int)(class226.NetCache_currentResponse.key & 65535L), VarpDefinition.NetCache_responseArchiveBuffer.array, (class226.NetCache_currentResponse.key & 16711680L) == 16711680L, class215.field2545); } - var22 = NetCache.NetCache_responseHeaderBuffer; - var22.offset += var6; - if (NetCache.NetCache_responseHeaderBuffer.offset < var5) { + class226.NetCache_currentResponse.remove(); + if (class215.field2545) { + --NetCache.NetCache_pendingPriorityResponsesCount; + } else { + --NetCache.NetCache_pendingResponsesCount; + } + + NetCache.field3175 = 0; + class226.NetCache_currentResponse = null; + VarpDefinition.NetCache_responseArchiveBuffer = null; + } else { + if (NetCache.field3175 != 512) { break; } - if (class226.NetCache_currentResponse == null) { - NetCache.NetCache_responseHeaderBuffer.offset = 0; - var7 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); - var8 = NetCache.NetCache_responseHeaderBuffer.readUnsignedShort(); - int var9 = NetCache.NetCache_responseHeaderBuffer.readUnsignedByte(); - var10 = NetCache.NetCache_responseHeaderBuffer.readInt(); - long var11 = (long)(var8 + (var7 << 16)); - NetFileRequest var13 = (NetFileRequest)NetCache.NetCache_pendingPriorityResponses.get(var11); - class215.field2545 = true; - if (var13 == null) { - var13 = (NetFileRequest)NetCache.NetCache_pendingResponses.get(var11); - class215.field2545 = false; - } - - if (var13 == null) { - throw new IOException(); - } - - int var14 = var9 == 0 ? 5 : 9; - class226.NetCache_currentResponse = var13; - VarpDefinition.NetCache_responseArchiveBuffer = new Buffer(var14 + var10 + class226.NetCache_currentResponse.padding); - VarpDefinition.NetCache_responseArchiveBuffer.writeByte(var9); - VarpDefinition.NetCache_responseArchiveBuffer.writeInt(var10); - NetCache.field3175 = 8; - NetCache.NetCache_responseHeaderBuffer.offset = 0; - } else if (NetCache.field3175 == 0) { - if (NetCache.NetCache_responseHeaderBuffer.array[0] == -1) { - NetCache.field3175 = 1; - NetCache.NetCache_responseHeaderBuffer.offset = 0; - } else { - class226.NetCache_currentResponse = null; - } - } - } else { - var6 = VarpDefinition.NetCache_responseArchiveBuffer.array.length - class226.NetCache_currentResponse.padding; - var7 = 512 - NetCache.field3175; - if (var7 > var6 - VarpDefinition.NetCache_responseArchiveBuffer.offset) { - var7 = var6 - VarpDefinition.NetCache_responseArchiveBuffer.offset; - } - - if (var7 > var16) { - var7 = var16; - } - - NetCache.NetCache_socket.read(VarpDefinition.NetCache_responseArchiveBuffer.array, VarpDefinition.NetCache_responseArchiveBuffer.offset, var7); - if (NetCache.field3181 != 0) { - for (var8 = 0; var8 < var7; ++var8) { - var10000 = VarpDefinition.NetCache_responseArchiveBuffer.array; - var10001 = VarpDefinition.NetCache_responseArchiveBuffer.offset + var8; - var10000[var10001] ^= NetCache.field3181; - } - } - - var22 = VarpDefinition.NetCache_responseArchiveBuffer; - var22.offset += var7; - NetCache.field3175 += var7; - if (var6 == VarpDefinition.NetCache_responseArchiveBuffer.offset) { - if (16711935L == class226.NetCache_currentResponse.key) { - AbstractRasterProvider.NetCache_reference = VarpDefinition.NetCache_responseArchiveBuffer; - - for (var8 = 0; var8 < 256; ++var8) { - Archive var17 = NetCache.NetCache_archives[var8]; - if (var17 != null) { - AbstractRasterProvider.NetCache_reference.offset = var8 * 8 + 5; - var10 = AbstractRasterProvider.NetCache_reference.readInt(); - int var18 = AbstractRasterProvider.NetCache_reference.readInt(); - var17.loadIndex(var10, var18); - } - } - } else { - NetCache.NetCache_crc.reset(); - NetCache.NetCache_crc.update(VarpDefinition.NetCache_responseArchiveBuffer.array, 0, var6); - var8 = (int)NetCache.NetCache_crc.getValue(); - if (var8 != class226.NetCache_currentResponse.crc) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var20) { - } - - ++NetCache.NetCache_crcMismatches; - NetCache.NetCache_socket = null; - NetCache.field3181 = (byte)((int)(Math.random() * 255.0D + 1.0D)); - return false; - } - - NetCache.NetCache_crcMismatches = 0; - NetCache.NetCache_ioExceptions = 0; - class226.NetCache_currentResponse.archive.write((int)(class226.NetCache_currentResponse.key & 65535L), VarpDefinition.NetCache_responseArchiveBuffer.array, (class226.NetCache_currentResponse.key & 16711680L) == 16711680L, class215.field2545); - } - - class226.NetCache_currentResponse.remove(); - if (class215.field2545) { - --NetCache.NetCache_pendingPriorityResponsesCount; - } else { - --NetCache.NetCache_pendingResponsesCount; - } - - NetCache.field3175 = 0; - class226.NetCache_currentResponse = null; - VarpDefinition.NetCache_responseArchiveBuffer = null; - } else { - if (NetCache.field3175 != 512) { - break; - } - - NetCache.field3175 = 0; - } + NetCache.field3175 = 0; } } - - return true; - } - } catch (IOException var21) { - try { - NetCache.NetCache_socket.close(); - } catch (Exception var19) { } - ++NetCache.NetCache_ioExceptions; - NetCache.NetCache_socket = null; - return false; + return true; + } catch (IOException var21) { + try { + NetCache.NetCache_socket.close(); + } catch (Exception var19) { } + + ++NetCache.NetCache_ioExceptions; + NetCache.NetCache_socket = null; + return false; } } diff --git a/runescape-client/src/main/java/WorldMapCacheName.java b/runescape-client/src/main/java/WorldMapCacheName.java index e369a3873e..543e745ec9 100644 --- a/runescape-client/src/main/java/WorldMapCacheName.java +++ b/runescape-client/src/main/java/WorldMapCacheName.java @@ -70,12 +70,11 @@ public class WorldMapCacheName { static final void method600(Widget var0, int var1) { if (var0.field2650 == null) { throw new RuntimeException(); - } else { - if (var0.field2578 == null) { - var0.field2578 = new int[var0.field2650.length]; - } - - var0.field2578[var1] = Integer.MAX_VALUE; } + if (var0.field2578 == null) { + var0.field2578 = new int[var0.field2650.length]; + } + + var0.field2578[var1] = Integer.MAX_VALUE; } } diff --git a/runescape-client/src/main/java/WorldMapData_0.java b/runescape-client/src/main/java/WorldMapData_0.java index d43de4aa00..070789d82a 100644 --- a/runescape-client/src/main/java/WorldMapData_0.java +++ b/runescape-client/src/main/java/WorldMapData_0.java @@ -19,16 +19,15 @@ public class WorldMapData_0 extends AbstractWorldMapData { int var2 = var1.readUnsignedByte(); if (var2 != WorldMapID.field272.value) { throw new IllegalStateException(""); - } else { - super.minPlane = var1.readUnsignedByte(); - super.planes = var1.readUnsignedByte(); - super.regionXLow = var1.readUnsignedShort() * 4096; - super.regionYLow = var1.readUnsignedShort() * 4096; - super.regionX = var1.readUnsignedShort(); - super.regionY = var1.readUnsignedShort(); - super.groupId = var1.method5511(); - super.fileId = var1.method5511(); } + super.minPlane = var1.readUnsignedByte(); + super.planes = var1.readUnsignedByte(); + super.regionXLow = var1.readUnsignedShort() * 4096; + super.regionYLow = var1.readUnsignedShort() * 4096; + super.regionX = var1.readUnsignedShort(); + super.regionY = var1.readUnsignedShort(); + super.groupId = var1.method5511(); + super.fileId = var1.method5511(); } @ObfuscatedName("w") @@ -47,29 +46,27 @@ public class WorldMapData_0 extends AbstractWorldMapData { int var2 = var1.readUnsignedByte(); if (var2 != class30.field262.value) { throw new IllegalStateException(""); - } else { - int var3 = var1.readUnsignedByte(); - int var4 = var1.readUnsignedByte(); - if (var3 == super.regionX && var4 == super.regionY) { - for (int var5 = 0; var5 < 64; ++var5) { - for (int var6 = 0; var6 < 64; ++var6) { - this.readTile(var5, var6, var1); - } + } + int var3 = var1.readUnsignedByte(); + int var4 = var1.readUnsignedByte(); + if (var3 == super.regionX && var4 == super.regionY) { + for (int var5 = 0; var5 < 64; ++var5) { + for (int var6 = 0; var6 < 64; ++var6) { + this.readTile(var5, var6, var1); } - - } else { - throw new IllegalStateException(""); } + + } else { + throw new IllegalStateException(""); } } public boolean equals(Object var1) { if (!(var1 instanceof WorldMapData_0)) { return false; - } else { - WorldMapData_0 var2 = (WorldMapData_0)var1; - return var2.regionX == super.regionX && super.regionY == var2.regionY; } + WorldMapData_0 var2 = (WorldMapData_0)var1; + return var2.regionX == super.regionX && super.regionY == var2.regionY; } public int hashCode() { diff --git a/runescape-client/src/main/java/WorldMapData_1.java b/runescape-client/src/main/java/WorldMapData_1.java index ed6f9ddd91..0b1288a830 100644 --- a/runescape-client/src/main/java/WorldMapData_1.java +++ b/runescape-client/src/main/java/WorldMapData_1.java @@ -55,20 +55,19 @@ public class WorldMapData_1 extends AbstractWorldMapData { int var2 = var1.readUnsignedByte(); if (var2 != WorldMapID.field269.value) { throw new IllegalStateException(""); - } else { - super.minPlane = var1.readUnsignedByte(); - super.planes = var1.readUnsignedByte(); - super.regionXLow = var1.readUnsignedShort() * 4096; - super.regionYLow = var1.readUnsignedShort() * 4096; - this.chunkXLow = var1.readUnsignedByte(); - this.chunkYLow = var1.readUnsignedByte(); - super.regionX = var1.readUnsignedShort(); - super.regionY = var1.readUnsignedShort(); - this.chunkX = var1.readUnsignedByte(); - this.chunkY = var1.readUnsignedByte(); - super.groupId = var1.method5511(); - super.fileId = var1.method5511(); } + super.minPlane = var1.readUnsignedByte(); + super.planes = var1.readUnsignedByte(); + super.regionXLow = var1.readUnsignedShort() * 4096; + super.regionYLow = var1.readUnsignedShort() * 4096; + this.chunkXLow = var1.readUnsignedByte(); + this.chunkYLow = var1.readUnsignedByte(); + super.regionX = var1.readUnsignedShort(); + super.regionY = var1.readUnsignedShort(); + this.chunkX = var1.readUnsignedByte(); + this.chunkY = var1.readUnsignedByte(); + super.groupId = var1.method5511(); + super.fileId = var1.method5511(); } @ObfuscatedName("w") @@ -87,21 +86,20 @@ public class WorldMapData_1 extends AbstractWorldMapData { int var2 = var1.readUnsignedByte(); if (var2 != class30.field258.value) { throw new IllegalStateException(""); - } else { - int var3 = var1.readUnsignedByte(); - int var4 = var1.readUnsignedByte(); - int var5 = var1.readUnsignedByte(); - int var6 = var1.readUnsignedByte(); - if (var3 == super.regionX && var4 == super.regionY && var5 == this.chunkX && var6 == this.chunkY) { - for (int var7 = 0; var7 < 8; ++var7) { - for (int var8 = 0; var8 < 8; ++var8) { - this.readTile(var7 + this.chunkX * 8, var8 + this.chunkY * 8, var1); - } + } + int var3 = var1.readUnsignedByte(); + int var4 = var1.readUnsignedByte(); + int var5 = var1.readUnsignedByte(); + int var6 = var1.readUnsignedByte(); + if (var3 == super.regionX && var4 == super.regionY && var5 == this.chunkX && var6 == this.chunkY) { + for (int var7 = 0; var7 < 8; ++var7) { + for (int var8 = 0; var8 < 8; ++var8) { + this.readTile(var7 + this.chunkX * 8, var8 + this.chunkY * 8, var1); } - - } else { - throw new IllegalStateException(""); } + + } else { + throw new IllegalStateException(""); } } @@ -148,14 +146,12 @@ public class WorldMapData_1 extends AbstractWorldMapData { public boolean equals(Object var1) { if (!(var1 instanceof WorldMapData_1)) { return false; - } else { - WorldMapData_1 var2 = (WorldMapData_1)var1; - if (var2.regionX == super.regionX && super.regionY == var2.regionY) { - return var2.chunkX == this.chunkX && var2.chunkY == this.chunkY; - } else { - return false; - } } + WorldMapData_1 var2 = (WorldMapData_1)var1; + if (var2.regionX == super.regionX && super.regionY == var2.regionY) { + return var2.chunkX == this.chunkX && var2.chunkY == this.chunkY; + } + return false; } public int hashCode() { @@ -171,8 +167,7 @@ public class WorldMapData_1 extends AbstractWorldMapData { if (var0 == ScriptOpcodes.LOGOUT) { Client.field700 = 250; return 1; - } else { - return 2; } + return 2; } } diff --git a/runescape-client/src/main/java/WorldMapDecoration.java b/runescape-client/src/main/java/WorldMapDecoration.java index 7a873ce86b..8e3fef0932 100644 --- a/runescape-client/src/main/java/WorldMapDecoration.java +++ b/runescape-client/src/main/java/WorldMapDecoration.java @@ -53,19 +53,7 @@ public class WorldMapDecoration { } Strings.method4120(var3); - if (var0 != ScriptOpcodes.CC_SETOBJECT && var0 != ScriptOpcodes.CC_SETOBJECT_NONUM && var0 != ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) { - if (var0 == ScriptOpcodes.CC_SETNPCHEAD) { - var3.modelType = 2; - var3.modelId = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { - var3.modelType = 3; - var3.modelId = Client.localPlayer.appearance.getChatHeadId(); - return 1; - } else { - return 2; - } - } else { + if (var0 == ScriptOpcodes.CC_SETOBJECT || var0 == ScriptOpcodes.CC_SETOBJECT_NONUM || var0 == ScriptOpcodes.CC_SETOBJECT_ALWAYS_NUM) { HealthBarUpdate.Interpreter_intStackSize -= 2; int var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; int var5 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; @@ -94,6 +82,17 @@ public class WorldMapDecoration { return 1; } + if (var0 == ScriptOpcodes.CC_SETNPCHEAD) { + var3.modelType = 2; + var3.modelId = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + return 1; + } + if (var0 == ScriptOpcodes.CC_SETPLAYERHEAD_SELF) { + var3.modelType = 3; + var3.modelId = Client.localPlayer.appearance.getChatHeadId(); + return 1; + } + return 2; } @ObfuscatedName("kv") diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java index 1cc5978b06..a2f77eac51 100644 --- a/runescape-client/src/main/java/WorldMapElement.java +++ b/runescape-client/src/main/java/WorldMapElement.java @@ -278,19 +278,17 @@ public class WorldMapElement extends DualNode { Sprite getSprite(int var1) { if (var1 < 0) { return null; - } else { - Sprite var2 = (Sprite)WorldMapElement_cachedSprites.get((long)var1); - if (var2 != null) { - return var2; - } else { - var2 = class65.loadSprite(WorldMapElement_archive, var1, 0); - if (var2 != null) { - WorldMapElement_cachedSprites.put(var2, (long)var1); - } - - return var2; - } } + Sprite var2 = (Sprite)WorldMapElement_cachedSprites.get((long)var1); + if (var2 != null) { + return var2; + } + var2 = class65.SpriteBuffer_getSprite(WorldMapElement_archive, var1, 0); + if (var2 != null) { + WorldMapElement_cachedSprites.put(var2, (long)var1); + } + + return var2; } @ObfuscatedName("b") diff --git a/runescape-client/src/main/java/WorldMapID.java b/runescape-client/src/main/java/WorldMapID.java index d7989644c4..1b573d35c8 100644 --- a/runescape-client/src/main/java/WorldMapID.java +++ b/runescape-client/src/main/java/WorldMapID.java @@ -68,131 +68,149 @@ public class WorldMapID { if (var0 == ScriptOpcodes.CLIENTCLOCK) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.cycle; return 1; - } else { - int var3; - int var4; - if (var0 == ScriptOpcodes.INV_GETOBJ) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = AbstractWorldMapData.method274(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INV_GETNUM) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = class2.method27(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INV_TOTAL) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = BufferedFile.method6528(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INV_SIZE) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = NetSocket.getInvDefinition(var3).size; - return 1; - } else if (var0 == ScriptOpcodes.STAT) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; - return 1; - } else if (var0 == ScriptOpcodes.STAT_BASE) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.levels[var3]; - return 1; - } else if (var0 == ScriptOpcodes.STAT_XP) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.experience[var3]; - return 1; - } else { - int var5; - if (var0 == ScriptOpcodes.COORD) { - var3 = class42.plane; - var4 = MusicPatchNode2.baseX * 64 + (Client.localPlayer.x >> 7); - var5 = class1.baseY * 64 + (Client.localPlayer.y >> 7); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); - return 1; - } else if (var0 == ScriptOpcodes.COORDX) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; - return 1; - } else if (var0 == ScriptOpcodes.COORDZ) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 >> 28; - return 1; - } else if (var0 == ScriptOpcodes.COORDY) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 & 16383; - return 1; - } else if (var0 == ScriptOpcodes.MAP_MEMBERS) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize] + 32768; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = AbstractWorldMapData.method274(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize] + 32768; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = class2.method27(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize] + 32768; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = BufferedFile.method6528(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.STAFFMODLEVEL) { - if (Client.staffModLevel >= 2) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.staffModLevel; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.REBOOTTIMER) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.rebootTimer; - return 1; - } else if (var0 == ScriptOpcodes.MAP_WORLD) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.worldId; - return 1; - } else if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.runEnergy; - return 1; - } else if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.weight; - return 1; - } else if (var0 == ScriptOpcodes.PLAYERMOD) { - if (Client.playerMod) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDFLAGS) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.worldProperties; - return 1; - } else if (var0 == ScriptOpcodes.MOVECOORD) { - HealthBarUpdate.Interpreter_intStackSize -= 4; - var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2]; - int var6 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 3]; - var3 += var4 << 14; - var3 += var5 << 28; - var3 += var6; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3; - return 1; - } else { - return 2; - } - } } + int var3; + int var4; + if (var0 == ScriptOpcodes.INV_GETOBJ) { + HealthBarUpdate.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = AbstractWorldMapData.method274(var3, var4); + return 1; + } + if (var0 == ScriptOpcodes.INV_GETNUM) { + HealthBarUpdate.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = class2.method27(var3, var4); + return 1; + } + if (var0 == ScriptOpcodes.INV_TOTAL) { + HealthBarUpdate.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = BufferedFile.method6528(var3, var4); + return 1; + } + if (var0 == ScriptOpcodes.INV_SIZE) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = NetSocket.getInvDefinition(var3).size; + return 1; + } + if (var0 == ScriptOpcodes.STAT) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.currentLevels[var3]; + return 1; + } + if (var0 == ScriptOpcodes.STAT_BASE) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.levels[var3]; + return 1; + } + if (var0 == ScriptOpcodes.STAT_XP) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.experience[var3]; + return 1; + } + int var5; + if (var0 == ScriptOpcodes.COORD) { + var3 = class42.plane; + var4 = MusicPatchNode2.baseX * 64 + (Client.localPlayer.x >> 7); + var5 = class1.baseY * 64 + (Client.localPlayer.y >> 7); + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = (var4 << 14) + var5 + (var3 << 28); + return 1; + } + if (var0 == ScriptOpcodes.COORDX) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 >> 14 & 16383; + return 1; + } + if (var0 == ScriptOpcodes.COORDZ) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 >> 28; + return 1; + } + if (var0 == ScriptOpcodes.COORDY) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3 & 16383; + return 1; + } + if (var0 == ScriptOpcodes.MAP_MEMBERS) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.isMembersWorld ? 1 : 0; + return 1; + } + if (var0 == ScriptOpcodes.INVOTHER_GETOBJ) { + HealthBarUpdate.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize] + 32768; + var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = AbstractWorldMapData.method274(var3, var4); + return 1; + } + if (var0 == ScriptOpcodes.INVOTHER_GETNUM) { + HealthBarUpdate.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize] + 32768; + var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = class2.method27(var3, var4); + return 1; + } + if (var0 == ScriptOpcodes.INVOTHER_TOTAL) { + HealthBarUpdate.Interpreter_intStackSize -= 2; + var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize] + 32768; + var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = BufferedFile.method6528(var3, var4); + return 1; + } + if (var0 == ScriptOpcodes.STAFFMODLEVEL) { + if (Client.staffModLevel >= 2) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.staffModLevel; + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } + if (var0 == ScriptOpcodes.REBOOTTIMER) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.rebootTimer; + return 1; + } + if (var0 == ScriptOpcodes.MAP_WORLD) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.worldId; + return 1; + } + if (var0 == ScriptOpcodes.RUNENERGY_VISIBLE) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.runEnergy; + return 1; + } + if (var0 == ScriptOpcodes.RUNWEIGHT_VISIBLE) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.weight; + return 1; + } + if (var0 == ScriptOpcodes.PLAYERMOD) { + if (Client.playerMod) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } + if (var0 == ScriptOpcodes.WORLDFLAGS) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.worldProperties; + return 1; + } + if (var0 == ScriptOpcodes.MOVECOORD) { + HealthBarUpdate.Interpreter_intStackSize -= 4; + var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; + var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2]; + int var6 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 3]; + var3 += var4 << 14; + var3 += var5 << 28; + var3 += var6; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3; + return 1; + } + return 2; } @ObfuscatedName("ek") diff --git a/runescape-client/src/main/java/WorldMapIcon_0.java b/runescape-client/src/main/java/WorldMapIcon_0.java index fc0c6c769b..89517da150 100644 --- a/runescape-client/src/main/java/WorldMapIcon_0.java +++ b/runescape-client/src/main/java/WorldMapIcon_0.java @@ -71,6 +71,7 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { signature = "(I)I", garbageValue = "-229566020" ) + @Export("getElement") public int getElement() { return this.element; } @@ -90,6 +91,7 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { signature = "(B)I", garbageValue = "14" ) + @Export("getSubWidth") int getSubWidth() { return this.subWidth; } @@ -99,6 +101,7 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { signature = "(B)I", garbageValue = "1" ) + @Export("getSubHeight") int getSubHeight() { return this.subHeight; } @@ -124,17 +127,16 @@ public class WorldMapIcon_0 extends AbstractWorldMapIcon { ParamDefinition var1 = (ParamDefinition)ParamDefinition.ParamDefinition_cached.get((long)var0); if (var1 != null) { return var1; - } else { - byte[] var2 = ParamDefinition.ParamDefinition_archive.takeFile(11, var0); - var1 = new ParamDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - var1.postDecode(); - ParamDefinition.ParamDefinition_cached.put(var1, (long)var0); - return var1; } + byte[] var2 = ParamDefinition.ParamDefinition_archive.takeFile(11, var0); + var1 = new ParamDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + var1.postDecode(); + ParamDefinition.ParamDefinition_cached.put(var1, (long)var0); + return var1; } @ObfuscatedName("e") diff --git a/runescape-client/src/main/java/WorldMapIcon_1.java b/runescape-client/src/main/java/WorldMapIcon_1.java index e8ee66d51c..41c3c543b2 100644 --- a/runescape-client/src/main/java/WorldMapIcon_1.java +++ b/runescape-client/src/main/java/WorldMapIcon_1.java @@ -80,6 +80,7 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { signature = "(I)I", garbageValue = "-229566020" ) + @Export("getElement") public int getElement() { return this.element; } @@ -99,6 +100,7 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { signature = "(B)I", garbageValue = "14" ) + @Export("getSubWidth") int getSubWidth() { return this.subWidth; } @@ -108,6 +110,7 @@ public class WorldMapIcon_1 extends AbstractWorldMapIcon { signature = "(B)I", garbageValue = "1" ) + @Export("getSubHeight") int getSubHeight() { return this.subHeight; } diff --git a/runescape-client/src/main/java/WorldMapLabel.java b/runescape-client/src/main/java/WorldMapLabel.java index a9cd0781e3..2b518b79f5 100644 --- a/runescape-client/src/main/java/WorldMapLabel.java +++ b/runescape-client/src/main/java/WorldMapLabel.java @@ -118,9 +118,8 @@ public class WorldMapLabel { static String method417(int var0) { if (var0 < 0) { return ""; - } else { - return Client.menuTargetNames[var0].length() > 0 ? Client.menuActions[var0] + " " + Client.menuTargetNames[var0] : Client.menuActions[var0]; } + return Client.menuTargetNames[var0].length() > 0 ? Client.menuActions[var0] + " " + Client.menuTargetNames[var0] : Client.menuActions[var0]; } @ObfuscatedName("kz") diff --git a/runescape-client/src/main/java/WorldMapManager.java b/runescape-client/src/main/java/WorldMapManager.java index 197b9dff3c..ae88f71c25 100644 --- a/runescape-client/src/main/java/WorldMapManager.java +++ b/runescape-client/src/main/java/WorldMapManager.java @@ -329,24 +329,23 @@ public final class WorldMapManager { LinkedList var11 = new LinkedList(); if (!this.loaded) { return var11; - } else { - WorldMapRectangle var12 = this.createWorldMapRectangle(var1, var2, var3, var4); - float var13 = this.getPixelsPerTile(var7, var3 - var1); - int var14 = (int)(64.0F * var13); - int var15 = this.tileX * 4096 + var1; - int var16 = this.tileY * 4096 + var2; + } + WorldMapRectangle var12 = this.createWorldMapRectangle(var1, var2, var3, var4); + float var13 = this.getPixelsPerTile(var7, var3 - var1); + int var14 = (int)(64.0F * var13); + int var15 = this.tileX * 4096 + var1; + int var16 = this.tileY * 4096 + var2; - for (int var17 = var12.x; var17 < var12.width + var12.x; ++var17) { - for (int var18 = var12.y; var18 < var12.y + var12.height; ++var18) { - List var19 = this.regions[var17][var18].method440(var5 + var14 * (this.regions[var17][var18].regionx * 64 - var15) / 64, var8 + var6 - var14 * (this.regions[var17][var18].regionY * 64 - var16 + 64) / 64, var14, var9, var10); - if (!var19.isEmpty()) { - var11.addAll(var19); - } + for (int var17 = var12.x; var17 < var12.width + var12.x; ++var17) { + for (int var18 = var12.y; var18 < var12.y + var12.height; ++var18) { + List var19 = this.regions[var17][var18].method440(var5 + var14 * (this.regions[var17][var18].regionx * 64 - var15) / 64, var8 + var6 - var14 * (this.regions[var17][var18].regionY * 64 - var16 + 64) / 64, var14, var9, var10); + if (!var19.isEmpty()) { + var11.addAll(var19); } } - - return var11; } + + return var11; } @ObfuscatedName("b") @@ -460,12 +459,12 @@ public final class WorldMapManager { float var3 = (float)var1 / (float)var2; if (var3 > 8.0F) { return 8.0F; - } else if (var3 < 1.0F) { - return 1.0F; - } else { - int var4 = Math.round(var3); - return Math.abs((float)var4 - var3) < 0.05F ? (float)var4 : var3; } + if (var3 < 1.0F) { + return 1.0F; + } + int var4 = Math.round(var3); + return Math.abs((float)var4 - var3) < 0.05F ? (float)var4 : var3; } @ObfuscatedName("w") @@ -477,11 +476,11 @@ public final class WorldMapManager { var2 &= 3; if (var2 == 0) { return var1; - } else if (var2 == 1) { - return 7 - var0; - } else { - return var2 == 2 ? 7 - var1 : var0; } + if (var2 == 1) { + return 7 - var0; + } + return var2 == 2 ? 7 - var1 : var0; } @ObfuscatedName("u") diff --git a/runescape-client/src/main/java/WorldMapRegion.java b/runescape-client/src/main/java/WorldMapRegion.java index d1c4fd3222..257eb96ced 100644 --- a/runescape-client/src/main/java/WorldMapRegion.java +++ b/runescape-client/src/main/java/WorldMapRegion.java @@ -287,30 +287,28 @@ public class WorldMapRegion { if (this.worldMapData_0.isFullyLoaded()) { this.getIconsForTiles(0, 0, 64, 64, this.worldMapData_0); return true; - } else { - return false; } - } else { - boolean var2 = true; - - Iterator var3; - WorldMapData_1 var4; - for (var3 = this.worldMapData1List.iterator(); var3.hasNext(); var2 &= var4.isFullyLoaded()) { - var4 = (WorldMapData_1)var3.next(); - var4.loadGeography(var1); - } - - if (var2) { - var3 = this.worldMapData1List.iterator(); - - while (var3.hasNext()) { - var4 = (WorldMapData_1)var3.next(); - this.getIconsForTiles(var4.getChunkX() * 8, var4.getChunkY() * 8, 8, 8, var4); - } - } - - return var2; + return false; } + boolean var2 = true; + + Iterator var3; + WorldMapData_1 var4; + for (var3 = this.worldMapData1List.iterator(); var3.hasNext(); var2 &= var4.isFullyLoaded()) { + var4 = (WorldMapData_1)var3.next(); + var4.loadGeography(var1); + } + + if (var2) { + var3 = this.worldMapData1List.iterator(); + + while (var3.hasNext()) { + var4 = (WorldMapData_1)var3.next(); + this.getIconsForTiles(var4.getChunkX() * 8, var4.getChunkY() * 8, 8, 8, var4); + } + } + + return var2; } @ObfuscatedName("v") @@ -978,32 +976,29 @@ public class WorldMapRegion { WorldMapLabelSize var2 = WorldMapLabelSize.method177(var1.textSize); if (var2 == null) { return null; - } else { - Font var3 = (Font)this.fonts.get(var2); - if (var3 == null) { - return null; - } else { - int var4 = var3.lineCount(var1.name, 1000000); - String[] var5 = new String[var4]; - var3.breakLines(var1.name, (int[])null, var5); - int var6 = var5.length * var3.ascent / 2; - int var7 = 0; - String[] var8 = var5; + } + Font var3 = (Font)this.fonts.get(var2); + if (var3 == null) { + return null; + } + int var4 = var3.lineCount(var1.name, 1000000); + String[] var5 = new String[var4]; + var3.breakLines(var1.name, (int[])null, var5); + int var6 = var5.length * var3.ascent / 2; + int var7 = 0; + String[] var8 = var5; - for (int var9 = 0; var9 < var8.length; ++var9) { - String var10 = var8[var9]; - int var11 = var3.stringWidth(var10); - if (var11 > var7) { - var7 = var11; - } - } - - return new WorldMapLabel(var1.name, var7, var6, var2); + for (int var9 = 0; var9 < var8.length; ++var9) { + String var10 = var8[var9]; + int var11 = var3.stringWidth(var10); + if (var11 > var7) { + var7 = var11; } } - } else { - return null; + + return new WorldMapLabel(var1.name, var7, var6, var2); } + return null; } @ObfuscatedName("ac") @@ -1034,13 +1029,11 @@ public class WorldMapRegion { } } - return var6; - } else { return var6; } - } else { return var6; } + return var6; } @ObfuscatedName("ap") diff --git a/runescape-client/src/main/java/WorldMapSection0.java b/runescape-client/src/main/java/WorldMapSection0.java index 5ba3bb48c1..f39e9a5a24 100644 --- a/runescape-client/src/main/java/WorldMapSection0.java +++ b/runescape-client/src/main/java/WorldMapSection0.java @@ -129,9 +129,8 @@ public class WorldMapSection0 implements WorldMapSection { public boolean containsCoord(int var1, int var2, int var3) { if (var1 >= this.oldZ && var1 < this.oldZ + this.newZ) { return var2 >= (this.oldX << 6) + (this.oldChunkXLow << 3) && var2 <= (this.oldX << 6) + (this.oldChunkXHigh << 3) + 7 && var3 >= (this.oldY << 6) + (this.oldChunkYLow << 3) && var3 <= (this.oldY << 6) + (this.oldChunkYHigh << 3) + 7; - } else { - return false; } + return false; } @ObfuscatedName("e") @@ -153,10 +152,9 @@ public class WorldMapSection0 implements WorldMapSection { public int[] getBorderTileLengths(int var1, int var2, int var3) { if (!this.containsCoord(var1, var2, var3)) { return null; - } else { - int[] var4 = new int[]{this.newX * 64 - this.oldX * 64 + var2 + (this.newChunkXLow * 8 - this.oldChunkXLow * 8), var3 + (this.newY * 64 - this.oldY * 64) + (this.newChunkYLow * 8 - this.oldChunkYLow * 8)}; - return var4; } + int[] var4 = new int[]{this.newX * 64 - this.oldX * 64 + var2 + (this.newChunkXLow * 8 - this.oldChunkXLow * 8), var3 + (this.newY * 64 - this.oldY * 64) + (this.newChunkYLow * 8 - this.oldChunkYLow * 8)}; + return var4; } @ObfuscatedName("k") @@ -168,11 +166,10 @@ public class WorldMapSection0 implements WorldMapSection { public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { return null; - } else { - int var3 = this.oldX * 64 - this.newX * 64 + (this.oldChunkXLow * 8 - this.newChunkXLow * 8) + var1; - int var4 = this.oldY * 64 - this.newY * 64 + var2 + (this.oldChunkYLow * 8 - this.newChunkYLow * 8); - return new Coord(this.oldZ, var3, var4); } + int var3 = this.oldX * 64 - this.newX * 64 + (this.oldChunkXLow * 8 - this.newChunkXLow * 8) + var1; + int var4 = this.oldY * 64 - this.newY * 64 + var2 + (this.oldChunkYLow * 8 - this.newChunkYLow * 8); + return new Coord(this.oldZ, var3, var4); } @ObfuscatedName("l") @@ -323,96 +320,95 @@ public class WorldMapSection0 implements WorldMapSection { Model var21 = var9.getModel(1); if (var21 == null) { return null; - } else { - Sprite var22 = null; - if (var9.noteTemplate != -1) { - var22 = getItemSprite(var9.note, 10, 1, 0, 0, true); - if (var22 == null) { - return null; - } - } else if (var9.notedId != -1) { - var22 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); - if (var22 == null) { - return null; - } - } else if (var9.placeholderTemplate != -1) { - var22 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); - if (var22 == null) { - return null; - } - } - - int[] var12 = Rasterizer2D.Rasterizer2D_pixels; - int var13 = Rasterizer2D.Rasterizer2D_width; - int var14 = Rasterizer2D.Rasterizer2D_height; - int[] var15 = new int[4]; - Rasterizer2D.Rasterizer2D_getClipArray(var15); - var8 = new Sprite(36, 32); - Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); - Rasterizer2D.Rasterizer2D_clear(); - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - Rasterizer3D.method2976(16, 16); - Rasterizer3D.field1768 = false; - if (var9.placeholderTemplate != -1) { - var22.drawAt2(0, 0); - } - - int var16 = var9.zoom2d; - if (var5) { - var16 = (int)((double)var16 * 1.5D); - } else if (var2 == 2) { - var16 = (int)(1.04D * (double)var16); - } - - int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; - int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; - var21.calculateBoundsCylinder(); - var21.method2866(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var21.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d); - if (var9.notedId != -1) { - var22.drawAt2(0, 0); - } - - if (var2 >= 1) { - var8.outline(1); - } - - if (var2 >= 2) { - var8.outline(16777215); - } - - if (var3 != 0) { - var8.shadow(var3); - } - - Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); - if (var9.noteTemplate != -1) { - var22.drawAt2(0, 0); - } - - if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { - Font var19 = HealthBar.ItemDefinition_fontPlain11; - String var20; - if (var1 < 100000) { - var20 = "" + var1 + ""; - } else if (var1 < 10000000) { - var20 = "" + var1 / 1000 + "K" + ""; - } else { - var20 = "" + var1 / 1000000 + "M" + ""; - } - - var19.draw(var20, 0, 9, 16776960, 1); - } - - if (!var5) { - ItemDefinition.ItemDefinition_cachedSprites.put(var8, var6); - } - - Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); - Rasterizer2D.Rasterizer2D_setClipArray(var15); - Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); - Rasterizer3D.field1768 = true; - return var8; } + Sprite var22 = null; + if (var9.noteTemplate != -1) { + var22 = getItemSprite(var9.note, 10, 1, 0, 0, true); + if (var22 == null) { + return null; + } + } else if (var9.notedId != -1) { + var22 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false); + if (var22 == null) { + return null; + } + } else if (var9.placeholderTemplate != -1) { + var22 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false); + if (var22 == null) { + return null; + } + } + + int[] var12 = Rasterizer2D.Rasterizer2D_pixels; + int var13 = Rasterizer2D.Rasterizer2D_width; + int var14 = Rasterizer2D.Rasterizer2D_height; + int[] var15 = new int[4]; + Rasterizer2D.Rasterizer2D_getClipArray(var15); + var8 = new Sprite(36, 32); + Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); + Rasterizer2D.Rasterizer2D_clear(); + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); + Rasterizer3D.method2976(16, 16); + Rasterizer3D.field1768 = false; + if (var9.placeholderTemplate != -1) { + var22.drawAt2(0, 0); + } + + int var16 = var9.zoom2d; + if (var5) { + var16 = (int)((double)var16 * 1.5D); + } else if (var2 == 2) { + var16 = (int)(1.04D * (double)var16); + } + + int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16; + int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16; + var21.calculateBoundsCylinder(); + var21.method2866(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var21.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d); + if (var9.notedId != -1) { + var22.drawAt2(0, 0); + } + + if (var2 >= 1) { + var8.outline(1); + } + + if (var2 >= 2) { + var8.outline(16777215); + } + + if (var3 != 0) { + var8.shadow(var3); + } + + Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32); + if (var9.noteTemplate != -1) { + var22.drawAt2(0, 0); + } + + if (var4 == 1 || var4 == 2 && var9.isStackable == 1) { + Font var19 = HealthBar.ItemDefinition_fontPlain11; + String var20; + if (var1 < 100000) { + var20 = "" + var1 + ""; + } else if (var1 < 10000000) { + var20 = "" + var1 / 1000 + "K" + ""; + } else { + var20 = "" + var1 / 1000000 + "M" + ""; + } + + var19.draw(var20, 0, 9, 16776960, 1); + } + + if (!var5) { + ItemDefinition.ItemDefinition_cachedSprites.put(var8, var6); + } + + Rasterizer2D.Rasterizer2D_replace(var12, var13, var14); + Rasterizer2D.Rasterizer2D_setClipArray(var15); + Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D(); + Rasterizer3D.field1768 = true; + return var8; } @ObfuscatedName("fr") diff --git a/runescape-client/src/main/java/WorldMapSection1.java b/runescape-client/src/main/java/WorldMapSection1.java index 00ac4690e9..454bf11e21 100644 --- a/runescape-client/src/main/java/WorldMapSection1.java +++ b/runescape-client/src/main/java/WorldMapSection1.java @@ -81,9 +81,8 @@ public class WorldMapSection1 implements WorldMapSection { public boolean containsCoord(int var1, int var2, int var3) { if (var1 >= this.minPlane && var1 < this.planes + this.minPlane) { return var2 >> 6 == this.regionStartX && var3 >> 6 == this.regionStartY; - } else { - return false; } + return false; } @ObfuscatedName("e") @@ -105,10 +104,9 @@ public class WorldMapSection1 implements WorldMapSection { public int[] getBorderTileLengths(int var1, int var2, int var3) { if (!this.containsCoord(var1, var2, var3)) { return null; - } else { - int[] var4 = new int[]{this.regionEndX * 64 - this.regionStartX * 64 + var2, var3 + (this.regionEndY * 64 - this.regionStartY * 64)}; - return var4; } + int[] var4 = new int[]{this.regionEndX * 64 - this.regionStartX * 64 + var2, var3 + (this.regionEndY * 64 - this.regionStartY * 64)}; + return var4; } @ObfuscatedName("k") @@ -120,11 +118,10 @@ public class WorldMapSection1 implements WorldMapSection { public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { return null; - } else { - int var3 = this.regionStartX * 64 - this.regionEndX * 64 + var1; - int var4 = this.regionStartY * 64 - this.regionEndY * 64 + var2; - return new Coord(this.minPlane, var3, var4); } + int var3 = this.regionStartX * 64 - this.regionEndX * 64 + var1; + int var4 = this.regionStartY * 64 - this.regionEndY * 64 + var2; + return new Coord(this.minPlane, var3, var4); } @ObfuscatedName("l") @@ -220,11 +217,9 @@ public class WorldMapSection1 implements WorldMapSection { if (!var4) { throw new NumberFormatException(); - } else { - return var5; } - } else { - throw new IllegalArgumentException("" + var1); + return var5; } + throw new IllegalArgumentException("" + var1); } } diff --git a/runescape-client/src/main/java/WorldMapSection2.java b/runescape-client/src/main/java/WorldMapSection2.java index 811c329e88..df21f1cb30 100644 --- a/runescape-client/src/main/java/WorldMapSection2.java +++ b/runescape-client/src/main/java/WorldMapSection2.java @@ -101,9 +101,8 @@ public class WorldMapSection2 implements WorldMapSection { public boolean containsCoord(int var1, int var2, int var3) { if (var1 >= this.minPlane && var1 < this.planes + this.minPlane) { return var2 >> 6 >= this.regionStartX && var2 >> 6 <= this.regionEndX && var3 >> 6 >= this.regionStartY && var3 >> 6 <= this.regionEndY; - } else { - return false; } + return false; } @ObfuscatedName("e") @@ -125,10 +124,9 @@ public class WorldMapSection2 implements WorldMapSection { public int[] getBorderTileLengths(int var1, int var2, int var3) { if (!this.containsCoord(var1, var2, var3)) { return null; - } else { - int[] var4 = new int[]{this.field202 * 64 - this.regionStartX * 64 + var2, var3 + (this.field203 * 64 - this.regionStartY * 64)}; - return var4; } + int[] var4 = new int[]{this.field202 * 64 - this.regionStartX * 64 + var2, var3 + (this.field203 * 64 - this.regionStartY * 64)}; + return var4; } @ObfuscatedName("k") @@ -140,11 +138,10 @@ public class WorldMapSection2 implements WorldMapSection { public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { return null; - } else { - int var3 = this.regionStartX * 64 - this.field202 * 64 + var1; - int var4 = this.regionStartY * 64 - this.field203 * 64 + var2; - return new Coord(this.minPlane, var3, var4); } + int var3 = this.regionStartX * 64 - this.field202 * 64 + var1; + int var4 = this.regionStartY * 64 - this.field203 * 64 + var2; + return new Coord(this.minPlane, var3, var4); } @ObfuscatedName("l") diff --git a/runescape-client/src/main/java/WorldMapSectionType.java b/runescape-client/src/main/java/WorldMapSectionType.java index 6db57725d9..74a8ce3ef4 100644 --- a/runescape-client/src/main/java/WorldMapSectionType.java +++ b/runescape-client/src/main/java/WorldMapSectionType.java @@ -121,13 +121,16 @@ public enum WorldMapSectionType implements Enumerated { } return 1; - } else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { + } + if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.camAngleX; return 1; - } else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { + } + if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.camAngleY; return 1; - } else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { + } + if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) { var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; if (var3 < 0) { var3 = 0; @@ -135,12 +138,12 @@ public enum WorldMapSectionType implements Enumerated { Client.camFollowHeight = var3; return 1; - } else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { + } + if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.camFollowHeight; return 1; - } else { - return 2; } + return 2; } @ObfuscatedName("aq") @@ -162,7 +165,8 @@ public enum WorldMapSectionType implements Enumerated { } return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { + } + if (var0 == ScriptOpcodes.VIEWPORT_SETZOOM) { HealthBarUpdate.Interpreter_intStackSize -= 2; Client.field906 = (short)Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; if (Client.field906 <= 0) { @@ -175,7 +179,8 @@ public enum WorldMapSectionType implements Enumerated { } return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { + } + if (var0 == ScriptOpcodes.VIEWPORT_CLAMPFOV) { HealthBarUpdate.Interpreter_intStackSize -= 4; Client.field820 = (short)Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; if (Client.field820 <= 0) { @@ -202,7 +207,8 @@ public enum WorldMapSectionType implements Enumerated { } return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { + } + if (var0 == ScriptOpcodes.VIEWPORT_GETEFFECTIVESIZE) { if (Client.viewportWidget != null) { UrlRequest.setViewportShape(0, 0, Client.viewportWidget.width, Client.viewportWidget.height, false); Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.viewportWidth; @@ -213,16 +219,17 @@ public enum WorldMapSectionType implements Enumerated { } return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { + } + if (var0 == ScriptOpcodes.VIEWPORT_GETZOOM) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.field906; Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.field908; return 1; - } else if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { + } + if (var0 == ScriptOpcodes.VIEWPORT_GETFOV) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = NetFileRequest.method4140(Client.field782); Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = NetFileRequest.method4140(Client.field651); return 1; - } else { - return 2; } + return 2; } } diff --git a/runescape-client/src/main/java/class14.java b/runescape-client/src/main/java/class14.java index b1a42b193d..a25a3a49af 100644 --- a/runescape-client/src/main/java/class14.java +++ b/runescape-client/src/main/java/class14.java @@ -38,10 +38,9 @@ public class class14 { static final void method153(Widget var0, int var1, int var2, int var3) { if (var0.field2641 == null) { throw new RuntimeException(); - } else { - var0.field2641[var1] = var2; - var0.field2588[var1] = var3; } + var0.field2641[var1] = var2; + var0.field2588[var1] = var3; } @ObfuscatedName("s") diff --git a/runescape-client/src/main/java/class16.java b/runescape-client/src/main/java/class16.java index 151d20b9b4..ddccf5eb22 100644 --- a/runescape-client/src/main/java/class16.java +++ b/runescape-client/src/main/java/class16.java @@ -1,3 +1,4 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -8,12 +9,13 @@ public class class16 { signature = "(I)V", garbageValue = "572816821" ) - public static void method174() { + @Export("SpriteBuffer_clear") + public static void SpriteBuffer_clear() { Varps.SpriteBuffer_xOffsets = null; - class326.SpriteBuffer_yOffsets = null; - class326.SpriteBuffer_spriteWidths = null; + SpriteBuffer.SpriteBuffer_yOffsets = null; + SpriteBuffer.SpriteBuffer_spriteWidths = null; class216.SpriteBuffer_spriteHeights = null; Frames.SpriteBuffer_spritePalette = null; - class326.SpriteBuffer_pixels = null; + SpriteBuffer.SpriteBuffer_pixels = null; } } diff --git a/runescape-client/src/main/java/class162.java b/runescape-client/src/main/java/class162.java index 18b9b6957c..43edc182ec 100644 --- a/runescape-client/src/main/java/class162.java +++ b/runescape-client/src/main/java/class162.java @@ -13,36 +13,35 @@ public class class162 implements class161 { public static boolean loadInterface(int var0) { if (ViewportMouse.loadedInterfaces[var0]) { return true; - } else if (!Widget.Widget_archive.tryLoadGroup(var0)) { + } + if (!Widget.Widget_archive.tryLoadGroup(var0)) { return false; - } else { - int var1 = Widget.Widget_archive.getGroupFileCount(var0); - if (var1 == 0) { - ViewportMouse.loadedInterfaces[var0] = true; - return true; - } else { - if (Widget.Widget_interfaceComponents[var0] == null) { - Widget.Widget_interfaceComponents[var0] = new Widget[var1]; - } + } + int var1 = Widget.Widget_archive.getGroupFileCount(var0); + if (var1 == 0) { + ViewportMouse.loadedInterfaces[var0] = true; + return true; + } + if (Widget.Widget_interfaceComponents[var0] == null) { + Widget.Widget_interfaceComponents[var0] = new Widget[var1]; + } - for (int var2 = 0; var2 < var1; ++var2) { - if (Widget.Widget_interfaceComponents[var0][var2] == null) { - byte[] var3 = Widget.Widget_archive.takeFile(var0, var2); - if (var3 != null) { - Widget.Widget_interfaceComponents[var0][var2] = new Widget(); - Widget.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); - if (var3[0] == -1) { - Widget.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3)); - } else { - Widget.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); - } - } + for (int var2 = 0; var2 < var1; ++var2) { + if (Widget.Widget_interfaceComponents[var0][var2] == null) { + byte[] var3 = Widget.Widget_archive.takeFile(var0, var2); + if (var3 != null) { + Widget.Widget_interfaceComponents[var0][var2] = new Widget(); + Widget.Widget_interfaceComponents[var0][var2].id = var2 + (var0 << 16); + if (var3[0] == -1) { + Widget.Widget_interfaceComponents[var0][var2].decode(new Buffer(var3)); + } else { + Widget.Widget_interfaceComponents[var0][var2].decodeLegacy(new Buffer(var3)); } } - - ViewportMouse.loadedInterfaces[var0] = true; - return true; } } + + ViewportMouse.loadedInterfaces[var0] = true; + return true; } } diff --git a/runescape-client/src/main/java/class169.java b/runescape-client/src/main/java/class169.java index aab8837352..db817f9f1b 100644 --- a/runescape-client/src/main/java/class169.java +++ b/runescape-client/src/main/java/class169.java @@ -59,7 +59,8 @@ public class class169 { if (var0 == ScriptOpcodes.CC_GETINVOBJECT) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.itemId; return 1; - } else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { + } + if (var0 == ScriptOpcodes.CC_GETINVCOUNT) { if (var3.itemId != -1) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.itemQuantity; } else { @@ -67,11 +68,11 @@ public class class169 { } return 1; - } else if (var0 == ScriptOpcodes.CC_GETID) { + } + if (var0 == ScriptOpcodes.CC_GETID) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.childIndex; return 1; - } else { - return 2; } + return 2; } } diff --git a/runescape-client/src/main/java/class185.java b/runescape-client/src/main/java/class185.java index ba8d58b211..ec4975c67a 100644 --- a/runescape-client/src/main/java/class185.java +++ b/runescape-client/src/main/java/class185.java @@ -94,35 +94,35 @@ public class class185 { static void SpriteBuffer_decode(byte[] var0) { Buffer var1 = new Buffer(var0); var1.offset = var0.length - 2; - class326.SpriteBuffer_spriteCount = var1.readUnsignedShort(); - Varps.SpriteBuffer_xOffsets = new int[class326.SpriteBuffer_spriteCount]; - class326.SpriteBuffer_yOffsets = new int[class326.SpriteBuffer_spriteCount]; - class326.SpriteBuffer_spriteWidths = new int[class326.SpriteBuffer_spriteCount]; - class216.SpriteBuffer_spriteHeights = new int[class326.SpriteBuffer_spriteCount]; - class326.SpriteBuffer_pixels = new byte[class326.SpriteBuffer_spriteCount][]; - var1.offset = var0.length - 7 - class326.SpriteBuffer_spriteCount * 8; - class326.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); - class326.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); + SpriteBuffer.SpriteBuffer_spriteCount = var1.readUnsignedShort(); + Varps.SpriteBuffer_xOffsets = new int[SpriteBuffer.SpriteBuffer_spriteCount]; + SpriteBuffer.SpriteBuffer_yOffsets = new int[SpriteBuffer.SpriteBuffer_spriteCount]; + SpriteBuffer.SpriteBuffer_spriteWidths = new int[SpriteBuffer.SpriteBuffer_spriteCount]; + class216.SpriteBuffer_spriteHeights = new int[SpriteBuffer.SpriteBuffer_spriteCount]; + SpriteBuffer.SpriteBuffer_pixels = new byte[SpriteBuffer.SpriteBuffer_spriteCount][]; + var1.offset = var0.length - 7 - SpriteBuffer.SpriteBuffer_spriteCount * 8; + SpriteBuffer.SpriteBuffer_spriteWidth = var1.readUnsignedShort(); + SpriteBuffer.SpriteBuffer_spriteHeight = var1.readUnsignedShort(); int var2 = (var1.readUnsignedByte() & 255) + 1; int var3; - for (var3 = 0; var3 < class326.SpriteBuffer_spriteCount; ++var3) { + for (var3 = 0; var3 < SpriteBuffer.SpriteBuffer_spriteCount; ++var3) { Varps.SpriteBuffer_xOffsets[var3] = var1.readUnsignedShort(); } - for (var3 = 0; var3 < class326.SpriteBuffer_spriteCount; ++var3) { - class326.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); + for (var3 = 0; var3 < SpriteBuffer.SpriteBuffer_spriteCount; ++var3) { + SpriteBuffer.SpriteBuffer_yOffsets[var3] = var1.readUnsignedShort(); } - for (var3 = 0; var3 < class326.SpriteBuffer_spriteCount; ++var3) { - class326.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); + for (var3 = 0; var3 < SpriteBuffer.SpriteBuffer_spriteCount; ++var3) { + SpriteBuffer.SpriteBuffer_spriteWidths[var3] = var1.readUnsignedShort(); } - for (var3 = 0; var3 < class326.SpriteBuffer_spriteCount; ++var3) { + for (var3 = 0; var3 < SpriteBuffer.SpriteBuffer_spriteCount; ++var3) { class216.SpriteBuffer_spriteHeights[var3] = var1.readUnsignedShort(); } - var1.offset = var0.length - 7 - class326.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; + var1.offset = var0.length - 7 - SpriteBuffer.SpriteBuffer_spriteCount * 8 - (var2 - 1) * 3; Frames.SpriteBuffer_spritePalette = new int[var2]; for (var3 = 1; var3 < var2; ++var3) { @@ -134,12 +134,12 @@ public class class185 { var1.offset = 0; - for (var3 = 0; var3 < class326.SpriteBuffer_spriteCount; ++var3) { - int var4 = class326.SpriteBuffer_spriteWidths[var3]; + for (var3 = 0; var3 < SpriteBuffer.SpriteBuffer_spriteCount; ++var3) { + int var4 = SpriteBuffer.SpriteBuffer_spriteWidths[var3]; int var5 = class216.SpriteBuffer_spriteHeights[var3]; int var6 = var5 * var4; byte[] var7 = new byte[var6]; - class326.SpriteBuffer_pixels[var3] = var7; + SpriteBuffer.SpriteBuffer_pixels[var3] = var7; int var8 = var1.readUnsignedByte(); int var9; if (var8 == 0) { diff --git a/runescape-client/src/main/java/class188.java b/runescape-client/src/main/java/class188.java index bbf01ec189..c40dac13d6 100644 --- a/runescape-client/src/main/java/class188.java +++ b/runescape-client/src/main/java/class188.java @@ -33,7 +33,7 @@ public class class188 { var3 = Client.archive8; var4 = var3.getGroupId("sl_back"); var5 = var3.getFileId(var4, ""); - Sprite[] var2 = TilePaint.method3062(var3, var4, var5); + Sprite[] var2 = TilePaint.SpriteBuffer_getSpriteArray(var3, var4, var5); WorldMapID.worldSelectBackSprites = var2; } @@ -42,7 +42,7 @@ public class class188 { var3 = Client.archive8; var4 = var3.getGroupId("sl_flags"); var5 = var3.getFileId(var4, ""); - var25 = class289.method5281(var3, var4, var5); + var25 = class289.SpriteBuffer_getIndexedSpriteArray(var3, var4, var5); SecureRandomCallable.worldSelectFlagSprites = var25; } @@ -50,7 +50,7 @@ public class class188 { var3 = Client.archive8; var4 = var3.getGroupId("sl_arrows"); var5 = var3.getFileId(var4, ""); - var25 = class289.method5281(var3, var4, var5); + var25 = class289.SpriteBuffer_getIndexedSpriteArray(var3, var4, var5); class225.worldSelectArrows = var25; } @@ -58,16 +58,16 @@ public class class188 { var3 = Client.archive8; var4 = var3.getGroupId("sl_stars"); var5 = var3.getFileId(var4, ""); - var25 = class289.method5281(var3, var4, var5); + var25 = class289.SpriteBuffer_getIndexedSpriteArray(var3, var4, var5); FriendSystem.worldSelectStars = var25; } if (Login.worldSelectLeftSprite == null) { - Login.worldSelectLeftSprite = class215.loadIndexedSpriteByName(Client.archive8, "leftarrow", ""); + Login.worldSelectLeftSprite = class215.SpriteBuffer_getIndexedSpriteByName(Client.archive8, "leftarrow", ""); } if (NPCDefinition.worldSelectRightSprite == null) { - NPCDefinition.worldSelectRightSprite = class215.loadIndexedSpriteByName(Client.archive8, "rightarrow", ""); + NPCDefinition.worldSelectRightSprite = class215.SpriteBuffer_getIndexedSpriteByName(Client.archive8, "rightarrow", ""); } Rasterizer2D.Rasterizer2D_fillRectangle(Login.xPadding, 23, 765, 480, 0); @@ -300,8 +300,7 @@ public class class188 { if (var1.length() > 9) { return " " + ClientPreferences.colorStartTag(65408) + var1.substring(0, var1.length() - 8) + "M" + " " + " (" + var1 + ")" + ""; - } else { - return var1.length() > 6 ? " " + ClientPreferences.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + ClientPreferences.colorStartTag(16776960) + var1 + ""; } + return var1.length() > 6 ? " " + ClientPreferences.colorStartTag(16777215) + var1.substring(0, var1.length() - 4) + "K" + " " + " (" + var1 + ")" + "" : " " + ClientPreferences.colorStartTag(16776960) + var1 + ""; } } diff --git a/runescape-client/src/main/java/class189.java b/runescape-client/src/main/java/class189.java index 2b7db3cb75..6c0a3013f8 100644 --- a/runescape-client/src/main/java/class189.java +++ b/runescape-client/src/main/java/class189.java @@ -349,7 +349,7 @@ public class class189 { var1.drawCentered("Click to switch", var27 / 2 + var23, var19 / 2 + var24 + 12, 16777215, 0); } } else { - class30.field264 = class215.loadIndexedSpriteByName(Client.archive8, "sl_button", ""); + class30.field264 = class215.SpriteBuffer_getIndexedSpriteByName(Client.archive8, "sl_button", ""); } } diff --git a/runescape-client/src/main/java/class190.java b/runescape-client/src/main/java/class190.java index 96d8b58d41..b123470694 100644 --- a/runescape-client/src/main/java/class190.java +++ b/runescape-client/src/main/java/class190.java @@ -125,6 +125,7 @@ public class class190 implements Enumerated { signature = "(I)I", garbageValue = "320353268" ) + @Export("rsOrdinal") public int rsOrdinal() { return this.field2354; } @@ -168,10 +169,9 @@ public class class190 implements Enumerated { ++Client.archiveLoaderArchive; } - return true; - } else { return true; } + return true; } @ObfuscatedName("ko") diff --git a/runescape-client/src/main/java/class192.java b/runescape-client/src/main/java/class192.java index 4b6874cb19..4f9987e1b7 100644 --- a/runescape-client/src/main/java/class192.java +++ b/runescape-client/src/main/java/class192.java @@ -115,6 +115,7 @@ public enum class192 implements Enumerated { signature = "(I)I", garbageValue = "320353268" ) + @Export("rsOrdinal") public int rsOrdinal() { return this.field2379; } @@ -269,9 +270,8 @@ public enum class192 implements Enumerated { Message var1 = (Message)Messages.Messages_hashTable.get((long)var0); if (var1 == null) { return -1; - } else { - return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; } + return var1.nextDual == Messages.Messages_queue.sentinel ? -1 : ((Message)var1.nextDual).count; } @ObfuscatedName("ke") diff --git a/runescape-client/src/main/java/class195.java b/runescape-client/src/main/java/class195.java index 766931d90c..ffebe8f8c8 100644 --- a/runescape-client/src/main/java/class195.java +++ b/runescape-client/src/main/java/class195.java @@ -46,9 +46,8 @@ public class class195 { } return var2; - } else { - return Integer.toString(var0); } + return Integer.toString(var0); } @ObfuscatedName("i") diff --git a/runescape-client/src/main/java/class197.java b/runescape-client/src/main/java/class197.java index 305506f194..ca1a7bff29 100644 --- a/runescape-client/src/main/java/class197.java +++ b/runescape-client/src/main/java/class197.java @@ -66,11 +66,11 @@ public class class197 { var2 &= 3; if (var2 == 0) { return var0; - } else if (var2 == 1) { - return var1; - } else { - return var2 == 2 ? 7 - var0 : 7 - var1; } + if (var2 == 1) { + return var1; + } + return var2 == 2 ? 7 - var0 : 7 - var1; } @ObfuscatedName("k") @@ -92,195 +92,205 @@ public class class197 { if (var0 == ScriptOpcodes.WORLDLIST_FETCH) { Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = UserComparator3.loadWorlds() ? 1 : 0; return 1; - } else { - World var3; - if (var0 == ScriptOpcodes.WORLDLIST_START) { - var3 = DynamicObject.worldListStart(); - if (var3 != null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.id; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.properties; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.activity; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.location; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.population; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.host; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { - var3 = Canvas.getNextWorldListWorld(); - if (var3 != null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.id; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.properties; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.activity; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.location; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.population; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.host; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - } - - return 1; + } + World var3; + if (var0 == ScriptOpcodes.WORLDLIST_START) { + var3 = DynamicObject.worldListStart(); + if (var3 != null) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.id; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.properties; + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.activity; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.location; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.population; + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.host; } else { - World var4; - int var5; - int var7; - if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var4 = null; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; + } - for (var5 = 0; var5 < World.worldsCount; ++var5) { - if (var7 == World.worlds[var5].id) { - var4 = World.worlds[var5]; - break; - } - } + return 1; + } + if (var0 == ScriptOpcodes.WORLDLIST_NEXT) { + var3 = Canvas.getNextWorldListWorld(); + if (var3 != null) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.id; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.properties; + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.activity; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.location; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.population; + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.host; + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; + } - if (var4 != null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var4.id; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var4.properties; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var4.activity; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var4.location; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var4.population; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var4.host; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - } + return 1; + } + World var4; + int var5; + int var7; + if (var0 == ScriptOpcodes.WORLDLIST_SPECIFIC) { + var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + var4 = null; - return 1; - } else if (var0 == ScriptOpcodes.WORLDLIST_SORT) { - HealthBarUpdate.Interpreter_intStackSize -= 4; - var7 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - boolean var10 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1] == 1; - var5 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2]; - boolean var6 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 3] == 1; - WorldMapLabelSize.sortWorldList(var7, var10, var5, var6); - return 1; - } else if (var0 != ScriptOpcodes.GETWORLDINFO) { - if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { - Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - return 1; - } else { - int var8; - ParamDefinition var9; - if (var0 == ScriptOpcodes.NC_PARAM) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - var9 = WorldMapIcon_0.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = GameShell.getNpcDefinition(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = GameShell.getNpcDefinition(var7).getIntParam(var8, var9.defaultInt); - } - - return 1; - } else if (var0 == ScriptOpcodes.LC_PARAM) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - var9 = WorldMapIcon_0.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ViewportMouse.getObjectDefinition(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = ViewportMouse.getObjectDefinition(var7).getIntParam(var8, var9.defaultInt); - } - - return 1; - } else if (var0 == ScriptOpcodes.OC_PARAM) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - var9 = WorldMapIcon_0.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = WorldMapArea.getItemDefinition(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapArea.getItemDefinition(var7).getIntParam(var8, var9.defaultInt); - } - - return 1; - } else if (var0 == ScriptOpcodes.STRUCT_PARAM) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var7 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var8 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - var9 = WorldMapIcon_0.getParamDefinition(var8); - if (var9.isString()) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ParamDefinition.StructDefinition_getStructDefinition(var7).getStringParam(var8, var9.defaultStr); - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = ParamDefinition.StructDefinition_getStructDefinition(var7).getIntParam(var8, var9.defaultInt); - } - - return 1; - } else if (var0 == ScriptOpcodes.ON_MOBILE) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLIENTTYPE) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.clientType & 3; - return 1; - } else if (var0 == 6520) { - return 1; - } else if (var0 == ScriptOpcodes.MOBILE_KEYBOARDHIDE) { - return 1; - } else if (var0 == 6522) { - --Skills.Interpreter_stringStackSize; - --HealthBarUpdate.Interpreter_intStackSize; - return 1; - } else if (var0 == 6523) { - --Skills.Interpreter_stringStackSize; - --HealthBarUpdate.Interpreter_intStackSize; - return 1; - } else if (var0 == ScriptOpcodes.BATTERYLEVEL) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - return 1; - } else if (var0 == ScriptOpcodes.BATTERYCHARGING) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 1; - return 1; - } else if (var0 == ScriptOpcodes.WIFIAVAILABLE) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 1; - return 1; - } else { - return 2; - } - } - } else { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - if (var7 >= 0 && var7 < World.worldsCount) { - var4 = World.worlds[var7]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var4.id; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var4.properties; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var4.activity; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var4.location; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var4.population; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var4.host; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - } - - return 1; + for (var5 = 0; var5 < World.worldsCount; ++var5) { + if (var7 == World.worlds[var5].id) { + var4 = World.worlds[var5]; + break; } } + + if (var4 != null) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var4.id; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var4.properties; + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var4.activity; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var4.location; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var4.population; + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var4.host; + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; + } + + return 1; } + if (var0 == ScriptOpcodes.WORLDLIST_SORT) { + HealthBarUpdate.Interpreter_intStackSize -= 4; + var7 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; + boolean var10 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1] == 1; + var5 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2]; + boolean var6 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 3] == 1; + WorldMapLabelSize.sortWorldList(var7, var10, var5, var6); + return 1; + } + if (var0 == ScriptOpcodes.GETWORLDINFO) { + var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + if (var7 >= 0 && var7 < World.worldsCount) { + var4 = World.worlds[var7]; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var4.id; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var4.properties; + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var4.activity; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var4.location; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var4.population; + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var4.host; + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } + if (var0 == ScriptOpcodes.SETFOLLOWEROPSLOWPRIORITY) { + Client.followerOpsLowPriority = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + return 1; + } + int var8; + ParamDefinition var9; + if (var0 == ScriptOpcodes.NC_PARAM) { + HealthBarUpdate.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; + var9 = WorldMapIcon_0.getParamDefinition(var8); + if (var9.isString()) { + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = GameShell.getNpcDefinition(var7).getStringParam(var8, var9.defaultStr); + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = GameShell.getNpcDefinition(var7).getIntParam(var8, var9.defaultInt); + } + + return 1; + } + if (var0 == ScriptOpcodes.LC_PARAM) { + HealthBarUpdate.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; + var9 = WorldMapIcon_0.getParamDefinition(var8); + if (var9.isString()) { + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ViewportMouse.getObjectDefinition(var7).getStringParam(var8, var9.defaultStr); + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = ViewportMouse.getObjectDefinition(var7).getIntParam(var8, var9.defaultInt); + } + + return 1; + } + if (var0 == ScriptOpcodes.OC_PARAM) { + HealthBarUpdate.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; + var9 = WorldMapIcon_0.getParamDefinition(var8); + if (var9.isString()) { + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = WorldMapArea.getItemDefinition(var7).getStringParam(var8, var9.defaultStr); + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapArea.getItemDefinition(var7).getIntParam(var8, var9.defaultInt); + } + + return 1; + } + if (var0 == ScriptOpcodes.STRUCT_PARAM) { + HealthBarUpdate.Interpreter_intStackSize -= 2; + var7 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; + var8 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; + var9 = WorldMapIcon_0.getParamDefinition(var8); + if (var9.isString()) { + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ParamDefinition.StructDefinition_getStructDefinition(var7).getStringParam(var8, var9.defaultStr); + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = ParamDefinition.StructDefinition_getStructDefinition(var7).getIntParam(var8, var9.defaultInt); + } + + return 1; + } + if (var0 == ScriptOpcodes.ON_MOBILE) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.onMobile ? 1 : 0; + return 1; + } + if (var0 == ScriptOpcodes.CLIENTTYPE) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.clientType & 3; + return 1; + } + if (var0 == 6520) { + return 1; + } + if (var0 == ScriptOpcodes.MOBILE_KEYBOARDHIDE) { + return 1; + } + if (var0 == 6522) { + --Skills.Interpreter_stringStackSize; + --HealthBarUpdate.Interpreter_intStackSize; + return 1; + } + if (var0 == 6523) { + --Skills.Interpreter_stringStackSize; + --HealthBarUpdate.Interpreter_intStackSize; + return 1; + } + if (var0 == ScriptOpcodes.BATTERYLEVEL) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; + return 1; + } + if (var0 == ScriptOpcodes.BATTERYCHARGING) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 1; + return 1; + } + if (var0 == ScriptOpcodes.WIFIAVAILABLE) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 1; + return 1; + } + return 2; } @ObfuscatedName("jw") diff --git a/runescape-client/src/main/java/class2.java b/runescape-client/src/main/java/class2.java index c21391cf9a..a35a1a567a 100644 --- a/runescape-client/src/main/java/class2.java +++ b/runescape-client/src/main/java/class2.java @@ -53,9 +53,8 @@ final class class2 implements class0 { ItemContainer var2 = (ItemContainer)ItemContainer.itemContainers.get((long)var0); if (var2 == null) { return 0; - } else { - return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; } + return var1 >= 0 && var1 < var2.quantities.length ? var2.quantities[var1] : 0; } @ObfuscatedName("an") diff --git a/runescape-client/src/main/java/class208.java b/runescape-client/src/main/java/class208.java index 11ac56cb0c..c7a9905950 100644 --- a/runescape-client/src/main/java/class208.java +++ b/runescape-client/src/main/java/class208.java @@ -18,169 +18,182 @@ public class class208 { var4 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3 + var4; return 1; - } else { - String var9; - if (var0 == ScriptOpcodes.APPEND) { - Skills.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize + 1]; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3 + var9; - return 1; - } else if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { - var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3 + class195.intToString(var4, true); - return 1; - } else if (var0 == ScriptOpcodes.LOWERCASE) { - var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.toLowerCase(); - return 1; + } + String var9; + if (var0 == ScriptOpcodes.APPEND) { + Skills.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize + 1]; + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3 + var9; + return 1; + } + if (var0 == ScriptOpcodes.APPEND_SIGNNUM) { + var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3 + class195.intToString(var4, true); + return 1; + } + if (var0 == ScriptOpcodes.LOWERCASE) { + var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.toLowerCase(); + return 1; + } + int var6; + int var10; + if (var0 == ScriptOpcodes.FROMDATE) { + var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + long var11 = (11745L + (long)var10) * 86400000L; + Interpreter.Interpreter_calendar.setTime(new Date(var11)); + var6 = Interpreter.Interpreter_calendar.get(5); + int var16 = Interpreter.Interpreter_calendar.get(2); + int var8 = Interpreter.Interpreter_calendar.get(1); + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var16] + "-" + var8; + return 1; + } + if (var0 == ScriptOpcodes.TEXT_GENDER) { + Skills.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize + 1]; + if (Client.localPlayer.appearance != null && Client.localPlayer.appearance.isFemale) { + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var9; } else { - int var6; - int var10; - if (var0 == ScriptOpcodes.FROMDATE) { - var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - long var11 = (11745L + (long)var10) * 86400000L; - Interpreter.Interpreter_calendar.setTime(new Date(var11)); - var6 = Interpreter.Interpreter_calendar.get(5); - int var16 = Interpreter.Interpreter_calendar.get(2); - int var8 = Interpreter.Interpreter_calendar.get(1); - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var6 + "-" + Interpreter.Interpreter_MONTHS[var16] + "-" + var8; - return 1; - } else if (var0 != ScriptOpcodes.TEXT_GENDER) { - if (var0 == ScriptOpcodes.TOSTRING) { - var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = Integer.toString(var10); - return 1; - } else if (var0 == ScriptOpcodes.COMPARE) { - Skills.Interpreter_stringStackSize -= 2; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WallDecoration.method3292(MenuAction.method1993(Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize + 1], ScriptFrame.field528)); - return 1; - } else { - int var5; - byte[] var13; - Font var14; - if (var0 == ScriptOpcodes.PARAHEIGHT) { - var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - HealthBarUpdate.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - var13 = class2.archive13.takeFile(var5, 0); - var14 = new Font(var13); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var14.lineCount(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.PARAWIDTH) { - var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - HealthBarUpdate.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - var13 = class2.archive13.takeFile(var5, 0); - var14 = new Font(var13); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var14.lineWidth(var3, var4); - return 1; - } else if (var0 == ScriptOpcodes.TEXT_SWITCH) { - Skills.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize + 1]; - if (Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3; - } else { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var9; - } + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3; + } - return 1; - } else if (var0 == ScriptOpcodes.ESCAPE) { - var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); - return 1; - } else if (var0 == ScriptOpcodes.APPEND_CHAR) { - var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3 + (char)var4; - return 1; - } else if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { - var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Ignored.isCharPrintable((char)var10) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { - var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = GrandExchangeOfferOwnWorldComparator.isAlphaNumeric((char)var10) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CHAR_ISALPHA) { - var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = class185.isCharAlphabetic((char)var10) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { - var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = class49.isCharDigit((char)var10) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.STRING_LENGTH) { - var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - if (var3 != null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.length(); - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - } + return 1; + } + if (var0 == ScriptOpcodes.TOSTRING) { + var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = Integer.toString(var10); + return 1; + } + if (var0 == ScriptOpcodes.COMPARE) { + Skills.Interpreter_stringStackSize -= 2; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WallDecoration.method3292(MenuAction.method1993(Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize], Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize + 1], ScriptFrame.field528)); + return 1; + } + int var5; + byte[] var13; + Font var14; + if (var0 == ScriptOpcodes.PARAHEIGHT) { + var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; + HealthBarUpdate.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; + var13 = class2.archive13.takeFile(var5, 0); + var14 = new Font(var13); + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var14.lineCount(var3, var4); + return 1; + } + if (var0 == ScriptOpcodes.PARAWIDTH) { + var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; + HealthBarUpdate.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; + var13 = class2.archive13.takeFile(var5, 0); + var14 = new Font(var13); + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var14.lineWidth(var3, var4); + return 1; + } + if (var0 == ScriptOpcodes.TEXT_SWITCH) { + Skills.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize + 1]; + if (Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1) { + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3; + } else { + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var9; + } - return 1; - } else if (var0 == ScriptOpcodes.SUBSTRING) { - var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - HealthBarUpdate.Interpreter_intStackSize -= 2; - var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var5 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.substring(var4, var5); - return 1; - } else if (var0 == ScriptOpcodes.REMOVETAGS) { - var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - StringBuilder var17 = new StringBuilder(var3.length()); - boolean var15 = false; + return 1; + } + if (var0 == ScriptOpcodes.ESCAPE) { + var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = AbstractFont.escapeBrackets(var3); + return 1; + } + if (var0 == ScriptOpcodes.APPEND_CHAR) { + var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3 + (char) var4; + return 1; + } + if (var0 == ScriptOpcodes.CHAR_ISPRINTABLE) { + var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Ignored.isCharPrintable((char) var10) ? 1 : 0; + return 1; + } + if (var0 == ScriptOpcodes.CHAR_ISALPHANUMERIC) { + var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = GrandExchangeOfferOwnWorldComparator.isAlphaNumeric((char) var10) ? 1 : 0; + return 1; + } + if (var0 == ScriptOpcodes.CHAR_ISALPHA) { + var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = class185.isCharAlphabetic((char) var10) ? 1 : 0; + return 1; + } + if (var0 == ScriptOpcodes.CHAR_ISNUMERIC) { + var10 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = class49.isCharDigit((char) var10) ? 1 : 0; + return 1; + } + if (var0 == ScriptOpcodes.STRING_LENGTH) { + var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; + if (var3 != null) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.length(); + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + } - for (var6 = 0; var6 < var3.length(); ++var6) { - char var7 = var3.charAt(var6); - if (var7 == '<') { - var15 = true; - } else if (var7 == '>') { - var15 = false; - } else if (!var15) { - var17.append(var7); - } - } + return 1; + } + if (var0 == ScriptOpcodes.SUBSTRING) { + var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; + HealthBarUpdate.Interpreter_intStackSize -= 2; + var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; + var5 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.substring(var4, var5); + return 1; + } + if (var0 == ScriptOpcodes.REMOVETAGS) { + var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; + StringBuilder var17 = new StringBuilder(var3.length()); + boolean var15 = false; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var17.toString(); - return 1; - } else if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { - var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - var4 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.indexOf(var4); - return 1; - } else if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { - Skills.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize + 1]; - var5 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.indexOf(var9, var5); - return 1; - } else if (var0 == ScriptOpcodes.UPPERCASE) { - var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.toUpperCase(); - return 1; - } else { - return 2; - } - } - } else { - Skills.Interpreter_stringStackSize -= 2; - var3 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize]; - var9 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize + 1]; - if (Client.localPlayer.appearance != null && Client.localPlayer.appearance.isFemale) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var9; - } else { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3; - } - - return 1; + for (var6 = 0; var6 < var3.length(); ++var6) { + char var7 = var3.charAt(var6); + if (var7 == '<') { + var15 = true; + } else if (var7 == '>') { + var15 = false; + } else if (!var15) { + var17.append(var7); } } + + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var17.toString(); + return 1; } + if (var0 == ScriptOpcodes.STRING_INDEXOF_CHAR) { + var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; + var4 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.indexOf(var4); + return 1; + } + if (var0 == ScriptOpcodes.STRING_INDEXOF_STRING) { + Skills.Interpreter_stringStackSize -= 2; + var3 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize]; + var9 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize + 1]; + var5 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var3.indexOf(var9, var5); + return 1; + } + if (var0 == ScriptOpcodes.UPPERCASE) { + var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var3.toUpperCase(); + return 1; + } + return 2; } } diff --git a/runescape-client/src/main/java/class215.java b/runescape-client/src/main/java/class215.java index 9270440606..0a388cf1b2 100644 --- a/runescape-client/src/main/java/class215.java +++ b/runescape-client/src/main/java/class215.java @@ -33,33 +33,31 @@ public class class215 { if (var0 > 0L && var0 < 6582952005840035281L) { if (var0 % 37L == 0L) { return null; - } else { - int var2 = 0; - - for (long var3 = var0; 0L != var3; var3 /= 37L) { - ++var2; - } - - StringBuilder var5; - char var8; - for (var5 = new StringBuilder(var2); var0 != 0L; var5.append(var8)) { - long var6 = var0; - var0 /= 37L; - var8 = class289.base37Table[(int)(var6 - var0 * 37L)]; - if (var8 == '_') { - int var9 = var5.length() - 1; - var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); - var8 = 160; - } - } - - var5.reverse(); - var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); - return var5.toString(); } - } else { - return null; + int var2 = 0; + + for (long var3 = var0; 0L != var3; var3 /= 37L) { + ++var2; + } + + StringBuilder var5; + char var8; + for (var5 = new StringBuilder(var2); var0 != 0L; var5.append(var8)) { + long var6 = var0; + var0 /= 37L; + var8 = class289.base37Table[(int)(var6 - var0 * 37L)]; + if (var8 == '_') { + int var9 = var5.length() - 1; + var5.setCharAt(var9, Character.toUpperCase(var5.charAt(var9))); + var8 = 160; + } + } + + var5.reverse(); + var5.setCharAt(0, Character.toUpperCase(var5.charAt(0))); + return var5.toString(); } + return null; } @ObfuscatedName("l") @@ -67,11 +65,11 @@ public class class215 { signature = "(Lhp;Ljava/lang/String;Ljava/lang/String;I)Llx;", garbageValue = "-1167154349" ) - @Export("loadIndexedSpriteByName") - public static IndexedSprite loadIndexedSpriteByName(AbstractArchive var0, String var1, String var2) { + @Export("SpriteBuffer_getIndexedSpriteByName") + public static IndexedSprite SpriteBuffer_getIndexedSpriteByName(AbstractArchive var0, String var1, String var2) { int var3 = var0.getGroupId(var1); int var4 = var0.getFileId(var3, var2); - return PacketBuffer.loadIndexedSprite(var0, var3, var4); + return PacketBuffer.SpriteBuffer_getIndexedSprite(var0, var3, var4); } @ObfuscatedName("eg") diff --git a/runescape-client/src/main/java/class218.java b/runescape-client/src/main/java/class218.java index 02fa14fe6e..10bcc61646 100644 --- a/runescape-client/src/main/java/class218.java +++ b/runescape-client/src/main/java/class218.java @@ -33,12 +33,11 @@ public class class218 { synchronized(KeyHandler.KeyHandler_instance) { if (KeyHandler.field385 == KeyHandler.field396) { return false; - } else { - ReflectionCheck.field1338 = KeyHandler.field400[KeyHandler.field396]; - Calendar.field2508 = KeyHandler.field399[KeyHandler.field396]; - KeyHandler.field396 = KeyHandler.field396 + 1 & 127; - return true; } + ReflectionCheck.field1338 = KeyHandler.field400[KeyHandler.field396]; + Calendar.field2508 = KeyHandler.field399[KeyHandler.field396]; + KeyHandler.field396 = KeyHandler.field396 + 1 & 127; + return true; } } } diff --git a/runescape-client/src/main/java/class226.java b/runescape-client/src/main/java/class226.java index 314136df30..fb054d20fc 100644 --- a/runescape-client/src/main/java/class226.java +++ b/runescape-client/src/main/java/class226.java @@ -44,91 +44,89 @@ public class class226 { if (Client.players[var1] != null) { throw new RuntimeException(); - } else { - Player var6 = Client.players[var1] = new Player(); - var6.index = var1; - if (Players.field1254[var1] != null) { - var6.read(Players.field1254[var1]); - } - - var6.orientation = Players.Players_orientations[var1]; - var6.targetIndex = Players.Players_targetIndices[var1]; - var7 = Players.Players_regions[var1]; - var8 = var7 >> 28; - var9 = var7 >> 14 & 255; - var10 = var7 & 255; - var6.pathTraversed[0] = Players.field1250[var1]; - var6.plane = (byte)var8; - var6.resetPath((var9 << 13) + var3 - MusicPatchNode2.baseX * 64, (var10 << 13) + var4 - class1.baseY * 64); - var6.field638 = false; - return true; } - } else if (var2 == 1) { + Player var6 = Client.players[var1] = new Player(); + var6.index = var1; + if (Players.field1254[var1] != null) { + var6.read(Players.field1254[var1]); + } + + var6.orientation = Players.Players_orientations[var1]; + var6.targetIndex = Players.Players_targetIndices[var1]; + var7 = Players.Players_regions[var1]; + var8 = var7 >> 28; + var9 = var7 >> 14 & 255; + var10 = var7 & 255; + var6.pathTraversed[0] = Players.field1250[var1]; + var6.plane = (byte)var8; + var6.resetPath((var9 << 13) + var3 - MusicPatchNode2.baseX * 64, (var10 << 13) + var4 - class1.baseY * 64); + var6.field638 = false; + return true; + } + if (var2 == 1) { var3 = var0.readBits(2); var4 = Players.Players_regions[var1]; Players.Players_regions[var1] = (((var4 >> 28) + var3 & 3) << 28) + (var4 & 268435455); return false; - } else { - int var5; - int var11; - if (var2 == 2) { - var3 = var0.readBits(5); - var4 = var3 >> 3; - var5 = var3 & 7; - var11 = Players.Players_regions[var1]; - var7 = (var11 >> 28) + var4 & 3; - var8 = var11 >> 14 & 255; - var9 = var11 & 255; - if (var5 == 0) { - --var8; - --var9; - } - - if (var5 == 1) { - --var9; - } - - if (var5 == 2) { - ++var8; - --var9; - } - - if (var5 == 3) { - --var8; - } - - if (var5 == 4) { - ++var8; - } - - if (var5 == 5) { - --var8; - ++var9; - } - - if (var5 == 6) { - ++var9; - } - - if (var5 == 7) { - ++var8; - ++var9; - } - - Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); - return false; - } else { - var3 = var0.readBits(18); - var4 = var3 >> 16; - var5 = var3 >> 8 & 255; - var11 = var3 & 255; - var7 = Players.Players_regions[var1]; - var8 = (var7 >> 28) + var4 & 3; - var9 = var5 + (var7 >> 14) & 255; - var10 = var11 + var7 & 255; - Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); - return false; - } } + int var5; + int var11; + if (var2 == 2) { + var3 = var0.readBits(5); + var4 = var3 >> 3; + var5 = var3 & 7; + var11 = Players.Players_regions[var1]; + var7 = (var11 >> 28) + var4 & 3; + var8 = var11 >> 14 & 255; + var9 = var11 & 255; + if (var5 == 0) { + --var8; + --var9; + } + + if (var5 == 1) { + --var9; + } + + if (var5 == 2) { + ++var8; + --var9; + } + + if (var5 == 3) { + --var8; + } + + if (var5 == 4) { + ++var8; + } + + if (var5 == 5) { + --var8; + ++var9; + } + + if (var5 == 6) { + ++var9; + } + + if (var5 == 7) { + ++var8; + ++var9; + } + + Players.Players_regions[var1] = (var8 << 14) + var9 + (var7 << 28); + return false; + } + var3 = var0.readBits(18); + var4 = var3 >> 16; + var5 = var3 >> 8 & 255; + var11 = var3 & 255; + var7 = Players.Players_regions[var1]; + var8 = (var7 >> 28) + var4 & 3; + var9 = var5 + (var7 >> 14) & 255; + var10 = var11 + var7 & 255; + Players.Players_regions[var1] = (var9 << 14) + var10 + (var8 << 28); + return false; } } diff --git a/runescape-client/src/main/java/class287.java b/runescape-client/src/main/java/class287.java index caf7f7f4bc..28abfd715d 100644 --- a/runescape-client/src/main/java/class287.java +++ b/runescape-client/src/main/java/class287.java @@ -1,3 +1,4 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -8,14 +9,15 @@ public class class287 { signature = "(Lhp;Lhp;Ljava/lang/String;Ljava/lang/String;I)Lke;", garbageValue = "-2097439358" ) - public static Font method5258(AbstractArchive var0, AbstractArchive var1, String var2, String var3) { - int var4 = var0.getGroupId(var2); - int var5 = var0.getFileId(var4, var3); + @Export("SpriteBuffer_getFontByName") + public static Font SpriteBuffer_getFontByName(AbstractArchive spriteArchive, AbstractArchive fontArchive, String groupName, String fileName) { + int var4 = spriteArchive.getGroupId(groupName); + int var5 = spriteArchive.getFileId(var4, fileName); Font var6; - if (!Friend.doesSpriteExist(var0, var4, var5)) { + if (!Friend.SpriteBuffer_bufferFile(spriteArchive, var4, var5)) { var6 = null; } else { - var6 = WallDecoration.getWorldMapSprite(var1.takeFile(var4, var5)); + var6 = WallDecoration.SpriteBuffer_createFont(fontArchive.takeFile(var4, var5)); } return var6; diff --git a/runescape-client/src/main/java/class289.java b/runescape-client/src/main/java/class289.java index f97846313b..940497a96c 100644 --- a/runescape-client/src/main/java/class289.java +++ b/runescape-client/src/main/java/class289.java @@ -25,26 +25,26 @@ public final class class289 { signature = "(Lhp;III)[Llx;", garbageValue = "1777014825" ) - public static IndexedSprite[] method5281(AbstractArchive var0, int var1, int var2) { - if (!Friend.doesSpriteExist(var0, var1, var2)) { + @Export("SpriteBuffer_getIndexedSpriteArray") + public static IndexedSprite[] SpriteBuffer_getIndexedSpriteArray(AbstractArchive var0, int var1, int var2) { + if (!Friend.SpriteBuffer_bufferFile(var0, var1, var2)) { return null; - } else { - IndexedSprite[] var4 = new IndexedSprite[class326.SpriteBuffer_spriteCount]; - - for (int var5 = 0; var5 < class326.SpriteBuffer_spriteCount; ++var5) { - IndexedSprite var6 = var4[var5] = new IndexedSprite(); - var6.width = class326.SpriteBuffer_spriteWidth; - var6.height = class326.SpriteBuffer_spriteHeight; - var6.xOffset = Varps.SpriteBuffer_xOffsets[var5]; - var6.yOffset = class326.SpriteBuffer_yOffsets[var5]; - var6.subWidth = class326.SpriteBuffer_spriteWidths[var5]; - var6.subHeight = class216.SpriteBuffer_spriteHeights[var5]; - var6.palette = Frames.SpriteBuffer_spritePalette; - var6.pixels = class326.SpriteBuffer_pixels[var5]; - } - - class16.method174(); - return var4; } + IndexedSprite[] var4 = new IndexedSprite[SpriteBuffer.SpriteBuffer_spriteCount]; + + for (int var5 = 0; var5 < SpriteBuffer.SpriteBuffer_spriteCount; ++var5) { + IndexedSprite var6 = var4[var5] = new IndexedSprite(); + var6.width = SpriteBuffer.SpriteBuffer_spriteWidth; + var6.height = SpriteBuffer.SpriteBuffer_spriteHeight; + var6.xOffset = Varps.SpriteBuffer_xOffsets[var5]; + var6.yOffset = SpriteBuffer.SpriteBuffer_yOffsets[var5]; + var6.subWidth = SpriteBuffer.SpriteBuffer_spriteWidths[var5]; + var6.subHeight = class216.SpriteBuffer_spriteHeights[var5]; + var6.palette = Frames.SpriteBuffer_spritePalette; + var6.pixels = SpriteBuffer.SpriteBuffer_pixels[var5]; + } + + class16.SpriteBuffer_clear(); + return var4; } } diff --git a/runescape-client/src/main/java/class291.java b/runescape-client/src/main/java/class291.java index e6d2d05827..8c918e891a 100644 --- a/runescape-client/src/main/java/class291.java +++ b/runescape-client/src/main/java/class291.java @@ -10,188 +10,187 @@ public final class class291 { ) public static String method5315(CharSequence var0, LoginType var1) { if (var0 == null) { - return null; - } else { - int var2 = 0; - - int var3; - boolean var4; - char var5; - for (var3 = var0.length(); var2 < var3; ++var2) { - var5 = var0.charAt(var2); - var4 = var5 == 160 || var5 == ' ' || var5 == '_' || var5 == '-'; - if (!var4) { - break; - } - } - - while (var3 > var2) { - var5 = var0.charAt(var3 - 1); - var4 = var5 == 160 || var5 == ' ' || var5 == '_' || var5 == '-'; - if (!var4) { - break; - } - - --var3; - } - - int var14 = var3 - var2; - if (var14 >= 1) { - byte var6; - if (var1 == null) { - var6 = 12; - } else { - switch(var1.field4057) { - case 8: - var6 = 20; - break; - default: - var6 = 12; - } - } - - if (var14 <= var6) { - StringBuilder var12 = new StringBuilder(var14); - - for (int var15 = var2; var15 < var3; ++var15) { - char var7 = var0.charAt(var15); - boolean var8; - if (Character.isISOControl(var7)) { - var8 = false; - } else if (GrandExchangeOfferOwnWorldComparator.isAlphaNumeric(var7)) { - var8 = true; - } else { - char[] var13 = class339.field4061; - int var10 = 0; - - label118: - while (true) { - char var11; - if (var10 >= var13.length) { - var13 = class339.field4062; - - for (var10 = 0; var10 < var13.length; ++var10) { - var11 = var13[var10]; - if (var11 == var7) { - var8 = true; - break label118; - } - } - - var8 = false; - break; - } - - var11 = var13[var10]; - if (var11 == var7) { - var8 = true; - break; - } - - ++var10; - } - } - - if (var8) { - char var9; - switch(var7) { - case ' ': - case '-': - case '_': - case ' ': - var9 = '_'; - break; - case '#': - case '[': - case ']': - var9 = var7; - break; - case 'À': - case 'Á': - case 'Â': - case 'Ã': - case 'Ä': - case 'à': - case 'á': - case 'â': - case 'ã': - case 'ä': - var9 = 'a'; - break; - case 'Ç': - case 'ç': - var9 = 'c'; - break; - case 'È': - case 'É': - case 'Ê': - case 'Ë': - case 'è': - case 'é': - case 'ê': - case 'ë': - var9 = 'e'; - break; - case 'Í': - case 'Î': - case 'Ï': - case 'í': - case 'î': - case 'ï': - var9 = 'i'; - break; - case 'Ñ': - case 'ñ': - var9 = 'n'; - break; - case 'Ò': - case 'Ó': - case 'Ô': - case 'Õ': - case 'Ö': - case 'ò': - case 'ó': - case 'ô': - case 'õ': - case 'ö': - var9 = 'o'; - break; - case 'Ù': - case 'Ú': - case 'Û': - case 'Ü': - case 'ù': - case 'ú': - case 'û': - case 'ü': - var9 = 'u'; - break; - case 'ß': - var9 = 'b'; - break; - case 'ÿ': - case 'Ÿ': - var9 = 'y'; - break; - default: - var9 = Character.toLowerCase(var7); - } - - if (var9 != 0) { - var12.append(var9); - } - } - } - - if (var12.length() == 0) { - return null; - } - - return var12.toString(); - } - } - return null; } + int var2 = 0; + + int var3; + boolean var4; + char var5; + for (var3 = var0.length(); var2 < var3; ++var2) { + var5 = var0.charAt(var2); + var4 = var5 == 160 || var5 == ' ' || var5 == '_' || var5 == '-'; + if (!var4) { + break; + } + } + + while (var3 > var2) { + var5 = var0.charAt(var3 - 1); + var4 = var5 == 160 || var5 == ' ' || var5 == '_' || var5 == '-'; + if (!var4) { + break; + } + + --var3; + } + + int var14 = var3 - var2; + if (var14 >= 1) { + byte var6; + if (var1 == null) { + var6 = 12; + } else { + switch(var1.field4057) { + case 8: + var6 = 20; + break; + default: + var6 = 12; + } + } + + if (var14 <= var6) { + StringBuilder var12 = new StringBuilder(var14); + + for (int var15 = var2; var15 < var3; ++var15) { + char var7 = var0.charAt(var15); + boolean var8; + if (Character.isISOControl(var7)) { + var8 = false; + } else if (GrandExchangeOfferOwnWorldComparator.isAlphaNumeric(var7)) { + var8 = true; + } else { + char[] var13 = class339.field4061; + int var10 = 0; + + label118: + while (true) { + char var11; + if (var10 >= var13.length) { + var13 = class339.field4062; + + for (var10 = 0; var10 < var13.length; ++var10) { + var11 = var13[var10]; + if (var11 == var7) { + var8 = true; + break label118; + } + } + + var8 = false; + break; + } + + var11 = var13[var10]; + if (var11 == var7) { + var8 = true; + break; + } + + ++var10; + } + } + + if (var8) { + char var9; + switch(var7) { + case ' ': + case '-': + case '_': + case ' ': + var9 = '_'; + break; + case '#': + case '[': + case ']': + var9 = var7; + break; + case 'À': + case 'Á': + case 'Â': + case 'Ã': + case 'Ä': + case 'à': + case 'á': + case 'â': + case 'ã': + case 'ä': + var9 = 'a'; + break; + case 'Ç': + case 'ç': + var9 = 'c'; + break; + case 'È': + case 'É': + case 'Ê': + case 'Ë': + case 'è': + case 'é': + case 'ê': + case 'ë': + var9 = 'e'; + break; + case 'Í': + case 'Î': + case 'Ï': + case 'í': + case 'î': + case 'ï': + var9 = 'i'; + break; + case 'Ñ': + case 'ñ': + var9 = 'n'; + break; + case 'Ò': + case 'Ó': + case 'Ô': + case 'Õ': + case 'Ö': + case 'ò': + case 'ó': + case 'ô': + case 'õ': + case 'ö': + var9 = 'o'; + break; + case 'Ù': + case 'Ú': + case 'Û': + case 'Ü': + case 'ù': + case 'ú': + case 'û': + case 'ü': + var9 = 'u'; + break; + case 'ß': + var9 = 'b'; + break; + case 'ÿ': + case 'Ÿ': + var9 = 'y'; + break; + default: + var9 = Character.toLowerCase(var7); + } + + if (var9 != 0) { + var12.append(var9); + } + } + } + + if (var12.length() == 0) { + return null; + } + + return var12.toString(); + } + } + + return null; } } diff --git a/runescape-client/src/main/java/class3.java b/runescape-client/src/main/java/class3.java index 96bc170760..1d0f301a9a 100644 --- a/runescape-client/src/main/java/class3.java +++ b/runescape-client/src/main/java/class3.java @@ -111,9 +111,8 @@ public class class3 implements Enumerated { if (var1 == null) { throw new IllegalArgumentException(); - } else { - return var1.field13; } + return var1.field13; } @ObfuscatedName("e") diff --git a/runescape-client/src/main/java/class30.java b/runescape-client/src/main/java/class30.java index 734f5fd17f..410c90f0dd 100644 --- a/runescape-client/src/main/java/class30.java +++ b/runescape-client/src/main/java/class30.java @@ -57,15 +57,14 @@ public class class30 { static Frames getFrames(int var0) { Frames var1 = (Frames)SequenceDefinition.SequenceDefinition_cachedFrames.get((long)var0); if (var1 != null) { - return var1; - } else { - var1 = BoundaryObject.method3262(SequenceDefinition.SequenceDefinition_animationsArchive, SequenceDefinition.SequenceDefinition_skeletonsArchive, var0, false); - if (var1 != null) { - SequenceDefinition.SequenceDefinition_cachedFrames.put(var1, (long)var0); - } - return var1; } + var1 = BoundaryObject.method3262(SequenceDefinition.SequenceDefinition_animationsArchive, SequenceDefinition.SequenceDefinition_skeletonsArchive, var0, false); + if (var1 != null) { + SequenceDefinition.SequenceDefinition_cachedFrames.put(var1, (long)var0); + } + + return var1; } @ObfuscatedName("al") @@ -79,269 +78,317 @@ public class class30 { var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; ScriptEvent.addGameMessage(0, "", var3); return 1; - } else if (var0 == ScriptOpcodes.ANIM) { + } + if (var0 == ScriptOpcodes.ANIM) { HealthBarUpdate.Interpreter_intStackSize -= 2; MouseRecorder.performPlayerAnimation(Client.localPlayer, Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize], Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]); return 1; - } else if (var0 == ScriptOpcodes.IF_CLOSE) { + } + if (var0 == ScriptOpcodes.IF_CLOSE) { if (!Interpreter.field1105) { Interpreter.field1104 = true; } return 1; - } else { - int var10; - if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) { - var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - var10 = 0; - if (class192.method3677(var3)) { - var10 = class3.parseInt(var3); - } - - PacketBufferNode var12 = Archive.method4265(ClientPacket.field2220, Client.packetWriter.isaacCipher); - var12.packetBuffer.writeInt(var10); - Client.packetWriter.method2219(var12); - return 1; - } else { - PacketBufferNode var14; - if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) { - var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - var14 = Archive.method4265(ClientPacket.field2298, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeByte(var3.length() + 1); - var14.packetBuffer.writeStringCp1252NullTerminated(var3); - Client.packetWriter.method2219(var14); - return 1; - } else if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) { - var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - var14 = Archive.method4265(ClientPacket.field2211, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeByte(var3.length() + 1); - var14.packetBuffer.writeStringCp1252NullTerminated(var3); - Client.packetWriter.method2219(var14); - return 1; - } else { - String var7; - int var15; - if (var0 == ScriptOpcodes.OPPLAYER) { - var15 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var7 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - class81.method1988(var15, var7); - return 1; - } else if (var0 == ScriptOpcodes.IF_DRAGPICKUP) { - HealthBarUpdate.Interpreter_intStackSize -= 3; - var15 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var10 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - int var9 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2]; - Widget var13 = class80.getWidget(var9); - class60.clickWidget(var13, var15, var10); - return 1; - } else if (var0 == ScriptOpcodes.CC_DRAGPICKUP) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var15 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var10 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - Widget var11 = var2 ? Interpreter.field1111 : Calendar.field2507; - class60.clickWidget(var11, var15, var10); - return 1; - } else if (var0 == ScriptOpcodes.MOUSECAM) { - DevicePcmPlayerProvider.mouseCam = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.GETREMOVEROOFS) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapLabelSize.clientPreferences.roofsHidden ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.SETREMOVEROOFS) { - WorldMapLabelSize.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - ReflectionCheck.savePreferences(); - return 1; - } else if (var0 == ScriptOpcodes.OPENURL) { - var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - boolean var4 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - GrandExchangeOfferWorldComparator.openURL(var3, var4, false); - return 1; - } else if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { - var15 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - var14 = Archive.method4265(ClientPacket.field2245, Client.packetWriter.isaacCipher); - var14.packetBuffer.writeShort(var15); - Client.packetWriter.method2219(var14); - return 1; - } else if (var0 == ScriptOpcodes.BUG_REPORT) { - var15 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Skills.Interpreter_stringStackSize -= 2; - var7 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize]; - String var5 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize + 1]; - if (var7.length() > 500) { - return 1; - } else if (var5.length() > 500) { - return 1; - } else { - PacketBufferNode var6 = Archive.method4265(ClientPacket.field2219, Client.packetWriter.isaacCipher); - var6.packetBuffer.writeShort(1 + Huffman.stringCp1252NullTerminatedByteSize(var7) + Huffman.stringCp1252NullTerminatedByteSize(var5)); - var6.packetBuffer.writeStringCp1252NullTerminated(var7); - var6.packetBuffer.writeByte(var15); - var6.packetBuffer.writeStringCp1252NullTerminated(var5); - Client.packetWriter.method2219(var6); - return 1; - } - } else if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) { - Client.shiftClickDrop = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) { - Client.showMouseOverText = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.RENDERSELF) { - Client.renderSelf = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == 3120) { - if (Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1) { - Client.field774 |= 1; - } else { - Client.field774 &= -2; - } - - return 1; - } else if (var0 == 3121) { - if (Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1) { - Client.field774 |= 2; - } else { - Client.field774 &= -3; - } - - return 1; - } else if (var0 == 3122) { - if (Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1) { - Client.field774 |= 4; - } else { - Client.field774 &= -5; - } - - return 1; - } else if (var0 == 3123) { - if (Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1) { - Client.field774 |= 8; - } else { - Client.field774 &= -9; - } - - return 1; - } else if (var0 == 3124) { - Client.field774 = 0; - return 1; - } else if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) { - Client.showMouseCross = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) { - Client.showLoadingMessages = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - return 1; - } else if (var0 == ScriptOpcodes.SETTAPTODROP) { - UserComparator5.setTapToDrop(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1); - return 1; - } else if (var0 == ScriptOpcodes.GETTAPTODROP) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = ScriptEvent.getTapToDrop() ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.SETOCULUSORBSPEED) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - return 1; - } else if (var0 == 3130) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - return 1; - } else if (var0 == 3131) { - --HealthBarUpdate.Interpreter_intStackSize; - return 1; - } else if (var0 == ScriptOpcodes.GETCANVASSIZE) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = GrandExchangeEvent.canvasWidth; - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = ParamDefinition.canvasHeight; - return 1; - } else if (var0 == ScriptOpcodes.MOBILE_SETFPS) { - --HealthBarUpdate.Interpreter_intStackSize; - return 1; - } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) { - return 1; - } else if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - return 1; - } else if (var0 == 3136) { - Client.field817 = 3; - Client.field818 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - return 1; - } else if (var0 == 3137) { - Client.field817 = 2; - Client.field818 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - return 1; - } else if (var0 == 3138) { - Client.field817 = 0; - return 1; - } else if (var0 == 3139) { - Client.field817 = 1; - return 1; - } else if (var0 == 3140) { - Client.field817 = 3; - Client.field818 = var2 ? Interpreter.field1111.id : Calendar.field2507.id; - return 1; - } else { - boolean var8; - if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { - var8 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - WorldMapLabelSize.clientPreferences.hideUsername = var8; - ReflectionCheck.savePreferences(); - return 1; - } else if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapLabelSize.clientPreferences.hideUsername ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) { - var8 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - Client.Login_isUsernameRemembered = var8; - if (!var8) { - WorldMapLabelSize.clientPreferences.rememberedUsername = ""; - ReflectionCheck.savePreferences(); - } - - return 1; - } else if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; - return 1; - } else if (var0 == 3145) { - return 1; - } else if (var0 == ScriptOpcodes.SETTITLEMUSICENABLED) { - var8 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - if (var8 == WorldMapLabelSize.clientPreferences.titleMusicDisabled) { - WorldMapLabelSize.clientPreferences.titleMusicDisabled = !var8; - ReflectionCheck.savePreferences(); - } - - return 1; - } else if (var0 == ScriptOpcodes.GETTITLEMUSICENABLED) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapLabelSize.clientPreferences.titleMusicDisabled ? 0 : 1; - return 1; - } else if (var0 == 3148) { - return 1; - } else if (var0 == 3149) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3150) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3151) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3152) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - return 1; - } else if (var0 == 3153) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; - return 1; - } else if (var0 == 3154) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Buddy.method5176(); - return 1; - } else if (var0 == 3155) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - return 1; - } else { - return var0 == 3156 ? 1 : 2; - } - } - } - } } + int var10; + if (var0 == ScriptOpcodes.RESUME_COUNTDIALOG) { + var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; + var10 = 0; + if (class192.method3677(var3)) { + var10 = class3.parseInt(var3); + } + + PacketBufferNode var12 = Archive.method4265(ClientPacket.field2220, Client.packetWriter.isaacCipher); + var12.packetBuffer.writeInt(var10); + Client.packetWriter.method2219(var12); + return 1; + } + PacketBufferNode var14; + if (var0 == ScriptOpcodes.RESUME_NAMEDIALOG) { + var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; + var14 = Archive.method4265(ClientPacket.field2298, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeByte(var3.length() + 1); + var14.packetBuffer.writeStringCp1252NullTerminated(var3); + Client.packetWriter.method2219(var14); + return 1; + } + if (var0 == ScriptOpcodes.RESUME_STRINGDIALOG) { + var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; + var14 = Archive.method4265(ClientPacket.field2211, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeByte(var3.length() + 1); + var14.packetBuffer.writeStringCp1252NullTerminated(var3); + Client.packetWriter.method2219(var14); + return 1; + } + String var7; + int var15; + if (var0 == ScriptOpcodes.OPPLAYER) { + var15 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + var7 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; + class81.method1988(var15, var7); + return 1; + } + if (var0 == ScriptOpcodes.IF_DRAGPICKUP) { + HealthBarUpdate.Interpreter_intStackSize -= 3; + var15 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; + var10 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; + int var9 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2]; + Widget var13 = class80.getWidget(var9); + class60.clickWidget(var13, var15, var10); + return 1; + } + if (var0 == ScriptOpcodes.CC_DRAGPICKUP) { + HealthBarUpdate.Interpreter_intStackSize -= 2; + var15 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; + var10 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; + Widget var11 = var2 ? Interpreter.field1111 : Calendar.field2507; + class60.clickWidget(var11, var15, var10); + return 1; + } + if (var0 == ScriptOpcodes.MOUSECAM) { + DevicePcmPlayerProvider.mouseCam = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + return 1; + } + if (var0 == ScriptOpcodes.GETREMOVEROOFS) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapLabelSize.clientPreferences.roofsHidden ? 1 : 0; + return 1; + } + if (var0 == ScriptOpcodes.SETREMOVEROOFS) { + WorldMapLabelSize.clientPreferences.roofsHidden = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + ReflectionCheck.savePreferences(); + return 1; + } + if (var0 == ScriptOpcodes.OPENURL) { + var3 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; + boolean var4 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + GrandExchangeOfferWorldComparator.openURL(var3, var4, false); + return 1; + } + if (var0 == ScriptOpcodes.RESUME_OBJDIALOG) { + var15 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + var14 = Archive.method4265(ClientPacket.field2245, Client.packetWriter.isaacCipher); + var14.packetBuffer.writeShort(var15); + Client.packetWriter.method2219(var14); + return 1; + } + if (var0 == ScriptOpcodes.BUG_REPORT) { + var15 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + Skills.Interpreter_stringStackSize -= 2; + var7 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize]; + String var5 = Interpreter.Interpreter_stringStack[Skills.Interpreter_stringStackSize + 1]; + if (var7.length() > 500) { + return 1; + } + if (var5.length() > 500) { + return 1; + } + PacketBufferNode var6 = Archive.method4265(ClientPacket.field2219, Client.packetWriter.isaacCipher); + var6.packetBuffer.writeShort(1 + Huffman.stringCp1252NullTerminatedByteSize(var7) + Huffman.stringCp1252NullTerminatedByteSize(var5)); + var6.packetBuffer.writeStringCp1252NullTerminated(var7); + var6.packetBuffer.writeByte(var15); + var6.packetBuffer.writeStringCp1252NullTerminated(var5); + Client.packetWriter.method2219(var6); + return 1; + } + if (var0 == ScriptOpcodes.SETSHIFTCLICKDROP) { + Client.shiftClickDrop = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + return 1; + } + if (var0 == ScriptOpcodes.SETSHOWMOUSEOVERTEXT) { + Client.showMouseOverText = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + return 1; + } + if (var0 == ScriptOpcodes.RENDERSELF) { + Client.renderSelf = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + return 1; + } + if (var0 == 3120) { + if (Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1) { + Client.field774 |= 1; + } else { + Client.field774 &= -2; + } + + return 1; + } + if (var0 == 3121) { + if (Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1) { + Client.field774 |= 2; + } else { + Client.field774 &= -3; + } + + return 1; + } + if (var0 == 3122) { + if (Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1) { + Client.field774 |= 4; + } else { + Client.field774 &= -5; + } + + return 1; + } + if (var0 == 3123) { + if (Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1) { + Client.field774 |= 8; + } else { + Client.field774 &= -9; + } + + return 1; + } + if (var0 == 3124) { + Client.field774 = 0; + return 1; + } + if (var0 == ScriptOpcodes.SETSHOWMOUSECROSS) { + Client.showMouseCross = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + return 1; + } + if (var0 == ScriptOpcodes.SETSHOWLOADINGMESSAGES) { + Client.showLoadingMessages = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + return 1; + } + if (var0 == ScriptOpcodes.SETTAPTODROP) { + UserComparator5.setTapToDrop(Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1); + return 1; + } + if (var0 == ScriptOpcodes.GETTAPTODROP) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = ScriptEvent.getTapToDrop() ? 1 : 0; + return 1; + } + if (var0 == ScriptOpcodes.SETOCULUSORBSPEED) { + HealthBarUpdate.Interpreter_intStackSize -= 2; + Client.oculusOrbNormalSpeed = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; + Client.oculusOrbSlowedSpeed = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; + return 1; + } + if (var0 == 3130) { + HealthBarUpdate.Interpreter_intStackSize -= 2; + return 1; + } + if (var0 == 3131) { + --HealthBarUpdate.Interpreter_intStackSize; + return 1; + } + if (var0 == ScriptOpcodes.GETCANVASSIZE) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = GrandExchangeEvent.canvasWidth; + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = ParamDefinition.canvasHeight; + return 1; + } + if (var0 == ScriptOpcodes.MOBILE_SETFPS) { + --HealthBarUpdate.Interpreter_intStackSize; + return 1; + } + if (var0 == ScriptOpcodes.MOBILE_OPENSTORE) { + return 1; + } + if (var0 == ScriptOpcodes.MOBILE_OPENSTORECATEGORY) { + HealthBarUpdate.Interpreter_intStackSize -= 2; + return 1; + } + if (var0 == 3136) { + Client.field817 = 3; + Client.field818 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + return 1; + } + if (var0 == 3137) { + Client.field817 = 2; + Client.field818 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + return 1; + } + if (var0 == 3138) { + Client.field817 = 0; + return 1; + } + if (var0 == 3139) { + Client.field817 = 1; + return 1; + } + if (var0 == 3140) { + Client.field817 = 3; + Client.field818 = var2 ? Interpreter.field1111.id : Calendar.field2507.id; + return 1; + } + boolean var8; + if (var0 == ScriptOpcodes.SETHIDEUSERNAME) { + var8 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + WorldMapLabelSize.clientPreferences.hideUsername = var8; + ReflectionCheck.savePreferences(); + return 1; + } + if (var0 == ScriptOpcodes.GETHIDEUSERNAME) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapLabelSize.clientPreferences.hideUsername ? 1 : 0; + return 1; + } + if (var0 == ScriptOpcodes.SETREMEMBERUSERNAME) { + var8 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + Client.Login_isUsernameRemembered = var8; + if (!var8) { + WorldMapLabelSize.clientPreferences.rememberedUsername = ""; + ReflectionCheck.savePreferences(); + } + + return 1; + } + if (var0 == ScriptOpcodes.GETREMEMBERUSERNAME) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Client.Login_isUsernameRemembered ? 1 : 0; + return 1; + } + if (var0 == 3145) { + return 1; + } + if (var0 == ScriptOpcodes.SETTITLEMUSICENABLED) { + var8 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + if (var8 == WorldMapLabelSize.clientPreferences.titleMusicDisabled) { + WorldMapLabelSize.clientPreferences.titleMusicDisabled = !var8; + ReflectionCheck.savePreferences(); + } + + return 1; + } + if (var0 == ScriptOpcodes.GETTITLEMUSICENABLED) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = WorldMapLabelSize.clientPreferences.titleMusicDisabled ? 0 : 1; + return 1; + } + if (var0 == 3148) { + return 1; + } + if (var0 == 3149) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + return 1; + } + if (var0 == 3150) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + return 1; + } + if (var0 == 3151) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + return 1; + } + if (var0 == 3152) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + return 1; + } + if (var0 == 3153) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Login.Login_loadingPercent; + return 1; + } + if (var0 == 3154) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = Buddy.method5176(); + return 1; + } + if (var0 == 3155) { + HealthBarUpdate.Interpreter_intStackSize -= 2; + return 1; + } + if (var0 == 3156) { + return 1; + } + + return 2; } @ObfuscatedName("ad") @@ -360,348 +407,395 @@ public class class30 { } return 1; - } else { - int var3; - if (var0 == ScriptOpcodes.FRIEND_GETNAME) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - if (ArchiveLoader.friendSystem.method1791() && var3 >= 0 && var3 < ArchiveLoader.friendSystem.friendsList.getSize()) { - Friend var8 = (Friend)ArchiveLoader.friendSystem.friendsList.get(var3); - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var8.getName(); - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var8.getPreviousName(); - } else { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_GETWORLD) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - if (ArchiveLoader.friendSystem.method1791() && var3 >= 0 && var3 < ArchiveLoader.friendSystem.friendsList.getSize()) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = ((Buddy)ArchiveLoader.friendSystem.friendsList.get(var3)).world; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_GETRANK) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - if (ArchiveLoader.friendSystem.method1791() && var3 >= 0 && var3 < ArchiveLoader.friendSystem.friendsList.getSize()) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = ((Buddy)ArchiveLoader.friendSystem.friendsList.get(var3)).rank; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else { - String var5; - if (var0 == ScriptOpcodes.FRIEND_SETRANK) { - var5 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - int var6 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - class14.method159(var5, var6); - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_ADD) { - var5 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - ArchiveLoader.friendSystem.addFriend(var5); - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_DEL) { - var5 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - ArchiveLoader.friendSystem.removeFriend(var5); - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_ADD) { - var5 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - ArchiveLoader.friendSystem.addIgnore(var5); - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_DEL) { - var5 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - ArchiveLoader.friendSystem.removeIgnore(var5); - return 1; - } else if (var0 == ScriptOpcodes.FRIEND_TEST) { - var5 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - var5 = GrandExchangeOfferTotalQuantityComparator.removeImageTag(var5); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = ArchiveLoader.friendSystem.isFriended(new Username(var5, class40.loginType), false) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) { - if (DevicePcmPlayerProvider.clanChat != null) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = DevicePcmPlayerProvider.clanChat.name; - } else { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) { - if (DevicePcmPlayerProvider.clanChat != null) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = DevicePcmPlayerProvider.clanChat.getSize(); - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - if (DevicePcmPlayerProvider.clanChat != null && var3 < DevicePcmPlayerProvider.clanChat.getSize()) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = DevicePcmPlayerProvider.clanChat.get(var3).getUsername().getName(); - } else { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - if (DevicePcmPlayerProvider.clanChat != null && var3 < DevicePcmPlayerProvider.clanChat.getSize()) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = ((Buddy)DevicePcmPlayerProvider.clanChat.get(var3)).getWorld(); - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - if (DevicePcmPlayerProvider.clanChat != null && var3 < DevicePcmPlayerProvider.clanChat.getSize()) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = ((Buddy)DevicePcmPlayerProvider.clanChat.get(var3)).rank; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = DevicePcmPlayerProvider.clanChat != null ? DevicePcmPlayerProvider.clanChat.minKick : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLAN_KICKUSER) { - var5 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - Tile.clanKickUser(var5); - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = DevicePcmPlayerProvider.clanChat != null ? DevicePcmPlayerProvider.clanChat.rank : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLAN_JOINCHAT) { - var5 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - class65.method1170(var5); - return 1; - } else if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) { - ScriptFrame.method1089(); - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_COUNT) { - if (!ArchiveLoader.friendSystem.method1791()) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = ArchiveLoader.friendSystem.ignoreList.getSize(); - } - - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_GETNAME) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - if (ArchiveLoader.friendSystem.method1791() && var3 >= 0 && var3 < ArchiveLoader.friendSystem.ignoreList.getSize()) { - Ignored var4 = (Ignored)ArchiveLoader.friendSystem.ignoreList.get(var3); - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var4.getName(); - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var4.getPreviousName(); - } else { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.IGNORE_TEST) { - var5 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - var5 = GrandExchangeOfferTotalQuantityComparator.removeImageTag(var5); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = ArchiveLoader.friendSystem.isIgnored(new Username(var5, class40.loginType)) ? 1 : 0; - return 1; - } else if (var0 == ScriptOpcodes.CLAN_ISSELF) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - if (DevicePcmPlayerProvider.clanChat != null && var3 < DevicePcmPlayerProvider.clanChat.getSize() && DevicePcmPlayerProvider.clanChat.get(var3).getUsername().equals(Client.localPlayer.username)) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) { - if (DevicePcmPlayerProvider.clanChat != null && DevicePcmPlayerProvider.clanChat.owner != null) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = DevicePcmPlayerProvider.clanChat.owner; - } else { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; - } - - return 1; - } else if (var0 == ScriptOpcodes.CLAN_ISFRIEND) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - if (DevicePcmPlayerProvider.clanChat != null && var3 < DevicePcmPlayerProvider.clanChat.getSize() && ((ClanMate)DevicePcmPlayerProvider.clanChat.get(var3)).isFriend()) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } else if (var0 != ScriptOpcodes.CLAN_ISIGNORE) { - if (var0 == 3628) { - ArchiveLoader.friendSystem.friendsList.removeComparator(); - return 1; - } else { - boolean var7; - if (var0 == 3629) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - ArchiveLoader.friendSystem.friendsList.addComparator(new UserComparator1(var7)); - return 1; - } else if (var0 == 3630) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - ArchiveLoader.friendSystem.friendsList.addComparator(new UserComparator2(var7)); - return 1; - } else if (var0 == 3631) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - ArchiveLoader.friendSystem.friendsList.addComparator(new UserComparator3(var7)); - return 1; - } else if (var0 == 3632) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - ArchiveLoader.friendSystem.friendsList.addComparator(new UserComparator4(var7)); - return 1; - } else if (var0 == 3633) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - ArchiveLoader.friendSystem.friendsList.addComparator(new UserComparator5(var7)); - return 1; - } else if (var0 == 3634) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - ArchiveLoader.friendSystem.friendsList.addComparator(new UserComparator6(var7)); - return 1; - } else if (var0 == 3635) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - ArchiveLoader.friendSystem.friendsList.addComparator(new UserComparator7(var7)); - return 1; - } else if (var0 == 3636) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - ArchiveLoader.friendSystem.friendsList.addComparator(new UserComparator8(var7)); - return 1; - } else if (var0 == 3637) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - ArchiveLoader.friendSystem.friendsList.addComparator(new UserComparator9(var7)); - return 1; - } else if (var0 == 3638) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - ArchiveLoader.friendSystem.friendsList.addComparator(new UserComparator10(var7)); - return 1; - } else if (var0 == 3639) { - ArchiveLoader.friendSystem.friendsList.sort(); - return 1; - } else if (var0 == 3640) { - ArchiveLoader.friendSystem.ignoreList.removeComparator(); - return 1; - } else if (var0 == 3641) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - ArchiveLoader.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); - return 1; - } else if (var0 == 3642) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - ArchiveLoader.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); - return 1; - } else if (var0 == 3643) { - ArchiveLoader.friendSystem.ignoreList.sort(); - return 1; - } else if (var0 == 3644) { - if (DevicePcmPlayerProvider.clanChat != null) { - DevicePcmPlayerProvider.clanChat.removeComparator(); - } - - return 1; - } else if (var0 == 3645) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - if (DevicePcmPlayerProvider.clanChat != null) { - DevicePcmPlayerProvider.clanChat.addComparator(new UserComparator1(var7)); - } - - return 1; - } else if (var0 == 3646) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - if (DevicePcmPlayerProvider.clanChat != null) { - DevicePcmPlayerProvider.clanChat.addComparator(new UserComparator2(var7)); - } - - return 1; - } else if (var0 == 3647) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - if (DevicePcmPlayerProvider.clanChat != null) { - DevicePcmPlayerProvider.clanChat.addComparator(new UserComparator3(var7)); - } - - return 1; - } else if (var0 == 3648) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - if (DevicePcmPlayerProvider.clanChat != null) { - DevicePcmPlayerProvider.clanChat.addComparator(new UserComparator4(var7)); - } - - return 1; - } else if (var0 == 3649) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - if (DevicePcmPlayerProvider.clanChat != null) { - DevicePcmPlayerProvider.clanChat.addComparator(new UserComparator5(var7)); - } - - return 1; - } else if (var0 == 3650) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - if (DevicePcmPlayerProvider.clanChat != null) { - DevicePcmPlayerProvider.clanChat.addComparator(new UserComparator6(var7)); - } - - return 1; - } else if (var0 == 3651) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - if (DevicePcmPlayerProvider.clanChat != null) { - DevicePcmPlayerProvider.clanChat.addComparator(new UserComparator7(var7)); - } - - return 1; - } else if (var0 == 3652) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - if (DevicePcmPlayerProvider.clanChat != null) { - DevicePcmPlayerProvider.clanChat.addComparator(new UserComparator8(var7)); - } - - return 1; - } else if (var0 == 3653) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - if (DevicePcmPlayerProvider.clanChat != null) { - DevicePcmPlayerProvider.clanChat.addComparator(new UserComparator9(var7)); - } - - return 1; - } else if (var0 == 3654) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - if (DevicePcmPlayerProvider.clanChat != null) { - DevicePcmPlayerProvider.clanChat.addComparator(new UserComparator10(var7)); - } - - return 1; - } else if (var0 == 3655) { - if (DevicePcmPlayerProvider.clanChat != null) { - DevicePcmPlayerProvider.clanChat.sort(); - } - - return 1; - } else if (var0 == 3656) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - ArchiveLoader.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); - return 1; - } else if (var0 == 3657) { - var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - if (DevicePcmPlayerProvider.clanChat != null) { - DevicePcmPlayerProvider.clanChat.addComparator(new BuddyRankComparator(var7)); - } - - return 1; - } else { - return 2; - } - } - } else { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - if (DevicePcmPlayerProvider.clanChat != null && var3 < DevicePcmPlayerProvider.clanChat.getSize() && ((ClanMate)DevicePcmPlayerProvider.clanChat.get(var3)).isIgnored()) { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 1; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - } - - return 1; - } - } } + int var3; + if (var0 == ScriptOpcodes.FRIEND_GETNAME) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + if (ArchiveLoader.friendSystem.method1791() && var3 >= 0 && var3 < ArchiveLoader.friendSystem.friendsList.getSize()) { + Friend var8 = (Friend)ArchiveLoader.friendSystem.friendsList.get(var3); + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var8.getName(); + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var8.getPreviousName(); + } else { + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } + if (var0 == ScriptOpcodes.FRIEND_GETWORLD) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + if (ArchiveLoader.friendSystem.method1791() && var3 >= 0 && var3 < ArchiveLoader.friendSystem.friendsList.getSize()) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = ((Buddy)ArchiveLoader.friendSystem.friendsList.get(var3)).world; + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } + if (var0 == ScriptOpcodes.FRIEND_GETRANK) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + if (ArchiveLoader.friendSystem.method1791() && var3 >= 0 && var3 < ArchiveLoader.friendSystem.friendsList.getSize()) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = ((Buddy)ArchiveLoader.friendSystem.friendsList.get(var3)).rank; + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } + String var5; + if (var0 == ScriptOpcodes.FRIEND_SETRANK) { + var5 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; + int var6 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + class14.method159(var5, var6); + return 1; + } + if (var0 == ScriptOpcodes.FRIEND_ADD) { + var5 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; + ArchiveLoader.friendSystem.addFriend(var5); + return 1; + } + if (var0 == ScriptOpcodes.FRIEND_DEL) { + var5 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; + ArchiveLoader.friendSystem.removeFriend(var5); + return 1; + } + if (var0 == ScriptOpcodes.IGNORE_ADD) { + var5 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; + ArchiveLoader.friendSystem.addIgnore(var5); + return 1; + } + if (var0 == ScriptOpcodes.IGNORE_DEL) { + var5 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; + ArchiveLoader.friendSystem.removeIgnore(var5); + return 1; + } + if (var0 == ScriptOpcodes.FRIEND_TEST) { + var5 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; + var5 = GrandExchangeOfferTotalQuantityComparator.removeImageTag(var5); + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = ArchiveLoader.friendSystem.isFriended(new Username(var5, class40.loginType), false) ? 1 : 0; + return 1; + } + if (var0 == ScriptOpcodes.CLAN_GETCHATDISPLAYNAME) { + if (DevicePcmPlayerProvider.clanChat != null) { + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = DevicePcmPlayerProvider.clanChat.name; + } else { + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } + if (var0 == ScriptOpcodes.CLAN_GETCHATCOUNT) { + if (DevicePcmPlayerProvider.clanChat != null) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = DevicePcmPlayerProvider.clanChat.getSize(); + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } + if (var0 == ScriptOpcodes.CLAN_GETCHATUSERNAME) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + if (DevicePcmPlayerProvider.clanChat != null && var3 < DevicePcmPlayerProvider.clanChat.getSize()) { + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = DevicePcmPlayerProvider.clanChat.get(var3).getUsername().getName(); + } else { + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } + if (var0 == ScriptOpcodes.CLAN_GETCHATUSERWORLD) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + if (DevicePcmPlayerProvider.clanChat != null && var3 < DevicePcmPlayerProvider.clanChat.getSize()) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = ((Buddy)DevicePcmPlayerProvider.clanChat.get(var3)).getWorld(); + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } + if (var0 == ScriptOpcodes.CLAN_GETCHATUSERRANK) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + if (DevicePcmPlayerProvider.clanChat != null && var3 < DevicePcmPlayerProvider.clanChat.getSize()) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = ((Buddy)DevicePcmPlayerProvider.clanChat.get(var3)).rank; + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } + if (var0 == ScriptOpcodes.CLAN_GETCHATMINKICK) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = DevicePcmPlayerProvider.clanChat != null ? DevicePcmPlayerProvider.clanChat.minKick : 0; + return 1; + } + if (var0 == ScriptOpcodes.CLAN_KICKUSER) { + var5 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; + Tile.clanKickUser(var5); + return 1; + } + if (var0 == ScriptOpcodes.CLAN_GETCHATRANK) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = DevicePcmPlayerProvider.clanChat != null ? DevicePcmPlayerProvider.clanChat.rank : 0; + return 1; + } + if (var0 == ScriptOpcodes.CLAN_JOINCHAT) { + var5 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; + class65.method1170(var5); + return 1; + } + if (var0 == ScriptOpcodes.CLAN_LEAVECHAT) { + ScriptFrame.method1089(); + return 1; + } + if (var0 == ScriptOpcodes.IGNORE_COUNT) { + if (!ArchiveLoader.friendSystem.method1791()) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = -1; + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = ArchiveLoader.friendSystem.ignoreList.getSize(); + } + + return 1; + } + if (var0 == ScriptOpcodes.IGNORE_GETNAME) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + if (ArchiveLoader.friendSystem.method1791() && var3 >= 0 && var3 < ArchiveLoader.friendSystem.ignoreList.getSize()) { + Ignored var4 = (Ignored)ArchiveLoader.friendSystem.ignoreList.get(var3); + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var4.getName(); + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = var4.getPreviousName(); + } else { + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } + if (var0 == ScriptOpcodes.IGNORE_TEST) { + var5 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; + var5 = GrandExchangeOfferTotalQuantityComparator.removeImageTag(var5); + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = ArchiveLoader.friendSystem.isIgnored(new Username(var5, class40.loginType)) ? 1 : 0; + return 1; + } + if (var0 == ScriptOpcodes.CLAN_ISSELF) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + if (DevicePcmPlayerProvider.clanChat != null && var3 < DevicePcmPlayerProvider.clanChat.getSize() && DevicePcmPlayerProvider.clanChat.get(var3).getUsername().equals(Client.localPlayer.username)) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } + if (var0 == ScriptOpcodes.CLAN_GETCHATOWNERNAME) { + if (DevicePcmPlayerProvider.clanChat != null && DevicePcmPlayerProvider.clanChat.owner != null) { + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = DevicePcmPlayerProvider.clanChat.owner; + } else { + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = ""; + } + + return 1; + } + if (var0 == ScriptOpcodes.CLAN_ISFRIEND) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + if (DevicePcmPlayerProvider.clanChat != null && var3 < DevicePcmPlayerProvider.clanChat.getSize() && ((ClanMate)DevicePcmPlayerProvider.clanChat.get(var3)).isFriend()) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } + if (var0 == ScriptOpcodes.CLAN_ISIGNORE) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + if (DevicePcmPlayerProvider.clanChat != null && var3 < DevicePcmPlayerProvider.clanChat.getSize() && ((ClanMate) DevicePcmPlayerProvider.clanChat.get(var3)).isIgnored()) { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 1; + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + } + + return 1; + } + if (var0 == 3628) { + ArchiveLoader.friendSystem.friendsList.removeComparator(); + return 1; + } + boolean var7; + if (var0 == 3629) { + var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + ArchiveLoader.friendSystem.friendsList.addComparator(new UserComparator1(var7)); + return 1; + } + if (var0 == 3630) { + var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + ArchiveLoader.friendSystem.friendsList.addComparator(new UserComparator2(var7)); + return 1; + } + if (var0 == 3631) { + var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + ArchiveLoader.friendSystem.friendsList.addComparator(new UserComparator3(var7)); + return 1; + } + if (var0 == 3632) { + var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + ArchiveLoader.friendSystem.friendsList.addComparator(new UserComparator4(var7)); + return 1; + } + if (var0 == 3633) { + var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + ArchiveLoader.friendSystem.friendsList.addComparator(new UserComparator5(var7)); + return 1; + } + if (var0 == 3634) { + var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + ArchiveLoader.friendSystem.friendsList.addComparator(new UserComparator6(var7)); + return 1; + } + if (var0 == 3635) { + var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + ArchiveLoader.friendSystem.friendsList.addComparator(new UserComparator7(var7)); + return 1; + } + if (var0 == 3636) { + var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + ArchiveLoader.friendSystem.friendsList.addComparator(new UserComparator8(var7)); + return 1; + } + if (var0 == 3637) { + var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + ArchiveLoader.friendSystem.friendsList.addComparator(new UserComparator9(var7)); + return 1; + } + if (var0 == 3638) { + var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + ArchiveLoader.friendSystem.friendsList.addComparator(new UserComparator10(var7)); + return 1; + } + if (var0 == 3639) { + ArchiveLoader.friendSystem.friendsList.sort(); + return 1; + } + if (var0 == 3640) { + ArchiveLoader.friendSystem.ignoreList.removeComparator(); + return 1; + } + if (var0 == 3641) { + var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + ArchiveLoader.friendSystem.ignoreList.addComparator(new UserComparator1(var7)); + return 1; + } + if (var0 == 3642) { + var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + ArchiveLoader.friendSystem.ignoreList.addComparator(new UserComparator2(var7)); + return 1; + } + if (var0 == 3643) { + ArchiveLoader.friendSystem.ignoreList.sort(); + return 1; + } + if (var0 == 3644) { + if (DevicePcmPlayerProvider.clanChat != null) { + DevicePcmPlayerProvider.clanChat.removeComparator(); + } + + return 1; + } + if (var0 == 3645) { + var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + if (DevicePcmPlayerProvider.clanChat != null) { + DevicePcmPlayerProvider.clanChat.addComparator(new UserComparator1(var7)); + } + + return 1; + } + if (var0 == 3646) { + var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + if (DevicePcmPlayerProvider.clanChat != null) { + DevicePcmPlayerProvider.clanChat.addComparator(new UserComparator2(var7)); + } + + return 1; + } + if (var0 == 3647) { + var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + if (DevicePcmPlayerProvider.clanChat != null) { + DevicePcmPlayerProvider.clanChat.addComparator(new UserComparator3(var7)); + } + + return 1; + } + if (var0 == 3648) { + var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + if (DevicePcmPlayerProvider.clanChat != null) { + DevicePcmPlayerProvider.clanChat.addComparator(new UserComparator4(var7)); + } + + return 1; + } + if (var0 == 3649) { + var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + if (DevicePcmPlayerProvider.clanChat != null) { + DevicePcmPlayerProvider.clanChat.addComparator(new UserComparator5(var7)); + } + + return 1; + } + if (var0 == 3650) { + var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + if (DevicePcmPlayerProvider.clanChat != null) { + DevicePcmPlayerProvider.clanChat.addComparator(new UserComparator6(var7)); + } + + return 1; + } + if (var0 == 3651) { + var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + if (DevicePcmPlayerProvider.clanChat != null) { + DevicePcmPlayerProvider.clanChat.addComparator(new UserComparator7(var7)); + } + + return 1; + } + if (var0 == 3652) { + var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + if (DevicePcmPlayerProvider.clanChat != null) { + DevicePcmPlayerProvider.clanChat.addComparator(new UserComparator8(var7)); + } + + return 1; + } + if (var0 == 3653) { + var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + if (DevicePcmPlayerProvider.clanChat != null) { + DevicePcmPlayerProvider.clanChat.addComparator(new UserComparator9(var7)); + } + + return 1; + } + if (var0 == 3654) { + var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + if (DevicePcmPlayerProvider.clanChat != null) { + DevicePcmPlayerProvider.clanChat.addComparator(new UserComparator10(var7)); + } + + return 1; + } + if (var0 == 3655) { + if (DevicePcmPlayerProvider.clanChat != null) { + DevicePcmPlayerProvider.clanChat.sort(); + } + + return 1; + } + if (var0 == 3656) { + var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + ArchiveLoader.friendSystem.friendsList.addComparator(new BuddyRankComparator(var7)); + return 1; + } + if (var0 == 3657) { + var7 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + if (DevicePcmPlayerProvider.clanChat != null) { + DevicePcmPlayerProvider.clanChat.addComparator(new BuddyRankComparator(var7)); + } + + return 1; + } + return 2; } } diff --git a/runescape-client/src/main/java/class313.java b/runescape-client/src/main/java/class313.java index b184242d99..46c34a1704 100644 --- a/runescape-client/src/main/java/class313.java +++ b/runescape-client/src/main/java/class313.java @@ -1,3 +1,4 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -73,6 +74,7 @@ public enum class313 implements Enumerated { signature = "(I)I", garbageValue = "320353268" ) + @Export("rsOrdinal") public int rsOrdinal() { return this.field3836; } diff --git a/runescape-client/src/main/java/class4.java b/runescape-client/src/main/java/class4.java index 5e189dccba..0f29b40921 100644 --- a/runescape-client/src/main/java/class4.java +++ b/runescape-client/src/main/java/class4.java @@ -185,39 +185,38 @@ final class class4 implements class0 { } } } - } else { - if (var12 > 0) { - var13 = var11 * 65536 / var12; - var14 = 32768; + } + if (var12 > 0) { + var13 = var11 * 65536 / var12; + var14 = 32768; - while (var10 != var8) { - if (var10 < var8) { - ++var10; - } else if (var10 > var8) { - --var10; + while (var10 != var8) { + if (var10 < var8) { + ++var10; + } else if (var10 > var8) { + --var10; + } + + if ((Tiles.Tiles_renderFlags[class42.plane][var9][var10] & 4) != 0) { + var6 = class42.plane; + } + + var14 += var13; + if (var14 >= 65536) { + var14 -= 65536; + if (var9 < var7) { + ++var9; + } else if (var9 > var7) { + --var9; } if ((Tiles.Tiles_renderFlags[class42.plane][var9][var10] & 4) != 0) { var6 = class42.plane; } - - var14 += var13; - if (var14 >= 65536) { - var14 -= 65536; - if (var9 < var7) { - ++var9; - } else if (var9 > var7) { - --var9; - } - - if ((Tiles.Tiles_renderFlags[class42.plane][var9][var10] & 4) != 0) { - var6 = class42.plane; - } - } } } - break label559; } + break label559; } var28 = class42.plane; diff --git a/runescape-client/src/main/java/class40.java b/runescape-client/src/main/java/class40.java index 73083d23c6..8f7ae7719d 100644 --- a/runescape-client/src/main/java/class40.java +++ b/runescape-client/src/main/java/class40.java @@ -79,9 +79,8 @@ public class class40 { int method712(int var1) { if (var1 != 9 && var1 != 10) { return var1 == 11 ? 8 : var1; - } else { - return 1; } + return 1; } @ObfuscatedName("p") diff --git a/runescape-client/src/main/java/class42.java b/runescape-client/src/main/java/class42.java index 5c3219da30..d87f339b6b 100644 --- a/runescape-client/src/main/java/class42.java +++ b/runescape-client/src/main/java/class42.java @@ -76,6 +76,7 @@ public class class42 implements WorldMapSection { signature = "(Lal;B)V", garbageValue = "-53" ) + @Export("expandBounds") public void expandBounds(WorldMapArea var1) { if (var1.regionLowX > this.field366) { var1.regionLowX = this.field366; @@ -100,12 +101,12 @@ public class class42 implements WorldMapSection { signature = "(IIII)Z", garbageValue = "59484528" ) + @Export("containsCoord") public boolean containsCoord(int var1, int var2, int var3) { if (var1 >= this.field368 && var1 < this.field368 + this.field363) { return var2 >= (this.field364 << 6) + (this.field376 << 3) && var2 <= (this.field364 << 6) + (this.field376 << 3) + 7 && var3 >= (this.field365 << 6) + (this.field369 << 3) && var3 <= (this.field365 << 6) + (this.field369 << 3) + 7; - } else { - return false; } + return false; } @ObfuscatedName("e") @@ -113,6 +114,7 @@ public class class42 implements WorldMapSection { signature = "(IIB)Z", garbageValue = "56" ) + @Export("containsPosition") public boolean containsPosition(int var1, int var2) { return var1 >= (this.field366 << 6) + (this.field370 << 3) && var1 <= (this.field366 << 6) + (this.field370 << 3) + 7 && var2 >= (this.field375 << 6) + (this.field371 << 3) && var2 <= (this.field375 << 6) + (this.field371 << 3) + 7; } @@ -122,13 +124,13 @@ public class class42 implements WorldMapSection { signature = "(IIIB)[I", garbageValue = "12" ) + @Export("getBorderTileLengths") public int[] getBorderTileLengths(int var1, int var2, int var3) { if (!this.containsCoord(var1, var2, var3)) { return null; - } else { - int[] var4 = new int[]{this.field366 * 64 - this.field364 * 64 + var2 + (this.field370 * 8 - this.field376 * 8), var3 + (this.field375 * 64 - this.field365 * 64) + (this.field371 * 8 - this.field369 * 8)}; - return var4; } + int[] var4 = new int[]{this.field366 * 64 - this.field364 * 64 + var2 + (this.field370 * 8 - this.field376 * 8), var3 + (this.field375 * 64 - this.field365 * 64) + (this.field371 * 8 - this.field369 * 8)}; + return var4; } @ObfuscatedName("k") @@ -136,14 +138,14 @@ public class class42 implements WorldMapSection { signature = "(IIB)Lhv;", garbageValue = "-13" ) + @Export("coord") public Coord coord(int var1, int var2) { if (!this.containsPosition(var1, var2)) { return null; - } else { - int var3 = this.field364 * 64 - this.field366 * 64 + (this.field376 * 8 - this.field370 * 8) + var1; - int var4 = this.field365 * 64 - this.field375 * 64 + var2 + (this.field369 * 8 - this.field371 * 8); - return new Coord(this.field368, var3, var4); } + int var3 = this.field364 * 64 - this.field366 * 64 + (this.field376 * 8 - this.field370 * 8) + var1; + int var4 = this.field365 * 64 - this.field375 * 64 + var2 + (this.field369 * 8 - this.field371 * 8); + return new Coord(this.field368, var3, var4); } @ObfuscatedName("l") @@ -151,6 +153,7 @@ public class class42 implements WorldMapSection { signature = "(Lkf;I)V", garbageValue = "1767519038" ) + @Export("read") public void read(Buffer var1) { this.field368 = var1.readUnsignedByte(); this.field363 = var1.readUnsignedByte(); diff --git a/runescape-client/src/main/java/class49.java b/runescape-client/src/main/java/class49.java index 7349bd5dd1..ee85d59070 100644 --- a/runescape-client/src/main/java/class49.java +++ b/runescape-client/src/main/java/class49.java @@ -36,28 +36,26 @@ public class class49 { Script var2 = (Script)Script.Script_cached.get((long)(var0 << 16)); if (var2 != null) { return var2; - } else { - String var3 = String.valueOf(var0); - int var4 = UserComparator4.archive12.getGroupId(var3); - if (var4 == -1) { - return null; - } else { - byte[] var5 = UserComparator4.archive12.takeFileFlat(var4); - if (var5 != null) { - if (var5.length <= 1) { - return null; - } - - var2 = World.newScript(var5); - if (var2 != null) { - Script.Script_cached.put(var2, (long)(var0 << 16)); - return var2; - } - } - + } + String var3 = String.valueOf(var0); + int var4 = UserComparator4.archive12.getGroupId(var3); + if (var4 == -1) { + return null; + } + byte[] var5 = UserComparator4.archive12.takeFileFlat(var4); + if (var5 != null) { + if (var5.length <= 1) { return null; } + + var2 = World.newScript(var5); + if (var2 != null) { + Script.Script_cached.put(var2, (long)(var0 << 16)); + return var2; + } } + + return null; } @ObfuscatedName("u") diff --git a/runescape-client/src/main/java/class51.java b/runescape-client/src/main/java/class51.java index 13b9fd1ecc..82dc44d3fc 100644 --- a/runescape-client/src/main/java/class51.java +++ b/runescape-client/src/main/java/class51.java @@ -25,15 +25,14 @@ public class class51 { HealthBarDefinition var1 = (HealthBarDefinition)HealthBarDefinition.HealthBarDefinition_cached.get((long)var0); if (var1 != null) { return var1; - } else { - byte[] var2 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var0); - var1 = new HealthBarDefinition(); - if (var2 != null) { - var1.decode(new Buffer(var2)); - } - - HealthBarDefinition.HealthBarDefinition_cached.put(var1, (long)var0); - return var1; } + byte[] var2 = HealthBarDefinition.HealthBarDefinition_archive.takeFile(33, var0); + var1 = new HealthBarDefinition(); + if (var2 != null) { + var1.decode(new Buffer(var2)); + } + + HealthBarDefinition.HealthBarDefinition_cached.put(var1, (long)var0); + return var1; } } diff --git a/runescape-client/src/main/java/class65.java b/runescape-client/src/main/java/class65.java index db52abf11f..dfbd94b70e 100644 --- a/runescape-client/src/main/java/class65.java +++ b/runescape-client/src/main/java/class65.java @@ -27,40 +27,37 @@ public class class65 extends RouteStrategy { static File method1177(String var0) { if (!class169.field2055) { throw new RuntimeException(""); - } else { - File var1 = (File)class169.field2052.get(var0); - if (var1 != null) { - return var1; - } else { - File var2 = new File(class169.field2050, var0); - RandomAccessFile var3 = null; + } + File var1 = (File)class169.field2052.get(var0); + if (var1 != null) { + return var1; + } + File var2 = new File(class169.field2050, var0); + RandomAccessFile var3 = null; - try { - File var4 = new File(var2.getParent()); - if (!var4.exists()) { - throw new RuntimeException(""); - } else { - var3 = new RandomAccessFile(var2, "rw"); - int var5 = var3.read(); - var3.seek(0L); - var3.write(var5); - var3.seek(0L); - var3.close(); - class169.field2052.put(var0, var2); - return var2; - } - } catch (Exception var8) { - try { - if (var3 != null) { - var3.close(); - var3 = null; - } - } catch (Exception var7) { - } - - throw new RuntimeException(); - } + try { + File var4 = new File(var2.getParent()); + if (!var4.exists()) { + throw new RuntimeException(""); } + var3 = new RandomAccessFile(var2, "rw"); + int var5 = var3.read(); + var3.seek(0L); + var3.write(var5); + var3.seek(0L); + var3.close(); + class169.field2052.put(var0, var2); + return var2; + } catch (Exception var8) { + try { + if (var3 != null) { + var3.close(); + var3 = null; + } + } catch (Exception var7) { + } + + throw new RuntimeException(); } } @@ -69,29 +66,28 @@ public class class65 extends RouteStrategy { signature = "(Lhp;III)Lly;", garbageValue = "300652258" ) - @Export("loadSprite") - public static Sprite loadSprite(AbstractArchive var0, int var1, int var2) { - if (!Friend.doesSpriteExist(var0, var1, var2)) { + @Export("SpriteBuffer_getSprite") + public static Sprite SpriteBuffer_getSprite(AbstractArchive var0, int var1, int var2) { + if (!Friend.SpriteBuffer_bufferFile(var0, var1, var2)) { return null; - } else { - Sprite var4 = new Sprite(); - var4.width = class326.SpriteBuffer_spriteWidth; - var4.height = class326.SpriteBuffer_spriteHeight; - var4.yOffset = Varps.SpriteBuffer_xOffsets[0]; - var4.xOffset = class326.SpriteBuffer_yOffsets[0]; - var4.subWidth = class326.SpriteBuffer_spriteWidths[0]; - var4.subHeight = class216.SpriteBuffer_spriteHeights[0]; - int var5 = var4.subHeight * var4.subWidth; - byte[] var6 = class326.SpriteBuffer_pixels[0]; - var4.pixels = new int[var5]; - - for (int var7 = 0; var7 < var5; ++var7) { - var4.pixels[var7] = Frames.SpriteBuffer_spritePalette[var6[var7] & 255]; - } - - class16.method174(); - return var4; } + Sprite var4 = new Sprite(); + var4.width = SpriteBuffer.SpriteBuffer_spriteWidth; + var4.height = SpriteBuffer.SpriteBuffer_spriteHeight; + var4.yOffset = Varps.SpriteBuffer_xOffsets[0]; + var4.xOffset = SpriteBuffer.SpriteBuffer_yOffsets[0]; + var4.subWidth = SpriteBuffer.SpriteBuffer_spriteWidths[0]; + var4.subHeight = class216.SpriteBuffer_spriteHeights[0]; + int var5 = var4.subHeight * var4.subWidth; + byte[] var6 = SpriteBuffer.SpriteBuffer_pixels[0]; + var4.pixels = new int[var5]; + + for (int var7 = 0; var7 < var5; ++var7) { + var4.pixels[var7] = Frames.SpriteBuffer_spritePalette[var6[var7] & 255]; + } + + class16.SpriteBuffer_clear(); + return var4; } @ObfuscatedName("aw") @@ -124,16 +120,8 @@ public class class65 extends RouteStrategy { } return 1; - } else if (var0 != ScriptOpcodes.ENUM) { - if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { - var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - EnumDefinition var10 = BoundaryObject.getEnum(var3); - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var10.size(); - return 1; - } else { - return 2; - } - } else { + } + if (var0 == ScriptOpcodes.ENUM) { HealthBarUpdate.Interpreter_intStackSize -= 4; var3 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; var4 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; @@ -141,6 +129,7 @@ public class class65 extends RouteStrategy { var6 = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 3]; EnumDefinition var7 = BoundaryObject.getEnum(var9); if (var3 == var7.inputType && var4 == var7.outputType) { + for (int var8 = 0; var8 < var7.outputCount; ++var8) { if (var6 == var7.keys[var8]) { if (var4 == 115) { @@ -162,17 +151,23 @@ public class class65 extends RouteStrategy { } } - return 1; - } else { - if (var4 == 115) { - Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = "null"; - } else { - Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; - } - return 1; } + if (var4 == 115) { + Interpreter.Interpreter_stringStack[++Skills.Interpreter_stringStackSize - 1] = "null"; + } else { + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = 0; + } + + return 1; } + if (var0 == ScriptOpcodes.ENUM_GETOUTPUTCOUNT) { + var3 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + EnumDefinition var10 = BoundaryObject.getEnum(var3); + Interpreter.Interpreter_intStack[++HealthBarUpdate.Interpreter_intStackSize - 1] = var10.size(); + return 1; + } + return 2; } @ObfuscatedName("ee") diff --git a/runescape-client/src/main/java/class83.java b/runescape-client/src/main/java/class83.java index e5dc473264..7ab170b6a0 100644 --- a/runescape-client/src/main/java/class83.java +++ b/runescape-client/src/main/java/class83.java @@ -95,40 +95,49 @@ public class class83 { Strings.method4120(var3); return 1; - } else if (var0 == ScriptOpcodes.CC_SETCOLOUR) { + } + if (var0 == ScriptOpcodes.CC_SETCOLOUR) { var3.color = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; Strings.method4120(var3); return 1; - } else if (var0 == ScriptOpcodes.CC_SETFILL) { + } + if (var0 == ScriptOpcodes.CC_SETFILL) { var3.fill = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; Strings.method4120(var3); return 1; - } else if (var0 == ScriptOpcodes.CC_SETTRANS) { + } + if (var0 == ScriptOpcodes.CC_SETTRANS) { var3.transparencyTop = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; Strings.method4120(var3); return 1; - } else if (var0 == ScriptOpcodes.CC_SETLINEWID) { + } + if (var0 == ScriptOpcodes.CC_SETLINEWID) { var3.lineWid = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; Strings.method4120(var3); return 1; - } else if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { + } + if (var0 == ScriptOpcodes.CC_SETGRAPHIC) { var3.spriteId2 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; Strings.method4120(var3); return 1; - } else if (var0 == ScriptOpcodes.CC_SET2DANGLE) { + } + if (var0 == ScriptOpcodes.CC_SET2DANGLE) { var3.spriteAngle = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; Strings.method4120(var3); return 1; - } else if (var0 == ScriptOpcodes.CC_SETTILING) { + } + if (var0 == ScriptOpcodes.CC_SETTILING) { var3.spriteTiling = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; Strings.method4120(var3); return 1; - } else if (var0 == ScriptOpcodes.CC_SETMODEL) { + } + if (var0 == ScriptOpcodes.CC_SETMODEL) { var3.modelType = 1; var3.modelId = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; Strings.method4120(var3); return 1; - } else if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { + } + if (var0 == ScriptOpcodes.CC_SETMODELANGLE) { HealthBarUpdate.Interpreter_intStackSize -= 6; var3.modelOffsetX = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; var3.modelOffsetY = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; @@ -138,112 +147,125 @@ public class class83 { var3.modelZoom = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 5]; Strings.method4120(var3); return 1; - } else { - int var8; - if (var0 == ScriptOpcodes.CC_SETMODELANIM) { - var8 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - if (var8 != var3.sequenceId) { - var3.sequenceId = var8; - var3.modelFrame = 0; - var3.modelFrameCycle = 0; - Strings.method4120(var3); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { - var3.modelOrthog = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - Strings.method4120(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTEXT) { - String var7 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; - if (!var7.equals(var3.text)) { - var3.text = var7; - Strings.method4120(var3); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { - var3.fontId = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Strings.method4120(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { - HealthBarUpdate.Interpreter_intStackSize -= 3; - var3.textXAlignment = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var3.textYAlignment = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - var3.textLineHeight = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2]; - Strings.method4120(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { - var3.textShadowed = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - Strings.method4120(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETOUTLINE) { - var3.outline = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Strings.method4120(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { - var3.spriteShadow = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Strings.method4120(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETVFLIP) { - var3.spriteFlipV = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - Strings.method4120(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETHFLIP) { - var3.spriteFlipH = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - Strings.method4120(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { - HealthBarUpdate.Interpreter_intStackSize -= 2; - var3.scrollWidth = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; - var3.scrollHeight = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; - Strings.method4120(var3); - if (var4 != -1 && var3.type == 0) { - WorldMapSprite.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var4 >> 16], var3, false); - } - - return 1; - } else if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { - ScriptFrame.method1086(var3.id, var3.childIndex); - Client.field850 = var3; - Strings.method4120(var3); - return 1; - } else if (var0 == 1122) { - var3.spriteId = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Strings.method4120(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { - var3.color2 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Strings.method4120(var3); - return 1; - } else if (var0 == 1124) { - var3.transparencyBot = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - Strings.method4120(var3); - return 1; - } else if (var0 == ScriptOpcodes.CC_SETFILLMODE) { - var8 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - class323 var6 = (class323)SoundSystem.findEnumerated(PcmPlayer.method2405(), var8); - if (var6 != null) { - var3.fillMode = var6; - Strings.method4120(var3); - } - - return 1; - } else { - boolean var5; - if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { - var5 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - var3.field2598 = var5; - return 1; - } else if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { - var5 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; - var3.modelTransparency = var5; - return 1; - } else { - return 2; - } - } } + int var8; + if (var0 == ScriptOpcodes.CC_SETMODELANIM) { + var8 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + if (var8 != var3.sequenceId) { + var3.sequenceId = var8; + var3.modelFrame = 0; + var3.modelFrameCycle = 0; + Strings.method4120(var3); + } + + return 1; + } + if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) { + var3.modelOrthog = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + Strings.method4120(var3); + return 1; + } + if (var0 == ScriptOpcodes.CC_SETTEXT) { + String var7 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize]; + if (!var7.equals(var3.text)) { + var3.text = var7; + Strings.method4120(var3); + } + + return 1; + } + if (var0 == ScriptOpcodes.CC_SETTEXTFONT) { + var3.fontId = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + Strings.method4120(var3); + return 1; + } + if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) { + HealthBarUpdate.Interpreter_intStackSize -= 3; + var3.textXAlignment = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; + var3.textYAlignment = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; + var3.textLineHeight = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2]; + Strings.method4120(var3); + return 1; + } + if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) { + var3.textShadowed = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + Strings.method4120(var3); + return 1; + } + if (var0 == ScriptOpcodes.CC_SETOUTLINE) { + var3.outline = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + Strings.method4120(var3); + return 1; + } + if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) { + var3.spriteShadow = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + Strings.method4120(var3); + return 1; + } + if (var0 == ScriptOpcodes.CC_SETVFLIP) { + var3.spriteFlipV = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + Strings.method4120(var3); + return 1; + } + if (var0 == ScriptOpcodes.CC_SETHFLIP) { + var3.spriteFlipH = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + Strings.method4120(var3); + return 1; + } + if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) { + HealthBarUpdate.Interpreter_intStackSize -= 2; + var3.scrollWidth = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize]; + var3.scrollHeight = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1]; + Strings.method4120(var3); + if (var4 != -1 && var3.type == 0) { + WorldMapSprite.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var4 >> 16], var3, false); + } + + return 1; + } + if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) { + ScriptFrame.method1086(var3.id, var3.childIndex); + Client.field850 = var3; + Strings.method4120(var3); + return 1; + } + if (var0 == 1122) { + var3.spriteId = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + Strings.method4120(var3); + return 1; + } + if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) { + var3.color2 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + Strings.method4120(var3); + return 1; + } + if (var0 == 1124) { + var3.transparencyBot = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + Strings.method4120(var3); + return 1; + } + if (var0 == ScriptOpcodes.CC_SETFILLMODE) { + var8 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; + class323 var6 = (class323)SoundSystem.findEnumerated(PcmPlayer.method2405(), var8); + if (var6 != null) { + var3.fillMode = var6; + Strings.method4120(var3); + } + + return 1; + } + boolean var5; + if (var0 == ScriptOpcodes.CC_SETLINEDIRECTION) { + var5 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + var3.field2598 = var5; + return 1; + } + if (var0 == ScriptOpcodes.CC_SETMODELTRANSPARENT) { + var5 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1; + var3.modelTransparency = var5; + return 1; + } + return 2; } @ObfuscatedName("gp") @@ -254,9 +276,8 @@ public class class83 { static final int method1995() { if (WorldMapLabelSize.clientPreferences.roofsHidden) { return class42.plane; - } else { - int var0 = ScriptEvent.getTileHeight(PacketBuffer.cameraX, class1.cameraZ, class42.plane); - return var0 - class43.cameraY < 800 && (Tiles.Tiles_renderFlags[class42.plane][PacketBuffer.cameraX >> 7][class1.cameraZ >> 7] & 4) != 0 ? class42.plane : 3; } + int var0 = ScriptEvent.getTileHeight(PacketBuffer.cameraX, class1.cameraZ, class42.plane); + return var0 - class43.cameraY < 800 && (Tiles.Tiles_renderFlags[class42.plane][PacketBuffer.cameraX >> 7][class1.cameraZ >> 7] & 4) != 0 ? class42.plane : 3; } } diff --git a/runescape-client/src/main/java/class99.java b/runescape-client/src/main/java/class99.java index dc7120c4a7..0e90eb94bf 100644 --- a/runescape-client/src/main/java/class99.java +++ b/runescape-client/src/main/java/class99.java @@ -1,3 +1,4 @@ +import net.runelite.mapping.Export; import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedSignature; @@ -8,5 +9,6 @@ public interface class99 { signature = "(B)Ldn;", garbageValue = "1" ) + @Export("player") PcmPlayer player(); } diff --git a/runescape-client/src/main/java/net/runelite/rs/Reflection.java b/runescape-client/src/main/java/net/runelite/rs/Reflection.java index 456b58a368..646dc1665c 100644 --- a/runescape-client/src/main/java/net/runelite/rs/Reflection.java +++ b/runescape-client/src/main/java/net/runelite/rs/Reflection.java @@ -152,10 +152,7 @@ public class Reflection { return annotation.value(); } - else - { - return method.getName(); - } + return method.getName(); } public static Class[] getParameterTypes(Method method)