Add support for webp

Author: Patbox

build.gradle

@@ -30,7 +30,17 @@ dependencies {
 	modImplementation include("eu.pb4:map-canvas-api:${project.mapcanvas_version}")
 	modImplementation include("eu.pb4:sgui:${project.sgui_version}")
 	modImplementation include("me.lucko:fabric-permissions-api:0.6.0-patbox")
-	//implementation include("com.twelvemonkeys.imageio:imageio-webp:3.12.0")
+
+	[
+			"imageio:imageio-core",
+			"imageio:imageio-webp",
+			"imageio:imageio-metadata",
+			"common:common-lang",
+			"common:common-io",
+			"common:common-image",
+	].forEach {
+		implementation include("com.twelvemonkeys.${it}:3.12.0")
+	}
 }
 
 loom {

gradle.properties

@@ -3,19 +3,19 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/versions.html
-minecraft_version=1.21.11-rc3
-yarn_mappings=1.21.11-rc3+build.1
-loader_version=0.18.1
+minecraft_version=1.21.11
+yarn_mappings=1.21.11+build.1
+loader_version=0.18.2
 loom_version=1.13-SNAPSHOT
 
 # Fabric API
 fabric_version=0.139.4+1.21.11
 
 # Mod Properties
-	mod_version = 0.12.0+1.21.11
+	mod_version = 0.12.1+1.21.11
 	maven_group = space.essem
 	archives_base_name = image2map
 
 # Dependencies
-	mapcanvas_version=0.6.0+1.21.9
+	mapcanvas_version=0.7.0+1.21.11
 	sgui_version=1.11.0+1.21.9

src/main/java/space/essem/image2map/Image2Map.java

@@ -128,7 +128,7 @@ private int openPreview(CommandContext<CommandSourceStack> context) throws Comma
 
         source.sendSuccess(() -> Component.literal("Getting image..."), false);
 
-        getImage(input).orTimeout(20, TimeUnit.SECONDS).handleAsync((image, ex) -> {
+        getImage(input).orTimeout(30, TimeUnit.SECONDS).handleAsync((image, ex) -> {
             if (ex instanceof TimeoutException) {
                 source.sendSuccess(() -> Component.literal("Downloading or reading of the image took too long!"), false);
                 return null;
@@ -205,6 +205,7 @@ private CompletableFuture<BufferedImage> getImage(String input) {
                     return null;
                 }
             } catch (Throwable e) {
+                LOGGER.warn("Failed to load the image!", e);
                 throw new RuntimeException(e);
             }
         });

src/main/java/space/essem/image2map/ImageIoBootstrap.java

@@ -0,0 +1,16 @@
+package space.essem.image2map;
+
+import net.fabricmc.loader.api.entrypoint.PreLaunchEntrypoint;
+
+import javax.imageio.ImageIO;
+
+public class ImageIoBootstrap implements PreLaunchEntrypoint {
+    @Override
+    public void onPreLaunch() {
+        try {
+            ImageIO.scanForPlugins();
+        } catch (Throwable e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

src/main/java/space/essem/image2map/renderer/MapRenderer.java

@@ -31,21 +31,10 @@ public class MapRenderer {
     public static CanvasImage render(BufferedImage image, DitherMode mode, int width, int height) {
         Image resizedImage = image.getScaledInstance(width, height, Image.SCALE_DEFAULT);
         BufferedImage resized = convertToBufferedImage(resizedImage);
-        int[][] pixels = convertPixelArray(resized);
-
-        var state = new CanvasImage(width, height);
-
-        for (int i = 0; i < width; i++) {
-            for (int j = 0; j < height; j++) {
-                if (mode.equals(DitherMode.FLOYD)) {
-                    state.set(i, j, floydDither(pixels, i, j, pixels[j][i]));
-                } else {
-                    state.set(i, j, CanvasUtils.findClosestColorARGB(pixels[j][i]));
-                }
-            }
-        }
-
-        return state;
+        return switch (mode) {
+            case NONE -> CanvasImage.from(resized);
+            case FLOYD -> CanvasImage.fromWithFloydSteinbergDither(resized);
+        };
     }
 
     public static List<ItemStack> toVanillaItems(CanvasImage image, ServerLevel world, String url) {
@@ -90,111 +79,6 @@ public static List<ItemStack> toVanillaItems(CanvasImage image, ServerLevel worl
         return items;
     }
 
-    /*public static ItemStack render(BufferedImage image, DitherMode mode, ServerWorld world, int width, int height,
-                                   PlayerEntity player) {
-        // mojang removed the ability to set a map as locked via the "locked" field in
-        // 1.17, so we create and apply our own MapState instead
-        ItemStack stack = new ItemStack(Items.FILLED_MAP);
-        int id = world.getNextMapId();
-        NbtCompound nbt = new NbtCompound();
-
-        nbt.putString("dimension", world.getRegistryKey().getValue().toString());
-        nbt.putInt("xCenter", (int) 0);
-        nbt.putInt("zCenter", (int) 0);
-        nbt.putBoolean("locked", true);
-        nbt.putBoolean("unlimitedTracking", false);
-        nbt.putBoolean("trackingPosition", false);
-        nbt.putByte("scale", (byte) 3);
-        MapState state = MapState.fromNbt(nbt);
-        world.putMapState(FilledMapItem.getMapName(id), state);
-        stack.getOrCreateNbt().putInt("map", id);
-
-        Image resizedImage = image.getScaledInstance(128, 128, Image.SCALE_DEFAULT);
-        BufferedImage resized = convertToBufferedImage(resizedImage);
-        int width = resized.getWidth();
-        int height = resized.getHeight();
-        int[][] pixels = convertPixelArray(resized);
-        MapColor[] mapColors = MapColor.COLORS;
-        Color imageColor;
-        mapColors = Arrays.stream(mapColors).filter(Objects::nonNull).toArray(MapColor[]::new);
-
-        for (int i = 0; i < width; i++) {
-            for (int j = 0; j < height; j++) {
-                imageColor = new Color(pixels[j][i], true);
-                if (mode.equals(DitherMode.FLOYD))
-                    state.colors[i + j * width] = (byte) floydDither(mapColors, pixels, i, j, imageColor);
-                else
-                    state.colors[i + j * width] = (byte) nearestColor(mapColors, imageColor);
-            }
-        }
-        return stack;
-    }*/
-
-    private static CanvasColor floydDither(int[][] pixels, int x, int y, int imageColor) {
-        var closestColor = CanvasUtils.findClosestColorARGB(imageColor);
-        var palletedColor = closestColor.getRgbColor();
-
-        var errorR = ARGB.red(imageColor) - ARGB.red(palletedColor);
-        var errorG = ARGB.green(imageColor) - ARGB.green(palletedColor);
-        var errorB = ARGB.blue(imageColor) - ARGB.blue(palletedColor);
-        if (pixels[0].length > x + 1) {
-            pixels[y][x + 1] = applyError(pixels[y][x + 1], errorR, errorG, errorB, 7.0 / 16.0);
-        }
-        if (pixels.length > y + 1) {
-            if (x > 0) {
-                pixels[y + 1][x - 1] = applyError(pixels[y + 1][x - 1], errorR, errorG, errorB, 3.0 / 16.0);
-            }
-            pixels[y + 1][x] = applyError(pixels[y + 1][x], errorR, errorG, errorB, 5.0 / 16.0);
-            if (pixels[0].length > x + 1) {
-                pixels[y + 1][x + 1] = applyError(pixels[y + 1][x + 1], errorR, errorG, errorB, 1.0 / 16.0);
-            }
-        }
-
-        return closestColor;
-    }
-
-    private static int applyError(int pixelColor, int errorR, int errorG, int errorB, double quantConst) {
-        int pR = clamp( ARGB.red(pixelColor) + (int) ((double) errorR * quantConst), 0, 255);
-        int pG = clamp(ARGB.green(pixelColor) + (int) ((double) errorG * quantConst), 0, 255);
-        int pB = clamp(ARGB.blue(pixelColor) + (int) ((double) errorB * quantConst), 0, 255);
-        return ARGB.color(ARGB.alpha(pixelColor), pR, pG, pB);
-    }
-
-    private static int clamp(int i, int min, int max) {
-        if (min > max)
-            throw new IllegalArgumentException("max value cannot be less than min value");
-        if (i < min)
-            return min;
-        if (i > max)
-            return max;
-        return i;
-    }
-
-    private static int[][] convertPixelArray(BufferedImage image) {
-
-        final byte[] pixels = ((DataBufferByte) image.getRaster().getDataBuffer()).getData();
-        final int width = image.getWidth();
-        final int height = image.getHeight();
-
-        int[][] result = new int[height][width];
-        final int pixelLength = 4;
-        for (int pixel = 0, row = 0, col = 0; pixel + 3 < pixels.length; pixel += pixelLength) {
-            int argb = 0;
-            argb += (((int) pixels[pixel] & 0xff) << 24); // alpha
-            argb += ((int) pixels[pixel + 1] & 0xff); // blue
-            argb += (((int) pixels[pixel + 2] & 0xff) << 8); // green
-            argb += (((int) pixels[pixel + 3] & 0xff) << 16); // red
-            result[row][col] = argb;
-            col++;
-            if (col == width) {
-                col = 0;
-                row++;
-            }
-        }
-
-        return result;
-    }
-
     private static BufferedImage convertToBufferedImage(Image image) {
         BufferedImage newImage = new BufferedImage(image.getWidth(null), image.getHeight(null),
                 BufferedImage.TYPE_4BYTE_ABGR);

src/main/resources/fabric.mod.json

@@ -23,7 +23,8 @@
       "space.essem.image2map.Image2Map"
     ],
     "preLaunch": [
-      "space.essem.image2map.CardboardWarning"
+      "space.essem.image2map.CardboardWarning",
+      "space.essem.image2map.ImageIoBootstrap"
     ]
   },
   "accessWidener": "image2map.accesswidener",