diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1501bd6f..c6e34e9c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -29,6 +29,7 @@ adventurePlatformFabric = "5.14.2" adventurePlatformNeoforge = "6.0.0" mixin = "0.8.7" neoforge = "21.1.82" +neoForm = "1.21.1-20240808.144430" # buildSrc indra = "3.1.3" diff --git a/settings.gradle.kts b/settings.gradle.kts index 2a86621e..eb236ff5 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -28,14 +28,12 @@ pluginManagement { maven("https://repo.jpenilla.xyz/snapshots/") { mavenContent { snapshotsOnly() } } - maven("https://repo.spongepowered.org/repository/maven-public/") } includeBuild("gradle/build-logic") } plugins { id("quiet-fabric-loom") version "1.8-SNAPSHOT" - id("org.spongepowered.gradle.vanilla") version "0.2.1-SNAPSHOT" id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" id("net.neoforged.moddev.repositories") version "2.0.49-beta" } diff --git a/sponge/build.gradle.kts b/sponge/build.gradle.kts index 03073ed4..5d7179a5 100644 --- a/sponge/build.gradle.kts +++ b/sponge/build.gradle.kts @@ -1,11 +1,10 @@ import org.spongepowered.gradle.plugin.config.PluginLoaders -import org.spongepowered.gradle.vanilla.repository.MinecraftPlatform import org.spongepowered.plugin.metadata.model.PluginDependency plugins { id("tabtps.platform") alias(libs.plugins.sponge.gradle) - id("org.spongepowered.gradle.vanilla") + id("net.neoforged.moddev") } // Workaround weird interaction between VanillaGradle and shadow @@ -54,9 +53,8 @@ sponge { } } -minecraft { - version("1.21.1") - platform(MinecraftPlatform.JOINED) +neoForge { + neoFormVersion = libs.versions.neoForm } tasks {