Updated to ForgeConfigApi Port v. 20.4.1, to allow all 3 mod loaders …

…to build at once.
GirafiStudios · Jan 11, 2024 · 195d9fa · 195d9fa
1 parent 5ce2f11
commit 195d9fa
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 10 deletions.
diff --git a/common/build.gradle b/common/build.gradle
@@ -18,4 +18,5 @@ dependencies {
     implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1'
     implementation "mysticdrew:common-networking-common:${common_networking}-${minecraft_version}"
     implementation "fuzs.forgeconfigapiport:forgeconfigapiport-common:${forge_config_api_port}"	
+    implementation "fuzs.forgeconfigapiport:forgeconfigapiport-common-neoforgeapi:${forge_config_api_port}"
 }
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -28,7 +28,7 @@
         "fabric-api": "*",
         "minecraft": "~1.20.4",
         "java": ">=17",
-        "forgeconfigapiport": ">=2.4.0"
+        "forgeconfigapiport": ">=2.4.1"
     },
     "suggests": {
         "another-mod": "*"

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -74,6 +74,8 @@ dependencies {
     compileOnly fg.deobf("fuzs.forgeconfigapiport:forgeconfigapiport-fabric:${forge_config_api_port}")
 	implementation fg.deobf(group: 'mysticdrew', name: 'common-networking-forge', version: "${common_networking}-${minecraft_version}")	
     jarJar group: 'mysticdrew', name: 'common-networking-forge', version: '[1.0.1, 5.0.0)'
+    implementation fg.deobf("fuzs.forgeconfigapiport:forgeconfigapiport-forge:${forge_config_api_port}")
+    jarJar group: 'fuzs.forgeconfigapiport', name: 'forgeconfigapiport-forge', version: '[20.4.1, 30.0.0)'
 }
 
 tasks.withType(JavaCompile).configureEach {

diff --git a/forge/src/main/java/com/girafi/minemenu/MineMenu.java b/forge/src/main/java/com/girafi/minemenu/MineMenu.java
@@ -2,10 +2,10 @@
 
 import com.girafi.minemenu.util.Config;
 import com.girafi.minemenu.util.MineMenuKeybinds;
+import fuzs.forgeconfigapiport.forge.api.neoforge.v4.NeoForgeConfigRegistry;
 import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
 import net.minecraftforge.eventbus.api.EventPriority;
 import net.minecraftforge.eventbus.api.IEventBus;
-import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.config.ModConfig;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
@@ -22,7 +22,7 @@ public MineMenu() {
 
         MineMenuCommon.registerPackets();
 
-        //ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, Config.spec); //TODO Uncomment before building Forge version
+        NeoForgeConfigRegistry.INSTANCE.register(ModConfig.Type.COMMON, Config.spec);
     }
 
     public void loadMenuLoader(final FMLClientSetupEvent event) {

diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
@@ -26,3 +26,10 @@ mandatory = true
 versionRange = "${minecraft_version_range}"
 ordering = "NONE"
 side = "BOTH"
+
+[[dependencies.${mod_id}]]
+modId = "forgeconfigapiport"
+mandatory = true
+versionRange = "[20.4.1,)"
+ordering = "NONE"
+side = "BOTH"
diff --git a/gradle.properties b/gradle.properties
@@ -13,21 +13,21 @@ description=MineMenu supports key bindings, commands, and creative functions to
 minecraft_version_range=[1.20.4, 1.21)
 
 # Fabric
-fabric_version=0.92.0+1.20.4
+fabric_version=0.92.1+1.20.4
 fabric_loader_version=0.15.3
 
 # Forge
-forge_version=49.0.12
+forge_version=49.0.19
 forge_loader_version_range=[49,)
 forge_version_range=[49,)
 
 # NeoForge
-neoforge_version=20.4.69-beta
+neoforge_version=20.4.83-beta
 neoforge_loader_version_range=[1,)
 
 # Libs
 common_networking=1.0.5
-forge_config_api_port=20.4.0
+forge_config_api_port=20.4.1
 
 # Gradle
 org.gradle.jvmargs=-Xmx4G

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/neoforge/src/main/java/com/girafi/minemenu/MineMenu.java b/neoforge/src/main/java/com/girafi/minemenu/MineMenu.java
@@ -8,7 +8,6 @@
 import net.neoforged.fml.common.Mod;
 import net.neoforged.fml.config.ModConfig;
 import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
-import net.neoforged.fml.javafmlmod.FMLJavaModLoadingContext;
 import net.neoforged.fml.loading.FMLPaths;
 import net.neoforged.neoforge.client.event.RegisterKeyMappingsEvent;
 

diff --git a/settings.gradle b/settings.gradle
@@ -28,5 +28,5 @@ plugins {
 rootProject.name = 'MineMenu'
 include("common")
 include("fabric")
-//include("forge")
+include("forge")
 include("neoforge")