From f0f69eeba72e5cf1f8c30536ee90c32f4be41666 Mon Sep 17 00:00:00 2001
From: 90 <hi@90.gripe>
Date: Thu, 2 May 2024 07:31:29 +0100
Subject: [PATCH] Use event subscription for screen registration

---
 src/main/java/gripe/_90/appliede/AppliedE.java            | 6 ------
 .../java/gripe/_90/appliede/iface/EMCInterfaceScreen.java | 8 ++++++++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/gripe/_90/appliede/AppliedE.java b/src/main/java/gripe/_90/appliede/AppliedE.java
index 41078d6..c585191 100644
--- a/src/main/java/gripe/_90/appliede/AppliedE.java
+++ b/src/main/java/gripe/_90/appliede/AppliedE.java
@@ -17,7 +17,6 @@
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
-import net.minecraftforge.fml.loading.FMLEnvironment;
 import net.minecraftforge.fml.loading.LoadingModList;
 import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
 import net.minecraftforge.registries.DeferredRegister;
@@ -44,7 +43,6 @@
 import gripe._90.appliede.iface.EMCInterfaceMenu;
 import gripe._90.appliede.iface.EMCInterfacePart;
 import gripe._90.appliede.iface.EMCInterfacePartAECF;
-import gripe._90.appliede.iface.EMCInterfaceScreen;
 import gripe._90.appliede.key.EMCKey;
 import gripe._90.appliede.key.EMCKeyType;
 import gripe._90.appliede.module.EMCModulePart;
@@ -129,10 +127,6 @@ public AppliedE() {
             registerEMC(AEParts.CABLE_ANCHOR, 32);
             registerEMC(AEItems.FACADE, 1); // will be replaced by FacadeProcessor
         });
-
-        if (FMLEnvironment.dist.isClient()) {
-            bus.addListener(EMCInterfaceScreen::register);
-        }
     }
 
     public static ResourceLocation id(String path) {
diff --git a/src/main/java/gripe/_90/appliede/iface/EMCInterfaceScreen.java b/src/main/java/gripe/_90/appliede/iface/EMCInterfaceScreen.java
index 7a75d2e..62baa4f 100644
--- a/src/main/java/gripe/_90/appliede/iface/EMCInterfaceScreen.java
+++ b/src/main/java/gripe/_90/appliede/iface/EMCInterfaceScreen.java
@@ -6,6 +6,9 @@
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 
 import appeng.client.gui.AEBaseScreen;
@@ -16,6 +19,10 @@
 import appeng.init.client.InitScreens;
 import appeng.menu.SlotSemantics;
 
+import gripe._90.appliede.AppliedE;
+
+@SuppressWarnings("unused")
+@Mod.EventBusSubscriber(modid = AppliedE.MODID, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD)
 public class EMCInterfaceScreen extends AEBaseScreen<EMCInterfaceMenu> {
     private final List<Button> amountButtons = new ArrayList<>();
 
@@ -39,6 +46,7 @@ public EMCInterfaceScreen(EMCInterfaceMenu menu, Inventory playerInventory, Comp
         }
     }
 
+    @SubscribeEvent
     public static void register(FMLClientSetupEvent event) {
         event.enqueueWork(() -> InitScreens.register(
                 EMCInterfaceMenu.TYPE, EMCInterfaceScreen::new, "/screens/appliede/emc_interface.json"));