Repo-Mirror/craft-engine
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2026-01-06 15:52:03 +00:00
Code Issues Releases Activity

修复带透明色的灰度图处理

Browse Source
This commit is contained in:
XiaoMoMi
2025-11-02 02:23:26 +08:00
parent 9b120886a9
commit 7ccab0d449
3 changed files with 19 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/net/momirealms/craftengine/core/pack/AbstractPackManager.java
View File

@@ -43,6 +43,7 @@ import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.scanner.ScannerException; import org.yaml.snakeyaml.scanner.ScannerException;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.imageio.ImageReader;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.*; import java.io.*;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
@@ -1150,6 +1151,9 @@ public abstract class AbstractPackManager implements PackManager {
private byte[] optimizeImage(byte[] previousImageBytes) throws IOException { private byte[] optimizeImage(byte[] previousImageBytes) throws IOException {
try (ByteArrayInputStream is = new ByteArrayInputStream(previousImageBytes)) { try (ByteArrayInputStream is = new ByteArrayInputStream(previousImageBytes)) {
BufferedImage src = ImageIO.read(is); BufferedImage src = ImageIO.read(is);
if (src.getType() == BufferedImage.TYPE_CUSTOM) {
return previousImageBytes;
}
ByteArrayOutputStream baos = new ByteArrayOutputStream(); ByteArrayOutputStream baos = new ByteArrayOutputStream();
new PngOptimizer(src).write(baos); new PngOptimizer(src).write(baos);
return baos.toByteArray(); return baos.toByteArray();

43
core/src/main/java/net/momirealms/craftengine/core/util/PngOptimizer.java
View File

@@ -94,37 +94,22 @@ public class PngOptimizer {
private BufferedImage convertTo8BitRGB(BufferedImage src) { private BufferedImage convertTo8BitRGB(BufferedImage src) {
int type = src.getType(); int type = src.getType();
if (type == BufferedImage.TYPE_INT_ARGB || if (type == BufferedImage.TYPE_BYTE_GRAY || type == BufferedImage.TYPE_USHORT_GRAY) {
type == BufferedImage.TYPE_INT_RGB || BufferedImage eightBitImage = new BufferedImage(
type == BufferedImage.TYPE_BYTE_INDEXED) { src.getWidth(),
return src; src.getHeight(),
} BufferedImage.TYPE_4BYTE_ABGR
);
BufferedImage eightBitImage = new BufferedImage( Graphics2D g2d = eightBitImage.createGraphics();
src.getWidth(), g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY);
src.getHeight(), g2d.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
src.getColorModel().hasAlpha() ? BufferedImage.TYPE_INT_ARGB : BufferedImage.TYPE_INT_RGB g2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_DISABLE);
); g2d.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION, RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY);
g2d.drawImage(src, 0, 0, null);
// 32 bit 位深 -> 8 bit 位深 g2d.dispose();
if (type == BufferedImage.TYPE_4BYTE_ABGR || type == BufferedImage.TYPE_4BYTE_ABGR_PRE) {
for (int y = 0; y < src.getHeight(); y++) {
for (int x = 0; x < src.getWidth(); x++) {
int rgb = src.getRGB(x, y);
eightBitImage.setRGB(x, y, rgb);
}
}
return eightBitImage; return eightBitImage;
} }
return src;
Graphics2D g2d = eightBitImage.createGraphics();
g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY);
g2d.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
g2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_DISABLE);
g2d.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION, RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY);
g2d.drawImage(src, 0, 0, null);
g2d.dispose();
return eightBitImage;
} }
private ImageData findBestFileStructure(BufferedImage src, ImageColorInfo info) throws IOException { private ImageData findBestFileStructure(BufferedImage src, ImageColorInfo info) throws IOException {

2
gradle.properties
View File

@@ -39,7 +39,7 @@ zstd_version=1.5.7-4
commons_io_version=2.20.0 commons_io_version=2.20.0
commons_lang3_version=3.19.0 commons_lang3_version=3.19.0
sparrow_nbt_version=0.10.6 sparrow_nbt_version=0.10.6
sparrow_util_version=0.58 sparrow_util_version=0.60
fastutil_version=8.5.18 fastutil_version=8.5.18
netty_version=4.1.127.Final netty_version=4.1.127.Final
joml_version=1.10.8 joml_version=1.10.8