diff --git a/changelog.md b/changelog.md index c4f98b79..32ead8ab 100644 --- a/changelog.md +++ b/changelog.md @@ -1 +1,2 @@ +- hotifx for forge 1.20 for previous update - improved dynamic pack resource clearing and added config to disable it \ No newline at end of file diff --git a/common/src/main/java/net/mehvahdjukaar/moonlight/core/CommonConfigs.java b/common/src/main/java/net/mehvahdjukaar/moonlight/core/CommonConfigs.java index c384c6be..6745b5fb 100644 --- a/common/src/main/java/net/mehvahdjukaar/moonlight/core/CommonConfigs.java +++ b/common/src/main/java/net/mehvahdjukaar/moonlight/core/CommonConfigs.java @@ -17,6 +17,7 @@ public class CommonConfigs { builder.push("general"); CLEAR_RESOURCES = builder.comment("Clears dynamic models and textures from the mod dynamic pack once resource reload is done. This can save up some ram.") .define("clear_dynamic_resources", true); + builder.pop(); CONFIG = builder.buildAndRegister(); diff --git a/forge/src/main/java/net/mehvahdjukaar/moonlight/forge/MoonlightForge.java b/forge/src/main/java/net/mehvahdjukaar/moonlight/forge/MoonlightForge.java index 11cf7de9..2c71e184 100644 --- a/forge/src/main/java/net/mehvahdjukaar/moonlight/forge/MoonlightForge.java +++ b/forge/src/main/java/net/mehvahdjukaar/moonlight/forge/MoonlightForge.java @@ -5,6 +5,7 @@ import net.mehvahdjukaar.moonlight.api.platform.configs.ConfigBuilder; import net.mehvahdjukaar.moonlight.api.platform.configs.ConfigType; import net.mehvahdjukaar.moonlight.api.platform.configs.forge.ConfigSpecWrapper; +import net.mehvahdjukaar.moonlight.core.CommonConfigs; import net.mehvahdjukaar.moonlight.core.Moonlight; import net.mehvahdjukaar.moonlight.core.fake_player.FPClientAccess; import net.mehvahdjukaar.moonlight.core.fake_player.FakeGenericPlayer; @@ -43,8 +44,6 @@ @Mod(Moonlight.MOD_ID) public class MoonlightForge { public static final String MOD_ID = Moonlight.MOD_ID; - public static final ForgeConfigSpec SPEC = ((ConfigSpecWrapper) ConfigBuilder.create(MOD_ID, ConfigType.COMMON) - .buildAndRegister()).getSpec(); public MoonlightForge() { Moonlight.commonInit(); @@ -61,7 +60,7 @@ public MoonlightForge() { public static void configsLoaded(ModConfigEvent.Loading event) { - if (event.getConfig().getSpec() == SPEC) { + if (event.getConfig().getSpec() == ((ConfigSpecWrapper) CommonConfigs.CONFIG).getSpec()) { if (!ModLoader.get().hasCompletedState("LOAD_REGISTRIES")) { throw new IllegalStateException("Some OTHER mod has forcefully loaded ALL other mods configs before the registry phase. This should not be done. Dont report this to Moonlight. Refusing to proceed further"); } diff --git a/forge/update.json b/forge/update.json index f741be68..130fa155 100644 --- a/forge/update.json +++ b/forge/update.json @@ -1,7 +1,7 @@ { "homepage": "https://www.curseforge.com/minecraft/mc-mods/selene", "promos": { - "1.19.2-latest": "1.20-2.13.54", - "1.19.2-recommended": "1.20-2.13.54" + "1.19.2-latest": "1.20-2.13.55", + "1.19.2-recommended": "1.20-2.13.55" } } diff --git a/gradle.properties b/gradle.properties index f926ddce..f75ccd41 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ minecraft_version = 1.20.1 enabled_platforms = fabric,forge mod_id = moonlight -mod_version = 1.20-2.13.54 +mod_version = 1.20-2.13.55 maven_group = net.mehvahdjukaar project_id = 499980