Merge pull request #16 from FTBTeam/1.20.1/dev

1.20.1/dev

Author: desht

Diff for: 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

Diff for: 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) {

Diff for: 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