Fix crash caused by MinecraftForge/MinecraftForge#3621

AtomicBlom · Jan 13, 2017 · b6002a2 · b6002a2
1 parent e1bd3ac
commit b6002a2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/build.properties b/build.properties
@@ -6,7 +6,7 @@ group_name=com.github.atomicblom.hcmw
 
 #Minecrat Version
 minecraft_version=1.11.2
-forge_version=13.20.0.2201
+forge_version=13.20.0.2214
 mcp_mappings=snapshot_20170103
 
 #Dependancies

diff --git a/src/main/java/com/github/atomicblom/hcmw/client/model/LanternMultiModel.java b/src/main/java/com/github/atomicblom/hcmw/client/model/LanternMultiModel.java
@@ -47,8 +47,12 @@ public void loadModel(ModelBakeEvent event) {
             final ImmutableMap.Builder<String, Pair<IModel, IModelState>> builder = new ImmutableMap.Builder<>();
             ModelResourceLocation modelLocation = stateMapper.getModelResourceLocation(state);
 
-            final OBJBakedModel bakedModel = (OBJBakedModel) modelRegistry.getObject(modelLocation);
-            OBJModel model = bakedModel.getModel();
+            IBakedModel bakedModel = modelRegistry.getObject(modelLocation);
+            if (!(bakedModel instanceof OBJBakedModel)) {
+                continue;
+            }
+            final OBJBakedModel objBakedModel = (OBJBakedModel) bakedModel;
+            OBJModel model = objBakedModel.getModel();
 
             if (connection == EnumFacing.UP)  {
                 builder.put("roof_hook", Pair.of(roofHookModel, TRSRTransformation.identity()));
@@ -64,12 +68,12 @@ public void loadModel(ModelBakeEvent event) {
             IModel multiModel = new MultiModel(
                     modelLocation,
                     model,
-                    bakedModel.getState(),
+                    objBakedModel.getState(),
                     builder.build()
             );
 
             modelRegistry.putObject(modelLocation,
-                    multiModel.bake(bakedModel.getState(), DefaultVertexFormats.ITEM, textureGetter)
+                    multiModel.bake(objBakedModel.getState(), DefaultVertexFormats.ITEM, textureGetter)
             );
         }
     }