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

Fix timing of dynamic baked model registry handoff

Browse Source
This commit is contained in:
embeddedt 2023-07-19 17:31:24 -04:00
parent d1a1fce7e1
commit ad60b1dec6
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicBakedModelProvider.java
View File

@ -73,7 +73,8 @@ public class DynamicBakedModelProvider implements Map<ResourceLocation, BakedMod
this.bakery = bakery; this.bakery = bakery;
this.bakedCache = cache; this.bakedCache = cache;
this.permanentOverrides = Collections.synchronizedMap(new Object2ObjectOpenHashMap<>()); this.permanentOverrides = Collections.synchronizedMap(new Object2ObjectOpenHashMap<>());
currentInstance = this; if(currentInstance == null)
currentInstance = this;
} }
public void setMissingModel(BakedModel model) { public void setMissingModel(BakedModel model) {

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

@ -350,6 +350,7 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
this.topLevelModels.clear(); this.topLevelModels.clear();
this.topLevelModels.put(MISSING_MODEL_LOCATION, this.missingModel); this.topLevelModels.put(MISSING_MODEL_LOCATION, this.missingModel);
this.smallLoadingCache.clear(); this.smallLoadingCache.clear();
DynamicBakedModelProvider.currentInstance = (DynamicBakedModelProvider)this.bakedTopLevelModels;
} }
/** /**

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

@ -203,6 +203,7 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
profiler.pop(); profiler.pop();
// ensure missing model is a permanent override // ensure missing model is a permanent override
this.bakedTopLevelModels.put(MISSING_MODEL_LOCATION, this.getBakedModel(MISSING_MODEL_LOCATION, BlockModelRotation.X0_Y0, this.atlasSet::getSprite)); this.bakedTopLevelModels.put(MISSING_MODEL_LOCATION, this.getBakedModel(MISSING_MODEL_LOCATION, BlockModelRotation.X0_Y0, this.atlasSet::getSprite));
DynamicBakedModelProvider.currentInstance = (DynamicBakedModelProvider)this.bakedTopLevelModels;
cir.setReturnValue(atlasSet); cir.setReturnValue(atlasSet);
} }