From cb9f6b83e79fb0f9eb345e8b280373821cd24e5a Mon Sep 17 00:00:00 2001 From: ROOCKY-dev <169755829+ROOCKY-dev@users.noreply.github.com> Date: Wed, 11 Feb 2026 08:57:34 +0000 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=92=20fix:=20replace=20System.out/err?= =?UTF-8?q?=20with=20Logger=20to=20prevent=20debug=20information=20leakage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Modified com.roockydev.mactouchmc.Logger to make it public and accessible from other packages. - Replaced System.out.println in LayoutManager with Logger.log(Level.DEBUG, ...). - Replaced System.out.println and System.err.println in VirtualInputHandler and ConfigParser with appropriate Logger calls. - Cleaned up commented-out debug code in KeyReleaseManager. - Commented out hardcoded org.gradle.java.home in gradle.properties to improve portability. --- gradle.properties | 2 +- src/main/java/com/roockydev/mactouchmc/Logger.java | 4 ++-- .../java/com/roockydev/mactouchmc/config/ConfigParser.java | 5 ++++- .../com/roockydev/mactouchmc/input/KeyReleaseManager.java | 1 - .../com/roockydev/mactouchmc/input/VirtualInputHandler.java | 6 ++++-- .../java/com/roockydev/mactouchmc/layout/LayoutManager.java | 4 +++- 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index 5c352b5..216130b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # Done to increase the memory available to gradle. org.gradle.jvmargs=-Xmx1G -org.gradle.java.home=/Library/Java/JavaVirtualMachines/temurin-21.jdk/Contents/Home +# org.gradle.java.home=/Library/Java/JavaVirtualMachines/temurin-21.jdk/Contents/Home # Fabric Properties # check these on https://fabricmc.net/use diff --git a/src/main/java/com/roockydev/mactouchmc/Logger.java b/src/main/java/com/roockydev/mactouchmc/Logger.java index bac0443..d167114 100644 --- a/src/main/java/com/roockydev/mactouchmc/Logger.java +++ b/src/main/java/com/roockydev/mactouchmc/Logger.java @@ -5,10 +5,10 @@ public class Logger { - static void log(Level level, String message) { + public static void log(Level level, String message) { LogManager.getLogger().log(level, "[MCTouchBar] " + message); } - static void log(Level level, Object message) { + public static void log(Level level, Object message) { LogManager.getLogger().log(level, "[MCTouchBar] " + message); } } diff --git a/src/main/java/com/roockydev/mactouchmc/config/ConfigParser.java b/src/main/java/com/roockydev/mactouchmc/config/ConfigParser.java index c1461c3..b7acdda 100644 --- a/src/main/java/com/roockydev/mactouchmc/config/ConfigParser.java +++ b/src/main/java/com/roockydev/mactouchmc/config/ConfigParser.java @@ -1,5 +1,8 @@ package com.roockydev.mactouchmc.config; +import com.roockydev.mactouchmc.Logger; +import org.apache.logging.log4j.Level; + public class ConfigParser { public static TouchBarButtonConfig parse(String definition) { TouchBarButtonConfig config = new TouchBarButtonConfig(); @@ -11,7 +14,7 @@ public static TouchBarButtonConfig parse(String definition) { if (parts.length >= 4) config.type = TouchBarButtonConfig.ActionType.valueOf(parts[3].trim()); if (parts.length >= 5) config.keyId = Integer.parseInt(parts[4].trim()); } catch (Exception e) { - System.err.println("Failed to parse button definition: " + definition); + Logger.log(Level.ERROR, "Failed to parse button definition: " + definition); } return config; } diff --git a/src/main/java/com/roockydev/mactouchmc/input/KeyReleaseManager.java b/src/main/java/com/roockydev/mactouchmc/input/KeyReleaseManager.java index 994720a..c8b6ecc 100644 --- a/src/main/java/com/roockydev/mactouchmc/input/KeyReleaseManager.java +++ b/src/main/java/com/roockydev/mactouchmc/input/KeyReleaseManager.java @@ -43,7 +43,6 @@ private static void releaseKey(int keyCode) { int scancode = GLFW.glfwGetKeyScancode(keyCode); // Inject RELEASE - // System.out.println("[DEBUG] VirtualInputHandler: Releasing Key=" + keyCode); client.execute(() -> { if (client.keyboard != null) { client.keyboard.onKey(window, keyCode, scancode, GLFW.GLFW_RELEASE, 0); diff --git a/src/main/java/com/roockydev/mactouchmc/input/VirtualInputHandler.java b/src/main/java/com/roockydev/mactouchmc/input/VirtualInputHandler.java index dec24a6..0479370 100644 --- a/src/main/java/com/roockydev/mactouchmc/input/VirtualInputHandler.java +++ b/src/main/java/com/roockydev/mactouchmc/input/VirtualInputHandler.java @@ -1,6 +1,8 @@ package com.roockydev.mactouchmc.input; +import com.roockydev.mactouchmc.Logger; import net.minecraft.client.MinecraftClient; +import org.apache.logging.log4j.Level; import org.lwjgl.glfw.GLFW; public class VirtualInputHandler { @@ -26,7 +28,7 @@ public static void handleButtonPress(int buttonIndex, boolean isdown) { // Inject the key if (MinecraftClient.getInstance().keyboard != null) { int scancode = GLFW.glfwGetKeyScancode(keyCode); - System.out.println("[DEBUG] VirtualInputHandler: Injecting Key=" + keyCode + " Scancode=" + scancode + " Action=" + action); + Logger.log(Level.DEBUG, "VirtualInputHandler: Injecting Key=" + keyCode + " Scancode=" + scancode + " Action=" + action); MinecraftClient.getInstance().keyboard.onKey(window, keyCode, scancode, action, 0); // If this was a PRESS action (from TouchBar tap), schedule a RELEASE in 2 ticks @@ -34,7 +36,7 @@ public static void handleButtonPress(int buttonIndex, boolean isdown) { KeyReleaseManager.scheduleRelease(keyCode, 2); } } else { - System.err.println("Keyboard instance is null!"); + Logger.log(Level.ERROR, "Keyboard instance is null!"); } } } diff --git a/src/main/java/com/roockydev/mactouchmc/layout/LayoutManager.java b/src/main/java/com/roockydev/mactouchmc/layout/LayoutManager.java index 9c52bde..c8ded52 100644 --- a/src/main/java/com/roockydev/mactouchmc/layout/LayoutManager.java +++ b/src/main/java/com/roockydev/mactouchmc/layout/LayoutManager.java @@ -1,7 +1,9 @@ package com.roockydev.mactouchmc.layout; +import com.roockydev.mactouchmc.Logger; import com.roockydev.mactouchmc.api.TouchBarLayout; import com.thizzer.jtouchbar.JTouchBar; +import org.apache.logging.log4j.Level; import org.lwjgl.glfw.GLFWNativeCocoa; /** @@ -31,7 +33,7 @@ public void setLayout(TouchBarLayout layout) { // Only switch if different (or force update logic if needed) if (this.currentLayout != layout) { - System.out.println("[DEBUG] LayoutManager: Switching layout to " + layout.getClass().getSimpleName()); + Logger.log(Level.DEBUG, "LayoutManager: Switching layout to " + layout.getClass().getSimpleName()); this.currentLayout = layout; show(layout.getTouchBar()); }