Update to 1.21.9

3 files changed, 17 insertions, 12 deletions

diff --git a/api/src/main/java/me/shedaniel/rei/api/client/entry/region/RegionEntry.java b/api/src/main/java/me/shedaniel/rei/api/client/entry/region/RegionEntry.java
index d6ed83471..053f69290 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/entry/region/RegionEntry.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/entry/region/RegionEntry.java
@@ -28,6 +28,7 @@ import me.shedaniel.rei.api.client.favorites.FavoriteMenuEntry;
 import me.shedaniel.rei.api.client.gui.drag.component.DraggableComponent;
 import me.shedaniel.rei.api.client.gui.widgets.Slot;
 import me.shedaniel.rei.api.common.entry.EntryStack;
+import net.minecraft.client.input.MouseButtonEvent;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
@@ -56,7 +57,7 @@ public interface RegionEntry<T extends RegionEntry<T>> {
     
     UUID getUuid();
     
-    default boolean doAction(int button) {
+    default boolean doAction(MouseButtonEvent event) {
         return false;
     }
     
diff --git a/api/src/main/java/me/shedaniel/rei/api/client/favorites/FavoriteEntry.java b/api/src/main/java/me/shedaniel/rei/api/client/favorites/FavoriteEntry.java
index 42a884d0d..d21f47a0e 100644
--- a/api/src/main/java/me/shedaniel/rei/api/client/favorites/FavoriteEntry.java
+++ b/api/src/main/java/me/shedaniel/rei/api/client/favorites/FavoriteEntry.java
@@ -33,6 +33,7 @@ import me.shedaniel.rei.api.common.entry.EntryStack;
 import me.shedaniel.rei.impl.ClientInternals;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.minecraft.client.input.MouseButtonEvent;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.ApiStatus;
@@ -100,7 +101,7 @@ public abstract class FavoriteEntry implements RegionEntry<FavoriteEntry> {
     public abstract Renderer getRenderer(boolean showcase);
     
     @Override
-    public abstract boolean doAction(int button);
+    public abstract boolean doAction(MouseButtonEvent event);
     
     @Override
     public Optional<Supplier<Collection<FavoriteMenuEntry>>> getMenuEntries() {
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 e0e12524c..2a151fa5c 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
@@ -26,6 +26,9 @@ package me.shedaniel.rei.api.client.gui.widgets;
 import me.shedaniel.math.Rectangle;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.events.GuiEventListener;
+import net.minecraft.client.input.CharacterEvent;
+import net.minecraft.client.input.KeyEvent;
+import net.minecraft.client.input.MouseButtonEvent;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Collections;
@@ -90,29 +93,29 @@ public class DelegateWidget extends WidgetWithBounds {
     }
     
     @Override
-    public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
-        return delegate().keyPressed(keyCode, scanCode, modifiers);
+    public boolean keyPressed(KeyEvent event) {
+        return delegate().keyPressed(event);
     }
     
     @Override
-    public boolean keyReleased(int keyCode, int scanCode, int modifiers) {
-        return delegate().keyReleased(keyCode, scanCode, modifiers);
+    public boolean keyReleased(KeyEvent event) {
+        return delegate().keyReleased(event);
     }
     
     @Override
-    public boolean charTyped(char character, int modifiers) {
-        return delegate().charTyped(character, modifiers);
+    public boolean charTyped(CharacterEvent event) {
+        return delegate().charTyped(event);
     }
     
     @Override
-    public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) {
-        return delegate().mouseDragged(mouseX, mouseY, button, deltaX, deltaY);
+    public boolean mouseDragged(MouseButtonEvent event, double deltaX, double deltaY) {
+        return delegate().mouseDragged(event, deltaX, deltaY);
     }
     
     @Override
-    public boolean mouseReleased(double mouseX, double mouseY, int button) {
+    public boolean mouseReleased(MouseButtonEvent event) {
         this.setDragging(false);
-        return delegate().mouseReleased(mouseX, mouseY, button);
+        return delegate().mouseReleased(event);
     }
     
     @Override