diff --git a/src/main/java/noppes/npcs/CommonProxy.java b/src/main/java/noppes/npcs/CommonProxy.java index 6229b0f4e..0c60d14ac 100644 --- a/src/main/java/noppes/npcs/CommonProxy.java +++ b/src/main/java/noppes/npcs/CommonProxy.java @@ -225,6 +225,14 @@ public class CommonProxy implements IGuiHandler { public void buildPackageIndex() { } + /** + * Called from the mod's FMLLoadCompleteEvent, after every other mod has finished loading. + * Anything that has to observe another mod's registrations belongs here rather than in + * load(), and it stays on the proxy so client-only types never reach the server. + */ + public void loadComplete() { + } + public boolean isScriptingEnabled() { return ConfigScript.ScriptingEnabled; } diff --git a/src/main/java/noppes/npcs/CustomNpcs.java b/src/main/java/noppes/npcs/CustomNpcs.java index 480ee4f12..7274a490e 100644 --- a/src/main/java/noppes/npcs/CustomNpcs.java +++ b/src/main/java/noppes/npcs/CustomNpcs.java @@ -343,6 +343,10 @@ public class CustomNpcs { @EventHandler public void loadComplete(FMLLoadCompleteEvent ev) { + // Runs after every other mod has loaded. Kept on the proxy: the client side registers + // inventory tabs, and naming those types here would drag client-only GUI classes into + // a class the server loads. + proxy.loadComplete(); proxy.buildPackageIndex(); // Load built-in animations on the client so they're available for ability preview. diff --git a/src/main/java/noppes/npcs/client/ClientProxy.java b/src/main/java/noppes/npcs/client/ClientProxy.java index ce49e6eee..ca39262d7 100644 --- a/src/main/java/noppes/npcs/client/ClientProxy.java +++ b/src/main/java/noppes/npcs/client/ClientProxy.java @@ -384,14 +384,6 @@ public class ClientProxy extends CommonProxy { // Lightning effect rendering system MinecraftForge.EVENT_BUS.register(new LightningHandler()); - - if (ConfigClient.InventoryGuiEnabled) { - MinecraftForge.EVENT_BUS.register(new TabRegistry()); - if (TabRegistry.getTabList().isEmpty()) { - TabRegistry.registerTab(new InventoryTabVanilla()); - } - TabRegistry.registerTab(new InventoryTabCustomNpc()); - } } public FakePlayer getCommandPlayer(IWorld world) { @@ -862,6 +854,19 @@ public class ClientProxy extends CommonProxy { return Minecraft.getMinecraft().currentScreen != null; } + @Override + public void loadComplete() { + // Deferred from load() so TConstruct has registered its own tabs first - registering + // ours before it left the vanilla tab duplicated. + if (ConfigClient.InventoryGuiEnabled) { + MinecraftForge.EVENT_BUS.register(new TabRegistry()); + if (TabRegistry.getTabList().isEmpty()) { + TabRegistry.registerTab(new InventoryTabVanilla()); + } + TabRegistry.registerTab(new InventoryTabCustomNpc()); + } + } + public void buildPackageIndex() { try { PackageFinder.init(Thread.currentThread().getContextClassLoader());