Update to 23w31a

40 files changed, 148 insertions, 144 deletions

diff --git a/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/DelegateWidget.java b/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/DelegateWidget.java
index 5dd7c5a00..e0e12524c 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/DelegateWidget.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/gui/widgets/DelegateWidget.java
@@ -85,8 +85,8 @@ public class DelegateWidget extends WidgetWithBounds {
     }
     
     @Override
-    public boolean mouseScrolled(double mouseX, double mouseY, double amount) {
-        return delegate().mouseScrolled(mouseX, mouseY, amount);
+    public boolean mouseScrolled(double mouseX, double mouseY, double amountX, double amountY) {
+        return delegate().mouseScrolled(mouseX, mouseY, amountX, amountY);
     }
     
     @Override
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)) {
diff --git a/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinClientPacketListener.java b/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinClientPacketListener.java
index 5f355b9fa..4b4f394e7 100644
--- a/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinClientPacketListener.java
+++ b/fabric/src/main/java/me/shedaniel/rei/mixin/fabric/MixinClientPacketListener.java
@@ -25,8 +25,8 @@ package me.shedaniel.rei.mixin.fabric;
 
 import me.shedaniel.rei.RoughlyEnoughItemsCoreClient;
 import net.minecraft.client.multiplayer.ClientPacketListener;
+import net.minecraft.network.protocol.common.ClientboundUpdateTagsPacket;
 import net.minecraft.network.protocol.game.ClientboundUpdateRecipesPacket;
-import net.minecraft.network.protocol.game.ClientboundUpdateTagsPacket;
 import net.minecraft.world.item.crafting.RecipeManager;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -48,4 +48,4 @@ public class MixinClientPacketListener {
     private void handleUpdateTags(ClientboundUpdateTagsPacket packet, CallbackInfo ci) {
         RoughlyEnoughItemsCoreClient.POST_UPDATE_TAGS.invoker().run();
     }
-}
\ No newline at end of file
+}
diff --git a/fabric/src/main/resources/error_notifier.json b/fabric/src/main/resources/error_notifier.json
index 62ceb1414..d551a7504 100644
--- a/fabric/src/main/resources/error_notifier.json
+++ b/fabric/src/main/resources/error_notifier.json
@@ -12,15 +12,15 @@
             "type": "depends",
             "modId": "architectury",
             "modName": "Architectury API",
-            "versions": ">=9.0.7 <10.0.0",
+            "versions": ">=10.0.0 <11.0.0",
             "url": "https://www.curseforge.com/minecraft/mc-mods/architectury-api/"
         },
         {
             "type": "depends",
             "modId": "cloth-config2",
             "modName": "Cloth Config",
-            "versions": ">=11.0.0 <12.0.0",
+            "versions": ">=12.0.0 <13.0.0",
             "url": "https://www.curseforge.com/minecraft/mc-mods/cloth-config/"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/fabric/src/main/resources/roughlyenoughitems.accessWidener b/fabric/src/main/resources/roughlyenoughitems.accessWidener
index 39c484b83..66d5704ee 100644
--- a/fabric/src/main/resources/roughlyenoughitems.accessWidener
+++ b/fabric/src/main/resources/roughlyenoughitems.accessWidener
@@ -1,7 +1,7 @@
 accessWidener v1     named
 accessible    class  net/minecraft/client/gui/Font$StringRenderOutput
 accessible    class  net/minecraft/world/item/alchemy/PotionBrewing$Mix
-accessible    field  net/minecraft/client/gui/components/ImageButton                           resourceLocation        Lnet/minecraft/resources/ResourceLocation;
+accessible    field  net/minecraft/client/gui/components/ImageButton                           sprites                 Lnet/minecraft/client/gui/components/WidgetSprites;
 accessible    field  net/minecraft/client/gui/screens/inventory/AbstractContainerScreen        hoveredSlot             Lnet/minecraft/world/inventory/Slot;
 accessible    field  net/minecraft/client/gui/screens/inventory/AbstractContainerScreen        imageHeight             I
 accessible    field  net/minecraft/client/gui/screens/inventory/AbstractContainerScreen        imageWidth              I
@@ -39,4 +39,4 @@ accessible field net/minecraft/world/item/crafting/SmithingTransformRecipe base
 accessible field net/minecraft/world/item/crafting/SmithingTransformRecipe addition Lnet/minecraft/world/item/crafting/Ingredient;
 accessible field net/minecraft/world/item/crafting/SmithingTrimRecipe template Lnet/minecraft/world/item/crafting/Ingredient;
 accessible field net/minecraft/world/item/crafting/SmithingTrimRecipe base Lnet/minecraft/world/item/crafting/Ingredient;
-accessible field net/minecraft/world/item/crafting/SmithingTrimRecipe addition Lnet/minecraft/world/item/crafting/Ingredient;
\ No newline at end of file
+accessible field net/minecraft/world/item/crafting/SmithingTrimRecipe addition Lnet/minecraft/world/item/crafting/Ingredient;
diff --git a/gradle.properties b/gradle.properties
index 7d8dd18f4..8f3b0ad7b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,14 +1,14 @@
 org.gradle.jvmargs=-Xmx6G
 base_version=12.0
 unstable=false
-supported_version=1.20(.1)
-minecraft_version=1.20
-forgeEnabled=true
+supported_version=1.20.2 (23w31a)
+minecraft_version=23w31a
+forgeEnabled=false
 forge_version=46.0.1
-fabricloader_version=0.14.21
-cloth_config_version=11.0.99
+fabricloader_version=0.14.22
+cloth_config_version=12.0.107
 modmenu_version=7.0.0
-fabric_api=0.83.0+1.20
-architectury_version=9.0.7
+fabric_api=0.86.1+1.20.2
+architectury_version=10.0.1
 api_exculde=
 #api_include=me.shedaniel.cloth:cloth-events,me.shedaniel.cloth:config-2,me.sargunvohra.mcmods:autoconfig1u,org.jetbrains:annotations,net.fabricmc.fabric-api:fabric
diff --git a/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCoreClient.java b/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCoreClient.java
index 3698aed64..bbf4e5308 100644
--- a/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCoreClient.java
+++ b/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsCoreClient.java
@@ -356,9 +356,9 @@ public class RoughlyEnoughItemsCoreClient {
                 ((ScreenRegistryImpl) ScreenRegistry.getInstance()).getLastRendererProvider(screen);
             }
             if (ConfigObject.getInstance().doesDisableRecipeBook() && screen instanceof AbstractContainerScreen) {
-                access.getRenderables().removeIf(widget -> widget instanceof ImageButton button && button.resourceLocation.equals(recipeButtonTex));
-                access.getNarratables().removeIf(widget -> widget instanceof ImageButton button && button.resourceLocation.equals(recipeButtonTex));
-                screen.children().removeIf(widget -> widget instanceof ImageButton button && button.resourceLocation.equals(recipeButtonTex));
+                access.getRenderables().removeIf(widget -> widget instanceof ImageButton button && button.sprites.enabled().equals(recipeButtonTex));
+                access.getNarratables().removeIf(widget -> widget instanceof ImageButton button && button.sprites.enabled().equals(recipeButtonTex));
+                screen.children().removeIf(widget -> widget instanceof ImageButton button && button.sprites.enabled().equals(recipeButtonTex));
             }
         });
         ClientScreenInputEvent.MOUSE_CLICKED_PRE.register((minecraftClient, screen, mouseX, mouseY, button) -> {
@@ -386,11 +386,11 @@ public class RoughlyEnoughItemsCoreClient {
             }
             return EventResult.pass();
         });
-        ClientScreenInputEvent.MOUSE_SCROLLED_PRE.register((minecraftClient, screen, mouseX, mouseY, amount) -> {
+        ClientScreenInputEvent.MOUSE_SCROLLED_PRE.register((minecraftClient, screen, mouseX, mouseY, amountX, amountY) -> {
             if (shouldReturn(screen) || screen instanceof DisplayScreen)
                 return EventResult.pass();
             resetFocused(screen);
-            if (REIRuntime.getInstance().isOverlayVisible() && getOverlay().mouseScrolled(mouseX, mouseY, amount)
+            if (REIRuntime.getInstance().isOverlayVisible() && getOverlay().mouseScrolled(mouseX, mouseY, amountX, amountY)
                 && resetFocused(screen))
                 return EventResult.interruptFalse();
             return EventResult.pass();
diff --git a/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java b/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java
index 1844edf1e..f796dc637 100644
--- a/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java
+++ b/runtime/src/main/java/me/shedaniel/rei/RoughlyEnoughItemsNetwork.java
@@ -122,7 +122,7 @@ public class RoughlyEnoughItemsNetwork {
             try {
                 boolean shift = packetByteBuf.readBoolean();
                 try {
-                    InputSlotCrafter<AbstractContainerMenu, Container, Display> crafter = InputSlotCrafter.start(category, container, player, packetByteBuf.readAnySizeNbt(), shift);
+                    InputSlotCrafter<AbstractContainerMenu, Container, Display> crafter = InputSlotCrafter.start(category, container, player, packetByteBuf.readNbt(), shift);
                 } catch (InputSlotCrafter.NotEnoughMaterialsException e) {
                     if (!(container instanceof RecipeBookMenu)) {
                         return;
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringScreen.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringScreen.java
index b10232ac5..b0501c7ba 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringScreen.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/entries/FilteringScreen.java
@@ -445,12 +445,12 @@ public class FilteringScreen extends Screen {
     }
     
     @Override
-    public boolean mouseScrolled(double double_1, double double_2, double double_3) {
-        if (getBounds().contains(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 (getBounds().contains(double_1, double_2) && amountY != 0) {
+            scrolling.offset(ClothConfigInitializer.getScrollStep() * -amountY, true);
             return true;
         }
-        super.mouseScrolled(double_1, double_2, double_3);
+        super.mouseScrolled(double_1, double_2, amountX, amountY);
         return true;
     }
     
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/ScreenOverlayImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/ScreenOverlayImpl.java
index b05ede98f..6cedb1bb8 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/ScreenOverlayImpl.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/ScreenOverlayImpl.java
@@ -350,25 +350,25 @@ public abstract class ScreenOverlayImpl extends ScreenOverlay {
     }
     
     @Override
-    public boolean mouseScrolled(double mouseX, double mouseY, double amount) {
+    public boolean mouseScrolled(double mouseX, double mouseY, double amountX, double amountY) {
         if (!REIRuntime.getInstance().isOverlayVisible())
             return false;
-        if (menuHolder.mouseScrolled(mouseX, mouseY, amount))
+        if (menuHolder.mouseScrolled(mouseX, mouseY, amountX, amountY))
             return true;
-        if (hintsWidget.mouseScrolled(mouseX, mouseY, amount))
+        if (hintsWidget.mouseScrolled(mouseX, mouseY, amountX, amountY))
             return true;
-        if (isInside(mouseX, mouseY) && getEntryListWidget().mouseScrolled(mouseX, mouseY, amount)) {
+        if (isInside(mouseX, mouseY) && getEntryListWidget().mouseScrolled(mouseX, mouseY, amountX, amountY)) {
             return true;
         }
         if (isNotInExclusionZones(PointHelper.getMouseX(), PointHelper.getMouseY())) {
-            if (favoritesListWidget != null && favoritesListWidget.mouseScrolled(mouseX, mouseY, amount))
+            if (favoritesListWidget != null && favoritesListWidget.mouseScrolled(mouseX, mouseY, amountX, amountY))
                 return true;
         }
         for (Widget widget : widgets)
             if (widget != getEntryListWidget() && (favoritesListWidget == null || widget != favoritesListWidget)
                     && widget != menuHolder.widget()
                     && widget != hintsWidget
-                    && widget.mouseScrolled(mouseX, mouseY, amount))
+                    && widget.mouseScrolled(mouseX, mouseY, amountX, amountY))
                 return true;
         return false;
     }
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/credits/CreditsScreen.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/credits/CreditsScreen.java
index 76afc126b..b8bb723c3 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/credits/CreditsScreen.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/credits/CreditsScreen.java
@@ -145,10 +145,10 @@ public class CreditsScreen extends Screen {
     }
     
     @Override
-    public boolean mouseScrolled(double mouseX, double mouseY, double amount) {
-        if (entryListWidget.mouseScrolled(mouseX, mouseY, amount))
+    public boolean mouseScrolled(double mouseX, double mouseY, double amountX, double amountY) {
+        if (entryListWidget.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/error/ErrorsEntryListWidget.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/error/ErrorsEntryListWidget.java
index 7edfe11b2..b90d83052 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/error/ErrorsEntryListWidget.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/error/ErrorsEntryListWidget.java
@@ -251,9 +251,9 @@ public class ErrorsEntryListWidget extends DynamicSmoothScrollingEntryListWidget
         }
         
         @Override
-        public boolean mouseScrolled(double d, double e, double f) {
+        public boolean mouseScrolled(double d, double e, double amountX, double amountY) {
             Vector4f mouse = transformMouse(d, e);
-            return super.mouseScrolled(mouse.x(), mouse.y(), f);
+            return super.mouseScrolled(mouse.x(), mouse.y(), amountX, amountY);
         }
         
         @Nullable
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/error/ErrorsScreen.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/error/ErrorsScreen.java
index 072a98eed..c61a18724 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/error/ErrorsScreen.java
+++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/error/ErrorsScreen.java
@@ -88,23 +88,22 @@ public class ErrorsScreen extends Screen {
     
     private void exit() {
         boolean localServer = this.minecraft.isLocalServer();
-        boolean connectedToRealms = this.minecraft.isConnectedToRealms();
         this.minecraft.level.disconnect();
         
         if (localServer) {
-            this.minecraft.clearLevel(new GenericDirtMessageScreen(Component.translatable("menu.savingLevel")));
+            this.minecraft.disconnect(new GenericDirtMessageScreen(Component.translatable("menu.savingLevel")));
         } else {
-            this.minecraft.clearLevel();
+            this.minecraft.disconnect();
         }
         
         System.exit(-1);
     }
     
     @Override
-    public boolean mouseScrolled(double mouseX, double mouseY, double amount) {
-        if (listWidget.mouseScrolled(mouseX, mouseY, amount))
+    public boolean mouseScrolled(double mouseX, double mouseY, double amountX, double amountY) {
+        if (listWidget.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/modules/Menu.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/modules/Menu.java
index 585fedf10..393e4de4e 100644
--- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/modules/Menu.java
+++ b/