Fix merge conflicts

8 files changed, 26 insertions, 27 deletions

diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/REIConfigScreen.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/REIConfigScreen.java
index d1cdccd00..cdc5c8c88 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/REIConfigScreen.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/REIConfigScreen.java
@@ -321,13 +321,13 @@ public class REIConfigScreen extends Screen implements ConfigAccess {
     }
     
     @Override
-    public boolean mouseScrolled(double mouseX, double mouseY, double amount) {
-        if (menu != null && menu.mouseScrolled(mouseX, mouseY, amount))
+    public boolean mouseScrolled(double mouseX, double mouseY, double amountX, double amountY) {
+        if (menu != null && menu.mouseScrolled(mouseX, mouseY, amountX, amountY))
             return true;
         for (GuiEventListener listener : children())
-            if (listener.mouseScrolled(mouseX, mouseY, amount))
+            if (listener.mouseScrolled(mouseX, mouseY, amountX, amountY))
                 return true;
-        return super.mouseScrolled(mouseX, mouseY, amount);
+        return super.mouseScrolled(mouseX, mouseY, amountX, amountY);
     }
     
     @Override
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/options/configure/PanelBoundariesConfiguration.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/options/configure/PanelBoundariesConfiguration.java
index 0530ba503..9c040f00e 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/options/configure/PanelBoundariesConfiguration.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/options/configure/PanelBoundariesConfiguration.java
@@ -271,7 +271,7 @@ public enum PanelBoundariesConfiguration implements OptionValueEntry.Configurato
         public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
             this.innerAlphaAnimator.setTarget(this.innerAlphaAnimator.target() + (1.0F - this.innerAlphaAnimator.target()) * 0.06F);
             this.innerAlphaAnimator.update(delta);
-            this.renderBackground(graphics);
+            super.render(graphics, mouseX, mouseY, delta);
             Rectangle panelBounds = new Rectangle(this.width * 3 / 10, this.height * 4 / 40, this.width * 4 / 10, this.height * 32 / 40);
             Widgets.createCategoryBase(panelBounds).render(graphics, mouseX, mouseY, delta);
             int y = panelBounds.y + 6;
@@ -304,7 +304,6 @@ public enum PanelBoundariesConfiguration implements OptionValueEntry.Configurato
             this.verticalAlignmentSlider.setY(y);
             this.verticalAlignmentSlider.setWidth(panelBounds.width - 12);
             
-            super.render(graphics, mouseX, mouseY, delta);
             renderPreview(graphics, panelBounds, delta);
         }
         
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/options/preview/TooltipPreviewer.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/options/preview/TooltipPreviewer.java
index f3f4d6820..cfe3386aa 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/options/preview/TooltipPreviewer.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/config/options/preview/TooltipPreviewer.java
@@ -42,9 +42,9 @@ import net.minecraft.client.resources.language.I18n;
 import net.minecraft.util.FormattedCharSequence;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
+import org.jetbrains.annotations.Nullable;
 import org.joml.Matrix4f;
 
-import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.IntSupplier;
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/collapsible/CollapsibleEntriesScreen.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/collapsible/CollapsibleEntriesScreen.java
index c072e84e3..f46a7c29b 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/collapsible/CollapsibleEntriesScreen.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/collapsible/CollapsibleEntriesScreen.java
@@ -200,8 +200,8 @@ public class CollapsibleEntriesScreen extends Screen {
     }
     
     @Override
-    public boolean mouseScrolled(double mouseX, double mouseY, double amount) {
-        return this.listWidget.mouseScrolled(mouseX, mouseY, amount) || super.mouseScrolled(mouseX, mouseY, amount);
+    public boolean mouseScrolled(double mouseX, double mouseY, double amountX, double amountY) {
+        return this.listWidget.mouseScrolled(mouseX, mouseY, amountX, amountY) || super.mouseScrolled(mouseX, mouseY, amountX, amountY);
     }
     
     @Override
@@ -302,14 +302,14 @@ public class CollapsibleEntriesScreen extends Screen {
         }
         
         @Override
-        public boolean mouseScrolled(double mouseX, double mouseY, double amount) {
+        public boolean mouseScrolled(double mouseX, double mouseY, double amountX, double amountY) {
             for (CollapsibleEntryWidget widget : children) {
-                if (widget.mouseScrolled(mouseX, mouseY, amount)) {
+                if (widget.mouseScrolled(mouseX, mouseY, amountX, amountY)) {
                     return true;
                 }
             }
-            if (mouseY > this.top) {
-                this.scroller.offset(ClothConfigInitializer.getScrollStep() * -amount, true);
+            if (mouseY > this.top && amountY != 0) {
+                this.scroller.offset(ClothConfigInitializer.getScrollStep() * -amountY, true);
                 return true;
             } else {
                 return false;
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/collapsible/CollapsibleEntryWidget.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/collapsible/CollapsibleEntryWidget.java
index e93d5d733..fda57ba57 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/collapsible/CollapsibleEntryWidget.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/collapsible/CollapsibleEntryWidget.java
@@ -296,10 +296,10 @@ public class CollapsibleEntryWidget extends WidgetWithBounds {
     }
     
     @Override
-    public boolean mouseScrolled(double mouseX, double mouseY, double amount) {
-        if (this.scroller.getMaxScroll() > 0 && this.scroller.getBounds().contains(mouseX, mouseY)) {
-            if ((amount < 0 || this.scroller.scrollAmountInt() != 0) && (amount > 0 || this.scroller.scrollAmountInt() != this.scroller.getMaxScroll())) {
-                this.scroller.offset(ClothConfigInitializer.getScrollStep() * -amount, true);
+    public boolean mouseScrolled(double mouseX, double mouseY, double amountX, double amountY) {
+        if (this.scroller.getMaxScroll() > 0 && this.scroller.getBounds().contains(mouseX, mouseY) && amountY != 0) {
+            if ((amountY < 0 || this.scroller.scrollAmountInt() != 0) && (amountY > 0 || this.scroller.scrollAmountInt() != this.scroller.getMaxScroll())) {
+                this.scroller.offset(ClothConfigInitializer.getScrollStep() * -amountY, true);
                 return true;
             }
         }
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/collapsible/selection/CustomCollapsibleEntrySelectionScreen.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/collapsible/selection/CustomCollapsibleEntrySelectionScreen.java
index 2d5c3bd27..23ea8e6b1 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/collapsible/selection/CustomCollapsibleEntrySelectionScreen.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/screen/collapsible/selection/CustomCollapsibleEntrySelectionScreen.java
@@ -453,13 +453,13 @@ public class CustomCollapsibleEntrySelectionScreen extends Screen {
     }
     
     @Override
-    public boolean mouseScrolled(double mouseX, double mouseY, double amount) {
-        if (getBounds().contains(mouseX, mouseY)) {
-            scrolling.offset(ClothConfigInitializer.getScrollStep() * -amount, true);
+    public boolean mouseScrolled(double mouseX, double mouseY, double amountX, double amountY) {
+        if (getBounds().contains(mouseX, mouseY) && amountY != 0) {
+            scrolling.offset(ClothConfigInitializer.getScrollStep() * -amountY, true);
             return true;
         }
         
-        super.mouseScrolled(mouseX, mouseY, amount);
+        super.mouseScrolled(mouseX, mouseY, amountX, amountY);
         return true;
     }
     
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/MergedWidgetWithBounds.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/MergedWidgetWithBounds.java
index a5b5b1a09..23eb26c90 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/MergedWidgetWithBounds.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/MergedWidgetWithBounds.java
@@ -56,9 +56,9 @@ public class MergedWidgetWithBounds extends WidgetWithBounds {
     }
     
     @Override
-    public boolean mouseScrolled(double mouseX, double mouseY, double amount) {
+    public boolean mouseScrolled(double mouseX, double mouseY, double amountX, double amountY) {
         for (Widget widget : this.widgets) {
-            if (widget.mouseScrolled(mouseX, mouseY, amount))
+            if (widget.mouseScrolled(mouseX, mouseY, amountX, amountY))
                 return true;
         }
         return false;
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/ScrollableViewWidget.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/ScrollableViewWidget.java
index 4f3524c42..126576f49 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/ScrollableViewWidget.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/widget/ScrollableViewWidget.java
@@ -99,13 +99,13 @@ public class ScrollableViewWidget {
             }
             
             @Override
-            public boolean mouseScrolled(double mouseX, double mouseY, double amount) {
-                if (bounds.contains(mouseX, mouseY)) {
-                    scrolling.offset(ClothConfigInitializer.getScrollStep() * -amount, true);
+            public boolean mouseScrolled(double mouseX, double mouseY, double amountX, double amountY) {
+                if (bounds.contains(mouseX, mouseY) && amountY != 0) {
+                    scrolling.offset(ClothConfigInitializer.getScrollStep() * -amountY, true);
                     return true;
                 }
                 
-                return super.mouseScrolled(mouseX, mouseY, amount);
+                return super.mouseScrolled(mouseX, mouseY, amountX, amountY);
             }
         };
     }