char typed

Author: shedaniel

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

@@ -9,6 +9,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import net.minecraft.client.Keyboard;
+import net.minecraft.client.gui.Element;
 import net.minecraft.client.gui.ParentElement;
 import net.minecraft.client.gui.screen.Screen;
 
@@ -18,7 +19,7 @@ public abstract class MixinKeyboard {
 	private boolean repeatEvents;
 
 	@Inject(method = "method_1454", at = @At("HEAD"), cancellable = true)
-	public void preKeyEvent(int i, boolean[] bls, ParentElement element, int key, int scanCode, int j, CallbackInfo info) {
+	private void preKeyEvent(int i, boolean[] bls, ParentElement element, int key, int scanCode, int j, CallbackInfo info) {
 		if (i != 1 && (i != 2 || !this.repeatEvents)) {
 			if (i == 0) {
 				if (MinecraftForge.EVENT_BUS.post(new GuiScreenEvent.KeyboardKeyReleasedEvent.Pre((Screen) element, key, scanCode, j))) {
@@ -35,7 +36,7 @@ public void preKeyEvent(int i, boolean[] bls, ParentElement element, int key, in
 	}
 
 	@Inject(method = "method_1454", at = @At("RETURN"))
-	public void postKeyEvent(int i, boolean[] bls, ParentElement element, int key, int scanCode, int j, CallbackInfo info) {
+	private void postKeyEvent(int i, boolean[] bls, ParentElement element, int key, int scanCode, int j, CallbackInfo info) {
 		if (bls[0]) {
 			return;
 		}
@@ -52,4 +53,22 @@ public void postKeyEvent(int i, boolean[] bls, ParentElement element, int key, i
 			}
 		}
 	}
+
+	@Inject(method = "method_1458", at = @At("HEAD"), cancellable = true)
+	private static void charEvent(Element element, int i, int j, CallbackInfo info) {
+		if (MinecraftForge.EVENT_BUS.post(new GuiScreenEvent.KeyboardCharTypedEvent.Pre((Screen) element, (char) i, j))) {
+			info.cancel();
+		} else if (!element.charTyped((char) i, j)) {
+			MinecraftForge.EVENT_BUS.post(new GuiScreenEvent.KeyboardCharTypedEvent.Post((Screen) element, (char) i, j));
+		}
+	}
+
+	@Inject(method = "method_1473", at = @At("HEAD"), cancellable = true)
+	private static void charEvent(Element element, char i, int j, CallbackInfo info) {
+		if (MinecraftForge.EVENT_BUS.post(new GuiScreenEvent.KeyboardCharTypedEvent.Pre((Screen) element, i, j))) {
+			info.cancel();
+		} else if (!element.charTyped(i, j)) {
+			MinecraftForge.EVENT_BUS.post(new GuiScreenEvent.KeyboardCharTypedEvent.Post((Screen) element, i, j));
+		}
+	}
 }

patchwork-rendering/src/main/java/com/patchworkmc/mixin/rendering/MixinMouse.java

@@ -60,7 +60,7 @@ public void preMouseClicked(boolean[] bls, double d, double e, int button, Callb
 	}
 
 	@Inject(method = "method_1611", at = @At("RETURN"), locals = LocalCapture.CAPTURE_FAILHARD, cancellable = true)
-	public void postMouseClicked(boolean[] bls, double d, double e, int button, CallbackInfo info) {
+	private void postMouseClicked(boolean[] bls, double d, double e, int button, CallbackInfo info) {
 		if (bls[0]) {
 			return;
 		}
@@ -72,15 +72,15 @@ public void postMouseClicked(boolean[] bls, double d, double e, int button, Call
 	}
 
 	@Inject(method = "method_1605", at = @At("HEAD"), locals = LocalCapture.CAPTURE_FAILHARD, cancellable = true)
-	public void preMouseReleased(boolean[] bls, double d, double e, int button, CallbackInfo info) {
+	private void preMouseReleased(boolean[] bls, double d, double e, int button, CallbackInfo info) {
 		if (MinecraftForge.EVENT_BUS.post(new GuiScreenEvent.MouseReleasedEvent.Pre(client.currentScreen, d, e, button))) {
 			bls[0] = true;
 			info.cancel();
 		}
 	}
 
 	@Inject(method = "method_1605", at = @At("RETURN"), locals = LocalCapture.CAPTURE_FAILHARD)
-	public void postMouseReleased(boolean[] bls, double d, double e, int button, CallbackInfo info) {
+	private void postMouseReleased(boolean[] bls, double d, double e, int button, CallbackInfo info) {
 		if (bls[0]) {
 			return;
 		}
@@ -92,21 +92,21 @@ public void postMouseReleased(boolean[] bls, double d, double e, int button, Cal
 	}
 
 	@Inject(method = "method_1602", at = @At("HEAD"), cancellable = true)
-	public void preMouseDragged(Element element, double d, double e, double f, double g, CallbackInfo info) {
+	private void preMouseDragged(Element element, double d, double e, double f, double g, CallbackInfo info) {
 		if (MinecraftForge.EVENT_BUS.post(new GuiScreenEvent.MouseDragEvent.Pre(client.currentScreen, d, e, activeButton, f, g))) {
 			info.cancel();
 		}
 	}
 
 	@Inject(method = "method_1602", at = @At("RETURN"))
-	public void postMouseDragged(Element element, double d, double e, double f, double g, CallbackInfo info) {
+	private void postMouseDragged(Element element, double d, double e, double f, double g, CallbackInfo info) {
 		MinecraftForge.EVENT_BUS.post(new GuiScreenEvent.MouseDragEvent.Post(client.currentScreen, d, e, activeButton, f, g));
 	}
 
 	@Inject(method = "onMouseScroll", at = @At(value = "INVOKE",
 					target = "Lnet/minecraft/client/gui/screen/Screen;mouseScrolled(DDD)Z",
 					ordinal = 0), locals = LocalCapture.CAPTURE_FAILHARD, cancellable = true)
-	public void preMouseScrolled(long window, double d, double e, CallbackInfo ci, double f, double g, double h) {
+	private void preMouseScrolled(long window, double d, double e, CallbackInfo ci, double f, double g, double h) {
 		if (MinecraftForge.EVENT_BUS.post(new GuiScreenEvent.MouseScrollEvent.Pre(client.currentScreen, g, h, f))) {
 			ci.cancel();
 		}
@@ -115,7 +115,7 @@ public void preMouseScrolled(long window, double d, double e, CallbackInfo ci, d
 	@Inject(method = "onMouseScroll", at = @At(value = "INVOKE",
 					target = "Lnet/minecraft/client/gui/screen/Screen;mouseScrolled(DDD)Z",
 					ordinal = 0, shift = At.Shift.BY, by = 2), locals = LocalCapture.CAPTURE_FAILHARD, cancellable = true)
-	public void postMouseScrolled(long window, double d, double e, CallbackInfo ci, double f, double g, double h) {
+	private void postMouseScrolled(long window, double d, double e, CallbackInfo ci, double f, double g, double h) {
 		MinecraftForge.EVENT_BUS.post(new GuiScreenEvent.MouseScrollEvent.Post(client.currentScreen, g, h, f));
 	}