diff --git a/src/main/java/net/minecraftforge/installer/DownloadUtils.java b/src/main/java/net/minecraftforge/installer/DownloadUtils.java index d96b4371..316d4762 100644 --- a/src/main/java/net/minecraftforge/installer/DownloadUtils.java +++ b/src/main/java/net/minecraftforge/installer/DownloadUtils.java @@ -15,15 +15,6 @@ */ package net.minecraftforge.installer; -import net.minecraftforge.installer.actions.ProgressCallback; -import net.minecraftforge.installer.json.Artifact; -import net.minecraftforge.installer.json.Manifest; -import net.minecraftforge.installer.json.Mirror; -import net.minecraftforge.installer.json.Util; -import net.minecraftforge.installer.json.Version.Library; -import net.minecraftforge.installer.json.Version.LibraryDownload; - -import javax.net.ssl.SSLHandshakeException; import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -40,6 +31,14 @@ import java.util.List; import java.util.function.Predicate; import java.util.stream.Collectors; +import javax.net.ssl.SSLHandshakeException; +import net.minecraftforge.installer.actions.ProgressCallback; +import net.minecraftforge.installer.json.Artifact; +import net.minecraftforge.installer.json.Manifest; +import net.minecraftforge.installer.json.Mirror; +import net.minecraftforge.installer.json.Util; +import net.minecraftforge.installer.json.Version.Library; +import net.minecraftforge.installer.json.Version.LibraryDownload; public class DownloadUtils { public static final String MANIFEST_URL = "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json"; diff --git a/src/main/java/net/minecraftforge/installer/Downloader.java b/src/main/java/net/minecraftforge/installer/Downloader.java index e83401ee..00391f82 100644 --- a/src/main/java/net/minecraftforge/installer/Downloader.java +++ b/src/main/java/net/minecraftforge/installer/Downloader.java @@ -15,10 +15,6 @@ */ package net.minecraftforge.installer; -import net.minecraftforge.installer.actions.ProgressCallback; -import org.jetbrains.annotations.CheckReturnValue; -import org.jetbrains.annotations.Nullable; - import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -33,6 +29,9 @@ import java.util.Objects; import java.util.logging.Level; import java.util.logging.Logger; +import net.minecraftforge.installer.actions.ProgressCallback; +import org.jetbrains.annotations.CheckReturnValue; +import org.jetbrains.annotations.Nullable; @CheckReturnValue public class Downloader { diff --git a/src/main/java/net/minecraftforge/installer/actions/ClientInstall.java b/src/main/java/net/minecraftforge/installer/actions/ClientInstall.java index a0926e42..b54831f8 100644 --- a/src/main/java/net/minecraftforge/installer/actions/ClientInstall.java +++ b/src/main/java/net/minecraftforge/installer/actions/ClientInstall.java @@ -17,7 +17,11 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import java.io.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.StandardCopyOption; diff --git a/src/main/java/net/minecraftforge/installer/actions/ServerInstall.java b/src/main/java/net/minecraftforge/installer/actions/ServerInstall.java index 7baf51bf..fdb2f595 100644 --- a/src/main/java/net/minecraftforge/installer/actions/ServerInstall.java +++ b/src/main/java/net/minecraftforge/installer/actions/ServerInstall.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; import java.util.function.Predicate; - import net.minecraftforge.installer.DownloadUtils; import net.minecraftforge.installer.SimpleInstaller; import net.minecraftforge.installer.json.Artifact; diff --git a/src/main/java/net/minecraftforge/installer/ui/InstallerPanel.java b/src/main/java/net/minecraftforge/installer/ui/InstallerPanel.java index c1fcd29a..3106ac03 100644 --- a/src/main/java/net/minecraftforge/installer/ui/InstallerPanel.java +++ b/src/main/java/net/minecraftforge/installer/ui/InstallerPanel.java @@ -15,7 +15,13 @@ */ package net.minecraftforge.installer.ui; -import java.awt.*; +import java.awt.Color; +import java.awt.Desktop; +import java.awt.Dialog; +import java.awt.Dimension; +import java.awt.EventQueue; +import java.awt.Font; +import java.awt.Insets; import java.awt.event.ActionEvent; import java.awt.image.BufferedImage; import java.io.File; @@ -32,7 +38,22 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.Function; import java.util.function.Predicate; -import javax.swing.*; +import javax.swing.AbstractAction; +import javax.swing.Box; +import javax.swing.BoxLayout; +import javax.swing.ButtonGroup; +import javax.swing.DefaultComboBoxModel; +import javax.swing.ImageIcon; +import javax.swing.JButton; +import javax.swing.JCheckBox; +import javax.swing.JComboBox; +import javax.swing.JDialog; +import javax.swing.JFileChooser; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JRadioButton; +import javax.swing.JTextField; import javax.swing.border.LineBorder; import net.minecraftforge.installer.DownloadUtils; import net.minecraftforge.installer.SimpleInstaller; diff --git a/src/main/java/net/minecraftforge/installer/ui/ProgressFrame.java b/src/main/java/net/minecraftforge/installer/ui/ProgressFrame.java index ccd6fab3..1869ffe8 100644 --- a/src/main/java/net/minecraftforge/installer/ui/ProgressFrame.java +++ b/src/main/java/net/minecraftforge/installer/ui/ProgressFrame.java @@ -19,7 +19,14 @@ import java.awt.GridBagConstraints; import java.awt.GridBagLayout; import java.awt.Insets; -import javax.swing.*; +import javax.swing.JButton; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JProgressBar; +import javax.swing.JScrollPane; +import javax.swing.JTextArea; +import javax.swing.WindowConstants; import net.minecraftforge.installer.actions.ProgressCallback; public class ProgressFrame extends JFrame implements ProgressCallback { diff --git a/src/main/java/net/minecraftforge/installer/ui/TranslationTarget.java b/src/main/java/net/minecraftforge/installer/ui/TranslationTarget.java index a9b47f0f..060d19a2 100644 --- a/src/main/java/net/minecraftforge/installer/ui/TranslationTarget.java +++ b/src/main/java/net/minecraftforge/installer/ui/TranslationTarget.java @@ -15,11 +15,13 @@ */ package net.minecraftforge.installer.ui; -import java.awt.*; +import java.awt.Component; import java.util.IdentityHashMap; import java.util.Map; import java.util.function.BiConsumer; -import javax.swing.*; +import javax.swing.AbstractButton; +import javax.swing.JComponent; +import javax.swing.JLabel; @SuppressWarnings({ "unchecked", "rawtypes" }) public final class TranslationTarget {