fix(1.21): Fix loadModel for Fabric never resolving

Author: BlayTheNinth

common/src/main/java/net/blay09/mods/balm/api/client/rendering/BalmModels.java

@@ -21,7 +21,7 @@
 import java.util.function.Supplier;
 
 public interface BalmModels {
-    DeferredObject<BakedModel> loadModel(ModelResourceLocation identifier);
+    DeferredObject<BakedModel> loadModel(ResourceLocation identifier);
 
     DeferredObject<BakedModel> bakeModel(ModelResourceLocation identifier, UnbakedModel model);
 

fabric/src/main/java/net/blay09/mods/balm/fabric/client/rendering/FabricBalmModels.java

@@ -40,14 +40,14 @@ public void set(BakedModel object) {
         }
     }
 
-    private final List<ModelResourceLocation> additionalModels = Collections.synchronizedList(new ArrayList<>());
+    private final List<ResourceLocation> additionalModels = Collections.synchronizedList(new ArrayList<>());
     private final List<DeferredModel> modelsToBake = Collections.synchronizedList(new ArrayList<>());
     public final List<Pair<Supplier<Block>, Supplier<BakedModel>>> overrides = Collections.synchronizedList(new ArrayList<>());
     private ModelBakery modelBakery;
 
     @Override
     public void onInitializeModelLoader(Context context) {
-        context.addModels(additionalModels.stream().map(ModelResourceLocation::id).toList());
+        context.addModels(additionalModels);
     }
 
     public void onBakeModels(ModelBakery modelBakery, ModelBakery.TextureGetter textureGetter) {
@@ -72,21 +72,23 @@ public void onBakeModels(ModelBakery modelBakery, ModelBakery.TextureGetter text
     }
 
     @Override
-    public DeferredObject<BakedModel> loadModel(final ModelResourceLocation identifier) {
-        DeferredModel deferredModel = new DeferredModel(identifier) {
+    public DeferredObject<BakedModel> loadModel(final ResourceLocation identifier) {
+        // fabric_resource is what Fabric uses as variant for additional models
+        final var modelResourceLocation = new ModelResourceLocation(identifier, "fabric_resource");
+        DeferredModel deferredModel = new DeferredModel(modelResourceLocation) {
             @Override
             public BakedModel resolve(ModelBakery modelBakery, ModelBakery.TextureGetter textureGetter) {
                 return resolve();
             }
 
             @Override
             public BakedModel resolve() {
-                return modelBakery.getBakedTopLevelModels().get(identifier);
+                return modelBakery.getBakedTopLevelModels().get(modelResourceLocation);
             }
 
             @Override
             public boolean canResolve() {
-                return modelBakery.getBakedTopLevelModels().containsKey(identifier);
+                return modelBakery.getBakedTopLevelModels().containsKey(modelResourceLocation);
             }
         };
         additionalModels.add(identifier);