From 14ae37552ae94142cf261a2cdf8e6a7c577f7064 Mon Sep 17 00:00:00 2001 From: cech12 Date: Thu, 20 Jun 2024 18:14:01 +0200 Subject: [PATCH] Updated to Minecraft 1.20.6 (Fabric 0.98.0+1.20.6, Neoforge 20.6.119) - Removed Forge support until the capability system is re-added - Updated BucketLib to 1.20.6-3.3.0.3 - Updated Cloth Config support (14.0.126) (Fabric/Quilt) - Updated ModMenu support (10.0.0-beta.1) (Fabric/Quilt) - fixed known issue: max stack size was not taken into account and defaulted to 1 (Fabric) --- .github/workflows/cicd-workflow.yml | 30 +++++++++---------- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/update-gradle-wrapper.yml | 2 +- CHANGELOG.md | 11 +++++++ README.md | 6 ++-- build.gradle | 10 ++----- .../assets/ceramicbucket/lang/en_us.json | 2 ++ .../recipes/misc/ceramic_bucket.json | 4 +-- .../recipes/misc/unfired_clay_bucket.json | 4 +-- .../ceramicbucket/recipes/ceramic_bucket.json | 4 ++- .../recipes/unfired_clay_bucket.json | 2 +- .../data/minecraft/tags/items/dyeable.json | 6 ++++ .../tags/items/enchantable/durability.json | 6 ++++ common/src/main/resources/pack.mcmeta | 2 +- fabric/build.gradle | 2 +- .../ceramicbucket/CeramicBucketMod.java | 3 +- forge/build.gradle | 7 +++-- .../ceramicbucket/CeramicBucketMod.java | 3 +- gradle.properties | 29 +++++++++--------- neoforge/build.gradle | 10 ++++++- .../ceramicbucket/CeramicBucketMod.java | 9 +++--- .../platform/NeoForgeConfigHelper.java | 2 +- .../{mods.toml => neoforge.mods.toml} | 0 settings.gradle | 2 +- 24 files changed, 95 insertions(+), 63 deletions(-) create mode 100644 common/src/main/resources/data/minecraft/tags/items/dyeable.json create mode 100644 common/src/main/resources/data/minecraft/tags/items/enchantable/durability.json rename neoforge/src/main/resources/META-INF/{mods.toml => neoforge.mods.toml} (100%) diff --git a/.github/workflows/cicd-workflow.yml b/.github/workflows/cicd-workflow.yml index d171a8e..c83cc27 100644 --- a/.github/workflows/cicd-workflow.yml +++ b/.github/workflows/cicd-workflow.yml @@ -15,20 +15,20 @@ jobs: name: Build uses: cech12/MinecraftModActions/.github/workflows/build.yml@main with: - java-version: 17 + java-version: 21 codeql: needs: build name: CodeQL uses: cech12/MinecraftModActions/.github/workflows/codeql-analysis.yml@main with: - java-version: 17 + java-version: 21 publish-github: needs: codeql if: startsWith(github.ref, 'refs/tags/') name: Publish Github uses: cech12/MinecraftModActions/.github/workflows/multi-publish-github.yml@main with: - java-version: 17 + java-version: 21 mod-name: Ceramic Bucket mod-id: ceramicbucket secrets: @@ -39,12 +39,12 @@ jobs: name: Publish Forge on Curseforge uses: cech12/MinecraftModActions/.github/workflows/publish-curseforge.yml@main with: - java-version: 17 + java-version: 21 subproject: forge title-prefix: forge- curseforge-id: 363799 game-versions: | - 1.20.4 + 1.20.6 release-type: release loaders: | forge @@ -57,12 +57,12 @@ jobs: name: Publish Forge on Modrinth uses: cech12/MinecraftModActions/.github/workflows/publish-modrinth.yml@main with: - java-version: 17 + java-version: 21 subproject: forge title-prefix: forge- modrinth-id: M9G5zpf1 game-versions: | - 1.20.4 + 1.20.6 release-type: release loaders: | forge @@ -75,12 +75,12 @@ jobs: name: Publish NeoForge on Curseforge uses: cech12/MinecraftModActions/.github/workflows/publish-curseforge.yml@main with: - java-version: 17 + java-version: 21 subproject: neoforge title-prefix: neoforge- curseforge-id: 363799 game-versions: | - 1.20.4 + 1.20.6 release-type: release loaders: | neoforge @@ -93,12 +93,12 @@ jobs: name: Publish NeoForge on Modrinth uses: cech12/MinecraftModActions/.github/workflows/publish-modrinth.yml@main with: - java-version: 17 + java-version: 21 subproject: neoforge title-prefix: neoforge- modrinth-id: M9G5zpf1 game-versions: | - 1.20.4 + 1.20.6 release-type: release loaders: | neoforge @@ -111,12 +111,12 @@ jobs: name: Publish Fabric on Curseforge uses: cech12/MinecraftModActions/.github/workflows/publish-curseforge.yml@main with: - java-version: 17 + java-version: 21 subproject: fabric title-prefix: fabric- curseforge-id: 363799 game-versions: | - 1.20.4 + 1.20.6 release-type: release loaders: | fabric @@ -130,12 +130,12 @@ jobs: name: Publish Fabric on Modrinth uses: cech12/MinecraftModActions/.github/workflows/publish-modrinth.yml@main with: - java-version: 17 + java-version: 21 subproject: fabric title-prefix: fabric- modrinth-id: M9G5zpf1 game-versions: | - 1.20.4 + 1.20.6 release-type: release loaders: | fabric diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index a2b3b1f..145a806 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -10,4 +10,4 @@ jobs: name: Analyze uses: cech12/MinecraftModActions/.github/workflows/codeql-analysis.yml@main with: - java-version: 17 + java-version: 21 diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml index a8bd100..30c13ff 100644 --- a/.github/workflows/update-gradle-wrapper.yml +++ b/.github/workflows/update-gradle-wrapper.yml @@ -10,6 +10,6 @@ jobs: name: Update Gradle Wrapper uses: cech12/MinecraftModActions/.github/workflows/update-gradle-wrapper.yml@main with: - java-version: 17 + java-version: 21 secrets: github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/CHANGELOG.md b/CHANGELOG.md index e40018c..595cf8c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ 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.20.6-5.3.0.0] - 2024-06-20 +### Changed +- Updated to Minecraft 1.20.6 (Fabric 0.98.0+1.20.6, Neoforge 20.6.119) +- Removed Forge support until the capability system is re-added +- Updated BucketLib to 1.20.6-3.3.0.3 +- Updated Cloth Config support (14.0.126) (Fabric/Quilt) +- Updated ModMenu support (10.0.0-beta.1) (Fabric/Quilt) + +### Fixed +- fixed known issue: max stack size was not taken into account and defaulted to 1 (Fabric) + ## [1.20.4-5.2.0.0] - 2024-05-11 ### Added - add Fabric (>=0.96.11+1.20.4) support (Fabric, Quilt) diff --git a/README.md b/README.md index d64a985..249e2c4 100644 --- a/README.md +++ b/README.md @@ -15,12 +15,12 @@ This is a Minecraft mod that adds a **Ceramic Bucket** to the game. (Forge, NeoF ## Dependencies -Since mod version 3.0.0.0 the library mod BucketLib ([Github](https://github.com/cech12/BucketLib/), [Curseforge](https://www.curseforge.com/minecraft/mc-mods/bucketlib), [Modrinth](https://modrinth.com/mod/bucketlib)) is required. +Since mod version 3.0.0.0 the library mod BucketLib ([GitHub](https://github.com/cech12/BucketLib/), [Curseforge](https://www.curseforge.com/minecraft/mc-mods/bucketlib), [Modrinth](https://modrinth.com/mod/bucketlib)) is required. The Fabric / Quilt version needs also the following mods: -- Fabric API ([Github](https://github.com/FabricMC/fabric), [Curseforge](https://www.curseforge.com/minecraft/mc-mods/fabric-api), [Modrinth](https://modrinth.com/mod/fabric-api)) -- Cloth Config API ([Github](https://github.com/shedaniel/cloth-config), [Curseforge](https://www.curseforge.com/minecraft/mc-mods/cloth-config), [Modrinth](https://modrinth.com/mod/cloth-config)) +- Fabric API ([GitHub](https://github.com/FabricMC/fabric), [Curseforge](https://www.curseforge.com/minecraft/mc-mods/fabric-api), [Modrinth](https://modrinth.com/mod/fabric-api)) +- Cloth Config API ([GitHub](https://github.com/shedaniel/cloth-config), [Curseforge](https://www.curseforge.com/minecraft/mc-mods/cloth-config), [Modrinth](https://modrinth.com/mod/cloth-config)) ## Features diff --git a/build.gradle b/build.gradle index 745e848..70005a3 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ subprojects { version "$project.minecraft_version-$project.mod_version" - java.toolchain.languageVersion = JavaLanguageVersion.of(17) + java.toolchain.languageVersion = JavaLanguageVersion.of(java_version) //java.withSourcesJar() //java.withJavadocJar() @@ -50,15 +50,11 @@ subprojects { } } - tasks.withType(JavaCompile).configureEach { - it.options.encoding = 'UTF-8' - it.options.getRelease().set(17) - } - processResources { def expandProps = [ "version": version, "group": project.group, //Else we target the task's group. + "java_version": java_version, "minecraft_version": minecraft_version, "minecraft_version_range": minecraft_version_range, "forge_version": forge_version, @@ -82,7 +78,7 @@ subprojects { "bucketlib_version_range": bucketlib_version_range ] - filesMatching(['pack.mcmeta', 'fabric.mod.json', 'META-INF/mods.toml', '*.mixins.json']) { + filesMatching(['pack.mcmeta', 'fabric.mod.json', 'META-INF/neoforge.mods.toml', 'META-INF/mods.toml', '*.mixins.json']) { expand expandProps } inputs.properties(expandProps) diff --git a/common/src/main/resources/assets/ceramicbucket/lang/en_us.json b/common/src/main/resources/assets/ceramicbucket/lang/en_us.json index 6f293ce..7b5ac97 100644 --- a/common/src/main/resources/assets/ceramicbucket/lang/en_us.json +++ b/common/src/main/resources/assets/ceramicbucket/lang/en_us.json @@ -1,4 +1,6 @@ { + "tag.fluid.woodenbucket.ceramic_cracking": "Fluids that crack the Ceramic Bucket", + "item.ceramicbucket.ceramic_bucket": "Ceramic Bucket", "item.ceramicbucket.ceramic_bucket.entity": "Ceramic Bucket of %s", "item.ceramicbucket.ceramic_bucket.filled": "Ceramic %s Bucket", diff --git a/common/src/main/resources/data/ceramicbucket/advancements/recipes/misc/ceramic_bucket.json b/common/src/main/resources/data/ceramicbucket/advancements/recipes/misc/ceramic_bucket.json index 27d24d1..6a4a490 100644 --- a/common/src/main/resources/data/ceramicbucket/advancements/recipes/misc/ceramic_bucket.json +++ b/common/src/main/resources/data/ceramicbucket/advancements/recipes/misc/ceramic_bucket.json @@ -11,9 +11,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:clay_ball" - ] + "items": "minecraft:clay_ball" } ] } diff --git a/common/src/main/resources/data/ceramicbucket/advancements/recipes/misc/unfired_clay_bucket.json b/common/src/main/resources/data/ceramicbucket/advancements/recipes/misc/unfired_clay_bucket.json index b5a01c8..de88120 100644 --- a/common/src/main/resources/data/ceramicbucket/advancements/recipes/misc/unfired_clay_bucket.json +++ b/common/src/main/resources/data/ceramicbucket/advancements/recipes/misc/unfired_clay_bucket.json @@ -11,9 +11,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:clay_ball" - ] + "items": "minecraft:clay_ball" } ] } diff --git a/common/src/main/resources/data/ceramicbucket/recipes/ceramic_bucket.json b/common/src/main/resources/data/ceramicbucket/recipes/ceramic_bucket.json index f995b5e..bdeebcc 100644 --- a/common/src/main/resources/data/ceramicbucket/recipes/ceramic_bucket.json +++ b/common/src/main/resources/data/ceramicbucket/recipes/ceramic_bucket.json @@ -4,7 +4,9 @@ "ingredient": { "item": "ceramicbucket:unfired_clay_bucket" }, - "result": "ceramicbucket:ceramic_bucket", + "result": { + "id": "ceramicbucket:ceramic_bucket" + }, "experience": 0.3, "cookingtime": 200 } \ No newline at end of file diff --git a/common/src/main/resources/data/ceramicbucket/recipes/unfired_clay_bucket.json b/common/src/main/resources/data/ceramicbucket/recipes/unfired_clay_bucket.json index d82206b..41fc51b 100644 --- a/common/src/main/resources/data/ceramicbucket/recipes/unfired_clay_bucket.json +++ b/common/src/main/resources/data/ceramicbucket/recipes/unfired_clay_bucket.json @@ -11,6 +11,6 @@ } }, "result": { - "item": "ceramicbucket:unfired_clay_bucket" + "id": "ceramicbucket:unfired_clay_bucket" } } \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/items/dyeable.json b/common/src/main/resources/data/minecraft/tags/items/dyeable.json new file mode 100644 index 0000000..c80e70a --- /dev/null +++ b/common/src/main/resources/data/minecraft/tags/items/dyeable.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "ceramicbucket:ceramic_bucket" + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/items/enchantable/durability.json b/common/src/main/resources/data/minecraft/tags/items/enchantable/durability.json new file mode 100644 index 0000000..c80e70a --- /dev/null +++ b/common/src/main/resources/data/minecraft/tags/items/enchantable/durability.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "ceramicbucket:ceramic_bucket" + ] +} \ No newline at end of file diff --git a/common/src/main/resources/pack.mcmeta b/common/src/main/resources/pack.mcmeta index add527b..13aa4c9 100644 --- a/common/src/main/resources/pack.mcmeta +++ b/common/src/main/resources/pack.mcmeta @@ -3,6 +3,6 @@ "description": { "text": "${mod_id} resources" }, - "pack_format": 15 + "pack_format": 32 } } \ No newline at end of file diff --git a/fabric/build.gradle b/fabric/build.gradle index d3f605c..89c7f51 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id 'idea' id 'maven-publish' - id 'fabric-loom' version '[1.6.6,1.7)' + id 'fabric-loom' version '1.6-SNAPSHOT' } base { archivesName = "${mod_id}-fabric" diff --git a/fabric/src/main/java/de/cech12/ceramicbucket/CeramicBucketMod.java b/fabric/src/main/java/de/cech12/ceramicbucket/CeramicBucketMod.java index 77605d5..a187c4b 100644 --- a/fabric/src/main/java/de/cech12/ceramicbucket/CeramicBucketMod.java +++ b/fabric/src/main/java/de/cech12/ceramicbucket/CeramicBucketMod.java @@ -9,6 +9,7 @@ import net.minecraft.core.Registry; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.FastColor; import net.minecraft.world.item.CreativeModeTabs; import net.minecraft.world.item.Item; @@ -24,7 +25,7 @@ public class CeramicBucketMod implements ModInitializer { .crackingFluids(ModTags.Fluids.CERAMIC_CRACKING) .milking(Services.CONFIG::isMilkingEnabled) .entityObtaining(Services.CONFIG::isFishObtainingEnabled) - .dyeable(14975336) + .dyeable(FastColor.ARGB32.color(255, 14975336)) .durability(Services.CONFIG::getDurability) )); diff --git a/forge/build.gradle b/forge/build.gradle index 51593ca..87dc6d9 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -1,7 +1,7 @@ plugins { id 'idea' id 'maven-publish' - id 'net.minecraftforge.gradle' version '[6.0.16,6.2)' + id 'net.minecraftforge.gradle' version '6.0.24' id 'org.spongepowered.mixin' version '0.7-SNAPSHOT' } base { @@ -15,6 +15,7 @@ base { minecraft { mappings channel: 'official', version: minecraft_version + reobf = false copyIdeResources = true //Calls processResources when in dev @@ -63,6 +64,8 @@ dependencies { minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" compileOnly project(":common") //annotationProcessor("org.spongepowered:mixin:0.8.5-SNAPSHOT:processor") + //temporary necessary: + implementation('net.sf.jopt-simple:jopt-simple:5.0.4') { version { strictly '5.0.4' } } implementation fg.deobf("com.github.cech12.BucketLib:forge:${bucketlib_version}") } @@ -81,8 +84,6 @@ processResources { from project(":common").sourceSets.main.resources } -jar.finalizedBy('reobfJar') - publishing { publications { mavenJava(MavenPublication) { diff --git a/forge/src/main/java/de/cech12/ceramicbucket/CeramicBucketMod.java b/forge/src/main/java/de/cech12/ceramicbucket/CeramicBucketMod.java index 1f6cef9..dd1db5b 100644 --- a/forge/src/main/java/de/cech12/ceramicbucket/CeramicBucketMod.java +++ b/forge/src/main/java/de/cech12/ceramicbucket/CeramicBucketMod.java @@ -5,6 +5,7 @@ import de.cech12.ceramicbucket.init.ModTags; import de.cech12.ceramicbucket.platform.Services; import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.FastColor; import net.minecraft.world.item.CreativeModeTabs; import net.minecraft.world.item.Item; import net.minecraftforge.event.BuildCreativeModeTabContentsEvent; @@ -34,7 +35,7 @@ public class CeramicBucketMod { .crackingFluids(ModTags.Fluids.CERAMIC_CRACKING) .milking(Services.CONFIG::isMilkingEnabled) .entityObtaining(Services.CONFIG::isFishObtainingEnabled) - .dyeable(14975336) + .dyeable(FastColor.ARGB32.color(255, 14975336)) .durability(Services.CONFIG::getDurability) )); diff --git a/gradle.properties b/gradle.properties index 9905963..fe5e264 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ # Project group=de.cech12.ceramicbucket -mod_version=5.2.0.0 +mod_version=5.3.0.0 mod_id=ceramicbucket mod_name=Ceramic Bucket mod_author=Cech12 @@ -14,28 +14,29 @@ mod_issue_tracker=https://github.com/cech12/CeramicBucket/issues description=A mod which adds a Ceramic Bucket. # Common -minecraft_version=1.20.4 -minecraft_version_range=[1.20.4, 1.21) +java_version=21 +minecraft_version=1.20.6 +minecraft_version_range=[1.20.6, 1.21) # Fabric -fabric_version=0.96.11+1.20.4 -fabric_loader_version=0.15.7 -cloth_config_version=13.0.121 -mod_menu_version=9.0.0 +fabric_version=0.98.0+1.20.6 +fabric_loader_version=0.15.11 +cloth_config_version=14.0.126 +mod_menu_version=10.0.0-beta.1 # Forge -forge_version=49.0.22 -forge_version_range=[49.0.22,) -forge_loader_version_range=[49,) +forge_version=50.1.3 +forge_version_range=[50.1.3,) +forge_loader_version_range=[50,) # NeoForge -neoforge_version=20.4.138-beta -neoforge_version_range=[20.4.138-beta,) +neoforge_version=20.6.119 +neoforge_version_range=[20.6.119,) neoforge_loader_version_range=[2,) #Bucket Lib -bucketlib_version=1.20.4-3.2.0.2 -bucketlib_version_range=[1.20.4-3.2.0.2,) +bucketlib_version=1.20.6-3.3.0.3 +bucketlib_version_range=[1.20.6-3.3.0.2,) # Gradle org.gradle.jvmargs=-Xmx3G diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 17e7136..0461c34 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -1,6 +1,6 @@ plugins { id 'idea' - id 'net.neoforged.gradle.userdev' version '7.0.81' + id 'net.neoforged.gradle.userdev' version '7.0.145' id 'java-library' } base { @@ -61,4 +61,12 @@ tasks.withType(JavaCompile).matching(notNeoTask).configureEach { tasks.withType(ProcessResources).matching(notNeoTask).configureEach { from project(":common").sourceSets.main.resources +} + +//disable tests +test.onlyIf { false } +tasks.configureEach { task -> + if (task.name.startsWith("testJunit")) { + task.enabled = false + } } \ No newline at end of file diff --git a/neoforge/src/main/java/de/cech12/ceramicbucket/CeramicBucketMod.java b/neoforge/src/main/java/de/cech12/ceramicbucket/CeramicBucketMod.java index 9046de0..6193c73 100644 --- a/neoforge/src/main/java/de/cech12/ceramicbucket/CeramicBucketMod.java +++ b/neoforge/src/main/java/de/cech12/ceramicbucket/CeramicBucketMod.java @@ -4,12 +4,13 @@ import de.cech12.bucketlib.api.item.UniversalBucketItem; import de.cech12.ceramicbucket.init.ModTags; import de.cech12.ceramicbucket.platform.Services; +import net.minecraft.util.FastColor; import net.minecraft.world.item.CreativeModeTabs; import net.minecraft.world.item.Item; import net.neoforged.bus.api.IEventBus; import net.neoforged.fml.common.Mod; +import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent; import net.neoforged.neoforge.event.BuildCreativeModeTabContentsEvent; -import net.neoforged.fml.event.lifecycle.InterModEnqueueEvent; import net.neoforged.neoforge.registries.DeferredItem; import net.neoforged.neoforge.registries.DeferredRegister; @@ -26,7 +27,7 @@ public class CeramicBucketMod { .crackingFluids(ModTags.Fluids.CERAMIC_CRACKING) .milking(Services.CONFIG::isMilkingEnabled) .entityObtaining(Services.CONFIG::isFishObtainingEnabled) - .dyeable(14975336) + .dyeable(FastColor.ARGB32.color(255, 14975336)) .durability(Services.CONFIG::getDurability) )); @@ -40,8 +41,8 @@ public CeramicBucketMod(IEventBus modEventBus) { modEventBus.addListener(this::sendImc); } - private void sendImc(InterModEnqueueEvent evt) { - BucketLibApi.registerBucket(CERAMIC_BUCKET.getId()); + private void sendImc(RegisterCapabilitiesEvent evt) { + BucketLibApi.registerBucket(evt, CERAMIC_BUCKET.getId()); } private void addItemsToTabs(BuildCreativeModeTabContentsEvent event) { diff --git a/neoforge/src/main/java/de/cech12/ceramicbucket/platform/NeoForgeConfigHelper.java b/neoforge/src/main/java/de/cech12/ceramicbucket/platform/NeoForgeConfigHelper.java index 7d8c3be..706858b 100644 --- a/neoforge/src/main/java/de/cech12/ceramicbucket/platform/NeoForgeConfigHelper.java +++ b/neoforge/src/main/java/de/cech12/ceramicbucket/platform/NeoForgeConfigHelper.java @@ -52,7 +52,7 @@ public class NeoForgeConfigHelper implements IConfigHelper { @Override public void init() { - ModLoadingContext.get().registerConfig(ModConfig.Type.SERVER, SERVER_CONFIG); + 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(); diff --git a/neoforge/src/main/resources/META-INF/mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml similarity index 100% rename from neoforge/src/main/resources/META-INF/mods.toml rename to neoforge/src/main/resources/META-INF/neoforge.mods.toml diff --git a/settings.gradle b/settings.gradle index b102a39..c3af3cf 100644 --- a/settings.gradle +++ b/settings.gradle @@ -28,5 +28,5 @@ plugins { rootProject.name = 'CeramicBucket' include("common") include("fabric") -include("forge") +//include("forge") include("neoforge") \ No newline at end of file