From 322432ca372c5c195e09cb5eca74d9cf2232af26 Mon Sep 17 00:00:00 2001 From: Nilstrieb Date: Thu, 6 May 2021 19:24:09 +0200 Subject: [PATCH] integer division, i love it so much --- KilluaBot.iml | 2 -- .../github/nilstrieb/commands/fun/trivia/TriviaApproval.java | 1 - .../github/nilstrieb/commands/fun/trivia/TriviaCommand.java | 2 -- .../com/github/nilstrieb/commands/util/EmoteAddCommand.java | 5 +++-- src/main/java/com/github/nilstrieb/core/Main.java | 2 +- .../com/github/nilstrieb/core/command/CommandHandler.java | 1 - .../com/github/nilstrieb/core/command/CommandListener.java | 1 - .../nilstrieb/core/reactions/ReactionEventManager.java | 1 - 8 files changed, 4 insertions(+), 11 deletions(-) diff --git a/KilluaBot.iml b/KilluaBot.iml index 920ea54..b2a132a 100644 --- a/KilluaBot.iml +++ b/KilluaBot.iml @@ -5,8 +5,6 @@ - - diff --git a/src/main/java/com/github/nilstrieb/commands/fun/trivia/TriviaApproval.java b/src/main/java/com/github/nilstrieb/commands/fun/trivia/TriviaApproval.java index 160d81d..de8c92e 100644 --- a/src/main/java/com/github/nilstrieb/commands/fun/trivia/TriviaApproval.java +++ b/src/main/java/com/github/nilstrieb/commands/fun/trivia/TriviaApproval.java @@ -44,7 +44,6 @@ public class TriviaApproval extends ReactionAdapter { if (event.getUser() != null) { if (event.getUser().getIdLong() == Config.NILS_ID) { String emote = event.getReaction().getReactionEmote().getName(); - System.out.println(ConsoleColors.BLUE + "[TriviaApproval 47] Received Emote " + emote + ConsoleColors.RESET); if (emote.equals(APPROVE_EMOTE)) { event.getTextChannel().sendMessage("Question approved.").queue(); System.out.println(ConsoleColors.BLUE + "[TriviaApproval 50] Question Approved: " + question.getQuestion() + ConsoleColors.RESET); diff --git a/src/main/java/com/github/nilstrieb/commands/fun/trivia/TriviaCommand.java b/src/main/java/com/github/nilstrieb/commands/fun/trivia/TriviaCommand.java index 13118c3..0c44c47 100644 --- a/src/main/java/com/github/nilstrieb/commands/fun/trivia/TriviaCommand.java +++ b/src/main/java/com/github/nilstrieb/commands/fun/trivia/TriviaCommand.java @@ -133,8 +133,6 @@ public class TriviaCommand extends Command { answers[3] = "0"; new TriviaApproval(event, new TriviaQuestion(answers)); } else { - - System.out.println(ConsoleColors.BLUE_BOLD + "[TriviaCommand.AddSection 139] Received Next Message. status: " + status + ConsoleColors.RESET); answers[status] = event.getMessage().getContentRaw(); if (status >= 3) { try { 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 b57da6d..90f9347 100644 --- a/src/main/java/com/github/nilstrieb/commands/util/EmoteAddCommand.java +++ b/src/main/java/com/github/nilstrieb/commands/util/EmoteAddCommand.java @@ -12,6 +12,7 @@ import java.awt.*; import java.awt.image.BufferedImage; import java.io.*; import java.net.URL; +import java.util.Arrays; import java.util.List; public class EmoteAddCommand extends Command { @@ -114,8 +115,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)); - int ratio = image.getHeight(null) / image.getWidth(null); - image = image.getScaledInstance(size, size * ratio, Image.SCALE_SMOOTH); + double ratio = (double)image.getHeight(null) / (double)image.getWidth(null); + image = image.getScaledInstance(size, (int) (size * ratio), Image.SCALE_SMOOTH); ByteArrayOutputStream out = new ByteArrayOutputStream(); BufferedImage bufferedImg = new BufferedImage(image.getWidth(null), image.getHeight(null), BufferedImage.TYPE_INT_ARGB); diff --git a/src/main/java/com/github/nilstrieb/core/Main.java b/src/main/java/com/github/nilstrieb/core/Main.java index b6c84d4..41b6ce5 100644 --- a/src/main/java/com/github/nilstrieb/core/Main.java +++ b/src/main/java/com/github/nilstrieb/core/Main.java @@ -24,7 +24,7 @@ import java.util.Scanner; public class Main { public static void main(String[] args) throws LoginException { - Config.init(1); + Config.init(0); JDABuilder builder = JDABuilder.createDefault(Config.TOKEN); builder.setCompression(Compression.ZLIB); builder.setActivity(Activity.watching("over Gon")); diff --git a/src/main/java/com/github/nilstrieb/core/command/CommandHandler.java b/src/main/java/com/github/nilstrieb/core/command/CommandHandler.java index ef999f5..30f1e59 100644 --- a/src/main/java/com/github/nilstrieb/core/command/CommandHandler.java +++ b/src/main/java/com/github/nilstrieb/core/command/CommandHandler.java @@ -48,7 +48,6 @@ public class CommandHandler { if (event.getMessage().getContentRaw().toLowerCase().startsWith(Config.PREFIX)) { String[] split = parser.splitOffCommandName(event.getMessage().getContentRaw()); String command = split[0]; - System.out.println(ConsoleColors.GREEN + "[CHandler 35] cmd: '" + command + "'" + " args: '" + split[1] + "'" + ConsoleColors.RESET); if (commands.containsKey(command)) { commands.get(command).onMessageReceived(event, split[1]); } else if (hiddenCommands.containsKey(command)) { diff --git a/src/main/java/com/github/nilstrieb/core/command/CommandListener.java b/src/main/java/com/github/nilstrieb/core/command/CommandListener.java index b388295..1f4a0b7 100644 --- a/src/main/java/com/github/nilstrieb/core/command/CommandListener.java +++ b/src/main/java/com/github/nilstrieb/core/command/CommandListener.java @@ -9,7 +9,6 @@ public class CommandListener extends ListenerAdapter { @Override public void onMessageReceived(@NotNull MessageReceivedEvent event) { if (!event.getAuthor().isBot()) { - System.out.println(ConsoleColors.CYAN + "[CListener 13] Received message." + ConsoleColors.RESET); CommandHandler.call(event); } } diff --git a/src/main/java/com/github/nilstrieb/core/reactions/ReactionEventManager.java b/src/main/java/com/github/nilstrieb/core/reactions/ReactionEventManager.java index 677fe3a..2cae2ce 100644 --- a/src/main/java/com/github/nilstrieb/core/reactions/ReactionEventManager.java +++ b/src/main/java/com/github/nilstrieb/core/reactions/ReactionEventManager.java @@ -18,7 +18,6 @@ public class ReactionEventManager { } public static void onReactionAdd(MessageReactionAddEvent event){ - System.out.println(ConsoleColors.PURPLE + "[ReactionEventManager 21] Reaction added: " + event.getReactionEmote() + ConsoleColors.RESET); long message = event.getMessageIdLong(); ReactionListener listener = currentReactions.get(message); if (listener != null) {