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

Bake models with custom geometry at startup time

Browse Source 
Fixes #18 (not the way I want though)
This commit is contained in:
embeddedt 2023-02-13 14:55:32 -05:00
parent 318afbe3bf
commit 7742a9507f
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/org/embeddedt/modernfix/mixin/perf/faster_baking/ModelBakeryMixin.java
View File

@ -76,6 +76,13 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
return ibakedmodel; return ibakedmodel;
} }
private boolean requiresBake(IUnbakedModel model) {
if(model instanceof BlockModel && ((BlockModel)model).customData.hasCustomGeometry())
return true;
else
return false;
}
@Inject(method = "processLoading", at = @At(value = "INVOKE", target = "Lnet/minecraft/profiler/IProfiler;pop()V")) @Inject(method = "processLoading", at = @At(value = "INVOKE", target = "Lnet/minecraft/profiler/IProfiler;pop()V"))
private void bakeModels(IProfiler pProfiler, int p_i226056_4_, CallbackInfo ci) { private void bakeModels(IProfiler pProfiler, int p_i226056_4_, CallbackInfo ci) {
pProfiler.popPush("atlas"); pProfiler.popPush("atlas");
@ -104,21 +111,20 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
} }
}); });
/* Then store them as top-level models if needed, and set up the lazy models */ /* Then store them as top-level models if needed, and set up the lazy models */
this.topLevelModels.keySet().forEach((p_229350_1_) -> { this.topLevelModels.forEach((location, value) -> {
if(incompatibleLazyBakedModels.contains(p_229350_1_.getNamespace())) { if (incompatibleLazyBakedModels.contains(location.getNamespace()) || requiresBake(value)) {
IBakedModel model = this.bakeIfPossible(p_229350_1_); IBakedModel model = this.bakeIfPossible(location);
if(model != null) if (model != null)
this.bakedTopLevelModels.put(p_229350_1_, model); this.bakedTopLevelModels.put(location, model);
} else { } else {
this.bakedTopLevelModels.put(p_229350_1_, new LazyBakedModel(() -> { this.bakedTopLevelModels.put(location, new LazyBakedModel(() -> {
synchronized (this.bakedCache) { synchronized (this.bakedCache) {
IBakedModel ibakedmodel = this.bakeIfPossible(p_229350_1_); IBakedModel ibakedmodel = this.bakeIfPossible(location);
return ibakedmodel != null ? ibakedmodel : missingModel; return ibakedmodel != null ? ibakedmodel : missingModel;
} }
})); }));
} }
}); });
} }