1
0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-09-11 14:55:59 +00:00

Merge branch 'mc-1.20.x' into mc-1.21.x

This commit is contained in:
Jonathan Coates
2025-03-16 16:28:53 +00:00
131 changed files with 571 additions and 9186 deletions

View File

@@ -38,7 +38,7 @@ class ForbiddenImport : BugChecker(), BugChecker.ImportTreeMatcher {
companion object {
private val ALTERNATIVE_IMPORTS = mapOf(
// Ban JSR 305 and JetBrains @Nullable, and prefer the JSpecify one.
"org.javax.annotation.Nullable" to "org.jspecify.annotations.Nullable",
"javax.annotation.Nullable" to "org.jspecify.annotations.Nullable",
"org.jetbrains.annotations.Nullable" to "org.jspecify.annotations.Nullable",
// Prefer ErrorProne annotations over JSR ones.
"javax.annotation.CheckReturnValue" to "com.google.errorprone.annotations.CheckReturnValue",