.gitattributes

@@ -1,3 +1,2 @@
-*.java text eol=lf
-*.json text eol=lf
-*.bat text eol=crlf
+* text=auto eol=lf
+*.bat text eol=crlf

.github/workflows/build.yml

@@ -43,10 +43,11 @@ jobs:
         with:
           distribution: 'microsoft'
           java-version: '21'
-      - name: Run Auto test Client
+      - run: mkdir run && echo "eula=true" >> run/eula.txt
+      - name: Run Client Gametests
         uses: modmuss50/xvfb-action@v1
         with:
-          run: ./gradlew runProductionAutoTestClient --stacktrace --warning-mode=fail
+          run: ./gradlew runProductionClientGametest --stacktrace --warning-mode=fail
       - uses: actions/upload-artifact@v4
         if: always()
         with:

.gitignore

@@ -35,6 +35,7 @@ classes/
 run
 *.log
 *.log.gz
+focus.txt
 
 # Windows
 *.db

CONTRIBUTING.md

@@ -99,6 +99,9 @@ Fabric API makes strong backwards compatibility guarantees, by which contributor
     - If vanilla exposes optionals in return types, then returning an optional is fine.
 - Avoid requiring the user to cast to a subtype if possible.
     - Adding methods to vanilla types can be done via interface injection.
+- Avoid exposing java `record`s as public API.
+    - Records expose more than is necessary for most APIs, which makes them difficult to evolve.
+    - Prefer to expose an interface that is implemented by an impl record.
 
 ### API design patterns to consider
 

README.md

@@ -5,7 +5,7 @@ Essential hooks for modding with Fabric.
 Fabric API is the library for essential hooks and interoperability mechanisms for Fabric mods. Examples include:
 
 - Exposing functionality that is useful but difficult to access for many mods such as particles, biomes and dimensions
-- Adding events, hooks and APIs to improve interopability between mods.
+- Adding events, hooks and APIs to improve interoperability between mods.
 - Essential features such as registry synchronization and adding information to crash reports.
 - An advanced rendering API designed for compatibility with optimization mods and graphics overhaul mods.
 

build.gradle

@@ -4,10 +4,10 @@ plugins {
 	id "idea"
 	id "maven-publish"
 	id 'jacoco'
-	id "fabric-loom" version "1.6.11" apply false
+	id "fabric-loom" version "1.9.2" apply false
 	id "com.diffplug.spotless" version "6.20.0"
 	id "org.ajoberstar.grgit" version "5.2.2"
-	id "me.modmuss50.remotesign" version "0.4.0" apply false
+	id "me.modmuss50.remotesign" version "0.5.0" apply false
 	id "me.modmuss50.mod-publish-plugin" version "0.4.5"
 }
 
@@ -215,7 +215,7 @@ allprojects {
 	}
 
 	allprojects.each { p ->
-		if (metaProjects.contains(project.name)) {
+		if (metaProjects.contains(p.name)) {
 			return
 		}
 
@@ -242,24 +242,11 @@ allprojects {
 
 		testImplementation "net.fabricmc:fabric-loader-junit:${project.loader_version}"
 		testImplementation sourceSets.testmodClient.output
-		testImplementation 'org.mockito:mockito-core:5.4.0'
+		testImplementation 'org.mockito:mockito-core:5.13.0'
 	}
 
 	test {
 		useJUnitPlatform()
-
-		afterEvaluate {
-			// See: https://github.com/FabricMC/fabric-loader/pull/585
-			def classPathGroups = loom.mods.stream()
-					.map { modSettings ->
-						SourceSetHelper.getClasspath(modSettings, getProject()).stream()
-								.map(File.&getAbsolutePath)
-								.collect(Collectors.joining(File.pathSeparator))
-					}
-					.collect(Collectors.joining(File.pathSeparator+File.pathSeparator))
-
-			systemProperty("fabric.classPathGroups", classPathGroups)
-		}
 	}
 
 	tasks.withType(ProcessResources).configureEach {
@@ -271,18 +258,28 @@ allprojects {
 	}
 
 	spotless {
+		lineEndings = com.diffplug.spotless.LineEnding.UNIX
+
 		java {
 			licenseHeaderFile(rootProject.file("HEADER"))
 			removeUnusedImports()
 			importOrder('java', 'javax', '', 'net.minecraft', 'net.fabricmc')
 			indentWithTabs()
 			trimTrailingWhitespace()
 		}
+
+		// Sort the en_us translation files
+		// The other languages are handled by Crowdin
+		json {
+			target 'src/**/lang/en_us.json'
+			targetExclude 'src/**/generated/**'
+			gson().indentWithSpaces(2).sortByKeys()
+		}
 	}
 
 	checkstyle {
 		configFile = rootProject.file("checkstyle.xml")
-		toolVersion = "10.12.1"
+		toolVersion = "10.20.2"
 	}
 
 	tasks.withType(AbstractArchiveTask).configureEach {
@@ -329,6 +326,7 @@ allprojects {
 		addNestedDependencies = false
 		includesClientOnlyClasses = true
 		clientOnlySourceSetName = sourceSets.testmodClient.name
+		classpath.from(sourceSets.testmodClient.compileClasspath)
 	}
 	build.dependsOn remapTestmodJar
 
@@ -365,8 +363,7 @@ apply from: "gradle/module-validation.gradle"
 apply from: "gradle/module-versioning.gradle"
 
 loom {
-	// Required as the item-group API uses access widened classes in its API, without this the javadoc generation fails.
-	accessWidenerPath = file("fabric-item-group-api-v1/src/main/resources/fabric-item-group-api-v1.accesswidener")
+	accessWidenerPath = file("gradle/javadoc.accesswidener")
 }
 
 javadoc {
@@ -399,7 +396,7 @@ javadoc {
 
 	classpath = files(sourceSets.main.compileClasspath, sourceSets.client.compileClasspath)
 	include("**/api/**")
-	failOnError true
+	failOnError = true
 }
 
 tasks.register('javadocJar', Jar) {
@@ -420,18 +417,18 @@ loom {
 
 			// Enable the gametest runner
 			vmArg "-Dfabric-api.gametest"
-			vmArg "-Dfabric-api.gametest.report-file=${project.buildDir}/junit.xml"
+			vmArg "-Dfabric-api.gametest.report-file=${project.layout.buildDirectory.file("junit.xml").get().getAsFile()}"
 			runDir "build/gametest"
 		}
 		autoTestServer {
 			inherit testmodServer
 			name  "Auto Test Server"
 			vmArg "-Dfabric.autoTest"
 		}
-		autoTestClient {
+		clientGametest {
 			inherit testmodClient
-			name "Auto Test Client"
-			vmArg "-Dfabric.autoTest"
+			name "Client Game Test"
+			vmArg "-Dfabric.client.gametest"
 			vmArg "-Dfabric-tag-conventions-v2.missingTagTranslationWarning=fail"
 			vmArg "-Dfabric-tag-conventions-v1.legacyTagWarning=fail"
 		}
@@ -443,18 +440,23 @@ loom {
 			ideConfigGenerated = false
 		}
 
-		autoTestClientCoverage {
-			inherit autoTestClient
-			name "Auto Test Client Coverage"
+		clientGametestCoverage {
+			inherit clientGametest
+			name "Client Game Test Coverage"
 			ideConfigGenerated = false
 		}
 	}
 }
+
+runGametest {
+	outputs.file project.layout.buildDirectory.file("junit.xml")
+}
+
 test.dependsOn runGametest
 
 def coverageTasks = [
 	runGametestCoverage,
-	runAutoTestClientCoverage
+	runClientGametestCoverage
 ]
 
 jacoco {
@@ -490,20 +492,26 @@ configurations {
 		extendsFrom configurations.minecraftRuntimeLibraries
 	}
 	productionRuntimeServer
+	productionMods {
+		transitive = false
+	}
 }
 
 dependencies {
 	productionRuntime "net.fabricmc:fabric-loader:${project.loader_version}"
 	productionRuntime "net.fabricmc:intermediary:${project.minecraft_version}"
 
 	productionRuntimeServer "net.fabricmc:fabric-installer:${project.installer_version}:server"
+	productionMods project(':fabric-client-gametest-api-v1')
 }
 
 import net.fabricmc.loom.util.Platform
 
+def productionMods = project.files(configurations.productionMods, remapJar.archiveFile, remapTestmodJar.archiveFile)
+
 // This is very far beyond loom's API if you copy this, you're on your own.
-tasks.register('runProductionAutoTestClient', JavaExec) {
-	dependsOn remapJar, remapTestmodJar, downloadAssets
+tasks.register('runProductionClientGametest', JavaExec) {
+	dependsOn productionMods, downloadAssets
 	classpath.from configurations.productionRuntime
 	mainClass = "net.fabricmc.loader.impl.launch.knot.KnotClient"
 	workingDir = file("run")
@@ -525,8 +533,8 @@ tasks.register('runProductionAutoTestClient', JavaExec) {
 		}
 
 		jvmArgs(
-				"-Dfabric.addMods=${remapJar.archiveFile.get().asFile.absolutePath}${File.pathSeparator}${remapTestmodJar.archiveFile.get().asFile.absolutePath}",
-				"-Dfabric.autoTest",
+				"-Dfabric.addMods=${productionMods.collect { it.absolutePath }.join(File.pathSeparator)}",
+				"-Dfabric.client.gametest",
 				"-Dfabric-tag-conventions-v2.missingTagTranslationWarning=fail",
 				"-Dfabric-tag-conventions-v1.legacyTagWarning=fail"
 				)
@@ -550,7 +558,7 @@ tasks.register('serverPropertiesJar', Jar) {
 }
 
 tasks.register('runProductionAutoTestServer', JavaExec) {
-	dependsOn remapJar, remapTestmodJar, serverPropertiesJar
+	dependsOn productionMods, serverPropertiesJar
 	classpath.from configurations.productionRuntimeServer, serverPropertiesJar
 	mainClass = "net.fabricmc.installer.ServerLauncher"
 	workingDir = file("run")
@@ -559,7 +567,7 @@ tasks.register('runProductionAutoTestServer', JavaExec) {
 		workingDir.mkdirs()
 
 		jvmArgs(
-				"-Dfabric.addMods=${remapJar.archiveFile.get().asFile.absolutePath}${File.pathSeparator}${remapTestmodJar.archiveFile.get().asFile.absolutePath}",
+				"-Dfabric.addMods=${productionMods.collect { it.absolutePath }.join(File.pathSeparator)}",
 				"-Dfabric.autoTest",
 				)
 		jvmArgs(debugArgs)
@@ -732,7 +740,10 @@ subprojects.each {
 }
 
 // These modules are not included in the fat jar, maven will resolve them via the pom.
-def devOnlyModules = ["fabric-gametest-api-v1",]
+def devOnlyModules = [
+	"fabric-client-gametest-api-v1",
+	"fabric-gametest-api-v1",
+]
 
 dependencies {
 	afterEvaluate {
@@ -750,19 +761,42 @@ dependencies {
 	}
 }
 
-remapJar {
-	afterEvaluate {
-		subprojects.each {
-			if (it.name in devOnlyModules || metaProjects.contains(it.name)) {
-				return
-			}
+configurations {
+	nestedJars {
+		transitive = false
+	}
+}
 
-			// Include the signed or none signed jar from the sub project.
-			nestedJars.from project("${it.path}").tasks.getByName("signRemapJar")
+dependencies {
+	subprojects.each {
+		if (it.name in devOnlyModules || metaProjects.contains(it.name)) {
+			return
 		}
+
+		nestedJars project("${it.path}")
 	}
 }
 
+remapJar {
+	nestedJars.from configurations.nestedJars
+}
+
+// Attempt to create a single jar with all files from all nested jars, this will fail if there are duplicate files.
+tasks.register("checkNoDuplicateFiles", Zip) {
+	inputs.files configurations.nestedJars
+	destinationDirectory = layout.buildDirectory.dir("test")
+
+	from {
+		configurations.nestedJars.files.collect { zipTree(it) }
+	}
+
+	// We expect these files to be duplicated, so exclude them.
+	exclude 'META-INF/**'
+	exclude 'fabric.mod.json'
+}
+
+check.dependsOn "checkNoDuplicateFiles"
+
 publishMods {
 	file = signRemapJar.output
 	changelog = providers.environmentVariable("CHANGELOG").getOrElse("No changelog provided")

checkstyle.xml

@@ -208,5 +208,10 @@
         <module name="MatchXpath">
             <property name="query" value="//VARIABLE_DEF[./TYPE/IDENT[@text='var'] and not(./ASSIGN/EXPR/LITERAL_NEW)]"/>
         </module>
+
+        <!-- Prevent public records in API packages -->
+        <module name="MatchXpath">
+            <property name="query" value="//RECORD_DEF[./MODIFIERS/LITERAL_PUBLIC][//PACKAGE_DEF//DOT/IDENT[@text='api']]"/>
+        </module>
 	</module>
 </module>

deprecated/fabric-command-api-v1/src/main/resources/fabric.mod.json

@@ -16,7 +16,7 @@
     "FabricMC"
   ],
   "depends": {
-    "fabricloader": ">=0.15.11",
+    "fabricloader": ">=0.16.10",
     "fabric-api-base": "*",
     "fabric-command-api-v2": "*"
   },

deprecated/fabric-commands-v0/src/main/resources/fabric.mod.json

@@ -16,7 +16,7 @@
     "FabricMC"
   ],
   "depends": {
-    "fabricloader": ">=0.15.11",
+    "fabricloader": ">=0.16.10",
     "fabric-api-base": "*",
     "fabric-command-api-v2": "*"
   },

deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java

@@ -174,12 +174,13 @@ boolean isVerbose() {
 			createMapEntry(RegistryKeys.ITEM, "hoes", ItemTags.HOES),
 			createMapEntry(RegistryKeys.ITEM, "shovels", ItemTags.SHOVELS),
 			createMapEntry(RegistryKeys.ITEM, "swords", ItemTags.SWORDS),
-			createMapEntry(RegistryKeys.ITEM, "wrenches", "tools/wrenches"),
 			createMapEntry(createTagKeyUnderFabric(RegistryKeys.ITEM, "axes"), ItemTags.AXES),
 			createMapEntry(createTagKeyUnderFabric(RegistryKeys.ITEM, "pickaxes"), ItemTags.PICKAXES),
 			createMapEntry(createTagKeyUnderFabric(RegistryKeys.ITEM, "hoes"), ItemTags.HOES),
 			createMapEntry(createTagKeyUnderFabric(RegistryKeys.ITEM, "shovels"), ItemTags.SHOVELS),
 			createMapEntry(createTagKeyUnderFabric(RegistryKeys.ITEM, "swords"), ItemTags.SWORDS),
+			createMapEntry(RegistryKeys.ITEM, "wrenches", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.WRENCH_TOOLS),
+			createMapEntry(RegistryKeys.ITEM, "tools/wrenches", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.WRENCH_TOOLS),
 			createMapEntry(RegistryKeys.ITEM, "barrel", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.BARRELS),
 			createMapEntry(RegistryKeys.ITEM, "chest", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.CHESTS),
 			createMapEntry(RegistryKeys.ITEM, "glass", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.GLASS_BLOCKS),
@@ -215,7 +216,12 @@ boolean isVerbose() {
 			createMapEntry(RegistryKeys.ITEM, "stews", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SOUP_FOODS),
 			createMapEntry(RegistryKeys.ITEM, "candy", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.CANDY_FOODS),
 			createMapEntry(RegistryKeys.ITEM, "candies", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.CANDY_FOODS),
-			createMapEntry(TagKey.of(RegistryKeys.ITEM, Identifier.of("minecraft", "music_discs")), net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.MUSIC_DISCS)
+			createMapEntry(RegistryKeys.ITEM, "pie", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.PIE_FOODS),
+			createMapEntry(RegistryKeys.ITEM, "pies", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.PIE_FOODS),
+			createMapEntry(TagKey.of(RegistryKeys.ITEM, Identifier.of("minecraft", "music_discs")), net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.MUSIC_DISCS),
+			createMapEntry(TagKey.of(RegistryKeys.ITEM, Identifier.of("minecraft", "tall_flowers")), net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.TALL_FLOWERS),
+			createMapEntry(TagKey.of(RegistryKeys.ITEM, Identifier.of("minecraft", "flowers")), net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.FLOWERS),
+			createMapEntry(TagKey.of(RegistryKeys.BLOCK, Identifier.of("minecraft", "tall_flowers")), net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.TALL_FLOWERS)
 	);
 
 	@Override
@@ -234,7 +240,9 @@ private static void setupLegacyTagWarning() {
 			// We only care about vanilla registries
 			dynamicRegistries.streamAllRegistries().forEach(registryEntry -> {
 				if (registryEntry.key().getValue().getNamespace().equals(Identifier.DEFAULT_NAMESPACE)) {
-					registryEntry.value().streamTags().forEach(tagKey -> {
+					registryEntry.value().streamTags().forEach(listEntry -> {
+						TagKey<?> tagKey = TagKey.of(registryEntry.key(), listEntry.getTag().id());
+
 						// Grab legacy tags we migrated or discourage
 						if (LEGACY_C_TAGS.containsKey(tagKey)) {
 							legacyTags.add(tagKey);