diff --git a/src/main/java/tconstruct/armor/ArmorProxyClient.java b/src/main/java/tconstruct/armor/ArmorProxyClient.java index bbde5a44..842dac0b 100644 --- a/src/main/java/tconstruct/armor/ArmorProxyClient.java +++ b/src/main/java/tconstruct/armor/ArmorProxyClient.java @@ -60,7 +60,7 @@ public class ArmorProxyClient extends ArmorProxyCommon { @Override public void preInit() { controlInstance = new ArmorControls(); - new TabRegistry().registerEvent(); + MinecraftForge.EVENT_BUS.register(new TabRegistry()); } @Override diff --git a/src/main/java/tconstruct/client/tabs/TabRegistry.java b/src/main/java/tconstruct/client/tabs/TabRegistry.java index 5d7b5e6d..962a2042 100644 --- a/src/main/java/tconstruct/client/tabs/TabRegistry.java +++ b/src/main/java/tconstruct/client/tabs/TabRegistry.java @@ -7,7 +7,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiInventory; import net.minecraft.network.play.client.C0DPacketCloseWindow; import net.minecraftforge.client.event.GuiScreenEvent; -import net.minecraftforge.common.MinecraftForge; import codechicken.nei.NEIClientConfig; import cpw.mods.fml.client.FMLClientHandler; @@ -18,10 +17,6 @@ import cpw.mods.fml.relauncher.SideOnly; public class TabRegistry { - public void registerEvent() { - MinecraftForge.EVENT_BUS.register(new EventHandler()); - } - private static final ArrayList tabList = new ArrayList<>(); public static void registerTab(AbstractTab tab) { @@ -32,7 +27,8 @@ public class TabRegistry { return tabList; } - // Client method + @SideOnly(Side.CLIENT) + @SubscribeEvent public void guiPostInit(GuiScreenEvent.InitGuiEvent.Post event) { if ((event.gui instanceof GuiInventory)) { int xSize = 176; @@ -93,13 +89,4 @@ public class TabRegistry { // No potions, no offset needed return 0; } - - public class EventHandler { - - @SideOnly(Side.CLIENT) - @SubscribeEvent - public void guiPostInitWrapper(GuiScreenEvent.InitGuiEvent.Post event) { - TabRegistry.this.guiPostInit(event); - } - } }