From b765bcb51f4d335d639ce50543c6b11fde81fc9e Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Wed, 22 Apr 2026 19:27:07 -0400
Subject: [PATCH] Improve compatibility with mods that inject into
 ModelBaker.bake

Fixes #646
---
 .../mixin/perf/dynamic_resources/ModelBakeryMixin.java     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ModelBakeryMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ModelBakeryMixin.java
index f8a08e42..d3b3a5f9 100644
--- a/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ModelBakeryMixin.java
+++ b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ModelBakeryMixin.java
@@ -374,7 +374,12 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
         ModelBakery self = (ModelBakery) (Object) this;
         ModelBaker theBaker = self.new ModelBakerImpl(textureGetter, modelLocation);
         ((IExtendedModelBaker)theBaker).throwOnMissingModel(true);
-        synchronized(this) { m = theBaker.bake(modelLocation, state, theBaker.getModelTextureGetter()); }
+        synchronized(this) {
+            // We intentionally use the 2-arg overload for better mixin compatibility, because we use the baker's default
+            // texture getter anyway.
+            //noinspection deprecation
+            m = theBaker.bake(modelLocation, state);
+        }
         if(m != null)
             loadedBakedModels.put(key, m);
         return m;