Merge branch '1.21.4' into SyncWithNeoforge2

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,7 +4,7 @@ plugins {
 	id "idea"
 	id "maven-publish"
 	id 'jacoco'
-	id "fabric-loom" version "1.8.9" 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
@@ -215,7 +215,7 @@ allprojects {
 	}
 
 	allprojects.each { p ->
-		if (metaProjects.contains(project.name)) {
+		if (metaProjects.contains(p.name)) {
 			return
 		}
 
@@ -247,19 +247,6 @@ allprojects {
 
 	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 {
@@ -284,7 +271,7 @@ allprojects {
 
 	checkstyle {
 		configFile = rootProject.file("checkstyle.xml")
-		toolVersion = "10.12.1"
+		toolVersion = "10.20.2"
 	}
 
 	tasks.withType(AbstractArchiveTask).configureEach {
@@ -422,7 +409,7 @@ 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 {
@@ -452,6 +439,11 @@ loom {
 		}
 	}
 }
+
+runGametest {
+	outputs.file project.layout.buildDirectory.file("junit.xml")
+}
+
 test.dependsOn runGametest
 
 def coverageTasks = [

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.16.7",
+    "fabricloader": ">=0.16.9",
     "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.16.7",
+    "fabricloader": ">=0.16.9",
     "fabric-api-base": "*",
     "fabric-command-api-v2": "*"
   },

deprecated/fabric-convention-tags-v1/src/main/resources/fabric.mod.json

@@ -21,7 +21,7 @@
     ]
   },
   "depends": {
-    "fabricloader": ">=0.16.7",
+    "fabricloader": ">=0.16.9",
     "minecraft": ">=1.18.2"
   },
   "description": "Contains common tags used by mods for vanilla things.",

deprecated/fabric-keybindings-v0/src/client/resources/fabric.mod.json

@@ -16,7 +16,7 @@
     "FabricMC"
   ],
   "depends": {
-    "fabricloader": ">=0.16.7",
+    "fabricloader": ">=0.16.9",
     "fabric-key-binding-api-v1": "*"
   },
   "description": "Keybinding registry API.",

deprecated/fabric-loot-api-v2/src/main/resources/fabric.mod.json

@@ -16,7 +16,7 @@
     "FabricMC"
   ],
   "depends": {
-    "fabricloader": ">=0.16.7",
+    "fabricloader": ">=0.16.9",
     "fabric-api-base": "*",
     "fabric-resource-loader-v0": "*"
   },

deprecated/fabric-rendering-data-attachment-v1/src/main/resources/fabric.mod.json

@@ -16,7 +16,7 @@
     "FabricMC"
   ],
   "depends": {
-    "fabricloader": ">=0.16.7",
+    "fabricloader": ">=0.16.9",
     "fabric-block-view-api-v2": "*"
   },
   "description": "Thread-safe hooks for block entity data use during terrain rendering.",

fabric-api-base/src/main/resources/fabric.mod.json

@@ -16,7 +16,7 @@
     "FabricMC"
   ],
   "depends": {
-    "fabricloader": ">=0.16.7"
+    "fabricloader": ">=0.16.9"
   },
   "description": "Contains the essentials for Fabric API modules.",
   "custom": {