From bdf1f11a031ca9f1dfda9058540a0f906c5891da Mon Sep 17 00:00:00 2001 From: KnightMiner Date: Fri, 24 Jul 2020 11:42:19 -0500 Subject: [PATCH] Move model loader registration to mod construct According to pupnewfster, registering it later causes it to randomly be registered too late --- src/main/java/slimeknights/mantle/Mantle.java | 4 ++++ .../slimeknights/mantle/client/ClientEvents.java | 16 ++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/main/java/slimeknights/mantle/Mantle.java b/src/main/java/slimeknights/mantle/Mantle.java index eb7373f..e4bdca9 100644 --- a/src/main/java/slimeknights/mantle/Mantle.java +++ b/src/main/java/slimeknights/mantle/Mantle.java @@ -1,12 +1,15 @@ package slimeknights.mantle; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import slimeknights.mantle.network.BookNetwork; +import slimeknights.mantle.client.ClientEvents; /** * Mantle @@ -28,6 +31,7 @@ public class Mantle { public Mantle() { instance = this; FMLJavaModLoadingContext.get().getModEventBus().addListener(this::commonSetup); + DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> ClientEvents::onConstruct); } private void commonSetup(final FMLCommonSetupEvent event) { diff --git a/src/main/java/slimeknights/mantle/client/ClientEvents.java b/src/main/java/slimeknights/mantle/client/ClientEvents.java index 0d57f89..5fb426c 100644 --- a/src/main/java/slimeknights/mantle/client/ClientEvents.java +++ b/src/main/java/slimeknights/mantle/client/ClientEvents.java @@ -4,7 +4,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.resources.IReloadableResourceManager; import net.minecraft.resources.IResourceManager; import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.client.event.ModelRegistryEvent; import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.eventbus.api.SubscribeEvent; @@ -20,6 +19,14 @@ import slimeknights.mantle.client.model.inventory.InventoryModel; @SuppressWarnings("unused") @EventBusSubscriber(modid = Mantle.modId, value = Dist.CLIENT, bus = Bus.MOD) 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); + } + @SubscribeEvent static void commonSetup(FMLCommonSetupEvent event) { IResourceManager manager = Minecraft.getInstance().getResourceManager(); @@ -28,11 +35,4 @@ public class ClientEvents { } MinecraftForge.EVENT_BUS.register(new ExtraHeartRenderHandler()); } - - @SubscribeEvent - static void registerModelLoaders(ModelRegistryEvent event) { - ModelLoaderRegistry.registerLoader(Mantle.getResource("fallback"), FallbackModelLoader.INSTANCE); - ModelLoaderRegistry.registerLoader(Mantle.getResource("inventory"), InventoryModel.Loader.INSTANCE); - ModelLoaderRegistry.registerLoader(Mantle.getResource("connected"), ConnectedModel.Loader.INSTANCE); - } }