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

…to build at once.
GirafiStudios · Jan 10, 2024 · f8da5a8 · f8da5a8
1 parent b12f8f3
commit f8da5a8
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 9 deletions.
diff --git a/common/build.gradle b/common/build.gradle
@@ -16,5 +16,5 @@ minecraft {
 dependencies {
     compileOnly group: 'org.spongepowered', name: 'mixin', version: '0.8.5'
     implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.1'
-    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
@@ -27,7 +27,7 @@
         "fabric-api": "*",
         "minecraft": "~1.20.4",
         "java": ">=17",
-        "forgeconfigapiport": ">=20.4.0"
+        "forgeconfigapiport": ">=20.4.1"
     },
     "suggests": {
         "another-mod": "*"

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -61,6 +61,10 @@ minecraft {
     }
 }
 
+dependencies {
+    implementation fg.deobf("fuzs.forgeconfigapiport:forgeconfigapiport-forge:${forge_config_api_port}")
+}
+
 sourceSets.main.resources.srcDir 'src/generated/resources'
 
 sourceSets.each {

diff --git a/forge/src/main/java/com/girafi/waddles/Waddles.java b/forge/src/main/java/com/girafi/waddles/Waddles.java
@@ -2,6 +2,8 @@
 
 import com.girafi.waddles.entity.AdeliePenguinEntity;
 import com.girafi.waddles.init.PenguinRegistry;
+import com.girafi.waddles.utils.ConfigurationHandler;
+import fuzs.forgeconfigapiport.forge.api.neoforge.v4.NeoForgeConfigRegistry;
 import net.minecraft.world.entity.SpawnPlacements;
 import net.minecraft.world.item.CreativeModeTabs;
 import net.minecraft.world.item.Item;
@@ -13,6 +15,7 @@
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.config.ModConfig;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
@@ -33,7 +36,7 @@ public Waddles() {
         eventBus.addListener(this::setupCommon);
         eventBus.addListener(this::setupClient);
 
-        //ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, ConfigurationHandler.spec); //Uncomment when building, otherwise have it commented out.
+        NeoForgeConfigRegistry.INSTANCE.register(ModConfig.Type.COMMON, ConfigurationHandler.spec); //Uncomment when building, otherwise have it commented out.
 
         registerDeferredRegistries(eventBus);
         register();

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,20 +13,20 @@ description=Waddles adds somewhat realistic Adélie penguins that waddle.
 minecraft_version_range=[1.20.2, 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,)
 
 # Mod Support
-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/settings.gradle b/settings.gradle
@@ -28,5 +28,5 @@ plugins {
 rootProject.name = 'Waddles'
 include("common")
 include("fabric")
-//include("forge")
+include("forge")
 include("neoforge")