From 86b656b2e1bd0aa7629d3be837c750d32e6a23f3 Mon Sep 17 00:00:00 2001 From: "Luis C.M" <42545778+c0508383@users.noreply.github.com> Date: Tue, 22 Aug 2023 18:18:30 -0500 Subject: [PATCH] GuiQuestLog: -Clamped maximum scroll position --- src/main/java/noppes/npcs/client/gui/player/GuiQuestLog.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 de518eb7d..c47f68bee 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiQuestLog.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiQuestLog.java @@ -16,6 +16,7 @@ import noppes.npcs.client.TextBlockClient; import noppes.npcs.client.gui.util.*; import noppes.npcs.constants.EnumPacketServer; import noppes.npcs.constants.EnumPlayerPacket; +import noppes.npcs.util.ValueUtil; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import tconstruct.client.tabs.InventoryTabQuests; @@ -140,7 +141,8 @@ public class GuiQuestLog extends GuiNPCInterface implements ITopButtonListener,I return; } - this.destSideButtonScroll = Math.max(0, this.destSideButtonScroll - Math.signum(this.mouseWheel) * 22); + int maxScroll = (Math.max(0, this.sideButtons.size() - 8) + 8) * 22; + this.destSideButtonScroll = ValueUtil.clamp(this.destSideButtonScroll - Math.signum(this.mouseWheel) * 22, 0, maxScroll); this.sideButtonScroll = this.sideButtonScroll * (1.0F - 0.2F) + (this.destSideButtonScroll * 0.2F); for(Map.Entry entry : this.sideButtons.entrySet()){