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 mods = null; private final Set 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 9c8ab393..84e343dd 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 @@ -17,7 +17,7 @@ public abstract class EntryListWidget extends ListWidget implements ListWidgetHe protected int mouseX; protected int mouseY; 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); @@ -90,7 +90,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 { @@ -102,7 +102,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(); } @@ -285,7 +285,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; } @@ -296,7 +296,7 @@ public void setScrollAmount(double amount) { if (amount > getMaxScroll()) { amount = getMaxScroll(); } - this.scrollAmount = amount; + super.scrollAmount = (float) (this.scrollAmount = amount); } @Override @@ -306,10 +306,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); } }