Skip to content
This repository was archived by the owner on Jun 3, 2024. It is now read-only.

Commit 9d56fc6

Browse files
committed
actually let's just overwrite because mojang is simply ignoring all the returned booleans and we are not able to grab them meaning that we have to just overwrite it
Signed-off-by: shedaniel <daniel@shedaniel.me>
1 parent bde42c6 commit 9d56fc6

1 file changed

Lines changed: 12 additions & 11 deletions

File tree

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

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import net.minecraftforge.client.event.GuiScreenEvent;
2323
import net.minecraftforge.common.MinecraftForge;
2424
import org.spongepowered.asm.mixin.Mixin;
25+
import org.spongepowered.asm.mixin.Overwrite;
2526
import org.spongepowered.asm.mixin.Shadow;
2627
import org.spongepowered.asm.mixin.injection.At;
2728
import org.spongepowered.asm.mixin.injection.Inject;
@@ -73,21 +74,21 @@ private void postKeyEvent(int i, boolean[] bls, ParentElement element, int key,
7374
}
7475
}
7576

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+
}
8283
}
8384
}
8485

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) {
8788
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+
}
9192
}
9293
}
9394
}

0 commit comments

Comments
 (0)