fix #25

kurrycat2004 · Jul 13, 2023 · 4e78cba · 4e78cba
1 parent afa8d7f
commit 4e78cba
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 0 deletions.
diff --git a/common/src/main/java/io/github/kurrycat/mpkmod/Main.java b/common/src/main/java/io/github/kurrycat/mpkmod/Main.java
@@ -125,6 +125,7 @@ public void loaded() {
                 EventAPI.EventListener.onRenderOverlay(
                         e -> {
                             if (!displayOverlay) return;
+                            if(Minecraft.isF3Enabled()) return;
 
                             Profiler.startSection("components");
                             if (mainGUI != null) {

diff --git a/common/src/main/java/io/github/kurrycat/mpkmod/compatibility/MCClasses/Minecraft.java b/common/src/main/java/io/github/kurrycat/mpkmod/compatibility/MCClasses/Minecraft.java
@@ -99,6 +99,10 @@ public static boolean setInputs(TickInput inputs) {
        return Interface.get().get().setInputs(inputs);
     }
 
+    public static boolean isF3Enabled() {
+        return Interface.get().map(Interface::isF3Enabled).orElse(false);
+    }
+
     public enum WorldState {
         MENU,
         SINGLE_PLAYER,
@@ -129,5 +133,7 @@ static Optional<Interface> get() {
         void copyToClipboard(String content);
 
         boolean setInputs(TickInput inputs);
+
+        boolean isF3Enabled();
     }
 }
diff --git a/...ain/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_19_4/FunctionCompatibility.java b/...ain/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_19_4/FunctionCompatibility.java
@@ -384,6 +384,10 @@ public boolean setInputs(TickInput inputs) {
         return true;
     }
 
+    public boolean isF3Enabled() {
+        return MinecraftClient.getInstance().options.debugEnabled;
+    }
+
     public List<Integer> getPressedButtons() {
         return new ArrayList<>(pressedButtons);
     }

diff --git a/.../main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20/FunctionCompatibility.java b/.../main/java/io/github/kurrycat/mpkmod/compatibility/fabric_1_20/FunctionCompatibility.java
@@ -386,6 +386,10 @@ public boolean setInputs(TickInput inputs) {
         return true;
     }
 
+    public boolean isF3Enabled() {
+        return MinecraftClient.getInstance().options.debugEnabled;
+    }
+
     public List<Integer> getPressedButtons() {
         return new ArrayList<>(pressedButtons);
     }

diff --git a/...main/java/io/github/kurrycat/mpkmod/compatibility/forge_1_19_4/FunctionCompatibility.java b/...main/java/io/github/kurrycat/mpkmod/compatibility/forge_1_19_4/FunctionCompatibility.java
@@ -391,6 +391,10 @@ public boolean setInputs(TickInput inputs) {
         return true;
     }
 
+    public boolean isF3Enabled() {
+        return Minecraft.getInstance().options.renderDebug;
+    }
+
     /**
      * Is called in {@link Keyboard.Interface Keyboard.Interface}
      */

diff --git a/...c/main/java/io/github/kurrycat/mpkmod/compatibility/forge_1_20/FunctionCompatibility.java b/...c/main/java/io/github/kurrycat/mpkmod/compatibility/forge_1_20/FunctionCompatibility.java
@@ -394,6 +394,10 @@ public boolean setInputs(TickInput inputs) {
         return true;
     }
 
+    public boolean isF3Enabled() {
+        return Minecraft.getInstance().options.renderDebug;
+    }
+
     /**
      * Is called in {@link Keyboard.Interface Keyboard.Interface}
      */

diff --git a/...rc/main/java/io/github/kurrycat/mpkmod/compatibility/forge_1_8/FunctionCompatibility.java b/...rc/main/java/io/github/kurrycat/mpkmod/compatibility/forge_1_8/FunctionCompatibility.java
@@ -386,6 +386,10 @@ public boolean setInputs(TickInput inputs) {
         return true;
     }
 
+    public boolean isF3Enabled() {
+        return Minecraft.getMinecraft().gameSettings.showDebugInfo;
+    }
+
     /**
      * Is called in {@link io.github.kurrycat.mpkmod.compatibility.MCClasses.Keyboard.Interface Keyboard.Interface}
      */