GeyserMC-Mirror/Thunder
1
0
Fork 0
mirror of https://github.com/GeyserMC/PackConverter.git synced 2026-01-06 15:41:51 +00:00
Code Issues Releases Activity

Correctly handle missing vanilla textures in IconTransformer

Browse Source
This commit is contained in:
Aurora
2025-11-07 10:17:58 +00:00
parent 322f7c50d0
commit e11e718c69
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
converter/src/main/java/org/geysermc/pack/converter/type/texture/transformer/type/ui/IconTransformer.java
View File

@@ -158,17 +158,17 @@ public class IconTransformer implements TextureTransformer {
if (!exists) return;
List<Texture> textures = Arrays.stream(javaInputs)
.map(key -> poll ? context.pollOrPeekVanilla(key) : context.peekOrVanilla(key))
.filter(Objects::nonNull).toList();
.map(key -> poll ? context.pollOrPeekVanilla(key) : context.peekOrVanilla(key)).toList();
List<BufferedImage> images = new ArrayList<>(textures.size());
for (Texture texture : textures) {
images.add(this.readImage(texture));
if (texture == null) images.add(null);
else images.add(this.readImage(texture));
}
float maxScale = (float) images.stream()
.flatMapToDouble(img -> DoubleStream.of(img.getWidth() / 16f))
.flatMapToDouble(img -> DoubleStream.of(img == null ? 1f : img.getWidth() / 16f))
.max().orElseThrow();
BufferedImage bedrockOutputImage = new BufferedImage((int) (maxScale * 16 * images.size()), (int) (maxScale * 16), BufferedImage.TYPE_INT_ARGB);
@@ -177,13 +177,15 @@ public class IconTransformer implements TextureTransformer {
for (int i = 0; i < images.size(); i++) {
BufferedImage image = images.get(i);
float scale = maxScale / (image.getWidth() / 16f);
if (image != null) {
float scale = maxScale / (image.getWidth() / 16f);
graphics.drawImage(
ImageUtil.scale(image, scale),
(int) (maxScale * 16 * i),
0, null
);
graphics.drawImage(
ImageUtil.scale(image, scale),
(int) (maxScale * 16 * i),
0, null
);
}
}
context.offer(bedrockOutput, bedrockOutputImage, "png");