fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Catch NPEs when accessing IBakedModel#getOverrides from ModelBakeEvent, fixes #537

Browse Source
This commit is contained in:
Electroblob77
2020-12-20 17:07:58 +00:00
parent 8f8ce7a453
commit e2fd978d8b
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/client/model/BakedModelGenerateOverrides.java
+13 -7
View File
@@ -119,13 +119,19 @@ public class BakedModelGenerateOverrides implements IBakedModel {
IBakedModel original = event.getModelRegistry().getObject(location);
// Ignore the warnings, IntelliJ is right that these can't be null in the dev environment but certain
// mods seem to be doing ASM hackery that makes it so they can be null
if(original != null && original.getOverrides() != null && original.getOverrides().getOverrides() != null){
original.getOverrides().getOverrides().stream().map(ItemOverride::getLocation)
.filter(l -> l.getPath().contains(OVERRIDE_GENERATORS)).findFirst()
.ifPresent(l -> event.getModelRegistry().putObject(location,
substituteWandModel(event.getModelManager(), location, original, l)));
try{
// Ignore the warnings, IntelliJ is right that these can't be null in the dev environment but certain
// mods seem to be doing ASM hackery that makes it so they can be null
if(original != null && original.getOverrides() != null && original.getOverrides().getOverrides() != null){
original.getOverrides().getOverrides().stream().map(ItemOverride::getLocation)
.filter(l -> l.getPath().contains(OVERRIDE_GENERATORS)).findFirst()
.ifPresent(l -> event.getModelRegistry().putObject(location,
substituteWandModel(event.getModelManager(), location, original, l)));
}
}catch(NullPointerException e){
Wizardry.logger.info("The model {} threw an error when trying to access item overrides, it will be ignored. If you're an addon dev and you made this model, something is wrong with it! Otherwise, please ignore this message.", location);
}
}
}