From 15dcb0fdd13cd06d90979189eb4bf728587dfaae Mon Sep 17 00:00:00 2001 From: Faboslav Date: Sun, 8 Dec 2024 17:31:59 +0100 Subject: [PATCH] Fixed catalogue compat --- CHANGELOG.md | 4 ++++ .../structurify/common/modcompat/fabric/CatalogueCompat.java | 4 ++-- fabric/src/main/resources/fabric.mod.json | 2 +- gradle.properties | 2 +- versions/1.20.1/gradle.properties | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e04327..3786bad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.0.10 + +- Fixed crash related to invalid catalogue compat setup + ## 1.0.9 - Fixed typo causing invalid saving and loading of "disable_all_structures" option diff --git a/fabric/src/main/java/com/faboslav/structurify/common/modcompat/fabric/CatalogueCompat.java b/fabric/src/main/java/com/faboslav/structurify/common/modcompat/fabric/CatalogueCompat.java index 96e8b87..def3ced 100644 --- a/fabric/src/main/java/com/faboslav/structurify/common/modcompat/fabric/CatalogueCompat.java +++ b/fabric/src/main/java/com/faboslav/structurify/common/modcompat/fabric/CatalogueCompat.java @@ -7,7 +7,7 @@ public final class CatalogueCompat { - public static Screen createConfigScreen(Screen screen, ModContainer container) { + public static Screen createConfigScreen(Screen currentScreen, ModContainer container) { if ( !FabricLoader.getInstance().isModLoaded("catalogue") || !FabricLoader.getInstance().isModLoaded("yet_another_config_lib_v3") @@ -15,6 +15,6 @@ public static Screen createConfigScreen(Screen screen, ModContainer container) { return null; } - return new StructurifyConfigScreen(screen); + return new StructurifyConfigScreen(currentScreen); } } diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 8318216..2eebd42 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -46,7 +46,7 @@ } }, "catalogue": { - "configFactory": "com.faboslav.structurify.fabric.CatalogueCompat", + "configFactory": "com.faboslav.structurify.common.modcompat.fabric.CatalogueCompat", "icon": { "image": "catalogue_icon.png" }, diff --git a/gradle.properties b/gradle.properties index 571c91f..494cdaf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx4G mod_java_version=[VERSIONED] mod_name=Structurify mod_id=structurify -mod_version=1.0.9 +mod_version=1.0.10 mod_author=Faboslav mod_description=Configuration mod that makes configuring everything related to structures very easy and accessible, eliminating the hassle of creating multiple datapacks. mod_github_url=https://github.com/Faboslav/structurify diff --git a/versions/1.20.1/gradle.properties b/versions/1.20.1/gradle.properties index 9246813..6e24976 100644 --- a/versions/1.20.1/gradle.properties +++ b/versions/1.20.1/gradle.properties @@ -20,7 +20,7 @@ neoforge_version= # Common yacl_version=3.5.0+1.20.1 mod_menu_version=7.2.2 -catalogue_version=1.7.1 +catalogue_version=1.8.0 # Compat global_datapacks_version=1.2