|
22 | 22 | import net.minecraftforge.client.event.GuiScreenEvent; |
23 | 23 | import net.minecraftforge.common.MinecraftForge; |
24 | 24 | import org.spongepowered.asm.mixin.Mixin; |
| 25 | +import org.spongepowered.asm.mixin.Overwrite; |
25 | 26 | import org.spongepowered.asm.mixin.Shadow; |
26 | 27 | import org.spongepowered.asm.mixin.injection.At; |
27 | 28 | import org.spongepowered.asm.mixin.injection.Inject; |
@@ -73,21 +74,21 @@ private void postKeyEvent(int i, boolean[] bls, ParentElement element, int key, |
73 | 74 | } |
74 | 75 | } |
75 | 76 |
|
76 | | - @Inject(method = "method_1458", at = @At("HEAD"), cancellable = true) |
77 | | - private static void charEvent(Element element, int character, int mods, CallbackInfo info) { |
78 | | - if (MinecraftForge.EVENT_BUS.post(new GuiScreenEvent.KeyboardCharTypedEvent.Pre((Screen) element, (char) character, mods))) { |
79 | | - info.cancel(); |
80 | | - } else if (!element.charTyped((char) character, mods)) { |
81 | | - MinecraftForge.EVENT_BUS.post(new GuiScreenEvent.KeyboardCharTypedEvent.Post((Screen) element, (char) character, mods)); |
| 77 | + @Overwrite |
| 78 | + private static void method_1458(Element element, int character, int mods) { |
| 79 | + if (!MinecraftForge.EVENT_BUS.post(new GuiScreenEvent.KeyboardCharTypedEvent.Pre((Screen) element, (char) character, mods))) { |
| 80 | + if (!element.charTyped((char) character, mods)) { |
| 81 | + MinecraftForge.EVENT_BUS.post(new GuiScreenEvent.KeyboardCharTypedEvent.Post((Screen) element, (char) character, mods)); |
| 82 | + } |
82 | 83 | } |
83 | 84 | } |
84 | 85 |
|
85 | | - @Inject(method = "method_1473", at = @At("HEAD"), cancellable = true) |
86 | | - private static void charEvent(Element element, char character, int mods, CallbackInfo info) { |
| 86 | + @Overwrite |
| 87 | + private static void method_1473(Element element, char character, int mods) { |
87 | 88 | if (MinecraftForge.EVENT_BUS.post(new GuiScreenEvent.KeyboardCharTypedEvent.Pre((Screen) element, character, mods))) { |
88 | | - info.cancel(); |
89 | | - } else if (!element.charTyped(character, mods)) { |
90 | | - MinecraftForge.EVENT_BUS.post(new GuiScreenEvent.KeyboardCharTypedEvent.Post((Screen) element, character, mods)); |
| 89 | + if (!element.charTyped(character, mods)) { |
| 90 | + MinecraftForge.EVENT_BUS.post(new GuiScreenEvent.KeyboardCharTypedEvent.Post((Screen) element, character, mods)); |
| 91 | + } |
91 | 92 | } |
92 | 93 | } |
93 | 94 | } |
0 commit comments