R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve parents in getModel rather than at bake time

Browse Source 
Fixes EBE chests
This commit is contained in:
embeddedt 2023-07-09 20:34:25 -04:00
parent f040f66bf9
commit 49b31c347b
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakeryMixin.java
View File

@ -401,6 +401,8 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
// As in pathological cases (e.g. Pedestals on 1.19) unbakedCache can lose // As in pathological cases (e.g. Pedestals on 1.19) unbakedCache can lose
// the model immediately // the model immediately
UnbakedModel result = smallLoadingCache.getOrDefault(modelLocation, iunbakedmodel); UnbakedModel result = smallLoadingCache.getOrDefault(modelLocation, iunbakedmodel);
// required as some mods (e.g. EBE) call bake directly on the returned model, without resolving parents themselves
result.getMaterials(this::getModel, new HashSet<>());
// We are done with loading, so clear this cache to allow GC of any unneeded models // We are done with loading, so clear this cache to allow GC of any unneeded models
if(mfix$nestedLoads == 0) if(mfix$nestedLoads == 0)
smallLoadingCache.clear(); smallLoadingCache.clear();

2
forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakeryMixin.java
View File

@ -286,6 +286,8 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
// As in pathological cases (e.g. Pedestals on 1.19) unbakedCache can lose // As in pathological cases (e.g. Pedestals on 1.19) unbakedCache can lose
// the model immediately // the model immediately
UnbakedModel result = smallLoadingCache.getOrDefault(modelLocation, iunbakedmodel); UnbakedModel result = smallLoadingCache.getOrDefault(modelLocation, iunbakedmodel);
// required as some mods (e.g. EBE) call bake directly on the returned model, without resolving parents themselves
result.getMaterials(this::getModel, new HashSet<>());
// We are done with loading, so clear this cache to allow GC of any unneeded models // We are done with loading, so clear this cache to allow GC of any unneeded models
if(mfix$nestedLoads == 0) if(mfix$nestedLoads == 0)
smallLoadingCache.clear(); smallLoadingCache.clear();