From e68d589075bcfe7bdb7dc614f0f42d33089b2eb5 Mon Sep 17 00:00:00 2001 From: Nilstrieb <48135649+Nilstrieb@users.noreply.github.com> Date: Mon, 5 Sep 2022 17:58:56 +0200 Subject: [PATCH] optimize imports --- .../nilstrieb/commands/fun/FightCommand.java | 14 ++++++++------ .../github/nilstrieb/commands/fun/HugCommand.java | 1 - .../commands/fun/trivia/TriviaCommand.java | 1 - .../nilstrieb/commands/util/EmoteAddCommand.java | 9 +++++---- .../nilstrieb/core/command/CommandHandler.java | 4 ++-- .../nilstrieb/core/command/CommandListener.java | 1 - .../nilstrieb/core/command/MessageSender.java | 2 -- .../github/nilstrieb/core/util/MultiPageEmbed.java | 2 -- 8 files changed, 15 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/github/nilstrieb/commands/fun/FightCommand.java b/src/main/java/com/github/nilstrieb/commands/fun/FightCommand.java index e024cdb..76afcc3 100644 --- a/src/main/java/com/github/nilstrieb/commands/fun/FightCommand.java +++ b/src/main/java/com/github/nilstrieb/commands/fun/FightCommand.java @@ -6,7 +6,9 @@ import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.MessageEmbed; -import java.util.*; +import java.util.Random; +import java.util.Timer; +import java.util.TimerTask; public class FightCommand extends Command { @@ -30,14 +32,14 @@ public class FightCommand extends Command { static class Fight { - private static String[] abilities = {"Little Flower", "Jajanken", "Lightning", "punch", "Chapter 7 Bankruptcy", "Ripper Cyclotron", "Rising Sun", + private static final String[] abilities = {"Little Flower", "Jajanken", "Lightning", "punch", "Chapter 7 Bankruptcy", "Ripper Cyclotron", "Rising Sun", "100-Type Guanyin Bodhisattva"}; - private Message fightMessage; - private Fighter fighter1; - private Fighter fighter2; + private final Message fightMessage; + private final Fighter fighter1; + private final Fighter fighter2; - private Fighter currentFighter; + private final Fighter currentFighter; Random random = new Random(); public Fight(Message fightMessage, String fighter1, String fighter2) { diff --git a/src/main/java/com/github/nilstrieb/commands/fun/HugCommand.java b/src/main/java/com/github/nilstrieb/commands/fun/HugCommand.java index 41370c1..52734a8 100644 --- a/src/main/java/com/github/nilstrieb/commands/fun/HugCommand.java +++ b/src/main/java/com/github/nilstrieb/commands/fun/HugCommand.java @@ -6,7 +6,6 @@ import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.Member; import java.util.List; -import java.util.Objects; public class HugCommand extends Command { 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 0c44c47..62a181c 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 @@ -3,7 +3,6 @@ package com.github.nilstrieb.commands.fun.trivia; import com.github.nilstrieb.cofig.Config; import com.github.nilstrieb.core.command.Command; import com.github.nilstrieb.core.sections.Section; -import com.github.nilstrieb.util.ConsoleColors; import com.github.nilstrieb.util.trivia.TriviaQuestion; import com.github.nilstrieb.util.trivia.TriviaQuestionData; import net.dv8tion.jda.api.EmbedBuilder; 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 bb74507..99d0e70 100644 --- a/src/main/java/com/github/nilstrieb/commands/util/EmoteAddCommand.java +++ b/src/main/java/com/github/nilstrieb/commands/util/EmoteAddCommand.java @@ -10,11 +10,12 @@ import net.dv8tion.jda.api.entities.Message; import javax.imageio.ImageIO; import java.awt.*; import java.awt.image.BufferedImage; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; import java.net.URL; -import java.util.HashMap; import java.util.List; -import java.util.stream.Collectors; public class EmoteAddCommand extends Command { @@ -116,7 +117,7 @@ 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); + double ratio = (double) image.getHeight(null) / (double) image.getWidth(null); image = image.getScaledInstance(size, (int) (size * ratio), Image.SCALE_SMOOTH); ByteArrayOutputStream out = new ByteArrayOutputStream(); 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 30f1e59..d772ad8 100644 --- a/src/main/java/com/github/nilstrieb/core/command/CommandHandler.java +++ b/src/main/java/com/github/nilstrieb/core/command/CommandHandler.java @@ -1,12 +1,12 @@ package com.github.nilstrieb.core.command; import com.github.nilstrieb.cofig.Config; -import com.github.nilstrieb.util.ConsoleColors; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.MessageEmbed; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; -import java.util.*; +import java.util.HashMap; +import java.util.Map; /** * The CommandHandler handles everything about the commands 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 1f4a0b7..00a8812 100644 --- a/src/main/java/com/github/nilstrieb/core/command/CommandListener.java +++ b/src/main/java/com/github/nilstrieb/core/command/CommandListener.java @@ -1,6 +1,5 @@ package com.github.nilstrieb.core.command; -import com.github.nilstrieb.util.ConsoleColors; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/github/nilstrieb/core/command/MessageSender.java b/src/main/java/com/github/nilstrieb/core/command/MessageSender.java index 36572c0..50051db 100644 --- a/src/main/java/com/github/nilstrieb/core/command/MessageSender.java +++ b/src/main/java/com/github/nilstrieb/core/command/MessageSender.java @@ -4,8 +4,6 @@ import com.github.nilstrieb.core.util.MultiPageEmbed; import net.dv8tion.jda.api.entities.MessageEmbed; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; -import java.util.Timer; -import java.util.TimerTask; import java.util.concurrent.TimeUnit; /** diff --git a/src/main/java/com/github/nilstrieb/core/util/MultiPageEmbed.java b/src/main/java/com/github/nilstrieb/core/util/MultiPageEmbed.java index c477ade..f54bdab 100644 --- a/src/main/java/com/github/nilstrieb/core/util/MultiPageEmbed.java +++ b/src/main/java/com/github/nilstrieb/core/util/MultiPageEmbed.java @@ -6,8 +6,6 @@ import net.dv8tion.jda.api.entities.MessageEmbed; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent; -import java.util.Objects; - /** * This class sends a message to the channel in the event that contains multiple pages that can be navigated using reactinos */