Merge pull request #6 from FTBTeam/dev

Dev

Author: desht

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).
 
+## [1.2.1]
+
+### Fixed
+* Fixed a crash when Waystones is loaded and FTB Chunks isn't loaded.
+
 ## [1.2.0]
 
 ### Added

fabric/src/main/java/dev/ftb/mods/ftbxmodcompat/fabric/FTBXModCompatFabric.java

@@ -10,7 +10,7 @@ public class FTBXModCompatFabric implements ModInitializer {
     public void onInitialize() {
         FTBXModCompat.init();
 
-        if (FTBXModCompat.isWaystonesLoaded) {
+        if (FTBXModCompat.isFTBChunksLoaded && FTBXModCompat.isWaystonesLoaded) {
             WaystonesCompat.init();
         }
 

forge/src/main/java/dev/ftb/mods/ftbxmodcompat/forge/FTBXModCompatForge.java

@@ -21,7 +21,7 @@ public FTBXModCompatForge() {
             GameStagesEventHandlerQuests.register();
         }
 
-        if (FTBXModCompat.isWaystonesLoaded) {
+        if (FTBXModCompat.isFTBChunksLoaded && FTBXModCompat.isWaystonesLoaded) {
             WaystonesCompat.init();
         }
     }

gradle.properties

@@ -4,7 +4,7 @@ minecraft_version=1.19.2
 enabled_platforms=fabric,forge
 
 archives_base_name=ftb-xmod-compat
-mod_version=1.2.0
+mod_version=1.2.1
 maven_group=dev.ftb.mods
 curseforge_id=889915