From a29bdb2f826ac40e417d22c4553937942404a750 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Tue, 12 Nov 2024 08:16:36 -0500 Subject: [PATCH] Fix standalone model variant not being loaded Related: #475 --- .../mixin/perf/dynamic_resources/ModelBakeryMixin.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ModelBakeryMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ModelBakeryMixin.java index 4d76363d..1f893d26 100644 --- a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ModelBakeryMixin.java +++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ModelBakeryMixin.java @@ -76,6 +76,8 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery { @Shadow @Final public static ModelResourceLocation MISSING_MODEL_VARIANT; + @Shadow protected abstract void registerModelAndLoadDependencies(ModelResourceLocation modelLocation, UnbakedModel model); + private final Map mfix$emulatedBakedRegistry = new DynamicOverridableMap<>(ModelResourceLocation.class, this::loadBakedModelDynamic); @Override @@ -94,6 +96,9 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery { } if(location.variant().equals("inventory")) { this.loadItemModelAndDependencies(location.id()); + } else if (location.variant().equals("fabric_resource") || location.variant().equals("standalone")) { + UnbakedModel unbakedModel = this.getModel(location.id()); + this.registerModelAndLoadDependencies(location, unbakedModel); } else { ((IBlockStateModelLoader)dynamicLoader).loadSpecificBlock(location); }