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-15 21:32:20 -04:00
commit c4abe1cf05
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,6 +101,7 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
private Cache<ResourceLocation, UnbakedModel> loadedModels;
private HashMap<ResourceLocation, UnbakedModel> smallLoadingCache = new HashMap<>();
private Map<ResourceLocation, UnbakedModel> vanillaUnbakedStorage;
private boolean inTextureGatheringPass;
@ -124,11 +125,11 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
.softValues()
.build();
// temporarily replace this map to capture models into the small loading cache
Map<ResourceLocation, UnbakedModel> oldMap = this.unbakedCache;
vanillaUnbakedStorage = this.unbakedCache;
this.unbakedCache = new ForwardingMap<ResourceLocation, UnbakedModel>() {
@Override
protected Map<ResourceLocation, UnbakedModel> delegate() {
return oldMap;
return vanillaUnbakedStorage;
}
@Override
@ -316,6 +317,31 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
ModernFix.LOGGER.info("Early model bake took {}", watch);
ModernFix.LOGGER.info("{} unbaked models, {} baked models loaded permanently", this.unbakedCache.size(), this.bakedCache.size());
this.unbakedCache = new LayeredForwardingMap<>(new Map[] { this.unbakedCache, mutableBackingMap });
// prevent writes from hitting the vanilla map, which prevents GC of models
Map<ResourceLocation, UnbakedModel> oldVanillaStorage = vanillaUnbakedStorage;
vanillaUnbakedStorage = new ForwardingMap<ResourceLocation, UnbakedModel>() {
@Override
protected Map<ResourceLocation, UnbakedModel> delegate() {
return oldVanillaStorage;
}
@Override
public UnbakedModel put(ResourceLocation key, UnbakedModel value) {
UnbakedModel old = get(key);
if(old != null)
remove(key);
return old;
}
@Override
public void putAll(Map<? extends ResourceLocation, ? extends UnbakedModel> map) {
}
@Override
public void clear() {
}
};
this.bakedTopLevelModels = new DynamicBakedModelProvider((ModelBakery)(Object)this, bakedCache);
if(this.bakedMissingModel != null)
((DynamicBakedModelProvider)this.bakedTopLevelModels).setMissingModel(this.bakedMissingModel);