From b61090f996c5206b9c9d9fc78f989162cd03f254 Mon Sep 17 00:00:00 2001 From: "Luis C.M" <42545778+c0508383@users.noreply.github.com> Date: Tue, 22 Aug 2023 18:42:43 -0500 Subject: [PATCH] GuiQuestLog: -Fixed scroll clamping --- .../java/noppes/npcs/client/gui/player/GuiQuestLog.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiQuestLog.java b/src/main/java/noppes/npcs/client/gui/player/GuiQuestLog.java index c47f68bee..f95aec81e 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiQuestLog.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiQuestLog.java @@ -141,8 +141,8 @@ public class GuiQuestLog extends GuiNPCInterface implements ITopButtonListener,I return; } - int maxScroll = (Math.max(0, this.sideButtons.size() - 8) + 8) * 22; - this.destSideButtonScroll = ValueUtil.clamp(this.destSideButtonScroll - Math.signum(this.mouseWheel) * 22, 0, maxScroll); + int maxScroll = Math.max(0, this.sideButtons.size() - 10) * 22; + this.destSideButtonScroll = ValueUtil.clamp(this.destSideButtonScroll - Math.signum(this.mouseWheel) * 22, -maxScroll, 0); this.sideButtonScroll = this.sideButtonScroll * (1.0F - 0.2F) + (this.destSideButtonScroll * 0.2F); for(Map.Entry entry : this.sideButtons.entrySet()){ @@ -150,7 +150,7 @@ public class GuiQuestLog extends GuiNPCInterface implements ITopButtonListener,I GuiMenuSideButton button = entry.getValue(); button.yPosition = (int) (this.guiTop +2 + buttonNumber*21 + this.sideButtonScroll); - if (button.yPosition >= this.guiTop + 2 && button.yPosition < this.guiTop + 22 * 8 + 2) { + if (button.yPosition >= this.guiTop && button.yPosition < this.guiTop + 22 * 8) { button.drawButton(mc, i, j); } }