From 806bcf2d6bf8f079c922ca42e6988025bdb941ed Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sun, 21 Jan 2024 13:47:45 -0800 Subject: [PATCH] Config updates (#225) * Make in game config for Angelica work * Backport https://github.com/embeddedt/embeddium/commit/7476bf9b13fcb9a302722b350ef4e6e7d2b8a8c8 to rename angelica-options.json --- .../gtnewhorizons/angelica/AngelicaMod.java | 3 +- .../angelica/config/AngelicaGuiConfig.java | 2 +- .../angelica/config/ConfigMigrator.java | 35 +++++++++++++++++++ .../mods/sodium/client/SodiumClientMod.java | 3 +- src/main/resources/mcmod.info | 11 +++--- 5 files changed, 45 insertions(+), 9 deletions(-) create mode 100644 src/main/java/com/gtnewhorizons/angelica/config/ConfigMigrator.java diff --git a/src/main/java/com/gtnewhorizons/angelica/AngelicaMod.java b/src/main/java/com/gtnewhorizons/angelica/AngelicaMod.java index 7a1d7553b..a83d0b040 100644 --- a/src/main/java/com/gtnewhorizons/angelica/AngelicaMod.java +++ b/src/main/java/com/gtnewhorizons/angelica/AngelicaMod.java @@ -17,7 +17,8 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; dependencies = " before:lwjgl3ify@[1.5.3,);" + " after:hodgepodge@[2.4.4,);" + " after:CodeChickenCore@[1.2.0,);" + " after:archaicfix@[0.7.0,);" + " required-after:gtnhlib@[0.2.1,);", acceptedMinecraftVersions = "[1.7.10]", - acceptableRemoteVersions = "*") + acceptableRemoteVersions = "*", + guiFactory = "com.gtnewhorizons.angelica.config.AngelicaGuiConfigFactory") public class AngelicaMod { @SidedProxy(clientSide = "com.gtnewhorizons.angelica.proxy.ClientProxy", serverSide = "com.gtnewhorizons.angelica.proxy.CommonProxy") public static CommonProxy proxy; diff --git a/src/main/java/com/gtnewhorizons/angelica/config/AngelicaGuiConfig.java b/src/main/java/com/gtnewhorizons/angelica/config/AngelicaGuiConfig.java index 09377919c..9a291aaf3 100644 --- a/src/main/java/com/gtnewhorizons/angelica/config/AngelicaGuiConfig.java +++ b/src/main/java/com/gtnewhorizons/angelica/config/AngelicaGuiConfig.java @@ -4,6 +4,6 @@ import net.minecraft.client.gui.GuiScreen; public class AngelicaGuiConfig extends SimpleGuiConfig { public AngelicaGuiConfig(GuiScreen parent) throws ConfigException { - super(parent, AngelicaConfig.class, "archaicfix", "ArchaicFix"); + super(parent, AngelicaConfig.class, "angelica", "Angelica"); } } diff --git a/src/main/java/com/gtnewhorizons/angelica/config/ConfigMigrator.java b/src/main/java/com/gtnewhorizons/angelica/config/ConfigMigrator.java new file mode 100644 index 000000000..de108ba3a --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/config/ConfigMigrator.java @@ -0,0 +1,35 @@ +package com.gtnewhorizons.angelica.config; + +import net.minecraft.client.Minecraft; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; + +public class ConfigMigrator { + public static Logger LOGGER = LogManager.getLogger("Angelica"); + + /** + * Tries to migrate the equivalent config file from Rubidium to the Angelica name if possible. + */ + public static Path handleConfigMigration(String fileName) { + final Path configDir = Minecraft.getMinecraft().mcDataDir.toPath().resolve("config"); + final Path mainPath = configDir.resolve(fileName); + try { + if(Files.notExists(mainPath)) { + final String legacyName = fileName.replace("angelica", "rubidium"); + final Path legacyPath = configDir.resolve(legacyName); + if(Files.exists(legacyPath)) { + Files.move(legacyPath, mainPath); + LOGGER.warn("Migrated {} config file to {}", legacyName, fileName); + } + } + } catch(IOException | RuntimeException e) { + LOGGER.error("Exception encountered while attempting config migration", e); + } + + return mainPath; + } +} diff --git a/src/main/java/me/jellysquid/mods/sodium/client/SodiumClientMod.java b/src/main/java/me/jellysquid/mods/sodium/client/SodiumClientMod.java index db33397b5..8e77a0c3f 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/SodiumClientMod.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/SodiumClientMod.java @@ -1,6 +1,7 @@ package me.jellysquid.mods.sodium.client; import com.gtnewhorizons.angelica.Tags; +import com.gtnewhorizons.angelica.config.ConfigMigrator; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; @@ -56,7 +57,7 @@ public class SodiumClientMod { } private static SodiumGameOptions loadConfig() { - return SodiumGameOptions.load(Minecraft.getMinecraft().mcDataDir.toPath().resolve("config").resolve("rubidium-options.json")); + return SodiumGameOptions.load(ConfigMigrator.handleConfigMigration("angelica-options.json")); } public static String getVersion() { diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index c779409fe..689bf285b 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -20,7 +20,7 @@ "id_miner", "daxnitro" ], - "credits": "Based on daxnitro's GLSL Shaders Mod. Includes backported code from Oculus and Iris", + "credits": "The Angelica Team.", "logoFile": "", "screenshots": [], "parent": "", @@ -43,8 +43,7 @@ "parent": "", "requiredMods": [], "dependencies": [], - "dependants": [], - "useDependencyInformation": true + "dependants": [] }, { "modid": "embeddium", @@ -54,7 +53,8 @@ "authorList": [ "embeddedt", "NanoLive", - "CaffeineMC" + "CaffeineMC", + "mitchej123" ] }, { @@ -72,8 +72,7 @@ "parent": "", "requiredMods": [], "dependencies": [], - "dependants": [], - "useDependencyInformation": true + "dependants": [] } ] }