Using Cloth events instead of overwriting methods

1 files changed, 5 insertions, 15 deletions

diff --git a/src/main/java/me/shedaniel/rei/mixin/MixinContainerScreen.java b/src/main/java/me/shedaniel/rei/mixin/MixinContainerScreen.java
index 269d54de2..002498a01 100644
--- a/src/main/java/me/shedaniel/rei/mixin/MixinContainerScreen.java
+++ b/src/main/java/me/shedaniel/rei/mixin/MixinContainerScreen.java
@@ -1,9 +1,8 @@
 package me.shedaniel.rei.mixin;
 
-import me.shedaniel.rei.api.TabGetter;
+import me.shedaniel.rei.listeners.CreativePlayerInventoryScreenHooks;
 import me.shedaniel.rei.client.ScreenHelper;
 import me.shedaniel.rei.listeners.ContainerScreenHooks;
-import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.ContainerScreen;
 import net.minecraft.client.gui.Screen;
 import net.minecraft.client.gui.ingame.CreativePlayerInventoryScreen;
@@ -59,11 +58,11 @@ public class MixinContainerScreen extends Screen implements ContainerScreenHooks
         return focusedSlot;
     }
     
-    @Inject(method = "keyPressed(III)Z", at = @At("HEAD"), cancellable = true, remap = false)
+    @Inject(method = "keyPressed(III)Z", at = @At("HEAD"), cancellable = true)
     public void keyPressed(int int_1, int int_2, int int_3, CallbackInfoReturnable<Boolean> ci) {
-        if (MinecraftClient.getInstance().currentScreen instanceof CreativePlayerInventoryScreen) {
-            TabGetter tabGetter = (TabGetter) MinecraftClient.getInstance().currentScreen;
-            if (tabGetter.rei_getSelectedTab() != ItemGroup.INVENTORY.getIndex())
+        if (minecraft.currentScreen instanceof CreativePlayerInventoryScreen) {
+            CreativePlayerInventoryScreenHooks creativePlayerInventoryScreenHooks = (CreativePlayerInventoryScreenHooks) minecraft.currentScreen;
+            if (creativePlayerInventoryScreenHooks.rei_getSelectedTab() != ItemGroup.INVENTORY.getIndex())
                 return;
         }
         if (ScreenHelper.getLastOverlay().keyPressed(int_1, int_2, int_3)) {
@@ -72,13 +71,4 @@ public class MixinContainerScreen extends Screen implements ContainerScreenHooks
         }
     }
     
-    // TODO: Make this use an event when Cloth mixin issues are fixed
-    @Override
-    public boolean charTyped(char char_1, int int_1) {
-        if (!(MinecraftClient.getInstance().currentScreen instanceof CreativePlayerInventoryScreen))
-            if (ScreenHelper.getLastOverlay().charTyped(char_1, int_1))
-                return true;
-        return super.charTyped(char_1, int_1);
-    }
-    
 }