From 30354c925e0201031c6cb71aa4a7bc68d5698686 Mon Sep 17 00:00:00 2001 From: ThatGamerBlue Date: Thu, 1 Aug 2019 14:56:12 +0100 Subject: [PATCH 1/3] http-api: fix api going down after runelite update --- http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java b/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java index 2687df25cf..6f8d1abeff 100644 --- a/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java +++ b/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java @@ -197,7 +197,7 @@ public class RuneLiteAPI public static String getVersion() { - return version; + return upstreamVersion; } public static int getRsVersion() From 9f0b678232f164c5b8d3bf4bec5a1fa34a23ffc9 Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Thu, 1 Aug 2019 18:00:54 +0200 Subject: [PATCH 2/3] linecomponent: Fix items not being positioned correctly (#1219) * linecomponent: Fix items not being positioned correctly * Revert "boosts: Separate icons so they aren't stacked (#1211)" This reverts commit bcc75c1e947b71030426468f4d0263827ceec681. --- .../net/runelite/client/plugins/boosts/CombatIconsOverlay.java | 2 -- .../runelite/client/ui/overlay/components/LineComponent.java | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/CombatIconsOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/CombatIconsOverlay.java index 787651f22c..c3c69d9561 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/boosts/CombatIconsOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/boosts/CombatIconsOverlay.java @@ -3,7 +3,6 @@ package net.runelite.client.plugins.boosts; import java.awt.Color; import java.awt.Dimension; import java.awt.Graphics2D; -import java.awt.Point; import java.awt.Rectangle; import java.awt.image.BufferedImage; import javax.inject.Inject; @@ -60,7 +59,6 @@ class CombatIconsOverlay extends Overlay panelComponent.getChildren().clear(); panelComponent.setPreferredSize(new Dimension(28, 0)); - panelComponent.setGap(new Point(0, 18)); panelComponent.setWrapping(2); panelComponent.setBackgroundColor(null); panelComponent.setBorder(new Rectangle()); diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/LineComponent.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/LineComponent.java index a8bb184059..f6c2f5e77c 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/LineComponent.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/components/LineComponent.java @@ -136,6 +136,7 @@ public class LineComponent implements LayoutableRenderableEntity rightLineComponent.setText(right); rightLineComponent.setColor(rightColor); rightLineComponent.render(graphics); + y += metrics.getHeight(); final Dimension dimension = new Dimension(preferredSize.width, y - baseY); bounds.setLocation(preferredLocation); From 9bc8e6e5a6bf2ab2eb82cc5144e2f846a72c4693 Mon Sep 17 00:00:00 2001 From: Ganom Date: Thu, 1 Aug 2019 12:17:46 -0400 Subject: [PATCH 3/3] bootstrap: fix extra \ added. --- .../main/java/net/runelite/client/util/bootstrap/Bootstrap.java | 2 +- .../java/net/runelite/client/util/bootstrap/Bootstrapper.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrap.java b/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrap.java index 62fb948cfb..f26b23035b 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrap.java +++ b/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrap.java @@ -14,7 +14,7 @@ import org.codehaus.plexus.util.FileUtils; public class Bootstrap { - private String projectVersion = "1.5.30-SNAPSHOT"; + private String projectVersion = "1.5.31-SNAPSHOT"; String buildCommit = "6fe334c02648d3f8b38625e3175e3f547d54aa37"; Client client = new Client(); String[] clientJvm9Arguments = new String[]{ diff --git a/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrapper.java b/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrapper.java index edce589251..770c377457 100644 --- a/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrapper.java +++ b/runelite-client/src/main/java/net/runelite/client/util/bootstrap/Bootstrapper.java @@ -32,7 +32,7 @@ public class Bootstrapper } else { - remoteLocation = "/live/"; + remoteLocation = "live/"; localLocation = "./live/"; Gson gson = new GsonBuilder().disableHtmlEscaping().setPrettyPrinting().create(); File dir = new File("./live/");