GeyserMC-Mirror/Rainbow
1
0
Fork 0
mirror of https://github.com/GeyserMC/Rainbow.git synced 2025-12-19 14:59:16 +00:00
Code Issues Releases Activity

Fix 3D icon inclusion in pack.zip, use right head animation identifier

Browse Source
This commit is contained in:
Eclipse
2025-10-19 17:48:58 +00:00
parent 8ccba795e7
commit a69c289947
5 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rainbow/src/main/java/org/geysermc/rainbow/mapping/animation/AnimationMapper.java
View File

@@ -48,6 +48,6 @@ public class AnimationMapper {
.withAnimation(identifier + ".head", BedrockAnimation.animation()
.withLoopMode(BedrockAnimation.LoopMode.LOOP)
.withBone(bone, headPosition, headRotation, headScale))
.build(), "animation." + identifier + ".hold_first_person", "animation." + identifier + ".hold_third_person", identifier + ".head");
.build(), "animation." + identifier + ".hold_first_person", "animation." + identifier + ".hold_third_person", "animation." + identifier + ".head");
}
}

10
rainbow/src/main/java/org/geysermc/rainbow/pack/BedrockPack.java
View File

@@ -134,17 +134,17 @@ public class BedrockPack {
futures.add(item.save(serializer, paths.attachables(), paths.geometry(), paths.animation(), textureSaver));
}
if (paths.zipOutput().isPresent()) {
RainbowIO.safeIO(() -> CodecUtil.tryZipDirectory(paths.packRoot(), paths.zipOutput().get()));
}
if (reporter instanceof AutoCloseable closeable) {
try {
closeable.close();
} catch (Exception ignored) {}
}
return CompletableFuture.allOf(futures.toArray(CompletableFuture[]::new));
CompletableFuture<?> packSerializingFinished = CompletableFuture.allOf(futures.toArray(CompletableFuture[]::new));
if (paths.zipOutput().isPresent()) {
return packSerializingFinished.thenAcceptAsync(object -> RainbowIO.safeIO(() -> CodecUtil.tryZipDirectory(paths.packRoot(), paths.zipOutput().get())));
}
return packSerializingFinished;
}
public int getMappings() {