diff --git a/KilluaBot.iml b/KilluaBot.iml deleted file mode 100644 index b2a132a..0000000 --- a/KilluaBot.iml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/github/nilstrieb/commands/util/EmoteAddCommand.java b/src/main/java/com/github/nilstrieb/commands/util/EmoteAddCommand.java index 90f9347..ffe7b09 100644 --- a/src/main/java/com/github/nilstrieb/commands/util/EmoteAddCommand.java +++ b/src/main/java/com/github/nilstrieb/commands/util/EmoteAddCommand.java @@ -12,8 +12,9 @@ import java.awt.*; import java.awt.image.BufferedImage; import java.io.*; import java.net.URL; -import java.util.Arrays; +import java.util.HashMap; import java.util.List; +import java.util.stream.Collectors; public class EmoteAddCommand extends Command { @@ -107,7 +108,7 @@ public class EmoteAddCommand extends Command { private boolean emoteLimitReached() { int max = event.getGuild().getMaxEmotes(); - int count = event.getGuild().retrieveEmotes().complete().size(); + int count = (int) event.getGuild().retrieveEmotes().complete().stream().filter(e -> !e.isAnimated()).count(); return max == count; } @@ -115,8 +116,8 @@ public class EmoteAddCommand extends Command { private byte[] resizeImage(byte[] bytes, String format, int size) throws IOException { reply("Image size too big (" + bytes.length / 1000 + "kB). Resizing image..."); Image image = ImageIO.read(new ByteArrayInputStream(bytes)); - double ratio = (double)image.getHeight(null) / (double)image.getWidth(null); - image = image.getScaledInstance(size, (int) (size * ratio), Image.SCALE_SMOOTH); + int ratio = image.getHeight(null) / image.getWidth(null); + image = image.getScaledInstance(size, size * ratio, Image.SCALE_SMOOTH); ByteArrayOutputStream out = new ByteArrayOutputStream(); BufferedImage bufferedImg = new BufferedImage(image.getWidth(null), image.getHeight(null), BufferedImage.TYPE_INT_ARGB);