From d0699717a50ef4b0513b823c9ce7e6fdebe5138d Mon Sep 17 00:00:00 2001 From: Ganom Date: Thu, 8 Aug 2019 14:05:39 -0400 Subject: [PATCH 1/2] menuentryswapper: Fix birdhouse priority entries. (#1281) * menuentryswapper: Fix birdhouse priority entries. * menuentryswapper: Actually fix birdhouse this time? --- .../menuentryswapper/MenuEntrySwapperPlugin.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java index 3c2a6ab602..6f725c02ab 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java @@ -1265,6 +1265,14 @@ public class MenuEntrySwapperPlugin extends Plugin if (this.swapBirdhouseEmpty) { menuManager.addPriorityEntry("Empty", "Birdhouse"); + menuManager.addPriorityEntry("Empty", "Oak Birdhouse"); + menuManager.addPriorityEntry("Empty", "Willow Birdhouse"); + menuManager.addPriorityEntry("Empty", "Teak Birdhouse"); + menuManager.addPriorityEntry("Empty", "Maple Birdhouse"); + menuManager.addPriorityEntry("Empty", "Mahogany Birdhouse"); + menuManager.addPriorityEntry("Empty", "Yew Birdhouse"); + menuManager.addPriorityEntry("Empty", "Magic Birdhouse"); + menuManager.addPriorityEntry("Empty", "Redwood Birdhouse"); } if (this.swapQuick) @@ -1565,6 +1573,14 @@ public class MenuEntrySwapperPlugin extends Plugin menuManager.removePriorityEntry("Activate", "Box trap"); menuManager.removePriorityEntry("Chase"); menuManager.removePriorityEntry("Empty", "Birdhouse"); + menuManager.removePriorityEntry("Empty", "Oak Birdhouse"); + menuManager.removePriorityEntry("Empty", "Willow Birdhouse"); + menuManager.removePriorityEntry("Empty", "Teak Birdhouse"); + menuManager.removePriorityEntry("Empty", "Maple Birdhouse"); + menuManager.removePriorityEntry("Empty", "Mahogany Birdhouse"); + menuManager.removePriorityEntry("Empty", "Yew Birdhouse"); + menuManager.removePriorityEntry("Empty", "Magic Birdhouse"); + menuManager.removePriorityEntry("Empty", "Redwood Birdhouse"); menuManager.removePriorityEntry("Quick-enter"); menuManager.removePriorityEntry("Quick-start"); menuManager.removePriorityEntry("Quick-pass"); From ca14485b2b07f2e7966694804902d59a6ed5c306 Mon Sep 17 00:00:00 2001 From: ThatGamerBlue Date: Thu, 8 Aug 2019 21:35:57 +0100 Subject: [PATCH 2/2] gradle: update env vars to use underscores (#1287) Provides better compatibility with /bin/sh, /bin/bash and the likes, which don't accept env vars with dashes in the name. --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 3ccf2b7c9d..7e420555b7 100644 --- a/build.gradle +++ b/build.gradle @@ -79,8 +79,8 @@ subprojects { uploadArchives { repositories { mavenDeployer { - repository(url: System.getenv("NEXUS-URL")) { - authentication(userName: System.getenv("NEXUS-USER"), password: System.getenv("NEXUS-PASSWORD")) + repository(url: System.getenv("NEXUS_URL")) { + authentication(userName: System.getenv("NEXUS_USER"), password: System.getenv("NEXUS_PASSWORD")) } } }