Fixed runData crash. Fixes #2615

This commit is contained in:
raoulvdberge
2020-07-14 18:17:31 +02:00
parent 93e443b7aa
commit 3be3ca9ef9

View File

@@ -39,9 +39,12 @@ public class ClientSetup {
private final BakedModelOverrideRegistry bakedModelOverrideRegistry = new BakedModelOverrideRegistry(); private final BakedModelOverrideRegistry bakedModelOverrideRegistry = new BakedModelOverrideRegistry();
public ClientSetup() { public ClientSetup() {
IResourceManager resourceManager = Minecraft.getInstance().getResourceManager(); Minecraft minecraft = Minecraft.getInstance();
if (resourceManager instanceof IReloadableResourceManager) { if (minecraft != null) { // This is null in a runData environment.
((IReloadableResourceManager) resourceManager).addReloadListener(new ResourcePackListener()); IResourceManager resourceManager = minecraft.getResourceManager();
if (resourceManager instanceof IReloadableResourceManager) {
((IReloadableResourceManager) resourceManager).addReloadListener(new ResourcePackListener());
}
} }
bakedModelOverrideRegistry.add(new ResourceLocation(RS.ID, "controller"), (base, registry) -> new FullbrightBakedModel( bakedModelOverrideRegistry.add(new ResourceLocation(RS.ID, "controller"), (base, registry) -> new FullbrightBakedModel(