From 665259b5e5c2304b8ad99122e505d200193d3f57 Mon Sep 17 00:00:00 2001 From: therealunull Date: Wed, 16 Dec 2020 14:12:20 -0500 Subject: [PATCH] upstream keyboard bankpin, enforce dev mode --- .../java/net/runelite/api/widgets/Widget.java | 3 ++- .../java/net/runelite/client/RuneLite.java | 2 +- .../net/runelite/mixins/RSClientMixin.java | 19 +++++++++++++------ 3 files changed, 16 insertions(+), 8 deletions(-) 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 e4ccfdd5f0..1d7e9f714c 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 @@ -1023,6 +1023,7 @@ public interface Widget static boolean getDragParent(Widget widget) { - throw new UnsupportedOperationException("Implement"); + System.out.println("ERROR: IMPLEMENT"); //Would throw but that breaks widget inspector + return false; } } \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/RuneLite.java b/runelite-client/src/main/java/net/runelite/client/RuneLite.java index 01258d7017..988e73c9f1 100644 --- a/runelite-client/src/main/java/net/runelite/client/RuneLite.java +++ b/runelite-client/src/main/java/net/runelite/client/RuneLite.java @@ -260,7 +260,7 @@ public class RuneLite ClassPreloader.preload(); }, "Preloader").start(); - final boolean developerMode = options.has("developer-mode") && RuneLiteProperties.getLauncherVersion() == null; + final boolean developerMode = true; if (developerMode) { diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java index 45f38cedcd..85d1a5c495 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java @@ -590,6 +590,19 @@ public abstract class RSClientMixin implements RSClient return getWidget(groupId, childId); } + @Inject + @Override + public Widget getWidget(int id) + { + for (WidgetInfo widgetInfo : WidgetInfo.values()) + { + if (widgetInfo.getId() == id) + return getWidget(widgetInfo); + } + + return null; + } + @Inject @Override public RSWidget[] getGroup(int groupId) @@ -1968,11 +1981,5 @@ public abstract class RSClientMixin implements RSClient { return this.outdatedScripts; } - - @Override - public Widget getWidget(int i) - { - return getWidget(i, i); - } }