Merge remote-tracking branch 'origin/main' into 1.18
This commit is contained in:
commit
5f601b53b2
|
|
@ -364,11 +364,13 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
|
||||||
ResourceLocation resourcelocation = this.loadingStack.iterator().next();
|
ResourceLocation resourcelocation = this.loadingStack.iterator().next();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
if (!this.unbakedCache.containsKey(resourcelocation)) {
|
existing = this.unbakedCache.get(resourcelocation);
|
||||||
|
if (existing == null) {
|
||||||
if(debugDynamicModelLoading)
|
if(debugDynamicModelLoading)
|
||||||
LOGGER.info("Loading {}", resourcelocation);
|
LOGGER.info("Loading {}", resourcelocation);
|
||||||
this.loadModel(resourcelocation);
|
this.loadModel(resourcelocation);
|
||||||
}
|
} else
|
||||||
|
smallLoadingCache.put(resourcelocation, existing);
|
||||||
} catch (ModelBakery.BlockStateDefinitionException var9) {
|
} catch (ModelBakery.BlockStateDefinitionException var9) {
|
||||||
LOGGER.warn(var9.getMessage());
|
LOGGER.warn(var9.getMessage());
|
||||||
this.unbakedCache.put(resourcelocation, iunbakedmodel);
|
this.unbakedCache.put(resourcelocation, iunbakedmodel);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user