From 04561578b3e03d4e4dac4e8b8412202f00a4f1f5 Mon Sep 17 00:00:00 2001
From: Space Walker <spacedoesrs@gmail.com>
Date: Mon, 29 Jan 2024 23:12:49 +0100
Subject: [PATCH] fix quick configure button

it appeared on the wrong entry if the mod list was scrolled down
---
 .../modmenu/gui/widget/ModListWidget.java          |  1 -
 .../gui/widget/entries/EntryListWidget.java        | 14 +++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/terraformersmc/modmenu/gui/widget/ModListWidget.java b/src/main/java/com/terraformersmc/modmenu/gui/widget/ModListWidget.java
index 06acdcab..5f1cfba9 100644
--- a/src/main/java/com/terraformersmc/modmenu/gui/widget/ModListWidget.java
+++ b/src/main/java/com/terraformersmc/modmenu/gui/widget/ModListWidget.java
@@ -28,7 +28,6 @@ public class ModListWidget extends EntryListWidget implements AutoCloseable {
 	private List<Mod> mods = null;
 	private final Set<Mod> addedMods = new HashSet<>();
 	private String selectedModId = null;
-	private boolean scrolling;
 	private final FabricIconHandler iconHandler = new FabricIconHandler();
 	private ModListEntry selected;
 
diff --git a/src/main/java/com/terraformersmc/modmenu/gui/widget/entries/EntryListWidget.java b/src/main/java/com/terraformersmc/modmenu/gui/widget/entries/EntryListWidget.java
index ee53b2c7..a25b9be9 100644
--- a/src/main/java/com/terraformersmc/modmenu/gui/widget/entries/EntryListWidget.java
+++ b/src/main/java/com/terraformersmc/modmenu/gui/widget/entries/EntryListWidget.java
@@ -15,7 +15,7 @@
 public abstract class EntryListWidget extends ListWidget implements ListWidgetHelper {
 
 	protected double scrollAmount;
-	private boolean scrolling;
+	protected boolean scrolling;
 
 	public EntryListWidget(Minecraft minecraft, int i, int j, int k, int l, int m) {
 		super(minecraft, i, j, k, l, m);
@@ -88,7 +88,7 @@ public void render(int mouseX, int mouseY, float tickDelta) {
 						this.mouseYStart = -2.0f;
 					}
 				} else if (this.mouseYStart >= 0.0f) {
-					this.scrollAmount -= ((float) mouseY - this.mouseYStart) * this.scrollSpeedMultiplier;
+					super.scrollAmount = (float) (this.scrollAmount -= ((float) mouseY - this.mouseYStart) * this.scrollSpeedMultiplier);
 					this.mouseYStart = mouseY;
 				}
 			} else {
@@ -100,7 +100,7 @@ public void render(int mouseX, int mouseY, float tickDelta) {
 						} else if (n9 < 0) {
 							n9 = 1;
 						}
-						this.scrollAmount += (float) (n9 * this.entryHeight / 2);
+						super.scrollAmount = (float) (this.scrollAmount += (float) (n9 * this.entryHeight / 2));
 					}
 					this.minecraft.screen.handleMouse();
 				}
@@ -283,7 +283,7 @@ public int getScrollAmount() {
 	}
 
 	protected void scroll(int i) {
-		this.setScrollAmount(this.getScrollAmount() + (double)i);
+		this.setScrollAmount(this.scrollAmount + (double)i);
 		this.mouseYStart = -2.0F;
 	}
 
@@ -294,7 +294,7 @@ public void setScrollAmount(double amount) {
 		if (amount > getMaxScroll()) {
 			amount = getMaxScroll();
 		}
-		this.scrollAmount = amount;
+		super.scrollAmount = (float) (this.scrollAmount = amount);
 	}
 
 	@Override
@@ -304,10 +304,10 @@ public void doCapScrolling() {
 			max /= 2;
 		}
 		if (this.scrollAmount < 0.0F) {
-			this.scrollAmount = 0.0F;
+			super.scrollAmount = (float) (this.scrollAmount = 0.0F);
 		}
 		if (this.scrollAmount > max) {
-			this.scrollAmount = max;
+			super.scrollAmount = (float) (this.scrollAmount = max);
 		}
 	}