Avoid capturedLocation being replaced unexpectedly

embeddedt · Dec 9, 2023 · 11f313f · 11f313f
1 parent 46127b5
commit 11f313f
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 6 deletions.
diff --git a/...java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakerImplMixin.java b/...java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakerImplMixin.java
@@ -71,7 +71,6 @@ private void captureState(ResourceLocation rl, ModelState state, CallbackInfoRet
 
     @Inject(method = "getModel", at = @At("HEAD"), cancellable = true)
     private void obtainModel(ResourceLocation arg, CallbackInfoReturnable<UnbakedModel> cir) {
-        capturedLocation = arg;
         if(debugDynamicModelLoading)
             ModernFix.LOGGER.info("Baking {}", arg);
         IExtendedModelBakery extendedBakery = (IExtendedModelBakery)this.field_40571;
@@ -110,7 +109,10 @@ private void obtainModel(ResourceLocation arg, CallbackInfoReturnable<UnbakedMod
         }
         cir.setReturnValue(toReplace);
         cir.getReturnValue().resolveParents(this.field_40571::getModel);
-        capturedModel = cir.getReturnValue();
+        if(capturedLocation == null) {
+            capturedLocation = arg;
+            capturedModel = cir.getReturnValue();
+        }
         if(cir.getReturnValue() == extendedBakery.mfix$getUnbakedMissingModel()) {
             if(arg != ModelBakery.MISSING_MODEL_LOCATION) {
                 if(debugDynamicModelLoading)
@@ -123,9 +125,24 @@ private void obtainModel(ResourceLocation arg, CallbackInfoReturnable<UnbakedMod
 
     @ModifyVariable(method = "bake", at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/client/resources/model/UnbakedModel;bake(Lnet/minecraft/client/resources/model/ModelBaker;Ljava/util/function/Function;Lnet/minecraft/client/resources/model/ModelState;Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/resources/model/BakedModel;"))
     private BakedModel unifyMissingBakedModel(BakedModel model) {
+        // Save these variables in case the nested model calls getModel somehow
+        ResourceLocation location = this.capturedLocation;
+        UnbakedModel unbakedModel = this.capturedModel;
+        ModelState state = this.capturedState;
+
+        // Safety check
+        if(location == null) {
+            return model;
+        }
+
         for(ModernFixClientIntegration integration : ModernFixClient.CLIENT_INTEGRATIONS) {
-            model = integration.onBakedModelLoad(capturedLocation, capturedModel, model, capturedState, this.field_40571);
+            model = integration.onBakedModelLoad(location, unbakedModel, model, state, this.field_40571);
         }
+
+        // Allow more capturing
+        this.capturedLocation = null;
+        this.capturedModel = null;
+
         return model;
     }
 

diff --git a/.../java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakerImplMixin.java b/.../java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakerImplMixin.java
@@ -52,7 +52,6 @@ private void captureState(ResourceLocation arg, ModelState state, Function<Mater
 
     @Inject(method = "getModel", at = @At("HEAD"), cancellable = true)
     private void obtainModel(ResourceLocation arg, CallbackInfoReturnable<UnbakedModel> cir) {
-        capturedLocation = arg;
         if(debugDynamicModelLoading)
             ModernFix.LOGGER.info("Baking {}", arg);
         IExtendedModelBakery extendedBakery = (IExtendedModelBakery)this.field_40571;
@@ -78,7 +77,10 @@ private void obtainModel(ResourceLocation arg, CallbackInfoReturnable<UnbakedMod
         }
         cir.setReturnValue(toReplace);
         cir.getReturnValue().resolveParents(this.field_40571::getModel);
-        capturedModel = cir.getReturnValue();
+        if(capturedLocation == null) {
+            capturedLocation = arg;
+            capturedModel = cir.getReturnValue();
+        }
         if(cir.getReturnValue() == extendedBakery.mfix$getUnbakedMissingModel()) {
             if(arg != ModelBakery.MISSING_MODEL_LOCATION) {
                 if(debugDynamicModelLoading)
@@ -96,9 +98,24 @@ private Object ignoreCacheIfRequested(Object o) {
 
     @ModifyExpressionValue(method = "bake(Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/client/resources/model/ModelState;Ljava/util/function/Function;)Lnet/minecraft/client/resources/model/BakedModel;", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/resources/model/UnbakedModel;bake(Lnet/minecraft/client/resources/model/ModelBaker;Ljava/util/function/Function;Lnet/minecraft/client/resources/model/ModelState;Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/resources/model/BakedModel;"))
     private BakedModel unifyMissingBakedModel(BakedModel model) {
+        // Save these variables in case the nested model calls getModel somehow
+        ResourceLocation location = this.capturedLocation;
+        UnbakedModel unbakedModel = this.capturedModel;
+        ModelState state = this.capturedState;
+
+        // Safety check
+        if(location == null) {
+            return model;
+        }
+
         for(ModernFixClientIntegration integration : ModernFixClient.CLIENT_INTEGRATIONS) {
-            model = integration.onBakedModelLoad(capturedLocation, capturedModel, model, capturedState, this.field_40571);
+            model = integration.onBakedModelLoad(location, unbakedModel, model, state, this.field_40571);
         }
+
+        // Allow more capturing
+        this.capturedLocation = null;
+        this.capturedModel = null;
+
         return model;
     }
 }