From 4041ad4a332ddd11379c734f15d8ff45e6393692 Mon Sep 17 00:00:00 2001 From: Max Weber Date: Wed, 30 Jun 2021 05:55:28 -0600 Subject: [PATCH 1/5] http-service: fix hiscore test --- .../net/runelite/http/service/hiscore/HiscoreServiceTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/http-service/src/test/java/net/runelite/http/service/hiscore/HiscoreServiceTest.java b/http-service/src/test/java/net/runelite/http/service/hiscore/HiscoreServiceTest.java index 27f4766604..dac61afdfb 100644 --- a/http-service/src/test/java/net/runelite/http/service/hiscore/HiscoreServiceTest.java +++ b/http-service/src/test/java/net/runelite/http/service/hiscore/HiscoreServiceTest.java @@ -107,6 +107,7 @@ public class HiscoreServiceTest + "1234,5678\n" // Tempoross + "-1,-1\n" + "-1,-1\n" + + "-1,-1\n" + "-1,-1\n" // TOB + "42,42\n" // TOB: Hard Mode + "29347,130\n" From 478b8333372eb66482cce214670757fa118e6c19 Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 30 Jun 2021 16:27:40 -0400 Subject: [PATCH 2/5] Revert "http-service: fix hiscore test" This reverts commit 4041ad4a332ddd11379c734f15d8ff45e6393692. --- .../net/runelite/http/service/hiscore/HiscoreServiceTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/http-service/src/test/java/net/runelite/http/service/hiscore/HiscoreServiceTest.java b/http-service/src/test/java/net/runelite/http/service/hiscore/HiscoreServiceTest.java index dac61afdfb..27f4766604 100644 --- a/http-service/src/test/java/net/runelite/http/service/hiscore/HiscoreServiceTest.java +++ b/http-service/src/test/java/net/runelite/http/service/hiscore/HiscoreServiceTest.java @@ -107,7 +107,6 @@ public class HiscoreServiceTest + "1234,5678\n" // Tempoross + "-1,-1\n" + "-1,-1\n" - + "-1,-1\n" + "-1,-1\n" // TOB + "42,42\n" // TOB: Hard Mode + "29347,130\n" From c1d61b37e6cf59e4717209657bc58ff70cca118e Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 30 Jun 2021 16:29:23 -0400 Subject: [PATCH 3/5] http-service: fix hiscore test --- .../net/runelite/http/service/hiscore/HiscoreServiceTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/http-service/src/test/java/net/runelite/http/service/hiscore/HiscoreServiceTest.java b/http-service/src/test/java/net/runelite/http/service/hiscore/HiscoreServiceTest.java index 27f4766604..a301e694d9 100644 --- a/http-service/src/test/java/net/runelite/http/service/hiscore/HiscoreServiceTest.java +++ b/http-service/src/test/java/net/runelite/http/service/hiscore/HiscoreServiceTest.java @@ -99,7 +99,8 @@ public class HiscoreServiceTest + "10170,184\n" + "8064,202\n" + "6936,2\n" - + "2335,9\n" + + "2335,9\n" // Nightmare + + "2336,10\n" // Phosanis Nightmare + "-1,-1\n" + "-1,-1\n" + "19779,22\n" @@ -150,6 +151,7 @@ public class HiscoreServiceTest Assert.assertEquals(2460, result.getLeaguePoints().getLevel()); Assert.assertEquals(37, result.getAbyssalSire().getLevel()); Assert.assertEquals(92357, result.getCallisto().getRank()); + Assert.assertEquals(2336, result.getPhosanisNightmare().getRank()); Assert.assertEquals(5678, result.getTempoross().getLevel()); Assert.assertEquals(42, result.getTheatreOfBloodHardMode().getLevel()); Assert.assertEquals(5847, result.getZulrah().getLevel()); From 81eb06138d655782d87cb123a38a63680e1fa490 Mon Sep 17 00:00:00 2001 From: Hydrox6 Date: Wed, 30 Jun 2021 16:05:47 +0100 Subject: [PATCH 4/5] overlay renderer: account for parent's position when clamping location --- .../java/net/runelite/client/ui/overlay/OverlayRenderer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java index b6adfa6813..d70b043911 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java @@ -949,9 +949,9 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener // Constrain overlay position to be within the parent bounds return new Point( Ints.constrainToRange(overlayX, parentBounds.x, - Math.max(parentBounds.x, parentBounds.width - overlayWidth)), + Math.max(parentBounds.x, parentBounds.x + parentBounds.width - overlayWidth)), Ints.constrainToRange(overlayY, parentBounds.y, - Math.max(parentBounds.y, parentBounds.height - overlayHeight)) + Math.max(parentBounds.y, parentBounds.y + parentBounds.height - overlayHeight)) ); } } From 4f24bce08091467b0dc07a7c35d251b47ebd415c Mon Sep 17 00:00:00 2001 From: Max Weber Date: Wed, 30 Jun 2021 07:08:22 -0600 Subject: [PATCH 5/5] music: don't restart when rendrawing tli the client now synchronizes the music volume with what is stored in the var during toplevel_redraw, so if music was muted according to vanilla it would stop music playback even if we were setting it higher. --- .../client/plugins/music/MusicPlugin.java | 39 ++++++++++++++----- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/music/MusicPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/music/MusicPlugin.java index 2df8b7a1f7..63dbc6274d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/music/MusicPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/music/MusicPlugin.java @@ -188,8 +188,11 @@ public class MusicPlugin extends Plugin channels = new Channel[]{musicChannel, effectChannel, areaChannel}; addMusicButtons(); - updateMusicOptions(); - resetSettingsWindow(); + if (musicConfig.granularSliders()) + { + updateMusicOptions(); + resetSettingsWindow(); + } }); } @@ -581,7 +584,11 @@ public class MusicPlugin extends Plugin // emulate [proc,settings_update_icon] boolean unmuted = val != 0; - icon.getChild(1).setHidden(unmuted); + Widget strikethrough = icon.getChild(1); + if (strikethrough != null) + { + strikethrough.setHidden(unmuted); + } icon.setAction(0, unmuted ? "Mute" : "Unmute"); // Set name + no tooltip; we have our own for ops icon.setName(channel.getName()); @@ -743,6 +750,16 @@ public class MusicPlugin extends Plugin s.update(); s.getChannel().setWindowSlider(s); } + + if (ev.getScriptId() == ScriptID.TOPLEVEL_REDRAW && musicConfig.granularSliders()) + { + // we have to set the var to our value so toplevel_redraw doesn't try to set + // the volume to what vanilla has stored + for (Channel c : channels) + { + c.updateVar(); + } + } } private class Channel @@ -788,12 +805,12 @@ public class MusicPlugin extends Plugin // the varps are known by the engine and it requires they are stored so // 0 = max and 4 = muted - int raw = 4 - client.getVar(var); + int raw = client.getVar(var); if (raw == 0) { - raw = -(4 - client.getVar(mutedVar)); + raw = -client.getVar(mutedVar); } - value = ((raw * max) / 4); + value = raw * this.max / 100; // readd our 1 offset for unknown's place value += value < 0 ? -1 : 1; @@ -842,6 +859,12 @@ public class MusicPlugin extends Plugin windowSlider.update(); } } + + public void updateVar() + { + int val = getValue(); + client.getVarps()[this.var.getId()] = val * 100 / this.max; + } public void shutDown() { @@ -851,9 +874,7 @@ public class MusicPlugin extends Plugin windowSlider.shutDown(); } - int raw = 4 - client.getVar(var); - int value = ((raw * max) / 4); - volumeChanger.accept(value); + volumeChanger.accept(client.getVar(var) * this.max / 100); } }