From 17e89ba829d4cdeac6b2565f6a6bb959b278c016 Mon Sep 17 00:00:00 2001 From: JFronny Date: Fri, 5 May 2023 21:37:16 +0200 Subject: [PATCH] GTK: JPMS + optimize imports --- .../jfronny/inceptum/common/InceptumConfig.java | 1 - .../io/gitlab/jfronny/inceptum/common/Updater.java | 2 -- .../jfronny/inceptum/cli/BaseInstanceCommand.java | 2 +- launcher-gtk/build.gradle.kts | 2 -- .../kotlin/io/gitlab/jfronny/inceptum/gtk/GtkMain.kt | 1 - .../io/gitlab/jfronny/inceptum/gtk/GtkMenubar.kt | 2 -- .../io/gitlab/jfronny/inceptum/gtk/IdleTaskQueue.kt | 1 - .../gitlab/jfronny/inceptum/gtk/menu/MenuBuilder.kt | 1 - .../io/gitlab/jfronny/inceptum/gtk/util/UIExt.kt | 1 - .../gitlab/jfronny/inceptum/gtk/window/MainWindow.kt | 1 - .../gtk/window/dialog/ProcessStateWatcherDialog.kt | 1 - .../gtk/window/settings/instance/ExportTab.kt | 1 - .../gtk/window/settings/instance/GeneralTab.kt | 5 +---- launcher-gtk/src/main/kotlin/module-info.java | 12 ++++++++++++ .../inceptum/imgui/window/edit/GeneralTab.java | 1 - .../jfronny/inceptum/launcher/api/CurseforgeApi.java | 7 +------ .../jfronny/inceptum/launcher/api/FabricMetaApi.java | 2 +- .../gitlab/jfronny/inceptum/launcher/api/McApi.java | 5 ----- .../jfronny/inceptum/launcher/api/ModrinthApi.java | 3 --- .../launcher/api/account/AccountManager.java | 1 - .../launcher/api/account/MicrosoftAuthAPI.java | 11 +---------- .../launcher/gson/MicrosoftAccountAdapter.java | 1 - .../launcher/gson/MinecraftArgumentAdapter.java | 4 +--- .../launcher/gson/ModMetaSourcesAdapter.java | 2 +- .../launcher/system/exporter/CurseForgeExporter.java | 2 +- .../launcher/system/importer/CurseForgeImporter.java | 2 +- .../inceptum/launcher/system/importer/Importer.java | 2 +- .../launcher/system/importer/ModrinthImporter.java | 2 +- .../inceptum/launcher/system/instance/Instance.java | 2 +- .../launcher/system/instance/InstanceList.java | 2 +- .../inceptum/launcher/system/mds/FileScanTask.java | 4 ++-- .../jfronny/inceptum/launcher/system/mds/MdsMod.java | 2 +- .../launcher/system/setup/steps/RunMdsStep.java | 2 +- .../system/setup/steps/WriteMetadataStep.java | 2 +- .../io/gitlab/jfronny/inceptum/wrapper/Wrapper.java | 4 +--- 35 files changed, 31 insertions(+), 65 deletions(-) create mode 100644 launcher-gtk/src/main/kotlin/module-info.java diff --git a/common/src/main/java/io/gitlab/jfronny/inceptum/common/InceptumConfig.java b/common/src/main/java/io/gitlab/jfronny/inceptum/common/InceptumConfig.java index 98d7aeb..1828378 100644 --- a/common/src/main/java/io/gitlab/jfronny/inceptum/common/InceptumConfig.java +++ b/common/src/main/java/io/gitlab/jfronny/inceptum/common/InceptumConfig.java @@ -1,6 +1,5 @@ package io.gitlab.jfronny.inceptum.common; -import io.gitlab.jfronny.inceptum.common.GC_InceptumConfig; import io.gitlab.jfronny.gson.compile.annotations.GComment; import io.gitlab.jfronny.gson.compile.annotations.GSerializable; import io.gitlab.jfronny.inceptum.common.model.inceptum.UpdateChannel; diff --git a/common/src/main/java/io/gitlab/jfronny/inceptum/common/Updater.java b/common/src/main/java/io/gitlab/jfronny/inceptum/common/Updater.java index 34ed7f8..87d63db 100644 --- a/common/src/main/java/io/gitlab/jfronny/inceptum/common/Updater.java +++ b/common/src/main/java/io/gitlab/jfronny/inceptum/common/Updater.java @@ -1,7 +1,5 @@ package io.gitlab.jfronny.inceptum.common; -import io.gitlab.jfronny.inceptum.common.model.inceptum.GC_UpdateMetadata; -import io.gitlab.jfronny.inceptum.common.model.inceptum.GC_WrapperConfig; import io.gitlab.jfronny.commons.OSUtils; import io.gitlab.jfronny.inceptum.common.api.MavenApi; import io.gitlab.jfronny.inceptum.common.model.inceptum.*; diff --git a/launcher-cli/src/main/java/io/gitlab/jfronny/inceptum/cli/BaseInstanceCommand.java b/launcher-cli/src/main/java/io/gitlab/jfronny/inceptum/cli/BaseInstanceCommand.java index 69aa700..7d7472f 100644 --- a/launcher-cli/src/main/java/io/gitlab/jfronny/inceptum/cli/BaseInstanceCommand.java +++ b/launcher-cli/src/main/java/io/gitlab/jfronny/inceptum/cli/BaseInstanceCommand.java @@ -1,8 +1,8 @@ package io.gitlab.jfronny.inceptum.cli; -import io.gitlab.jfronny.inceptum.launcher.model.inceptum.GC_InstanceMeta; import io.gitlab.jfronny.inceptum.common.MetaHolder; import io.gitlab.jfronny.inceptum.common.Utils; +import io.gitlab.jfronny.inceptum.launcher.model.inceptum.GC_InstanceMeta; import io.gitlab.jfronny.inceptum.launcher.system.instance.Instance; import io.gitlab.jfronny.inceptum.launcher.system.instance.InstanceList; diff --git a/launcher-gtk/build.gradle.kts b/launcher-gtk/build.gradle.kts index 0350c8b..036665d 100644 --- a/launcher-gtk/build.gradle.kts +++ b/launcher-gtk/build.gradle.kts @@ -1,5 +1,3 @@ -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile - plugins { id("inceptum.application") id("com.github.johnrengelman.shadow") diff --git a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/GtkMain.kt b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/GtkMain.kt index 6fc423a..ed0c393 100644 --- a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/GtkMain.kt +++ b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/GtkMain.kt @@ -11,7 +11,6 @@ import org.gnome.glib.GLib import org.gnome.gtk.* import java.io.IOException import java.util.* -import java.util.function.Consumer import kotlin.system.exitProcess object GtkMain { diff --git a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/GtkMenubar.kt b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/GtkMenubar.kt index fcf15b4..dfcc2b0 100644 --- a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/GtkMenubar.kt +++ b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/GtkMenubar.kt @@ -1,7 +1,6 @@ package io.gitlab.jfronny.inceptum.gtk import io.gitlab.jfronny.commons.io.JFiles -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 @@ -26,7 +25,6 @@ import java.awt.Toolkit import java.awt.datatransfer.DataFlavor import java.io.IOException import java.nio.file.Path -import java.util.* object GtkMenubar { @JvmField diff --git a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/IdleTaskQueue.kt b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/IdleTaskQueue.kt index 4495f74..54a8c54 100644 --- a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/IdleTaskQueue.kt +++ b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/IdleTaskQueue.kt @@ -2,7 +2,6 @@ package io.gitlab.jfronny.inceptum.gtk import io.gitlab.jfronny.inceptum.common.Utils import java.util.* -import java.util.ArrayDeque private val SCHEDULED: Queue = ArrayDeque() diff --git a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/menu/MenuBuilder.kt b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/menu/MenuBuilder.kt index 7127162..8091ed6 100644 --- a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/menu/MenuBuilder.kt +++ b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/menu/MenuBuilder.kt @@ -9,7 +9,6 @@ import org.gnome.glib.VariantType import org.gnome.gtk.Application import org.gnome.gtk.MenuButton import org.gnome.gtk.PopoverMenu -import java.util.* import java.util.function.BiFunction import java.util.function.Consumer diff --git a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/util/UIExt.kt b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/util/UIExt.kt index 7b028ff..8fd7536 100644 --- a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/util/UIExt.kt +++ b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/util/UIExt.kt @@ -3,7 +3,6 @@ package io.gitlab.jfronny.inceptum.gtk.util import io.gitlab.jfronny.inceptum.gtk.control.ILabel import org.gnome.adw.ActionRow import org.gnome.gtk.Label -import org.gnome.gtk.MenuButton import org.gnome.gtk.MessageDialog import org.gnome.gtk.Widget diff --git a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/MainWindow.kt b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/MainWindow.kt index 2b087de..43454f1 100644 --- a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/MainWindow.kt +++ b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/MainWindow.kt @@ -17,7 +17,6 @@ import io.gitlab.jfronny.inceptum.launcher.system.instance.InstanceListWatcher import io.gitlab.jfronny.inceptum.launcher.system.launch.LaunchType import org.gnome.adw.Clamp import org.gnome.adw.StatusPage -import org.gnome.gdk.FrameClock import org.gnome.gio.* import org.gnome.glib.GLib import org.gnome.gtk.* diff --git a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/dialog/ProcessStateWatcherDialog.kt b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/dialog/ProcessStateWatcherDialog.kt index 2f8b951..f6dd0df 100644 --- a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/dialog/ProcessStateWatcherDialog.kt +++ b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/dialog/ProcessStateWatcherDialog.kt @@ -4,7 +4,6 @@ import io.gitlab.jfronny.commons.StringFormatter import io.gitlab.jfronny.commons.throwable.ThrowingRunnable import io.gitlab.jfronny.inceptum.common.Utils import io.gitlab.jfronny.inceptum.gtk.GtkEnvBackend -import io.gitlab.jfronny.inceptum.gtk.GtkMain import io.gitlab.jfronny.inceptum.gtk.schedule import io.gitlab.jfronny.inceptum.gtk.util.I18n import io.gitlab.jfronny.inceptum.launcher.util.ProcessState diff --git a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/settings/instance/ExportTab.kt b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/settings/instance/ExportTab.kt index 3a6bbac..8094a72 100644 --- a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/settings/instance/ExportTab.kt +++ b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/settings/instance/ExportTab.kt @@ -2,7 +2,6 @@ package io.gitlab.jfronny.inceptum.gtk.window.settings.instance import io.gitlab.jfronny.inceptum.common.Utils import io.gitlab.jfronny.inceptum.gtk.GtkEnvBackend -import io.gitlab.jfronny.inceptum.gtk.GtkMain import io.gitlab.jfronny.inceptum.gtk.control.settings.SettingsTab import io.gitlab.jfronny.inceptum.gtk.schedule import io.gitlab.jfronny.inceptum.gtk.util.I18n diff --git a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/settings/instance/GeneralTab.kt b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/settings/instance/GeneralTab.kt index aaa98f9..8a6dd1a 100644 --- a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/settings/instance/GeneralTab.kt +++ b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/settings/instance/GeneralTab.kt @@ -14,21 +14,18 @@ import io.gitlab.jfronny.inceptum.gtk.util.markup import io.gitlab.jfronny.inceptum.gtk.util.toTypedArray import io.gitlab.jfronny.inceptum.launcher.api.FabricMetaApi import io.gitlab.jfronny.inceptum.launcher.api.McApi -import io.gitlab.jfronny.inceptum.launcher.model.fabric.FabricVersionLoaderInfo import io.gitlab.jfronny.inceptum.launcher.model.inceptum.InstanceMeta -import io.gitlab.jfronny.inceptum.launcher.model.mojang.VersionsListInfo 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.instance.InstanceNameTool import io.gitlab.jfronny.inceptum.launcher.util.GameVersionParser -import org.gnome.gio.* +import org.gnome.gio.File import org.gnome.gobject.BindingFlags import org.gnome.gtk.* import java.io.IOException import java.nio.file.Files import java.nio.file.Path import java.util.* -import java.util.stream.Stream class GeneralTab(instance: Instance, window: InstanceSettingsWindow) : SettingsTab(window) { companion object { diff --git a/launcher-gtk/src/main/kotlin/module-info.java b/launcher-gtk/src/main/kotlin/module-info.java new file mode 100644 index 0000000..b54d69d --- /dev/null +++ b/launcher-gtk/src/main/kotlin/module-info.java @@ -0,0 +1,12 @@ +module io.gitlab.jfronny.inceptum.launcher.gtk { + requires transitive io.gitlab.jfronny.inceptum.launcher; + requires static org.jetbrains.annotations; + requires kotlin.stdlib; + requires org.gnome.glib; + requires org.gnome.gtk; + requires org.gnome.adwaita; + + // Should theoretically already be included with inceptum.lacuncher + requires io.gitlab.jfronny.commons; + requires java.desktop; +} \ No newline at end of file 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 4b63785..cc6f4ee 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 @@ -5,7 +5,6 @@ import imgui.type.ImBoolean; 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.MetaHolder; import io.gitlab.jfronny.inceptum.common.Utils; import io.gitlab.jfronny.inceptum.imgui.GuiMain; 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 4631e54..43b03b3 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 @@ -1,15 +1,10 @@ package io.gitlab.jfronny.inceptum.launcher.api; -import io.gitlab.jfronny.inceptum.launcher.model.curseforge.response.GC_FingerprintMatchesResponse; -import io.gitlab.jfronny.inceptum.launcher.model.curseforge.response.GC_GetModFileResponse; -import io.gitlab.jfronny.inceptum.launcher.model.curseforge.response.GC_GetModResponse; -import io.gitlab.jfronny.inceptum.launcher.model.curseforge.response.GC_SearchResponse; 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.FingerprintMatchesResponse; -import io.gitlab.jfronny.inceptum.launcher.model.curseforge.response.SearchResponse; +import io.gitlab.jfronny.inceptum.launcher.model.curseforge.response.*; 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 3bd1144..959249a 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 @@ -1,6 +1,5 @@ package io.gitlab.jfronny.inceptum.launcher.api; -import io.gitlab.jfronny.inceptum.launcher.model.fabric.GC_FabricVersionLoaderInfo; import io.gitlab.jfronny.commons.cache.MemoryOperationResultCache; import io.gitlab.jfronny.gson.compile.util.GList; import io.gitlab.jfronny.gson.stream.JsonReader; @@ -9,6 +8,7 @@ import io.gitlab.jfronny.inceptum.common.Utils; import io.gitlab.jfronny.inceptum.common.model.maven.ArtifactMeta; 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.fabric.GC_FabricVersionLoaderInfo; 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 5a3acd7..fda511d 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 @@ -1,10 +1,5 @@ package io.gitlab.jfronny.inceptum.launcher.api; -import io.gitlab.jfronny.inceptum.launcher.model.mojang.GC_AssetIndex; -import io.gitlab.jfronny.inceptum.launcher.model.mojang.GC_JvmFileInfo; -import io.gitlab.jfronny.inceptum.launcher.model.mojang.GC_JvmInfo; -import io.gitlab.jfronny.inceptum.launcher.model.mojang.GC_VersionInfo; -import io.gitlab.jfronny.inceptum.launcher.model.mojang.GC_VersionsList; import io.gitlab.jfronny.commons.OSUtils; import io.gitlab.jfronny.inceptum.common.MetaHolder; import io.gitlab.jfronny.inceptum.common.Net; diff --git a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/api/ModrinthApi.java b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/api/ModrinthApi.java index 49f0f83..1814bb4 100644 --- a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/api/ModrinthApi.java +++ b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/api/ModrinthApi.java @@ -1,8 +1,5 @@ package io.gitlab.jfronny.inceptum.launcher.api; -import io.gitlab.jfronny.inceptum.launcher.model.modrinth.GC_ModrinthProject; -import io.gitlab.jfronny.inceptum.launcher.model.modrinth.GC_ModrinthSearchResult; -import io.gitlab.jfronny.inceptum.launcher.model.modrinth.GC_ModrinthVersion; import io.gitlab.jfronny.gson.compile.util.GList; import io.gitlab.jfronny.gson.stream.JsonReader; import io.gitlab.jfronny.inceptum.common.Net; diff --git a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/api/account/AccountManager.java b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/api/account/AccountManager.java index 237fb62..ff2c6d0 100644 --- a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/api/account/AccountManager.java +++ b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/api/account/AccountManager.java @@ -1,6 +1,5 @@ package io.gitlab.jfronny.inceptum.launcher.api.account; -import io.gitlab.jfronny.inceptum.launcher.api.account.GC_MicrosoftAccount; import io.gitlab.jfronny.gson.compile.util.GList; import io.gitlab.jfronny.gson.stream.JsonReader; import io.gitlab.jfronny.gson.stream.JsonWriter; 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 42b51e6..3b2ba41 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 @@ -1,16 +1,7 @@ package io.gitlab.jfronny.inceptum.launcher.api.account; -import io.gitlab.jfronny.inceptum.launcher.model.microsoft.GC_Entitlements; -import io.gitlab.jfronny.inceptum.launcher.model.microsoft.GC_Profile; -import io.gitlab.jfronny.inceptum.launcher.model.microsoft.request.GC_LoginRequest; -import io.gitlab.jfronny.inceptum.launcher.model.microsoft.request.GC_XblTokenRequest; -import io.gitlab.jfronny.inceptum.launcher.model.microsoft.request.GC_XstsTokenRequest; -import io.gitlab.jfronny.inceptum.launcher.model.microsoft.response.GC_LoginResponse; -import io.gitlab.jfronny.inceptum.launcher.model.microsoft.response.GC_OauthTokenResponse; -import io.gitlab.jfronny.inceptum.launcher.model.microsoft.response.GC_XboxLiveAuthResponse; import io.gitlab.jfronny.commons.HttpUtils; -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.*; 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/gson/MicrosoftAccountAdapter.java b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/gson/MicrosoftAccountAdapter.java index 8a636d8..c81ecc0 100644 --- a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/gson/MicrosoftAccountAdapter.java +++ b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/gson/MicrosoftAccountAdapter.java @@ -1,6 +1,5 @@ package io.gitlab.jfronny.inceptum.launcher.gson; -import io.gitlab.jfronny.inceptum.launcher.gson.GC_MicrosoftAccountMeta; import io.gitlab.jfronny.gson.stream.JsonReader; import io.gitlab.jfronny.gson.stream.JsonWriter; import io.gitlab.jfronny.inceptum.launcher.api.account.MicrosoftAccount; 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 82af1ab..3b5b115 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 @@ -1,11 +1,9 @@ package io.gitlab.jfronny.inceptum.launcher.gson; -import io.gitlab.jfronny.inceptum.launcher.model.mojang.GC_Rules; 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.MinecraftArgument; -import io.gitlab.jfronny.inceptum.launcher.model.mojang.Rules; +import io.gitlab.jfronny.inceptum.launcher.model.mojang.*; import java.io.IOException; import java.util.List; diff --git a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/gson/ModMetaSourcesAdapter.java b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/gson/ModMetaSourcesAdapter.java index 169533b..79f2914 100644 --- a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/gson/ModMetaSourcesAdapter.java +++ b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/gson/ModMetaSourcesAdapter.java @@ -1,9 +1,9 @@ package io.gitlab.jfronny.inceptum.launcher.gson; -import io.gitlab.jfronny.inceptum.launcher.system.source.GC_ModSource; import io.gitlab.jfronny.gson.stream.JsonReader; import io.gitlab.jfronny.gson.stream.JsonWriter; import io.gitlab.jfronny.inceptum.launcher.model.inceptum.ModMeta.Sources; +import io.gitlab.jfronny.inceptum.launcher.system.source.GC_ModSource; import io.gitlab.jfronny.inceptum.launcher.system.source.ModSource; import java.io.IOException; diff --git a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/exporter/CurseForgeExporter.java b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/exporter/CurseForgeExporter.java index 8dddccb..b14a306 100644 --- a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/exporter/CurseForgeExporter.java +++ b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/exporter/CurseForgeExporter.java @@ -1,8 +1,8 @@ package io.gitlab.jfronny.inceptum.launcher.system.exporter; -import io.gitlab.jfronny.inceptum.launcher.model.curseforge.GC_CurseforgeModpackManifest; import io.gitlab.jfronny.inceptum.common.InceptumConfig; import io.gitlab.jfronny.inceptum.launcher.model.curseforge.CurseforgeModpackManifest; +import io.gitlab.jfronny.inceptum.launcher.model.curseforge.GC_CurseforgeModpackManifest; 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.source.CurseforgeModSource; 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 6905b9b..dae4023 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 @@ -1,8 +1,8 @@ package io.gitlab.jfronny.inceptum.launcher.system.importer; +import io.gitlab.jfronny.inceptum.launcher.model.curseforge.CurseforgeModpackManifest; import io.gitlab.jfronny.inceptum.launcher.model.curseforge.GC_CurseforgeModpackManifest; import io.gitlab.jfronny.inceptum.launcher.model.inceptum.GC_ModMeta; -import io.gitlab.jfronny.inceptum.launcher.model.curseforge.CurseforgeModpackManifest; import io.gitlab.jfronny.inceptum.launcher.model.inceptum.ModMeta; import io.gitlab.jfronny.inceptum.launcher.system.instance.ModPath; import io.gitlab.jfronny.inceptum.launcher.system.source.CurseforgeModSource; diff --git a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/importer/Importer.java b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/importer/Importer.java index 448ca4f..e6add0b 100644 --- a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/importer/Importer.java +++ b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/importer/Importer.java @@ -1,12 +1,12 @@ package io.gitlab.jfronny.inceptum.launcher.system.importer; -import io.gitlab.jfronny.inceptum.launcher.model.inceptum.GC_InstanceMeta; import io.gitlab.jfronny.commons.io.JFiles; import io.gitlab.jfronny.commons.throwable.ThrowingFunction; import io.gitlab.jfronny.inceptum.common.MetaHolder; import io.gitlab.jfronny.inceptum.common.Utils; import io.gitlab.jfronny.inceptum.launcher.api.FabricMetaApi; import io.gitlab.jfronny.inceptum.launcher.api.McApi; +import io.gitlab.jfronny.inceptum.launcher.model.inceptum.GC_InstanceMeta; import io.gitlab.jfronny.inceptum.launcher.model.inceptum.InstanceMeta; import io.gitlab.jfronny.inceptum.launcher.system.instance.*; import io.gitlab.jfronny.inceptum.launcher.system.setup.Steps; 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 7c41de9..d7f68b2 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 @@ -1,7 +1,7 @@ package io.gitlab.jfronny.inceptum.launcher.system.importer; -import io.gitlab.jfronny.inceptum.launcher.model.modrinth.GC_ModrinthModpackManifest; import io.gitlab.jfronny.inceptum.common.Net; +import io.gitlab.jfronny.inceptum.launcher.model.modrinth.GC_ModrinthModpackManifest; import io.gitlab.jfronny.inceptum.launcher.model.modrinth.ModrinthModpackManifest; import io.gitlab.jfronny.inceptum.launcher.util.ProcessState; diff --git a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/instance/Instance.java b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/instance/Instance.java index 7916d28..9c138c0 100644 --- a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/instance/Instance.java +++ b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/instance/Instance.java @@ -1,8 +1,8 @@ package io.gitlab.jfronny.inceptum.launcher.system.instance; -import io.gitlab.jfronny.inceptum.launcher.model.inceptum.GC_InstanceMeta; import io.gitlab.jfronny.commons.ref.R; import io.gitlab.jfronny.inceptum.common.Utils; +import io.gitlab.jfronny.inceptum.launcher.model.inceptum.GC_InstanceMeta; import io.gitlab.jfronny.inceptum.launcher.model.inceptum.InstanceMeta; import io.gitlab.jfronny.inceptum.launcher.system.mds.ModsDirScanner; import io.gitlab.jfronny.inceptum.launcher.util.GameVersionParser; diff --git a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/instance/InstanceList.java b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/instance/InstanceList.java index ad75beb..e0b069d 100644 --- a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/instance/InstanceList.java +++ b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/instance/InstanceList.java @@ -1,11 +1,11 @@ package io.gitlab.jfronny.inceptum.launcher.system.instance; -import io.gitlab.jfronny.inceptum.launcher.model.inceptum.GC_InstanceMeta; import io.gitlab.jfronny.commons.io.JFiles; import io.gitlab.jfronny.commons.throwable.ThrowingConsumer; import io.gitlab.jfronny.commons.throwable.ThrowingRunnable; import io.gitlab.jfronny.inceptum.common.MetaHolder; import io.gitlab.jfronny.inceptum.common.Utils; +import io.gitlab.jfronny.inceptum.launcher.model.inceptum.GC_InstanceMeta; import io.gitlab.jfronny.inceptum.launcher.model.inceptum.InstanceMeta; import io.gitlab.jfronny.inceptum.launcher.util.FileBackedRef; 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 b91b622..c266e28 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 @@ -1,10 +1,10 @@ package io.gitlab.jfronny.inceptum.launcher.system.mds; -import io.gitlab.jfronny.inceptum.launcher.model.fabric.GC_FabricModJson; -import io.gitlab.jfronny.inceptum.launcher.model.inceptum.GC_ModMeta; 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.fabric.GC_FabricModJson; +import io.gitlab.jfronny.inceptum.launcher.model.inceptum.GC_ModMeta; import io.gitlab.jfronny.inceptum.launcher.model.inceptum.ModMeta; import io.gitlab.jfronny.inceptum.launcher.system.instance.Mod; import io.gitlab.jfronny.inceptum.launcher.system.instance.ModPath; diff --git a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/mds/MdsMod.java b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/mds/MdsMod.java index 68f8a00..028d1d5 100644 --- a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/mds/MdsMod.java +++ b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/mds/MdsMod.java @@ -1,7 +1,7 @@ package io.gitlab.jfronny.inceptum.launcher.system.mds; -import io.gitlab.jfronny.inceptum.launcher.model.inceptum.GC_ModMeta; import io.gitlab.jfronny.inceptum.launcher.model.fabric.FabricModJson; +import io.gitlab.jfronny.inceptum.launcher.model.inceptum.GC_ModMeta; import io.gitlab.jfronny.inceptum.launcher.model.inceptum.ModMeta; import io.gitlab.jfronny.inceptum.launcher.system.instance.*; import io.gitlab.jfronny.inceptum.launcher.system.source.ModSource; diff --git a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/setup/steps/RunMdsStep.java b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/setup/steps/RunMdsStep.java index 6a6b85e..2367db8 100644 --- a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/setup/steps/RunMdsStep.java +++ b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/setup/steps/RunMdsStep.java @@ -1,7 +1,7 @@ package io.gitlab.jfronny.inceptum.launcher.system.setup.steps; -import io.gitlab.jfronny.inceptum.launcher.model.inceptum.GC_InstanceMeta; import io.gitlab.jfronny.inceptum.common.MetaHolder; +import io.gitlab.jfronny.inceptum.launcher.model.inceptum.GC_InstanceMeta; import io.gitlab.jfronny.inceptum.launcher.system.instance.Instance; import io.gitlab.jfronny.inceptum.launcher.system.mds.ModsDirScanner; import io.gitlab.jfronny.inceptum.launcher.system.setup.SetupStepInfo; diff --git a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/setup/steps/WriteMetadataStep.java b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/setup/steps/WriteMetadataStep.java index aa47b16..0a6b19d 100644 --- a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/setup/steps/WriteMetadataStep.java +++ b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/setup/steps/WriteMetadataStep.java @@ -1,7 +1,7 @@ package io.gitlab.jfronny.inceptum.launcher.system.setup.steps; -import io.gitlab.jfronny.inceptum.launcher.model.inceptum.GC_InstanceMeta; import io.gitlab.jfronny.inceptum.common.MetaHolder; +import io.gitlab.jfronny.inceptum.launcher.model.inceptum.GC_InstanceMeta; import io.gitlab.jfronny.inceptum.launcher.model.inceptum.InstanceMeta; import io.gitlab.jfronny.inceptum.launcher.system.instance.Instance; import io.gitlab.jfronny.inceptum.launcher.system.setup.SetupStepInfo; 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 9526722..679a5c1 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 @@ -1,10 +1,8 @@ package io.gitlab.jfronny.inceptum.wrapper; -import io.gitlab.jfronny.inceptum.common.model.inceptum.GC_WrapperConfig; import io.gitlab.jfronny.commons.ref.R; import io.gitlab.jfronny.inceptum.common.*; -import io.gitlab.jfronny.inceptum.common.model.inceptum.UpdateChannel; -import io.gitlab.jfronny.inceptum.common.model.inceptum.UpdateMetadata; +import io.gitlab.jfronny.inceptum.common.model.inceptum.*; import java.io.*; import java.net.URISyntaxException;