Skip to content

Commit

Permalink
Updated to ForgeConfigApi Port v. 20.4.1, to allow all 3 mod loaders …
Browse files Browse the repository at this point in the history
…to build at once.
  • Loading branch information
GirafiStudios committed Jan 10, 2024
1 parent 2c81d6d commit 49ecdba
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 10 deletions.
2 changes: 1 addition & 1 deletion common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ dependencies {
compileOnly group: 'org.spongepowered', name: 'mixin', version: '0.8.5'
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}"
}
2 changes: 1 addition & 1 deletion fabric/src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"minecraft": "~1.20.4",
"java": ">=17",
"fabric-key-binding-api-v1": "*",
"forgeconfigapiport": ">=20.4.0"
"forgeconfigapiport": ">=20.4.1"
},
"suggests": {
"another-mod": "*"
Expand Down
2 changes: 2 additions & 0 deletions forge/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ dependencies {

implementation fg.deobf("mysticdrew:common-networking-forge:${common_networking}-${minecraft_version}")
jarJar group: 'mysticdrew', name: 'common-networking-neoforge', 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 {
Expand Down
3 changes: 2 additions & 1 deletion forge/src/main/java/com/girafi/ping/Ping.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.girafi.ping.util.PingConfig;
import com.girafi.ping.util.PingSounds;
import fuzs.forgeconfigapiport.forge.api.neoforge.v4.NeoForgeConfigRegistry;
import net.minecraft.core.registries.Registries;
import net.minecraft.sounds.SoundEvent;
import net.minecraftforge.eventbus.api.IEventBus;
Expand All @@ -23,7 +24,7 @@ public Ping() {
eventBus.addListener(this::setupClient);
PingCommon.registerPackets();

//ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, PingConfig.spec); //Uncomment when building
NeoForgeConfigRegistry.INSTANCE.register(ModConfig.Type.COMMON, PingConfig.spec);

registerDeferredRegistries(eventBus);
SOUND_EVENT_DEFERRED.register("bloop", PingSounds.BLOOP);
Expand Down
7 changes: 7 additions & 0 deletions forge/src/main/resources/META-INF/mods.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Project
version=1.11.2
version=1.11.3
group=com.girafi.ping

# Common
Expand All @@ -13,21 +13,21 @@ description=Inspired by Portal 2, this mod brings the Ping tool into Minecraft.
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
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ plugins {
rootProject.name = 'Ping'
include("common")
include("fabric")
//include("forge")
include("forge")
include("neoforge")

0 comments on commit 49ecdba

Please sign in to comment.