Avoid NPE when accessing model manager

embeddedt · Aug 27, 2023 · 8b1e2d7 · 8b1e2d7
1 parent d21aea0
commit 8b1e2d7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/main/java/org/embeddedt/vintagefix/dynamicresources/SafeModelBakeWrapper.java b/src/main/java/org/embeddedt/vintagefix/dynamicresources/SafeModelBakeWrapper.java
@@ -3,6 +3,7 @@
 import com.google.common.collect.ImmutableList;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.block.model.IBakedModel;
+import net.minecraft.client.renderer.block.model.ModelManager;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.util.registry.RegistrySimple;
 import net.minecraftforge.client.event.ModelBakeEvent;
@@ -20,6 +21,7 @@
 import java.util.Objects;
 
 public class SafeModelBakeWrapper {
+    public static ModelManager theManager;
     private static final ImmutableList<Pair<String, String>> MOD_BAKE_CLASSES = ImmutableList.<Pair<String, String>>builder()
         .add(Pair.of("tschipp.hardcoreitemstages.ItemStageEventHandler", "onModelBakeEvent"))
         .build();
@@ -59,14 +61,14 @@ public static class WrappingHandler {
 
         @SubscribeEvent
         public void onDynBake(DynamicModelBakeEvent e) {
-            if(!(e.location instanceof ModelResourceLocation) || recursion > 0)
+            if(!(e.location instanceof ModelResourceLocation) || recursion > 0 || SafeModelBakeWrapper.theManager == null)
                 return;
             recursion++;
             try {
                 RegistrySimple<ModelResourceLocation, IBakedModel> reg = new RegistrySimple<>();
                 reg.putObject((ModelResourceLocation)e.location, e.bakedModel);
                 ModelBakeEvent event = new ModelBakeEvent(
-                    Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager(),
+                    SafeModelBakeWrapper.theManager,
                     reg,
                     null
                 );

diff --git a/src/main/java/org/embeddedt/vintagefix/mixin/dynamic_resources/MixinModelManager.java b/src/main/java/org/embeddedt/vintagefix/mixin/dynamic_resources/MixinModelManager.java
@@ -205,6 +205,7 @@ public void onResourceManagerReload(IResourceManager resourceManager) {
         DynamicBakedModelProvider dynamicBakedModelProvider = new DynamicBakedModelProvider(dynamicModelProvider);
         DynamicBakedModelProvider.instance = dynamicBakedModelProvider;
         modelRegistry = dynamicBakedModelProvider;
+        SafeModelBakeWrapper.theManager = (ModelManager)(Object)this;
 
         earlyDetectedTextures = new HashSet<>();