Skip to content

⚡ Optimize Screen Detection in Tick Loop #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ROOCKY-dev wants to merge 1 commit into
base: main
Choose a base branch
from
+25 −14
Open

⚡ Optimize Screen Detection in Tick Loop #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 25 additions & 14 deletions src/main/java/com/roockydev/mactouchmc/MacTouchMC.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.screen.Screen;
import org.apache.logging.log4j.Level;
import org.lwjgl.glfw.GLFWNativeCocoa;

Expand All @@ -32,6 +33,11 @@ public class MacTouchMC implements ClientModInitializer {
private Screens activeScreen;
private int tickCounter = 0;

// Cache for Screen Detection Optimization
private Screen lastScreen = null;
private String cachedScreenName = "";
private boolean lastInConfig = false;

private static JTouchBar inGameTouchBar;
private static JTouchBar mainTouchBar;

Expand Down Expand Up @@ -95,18 +101,26 @@ public void onInitializeClient() {
// Register Tick Listener to switch bars based on context
ClientTickEvents.END_CLIENT_TICK.register(client -> {

// Optimized Screen Detection
Screen currentScreen = client.currentScreen;
if (currentScreen != lastScreen) {
lastScreen = currentScreen;
cachedScreenName = currentScreen == null ? "" : currentScreen.getClass().getName();
String lowerScreenName = cachedScreenName.toLowerCase();
lastInConfig = lowerScreenName.contains("config") ||
lowerScreenName.contains("yacl") ||
lowerScreenName.contains("keybind") ||
lowerScreenName.contains("controls");
}

// Debug logging for Screen Detection (Requested by user)
// We log every 20 ticks (1 second) to avoid spam but generally track screens
if (client.player != null && client.player.age % 40 == 0 && client.currentScreen != null) {
Logger.log(Level.INFO, "[DEBUG] Screen: " + client.currentScreen.getClass().getName());
// We log every 40 ticks (2 seconds) to avoid spam but generally track screens
if (client.player != null && client.player.age % 40 == 0 && currentScreen != null) {
Logger.log(Level.INFO, "[DEBUG] Screen: " + cachedScreenName);
}

// Prioritize Config Screen Detection
String screenName = client.currentScreen == null ? "" : client.currentScreen.getClass().getName().toLowerCase();
boolean inConfig = screenName.contains("config") ||
screenName.contains("yacl") ||
screenName.contains("keybind") ||
screenName.contains("controls");
boolean inConfig = lastInConfig;

// Increment tick counter
tickCounter++;
Expand All @@ -122,8 +136,9 @@ public void onInitializeClient() {
}

// Standard Logic
if (activeScreen != Screens.getActive()) {
activeScreen = Screens.getActive();
Screens currentType = Screens.getActive();
if (activeScreen != currentType) {
activeScreen = currentType;
Logger.log(Level.DEBUG, "Screen switched to: " + activeScreen);

if (activeScreen == Screens.INGAME || activeScreen == Screens.GAME_MENU) {
Expand All @@ -132,10 +147,6 @@ public void onInitializeClient() {
layoutManager.setLayout(menuLayout);
}
}
// Standard Logic
if (activeScreen != Screens.getActive()) {
// ... existing logic ...
}

// Process Key Release Manager
com.roockydev.mactouchmc.input.KeyReleaseManager.tick();
Expand Down