diff --git a/buildSrc/src/main/kotlin/inceptum.application-standalone.gradle.kts b/buildSrc/src/main/kotlin/inceptum.application-standalone.gradle.kts index b983f76..1058f0c 100644 --- a/buildSrc/src/main/kotlin/inceptum.application-standalone.gradle.kts +++ b/buildSrc/src/main/kotlin/inceptum.application-standalone.gradle.kts @@ -1,5 +1,5 @@ -import java.io.FileOutputStream import de.undercouch.gradle.tasks.download.Download +import java.io.FileOutputStream plugins { application diff --git a/buildSrc/src/main/kotlin/inceptum.gson-compile.gradle.kts b/buildSrc/src/main/kotlin/inceptum.gson-compile.gradle.kts index 8076362..d01ac1c 100644 --- a/buildSrc/src/main/kotlin/inceptum.gson-compile.gradle.kts +++ b/buildSrc/src/main/kotlin/inceptum.gson-compile.gradle.kts @@ -1,5 +1,3 @@ -import org.gradle.kotlin.dsl.extra - plugins { id("inceptum.library") } diff --git a/common/src/main/java/io/gitlab/jfronny/inceptum/common/Utils.java b/common/src/main/java/io/gitlab/jfronny/inceptum/common/Utils.java index cce9c99..ae9fb46 100644 --- a/common/src/main/java/io/gitlab/jfronny/inceptum/common/Utils.java +++ b/common/src/main/java/io/gitlab/jfronny/inceptum/common/Utils.java @@ -13,7 +13,6 @@ import java.nio.file.FileSystem; import java.nio.file.Path; import java.util.Arrays; import java.util.regex.Pattern; -import java.util.stream.Collectors; public class Utils { public static final int CACHE_SIZE = 128; diff --git a/common/src/main/java/io/gitlab/jfronny/inceptum/common/api/MavenApi.java b/common/src/main/java/io/gitlab/jfronny/inceptum/common/api/MavenApi.java index ac0ff58..0964c23 100644 --- a/common/src/main/java/io/gitlab/jfronny/inceptum/common/api/MavenApi.java +++ b/common/src/main/java/io/gitlab/jfronny/inceptum/common/api/MavenApi.java @@ -5,7 +5,8 @@ import io.gitlab.jfronny.inceptum.common.Net; import io.gitlab.jfronny.inceptum.common.Utils; import io.gitlab.jfronny.inceptum.common.model.maven.*; import org.jetbrains.annotations.Nullable; -import org.w3c.dom.*; +import org.w3c.dom.Document; +import org.w3c.dom.Node; import org.xml.sax.SAXException; import javax.xml.parsers.*; diff --git a/common/src/main/java/io/gitlab/jfronny/inceptum/common/model/maven/DependencyNode.java b/common/src/main/java/io/gitlab/jfronny/inceptum/common/model/maven/DependencyNode.java index 47aa18a..712209b 100644 --- a/common/src/main/java/io/gitlab/jfronny/inceptum/common/model/maven/DependencyNode.java +++ b/common/src/main/java/io/gitlab/jfronny/inceptum/common/model/maven/DependencyNode.java @@ -1,6 +1,7 @@ package io.gitlab.jfronny.inceptum.common.model.maven; -import java.util.*; +import java.util.Iterator; +import java.util.Set; public record DependencyNode(String name, Set dependencies) { @Override diff --git a/launcher-gtk/src/main/java/io/gitlab/jfronny/inceptum/gtk/GtkEnvBackend.java b/launcher-gtk/src/main/java/io/gitlab/jfronny/inceptum/gtk/GtkEnvBackend.java index 7329c84..3961e30 100644 --- a/launcher-gtk/src/main/java/io/gitlab/jfronny/inceptum/gtk/GtkEnvBackend.java +++ b/launcher-gtk/src/main/java/io/gitlab/jfronny/inceptum/gtk/GtkEnvBackend.java @@ -1,13 +1,12 @@ package io.gitlab.jfronny.inceptum.gtk; -import io.gitlab.jfronny.inceptum.gtk.window.dialog.MicrosoftLoginDialog; -import io.gitlab.jfronny.inceptum.gtk.window.dialog.StringInputDialog; -import org.gnome.gtk.*; import io.gitlab.jfronny.commons.StringFormatter; import io.gitlab.jfronny.inceptum.common.Utils; -import io.gitlab.jfronny.inceptum.gtk.util.I18n; +import io.gitlab.jfronny.inceptum.gtk.window.dialog.MicrosoftLoginDialog; +import io.gitlab.jfronny.inceptum.gtk.window.dialog.StringInputDialog; import io.gitlab.jfronny.inceptum.launcher.LauncherEnv; import io.gitlab.jfronny.inceptum.launcher.api.account.MicrosoftAccount; +import org.gnome.gtk.*; import org.jetbrains.annotations.Nullable; import java.util.function.Consumer; diff --git a/launcher-gtk/src/main/java/io/gitlab/jfronny/inceptum/gtk/GtkMenubar.java b/launcher-gtk/src/main/java/io/gitlab/jfronny/inceptum/gtk/GtkMenubar.java index 470c6af..3e822da 100644 --- a/launcher-gtk/src/main/java/io/gitlab/jfronny/inceptum/gtk/GtkMenubar.java +++ b/launcher-gtk/src/main/java/io/gitlab/jfronny/inceptum/gtk/GtkMenubar.java @@ -1,34 +1,34 @@ package io.gitlab.jfronny.inceptum.gtk; import io.gitlab.jfronny.commons.io.JFiles; -import io.gitlab.jfronny.inceptum.common.MetaHolder; -import io.gitlab.jfronny.inceptum.gtk.window.dialog.MicrosoftLoginDialog; -import io.gitlab.jfronny.inceptum.gtk.window.dialog.ProcessStateWatcherDialog; -import io.gitlab.jfronny.inceptum.gtk.window.settings.launcher.LauncherSettingsWindow; -import io.gitlab.jfronny.inceptum.launcher.system.importer.Importers; -import io.gitlab.jfronny.inceptum.launcher.system.launch.*; -import io.gitlab.jfronny.inceptum.launcher.util.ProcessState; -import org.gnome.gio.Menu; -import org.gnome.gtk.*; import io.gitlab.jfronny.commons.ref.R; +import io.gitlab.jfronny.inceptum.common.MetaHolder; import io.gitlab.jfronny.inceptum.common.Utils; import io.gitlab.jfronny.inceptum.gtk.menu.MenuBuilder; import io.gitlab.jfronny.inceptum.gtk.util.I18n; import io.gitlab.jfronny.inceptum.gtk.window.AboutWindow; import io.gitlab.jfronny.inceptum.gtk.window.NewInstanceWindow; +import io.gitlab.jfronny.inceptum.gtk.window.dialog.MicrosoftLoginDialog; +import io.gitlab.jfronny.inceptum.gtk.window.dialog.ProcessStateWatcherDialog; +import io.gitlab.jfronny.inceptum.gtk.window.settings.launcher.LauncherSettingsWindow; import io.gitlab.jfronny.inceptum.launcher.LauncherEnv; import io.gitlab.jfronny.inceptum.launcher.api.account.AccountManager; import io.gitlab.jfronny.inceptum.launcher.api.account.MicrosoftAccount; +import io.gitlab.jfronny.inceptum.launcher.system.importer.Importers; import io.gitlab.jfronny.inceptum.launcher.system.instance.Instance; import io.gitlab.jfronny.inceptum.launcher.system.instance.InstanceList; +import io.gitlab.jfronny.inceptum.launcher.system.launch.InstanceLauncher; +import io.gitlab.jfronny.inceptum.launcher.system.launch.LaunchType; import io.gitlab.jfronny.inceptum.launcher.system.setup.Steps; +import io.gitlab.jfronny.inceptum.launcher.util.ProcessState; +import org.gnome.gtk.*; import java.awt.*; import java.awt.datatransfer.DataFlavor; import java.io.IOException; import java.nio.file.Path; -import java.util.*; import java.util.List; +import java.util.*; public class GtkMenubar { public static MenuBuilder newMenu; diff --git a/launcher-gtk/src/main/java/io/gitlab/jfronny/inceptum/gtk/control/settings/SettingsWindow.java b/launcher-gtk/src/main/java/io/gitlab/jfronny/inceptum/gtk/control/settings/SettingsWindow.java index b90192c..14736a0 100644 --- a/launcher-gtk/src/main/java/io/gitlab/jfronny/inceptum/gtk/control/settings/SettingsWindow.java +++ b/launcher-gtk/src/main/java/io/gitlab/jfronny/inceptum/gtk/control/settings/SettingsWindow.java @@ -1,12 +1,12 @@ package io.gitlab.jfronny.inceptum.gtk.control.settings; import io.gitlab.jfronny.inceptum.gtk.util.I18n; -import org.gnome.adw.*; import org.gnome.adw.HeaderBar; +import org.gnome.adw.*; import org.gnome.gobject.BindingFlags; -import org.gnome.gtk.*; import org.gnome.gtk.Application; import org.gnome.gtk.Window; +import org.gnome.gtk.*; import org.jetbrains.annotations.PropertyKey; public class SettingsWindow extends Window { diff --git a/launcher-gtk/src/main/java/io/gitlab/jfronny/inceptum/gtk/menu/MenuBuilder.java b/launcher-gtk/src/main/java/io/gitlab/jfronny/inceptum/gtk/menu/MenuBuilder.java index 6ff4c29..725519d 100644 --- a/launcher-gtk/src/main/java/io/gitlab/jfronny/inceptum/gtk/menu/MenuBuilder.java +++ b/launcher-gtk/src/main/java/io/gitlab/jfronny/inceptum/gtk/menu/MenuBuilder.java @@ -3,18 +3,14 @@ package io.gitlab.jfronny.inceptum.gtk.menu; import io.gitlab.jfronny.commons.throwable.ThrowingRunnable; import io.gitlab.jfronny.inceptum.common.Utils; import io.gitlab.jfronny.inceptum.gtk.util.I18n; -import org.gnome.gio.MenuItem; import org.gnome.gio.*; import org.gnome.glib.Variant; import org.gnome.glib.VariantType; -import org.gnome.gtk.*; import org.gnome.gtk.Application; +import org.gnome.gtk.*; import org.jetbrains.annotations.Nullable; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; import java.util.function.BiFunction; import java.util.function.Consumer; diff --git a/launcher-gtk/src/main/java/io/gitlab/jfronny/inceptum/gtk/window/AboutWindow.java b/launcher-gtk/src/main/java/io/gitlab/jfronny/inceptum/gtk/window/AboutWindow.java index aa7a893..dc846a1 100644 --- a/launcher-gtk/src/main/java/io/gitlab/jfronny/inceptum/gtk/window/AboutWindow.java +++ b/launcher-gtk/src/main/java/io/gitlab/jfronny/inceptum/gtk/window/AboutWindow.java @@ -1,10 +1,9 @@ package io.gitlab.jfronny.inceptum.gtk.window; -import io.gitlab.jfronny.inceptum.gtk.GtkMain; -import org.gnome.gtk.AboutDialog; -import org.gnome.gtk.License; import io.gitlab.jfronny.inceptum.common.BuildMetadata; import io.gitlab.jfronny.inceptum.gtk.util.I18n; +import org.gnome.gtk.AboutDialog; +import org.gnome.gtk.License; public class AboutWindow extends AboutDialog { public AboutWindow() { diff --git a/launcher-gtk/src/main/java/io/gitlab/jfronny/inceptum/gtk/window/settings/instance/ExportTab.java b/launcher-gtk/src/main/java/io/gitlab/jfronny/inceptum/gtk/window/settings/instance/ExportTab.java index 6af3e4c..fda2dd1 100644 --- a/launcher-gtk/src/main/java/io/gitlab/jfronny/inceptum/gtk/window/settings/instance/ExportTab.java +++ b/launcher-gtk/src/main/java/io/gitlab/jfronny/inceptum/gtk/window/settings/instance/ExportTab.java @@ -1,6 +1,5 @@ package io.gitlab.jfronny.inceptum.gtk.window.settings.instance; -import io.gitlab.jfronny.commons.ref.R; import io.gitlab.jfronny.inceptum.common.Utils; import io.gitlab.jfronny.inceptum.gtk.GtkEnvBackend; import io.gitlab.jfronny.inceptum.gtk.GtkMain; diff --git a/launcher-imgui/src/main/java/io/gitlab/jfronny/inceptum/imgui/window/edit/ArgumentsTab.java b/launcher-imgui/src/main/java/io/gitlab/jfronny/inceptum/imgui/window/edit/ArgumentsTab.java index 2c33079..9d2d3f5 100644 --- a/launcher-imgui/src/main/java/io/gitlab/jfronny/inceptum/imgui/window/edit/ArgumentsTab.java +++ b/launcher-imgui/src/main/java/io/gitlab/jfronny/inceptum/imgui/window/edit/ArgumentsTab.java @@ -7,10 +7,8 @@ import io.gitlab.jfronny.inceptum.imgui.control.Tab; import io.gitlab.jfronny.inceptum.imgui.window.GuiUtil; import io.gitlab.jfronny.inceptum.launcher.model.inceptum.InstanceMeta; -import java.util.ArrayList; import java.util.LinkedList; import java.util.List; -import java.util.regex.Pattern; public class ArgumentsTab extends Tab { private final InstanceEditWindow window; diff --git a/launcher-imgui/src/main/java/io/gitlab/jfronny/inceptum/imgui/window/edit/ExportTab.java b/launcher-imgui/src/main/java/io/gitlab/jfronny/inceptum/imgui/window/edit/ExportTab.java index fce5b4b..b92b08d 100644 --- a/launcher-imgui/src/main/java/io/gitlab/jfronny/inceptum/imgui/window/edit/ExportTab.java +++ b/launcher-imgui/src/main/java/io/gitlab/jfronny/inceptum/imgui/window/edit/ExportTab.java @@ -2,12 +2,10 @@ package io.gitlab.jfronny.inceptum.imgui.window.edit; import imgui.ImGui; import imgui.type.ImString; -import io.gitlab.jfronny.commons.ref.R; import io.gitlab.jfronny.inceptum.imgui.GuiMain; import io.gitlab.jfronny.inceptum.imgui.control.Tab; import io.gitlab.jfronny.inceptum.imgui.window.GuiUtil; import io.gitlab.jfronny.inceptum.imgui.window.dialog.ProcessStateWatcherWindow; -import io.gitlab.jfronny.inceptum.imgui.window.dialog.TextBoxWindow; import io.gitlab.jfronny.inceptum.launcher.LauncherEnv; import io.gitlab.jfronny.inceptum.launcher.system.exporter.Exporter; import io.gitlab.jfronny.inceptum.launcher.system.exporter.Exporters; diff --git a/launcher-imgui/src/main/java/io/gitlab/jfronny/inceptum/imgui/window/edit/GeneralTab.java b/launcher-imgui/src/main/java/io/gitlab/jfronny/inceptum/imgui/window/edit/GeneralTab.java index 3805f37..7927bda 100644 --- a/launcher-imgui/src/main/java/io/gitlab/jfronny/inceptum/imgui/window/edit/GeneralTab.java +++ b/launcher-imgui/src/main/java/io/gitlab/jfronny/inceptum/imgui/window/edit/GeneralTab.java @@ -6,7 +6,8 @@ import imgui.type.ImString; import io.gitlab.jfronny.commons.OSUtils; import io.gitlab.jfronny.commons.io.JFiles; import io.gitlab.jfronny.commons.ref.R; -import io.gitlab.jfronny.inceptum.common.*; +import io.gitlab.jfronny.inceptum.common.MetaHolder; +import io.gitlab.jfronny.inceptum.common.Utils; import io.gitlab.jfronny.inceptum.imgui.GuiMain; import io.gitlab.jfronny.inceptum.imgui.control.InstanceManageControls; import io.gitlab.jfronny.inceptum.imgui.control.Tab; diff --git a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/api/CurseforgeApi.java b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/api/CurseforgeApi.java index eed30a1..60164e7 100644 --- a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/api/CurseforgeApi.java +++ b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/api/CurseforgeApi.java @@ -8,7 +8,8 @@ import io.gitlab.jfronny.commons.HttpUtils; import io.gitlab.jfronny.inceptum.common.Net; import io.gitlab.jfronny.inceptum.launcher.model.curseforge.CurseforgeFile; import io.gitlab.jfronny.inceptum.launcher.model.curseforge.CurseforgeMod; -import io.gitlab.jfronny.inceptum.launcher.model.curseforge.response.*; +import io.gitlab.jfronny.inceptum.launcher.model.curseforge.response.FingerprintMatchesResponse; +import io.gitlab.jfronny.inceptum.launcher.model.curseforge.response.SearchResponse; import java.io.*; import java.net.URISyntaxException; diff --git a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/api/FabricMetaApi.java b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/api/FabricMetaApi.java index 18500bc..a15d9b9 100644 --- a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/api/FabricMetaApi.java +++ b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/api/FabricMetaApi.java @@ -7,7 +7,7 @@ import io.gitlab.jfronny.gson.stream.JsonReader; import io.gitlab.jfronny.inceptum.common.Net; import io.gitlab.jfronny.inceptum.common.Utils; import io.gitlab.jfronny.inceptum.common.model.maven.ArtifactMeta; -import io.gitlab.jfronny.inceptum.launcher.model.fabric.*; +import io.gitlab.jfronny.inceptum.launcher.model.fabric.FabricVersionLoaderInfo; import io.gitlab.jfronny.inceptum.launcher.model.fabric.FabricVersionLoaderInfo.WithMeta.LauncherMeta.Libraries.Library; import io.gitlab.jfronny.inceptum.launcher.model.mojang.*; import io.gitlab.jfronny.inceptum.launcher.util.GameVersionParser; diff --git a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/api/McApi.java b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/api/McApi.java index 68cc032..d8a4bd8 100644 --- a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/api/McApi.java +++ b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/api/McApi.java @@ -6,7 +6,8 @@ import gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.mojang.J import gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.mojang.VersionInfo.GC_VersionInfo; import gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.mojang.VersionsList.GC_VersionsList; import io.gitlab.jfronny.commons.OSUtils; -import io.gitlab.jfronny.inceptum.common.*; +import io.gitlab.jfronny.inceptum.common.MetaHolder; +import io.gitlab.jfronny.inceptum.common.Net; import io.gitlab.jfronny.inceptum.launcher.model.mojang.*; import java.io.IOException; diff --git a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/api/account/MicrosoftAccount.java b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/api/account/MicrosoftAccount.java index e897159..5e417ef 100644 --- a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/api/account/MicrosoftAccount.java +++ b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/api/account/MicrosoftAccount.java @@ -2,12 +2,13 @@ package io.gitlab.jfronny.inceptum.launcher.api.account; import io.gitlab.jfronny.commons.ref.R; import io.gitlab.jfronny.gson.compile.annotations.GSerializable; -import io.gitlab.jfronny.inceptum.common.*; +import io.gitlab.jfronny.inceptum.common.GsonPreset; +import io.gitlab.jfronny.inceptum.common.Utils; import io.gitlab.jfronny.inceptum.launcher.LauncherEnv; import io.gitlab.jfronny.inceptum.launcher.gson.MicrosoftAccountAdapter; -import io.gitlab.jfronny.inceptum.launcher.model.microsoft.response.*; import io.gitlab.jfronny.inceptum.launcher.gson.MicrosoftAccountMeta; -import io.gitlab.jfronny.inceptum.launcher.model.microsoft.*; +import io.gitlab.jfronny.inceptum.launcher.model.microsoft.Profile; +import io.gitlab.jfronny.inceptum.launcher.model.microsoft.response.*; import java.io.IOException; import java.net.URISyntaxException; diff --git a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/api/account/MicrosoftAuthAPI.java b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/api/account/MicrosoftAuthAPI.java index 64d9204..4dd1aaa 100644 --- a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/api/account/MicrosoftAuthAPI.java +++ b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/api/account/MicrosoftAuthAPI.java @@ -9,7 +9,8 @@ import gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.microsof import gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.microsoft.response.OauthTokenResponse.GC_OauthTokenResponse; import gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.microsoft.response.XboxLiveAuthResponse.GC_XboxLiveAuthResponse; import io.gitlab.jfronny.commons.HttpUtils; -import io.gitlab.jfronny.inceptum.launcher.model.microsoft.*; +import io.gitlab.jfronny.inceptum.launcher.model.microsoft.Entitlements; +import io.gitlab.jfronny.inceptum.launcher.model.microsoft.Profile; import io.gitlab.jfronny.inceptum.launcher.model.microsoft.request.*; import io.gitlab.jfronny.inceptum.launcher.model.microsoft.response.*; diff --git a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/api/account/MicrosoftAuthServer.java b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/api/account/MicrosoftAuthServer.java index f277db2..07d4920 100644 --- a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/api/account/MicrosoftAuthServer.java +++ b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/api/account/MicrosoftAuthServer.java @@ -2,8 +2,9 @@ package io.gitlab.jfronny.inceptum.launcher.api.account; import io.gitlab.jfronny.inceptum.common.Utils; import io.gitlab.jfronny.inceptum.launcher.LauncherEnv; +import io.gitlab.jfronny.inceptum.launcher.model.microsoft.Entitlements; +import io.gitlab.jfronny.inceptum.launcher.model.microsoft.Profile; import io.gitlab.jfronny.inceptum.launcher.model.microsoft.response.*; -import io.gitlab.jfronny.inceptum.launcher.model.microsoft.*; import net.freeutils.httpserver.HTTPServer; import org.jetbrains.annotations.Nullable; diff --git a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/gson/MinecraftArgumentAdapter.java b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/gson/MinecraftArgumentAdapter.java index b93902c..e3a2c18 100644 --- a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/gson/MinecraftArgumentAdapter.java +++ b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/gson/MinecraftArgumentAdapter.java @@ -4,7 +4,8 @@ import gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.mojang.R import io.gitlab.jfronny.gson.JsonParseException; import io.gitlab.jfronny.gson.compile.util.GList; import io.gitlab.jfronny.gson.stream.*; -import io.gitlab.jfronny.inceptum.launcher.model.mojang.*; +import io.gitlab.jfronny.inceptum.launcher.model.mojang.MinecraftArgument; +import io.gitlab.jfronny.inceptum.launcher.model.mojang.Rules; import java.io.IOException; import java.util.List; diff --git a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/model/inceptum/ModMeta.java b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/model/inceptum/ModMeta.java index 26b6747..43a2d6a 100644 --- a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/model/inceptum/ModMeta.java +++ b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/model/inceptum/ModMeta.java @@ -11,18 +11,14 @@ import io.gitlab.jfronny.inceptum.launcher.api.CurseforgeApi; import io.gitlab.jfronny.inceptum.launcher.api.ModrinthApi; import io.gitlab.jfronny.inceptum.launcher.gson.ModMetaSourcesAdapter; import io.gitlab.jfronny.inceptum.launcher.model.curseforge.response.FingerprintMatchesResponse; -import io.gitlab.jfronny.inceptum.launcher.system.source.CurseforgeModSource; -import io.gitlab.jfronny.inceptum.launcher.system.source.ModSource; -import io.gitlab.jfronny.inceptum.launcher.system.source.ModrinthModSource; +import io.gitlab.jfronny.inceptum.launcher.system.source.*; import org.jetbrains.annotations.Nullable; import java.io.IOException; import java.net.URISyntaxException; import java.nio.file.Files; import java.nio.file.Path; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; +import java.util.*; @GSerializable(configure = GsonPreset.Config.class) public record ModMeta( diff --git a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/exporter/Exporter.java b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/exporter/Exporter.java index 81ccd61..0f2bf1e 100644 --- a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/exporter/Exporter.java +++ b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/exporter/Exporter.java @@ -8,9 +8,7 @@ import io.gitlab.jfronny.inceptum.launcher.util.gitignore.IgnoringWalk; import java.io.IOException; import java.net.URISyntaxException; -import java.nio.file.FileSystem; -import java.nio.file.Files; -import java.nio.file.Path; +import java.nio.file.*; import java.util.Objects; public abstract class Exporter { diff --git a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/exporter/ModrinthExporter.java b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/exporter/ModrinthExporter.java index 72464eb..a155806 100644 --- a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/exporter/ModrinthExporter.java +++ b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/exporter/ModrinthExporter.java @@ -11,7 +11,6 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; -import java.util.Set; public class ModrinthExporter extends Exporter { public ModrinthExporter() { diff --git a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/importer/CurseForgeImporter.java b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/importer/CurseForgeImporter.java index 8bd57d5..50aeff4 100644 --- a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/importer/CurseForgeImporter.java +++ b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/importer/CurseForgeImporter.java @@ -12,7 +12,6 @@ import io.gitlab.jfronny.inceptum.launcher.util.ProcessState; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import java.util.Set; public class CurseForgeImporter extends Importer { public CurseForgeImporter() { diff --git a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/importer/ModrinthImporter.java b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/importer/ModrinthImporter.java index 97faf5c..35ec5c2 100644 --- a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/importer/ModrinthImporter.java +++ b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/importer/ModrinthImporter.java @@ -8,7 +8,6 @@ import io.gitlab.jfronny.inceptum.launcher.util.ProcessState; import java.io.IOException; import java.net.URISyntaxException; import java.nio.file.Path; -import java.util.ArrayList; public class ModrinthImporter extends Importer { public ModrinthImporter() { diff --git a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/mds/FileScanTask.java b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/mds/FileScanTask.java index 0c5f66f..141ee92 100644 --- a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/mds/FileScanTask.java +++ b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/mds/FileScanTask.java @@ -6,20 +6,15 @@ import io.gitlab.jfronny.gson.JsonParseException; import io.gitlab.jfronny.inceptum.common.Utils; import io.gitlab.jfronny.inceptum.launcher.model.fabric.FabricModJson; import io.gitlab.jfronny.inceptum.launcher.model.inceptum.ModMeta; -import io.gitlab.jfronny.inceptum.launcher.system.instance.Instance; import io.gitlab.jfronny.inceptum.launcher.system.instance.Mod; import io.gitlab.jfronny.inceptum.launcher.system.instance.ModPath; import io.gitlab.jfronny.inceptum.launcher.system.mds.noop.NoopMod; import io.gitlab.jfronny.inceptum.launcher.system.source.ModSource; -import org.jetbrains.annotations.Nullable; -import java.io.FileNotFoundException; import java.io.IOException; import java.net.URISyntaxException; import java.nio.file.*; -import java.util.List; import java.util.function.BiConsumer; -import java.util.function.Function; public record FileScanTask(ProtoInstance instance, Path file, BiConsumer discovered, String gameVersion) implements Runnable { @Override diff --git a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/mds/NamedThreadFactory.java b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/mds/NamedThreadFactory.java index 98af033..b782d4b 100644 --- a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/mds/NamedThreadFactory.java +++ b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/mds/NamedThreadFactory.java @@ -1,6 +1,5 @@ package io.gitlab.jfronny.inceptum.launcher.system.mds; -import java.util.concurrent.Executors; import java.util.concurrent.ThreadFactory; import java.util.concurrent.atomic.AtomicInteger; diff --git a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/setup/steps/DownloadJavaStep.java b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/setup/steps/DownloadJavaStep.java index 22cb9d3..8b87625 100644 --- a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/setup/steps/DownloadJavaStep.java +++ b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/setup/steps/DownloadJavaStep.java @@ -3,7 +3,8 @@ package io.gitlab.jfronny.inceptum.launcher.system.setup.steps; import io.gitlab.jfronny.inceptum.common.MetaHolder; import io.gitlab.jfronny.inceptum.common.Net; import io.gitlab.jfronny.inceptum.launcher.api.McApi; -import io.gitlab.jfronny.inceptum.launcher.model.mojang.*; +import io.gitlab.jfronny.inceptum.launcher.model.mojang.MojangFileDownload; +import io.gitlab.jfronny.inceptum.launcher.model.mojang.VersionInfo; import io.gitlab.jfronny.inceptum.launcher.system.setup.SetupStepInfo; import io.gitlab.jfronny.inceptum.launcher.system.setup.Step; diff --git a/wrapper/src/main/java/io/gitlab/jfronny/inceptum/wrapper/Wrapper.java b/wrapper/src/main/java/io/gitlab/jfronny/inceptum/wrapper/Wrapper.java index ec67eb9..917741b 100644 --- a/wrapper/src/main/java/io/gitlab/jfronny/inceptum/wrapper/Wrapper.java +++ b/wrapper/src/main/java/io/gitlab/jfronny/inceptum/wrapper/Wrapper.java @@ -3,7 +3,8 @@ package io.gitlab.jfronny.inceptum.wrapper; import gsoncompile.extensions.io.gitlab.jfronny.inceptum.common.model.inceptum.WrapperConfig.GC_WrapperConfig; import io.gitlab.jfronny.commons.ref.R; import io.gitlab.jfronny.inceptum.common.*; -import io.gitlab.jfronny.inceptum.common.model.inceptum.*; +import io.gitlab.jfronny.inceptum.common.model.inceptum.UpdateChannel; +import io.gitlab.jfronny.inceptum.common.model.inceptum.UpdateMetadata; import java.io.*; import java.net.URISyntaxException;