Merge pull request #41 from shedaniel/master

we fix double char

Author: coderbot16

patchwork-gui/build.gradle

@@ -1,5 +1,5 @@
 archivesBaseName = "patchwork-gui"
-version = getSubprojectVersion(project, "0.1.0")
+version = getSubprojectVersion(project, "0.1.1")
 
 dependencies {
 	compile project(path: ':patchwork-fml', configuration: 'dev')

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

@@ -25,6 +25,7 @@
 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,20 +75,26 @@ private void postKeyEvent(int i, boolean[] bls, ParentElement element, int key,
 	}
 
 	@Inject(method = "method_1458", at = @At("HEAD"), cancellable = true)
-	private static void charEvent(Element element, int character, int mods, CallbackInfo info) {
+	private static void preCharTyped(Element element, int character, int mods, CallbackInfo info) {
 		if (MinecraftForge.EVENT_BUS.post(new GuiScreenEvent.KeyboardCharTypedEvent.Pre((Screen) element, (char) character, mods))) {
 			info.cancel();
-		} else if (!element.charTyped((char) character, mods)) {
-			MinecraftForge.EVENT_BUS.post(new GuiScreenEvent.KeyboardCharTypedEvent.Post((Screen) element, (char) character, mods));
 		}
 	}
 
+	@Redirect(method = "method_1458", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Element;charTyped(CI)Z"))
+	private static boolean charTyped(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 charEvent(Element element, char character, int mods, CallbackInfo info) {
-		if (MinecraftForge.EVENT_BUS.post(new GuiScreenEvent.KeyboardCharTypedEvent.Pre((Screen) element, character, mods))) {
+	private static void preCharTyped(Element element, char character, int mods, CallbackInfo info) {
+		if (MinecraftForge.EVENT_BUS.post(new GuiScreenEvent.KeyboardCharTypedEvent.Pre((Screen) element, (char) character, mods))) {
 			info.cancel();
-		} else if (!element.charTyped(character, mods)) {
-			MinecraftForge.EVENT_BUS.post(new GuiScreenEvent.KeyboardCharTypedEvent.Post((Screen) element, character, mods));
 		}
 	}
+
+	@Redirect(method = "method_1473", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Element;charTyped(CI)Z"))
+	private static boolean charTyped2(Element element, char character, int mods) {
+		return element.charTyped(character, mods) || MinecraftForge.EVENT_BUS.post(new GuiScreenEvent.KeyboardCharTypedEvent.Post((Screen) element, character, mods));
+	}
 }