diff --git a/pom.xml b/pom.xml index d2372aa..276595c 100644 --- a/pom.xml +++ b/pom.xml @@ -65,13 +65,13 @@ org.jetbrains annotations - 24.0.1 + 26.0.0 provided us.dynmap dynmap-api - 3.1-beta-2 + 3.5 provided @@ -112,7 +112,7 @@ org.junit.jupiter junit-jupiter - 5.9.2 + 5.11.4 test diff --git a/src/main/java/net/knarcraft/stargate/command/CommandAbout.java b/src/main/java/net/knarcraft/stargate/command/CommandAbout.java index e0e7217..715e656 100644 --- a/src/main/java/net/knarcraft/stargate/command/CommandAbout.java +++ b/src/main/java/net/knarcraft/stargate/command/CommandAbout.java @@ -1,9 +1,9 @@ package net.knarcraft.stargate.command; import de.themoep.minedown.MineDown; +import net.knarcraft.knarlib.util.FileHelper; import net.knarcraft.stargate.Stargate; import net.knarcraft.stargate.config.Message; -import net.knarcraft.stargate.utility.FileHelper; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.chat.BaseComponent; import org.bukkit.command.Command; @@ -13,6 +13,7 @@ import org.jetbrains.annotations.NotNull; import java.io.IOException; import java.io.InputStream; +import java.util.List; /** * This command represents the plugin's about command @@ -26,9 +27,11 @@ public class CommandAbout implements CommandExecutor { ChatColor textColor = ChatColor.GOLD; ChatColor highlightColor = ChatColor.GREEN; - try (InputStream inputStream = Stargate.class.getResourceAsStream("/messages/about.md")) { + + try (InputStream inputStream = FileHelper.getInputStreamForInternalFile("/messages/about.md")) { if (inputStream != null) { - String aboutMessageString = FileHelper.readStreamToString(inputStream); + List lines = FileHelper.readLines(FileHelper.getBufferedReaderFromInputStream(inputStream)); + String aboutMessageString = String.join("\n", lines); BaseComponent[] component = MineDown.parse(aboutMessageString); commandSender.spigot().sendMessage(component); } diff --git a/src/main/java/net/knarcraft/stargate/utility/FileHelper.java b/src/main/java/net/knarcraft/stargate/utility/FileHelper.java deleted file mode 100644 index 77385c6..0000000 --- a/src/main/java/net/knarcraft/stargate/utility/FileHelper.java +++ /dev/null @@ -1,36 +0,0 @@ -package net.knarcraft.stargate.utility; - -import org.jetbrains.annotations.NotNull; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.nio.charset.StandardCharsets; - -public final class FileHelper { - - private FileHelper() { - - } - - /** - * Converts the stream directly into a string, includes the newline character - * - * @param stream

The stream to read from

- * @return

A String of the file read

- * @throws IOException

If unable to read the stream

- */ - @NotNull - public static String readStreamToString(@NotNull InputStream stream) throws IOException { - InputStreamReader inputStreamReader = new InputStreamReader(stream, StandardCharsets.UTF_8); - BufferedReader reader = new BufferedReader(inputStreamReader); - String line = reader.readLine(); - StringBuilder lines = new StringBuilder(); - while (line != null) { - lines.append(line).append("\n"); - line = reader.readLine(); - } - return lines.toString(); - } -}