Make size-less commands automatically rescale the image to valid dimensions

Author: Patbox

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

@@ -151,7 +151,17 @@ private int openPreview(CommandContext<CommandSourceStack> context) throws Comma
             if (GuiHelpers.getCurrentGui(source.getPlayer()) instanceof PreviewGui previewGui) {
                 previewGui.close();
             }
-            new PreviewGui(context.getSource().getPlayer(), image, input, DitherMode.NONE, image.getWidth(), image.getHeight());
+
+            var width = image.getWidth();
+            var height = image.getHeight();
+
+            if (height > CONFIG.maxSize || width > CONFIG.maxSize) {
+                var scaleDown = Math.min(CONFIG.maxSize / (double) height, CONFIG.maxSize / (double) width);
+                width = (int) (width * scaleDown);
+                height = (int) (height * scaleDown);
+            }
+
+            new PreviewGui(context.getSource().getPlayer(), image, input, DitherMode.NONE, width, height);
 
             return null;
         }, source.getServer());
@@ -299,18 +309,27 @@ private int createMap(CommandContext<CommandSourceStack> context) throws Command
             try {
                 width = IntegerArgumentType.getInteger(context, "width");
                 height = IntegerArgumentType.getInteger(context, "height");
+
+                if (height > CONFIG.maxSize || width > CONFIG.maxSize) {
+                    int finalHeight = height;
+                    int finalWidth = width;
+                    source.sendSuccess(() -> Component.literal("Map size exceeds maximum allowed (" + CONFIG.maxSize + "x" + CONFIG.maxSize + "), was " + finalWidth + "x" + finalHeight), false);
+                    return null;
+                }
             } catch (Throwable e) {
                 width = image.getWidth();
                 height = image.getHeight();
+
+                if (height > CONFIG.maxSize || width > CONFIG.maxSize) {
+                    var scaleDown = Math.min(CONFIG.maxSize / (double) height, CONFIG.maxSize / (double) width);
+                    width = (int) (width * scaleDown);
+                    height = (int) (height * scaleDown);
+                }
             }
 
             int finalHeight = height;
             int finalWidth = width;
 
-            if (finalHeight > CONFIG.maxSize || finalWidth > CONFIG.maxSize) {
-                source.sendSuccess(() -> Component.literal("Map size exceeds maximum allowed (" + CONFIG.maxSize + "x" + CONFIG.maxSize + "), was " + finalWidth + "x" + finalHeight), false);
-                return null;
-            }
             source.sendSuccess(() -> Component.literal("Converting into maps..."), false);
 
             CompletableFuture.supplyAsync(() -> MapRenderer.render(image, mode, finalWidth, finalHeight)).thenAcceptAsync(mapImage -> {

src/main/java/space/essem/image2map/config/Image2MapConfig.java

@@ -17,7 +17,7 @@ public class Image2MapConfig {
   public boolean allowLocalFiles = false;
 
   public int minPermLevel = 2;
-  public int maxSize = 1024;
+  public int maxSize = 2048;
 
   public static Image2MapConfig loadOrCreateConfig() {
     try {