From fb56c9e922f923c1ae9b5af4a2b4faba1db18db5 Mon Sep 17 00:00:00 2001 From: JFronny Date: Thu, 24 Nov 2022 21:11:07 +0100 Subject: [PATCH] Fix (don't use extension methods for now) --- build.gradle.kts | 2 +- buildSrc/build.gradle.kts | 2 + .../main/kotlin/inceptum.manifold.gradle.kts | 18 ++------ .../lang/Iterable/StructuralIterable.java | 9 ---- .../java/extensions/java/util/Map/MapExt.java | 19 -------- .../util/stream/BaseStream/BaseStreamExt.java | 7 --- .../java/util/stream/Stream/StreamExt.java | 44 ------------------- .../extensions/org/w3c/dom/Node/NodeExt.java | 14 ------ .../org/w3c/dom/NodeList/NodeListExt.java | 33 -------------- .../io/gitlab/jfronny/inceptum/common/R.java | 18 -------- .../jfronny/inceptum/common/Updater.java | 10 +++-- .../jfronny/inceptum/common/api/MavenApi.java | 4 +- .../jfronny/inceptum/gtk/GtkMenubar.java | 2 +- .../jfronny/inceptum/gtk/TestStart.java | 2 +- .../imgui/window/NewInstanceWindow.java | 2 +- .../inceptum/imgui/window/edit/ExportTab.java | 2 +- .../imgui/window/edit/GeneralTab.java | 1 + .../inceptum/launcher/api/CurseforgeApi.java | 4 ++ .../inceptum/launcher/api/FabricMetaApi.java | 3 +- .../jfronny/inceptum/launcher/api/McApi.java | 5 +++ .../inceptum/launcher/api/ModrinthApi.java | 3 ++ .../launcher/api/account/AccountManager.java | 2 + .../api/account/MicrosoftAccount.java | 4 +- .../api/account/MicrosoftAuthAPI.java | 8 ++++ .../gson/MicrosoftAccountAdapter.java | 19 ++++++++ .../launcher/gson/MicrosoftAccountMeta.java | 12 ----- .../gson/MinecraftArgumentAdapter.java | 1 + .../launcher/gson/ModMetaSourcesAdapter.java | 4 +- .../launcher/model/inceptum/ModMeta.java | 6 +-- .../system/exporter/CurseForgeExporter.java | 6 +-- .../system/exporter/ModrinthExporter.java | 6 +-- .../system/exporter/MultiMCExporter.java | 4 +- .../system/importer/CurseForgeImporter.java | 6 +-- .../launcher/system/importer/Importer.java | 4 +- .../system/importer/ModrinthImporter.java | 2 +- .../system/importer/MultiMCImporter.java | 2 +- .../launcher/system/instance/Instance.java | 6 +-- .../system/instance/InstanceList.java | 2 +- .../launcher/system/instance/ModManager.java | 4 +- .../system/launch/InstanceLauncher.java | 1 + .../launcher/system/mds/FileScanTask.java | 11 +++-- .../inceptum/launcher/system/mds/MdsMod.java | 4 +- .../system/mds/ModsDirScannerImpl.java | 2 +- .../system/setup/steps/RunMdsStep.java | 2 +- .../system/setup/steps/WriteMetadataStep.java | 4 +- settings.gradle.kts | 11 ----- .../jfronny/inceptum/wrapper/Wrapper.java | 2 + 47 files changed, 105 insertions(+), 234 deletions(-) delete mode 100644 common/src/main/java/extensions/java/lang/Iterable/StructuralIterable.java delete mode 100644 common/src/main/java/extensions/java/util/Map/MapExt.java delete mode 100644 common/src/main/java/extensions/java/util/stream/BaseStream/BaseStreamExt.java delete mode 100644 common/src/main/java/extensions/java/util/stream/Stream/StreamExt.java delete mode 100644 common/src/main/java/extensions/org/w3c/dom/Node/NodeExt.java delete mode 100644 common/src/main/java/extensions/org/w3c/dom/NodeList/NodeListExt.java delete mode 100644 common/src/main/java/io/gitlab/jfronny/inceptum/common/R.java create mode 100644 launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/gson/MicrosoftAccountAdapter.java diff --git a/build.gradle.kts b/build.gradle.kts index 2ea5536..ee33813 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,7 +13,7 @@ val lwjglVersion by extra("3.3.1") val imguiVersion by extra("1.86.4") val jfCommonsVersion by extra("1.0-SNAPSHOT") val gsonCompileVersion by extra("1.1-SNAPSHOT") -val manifoldVersion by extra("2022.1.25") +val manifoldVersion by extra("2022.1.27") val jlhttpVersion by extra("2.6") val flavorProp: String by extra(prop("flavor", "custom")) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 1ef7bce..04e578b 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -4,9 +4,11 @@ plugins { repositories { gradlePluginPortal() + maven("https://maven.frohnmeyer-wds.de/artifacts") } dependencies { implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2") implementation("de.undercouch:gradle-download-task:5.1.2") + implementation("io.gitlab.jfronny:convention:1.2-SNAPSHOT") } \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/inceptum.manifold.gradle.kts b/buildSrc/src/main/kotlin/inceptum.manifold.gradle.kts index b651185..846e3b4 100644 --- a/buildSrc/src/main/kotlin/inceptum.manifold.gradle.kts +++ b/buildSrc/src/main/kotlin/inceptum.manifold.gradle.kts @@ -1,22 +1,10 @@ plugins { id("inceptum.java-conventions") + id("jf.manifold") } dependencies { - val manifoldVersion: String by rootProject.extra + val jfCommonsVersion: String by rootProject.extra - implementation("systems.manifold:manifold-props-rt:$manifoldVersion") - - testAnnotationProcessor(annotationProcessor("systems.manifold:manifold-ext:$manifoldVersion")!!) - testAnnotationProcessor(annotationProcessor("systems.manifold:manifold-props:$manifoldVersion")!!) + implementation("io.gitlab.jfronny:commons-manifold:$jfCommonsVersion") } - -if (sourceSets.main.get().allJava.files.any {it.name == "module-info.java"}) { - tasks.withType { - options.compilerArgs.addAll(arrayOf("-Xplugin:Manifold no-bootstrap", "--module-path", classpath.asPath)) - } -} else { - tasks.withType { - options.compilerArgs.addAll(arrayOf("-Xplugin:Manifold no-bootstrap")) - } -} \ No newline at end of file diff --git a/common/src/main/java/extensions/java/lang/Iterable/StructuralIterable.java b/common/src/main/java/extensions/java/lang/Iterable/StructuralIterable.java deleted file mode 100644 index 5e3d1ef..0000000 --- a/common/src/main/java/extensions/java/lang/Iterable/StructuralIterable.java +++ /dev/null @@ -1,9 +0,0 @@ -package extensions.java.lang.Iterable; - -import manifold.ext.rt.api.Extension; -import manifold.ext.rt.api.Structural; - -@Extension -@Structural -public class StructuralIterable { -} diff --git a/common/src/main/java/extensions/java/util/Map/MapExt.java b/common/src/main/java/extensions/java/util/Map/MapExt.java deleted file mode 100644 index b869483..0000000 --- a/common/src/main/java/extensions/java/util/Map/MapExt.java +++ /dev/null @@ -1,19 +0,0 @@ -package extensions.java.util.Map; - -import manifold.ext.rt.api.Extension; -import manifold.ext.rt.api.This; - -import java.util.Iterator; -import java.util.Map; -import java.util.Set; - -@Extension -public abstract class MapExt implements Iterable> { - public static Iterator> iterator(@This Map thiz) { - return thiz.entrySet().iterator(); - } - - public static V set(@This Map thiz, K key, V value) { - return thiz.put(key, value); - } -} diff --git a/common/src/main/java/extensions/java/util/stream/BaseStream/BaseStreamExt.java b/common/src/main/java/extensions/java/util/stream/BaseStream/BaseStreamExt.java deleted file mode 100644 index cd2739d..0000000 --- a/common/src/main/java/extensions/java/util/stream/BaseStream/BaseStreamExt.java +++ /dev/null @@ -1,7 +0,0 @@ -package extensions.java.util.stream.BaseStream; - -import manifold.ext.rt.api.Extension; - -@Extension -public abstract class BaseStreamExt implements Iterable { -} diff --git a/common/src/main/java/extensions/java/util/stream/Stream/StreamExt.java b/common/src/main/java/extensions/java/util/stream/Stream/StreamExt.java deleted file mode 100644 index 5d928e6..0000000 --- a/common/src/main/java/extensions/java/util/stream/Stream/StreamExt.java +++ /dev/null @@ -1,44 +0,0 @@ -package extensions.java.util.stream.Stream; - -import manifold.ext.rt.api.Extension; -import manifold.ext.rt.api.This; - -import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -@Extension -public abstract class StreamExt { - public static Set toSet(@This Stream thiz) { - return thiz.collect(LinkedHashSet::new, Set::add, Set::addAll); - } - - public static Map toMap(@This Stream thiz, Function keyMapper, Function valueMapper) { - return thiz.collect(Collectors.toMap(keyMapper, valueMapper)); - } - - public static Map toMap(@This Stream thiz, Function keyMapper) { - return thiz.toMap(keyMapper, Function.identity()); - } - - public static Map> groupingBy(@This Stream thiz, Function valueMapper) { - return thiz.collect(Collectors.groupingBy(valueMapper)); - } - - public static String join(@This Stream thiz) { - return thiz.collect(Collectors.joining()); - } - - public static String join(@This Stream thiz, String delimiter) { - return thiz.collect(Collectors.joining(delimiter)); - } - - public static String join(@This Stream thiz, char delimiter) { - return thiz.join("" + delimiter); - } - - public static Stream concat(@This Stream thiz, Stream other) { - return Stream.concat(thiz, other); - } -} diff --git a/common/src/main/java/extensions/org/w3c/dom/Node/NodeExt.java b/common/src/main/java/extensions/org/w3c/dom/Node/NodeExt.java deleted file mode 100644 index 45ad5fc..0000000 --- a/common/src/main/java/extensions/org/w3c/dom/Node/NodeExt.java +++ /dev/null @@ -1,14 +0,0 @@ -package extensions.org.w3c.dom.Node; - -import manifold.ext.rt.api.Extension; -import manifold.ext.rt.api.This; -import org.w3c.dom.Node; - -@Extension -public class NodeExt { - public static boolean isWhitespace(@This Node thiz) { - if (thiz.nodeType == Node.TEXT_NODE && thiz.textContent.isBlank()) return true; - if (thiz.nodeType == Node.COMMENT_NODE) return true; - return false; - } -} diff --git a/common/src/main/java/extensions/org/w3c/dom/NodeList/NodeListExt.java b/common/src/main/java/extensions/org/w3c/dom/NodeList/NodeListExt.java deleted file mode 100644 index 0490bb0..0000000 --- a/common/src/main/java/extensions/org/w3c/dom/NodeList/NodeListExt.java +++ /dev/null @@ -1,33 +0,0 @@ -package extensions.org.w3c.dom.NodeList; - -import manifold.ext.rt.api.*; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - -import java.util.*; - -@Extension -public abstract class NodeListExt implements Iterable { - public static Iterator iterator(@This NodeList thiz) { - return new Iterator<>() { - private int index = 0; - @Override - public boolean hasNext() { - while (index < thiz.length && thiz[index].isWhitespace()) { - index++; - } - return index < thiz.length; - } - - @Override - public Node next() { - if (!hasNext()) throw new NoSuchElementException(); - return thiz[index++]; - } - }; - } - - public static Node get(@This NodeList thiz, int index) { - return thiz.item(index); - } -} diff --git a/common/src/main/java/io/gitlab/jfronny/inceptum/common/R.java b/common/src/main/java/io/gitlab/jfronny/inceptum/common/R.java deleted file mode 100644 index 4914b42..0000000 --- a/common/src/main/java/io/gitlab/jfronny/inceptum/common/R.java +++ /dev/null @@ -1,18 +0,0 @@ -package io.gitlab.jfronny.inceptum.common; - -/** - * Class containing methods for nop lambdas. Use these instead of () -> {} - */ -public class R { - public static void nop() { - // No-Op - } - - public static void nop(Object a1) { - // No-Op - } - - public static void nop(Object a1, Object a2) { - // No-Op - } -} 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 ec531c6..2c82e76 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,5 +1,7 @@ package io.gitlab.jfronny.inceptum.common; +import gsoncompile.extensions.io.gitlab.jfronny.inceptum.common.model.inceptum.UpdateMetadata.GC_UpdateMetadata; +import gsoncompile.extensions.io.gitlab.jfronny.inceptum.common.model.inceptum.WrapperConfig.GC_WrapperConfig; import io.gitlab.jfronny.commons.OSUtils; import io.gitlab.jfronny.inceptum.common.api.MavenApi; import io.gitlab.jfronny.inceptum.common.model.inceptum.*; @@ -52,7 +54,7 @@ public class Updater { config.natives[Utils.currentFlavor] = natives; } - GC_WrapperConfig.write(MetaHolder.WRAPPER_CONFIG_PATH, config); + GC_WrapperConfig.write(config, MetaHolder.WRAPPER_CONFIG_PATH); if (relaunch) { Runtime.runtime.addShutdownHook(new Thread(() -> { @@ -93,7 +95,7 @@ public class Updater { } } - if (configChanged) GC_WrapperConfig.write(MetaHolder.WRAPPER_CONFIG_PATH, wrapperConfig); + if (configChanged) GC_WrapperConfig.write(wrapperConfig, MetaHolder.WRAPPER_CONFIG_PATH); return buildClasspath(libs.stream().concat(natives.stream())).toList(); } @@ -140,10 +142,10 @@ public class Updater { public static @Nullable UpdateMetadata check(UpdateChannel channel, boolean versionCompare, boolean checkEnv, Consumer channelInvalid) throws UpdateCheckException { try { - UpdateMetadata experimental = Net.downloadObject(ARTIFACTS_URL + "version.json", GC_UpdateMetadata::read); + UpdateMetadata experimental = Net.downloadObject(ARTIFACTS_URL + "version.json", json -> GC_UpdateMetadata.read(json)); UpdateMetadata stable = null; try { - stable = Net.downloadObject(STABLE_URL + "version.json", GC_UpdateMetadata::read); + stable = Net.downloadObject(STABLE_URL + "version.json", json -> GC_UpdateMetadata.read(json)); } catch (Throwable ignored) {} if (stable == null && channel == UpdateChannel.Stable) { channel = UpdateChannel.CI; 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 15ba1c7..ac0ff58 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 @@ -56,12 +56,12 @@ public class MavenApi { switch (child.nodeName) { case "groupId" -> { if (groupId == null) { - groupId = node.textContent; + groupId = child.textContent; } } case "version" -> { if (version == null) { - version = node.textContent; + version = child.textContent; } } } 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 6c26e5a..8843e09 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,7 +1,7 @@ package io.gitlab.jfronny.inceptum.gtk; import ch.bailu.gtk.gtk.Application; -import io.gitlab.jfronny.inceptum.common.R; +import io.gitlab.jfronny.commons.ref.R; import io.gitlab.jfronny.inceptum.common.Utils; import io.gitlab.jfronny.inceptum.gtk.menu.MenuBuilder; import io.gitlab.jfronny.inceptum.gtk.util.I18n; diff --git a/launcher-gtk/src/main/java/io/gitlab/jfronny/inceptum/gtk/TestStart.java b/launcher-gtk/src/main/java/io/gitlab/jfronny/inceptum/gtk/TestStart.java index f715fc9..144aa7b 100644 --- a/launcher-gtk/src/main/java/io/gitlab/jfronny/inceptum/gtk/TestStart.java +++ b/launcher-gtk/src/main/java/io/gitlab/jfronny/inceptum/gtk/TestStart.java @@ -5,7 +5,7 @@ import ch.bailu.gtk.gio.ApplicationFlags; import ch.bailu.gtk.gtk.*; import ch.bailu.gtk.type.Str; import ch.bailu.gtk.type.Strs; -import io.gitlab.jfronny.inceptum.common.R; +import io.gitlab.jfronny.commons.ref.R; public class TestStart { public static void main(String[] args) { diff --git a/launcher-imgui/src/main/java/io/gitlab/jfronny/inceptum/imgui/window/NewInstanceWindow.java b/launcher-imgui/src/main/java/io/gitlab/jfronny/inceptum/imgui/window/NewInstanceWindow.java index 29c2395..c85917a 100644 --- a/launcher-imgui/src/main/java/io/gitlab/jfronny/inceptum/imgui/window/NewInstanceWindow.java +++ b/launcher-imgui/src/main/java/io/gitlab/jfronny/inceptum/imgui/window/NewInstanceWindow.java @@ -1,7 +1,7 @@ package io.gitlab.jfronny.inceptum.imgui.window; import imgui.ImGui; -import io.gitlab.jfronny.inceptum.common.R; +import io.gitlab.jfronny.commons.ref.R; import io.gitlab.jfronny.inceptum.common.Utils; import io.gitlab.jfronny.inceptum.imgui.GuiMain; import io.gitlab.jfronny.inceptum.imgui.control.InstanceManageControls; 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 5f14f22..f9545a2 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 @@ -1,7 +1,7 @@ package io.gitlab.jfronny.inceptum.imgui.window.edit; import imgui.ImGui; -import io.gitlab.jfronny.inceptum.common.R; +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.dialog.ProcessStateWatcherWindow; 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 1280a4d..bcac330 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,6 +5,7 @@ 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.*; import io.gitlab.jfronny.inceptum.imgui.GuiMain; import io.gitlab.jfronny.inceptum.imgui.control.InstanceManageControls; 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 5f86ad1..eed30a1 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,5 +1,9 @@ package io.gitlab.jfronny.inceptum.launcher.api; +import gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.curseforge.response.FingerprintMatchesResponse.GC_FingerprintMatchesResponse; +import gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.curseforge.response.GetModFileResponse.GC_GetModFileResponse; +import gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.curseforge.response.GetModResponse.GC_GetModResponse; +import gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.curseforge.response.SearchResponse.GC_SearchResponse; import io.gitlab.jfronny.commons.HttpUtils; import io.gitlab.jfronny.inceptum.common.Net; import io.gitlab.jfronny.inceptum.launcher.model.curseforge.CurseforgeFile; 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 781ae35..e91d461 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,5 +1,6 @@ package io.gitlab.jfronny.inceptum.launcher.api; +import gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.fabric.FabricVersionLoaderInfo.GC_FabricVersionLoaderInfo; import io.gitlab.jfronny.gson.compile.util.GList; import io.gitlab.jfronny.gson.stream.JsonReader; import io.gitlab.jfronny.inceptum.common.Net; @@ -29,7 +30,7 @@ public class FabricMetaApi { } public static FabricVersionLoaderInfo getLoaderVersion(String gameVersion, String fabricVersion) throws IOException { - return Net.downloadObject(META_URL + "v2/versions/loader/" + gameVersion + "/" + fabricVersion, GC_FabricVersionLoaderInfo_WithMeta::read); + return Net.downloadObject(META_URL + "v2/versions/loader/" + gameVersion + "/" + fabricVersion, GC_FabricVersionLoaderInfo.WithMeta::read); } public static VersionInfo addFabric(VersionInfo version, String fabricVersion, FabricVersionInfoType type) throws IOException { 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 1ddf598..00b67aa 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,5 +1,10 @@ package io.gitlab.jfronny.inceptum.launcher.api; +import gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.mojang.AssetIndex.GC_AssetIndex; +import gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.mojang.JvmFileInfo.GC_JvmFileInfo; +import gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.mojang.JvmInfo.GC_JvmInfo; +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.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 0718db2..453cb37 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,5 +1,8 @@ package io.gitlab.jfronny.inceptum.launcher.api; +import gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.modrinth.ModrinthProject.GC_ModrinthProject; +import gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.modrinth.ModrinthSearchResult.GC_ModrinthSearchResult; +import gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.modrinth.ModrinthVersion.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 f167fc4..67eccdd 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,5 +1,7 @@ package io.gitlab.jfronny.inceptum.launcher.api.account; +import gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.api.account.MicrosoftAccount.GC_MicrosoftAccount; +import io.gitlab.jfronny.commons.ref.R; 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/MicrosoftAccount.java b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/api/account/MicrosoftAccount.java index 2fd7647..e897159 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 @@ -1,8 +1,10 @@ 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.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.*; @@ -11,7 +13,7 @@ import java.io.IOException; import java.net.URISyntaxException; import java.util.*; -@GSerializable(with = MicrosoftAccountMeta.class, configure = GsonPreset.Config.class) +@GSerializable(with = MicrosoftAccountAdapter.class, configure = GsonPreset.Config.class) public class MicrosoftAccount { /** * The username/email/id of the account. 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 3b2ba41..64d9204 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,5 +1,13 @@ package io.gitlab.jfronny.inceptum.launcher.api.account; +import gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.microsoft.Entitlements.GC_Entitlements; +import gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.microsoft.Profile.GC_Profile; +import gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.microsoft.request.LoginRequest.GC_LoginRequest; +import gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.microsoft.request.XblTokenRequest.GC_XblTokenRequest; +import gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.microsoft.request.XstsTokenRequest.GC_XstsTokenRequest; +import gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.microsoft.response.LoginResponse.GC_LoginResponse; +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.request.*; 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 new file mode 100644 index 0000000..6b97e3b --- /dev/null +++ b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/gson/MicrosoftAccountAdapter.java @@ -0,0 +1,19 @@ +package io.gitlab.jfronny.inceptum.launcher.gson; + +import gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.gson.MicrosoftAccountMeta.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; + +import java.io.IOException; + +public class MicrosoftAccountAdapter { + public static void write(JsonWriter writer, MicrosoftAccount value) throws IOException { + GC_MicrosoftAccountMeta.write(value == null ? null : value.toMeta(), writer); + } + + public static MicrosoftAccount read(JsonReader reader) throws IOException { + MicrosoftAccountMeta meta = GC_MicrosoftAccountMeta.read(reader); + return meta == null ? null : new MicrosoftAccount(meta); + } +} diff --git a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/gson/MicrosoftAccountMeta.java b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/gson/MicrosoftAccountMeta.java index 8dee105..6c56e3c 100644 --- a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/gson/MicrosoftAccountMeta.java +++ b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/gson/MicrosoftAccountMeta.java @@ -1,24 +1,12 @@ package io.gitlab.jfronny.inceptum.launcher.gson; import io.gitlab.jfronny.gson.compile.annotations.GSerializable; -import io.gitlab.jfronny.gson.stream.JsonReader; -import io.gitlab.jfronny.gson.stream.JsonWriter; import io.gitlab.jfronny.inceptum.common.GsonPreset; -import io.gitlab.jfronny.inceptum.launcher.api.account.MicrosoftAccount; import io.gitlab.jfronny.inceptum.launcher.model.microsoft.response.OauthTokenResponse; import io.gitlab.jfronny.inceptum.launcher.model.microsoft.response.XboxLiveAuthResponse; -import java.io.IOException; import java.util.Date; @GSerializable(configure = GsonPreset.Api.class) public record MicrosoftAccountMeta(String accountId, String minecraftUsername, String uuid, String accessToken, OauthTokenResponse oauthToken, XboxLiveAuthResponse xstsAuth, Date accessTokenExpiresAt, boolean mustLogin) { - public static void write(JsonWriter writer, MicrosoftAccount value) throws IOException { - GC_MicrosoftAccountMeta.write(writer, value == null ? null : value.toMeta()); - } - - public static MicrosoftAccount read(JsonReader reader) throws IOException { - MicrosoftAccountMeta meta = GC_MicrosoftAccountMeta.read(reader); - return meta == null ? null : new MicrosoftAccount(meta); - } } 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 d42560d..a26e567 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,5 +1,6 @@ package io.gitlab.jfronny.inceptum.launcher.gson; +import gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.mojang.Rules.GC_Rules; import io.gitlab.jfronny.gson.JsonParseException; import io.gitlab.jfronny.gson.compile.util.GList; import io.gitlab.jfronny.gson.stream.*; 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 fc809b1..b6da9dd 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 gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.system.source.ModSource.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; @@ -12,7 +12,7 @@ import java.util.Optional; public class ModMetaSourcesAdapter { public static void write(JsonWriter writer, ModMeta$Sources value) throws IOException { writer.beginArray(); - for (ModSource source : value.keySet()) GC_ModSource.write(writer, source); + for (ModSource source : value.keySet()) GC_ModSource.write(source, writer); writer.endArray(); } 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 5905767..ba19cb2 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 @@ -87,8 +87,7 @@ public record ModMeta( try { FingerprintMatchesResponse.Result cf = CurseforgeApi.checkFingerprint(murmur2); if (!cf.exactMatches.isEmpty) { - // TODO use array access once fixed - FingerprintMatchesResponse.Result.Match f = cf.exactMatches.get(0); + FingerprintMatchesResponse.Result.Match f = cf.exactMatches[0]; addSource(new CurseforgeModSource(f.id, f.file.id), gameVersion); changed = true; } @@ -101,8 +100,7 @@ public record ModMeta( public void addSource(ModSource source, String gameVersion) { try { - // TODO use array access once fixed - sources.put(source, source.getUpdate(gameVersion)); + sources[source] = source.getUpdate(gameVersion); } catch (IOException e) { Utils.LOGGER.error("Could not check " + source.name + " for updates", e); } 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 8b6637b..4acc1cf 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 gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.curseforge.CurseforgeModpackManifest.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; @@ -41,7 +41,7 @@ public class CurseForgeExporter extends Exporter { true )); } - GC_CurseforgeModpackManifest.write(root.resolve("manifest.json"), manifest); + GC_CurseforgeModpackManifest.write(manifest, root.resolve("manifest.json")); return manifest; } @@ -60,6 +60,6 @@ public class CurseForgeExporter extends Exporter { Files.createDirectories(modsOverrides); Files.copy(mod.jarPath, modsOverrides.resolve(mod.jarPath.fileName.toString())); } - GC_CurseforgeModpackManifest.write(root.resolve("manifest.json"), manifest); + GC_CurseforgeModpackManifest.write(manifest, root.resolve("manifest.json")); } } 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 3ccf903..72464eb 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 @@ -1,6 +1,6 @@ package io.gitlab.jfronny.inceptum.launcher.system.exporter; -import io.gitlab.jfronny.inceptum.launcher.model.modrinth.GC_ModrinthModpackManifest; +import gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.modrinth.ModrinthModpackManifest.GC_ModrinthModpackManifest; import io.gitlab.jfronny.inceptum.launcher.model.modrinth.ModrinthModpackManifest; import io.gitlab.jfronny.inceptum.launcher.system.instance.Instance; import io.gitlab.jfronny.inceptum.launcher.system.instance.Mod; @@ -34,7 +34,7 @@ public class ModrinthExporter extends Exporter { null ) ); - GC_ModrinthModpackManifest.write(root.resolve("modrinth.index.json"), manifest); + GC_ModrinthModpackManifest.write(manifest, root.resolve("modrinth.index.json")); return manifest; } @@ -53,6 +53,6 @@ public class ModrinthExporter extends Exporter { Files.createDirectories(modsOverrides); Files.copy(mod.jarPath, modsOverrides.resolve(mod.jarPath.fileName.toString())); } - GC_ModrinthModpackManifest.write(root.resolve("modrinth.index.json"), manifest); + GC_ModrinthModpackManifest.write(manifest, root.resolve("modrinth.index.json")); } } diff --git a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/exporter/MultiMCExporter.java b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/exporter/MultiMCExporter.java index ca6220d..86a4e4e 100644 --- a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/exporter/MultiMCExporter.java +++ b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/exporter/MultiMCExporter.java @@ -1,6 +1,6 @@ package io.gitlab.jfronny.inceptum.launcher.system.exporter; -import io.gitlab.jfronny.inceptum.launcher.model.multimc.GC_MMCPackMeta; +import gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.multimc.MMCPackMeta.GC_MMCPackMeta; import io.gitlab.jfronny.inceptum.launcher.model.multimc.MMCPackMeta; import io.gitlab.jfronny.inceptum.launcher.system.instance.Instance; import io.gitlab.jfronny.inceptum.launcher.system.instance.Mod; @@ -54,7 +54,7 @@ public class MultiMCExporter extends Exporter { manifest.components.add(new MMCPackMeta.Component(true, false, "net.fabricmc.intermediary", instance.gameVersion)); manifest.components.add(new MMCPackMeta.Component(false, false, "net.fabricmc.fabric-loader", instance.loaderVersion)); } - GC_MMCPackMeta.write(root.resolve("mmc-pack.json"), manifest); + GC_MMCPackMeta.write(manifest, root.resolve("mmc-pack.json")); return manifest; } } 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 5b80669..8bd57d5 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 gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.curseforge.CurseforgeModpackManifest.GC_CurseforgeModpackManifest; +import gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.inceptum.ModMeta.GC_ModMeta; 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.inceptum.ModMeta; import io.gitlab.jfronny.inceptum.launcher.system.instance.ModPath; import io.gitlab.jfronny.inceptum.launcher.system.source.CurseforgeModSource; @@ -48,7 +48,7 @@ public class CurseForgeImporter extends Importer { ModDownload download = source.download(); ModMeta imod = ModMeta.of(download.sha1, download.murmur2, source, manifest.minecraft.version); Files.createDirectories(modsPath); - GC_ModMeta.write(modsPath.resolve(source.shortName + ModPath.EXT_IMOD), imod); + GC_ModMeta.write(imod, modsPath.resolve(source.shortName + ModPath.EXT_IMOD)); } } } 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 2658b7c..4f0f161 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 gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.inceptum.InstanceMeta.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; @@ -60,7 +60,7 @@ public abstract class Importer { Instance.setSetupLock(iDir, true); InstanceMeta meta = new InstanceMeta(); meta.version = createVersionString(man.gameVersion, man.fabricVersion); - GC_InstanceMeta.write(iDir.resolve("instance.json"), meta); + GC_InstanceMeta.write(meta, iDir.resolve("instance.json")); state.incrementStep("Downloading mods"); downloadMods(manifest, iDir, state); 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 569970e..97faf5c 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 gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.modrinth.ModrinthModpackManifest.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/importer/MultiMCImporter.java b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/importer/MultiMCImporter.java index 406516c..1750a51 100644 --- a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/importer/MultiMCImporter.java +++ b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/importer/MultiMCImporter.java @@ -1,6 +1,6 @@ package io.gitlab.jfronny.inceptum.launcher.system.importer; -import io.gitlab.jfronny.inceptum.launcher.model.multimc.GC_MMCPackMeta; +import gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.multimc.MMCPackMeta.GC_MMCPackMeta; import io.gitlab.jfronny.inceptum.launcher.model.multimc.MMCPackMeta; 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 99940d0..21b2449 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.common.R; +import gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.inceptum.InstanceMeta.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; @@ -132,7 +132,7 @@ public record Instance(String id, Path path, InstanceMeta meta, ModsDirScanner m public void writeMeta() { try { - GC_InstanceMeta.write(path.resolve("instance.json"), meta); + GC_InstanceMeta.write(meta, path.resolve("instance.json")); } catch (IOException e) { Utils.LOGGER.error("Could not write instance config", e); } 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 c7622b7..d51cd11 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,10 +1,10 @@ package io.gitlab.jfronny.inceptum.launcher.system.instance; +import gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.inceptum.InstanceMeta.GC_InstanceMeta; import io.gitlab.jfronny.commons.io.JFiles; import io.gitlab.jfronny.commons.throwable.ThrowingConsumer; 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/instance/ModManager.java b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/instance/ModManager.java index 089d71d..1219fa4 100644 --- a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/instance/ModManager.java +++ b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/instance/ModManager.java @@ -1,6 +1,6 @@ package io.gitlab.jfronny.inceptum.launcher.system.instance; -import io.gitlab.jfronny.inceptum.launcher.model.inceptum.GC_ModMeta; +import gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.inceptum.ModMeta.GC_ModMeta; import io.gitlab.jfronny.inceptum.launcher.model.inceptum.ModMeta; import io.gitlab.jfronny.inceptum.launcher.system.mds.ModsDirScanner; import io.gitlab.jfronny.inceptum.launcher.system.source.ModDownload; @@ -31,7 +31,7 @@ public class ModManager { public record DownloadMeta(ModDownload download, ModMeta meta, ModSource source, Path metaFile) { public void write() throws IOException { - GC_ModMeta.write(metaFile, meta); + GC_ModMeta.write(meta, metaFile); } } } diff --git a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/launch/InstanceLauncher.java b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/launch/InstanceLauncher.java index e56d23f..a60fffd 100644 --- a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/launch/InstanceLauncher.java +++ b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/launch/InstanceLauncher.java @@ -1,6 +1,7 @@ package io.gitlab.jfronny.inceptum.launcher.system.launch; import io.gitlab.jfronny.commons.OSUtils; +import io.gitlab.jfronny.commons.ref.R; import io.gitlab.jfronny.inceptum.common.*; import io.gitlab.jfronny.inceptum.launcher.LauncherEnv; import io.gitlab.jfronny.inceptum.launcher.api.FabricMetaApi; 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 4e095b7..1e6acbd 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 gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.fabric.FabricModJson.GC_FabricModJson; +import gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.inceptum.ModMeta.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; @@ -46,7 +46,7 @@ public record FileScanTask(ProtoInstance instance, Path file, BiConsumer void evaluateSources(Path modFile, MetadataRef ref) throws IOException, TEx { boolean modified = false; if (ref.meta.initialize(gameVersion)) { - GC_ModMeta.write(ref.imodPath, ref.meta); + GC_ModMeta.write(ref.meta, ref.imodPath); modified = true; } ModSource selectedSource = null; @@ -73,8 +73,7 @@ public record FileScanTask(ProtoInstance instance, Path file, BiConsumer defaultMeta) throws IOException { this.imodPath = imodPath; - if (!Files.exists(imodPath) && defaultMeta != null) GC_ModMeta.write(imodPath, defaultMeta.apply(imodPath)); + if (!Files.exists(imodPath) && defaultMeta != null) GC_ModMeta.write(defaultMeta.apply(imodPath), imodPath); if (Files.exists(imodPath)) update(); } 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 781d537..b3241ca 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 gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.inceptum.ModMeta.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; @@ -131,6 +131,6 @@ public class MdsMod extends Mod { } private void write() throws IOException { - GC_ModMeta.write(imodPath, meta); + GC_ModMeta.write(meta, imodPath); } } diff --git a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/mds/ModsDirScannerImpl.java b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/mds/ModsDirScannerImpl.java index 64f8a96..4a4ce33 100644 --- a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/mds/ModsDirScannerImpl.java +++ b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/system/mds/ModsDirScannerImpl.java @@ -1,7 +1,7 @@ package io.gitlab.jfronny.inceptum.launcher.system.mds; import io.gitlab.jfronny.commons.io.JFiles; -import io.gitlab.jfronny.inceptum.common.R; +import io.gitlab.jfronny.commons.ref.R; import io.gitlab.jfronny.inceptum.common.Utils; import io.gitlab.jfronny.inceptum.launcher.model.inceptum.InstanceMeta; import io.gitlab.jfronny.inceptum.launcher.system.instance.Mod; 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 1261b3e..eda793a 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 gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.inceptum.InstanceMeta.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.mds.ModsDirScanner; import io.gitlab.jfronny.inceptum.launcher.system.setup.SetupStepInfo; import io.gitlab.jfronny.inceptum.launcher.system.setup.Step; 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 c3958ff..826cd07 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 gsoncompile.extensions.io.gitlab.jfronny.inceptum.launcher.model.inceptum.InstanceMeta.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; @@ -21,7 +21,7 @@ public class WriteMetadataStep implements Step { if (!Files.exists(metaPath)) { InstanceMeta meta = new InstanceMeta(); meta.version = info.version.id; - GC_InstanceMeta.write(metaPath, meta); + GC_InstanceMeta.write(meta, metaPath); } Instance.setSetupLock(instance, false); if (!Files.exists(instance.resolve(".gitignore"))) { diff --git a/settings.gradle.kts b/settings.gradle.kts index 21b94e5..37f7886 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,14 +1,3 @@ -pluginManagement { - repositories { - maven("https://maven.frohnmeyer-wds.de/artifacts") - gradlePluginPortal() - } - plugins { - id("jf.codegen") version "1.2-SNAPSHOT" - id("jf.autoversion") version "1.2-SNAPSHOT" - } -} - rootProject.name = "Inceptum" include("common") 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 1f9e6d1..ec67eb9 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,5 +1,7 @@ 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.*;