fix: more registry issues

The-Aether-Team · Jul 28, 2023 · 8987af4 · 8987af4
1 parent 8348d60
commit 8987af4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/src/main/java/com/aetherteam/cumulus/Cumulus.java b/src/main/java/com/aetherteam/cumulus/Cumulus.java
@@ -22,24 +22,30 @@
 import net.minecraftforge.fml.config.ModConfig;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import net.minecraftforge.registries.DeferredRegister;
+import net.minecraftforge.registries.IForgeRegistry;
+import net.minecraftforge.registries.RegistryBuilder;
 import org.slf4j.Logger;
 
 import java.util.Map;
+import java.util.function.Supplier;
 
 @Mod(Cumulus.MODID)
 public class Cumulus {
     public static final String MODID = "cumulus_menus";
     public static final Logger LOGGER = LogUtils.getLogger();
 
     public static final ResourceKey<Registry<Menu>> MENU_REGISTRY_KEY = ResourceKey.createRegistryKey(new ResourceLocation(Cumulus.MODID, "menu"));
+    public static final DeferredRegister<Menu> DEFERRED_MENUS = DeferredRegister.create(Cumulus.MENU_REGISTRY_KEY, Cumulus.MENU_REGISTRY_KEY.location().getNamespace());
+    public static final Supplier<IForgeRegistry<Menu>> MENU_REGISTRY = DEFERRED_MENUS.makeRegistry(RegistryBuilder::new);
 
     public Cumulus() {
         DistExecutor.unsafeRunForDist(() -> () -> {
             IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
             modEventBus.addListener(this::dataSetup);
 
             DeferredRegister<?>[] registers = {
-                    Menus.MENUS
+                    Menus.MENUS,
+                    Cumulus.DEFERRED_MENUS
             };
 
             for (DeferredRegister<?> register : registers) {
@@ -50,7 +56,7 @@ public Cumulus() {
 
             return true;
         }, () -> () -> {
-            LOGGER.info("Disabling Cumulus as it is on server.");
+            Cumulus.LOGGER.info("Disabling Cumulus as it is on server.");
 
             return false;
         });

diff --git a/src/main/java/com/aetherteam/cumulus/api/Menu.java b/src/main/java/com/aetherteam/cumulus/api/Menu.java
@@ -1,5 +1,6 @@
 package com.aetherteam.cumulus.api;
 
+import com.aetherteam.cumulus.Cumulus;
 import com.aetherteam.cumulus.mixin.mixins.client.accessor.CreateWorldScreenAccessor;
 import com.aetherteam.cumulus.mixin.mixins.client.accessor.GuiComponentAccessor;
 import com.aetherteam.cumulus.mixin.mixins.client.accessor.RealmsPlayerScreenAccessor;
@@ -94,7 +95,7 @@ public Background getBackground() {
      * @return The {@link ResourceLocation} of the {@link Menu}'s full registry ID.
      */
     public ResourceLocation getId() {
-        return Menus.MENU_REGISTRY.get().getKey(this);
+        return Cumulus.MENU_REGISTRY.get().getKey(this);
     }
 
     /**

diff --git a/src/main/java/com/aetherteam/cumulus/api/Menus.java b/src/main/java/com/aetherteam/cumulus/api/Menus.java
@@ -6,18 +6,14 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraftforge.registries.DeferredRegister;
-import net.minecraftforge.registries.IForgeRegistry;
-import net.minecraftforge.registries.RegistryBuilder;
 import net.minecraftforge.registries.RegistryObject;
 
 import java.util.List;
 import java.util.function.BooleanSupplier;
-import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 public class Menus {
     public static final DeferredRegister<Menu> MENUS = DeferredRegister.create(Cumulus.MENU_REGISTRY_KEY, Cumulus.MODID);
-    public static final Supplier<IForgeRegistry<Menu>> MENU_REGISTRY = MENUS.makeRegistry(RegistryBuilder::new);
 
     public static final ResourceLocation MINECRAFT_ICON = new ResourceLocation("textures/block/grass_block_side.png");
     public static final Component MINECRAFT_NAME = Component.translatable("cumulus_menus.menu_title.minecraft");
@@ -26,14 +22,14 @@ public class Menus {
     public static final RegistryObject<Menu> MINECRAFT = MENUS.register("minecraft", () -> new Menu(MINECRAFT_ICON, MINECRAFT_NAME, new TitleScreen(true), MINECRAFT_CONDITION));
 
     public static Menu get(String id) {
-        return MENU_REGISTRY.get().getValue(new ResourceLocation(id));
+        return Cumulus.MENU_REGISTRY.get().getValue(new ResourceLocation(id));
     }
 
     /**
      * @return A {@link List} of all registered {@link Menu}s.
      */
     public static List<Menu> getMenus() {
-        return MENU_REGISTRY.get().getValues().stream().toList();
+        return Cumulus.MENU_REGISTRY.get().getValues().stream().toList();
     }
 
     /**