From f4181265c0bf6a7db15f0994e39b09011be4d5a7 Mon Sep 17 00:00:00 2001 From: ThatGamerBlue Date: Fri, 19 Jul 2019 07:25:27 +0100 Subject: [PATCH] rs-client: refactor sprite loading methods --- runescape-client/src/main/java/Friend.java | 4 ++-- runescape-client/src/main/java/GameObject.java | 2 +- .../src/main/java/HealthBarDefinition.java | 4 ++-- runescape-client/src/main/java/HitSplatDefinition.java | 10 +++++----- runescape-client/src/main/java/PacketBuffer.java | 5 +++-- runescape-client/src/main/java/TilePaint.java | 2 +- runescape-client/src/main/java/Timer.java | 4 ++-- runescape-client/src/main/java/Widget.java | 4 ++-- runescape-client/src/main/java/WorldMapElement.java | 2 +- runescape-client/src/main/java/class215.java | 2 +- runescape-client/src/main/java/class287.java | 2 +- runescape-client/src/main/java/class289.java | 2 +- runescape-client/src/main/java/class65.java | 6 +++--- 13 files changed, 25 insertions(+), 24 deletions(-) diff --git a/runescape-client/src/main/java/Friend.java b/runescape-client/src/main/java/Friend.java index 81cbfa3ed8..feb55b9984 100644 --- a/runescape-client/src/main/java/Friend.java +++ b/runescape-client/src/main/java/Friend.java @@ -61,8 +61,8 @@ public class Friend extends Buddy { signature = "(Lhp;IIB)Z", garbageValue = "-3" ) - @Export("SpriteBuffer_loadSprite") - public static boolean SpriteBuffer_loadSprite(AbstractArchive var0, int var1, int var2) { + @Export("doesSpriteExist") + public static boolean doesSpriteExist(AbstractArchive var0, int var1, int var2) { byte[] var3 = var0.takeFile(var1, var2); if (var3 == null) { return false; diff --git a/runescape-client/src/main/java/GameObject.java b/runescape-client/src/main/java/GameObject.java index 5ec3ae7f8a..4af5cf4946 100644 --- a/runescape-client/src/main/java/GameObject.java +++ b/runescape-client/src/main/java/GameObject.java @@ -103,6 +103,6 @@ public final class GameObject { ) @Export("loadFont") public static Font loadFont(AbstractArchive var0, AbstractArchive var1, int var2, int var3) { - return !Friend.SpriteBuffer_loadSprite(var0, var2, var3) ? null : WallDecoration.getWorldMapSprite(var1.takeFile(var2, var3)); + return !Friend.doesSpriteExist(var0, var2, var3) ? null : WallDecoration.getWorldMapSprite(var1.takeFile(var2, var3)); } } diff --git a/runescape-client/src/main/java/HealthBarDefinition.java b/runescape-client/src/main/java/HealthBarDefinition.java index 1a2c02cdd1..a4c3723563 100644 --- a/runescape-client/src/main/java/HealthBarDefinition.java +++ b/runescape-client/src/main/java/HealthBarDefinition.java @@ -172,7 +172,7 @@ public class HealthBarDefinition extends DualNode { if (var1 != null) { return var1; } else { - var1 = class65.SpriteBuffer_tryCreateSprite(HealthBarDefinition_spritesArchive, this.frontSpriteID, 0); + var1 = class65.loadSprite(HealthBarDefinition_spritesArchive, this.frontSpriteID, 0); if (var1 != null) { HealthBarDefinition_cachedSprites.put(var1, (long)this.frontSpriteID); } @@ -196,7 +196,7 @@ public class HealthBarDefinition extends DualNode { if (var1 != null) { return var1; } else { - var1 = class65.SpriteBuffer_tryCreateSprite(HealthBarDefinition_spritesArchive, this.backSpriteID, 0); + var1 = class65.loadSprite(HealthBarDefinition_spritesArchive, this.backSpriteID, 0); if (var1 != null) { HealthBarDefinition_cachedSprites.put(var1, (long)this.backSpriteID); } diff --git a/runescape-client/src/main/java/HitSplatDefinition.java b/runescape-client/src/main/java/HitSplatDefinition.java index 486167e105..06745eeb1c 100644 --- a/runescape-client/src/main/java/HitSplatDefinition.java +++ b/runescape-client/src/main/java/HitSplatDefinition.java @@ -290,7 +290,7 @@ public class HitSplatDefinition extends DualNode { if (var1 != null) { return var1; } else { - var1 = class65.SpriteBuffer_tryCreateSprite(HitSplatDefinition_spritesArchive, this.field3334, 0); + var1 = class65.loadSprite(HitSplatDefinition_spritesArchive, this.field3334, 0); if (var1 != null) { HitSplatDefinition_cachedSprites.put(var1, (long)this.field3334); } @@ -313,7 +313,7 @@ public class HitSplatDefinition extends DualNode { if (var1 != null) { return var1; } else { - var1 = class65.SpriteBuffer_tryCreateSprite(HitSplatDefinition_spritesArchive, this.field3336, 0); + var1 = class65.loadSprite(HitSplatDefinition_spritesArchive, this.field3336, 0); if (var1 != null) { HitSplatDefinition_cachedSprites.put(var1, (long)this.field3336); } @@ -336,7 +336,7 @@ public class HitSplatDefinition extends DualNode { if (var1 != null) { return var1; } else { - var1 = class65.SpriteBuffer_tryCreateSprite(HitSplatDefinition_spritesArchive, this.field3337, 0); + var1 = class65.loadSprite(HitSplatDefinition_spritesArchive, this.field3337, 0); if (var1 != null) { HitSplatDefinition_cachedSprites.put(var1, (long)this.field3337); } @@ -359,7 +359,7 @@ public class HitSplatDefinition extends DualNode { if (var1 != null) { return var1; } else { - var1 = class65.SpriteBuffer_tryCreateSprite(HitSplatDefinition_spritesArchive, this.field3338, 0); + var1 = class65.loadSprite(HitSplatDefinition_spritesArchive, this.field3338, 0); if (var1 != null) { HitSplatDefinition_cachedSprites.put(var1, (long)this.field3338); } @@ -387,7 +387,7 @@ public class HitSplatDefinition extends DualNode { AbstractArchive var4 = HitSplatDefinition_fontsArchive; int var5 = this.fontId; Font var2; - if (!Friend.SpriteBuffer_loadSprite(var3, var5, 0)) { + if (!Friend.doesSpriteExist(var3, var5, 0)) { var2 = null; } else { var2 = WallDecoration.getWorldMapSprite(var4.takeFile(var5, 0)); diff --git a/runescape-client/src/main/java/PacketBuffer.java b/runescape-client/src/main/java/PacketBuffer.java index da87ae854d..77a0c37783 100644 --- a/runescape-client/src/main/java/PacketBuffer.java +++ b/runescape-client/src/main/java/PacketBuffer.java @@ -169,8 +169,9 @@ public class PacketBuffer extends Buffer { signature = "(Lhp;III)Llx;", garbageValue = "-1232611828" ) - static IndexedSprite method5474(AbstractArchive var0, int var1, int var2) { - if (!Friend.SpriteBuffer_loadSprite(var0, var1, var2)) { + @Export("loadIndexedSprite") + static IndexedSprite loadIndexedSprite(AbstractArchive var0, int var1, int var2) { + if (!Friend.doesSpriteExist(var0, var1, var2)) { return null; } else { IndexedSprite var4 = new IndexedSprite(); diff --git a/runescape-client/src/main/java/TilePaint.java b/runescape-client/src/main/java/TilePaint.java index 3a78f78d8f..f883e9d16a 100644 --- a/runescape-client/src/main/java/TilePaint.java +++ b/runescape-client/src/main/java/TilePaint.java @@ -64,7 +64,7 @@ public final class TilePaint { garbageValue = "1591290793" ) public static Sprite[] method3062(AbstractArchive var0, int var1, int var2) { - if (!Friend.SpriteBuffer_loadSprite(var0, var1, var2)) { + if (!Friend.doesSpriteExist(var0, var1, var2)) { return null; } else { Sprite[] var4 = new Sprite[class326.SpriteBuffer_spriteCount]; diff --git a/runescape-client/src/main/java/Timer.java b/runescape-client/src/main/java/Timer.java index 73f0f5e74d..ad1070f05d 100644 --- a/runescape-client/src/main/java/Timer.java +++ b/runescape-client/src/main/java/Timer.java @@ -491,13 +491,13 @@ public class Timer { } else if (Client.titleLoadingStage == 80) { var0 = 0; if (Message.compass == null) { - Message.compass = class65.SpriteBuffer_tryCreateSprite(Client.archive8, UserComparator6.spriteIds.compass, 0); + Message.compass = class65.loadSprite(Client.archive8, UserComparator6.spriteIds.compass, 0); } else { ++var0; } if (UserComparator4.redHintArrowSprite == null) { - UserComparator4.redHintArrowSprite = class65.SpriteBuffer_tryCreateSprite(Client.archive8, UserComparator6.spriteIds.field3823, 0); + UserComparator4.redHintArrowSprite = class65.loadSprite(Client.archive8, UserComparator6.spriteIds.field3823, 0); } else { ++var0; } diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index 43f82fc040..f926090468 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -1271,7 +1271,7 @@ public class Widget extends Node { if (var5 != null) { return var5; } else { - var5 = class65.SpriteBuffer_tryCreateSprite(class216.Widget_spritesArchive, var2, 0); + var5 = class65.loadSprite(class216.Widget_spritesArchive, var2, 0); if (var5 == null) { field2562 = true; return null; @@ -1351,7 +1351,7 @@ public class Widget extends Node { if (var3 != null) { return var3; } else { - var3 = class65.SpriteBuffer_tryCreateSprite(class216.Widget_spritesArchive, var2, 0); + var3 = class65.loadSprite(class216.Widget_spritesArchive, var2, 0); if (var3 != null) { Widget_cachedSprites.put(var3, (long)var2); } else { diff --git a/runescape-client/src/main/java/WorldMapElement.java b/runescape-client/src/main/java/WorldMapElement.java index c7e1267222..1cc5978b06 100644 --- a/runescape-client/src/main/java/WorldMapElement.java +++ b/runescape-client/src/main/java/WorldMapElement.java @@ -283,7 +283,7 @@ public class WorldMapElement extends DualNode { if (var2 != null) { return var2; } else { - var2 = class65.SpriteBuffer_tryCreateSprite(WorldMapElement_archive, var1, 0); + var2 = class65.loadSprite(WorldMapElement_archive, var1, 0); if (var2 != null) { WorldMapElement_cachedSprites.put(var2, (long)var1); } diff --git a/runescape-client/src/main/java/class215.java b/runescape-client/src/main/java/class215.java index a316f84c1d..9270440606 100644 --- a/runescape-client/src/main/java/class215.java +++ b/runescape-client/src/main/java/class215.java @@ -71,7 +71,7 @@ public class class215 { public static IndexedSprite loadIndexedSpriteByName(AbstractArchive var0, String var1, String var2) { int var3 = var0.getGroupId(var1); int var4 = var0.getFileId(var3, var2); - return PacketBuffer.method5474(var0, var3, var4); + return PacketBuffer.loadIndexedSprite(var0, var3, var4); } @ObfuscatedName("eg") diff --git a/runescape-client/src/main/java/class287.java b/runescape-client/src/main/java/class287.java index c664792bcb..caf7f7f4bc 100644 --- a/runescape-client/src/main/java/class287.java +++ b/runescape-client/src/main/java/class287.java @@ -12,7 +12,7 @@ public class class287 { int var4 = var0.getGroupId(var2); int var5 = var0.getFileId(var4, var3); Font var6; - if (!Friend.SpriteBuffer_loadSprite(var0, var4, var5)) { + if (!Friend.doesSpriteExist(var0, var4, var5)) { var6 = null; } else { var6 = WallDecoration.getWorldMapSprite(var1.takeFile(var4, var5)); diff --git a/runescape-client/src/main/java/class289.java b/runescape-client/src/main/java/class289.java index 347dcc1dfb..f97846313b 100644 --- a/runescape-client/src/main/java/class289.java +++ b/runescape-client/src/main/java/class289.java @@ -26,7 +26,7 @@ public final class class289 { garbageValue = "1777014825" ) public static IndexedSprite[] method5281(AbstractArchive var0, int var1, int var2) { - if (!Friend.SpriteBuffer_loadSprite(var0, var1, var2)) { + if (!Friend.doesSpriteExist(var0, var1, var2)) { return null; } else { IndexedSprite[] var4 = new IndexedSprite[class326.SpriteBuffer_spriteCount]; diff --git a/runescape-client/src/main/java/class65.java b/runescape-client/src/main/java/class65.java index 3a103e802a..db52abf11f 100644 --- a/runescape-client/src/main/java/class65.java +++ b/runescape-client/src/main/java/class65.java @@ -69,9 +69,9 @@ public class class65 extends RouteStrategy { signature = "(Lhp;III)Lly;", garbageValue = "300652258" ) - @Export("SpriteBuffer_tryCreateSprite") - public static Sprite SpriteBuffer_tryCreateSprite(AbstractArchive var0, int var1, int var2) { - if (!Friend.SpriteBuffer_loadSprite(var0, var1, var2)) { + @Export("loadSprite") + public static Sprite loadSprite(AbstractArchive var0, int var1, int var2) { + if (!Friend.doesSpriteExist(var0, var1, var2)) { return null; } else { Sprite var4 = new Sprite();