From ae65708d82ac6ae1c4c32171e42b3dc6f023a4d5 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Fri, 17 Aug 2018 20:13:33 +1000
Subject: [PATCH] Fix some command parsing issues

Tab complete runs on main thread - that could be an issue
---
 .../fawe/bukkit/v0/BukkitQueue_All.java       | 11 +++++--
 .../fawe/command/FawePrimitiveBinding.java    | 31 +++++++++++++++++--
 .../object/collection/SummedColorTable.java   |  2 +-
 .../com/boydti/fawe/util/image/ImageUtil.java | 29 +++++++++++++++++
 .../worldedit/command/BrushCommands.java      |  5 ++-
 5 files changed, 71 insertions(+), 7 deletions(-)

diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v0/BukkitQueue_All.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v0/BukkitQueue_All.java
index a6642288d..df02eb8d2 100644
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v0/BukkitQueue_All.java
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v0/BukkitQueue_All.java
@@ -307,8 +307,15 @@ public class BukkitQueue_All extends BukkitQueue_0<ChunkSnapshot, ChunkSnapshot,
     private ChunkSnapshot tryGetSnasphot(Chunk chunk) {
         try {
             return chunk.getChunkSnapshot(false, true, false);
-        } catch (IllegalStateException ignore) {
-            return null;
+        } catch (Throwable ignore) {
+            Throwable cause = ignore;
+            while (cause.getCause() != null) {
+                cause = cause.getCause();
+            }
+            if (cause instanceof IllegalStateException) {
+                return null;
+            }
+            throw ignore;
         }
     }
 
diff --git a/worldedit-core/src/main/java/com/boydti/fawe/command/FawePrimitiveBinding.java b/worldedit-core/src/main/java/com/boydti/fawe/command/FawePrimitiveBinding.java
index b049c029f..fc8259002 100644
--- a/worldedit-core/src/main/java/com/boydti/fawe/command/FawePrimitiveBinding.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/command/FawePrimitiveBinding.java
@@ -4,6 +4,7 @@ import com.boydti.fawe.Fawe;
 import com.boydti.fawe.object.FawePlayer;
 import com.boydti.fawe.object.extent.NullExtent;
 import com.boydti.fawe.object.extent.ResettableExtent;
+import com.boydti.fawe.util.MainUtil;
 import com.boydti.fawe.util.TextureUtil;
 import com.boydti.fawe.util.image.ImageUtil;
 import com.sk89q.worldedit.EditSession;
@@ -32,7 +33,11 @@ import com.sk89q.worldedit.util.command.parametric.BindingMatch;
 import com.sk89q.worldedit.util.command.parametric.ParameterException;
 import com.sk89q.worldedit.world.World;
 import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
 import java.lang.annotation.Annotation;
+import java.net.URI;
+import java.net.URL;
 import javax.annotation.Nullable;
 
 public class FawePrimitiveBinding extends BindingHelper {
@@ -69,14 +74,34 @@ public class FawePrimitiveBinding extends BindingHelper {
             }
         }
     }
+
+    public class ImageUri {
+        public final URI uri;
+        public ImageUri(URI uri) {
+            this.uri = uri;
+        }
+        public BufferedImage load() throws ParameterException {
+            try {
+                String uriStr = uri.toString();
+                if (uriStr.startsWith("file:/")) {
+                    File file = new File(uri.getPath());
+                    return MainUtil.readImage(file);
+                }
+                return MainUtil.readImage(new URL(uriStr));
+            } catch (IOException e) {
+                throw new ParameterException(e);
+            }
+        }
+    }
+
     @BindingMatch(
-            type = {BufferedImage.class},
+            type = {ImageUri.class},
             behavior = BindingBehavior.CONSUMES,
             consumedCount = 1,
             provideModifiers = true
     )
-    public BufferedImage getImage(ArgumentStack context, Annotation[] modifiers) throws ParameterException {
-        return ImageUtil.getImage(context.next());
+    public ImageUri getImage(ArgumentStack context, Annotation[] modifiers) throws ParameterException {
+        return new ImageUri(ImageUtil.getImageURI(context.next()));
     }
 
     @BindingMatch(
diff --git a/worldedit-core/src/main/java/com/boydti/fawe/object/collection/SummedColorTable.java b/worldedit-core/src/main/java/com/boydti/fawe/object/collection/SummedColorTable.java
index 1bb13c7c3..b84d01569 100644
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/collection/SummedColorTable.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/collection/SummedColorTable.java
@@ -24,7 +24,7 @@ public class SummedColorTable {
         this.hasAlpha = new int[raw.length];
         this.alpha = calculateAlpha ? new long[raw.length] : null;
         this.alphaInverse = calculateAlpha ? new float[256] : null;
-        this.areaInverses = new float[Character.MAX_VALUE];
+        this.areaInverses = new float[1024 * 1024]; // 1 MB should be enough to cover scaling
         for (int i = 0; i < areaInverses.length; i++) {
             areaInverses[i] = 1f / (i + 1);
         }
diff --git a/worldedit-core/src/main/java/com/boydti/fawe/util/image/ImageUtil.java b/worldedit-core/src/main/java/com/boydti/fawe/util/image/ImageUtil.java
index c8092dd25..3ec951508 100644
--- a/worldedit-core/src/main/java/com/boydti/fawe/util/image/ImageUtil.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/util/image/ImageUtil.java
@@ -11,6 +11,8 @@ import java.awt.image.BufferedImage;
 import java.awt.image.DataBufferInt;
 import java.io.File;
 import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 
 public class ImageUtil {
@@ -177,4 +179,31 @@ public class ImageUtil {
             throw new ParameterException(e);
         }
     }
+
+    public static URI getImageURI(String arg) throws ParameterException {
+        try {
+            if (arg.startsWith("http")) {
+                if (arg.contains("imgur.com") && !arg.contains("i.imgur.com")) {
+                    arg = "https://i.imgur.com/" + arg.split("imgur.com/")[1] + ".png";
+                }
+                return new URL(arg).toURI();
+            } else if (arg.startsWith("file:/")) {
+                arg = arg.replaceFirst("file:/+", "");
+                File file = MainUtil.getFile(MainUtil.getFile(Fawe.imp().getDirectory(), com.boydti.fawe.config.Settings.IMP.PATHS.HEIGHTMAP), arg);
+                if (file.exists()) {
+                    throw new ParameterException("File not found " + file);
+                }
+                if (file.isDirectory()) {
+                    throw new ParameterException("File is a directory " + file);
+                }
+                return file.toURI();
+            } else {
+                throw new ParameterException("Invalid image " + arg);
+            }
+        } catch (IOException e) {
+            throw new ParameterException(e);
+        } catch (URISyntaxException e) {
+            throw new ParameterException(e);
+        }
+    }
 }
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java
index 78b85fc7d..0cd201143 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java
@@ -20,6 +20,7 @@
 package com.sk89q.worldedit.command;
 
 import com.boydti.fawe.Fawe;
+import com.boydti.fawe.command.FawePrimitiveBinding;
 import com.boydti.fawe.config.BBC;
 import com.boydti.fawe.config.Settings;
 import com.boydti.fawe.object.FaweLimit;
@@ -52,6 +53,7 @@ import com.sk89q.worldedit.util.command.InvalidUsageException;
 import com.sk89q.worldedit.util.command.binding.Range;
 import com.sk89q.worldedit.util.command.binding.Switch;
 import com.sk89q.worldedit.util.command.parametric.Optional;
+import com.sk89q.worldedit.util.command.parametric.ParameterException;
 import com.sk89q.worldedit.world.block.*;
 import com.sk89q.worldedit.world.block.BlockStateHolder;
 
@@ -376,7 +378,8 @@ public class BrushCommands extends BrushProcessor {
             max = -1
     )
     @CommandPermissions("worldedit.brush.stencil")
-    public BrushSettings imageBrush(Player player, EditSession editSession, LocalSession session, @Optional("5") double radius, BufferedImage image, @Optional("1") @Range(min=Double.MIN_NORMAL) final double yscale, @Switch('a') boolean alpha, @Switch('f') boolean fadeOut, CommandContext context) throws WorldEditException, IOException {
+    public BrushSettings imageBrush(Player player, EditSession editSession, LocalSession session, @Optional("5") double radius, FawePrimitiveBinding.ImageUri imageUri, @Optional("1") @Range(min=Double.MIN_NORMAL) final double yscale, @Switch('a') boolean alpha, @Switch('f') boolean fadeOut, CommandContext context) throws WorldEditException, IOException, ParameterException {
+        BufferedImage image = imageUri.load();
         getWorldEdit().checkMaxBrushRadius(radius);
         if (yscale != 1) {
             ImageUtil.scaleAlpha(image, yscale);