From d7a690da14a8002dd76bfb36e1eb1cefbee61df1 Mon Sep 17 00:00:00 2001 From: GaLicn <133291877+GaLicn@users.noreply.github.com> Date: Sat, 6 Sep 2025 16:20:03 +0800 Subject: [PATCH] =?UTF-8?q?mixin-hook=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mixin/hooks/ModelBakeryMixin.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/extendedae_plus/mixin/hooks/ModelBakeryMixin.java b/src/main/java/com/extendedae_plus/mixin/hooks/ModelBakeryMixin.java index efc1b57..fe9c6e8 100644 --- a/src/main/java/com/extendedae_plus/mixin/hooks/ModelBakeryMixin.java +++ b/src/main/java/com/extendedae_plus/mixin/hooks/ModelBakeryMixin.java @@ -1,10 +1,9 @@ package com.extendedae_plus.mixin.hooks; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import net.minecraft.client.resources.model.ModelBakery; import net.minecraft.client.resources.model.UnbakedModel; @@ -18,16 +17,11 @@ import com.extendedae_plus.hooks.BuiltInModelHooks; */ @Mixin(ModelBakery.class) public class ModelBakeryMixin { - @Inject(method = "loadModel", at = @At("HEAD"), cancellable = true) - private void extendedae_plus$loadModelHook(ResourceLocation id, CallbackInfo ci) { + @Inject(method = "getModel", at = @At("HEAD"), cancellable = true) + private void extendedae_plus$getModelHook(ResourceLocation id, CallbackInfoReturnable cir) { var model = BuiltInModelHooks.getBuiltInModel(id); if (model != null) { - cacheAndQueueDependencies(id, model); - ci.cancel(); + cir.setReturnValue(model); } } - - @Shadow - protected void cacheAndQueueDependencies(ResourceLocation id, UnbakedModel unbakedModel) { - } }