Skip to content

Commit ad60b1d

Browse files
committed
Fix timing of dynamic baked model registry handoff
1 parent d1a1fce commit ad60b1d

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

common/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicBakedModelProvider.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ public DynamicBakedModelProvider(ModelBakery bakery, Map<Triple<ResourceLocation
7373
this.bakery = bakery;
7474
this.bakedCache = cache;
7575
this.permanentOverrides = Collections.synchronizedMap(new Object2ObjectOpenHashMap<>());
76-
currentInstance = this;
76+
if(currentInstance == null)
77+
currentInstance = this;
7778
}
7879

7980
public void setMissingModel(BakedModel model) {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,7 @@ public void clear() {
350350
this.topLevelModels.clear();
351351
this.topLevelModels.put(MISSING_MODEL_LOCATION, this.missingModel);
352352
this.smallLoadingCache.clear();
353+
DynamicBakedModelProvider.currentInstance = (DynamicBakedModelProvider)this.bakedTopLevelModels;
353354
}
354355

355356
/**

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ private void skipBake(TextureManager resourceManager, ProfilerFiller profiler, C
203203
profiler.pop();
204204
// ensure missing model is a permanent override
205205
this.bakedTopLevelModels.put(MISSING_MODEL_LOCATION, this.getBakedModel(MISSING_MODEL_LOCATION, BlockModelRotation.X0_Y0, this.atlasSet::getSprite));
206+
DynamicBakedModelProvider.currentInstance = (DynamicBakedModelProvider)this.bakedTopLevelModels;
206207
cir.setReturnValue(atlasSet);
207208
}
208209

0 commit comments

Comments
 (0)