wip & clean up

KisaragiEffective · KisaragiEffective · commit 06b8fdd62635 · 2026-01-21T01:42:44.000+09:00
diff --git a/1.18.2/core/.gitignore b/1.18.2/core/.gitignore
@@ -0,0 +1 @@
+build
diff --git a/1.18.2/core/build.gradle b/1.18.2/core/build.gradle
@@ -14,6 +14,8 @@ dependencies {
     implementation 'net.java.dev.jna:jna:5.13.0'
     implementation 'net.java.dev.jna:jna-platform:5.13.0'
     compileOnly 'org.apache.logging.log4j:log4j-core:2.25.3'
+    // TODO(kisaragi): 妥協しているがバージョンが違うと容易にスライドするのでMinecraft側ソースに責務を押し付けるべき
+    compileOnly 'org.lwjgl:lwjgl-glfw:3.2.3'
 }
 
 java {
diff --git a/1.18.2/core/src/main/java/jp/axer/cocoainput/CocoaInput.java b/1.18.2/core/src/main/java/jp/axer/cocoainput/CocoaInput.java
@@ -33,10 +33,10 @@ public CocoaInput(String loader, String zipfile, SimpleLogger logger, MinecraftR
 			} else if (Platform.isWindows()) {
 				CocoaInput.applyController(new WinController(w, n, s));
 			} else if (Platform.isX11()) {
-				CocoaInput.applyController(new X11Controller(n, w));
+				CocoaInput.applyController(new X11Controller(w, n));
 			} else {
 				logger.log("CocoaInput cannot find appropriate Controller in running OS.");
-				CocoaInput.applyController(new DummyController(n, logger));
+				CocoaInput.applyController(new DummyController(logger));
 			}
 			logger.log("CocoaInput has been initialized.");
 		} catch (Exception e) {
diff --git a/1.18.2/core/src/main/java/jp/axer/cocoainput/arch/darwin/CallbackFunction.java b/1.18.2/core/src/main/java/jp/axer/cocoainput/arch/darwin/CallbackFunction.java
@@ -33,7 +33,8 @@ public void invoke(String msg) {
     };
     public static Callback Func_debug = new Callback() {
         public void invoke(String msg) {
-            if (SimpleLogger.debugMode) {
+            // TODO(kisaragi): make switchable?
+            if (true) {
                 LogManager.getLogger("CocoaInput:ObjC").log(Level.DEBUG, msg);
             }
         }
diff --git a/1.18.2/core/src/main/java/jp/axer/cocoainput/arch/darwin/DarwinController.java b/1.18.2/core/src/main/java/jp/axer/cocoainput/arch/darwin/DarwinController.java
@@ -3,11 +3,10 @@
 import java.lang.reflect.Field;
 
 import jp.axer.cocoainput.CocoaInput;
-import jp.axer.cocoainput.arch.WrapperChecker;
+import jp.axer.cocoainput.domain.*;
 import jp.axer.cocoainput.plugin.CocoaInputController;
 import jp.axer.cocoainput.plugin.IMEOperator;
 import jp.axer.cocoainput.plugin.IMEReceiver;
-import jp.axer.cocoainput.domain.*;
 
 public class DarwinController implements CocoaInputController {
     private SimpleLogger logger;
diff --git a/1.18.2/core/src/main/java/jp/axer/cocoainput/arch/darwin/DarwinIMEOperator.java b/1.18.2/core/src/main/java/jp/axer/cocoainput/arch/darwin/DarwinIMEOperator.java
@@ -56,7 +56,7 @@ public Pointer invoke() {
                 } else {
                     buff = new float[]{point.getX(), point.getY(), point.getWidth(), point.getHeight()};
                 }
-                double factor = scaler.getScreenScaledFactor();
+                double factor = scaler.getFactor();
                 buff[0] *= factor;
                 buff[1] *= factor;
                 buff[2] *= factor;
diff --git a/1.18.2/core/src/main/java/jp/axer/cocoainput/arch/win/WinController.java b/1.18.2/core/src/main/java/jp/axer/cocoainput/arch/win/WinController.java
@@ -6,15 +6,13 @@
 import com.sun.jna.WString;
 
 import jp.axer.cocoainput.CocoaInput;
-import jp.axer.cocoainput.arch.WrapperChecker;
 import jp.axer.cocoainput.arch.win.Handle.DoneCallback;
 import jp.axer.cocoainput.arch.win.Handle.PreeditCallback;
 import jp.axer.cocoainput.arch.win.Handle.RectCallback;
 import jp.axer.cocoainput.domain.*;
 import jp.axer.cocoainput.plugin.CocoaInputController;
 import jp.axer.cocoainput.plugin.IMEOperator;
 import jp.axer.cocoainput.plugin.IMEReceiver;
-import net.minecraft.client.Minecraft;
 
 public class WinController implements CocoaInputController {
 
@@ -51,7 +49,7 @@ public int invoke(Pointer ret) {
                 } else {
                     buff = new float[]{point.getX(), point.getY(), point.getWidth(), point.getHeight()};
                 }
-                double factor = scaler.getScreenScaledFactor();
+                double factor = scaler.getFactor();
                 buff[0] *= factor;
                 buff[1] *= factor;
                 buff[2] *= factor;
diff --git a/1.18.2/core/src/main/java/jp/axer/cocoainput/arch/x11/X11Controller.java b/1.18.2/core/src/main/java/jp/axer/cocoainput/arch/x11/X11Controller.java
@@ -11,13 +11,10 @@
 import com.sun.jna.WString;
 
 import jp.axer.cocoainput.CocoaInput;
-import jp.axer.cocoainput.arch.WrapperChecker;
 import jp.axer.cocoainput.domain.*;
 import jp.axer.cocoainput.plugin.CocoaInputController;
 import jp.axer.cocoainput.plugin.IMEOperator;
 import jp.axer.cocoainput.plugin.IMEReceiver;
-// import net.minecraft.client.Minecraft;
-// import net.minecraft.client.Minecraft;
 
 public class X11Controller implements CocoaInputController {
 
diff --git a/1.18.2/core/src/main/java/jp/axer/cocoainput/domain/NativeLibraryLoader.java b/1.18.2/core/src/main/java/jp/axer/cocoainput/domain/NativeLibraryLoader.java
@@ -1,5 +1,5 @@
 package jp.axer.cocoainput.domain;
 
 public interface NativeLibraryLoader {
-    public void copyFrom(String a, String b);
+    public void copyFrom(String a, String b) throws java.io.IOException;
 }
diff --git a/1.18.2/core/src/main/java/jp/axer/cocoainput/domain/NativeTextInserter.java b/1.18.2/core/src/main/java/jp/axer/cocoainput/domain/NativeTextInserter.java
@@ -0,0 +1,5 @@
+package jp.axer.cocoainput.domain;
+
+public interface NativeTextInserter {
+    public void enqueueMany(String input);
+}
diff --git a/1.18.2/core/src/main/java/jp/axer/cocoainput/domain/WrapperChecker.java b/1.18.2/core/src/main/java/jp/axer/cocoainput/domain/WrapperChecker.java
@@ -1,4 +1,4 @@
-package jp.axer.cocoainput.arch;
+package jp.axer.cocoainput.domain;
 
 public interface WrapperChecker {
     public boolean isAlreadyInitialized();
diff --git a/1.18.2/core/src/main/java/jp/axer/cocoainput/plugin/CocoaInputController.java b/1.18.2/core/src/main/java/jp/axer/cocoainput/plugin/CocoaInputController.java
@@ -1,6 +1,6 @@
 package jp.axer.cocoainput.plugin;
 
-import jp.axer.cocoainput.WrapperChecker;
+import jp.axer.cocoainput.domain.WrapperChecker;
 
 public interface CocoaInputController {
     IMEOperator generateIMEOperator(IMEReceiver ime); //GuiTextFieldとかが作成された時に割り当てるIMEOperator生成処理を委託
diff --git a/1.18.2/core/src/main/java/jp/axer/cocoainput/plugin/IMEReceiver.java b/1.18.2/core/src/main/java/jp/axer/cocoainput/plugin/IMEReceiver.java
@@ -3,7 +3,6 @@
 import jp.axer.cocoainput.CocoaInput;
 import jp.axer.cocoainput.arch.win.Logger;
 import jp.axer.cocoainput.domain.*;
-// import net.minecraft.client.Minecraft;
 
 public abstract class IMEReceiver {
 
@@ -66,7 +65,8 @@ public void setMarkedText(String aString, int position1, int length1, int positi
 		int caretPosition;
 		boolean hasCaret;
 		String commitString;
-		if (CocoaInput.config.isAdvancedPreeditDraw()) {
+        // TODO(kisaragi): config
+		if (true) {
 			Tuple3<String, Integer, Boolean> formattedText = PreeditFormatter.formatMarkedText(aString, position1,
 					length1);
 			commitString = formattedText._1();
@@ -109,14 +109,8 @@ public void setMarkedText(String aString, int position1, int length1, int positi
 
 	abstract protected void setSelectionPos(int p);
 
-	protected void insertTextNative(String text) {
+	protected void insertTextNative(String text, NativeTextInserter nativeTextInserter) {
         nativeTextInserter.enqueueMany(text);
-		/*
-        for (char c : text.toCharArray()) {
-			Minecraft instance = Minecraft.getInstance();
-			instance.keyboardHandler.charTyped(instance.getWindow().getWindow(), c, 0);
-		}
-        */
 	}
 
 	protected void insertTextEmurated(String aString) {
diff --git a/1.18.2/fabric/src/fabric/java/jp/axer/cocoainput/LibraryCopyImpl.java b/1.18.2/fabric/src/fabric/java/jp/axer/cocoainput/LibraryCopyImpl.java
@@ -16,13 +16,19 @@
 import jp.axer.cocoainput.arch.dummy.DummyController;
 import jp.axer.cocoainput.arch.win.WinController;
 import jp.axer.cocoainput.arch.x11.X11Controller;
+import jp.axer.cocoainput.domain.*;
 import jp.axer.cocoainput.plugin.CocoaInputController;
-import jp.axer.cocoainput.util.ConfigPack;
-import jp.axer.cocoainput.util.logger;
+import jp.axer.cocoainput.config.ConfigPack;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
 
 public class LibraryCopyImpl implements NativeLibraryLoader {
+    private SimpleLogger logger;
+
+    public LibraryCopyImpl(SimpleLogger logger) {
+        this.logger = logger;
+    }
+
     public void copyLibrary(String libraryName, String libraryPath) throws IOException {
         InputStream libFile;
         if (zipsource == null) {//Fabric case
diff --git a/1.18.2/fabric/src/fabric/java/jp/axer/cocoainput/config/ConfigPack.java b/1.18.2/fabric/src/fabric/java/jp/axer/cocoainput/config/ConfigPack.java
@@ -1,4 +1,4 @@
-package jp.axer.cocoainput.util;
+package jp.axer.cocoainput.config;
 
 public interface ConfigPack {
 
diff --git a/1.18.2/fabric/src/fabric/java/jp/axer/cocoainput/config/FCConfig.java b/1.18.2/fabric/src/fabric/java/jp/axer/cocoainput/config/FCConfig.java
@@ -1,6 +1,6 @@
-package jp.axer.cocoainput.util;
+package jp.axer.cocoainput.config;
 
-import jp.axer.cocoainput.util.ConfigPack;
+import jp.axer.cocoainput.config.ConfigPack;
 
 public class FCConfig extends TinyConfig implements ConfigPack{
 
diff --git a/1.18.2/fabric/src/fabric/java/jp/axer/cocoainput/config/TinyConfig.java b/1.18.2/fabric/src/fabric/java/jp/axer/cocoainput/config/TinyConfig.java
@@ -1,4 +1,4 @@
-package jp.axer.cocoainput.util;
+package jp.axer.cocoainput.config;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/1.18.2/fabric/src/fabric/java/jp/axer/cocoainput/loader/CocoaInputModMenu.java b/1.18.2/fabric/src/fabric/java/jp/axer/cocoainput/loader/CocoaInputModMenu.java
@@ -3,7 +3,7 @@
 
 import com.terraformersmc.modmenu.api.ModMenuApi;
 import com.terraformersmc.modmenu.api.ConfigScreenFactory;
-import jp.axer.cocoainput.util.FCConfig;
+import jp.axer.cocoainput.config.FCConfig;
 
 public class CocoaInputModMenu implements ModMenuApi {
 
diff --git a/1.18.2/fabric/src/fabric/java/jp/axer/cocoainput/loader/FabricLoader.java b/1.18.2/fabric/src/fabric/java/jp/axer/cocoainput/loader/FabricLoader.java
@@ -3,8 +3,9 @@
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
 import jp.axer.cocoainput.CocoaInput;
-import jp.axer.cocoainput.util.ModLogger;
-import jp.axer.cocoainput.util.FCConfig;
+import jp.axer.cocoainput.domain.SimpleLogger;
+import jp.axer.cocoainput.mcutil.ModLogger;
+import jp.axer.cocoainput.config.FCConfig;
 import net.minecraft.client.gui.screens.Screen;
 
 public class FabricLoader implements ClientModInitializer {
@@ -16,11 +17,12 @@ public void onInitializeClient() {
 	}
 	public void onWindowLaunched(){
 		this.cocoainput=new CocoaInput("Fabric",null);
-		ModLogger.log("Fabric config setup");
-		ModLogger.log("Config path:"+net.fabricmc.loader.api.FabricLoader.getInstance().getConfigDir().resolve("cocoainput.json").toString());
+        var logger = new ModLogger();
+		logger.log("Fabric config setup");
+        logger.log("Config path:"+net.fabricmc.loader.api.FabricLoader.getInstance().getConfigDir().resolve("cocoainput.json").toString());
 		FCConfig.init("cocoainput",net.fabricmc.loader.api.FabricLoader.getInstance().getConfigDir().resolve("cocoainput.json"), FCConfig.class);
 		CocoaInput.config=new FCConfig();
-		ModLogger.log("ConfigPack:"+CocoaInput.config.isAdvancedPreeditDraw()+" "+CocoaInput.config.isNativeCharTyped());
+        logger.log("ConfigPack:"+CocoaInput.config.isAdvancedPreeditDraw()+" "+CocoaInput.config.isNativeCharTyped());
 	}
 
 	public void onChangeScreen(Screen sc){
diff --git a/1.18.2/fabric/src/fabric/java/jp/axer/cocoainput/mcutil/ModLogger.java b/1.18.2/fabric/src/fabric/java/jp/axer/cocoainput/mcutil/ModLogger.java
@@ -1,6 +1,6 @@
-package jp.axer.cocoainput.util;
+package jp.axer.cocoainput.mcutil;
 
-import jp.axer.cocoainput.domain;
+import jp.axer.cocoainput.domain.SimpleLogger;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 
diff --git a/1.18.2/fabric/src/fabric/java/jp/axer/cocoainput/mcutil/WrapperUtil.java b/1.18.2/fabric/src/fabric/java/jp/axer/cocoainput/mcutil/WrapperUtil.java
@@ -1,4 +1,4 @@
-package jp.axer.cocoainput.util;
+package jp.axer.cocoainput.mcutil;
 
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.screens.Screen;
diff --git a/1.18.2/fabric/src/fabric/java/jp/axer/cocoainput/wrapper/BookEditScreenWrapper.java b/1.18.2/fabric/src/fabric/java/jp/axer/cocoainput/wrapper/BookEditScreenWrapper.java
@@ -6,9 +6,9 @@
 import jp.axer.cocoainput.CocoaInput;
 import jp.axer.cocoainput.plugin.IMEOperator;
 import jp.axer.cocoainput.plugin.IMEReceiver;
-import jp.axer.cocoainput.util.ModLogger;
-import jp.axer.cocoainput.util.Rect;
-import jp.axer.cocoainput.util.WrapperUtil;
+import jp.axer.cocoainput.domain.SimpleLogger;
+import jp.axer.cocoainput.domain.Rect;
+import jp.axer.cocoainput.mcutil.WrapperUtil;
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.screens.inventory.BookEditScreen;
 import net.minecraft.client.StringSplitter;
@@ -19,8 +19,8 @@ public class BookEditScreenWrapper extends IMEReceiver {
     private IMEOperator myIME;
     private BookEditScreen owner;
 
-    public BookEditScreenWrapper(BookEditScreen field) {
-        ModLogger.log("BookEditScreen init: " + field.hashCode());
+    public BookEditScreenWrapper(BookEditScreen field, SimpleLogger logger) {
+        logger.log("BookEditScreen init: " + field.hashCode());
         owner = field;
         myIME = CocoaInput.getController().generateIMEOperator(this);
         myIME.setFocused(true);
diff --git a/1.18.2/fabric/src/fabric/java/jp/axer/cocoainput/wrapper/EditBoxWrapper.java b/1.18.2/fabric/src/fabric/java/jp/axer/cocoainput/wrapper/EditBoxWrapper.java
@@ -4,17 +4,17 @@
 import jp.axer.cocoainput.CocoaInput;
 import jp.axer.cocoainput.plugin.IMEOperator;
 import jp.axer.cocoainput.plugin.IMEReceiver;
-import jp.axer.cocoainput.util.ModLogger;
-import jp.axer.cocoainput.util.Rect;
+import jp.axer.cocoainput.domain.SimpleLogger;
+import jp.axer.cocoainput.domain.Rect;
 import net.minecraft.client.gui.components.EditBox;
 import net.minecraft.network.chat.TextComponent;
 
 public class EditBoxWrapper extends IMEReceiver {
     private IMEOperator myIME;
     private EditBox owner;
 
-    public EditBoxWrapper(EditBox field) {
-        ModLogger.debug("EditBox init: " + field.hashCode());
+    public EditBoxWrapper(EditBox field, SimpleLogger logger) {
+        logger.debug("EditBox init: " + field.hashCode());
         owner = field;
         myIME = CocoaInput.getController().generateIMEOperator(this);
     }
diff --git a/1.18.2/fabric/src/fabric/java/jp/axer/cocoainput/wrapper/SignEditScreenWrapper.java b/1.18.2/fabric/src/fabric/java/jp/axer/cocoainput/wrapper/SignEditScreenWrapper.java
@@ -3,9 +3,9 @@
 import jp.axer.cocoainput.CocoaInput;
 import jp.axer.cocoainput.plugin.IMEOperator;
 import jp.axer.cocoainput.plugin.IMEReceiver;
-import jp.axer.cocoainput.util.ModLogger;
-import jp.axer.cocoainput.util.Rect;
-import jp.axer.cocoainput.util.WrapperUtil;
+import jp.axer.cocoainput.domain.SimpleLogger;
+import jp.axer.cocoainput.domain.Rect;
+import jp.axer.cocoainput.mcutil.WrapperUtil;
 import net.minecraft.world.level.block.StandingSignBlock;
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.screens.inventory.SignEditScreen;
@@ -16,8 +16,8 @@ public class SignEditScreenWrapper extends IMEReceiver {
     private IMEOperator myIME;
 
 
-    public SignEditScreenWrapper(SignEditScreen field) {
-        ModLogger.debug("SignEditScreen init: " + field.hashCode());
+    public SignEditScreenWrapper(SignEditScreen field, SimpleLogger logger) {
+        logger.debug("SignEditScreen init: " + field.hashCode());
         owner = field;
         myIME = CocoaInput.getController().generateIMEOperator(this);
         myIME.setFocused(true);

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@ dependencies {`
`14`	`14`	`implementation 'net.java.dev.jna:jna:5.13.0'`
`15`	`15`	`implementation 'net.java.dev.jna:jna-platform:5.13.0'`
`16`	`16`	`compileOnly 'org.apache.logging.log4j:log4j-core:2.25.3'`
	`17`	`+ // TODO(kisaragi): 妥協しているがバージョンが違うと容易にスライドするのでMinecraft側ソースに責務を押し付けるべき`
	`18`	`+ compileOnly 'org.lwjgl:lwjgl-glfw:3.2.3'`
`17`	`19`	`}`
`18`	`20`
`19`	`21`	`java {`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,8 @@ public void invoke(String msg) {`
`33`	`33`	`};`
`34`	`34`	`public static Callback Func_debug = new Callback() {`
`35`	`35`	`public void invoke(String msg) {`
`36`		`- if (SimpleLogger.debugMode) {`
	`36`	`+ // TODO(kisaragi): make switchable?`
	`37`	`+ if (true) {`
`37`	`38`	`LogManager.getLogger("CocoaInput:ObjC").log(Level.DEBUG, msg);`
`38`	`39`	`}`
`39`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public Pointer invoke() {`
`56`	`56`	`} else {`
`57`	`57`	`buff = new float[]{point.getX(), point.getY(), point.getWidth(), point.getHeight()};`
`58`	`58`	`}`
`59`		`- double factor = scaler.getScreenScaledFactor();`
	`59`	`+ double factor = scaler.getFactor();`
`60`	`60`	`buff[0] *= factor;`
`61`	`61`	`buff[1] *= factor;`
`62`	`62`	`buff[2] *= factor;`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`package jp.axer.cocoainput.domain;`
`2`	`2`
`3`	`3`	`public interface NativeLibraryLoader {`
`4`		`- public void copyFrom(String a, String b);`
	`4`	`+ public void copyFrom(String a, String b) throws java.io.IOException;`
`5`	`5`	`}`