From 76ebe3362a41e15308e8221b802e8a2bd3b74f4e Mon Sep 17 00:00:00 2001
From: shedaniel <daniel@shedaniel.me>
Date: Tue, 8 Aug 2023 22:04:05 +0800
Subject: Update to 23w31a

---
 .../rei/plugin/client/categories/DefaultInformationCategory.java    | 6 +++---
 .../plugin/client/categories/beacon/DefaultBeaconBaseCategory.java  | 6 +++---
 .../client/categories/beacon/DefaultBeaconPaymentCategory.java      | 6 +++---
 .../rei/plugin/client/categories/tag/ReferenceTagNodeWidget.java    | 4 +++-
 4 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'default-plugin')

diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultInformationCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultInformationCategory.java
index 38de0e376..d9c6c7c35 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultInformationCategory.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/DefaultInformationCategory.java
@@ -161,9 +161,9 @@ public class DefaultInformationCategory implements DisplayCategory<DefaultInform
         }
         
         @Override
-        public boolean mouseScrolled(double mouseX, double mouseY, double amount) {
-            if (containsMouse(mouseX, mouseY)) {
-                scrolling.offset(ClothConfigInitializer.getScrollStep() * -amount, true);
+        public boolean mouseScrolled(double mouseX, double mouseY, double amountX, double amountY) {
+            if (containsMouse(mouseX, mouseY) && amountY != 0) {
+                scrolling.offset(ClothConfigInitializer.getScrollStep() * -amountY, true);
                 return true;
             }
             return false;
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/beacon/DefaultBeaconBaseCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/beacon/DefaultBeaconBaseCategory.java
index 0c068776d..78b683e79 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/beacon/DefaultBeaconBaseCategory.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/beacon/DefaultBeaconBaseCategory.java
@@ -122,9 +122,9 @@ public class DefaultBeaconBaseCategory implements DisplayCategory<DefaultBeaconB
         }
         
         @Override
-        public boolean mouseScrolled(double double_1, double double_2, double double_3) {
-            if (containsMouse(double_1, double_2)) {
-                scrolling.offset(ClothConfigInitializer.getScrollStep() * -double_3, true);
+        public boolean mouseScrolled(double double_1, double double_2, double amountX, double amountY) {
+            if (containsMouse(double_1, double_2) && amountY != 0) {
+                scrolling.offset(ClothConfigInitializer.getScrollStep() * -amountY, true);
                 return true;
             }
             return false;
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/beacon/DefaultBeaconPaymentCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/beacon/DefaultBeaconPaymentCategory.java
index c70d6e3bc..2172e3046 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/beacon/DefaultBeaconPaymentCategory.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/beacon/DefaultBeaconPaymentCategory.java
@@ -122,9 +122,9 @@ public class DefaultBeaconPaymentCategory implements DisplayCategory<DefaultBeac
         }
         
         @Override
-        public boolean mouseScrolled(double double_1, double double_2, double double_3) {
-            if (containsMouse(double_1, double_2)) {
-                scrolling.offset(ClothConfigInitializer.getScrollStep() * -double_3, true);
+        public boolean mouseScrolled(double double_1, double double_2, double amountX, double amountY) {
+            if (containsMouse(double_1, double_2) && amountY != 0) {
+                scrolling.offset(ClothConfigInitializer.getScrollStep() * -amountY, true);
                 return true;
             }
             return false;
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/tag/ReferenceTagNodeWidget.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/tag/ReferenceTagNodeWidget.java
index 128300f11..04ddb52bf 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/tag/ReferenceTagNodeWidget.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/tag/ReferenceTagNodeWidget.java
@@ -71,7 +71,9 @@ public class ReferenceTagNodeWidget<S, T> extends TagNodeWidget<S, T> {
     public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
         if (this.overflowBounds.intersects(MatrixUtils.transform(graphics.pose().last().pose(), getBounds()))) {
             RenderSystem.setShader(GameRenderer::getPositionTexShader);
-            graphics.blit(new ResourceLocation("textures/gui/advancements/widgets.png"), bounds.x, bounds.y, 1, 128 + 27, 24, 24);
+            graphics.innerBlit(new ResourceLocation("textures/gui/sprites/advancements/task_frame_unobtained.png"),
+                    bounds.x - 1, bounds.x - 1 + 26, bounds.y - 1, bounds.y - 1 + 26, 0,
+                    0, 1, 0, 1);
             this.slot.getBounds().setLocation(bounds.getCenterX() - this.slot.getBounds().getWidth() / 2, bounds.y + (bounds.height - this.slot.getBounds().getHeight()) / 2 + 1);
             this.slot.render(graphics, mouseX, mouseY, delta);
             if (this.containsMouse(mouseX, mouseY)) {
-- 
cgit