fix #3

문자 입력이 아닌 경우 입력 상태를 NONE으로 전환해야만 함
LemonCaramel · Aug 27, 2023 · 65d1a76 · 65d1a76
1 parent 15fe798
commit 65d1a76
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/common/src/main/java/moe/caramel/chat/mixin/MixinEditBox.java b/common/src/main/java/moe/caramel/chat/mixin/MixinEditBox.java
@@ -55,6 +55,7 @@ private void setFormatter(final BiFunction<String, Integer, FormattedCharSequenc
 
     @Unique
     private void caramelChat$caretFormatter() {
+        // Set caret renderer
         this.formatter = ((original, firstPos) -> {
             /* Original */
             if (caramelChat$wrapper.getStatus() == AbstractIMEWrapper.InputStatus.NONE) {

diff --git a/common/src/main/java/moe/caramel/chat/mixin/MixinSignEditScreen.java b/common/src/main/java/moe/caramel/chat/mixin/MixinSignEditScreen.java
@@ -15,6 +15,7 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.ModifyArgs;
+import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import org.spongepowered.asm.mixin.injection.invoke.arg.Args;
@@ -27,7 +28,7 @@
 public final class MixinSignEditScreen implements ScreenController {
 
     @Unique private WrapperSignEditScreen caramelChat$wrapper;
-    @Unique private boolean caramelChat$textFieldInit;
+    @Unique private boolean caramelChat$lazyInit;
     @Shadow @Nullable public TextFieldHelper signField;
     @Shadow @Final public SignBlockEntity sign;
     @Shadow public int line;
@@ -39,10 +40,10 @@ private void init(final CallbackInfo ci) {
     }
 
     @Inject(method = "tick", at = @At("HEAD"))
-    private void tick(final CallbackInfo ci) {
+    private void lazyInit(final CallbackInfo ci) {
         // Stendhal mod creates a new signField... :scream:
-        if (!caramelChat$textFieldInit && signField != null) {
-            this.caramelChat$textFieldInit = true;
+        if (!caramelChat$lazyInit && signField != null) {
+            this.caramelChat$lazyInit = true;
 
             final Consumer<String> previous = (signField.setMessageFn);
             this.signField.setMessageFn = (value) -> {
@@ -60,6 +61,21 @@ private void keyPressed(final int key, final int scancode, final int action, fin
         this.caramelChat$wrapper.setOrigin();
     }
 
+    @Redirect(
+        method = "keyPressed",
+        at = @At(
+            value = "INVOKE",
+            target = "Lnet/minecraft/client/gui/font/TextFieldHelper;keyPressed(I)Z"
+        )
+    )
+    private boolean helperKeyPressed(final TextFieldHelper helper, final int key) {
+        final boolean result = helper.keyPressed(key);
+        if (result) {
+            this.caramelChat$wrapper.setToNoneStatus();
+        }
+        return result;
+    }
+
     @ModifyArgs(
         method = "renderSignText",
         at = @At(