diff --git a/build.gradle b/build.gradle index cba50fb..e20811b 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,6 @@ dependencies { implementation 'commons-io:commons-io:2.6' implementation 'org.apache.commons:commons-compress:1.18' implementation 'com.google.code.gson:gson:2.8.5' - implementation 'com.atlassian.commonmark:commonmark:0.12.1' implementation 'com.google.code.findbugs:jsr305:3.0.2' } diff --git a/src/main/java/io/github/ImpactDevelopment/installer/Markdown.java b/src/main/java/io/github/ImpactDevelopment/installer/Markdown.java deleted file mode 100644 index 9c61cba..0000000 --- a/src/main/java/io/github/ImpactDevelopment/installer/Markdown.java +++ /dev/null @@ -1,31 +0,0 @@ -package io.github.ImpactDevelopment.installer; - -import org.commonmark.parser.Parser; -import org.commonmark.renderer.html.HtmlRenderer; - -import java.io.*; -import java.nio.charset.Charset; -import java.nio.file.Files; -import java.nio.file.Path; - -public class Markdown { - - private static final Parser MD_PARSER = Parser.builder().build(); - private static final HtmlRenderer HTML_RENDERER = HtmlRenderer.builder().build(); - - public static String parse(String markdown) throws IOException { - return parse(new StringReader(markdown)); - } - - public static String parse(InputStream markdown) throws IOException { - return parse(new InputStreamReader(markdown)); - } - - public static String parse(Path markdown) throws IOException { - return parse(Files.newBufferedReader(markdown, Charset.forName("UTF-8"))); - } - - public static String parse(Reader markdown) throws IOException { - return HTML_RENDERER.render(MD_PARSER.parseReader(markdown)); - } -} diff --git a/src/main/java/io/github/ImpactDevelopment/installer/gui/AppWindow.java b/src/main/java/io/github/ImpactDevelopment/installer/gui/AppWindow.java index c3e3041..715dd88 100644 --- a/src/main/java/io/github/ImpactDevelopment/installer/gui/AppWindow.java +++ b/src/main/java/io/github/ImpactDevelopment/installer/gui/AppWindow.java @@ -1,7 +1,6 @@ package io.github.ImpactDevelopment.installer.gui; import io.github.ImpactDevelopment.installer.Installer; -import io.github.ImpactDevelopment.installer.gui.pages.MainPage; import io.github.ImpactDevelopment.installer.setting.InstallationConfig; import javax.swing.*; @@ -36,7 +35,7 @@ public AppWindow() { public void recreate() { SwingUtilities.invokeLater(() -> { try { - setContent(new MainPage(this)); + setContent(new ConfigPage(this)); validate(); repaint(); } catch (Throwable e) { diff --git a/src/main/java/io/github/ImpactDevelopment/installer/gui/pages/MainPage.java b/src/main/java/io/github/ImpactDevelopment/installer/gui/ConfigPage.java similarity index 97% rename from src/main/java/io/github/ImpactDevelopment/installer/gui/pages/MainPage.java rename to src/main/java/io/github/ImpactDevelopment/installer/gui/ConfigPage.java index 3f9af54..81f020b 100644 --- a/src/main/java/io/github/ImpactDevelopment/installer/gui/pages/MainPage.java +++ b/src/main/java/io/github/ImpactDevelopment/installer/gui/ConfigPage.java @@ -1,4 +1,4 @@ -package io.github.ImpactDevelopment.installer.gui.pages; +package io.github.ImpactDevelopment.installer.gui; import io.github.ImpactDevelopment.installer.Installer; import io.github.ImpactDevelopment.installer.gui.AppWindow; @@ -12,8 +12,8 @@ import java.nio.file.Path; import java.nio.file.Paths; -public class MainPage extends JPanel { - public MainPage(AppWindow app) { +public class ConfigPage extends JPanel { + public ConfigPage(AppWindow app) { setLayout(new BoxLayout(this, BoxLayout.Y_AXIS)); addPathSetting(MinecraftDirectorySetting.INSTANCE, "Minecraft directory", app); addSetting(InstallationModeSetting.INSTANCE, "Install for", app); diff --git a/src/main/resources/welcome.md b/src/main/resources/welcome.md deleted file mode 100644 index ace3cfc..0000000 --- a/src/main/resources/welcome.md +++ /dev/null @@ -1,3 +0,0 @@ -# Hellow world - -I am a _cool_ markdown file in `src/main/resources/` \ No newline at end of file