redirect and inject

Signed-off-by: shedaniel <daniel@shedaniel.me>

Author: shedaniel

patchwork-gui/src/main/java/com/patchworkmc/mixin/gui/MixinKeyboard.java

@@ -22,10 +22,10 @@
 import net.minecraftforge.client.event.GuiScreenEvent;
 import net.minecraftforge.common.MinecraftForge;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Overwrite;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import net.minecraft.client.Keyboard;
@@ -74,21 +74,27 @@ private void postKeyEvent(int i, boolean[] bls, ParentElement element, int key,
 		}
 	}
 
-	@Overwrite
-	private static void method_1458(Element element, int character, int mods) {
-		if (!MinecraftForge.EVENT_BUS.post(new GuiScreenEvent.KeyboardCharTypedEvent.Pre((Screen) element, (char) character, mods))) {
-			if (!element.charTyped((char) character, mods)) {
-				MinecraftForge.EVENT_BUS.post(new GuiScreenEvent.KeyboardCharTypedEvent.Post((Screen) element, (char) character, mods));
-			}
+	@Inject(method = "method_1458", at = @At("HEAD"), cancellable = true)
+	private static void method_1458(Element element, int character, int mods, CallbackInfo info) {
+		if (MinecraftForge.EVENT_BUS.post(new GuiScreenEvent.KeyboardCharTypedEvent.Pre((Screen) element, (char) character, mods))) {
+			info.cancel();
 		}
 	}
 
-	@Overwrite
-	private static void method_1473(Element element, char character, int mods) {
-		if (MinecraftForge.EVENT_BUS.post(new GuiScreenEvent.KeyboardCharTypedEvent.Pre((Screen) element, character, mods))) {
-			if (!element.charTyped(character, mods)) {
-				MinecraftForge.EVENT_BUS.post(new GuiScreenEvent.KeyboardCharTypedEvent.Post((Screen) element, character, mods));
-			}
+	@Redirect(method = "method_1458", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Element;charTyped(CI)Z"))
+	private static boolean method_1458(Element element, char character, int mods) {
+		return element.charTyped(character, mods) || MinecraftForge.EVENT_BUS.post(new GuiScreenEvent.KeyboardCharTypedEvent.Post((Screen) element, character, mods));
+	}
+
+	@Inject(method = "method_1473", at = @At("HEAD"), cancellable = true)
+	private static void method_1473(Element element, char character, int mods, CallbackInfo info) {
+		if (MinecraftForge.EVENT_BUS.post(new GuiScreenEvent.KeyboardCharTypedEvent.Pre((Screen) element, (char) character, mods))) {
+			info.cancel();
 		}
 	}
+
+	@Redirect(method = "method_1473", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Element;charTyped(CI)Z"))
+	private static boolean method_1473(Element element, char character, int mods) {
+		return element.charTyped(character, mods) || MinecraftForge.EVENT_BUS.post(new GuiScreenEvent.KeyboardCharTypedEvent.Post((Screen) element, character, mods));
+	}
 }