From 2e3f43674f8f8cb9c79c9c33ed26347dbb369388 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Sun, 5 Mar 2023 13:32:51 -0500 Subject: [PATCH] Fix model bakery not being initialized --- .../modernfix/mixin/perf/faster_baking/ModelManagerMixin.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/org/embeddedt/modernfix/mixin/perf/faster_baking/ModelManagerMixin.java b/src/main/java/org/embeddedt/modernfix/mixin/perf/faster_baking/ModelManagerMixin.java index a5fc47c6..837efa79 100644 --- a/src/main/java/org/embeddedt/modernfix/mixin/perf/faster_baking/ModelManagerMixin.java +++ b/src/main/java/org/embeddedt/modernfix/mixin/perf/faster_baking/ModelManagerMixin.java @@ -40,6 +40,8 @@ public class ModelManagerMixin { @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) private void fireModelBakeEvent(ResourceManager pResourceManager, ProfilerFiller pProfiler, CallbackInfoReturnable cir, ModelBakery pObject) { pProfiler.push("modelevent"); @@ -52,6 +54,7 @@ public class ModelManagerMixin { this.bakedRegistry = pObject.getBakedTopLevelModels(); this.modelGroups = pObject.getModelGroups(); this.missingModel = this.bakedRegistry.get(ModelBakery.MISSING_MODEL_LOCATION); + this.modelBakery = pObject; net.minecraftforge.client.ForgeHooksClient.onModelBake((ModelManager)(Object)this, this.bakedRegistry, pObject); pProfiler.popPush("cache"); this.blockModelShaper.rebuildCache();