diff --git a/CHANGELOG.md b/CHANGELOG.md index 97e11a6..4645004 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Forge Recommended Versioning](https://mcforge.readthedocs.io/en/latest/conventions/versioning/). +## [1.21-6.3.0.0] - 2024-07-14 +### Changed +- updated NeoForge to 21.0.94-beta +- the `config` directory is used for the default configuration (NeoForge) + +### Fixed +- crashed on startup with NeoForge (caused by a breaking change in 21.0.82-beta) (thanks to NielsPilgaard for the report) #64 + ## [1.21-6.2.0.0] - 2024-07-08 ### Changed - updated NeoForge to 21.0.76-beta diff --git a/gradle.properties b/gradle.properties index b0269cf..2f2bcb7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ # Project group=de.cech12.usefulhats -mod_version=6.2.0.0 +mod_version=6.3.0.0 mod_id=usefulhats mod_name=Useful Hats mod_author=Cech12 @@ -30,8 +30,8 @@ forge_version_range=[51.0.18,) forge_loader_version_range=[50,) # NeoForge -neoforge_version=21.0.76-beta -neoforge_version_range=[21.0.76-beta,) +neoforge_version=21.0.94-beta +neoforge_version_range=[21.0.94-beta,) neoforge_loader_version_range=[2,) # Baubles 2 diff --git a/neoforge/src/main/java/de/cech12/usefulhats/platform/NeoForgeConfigHelper.java b/neoforge/src/main/java/de/cech12/usefulhats/platform/NeoForgeConfigHelper.java index 1844690..1a62c2c 100644 --- a/neoforge/src/main/java/de/cech12/usefulhats/platform/NeoForgeConfigHelper.java +++ b/neoforge/src/main/java/de/cech12/usefulhats/platform/NeoForgeConfigHelper.java @@ -1,17 +1,10 @@ package de.cech12.usefulhats.platform; -import com.electronwill.nightconfig.core.file.CommentedFileConfig; -import com.electronwill.nightconfig.core.io.WritingMode; -import de.cech12.usefulhats.Constants; import de.cech12.usefulhats.platform.services.IConfigHelper; import net.neoforged.fml.ModLoadingContext; import net.neoforged.fml.config.ModConfig; -import net.neoforged.fml.loading.FMLConfig; -import net.neoforged.fml.loading.FMLPaths; import net.neoforged.neoforge.common.ModConfigSpec; -import java.nio.file.Path; - /** * The config service implementation for NeoForge. */ @@ -312,10 +305,6 @@ public class NeoForgeConfigHelper implements IConfigHelper { @Override public void init() { ModLoadingContext.get().getActiveContainer().registerConfig(ModConfig.Type.SERVER, SERVER_CONFIG); - Path path = FMLPaths.GAMEDIR.get().resolve(FMLConfig.defaultConfigPath()).resolve(Constants.MOD_ID + "-server.toml"); - final CommentedFileConfig configData = CommentedFileConfig.builder(path).sync().autosave().writingMode(WritingMode.REPLACE).build(); - configData.load(); - SERVER_CONFIG.setConfig(configData); } private boolean getBoolean(ModConfigSpec.BooleanValue config, boolean defaultValue) {