From 3be3ca9ef9ce19de5ab34629e90c7a4ec7e1a207 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Tue, 14 Jul 2020 18:17:31 +0200 Subject: [PATCH] Fixed runData crash. Fixes #2615 --- .../refinedmods/refinedstorage/setup/ClientSetup.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/refinedmods/refinedstorage/setup/ClientSetup.java b/src/main/java/com/refinedmods/refinedstorage/setup/ClientSetup.java index 981d52fb2..d853718c8 100644 --- a/src/main/java/com/refinedmods/refinedstorage/setup/ClientSetup.java +++ b/src/main/java/com/refinedmods/refinedstorage/setup/ClientSetup.java @@ -39,9 +39,12 @@ public class ClientSetup { private final BakedModelOverrideRegistry bakedModelOverrideRegistry = new BakedModelOverrideRegistry(); public ClientSetup() { - IResourceManager resourceManager = Minecraft.getInstance().getResourceManager(); - if (resourceManager instanceof IReloadableResourceManager) { - ((IReloadableResourceManager) resourceManager).addReloadListener(new ResourcePackListener()); + Minecraft minecraft = Minecraft.getInstance(); + if (minecraft != null) { // This is null in a runData environment. + IResourceManager resourceManager = minecraft.getResourceManager(); + if (resourceManager instanceof IReloadableResourceManager) { + ((IReloadableResourceManager) resourceManager).addReloadListener(new ResourcePackListener()); + } } bakedModelOverrideRegistry.add(new ResourceLocation(RS.ID, "controller"), (base, registry) -> new FullbrightBakedModel(