Don't tick avatars if the player doesn't exist

Add a message if the texture couldn't be read Fix Incorrect UV on Avatar Wizard Cape
FiguraMC · Jul 4, 2024 · 0f4d65f · 0f4d65f
1 parent 99882a9
commit 0f4d65f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/common/src/main/java/org/figuramc/figura/FiguraMod.java b/common/src/main/java/org/figuramc/figura/FiguraMod.java
@@ -86,8 +86,10 @@ public static void tick() {
         popPushProfiler("files");
         LocalAvatarLoader.tick();
         LocalAvatarFetcher.tick();
-        popPushProfiler("avatars");
-        AvatarManager.tickLoadedAvatars();
+        if (Minecraft.getInstance().player != null) {
+            popPushProfiler("avatars");
+            AvatarManager.tickLoadedAvatars();
+        }
         popPushProfiler("chatPrint");
         FiguraLuaPrinter.printChatFromQueue();
         popPushProfiler("emojiAnim");

diff --git a/common/src/main/java/org/figuramc/figura/lua/api/TextureAPI.java b/common/src/main/java/org/figuramc/figura/lua/api/TextureAPI.java
@@ -101,7 +101,7 @@ public FiguraTexture read(@LuaNotNil String name, @LuaNotNil Object object) {
             image = NativeImage.read(null, bais);
             bais.close();
         } catch (Exception e) {
-            throw new LuaError(e.getMessage());
+            throw new LuaError("Could not read image: " + e.getMessage());
         }
 
         return register(name, image, false);

diff --git a/common/src/main/java/org/figuramc/figura/wizards/AvatarWizard.java b/common/src/main/java/org/figuramc/figura/wizards/AvatarWizard.java
@@ -271,7 +271,7 @@ else if (hasCapeOrElytra)
         if (hasCape) {
             Group cape = model.addGroup(Cape, FiguraVec3.of(0, 24, 2), root);
             Cube cube = model.addCube("Cape", FiguraVec3.of(-5, 8, 2), FiguraVec3.of(10, 16, 1), cape);
-            cube.generateBoxFaces(0, 0, capeTex, 1, hasPlayer ? 2 : 1);
+            cube.generateBoxFaces(0, 0, capeTex, 1, 1);
         }
 
         //elytra