fix: attempt profile crash solution

The-Aether-Team · Dec 22, 2024 · b66f439 · b66f439
1 parent 07b441f
commit b66f439
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/common/src/main/java/com/aetherteam/cumulus/client/WorldDisplayHelper.java b/common/src/main/java/com/aetherteam/cumulus/client/WorldDisplayHelper.java
@@ -4,6 +4,7 @@
 import com.aetherteam.cumulus.CumulusConfig;
 import com.aetherteam.cumulus.mixin.mixins.client.accessor.MinecraftAccessor;
 import com.aetherteam.cumulus.mixin.mixins.common.accessor.MinecraftServerAccessor;
+import com.mojang.blaze3d.systems.TimerQuery;
 import net.minecraft.client.CameraType;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.toasts.SystemToast;
@@ -137,9 +138,13 @@ public static void stopLevel(@Nullable Screen screen) {
      * Sets up a menu through Cumulus and forces it as the current screen.
      */
     public static void setMenu() {
+        MinecraftAccessor minecraftAccessor = (MinecraftAccessor) Minecraft.getInstance();
         CumulusClient.MENU_HELPER.setShouldFade(false);
         Screen screen = CumulusClient.MENU_HELPER.applyMenu(CumulusClient.MENU_HELPER.getActiveMenu());
         if (screen != null) {
+            if (minecraftAccessor.cumulus$getCurrentFrameProfile() != null && !minecraftAccessor.cumulus$getCurrentFrameProfile().isDone()) {
+                TimerQuery.getInstance().ifPresent((timer) -> minecraftAccessor.cumulus$setCurrentFrameProfile(timer.endProfile()));
+            }
             Minecraft.getInstance().forceSetScreen(screen);
         }
     }

diff --git a/.../src/main/java/com/aetherteam/cumulus/mixin/mixins/client/accessor/MinecraftAccessor.java b/.../src/main/java/com/aetherteam/cumulus/mixin/mixins/client/accessor/MinecraftAccessor.java
@@ -1,5 +1,6 @@
 package com.aetherteam.cumulus.mixin.mixins.client.accessor;
 
+import com.mojang.blaze3d.systems.TimerQuery;
 import net.minecraft.client.Minecraft;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
@@ -8,4 +9,10 @@
 public interface MinecraftAccessor {
     @Accessor("isLocalServer")
     void cumulus$setIsLocalServer(boolean isLocalServer);
+
+    @Accessor("currentFrameProfile")
+    TimerQuery.FrameProfile cumulus$getCurrentFrameProfile();
+
+    @Accessor("currentFrameProfile")
+    void cumulus$setCurrentFrameProfile(TimerQuery.FrameProfile currentFrameProfile);
 }