1 files changed, 17 insertions, 20 deletions
diff --git a/src/main/java/me/shedaniel/rei/mixin/MixinCreativePlayerInventoryScreen.java b/src/main/java/me/shedaniel/rei/mixin/MixinCreativePlayerInventoryScreen.java
index 853624736..1e45d019e 100644
--- a/src/main/java/me/shedaniel/rei/mixin/MixinCreativePlayerInventoryScreen.java
+++ b/src/main/java/me/shedaniel/rei/mixin/MixinCreativePlayerInventoryScreen.java
@@ -1,7 +1,7 @@
 package me.shedaniel.rei.mixin;
 
-import me.shedaniel.cloth.api.ClientUtils;
 import me.shedaniel.rei.client.ScreenHelper;
+import me.shedaniel.rei.listeners.CreativePlayerInventoryScreenHooks;
 import net.minecraft.client.gui.ingame.AbstractPlayerInventoryScreen;
 import net.minecraft.client.gui.ingame.CreativePlayerInventoryScreen;
 import net.minecraft.entity.player.PlayerInventory;
@@ -14,7 +14,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(CreativePlayerInventoryScreen.class)
-public abstract class MixinCreativePlayerInventoryScreen extends AbstractPlayerInventoryScreen<CreativePlayerInventoryScreen.CreativeContainer> {
+public abstract class MixinCreativePlayerInventoryScreen extends AbstractPlayerInventoryScreen<CreativePlayerInventoryScreen.CreativeContainer> implements CreativePlayerInventoryScreenHooks {
     
     @Shadow
     private static int selectedTab;
@@ -28,16 +28,22 @@ public abstract class MixinCreativePlayerInventoryScreen extends AbstractPlayerI
     @Shadow
     protected abstract boolean doRenderScrollBar();
     
-    @Inject(method = "mouseScrolled", at = @At("HEAD"), cancellable = true, remap = false)
-    public void mouseScrolled(double i, double j, double amount, CallbackInfoReturnable<Boolean> ci) {
-        if (!doRenderScrollBar() && selectedTab == ItemGroup.INVENTORY.getIndex())
-            if (ScreenHelper.isOverlayVisible() && ScreenHelper.getLastOverlay().getRectangle().contains(ClientUtils.getMouseLocation()) && ScreenHelper.getLastOverlay().mouseScrolled(i, j, amount)) {
-                ci.setReturnValue(true);
-                ci.cancel();
-            }
+    @Override
+    public int rei_getSelectedTab() {
+        return selectedTab;
+    }
+    
+    @Override
+    public boolean rei_doRenderScrollBar() {
+        return doRenderScrollBar();
+    }
+    
+    @Override
+    public boolean rei_getField2888() {
+        return field_2888;
     }
     
-    @Inject(method = "keyPressed", at = @At("HEAD"), cancellable = true, remap = false)
+    @Inject(method = "keyPressed", at = @At("HEAD"), cancellable = true)
     public void keyPressed(int int_1, int int_2, int int_3, CallbackInfoReturnable<Boolean> ci) {
         if (selectedTab == ItemGroup.INVENTORY.getIndex())
             if (ScreenHelper.getLastOverlay().keyPressed(int_1, int_2, int_3)) {
@@ -46,16 +52,7 @@ public abstract class MixinCreativePlayerInventoryScreen extends AbstractPlayerI
             }
     }
     
-    @Inject(method = "charTyped", at = @At("HEAD"), cancellable = true, remap = false)
-    public void charTyped(char char_1, int int_1, CallbackInfoReturnable<Boolean> ci) {
-        if (!this.field_2888 && selectedTab == ItemGroup.INVENTORY.getIndex())
-            if (ScreenHelper.isOverlayVisible() && ScreenHelper.getLastOverlay().charTyped(char_1, int_1)) {
-                ci.setReturnValue(true);
-                ci.cancel();
-            }
-    }
-    
-    @Inject(method = "mouseClicked", at = @At("HEAD"), cancellable = true, remap = false)
+    @Inject(method = "mouseClicked", at = @At("HEAD"), cancellable = true)
     public void mouseClicked(double i, double j, int k, CallbackInfoReturnable<Boolean> ci) {
         if (selectedTab == ItemGroup.INVENTORY.getIndex())
             if (ScreenHelper.isOverlayVisible() && ScreenHelper.getLastOverlay().mouseClicked(i, j, k)) {