From 8f5999f37fec10b99199059e3ccca295c3d38fbf Mon Sep 17 00:00:00 2001 From: KnightMiner Date: Mon, 27 Jul 2020 21:44:06 -0500 Subject: [PATCH] Fix crash on data gen as minecraft instance is null --- .../java/slimeknights/mantle/client/ClientEvents.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/slimeknights/mantle/client/ClientEvents.java b/src/main/java/slimeknights/mantle/client/ClientEvents.java index 5fb426c..bd8d843 100644 --- a/src/main/java/slimeknights/mantle/client/ClientEvents.java +++ b/src/main/java/slimeknights/mantle/client/ClientEvents.java @@ -21,10 +21,13 @@ import slimeknights.mantle.client.model.inventory.InventoryModel; public class ClientEvents { public static void onConstruct() { - // register on construct as sometimes models start loading before client setup or model regsitry event - ModelLoaderRegistry.registerLoader(Mantle.getResource("fallback"), FallbackModelLoader.INSTANCE); - ModelLoaderRegistry.registerLoader(Mantle.getResource("inventory"), InventoryModel.Loader.INSTANCE); - ModelLoaderRegistry.registerLoader(Mantle.getResource("connected"), ConnectedModel.Loader.INSTANCE); + //noinspection ConstantConditions Minecraft is null during data gen, causing loader registration to fail + if (Minecraft.getInstance() != null) { + // register on construct as sometimes models start loading before client setup or model regsitry event + ModelLoaderRegistry.registerLoader(Mantle.getResource("fallback"), FallbackModelLoader.INSTANCE); + ModelLoaderRegistry.registerLoader(Mantle.getResource("inventory"), InventoryModel.Loader.INSTANCE); + ModelLoaderRegistry.registerLoader(Mantle.getResource("connected"), ConnectedModel.Loader.INSTANCE); + } } @SubscribeEvent