Properly register AE2WTLib integration menu

62832 · Nov 17, 2024 · 372f710 · 372f710
1 parent 38289cc
commit 372f710
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/src/main/java/gripe/_90/appliede/AppliedE.java b/src/main/java/gripe/_90/appliede/AppliedE.java
@@ -137,10 +137,6 @@ public final class AppliedE {
             id("main"), () -> PROTOCOL_VERSION, PROTOCOL_VERSION::equals, PROTOCOL_VERSION::equals);
 
     static {
-        if (Addons.AE2WTLIB.isLoaded()) {
-            MENU_TYPES.register("wireless_transmutation_terminal", () -> AE2WTIntegration.MENU);
-        }
-
         TABS.register(MODID, () -> CreativeModeTab.builder()
                 .title(Component.translatable("mod." + MODID))
                 .icon(() -> EMC_INTERFACE.get().asItem().getDefaultInstance())
@@ -201,6 +197,7 @@ public AppliedE() {
         });
 
         if (Addons.AE2WTLIB.isLoaded()) {
+            bus.addListener(AE2WTIntegration::registerTerminalMenu);
             bus.addListener(AE2WTIntegration::addTerminalToAE2WTLibTab);
         }
 

diff --git a/src/main/java/gripe/_90/appliede/integration/ae2wtlib/AE2WTIntegration.java b/src/main/java/gripe/_90/appliede/integration/ae2wtlib/AE2WTIntegration.java
@@ -1,20 +1,22 @@
 package gripe._90.appliede.integration.ae2wtlib;
 
-import net.minecraft.world.inventory.MenuType;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraftforge.event.BuildCreativeModeTabContentsEvent;
+import net.minecraftforge.registries.ForgeRegistries;
+import net.minecraftforge.registries.RegisterEvent;
 
 import appeng.api.config.Actionable;
 import appeng.api.features.GridLinkables;
+import appeng.core.AppEng;
 import appeng.init.client.InitScreens;
 import appeng.items.tools.powered.WirelessTerminalItem;
 
 import gripe._90.appliede.integration.Addons;
 
 public class AE2WTIntegration {
     private static final Item TERMINAL = new WTTItem();
-    public static final MenuType<?> MENU = WTTMenu.TYPE;
 
     static {
         GridLinkables.register(TERMINAL, WirelessTerminalItem.LINKABLE_HANDLER);
@@ -31,6 +33,12 @@ public static ItemStack getChargedTerminal() {
         return stack;
     }
 
+    public static void registerTerminalMenu(RegisterEvent event) {
+        if (event.getRegistryKey().equals(Registries.MENU)) {
+            ForgeRegistries.MENU_TYPES.register(AppEng.makeId("wireless_transmutation_terminal"), WTTMenu.TYPE);
+        }
+    }
+
     public static void addTerminalToAE2WTLibTab(BuildCreativeModeTabContentsEvent event) {
         if (event.getTabKey().location().getNamespace().equals(Addons.AE2WTLIB.getModId())) {
             event.accept(TERMINAL);

diff --git a/src/main/java/gripe/_90/appliede/menu/TransmutationTerminalMenu.java b/src/main/java/gripe/_90/appliede/menu/TransmutationTerminalMenu.java
@@ -1,5 +1,7 @@
 package gripe._90.appliede.menu;
 
+import org.jetbrains.annotations.NotNull;
+
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
@@ -149,6 +151,7 @@ public void decrementUnlearnedTicks() {
         }
     }
 
+    @NotNull
     @Override
     public ItemStack quickMoveStack(Player player, int idx) {
         if (shiftToTransmute) {