From 6879c6a2740386e546389a09e3adf4df48e2003d Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Mon, 1 May 2023 21:12:14 -0400 Subject: [PATCH] Use unmapped name for shadow method --- .../mixin/perf/dynamic_resources/ModelBakeryMixin.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakeryMixin.java b/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakeryMixin.java index d81f62cf..53358a06 100644 --- a/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakeryMixin.java +++ b/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakeryMixin.java @@ -33,10 +33,7 @@ import org.embeddedt.modernfix.duck.IExtendedModelBakery; import org.embeddedt.modernfix.dynamicresources.DynamicBakedModelProvider; import org.embeddedt.modernfix.dynamicresources.ModelBakeryHelpers; import org.jetbrains.annotations.Nullable; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Mutable; -import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.*; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Redirect; @@ -60,7 +57,8 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery { @Shadow @Final public static ModelResourceLocation MISSING_MODEL_LOCATION; - @Shadow protected abstract BlockModel loadBlockModel(ResourceLocation location) throws IOException; + @Dynamic + @Shadow(remap = false) protected abstract BlockModel method_4718(ResourceLocation location) throws IOException; @Shadow @Final protected ResourceManager resourceManager; @Shadow private AtlasSet atlasSet; @@ -134,7 +132,7 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery { @Redirect(method = "", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/resources/model/ModelBakery;loadBlockModel(Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/block/model/BlockModel;", ordinal = 0)) private BlockModel captureMissingModel(ModelBakery bakery, ResourceLocation location) throws IOException { - this.missingModel = this.loadBlockModel(location); + this.missingModel = this.method_4718(location); this.blockStateFiles = new HashSet<>(); this.modelFiles = new HashSet<>(); return (BlockModel)this.missingModel;