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

Retrieve missing model when first required

Browse Source
This commit is contained in:
embeddedt 2024-02-07 15:28:01 -05:00
parent e0516ebc51
commit e91220cdea
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,11 +91,6 @@ public class DynamicBakedModelProvider implements Map<ResourceLocation, BakedMod
currentInstance = this; currentInstance = this;
} }
public void setMissingModel(BakedModel model) {
this.missingModel = model;
this.put(ModelBakery.MISSING_MODEL_LOCATION, this.missingModel);
}
private static ModelBakery.BakedCacheKey vanillaKey(Object o) { private static ModelBakery.BakedCacheKey vanillaKey(Object o) {
return new ModelBakery.BakedCacheKey((ResourceLocation)o, BlockModelRotation.X0_Y0.getRotation(), false); return new ModelBakery.BakedCacheKey((ResourceLocation)o, BlockModelRotation.X0_Y0.getRotation(), false);
} }
@ -140,6 +135,14 @@ public class DynamicBakedModelProvider implements Map<ResourceLocation, BakedMod
return false; return false;
} }
private BakedModel getMissingModel() {
BakedModel m = missingModel;
if(m == null) {
m = missingModel = ((IExtendedModelBakery)bakery).bakeDefault(ModelBakery.MISSING_MODEL_LOCATION, BlockModelRotation.X0_Y0);
}
return m;
}
@Override @Override
public BakedModel get(Object o) { public BakedModel get(Object o) {
BakedModel model = permanentOverrides.getOrDefault(o, SENTINEL); BakedModel model = permanentOverrides.getOrDefault(o, SENTINEL);
@ -148,14 +151,14 @@ public class DynamicBakedModelProvider implements Map<ResourceLocation, BakedMod
else { else {
try { try {
if(BAKE_SKIPPED_TOPLEVEL.contains((ResourceLocation)o)) if(BAKE_SKIPPED_TOPLEVEL.contains((ResourceLocation)o))
model = missingModel; model = getMissingModel();
else else
model = ((IExtendedModelBakery)bakery).bakeDefault((ResourceLocation)o, BlockModelRotation.X0_Y0); model = ((IExtendedModelBakery)bakery).bakeDefault((ResourceLocation)o, BlockModelRotation.X0_Y0);
} catch(RuntimeException e) { } catch(RuntimeException e) {
ModernFix.LOGGER.error("Exception baking {}: {}", o, e); ModernFix.LOGGER.error("Exception baking {}: {}", o, e);
model = missingModel; model = getMissingModel();
} }
if(model == missingModel) { if(model == getMissingModel()) {
// to correctly emulate the original map, we return null for missing models, unless they are top-level // to correctly emulate the original map, we return null for missing models, unless they are top-level
model = isVanillaTopLevelModel((ResourceLocation)o) ? model : null; model = isVanillaTopLevelModel((ResourceLocation)o) ? model : null;
permanentOverrides.put((ResourceLocation) o, model); permanentOverrides.put((ResourceLocation) o, model);