fix: make prepareMenu check for registry existence

The-Aether-Team · Nov 18, 2024 · c399f7a · c399f7a
1 parent ea46f1f
commit c399f7a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/main/java/com/aetherteam/cumulus/api/MenuHelper.java b/src/main/java/com/aetherteam/cumulus/api/MenuHelper.java
@@ -8,7 +8,9 @@
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.TitleScreen;
 import net.minecraft.client.renderer.PanoramaRenderer;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.sounds.Music;
+import net.neoforged.neoforge.registries.DeferredHolder;
 
 import javax.annotation.Nullable;
 import java.util.Calendar;
@@ -45,9 +47,11 @@ public void setActiveMenu(@Nullable Menu activeMenu) {
      * Prepares a menu for application by marking it active if the condition is true.
      * @param menu The {@link Menu} to set active.
      */
-    public void prepareMenu(Menu menu) {
-        if (menu.getCondition().getAsBoolean()) {
-            this.setActiveMenu(menu);
+    public void prepareMenu(DeferredHolder<Menu, Menu> menu) {
+        if (menu.getKey() != null && BuiltInRegistries.REGISTRY.get(menu.getKey().registry()) != null) {
+            if (menu.get().getCondition().getAsBoolean()) {
+                this.setActiveMenu(menu.get());
+            }
         }
     }
 

diff --git a/src/main/java/com/aetherteam/cumulus/client/event/hooks/MenuHooks.java b/src/main/java/com/aetherteam/cumulus/client/event/hooks/MenuHooks.java
@@ -11,7 +11,6 @@
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.TitleScreen;
-import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.network.chat.Component;
 
 import javax.annotation.Nullable;
@@ -37,9 +36,7 @@ public static void setLastSplash(Screen screen, MenuHelper menuHelper) {
      * @param menuHelper The {@link MenuHelper}.
      */
     public static void prepareCustomMenus(MenuHelper menuHelper) {
-        if (Menus.MINECRAFT.getKey() != null && BuiltInRegistries.REGISTRY.get(Menus.MINECRAFT.getKey().registry()) != null) {
-            menuHelper.prepareMenu(Menus.MINECRAFT.get());
-        }
+        menuHelper.prepareMenu(Menus.MINECRAFT);
     }
 
     /**