Move state checker of Axiom GUI to client tick event.

common/src/main/java/io/github/reserveword/imblocker/AxiomGuiAccessor.java

@@ -0,0 +1,8 @@
+package io.github.reserveword.imblocker;
+
+public abstract class AxiomGuiAccessor {
+	public static AxiomGuiAccessor instance;
+
+	public abstract boolean isCaptureKeyboard();
+	public abstract boolean isTextFieldFocused();
+}

common/src/main/java/io/github/reserveword/imblocker/IMCheckState.java

@@ -13,7 +13,8 @@ public class IMCheckState {
 
     public static FocusableWidgetAccessor focusedInputWidget = null;
 
-    public static boolean imguiFocused = false;
+    private static boolean axiomGuiCaptureKeyboard = false;
+    private static boolean axiomGuiTextFieldFocused = false;
 
     public static boolean isWhiteListScreenShowing = false;
 
@@ -29,8 +30,14 @@ private static void syncState() {
         	deferredOp = null;
         }
 
-        IMManager.makeState((focusedInputWidget != null && focusedInputWidget.isWidgetEditable()) 
-        		|| isWhiteListScreenShowing || imguiFocused);
+        boolean state;
+        if(axiomGuiCaptureKeyboard) {
+        	state = axiomGuiTextFieldFocused;
+        }else {
+        	state = (focusedInputWidget != null && focusedInputWidget.isWidgetEditable()) 
+            		|| isWhiteListScreenShowing;
+        }
+        IMManager.makeState(state);
         updateChatState();
     }
 
@@ -45,13 +52,22 @@ public static void focusLost(FocusableWidgetAccessor widget) {
     }
 
     private static void updateChatState() {
-    	ChatState currentChatState = !isChatScreenShowing || imguiFocused ? ChatState.NONE :
+    	ChatState currentChatState = !isChatScreenShowing || axiomGuiCaptureKeyboard ? ChatState.NONE :
     			(focusedInputWidget.getText().trim().startsWith("/") ? ChatState.COMMAND : ChatState.CHAT);
     	if(currentChatState != ChatState.NONE && chatState != currentChatState) {
+    		//Executing at the same tick as imstate change will nullify this operation, thus move to next tick.
 			deferredOp = () -> IMManager.makeImmOnState(currentChatState == ChatState.COMMAND);
     	}
     	chatState = currentChatState;
 	}
+
+    private static void checkAxiomGuiState() {
+    	AxiomGuiAccessor axiomGuiAccessor = AxiomGuiAccessor.instance;
+    	if(axiomGuiAccessor != null) {
+	    	axiomGuiCaptureKeyboard = axiomGuiAccessor.isCaptureKeyboard();
+			axiomGuiTextFieldFocused = axiomGuiAccessor.isTextFieldFocused();
+    	}
+    }
 
     // process SCREEN_LIST rules
     // notice that nonPrintable rule triggers at screen change, here.
@@ -196,11 +212,12 @@ public static void captureClick(BooleanSupplier active) {
     }
 
     public static void clientTick(ScreenInfo screen) {
-        checkScreenList(screen);
+        /*checkScreenList(screen);
         checkSpecial();
         if (count == 0) checkTick();
         checkNonPrintable(screen);
-        checkClick();
+        checkClick();*/
+    	checkAxiomGuiState();
         syncState();
         // check interval
         if (count > 0) count --;

fabric/src/client/java/io/github/reserveword/imblocker/mixin/AxiomEditorUIMixin.java

@@ -0,0 +1,33 @@
+package io.github.reserveword.imblocker.mixin;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Pseudo;
+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.callback.CallbackInfo;
+
+import imgui.ImGuiIO;
+import io.github.reserveword.imblocker.AxiomGuiAccessor;
+
+@Pseudo
+@Mixin(targets = "com.moulberry.axiom.editor.EditorUI", remap = false)
+public abstract class AxiomEditorUIMixin {
+	@Shadow
+	public static ImGuiIO imGuiIO;
+
+	@Inject(method = "init", at = @At("TAIL"))
+	private static void loadImGui(CallbackInfo ci) {
+		AxiomGuiAccessor.instance = new AxiomGuiAccessor() {
+			@Override
+			public boolean isTextFieldFocused() {
+				return imGuiIO.getWantTextInput();
+			}
+
+			@Override
+			public boolean isCaptureKeyboard() {
+				return imGuiIO.getWantCaptureKeyboard();
+			}
+		};
+	}
+}

fabric/src/client/resources/imblocker.mixins.json

@@ -15,7 +15,7 @@
     "ReiTextFieldMixin",
     "EmiSearchWidgetMixin",
     "ReplayModTextFieldMixin",
-    "ImGuiMixin",
+    "AxiomEditorUIMixin",
     "TextFieldMixin"
   ],
   "injectors": {