From 1702d2683d6ee4f367b61ce60ead56f5dcf03258 Mon Sep 17 00:00:00 2001 From: Des Herriott Date: Thu, 28 Mar 2024 15:45:33 +0000 Subject: [PATCH 1/3] fix: move init code into event handler doing stuff in the constructor is too early https://github.com/FTBTeam/FTB-Mods-Issues/issues/1129 --- .../main/java/dev/ftb/mods/ftbxmodcompat/FTBXModCompat.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common/src/main/java/dev/ftb/mods/ftbxmodcompat/FTBXModCompat.java b/common/src/main/java/dev/ftb/mods/ftbxmodcompat/FTBXModCompat.java index 9a47211..1815192 100644 --- a/common/src/main/java/dev/ftb/mods/ftbxmodcompat/FTBXModCompat.java +++ b/common/src/main/java/dev/ftb/mods/ftbxmodcompat/FTBXModCompat.java @@ -1,5 +1,6 @@ package dev.ftb.mods.ftbxmodcompat; +import dev.architectury.event.events.common.LifecycleEvent; import dev.architectury.platform.Platform; import dev.ftb.mods.ftblibrary.snbt.config.ConfigUtil; import dev.ftb.mods.ftbxmodcompat.config.FTBXModConfig; @@ -35,6 +36,10 @@ public static void init() { ConfigUtil.loadDefaulted(FTBXModConfig.CONFIG, ConfigUtil.CONFIG_DIR, MOD_ID); + LifecycleEvent.SETUP.register(FTBXModCompat::onSetup); + } + + private static void onSetup() { StagesSetup.init(); PermissionsSetup.init(); if (isFTBQuestsLoaded) { From 6443828bf4c97b76f7333a8c647ae0aa90c72710 Mon Sep 17 00:00:00 2001 From: Des Herriott Date: Thu, 28 Mar 2024 15:46:50 +0000 Subject: [PATCH 2/3] build: version -> 2.1.1, changelog updated --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fdd98d2..fd6ae81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [2.1.1] + +### Fixed +* Hopefully fixed some init crashes by moving cross-mod init code to a later phase during mod loading + ## [2.1.0] ### Added From 3996a201e8491c35e44d9df85b67e9342476a740 Mon Sep 17 00:00:00 2001 From: Des Herriott Date: Thu, 28 Mar 2024 15:51:15 +0000 Subject: [PATCH 3/3] build: version -> 2.1.1, changelog updated --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 3c69ae8..05cb9ea 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,10 @@ -org.gradle.jvmargs=-Xmx2048M +org.gradle.jvmargs=-Xmx3172M minecraft_version=1.20.1 enabled_platforms=fabric,forge archives_base_name=ftb-xmod-compat -mod_version=2.1.0 +mod_version=2.1.1 maven_group=dev.ftb.mods curseforge_id=889915