From b9bd70d05197b73cb72f8d78b3809ea3440af86d Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 29 Apr 2017 19:58:33 -0400 Subject: [PATCH] Rename widget textureId to spriteId --- .../net/runelite/cache/definitions/InterfaceDefinition.java | 2 +- .../runelite/cache/definitions/loaders/InterfaceLoader.java | 4 ++-- .../src/main/java/net/runelite/api/widgets/Widget.java | 4 ++-- runescape-api/src/main/java/net/runelite/rs/api/Widget.java | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cache/src/main/java/net/runelite/cache/definitions/InterfaceDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/InterfaceDefinition.java index 9ecf46c0ce..3fd445cd08 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/InterfaceDefinition.java +++ b/cache/src/main/java/net/runelite/cache/definitions/InterfaceDefinition.java @@ -43,7 +43,7 @@ public class InterfaceDefinition public int scrollWidth; public int scrollHeight; public boolean field2210; - public int textureId; + public int spriteId; public int field2294; public boolean field2257; public int opacity; diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/InterfaceLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/InterfaceLoader.java index df401587a5..c03303c54f 100644 --- a/cache/src/main/java/net/runelite/cache/definitions/loaders/InterfaceLoader.java +++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/InterfaceLoader.java @@ -224,7 +224,7 @@ public class InterfaceLoader if (iface.type == 5) { - iface.textureId = var1.readInt(); + iface.spriteId = var1.readInt(); iface.field2332 = var1.readInt(); } @@ -389,7 +389,7 @@ public class InterfaceLoader if (iface.type == 5) { - iface.textureId = var1.readInt(); + iface.spriteId = var1.readInt(); iface.field2294 = var1.readUnsignedShort(); iface.field2257 = var1.readUnsignedByte() == 1; iface.opacity = var1.readUnsignedByte(); diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/Widget.java b/runelite-api/src/main/java/net/runelite/api/widgets/Widget.java index 05869ffefd..0368ee1ae4 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/Widget.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/Widget.java @@ -127,9 +127,9 @@ public class Widget return widget.getModelId(); } - public int getTextureId() + public int getSpriteId() { - return widget.getTextureId(); + return widget.getSpriteId(); } public boolean isHidden() diff --git a/runescape-api/src/main/java/net/runelite/rs/api/Widget.java b/runescape-api/src/main/java/net/runelite/rs/api/Widget.java index 60f8670587..df7a2c10e5 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/Widget.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/Widget.java @@ -110,8 +110,8 @@ public interface Widget @Import("scrollY") int getScrollY(); - @Import("textureId") - int getTextureId(); + @Import("spriteId") + int getSpriteId(); @Import("borderThickness") int getBorderThickness();