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

Merge 1.18 into 1.19.2

Browse Source
This commit is contained in:
embeddedt 2023-07-09 20:37:23 -04:00
commit 4962d855af
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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