diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6815656ec7..b8b754fa71 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,13 +4,13 @@ jobs:
   build:
     strategy:
       matrix:
-        java: [17-jdk, 20-jdk]
+        java: [17-ubuntu, 21-ubuntu]
     runs-on: ubuntu-22.04
     container:
-      image: eclipse-temurin:${{ matrix.java }}
+      image: mcr.microsoft.com/openjdk/jdk:${{ matrix.java }}
       options: --user root
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: gradle/wrapper-validation-action@v1
@@ -28,15 +28,19 @@ jobs:
         with:
           name: Artifacts
           path: ./*/build/libs/
+      - uses: actions/upload-artifact@v3
+        with:
+          name: Artifacts
+          path: build/publishMods/
       - uses: actions/upload-artifact@v3
         with:
           name: Maven Local
-          path: /root/.m2/repository
+          path: /root/.m2/repository/net/fabricmc/
 
   client_test:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: actions/setup-java@v3
@@ -56,7 +60,7 @@ jobs:
   server_test:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: actions/setup-java@v3
@@ -69,7 +73,7 @@ jobs:
   check_resources:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: actions/setup-java@v3
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2f8d9cc2e4..2b660a130b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -8,12 +8,12 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     container:
-      image: eclipse-temurin:20-jdk
+      image: mcr.microsoft.com/openjdk/jdk:21-ubuntu
       options: --user root
     steps:
       - run: apt update && apt install git -y && git --version
       - run: git config --global --add safe.directory /__w/fabric/fabric
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: FabricMC/fabric-action-scripts@v2
@@ -22,7 +22,7 @@ jobs:
           context: changelog
           workflow_id: release.yml
       - uses: gradle/wrapper-validation-action@v1
-      - run: ./gradlew checkVersion build publish curseforge github modrinth --stacktrace -Porg.gradle.parallel.threads=4
+      - run: ./gradlew checkVersion build publish publishMods --stacktrace -Porg.gradle.parallel.threads=4
         env:
           MAVEN_URL: ${{ secrets.MAVEN_URL }}
           MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
diff --git a/build.gradle b/build.gradle
index 404b552120..1140cc929f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,29 +1,22 @@
-buildscript {
-	dependencies {
-		classpath 'org.kohsuke:github-api:1.135'
-	}
-}
-
 plugins {
 	id "java-library"
 	id "eclipse"
 	id "idea"
 	id "maven-publish"
 	id 'jacoco'
-	id "fabric-loom" version "1.2.7" apply false
-	id "com.diffplug.spotless" version "6.18.0"
+	id "fabric-loom" version "1.5.4" apply false
+	id "com.diffplug.spotless" version "6.20.0"
 	id "org.ajoberstar.grgit" version "3.1.0"
-	id "com.matthewprenger.cursegradle" version "1.4.0"
-	id "com.modrinth.minotaur" version "2.4.3"
 	id "me.modmuss50.remotesign" version "0.4.0" apply false
+	id "me.modmuss50.mod-publish-plugin" version "0.4.5"
 }
 
 def ENV = System.getenv()
-def signingEnabled = ENV.SIGNING_SERVER
 
 version = project.version + "+" + (ENV.GITHUB_RUN_NUMBER ? "" : "local-") + getBranch()
 logger.lifecycle("Building Fabric: " + version)
 
+def metaProjects = ['deprecated']
 
 import net.fabricmc.loom.util.gradle.SourceSetHelper
 import groovy.json.JsonSlurper
@@ -123,16 +116,16 @@ allprojects {
 		enabled = false
 	}
 
-	if (signingEnabled) {
-		remoteSign {
-			requestUrl = ENV.SIGNING_SERVER
-			pgpAuthKey = ENV.SIGNING_PGP_KEY
-			jarAuthKey = ENV.SIGNING_JAR_KEY
+	remoteSign {
+		requestUrl = ENV.SIGNING_SERVER
+		pgpAuthKey = ENV.SIGNING_PGP_KEY
+		jarAuthKey = ENV.SIGNING_JAR_KEY
 
-			afterEvaluate {
-				// PGP sign all maven publications.
-				sign publishing.publications.mavenJava
-			}
+		useDummyForTesting = ENV.SIGNING_SERVER == null
+
+		afterEvaluate {
+			// PGP sign all maven publications.
+			sign publishing.publications.mavenJava
 		}
 	}
 
@@ -140,7 +133,7 @@ allprojects {
 		setupRepositories(repositories)
 	}
 
-	if (it.name == "deprecated") {
+	if (metaProjects.contains(it.name)) {
 		return
 	}
 
@@ -160,6 +153,9 @@ allprojects {
 
 	loom {
 		splitEnvironmentSourceSets()
+		mixin {
+			useLegacyMixinAp = true
+		}
 	}
 
 	sourceSets {
@@ -203,8 +199,12 @@ allprojects {
 		}
 	}
 
+	loom.runs.configureEach {
+		vmArg("-enableassertions")
+	}
+
 	allprojects.each { p ->
-		if (project.name == "deprecated") {
+		if (metaProjects.contains(project.name)) {
 			return
 		}
 
@@ -231,6 +231,7 @@ allprojects {
 
 		testImplementation "net.fabricmc:fabric-loader-junit:${project.loader_version}"
 		testImplementation sourceSets.testmodClient.output
+		testImplementation 'org.mockito:mockito-core:5.4.0'
 	}
 
 	test {
@@ -261,12 +262,15 @@ allprojects {
 	spotless {
 		java {
 			licenseHeaderFile(rootProject.file("HEADER"))
+			removeUnusedImports()
+			indentWithTabs()
+			trimTrailingWhitespace()
 		}
 	}
 
 	checkstyle {
 		configFile = rootProject.file("checkstyle.xml")
-		toolVersion = "10.11.0"
+		toolVersion = "10.12.1"
 	}
 
 	tasks.withType(AbstractArchiveTask).configureEach {
@@ -274,10 +278,8 @@ allprojects {
 		reproducibleFileOrder = true
 	}
 
-	if (signingEnabled) {
-		remoteSign {
-			sign remapJar
-		}
+	remoteSign {
+		sign remapJar
 	}
 
 	// Run this task after updating minecraft to regenerate any required resources
@@ -333,7 +335,7 @@ remapTestmodJar {
 	def testModJarTasks = []
 
 	subprojects {
-		if (it.name == "deprecated" || !(it.file("src/testmod").exists() || it.file("src/testmodClient").exists())) {
+		if (metaProjects.contains(it.name) || !(it.file("src/testmod").exists() || it.file("src/testmodClient").exists())) {
 			return
 		}
 
@@ -375,7 +377,7 @@ javadoc {
 	}
 
 	allprojects.each {
-		if (it.name == "deprecated") {
+		if (metaProjects.contains(it.name)) {
 			return
 		}
 
@@ -411,7 +413,7 @@ loom {
 		}
 		autoTestServer {
 			inherit testmodServer
-			name "Auto Test Server"
+			name  "Auto Test Server"
 			vmArg "-Dfabric.autoTest"
 		}
 		autoTestClient {
@@ -510,7 +512,8 @@ tasks.register('runProductionAutoTestClient', JavaExec) {
 
 		jvmArgs(
 				"-Dfabric.addMods=${remapJar.archiveFile.get().asFile.absolutePath}${File.pathSeparator}${remapTestmodJar.archiveFile.get().asFile.absolutePath}",
-				"-Dfabric.autoTest"
+				"-Dfabric.autoTest",
+				"-enableassertions"
 				)
 	}
 }
@@ -541,7 +544,8 @@ tasks.register('runProductionAutoTestServer', JavaExec) {
 
 		jvmArgs(
 				"-Dfabric.addMods=${remapJar.archiveFile.get().asFile.absolutePath}${File.pathSeparator}${remapTestmodJar.archiveFile.get().asFile.absolutePath}",
-				"-Dfabric.autoTest"
+				"-Dfabric.autoTest",
+				"-enableassertions"
 				)
 
 		args("nogui")
@@ -591,10 +595,14 @@ def addPomMetadataInformation(Project project, MavenPom pom) {
 }
 
 subprojects {
-	if (it.name == "deprecated") {
+	if (metaProjects.contains(it.name)) {
 		return
 	}
 
+	base {
+		archivesName = project.name
+	}
+
 	dependencies {
 		testmodImplementation sourceSets.main.output
 
@@ -619,8 +627,8 @@ subprojects {
 				pom {
 					addPomMetadataInformation(project, pom)
 				}
-				artifact(signingEnabled ? signRemapJar.output : remapJar) {
-					builtBy(signingEnabled ? signRemapJar : remapJar)
+				artifact(signRemapJar.output) {
+					builtBy(signRemapJar)
 				}
 
 				artifact(remapSourcesJar) {
@@ -639,8 +647,8 @@ subprojects {
 publishing {
 	publications {
 		mavenJava(MavenPublication) {
-			artifact(signingEnabled ? signRemapJar.output : remapJar) {
-				builtBy(signingEnabled ? signRemapJar : remapJar)
+			artifact(signRemapJar.output) {
+				builtBy(signRemapJar)
 			}
 
 			artifact(sourcesJar) {
@@ -658,7 +666,7 @@ publishing {
 				def depsNode = asNode().appendNode("dependencies")
 				subprojects.each {
 					// The maven BOM containing all of the deprecated modules is added manually below.
-					if (it.path.startsWith(":deprecated")) {
+					if (it.path.startsWith(":deprecated") || metaProjects.contains(it.name)) {
 						return
 					}
 
@@ -700,7 +708,7 @@ void setupRepositories(RepositoryHandler repositories) {
 }
 
 subprojects.each {
-	if (it.name == "deprecated") {
+	if (metaProjects.contains(it.name)) {
 		return
 	}
 
@@ -713,7 +721,7 @@ def devOnlyModules = ["fabric-gametest-api-v1",]
 dependencies {
 	afterEvaluate {
 		subprojects.each {
-			if (it.name == "deprecated") {
+			if (metaProjects.contains(it.name)) {
 				return
 			}
 
@@ -729,82 +737,44 @@ dependencies {
 remapJar {
 	afterEvaluate {
 		subprojects.each {
-			if (it.name in devOnlyModules || it.name == "deprecated") {
+			if (it.name in devOnlyModules || metaProjects.contains(it.name)) {
 				return
 			}
 
 			// Include the signed or none signed jar from the sub project.
-			nestedJars.from project("${it.path}").tasks.getByName(signingEnabled ? "signRemapJar" : "remapJar")
+			nestedJars.from project("${it.path}").tasks.getByName("signRemapJar")
 		}
 	}
 }
 
-curseforge {
-	if (ENV.CURSEFORGE_API_KEY) {
-		apiKey = ENV.CURSEFORGE_API_KEY
-	}
-
-	project {
-		id = "306612"
-		changelog = ENV.CHANGELOG ?: "No changelog provided"
-		releaseType = project.prerelease == "true" ? "beta" : "release"
-		addGameVersion "1.20.1"
-		addGameVersion "Fabric"
-
-		mainArtifact(signingEnabled ? signRemapJar.output : remapJar) {
-			displayName = "[$project.minecraft_version] Fabric API $project.version"
-		}
-
-		afterEvaluate {
-			uploadTask.dependsOn("remapJar")
-		}
-	}
+publishMods {
+	file = signRemapJar.output
+	changelog = providers.environmentVariable("CHANGELOG").getOrElse("No changelog provided")
+	type = project.prerelease == "true" ? BETA : STABLE
+	displayName = "[${project.minecraft_version}] Fabric API $project.version"
+	modLoaders.add("fabric")
+	dryRun = providers.environmentVariable("CURSEFORGE_API_KEY").getOrNull() == null
 
-	options {
-		forgeGradleIntegration = false
+	curseforge {
+		accessToken = providers.environmentVariable("CURSEFORGE_API_KEY")
+		projectId = "306612"
+		minecraftVersions.add(project.curseforge_minecraft_version)
 	}
-}
-
-if (signingEnabled) {
-	project.tasks.curseforge.dependsOn signRemapJar
-	project.tasks.modrinth.dependsOn signRemapJar
-	build.dependsOn signRemapJar
-}
-
-import org.kohsuke.github.GHReleaseBuilder
-import org.kohsuke.github.GitHub
-
-import java.util.stream.Collectors
-
-tasks.register('github') {
-	dependsOn(signingEnabled ? signRemapJar : remapJar)
-	onlyIf {
-		ENV.GITHUB_TOKEN
+	modrinth {
+		accessToken = providers.environmentVariable("MODRINTH_TOKEN")
+		projectId = "P7dR8mSH"
+		minecraftVersions.add(project.minecraft_version)
 	}
-
-	doLast {
-		def github = GitHub.connectUsingOAuth(ENV.GITHUB_TOKEN as String)
-		def repository = github.getRepository(ENV.GITHUB_REPOSITORY)
-
-		def releaseBuilder = new GHReleaseBuilder(repository, version as String)
-		releaseBuilder.name("[$project.minecraft_version] Fabric API $project.version")
-		releaseBuilder.body(ENV.CHANGELOG ?: "No changelog provided")
-		releaseBuilder.commitish(getBranch())
-		releaseBuilder.prerelease(project.prerelease == "true")
-
-		def ghRelease = releaseBuilder.create()
-		ghRelease.uploadAsset(signingEnabled ? signRemapJar.output.get().getAsFile() : remapJar.archiveFile.get().getAsFile(), "application/java-archive");
+	github {
+		accessToken = providers.environmentVariable("GITHUB_TOKEN")
+		repository = providers.environmentVariable("GITHUB_REPOSITORY").getOrElse("FabricMC/dryrun")
+		commitish = providers.environmentVariable("GITHUB_REF_NAME").getOrElse("dryrun")
 	}
 }
 
-modrinth {
-	projectId = "fabric-api"
-	versionName = "[$project.minecraft_version] Fabric API $project.version"
-	versionType = project.prerelease == "true" ? "beta" : "release"
-	changelog = ENV.CHANGELOG ?: "No changelog provided"
+assemble.dependsOn signRemapJar
 
-	uploadFile = signingEnabled ? signRemapJar.output : remapJar
-}
+import java.util.stream.Collectors
 
 // A task to ensure that the version being released has not already been released.
 tasks.register('checkVersion') {
@@ -818,7 +788,5 @@ tasks.register('checkVersion') {
 	}
 }
 
-github.mustRunAfter checkVersion
-project.tasks.modrinth.mustRunAfter checkVersion
+tasks.publishMods.dependsOn checkVersion
 publish.mustRunAfter checkVersion
-project.tasks.curseforge.mustRunAfter checkVersion
diff --git a/deprecated/fabric-command-api-v1/build.gradle b/deprecated/fabric-command-api-v1/build.gradle
index 6afd12fe2c..1d9fadecdd 100644
--- a/deprecated/fabric-command-api-v1/build.gradle
+++ b/deprecated/fabric-command-api-v1/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-command-api-v1"
 version = getSubprojectVersion(project)
 
 moduleDependencies(project, [
diff --git a/deprecated/fabric-commands-v0/build.gradle b/deprecated/fabric-commands-v0/build.gradle
index 1decd8dce4..402be7a599 100644
--- a/deprecated/fabric-commands-v0/build.gradle
+++ b/deprecated/fabric-commands-v0/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-commands-v0"
 version = getSubprojectVersion(project)
 
 moduleDependencies(project, [
diff --git a/deprecated/fabric-containers-v0/build.gradle b/deprecated/fabric-containers-v0/build.gradle
index 3a87ac952d..70b5d0059b 100644
--- a/deprecated/fabric-containers-v0/build.gradle
+++ b/deprecated/fabric-containers-v0/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-containers-v0"
 version = getSubprojectVersion(project)
 
 moduleDependencies(project, [
diff --git a/deprecated/fabric-events-lifecycle-v0/build.gradle b/deprecated/fabric-events-lifecycle-v0/build.gradle
index 4bc6d891a7..20e1a551dd 100644
--- a/deprecated/fabric-events-lifecycle-v0/build.gradle
+++ b/deprecated/fabric-events-lifecycle-v0/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-events-lifecycle-v0"
 version = getSubprojectVersion(project)
 
 moduleDependencies(project, [
diff --git a/deprecated/fabric-keybindings-v0/build.gradle b/deprecated/fabric-keybindings-v0/build.gradle
index 50f676ea54..2a9a297e15 100644
--- a/deprecated/fabric-keybindings-v0/build.gradle
+++ b/deprecated/fabric-keybindings-v0/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-keybindings-v0"
 version = getSubprojectVersion(project)
 
 moduleDependencies(project, [
diff --git a/deprecated/fabric-loot-tables-v1/build.gradle b/deprecated/fabric-loot-tables-v1/build.gradle
index ba46e8b42e..60edb097bf 100644
--- a/deprecated/fabric-loot-tables-v1/build.gradle
+++ b/deprecated/fabric-loot-tables-v1/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-loot-tables-v1"
 version = getSubprojectVersion(project)
 
 moduleDependencies(project, [
diff --git a/deprecated/fabric-models-v0/build.gradle b/deprecated/fabric-models-v0/build.gradle
index c5841fda4b..cfc8a41fda 100644
--- a/deprecated/fabric-models-v0/build.gradle
+++ b/deprecated/fabric-models-v0/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-models-v0"
 version = getSubprojectVersion(project)
 
 moduleDependencies(project, [
diff --git a/deprecated/fabric-networking-v0/build.gradle b/deprecated/fabric-networking-v0/build.gradle
index f4d366d9aa..70b5d0059b 100644
--- a/deprecated/fabric-networking-v0/build.gradle
+++ b/deprecated/fabric-networking-v0/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-networking-v0"
 version = getSubprojectVersion(project)
 
 moduleDependencies(project, [
diff --git a/deprecated/fabric-renderer-registries-v1/build.gradle b/deprecated/fabric-renderer-registries-v1/build.gradle
index 4e44b71157..a4911f2414 100644
--- a/deprecated/fabric-renderer-registries-v1/build.gradle
+++ b/deprecated/fabric-renderer-registries-v1/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-renderer-registries-v1"
 version = getSubprojectVersion(project)
 
 moduleDependencies(project, [
diff --git a/deprecated/fabric-rendering-data-attachment-v1/build.gradle b/deprecated/fabric-rendering-data-attachment-v1/build.gradle
index 173946169c..d13b85ea09 100644
--- a/deprecated/fabric-rendering-data-attachment-v1/build.gradle
+++ b/deprecated/fabric-rendering-data-attachment-v1/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-rendering-data-attachment-v1"
 version = getSubprojectVersion(project)
 
 moduleDependencies(project, ['fabric-block-view-api-v2'])
diff --git a/deprecated/fabric-rendering-v0/build.gradle b/deprecated/fabric-rendering-v0/build.gradle
index a709f8760e..a4911f2414 100644
--- a/deprecated/fabric-rendering-v0/build.gradle
+++ b/deprecated/fabric-rendering-v0/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-rendering-v0"
 version = getSubprojectVersion(project)
 
 moduleDependencies(project, [
diff --git a/fabric-api-base/build.gradle b/fabric-api-base/build.gradle
index 182a62bb16..fc1eb105c5 100644
--- a/fabric-api-base/build.gradle
+++ b/fabric-api-base/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-api-base"
 version = getSubprojectVersion(project)
 
 testDependencies(project, [
diff --git a/fabric-api-lookup-api-v1/build.gradle b/fabric-api-lookup-api-v1/build.gradle
index e842382f06..10e724d47f 100644
--- a/fabric-api-lookup-api-v1/build.gradle
+++ b/fabric-api-lookup-api-v1/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-api-lookup-api-v1"
 version = getSubprojectVersion(project)
 
 moduleDependencies(project, [
diff --git a/fabric-biome-api-v1/build.gradle b/fabric-biome-api-v1/build.gradle
index 5012031859..0c086498cb 100644
--- a/fabric-biome-api-v1/build.gradle
+++ b/fabric-biome-api-v1/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-biome-api-v1"
 version = getSubprojectVersion(project)
 
 loom {
diff --git a/fabric-block-api-v1/build.gradle b/fabric-block-api-v1/build.gradle
index 0299872be2..85b5e378d4 100644
--- a/fabric-block-api-v1/build.gradle
+++ b/fabric-block-api-v1/build.gradle
@@ -1,2 +1 @@
-archivesBaseName = "fabric-block-api-v1"
 version = getSubprojectVersion(project)
diff --git a/fabric-block-view-api-v2/build.gradle b/fabric-block-view-api-v2/build.gradle
index 948067d30d..84bd602fab 100644
--- a/fabric-block-view-api-v2/build.gradle
+++ b/fabric-block-view-api-v2/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-block-view-api-v2"
 version = getSubprojectVersion(project)
 
 loom {
diff --git a/fabric-blockrenderlayer-v1/build.gradle b/fabric-blockrenderlayer-v1/build.gradle
index 6abe270a2f..9ced6ef8b4 100644
--- a/fabric-blockrenderlayer-v1/build.gradle
+++ b/fabric-blockrenderlayer-v1/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-blockrenderlayer-v1"
 version = getSubprojectVersion(project)
 
 moduleDependencies(project, ['fabric-api-base'])
diff --git a/fabric-client-tags-api-v1/build.gradle b/fabric-client-tags-api-v1/build.gradle
index 06eeeed397..406c6a3cbb 100644
--- a/fabric-client-tags-api-v1/build.gradle
+++ b/fabric-client-tags-api-v1/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-client-tags-api-v1"
 version = getSubprojectVersion(project)
 
 moduleDependencies(project, ['fabric-api-base'])
diff --git a/fabric-command-api-v2/build.gradle b/fabric-command-api-v2/build.gradle
index 8c17b0efe8..6cdfdfe104 100644
--- a/fabric-command-api-v2/build.gradle
+++ b/fabric-command-api-v2/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-command-api-v2"
 version = getSubprojectVersion(project)
 
 moduleDependencies(project, ['fabric-api-base'])
diff --git a/fabric-content-registries-v0/build.gradle b/fabric-content-registries-v0/build.gradle
index a86225b9b9..1ca0b2511d 100644
--- a/fabric-content-registries-v0/build.gradle
+++ b/fabric-content-registries-v0/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-content-registries-v0"
 version = getSubprojectVersion(project)
 
 loom {
diff --git a/fabric-convention-tags-v1/build.gradle b/fabric-convention-tags-v1/build.gradle
index 9c30736c4d..ab2cb0ef62 100644
--- a/fabric-convention-tags-v1/build.gradle
+++ b/fabric-convention-tags-v1/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-convention-tags-v1"
 version = getSubprojectVersion(project)
 
 moduleDependencies(project, ['fabric-api-base'])
diff --git a/fabric-crash-report-info-v1/build.gradle b/fabric-crash-report-info-v1/build.gradle
index 1909659a61..85b5e378d4 100644
--- a/fabric-crash-report-info-v1/build.gradle
+++ b/fabric-crash-report-info-v1/build.gradle
@@ -1,2 +1 @@
-archivesBaseName = "fabric-crash-report-info-v1"
 version = getSubprojectVersion(project)
diff --git a/fabric-data-generation-api-v1/build.gradle b/fabric-data-generation-api-v1/build.gradle
index 9333f27e53..bbe27e46d7 100644
--- a/fabric-data-generation-api-v1/build.gradle
+++ b/fabric-data-generation-api-v1/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-data-generation-api-v1"
 version = getSubprojectVersion(project)
 
 moduleDependencies(project, [
@@ -54,7 +53,7 @@ loom {
 test.dependsOn runDatagen
 
 task datapackZip(type: Zip, dependsOn: runDatagen) {
-	archiveFileName = "${archivesBaseName}-${project.version}-test-datapack.zip"
+	archiveFileName = "${base.archivesName.get()}-${project.version}-test-datapack.zip"
 	destinationDirectory = layout.buildDirectory.dir('libs')
 
 	from file("src/testmod/generated")
diff --git a/fabric-dimensions-v1/build.gradle b/fabric-dimensions-v1/build.gradle
index 1b0b8fab78..84dd58e6c5 100644
--- a/fabric-dimensions-v1/build.gradle
+++ b/fabric-dimensions-v1/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-dimensions-v1"
 version = getSubprojectVersion(project)
 
 moduleDependencies(project, ['fabric-api-base'])
diff --git a/fabric-entity-events-v1/build.gradle b/fabric-entity-events-v1/build.gradle
index 7dd922250f..fdfef9dd92 100644
--- a/fabric-entity-events-v1/build.gradle
+++ b/fabric-entity-events-v1/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-entity-events-v1"
 version = getSubprojectVersion(project)
 
 moduleDependencies(project, ['fabric-api-base'])
diff --git a/fabric-events-interaction-v0/build.gradle b/fabric-events-interaction-v0/build.gradle
index a2e684128d..9ced6ef8b4 100644
--- a/fabric-events-interaction-v0/build.gradle
+++ b/fabric-events-interaction-v0/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-events-interaction-v0"
 version = getSubprojectVersion(project)
 
 moduleDependencies(project, ['fabric-api-base'])
diff --git a/fabric-game-rule-api-v1/build.gradle b/fabric-game-rule-api-v1/build.gradle
index 506856782c..f8a14ccf3d 100644
--- a/fabric-game-rule-api-v1/build.gradle
+++ b/fabric-game-rule-api-v1/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-game-rule-api-v1"
 version = getSubprojectVersion(project)
 
 loom {
diff --git a/fabric-gametest-api-v1/build.gradle b/fabric-gametest-api-v1/build.gradle
index 851ec7da8f..6d90f8f8f2 100644
--- a/fabric-gametest-api-v1/build.gradle
+++ b/fabric-gametest-api-v1/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-gametest-api-v1"
 version = getSubprojectVersion(project)
 
 loom {
diff --git a/fabric-item-api-v1/build.gradle b/fabric-item-api-v1/build.gradle
index ae9e5b889f..e54321e6e7 100644
--- a/fabric-item-api-v1/build.gradle
+++ b/fabric-item-api-v1/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-item-api-v1"
 version = getSubprojectVersion(project)
 
 moduleDependencies(project, ['fabric-api-base'])
diff --git a/fabric-item-group-api-v1/build.gradle b/fabric-item-group-api-v1/build.gradle
index 7a8a9237a6..466244f8e2 100644
--- a/fabric-item-group-api-v1/build.gradle
+++ b/fabric-item-group-api-v1/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-item-group-api-v1"
 version = getSubprojectVersion(project)
 
 moduleDependencies(project, [
diff --git a/fabric-key-binding-api-v1/build.gradle b/fabric-key-binding-api-v1/build.gradle
index 64dcf3c11f..4bcab6eb68 100644
--- a/fabric-key-binding-api-v1/build.gradle
+++ b/fabric-key-binding-api-v1/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-key-binding-api-v1"
 version = getSubprojectVersion(project)
 
 testDependencies(project, [
diff --git a/fabric-lifecycle-events-v1/build.gradle b/fabric-lifecycle-events-v1/build.gradle
index 0dd2bac50f..91e81b718b 100644
--- a/fabric-lifecycle-events-v1/build.gradle
+++ b/fabric-lifecycle-events-v1/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-lifecycle-events-v1"
 version = getSubprojectVersion(project)
 
 loom {
diff --git a/fabric-loot-api-v2/build.gradle b/fabric-loot-api-v2/build.gradle
index 557749a7ca..f2db1b51aa 100644
--- a/fabric-loot-api-v2/build.gradle
+++ b/fabric-loot-api-v2/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-loot-api-v2"
 version = getSubprojectVersion(project)
 
 moduleDependencies(project, [
diff --git a/fabric-message-api-v1/build.gradle b/fabric-message-api-v1/build.gradle
index 79491115f9..a733beb92b 100644
--- a/fabric-message-api-v1/build.gradle
+++ b/fabric-message-api-v1/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-message-api-v1"
 version = getSubprojectVersion(project)
 
 moduleDependencies(project, ['fabric-api-base'])
diff --git a/fabric-mining-level-api-v1/build.gradle b/fabric-mining-level-api-v1/build.gradle
index 750e26698a..d3b50580ee 100644
--- a/fabric-mining-level-api-v1/build.gradle
+++ b/fabric-mining-level-api-v1/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-mining-level-api-v1"
 version = getSubprojectVersion(project)
 
 moduleDependencies(project, [
diff --git a/fabric-model-loading-api-v1/build.gradle b/fabric-model-loading-api-v1/build.gradle
index 7831d25ef6..ca3eb5eb15 100644
--- a/fabric-model-loading-api-v1/build.gradle
+++ b/fabric-model-loading-api-v1/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-model-loading-api-v1"
 version = getSubprojectVersion(project)
 
 moduleDependencies(project, ['fabric-api-base'])
diff --git a/fabric-networking-api-v1/build.gradle b/fabric-networking-api-v1/build.gradle
index d622d32e46..ebd647d6c8 100644
--- a/fabric-networking-api-v1/build.gradle
+++ b/fabric-networking-api-v1/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-networking-api-v1"
 version = getSubprojectVersion(project)
 
 moduleDependencies(project, ['fabric-api-base'])
diff --git a/fabric-object-builder-api-v1/build.gradle b/fabric-object-builder-api-v1/build.gradle
index 9d9976e472..79a0168e1a 100644
--- a/fabric-object-builder-api-v1/build.gradle
+++ b/fabric-object-builder-api-v1/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-object-builder-api-v1"
 version = getSubprojectVersion(project)
 
 moduleDependencies(project, [
diff --git a/fabric-particles-v1/build.gradle b/fabric-particles-v1/build.gradle
index e08296ddf6..3c2205f361 100644
--- a/fabric-particles-v1/build.gradle
+++ b/fabric-particles-v1/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-particles-v1"
 version = getSubprojectVersion(project)
 
 loom {
diff --git a/fabric-recipe-api-v1/build.gradle b/fabric-recipe-api-v1/build.gradle
index 2d85d16a43..db1d1901ac 100644
--- a/fabric-recipe-api-v1/build.gradle
+++ b/fabric-recipe-api-v1/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-recipe-api-v1"
 version = getSubprojectVersion(project)
 
 loom {
diff --git a/fabric-registry-sync-v0/build.gradle b/fabric-registry-sync-v0/build.gradle
index e161b139c2..2dd05dd71d 100644
--- a/fabric-registry-sync-v0/build.gradle
+++ b/fabric-registry-sync-v0/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-registry-sync-v0"
 version = getSubprojectVersion(project)
 
 loom {
diff --git a/fabric-renderer-api-v1/build.gradle b/fabric-renderer-api-v1/build.gradle
index 0c989a24ec..4c5a4747f9 100644
--- a/fabric-renderer-api-v1/build.gradle
+++ b/fabric-renderer-api-v1/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-renderer-api-v1"
 version = getSubprojectVersion(project)
 
 moduleDependencies(project, ['fabric-api-base'])
diff --git a/fabric-renderer-indigo/build.gradle b/fabric-renderer-indigo/build.gradle
index 70bf920fbf..7dd602d266 100644
--- a/fabric-renderer-indigo/build.gradle
+++ b/fabric-renderer-indigo/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-renderer-indigo"
 version = getSubprojectVersion(project)
 
 loom {
diff --git a/fabric-rendering-fluids-v1/build.gradle b/fabric-rendering-fluids-v1/build.gradle
index 7cea017230..9ced6ef8b4 100644
--- a/fabric-rendering-fluids-v1/build.gradle
+++ b/fabric-rendering-fluids-v1/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-rendering-fluids-v1"
 version = getSubprojectVersion(project)
 
 moduleDependencies(project, ['fabric-api-base'])
diff --git a/fabric-rendering-v1/build.gradle b/fabric-rendering-v1/build.gradle
index 3bc0f4aea4..61680942a1 100644
--- a/fabric-rendering-v1/build.gradle
+++ b/fabric-rendering-v1/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-rendering-v1"
 version = getSubprojectVersion(project)
 
 moduleDependencies(project, ['fabric-api-base'])
diff --git a/fabric-resource-conditions-api-v1/build.gradle b/fabric-resource-conditions-api-v1/build.gradle
index 9975db89a1..6c3e7f4074 100644
--- a/fabric-resource-conditions-api-v1/build.gradle
+++ b/fabric-resource-conditions-api-v1/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-resource-conditions-api-v1"
 version = getSubprojectVersion(project)
 
 testDependencies(project, [':fabric-gametest-api-v1'])
diff --git a/fabric-resource-loader-v0/build.gradle b/fabric-resource-loader-v0/build.gradle
index e6c827bfaf..3c7ab2966e 100644
--- a/fabric-resource-loader-v0/build.gradle
+++ b/fabric-resource-loader-v0/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-resource-loader-v0"
 version = getSubprojectVersion(project)
 
 loom {
diff --git a/fabric-screen-api-v1/build.gradle b/fabric-screen-api-v1/build.gradle
index b1e70a3f58..9ced6ef8b4 100644
--- a/fabric-screen-api-v1/build.gradle
+++ b/fabric-screen-api-v1/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-screen-api-v1"
 version = getSubprojectVersion(project)
 
 moduleDependencies(project, ['fabric-api-base'])
diff --git a/fabric-screen-handler-api-v1/build.gradle b/fabric-screen-handler-api-v1/build.gradle
index 089aa943d5..ac72cee2e8 100644
--- a/fabric-screen-handler-api-v1/build.gradle
+++ b/fabric-screen-handler-api-v1/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-screen-handler-api-v1"
 version = getSubprojectVersion(project)
 
 loom {
diff --git a/fabric-sound-api-v1/build.gradle b/fabric-sound-api-v1/build.gradle
index 2a9df474d7..b484a8a73e 100644
--- a/fabric-sound-api-v1/build.gradle
+++ b/fabric-sound-api-v1/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-sound-api-v1"
 version = getSubprojectVersion(project)
 
 testDependencies(project, [
diff --git a/fabric-transfer-api-v1/build.gradle b/fabric-transfer-api-v1/build.gradle
index e63162015a..9f81ef61be 100644
--- a/fabric-transfer-api-v1/build.gradle
+++ b/fabric-transfer-api-v1/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-transfer-api-v1"
 version = getSubprojectVersion(project)
 
 moduleDependencies(project, [
diff --git a/fabric-transitive-access-wideners-v1/build.gradle b/fabric-transitive-access-wideners-v1/build.gradle
index 6154218712..0f33e7de46 100644
--- a/fabric-transitive-access-wideners-v1/build.gradle
+++ b/fabric-transitive-access-wideners-v1/build.gradle
@@ -1,4 +1,3 @@
-archivesBaseName = "fabric-transitive-access-wideners-v1"
 version = getSubprojectVersion(project)
 
 loom {
diff --git a/gradle.properties b/gradle.properties
index 45fc08bc3f..e950fd7a9f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,10 +5,11 @@ fabric.loom.multiProjectOptimisation=true
 version=0.91.0
 minecraft_version=1.20.1
 yarn_version=+build.1
-loader_version=0.14.21
+loader_version=0.15.6
 installer_version=0.11.1
 
 prerelease=false
+curseforge_minecraft_version=1.20.1
 
 # Do not manually update, use the bumpversions task:
 fabric-api-base-version=0.4.30
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 37aef8d3f0..3499ded5c1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 77274002d1..c993928ec0 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -19,7 +19,7 @@
     "FabricMC"
   ],
   "depends": {
-    "fabricloader": ">=0.14.21",
+    "fabricloader": ">=0.15.6",
     "java": ">=17",
     "minecraft": ">=1.20 <1.20.2-"
   },