From 73d5caef2ac1e3b9b5bc3b30159afc5bcc1f10c0 Mon Sep 17 00:00:00 2001 From: Dreyri Date: Sat, 20 Jan 2018 19:29:16 +0100 Subject: [PATCH 01/15] add setter for textColor --- .../src/main/java/net/runelite/api/widgets/Widget.java | 2 ++ runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java | 4 ++++ 2 files changed, 6 insertions(+) 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 3e00f0862b..258cf81df1 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 @@ -62,6 +62,8 @@ public interface Widget int getTextColor(); + void setTextColor(int textColor); + String getName(); int getModelId(); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java index 456bea52ca..ef7f3ab643 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java @@ -75,6 +75,10 @@ public interface RSWidget extends Widget @Override int getTextColor(); + @Import("textColor") + @Override + void setTextColor(int textColor); + @Import("opacity") int getOpacity(); From 29911e3627243dbf8fdb0305d4a9f6d3ba8c9be5 Mon Sep 17 00:00:00 2001 From: Dreyri Date: Sat, 20 Jan 2018 19:30:34 +0100 Subject: [PATCH 02/15] add setter for spriteId --- .../src/main/java/net/runelite/api/widgets/Widget.java | 2 ++ runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java | 4 ++++ 2 files changed, 6 insertions(+) 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 258cf81df1..a52f426b7e 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 @@ -70,6 +70,8 @@ public interface Widget int getSpriteId(); + void setSpriteId(int spriteId); + boolean isHidden(); void setHidden(boolean hidden); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java index ef7f3ab643..82a035dee9 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java @@ -142,6 +142,10 @@ public interface RSWidget extends Widget @Override int getSpriteId(); + @Import("spriteId") + @Override + void setSpriteId(int spriteId); + @Import("borderThickness") int getBorderThickness(); From 13d4c9e636b48e25ec9511f31d7e277d8322824a Mon Sep 17 00:00:00 2001 From: Dreyri Date: Sat, 20 Jan 2018 19:31:28 +0100 Subject: [PATCH 03/15] add setter for width --- .../src/main/java/net/runelite/api/widgets/Widget.java | 2 ++ runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java | 4 ++++ 2 files changed, 6 insertions(+) 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 a52f426b7e..fe4133b615 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 @@ -80,6 +80,8 @@ public interface Widget int getWidth(); + void setWidth(int width); + int getHeight(); Rectangle getBounds(); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java index 82a035dee9..413b8ec137 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java @@ -102,6 +102,10 @@ public interface RSWidget extends Widget @Override int getWidth(); + @Import("width") + @Override + void setWidth(int width); + @Import("height") @Override int getHeight(); From 47e2717a758bda8e0eaf48c3f4344ec69ab4cc64 Mon Sep 17 00:00:00 2001 From: Dreyri Date: Sat, 20 Jan 2018 19:32:07 +0100 Subject: [PATCH 04/15] add setter for height --- .../src/main/java/net/runelite/api/widgets/Widget.java | 2 ++ runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java | 4 ++++ 2 files changed, 6 insertions(+) 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 fe4133b615..17a9bb31da 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 @@ -84,6 +84,8 @@ public interface Widget int getHeight(); + void setHeight(int height); + Rectangle getBounds(); Collection getWidgetItems(); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java index 413b8ec137..7225b1cd4e 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java @@ -110,6 +110,10 @@ public interface RSWidget extends Widget @Override int getHeight(); + @Import("height") + @Override + void setHeight(int height); + @Import("isHidden") boolean isRSHidden(); From 4a20e9ca07e0731c3908c0fe498ac4ffd7a11217 Mon Sep 17 00:00:00 2001 From: Dreyri Date: Sat, 20 Jan 2018 23:53:01 +0100 Subject: [PATCH 05/15] add setter for name --- .../src/main/java/net/runelite/api/widgets/Widget.java | 2 ++ .../src/main/java/net/runelite/mixins/RSWidgetMixin.java | 7 +++++++ .../src/main/java/net/runelite/rs/api/RSWidget.java | 3 +++ 3 files changed, 12 insertions(+) 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 17a9bb31da..f9c03408ed 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 @@ -66,6 +66,8 @@ public interface Widget String getName(); + void setName(String name); + int getModelId(); int getSpriteId(); diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java index 0d1eb685b2..d0584746c7 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java @@ -105,6 +105,13 @@ public abstract class RSWidgetMixin implements RSWidget return getRSName().replace('\u00A0', ' '); } + @Inject + @Override + public void setName(String name) + { + setRSName(name.replace(' ', '\u00A0')); + } + @Inject @Override public boolean isHidden() diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java index 7225b1cd4e..fa7f6a1b6e 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java @@ -67,6 +67,9 @@ public interface RSWidget extends Widget @Import("name") String getRSName(); + @Import("name") + void setRSName(String name); + @Import("text") @Override void setText(String text); From ee6dab719e45dcf167ddc53735721865df31e422 Mon Sep 17 00:00:00 2001 From: Dreyri Date: Sun, 21 Jan 2018 02:25:37 +0100 Subject: [PATCH 06/15] add setter for contentType --- .../src/main/java/net/runelite/api/widgets/Widget.java | 2 ++ runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java | 4 ++++ 2 files changed, 6 insertions(+) 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 f9c03408ed..1698ea91f6 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 @@ -36,6 +36,8 @@ public interface Widget int getContentType(); + void setContentType(int contentType); + Widget getParent(); int getParentId(); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java index fa7f6a1b6e..482499e457 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java @@ -139,6 +139,10 @@ public interface RSWidget extends Widget @Override int getContentType(); + @Import("contentType") + @Override + void setContentType(int contentType); + @Import("type") @Override int getType(); From c4c49d1443183297e4d5124baefff594b69ece5d Mon Sep 17 00:00:00 2001 From: Dreyri Date: Sun, 21 Jan 2018 02:26:20 +0100 Subject: [PATCH 07/15] add setter for type --- .../src/main/java/net/runelite/api/widgets/Widget.java | 2 ++ runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java | 4 ++++ 2 files changed, 6 insertions(+) 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 1698ea91f6..03591cfaa7 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 @@ -34,6 +34,8 @@ public interface Widget int getType(); + void setType(int type); + int getContentType(); void setContentType(int contentType); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java index 482499e457..14603504a0 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java @@ -147,6 +147,10 @@ public interface RSWidget extends Widget @Override int getType(); + @Import("type") + @Override + void setType(int type); + @Import("scrollX") int getScrollX(); From 7f5875cc282c3113ac81d1c754117f96c0cabd68 Mon Sep 17 00:00:00 2001 From: Dreyri Date: Sun, 21 Jan 2018 02:27:40 +0100 Subject: [PATCH 08/15] add getter/setter for scrollX --- .../src/main/java/net/runelite/api/widgets/Widget.java | 4 ++++ .../src/main/java/net/runelite/rs/api/RSWidget.java | 5 +++++ 2 files changed, 9 insertions(+) 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 03591cfaa7..7e89e0b971 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 @@ -103,4 +103,8 @@ public interface Widget int getItemQuantity(); boolean contains(Point point); + + int getScrollX(); + + void setScrollX(int scrollX); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java index 14603504a0..61bb85d82d 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java @@ -152,8 +152,13 @@ public interface RSWidget extends Widget void setType(int type); @Import("scrollX") + @Override int getScrollX(); + @Import("scrollX") + @Override + void setScrollX(int scrollX); + @Import("scrollY") int getScrollY(); From 0946a48d7e89bdc64ab79c9867512ce92f3d4ac3 Mon Sep 17 00:00:00 2001 From: Dreyri Date: Sun, 21 Jan 2018 02:30:01 +0100 Subject: [PATCH 09/15] add getter/setter for scrollY --- .../src/main/java/net/runelite/api/widgets/Widget.java | 4 ++++ .../src/main/java/net/runelite/rs/api/RSWidget.java | 5 +++++ 2 files changed, 9 insertions(+) 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 7e89e0b971..60665f5869 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 @@ -107,4 +107,8 @@ public interface Widget int getScrollX(); void setScrollX(int scrollX); + + int getScrollY(); + + void setScrollY(int scrollY); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java index 61bb85d82d..3143226496 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java @@ -160,8 +160,13 @@ public interface RSWidget extends Widget void setScrollX(int scrollX); @Import("scrollY") + @Override int getScrollY(); + @Import("scrollY") + @Override + void setScrollY(int scrollY); + @Import("spriteId") @Override int getSpriteId(); From 942e79e6bd70494bae838c3b6c8daf5c6ba74432 Mon Sep 17 00:00:00 2001 From: Dreyri Date: Sun, 21 Jan 2018 02:32:23 +0100 Subject: [PATCH 10/15] add setter/getter for originalX --- .../src/main/java/net/runelite/api/widgets/Widget.java | 4 ++++ .../src/main/java/net/runelite/rs/api/RSWidget.java | 5 +++++ 2 files changed, 9 insertions(+) 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 60665f5869..3bf7bf18a5 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 @@ -111,4 +111,8 @@ public interface Widget int getScrollY(); void setScrollY(int scrollY); + + int getOriginalX(); + + void setOriginalX(int originalX); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java index 3143226496..bf23a01534 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java @@ -187,8 +187,13 @@ public interface RSWidget extends Widget int getItemQuantity(); @Import("originalX") + @Override int getOriginalX(); + @Import("originalX") + @Override + void setOriginalX(int originalX); + @Import("originalY") int getOriginalY(); From 9f8cc8e1463e21923c43bed9b2980f940eab802c Mon Sep 17 00:00:00 2001 From: Dreyri Date: Sun, 21 Jan 2018 02:33:16 +0100 Subject: [PATCH 11/15] add getter/setter for originalY --- .../src/main/java/net/runelite/api/widgets/Widget.java | 4 ++++ .../src/main/java/net/runelite/rs/api/RSWidget.java | 5 +++++ 2 files changed, 9 insertions(+) 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 3bf7bf18a5..dd923f4a78 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 @@ -115,4 +115,8 @@ public interface Widget int getOriginalX(); void setOriginalX(int originalX); + + int getOriginalY(); + + void setOriginalY(int originalY); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java index bf23a01534..82c5bbb7fc 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java @@ -195,8 +195,13 @@ public interface RSWidget extends Widget void setOriginalX(int originalX); @Import("originalY") + @Override int getOriginalY(); + @Import("originalY") + @Override + void setOriginalY(int originalY); + @Import("paddingX") int getPaddingX(); From 685b0706f9ef58cb5bf1370aebdcb83e72ffee0f Mon Sep 17 00:00:00 2001 From: Dreyri Date: Sun, 21 Jan 2018 02:34:13 +0100 Subject: [PATCH 12/15] add getter for paddingX --- runelite-api/src/main/java/net/runelite/api/widgets/Widget.java | 2 ++ runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java | 1 + 2 files changed, 3 insertions(+) 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 dd923f4a78..e1fafc957e 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 @@ -119,4 +119,6 @@ public interface Widget int getOriginalY(); void setOriginalY(int originalY); + + int getPaddingX(); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java index 82c5bbb7fc..12f7be5573 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java @@ -203,6 +203,7 @@ public interface RSWidget extends Widget void setOriginalY(int originalY); @Import("paddingX") + @Override int getPaddingX(); @Import("paddingY") From db45f4965b8b36bb39891380058888b5087a1ce5 Mon Sep 17 00:00:00 2001 From: Dreyri Date: Sun, 21 Jan 2018 02:34:35 +0100 Subject: [PATCH 13/15] add getter for paddingY --- runelite-api/src/main/java/net/runelite/api/widgets/Widget.java | 2 ++ runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java | 1 + 2 files changed, 3 insertions(+) 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 e1fafc957e..426065356b 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 @@ -121,4 +121,6 @@ public interface Widget void setOriginalY(int originalY); int getPaddingX(); + + int getPaddingY(); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java index 12f7be5573..1224ab14d9 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java @@ -207,5 +207,6 @@ public interface RSWidget extends Widget int getPaddingX(); @Import("paddingY") + @Override int getPaddingY(); } From 32b31dc3a25aecfe00a38275b910f93c04e46e1e Mon Sep 17 00:00:00 2001 From: Dreyri Date: Sun, 21 Jan 2018 02:35:55 +0100 Subject: [PATCH 14/15] add setter for paddingX --- .../src/main/java/net/runelite/api/widgets/Widget.java | 2 ++ runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java | 4 ++++ 2 files changed, 6 insertions(+) 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 426065356b..52ceac2945 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 @@ -122,5 +122,7 @@ public interface Widget int getPaddingX(); + void setPaddingX(int paddingX); + int getPaddingY(); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java index 1224ab14d9..9e60d4954b 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java @@ -206,6 +206,10 @@ public interface RSWidget extends Widget @Override int getPaddingX(); + @Import("paddingX") + @Override + void setPaddingX(int paddingX); + @Import("paddingY") @Override int getPaddingY(); From 9d96f65ae158cf6ec608720ea24917de62a75bd3 Mon Sep 17 00:00:00 2001 From: Dreyri Date: Sun, 21 Jan 2018 02:36:40 +0100 Subject: [PATCH 15/15] add setter for paddingY --- .../src/main/java/net/runelite/api/widgets/Widget.java | 2 ++ runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java | 4 ++++ 2 files changed, 6 insertions(+) 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 52ceac2945..416a3d8d66 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 @@ -125,4 +125,6 @@ public interface Widget void setPaddingX(int paddingX); int getPaddingY(); + + void setPaddingY(int paddingY); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java index 9e60d4954b..cbf14f0aa9 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java @@ -213,4 +213,8 @@ public interface RSWidget extends Widget @Import("paddingY") @Override int getPaddingY(); + + @Import("paddingY") + @Override + void setPaddingY(int paddingY); }