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

Fix model bakery not being initialized

Browse Source
This commit is contained in:
embeddedt 2023-03-05 13:32:51 -05:00
parent 9eb3ed4273
commit 2e3f43674f
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/embeddedt/modernfix/mixin/perf/faster_baking/ModelManagerMixin.java
View File

@ -40,6 +40,8 @@ public class ModelManagerMixin {
@Shadow @Final private BlockModelShaper blockModelShaper; @Shadow @Final private BlockModelShaper blockModelShaper;
@Shadow private ModelBakery modelBakery;
@Inject(method = "prepare(Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/util/profiling/ProfilerFiller;)Lnet/minecraft/client/resources/model/ModelBakery;", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/profiling/ProfilerFiller;endTick()V"), locals = LocalCapture.CAPTURE_FAILHARD) @Inject(method = "prepare(Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/util/profiling/ProfilerFiller;)Lnet/minecraft/client/resources/model/ModelBakery;", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/profiling/ProfilerFiller;endTick()V"), locals = LocalCapture.CAPTURE_FAILHARD)
private void fireModelBakeEvent(ResourceManager pResourceManager, ProfilerFiller pProfiler, CallbackInfoReturnable<ModelBakery> cir, ModelBakery pObject) { private void fireModelBakeEvent(ResourceManager pResourceManager, ProfilerFiller pProfiler, CallbackInfoReturnable<ModelBakery> cir, ModelBakery pObject) {
pProfiler.push("modelevent"); pProfiler.push("modelevent");
@ -52,6 +54,7 @@ public class ModelManagerMixin {
this.bakedRegistry = pObject.getBakedTopLevelModels(); this.bakedRegistry = pObject.getBakedTopLevelModels();
this.modelGroups = pObject.getModelGroups(); this.modelGroups = pObject.getModelGroups();
this.missingModel = this.bakedRegistry.get(ModelBakery.MISSING_MODEL_LOCATION); this.missingModel = this.bakedRegistry.get(ModelBakery.MISSING_MODEL_LOCATION);
this.modelBakery = pObject;
net.minecraftforge.client.ForgeHooksClient.onModelBake((ModelManager)(Object)this, this.bakedRegistry, pObject); net.minecraftforge.client.ForgeHooksClient.onModelBake((ModelManager)(Object)this, this.bakedRegistry, pObject);
pProfiler.popPush("cache"); pProfiler.popPush("cache");
this.blockModelShaper.rebuildCache(); this.blockModelShaper.rebuildCache();