fix: Allow loadModel to auto-resolve once present on Fabric

TwelveIterationMods · Feb 20, 2024 · d764fbd · d764fbd
1 parent 539a798
commit d764fbd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/fabric/src/main/java/net/blay09/mods/balm/fabric/client/rendering/FabricBalmModels.java b/fabric/src/main/java/net/blay09/mods/balm/fabric/client/rendering/FabricBalmModels.java
@@ -78,6 +78,11 @@ public DeferredObject<BakedModel> loadModel(final ResourceLocation identifier) {
             public BakedModel resolve(ModelBakery bakery, BiFunction<ResourceLocation, Material, TextureAtlasSprite> spriteBiFunction) {
                 return modelBakery.getBakedTopLevelModels().get(identifier);
             }
+
+            @Override
+            public boolean canResolve() {
+                return modelBakery.getBakedTopLevelModels().containsKey(identifier);
+            }
         };
         additionalModels.add(identifier);
         return deferredModel;

diff --git a/shared/src/main/java/net/blay09/mods/balm/api/DeferredObject.java b/shared/src/main/java/net/blay09/mods/balm/api/DeferredObject.java
@@ -28,6 +28,10 @@ protected void set(T object) {
         this.object = object;
     }
 
+    public boolean canResolve() {
+        return canResolveFunc.get();
+    }
+
     public T resolve() {
         if (object == null) {
             object = supplier.get();
@@ -37,7 +41,7 @@ public T resolve() {
 
     public T get() {
         if (object == null) {
-            if (canResolveFunc.get()) {
+            if (canResolve()) {
                 return resolve();
             }