Move model loader registration to mod construct

According to pupnewfster, registering it later causes it to randomly be registered too late
This commit is contained in:
KnightMiner committed 2020-07-24 11:42:19 -05:00
1 parent a8899f976c
commit bdf1f11a03
2 files changed
+12 -8

No files matched your search

@@ -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) {
@@ -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);
}
}